From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Fri, 18 Sep 2015 09:08:27 +0000 (+0000)
Subject: Merge "Use User::equals() where applicable in the class"
X-Git-Tag: 1.31.0-rc.0~9975
X-Git-Url: http://git.cyclocoop.org//%27http:/jquery.khurshid.com/ifixpng.php/%27?a=commitdiff_plain;h=b60dded47b7c4437a21baea8ee0780243340abb6;hp=5668f2347a65dda85fca5addd7cfc5f61db14717;p=lhc%2Fweb%2Fwiklou.git

Merge "Use User::equals() where applicable in the class"
---

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/CREDITS b/CREDITS
index 22dee7bdad..44adc4ffb9 100644
--- a/CREDITS
+++ b/CREDITS
@@ -24,6 +24,7 @@ following names for their contribution to the product.
 * Bryan Tong Minh
 * Chad Horohoe
 * Charles Melbye
+* Chris Steipp
 * church of emacs
 * Daniel Friesen
 * Daniel Kinzler
@@ -43,6 +44,7 @@ following names for their contribution to the product.
 * Jack D. Pond
 * Jack Phoenix
 * Jackmcbarn
+* James Forrester
 * Jan Paul Posma
 * Jason Richey
 * Jeroen De Dauw
@@ -91,6 +93,7 @@ following names for their contribution to the product.
 * Tim Starling
 * Timo Tijhof
 * Trevor Parscal
+* Tyler Anthony Romeo
 * Victor Vasiliev
 * Yesid Carrillo
 * Yuri Astrakhan
@@ -116,7 +119,6 @@ following names for their contribution to the product.
 * Brianna Laugher
 * Carlin
 * Carsten Nielsen
-* Chris Steipp
 * Christian Aistleitner
 * Christian Neubauer
 * Conrad Irwin
@@ -139,6 +141,7 @@ following names for their contribution to the product.
 * fomafix
 * FunPika
 * Gabriel Wicke
+* Geoffrey Mon
 * Gero Scholz
 * Gilles van den Hoven
 * Grunny
@@ -227,6 +230,7 @@ following names for their contribution to the product.
 * Simon Walker
 * Solitarius
 * Søren Løvborg
+* Southparkfan
 * Srikanth Lakshmanan
 * Stefano Codari
 * Str4nd
@@ -235,7 +239,6 @@ following names for their contribution to the product.
 * The Evil IP address
 * Tim Landscheidt
 * Tisane
-* Tyler Anthony Romeo
 * Umherirrender
 * Van de Bugger
 * Ville Stadista
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 19e3eaa97d..4463c7823e 100644
--- a/RELEASE-NOTES-1.26
+++ b/RELEASE-NOTES-1.26
@@ -22,10 +22,16 @@ production.
   the "Signature" button on the edit toolbar will be displayed.
 * $wgResourceLoaderUseESI was deprecated and removed. This was an experimental
   feature that was never enabled by default.
+* $wgResourceLoaderExperimentalAsyncLoading was deprecated and removed.
+  This experimental feature was never enabled by default and is obsolete as of
+  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 ===
-* (T9148) Changes to category membership are now shown in watchlists and recent
-  changes. This can be configured in user preferences.
 * (T51506) Now action=info gives estimates of actual watchers for a page.
   See $wgRCMaxAge, $wgWatchersMaxAge and $wgUnwatchedPageSecret
   to learn how to configure if needed.
@@ -61,6 +67,12 @@ production.
   by Special:Random to select random pages.
 * $wgTransactionalTimeLimit was added, which controls the request time limit
   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.
@@ -74,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
@@ -92,8 +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 ===
 
@@ -111,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
@@ -155,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 48e0b8824a..5adfbe5104 100644
--- a/autoload.php
+++ b/autoload.php
@@ -200,7 +200,6 @@ $wgAutoloadLocalClasses = array(
 	'CapsCleanup' => __DIR__ . '/maintenance/cleanupCaps.php',
 	'Category' => __DIR__ . '/includes/Category.php',
 	'CategoryFinder' => __DIR__ . '/includes/CategoryFinder.php',
-	'CategoryMembershipChange' => __DIR__ . '/includes/changes/CategoryMembershipChange.php',
 	'CategoryPage' => __DIR__ . '/includes/page/CategoryPage.php',
 	'CategoryPager' => __DIR__ . '/includes/specials/SpecialCategories.php',
 	'CategoryViewer' => __DIR__ . '/includes/CategoryViewer.php',
@@ -544,7 +543,7 @@ $wgAutoloadLocalClasses = array(
 	'IORMRow' => __DIR__ . '/includes/db/IORMRow.php',
 	'IORMTable' => __DIR__ . '/includes/db/IORMTable.php',
 	'IP' => __DIR__ . '/includes/utils/IP.php',
-	'IPSet' => __DIR__ . '/includes/libs/IPSet.php',
+	'IPSet' => __DIR__ . '/includes/compat/IPSetCompat.php',
 	'IPTC' => __DIR__ . '/includes/media/IPTC.php',
 	'IRCColourfulRCFeedFormatter' => __DIR__ . '/includes/rcfeed/IRCColourfulRCFeedFormatter.php',
 	'IcuCollation' => __DIR__ . '/includes/Collation.php',
@@ -725,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',
@@ -762,6 +760,15 @@ $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',
 	'MediaWiki\\Widget\\TitleInputWidget' => __DIR__ . '/includes/widget/TitleInputWidget.php',
 	'MediaWiki\\Widget\\UserInputWidget' => __DIR__ . '/includes/widget/UserInputWidget.php',
@@ -1012,6 +1019,7 @@ $wgAutoloadLocalClasses = array(
 	'ResourceLoaderEditToolbarModule' => __DIR__ . '/includes/resourceloader/ResourceLoaderEditToolbarModule.php',
 	'ResourceLoaderFileModule' => __DIR__ . '/includes/resourceloader/ResourceLoaderFileModule.php',
 	'ResourceLoaderFilePath' => __DIR__ . '/includes/resourceloader/ResourceLoaderFilePath.php',
+	'ResourceLoaderForeignApiModule' => __DIR__ . '/includes/resourceloader/ResourceLoaderForeignApiModule.php',
 	'ResourceLoaderImage' => __DIR__ . '/includes/resourceloader/ResourceLoaderImage.php',
 	'ResourceLoaderImageModule' => __DIR__ . '/includes/resourceloader/ResourceLoaderImageModule.php',
 	'ResourceLoaderJqueryMsgModule' => __DIR__ . '/includes/resourceloader/ResourceLoaderJqueryMsgModule.php',
diff --git a/composer.json b/composer.json
index af9aeab397..1fe1e5068d 100644
--- a/composer.json
+++ b/composer.json
@@ -21,13 +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.5",
+		"oojs/oojs-ui": "0.12.8",
 		"php": ">=5.3.3",
 		"psr/log": "1.0.0",
-		"wikimedia/cdb": "1.0.1",
 		"wikimedia/assert": "0.2.2",
+		"wikimedia/cdb": "1.3.0",
 		"wikimedia/composer-merge-plugin": "1.2.1",
-		"wikimedia/utfnormal": "1.0.2",
+		"wikimedia/ip-set": "1.0.1",
+		"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 bf5599778e..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.
@@ -2448,6 +2451,13 @@ $user: The user having their password expiration reset
 $oldSessionID: old session id
 $newSessionID: new session id
 
+'ResourceLoaderForeignApiModules': Called from ResourceLoaderForeignApiModule.
+Use this to add dependencies to 'mediawiki.ForeignApi' module when you wish
+to override its behavior. See the module docs for more information.
+&$dependencies: string[] List of modules that 'mediawiki.ForeignApi' should
+depend on
+$context: ResourceLoaderContext|null
+
 'ResourceLoaderGetConfigVars': Called at the end of
 ResourceLoaderStartUpModule::getConfigSettings(). Use this to export static
 configuration variables to JavaScript. Things that depend on the current page
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 34fe7eed40..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;
@@ -1860,12 +1860,6 @@ $wgDBservers = false;
  */
 $wgLBFactoryConf = array( 'class' => 'LBFactorySimple' );
 
-/**
- * How long to wait for a slave to catch up to the master
- * @deprecated since 1.24
- */
-$wgMasterWaitTimeout = 10;
-
 /**
  * File to log database errors to
  */
@@ -3479,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;
 
@@ -3617,13 +3611,6 @@ $wgResourceLoaderValidateJS = true;
  */
 $wgResourceLoaderValidateStaticJS = false;
 
-/**
- * If set to true, asynchronous loading of bottom-queue scripts in the "<head>"
- * will be enabled. This is an experimental feature that's supposed to make
- * JavaScript load faster.
- */
-$wgResourceLoaderExperimentalAsyncLoading = false;
-
 /**
  * Global LESS variables. An associative array binding variable names to
  * LESS code snippets representing their values.
@@ -3649,18 +3636,6 @@ $wgResourceLoaderExperimentalAsyncLoading = 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
@@ -3733,8 +3708,8 @@ $wgMetaNamespaceTalk = false;
  * Additional namespaces. If the namespaces defined in Language.php and
  * Namespace.php are insufficient, you can create new ones here, for example,
  * to import Help files in other languages. You can also override the namespace
- * names of existing namespaces. Extensions developers should use
- * $wgCanonicalNamespaceNames.
+ * names of existing namespaces. Extensions should use the CanonicalNamespaces
+ * hook or extension.json.
  *
  * @warning Once you delete a namespace, the pages in that namespace will
  * no longer be accessible. If you rename it, then you can access them through
@@ -4129,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/
+ *
+ * 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)
  *
- * - $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.
+ *  - 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' );
 
@@ -4503,7 +4489,6 @@ $wgDefaultUserOptions = array(
 	'gender' => 'unknown',
 	'hideminor' => 0,
 	'hidepatrolled' => 0,
-	'hidecategorization' => 0,
 	'imagesize' => 2,
 	'math' => 1,
 	'minordefault' => 0,
@@ -4535,7 +4520,6 @@ $wgDefaultUserOptions = array(
 	'watchlisthideminor' => 0,
 	'watchlisthideown' => 0,
 	'watchlisthidepatrolled' => 0,
-	'watchlisthidecategorization' => 0,
 	'watchmoves' => 0,
 	'watchrollback' => 0,
 	'wllimit' => 250,
@@ -7252,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
@@ -7708,6 +7686,7 @@ $wgUseLinkNamespaceDBFields = true;
  *   $wgVirtualRestConfig['modules']['parsoid'] = array(
  *     'url' => 'http://localhost:8000',
  *     'prefix' => 'enwiki',
+ *     'domain' => 'en.wikipedia.org',
  *   );
  *
  * @var array
@@ -7718,6 +7697,7 @@ $wgVirtualRestConfig = array(
 	'global' => array(
 		# Timeout in seconds
 		'timeout' => 360,
+		# 'domain' is set to $wgCanonicalServer in Setup.php
 		'forwardCookies' => false,
 		'HTTPProxy' => null
 	)
diff --git a/includes/Defines.php b/includes/Defines.php
index 38f2d424da..d55bbcf819 100644
--- a/includes/Defines.php
+++ b/includes/Defines.php
@@ -170,7 +170,6 @@ define( 'RC_EDIT', 0 );
 define( 'RC_NEW', 1 );
 define( 'RC_LOG', 3 );
 define( 'RC_EXTERNAL', 5 );
-define( 'RC_CATEGORIZE', 6 );
 /**@}*/
 
 /**@{
diff --git a/includes/EditPage.php b/includes/EditPage.php
index f3a41c46b9..05e0ac0ee9 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -527,7 +527,10 @@ class EditPage {
 		if ( $permErrors ) {
 			wfDebug( __METHOD__ . ": User can't edit\n" );
 			// Auto-block user's IP if the account was "hard" blocked
-			$wgUser->spreadAnyEditBlock();
+			$user = $wgUser;
+			DeferredUpdates::addCallableUpdate( function() use ( $user ) {
+				$user->spreadAnyEditBlock();
+			} );
 
 			$this->displayPermissionsError( $permErrors );
 
@@ -652,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" );
 
@@ -665,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 c3740a0146..f2e37d557c 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -171,6 +171,7 @@ if ( !function_exists( 'hash_equals' ) ) {
  *
  * @param string $ext Name of the extension to load
  * @param string|null $path Absolute path of where to find the extension.json file
+ * @since 1.25
  */
 function wfLoadExtension( $ext, $path = null ) {
 	if ( !$path ) {
@@ -191,6 +192,7 @@ function wfLoadExtension( $ext, $path = null ) {
  *
  * @see wfLoadExtension
  * @param string[] $exts Array of extension names to load
+ * @since 1.25
  */
 function wfLoadExtensions( array $exts ) {
 	global $wgExtensionDirectory;
@@ -206,6 +208,7 @@ function wfLoadExtensions( array $exts ) {
  * @see wfLoadExtension
  * @param string $skin Name of the extension to load
  * @param string|null $path Absolute path of where to find the skin.json file
+ * @since 1.25
  */
 function wfLoadSkin( $skin, $path = null ) {
 	if ( !$path ) {
@@ -220,6 +223,7 @@ function wfLoadSkin( $skin, $path = null ) {
  *
  * @see wfLoadExtensions
  * @param string[] $skins Array of extension names to load
+ * @since 1.25
  */
 function wfLoadSkins( array $skins ) {
 	global $wgStyleDirectory;
@@ -2179,14 +2183,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.
@@ -3461,10 +3475,10 @@ function wfResetSessionID() {
  * @param bool $sessionId
  */
 function wfSetupSession( $sessionId = false ) {
-	global $wgSessionsInMemcached, $wgSessionsInObjectCache, $wgSessionHandler;
+	global $wgSessionsInObjectCache, $wgSessionHandler;
 	global $wgCookiePath, $wgCookieDomain, $wgCookieSecure, $wgCookieHttpOnly;
 
-	if ( $wgSessionsInObjectCache || $wgSessionsInMemcached ) {
+	if ( $wgSessionsInObjectCache ) {
 		ObjectCacheSessionHandler::install();
 	} elseif ( $wgSessionHandler && $wgSessionHandler != ini_get( 'session.save_handler' ) ) {
 		# Only set this if $wgSessionHandler isn't null and session.save_handler
@@ -3485,7 +3499,7 @@ function wfSetupSession( $sessionId = false ) {
 	session_start();
 	MediaWiki\restoreWarnings();
 
-	if ( $wgSessionsInObjectCache || $wgSessionsInMemcached ) {
+	if ( $wgSessionsInObjectCache ) {
 		ObjectCacheSessionHandler::renewCurrentSession();
 	}
 }
@@ -3954,13 +3968,13 @@ function wfBCP47( $code ) {
 }
 
 /**
- * Get a cache object.
+ * Get a specific cache object.
  *
- * @param int $inputType Cache type, one of the CACHE_* constants.
+ * @param int|string $cacheType A CACHE_* constants, or other key in $wgObjectCaches
  * @return BagOStuff
  */
-function wfGetCache( $inputType ) {
-	return ObjectCache::getInstance( $inputType );
+function wfGetCache( $cacheType ) {
+	return ObjectCache::getInstance( $cacheType );
 }
 
 /**
@@ -4273,3 +4287,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 c726538c99..a414562436 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -135,10 +135,6 @@ class Hooks {
 	 *   returning null) is equivalent to returning true.
 	 */
 	public static function run( $event, array $args = array(), $deprecatedVersion = null ) {
-		$stats = RequestContext::getMain()->getStats();
-		$metric = $stats->increment( 'hooks.' . $event );
-		$metric->setSampleRate( 0.001 );
-
 		foreach ( self::getHandlers( $event ) as $hook ) {
 			// Turn non-array values into an array. (Can't use casting because of objects.)
 			if ( !is_array( $hook ) ) {
@@ -235,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 fec8adcbf6..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();
@@ -917,16 +973,16 @@ class PhpHttpRequest extends MWHttpRequest {
 		}
 
 		if ( $this->sslVerifyHost ) {
-			$options['ssl']['CN_match'] = $this->parsedUrl['host'];
+			// PHP 5.6.0 deprecates CN_match, in favour of peer_name which
+			// actually checks SubjectAltName properly.
+			if ( version_compare( PHP_VERSION, '5.6.0', '>=' ) ) {
+				$options['ssl']['peer_name'] = $this->parsedUrl['host'];
+			} else {
+				$options['ssl']['CN_match'] = $this->parsedUrl['host'];
+			}
 		}
 
-		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 );
 
@@ -943,11 +999,25 @@ 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.
+				// If we are contacting (commons|upload).wikimedia.org
+				// try again with CN_match for en.wikipedia.org
+				// as php does not handle SubjectAltName properly
+				// prior to "peer_name" option in php 5.6
+				if ( isset( $options['ssl']['CN_match'] )
+					&& ( $options['ssl']['CN_match'] === 'commons.wikimedia.org'
+						|| $options['ssl']['CN_match'] === 'upload.wikimedia.org' )
+				) {
+					$options['ssl']['CN_match'] = 'en.wikipedia.org';
+					$context = stream_context_create( $options );
+					continue;
+				}
 				break;
 			}
 
@@ -978,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/MWNamespace.php b/includes/MWNamespace.php
index 731b62e036..8ca205ab42 100644
--- a/includes/MWNamespace.php
+++ b/includes/MWNamespace.php
@@ -210,6 +210,8 @@ class MWNamespace {
 		if ( $namespaces === null || $rebuild ) {
 			global $wgExtraNamespaces, $wgCanonicalNamespaceNames;
 			$namespaces = array( NS_MAIN => '' ) + $wgCanonicalNamespaceNames;
+			// Add extension namespaces
+			$namespaces += ExtensionRegistry::getInstance()->getAttribute( 'ExtensionNamespaces' );
 			if ( is_array( $wgExtraNamespaces ) ) {
 				$namespaces += $wgExtraNamespaces;
 			}
diff --git a/includes/MWTimestamp.php b/includes/MWTimestamp.php
index f2bd6ba569..d28f88e504 100644
--- a/includes/MWTimestamp.php
+++ b/includes/MWTimestamp.php
@@ -56,7 +56,7 @@ class MWTimestamp {
 	 *
 	 * @since 1.20
 	 *
-	 * @param bool|string $timestamp Timestamp to set, or false for current time
+	 * @param bool|string|int|float $timestamp Timestamp to set, or false for current time
 	 */
 	public function __construct( $timestamp = false ) {
 		$this->setTimestamp( $timestamp );
@@ -74,6 +74,7 @@ class MWTimestamp {
 	 * @throws TimestampException
 	 */
 	public function setTimestamp( $ts = false ) {
+		$m = array();
 		$da = array();
 		$strtime = '';
 
@@ -87,9 +88,9 @@ class MWTimestamp {
 			# TS_EXIF
 		} elseif ( preg_match( '/^(\d{4})(\d\d)(\d\d)(\d\d)(\d\d)(\d\d)$/D', $ts, $da ) ) {
 			# TS_MW
-		} elseif ( preg_match( '/^-?\d{1,13}$/D', $ts ) ) {
+		} elseif ( preg_match( '/^(-?\d{1,13})(\.\d+)?$/D', $ts, $m ) ) {
 			# TS_UNIX
-			$strtime = "@$ts"; // http://php.net/manual/en/datetime.formats.compound.php
+			$strtime = "@{$m[1]}"; // http://php.net/manual/en/datetime.formats.compound.php
 		} elseif ( preg_match( '/^\d{2}-\d{2}-\d{4} \d{2}:\d{2}:\d{2}.\d{6}$/', $ts ) ) {
 			# TS_ORACLE // session altered to DD-MM-YYYY HH24:MI:SS.FF6
 			$strtime = preg_replace( '/(\d\d)\.(\d\d)\.(\d\d)(\.(\d+))?/', "$1:$2:$3",
diff --git a/includes/MagicWord.php b/includes/MagicWord.php
index 186821de39..2c7ba91bf2 100644
--- a/includes/MagicWord.php
+++ b/includes/MagicWord.php
@@ -718,9 +718,6 @@ class MagicWordArray {
 
 	private $regex;
 
-	/** @todo Unused? */
-	private $matches;
-
 	/**
 	 * @param array $names
 	 */
@@ -953,10 +950,12 @@ class MagicWordArray {
 			if ( $regex === '' ) {
 				continue;
 			}
-			preg_match_all( $regex, $text, $matches, PREG_SET_ORDER );
-			foreach ( $matches as $m ) {
-				list( $name, $param ) = $this->parseMatch( $m );
-				$found[$name] = $param;
+			$matches = array();
+			if ( preg_match_all( $regex, $text, $matches, PREG_SET_ORDER ) ) {
+				foreach ( $matches as $m ) {
+					list( $name, $param ) = $this->parseMatch( $m );
+					$found[$name] = $param;
+				}
 			}
 			$text = preg_replace( $regex, '', $text );
 		}
diff --git a/includes/MediaWiki.php b/includes/MediaWiki.php
index f488aa2485..fbacb2504e 100644
--- a/includes/MediaWiki.php
+++ b/includes/MediaWiki.php
@@ -283,9 +283,11 @@ class MediaWiki {
 	 *   /w/index.php?title=Foo_Bar -> /wiki/Foo_Bar
 	 * - Don't redirect anything with query parameters other than 'title' or 'action=view'.
 	 *
+	 * @param Title $title
 	 * @return bool True if a redirect was set.
+	 * @throws HttpError
 	 */
-	private function tryNormaliseRedirect( $title ) {
+	private function tryNormaliseRedirect( Title $title ) {
 		$request = $this->context->getRequest();
 		$output = $this->context->getOutput();
 
@@ -495,36 +497,39 @@ class MediaWiki {
 	public function doPreOutputCommit() {
 		// Either all DBs should commit or none
 		ignore_user_abort( true );
-		wfGetLBFactory()->commitMasterChanges();
+
+		// Commit all changes and record ChronologyProtector positions
+		$factory = wfGetLBFactory();
+		$factory->commitMasterChanges();
+		$factory->shutdown();
+
+		wfDebug( __METHOD__ . ' completed; all transactions committed' );
 	}
 
 	/**
 	 * This function does work that can be done *after* the
 	 * user gets the HTTP response so they don't block on it
 	 *
+	 * This manages deferred updates, job insertion,
+	 * final commit, and the logging of profiling data
+	 *
 	 * @param string $mode Use 'fast' to always skip job running
 	 * @since 1.26
 	 */
 	public function doPostOutputShutdown( $mode = 'normal' ) {
-		// Show profiling data if enabled
+		// Show visible profiling data if enabled (which cannot be post-send)
 		Profiler::instance()->logDataPageOutputOnly();
 
 		$that = $this;
 		$callback = function () use ( $that, $mode ) {
 			try {
-				// Assure deferred updates are not in the main transaction
-				wfGetLBFactory()->commitMasterChanges();
-				// Run jobs occasionally, if enabled
-				if ( $mode === 'normal' ) {
-					$that->triggerJobs();
-				}
-				// Do deferred updates and job insertion and final commit
-				$that->restInPeace();
+				$that->restInPeace( $mode );
 			} catch ( Exception $e ) {
 				MWExceptionHandler::handleException( $e );
 			}
 		};
 
+		// Defer everything else...
 		if ( function_exists( 'register_postsend_function' ) ) {
 			// https://github.com/facebook/hhvm/issues/1230
 			register_postsend_function( $callback );
@@ -687,8 +692,12 @@ class MediaWiki {
 
 	/**
 	 * Ends this task peacefully
+	 * @param string $mode Use 'fast' to always skip job running
 	 */
-	public function restInPeace() {
+	public function restInPeace( $mode = 'fast' ) {
+		// Assure deferred updates are not in the main transaction
+		wfGetLBFactory()->commitMasterChanges();
+
 		// Ignore things like master queries/connections on GET requests
 		// as long as they are in deferred updates (which catch errors).
 		Profiler::instance()->getTransactionProfiler()->resetExpectations();
@@ -699,6 +708,12 @@ class MediaWiki {
 		// Make sure any lazy jobs are pushed
 		JobQueueGroup::pushLazyJobs();
 
+		// Now that everything specific to this request is done,
+		// try to occasionally run jobs (if enabled) from the queues
+		if ( $mode === 'normal' ) {
+			$this->triggerJobs();
+		}
+
 		// Log profiling data, e.g. in the database or UDP
 		wfLogProfilingData();
 
diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 8d4720b610..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
@@ -2996,10 +2991,6 @@ class OutputPage extends ContextSource {
 		// Startup - this provides the client with the module manifest and loads jquery and mediawiki base modules
 		$links[] = $this->makeResourceLoaderLink( 'startup', ResourceLoaderModule::TYPE_SCRIPTS );
 
-		if ( $this->getConfig()->get( 'ResourceLoaderExperimentalAsyncLoading' ) ) {
-			$links[] = $this->getScriptsForBottomQueue();
-		}
-
 		return self::getHtmlFromLoaderLinks( $links );
 	}
 
@@ -3054,11 +3045,9 @@ class OutputPage extends ContextSource {
 	}
 
 	/**
-	 * JS stuff to put at the 'bottom', which can either be the bottom of the
-	 * "<body>" or the bottom of the "<head>" depending on
-	 * $wgResourceLoaderExperimentalAsyncLoading: modules marked with position
-	 * 'bottom', legacy scripts ($this->mScripts), user preferences, site JS
-	 * and user JS.
+	 * JS stuff to put at the 'bottom', which goes at the bottom of the `<body>`.
+	 * These are modules marked with position 'bottom', legacy scripts ($this->mScripts),
+	 * site JS, and user JS.
 	 *
 	 * @param bool $unused Previously used to let this method change its output based
 	 *  on whether it was called by getExternalHeadScripts() or getBottomScripts().
@@ -3142,10 +3131,6 @@ class OutputPage extends ContextSource {
 		// In case the skin wants to add bottom CSS
 		$this->getSkin()->setupSkinUserCss( $this );
 
-		if ( $this->getConfig()->get( 'ResourceLoaderExperimentalAsyncLoading' ) ) {
-			// Already handled by getExternalHeadScripts()
-			return '';
-		}
 		return $this->getScriptsForBottomQueue();
 	}
 
diff --git a/includes/Preferences.php b/includes/Preferences.php
index fbb7b510ef..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(
@@ -888,12 +892,6 @@ class Preferences {
 			'section' => 'rc/advancedrc',
 		);
 
-		$defaultPreferences['hidecategorization'] = array(
-			'type' => 'toggle',
-			'label-message' => 'tog-hidecategorization',
-			'section' => 'rc/advancedrc',
-		);
-
 		if ( $user->useRCPatrol() ) {
 			$defaultPreferences['hidepatrolled'] = array(
 				'type' => 'toggle',
@@ -1001,12 +999,6 @@ class Preferences {
 			'label-message' => 'tog-watchlisthideliu',
 		);
 
-		$defaultPreferences['watchlisthidecategorization'] = array(
-			'type' => 'toggle',
-			'section' => 'watchlist/advancedwatchlist',
-			'label-message' => 'tog-watchlisthidecategorization',
-		);
-
 		if ( $user->useRCPatrol() ) {
 			$defaultPreferences['watchlisthidepatrolled'] = array(
 				'type' => 'toggle',
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 e8f06c46b1..de63af7979 100644
--- a/includes/Sanitizer.php
+++ b/includes/Sanitizer.php
@@ -346,12 +346,9 @@ class Sanitizer {
 				  ($space*=$space*
 					(?:
 					 # The attribute value: quoted or alone
-					  \"([^<\"]*)\"
-					 | '([^<']*)'
+					  \"([^<\"]*)(?:\"|\$)
+					 | '([^<']*)(?:'|\$)
 					 |  ([a-zA-Z0-9!#$%&()*,\\-.\\/:;<>?@[\\]^_`{|}~]+)
-					 |  (\#[0-9a-fA-F]+) # Technically wrong, but lots of
-										 # colors are specified like this.
-										 # We'll be normalizing it.
 					)
 				)?(?=$space|\$)/sx";
 		}
@@ -457,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();
@@ -1264,10 +1259,7 @@ class Sanitizer {
 	 * @return string
 	 */
 	private static function getTagAttributeCallback( $set ) {
-		if ( isset( $set[6] ) ) {
-			# Illegal #XXXXXX color with no quotes.
-			return $set[6];
-		} elseif ( isset( $set[5] ) ) {
+		if ( isset( $set[5] ) ) {
 			# No quotes.
 			return $set[5];
 		} elseif ( isset( $set[4] ) ) {
@@ -1815,7 +1807,7 @@ class Sanitizer {
 			$host = preg_replace( $strip, '', $host );
 
 			// IPv6 host names are bracketed with [].  Url-decode these.
-			if ( substr_compare( "//%5B", $host, 0, 5 ) === 0 && preg_match( '!^//%5B(.*?)%5D((:\d+)?)$!', $host, $matches ) ) {
+			if ( substr_compare( "//%5B", $host, 0, 5 ) === 0 && preg_match( '!^//%5B([0-9A-Fa-f:.]+)%5D((:\d+)?)$!', $host, $matches ) ) {
 				$host = '//[' . $matches[1] . ']' . $matches[2];
 			}
 
diff --git a/includes/Setup.php b/includes/Setup.php
index 0c1e99df8d..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 ) {
@@ -477,6 +478,12 @@ if ( $wgMaximalPasswordLength !== false ) {
 	$wgPasswordPolicy['policies']['default']['MaximalPasswordLength'] = $wgMaximalPasswordLength;
 }
 
+// Backwards compatibility with deprecated alias
+// Must be before call to wfSetupSession()
+if ( $wgSessionsInMemcached ) {
+	$wgSessionsInObjectCache = true;
+}
+
 Profiler::instance()->scopedProfileOut( $ps_default );
 
 // Disable MWDebug for command line mode, this prevents MWDebug from eating up
@@ -515,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;
 }
 
@@ -529,6 +536,8 @@ if ( $wgSecureLogin && substr( $wgServer, 0, 2 ) !== '//' ) {
 		. 'HTTP or HTTPS. Disabling secure login.' );
 }
 
+$wgVirtualRestConfig['global']['domain'] = $wgCanonicalServer;
+
 // Now that GlobalFunctions is loaded, set defaults that depend on it.
 if ( $wgTmpDirectory === false ) {
 	$wgTmpDirectory = wfTempDir();
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/TemplateParser.php b/includes/TemplateParser.php
index f0a1ebb0c1..d6b101b26d 100644
--- a/includes/TemplateParser.php
+++ b/includes/TemplateParser.php
@@ -103,7 +103,7 @@ class TemplateParser {
 			// See if the compiled PHP code is stored in cache.
 			// CACHE_ACCEL throws an exception if no suitable object cache is present, so fall
 			// back to CACHE_ANYTHING.
-			$cache = ObjectCache::newAccelerator( array(), CACHE_ANYTHING );
+			$cache = ObjectCache::newAccelerator( CACHE_ANYTHING );
 			$key = wfMemcKey( 'template', $templateName, $fastHash );
 			$code = $this->forceRecompile ? null : $cache->get( $key );
 
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 fddceab31d..6df41ee073 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..b4b8be9b15 100644
--- a/includes/WebRequest.php
+++ b/includes/WebRequest.php
@@ -871,7 +871,7 @@ class WebRequest {
 	/**
 	 * Initialise the header list
 	 */
-	private function initHeaders() {
+	protected function initHeaders() {
 		if ( count( $this->headers ) ) {
 			return;
 		}
@@ -1325,11 +1325,10 @@ class FauxRequest extends WebRequest {
 	}
 
 	/**
-	 * @param string $method
-	 * @throws MWException
+	 * Initialise the header list
 	 */
-	private function notImplemented( $method ) {
-		throw new MWException( "{$method}() not implemented" );
+	protected function initHeaders() {
+		// Nothing to init
 	}
 
 	/**
@@ -1425,10 +1424,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/ApiFeedRecentChanges.php b/includes/api/ApiFeedRecentChanges.php
index 5adde875f1..d24112c7c8 100644
--- a/includes/api/ApiFeedRecentChanges.php
+++ b/includes/api/ApiFeedRecentChanges.php
@@ -155,7 +155,6 @@ class ApiFeedRecentChanges extends ApiBase {
 			'hideliu' => false,
 			'hidepatrolled' => false,
 			'hidemyself' => false,
-			'hidecategorization' => false,
 
 			'tagfilter' => array(
 				ApiBase::PARAM_TYPE => 'string',
diff --git a/includes/api/ApiFormatBase.php b/includes/api/ApiFormatBase.php
index 4d80163457..e522d709f1 100644
--- a/includes/api/ApiFormatBase.php
+++ b/includes/api/ApiFormatBase.php
@@ -182,7 +182,7 @@ abstract class ApiFormatBase extends ApiBase {
 			$out = new OutputPage( $context );
 			$context->setOutput( $out );
 
-			$out->addModules( 'mediawiki.apipretty' );
+			$out->addModuleStyles( 'mediawiki.apipretty' );
 			$out->setPageTitle( $context->msg( 'api-format-title' ) );
 
 			// When the format without suffix 'fm' is defined, there is a non-html version
@@ -387,10 +387,11 @@ abstract class ApiFormatBase extends ApiBase {
 	 * are required to ignore it or filter it out.
 	 *
 	 * @deprecated since 1.25
-	 * @return bool
+	 * @return bool Always true
 	 */
 	public function getNeedsRawData() {
-		return false;
+		wfDeprecated( __METHOD__, '1.25' );
+		return true;
 	}
 
 	/**@}*/
diff --git a/includes/api/ApiFormatFeedWrapper.php b/includes/api/ApiFormatFeedWrapper.php
index 00747eef59..d2bfd48d33 100644
--- a/includes/api/ApiFormatFeedWrapper.php
+++ b/includes/api/ApiFormatFeedWrapper.php
@@ -59,15 +59,6 @@ class ApiFormatFeedWrapper extends ApiFormatBase {
 		return null;
 	}
 
-	/**
-	 * Optimization - no need to sanitize data that will not be needed
-	 *
-	 * @return bool
-	 */
-	public function getNeedsRawData() {
-		return true;
-	}
-
 	/**
 	 * ChannelFeed doesn't give us a method to print errors in a friendly
 	 * manner, so just punt errors to the default printer.
diff --git a/includes/api/ApiFormatJson.php b/includes/api/ApiFormatJson.php
index 9538842466..be1b12c358 100644
--- a/includes/api/ApiFormatJson.php
+++ b/includes/api/ApiFormatJson.php
@@ -56,13 +56,6 @@ class ApiFormatJson extends ApiFormatBase {
 		return 'application/json';
 	}
 
-	/**
-	 * @deprecated since 1.25
-	 */
-	public function getNeedsRawData() {
-		return $this->isRaw;
-	}
-
 	/**
 	 * @deprecated since 1.25
 	 */
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/ApiFormatXml.php b/includes/api/ApiFormatXml.php
index 4be7d93df4..e8ad387bc3 100644
--- a/includes/api/ApiFormatXml.php
+++ b/includes/api/ApiFormatXml.php
@@ -39,13 +39,6 @@ class ApiFormatXml extends ApiFormatBase {
 		return 'text/xml';
 	}
 
-	/**
-	 * @deprecated since 1.25
-	 */
-	public function getNeedsRawData() {
-		return true;
-	}
-
 	public function setRootElement( $rootElemName ) {
 		$this->mRootElemName = $rootElemName;
 	}
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 8ce505a0d7..d943c86b42 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
@@ -1063,10 +1203,6 @@ class ApiMain extends ApiBase {
 			// Create an appropriate printer
 			$this->mPrinter = $this->createPrinterByName( $params['format'] );
 		}
-
-		if ( $this->mPrinter->getNeedsRawData() ) {
-			$this->getResult()->setRawMode();
-		}
 	}
 
 	/**
@@ -1083,20 +1219,18 @@ class ApiMain extends ApiBase {
 			return;
 		}
 
+		if ( !$this->checkConditionalRequestHeaders( $module ) ) {
+			return;
+		}
+
 		if ( !$this->mInternalMode ) {
 			$this->setupExternalResponse( $module, $params );
 		}
 
 		$this->checkAsserts( $params );
 
-		$stats = $this->getContext()->getStats();
-		$statsPath = 'api.modules.' . strtr( $module->getModulePath(), '+', '.' );
-		$metric = $stats->increment( $statsPath );
-		$metric->setSampleRate( 0.001 );
-
 		// Execute
 		$module->execute();
-
 		Hooks::run( 'APIAfterExecute', array( &$module ) );
 
 		$this->reportUnusedParams();
diff --git a/includes/api/ApiOptions.php b/includes/api/ApiOptions.php
index 436f22aee5..a62bcb6d56 100644
--- a/includes/api/ApiOptions.php
+++ b/includes/api/ApiOptions.php
@@ -52,6 +52,14 @@ class ApiOptions extends ApiBase {
 			$this->dieUsageMsg( array( 'missingparam', 'optionname' ) );
 		}
 
+		// Load the user from the master to reduce CAS errors on double post (T95839)
+		if ( wfGetLB()->getServerCount() > 1 ) {
+			$user = User::newFromId( $user->getId() );
+			if ( !$user->loadFromId( User::READ_LATEST ) ) {
+				$this->dieUsage( 'Anonymous users cannot change preferences', 'notloggedin' );
+			}
+		}
+
 		if ( $params['reset'] ) {
 			$user->resetOptions( $params['resetkinds'], $this->getContext() );
 			$changed = true;
diff --git a/includes/api/ApiPageSet.php b/includes/api/ApiPageSet.php
index d67b18420e..1415b794bd 100644
--- a/includes/api/ApiPageSet.php
+++ b/includes/api/ApiPageSet.php
@@ -66,6 +66,7 @@ class ApiPageSet extends ApiBase {
 	private $mInterwikiTitles = array();
 	/** @var Title[] */
 	private $mPendingRedirectIDs = array();
+	private $mResolvedRedirectTitles = array();
 	private $mConvertedTitles = array();
 	private $mGoodRevIDs = array();
 	private $mLiveRevIDs = array();
@@ -434,7 +435,7 @@ class ApiPageSet extends ApiBase {
 
 	/**
 	 * Get a list of redirect resolutions - maps a title to its redirect
-	 * target.
+	 * target. Includes generator data for redirect source when available.
 	 * @param ApiResult $result
 	 * @return array Array of prefixed_title (string) => Title object
 	 * @since 1.21
@@ -452,6 +453,15 @@ class ApiPageSet extends ApiBase {
 			if ( $titleTo->isExternal() ) {
 				$r['tointerwiki'] = $titleTo->getInterwiki();
 			}
+			if ( isset( $this->mResolvedRedirectTitles[$titleStrFrom] ) ) {
+				$titleFrom = $this->mResolvedRedirectTitles[$titleStrFrom];
+				$ns = $titleFrom->getNamespace();
+				$dbkey = $titleFrom->getDBkey();
+				if ( isset( $this->mGeneratorData[$ns][$dbkey] ) ) {
+					$r = array_merge( $this->mGeneratorData[$ns][$dbkey], $r );
+				}
+			}
+
 			$values[] = $r;
 		}
 		if ( !empty( $values ) && $result ) {
@@ -1030,6 +1040,7 @@ class ApiPageSet extends ApiBase {
 				$row->rd_fragment,
 				$row->rd_interwiki
 			);
+			$this->mResolvedRedirectTitles[$from] = $this->mPendingRedirectIDs[$rdfrom];
 			unset( $this->mPendingRedirectIDs[$rdfrom] );
 			if ( $to->isExternal() ) {
 				$this->mInterwikiTitles[$to->getPrefixedText()] = $to->getInterwiki();
@@ -1050,7 +1061,9 @@ class ApiPageSet extends ApiBase {
 					continue;
 				}
 				$lb->addObj( $rt );
-				$this->mRedirectTitles[$title->getPrefixedText()] = $rt;
+				$from = $title->getPrefixedText();
+				$this->mResolvedRedirectTitles[$from] = $title;
+				$this->mRedirectTitles[$from] = $rt;
 				unset( $this->mPendingRedirectIDs[$id] );
 			}
 		}
diff --git a/includes/api/ApiParse.php b/includes/api/ApiParse.php
index 1b8f6d94aa..cce8572344 100644
--- a/includes/api/ApiParse.php
+++ b/includes/api/ApiParse.php
@@ -169,9 +169,24 @@ class ApiParse extends ApiBase {
 
 				$popts = $this->makeParserOptions( $pageObj, $params );
 
-				// Potentially cached
-				$p_result = $this->getParsedContent( $pageObj, $popts, $pageid,
-					isset( $prop['wikitext'] ) );
+				// Don't pollute the parser cache when setting options that aren't
+				// in ParserOptions::optionsHash()
+				/// @todo: This should be handled closer to the actual cache instead of here, see T110269
+				$suppressCache =
+					$params['disablepp'] ||
+					$params['disablelimitreport'] ||
+					$params['preview'] ||
+					$params['sectionpreview'] ||
+					$params['disabletidy'];
+
+				if ( $suppressCache ) {
+					$this->content = $this->getContent( $pageObj, $pageid );
+					$p_result = $this->content->getParserOutput( $titleObj, null, $popts );
+				} else {
+					// Potentially cached
+					$p_result = $this->getParsedContent( $pageObj, $popts, $pageid,
+						isset( $prop['wikitext'] ) );
+				}
 			}
 		} else { // Not $oldid, $pageid, $page. Hence based on $text
 			$titleObj = Title::newFromText( $title );
@@ -464,10 +479,13 @@ class ApiParse extends ApiBase {
 	protected function makeParserOptions( WikiPage $pageObj, array $params ) {
 
 		$popts = $pageObj->makeParserOptions( $this->getContext() );
-		$popts->enableLimitReport( !$params['disablepp'] );
+		$popts->enableLimitReport( !$params['disablepp'] && !$params['disablelimitreport'] );
 		$popts->setIsPreview( $params['preview'] || $params['sectionpreview'] );
 		$popts->setIsSectionPreview( $params['sectionpreview'] );
 		$popts->setEditSection( !$params['disableeditsection'] );
+		if ( $params['disabletidy'] ) {
+			$popts->setTidy( false );
+		}
 
 		return $popts;
 	}
@@ -480,14 +498,9 @@ class ApiParse extends ApiBase {
 	 * @return ParserOutput
 	 */
 	private function getParsedContent( WikiPage $page, $popts, $pageId = null, $getWikitext = false ) {
-		$this->content = $page->getContent( Revision::RAW ); //XXX: really raw?
+		$this->content = $this->getContent( $page, $pageId );
 
 		if ( $this->section !== false && $this->content !== null ) {
-			$this->content = $this->getSectionContent(
-				$this->content,
-				!is_null( $pageId ) ? 'page id ' . $pageId : $page->getTitle()->getPrefixedText()
-			);
-
 			// Not cached (save or load)
 			return $this->content->getParserOutput( $page->getTitle(), null, $popts );
 		}
@@ -506,6 +519,27 @@ class ApiParse extends ApiBase {
 	}
 
 	/**
+	 * Get the content for the given page and the requested section.
+	 *
+	 * @param WikiPage $page
+	 * @param int $pageId
+	 * @return Content
+	 */
+	private function getContent( WikiPage $page, $pageId = null ) {
+		$content = $page->getContent( Revision::RAW ); //XXX: really raw?
+
+		if ( $this->section !== false && $content !== null ) {
+			$content = $this->getSectionContent(
+				$content,
+				!is_null( $pageId ) ? 'page id ' . $pageId : $page->getTitle()->getPrefixedText()
+			);
+		}
+		return $content;
+	}
+
+	/**
+	 * Extract the requested section from the given Content
+	 *
 	 * @param Content $content
 	 * @param string $what Identifies the content in error messages, e.g. page title.
 	 * @return Content|bool
@@ -762,8 +796,13 @@ class ApiParse extends ApiBase {
 			'sectiontitle' => array(
 				ApiBase::PARAM_TYPE => 'string',
 			),
-			'disablepp' => false,
+			'disablepp' => array(
+				ApiBase::PARAM_DFLT => false,
+				ApiBase::PARAM_DEPRECATED => true,
+			),
+			'disablelimitreport' => false,
 			'disableeditsection' => false,
+			'disabletidy' => false,
 			'generatexml' => array(
 				ApiBase::PARAM_DFLT => false,
 				ApiBase::PARAM_HELP_MSG => array(
diff --git a/includes/api/ApiQuery.php b/includes/api/ApiQuery.php
index 8959a46820..5378e9259f 100644
--- a/includes/api/ApiQuery.php
+++ b/includes/api/ApiQuery.php
@@ -276,7 +276,6 @@ class ApiQuery extends ApiBase {
 		}
 
 		$cacheMode = $this->mPageSet->getCacheMode();
-		$stats =  $this->getContext()->getStats();
 
 		// Execute all unfinished modules
 		/** @var $module ApiQueryBase */
@@ -284,11 +283,6 @@ class ApiQuery extends ApiBase {
 			$params = $module->extractRequestParams();
 			$cacheMode = $this->mergeCacheMode(
 				$cacheMode, $module->getCacheMode( $params ) );
-
-			$statsPath = 'api.modules.' . strtr( $module->getModulePath(), '+', '.' );
-			$metric = $stats->increment( $statsPath );
-			$metric->setSampleRate( 0.001 );
-
 			$module->execute();
 			Hooks::run( 'APIQueryAfterExecute', array( &$module ) );
 		}
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/ApiQueryAllPages.php b/includes/api/ApiQueryAllPages.php
index 0149ad2f7e..e441991af8 100644
--- a/includes/api/ApiQueryAllPages.php
+++ b/includes/api/ApiQueryAllPages.php
@@ -175,10 +175,14 @@ class ApiQueryAllPages extends ApiQueryGeneratorBase {
 			// 1999 rules works fine, but that breaks other DBs. Sigh.
 			/// @todo Once we drop support for 1992-rule DBs, we can simplify this.
 			$dbType = $db->getType();
-			if ( $dbType === 'mysql' || $dbType === 'sqlite' ||
-				$dbType === 'postgres' && $db->getServerVersion() >= 9.1
-			) {
-				// 1999 rules, or screw-the-rules
+			if ( $dbType === 'mysql' || $dbType === 'sqlite' ) {
+				// Ignore the rules, or 1999 rules if you count unique keys
+				// over non-NULL columns as satisfying the requirement for
+				// "functional dependency" and don't require including
+				// constant-in-WHERE columns in the GROUP BY.
+				$this->addOption( 'GROUP BY', array( 'page_title' ) );
+			} elseif ( $dbType === 'postgres' && $db->getServerVersion() >= 9.1 ) {
+				// 1999 rules only counting primary keys
 				$this->addOption( 'GROUP BY', array( 'page_title', 'page_id' ) );
 			} else {
 				// 1992 rules
diff --git a/includes/api/ApiQueryDeletedRevisions.php b/includes/api/ApiQueryDeletedRevisions.php
index 3a98478803..bf48b19496 100644
--- a/includes/api/ApiQueryDeletedRevisions.php
+++ b/includes/api/ApiQueryDeletedRevisions.php
@@ -234,8 +234,10 @@ class ApiQueryDeletedRevisions extends ApiQueryRevisionsBase {
 					}
 				}
 				if ( !isset( $pageMap[$row->ar_namespace][$row->ar_title] ) ) {
-					ApiBase::dieDebug( "Found row in archive (ar_id={$row->ar_id}) that didn't " .
-						"get processed by ApiPageSet" );
+					ApiBase::dieDebug(
+						__METHOD__,
+						"Found row in archive (ar_id={$row->ar_id}) that didn't get processed by ApiPageSet"
+					);
 				}
 
 				$fit = $this->addPageSubItem(
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/ApiQueryRecentChanges.php b/includes/api/ApiQueryRecentChanges.php
index b559144366..f579062983 100644
--- a/includes/api/ApiQueryRecentChanges.php
+++ b/includes/api/ApiQueryRecentChanges.php
@@ -668,9 +668,14 @@ class ApiQueryRecentChanges extends ApiQueryGeneratorBase {
 				ApiBase::PARAM_MAX2 => ApiBase::LIMIT_BIG2
 			),
 			'type' => array(
-				ApiBase::PARAM_DFLT => 'edit|new|log|categorize',
+				ApiBase::PARAM_DFLT => 'edit|new|log',
 				ApiBase::PARAM_ISMULTI => true,
-				ApiBase::PARAM_TYPE => RecentChange::getChangeTypes()
+				ApiBase::PARAM_TYPE => array(
+					'edit',
+					'external',
+					'new',
+					'log'
+				)
 			),
 			'toponly' => false,
 			'continue' => array(
diff --git a/includes/api/ApiQuerySearch.php b/includes/api/ApiQuerySearch.php
index 65fd727773..b866f43e09 100644
--- a/includes/api/ApiQuerySearch.php
+++ b/includes/api/ApiQuerySearch.php
@@ -82,6 +82,7 @@ class ApiQuerySearch extends ApiQueryGeneratorBase {
 			SearchEngine::create( $params['backend'] ) : SearchEngine::create();
 		$search->setLimitOffset( $limit + 1, $params['offset'] );
 		$search->setNamespaces( $params['namespace'] );
+		$search->setFeatureData( 'rewrite', (bool)$params['enablerewrites'] );
 
 		$query = $search->transformSearchTerm( $query );
 		$query = $search->replacePrefixes( $query );
@@ -134,6 +135,12 @@ class ApiQuerySearch extends ApiQueryGeneratorBase {
 				$apiResult->addValue( array( 'query', 'searchinfo' ),
 					'suggestionsnippet', $matches->getSuggestionSnippet() );
 			}
+			if ( isset( $searchInfo['rewrittenquery'] ) && $matches->hasRewrittenQuery() ) {
+				$apiResult->addValue( array( 'query', 'searchinfo' ),
+					'rewrittenquery', $matches->getQueryAfterRewrite() );
+				$apiResult->addValue( array( 'query', 'searchinfo' ),
+					'rewrittenquerysnippet', $matches->getQueryAfterRewriteSnippet() );
+			}
 		}
 
 		// Add the search results to the result
@@ -303,10 +310,11 @@ class ApiQuerySearch extends ApiQueryGeneratorBase {
 				)
 			),
 			'info' => array(
-				ApiBase::PARAM_DFLT => 'totalhits|suggestion',
+				ApiBase::PARAM_DFLT => 'totalhits|suggestion|rewrittenquery',
 				ApiBase::PARAM_TYPE => array(
 					'totalhits',
 					'suggestion',
+					'rewrittenquery',
 				),
 				ApiBase::PARAM_ISMULTI => true,
 			),
@@ -342,6 +350,7 @@ class ApiQuerySearch extends ApiQueryGeneratorBase {
 				ApiBase::PARAM_MAX2 => ApiBase::LIMIT_SML2
 			),
 			'interwiki' => false,
+			'enablerewrites' => false,
 		);
 
 		$alternatives = SearchEngine::getSearchTypes();
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/ApiQueryWatchlist.php b/includes/api/ApiQueryWatchlist.php
index 9d35a55233..648d25965d 100644
--- a/includes/api/ApiQueryWatchlist.php
+++ b/includes/api/ApiQueryWatchlist.php
@@ -483,9 +483,14 @@ class ApiQueryWatchlist extends ApiQueryGeneratorBase {
 				)
 			),
 			'type' => array(
-				ApiBase::PARAM_DFLT => 'edit|new|log|categorize',
+				ApiBase::PARAM_DFLT => 'edit|new|log',
 				ApiBase::PARAM_ISMULTI => true,
-				ApiBase::PARAM_TYPE => RecentChange::getChangeTypes()
+				ApiBase::PARAM_TYPE => array(
+					'edit',
+					'external',
+					'new',
+					'log',
+				)
 			),
 			'owner' => array(
 				ApiBase::PARAM_TYPE => 'user'
diff --git a/includes/api/ApiResult.php b/includes/api/ApiResult.php
index f0c7430140..cd4165b603 100644
--- a/includes/api/ApiResult.php
+++ b/includes/api/ApiResult.php
@@ -108,12 +108,24 @@ class ApiResult implements ApiSerializable {
 	const META_TYPE = '_type';
 
 	/**
-	 * Key (rather than "name" or other default) for when META_TYPE is 'kvp' or
-	 * 'BCkvp'. Value is string.
+	 * Key for the metadata item whose value specifies the name used for the
+	 * kvp key in the alternative output format with META_TYPE 'kvp' or
+	 * 'BCkvp', i.e. the "name" in <container><item name="key">value</item></container>.
+	 * Value is string.
 	 * @since 1.25
 	 */
 	const META_KVP_KEY_NAME = '_kvpkeyname';
 
+	/**
+	 * Key for the metadata item that indicates that the KVP key should be
+	 * added into an assoc value, i.e. {"key":{"val1":"a","val2":"b"}}
+	 * transforms to {"name":"key","val1":"a","val2":"b"} rather than
+	 * {"name":"key","value":{"val1":"a","val2":"b"}}.
+	 * Value is boolean.
+	 * @since 1.26
+	 */
+	const META_KVP_MERGE = '_kvpmerge';
+
 	/**
 	 * Key for the 'BC bools' metadata item. Value is string[].
 	 * Note no setter is provided.
@@ -132,7 +144,7 @@ class ApiResult implements ApiSerializable {
 	private $errorFormatter;
 
 	// Deprecated fields
-	private $isRawMode, $checkingSize, $mainForContinuation;
+	private $checkingSize, $mainForContinuation;
 
 	/**
 	 * @param int|bool $maxSize Maximum result "size", or false for no limit
@@ -147,7 +159,6 @@ class ApiResult implements ApiSerializable {
 		}
 
 		$this->maxSize = $maxSize;
-		$this->isRawMode = false;
 		$this->checkingSize = true;
 		$this->reset();
 	}
@@ -276,7 +287,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 );
 		}
 
@@ -390,6 +401,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()
@@ -941,19 +957,43 @@ class ApiResult implements ApiSerializable {
 						: $transformTypes['ArmorKVP'];
 					$valKey = isset( $transforms['BC'] ) ? '*' : 'value';
 					$assocAsObject = !empty( $transformTypes['AssocAsObject'] );
+					$merge = !empty( $metadata[self::META_KVP_MERGE] );
 
 					$ret = array();
 					foreach ( $data as $k => $v ) {
-						$item = array(
-							$key => $k,
-							$valKey => $v,
-						);
-						if ( $strip === 'none' ) {
-							$item += array(
-								self::META_PRESERVE_KEYS => array( $key ),
-								self::META_CONTENT => $valKey,
-								self::META_TYPE => 'assoc',
+						if ( $merge && ( is_array( $v ) || is_object( $v ) ) ) {
+							$vArr = (array)$v;
+							if ( isset( $vArr[self::META_TYPE] ) ) {
+								$mergeType = $vArr[self::META_TYPE];
+							} elseif ( is_object( $v ) ) {
+								$mergeType = 'assoc';
+							} else {
+								$keys = array_keys( $vArr );
+								sort( $keys, SORT_NUMERIC );
+								$mergeType = ( $keys === array_keys( $keys ) ) ? 'array' : 'assoc';
+							}
+						} else {
+							$mergeType = 'n/a';
+						}
+						if ( $mergeType === 'assoc' ) {
+							$item = $vArr + array(
+								$key => $k,
+							);
+							if ( $strip === 'none' ) {
+								self::setPreserveKeysList( $item, array( $key ) );
+							}
+						} else {
+							$item = array(
+								$key => $k,
+								$valKey => $v,
 							);
+							if ( $strip === 'none' ) {
+								$item += array(
+									self::META_PRESERVE_KEYS => array( $key ),
+									self::META_CONTENT => $valKey,
+									self::META_TYPE => 'assoc',
+								);
+							}
 						}
 						$ret[] = $assocAsObject ? (object)$item : $item;
 					}
@@ -1043,14 +1083,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 );
@@ -1166,27 +1204,23 @@ class ApiResult implements ApiSerializable {
 	 */
 
 	/**
-	 * Call this function when special elements such as '_element'
-	 * are needed by the formatter, for example in XML printing.
+	 * Formerly used to enable/disable "raw mode".
 	 * @deprecated since 1.25, you shouldn't have been using it in the first place
 	 * @since 1.23 $flag parameter added
 	 * @param bool $flag Set the raw mode flag to this state
 	 */
 	public function setRawMode( $flag = true ) {
-		// Can't wfDeprecated() here, since we need to set this flag from
-		// ApiMain for BC with stuff using self::getIsRawMode as
-		// "self::getIsXMLMode".
-		$this->isRawMode = $flag;
+		wfDeprecated( __METHOD__, '1.25' );
 	}
 
 	/**
-	 * Returns true whether the formatter requested raw data.
+	 * Returns true, the equivalent of "raw mode" is always enabled now
 	 * @deprecated since 1.25, you shouldn't have been using it in the first place
 	 * @return bool
 	 */
 	public function getIsRawMode() {
-		/// @todo: After Wikibase stops calling this, warn
-		return $this->isRawMode;
+		wfDeprecated( __METHOD__, '1.25' );
+		return true;
 	}
 
 	/**
@@ -1199,7 +1233,7 @@ class ApiResult implements ApiSerializable {
 		return $this->getResultData( null, array(
 			'BC' => array(),
 			'Types' => array(),
-			'Strip' => $this->isRawMode ? 'bc' : 'all',
+			'Strip' => 'all',
 		) );
 	}
 
@@ -1238,7 +1272,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 );
 	}
 
 	/**
@@ -1452,7 +1486,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/ApiRevisionDelete.php b/includes/api/ApiRevisionDelete.php
index bb5c145140..7d89b690b9 100644
--- a/includes/api/ApiRevisionDelete.php
+++ b/includes/api/ApiRevisionDelete.php
@@ -139,10 +139,8 @@ class ApiRevisionDelete extends ApiBase {
 		if ( !$messages ) {
 			return array();
 		}
-		$result = $this->getResult();
 		$ret = array();
 		foreach ( $messages as $m ) {
-			$message = array();
 			if ( $m['message'] instanceof Message ) {
 				$msg = $m['message'];
 				$message = array( 'message' => $msg->getKey() );
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 2cb68c7a11..98e1c10586 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]].",
@@ -295,7 +296,7 @@
 	"apihelp-query+allcategories-param-limit": "Wie viele Kategorien zurückgegeben werden sollen.",
 	"apihelp-query+allcategories-param-prop": "Zurückzugebende Eigenschaften:",
 	"apihelp-query+allcategories-paramvalue-prop-size": "Ergänzt die Anzahl der Einträge in der Antwort.",
-	"apihelp-query+allcategories-paramvalue-prop-hidden": "Markiert über _&#95;HIDDENCAT_&#95; versteckte Kategorien.",
+	"apihelp-query+allcategories-paramvalue-prop-hidden": "Markiert über <code>_&#95;HIDDENCAT_&#95;</code> versteckte Kategorien.",
 	"apihelp-query+allcategories-example-size": "Listet Kategorien mit der Anzahl ihrer Einträge auf.",
 	"apihelp-query+allcategories-example-generator": "Bezieht Informationen über die Kategorieseite selbst für Kategorien, die mit <kbd>List</kbd> beginnen.",
 	"apihelp-query+alldeletedrevisions-description": "Bezieht alle gelöschten Versionen eines Benutzers oder eines Namensraumes.",
@@ -312,6 +313,8 @@
 	"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-paramvalue-prop-title": "Ergänzt den Titel der Datei.",
 	"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 +387,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 +400,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 +473,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/el.json b/includes/api/i18n/el.json
index 867f594335..281dd29843 100644
--- a/includes/api/i18n/el.json
+++ b/includes/api/i18n/el.json
@@ -2,15 +2,25 @@
 	"@metadata": {
 		"authors": [
 			"Glavkos",
-			"Protnet"
+			"Protnet",
+			"Stam.nikos"
 		]
 	},
+	"apihelp-main-description": "<div class=\"hlist plainlinks api-main-links\">\n* [[mw:API:Main_page|Τεκμηρίωση]]\n* [[mw:API:FAQ|Συχνές ερωτήσεις]]\n* [https://lists.wikimedia.org/mailman/listinfo/mediawiki-api Λίστα αλληλογραφίας]\n* [https://lists.wikimedia.org/mailman/listinfo/mediawiki-api-announce Ανακοινώσεις API]\n* [https://phabricator.wikimedia.org/maniphest/query/GebfyV4uCaLd/#R Σφάλματα & αιτήματα]\n</div>\n<strong>Κατάσταση:</strong> Όλα τα χαρακτηριστικά που εμφανίζονται σε αυτή τη σελίδα πρέπει να λειτουργούν, αλλά το API είναι ακόμα σε ενεργό ανάπτυξη, και μπορεί να αλλάξει ανά πάσα στιγμή. Εγγραφείτε στη [https://lists.wikimedia.org/pipermail/mediawiki-api-announce/ the mediawiki-api-announce λίστα αλληλογραφίας] για να ειδοποιείστε για ενημερώσεις.\n\n<strong>Εσφαλμένα αιτήματα:</strong> Όταν στέλνονται εσφαλμένα αιτήματα στο API, επιστρέφεται μία κεφαλίδα HTTP (header) με το κλειδί \"MediaWiki-API-Error\" κι έπειτα η τιμή της κεφαλίδας και ο κωδικός σφάλματος που επιστρέφονται ορίζονται στην ίδια τιμή. Για περισσότερες πληροφορίες, δείτε [[mw:API:Errors_and_warnings|API: Σφάλματα και προειδοποιήσεις]].",
+	"apihelp-main-param-action": "Ποια ενέργει να εκτελεστεί.",
 	"apihelp-main-param-format": "Η μορφή των δεδομένων εξόδου.",
+	"apihelp-main-param-curtimestamp": "Συμπερίληψη της τρέχουσας χρονοσφραγίδας στο αποτέλεσμα.",
+	"apihelp-main-param-uselang": "Γλώσσα για τις μεταφράσεις μηνυμάτων. Μία λίστα κωδικών μπορεί να αντληθεί από το <kbd>[[Special:ApiHelp/query+siteinfo|action=query&meta=siteinfo]]</kbd> με το <kbd>siprop=languages</kbd>, ή καθορίστε <kbd>user</kbd> για να χρησιμοποιήσετε την προτίμηση γλώσσας του τρέχοντα χρήστη, ή καθορίστε <kbd>content</kbd> για να χρησιμοποιήσετε τη γλώσσα περιεχομένου αυτού του wiki.",
 	"apihelp-block-description": "Φραγή χρήστη",
 	"apihelp-block-param-user": "Όνομα χρήστη, διεύθυνση IP ή εύρος διευθύνσεων IP που θέλετε να επιβάλετε φραγή.",
+	"apihelp-block-param-expiry": "Ώρα λήξης. Μπορεί να είναι σχετική (π.χ. <kbd>σε 5 μήνες</kbd> ή <kbd>σε 2 εβδομάδες</kbd>) ή απόλυτη (π.χ. <kbd>2014-09-18T12:34:56Z</kbd>). Αν οριστεί σε <kbd>άπειρη</kbd>, <kbd>απεριόριστη</kbd>, ή <kbd>ποτέ</kbd>, ο αποκλεισμός δεν θα λήξει ποτέ.",
 	"apihelp-block-param-reason": "Λόγος φραγής.",
+	"apihelp-block-param-anononly": "Αποκλείστε ανώνυμους χρήστες μόνο (δηλ. απενεργοποιήστε ανώνυμες επεξεργασίες για αυτή τη διεύθυνση IP).",
 	"apihelp-block-param-nocreate": "Αποτροπή δημιουργίας λογαριασμού.",
+	"apihelp-block-param-autoblock": "Αποκλείστε αυτόματα την τελευταία χρησιμοποιημένη διεύθυνση IP και κάθε συνακόλουθη διεύθυνση IP από την οποία γίνεται προσπάθεια σύνδεσης.",
+	"apihelp-createaccount-description": "Δημιουργήστε νέο λογαριασμό χρήστη.",
 	"apihelp-createaccount-param-name": "Όνομα χρήστη.",
+	"apihelp-createaccount-param-password": "Κωδικός πρόσβασης (αγνοείται, αν έχει οριστεί το <var>$1mailpassword</var>).",
 	"apihelp-createaccount-param-email": "Διεύθυνση ηλεκτρονικού ταχυδρομείου χρήστη (προαιρετικό).",
 	"apihelp-createaccount-param-realname": "Πραγματικό όνομα χρήστη (προαιρετικό).",
 	"apihelp-createaccount-param-mailpassword": "Εάν οριστεί σε οποιαδήποτε τιμή, ένας τυχαίος κωδικός πρόσβασης θα αποσταλεί μέσω ηλεκτρονικού ταχυδρομείου στο χρήστη.",
@@ -79,5 +89,9 @@
 	"apihelp-options-example-reset": "Επαναφορά όλων των προτιμήσεων.",
 	"apihelp-paraminfo-param-helpformat": "Μορφή των συμβολοσειρών βοήθειας.",
 	"apihelp-patrol-example-revid": "Περιπολία αναθεώρησης.",
-	"apihelp-protect-example-protect": "Προστασία σελίδας."
+	"apihelp-protect-example-protect": "Προστασία σελίδας.",
+	"apihelp-query+users-paramvalue-prop-gender": "Επισημαίνει το φύλο του χρήστη. Επιστρέφει «αρσενικό», «θηλυκό» ή «άγνωστο»",
+	"api-help-param-type-limit": "Τύπος: ακέραιος ή <kbd>max</kbd>",
+	"api-help-param-type-boolean": "Τύπος: boolean ([[Special:ApiHelp/main#main/datatypes|λεπτομέρειες]])",
+	"api-help-param-type-user": "Τύπος: {{PLURAL:$1|1=όνομα χρήστη|2=λίστα με ονόματα χρήστη}}"
 }
diff --git a/includes/api/i18n/en.json b/includes/api/i18n/en.json
index 49331c44a1..173598f589 100644
--- a/includes/api/i18n/en.json
+++ b/includes/api/i18n/en.json
@@ -162,7 +162,6 @@
 	"apihelp-feedrecentchanges-param-hideliu": "Hide changes made by registered users.",
 	"apihelp-feedrecentchanges-param-hidepatrolled": "Hide patrolled changes.",
 	"apihelp-feedrecentchanges-param-hidemyself": "Hide changes made by the current user.",
-	"apihelp-feedrecentchanges-param-hidecategorization": "Hide category membership changes.",
 	"apihelp-feedrecentchanges-param-tagfilter": "Filter by tag.",
 	"apihelp-feedrecentchanges-param-target": "Show only changes on pages linked from this page.",
 	"apihelp-feedrecentchanges-param-showlinkedto": "Show changes on pages linked to the selected page instead.",
@@ -303,16 +302,18 @@
 	"apihelp-parse-paramvalue-prop-iwlinks": "Gives interwiki links in the parsed wikitext.",
 	"apihelp-parse-paramvalue-prop-wikitext": "Gives the original wikitext that was parsed.",
 	"apihelp-parse-paramvalue-prop-properties": "Gives various properties defined in the parsed wikitext.",
-	"apihelp-parse-paramvalue-prop-limitreportdata": "Gives the limit report in a structured way. Gives no data, when <var>$1disablepp</var> is set.",
-	"apihelp-parse-paramvalue-prop-limitreporthtml": "Gives the HTML version of the limit report. Gives no data, when <var>$1disablepp</var> is set.",
+	"apihelp-parse-paramvalue-prop-limitreportdata": "Gives the limit report in a structured way. Gives no data, when <var>$1disablelimitreport</var> is set.",
+	"apihelp-parse-paramvalue-prop-limitreporthtml": "Gives the HTML version of the limit report. Gives no data, when <var>$1disablelimitreport</var> is set.",
 	"apihelp-parse-paramvalue-prop-parsetree": "The XML parse tree of revision content (requires content model <code>$1</code>)",
 	"apihelp-parse-param-pst": "Do a pre-save transform on the input before parsing it. Only valid when used with text.",
 	"apihelp-parse-param-onlypst": "Do a pre-save transform (PST) on the input, but don't parse it. Returns the same wikitext, after a PST has been applied. Only valid when used with <var>$1text</var>.",
 	"apihelp-parse-param-effectivelanglinks": "Includes language links supplied by extensions (for use with <kbd>$1prop=langlinks</kbd>).",
 	"apihelp-parse-param-section": "Only retrieve the content of this section number or when <kbd>new</kbd> generate a new section.\n\n<kbd>new</kbd> section is only honored when specifying <var>text</var>.",
 	"apihelp-parse-param-sectiontitle": "New section title when <var>section</var> is <kbd>new</kbd>.\n\nUnlike page editing, this does not fall back to <var>summary</var> when omitted or empty.",
-	"apihelp-parse-param-disablepp": "Omit the preprocessor report (\"NewPP limit report\") from the parser output.",
+	"apihelp-parse-param-disablelimitreport": "Omit the limit report (\"NewPP limit report\") from the parser output.",
+	"apihelp-parse-param-disablepp": "Use <var>$1disablelimitreport</var> instead.",
 	"apihelp-parse-param-disableeditsection": "Omit edit section links from the parser output.",
+	"apihelp-parse-param-disabletidy": "Do not run HTML cleanup (e.g. tidy) on the parser output.",
 	"apihelp-parse-param-generatexml": "Generate XML parse tree (requires content model <code>$1</code>; replaced by <kbd>$2prop=parsetree</kbd>).",
 	"apihelp-parse-param-preview": "Parse in preview mode.",
 	"apihelp-parse-param-sectionpreview": "Parse in section preview mode (enables preview mode too).",
@@ -724,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.",
@@ -868,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.",
@@ -927,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.",
 
@@ -1037,6 +1039,7 @@
 	"apihelp-query+search-param-limit": "How many total pages to return.",
 	"apihelp-query+search-param-interwiki": "Include interwiki results in the search, if available.",
 	"apihelp-query+search-param-backend": "Which search backend to use, if not the default.",
+	"apihelp-query+search-param-enablerewrites": "Enable internal query rewriting. Some search backends can rewrite the query into one its thinks gives better results, such as correcting spelling errors.",
 	"apihelp-query+search-example-simple": "Search for <kbd>meaning</kbd>.",
 	"apihelp-query+search-example-text": "Search texts for <kbd>meaning</kbd>.",
 	"apihelp-query+search-example-generator": "Get page info about the pages returned for a search for <kbd>meaning</kbd>.",
@@ -1196,7 +1199,7 @@
 	"apihelp-query+watchlist-paramvalue-prop-notificationtimestamp": "Adds timestamp of when the user was last notified about the edit.",
 	"apihelp-query+watchlist-paramvalue-prop-loginfo": "Adds log information where appropriate.",
 	"apihelp-query+watchlist-param-show": "Show only items that meet these criteria. For example, to see only minor edits done by logged-in users, set $1show=minor|!anon.",
-	"apihelp-query+watchlist-param-type": "Which types of changes to show:\n;edit:Regular page edits.\n;external:External changes.\n;new:Page creations.\n;log:Log entries.\n;categorize:Category membership changes.",
+	"apihelp-query+watchlist-param-type": "Which types of changes to show:\n;edit:Regular page edits.\n;external:External changes.\n;new:Page creations.\n;log:Log entries.",
 	"apihelp-query+watchlist-param-owner": "Used along with $1token to access a different user's watchlist.",
 	"apihelp-query+watchlist-param-token": "A security token (available in the user's [[Special:Preferences#mw-prefsection-watchlist|preferences]]) to allow access to another user's watchlist.",
 	"apihelp-query+watchlist-example-simple": "List the top revision for recently changed pages on the current user's watchlist.",
@@ -1391,7 +1394,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.",
@@ -1416,5 +1419,5 @@
 	"api-help-right-apihighlimits": "Use higher limits in API queries (slow queries: $1; fast queries: $2). The limits for slow queries also apply to multivalue parameters.",
 
 	"api-credits-header": "Credits",
-	"api-credits": "API developers:\n* Roan Kattouw (lead developer Sep 2007–2009)\n* Victor Vasiliev\n* Bryan Tong Minh\n* Sam Reed\n* Yuri Astrakhan (creator, lead developer Sep 2006–Sep 2007)\n* Brad Jorsch (lead developer 2013–present)\n\nPlease send your comments, suggestions and questions to mediawiki-api@lists.wikimedia.org\nor file a bug report at https://phabricator.wikimedia.org/."
+	"api-credits": "API developers:\n* Yuri Astrakhan (creator, lead developer Sep 2006–Sep 2007)\n* Roan Kattouw (lead developer Sep 2007–2009)\n* Victor Vasiliev\n* Bryan Tong Minh\n* Sam Reed\n* Brad Jorsch (lead developer 2013–present)\n\nPlease send your comments, suggestions and questions to mediawiki-api@lists.wikimedia.org\nor file a bug report at https://phabricator.wikimedia.org/."
 }
diff --git a/includes/api/i18n/es.json b/includes/api/i18n/es.json
index e1af4054a3..06478f68a8 100644
--- a/includes/api/i18n/es.json
+++ b/includes/api/i18n/es.json
@@ -141,9 +141,8 @@
 	"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-hidecategorization": "Ocultar los cambios de pertenencia a categorías.",
 	"apihelp-feedrecentchanges-param-tagfilter": "Filtrar por etiquetas.",
 	"apihelp-feedrecentchanges-param-target": "Mostrar solo los cambios en las páginas enlazadas en esta.",
 	"apihelp-feedrecentchanges-param-showlinkedto": "Mostrar los cambios en páginas enlazadas con la página seleccionada.",
@@ -264,9 +263,10 @@
 	"apihelp-parse-paramvalue-prop-iwlinks": "Da los enlaces interwiki del texto analizado.",
 	"apihelp-parse-paramvalue-prop-wikitext": "Da el wikitexto original que se había analizado.",
 	"apihelp-parse-paramvalue-prop-properties": "Da varias propiedades definidas en el wikitexto analizado.",
-	"apihelp-parse-paramvalue-prop-limitreportdata": "Da el informe del límite de forma estructurada. No da datos si <var>$1disablepp</var> está establecido.",
-	"apihelp-parse-paramvalue-prop-limitreporthtml": "Da la versión HTML del informe del límite. No da datos si <var>$1disablepp</var> está establecido.",
+	"apihelp-parse-paramvalue-prop-limitreportdata": "Da el informe del límite de forma estructurada. No da datos si <var>$1disablelimitreport</var> está establecido.",
+	"apihelp-parse-paramvalue-prop-limitreporthtml": "Da la versión HTML del informe del límite. No da datos si <var>$1disablelimitreport</var> está establecido.",
 	"apihelp-parse-param-effectivelanglinks": "Incluye enlaces de idiomas proporcionados por las extensiones (para utilizar con <kbd>$1prop=langlinks</kbd>).",
+	"apihelp-parse-param-disablepp": "Usa <var>$1disablelimitreport</var> en su lugar.",
 	"apihelp-parse-param-preview": "Analizar en modo de vista previa.",
 	"apihelp-parse-param-sectionpreview": "Analizar sección en modo de vista previa (activa el modo de vista previa).",
 	"apihelp-parse-param-disabletoc": "Omitir la tabla de contenidos en la salida.",
@@ -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.",
@@ -304,8 +305,8 @@
 	"apihelp-query+allcategories-param-max": "Devolver solo categorías con como mucho este número de miembros.",
 	"apihelp-query+allcategories-param-limit": "Cuántas categorías se devolverán.",
 	"apihelp-query+allcategories-param-prop": "Qué propiedades se obtendrán:",
-	"apihelp-query+allcategories-paramvalue-prop-size": "Añade el número de páginas en la categorías.",
-	"apihelp-query+allcategories-paramvalue-prop-hidden": "Etiqueta las categorías que están ocultas con _&#95;HIDDENCAT_&#95;.",
+	"apihelp-query+allcategories-paramvalue-prop-size": "Añade el número de páginas en la categoría.",
+	"apihelp-query+allcategories-paramvalue-prop-hidden": "Etiqueta las categorías que están ocultas con <code>_&#95;HIDDENCAT_&#95;</code>.",
 	"apihelp-query+allcategories-example-size": "Lista las categorías con información sobre el número de páginas de cada una.",
 	"apihelp-query+alldeletedrevisions-description": "Listar todas las revisiones eliminadas por un usuario o en un espacio de nombres.",
 	"apihelp-query+alldeletedrevisions-paraminfo-useronly": "Solo puede usarse con <var>$3user</var>.",
@@ -325,6 +326,8 @@
 	"apihelp-query+allfileusages-param-from": "El título del archivo para comenzar la enumeración.",
 	"apihelp-query+allfileusages-param-to": "El título del archivo para detener la enumeración.",
 	"apihelp-query+allfileusages-param-prefix": "Buscar todos los títulos de los archivos que comiencen con este valor.",
+	"apihelp-query+allfileusages-param-prop": "Qué piezas de información incluir:",
+	"apihelp-query+allfileusages-paramvalue-prop-title": "Agrega el título del archivo.",
 	"apihelp-query+allfileusages-param-limit": "Cuántos elementos en total se devolverán.",
 	"apihelp-query+allfileusages-param-dir": "La dirección en la que se listará.",
 	"apihelp-query+allfileusages-example-B": "Listar títulos de archivos, incluyendo los desaparecidos, con las ID de páginas a las que pertenecen, empezando por la <kbd>B</kbd>.",
@@ -350,6 +353,8 @@
 	"apihelp-query+alllinks-param-from": "El título del enlace para comenzar la enumeración.",
 	"apihelp-query+alllinks-param-to": "El título del enlace para detener la enumeración.",
 	"apihelp-query+alllinks-param-prefix": "Buscar todos los títulos vinculados que comiencen con este valor.",
+	"apihelp-query+alllinks-param-prop": "Qué piezas de información incluir:",
+	"apihelp-query+alllinks-paramvalue-prop-title": "Añade el título del enlace.",
 	"apihelp-query+alllinks-param-namespace": "El espacio de nombres que enumerar.",
 	"apihelp-query+alllinks-param-limit": "Cuántos elementos en total se devolverán.",
 	"apihelp-query+alllinks-example-unique-generator": "Obtiene todos los títulos enlazados, marcando los que falten.",
@@ -376,13 +381,20 @@
 	"apihelp-query+allpages-example-generator": "Mostrar información acerca de 4 páginas que empiecen por la letra <kbd>T</kbd>.",
 	"apihelp-query+allpages-example-generator-revisions": "Mostrar el contenido de las 2 primeras páginas que no redirijan y empiecen por <kbd>Re</kbd>.",
 	"apihelp-query+allredirects-param-prefix": "Buscar todas las páginas de destino que empiecen con este valor.",
+	"apihelp-query+allredirects-param-prop": "Qué piezas de información incluir:",
+	"apihelp-query+allredirects-paramvalue-prop-title": "Añade el título de la redirección.",
 	"apihelp-query+allredirects-param-limit": "Cuántos elementos se devolverán.",
 	"apihelp-query+alltransclusions-param-prefix": "Buscar todos los títulos transcluídos que comiencen con este valor.",
+	"apihelp-query+alltransclusions-param-prop": "Qué piezas de información incluir:",
 	"apihelp-query+alltransclusions-example-unique": "Listar títulos transcluidos de forma única.",
 	"apihelp-query+alltransclusions-example-unique-generator": "Obtiene todos los títulos transcluídos, marcando los que faltan.",
 	"apihelp-query+allusers-description": "Enumerar todos los usuarios registrados.",
 	"apihelp-query+allusers-param-prefix": "Buscar todos los usuarios que empiecen con este valor.",
 	"apihelp-query+allusers-param-group": "Incluir solo usuarios en los grupos dados.",
+	"apihelp-query+allusers-param-prop": "Qué piezas de información incluir:",
+	"apihelp-query+allusers-paramvalue-prop-blockinfo": "Añade información sobre un bloque actual al usuario.",
+	"apihelp-query+allusers-paramvalue-prop-groups": "Lista los grupos a los que el usuario pertenece. Esto utiliza más recursos del servidor y puede devolver menos resultados que el límite.",
+	"apihelp-query+allusers-paramvalue-prop-rights": "Lista los permisos que tiene el usuario.",
 	"apihelp-query+allusers-param-limit": "Cuántos nombres de usuario se devolverán.",
 	"apihelp-query+allusers-param-activeusers": "Solo listar usuarios activos en {{PLURAL:$1|el último día|los $1 últimos días}}.",
 	"apihelp-query+allusers-example-Y": "Listar usuarios que empiecen por <kbd>Y</kbd>.",
@@ -391,12 +403,19 @@
 	"apihelp-query+backlinks-example-simple": "Mostrar enlaces a la <kbd>Portada<kbd>.",
 	"apihelp-query+blocks-description": "Listar todos los usuarios y direcciones IP bloqueadas.",
 	"apihelp-query+blocks-param-users": "Lista de usuarios a buscar (opcional).",
+	"apihelp-query+blocks-param-prop": "Qué propiedades se obtendrán:",
+	"apihelp-query+blocks-paramvalue-prop-userid": "Añade el identificador del usuario bloqueado.",
+	"apihelp-query+blocks-paramvalue-prop-timestamp": "Añade la fecha y hora de cuando se aplicó el bloque.",
 	"apihelp-query+blocks-example-simple": "Listar bloques.",
+	"apihelp-query+categories-param-prop": "Qué propiedades adicionales obtener para cada categoría:",
 	"apihelp-query+categories-param-show": "Qué tipo de categorías mostrar.",
 	"apihelp-query+categories-param-limit": "Cuántas categorías se devolverán.",
 	"apihelp-query+categories-example-generator": "Obtener información acerca de todas las categorías utilizadas en la página <kbd>Albert Einstein</kbd>.",
 	"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.",
 	"apihelp-query+categorymembers-example-simple": "Obtener las primeras 10 páginas de la <kbd>Categoría:Física</kbd>",
@@ -425,14 +444,28 @@
 	"apihelp-query+embeddedin-param-filterredir": "Cómo filtrar las redirecciones.",
 	"apihelp-query+embeddedin-param-limit": "Cuántas páginas se devolverán.",
 	"apihelp-query+extlinks-param-limit": "Cuántos enlaces se devolverán.",
+	"apihelp-query+exturlusage-param-prop": "Qué piezas de información incluir:",
+	"apihelp-query+exturlusage-paramvalue-prop-ids": "Añade el identificado de la página.",
+	"apihelp-query+exturlusage-paramvalue-prop-title": "Agrega el título y el identificador del espacio de nombres de la página.",
 	"apihelp-query+exturlusage-param-protocol": "Protocolo del URL. Si está vacío y se establece <var>$1query</var>, el protocolo es <kbd>http</kbd>. Deja vacío esto y <var>$1query</var> para listar todos los enlaces externos.",
 	"apihelp-query+exturlusage-param-limit": "Cuántas páginas se devolverán.",
 	"apihelp-query+exturlusage-example-simple": "Mostrar páginas que enlacen con <kbd>http://www.mediawiki.org</kbd>.",
 	"apihelp-query+filearchive-param-from": "El título de imagen para comenzar la enumeración",
 	"apihelp-query+filearchive-param-to": "El título de imagen para detener la enumeración.",
 	"apihelp-query+filearchive-param-prefix": "Buscar todos los títulos de las imágenes que comiencen con este valor.",
+	"apihelp-query+filearchive-param-prop": "Qué información de imagen se obtendrá:",
+	"apihelp-query+filearchive-paramvalue-prop-size": "Agrega el tamaño de la imagen en bytes y la altura, la anchura y el número de páginas (si es aplicable).",
+	"apihelp-query+filearchive-paramvalue-prop-dimensions": "Alias del tamaño.",
+	"apihelp-query+filearchive-paramvalue-prop-description": "Añade la descripción de la versión de la imagen.",
+	"apihelp-query+filearchive-paramvalue-prop-parseddescription": "Analizar la descripción de la versión.",
+	"apihelp-query+filearchive-paramvalue-prop-mime": "Añade el MIME de la imagen.",
+	"apihelp-query+filearchive-paramvalue-prop-mediatype": "Añade el tipo multimedia de la imagen.",
+	"apihelp-query+filearchive-paramvalue-prop-archivename": "Añade el nombre de archivo de la versión archivada para las versiones que no son las últimas.",
 	"apihelp-query+filearchive-example-simple": "Mostrar una lista de todos los archivos eliminados.",
 	"apihelp-query+filerepoinfo-example-simple": "Obtener información acerca de los repositorios de archivos.",
+	"apihelp-query+fileusage-param-prop": "Qué propiedades se obtendrán:",
+	"apihelp-query+fileusage-paramvalue-prop-pageid": "Identificador de cada página.",
+	"apihelp-query+fileusage-paramvalue-prop-title": "Título de cada página.",
 	"apihelp-query+fileusage-param-limit": "Cuántos se devolverán.",
 	"apihelp-query+fileusage-example-simple": "Obtener una lista de páginas que utilicen [[:File:Example.jpg]].",
 	"apihelp-query+fileusage-example-generator": "Obtener información acerca de las páginas que utilicen [[:File:Example.jpg]].",
@@ -461,16 +494,36 @@
 	"apihelp-query+info-example-simple": "Obtener información acerca de la página <kbd>Main Page</kbd>.",
 	"apihelp-query+info-example-protection": "Obtén información general y protección acerca de la página <kb>Página principal</kbd>.",
 	"apihelp-query+iwbacklinks-param-limit": "Cuántas páginas se devolverán.",
+	"apihelp-query+iwbacklinks-param-prop": "Qué propiedades se obtendrán:",
 	"apihelp-query+iwbacklinks-example-simple": "Obtener las páginas enlazadas a [[wikibooks:Test]]",
+	"apihelp-query+iwlinks-param-prop": "Qué propiedades adicionales obtener para cada enlace interlingüe:",
+	"apihelp-query+iwlinks-paramvalue-prop-url": "Añade el URL completo.",
 	"apihelp-query+langbacklinks-param-lang": "Idioma del enlace de idioma.",
 	"apihelp-query+langbacklinks-param-limit": "Cuántas páginas en total se devolverán.",
+	"apihelp-query+langbacklinks-param-prop": "Qué propiedades se obtendrán:",
+	"apihelp-query+langbacklinks-paramvalue-prop-lllang": "Agrega el código de idioma del enlace de idioma.",
+	"apihelp-query+langbacklinks-paramvalue-prop-lltitle": "Añade el título del enlace de idioma.",
 	"apihelp-query+langbacklinks-example-simple": "Obtener las páginas enlazadas a [[:fr:Test]]",
 	"apihelp-query+langbacklinks-example-generator": "Obtener información acerca de las páginas enlazadas a [[:fr:Test]].",
+	"apihelp-query+langlinks-param-prop": "Qué propiedades adicionales obtener para cada enlace interlingüe:",
+	"apihelp-query+langlinks-paramvalue-prop-url": "Añade el URL completo.",
+	"apihelp-query+langlinks-paramvalue-prop-autonym": "Añade el nombre del idioma nativo.",
 	"apihelp-query+langlinks-param-lang": "Devolver solo enlaces de idioma con este código de idioma.",
 	"apihelp-query+links-param-limit": "Cuántos enlaces se devolverán.",
+	"apihelp-query+linkshere-param-prop": "Qué propiedades se obtendrán:",
+	"apihelp-query+linkshere-paramvalue-prop-pageid": "Identificador de cada página.",
+	"apihelp-query+linkshere-paramvalue-prop-title": "Título de cada página.",
+	"apihelp-query+linkshere-paramvalue-prop-redirect": "Indicar si la página es una redirección.",
 	"apihelp-query+linkshere-param-limit": "Cuántos se devolverán.",
 	"apihelp-query+linkshere-example-simple": "Obtener una lista de páginas que enlacen a la [[Main Page]].",
 	"apihelp-query+linkshere-example-generator": "Obtener información acerca de las páginas enlazadas a la [[Main Page|Portada]].",
+	"apihelp-query+logevents-param-prop": "Qué propiedades se obtendrán:",
+	"apihelp-query+logevents-paramvalue-prop-ids": "Agrega el identificador del evento de registro.",
+	"apihelp-query+logevents-paramvalue-prop-type": "Añade el tipo del evento de registro.",
+	"apihelp-query+logevents-paramvalue-prop-parsedcomment": "Añade el comentario analizado del evento de registro.",
+	"apihelp-query+pageswithprop-param-prop": "Qué piezas de información incluir:",
+	"apihelp-query+pageswithprop-paramvalue-prop-ids": "Añade el identificador de página.",
+	"apihelp-query+pageswithprop-paramvalue-prop-title": "Agrega el título y el identificador del espacio de nombres de la página.",
 	"apihelp-query+pageswithprop-param-limit": "El máximo número de páginas que se devolverán.",
 	"apihelp-query+pageswithprop-example-simple": "Listar las 10 primeras páginas que utilicen <code>&#123;&#123;DISPLAYTITLE:&#125;&#125;</code>.",
 	"apihelp-query+pageswithprop-example-generator": "Obtener información adicional acerca de las 10 primeras páginas que utilicen <code>_&#95;NOTOC_&#95;</code>.",
@@ -482,6 +535,11 @@
 	"apihelp-query+protectedtitles-param-namespace": "Listar solo los títulos en estos espacios de nombres.",
 	"apihelp-query+protectedtitles-param-level": "Listar solo títulos con estos niveles de protección.",
 	"apihelp-query+protectedtitles-param-limit": "Cuántas páginas se devolverán.",
+	"apihelp-query+protectedtitles-param-prop": "Qué propiedades se obtendrán:",
+	"apihelp-query+protectedtitles-paramvalue-prop-user": "Agrega el usuario que agregó la protección.",
+	"apihelp-query+protectedtitles-paramvalue-prop-userid": "Agrega el identificador de usuario que agregó la protección.",
+	"apihelp-query+protectedtitles-paramvalue-prop-expiry": "Añade la fecha y hora de cuando se levantará la protección.",
+	"apihelp-query+protectedtitles-paramvalue-prop-level": "Agrega el nivel de protección.",
 	"apihelp-query+protectedtitles-example-simple": "Listar títulos protegidos.",
 	"apihelp-query+protectedtitles-example-generator": "Encuentra enlaces a títulos protegidos en el espacio de nombres principal.",
 	"apihelp-query+querypage-param-page": "El nombre de la página especial. Recuerda, es sensible a mayúsculas y minúsculas.",
@@ -493,10 +551,18 @@
 	"apihelp-query+recentchanges-param-user": "Listar solo los cambios de este usuario.",
 	"apihelp-query+recentchanges-param-excludeuser": "No listar cambios de este usuario.",
 	"apihelp-query+recentchanges-param-tag": "Listar solo los cambios con esta etiqueta.",
+	"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 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.",
 	"apihelp-query+recentchanges-example-simple": "Lista de cambios recientes.",
+	"apihelp-query+redirects-param-prop": "Qué propiedades se obtendrán:",
+	"apihelp-query+redirects-paramvalue-prop-pageid": "Identificador de página de cada redirección.",
+	"apihelp-query+redirects-paramvalue-prop-title": "Título de cada redirección.",
+	"apihelp-query+redirects-paramvalue-prop-fragment": "Fragmento de cada redirección, si los hubiere.",
 	"apihelp-query+redirects-param-limit": "Cuántas redirecciones se devolverán.",
 	"apihelp-query+redirects-example-simple": "Mostrar una lista de las redirecciones a la [[Main Page|Portada]]",
 	"apihelp-query+revisions-example-last5": "Mostrar las últimas 5 revisiones de la <kbd>Portada</kbd>.",
@@ -513,30 +579,83 @@
 	"apihelp-query+revisions+base-paramvalue-prop-content": "Texto de la revisión.",
 	"apihelp-query+revisions+base-paramvalue-prop-tags": "Etiquetas para la revisión.",
 	"apihelp-query+search-param-info": "Qué metadatos devolver.",
+	"apihelp-query+search-param-prop": "Qué propiedades se devolverán:",
+	"apihelp-query+search-paramvalue-prop-redirecttitle": "Añade el título de la redirección coincidente.",
+	"apihelp-query+search-paramvalue-prop-score": "<span class=\"apihelp-deprecated\">Desaconsejado e ignorado.</span>",
+	"apihelp-query+search-paramvalue-prop-hasrelated": "<span class=\"apihelp-deprecated\">Desaconsejado e ignorado.</span>",
 	"apihelp-query+search-param-limit": "Cuántas páginas en total se devolverán.",
 	"apihelp-query+search-param-interwiki": "Incluir resultados interwiki en la búsqueda, si es posible.",
 	"apihelp-query+search-example-simple": "Buscar <kbd>significado</kbd>.",
 	"apihelp-query+search-example-text": "Buscar <kbd>meaning</kbd> en los textos.",
 	"apihelp-query+search-example-generator": "Obtener información acerca de las páginas devueltas por una búsqueda de <kbd>meaning</kbd>.",
 	"apihelp-query+siteinfo-description": "Devolver información general acerca de la página web.",
+	"apihelp-query+siteinfo-param-prop": "Qué información se obtendrá:",
+	"apihelp-query+siteinfo-paramvalue-prop-general": "Información global del sistema.",
+	"apihelp-query+siteinfo-paramvalue-prop-namespaces": "Lista de espacios de nombres registrados y sus nombres canónicos.",
+	"apihelp-query+siteinfo-paramvalue-prop-namespacealiases": "Lista de alias registrados de espacios de nombres",
+	"apihelp-query+siteinfo-paramvalue-prop-specialpagealiases": "Lista de alias de páginas especiales.",
+	"apihelp-query+siteinfo-paramvalue-prop-magicwords": "Lista de palabras mágicas y sus alias.",
+	"apihelp-query+siteinfo-paramvalue-prop-statistics": "Devuelve las estadísticas del sitio.",
+	"apihelp-query+siteinfo-paramvalue-prop-interwikimap": "Devuelve el mapa interwiki (opcionalmente filtrado, opcionalmente localizado mediante el uso de <var>$1inlanguagecode</var>).",
+	"apihelp-query+siteinfo-paramvalue-prop-dbrepllag": "Devuelve el servidor de base de datos con el retraso de replicación más grande.",
+	"apihelp-query+siteinfo-paramvalue-prop-usergroups": "Devuelve los grupos de usuarios y los permisos asociados.",
+	"apihelp-query+siteinfo-paramvalue-prop-libraries": "Devuelve las bibliotecas instaladas en el wiki.",
+	"apihelp-query+siteinfo-paramvalue-prop-extensions": "Devuelve las extensiones instaladas en el wiki.",
+	"apihelp-query+siteinfo-paramvalue-prop-fileextensions": "Devuelve una lista de extensiones de archivo permitidas para cargadarse.",
+	"apihelp-query+siteinfo-paramvalue-prop-rightsinfo": "Devuelve información de permisos (licencia) del wiki, si está disponible.",
+	"apihelp-query+siteinfo-paramvalue-prop-restrictions": "Devuelve información sobre tipos de restricciones (protección) disponible.",
+	"apihelp-query+siteinfo-paramvalue-prop-languages": "Devuelve una lista de los idiomas que admite MediaWiki (opcionalmente localizada mediante el uso de <var>$1inlanguagecode</var>).",
+	"apihelp-query+siteinfo-paramvalue-prop-skins": "Devuelve una lista de todos las apariencias habilitadas (opcionalmente localizada mediante el uso de <var>$1inlanguagecode</var>, de lo contrario en el idioma del contenido).",
+	"apihelp-query+siteinfo-paramvalue-prop-variables": "Devuelve una lista de identificadores variables.",
+	"apihelp-query+siteinfo-paramvalue-prop-protocols": "Devuelve una lista de los protocolos que se permiten en los enlaces externos.",
+	"apihelp-query+siteinfo-paramvalue-prop-defaultoptions": "Devuelve los valores predeterminados de las preferencias del usuario.",
 	"apihelp-query+siteinfo-example-simple": "Obtener información del sitio.",
 	"apihelp-query+stashimageinfo-description": "Devuelve información del archivo para archivos escondidos.",
 	"apihelp-query+stashimageinfo-param-sessionkey": "Alias de $1filekey, para retrocompatibilidad.",
 	"apihelp-query+stashimageinfo-example-simple": "Devuelve información para un archivo escondido.",
 	"apihelp-query+stashimageinfo-example-params": "Devuelve las miniaturas de dos archivos escondidos.",
 	"apihelp-query+tags-param-limit": "El número máximo de etiquetas para enumerar.",
+	"apihelp-query+tags-param-prop": "Qué propiedades se obtendrán:",
+	"apihelp-query+tags-paramvalue-prop-displayname": "Agrega el mensaje de sistema para la etiqueta.",
+	"apihelp-query+tags-paramvalue-prop-source": "Obtiene las fuentes de la etiqueta, que pueden incluir <samp>extension</samp> para etiquetas definidas por extensiones y <samp>manual</samp> para etiquetas que pueden aplicarse manualmente por los usuarios.",
+	"apihelp-query+tags-paramvalue-prop-active": "Si la etiqueta aún se sigue aplicando.",
 	"apihelp-query+templates-description": "Devuelve todas las páginas transcluídas en las páginas dadas.",
 	"apihelp-query+templates-param-limit": "Cuántas plantillas se devolverán.",
 	"apihelp-query+transcludedin-description": "Encuentra todas las páginas que transcluyan las páginas dadas.",
+	"apihelp-query+transcludedin-param-prop": "Qué propiedades se obtendrán:",
+	"apihelp-query+transcludedin-paramvalue-prop-pageid": "Identificador de cada página.",
+	"apihelp-query+transcludedin-paramvalue-prop-title": "Título de cada página.",
+	"apihelp-query+transcludedin-param-namespace": "Incluir solo las páginas en estos espacios de nombres.",
 	"apihelp-query+transcludedin-param-limit": "Cuántos se devolverán.",
 	"apihelp-query+transcludedin-example-simple": "Obtener una lista de páginas transcluyendo <kbd>Main Page</kbd>.",
 	"apihelp-query+usercontribs-param-limit": "Número máximo de contribuciones que se devolverán.",
+	"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.",
+	"apihelp-query+userinfo-param-prop": "Qué piezas de información incluir:",
+	"apihelp-query+userinfo-paramvalue-prop-groups": "Lista todos los grupos al que pertenece el usuario actual.",
+	"apihelp-query+userinfo-paramvalue-prop-rights": "Lista todos los permisos que tiene el usuario actual.",
+	"apihelp-query+userinfo-paramvalue-prop-options": "Lista todas las preferencias que haya establecido el usuario actual.",
+	"apihelp-query+userinfo-paramvalue-prop-editcount": "Añade el número de ediciones del usuario actual.",
+	"apihelp-query+userinfo-paramvalue-prop-ratelimits": "Lista todos los límites de velocidad aplicados al usuario actual.",
+	"apihelp-query+userinfo-paramvalue-prop-realname": "Añade el nombre real del usuario.",
+	"apihelp-query+userinfo-paramvalue-prop-registrationdate": "Añade la fecha de registro del usuario.",
 	"apihelp-query+userinfo-example-simple": "Obtener información sobre el usuario actual.",
 	"apihelp-query+userinfo-example-data": "Obtener información adicional sobre el usuario actual.",
 	"apihelp-query+users-description": "Obtener información sobre una lista de usuarios.",
+	"apihelp-query+users-param-prop": "Qué piezas de información incluir:",
+	"apihelp-query+users-paramvalue-prop-blockinfo": "Etiqueta si el usuario está bloqueado, por quién y por qué razón.",
+	"apihelp-query+users-paramvalue-prop-groups": "Lista todos los grupos a los que pertenece cada usuario.",
+	"apihelp-query+users-paramvalue-prop-editcount": "Añade el número de ediciones del usuario.",
+	"apihelp-query+users-paramvalue-prop-gender": "Etiqueta el género del usuario. Devuelve \"masculino\", \"femenino\" o \"desconocido\".",
 	"apihelp-query+users-example-simple": "Devolver información del usuario <kbd>Ejemplo</kbd>.",
 	"apihelp-query+watchlist-param-start": "El sello de tiempo para comenzar la enumeración",
 	"apihelp-query+watchlist-param-end": "El sello de tiempo para finalizar la enumeración.",
@@ -549,11 +668,12 @@
 	"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.",
-	"apihelp-query+watchlist-param-type": "Qué tipos de cambios mostrar:\n;edit:ediciones comunes a páginas.\n;external:cambios externos.\n;new:creaciones de páginas.\n;log:entradas de registros.\n;categorize:cambios de pertenencia a categorías.",
+	"apihelp-query+watchlist-param-type": "Qué tipos de cambios mostrar:\n;edit:ediciones comunes a páginas.\n;external:cambios externos.\n;new:creaciones de páginas.\n;log:entradas del registro.",
+	"apihelp-query+watchlistraw-param-prop": "Qué propiedades adicionales se obtendrán:",
 	"apihelp-query+watchlistraw-param-show": "Sólo listar los elementos que cumplen estos criterios.",
 	"apihelp-query+watchlistraw-param-fromtitle": "Título (con el prefijo de espacio de nombres) desde el que se empezará a enumerar.",
 	"apihelp-query+watchlistraw-param-totitle": "Título (con el prefijo de espacio de nombres) desde el que se dejará de enumerar.",
@@ -605,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 b2ca8a53b2..08515d343a 100644
--- a/includes/api/i18n/fr.json
+++ b/includes/api/i18n/fr.json
@@ -19,7 +19,9 @@
 			"Urhixidur",
 			"Wladek92",
 			"Ash Crow",
-			"L"
+			"L",
+			"Umherirrender",
+			"Elfix"
 		]
 	},
 	"apihelp-main-description": "<div class=\"hlist plainlinks api-main-links\">\n* [[mw:API:Main_page|Documentation]]\n* [[mw:API:FAQ|FAQ]]\n* [https://lists.wikimedia.org/mailman/listinfo/mediawiki-api Liste de diffusion]\n* [https://lists.wikimedia.org/mailman/listinfo/mediawiki-api-announce Annonces de l’API]\n* [https://phabricator.wikimedia.org/maniphest/query/GebfyV4uCaLd/#R Bogues et demandes]\n</div>\n<strong>État :</strong> Toutes les fonctionnalités affichées sur cette page devraient fonctionner, mais l’API est encore en cours de développement et peut changer à tout moment. Inscrivez-vous à [https://lists.wikimedia.org/pipermail/mediawiki-api-announce/ la liste de diffusion mediawiki-api-announce] pour être informé des mises à jour.\n\n<strong>Requêtes erronées :</strong> Si des requêtes erronées sont envoyées à l’API, un en-tête HTTP sera renvoyé avec la clé « MediaWiki-API-Error ». La valeur de cet en-tête et le code d’erreur renvoyé prendront la même valeur. Pour plus d’information, voyez [[mw:API:Errors_and_warnings|API: Errors and warnings]].",
@@ -166,7 +168,6 @@
 	"apihelp-feedrecentchanges-param-hideliu": "Masquer les modifications faites par des utilisateurs enregistrés.",
 	"apihelp-feedrecentchanges-param-hidepatrolled": "Masquer les modifications contrôlées.",
 	"apihelp-feedrecentchanges-param-hidemyself": "Masquer les modifications faites par l'utilisateur actuel.",
-	"apihelp-feedrecentchanges-param-hidecategorization": "Masquer les changements de la catégorie d'appartenance.",
 	"apihelp-feedrecentchanges-param-tagfilter": "Filtrer par balise.",
 	"apihelp-feedrecentchanges-param-target": "Afficher uniquement les modifications sur les pages liées depuis cette page.",
 	"apihelp-feedrecentchanges-param-showlinkedto": "Afficher les modifications plutôt sur les pages liées vers la page sélectionnée.",
@@ -294,16 +295,18 @@
 	"apihelp-parse-paramvalue-prop-iwlinks": "Fournit les liens interwikis dans le wikitexte analysé.",
 	"apihelp-parse-paramvalue-prop-wikitext": "Fournit le wikitexte d’origine qui a été analysé.",
 	"apihelp-parse-paramvalue-prop-properties": "Fournit les diverses propriétés définies dans le wikitexte analysé.",
-	"apihelp-parse-paramvalue-prop-limitreportdata": "Fournit le rapport de limite d’une manière structurée. Ne fournit aucune donnée, si <var>$1disablepp</var> est positionné.",
-	"apihelp-parse-paramvalue-prop-limitreporthtml": "Fournit la version HTML du rapport de limite. Ne fournit aucune donnée, si <var>$1disablepp</var> est positionné.",
+	"apihelp-parse-paramvalue-prop-limitreportdata": "Fournit le rapport de limite d’une manière structurée. Ne fournit aucune donnée, si <var>$1disablelimitreport</var> est positionné.",
+	"apihelp-parse-paramvalue-prop-limitreporthtml": "Fournit la version HTML du rapport de limite. Ne fournit aucune donnée, si <var>$1disablelimitreport</var> est positionné.",
 	"apihelp-parse-paramvalue-prop-parsetree": "L’arbre d’analyse XML du contenu de la révision (nécessite le modèle de contenu <code>$1</code>)",
 	"apihelp-parse-param-pst": "Faire une transformation avant enregistrement de l’entrée avant de l’analyser. Valide uniquement quand utilisé avec du texte.",
 	"apihelp-parse-param-onlypst": "Faire une transformation avant enregistrement (PST) de l’entrée, mais ne pas l’analyser. Renvoie le même wikitexte, après que la PST a été appliquée. Valide uniquement quand utilisé avec <var>$1text</var>.",
 	"apihelp-parse-param-effectivelanglinks": "Inclut les liens de langue fournis par les extensions (à utiliser avec <kbd>$1prop=langlinks</kbd>).",
 	"apihelp-parse-param-section": "Récupérer uniquement le contenu de ce numéro de section ou quand <kbd>nouveau</kbd> génère une nouvelle section.\n\nLa <kbd>nouvelle</kbd> section est mise à l’honneur uniquement quand <var>text</var> est spécifié.",
 	"apihelp-parse-param-sectiontitle": "Nouveau titre de section quand <var>section</var> vaut <kbd>nouveau</kbd>.\n\nÀ la différence de la modification de page, cela ne revient pas à <var>summary</var> quand il est omis ou vide.",
-	"apihelp-parse-param-disablepp": "Omettre le rapport du préprocesseur (« rapport de limite du nouveau PP ») de la sortie de l’analyseur.",
+	"apihelp-parse-param-disablelimitreport": "Omettre le rapport de limite (« rapport de limite du nouveau PP ») de la sortie de l’analyseur.",
+	"apihelp-parse-param-disablepp": "Utiliser <var>$1disablelimitreport</var> à la place.",
 	"apihelp-parse-param-disableeditsection": "Omettre les liens de modification de section de la sortie de l’analyseur.",
+	"apihelp-parse-param-disabletidy": "Ne pas exécuter de nettoyage du code HTML (par exemple,  réagencer) sur la sortie de l'analyseur.",
 	"apihelp-parse-param-generatexml": "Générer un arbre d’analyse XML (nécessite le modèle de contenu <code>$1</code> ; remplacé par <kbd>$2prop=parsetree</kbd>).",
 	"apihelp-parse-param-preview": "Analyser en mode aperçu.",
 	"apihelp-parse-param-sectionpreview": "Analyser en mode aperçu de section (active aussi le mode aperçu).",
@@ -357,7 +360,7 @@
 	"apihelp-query+allcategories-param-limit": "Combien de catégories renvoyer.",
 	"apihelp-query+allcategories-param-prop": "Quelles propriétés récupérer :",
 	"apihelp-query+allcategories-paramvalue-prop-size": "Ajoute le nombre de pages dans la catégorie.",
-	"apihelp-query+allcategories-paramvalue-prop-hidden": "Marque les catégories qui sont cachées avec _&#95;HIDDENCAT_&#95;.",
+	"apihelp-query+allcategories-paramvalue-prop-hidden": "Marque les catégories qui sont masquées avec <code>_&#95;HIDDENCAT_&#95;</code>.",
 	"apihelp-query+allcategories-example-size": "Lister les catégories avec l’information sur le nombre de pages dans chacune",
 	"apihelp-query+allcategories-example-generator": "Récupérer l’information sur la page de catégorie elle-même pour les catégories commençant par <kbd>List</kbd>.",
 	"apihelp-query+alldeletedrevisions-description": "Lister toutes les révisions supprimées par un utilisateur ou dans un espace de noms.",
@@ -382,7 +385,7 @@
 	"apihelp-query+allfileusages-param-prefix": "Rechercher tous les fichiers dont le titre commence par cette valeur.",
 	"apihelp-query+allfileusages-param-unique": "Afficher uniquement les titres de fichier distincts. Impossible à utiliser avec $1prop=ids.\nQuand utilisé comme générateur, produit les pages cibles au lieu des sources.",
 	"apihelp-query+allfileusages-param-prop": "Quelles informations inclure :",
-	"apihelp-query+allfileusages-paramvalue-prop-ids": "Ajoute les IDs des pages utilisatrices (impossible à utiliser avec $1unique).",
+	"apihelp-query+allfileusages-paramvalue-prop-ids": "Ajoute les IDs de page des pages l’utilisant (impossible à utiliser avec $1unique).",
 	"apihelp-query+allfileusages-paramvalue-prop-title": "Ajoute le titre du fichier.",
 	"apihelp-query+allfileusages-param-limit": "Combien d’éléments renvoyer au total.",
 	"apihelp-query+allfileusages-param-dir": "La direction dans laquelle lister.",
@@ -416,7 +419,7 @@
 	"apihelp-query+alllinks-param-prefix": "Rechercher tous les titres liés commençant par cette valeur.",
 	"apihelp-query+alllinks-param-unique": "Afficher uniquement les titres liés distincts. Impossible à utiliser avec <kbd>$1prop=ids</kbd>.\nUtilisé avec un générateur, produit les pages cible au lieu des pages source.",
 	"apihelp-query+alllinks-param-prop": "Quelles informations inclure :",
-	"apihelp-query+alllinks-paramvalue-prop-ids": "Ajoute l’ID de la page de liaison (impossible à utiliser avec <var>$1unique</var>).",
+	"apihelp-query+alllinks-paramvalue-prop-ids": "Ajoute l’ID de la page avec le lien (impossible à utiliser avec <var>$1unique</var>).",
 	"apihelp-query+alllinks-paramvalue-prop-title": "Ajoute le titre du lien.",
 	"apihelp-query+alllinks-param-namespace": "L’espace de noms à énumérer.",
 	"apihelp-query+alllinks-param-limit": "Combien d’éléments renvoyer au total.",
@@ -467,8 +470,8 @@
 	"apihelp-query+allredirects-param-prop": "Quelles informations inclure :",
 	"apihelp-query+allredirects-paramvalue-prop-ids": "Ajoute l’ID de la page de redirection (impossible à utiliser avec <var>$1unique</var>).",
 	"apihelp-query+allredirects-paramvalue-prop-title": "Ajoute le titre de la redirection.",
-	"apihelp-query+allredirects-paramvalue-prop-fragment": "Ajoute le fragment de la redirection, s’il y en a un (impossible à utiliser avec <var>$1unique</var>).",
-	"apihelp-query+allredirects-paramvalue-prop-interwiki": "Ajoute le préfixe interwiki de la redirection, s’il y en a un (impossible à utiliser avec <var>$1unique</var>).",
+	"apihelp-query+allredirects-paramvalue-prop-fragment": "Ajoute le fragment de la redirection, s’il existe (impossible à utiliser avec <var>$1unique</var>).",
+	"apihelp-query+allredirects-paramvalue-prop-interwiki": "Ajoute le préfixe interwiki de la redirection, s’il existe (impossible à utiliser avec <var>$1unique</var>).",
 	"apihelp-query+allredirects-param-namespace": "L’espace de noms à énumérer.",
 	"apihelp-query+allredirects-param-limit": "Combien d’éléments renvoyer au total.",
 	"apihelp-query+allredirects-param-dir": "La direction dans laquelle lister.",
@@ -482,7 +485,7 @@
 	"apihelp-query+alltransclusions-param-prefix": "Rechercher tous les titres inclus qui commencent par cette valeur.",
 	"apihelp-query+alltransclusions-param-unique": "Afficher uniquement les titres inclus. Impossible à utiliser avec $1prop=ids.\nUtilisé avec un générateur, produit les pages cible plutôt que les pages source.",
 	"apihelp-query+alltransclusions-param-prop": "Quelles informations inclure :",
-	"apihelp-query+alltransclusions-paramvalue-prop-ids": "Ajoute l’ID de la page incluse (impossible à utiliser avec $1unique).",
+	"apihelp-query+alltransclusions-paramvalue-prop-ids": "Ajout l’ID de la page de transclusion (impossible à utiliser avec $1unique).",
 	"apihelp-query+alltransclusions-paramvalue-prop-title": "Ajoute le titre de la transclusion.",
 	"apihelp-query+alltransclusions-param-namespace": "L’espace de noms à énumérer.",
 	"apihelp-query+alltransclusions-param-limit": "Combien d’éléments renvoyer au total.",
@@ -545,7 +548,7 @@
 	"apihelp-query+categories-param-prop": "Quelles propriétés supplémentaires obtenir de chaque catégorie :",
 	"apihelp-query+categories-paramvalue-prop-sortkey": "Ajoute la clé de tri (chaîne hexadécimale) et son préfixe (partie lisible) de la catégorie.",
 	"apihelp-query+categories-paramvalue-prop-timestamp": "Ajoute l’horodatage de l’ajout de la catégorie.",
-	"apihelp-query+categories-paramvalue-prop-hidden": "Marque les catégories cachées avec _&#95;HIDDENCAT_&#95;.",
+	"apihelp-query+categories-paramvalue-prop-hidden": "Marque les catégories cachées avec <code>_&#95;HIDDENCAT_&#95;</code>.",
 	"apihelp-query+categories-param-show": "Quelle sorte de catégories afficher.",
 	"apihelp-query+categories-param-limit": "Combien de catégories renvoyer.",
 	"apihelp-query+categories-param-categories": "Lister uniquement ces catégories. Utile pour vérifier si une certaine page est dans une certaine catégorie.",
@@ -860,7 +863,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.",
@@ -915,7 +918,7 @@
 	"apihelp-query+redirects-param-show": "Afficher uniquement les éléments correspondant à ces critères :\n;fragment:Afficher uniquement les redirections avec un fragment.\n;!fragment:Afficher uniquement les redirections sans fragment.",
 	"apihelp-query+redirects-example-simple": "Obtenir une liste des redirections vers [[Main Page]]",
 	"apihelp-query+redirects-example-generator": "Obtenir des informations sur toutes les redirections vers [[Main Page]]",
-	"apihelp-query+revisions-description": "Obtenir des informations sur la révision.\n\nPeut être utilisé de différentes manières :\n# Obtenir des données sur un ensemble de pages (dernière révision), en mettant les titres ou les ids de page.\n# Obtenir les révisions d’une page donnée, en utilisant les titres ou les ids de page avec début, fin ou limite.\n# Obtenir des données sur un ensemble de révisions en donnant leurs IDs et leurs ids de révision.",
+	"apihelp-query+revisions-description": "Obtenir des informations sur la révision.\n\nPeut être utilisé de différentes manières :\n# Obtenir des données sur un ensemble de pages (dernière révision), en mettant les titres ou les ids de page.\n# Obtenir les révisions d’une page donnée, en utilisant les titres ou les ids de page avec rvstart, rvend ou rvlimit.\n# Obtenir des données sur un ensemble de révisions en donnant leurs IDs avec revids.",
 	"apihelp-query+revisions-paraminfo-singlepageonly": "Utilisable uniquement avec une seule page (mode #2).",
 	"apihelp-query+revisions-param-startid": "À quel ID de révision démarrer l’énumération.",
 	"apihelp-query+revisions-param-endid": "Arrêter l’énumération des révisions à cet ID.",
@@ -1079,7 +1082,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.",
@@ -1124,7 +1127,7 @@
 	"apihelp-query+watchlist-paramvalue-prop-notificationtimestamp": "Ajoute l’horodatage de la dernière notification de la modification à l’utilisateur.",
 	"apihelp-query+watchlist-paramvalue-prop-loginfo": "Ajoute l’information de trace le cas échéant.",
 	"apihelp-query+watchlist-param-show": "Afficher uniquement les éléments qui correspondent à ces critères. Par exemple, pour voir uniquement les modifications mineures faites par des utilisateurs connectés, mettre $1show=minor|!anon.",
-	"apihelp-query+watchlist-param-type": "Quels types de modification afficher :\n;edit:Modifications ordinaires de page.\n;external:Modifications externes.\n;new:Créations de page.\n;log:Entrées du journal.\n;categorize:changements dans la catégorie d'appartenance.",
+	"apihelp-query+watchlist-param-type": "Quels types de modification afficher :\n;edit:Modifications ordinaires de page.\n;external:Modifications externes.\n;new:Créations de page.\n;log:Entrées du journal.",
 	"apihelp-query+watchlist-param-owner": "Utilisé avec $1token pour accéder à la liste de suivi d’un autre utilisateur.",
 	"apihelp-query+watchlist-param-token": "Un jeton de sécurité (disponible dans les [[Special:Preferences#mw-prefsection-watchlist|préférences]] de l’utilsiateur) pour autoriser l’accès à la liste de suivi d&un autre utilisateur.",
 	"apihelp-query+watchlist-example-simple": "Lister la révision de tête des pages récemment modifiées dans la liste de suivi de l’utilisateur actuel",
diff --git a/includes/api/i18n/gl.json b/includes/api/i18n/gl.json
index b8df6b3845..6b6345d004 100644
--- a/includes/api/i18n/gl.json
+++ b/includes/api/i18n/gl.json
@@ -7,7 +7,9 @@
 			"VaiPolaSombra",
 			"Banjo",
 			"Fisterraeomar",
-			"Toliño"
+			"Toliño",
+			"Umherirrender",
+			"Amire80"
 		]
 	},
 	"apihelp-main-description": "<div class=\"hlist plainlinks api-main-links\">\n* [[mw:API:Main_page|Documentación]]\n* [[mw:API:FAQ|FAQ]]\n* [https://lists.wikimedia.org/mailman/listinfo/mediawiki-api Lista de discusión]\n* [https://lists.wikimedia.org/mailman/listinfo/mediawiki-api-announce Anuncios da API]\n* [https://phabricator.wikimedia.org/maniphest/query/GebfyV4uCaLd/#R Erros e solicitudes]\n</div>\n<strong>Estado:</strong> Tódalas funcionalidades mostradas nesta páxina deberían estar funcionanado, pero a API aínda está desenrolo, e pode ser modificada en calquera momento. Apúntese na [https://lists.wikimedia.org/pipermail/mediawiki-api-announce/ lista de discusión mediawiki-api-announce] para estar informado acerca das actualizacións.\n\n<strong>Solicitudes incorrectas:</strong> Cando se envían solicitudes incorrectas á API, envíase unha cabeceira HTTP coa chave \"MediaWiki-API-Error\" e, a seguir, tanto o valor da cabeceira como o código de erro retornado serán definidos co mesmo valor. Para máis información, consulte [[mw:API:Errors_and_warnings|API: Erros e avisos]].",
@@ -281,16 +283,18 @@
 	"apihelp-parse-paramvalue-prop-iwlinks": "Devolve as ligazóns interwiki do texto wiki analizado.",
 	"apihelp-parse-paramvalue-prop-wikitext": "Devolve o texto wiki orixinal que foi analizado.",
 	"apihelp-parse-paramvalue-prop-properties": "Obter varias propiedades definidas no texto wiki analizado.",
-	"apihelp-parse-paramvalue-prop-limitreportdata": "Devolve o informe de límite de forma estruturada. Non devolve datos cando <var>$1disablepp</var> está fixado.",
-	"apihelp-parse-paramvalue-prop-limitreporthtml": "Devolve a versión HTML do informe de límite. Non devolve datos cando <var>$1disablepp</var> está fixado.",
+	"apihelp-parse-paramvalue-prop-limitreportdata": "Devolve o informe de límite de forma estruturada. Non devolve datos cando <var>$1disablelimitreport</var> está fixado.",
+	"apihelp-parse-paramvalue-prop-limitreporthtml": "Devolve a versión HTML do informe de límite. Non devolve datos cando <var>$1disablelimitreport</var> está fixado.",
 	"apihelp-parse-paramvalue-prop-parsetree": "Árbores de análise XML do contido da revisión (precisa o modelo de contido <code>$1</code>)",
 	"apihelp-parse-param-pst": "Fai unha transformación antes de gardar a entrada antes de analizala. Válida unicamente para usar con texto.",
 	"apihelp-parse-param-onlypst": "Facer unha transformación antes de gardar (PST) a entrada, pero sen analizala. Devolve o mesmo wikitexto, despois de que a PST foi aplicada. Só válida cando se usa con <var>$1text</var>.",
 	"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-disablepp": "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).",
@@ -344,7 +348,7 @@
 	"apihelp-query+allcategories-param-limit": "Cantas categorías devolver.",
 	"apihelp-query+allcategories-param-prop": "Que propiedades recuperar:",
 	"apihelp-query+allcategories-paramvalue-prop-size": "Engade o número de páxinas na categoría.",
-	"apihelp-query+allcategories-paramvalue-prop-hidden": "Marca as categorías que están ocultas con _&#95;HIDDENCAT_&#95;.",
+	"apihelp-query+allcategories-paramvalue-prop-hidden": "Marca as categorías que están ocultas con <code>_&#95;HIDDENCAT_&#95;</code>.",
 	"apihelp-query+allcategories-example-size": "Listar categorías con información do número de páxinas en cada unha.",
 	"apihelp-query+allcategories-example-generator": "Obter información sobre a páxina de categoría para categorías que comezan por <kbd>List</kbd>.",
 	"apihelp-query+alldeletedrevisions-description": "Listar todas as revisións borradas por un usuario ou nun espazo de nomes.",
@@ -532,7 +536,7 @@
 	"apihelp-query+categories-param-prop": "Que propiedades adicionais obter para cada categoría:",
 	"apihelp-query+categories-paramvalue-prop-sortkey": "Engade a clave de ordenación (cadea hexadecimal) e o prefixo da clave de ordenación (parte lexible) da categoría.",
 	"apihelp-query+categories-paramvalue-prop-timestamp": "Engade o selo de tempo de cando se engadíu a categoría.",
-	"apihelp-query+categories-paramvalue-prop-hidden": "Pon unha marca nas categorías que están ocultas con _&#95;HIDDENCAT_&#95;.",
+	"apihelp-query+categories-paramvalue-prop-hidden": "Pon unha marca nas categorías que están ocultas con <code>_&#95;HIDDENCAT_&#95;</code>.",
 	"apihelp-query+categories-param-show": "Tipo de categorías a amosar.",
 	"apihelp-query+categories-param-limit": "Cantas categorías devolver.",
 	"apihelp-query+categories-param-categories": "Listar só esas categorías. Útil para verificar se unha páxina concreta está nunha categoría determinada.",
@@ -805,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.",
@@ -857,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.",
@@ -1062,7 +1067,7 @@
 	"apihelp-query+userinfo-paramvalue-prop-blockinfo": "Marca se o usuario actual está bloqueado, por que, e por que razón.",
 	"apihelp-query+userinfo-paramvalue-prop-hasmsg": "Engade unha etiqueta <samp>messages</samp> (mensaxe) se o usuario actual ten mensaxes pendentes.",
 	"apihelp-query+userinfo-paramvalue-prop-groups": "Lista todos os grupos ós que pertence o usuario actual.",
-	"apihelp-query+userinfo-paramvalue-prop-implicitgroups": "Lista todos so grupos dos que o usuario actual é membro automaticamente. ",
+	"apihelp-query+userinfo-paramvalue-prop-implicitgroups": "Lista todos so grupos dos que o usuario actual é membro automaticamente.",
 	"apihelp-query+userinfo-paramvalue-prop-rights": "Lista todos os dereitos que ten o usuario actual.",
 	"apihelp-query+userinfo-paramvalue-prop-changeablegroups": "Lista os grupos ós que o usuario pode engadir ou eliminar a outros usuarios.",
 	"apihelp-query+userinfo-paramvalue-prop-options": "Lista todas as preferencias que ten seleccionadas o usuario actual.",
@@ -1283,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 2fbba0194e..5cd1d94451 100644
--- a/includes/api/i18n/he.json
+++ b/includes/api/i18n/he.json
@@ -8,7 +8,8 @@
 			"YaronSh",
 			"ערן",
 			"LaG roiL",
-			"Elyashiv"
+			"Elyashiv",
+			"Umherirrender"
 		]
 	},
 	"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: שגיאות ואזהרות]].",
@@ -31,7 +32,7 @@
 	"apihelp-block-param-nocreate": "מניעת יצירת חשבונות",
 	"apihelp-block-param-autoblock": "חסימה אוטומטית גם של כתובת ה־IP האחרונה שהשתמש בה ושל כל כתובת IP שינסה להשתמש בה בעתיד.",
 	"apihelp-block-param-noemail": "למנוע ממשתמש לשלוח דואר אלקטרוני דרך הוויקי. (דורש את ההרשאה <code>blockemail</code>).",
-	"apihelp-block-param-hidename": "התסרת השם מיומן החסימות. (דורש את ההרשאה <code>hideuser</code>.)",
+	"apihelp-block-param-hidename": "הסרת השם מיומן החסימות. (דורש את ההרשאה <code>hideuser</code>.)",
 	"apihelp-block-param-allowusertalk": "לאפשר למשתמש לערוך את דף השיחה שלו או שלה (תלוי ב־<var>[[mw:Manual:$wgBlockAllowsUTEdit|$wgBlockAllowsUTEdit]]</var>).",
 	"apihelp-block-param-reblock": "אם המשתמש כבר חסום, לדרוס את החסימה הנוכחית.",
 	"apihelp-block-param-watchuser": "לעקוב אחרי דף המשתמש ודף השיחה של המשתמש או של כתובת ה־IP.",
@@ -155,7 +156,6 @@
 	"apihelp-feedrecentchanges-param-hideliu": "הסתרת שינויים שנעשו על ידי משתמשים רשומים.",
 	"apihelp-feedrecentchanges-param-hidepatrolled": "הסתרת שינויים שנבדקו.",
 	"apihelp-feedrecentchanges-param-hidemyself": "הסתרת שינוים שנעשו על ידי המשתמש הנוכחי.",
-	"apihelp-feedrecentchanges-param-hidecategorization": "להסתיר שינויים בחברות בקטגוריה.",
 	"apihelp-feedrecentchanges-param-tagfilter": "סינון לפי תגית.",
 	"apihelp-feedrecentchanges-param-target": "הצגת שינויים שנעשו בדפים המקושרים לדף זה בלבד.",
 	"apihelp-feedrecentchanges-param-showlinkedto": "להציג את השינויים בדפים שמקושרים לדף שנבחר במקום זה.",
@@ -283,16 +283,18 @@
 	"apihelp-parse-paramvalue-prop-iwlinks": "מתן קישורי בינוויקי בקוד הוויקי המפוענח.",
 	"apihelp-parse-paramvalue-prop-wikitext": "מתן קוד הוויקי המקורי שפוענח.",
 	"apihelp-parse-paramvalue-prop-properties": "נותן מאפיינים שונים שמוגדרים בקוד הוויקי המפוענח.",
-	"apihelp-parse-paramvalue-prop-limitreportdata": "נותן דו\"ח הגבלות בדרך מובנית. לא נותן שום נתונים כאשר מוגדר <var>$1disablepp</var>.",
-	"apihelp-parse-paramvalue-prop-limitreporthtml": "נותן את גרסת ה־HTML של דו\"ח ההגבלות. לא נותן שום נתונים כאשר מוגדר <var>$1disablepp</var>.",
+	"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>)",
 	"apihelp-parse-param-pst": "לעשות התמרה לפני שמירה על הקלט לפני פענוחו. תקין רק בשימוש עם טקסט.",
 	"apihelp-parse-param-onlypst": "לעשות התמרה לפני שמירה (pre-save transform‏, PST) על הקלט, אבל לא לפענח אותו. מחזיר את אותו קוד הוויקי אחרי החלת PST. תקף רק בשימוש עם <var>$1text</var>.",
 	"apihelp-parse-param-effectivelanglinks": "כולל קישור שפה שמספקות הרחבות (לשימוש עם <kbd>$1prop=langlinks</kbd>).",
 	"apihelp-parse-param-section": "לאחזר את התוכן של הפסקה עם המספר הזה, או, אם זה <kbd>new</kbd>, ליצור פסקה חדשה.\n\n<kbd>new</kbd> יכובד רק בעת ציון <var>text</var>.",
 	"apihelp-parse-param-sectiontitle": "כותרת פסקה חדשה כאשר <var>section</var> הוא <kbd>new</kbd>.\n\nבניגוד לעריכת דף, זה לא מתגבה ל־<var>summary</var> כשזה מושמט אם ריק.",
-	"apihelp-parse-param-disablepp": "להשמיט את דו\"ח הקדם־מעבד (\"NewPP limit report\") מפלט המפענח.",
+	"apihelp-parse-param-disablelimitreport": "להשמיט את דו\"ח הקדם־מעבד (\"NewPP limit report\") מפלט המפענח.",
+	"apihelp-parse-param-disablepp": "יש להשתמש ב־<var>$1disablelimitreport</var> במקום.",
 	"apihelp-parse-param-disableeditsection": "להשמיט את קישורי עריכת הפסקאות מפלט המפענח.",
+	"apihelp-parse-param-disabletidy": "לא להריץ ניקוי HTML (למשל tidy) על פלט המפענח.",
 	"apihelp-parse-param-generatexml": "יצירת עץ פענוח של XML (נדרש מודל תוכן <code>$1</code>; מוחלף ב־<kbd>$2prop=parsetree</kbd>).",
 	"apihelp-parse-param-preview": "לפענח במצב תצוגה מקדימה.",
 	"apihelp-parse-param-sectionpreview": "לפענח במצב תצוגה מקדימה של פסקה (מדליק גם את מצב תצוגה מקדימה).",
@@ -346,7 +348,7 @@
 	"apihelp-query+allcategories-param-limit": "כמה קטגוריות להחזיר.",
 	"apihelp-query+allcategories-param-prop": "אילו מאפיינים לקבל:",
 	"apihelp-query+allcategories-paramvalue-prop-size": "הוספת מספר הדפים בקטגוריה.",
-	"apihelp-query+allcategories-paramvalue-prop-hidden": "מתייג קטגוריות מוסתרות עם _&#95;HIDDENCAT_&#95;.",
+	"apihelp-query+allcategories-paramvalue-prop-hidden": "מתייג קטגוריות מוסתרות עם <code>_&#95;HIDDENCAT_&#95;</code>.",
 	"apihelp-query+allcategories-example-size": "רשימת קטגוריות עם מידע על מספר הדפים בכל אחת מהן.",
 	"apihelp-query+allcategories-example-generator": "אחזור מידע על דף הקטגוריה עצמו עבור קטגוריות שמתחילות ב־<kbd>List</kbd>.",
 	"apihelp-query+alldeletedrevisions-description": "רשימת כל הגרסאות המחוקות על־ידי משתמש או במרחב.",
@@ -534,7 +536,7 @@
 	"apihelp-query+categories-param-prop": "אילו מאפיינים נוספים לקבל עבור כל קטגוריה:",
 	"apihelp-query+categories-paramvalue-prop-sortkey": "הוספת מפתח מיון (מחרוזת הקסדצימלית) ותחילית מפתח מיון (החלק הקריא) עבור קטגוריה.",
 	"apihelp-query+categories-paramvalue-prop-timestamp": "הוספת חותם־הזמן של יצירת הקטגוריה.",
-	"apihelp-query+categories-paramvalue-prop-hidden": "תיוג קטגוריות שהוסתרו באמצעות _&#95;HIDDENCAT_&#95;.",
+	"apihelp-query+categories-paramvalue-prop-hidden": "תיוג קטגוריות שהוסתרו באמצעות <code>_&#95;HIDDENCAT_&#95;</code>.",
 	"apihelp-query+categories-param-show": "איזה סוג של קטגוריות להציג.",
 	"apihelp-query+categories-param-limit": "כמה קטגוריות להחזיר.",
 	"apihelp-query+categories-param-categories": "לרשום רק את הקטגוריות האלו. שימושי לבדיקה עם דף מסוים נמצא בקטגוריה מסוימת.",
@@ -807,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": "לסנן את העיולים שעשה המשתמש הנתון.",
@@ -828,6 +830,7 @@
 	"apihelp-query+pageswithprop-param-prop": "אילו חלקי מידע לכלול:",
 	"apihelp-query+pageswithprop-paramvalue-prop-ids": "הוספת מזהה הדף.",
 	"apihelp-query+pageswithprop-paramvalue-prop-title": "הוספת השם ומזהה מרחב השם של הדף.",
+	"apihelp-query+pageswithprop-paramvalue-prop-value": "הוספת הערך של מאפיין הדף.",
 	"apihelp-query+pageswithprop-param-limit": "מספר הדפים המרבי שיוחזר.",
 	"apihelp-query+pageswithprop-param-dir": "באיזה כיוון לסדר.",
 	"apihelp-query+pageswithprop-example-simple": "הצגת עשרת הדפים הראשונים שעושים שימוש ב־<code>&#123;&#123;DISPLAYTITLE:&#125;&#125;</code>.",
@@ -858,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": "למנות שינויים אחרונים.",
@@ -958,11 +962,12 @@
 	"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-param-enablerewrites": "הפעלת שכתוב שאילתות פנימי. שרתי חיפוש אחדים יכולים לשכתב את השאילתה לצורה שלדעתם נותנת תוצאות טובות יותר, למשל תיקון שגיאות כתיב.",
 	"apihelp-query+search-example-simple": "חיפוש <kbd>meaning</kbd>.",
 	"apihelp-query+search-example-text": "חיפוש טקסטים עבור <kbd>meaning</kbd>.",
 	"apihelp-query+search-example-generator": "קבלת מידע על הדף עבור שמוחזרים מחיפוש אחרי <kbd>meaning</kbd>.",
@@ -1112,7 +1117,7 @@
 	"apihelp-query+watchlist-paramvalue-prop-notificationtimestamp": "הוספת חותם־זמן של ההודעה האחרונה למשתמש על העריכה.",
 	"apihelp-query+watchlist-paramvalue-prop-loginfo": "הוספת מידע מהיומן איפה שמתאים.",
 	"apihelp-query+watchlist-param-show": "הצגה רק של פריטים שמתאימים לאמות המידה האלו. למשל, כדי לראות רק עריכות משניות שעשו משתמשים שנכנסו לחשבון, יש להגדיר $1show=minor|!anon.",
-	"apihelp-query+watchlist-param-type": "אולי סוגי שינויים להציג:\n;edit:עריכות דף רגילות.\n;external:שינויים חיצוניים.\n;new:יצירות דף.\n;log:עיולי יומן.\n;categorize:שינויים בחברות בקטגוריה.",
+	"apihelp-query+watchlist-param-type": "אולי סוגי שינויים להציג:\n;edit:עריכות דף רגילות.\n;external:שינויים חיצוניים.\n;new:יצירות דף.\n;log:עיולי יומן.",
 	"apihelp-query+watchlist-param-owner": "משמש יחד עם $1token לגישה לרשימת מעקב של משתמש אחר.",
 	"apihelp-query+watchlist-param-token": "אסימון אבטחה (זמין ב־[[Special:Preferences#mw-prefsection-watchlist|העדפות]]) שמאפשר לגשת לרשימת מעקב של משתמש אחר.",
 	"apihelp-query+watchlist-example-simple": "לרשום את הגרסה האחרונה עבור דפים שהשתנו לאחרונה ברשימת המעקב של המשתמש הנוכחי.",
@@ -1284,7 +1289,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).",
@@ -1308,5 +1313,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/ko.json b/includes/api/i18n/ko.json
index 483b260fed..ab018c95d6 100644
--- a/includes/api/i18n/ko.json
+++ b/includes/api/i18n/ko.json
@@ -7,10 +7,11 @@
 			"LiteHell",
 			"Ysjbserver",
 			"Alex00728",
-			"Hwangjy9"
+			"Hwangjy9",
+			"Kurousagi"
 		]
 	},
-	"apihelp-main-description": "<div class=\"hlist plainlinks api-main-links\">\n* [https://www.mediawiki.org/wiki/API:Main_page 설명문서]\n* [https://www.mediawiki.org/wiki/API:FAQ FAQ]\n* [https://lists.wikimedia.org/mailman/listinfo/mediawiki-api 메일링 리스트]\n* [https://lists.wikimedia.org/mailman/listinfo/mediawiki-api-announce API 공지 사항] * [https://phabricator.wikimedia.org/maniphest/query/GebfyV4uCaLd/#R 버그 및 요청] </div>\n<strong>상태:</strong> 이 페이지에 표시된 모든 기능은 정상 작동할 것이지만, API는 여전히 활발하게 개발되고 있으며, 언제든지 바뀔 수 있습니다. 업데이트 정보를 받아보려면 [https://lists.wikimedia.org/pipermail/mediawiki-api-announce/ the mediawiki-api-announce 메일링 리스트]를 구독하십시오.\n\n<strong>잘못된 요청:</strong> API에 잘못된 요청이 전송되면 HTTP 헤더에서 \"MediaWiki-API-Error\" 키를 보내고, 헤더 값과 오류 코드가 같게 설정됩니다. 자세한 정보에 대해서는 https://www.mediawiki.org/wiki/API:Errors_and_warnings 를 참고하십시오.",
+	"apihelp-main-description": "<div class=\"hlist plainlinks api-main-links\">\n* [[mw:API:Main_page|설명문서]]\n* [[mw:API:FAQ|FAQ]]\n* [https://lists.wikimedia.org/mailman/listinfo/mediawiki-api 메일링 리스트]\n* [https://lists.wikimedia.org/mailman/listinfo/mediawiki-api-announce API 공지 사항] * [https://phabricator.wikimedia.org/maniphest/query/GebfyV4uCaLd/#R 버그 및 요청] </div>\n<strong>상태:</strong> 이 페이지에 표시된 모든 기능은 정상 작동할 것이지만, API는 여전히 활발하게 개발되고 있으며, 언제든지 바뀔 수 있습니다. 업데이트 정보를 받아보려면 [https://lists.wikimedia.org/pipermail/mediawiki-api-announce/ the 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-block-description": "사용자를 차단합니다.",
@@ -45,11 +46,11 @@
 	"apihelp-edit-param-unwatch": "문서를 현재 사용자의 주시문서 목록에서 제거합니다.",
 	"apihelp-edit-example-edit": "문서 편집",
 	"apihelp-emailuser-description": "사용자에게 이메일을 보냅니다.",
-	"apihelp-emailuser-param-target": "이메일을 보낼 사용자.",
+	"apihelp-emailuser-param-target": "이메일을 받을 사용자.",
 	"apihelp-expandtemplates-param-title": "문서 제목",
 	"apihelp-expandtemplates-param-text": "변환할 위키텍스트.",
 	"apihelp-feedrecentchanges-param-hideminor": "사소한 편집을 숨깁니다.",
-	"apihelp-feedrecentchanges-param-hidebots": "봇 편집을 숨깁니다.",
+	"apihelp-feedrecentchanges-param-hidebots": "봇의 편집을 숨깁니다.",
 	"apihelp-feedrecentchanges-param-hideanons": "익명 사용자의 편집을 숨깁니다.",
 	"apihelp-feedrecentchanges-param-hideliu": "등록된 사용자의 편집을 숨깁니다.",
 	"apihelp-feedrecentchanges-param-hidepatrolled": "검토된 편집을 숨깁니다.",
diff --git a/includes/api/i18n/ksh.json b/includes/api/i18n/ksh.json
index 4b032884ef..46ef96829d 100644
--- a/includes/api/i18n/ksh.json
+++ b/includes/api/i18n/ksh.json
@@ -138,7 +138,7 @@
 	"apihelp-feedrecentchanges-param-days": "Wadd eruß küdd op di Dähsch enschrängke.",
 	"apihelp-feedrecentchanges-param-limit": "De hühßte Aanzahl vun Äjeebnesse för zeröck ze jävve",
 	"apihelp-feedrecentchanges-param-from": "Zeijsch de Änderonge zigg dämm.",
-	"apihelp-feedrecentchanges-param-hideminor": "De kein Minni_Änderonge verschteijsche.",
+	"apihelp-feedrecentchanges-param-hideminor": "De kleine Minni_Ännderonge verschteijsche.",
 	"apihelp-feedrecentchanges-param-hidebots": "Änderonge ußschlehße, di vun Bots jemaht wohde.",
 	"apihelp-feedrecentchanges-param-hideanons": "Änderonge ußschlehße, di vun nahmelohse Metmaacher jemaht wohde.",
 	"apihelp-feedrecentchanges-param-hideliu": "Änderonge ußschlehße, di vun aanjemälldete Metmaacher jemaht wohde.",
@@ -250,6 +250,7 @@
 	"apihelp-parse-paramvalue-prop-properties": "Jitt devärse Eijeschafte uß, di em jepahßde Wikkitäx faßjelaat woode sen.",
 	"apihelp-parse-param-section": "Holl blohß dann der Ennhalld vun däm Affschnett met dä Nommer, udder wann „<kbd lang=\"en\" xml:lang=\"en\" dir=\"ltr\">new</kbd>“ enjejovve es, maach ene neu Affschnett derbei.",
 	"apihelp-parse-param-sectiontitle": "De Övverschreff för dä neuje Afschnet, wann <var lang=\"en\" xml:lang=\"en\" dir=\"ltr\">section</var> = <kbd lang=\"en\" xml:lang=\"en\" dir=\"ltr\">new</kbd> es.\n\nAnders wi beim Beärbeide vun dä Sigg weed dä Parramehter nit dorsch de <var lang=\"en\" xml:lang=\"en\" dir=\"ltr\">summary</var> ußjetuusch, wann hä fottjelohße udder läddesch es.",
+	"apihelp-parse-param-disablelimitreport": "Jiff keine Bereesch vum Vüürbereijde zom Paase (der „<i lang=\"en\" xml:lang=\"en\" dir=\"ltr\">NewPP limit report</i>“) mem Paaser singe Dahte zosamme uß.",
 	"apihelp-parse-param-disableeditsection": "Donn de Lenks för Affschnedde ze änndere en de Ußjahbe vum Paaser eruß lohße.",
 	"apihelp-parse-param-disabletoc": "Donn et Ennhaldsverzeijscheneß en de Ußjahbe vottlohße.",
 	"apihelp-parse-example-page": "Donn en Sigg pahse.",
@@ -283,7 +284,7 @@
 	"apihelp-query+allcategories-param-min": "Jiff blohß Saachjroppe us, di winneschsdens esu vill Metjlehder han.",
 	"apihelp-query+allcategories-param-max": "Jiff blohß Saachjroppe us, di et mihts esu vill Metjlehder han.",
 	"apihelp-query+allcategories-param-limit": "Wi vell Saachjroppe ußjävve?",
-	"apihelp-query+allcategories-param-prop": "Wat för en Eijeschaffte holle: ",
+	"apihelp-query+allcategories-param-prop": "Wat för en Eijeschaffte holle:",
 	"apihelp-query+allcategories-paramvalue-prop-size": "Deiht de Aanzahl Sigge en dä Saachjropp derbei.",
 	"apihelp-query+allcategories-paramvalue-prop-hidden": "Makehrt de veschtoche Sachjroppe met „<code lang=\"en\" xml:lang=\"en\" dir=\"ltr\">_&#95;HIDDENCAT_&#95;</code>“.",
 	"apihelp-query+allcategories-example-generator": "Holl Ennfommazjuhne övver di Saaachjroppe_Sigg för Saachjroppe, di met „<kbd lang=\"en\" xml:lang=\"en\" dir=\"ltr\">List</kbd>“ bejenne.",
@@ -379,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?",
@@ -407,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.",
@@ -417,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.",
@@ -455,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.",
@@ -467,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.",
@@ -503,6 +516,10 @@
 	"apihelp-query+extlinks-param-limit": "Wi vill Lengks ußjävve?",
 	"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?",
@@ -514,7 +531,7 @@
 	"apihelp-query+filearchive-param-dir": "En wälsche Reijefollsch opleßte.",
 	"apihelp-query+filearchive-param-sha1": "Däm Beld singe <i lang=\"en\" xml:lang=\"en\" dir=\"ltr\" title=\"secure hash algorithm\">SHA-1</i>-Pröhvsomm. Övverjeiht „<code lang=\"en\" xml:lang=\"en\" dir=\"ltr\">$1sha1base36</code>“.",
 	"apihelp-query+filearchive-param-sha1base36": "Däm Beld singe <i lang=\"en\" xml:lang=\"en\" dir=\"ltr\" title=\"secure hash algorithm\">SHA-1</i>-Pröhvsomm em 36-jer Zahlesüßtehm. Weed em Mehdiajwikki jebruch.",
-	"apihelp-query+filearchive-param-prop": "Wat för en Aanjahbe zum Beld holle:",
+	"apihelp-query+filearchive-param-prop": "Wat för en Aanjahbe zom Beld holle:",
 	"apihelp-query+filearchive-paramvalue-prop-sha1": "Deiht dä <i lang=\"en\" xml:lang=\"en\" dir=\"ltr\" title=\"secure hash algorithm\">SHA-1 (base 16)</i> vun dä Väsjohn vn däm Beld derbei.",
 	"apihelp-query+filearchive-paramvalue-prop-timestamp": "Adds timestamp for the uploaded version.",
 	"apihelp-query+filearchive-paramvalue-prop-user": "Deiht dä Metmaacher derbei, dä di Väsjohn huhjelahde hät.",
@@ -530,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.",
@@ -538,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.",
@@ -551,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.",
@@ -569,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.",
@@ -634,6 +659,7 @@
 	"apihelp-query+pageprops-description": "Jitt devärse Eijeschafte uß, di em Ennhald vun dä Sigg faßjelaat wohde sen.",
 	"apihelp-query+pageprops-example-simple": "Holl de Eijeschaffte för di Sigge „<kbd lang=\"en\" xml:lang=\"en\" dir=\"ltr\">Main Page</kbd>“ un „<kbd lang=\"en\" xml:lang=\"en\" dir=\"ltr\">MediaWiki</kbd>“.",
 	"apihelp-query+pageswithprop-description": "Donn alle Sigge met bechtemmpte Sigge_Eijeschaff opleßte.",
+	"apihelp-query+pageswithprop-paramvalue-prop-ids": "Deiht de Kännong vun de Sigge derbei.",
 	"apihelp-query+pageswithprop-param-limit": "De jrüüßte Zahl Sigge för ußzejävve.",
 	"apihelp-query+pageswithprop-param-dir": "En wälsche Reihjefollsch opleßte.",
 	"apihelp-query+pageswithprop-example-generator": "Holl zohsäzlejje Aanjahbe övver de eezde zehn Sigge, woh <code>_&#95;NOTOC_&#95;</code> dren vörkütt.",
@@ -654,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.",
@@ -709,6 +735,7 @@
 	"apihelp-query+search-param-namespace": "Söhk blohß en heh dä Appachtemangs.",
 	"apihelp-query+search-param-what": "Wat för en Aat ze Söhke?",
 	"apihelp-query+search-param-info": "Wat för en Metta_Dahte ußzejävve.",
+	"apihelp-query+search-param-prop": "Wat för en Eijeschaffte holle:",
 	"apihelp-query+search-param-limit": "Wi vill Sigge ensjesamp ußjävve?",
 	"apihelp-query+search-param-interwiki": "Donn de Engerwiki Lengks met ußjävve beim Söhke, wann_er doh sin.",
 	"apihelp-query+search-example-simple": "Söhk noh „<kbd lang=\"en\" xml:lang=\"en\" dir=\"ltr\">meaning</kbd>“.",
@@ -724,7 +751,7 @@
 	"apihelp-query+stashimageinfo-param-sessionkey": "Es et sällve wi „<code lang=\"en\" xml:lang=\"en\" dir=\"ltr\">$1filekey</code>“ un kütt vun fröjere Väsjohne.",
 	"apihelp-query+tags-description": "Leß de Makehronge vun Änderonge.",
 	"apihelp-query+tags-param-limit": "De hühßde Zahl Makkehronge zom Opleste.",
-	"apihelp-query+tags-param-prop": "Wat för en Eijschaffte holle:",
+	"apihelp-query+tags-param-prop": "Wat för en Eijeschaffte holle:",
 	"apihelp-query+tags-paramvalue-prop-name": "Deiht dä Nahme vun dä Makkehrong derbei.",
 	"apihelp-query+tags-paramvalue-prop-displayname": "Deiht der Täx vum Wikki för de Makkehrong derbei.",
 	"apihelp-query+tags-paramvalue-prop-description": "Deiht dä Beschrievongstäx vun dä Makkehrong derbei.",
@@ -753,11 +780,15 @@
 	"apihelp-query+usercontribs-param-user": "De Metmaacher för di mer Beijdrähsch holle welle.",
 	"apihelp-query+usercontribs-param-userprefix": "Holl beijdrähsch för alle Metmaacher, dänne ier Nahme met heh däm Wääd aanfange. Övverschriehv „<code lang=\"en\" xml:lang=\"en\" dir=\"ltr\">$1user</code>“.",
 	"apihelp-query+usercontribs-param-namespace": "Donn blohß Beijdrähsch en heh dä Appachtemangs opleßte.",
+	"apihelp-query+usercontribs-param-prop": "Donn zohsäzlejje Aanjahbe ennschlehße:",
 	"apihelp-query+usercontribs-param-tag": "Donn blohß Väsjohne met heh dä Makehrong opleßte.",
 	"apihelp-query+usercontribs-param-toponly": "Bloß Änderonge aanzeije, woh de neußte Väsjohn beij eruß kohm.",
-	"apihelp-query+usercontribs-example-user": "Zeijsch dem Metmaacher „<kbd lang=\"en\" xml:lang=\"en\" dir=\"ltr\">Example</kbd>“ sing Beidrähch.",
-	"apihelp-query+usercontribs-example-ipprefix": "Zeijsch de Beidrähch vun alle <i lang=\"en\" xml:lang=\"en\" dir=\"ltr\" title=\"Internet Protocol\">IP</i>-Adräße, di met „<kbd lang=\"en\" xml:lang=\"en\" dir=\"ltr\">192.0.2.</kbd>“ bejenne.",
+	"apihelp-query+usercontribs-example-user": "Zeijsch dem Metmaacher „<kbd lang=\"en\" xml:lang=\"en\" dir=\"ltr\">Example</kbd>“ sing Beijdrähsch.",
+	"apihelp-query+usercontribs-example-ipprefix": "Zeijsch de Beijdrähsch vun alle <i lang=\"en\" xml:lang=\"en\" dir=\"ltr\" title=\"Internet Protocol\">IP</i>-Adräße, di met „<kbd lang=\"en\" xml:lang=\"en\" dir=\"ltr\">192.0.2.</kbd>“ bejenne.",
 	"apihelp-query+userinfo-description": "Holl Aanjahbe övver dä aktoälle Metmaacher.",
+	"apihelp-query+userinfo-param-prop": "Wat för en Aanjahbe med enzschlehße:",
+	"apihelp-query+userinfo-paramvalue-prop-realname": "Deiht däm Metmaacher singe reeschtejje Nahme derbei.",
+	"apihelp-query+userinfo-paramvalue-prop-registrationdate": "Donn et Dattom vun dämm Metmaacher singe eetze Aanmäldong derbei.",
 	"apihelp-query+userinfo-example-simple": "Holl Aanjahbe övver dä aktoälle Metmaacher.",
 	"apihelp-query+userinfo-example-data": "Holl zohsäzlejje Aanjahbe övver dä aktoälle Metmaacher.",
 	"apihelp-query+users-description": "Holl Aanjahbe övver en Leß vun Metmaacher.",
@@ -775,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.",
@@ -858,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 dc73afe4c4..d9ea21af6b 100644
--- a/includes/api/i18n/lb.json
+++ b/includes/api/i18n/lb.json
@@ -37,7 +37,6 @@
 	"apihelp-feedrecentchanges-param-hideanons": "Ännerunge vun anonyme Benotzer verstoppen.",
 	"apihelp-feedrecentchanges-param-hideliu": "Ännerunge vu registréierte Benotzer verstoppen.",
 	"apihelp-feedrecentchanges-param-hidemyself": "Ännerunge vum aktuelle Benotzer verstoppen.",
-	"apihelp-feedrecentchanges-param-hidecategorization": "Ännerunge vun der Memberschaft a Kategorie verstoppen.",
 	"apihelp-feedrecentchanges-example-simple": "Rezent Ännerunge weisen",
 	"apihelp-help-example-main": "Hëllef fir den Haaptmodul.",
 	"apihelp-help-example-recursive": "All Hëllef op enger Säit",
@@ -55,6 +54,7 @@
 	"apihelp-options-description": "Astellunge fir den aktuelle Benotzer änneren.\n\nNëmmen Optiounen aus dem Haaptdeel (core) oder aus enger vun den installéierten Erweiderunge, oder Optioune mat Schlësselen déi viragestallt si mat <code>userjs-</code> (geduecht fir mat Benotzer-Scripte benotzt ze ginn), kënnen agestallt ginn.",
 	"apihelp-options-param-optionname": "Den Numm vun der Optioun deen op de Wäert vun <var>$1optionvalue</var> gesat gi muss",
 	"apihelp-options-example-reset": "All Astellungen zrécksetzen",
+	"apihelp-parse-param-disablepp": "Benotzt an där Plaz <var>$1disablelimitreport</var>.",
 	"apihelp-patrol-example-rcid": "Eng rezent Ännerung nokucken.",
 	"apihelp-patrol-example-revid": "Eng Versioun nokucken.",
 	"apihelp-protect-example-protect": "Eng Säit spären",
@@ -62,18 +62,25 @@
 	"apihelp-query+alldeletedrevisions-paraminfo-useronly": "Kann nëmme mam <var>$3user</var> benotzt ginn.",
 	"apihelp-query+alldeletedrevisions-param-user": "Nëmme Versioune vun dësem Benotzer opzielen.",
 	"apihelp-query+alldeletedrevisions-param-excludeuser": "Versioune vun dësem Benotzer net opzielen.",
+	"apihelp-query+allfileusages-paramvalue-prop-title": "Setzt den Titel vum Fichier derbäi.",
+	"apihelp-query+alllinks-paramvalue-prop-title": "Setzt den Titel vum Link derbäi.",
 	"apihelp-query+allusers-description": "All registréiert Benotzer opzielen.",
+	"apihelp-query+allusers-paramvalue-prop-implicitgroups": "Lëscht vun alle Gruppen an deenen de Benotzer automatesch dran ass.",
 	"apihelp-query+allusers-param-activeusers": "Nëmme Benotzer opzielen déi an de leschten $1 {{PLURAL:$1|Dag|Deeg}} aktiv waren.",
 	"apihelp-query+blocks-description": "Lëscht vun de gespaarte Benotzer an IP-Adressen.",
+	"apihelp-query+blocks-paramvalue-prop-range": "Setzt de Beräich vun den IP-Adressen derbäi déi vun der Spär betraff sinn.",
 	"apihelp-query+blocks-example-simple": "Lëscht vun de Spären",
 	"apihelp-query+categories-description": "All Kategorien opzielen zu deenen dës Säit gehéiert.",
+	"apihelp-query+categories-paramvalue-prop-timestamp": "Setzt den Zäitstempel vun dem Ament derbäi wou d'Kategorie derbäigesat gouf.",
 	"apihelp-query+categories-example-generator": "Informatioun iwwer all Kategorien, déi an der Säit <kbd>Albert Einstein</kbd> benotzt ginn, kréien.",
 	"apihelp-query+categorymembers-description": "All Säiten aus enger bestëmmter Kategorie opzielen.",
 	"apihelp-query+categorymembers-example-simple": "Déi éischt 10 Säiten aus der <kbd>Category:Physics</kbd> kréien.",
 	"apihelp-query+deletedrevisions-param-excludeuser": "Versioune vun dësem Benotzer net opzielen.",
 	"apihelp-query+deletedrevs-param-unique": "Nëmmen eng Versioun fir all Säit weisen.",
 	"apihelp-query+embeddedin-param-filterredir": "Wéi Viruleedungen gefiltert gi sollen.",
+	"apihelp-query+filearchive-paramvalue-prop-dimensions": "Alias fir Gréisst.",
 	"apihelp-query+filearchive-example-simple": "Eng Lëscht vun alle geläschte Fichiere weisen",
+	"apihelp-query+fileusage-paramvalue-prop-title": "Titel vun all Säit.",
 	"apihelp-query+imageinfo-paramvalue-prop-user": "Setzt fir all Versioun vum Fichier de Benotzer dobäi deen en eropgelueden huet.",
 	"apihelp-query+imageinfo-paramvalue-prop-comment": "Bemierkung iwwert d'Versioun.",
 	"apihelp-query+imageinfo-paramvalue-prop-dimensions": "Alias fir Gréisst.",
@@ -81,13 +88,18 @@
 	"apihelp-query+images-example-simple": "Eng Lëscht vun de Fichiere kréien déi op der [[Main Page|Haaptsäit]] benotzt ginn",
 	"apihelp-query+imageusage-example-simple": "Säite weisen déi [[:File:Albert Einstein Head.jpg]] benotzen",
 	"apihelp-query+info-paramvalue-prop-readable": "Ob de Benotzer dës Säit liese kann.",
+	"apihelp-query+iwlinks-paramvalue-prop-url": "Setzt déi komplett URL derbäi.",
 	"apihelp-query+langlinks-param-lang": "Nëmme Sproochlinke mat dësem Sproochcode zréckginn.",
 	"apihelp-query+links-param-namespace": "Nëmme Linken an dësen Nummräim weisen.",
+	"apihelp-query+linkshere-paramvalue-prop-title": "Titel vun all Säit.",
+	"apihelp-query+linkshere-paramvalue-prop-redirect": "Markéiere wann d'Säit eng Viruleedung ass.",
 	"apihelp-query+pageswithprop-example-generator": "Zousätzlech Informatiounen iwwer déi 10 éischt Säite kréie mat <code>_&#95;NOTOC_&#95;</code>.",
 	"apihelp-query+protectedtitles-param-namespace": "Nëmmen Titelen aus dësen Nummraim opzielen.",
 	"apihelp-query+random-param-redirect": "Eng zoufälleg Viruleedung lueden aplaz vun enger zoufälleger Säit.",
 	"apihelp-query+recentchanges-param-user": "Nëmmen Ännerunge vun dësem Benotzer opzielen.",
+	"apihelp-query+recentchanges-paramvalue-prop-comment": "Setzt d'Bemierkung vun der Ännerung derbäi.",
 	"apihelp-query+recentchanges-example-simple": "Rezent Ännerunge weisen",
+	"apihelp-query+redirects-paramvalue-prop-title": "Titel vun all Viruleedung.",
 	"apihelp-query+revisions-example-last5": "Déi lescht 5 Versioune vun der <kbd>Haaptsäit</kbd> kréien.",
 	"apihelp-query+revisions+base-paramvalue-prop-ids": "D'Nummer vun der Versioun.",
 	"apihelp-query+revisions+base-paramvalue-prop-timestamp": "Den Zäitstempel vun der Versioun.",
@@ -97,7 +109,18 @@
 	"apihelp-query+revisions+base-paramvalue-prop-comment": "Bemierkung vum Benotzer fir dës Versioun.",
 	"apihelp-query+revisions+base-paramvalue-prop-content": "Text vun der Versioun.",
 	"apihelp-query+search-param-namespace": "Nëmmen an dësen Nummräim sichen.",
+	"apihelp-query+search-paramvalue-prop-wordcount": "Setzt d'Zuel vun de Wierder vun der Säit derbäi.",
+	"apihelp-query+search-paramvalue-prop-timestamp": "Setzt den Zäitstempel vun der leschter Ännerung vun der Säit derbäi.",
+	"apihelp-query+transcludedin-paramvalue-prop-title": "Titel vun all Säit.",
 	"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.",
 	"apihelp-query+watchlist-paramvalue-prop-title": "Setzt den Titel vun der Säit derbäi.",
diff --git a/includes/api/i18n/lv.json b/includes/api/i18n/lv.json
index 08a1207d8c..b163c22706 100644
--- a/includes/api/i18n/lv.json
+++ b/includes/api/i18n/lv.json
@@ -8,5 +8,6 @@
 	"apihelp-block-description": "Bloķēt lietotāju",
 	"apihelp-block-param-reason": "Bloķēšanas iemesls:",
 	"apihelp-delete-description": "Dzēst lapas",
+	"apihelp-emailuser-description": "Sūtīt e-pastu lietotājam",
 	"apihelp-userrights-param-userid": "Lietotāja ID:"
 }
diff --git a/includes/api/i18n/mr.json b/includes/api/i18n/mr.json
new file mode 100644
index 0000000000..74db7424a6
--- /dev/null
+++ b/includes/api/i18n/mr.json
@@ -0,0 +1,12 @@
+{
+	"@metadata": {
+		"authors": [
+			"Rahuldeshmukh101",
+			"V.narsikar"
+		]
+	},
+	"apihelp-main-param-action": "कोणती कार्यवाही करावयाची.",
+	"apihelp-main-param-curtimestamp": "निकालात सद्य वेळठश्याचा अंतर्भाव करा.",
+	"apihelp-block-description": "सदस्यास प्रतिबंधित करा.",
+	"apihelp-block-param-user": "सदस्याचे नाव, अंक-पत्त्ता, किंवा प्रतिबंध करण्यासाठीचा आयपीचा आवाका."
+}
diff --git a/includes/api/i18n/nap.json b/includes/api/i18n/nap.json
index a285b04a3e..0d3044016d 100644
--- a/includes/api/i18n/nap.json
+++ b/includes/api/i18n/nap.json
@@ -1,10 +1,18 @@
 {
 	"@metadata": {
 		"authors": [
-			"Chelin"
+			"Chelin",
+			"C.R."
 		]
 	},
 	"apihelp-block-description": "Blocca n'utente.",
 	"apihelp-createaccount-param-name": "Nomme utente.",
-	"apihelp-delete-description": "Scancella 'na paggena."
+	"apihelp-delete-description": "Scancella 'na paggena.",
+	"apihelp-edit-example-edit": "Cagna paggena.",
+	"apihelp-emailuser-description": "E-mail a n'utente.",
+	"apihelp-feedwatchlist-param-feedformat": "'O furmato d' 'o feed.",
+	"apihelp-login-example-login": "Tràse.",
+	"apihelp-move-description": "Mòve paggena.",
+	"apihelp-opensearch-param-search": "Ascìa stringa.",
+	"apihelp-opensearch-param-format": "'O furmato 'e ll'output."
 }
diff --git a/includes/api/i18n/nl.json b/includes/api/i18n/nl.json
index 41443c6dd7..c96187253c 100644
--- a/includes/api/i18n/nl.json
+++ b/includes/api/i18n/nl.json
@@ -38,8 +38,8 @@
 	"apihelp-edit-param-bot": "Markeer deze bewerking als bot.",
 	"apihelp-edit-param-createonly": "Bewerk de pagina niet als die al bestaat.",
 	"apihelp-edit-param-nocreate": "Geef een foutmelding als de pagina niet bestaat.",
-	"apihelp-edit-param-watch": "Voeg de pagina toe aan je huidige volglijst.",
-	"apihelp-edit-param-unwatch": "Verwijder de pagina van je huidige volglijst.",
+	"apihelp-edit-param-watch": "Voeg de pagina toe aan de volglijst van de huidige gebruiker.",
+	"apihelp-edit-param-unwatch": "Verwijder de pagina van de volglijst van de huidige gebruiker.",
 	"apihelp-edit-example-edit": "Pagina bewerken",
 	"apihelp-emailuser-description": "Gebruiker e-mailen.",
 	"apihelp-emailuser-param-target": "Gebruiker naar wie de e-mail moet worden gestuurd.",
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 b7fdf5479c..d2ebb3ae05 100644
--- a/includes/api/i18n/pl.json
+++ b/includes/api/i18n/pl.json
@@ -9,7 +9,9 @@
 			"Macofe",
 			"Pio387",
 			"Peter Bowman",
-			"Darellur"
+			"Darellur",
+			"The Polish",
+			"Matma Rex"
 		]
 	},
 	"apihelp-main-param-action": "Wybierz akcję do wykonania.",
@@ -77,6 +79,7 @@
 	"apihelp-expandtemplates-param-title": "Tytuł strony.",
 	"apihelp-expandtemplates-param-text": "Wikitext do przekonwertowania.",
 	"apihelp-expandtemplates-paramvalue-prop-wikitext": "Rozszerzony wikitext.",
+	"apihelp-feedcontributions-param-feedformat": "Format danych wyjściowych.",
 	"apihelp-feedcontributions-param-year": "Od roku (i wcześniej).",
 	"apihelp-feedcontributions-param-month": "Od miesiąca (i wcześniej).",
 	"apihelp-feedcontributions-param-deletedonly": "Pokazuj tylko usunięty wkład.",
@@ -220,8 +223,10 @@
 	"apihelp-query+embeddedin-param-filterredir": "Jaki filtrować przekierowania.",
 	"apihelp-query+extlinks-param-limit": "Ilość linków do zwrócenia.",
 	"apihelp-query+exturlusage-param-limit": "Ilość stron do zwrócenia.",
+	"apihelp-query+filearchive-paramvalue-prop-dimensions": "Alias rozmiaru.",
 	"apihelp-query+filearchive-example-simple": "Pokaż listę wszystkich usuniętych plików.",
 	"apihelp-query+filerepoinfo-example-simple": "Uzyskaj informacje na temat repozytoriów plików.",
+	"apihelp-query+fileusage-paramvalue-prop-title": "Nazwa każdej strony.",
 	"apihelp-query+fileusage-param-limit": "Ilość do zwrócenia.",
 	"apihelp-query+imageinfo-paramvalue-prop-canonicaltitle": "Dodaje kanoniczny tytuł pliku.",
 	"apihelp-query+imageinfo-paramvalue-prop-dimensions": "Alias rozmiaru.",
@@ -234,7 +239,9 @@
 	"apihelp-query+info-paramvalue-prop-readable": "Czy użytkownik może przeczytać tę stronę.",
 	"apihelp-query+iwbacklinks-param-prefix": "Prefix interwiki.",
 	"apihelp-query+iwbacklinks-param-limit": "Łączna ilość stron do zwrócenia.",
+	"apihelp-query+iwlinks-paramvalue-prop-url": "Dodaje pełny adres URL.",
 	"apihelp-query+links-param-limit": "Ilość linków do zwrócenia.",
+	"apihelp-query+linkshere-paramvalue-prop-title": "Nazwa każdej strony.",
 	"apihelp-query+linkshere-param-limit": "Ilość do zwrócenia.",
 	"apihelp-query+logevents-description": "Pobierz eventy z logu.",
 	"apihelp-query+logevents-example-simple": "Lista ostatnich zarejestrowanych zdarzeń.",
@@ -251,6 +258,7 @@
 	"apihelp-query+recentchanges-param-excludeuser": "Nie listuj zmian dokonanych przez tego użytkownika.",
 	"apihelp-query+recentchanges-param-tag": "Pokazuj tylko zmiany oznaczone tym tagiem.",
 	"apihelp-query+recentchanges-example-simple": "Lista ostatnich zmian.",
+	"apihelp-query+redirects-paramvalue-prop-title": "Nazwa każdego przekierowania.",
 	"apihelp-query+redirects-param-limit": "Ile przekierowań zwrócić.",
 	"apihelp-query+revisions+base-paramvalue-prop-ids": "Identyfikator wersji.",
 	"apihelp-query+revisions+base-paramvalue-prop-flags": "Znaczniki wersji (drobne).",
@@ -264,6 +272,8 @@
 	"apihelp-query+search-param-limit": "Łączna liczba stron do zwrócenia.",
 	"apihelp-query+search-param-interwiki": "Dołączaj wyniki wyszukiwań interwiki w wyszukiwarce, jeśli możliwe.",
 	"apihelp-query+search-example-simple": "Szukaj <kbd>meaning</kbd>.",
+	"apihelp-query+siteinfo-paramvalue-prop-namespaces": "Lista zarejestrowanych przestrzeni nazw i ich nazwy kanoniczne.",
+	"apihelp-query+siteinfo-paramvalue-prop-namespacealiases": "Lista zarejestrowanych aliasów przestrzeni nazw.",
 	"apihelp-query+siteinfo-example-simple": "Pobierz informacje o stronie.",
 	"apihelp-query+tags-description": "Lista zmian tagów.",
 	"apihelp-query+tags-param-limit": "Maksymalna liczba tagów do wyświetlenia.",
@@ -317,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 82e05ffb1a..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,14 +149,14 @@
 	"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.",
 	"apihelp-parse-paramvalue-prop-iwlinks": "Fornece links interwiki no wikitexto analisado.",
 	"apihelp-parse-paramvalue-prop-wikitext": "Fornece o wikitexto original que foi analisado.",
 	"apihelp-parse-paramvalue-prop-properties": "Fornece várias propriedades definidas no wikitexto analisado.",
-	"apihelp-parse-paramvalue-prop-limitreportdata": "Fornece o relatório limite de uma forma estruturada. Não informa dado, quando<var>$1disablepp</var> se definido.",
+	"apihelp-parse-paramvalue-prop-limitreportdata": "Fornece o relatório limite de uma forma estruturada. Não informa dado, quando<var>$1disablelimitreport</var> se definido.",
 	"apihelp-parse-example-page": "Analisa uma página.",
 	"apihelp-parse-example-text": "Analisa wikitexto.",
 	"apihelp-parse-example-texttitle": "Analisa wikitexto, especificando o título da 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 99d9c99df5..b851152830 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}}",
@@ -157,7 +158,6 @@
 	"apihelp-feedrecentchanges-param-hideliu": "{{doc-apihelp-param|feedrecentchanges|hideliu}}",
 	"apihelp-feedrecentchanges-param-hidepatrolled": "{{doc-apihelp-param|feedrecentchanges|hidepatrolled}}",
 	"apihelp-feedrecentchanges-param-hidemyself": "{{doc-apihelp-param|feedrecentchanges|hidemyself}}",
-	"apihelp-feedrecentchanges-param-hidecategorization": "{{doc-apihelp-param|feedrecentchanges|hidecategorization}}",
 	"apihelp-feedrecentchanges-param-tagfilter": "{{doc-apihelp-param|feedrecentchanges|tagfilter}}",
 	"apihelp-feedrecentchanges-param-target": "{{doc-apihelp-param|feedrecentchanges|target}}",
 	"apihelp-feedrecentchanges-param-showlinkedto": "{{doc-apihelp-param|feedrecentchanges|showlinkedto}}",
@@ -293,8 +293,10 @@
 	"apihelp-parse-param-effectivelanglinks": "{{doc-apihelp-param|parse|effectivelanglinks}}",
 	"apihelp-parse-param-section": "{{doc-apihelp-param|parse|section}}",
 	"apihelp-parse-param-sectiontitle": "{{doc-apihelp-param|parse|sectiontitle}}",
+	"apihelp-parse-param-disablelimitreport": "{{doc-apihelp-param|parse|disablelimitreport}}",
 	"apihelp-parse-param-disablepp": "{{doc-apihelp-param|parse|disablepp}}",
 	"apihelp-parse-param-disableeditsection": "{{doc-apihelp-param|parse|disableeditsection}}",
+	"apihelp-parse-param-disabletidy": "{{doc-apihelp-param|parse|disabletidy}}",
 	"apihelp-parse-param-generatexml": "{{doc-apihelp-param|parse|generatexml|params=* $1 - Value of the constant CONTENT_MODEL_WIKITEXT|paramstart=2}}",
 	"apihelp-parse-param-preview": "{{doc-apihelp-param|parse|preview}}",
 	"apihelp-parse-param-sectionpreview": "{{doc-apihelp-param|parse|sectionpreview}}",
@@ -455,7 +457,7 @@
 	"apihelp-query+allredirects-param-to": "{{doc-apihelp-param|query+allredirects|to}}",
 	"apihelp-query+allredirects-param-prefix": "{{doc-apihelp-param|query+allredirects|prefix}}",
 	"apihelp-query+allredirects-param-unique": "{{doc-apihelp-param|query+allredirects|unique}}",
-	"apihelp-query+allredirects-param-prop": "{{doc-apihelp-param|query+allredirects|prop|paramvalue=1}}",
+	"apihelp-query+allredirects-param-prop": "{{doc-apihelp-param|query+allredirects|prop|paramvalues=1}}",
 	"apihelp-query+allredirects-paramvalue-prop-ids": "{{doc-apihelp-param|query+allredirects|prop|ids}}",
 	"apihelp-query+allredirects-paramvalue-prop-title": "{{doc-apihelp-param|query+allredirects|prop|title}}",
 	"apihelp-query+allredirects-paramvalue-prop-fragment": "{{doc-apihelp-param|query+allredirects|prop|fragment}}",
@@ -508,7 +510,7 @@
 	"apihelp-query+backlinks-param-dir": "{{doc-apihelp-param|query+backlinks|dir}}",
 	"apihelp-query+backlinks-param-filterredir": "{{doc-apihelp-param|query+backlinks|filterredir}}",
 	"apihelp-query+backlinks-param-limit": "{{doc-apihelp-param|query+backlinks|limit}}",
-	"apihelp-query+backlinks-param-redirect": "{{doc-apihelp-param|query+backlinks|redirect}}",
+	"apihelp-query+backlinks-param-redirect": "\"Is halved\" means that the limits are half of the usual ones.\n----\n{{doc-apihelp-param|query+backlinks|redirect}}",
 	"apihelp-query+backlinks-example-simple": "{{doc-apihelp-example|query+backlinks}}",
 	"apihelp-query+backlinks-example-generator": "{{doc-apihelp-example|query+backlinks}}",
 	"apihelp-query+blocks-description": "{{doc-apihelp-description|query+blocks}}",
@@ -675,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}}",
@@ -865,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}}",
@@ -966,6 +969,7 @@
 	"apihelp-query+search-param-limit": "{{doc-apihelp-param|query+search|limit}}",
 	"apihelp-query+search-param-interwiki": "{{doc-apihelp-param|query+search|interwiki}}",
 	"apihelp-query+search-param-backend": "{{doc-apihelp-param|query+search|backend}}",
+	"apihelp-query+search-param-enablerewrites": "{{doc-apihelp-param|query+search|enablerewrites}}",
 	"apihelp-query+search-example-simple": "{{doc-apihelp-example|query+search}}",
 	"apihelp-query+search-example-text": "{{doc-apihelp-example|query+search}}",
 	"apihelp-query+search-example-generator": "{{doc-apihelp-example|query+search}}",
diff --git a/includes/api/i18n/ru.json b/includes/api/i18n/ru.json
index 2accd1fd29..56b3f5b474 100644
--- a/includes/api/i18n/ru.json
+++ b/includes/api/i18n/ru.json
@@ -8,14 +8,15 @@
 			"Mariya",
 			"Дмитрий",
 			"WindEwriX",
-			"Ochilov"
+			"Ochilov",
+			"Nzeemin"
 		]
 	},
 	"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": "Включить в результаты имя хоста, обработавшего запрос.",
@@ -85,15 +86,25 @@
 	"apihelp-expandtemplates-paramvalue-prop-parsetree": "Дерево разбора XML входных данных.",
 	"apihelp-feedcontributions-param-year": "От года (и ранее).",
 	"apihelp-feedcontributions-param-month": "От месяца (и ранее).",
+	"apihelp-feedcontributions-param-newonly": "Показывать только правки, являющиеся созданием страниц.",
+	"apihelp-feedcontributions-param-showsizediff": "Показать размер различия между версиями.",
+	"apihelp-feedrecentchanges-param-limit": "Максимальное число возвращаемых результатов.",
+	"apihelp-feedrecentchanges-param-from": "Показать изменения с тех пор.",
 	"apihelp-feedrecentchanges-param-hideminor": "Скрыть малые правки.",
 	"apihelp-feedrecentchanges-param-hidebots": "Скрыть правки ботов.",
+	"apihelp-feedrecentchanges-param-hideanons": "Скрыть изменения, внесённые анонимными участниками.",
 	"apihelp-feedrecentchanges-param-hidepatrolled": "Скрыть отпатруллированные правки.",
+	"apihelp-feedrecentchanges-param-hidemyself": "Скрыть изменения, сделанные текущим участником.",
 	"apihelp-feedrecentchanges-param-tagfilter": "Фильтр по тегам.",
 	"apihelp-feedrecentchanges-example-simple": "Список последних изменений.",
 	"apihelp-feedrecentchanges-example-30days": "Показать последние изменения в течение 30 дней.",
 	"apihelp-filerevert-param-comment": "Загрузить комментарий.",
 	"apihelp-help-example-main": "Помощь по главному модулю.",
 	"apihelp-help-example-recursive": "Вся справка в одном разделе.",
+	"apihelp-imagerotate-description": "Поворот одного или нескольких изображений.",
+	"apihelp-imagerotate-param-rotation": "На сколько градусов по часовой стрелке повернуть изображение.",
+	"apihelp-imagerotate-example-simple": "Повернуть <kbd>File:Example.png</kbd> на <kbd>90</kbd> градусов.",
+	"apihelp-imagerotate-example-generator": "Повернуть все изображения в <kbd>Category:Flip</kbd> на <kbd>180</kbd> градусов.",
 	"apihelp-import-param-summary": "Импорт итога",
 	"apihelp-import-param-xml": "Загруженный XML-файл.",
 	"apihelp-login-param-name": "Имя участника.",
@@ -102,14 +113,25 @@
 	"apihelp-login-example-login": "Войти",
 	"apihelp-logout-description": "Выйти и очистить данные сессии.",
 	"apihelp-move-description": "Переместить страницу.",
+	"apihelp-move-param-reason": "Причина переименования.",
+	"apihelp-move-param-movetalk": "Переименовать страницу обсуждения, если она есть.",
+	"apihelp-move-param-movesubpages": "Переименовать подстраницы, если это применимо.",
+	"apihelp-move-param-noredirect": "Не создавать перенаправление.",
 	"apihelp-move-param-ignorewarnings": "Игнорировать предупреждения",
 	"apihelp-opensearch-param-search": "Строка поиска.",
+	"apihelp-opensearch-param-limit": "Максимальное число возвращаемых результатов.",
+	"apihelp-opensearch-param-namespace": "Пространства имён для поиска.",
+	"apihelp-options-example-reset": "Сбросить все настройки.",
+	"apihelp-paraminfo-param-helpformat": "Формат строк справки.",
 	"apihelp-parse-example-page": "анализ страницы",
 	"apihelp-parse-example-text": "Анализ wikitext.",
 	"apihelp-protect-example-protect": "Защитить страницу.",
 	"apihelp-purge-param-forcelinkupdate": "Обновление связей таблиц.",
 	"apihelp-query-param-list": "Какие списки использовать",
 	"apihelp-query-param-meta": "Какие метаданные использовать",
+	"apihelp-query+allcategories-description": "Перечислить все категории.",
+	"apihelp-query+allcategories-param-limit": "Сколько категорий вернуть.",
+	"apihelp-query+allcategories-param-prop": "Какие свойства получить:",
 	"apihelp-query+alllinks-example-unique-generator": "Получить все названия-ссылки, выделяя пропущенные.",
 	"apihelp-query+blocks-example-simple": "Список блоков.",
 	"apihelp-query+categories-param-limit": "Сколько категорий на возврат.",
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/sv.json b/includes/api/i18n/sv.json
index 7ae00b393a..83f4d808bb 100644
--- a/includes/api/i18n/sv.json
+++ b/includes/api/i18n/sv.json
@@ -41,6 +41,10 @@
 	"apihelp-block-param-watchuser": "Bevaka användarens eller IP-adressens användarsida och diskussionssida",
 	"apihelp-block-example-ip-simple": "Blockera IP-adressen <kbd>192.0.2.5</kbd> i tre dagar med motivationen <kbd>First strike</kbd>",
 	"apihelp-block-example-user-complex": "Blockera användare <kbd>Vandal</kbd> på obegränsad tid med motivationen <kbd>Vandalism</kbd>, och förhindra kontoskapande och e-post.",
+	"apihelp-checktoken-param-type": "Typ av token som testas.",
+	"apihelp-checktoken-param-token": "Token att testa.",
+	"apihelp-checktoken-param-maxtokenage": "Högsta tillåtna åldern för token, i sekunder.",
+	"apihelp-checktoken-example-simple": "Testa giltigheten av en <kbd>csrf</kbd>-token.",
 	"apihelp-clearhasmsg-description": "Rensa <code>hasmsg</code>-flaggan för den aktuella användaren.",
 	"apihelp-clearhasmsg-example-1": "Rensa <code>hasmsg</code>-flaggan för den aktuella användaren",
 	"apihelp-compare-description": "Hämta skillnaden mellan två sidor.\n\nEtt versionsnummer, en sidtitel, eller ett sid-Id för både \"from\" och \"to\" måste skickas.",
@@ -81,6 +85,7 @@
 	"apihelp-edit-param-sectiontitle": "Rubriken för ett nytt avsnitt.",
 	"apihelp-edit-param-text": "Sidans innehåll.",
 	"apihelp-edit-param-summary": "Redigeringssammanfattning. Även avsnittets rubrik när $1section=new och $1sectiontitle inte anges.",
+	"apihelp-edit-param-tags": "Ändra taggar till att gälla för revideringen.",
 	"apihelp-edit-param-minor": "Mindre redigering.",
 	"apihelp-edit-param-notminor": "Icke-mindre redigering.",
 	"apihelp-edit-param-bot": "Markera denna redigering som robotredigering.",
@@ -113,6 +118,7 @@
 	"apihelp-expandtemplates-param-title": "Sidans rubrik.",
 	"apihelp-expandtemplates-param-text": "Wikitext att konvertera.",
 	"apihelp-expandtemplates-param-revid": "Revision ID, för <nowiki>{{REVISIONID}}</nowiki> och liknande variabler.",
+	"apihelp-expandtemplates-paramvalue-prop-wikitext": "Den expanderade wikitexten.",
 	"apihelp-expandtemplates-param-includecomments": "Om HTML-kommentarer skall inkluderas i utdata.",
 	"apihelp-expandtemplates-param-generatexml": "Generera ett XML tolknings träd (ersatt av $1prop=parsetree).",
 	"apihelp-expandtemplates-example-simple": "Expandera wikitexten <kbd><nowiki>{{Projekt:Sandbox}}</nowiki></kbd>.",
@@ -167,6 +173,7 @@
 	"apihelp-help-example-main": "Hjälp för huvudmodul",
 	"apihelp-help-example-recursive": "All hjälp på en sida",
 	"apihelp-help-example-help": "Hjälp för själva hjälpmodulen",
+	"apihelp-help-example-query": "Hjälp för två frågeundermoduler.",
 	"apihelp-imagerotate-description": "Rotera en eller flera bilder.",
 	"apihelp-imagerotate-param-rotation": "Grader att rotera bild medurs.",
 	"apihelp-imagerotate-example-simple": "Rotera <kbd>File:Example.png</kbd> med <kbd>90</kbd> grader",
@@ -227,6 +234,7 @@
 	"apihelp-parse-param-summary": "Sammanfattning att tolka.",
 	"apihelp-parse-param-page": "Tolka innehållet av denna sida. Kan inte användas tillsammans med <var>$1text</var> och <var>$1title</var>.",
 	"apihelp-parse-param-pageid": "Tolka innehållet på denna sida. Åsidosätter <var>$1sidan</var>.",
+	"apihelp-parse-param-prop": "Vilka bitar av information att få:",
 	"apihelp-parse-paramvalue-prop-categorieshtml": "Ger HTML-version av kategorierna.",
 	"apihelp-parse-param-preview": "Tolka i preview-läget.",
 	"apihelp-parse-example-page": "Tolka en sida.",
@@ -331,6 +339,14 @@
 	"apihelp-query+backlinks-param-dir": "Riktningen att lista mot.",
 	"apihelp-query+backlinks-example-simple": "Visa länkar till <kbd>huvudsidan<kbd>.",
 	"apihelp-query+blocks-description": "Lista alla blockerade användare och IP-adresser.",
+	"apihelp-query+blocks-param-prop": "Vilka egenskaper att hämta.",
+	"apihelp-query+blocks-paramvalue-prop-id": "Lägger till ID på blocket.",
+	"apihelp-query+blocks-paramvalue-prop-user": "Lägger till användarnamn för den blockerade användaren.",
+	"apihelp-query+blocks-paramvalue-prop-userid": "Lägger till användar-ID för den blockerade användaren.",
+	"apihelp-query+blocks-paramvalue-prop-timestamp": "Lägger till en tidsstämpel för när blockeringen gavs.",
+	"apihelp-query+blocks-paramvalue-prop-expiry": "Lägger till en tidsstämpel för när blockeringen går ut.",
+	"apihelp-query+blocks-paramvalue-prop-reason": "Lägger till de skäl som angetts för blockeringen.",
+	"apihelp-query+blocks-paramvalue-prop-range": "Lägger till intervallet av IP-adresser som berörs av blockeringen.",
 	"apihelp-query+blocks-example-simple": "Lista blockeringar.",
 	"apihelp-query+blocks-example-users": "Lista blockeringar av användarna <kbd>Alice</kbd> och <kbd>Bob</kbd>.",
 	"apihelp-query+categories-description": "Lista alla kategorier sidorna tillhör.",
@@ -342,6 +358,8 @@
 	"apihelp-query+categoryinfo-description": "Returnerar information om angivna kategorier.",
 	"apihelp-query+categoryinfo-example-simple": "Hämta information om <kbd>Category:Foo</kbd> och <kbd>Category:Bar</kbd>.",
 	"apihelp-query+categorymembers-description": "Lista alla sidor i en angiven kategori.",
+	"apihelp-query+categorymembers-paramvalue-prop-ids": "Lägger till sid-ID.",
+	"apihelp-query+categorymembers-paramvalue-prop-title": "Lägger till titeln och namnrymds-ID för sidan.",
 	"apihelp-query+categorymembers-param-dir": "I vilken riktning att sortera.",
 	"apihelp-query+categorymembers-param-startsortkey": "Använd $1starthexsortkey istället.",
 	"apihelp-query+categorymembers-param-endsortkey": "Använd $1endhexsortkey istället.",
@@ -359,7 +377,11 @@
 	"apihelp-query+embeddedin-param-dir": "Riktningen att lista mot.",
 	"apihelp-query+embeddedin-param-limit": "Hur många sidor att returnera totalt.",
 	"apihelp-query+filearchive-param-dir": "Riktningen att lista mot.",
+	"apihelp-query+filearchive-paramvalue-prop-timestamp": "Lägger till tidsstämpel för den uppladdade versionen.",
+	"apihelp-query+filearchive-paramvalue-prop-user": "Lägger till användaren som laddade upp bildversionen.",
 	"apihelp-query+filearchive-example-simple": "Visa en lista över alla borttagna filer.",
+	"apihelp-query+fileusage-paramvalue-prop-title": "Titel för varje sida.",
+	"apihelp-query+fileusage-paramvalue-prop-redirect": "Flagga om sidan är en omdirigering.",
 	"apihelp-query+imageinfo-paramvalue-prop-userid": "Lägg till det användar-ID som laddade upp varje filversion.",
 	"apihelp-query+images-param-dir": "Riktningen att lista mot.",
 	"apihelp-query+imageusage-param-dir": "Riktningen att lista mot.",
diff --git a/includes/api/i18n/uk.json b/includes/api/i18n/uk.json
index a0d7c96923..194e10ff8e 100644
--- a/includes/api/i18n/uk.json
+++ b/includes/api/i18n/uk.json
@@ -4,7 +4,9 @@
 			"Ата",
 			"A1",
 			"Ahonc",
-			"Base"
+			"Base",
+			"Dars",
+			"Umherirrender"
 		]
 	},
 	"apihelp-main-description": "<div class=\"hlist plainlinks api-main-links\">\n* [[mw:API:Main_page|Документація]]\n* [[mw:API:FAQ|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: Errors and warnings]].",
@@ -151,7 +153,6 @@
 	"apihelp-feedrecentchanges-param-hideliu": "Приховати редагування зареєстрованих користувачів.",
 	"apihelp-feedrecentchanges-param-hidepatrolled": "Приховати відпатрульовані редагування.",
 	"apihelp-feedrecentchanges-param-hidemyself": "Приховати редагування поточного користувача.",
-	"apihelp-feedrecentchanges-param-hidecategorization": "Приховати зміни в членстві в категорії.",
 	"apihelp-feedrecentchanges-param-tagfilter": "Фільтрувати за теґом.",
 	"apihelp-feedrecentchanges-param-target": "Показати лише зміни на сторінках, на які посилається ця сторінка.",
 	"apihelp-feedrecentchanges-param-showlinkedto": "Показати натомість лише зміни на сторінках, які посилаються на цю сторінку.",
@@ -279,15 +280,15 @@
 	"apihelp-parse-paramvalue-prop-iwlinks": "Дає інтервікі-посилання в аналізованому вікітексті.",
 	"apihelp-parse-paramvalue-prop-wikitext": "Дає вихідний вікітекст, який було аналізовано.",
 	"apihelp-parse-paramvalue-prop-properties": "Дає різні властивості, визначені в аналізованому вікітексті.",
-	"apihelp-parse-paramvalue-prop-limitreportdata": "Дає звіт по обмеженнях у структурованому вигляді. Не видає даних, якщо встановлено <var>$1disablepp</var>.",
-	"apihelp-parse-paramvalue-prop-limitreporthtml": "Дає HTML-версію звіту по обмеженнях. Не видає даних, якщо встановлено <var>$1disablepp</var>.",
+	"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>)",
 	"apihelp-parse-param-pst": "Зробіть трансформацію вхідних даних перед збереженням і аналізом. Дійсне лише при використанні з текстом.",
 	"apihelp-parse-param-onlypst": "Зробіть трансформацію вхідних даних перед збереженням (PST), але не аналізуйте. Видає той самий вікітекст, після застосування PST. Дійсне лише у разі використання з <var>$1text</var>.",
 	"apihelp-parse-param-effectivelanglinks": "Включає мовні посилання, додані розширеннями (для використання з <kbd>$1prop=langlinks</kbd>).",
 	"apihelp-parse-param-section": "Видає вміст лише розділу з цим номером або при <kbd>new</kbd> створенні нового розділу.\n\n<kbd>new</kbd> розділ відзначається лише при вказанні тексту <var>text</var>.",
 	"apihelp-parse-param-sectiontitle": "Заголовок нового розділу, коли <var>section</var> має значення <kbd>new</kbd>.\n\nНа відміну від редагування сторінки, це не повертається до <var>summary</var>, якщо пропустити чи лишити порожнім.",
-	"apihelp-parse-param-disablepp": "Пропустити звіт препроцесора («NewPP limit report») на виході аналізу.",
+	"apihelp-parse-param-disablelimitreport": "Пропустити звіт препроцесора («NewPP limit report») на виході аналізу.",
 	"apihelp-parse-param-disableeditsection": "Пропустити посилання на редагування розділів на виході аналізу.",
 	"apihelp-parse-param-generatexml": "Генерувати синтаксичне дерево XML (передбачає модель вмісту <code>$1</code>; замінено на <kbd>$2prop=parsetree</kbd>).",
 	"apihelp-parse-param-preview": "Аналізувати у режимі попереднього перегляду.",
@@ -342,7 +343,7 @@
 	"apihelp-query+allcategories-param-limit": "Скільки категорій видати.",
 	"apihelp-query+allcategories-param-prop": "Які властивості отримати:",
 	"apihelp-query+allcategories-paramvalue-prop-size": "Додає номер сторінок у категорії.",
-	"apihelp-query+allcategories-paramvalue-prop-hidden": "Теґує категорії, приховані з _&#95;HIDDENCAT_&#95;.",
+	"apihelp-query+allcategories-paramvalue-prop-hidden": "Теґує категорії, приховані з <code>_&#95;HIDDENCAT_&#95;</code>.",
 	"apihelp-query+allcategories-example-size": "Перерахувати категорії з інформацією про кількість сторінок у кожній.",
 	"apihelp-query+allcategories-example-generator": "Отримати інформацію про саму сторінку категорії для категорій, що починаються з <kbd>List</kbd>.",
 	"apihelp-query+alldeletedrevisions-description": "Перерахувати усі вилучені версії за користувачем або у просторі назв.",
@@ -367,7 +368,7 @@
 	"apihelp-query+allfileusages-param-prefix": "Шукати усі назви файлів, які починаються з цього значення.",
 	"apihelp-query+allfileusages-param-unique": "Показувати лише окремі назви файлів. Не може використовуватися разом з $1prop=ids.\nКоли використовується як генератор, видає цільові сторінки замість вихідних сторінок.",
 	"apihelp-query+allfileusages-param-prop": "Які відомості включати:",
-	"apihelp-query+allfileusages-paramvalue-prop-ids": "Додає ідентифікатори сторінок, що використовують (не можна використати разом з $1unique).",
+	"apihelp-query+allfileusages-paramvalue-prop-ids": "Додає ідентифікатори із використаних сторінок (не буде використовуватися, при єдиній $1).",
 	"apihelp-query+allfileusages-paramvalue-prop-title": "Додає назву файлу.",
 	"apihelp-query+allfileusages-param-limit": "Скільки всього елементів виводити.",
 	"apihelp-query+allfileusages-param-dir": "Напрямок, у якому перелічити.",
@@ -530,7 +531,7 @@
 	"apihelp-query+categories-param-prop": "Які додаткові властивості отримати для кожної категорії:",
 	"apihelp-query+categories-paramvalue-prop-sortkey": "Додає ключ сортування (шістнадцятковий рядок) і префікс ключа сортування (людиночитна частина) для категорії.",
 	"apihelp-query+categories-paramvalue-prop-timestamp": "Додає мітку часу, коли категорію було додано.",
-	"apihelp-query+categories-paramvalue-prop-hidden": "Тегує приховані категорії з допомогою _&#95;HIDDENCAT_&#95;.",
+	"apihelp-query+categories-paramvalue-prop-hidden": "Тегує приховані категорії з допомогою <code>_&#95;HIDDENCAT_&#95;</code>.",
 	"apihelp-query+categories-param-show": "Який тип категорій показувати.",
 	"apihelp-query+categories-param-limit": "Скільки категорій видати.",
 	"apihelp-query+categories-param-categories": "Перерахувати лише ці категорії. Корисно для перевірки, чи певна сторінка є в певній категорії.",
@@ -650,7 +651,7 @@
 	"apihelp-query+filearchive-paramvalue-prop-mediatype": "Додає медіатип зображення.",
 	"apihelp-query+filearchive-paramvalue-prop-metadata": "Вилає Exif-метадані версії зображення.",
 	"apihelp-query+filearchive-paramvalue-prop-bitdepth": "Додає бітну глибину версії.",
-	"apihelp-query+filearchive-paramvalue-prop-archivename": "Додає назву файлу архівної версії для неостанніх версій.",
+	"apihelp-query+filearchive-paramvalue-prop-archivename": "Додає до імені версію архіву для неостаточного варіанту файлу.",
 	"apihelp-query+filearchive-example-simple": "Показати список усіх вилучених файлів.",
 	"apihelp-query+filerepoinfo-description": "Видати мета-інформацію про репозиторії зображень, налаштовані на вікі.",
 	"apihelp-query+filerepoinfo-param-prop": "Які властивості репозиторію отримати (на деяких вікі може бути більше):\n;apiurl:URL до репозиторію API — корисне для отримання інформації про зображення з хосту.\n;name:Ключ репозиторію — використано в e.g. <var>[[mw:Manual:$wgForeignFileRepos|$wgForeignFileRepos]]</var> і значення [[Special:ApiHelp/query+imageinfo|imageinfo]].\n;displayname:Людиночита назва репозиторію вікі.\n;rooturl:Корінний URL для шляху зображення.\n;local:Чи репозиторій локальний, чи ні.",
@@ -754,7 +755,7 @@
 	"apihelp-query+langbacklinks-param-lang": "Мова мовного посилання.",
 	"apihelp-query+langbacklinks-param-title": "Мовне посилання для пошуку. Мусить бути використане з $1lang.",
 	"apihelp-query+langbacklinks-param-limit": "Скільки всього сторінок виводити.",
-	"apihelp-query+langbacklinks-param-prop": "Які властивості отримати:",
+	"apihelp-query+langbacklinks-param-prop": "Які властивості для отримання:",
 	"apihelp-query+langbacklinks-paramvalue-prop-lllang": "Додає код мови мовного посилання.",
 	"apihelp-query+langbacklinks-paramvalue-prop-lltitle": "Додає назву мовного посилання.",
 	"apihelp-query+langbacklinks-param-dir": "Напрямок, у якому перелічити.",
@@ -763,7 +764,7 @@
 	"apihelp-query+langlinks-description": "Видає усі міжмовні посилання із вказаних сторінок.",
 	"apihelp-query+langlinks-param-limit": "Скільки мовних посилань виводити.",
 	"apihelp-query+langlinks-param-url": "Чи отримувати повну URL-адресу (не може використовуватися з <var>$1prop</var>).",
-	"apihelp-query+langlinks-param-prop": "Які додаткові властивості отримати для кожного міжмовного посилання:",
+	"apihelp-query+langlinks-param-prop": "Які додаткові властивості для отримання кожного із міжмовного посилання:",
 	"apihelp-query+langlinks-paramvalue-prop-url": "Додає повну URL-адресу.",
 	"apihelp-query+langlinks-paramvalue-prop-langname": "Додає локалізовану назву мови (найкращий варіант). Використайте <var>$1inlanguagecode</var> для контролю мови.",
 	"apihelp-query+langlinks-paramvalue-prop-autonym": "Додає самоназву мови.",
@@ -784,7 +785,7 @@
 	"apihelp-query+linkshere-param-prop": "Які властивості отримати:",
 	"apihelp-query+linkshere-paramvalue-prop-pageid": "ID кожної сторінки.",
 	"apihelp-query+linkshere-paramvalue-prop-title": "Назва кожної сторінки.",
-	"apihelp-query+linkshere-paramvalue-prop-redirect": "Помітка, якщо сторінка є перенаправленням.",
+	"apihelp-query+linkshere-paramvalue-prop-redirect": "Відзначити, якщо сторінка є перенаправленням.",
 	"apihelp-query+linkshere-param-namespace": "Включати сторінки лише в цих просторах назв.",
 	"apihelp-query+linkshere-param-limit": "Скільки результатів виводити.",
 	"apihelp-query+linkshere-param-show": "Показати лише елементи, що відповідають цим критеріям:\n;redirect:Показати лише перенаправлення.\n;!redirect:Показати лише не перенаправлення.",
@@ -943,7 +944,7 @@
 	"apihelp-query+search-param-namespace": "Шукати лише в межах цих просторів назв.",
 	"apihelp-query+search-param-what": "Який тип пошуку виконати.",
 	"apihelp-query+search-param-info": "Які метадані отримати.",
-	"apihelp-query+search-param-prop": "Які властивості отримати:",
+	"apihelp-query+search-param-prop": "Які властивості для виведення:",
 	"apihelp-query+search-paramvalue-prop-size": "Додає розмір сторінки в байтах.",
 	"apihelp-query+search-paramvalue-prop-wordcount": "Додає кількість слів на сторінці.",
 	"apihelp-query+search-paramvalue-prop-timestamp": "Додає часову мітку останнього редагування сторінки.",
@@ -967,7 +968,7 @@
 	"apihelp-query+siteinfo-param-prop": "Яку інформацію отримати:",
 	"apihelp-query+siteinfo-paramvalue-prop-general": "Загальна системна інформація.",
 	"apihelp-query+siteinfo-paramvalue-prop-namespaces": "Список зареєстрованих просторів назв та їхні канонічні назви.",
-	"apihelp-query+siteinfo-paramvalue-prop-namespacealiases": "Список зареєстрованих синонімів просторів назв.",
+	"apihelp-query+siteinfo-paramvalue-prop-namespacealiases": "Список зареєстрованого простору прізвиськ.",
 	"apihelp-query+siteinfo-paramvalue-prop-specialpagealiases": "Список аліасів спеціальної сторінки.",
 	"apihelp-query+siteinfo-paramvalue-prop-magicwords": "Список магічних слів та їх аліасів.",
 	"apihelp-query+siteinfo-paramvalue-prop-statistics": "Видає статистику сайту.",
@@ -1008,7 +1009,7 @@
 	"apihelp-query+tags-paramvalue-prop-hitcount": "Додає кількість версій та записів журналу, які мають цю мітку.",
 	"apihelp-query+tags-paramvalue-prop-defined": "Показує, чи мітка визначена.",
 	"apihelp-query+tags-paramvalue-prop-source": "Отримує джерела мітки, що може включати <samp>extension</samp> для визначених розширеннями міток і <samp>manual</samp> для міток, які користувачі можуть застосовувати вручну.",
-	"apihelp-query+tags-paramvalue-prop-active": "Чи мітка ще застосовується.",
+	"apihelp-query+tags-paramvalue-prop-active": "І все ж позначка досі задіяна.",
 	"apihelp-query+tags-example-simple": "Перелічити доступні мітки.",
 	"apihelp-query+templates-description": "Видає усі сторінки, які включені на вказаних сторінках.",
 	"apihelp-query+templates-param-namespace": "Показати шаблони лише у цьому просторі назв.",
@@ -1064,13 +1065,13 @@
 	"apihelp-query+userinfo-paramvalue-prop-rights": "Перелічує усі права, які має поточний користувач.",
 	"apihelp-query+userinfo-paramvalue-prop-changeablegroups": "Перелічує групи, у які користувач може додавати і з яких вилучати.",
 	"apihelp-query+userinfo-paramvalue-prop-options": "Перелічує усі налаштування, які поточний користувач встановив.",
-	"apihelp-query+userinfo-paramvalue-prop-preferencestoken": "<span class=\"apihelp-deprecated\">Застаріло.</span> Отримати токен зміни налаштувань поточного користувача.",
+	"apihelp-query+userinfo-paramvalue-prop-preferencestoken": "<span class=\"apihelp-deprecated\">Застаріле.</span> Отримати знак для зміни налаштувань поточного користувача.",
 	"apihelp-query+userinfo-paramvalue-prop-editcount": "Додає кількість редагувань поточного користувача.",
 	"apihelp-query+userinfo-paramvalue-prop-ratelimits": "Перелічує усі ліміти оцінок, застосовні до поточного користувача.",
 	"apihelp-query+userinfo-paramvalue-prop-realname": "Додає справжнє ім'я користувача.",
 	"apihelp-query+userinfo-paramvalue-prop-email": "Додає електронну пошту користувача та дату її підтвердження.",
 	"apihelp-query+userinfo-paramvalue-prop-acceptlang": "Дублює шапку <code>Accept-Language</code>, надіслану клієнтом у структурованому форматі.",
-	"apihelp-query+userinfo-paramvalue-prop-registrationdate": "Додає дату реєстрації користувача.",
+	"apihelp-query+userinfo-paramvalue-prop-registrationdate": "ДОдає дату реєстрації користувача.",
 	"apihelp-query+userinfo-paramvalue-prop-unreadcount": "Додає кількість непрочитаних сторінок у списку спостереження користувача (максимально $1; видає «<samp>$2</samp>», якщо більше).",
 	"apihelp-query+userinfo-example-simple": "Отримати інформацію про поточного користувача.",
 	"apihelp-query+userinfo-example-data": "Отримати додаткову інформацію про поточного користувача.",
@@ -1109,7 +1110,7 @@
 	"apihelp-query+watchlist-paramvalue-prop-notificationtimestamp": "Додає мітку часу, коли користувач був востаннє сповіщений про редагування.",
 	"apihelp-query+watchlist-paramvalue-prop-loginfo": "Додає інформацію журналу, де це доречно.",
 	"apihelp-query+watchlist-param-show": "Показати лише елементи, що задовільняють ці критерії. Наприклад, для перегляду лише незначних змін, здійснених користувачами, що увійшли до системи, вкажіть $1show=minor|!anon.",
-	"apihelp-query+watchlist-param-type": "Які типи змін показувати:\n;edit:Звичайні редагування сторінки.\n;external:Зовнішні зміни.\n;new:Створення сторінок.\n;log:Записи журналу.\n;categorize:Зміни в членстві в категоріях.",
+	"apihelp-query+watchlist-param-type": "Які типи змін показувати:\n;edit:Звичайні редагування сторінки.\n;external:Зовнішні зміни.\n;new:Створення сторінок.\n;log:Записи журналу.",
 	"apihelp-query+watchlist-param-owner": "Використовується разом з $1token для доступу до списку спостереження різних користувачів.",
 	"apihelp-query+watchlist-param-token": "Токен безпеки (доступний у [[Special:Preferences#mw-prefsection-watchlist|налаштуваннях]] користувача) для отримання доступу до списку спостереження іншого користувача.",
 	"apihelp-query+watchlist-example-simple": "Перелічити верхні версії для нещодавно змінених сторінок у списку спостереження поточного користувача.",
diff --git a/includes/api/i18n/vi.json b/includes/api/i18n/vi.json
index 3ffc792b24..53bc4e8133 100644
--- a/includes/api/i18n/vi.json
+++ b/includes/api/i18n/vi.json
@@ -127,7 +127,7 @@
 	"apihelp-paraminfo-param-helpformat": "Định dạng chuỗi trợ giúp.",
 	"apihelp-parse-param-summary": "Lời tóm lược để phân tích.",
 	"apihelp-parse-param-section": "Chỉ truy xuất nội dung của số phần này; nếu có <kbd>new</kbd> thì tạo phần mới.\n\nPhần <kbd>new</kbd> chỉ được chấp nhận khi định rõ <var>text</var>.",
-	"apihelp-parse-param-disablepp": "Bỏ qua thông báo bộ tiền xử lý (“NewPP limit report”) khi cho ra kết quả bộ xử lý.",
+	"apihelp-parse-param-disablelimitreport": "Bỏ qua thông báo bộ tiền xử lý (“NewPP limit report”) khi cho ra kết quả bộ xử lý.",
 	"apihelp-parse-example-page": "Phân tích trang.",
 	"apihelp-parse-example-text": "Phân tích văn bản wiki.",
 	"apihelp-parse-example-texttitle": "Phân tích văn bản wiki theo tên trang.",
diff --git a/includes/api/i18n/zh-hans.json b/includes/api/i18n/zh-hans.json
index 76a5f008b4..dd3fb8f3ff 100644
--- a/includes/api/i18n/zh-hans.json
+++ b/includes/api/i18n/zh-hans.json
@@ -14,7 +14,8 @@
 			"Kuailong",
 			"Zhxy 519",
 			"御坂美琴",
-			"RyRubyy"
+			"RyRubyy",
+			"Umherirrender"
 		]
 	},
 	"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 header将会返回一个包含\"MediaWiki-API-Error\"的值，随后header的值与error code将会送回并设置为相同的值。详细信息请参阅[[mw:API:Errors_and_warnings|API: 错误与警告]]。",
@@ -50,7 +51,7 @@
 	"apihelp-checktoken-example-simple": "测试<kbd>csrf</kbd>令牌的有效性。",
 	"apihelp-clearhasmsg-description": "清除当前用户的<code>hasmsg</code>标记。",
 	"apihelp-clearhasmsg-example-1": "清除当前用户的<code>hasmsg</code>标记。",
-	"apihelp-compare-description": "获得2个页面之间的差别。\n\n用于“from”和“to”的修订版本号、页面标题或页面 ID 必须获得通过。",
+	"apihelp-compare-description": "获取2个页面之间的差别。\n\n用于“from”和“to”的修订版本号、页面标题或页面 ID 必须获得通过。",
 	"apihelp-compare-param-fromtitle": "要比较的第一个标题。",
 	"apihelp-compare-param-fromid": "要比较的第一个页面 ID。",
 	"apihelp-compare-param-fromrev": "要比较的第一个修订版本。",
@@ -160,7 +161,6 @@
 	"apihelp-feedrecentchanges-param-hideliu": "隐藏注册用户做出的更改。",
 	"apihelp-feedrecentchanges-param-hidepatrolled": "隐藏已巡查更改。",
 	"apihelp-feedrecentchanges-param-hidemyself": "隐藏当前用户做出的更改。",
-	"apihelp-feedrecentchanges-param-hidecategorization": "隐藏分类成员更改。",
 	"apihelp-feedrecentchanges-param-tagfilter": "按标签过滤。",
 	"apihelp-feedrecentchanges-param-target": "仅仅显示从该页面链出的那些页面的变更。",
 	"apihelp-feedrecentchanges-param-showlinkedto": "仅仅显示链入到该页面的那些页面的变更。",
@@ -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,15 +287,18 @@
 	"apihelp-parse-paramvalue-prop-indicators": "提供页面上使用的页面状态指示器的HTML。",
 	"apihelp-parse-paramvalue-prop-iwlinks": "在被解析的wiki文本中提供跨wiki链接。",
 	"apihelp-parse-paramvalue-prop-wikitext": "提供被解析的原始wiki文本。",
-	"apihelp-parse-paramvalue-prop-limitreportdata": "以结构化的方式提供限制报告。如果<var>$1disablepp</var>被设定则不提供数据。",
-	"apihelp-parse-paramvalue-prop-limitreporthtml": "提供限制报告的HTML版本。当<var>$1disablepp</var>被设置时不会提供数据。",
+	"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>）",
 	"apihelp-parse-param-pst": "在解析输入前，对输入做一次保存前变换处理。仅当使用文本时有效。",
 	"apihelp-parse-param-effectivelanglinks": "包含由扩展提供的语言链接（用于与<kbd>$1prop=langlinks</kbd>一起使用）。",
 	"apihelp-parse-param-section": "只检索此段数的内容，或只当<kbd>new</kbd>生成新的段落时检索。\n\n<kbd>new</kbd>段落只当指定<var>text</var>时受尊重。",
 	"apihelp-parse-param-sectiontitle": "当<var>section</var>为<kbd>new</kbd>时新段落标题。\n\n不像页面编辑，当省略或为空时将不会备选为<var>summary</var>。",
-	"apihelp-parse-param-disablepp": "从解析器输出中省略预处理器报告（“NewPP limit report”）。",
+	"apihelp-parse-param-disablelimitreport": "从解析器输出中省略限制报告（“NewPP limit report”）。",
+	"apihelp-parse-param-disablepp": "请改用<var>$1disablelimitreport</var>。",
 	"apihelp-parse-param-disableeditsection": "从解析器输出中省略编辑段落链接。",
+	"apihelp-parse-param-disabletidy": "不要在解析器输出中运行HTML清理（例如tidy）。",
 	"apihelp-parse-param-generatexml": "生成XML解析树（需要内容模型<code>$1</code>；被<kbd>$2prop=parsetree</kbd>所取代）。",
 	"apihelp-parse-param-preview": "在预览模式下解析。",
 	"apihelp-parse-param-sectionpreview": "在小节预览模式下解析 （同时要启用预览模式）。",
@@ -348,7 +351,7 @@
 	"apihelp-query+allcategories-param-limit": "要返回多少个类别。",
 	"apihelp-query+allcategories-param-prop": "要获取的属性：",
 	"apihelp-query+allcategories-paramvalue-prop-size": "在分类中添加页面数。",
-	"apihelp-query+allcategories-paramvalue-prop-hidden": "标记由_&#95;HIDDENCAT_&#95;隐藏的分类。",
+	"apihelp-query+allcategories-paramvalue-prop-hidden": "标记由<code>_&#95;HIDDENCAT_&#95;</code>隐藏的分类。",
 	"apihelp-query+allcategories-example-size": "列出分类及其含有多少页面的信息。",
 	"apihelp-query+allcategories-example-generator": "为以<kbd>List</kbd>的分类检索有关分类页面本身的信息。",
 	"apihelp-query+alldeletedrevisions-description": "列举由一位用户或在一个名字空间中所有已删除的修订。",
@@ -412,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": "获取包含这些链接的页面。",
@@ -448,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": "添加重定向的标题。",
@@ -463,12 +468,14 @@
 	"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": "添加嵌入的标题。",
 	"apihelp-query+alltransclusions-param-namespace": "要列举的名字空间。",
 	"apihelp-query+alltransclusions-param-limit": "要返回的总计项目。",
 	"apihelp-query+alltransclusions-param-dir": "罗列所采用的方向。",
+	"apihelp-query+alltransclusions-example-B": "列出嵌入的标题，包括丢失的，带有来自的页面ID，从<kbd>B</kbd>开始。",
 	"apihelp-query+alltransclusions-example-unique": "列出孤立嵌入标题",
 	"apihelp-query+alltransclusions-example-unique-generator": "获取所有嵌入的标题，并标记缺失的。",
 	"apihelp-query+alltransclusions-example-generator": "获得包含嵌入内容的页面。",
@@ -524,7 +531,7 @@
 	"apihelp-query+categories-param-prop": "要为每个分类获取的额外属性：",
 	"apihelp-query+categories-paramvalue-prop-sortkey": "为每个分类添加关键词（十六进制字符串）和关键词前缀（人类可读部分）。",
 	"apihelp-query+categories-paramvalue-prop-timestamp": "添加分类添加时的时间戳。",
-	"apihelp-query+categories-paramvalue-prop-hidden": "标记由_&#95;HIDDENCAT_&#95;隐藏的分类。",
+	"apihelp-query+categories-paramvalue-prop-hidden": "标记由<code>_&#95;HIDDENCAT_&#95;</code>隐藏的分类。",
 	"apihelp-query+categories-param-show": "显示何种分类。",
 	"apihelp-query+categories-param-limit": "返回多少分类。",
 	"apihelp-query+categories-param-dir": "罗列所采用的方向。",
@@ -551,6 +558,7 @@
 	"apihelp-query+categorymembers-param-end": "列举的结尾时间戳。只能与<kbd>$1sort=timestamp</kbd>一起使用。",
 	"apihelp-query+categorymembers-param-starthexsortkey": "开始列举的关键词，由<kbd>$1prop=sortkey</kbd>返回。不能与<kbd>$1sort=sortkey</kbd>一起使用。",
 	"apihelp-query+categorymembers-param-endhexsortkey": "结束列举的关键词，由<kbd>$1prop=sortkey</kbd>返回。不能与<kbd>$1sort=sortkey</kbd>一起使用。",
+	"apihelp-query+categorymembers-param-startsortkeyprefix": "要开始列举的排序关键词前缀。只能与<kbd>$1sort=sortkey</kbd>一起使用。覆盖<var>$1starthexsortkey</var>。",
 	"apihelp-query+categorymembers-param-startsortkey": "请改用$1starthexsortkey。",
 	"apihelp-query+categorymembers-param-endsortkey": "请改用$1endhexsortkey。",
 	"apihelp-query+categorymembers-example-simple": "获取<kbd>Category:Physics</kbd>中的前10个页面。",
@@ -621,6 +629,19 @@
 	"apihelp-query+filearchive-param-dir": "罗列所采用的方向。",
 	"apihelp-query+filearchive-param-sha1": "图片的SHA1哈希值。覆盖$1sha1base36。",
 	"apihelp-query+filearchive-param-sha1base36": "基于base 36的图片的SHA1哈希值（用于MediaWiki）。",
+	"apihelp-query+filearchive-param-prop": "要获取的图片信息：",
+	"apihelp-query+filearchive-paramvalue-prop-sha1": "为文件加入SHA-1哈希值。",
+	"apihelp-query+filearchive-paramvalue-prop-timestamp": "为已上传版本添加时间戳。",
+	"apihelp-query+filearchive-paramvalue-prop-user": "添加上传了图片版本的用户。",
+	"apihelp-query+filearchive-paramvalue-prop-size": "添加图片大小（字节）及其高度、宽度和页面计数（如果可以）。",
+	"apihelp-query+filearchive-paramvalue-prop-dimensions": "用于大小的别名。",
+	"apihelp-query+filearchive-paramvalue-prop-description": "添加图片版本的说明。",
+	"apihelp-query+filearchive-paramvalue-prop-parseddescription": "解析版本的描述。",
+	"apihelp-query+filearchive-paramvalue-prop-mime": "添加图片的MIME。",
+	"apihelp-query+filearchive-paramvalue-prop-mediatype": "添加图片的媒体类型。",
+	"apihelp-query+filearchive-paramvalue-prop-metadata": "为图片版本列出Exif元数据。",
+	"apihelp-query+filearchive-paramvalue-prop-bitdepth": "添加版本的字节深度。",
+	"apihelp-query+filearchive-paramvalue-prop-archivename": "添加用于非最新版本的存档版本的文件名。",
 	"apihelp-query+filearchive-example-simple": "显示已删除文件列表。",
 	"apihelp-query+filerepoinfo-description": "返回有关wiki配置的图片存储库的元信息。",
 	"apihelp-query+filerepoinfo-example-simple": "获得有关文件存储库的信息。",
@@ -631,6 +652,7 @@
 	"apihelp-query+fileusage-paramvalue-prop-redirect": "标记作为重定向的页面。",
 	"apihelp-query+fileusage-param-namespace": "只包括这些名字空间的页面。",
 	"apihelp-query+fileusage-param-limit": "返回多少。",
+	"apihelp-query+fileusage-param-show": "只显示符合以下标准的项：\n;redirect:只显示重定向。\n;!redirect:只显示非重定向。",
 	"apihelp-query+fileusage-example-simple": "获取使用[[:File:Example.jpg]]的页面列表。",
 	"apihelp-query+fileusage-example-generator": "获取有关使用[[:File:Example.jpg]]的页面的信息。",
 	"apihelp-query+imageinfo-description": "返回文件信息和上传历史。",
@@ -687,8 +709,10 @@
 	"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": "在页面标题实际显示的地方提供方式。",
 	"apihelp-query+info-param-testactions": "测试当前用户是否可以在页面上执行某种操作。",
 	"apihelp-query+info-param-token": "请改用[[Special:ApiHelp/query+tokens|action=query&meta=tokens]]。",
 	"apihelp-query+info-example-simple": "获取有关页面<kbd>Main Page</kbd>的信息。",
@@ -705,6 +729,8 @@
 	"apihelp-query+iwbacklinks-example-generator": "获取有关链接至[[wikibooks:Test]]的页面的信息。",
 	"apihelp-query+iwlinks-description": "从指定页面返回所有跨wiki链接。",
 	"apihelp-query+iwlinks-param-url": "是否获取完整URL（不能与$1prop一起使用）。",
+	"apihelp-query+iwlinks-param-prop": "要为每个跨语言链接获取的额外属性：",
+	"apihelp-query+iwlinks-paramvalue-prop-url": "添加完整URL。",
 	"apihelp-query+iwlinks-param-limit": "返回多少跨wiki链接。",
 	"apihelp-query+iwlinks-param-prefix": "只返回此前缀的跨wiki链接。",
 	"apihelp-query+iwlinks-param-title": "用于搜索的跨wiki链接。必须与<var>$1prefix</var>一起使用。",
@@ -722,6 +748,10 @@
 	"apihelp-query+langlinks-description": "从指定页面返回所有跨语言链接。",
 	"apihelp-query+langlinks-param-limit": "返回多少语言链接。",
 	"apihelp-query+langlinks-param-url": "是否获取完整URL（不能与<var>$1prop</var>一起使用）。",
+	"apihelp-query+langlinks-param-prop": "要为每个跨语言链接获取的额外属性：",
+	"apihelp-query+langlinks-paramvalue-prop-url": "添加完整URL。",
+	"apihelp-query+langlinks-paramvalue-prop-langname": "添加本地化语言名（尽可能）。使用<var>$1inlanguagecode</var>以控制语言。",
+	"apihelp-query+langlinks-paramvalue-prop-autonym": "添加本地语言名。",
 	"apihelp-query+langlinks-param-lang": "只返回带此语言代码的语言链接。",
 	"apihelp-query+langlinks-param-title": "要搜索的链接。必须与<var>$1lang</var>一起使用。",
 	"apihelp-query+langlinks-param-dir": "罗列所采用的方向。",
@@ -745,12 +775,28 @@
 	"apihelp-query+linkshere-example-simple": "获取链接至[[Main Page]]的页面列表。",
 	"apihelp-query+linkshere-example-generator": "获取有关链接至[[Main Page]]的页面的信息。",
 	"apihelp-query+logevents-description": "从日志获取事件。",
+	"apihelp-query+logevents-param-prop": "要获取的属性：",
+	"apihelp-query+logevents-paramvalue-prop-ids": "添加日志活动的ID。",
+	"apihelp-query+logevents-paramvalue-prop-title": "为日志事件添加页面标题。",
+	"apihelp-query+logevents-paramvalue-prop-type": "添加日志活动的类型。",
+	"apihelp-query+logevents-paramvalue-prop-user": "为日志事件添加用户责任。",
+	"apihelp-query+logevents-paramvalue-prop-userid": "为日志事件添加对此负责的用户ID。",
+	"apihelp-query+logevents-paramvalue-prop-timestamp": "为日志活动添加时间戳。",
+	"apihelp-query+logevents-paramvalue-prop-comment": "添加日志活动的摘要。",
+	"apihelp-query+logevents-paramvalue-prop-parsedcomment": "添加被解析的日志活动的摘要。",
+	"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-start": "枚举的起始时间戳。",
 	"apihelp-query+logevents-param-end": "枚举的结束时间戳。",
+	"apihelp-query+logevents-param-user": "过滤记录为这些由指定用户做出的。",
+	"apihelp-query+logevents-param-title": "过滤记录至这些与页面相关的。",
+	"apihelp-query+logevents-param-namespace": "过滤事件为在这些指定的名字空间中。",
 	"apihelp-query+logevents-param-prefix": "过滤以此前缀开头的记录。",
 	"apihelp-query+logevents-param-tag": "只列举带此标签的事件日志记录。",
 	"apihelp-query+logevents-param-limit": "返回的事件日志记录总数。",
-	"apihelp-query+logevents-example-simple": "列出最近日志活动。",
+	"apihelp-query+logevents-example-simple": "列出最近日志事件。",
 	"apihelp-query+pagepropnames-description": "列出wiki中所有使用中的页面属性名称。",
 	"apihelp-query+pagepropnames-param-limit": "返回名称的最大数量。",
 	"apihelp-query+pagepropnames-example-simple": "获取前10个属性名称。",
@@ -776,14 +822,23 @@
 	"apihelp-query+protectedtitles-param-namespace": "只列出这些名字空间的标题。",
 	"apihelp-query+protectedtitles-param-level": "只列出带这些保护级别的标题。",
 	"apihelp-query+protectedtitles-param-limit": "返回的总计页面数。",
+	"apihelp-query+protectedtitles-param-prop": "要获取的属性：",
+	"apihelp-query+protectedtitles-paramvalue-prop-timestamp": "添加保护被添加时的时间戳。",
+	"apihelp-query+protectedtitles-paramvalue-prop-user": "添加对页面添加保护的用户。",
+	"apihelp-query+protectedtitles-paramvalue-prop-userid": "添加对页面添加保护的用户ID。",
+	"apihelp-query+protectedtitles-paramvalue-prop-comment": "为保护添加摘要。",
+	"apihelp-query+protectedtitles-paramvalue-prop-parsedcomment": "为保护添加解析的摘要。",
+	"apihelp-query+protectedtitles-paramvalue-prop-expiry": "添加保护将被提升时的时间戳。",
+	"apihelp-query+protectedtitles-paramvalue-prop-level": "添加保护级别。",
 	"apihelp-query+protectedtitles-example-simple": "受保护标题列表。",
 	"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": "枚举最近更改。",
@@ -814,6 +869,10 @@
 	"apihelp-query+recentchanges-example-simple": "最近更改列表。",
 	"apihelp-query+recentchanges-example-generator": "获取有关最近未巡查更改的页面信息。",
 	"apihelp-query+redirects-description": "返回至指定页面的所有重定向。",
+	"apihelp-query+redirects-param-prop": "要获取的属性：",
+	"apihelp-query+redirects-paramvalue-prop-pageid": "每个重定向的页面ID。",
+	"apihelp-query+redirects-paramvalue-prop-title": "每个重定向的标题。",
+	"apihelp-query+redirects-paramvalue-prop-fragment": "每个重定向的碎片，如果有。",
 	"apihelp-query+redirects-param-namespace": "只包含这些名字空间的页面。",
 	"apihelp-query+redirects-param-limit": "返回多少重定向。",
 	"apihelp-query+redirects-example-simple": "获取至[[Main Page]]的重定向列表。",
@@ -970,10 +1029,10 @@
 	"apihelp-query+userinfo-paramvalue-prop-preferencestoken": "<span class=\"apihelp-deprecated\">Deprecated.</span> Get a token to change current user's preferences.",
 	"apihelp-query+userinfo-paramvalue-prop-editcount": "Adds the current user's edit count.",
 	"apihelp-query+userinfo-paramvalue-prop-ratelimits": "Lists all rate limits applying to the current user.",
-	"apihelp-query+userinfo-paramvalue-prop-realname": "Adds the user's real name.",
+	"apihelp-query+userinfo-paramvalue-prop-realname": "添加用户的真实姓名。",
 	"apihelp-query+userinfo-paramvalue-prop-email": "Adds the user's email address and email authentication date.",
 	"apihelp-query+userinfo-paramvalue-prop-acceptlang": "Echoes the <code>Accept-Language</code> header sent by the client in a structured format.",
-	"apihelp-query+userinfo-paramvalue-prop-registrationdate": "Adds the user's registration date.",
+	"apihelp-query+userinfo-paramvalue-prop-registrationdate": "添加用户的注册时间。",
 	"apihelp-query+userinfo-paramvalue-prop-unreadcount": "Adds the count of unread pages on the user's watchlist (maximum $1; returns <samp>$2</samp> if more).",
 	"apihelp-query+userinfo-example-simple": "获取有关当前用户的信息。",
 	"apihelp-query+userinfo-example-data": "获取有关当前用户的额外信息。",
@@ -1008,7 +1067,7 @@
 	"apihelp-query+watchlist-paramvalue-prop-sizes": "添加页面的旧有长度和新长度。",
 	"apihelp-query+watchlist-paramvalue-prop-notificationtimestamp": "添加最近被通知有关编辑的用户的时间戳。",
 	"apihelp-query+watchlist-paramvalue-prop-loginfo": "在适当位置添加日志信息。",
-	"apihelp-query+watchlist-param-type": "要显示的更改类型：\n;edit:定期页面编辑。\n;external:外部更改。\n;new:页面创建。\n;log:日志记录。\n;categorize:分类成员更改。",
+	"apihelp-query+watchlist-param-type": "要显示的更改类型：\n;edit:定期页面编辑。\n;external:外部更改。\n;new:页面创建。\n;log:日志记录。",
 	"apihelp-query+watchlist-param-token": "允许访问其他用户监视列表的安全密钥（可通过用户的[[Special:Preferences#mw-prefsection-watchlist|参数设置]]找到）。",
 	"apihelp-query+watchlist-example-simple": "在当前用户的监视列表中列出用于最近更改页面的最新修订。",
 	"apihelp-query+watchlist-example-props": "在当前用户的监视列表中检索有关用于最近更改页面的最新修订的额外信息。",
@@ -1071,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>的两个修订。",
@@ -1099,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": "监视主名字空间中的最少几个页面。",
@@ -1160,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/BacklinkCache.php b/includes/cache/BacklinkCache.php
index 10b4fb0090..1296c136f7 100644
--- a/includes/cache/BacklinkCache.php
+++ b/includes/cache/BacklinkCache.php
@@ -157,7 +157,7 @@ class BacklinkCache {
 	 * @param string $table
 	 * @param int|bool $startId
 	 * @param int|bool $endId
-	 * @param int|INF $max
+	 * @param int $max
 	 * @return TitleArrayFromResult
 	 */
 	public function getLinks( $table, $startId = false, $endId = false, $max = INF ) {
@@ -169,7 +169,7 @@ class BacklinkCache {
 	 * @param string $table
 	 * @param int|bool $startId
 	 * @param int|bool $endId
-	 * @param int|INF $max
+	 * @param int $max
 	 * @param string $select 'all' or 'ids'
 	 * @return ResultWrapper
 	 */
@@ -319,7 +319,7 @@ class BacklinkCache {
 	/**
 	 * Get the approximate number of backlinks
 	 * @param string $table
-	 * @param int|INF $max Only count up to this many backlinks
+	 * @param int $max Only count up to this many backlinks
 	 * @return int
 	 */
 	public function getNumLinks( $table, $max = INF ) {
diff --git a/includes/cache/MessageCache.php b/includes/cache/MessageCache.php
index 7945c8be54..f22c860afa 100644
--- a/includes/cache/MessageCache.php
+++ b/includes/cache/MessageCache.php
@@ -27,23 +27,6 @@
  */
 define( 'MSG_CACHE_VERSION', 2 );
 
-/**
- * Memcached timeout when loading a key.
- * See MessageCache::load()
- */
-define( 'MSG_LOAD_TIMEOUT', 60 );
-
-/**
- * Memcached timeout when locking a key for a writing operation.
- * See MessageCache::lock()
- */
-define( 'MSG_LOCK_TIMEOUT', 30 );
-/**
- * Number of times we will try to acquire a lock from Memcached.
- * This comes in addition to MSG_LOCK_TIMEOUT.
- */
-define( 'MSG_WAIT_TIMEOUT', 30 );
-
 /**
  * Message cache
  * Performs various MediaWiki namespace-related functions
@@ -52,6 +35,11 @@ define( 'MSG_WAIT_TIMEOUT', 30 );
 class MessageCache {
 	const FOR_UPDATE = 1; // force message reload
 
+	/** How long to wait for memcached locks */
+	const WAIT_SEC = 15;
+	/** How long memcached locks last */
+	const LOCK_TTL = 30;
+
 	/**
 	 * Process local cache of loaded messages that are defined in
 	 * MediaWiki namespace. First array level is a language code,
@@ -166,7 +154,7 @@ class MessageCache {
 		$this->mExpiry = $expiry;
 
 		if ( $wgUseLocalMessageCache ) {
-			$this->localCache = ObjectCache::newAccelerator( array(), CACHE_NONE );
+			$this->localCache = ObjectCache::newAccelerator( CACHE_NONE );
 		} else {
 			$this->localCache = wfGetCache( CACHE_NONE );
 		}
@@ -196,6 +184,7 @@ class MessageCache {
 	 */
 	protected function getLocalCache( $code ) {
 		$cacheKey = wfMemcKey( __CLASS__, $code );
+
 		return $this->localCache->get( $cacheKey );
 	}
 
@@ -232,8 +221,6 @@ class MessageCache {
 	 * @return bool
 	 */
 	function load( $code = false, $mode = null ) {
-		global $wgUseLocalMessageCache;
-
 		if ( !is_string( $code ) ) {
 			# This isn't really nice, so at least make a note about it and try to
 			# fall back
@@ -266,25 +253,23 @@ class MessageCache {
 		# or local cache goes out of date (e.g. due to replace() on some other server)
 		list( $hash, $hashVolatile ) = $this->getValidationHash( $code );
 
-		if ( $wgUseLocalMessageCache && $hash ) {
-			# Try the local cache and check against the cluster hash key...
-			$cache = $this->getLocalCache( $code );
-			if ( !$cache ) {
-				$where[] = 'local cache is empty';
-			} elseif ( !isset( $cache['HASH'] ) || $cache['HASH'] !== $hash ) {
-				$where[] = 'local cache has the wrong hash';
-				$staleCache = $cache;
-			} elseif ( $this->isCacheExpired( $cache ) ) {
-				$where[] = 'local cache is expired';
-				$staleCache = $cache;
-			} elseif ( $hashVolatile ) {
-				$where[] = 'local cache validation key is expired/volatile';
-				$staleCache = $cache;
-			} else {
-				$where[] = 'got from local cache';
-				$success = true;
-				$this->mCache[$code] = $cache;
-			}
+		# Try the local cache and check against the cluster hash key...
+		$cache = $this->getLocalCache( $code );
+		if ( !$cache ) {
+			$where[] = 'local cache is empty';
+		} elseif ( !isset( $cache['HASH'] ) || $cache['HASH'] !== $hash ) {
+			$where[] = 'local cache has the wrong hash';
+			$staleCache = $cache;
+		} elseif ( $this->isCacheExpired( $cache ) ) {
+			$where[] = 'local cache is expired';
+			$staleCache = $cache;
+		} elseif ( $hashVolatile ) {
+			$where[] = 'local cache validation key is expired/volatile';
+			$staleCache = $cache;
+		} else {
+			$where[] = 'got from local cache';
+			$success = true;
+			$this->mCache[$code] = $cache;
 		}
 
 		if ( !$success ) {
@@ -292,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
@@ -326,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 ) {
@@ -337,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
-						$where[] = 'waited for other thread to complete';
-						$this->lock( $cacheKey );
-						$this->unlock( $cacheKey );
-					}
+					# Disable cache; $loadStatus is 'disabled'
+					break;
 				}
 			}
 		}
@@ -378,49 +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;
-
+		# 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.
-		if ( $this->lock( $cacheKey ) ) {
-			$that = $this;
-			$mainUnlocker = new ScopedCallback( function () use ( $that, $cacheKey ) {
-				$that->unlock( $cacheKey );
-			} );
-		} else {
-			$mainUnlocker = null;
+		$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:
@@ -438,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";
@@ -453,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
@@ -540,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 ) {
@@ -552,32 +526,44 @@ 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().
 		$cacheKey = wfMemcKey( 'messages', $code );
-		$this->lock( $cacheKey );
+		$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->mMemc->delete( $titleKey );
+			$this->wanCache->delete( $titleKey );
 		} elseif ( strlen( $text ) > $wgMaxMsgCacheEntrySize ) {
-			# Check for size
+			// Check for size
 			$this->mCache[$code][$title] = '!TOO BIG';
-			$this->mMemc->set( $titleKey, ' ' . $text, $this->mExpiry );
+			$this->wanCache->set( $titleKey, ' ' . $text, $this->mExpiry );
 		} else {
 			$this->mCache[$code][$title] = ' ' . $text;
-			$this->mMemc->delete( $titleKey );
+			$this->wanCache->delete( $titleKey );
 		}
 
-		# Update caches
-		$this->saveToCaches( $this->mCache[$code], 'all', $code );
-		$this->unlock( $cacheKey );
+		// 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
@@ -629,9 +615,7 @@ class MessageCache {
 	 * @param string|bool $code Language code (default: false)
 	 * @return bool
 	 */
-	protected function saveToCaches( $cache, $dest, $code = false ) {
-		global $wgUseLocalMessageCache;
-
+	protected function saveToCaches( array $cache, $dest, $code = false ) {
 		if ( $dest === 'all' ) {
 			$cacheKey = wfMemcKey( 'messages', $code );
 			$success = $this->mMemc->set( $cacheKey, $cache );
@@ -639,18 +623,14 @@ class MessageCache {
 			$success = true;
 		}
 
-		$this->setValidationHash( $code, $cache['HASH'] );
-
-		# Save to local cache
-		if ( $wgUseLocalMessageCache ) {
-			$this->saveToLocalCache( $code, $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)
@@ -658,64 +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
 		);
 	}
 
 	/**
-	 * Represents a write lock on the messages key.
-	 *
-	 * Will retry MessageCache::MSG_WAIT_TIMEOUT times, each operations having
-	 * a timeout of MessageCache::MSG_LOCK_TIMEOUT.
-	 *
-	 * @param string $key
-	 * @return bool Success
+	 * @param string $key A language message cache key that stores blobs
+	 * @param integer $timeout Wait timeout in seconds
+	 * @return null|ScopedCallback
 	 */
-	function lock( $key ) {
-		$lockKey = $key . ':lock';
-		$acquired = false;
-		$testDone = false;
-		for ( $i = 0; $i < MSG_WAIT_TIMEOUT && !$acquired; $i++ ) {
-			$acquired = $this->mMemc->add( $lockKey, 1, MSG_LOCK_TIMEOUT );
-			if ( $acquired ) {
-				break;
-			}
-
-			# Fail fast if memcached is totally down
-			if ( !$testDone ) {
-				$testDone = true;
-				if ( !$this->mMemc->set( wfMemcKey( 'test' ), 'test', 1 ) ) {
-					break;
-				}
-			}
-			sleep( 1 );
-		}
-
-		return $acquired;
-	}
-
-	function unlock( $key ) {
-		$lockKey = $key . ':lock';
-		$this->mMemc->delete( $lockKey );
+	protected function getReentrantScopedLock( $key, $timeout = self::WAIT_SEC ) {
+		return $this->mMemc->getScopedLock( $key, $timeout, self::LOCK_TTL, __METHOD__ );
 	}
 
 	/**
@@ -959,7 +931,7 @@ class MessageCache {
 
 		# Try the individual message cache
 		$titleKey = wfMemcKey( 'messages', 'individual', $title );
-		$entry = $this->mMemc->get( $titleKey );
+		$entry = $this->wanCache->get( $titleKey );
 		if ( $entry ) {
 			if ( substr( $entry, 0, 1 ) === ' ' ) {
 				$this->mCache[$code][$title] = $entry;
@@ -973,14 +945,12 @@ class MessageCache {
 				return false;
 			} else {
 				# Corrupt/obsolete entry, delete it
-				$this->mMemc->delete( $titleKey );
+				$this->wanCache->delete( $titleKey );
 			}
 		}
 
 		# Try loading it from the database
-		$revision = Revision::newFromTitle(
-			Title::makeTitle( NS_MEDIAWIKI, $title ), false, Revision::READ_LATEST
-		);
+		$revision = Revision::newFromTitle( Title::makeTitle( NS_MEDIAWIKI, $title ) );
 		if ( $revision ) {
 			$content = $revision->getContent();
 			if ( !$content ) {
@@ -1001,13 +971,13 @@ class MessageCache {
 					wfDebugLog(
 						'MessageCache',
 						__METHOD__ . ": message content doesn't provide wikitext "
-							. "(content model: " . $content->getContentHandler() . ")"
+							. "(content model: " . $content->getModel() . ")"
 					);
 
 					$message = false; // negative caching
 				} else {
 					$this->mCache[$code][$title] = ' ' . $message;
-					$this->mMemc->set( $titleKey, ' ' . $message, $this->mExpiry );
+					$this->wanCache->set( $titleKey, ' ' . $message, $this->mExpiry );
 				}
 			}
 		} else {
@@ -1016,7 +986,7 @@ class MessageCache {
 
 		if ( $message === false ) { // negative caching
 			$this->mCache[$code][$title] = '!NONEXISTENT';
-			$this->mMemc->set( $titleKey, '!NONEXISTENT', $this->mExpiry );
+			$this->wanCache->set( $titleKey, '!NONEXISTENT', $this->mExpiry );
 		}
 
 		return $message;
diff --git a/includes/changes/CategoryMembershipChange.php b/includes/changes/CategoryMembershipChange.php
deleted file mode 100644
index 8bc4cf57e4..0000000000
--- a/includes/changes/CategoryMembershipChange.php
+++ /dev/null
@@ -1,205 +0,0 @@
-<?php
-/**
- * Helper class for category membership changes
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- * http://www.gnu.org/copyleft/gpl.html
- *
- * @file
- * @author Kai Nissen
- * @since 1.26
- */
-
-class CategoryMembershipChange {
-
-	const CATEGORY_ADDITION = 1;
-	const CATEGORY_REMOVAL = -1;
-
-	/** @var string Current timestamp, set during CategoryMembershipChange::__construct() */
-	private $timestamp;
-
-	/** @var Title Title instance of the categorized page */
-	private $pageTitle;
-
-	/** @var WikiPage WikiPage instance of the categorized page */
-	private $page;
-
-	/** @var Revision Latest Revision instance of the categorized page */
-	private $revision;
-
-	/**
-	 * @var int
-	 * Number of pages this WikiPage is embedded by; set by CategoryMembershipChange::setRecursive()
-	 */
-	private $numTemplateLinks = 0;
-
-	/**
-	 * @var User
-	 * instance of the user that created CategoryMembershipChange::$revision
-	 */
-	private $user;
-
-	/**
-	 * @var null|RecentChange
-	 * RecentChange that is referred to in CategoryMembershipChange::$revision
-	 */
-	private $correspondingRC;
-
-	/**
-	 * @param Title $pageTitle Title instance of the categorized page
-	 * @param Revision $revision Latest Revision instance of the categorized page
-	 * @throws MWException
-	 */
-	public function __construct( Title $pageTitle, Revision $revision = null ) {
-		$this->pageTitle = $pageTitle;
-		$this->page = WikiPage::factory( $pageTitle );
-		$this->timestamp = wfTimestampNow();
-
-		# if no revision is given, the change was probably triggered by parser functions
-		if ( $revision ) {
-			$this->revision = $revision;
-			$this->correspondingRC = $this->revision->getRecentChange();
-			$this->user = $this->getRevisionUser();
-		} else {
-			$this->user = User::newFromId( 0 );
-		}
-	}
-
-	/**
-	 * Determines the number of template links for recursive link updates
-	 */
-	public function setRecursive() {
-		$this->numTemplateLinks = $this->pageTitle->getBacklinkCache()->getNumLinks( 'templatelinks' );
-	}
-
-	/**
-	 * Create a recentchanges entry for category additions
-	 * @param string $categoryName
-	 */
-	public function pageAddedToCategory( $categoryName ) {
-		$this->createRecentChangesEntry( $categoryName, self::CATEGORY_ADDITION );
-	}
-
-	/**
-	 * Create a recentchanges entry for category removals
-	 * @param string $categoryName
-	 */
-	public function pageRemovedFromCategory( $categoryName ) {
-		$this->createRecentChangesEntry( $categoryName, self::CATEGORY_REMOVAL );
-	}
-
-	/**
-	 * Create a recentchanges entry using RecentChange::notifyCategorization()
-	 * @param string $categoryName
-	 * @param int $type
-	 */
-	private function createRecentChangesEntry( $categoryName, $type ) {
-		$categoryTitle = Title::newFromText( $categoryName, NS_CATEGORY );
-		if ( !$categoryTitle ) {
-			return;
-		}
-
-		$previousRevTimestamp = $this->getPreviousRevisionTimestamp();
-		$unpatrolled = $this->revision ? $this->revision->isUnpatrolled() : 0;
-
-		$lastRevId = 0;
-		$bot = 0;
-		$ip = '';
-		if ( $this->correspondingRC ) {
-			$lastRevId = $this->correspondingRC->getAttribute( 'rc_last_oldid' ) ?: 0;
-			$bot = $this->correspondingRC->getAttribute( 'rc_bot' ) ?: 0;
-			$ip = $this->correspondingRC->getAttribute( 'rc_ip' ) ?: '';
-		}
-
-		RecentChange::notifyCategorization(
-			$this->timestamp,
-			$categoryTitle,
-			$this->user,
-			$this->getChangeMessage( $type, array(
-				'prefixedUrl' => $this->page->getTitle()->getPrefixedURL(),
-				'numTemplateLinks' => $this->numTemplateLinks
-			) ),
-			$this->pageTitle,
-			$lastRevId,
-			$this->revision ? $this->revision->getId() : 0,
-			$previousRevTimestamp,
-			$bot,
-			$ip,
-			$unpatrolled ? 0 : 1,
-			$this->revision ? $this->revision->getVisibility() & Revision::SUPPRESSED_USER : 0
-		);
-	}
-
-	/**
-	 * Get the user who created the revision. may be an anonymous IP
-	 * @return User
-	 */
-	private function getRevisionUser() {
-		$userId = $this->revision->getUser( Revision::RAW );
-		if ( $userId === 0 ) {
-			return User::newFromName( $this->revision->getUserText( Revision::RAW ), false );
-		} else {
-			return User::newFromId( $userId );
-		}
-	}
-
-	/**
-	 * Returns the change message according to the type of category membership change
-	 *
-	 * The message keys created in this method may be one of:
-	 * - recentchanges-page-added-to-category
-	 * - recentchanges-page-added-to-category-bundled
-	 * - recentchanges-page-removed-from-category
-	 * - recentchanges-page-removed-from-category-bundled
-	 *
-	 * @param int $type may be CategoryMembershipChange::CATEGORY_ADDITION
-	 * or CategoryMembershipChange::CATEGORY_REMOVAL
-	 * @param array $params
-	 * - prefixedUrl: result of Title::->getPrefixedURL()
-	 * - numTemplateLinks
-	 * @return string
-	 */
-	private function getChangeMessage( $type, array $params ) {
-		$msgKey = 'recentchanges-';
-
-		switch ( $type ) {
-			case self::CATEGORY_ADDITION:
-				$msgKey .= 'page-added-to-category';
-				break;
-			case self::CATEGORY_REMOVAL:
-				$msgKey .= 'page-removed-from-category';
-				break;
-		}
-
-		if ( intval( $params['numTemplateLinks'] ) > 0 ) {
-			$msgKey .= '-bundled';
-		}
-
-		return wfMessage( $msgKey, $params )->inContentLanguage()->text();
-	}
-
-	/**
-	 * Returns the timestamp of the page's previous revision or null if the latest revision
-	 * does not refer to a parent revision
-	 * @return null|string
-	 */
-	private function getPreviousRevisionTimestamp() {
-		$latestRev = Revision::newFromId( $this->pageTitle->getLatestRevID() );
-		$previousRev = Revision::newFromId( $latestRev->getParentId() );
-
-		return $previousRev ? $previousRev->getTimestamp() : null;
-	}
-
-}
diff --git a/includes/changes/ChangesList.php b/includes/changes/ChangesList.php
index 249f53f0d7..fdc9944fdc 100644
--- a/includes/changes/ChangesList.php
+++ b/includes/changes/ChangesList.php
@@ -456,28 +456,6 @@ class ChangesList extends ContextSource {
 		}
 	}
 
-	/**
-	 * @param RCCacheEntry $rc
-	 * @param array $query array of key/value pairs to append as a query string
-	 * @return string
-	 * @since 1.26
-	 */
-	public function getDiffHistLinks( RCCacheEntry $rc, array $query ) {
-		$pageTitle = $rc->getTitle();
-		if ( intval( $rc->getAttribute( 'rc_type' ) ) === RC_CATEGORIZE ) {
-			$pageTitle = Title::newFromID( $rc->getAttribute( 'rc_cur_id' ) );
-		}
-
-		$retVal = ' ' . $this->msg( 'parentheses' )
-		->rawParams( $rc->difflink . $this->message['pipe-separator'] . Linker::linkKnown(
-				$pageTitle,
-				$this->message['hist'],
-				array(),
-				$query
-			) )->escaped();
-		return $retVal;
-	}
-
 	/**
 	 * Check whether to enable recent changes patrol features
 	 *
@@ -652,17 +630,4 @@ class ChangesList extends ContextSource {
 
 		return false;
 	}
-
-	/**
-	 * Determines whether a revision is linked to this change; this may not be the case
-	 * when the categorization wasn't done by an edit but a conditional parser function
-	 *
-	 * @param RecentChange|RCCacheEntry $rcObj
-	 * @return bool
-	 */
-	protected function isCategorizationWithoutRevision( $rcObj ) {
-		return intval( $rcObj->getAttribute( 'rc_type' ) ) === RC_CATEGORIZE
-		&& intval( $rcObj->getAttribute( 'rc_this_oldid' ) ) === 0;
-	}
-
 }
diff --git a/includes/changes/EnhancedChangesList.php b/includes/changes/EnhancedChangesList.php
index a1e9d2843b..d912e3a2dd 100644
--- a/includes/changes/EnhancedChangesList.php
+++ b/includes/changes/EnhancedChangesList.php
@@ -270,6 +270,20 @@ 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] );
+			}
+		}
+		// Further down are some assumptions that $block is a 0-indexed array
+		// with (count-1) as last key. Let's make sure it is.
+		$block = array_values( $block );
+
 		$r .= $this->getLogText( $block, $queryParams, $allLogs, $isnew, $namehidden );
 
 		$r .= ' <span class="mw-changeslist-separator">. .</span> ';
@@ -299,118 +313,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;
+	}
+
+	/**
+	 * @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' );
 
-			# Log timestamp
-			if ( $type == RC_LOG ) {
-				$link = $rcObj->timestamp;
+		# 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 );
-			} elseif ( $this->isCategorizationWithoutRevision( $rcObj ) ) {
-				$data['comment'] = $this->insertComment( $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 );
-
-			// 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;
-			}
+		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 );
+		}
 
-			$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">';
+		# Rollback
+		$data['rollback'] = $this->getRollback( $rcObj );
 
-			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;
 	}
 
 	/**
@@ -568,9 +597,15 @@ class EnhancedChangesList extends ChangesList {
 		}
 
 		# Diff and hist links
-		if ( intval( $type ) !== RC_LOG && intval( $type ) !== RC_CATEGORIZE ) {
+		if ( $type != RC_LOG ) {
 			$query['action'] = 'history';
-			$data['historyLink'] = $this->getDiffHistLinks( $rcObj, $query );
+			$data['historyLink'] = ' ' . $this->msg( 'parentheses' )
+				->rawParams( $rcObj->difflink . $this->message['pipe-separator'] . Linker::linkKnown(
+					$rcObj->getTitle(),
+					$this->message['hist'],
+					array(),
+					$query
+				) )->escaped();
 		}
 		$data['separatorAfterLinks'] = ' <span class="mw-changeslist-separator">. .</span> ';
 
@@ -585,15 +620,10 @@ class EnhancedChangesList extends ChangesList {
 
 		if ( $type == RC_LOG ) {
 			$data['logEntry'] = $this->insertLogEntry( $rcObj );
-		} elseif ( $this->isCategorizationWithoutRevision( $rcObj ) ) {
-			$data['comment'] = $this->insertComment( $rcObj );
 		} else {
 			$data['userLink'] = $rcObj->userlink;
 			$data['userTalkLink'] = $rcObj->usertalklink;
 			$data['comment'] = $this->insertComment( $rcObj );
-			if ( intval( $type ) === RC_CATEGORIZE ) {
-				$data['historyLink'] = $this->getDiffHistLinks( $rcObj, $query );
-			}
 			$data['rollback'] = $this->getRollback( $rcObj );
 		}
 
diff --git a/includes/changes/OldChangesList.php b/includes/changes/OldChangesList.php
index 1bd78ca69c..4ce564d1e4 100644
--- a/includes/changes/OldChangesList.php
+++ b/includes/changes/OldChangesList.php
@@ -88,9 +88,7 @@ class OldChangesList extends ChangesList {
 		} else {
 			$unpatrolled = $this->showAsUnpatrolled( $rc );
 
-			if ( !$this->isCategorizationWithoutRevision( $rc ) ) {
-				$this->insertDiffHist( $html, $rc, $unpatrolled );
-			}
+			$this->insertDiffHist( $html, $rc, $unpatrolled );
 			# M, N, b and ! (minor, new, bot and unpatrolled)
 			$html .= $this->recentChangesFlags(
 				array(
@@ -115,8 +113,6 @@ class OldChangesList extends ChangesList {
 
 		if ( $rc->mAttribs['rc_type'] == RC_LOG ) {
 			$html .= $this->insertLogEntry( $rc );
-		} elseif ( $this->isCategorizationWithoutRevision( $rc ) ) {
-			$html .= $this->insertComment( $rc );
 		} else {
 			# User tool links
 			$this->insertUserRelatedLinks( $html, $rc );
diff --git a/includes/changes/RCCacheEntryFactory.php b/includes/changes/RCCacheEntryFactory.php
index e41f7358b6..c3fe183e1f 100644
--- a/includes/changes/RCCacheEntryFactory.php
+++ b/includes/changes/RCCacheEntryFactory.php
@@ -209,10 +209,6 @@ class RCCacheEntryFactory {
 			$diffLink = $diffMessage;
 		} elseif ( in_array( $cacheEntry->mAttribs['rc_type'], $logTypes ) ) {
 			$diffLink = $diffMessage;
-		} elseif ( intval( $cacheEntry->getAttribute( 'rc_type' ) ) === RC_CATEGORIZE ) {
-			$pageTitle = Title::newFromID( $cacheEntry->getAttribute( 'rc_cur_id' ) );
-			$diffUrl = htmlspecialchars( $pageTitle->getLinkURL( $queryParams ) );
-			$diffLink = "<a href=\"$diffUrl\" tabindex=\"$counter\">$diffMessage</a>";
 		} else {
 			$diffUrl = htmlspecialchars( $cacheEntry->getTitle()->getLinkURL( $queryParams ) );
 			$diffLink = "<a href=\"$diffUrl\" tabindex=\"$counter\">$diffMessage</a>";
diff --git a/includes/changes/RecentChange.php b/includes/changes/RecentChange.php
index 9199e1f7b1..54ca2ab23a 100644
--- a/includes/changes/RecentChange.php
+++ b/includes/changes/RecentChange.php
@@ -67,7 +67,6 @@ class RecentChange {
 	const SRC_NEW = 'mw.new';
 	const SRC_LOG = 'mw.log';
 	const SRC_EXTERNAL = 'mw.external'; // obsolete
-	const SRC_CATEGORIZE = 'mw.categorize';
 
 	public $mAttribs = array();
 	public $mExtra = array();
@@ -90,17 +89,6 @@ class RecentChange {
 	 */
 	public $counter = -1;
 
-	/**
-	 * @var array Array of change types
-	 */
-	private static $changeTypes = array(
-		'edit' => RC_EDIT,
-		'new' => RC_NEW,
-		'log' => RC_LOG,
-		'external' => RC_EXTERNAL,
-		'categorize' => RC_CATEGORIZE,
-	);
-
 	# Factory methods
 
 	/**
@@ -131,10 +119,18 @@ class RecentChange {
 			return $retval;
 		}
 
-		if ( !array_key_exists( $type, self::$changeTypes ) ) {
-			throw new MWException( "Unknown type '$type'" );
+		switch ( $type ) {
+			case 'edit':
+				return RC_EDIT;
+			case 'new':
+				return RC_NEW;
+			case 'log':
+				return RC_LOG;
+			case 'external':
+				return RC_EXTERNAL;
+			default:
+				throw new MWException( "Unknown type '$type'" );
 		}
-		return self::$changeTypes[$type];
 	}
 
 	/**
@@ -144,15 +140,24 @@ class RecentChange {
 	 * @return string $type
 	 */
 	public static function parseFromRCType( $rcType ) {
-		return array_search( $rcType, self::$changeTypes, true ) ?: "$rcType";
-	}
+		switch ( $rcType ) {
+			case RC_EDIT:
+				$type = 'edit';
+				break;
+			case RC_NEW:
+				$type = 'new';
+				break;
+			case RC_LOG:
+				$type = 'log';
+				break;
+			case RC_EXTERNAL:
+				$type = 'external';
+				break;
+			default:
+				$type = "$rcType";
+		}
 
-	/**
-	 * Get an array of all change types
-	 * @return array
-	 */
-	public static function getChangeTypes() {
-		return array_keys( self::$changeTypes );
+		return $type;
 	}
 
 	/**
@@ -748,72 +753,6 @@ class RecentChange {
 		return $rc;
 	}
 
-	/**
-	 * Makes an entry in the database corresponding to a categorization
-	 *
-	 * @param string $timestamp Timestamp of the recent change to occur
-	 * @param Title $categoryTitle Title of the category a page is being added to or removed from
-	 * @param User $user User object of the user that made the change
-	 * @param string $comment Change summary
-	 * @param Title $pageTitle Title of the page that is being added or removed
-	 * @param int $oldRevId Parent revision ID of this change
-	 * @param int $newRevId Revision ID of this change
-	 * @param string $lastTimestamp Parent revision timestamp of this change
-	 * @param bool $bot true, if the change was made by a bot
-	 * @param string $ip IP address of the user, if the change was made anonymously
-	 * @param int $patrol Indicates whether the change is patrolled/unpatrolled
-	 * @param int $deleted Indicates whether the change has been deleted
-	 * @param array|null $params Additional parameters as explained on
-	 * https://www.mediawiki.org/wiki/Manual:Logging_table#log_params
-	 * @return RecentChange
-	 * @throws MWException
-	 * @since 1.26
-	 */
-	public static function notifyCategorization( $timestamp, Title $categoryTitle, User $user = null,
-			$comment, Title $pageTitle, $oldRevId, $newRevId, $lastTimestamp, $bot, $ip = '',
-			$patrol = 0, $deleted = 0, $params = null ) {
-
-		$rc = new RecentChange;
-		$rc->mTitle = $categoryTitle;
-		$rc->mPerformer = $user;
-		$rc->mAttribs = array(
-			'rc_timestamp' => $timestamp,
-			'rc_namespace' => $categoryTitle->getNamespace(),
-			'rc_title' => $categoryTitle->getDBkey(),
-			'rc_type' => RC_CATEGORIZE,
-			'rc_source' => self::SRC_CATEGORIZE,
-			'rc_minor' => 0,
-			'rc_cur_id' => $pageTitle->getArticleID(),
-			'rc_user' => $user ? $user->getId() : 0,
-			'rc_user_text' => $user ? $user->getName() : '',
-			'rc_comment' => $comment,
-			'rc_this_oldid' => $newRevId,
-			'rc_last_oldid' => $oldRevId,
-			'rc_bot' => $bot ? 1 : 0,
-			'rc_ip' => self::checkIPAddress( $ip ),
-			'rc_patrolled' => intval( $patrol ),
-			'rc_new' => 0, # obsolete
-			'rc_old_len' => 0,
-			'rc_new_len' => 0,
-			'rc_deleted' => $deleted,
-			'rc_logid' => 0,
-			'rc_log_type' => null,
-			'rc_log_action' => '',
-			'rc_params' => $params ? serialize( $params ) : ''
-		);
-
-		$rc->mExtra = array(
-			'prefixedDBkey' => $categoryTitle->getPrefixedDBkey(),
-			'lastTimestamp' => $lastTimestamp,
-			'oldSize' => 0,
-			'newSize' => 0,
-			'pageStatus' => 'changed'
-		);
-		$rc->save();
-
-		return $rc;
-	}
-
 	/**
 	 * Initialises the members of this object from a mysql row object
 	 *
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/compat/IPSetCompat.php b/includes/compat/IPSetCompat.php
new file mode 100644
index 0000000000..79c600046f
--- /dev/null
+++ b/includes/compat/IPSetCompat.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ */
+
+/**
+ * Backward-compatibility alias for IPSet, which was moved out
+ * into an external library and namespaced.
+ *
+ * @deprecated since 1.26 use IPSet\IPSet directly
+ */
+class IPSet extends IPSet\IPSet {
+}
diff --git a/includes/content/CssContentHandler.php b/includes/content/CssContentHandler.php
index dfa01e2cb1..ae5f742a4c 100644
--- a/includes/content/CssContentHandler.php
+++ b/includes/content/CssContentHandler.php
@@ -49,7 +49,7 @@ class CssContentHandler extends CodeContentHandler {
 	 *
 	 * @param Title $destination
 	 * @param string $text ignored
-	 * @return JavaScriptContent
+	 * @return CssContent
 	 */
 	public function makeRedirectContent( Title $destination, $text = '' ) {
 		// The parameters are passed as a string so the / is not url-encoded by wfArrayToCgi
diff --git a/includes/context/ContextSource.php b/includes/context/ContextSource.php
index d526d84be6..caf5afaa86 100644
--- a/includes/context/ContextSource.php
+++ b/includes/context/ContextSource.php
@@ -168,6 +168,7 @@ abstract class ContextSource implements IContextSource {
 	 * Parameters are the same as wfMessage()
 	 *
 	 * @since 1.18
+	 * @param mixed ...
 	 * @return Message
 	 */
 	public function msg( /* $args */ ) {
diff --git a/includes/context/IContextSource.php b/includes/context/IContextSource.php
index 2ca79cd5b3..58bf5d985e 100644
--- a/includes/context/IContextSource.php
+++ b/includes/context/IContextSource.php
@@ -134,6 +134,7 @@ interface IContextSource {
 	/**
 	 * Get a Message object with context set.  See wfMessage for parameters.
 	 *
+	 * @param mixed ...
 	 * @return Message
 	 */
 	public function msg();
diff --git a/includes/context/RequestContext.php b/includes/context/RequestContext.php
index 76b5e52582..93adde1fee 100644
--- a/includes/context/RequestContext.php
+++ b/includes/context/RequestContext.php
@@ -62,7 +62,7 @@ class RequestContext implements IContextSource, MutableContext {
 	private $skin;
 
 	/**
-	 * @var StatsdDataFactory
+	 * @var \Liuggio\StatsdClient\Factory\StatsdDataFactory
 	 */
 	private $stats;
 
@@ -427,6 +427,7 @@ class RequestContext implements IContextSource, MutableContext {
 	 * Get a Message object with context set
 	 * Parameters are the same as wfMessage()
 	 *
+	 * @param mixed ...
 	 * @return Message
 	 */
 	public function msg() {
diff --git a/includes/db/Database.php b/includes/db/Database.php
index aa8e2a0028..4d1b1c0f04 100644
--- a/includes/db/Database.php
+++ b/includes/db/Database.php
@@ -1901,9 +1901,6 @@ abstract class DatabaseBase implements IDatabase {
 	 *     This causes a multi-row INSERT on DBMSs that support it. The keys in
 	 *     each subarray must be identical to each other, and in the same order.
 	 *
-	 * Usually throws a DBQueryError on failure. If errors are explicitly ignored,
-	 * returns success.
-	 *
 	 * $options is an array of options, with boolean options encoded as values
 	 * with numeric keys, in the same style as $options in
 	 * DatabaseBase::select(). Supported options are:
@@ -1919,6 +1916,9 @@ abstract class DatabaseBase implements IDatabase {
 	 * @param string $fname Calling function name (use __METHOD__) for logs/profiling
 	 * @param array $options Array of options
 	 *
+	 * @throws DBQueryError Usually throws a DBQueryError on failure. If errors are explicitly ignored,
+	 * returns success.
+	 *
 	 * @return bool
 	 */
 	public function insert( $table, $a, $fname = __METHOD__, $options = array() ) {
diff --git a/includes/db/DatabaseSqlite.php b/includes/db/DatabaseSqlite.php
index 9c93951a21..656547b52e 100644
--- a/includes/db/DatabaseSqlite.php
+++ b/includes/db/DatabaseSqlite.php
@@ -284,7 +284,7 @@ class DatabaseSqlite extends DatabaseBase {
 	 * @return bool
 	 */
 	function isWriteQuery( $sql ) {
-		return parent::isWriteQuery( $sql ) && !preg_match( '/^ATTACH\b/i', $sql );
+		return parent::isWriteQuery( $sql ) && !preg_match( '/^(ATTACH|PRAGMA)\b/i', $sql );
 	}
 
 	/**
diff --git a/includes/db/LBFactory.php b/includes/db/LBFactory.php
index 0742df279f..cf522b2087 100644
--- a/includes/db/LBFactory.php
+++ b/includes/db/LBFactory.php
@@ -208,7 +208,7 @@ abstract class LBFactory {
 	 */
 	public function hasMasterChanges() {
 		$ret = false;
-		$this->forEachLB( function ( $lb ) use ( &$ret ) {
+		$this->forEachLB( function ( LoadBalancer $lb ) use ( &$ret ) {
 			$ret = $ret || $lb->hasMasterChanges();
 		} );
 		return $ret;
diff --git a/includes/db/LBFactoryMulti.php b/includes/db/LBFactoryMulti.php
index aa305ab112..92fbccd690 100644
--- a/includes/db/LBFactoryMulti.php
+++ b/includes/db/LBFactoryMulti.php
@@ -232,7 +232,7 @@ class LBFactoryMulti extends LBFactory {
 	public function getMainLB( $wiki = false ) {
 		$section = $this->getSectionForWiki( $wiki );
 		if ( !isset( $this->mainLBs[$section] ) ) {
-			$lb = $this->newMainLB( $wiki, $section );
+			$lb = $this->newMainLB( $wiki );
 			$lb->parentInfo( array( 'id' => "main-$section" ) );
 			$this->chronProt->initLB( $lb );
 			$this->mainLBs[$section] = $lb;
diff --git a/includes/db/LoadMonitorMySQL.php b/includes/db/LoadMonitorMySQL.php
index c80697be54..30084190b5 100644
--- a/includes/db/LoadMonitorMySQL.php
+++ b/includes/db/LoadMonitorMySQL.php
@@ -34,12 +34,10 @@ class LoadMonitorMySQL implements LoadMonitor {
 	protected $mainCache;
 
 	public function __construct( $parent ) {
-		global $wgMemc;
-
 		$this->parent = $parent;
 
-		$this->srvCache = ObjectCache::newAccelerator( array(), 'hash' );
-		$this->mainCache = $wgMemc ?: wfGetMainCache();
+		$this->srvCache = ObjectCache::newAccelerator( 'hash' );
+		$this->mainCache = wfGetMainCache();
 	}
 
 	public function scaleLoads( &$loads, $group = false, $wiki = false ) {
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/deferred/LinksUpdate.php b/includes/deferred/LinksUpdate.php
index 36cc86566d..e9ec7ffa2b 100644
--- a/includes/deferred/LinksUpdate.php
+++ b/includes/deferred/LinksUpdate.php
@@ -61,12 +61,6 @@ class LinksUpdate extends SqlDataUpdate {
 	/** @var bool Whether to queue jobs for recursive updates */
 	public $mRecursive;
 
-	/** @var bool Whether this job was triggered by a recursive update job */
-	private $mTriggeredRecursive;
-
-	/** @var Revision Revision for which this update has been triggered */
-	private $mRevision;
-
 	/**
 	 * @var null|array Added links if calculated.
 	 */
@@ -153,6 +147,7 @@ class LinksUpdate extends SqlDataUpdate {
 	}
 
 	protected function doIncrementalUpdate() {
+
 		# Page links
 		$existing = $this->getExistingLinks();
 		$this->linkDeletions = $this->getLinkDeletions( $existing );
@@ -204,27 +199,6 @@ class LinksUpdate extends SqlDataUpdate {
 		$this->invalidateCategories( $categoryUpdates );
 		$this->updateCategoryCounts( $categoryInserts, $categoryDeletes );
 
-		# Category membership changes
-		if ( !$this->mTriggeredRecursive && ( $categoryInserts || $categoryDeletes ) ) {
-			try {
-				$catMembChange = new CategoryMembershipChange( $this->mTitle, $this->mRevision );
-
-				if ( $this->mRecursive ) {
-					$catMembChange->setRecursive();
-				}
-
-				foreach ( $categoryInserts as $categoryName => $value ) {
-					$catMembChange->pageAddedToCategory( $categoryName );
-				}
-
-				foreach ( $categoryDeletes as $categoryName => $value ) {
-					$catMembChange->pageRemovedFromCategory( $categoryName );
-				}
-			} catch ( MWException $e ) {
-				MWExceptionHandler::logException( $e );
-			}
-		}
-
 		# Page properties
 		$existing = $this->getExistingProperties();
 
@@ -889,21 +863,6 @@ class LinksUpdate extends SqlDataUpdate {
 		return $this->mImages;
 	}
 
-	/**
-	 * Set this object as being triggered by a recursive LinksUpdate
-	 */
-	public function setTriggeredRecursive() {
-		$this->mTriggeredRecursive = true;
-	}
-
-	/**
-	 * Set the revision corresponding to this LinksUpdate
-	 * @param Revision $revision
-	 */
-	public function setRevision( Revision $revision ) {
-		$this->mRevision = $revision;
-	}
-
 	/**
 	 * Invalidate any necessary link lists related to page property changes
 	 * @param array $changed
diff --git a/includes/exception/HttpError.php b/includes/exception/HttpError.php
index b910ec629d..9211bf8267 100644
--- a/includes/exception/HttpError.php
+++ b/includes/exception/HttpError.php
@@ -121,7 +121,7 @@ class HttpError extends MWException {
 		if ( $this->content instanceof Message ) {
 			$contentHtml = $this->content->escaped();
 		} else {
-			$contentHtml = htmlspecialchars( $this->content );
+			$contentHtml = nl2br( htmlspecialchars( $this->content ) );
 		}
 
 		return "<!DOCTYPE html>\n" .
diff --git a/includes/exception/MWExceptionHandler.php b/includes/exception/MWExceptionHandler.php
index def653fb30..d25f1a8269 100644
--- a/includes/exception/MWExceptionHandler.php
+++ b/includes/exception/MWExceptionHandler.php
@@ -26,31 +26,39 @@ 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' );
 	}
 
 	/**
 	 * Report an exception to the user
-	 * @param Exception $e
+	 * @param Exception|Throwable $e
 	 */
-	protected static function report( Exception $e ) {
+	protected static function report( $e ) {
 		global $wgShowExceptionDetails;
 
 		$cmdLine = MWException::isCommandLine();
@@ -124,9 +132,9 @@ class MWExceptionHandler {
 	 * transaction could be aborted properly.
 	 *
 	 * @since 1.23
-	 * @param Exception $e
+	 * @param Exception|Throwable $e
 	 */
-	public static function rollbackMasterChangesAndLog( Exception $e ) {
+	public static function rollbackMasterChangesAndLog( $e ) {
 		$factory = wfGetLBFactory();
 		if ( $factory->hasMasterChanges() ) {
 			$logger = LoggerFactory::getInstance( 'Bug56269' );
@@ -151,9 +159,9 @@ class MWExceptionHandler {
 	 *   }
 	 *
 	 * @since 1.25
-	 * @param Exception $e
+	 * @param Exception|Throwable $e
 	 */
-	public static function handleException( Exception $e ) {
+	public static function handleException( $e ) {
 		try {
 			// Rollback DBs to avoid transaction notices. This may fail
 			// to rollback some DB due to connection issues or exceptions.
@@ -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;
 	}
 
 	/**
@@ -275,34 +350,34 @@ TXT;
 	 * Like Exception::getTraceAsString, but replaces argument values with
 	 * argument type or class name.
 	 *
-	 * @param Exception $e
+	 * @param Exception|Throwable $e
 	 * @return string
+	 * @see prettyPrintTrace()
 	 */
-	public static function getRedactedTraceAsString( Exception $e ) {
-		return self::prettyPrintRedactedTrace(
-			self::getRedactedTrace( $e )
-		);
+	public static function getRedactedTraceAsString( $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;
 	}
@@ -332,10 +407,24 @@ TXT;
 	 * or its type (if the element is a PHP primitive).
 	 *
 	 * @since 1.22
-	 * @param Exception $e
+	 * @param Exception|Throwable $e
 	 * @return array
 	 */
-	public static function getRedactedTrace( Exception $e ) {
+	public static function getRedactedTrace( $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 );
 	}
 
 	/**
@@ -353,10 +442,10 @@ TXT;
 	 * $wgShowExceptionDetails is set to false), to the entry in the debug log.
 	 *
 	 * @since 1.22
-	 * @param Exception $e
+	 * @param Exception|Throwable $e
 	 * @return string
 	 */
-	public static function getLogId( Exception $e ) {
+	public static function getLogId( $e ) {
 		if ( !isset( $e->_mwLogId ) ) {
 			$e->_mwLogId = wfRandomString( 8 );
 		}
@@ -382,10 +471,10 @@ TXT;
 	 * Get a message formatting the exception message and its origin.
 	 *
 	 * @since 1.22
-	 * @param Exception $e
+	 * @param Exception|Throwable $e
 	 * @return string
 	 */
-	public static function getLogMessage( Exception $e ) {
+	public static function getLogMessage( $e ) {
 		$id = self::getLogId( $e );
 		$type = get_class( $e );
 		$file = $e->getFile();
@@ -403,12 +492,13 @@ TXT;
 	 * exception that can be used to augment a log message sent to a PSR-3
 	 * logger.
 	 *
-	 * @param Exception $e
+	 * @param Exception|Throwable $e
 	 * @return array
 	 */
-	public static function getLogContext( Exception $e ) {
+	public static function getLogContext( $e ) {
 		return array(
 			'exception' => $e,
+			'exception_id' => static::getLogId( $e ),
 		);
 	}
 
@@ -419,11 +509,11 @@ TXT;
 	 * backtrace) derived from the given exception. The backtrace information
 	 * will be redacted as per getRedactedTraceAsArray().
 	 *
-	 * @param Exception $e
+	 * @param Exception|Throwable $e
 	 * @return array
 	 * @since 1.26
 	 */
-	public static function getStructuredExceptionData( Exception $e ) {
+	public static function getStructuredExceptionData( $e ) {
 		global $wgLogExceptionBacktrace;
 		$data = array(
 			'id' => self::getLogId( $e ),
@@ -502,12 +592,12 @@ TXT;
 	 * @endcode
 	 *
 	 * @since 1.23
-	 * @param Exception $e
+	 * @param Exception|Throwable $e
 	 * @param bool $pretty Add non-significant whitespace to improve readability (default: false).
 	 * @param int $escaping Bitfield consisting of FormatJson::.*_OK class constants.
 	 * @return string|false JSON string if successful; false upon failure
 	 */
-	public static function jsonSerializeException( Exception $e, $pretty = false, $escaping = 0 ) {
+	public static function jsonSerializeException( $e, $pretty = false, $escaping = 0 ) {
 		$data = self::getStructuredExceptionData( $e );
 		return FormatJson::encode( $data, $pretty, $escaping );
 	}
@@ -519,9 +609,9 @@ TXT;
 	 * it is also used to handle PHP exceptions or exceptions from other libraries.
 	 *
 	 * @since 1.22
-	 * @param Exception $e
+	 * @param Exception|Throwable $e
 	 */
-	public static function logException( Exception $e ) {
+	public static function logException( $e ) {
 		if ( !( $e instanceof MWException ) || $e->isLoggable() ) {
 			$logger = LoggerFactory::getInstance( 'exception' );
 			$logger->error(
@@ -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/filebackend/SwiftFileBackend.php b/includes/filebackend/SwiftFileBackend.php
index 6a0f2ee3e6..408194f49e 100644
--- a/includes/filebackend/SwiftFileBackend.php
+++ b/includes/filebackend/SwiftFileBackend.php
@@ -138,13 +138,12 @@ class SwiftFileBackend extends FileBackendStore {
 			if ( PHP_SAPI === 'cli' ) {
 				$this->srvCache = wfGetMainCache(); // preferrably memcached
 			} else {
-				try { // look for APC, XCache, WinCache, ect...
-					$this->srvCache = ObjectCache::newAccelerator( array() );
-				} catch ( Exception $e ) {
-				}
+				// look for APC, XCache, WinCache, ect...
+				$this->srvCache = ObjectCache::newAccelerator( CACHE_NONE );
 			}
+		} else {
+			$this->srvCache = new EmptyBagOStuff();
 		}
-		$this->srvCache = $this->srvCache ?: new EmptyBagOStuff();
 	}
 
 	public function getFeatures() {
@@ -716,6 +715,11 @@ class SwiftFileBackend extends FileBackendStore {
 			return $objHdrs; // failed
 		}
 
+		// Find prior custom HTTP headers
+		$postHeaders = $this->getCustomHeaders( $objHdrs );
+		// Find prior metadata headers
+		$postHeaders += $this->getMetadataHeaders( $objHdrs );
+
 		$status = Status::newGood();
 		/** @noinspection PhpUnusedLocalVariableInspection */
 		$scopeLockS = $this->getScopedFileLocks( array( $path ), LockManager::LOCK_UW, $status );
@@ -725,11 +729,13 @@ class SwiftFileBackend extends FileBackendStore {
 				$hash = $tmpFile->getSha1Base36();
 				if ( $hash !== false ) {
 					$objHdrs['x-object-meta-sha1base36'] = $hash;
+					// Merge new SHA1 header into the old ones
+					$postHeaders['x-object-meta-sha1base36'] = $hash;
 					list( $srcCont, $srcRel ) = $this->resolveStoragePathReal( $path );
-					list( $rcode, $rdesc, $rhdrs, $rbody, $rerr ) = $this->http->run( array(
+					list( $rcode ) = $this->http->run( array(
 						'method' => 'POST',
 						'url' => $this->storageUrl( $auth, $srcCont, $srcRel ),
-						'headers' => $this->authTokenHeaders( $auth ) + $objHdrs
+						'headers' => $this->authTokenHeaders( $auth ) + $postHeaders
 					) );
 					if ( $rcode >= 200 && $rcode <= 299 ) {
 						$this->deleteFileCache( $path );
diff --git a/includes/filebackend/lockmanager/DBLockManager.php b/includes/filebackend/lockmanager/DBLockManager.php
index 39a55635c0..b81cf3e497 100644
--- a/includes/filebackend/lockmanager/DBLockManager.php
+++ b/includes/filebackend/lockmanager/DBLockManager.php
@@ -96,7 +96,7 @@ abstract class DBLockManager extends QuorumLockManager {
 				// Tracks peers that couldn't be queried recently to avoid lengthy
 				// connection timeouts. This is useless if each bucket has one peer.
 				try {
-					$this->statusCache = ObjectCache::newAccelerator( array() );
+					$this->statusCache = ObjectCache::newAccelerator();
 				} catch ( Exception $e ) {
 					trigger_error( __CLASS__ .
 						" using multiple DB peers without apc, xcache, or wincache." );
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/HTMLButtonField.php b/includes/htmlform/HTMLButtonField.php
index b0b08a645f..56a23ad20b 100644
--- a/includes/htmlform/HTMLButtonField.php
+++ b/includes/htmlform/HTMLButtonField.php
@@ -28,7 +28,7 @@ class HTMLButtonField extends HTMLFormField {
 		) {
 			$prefix = 'mw-ui-';
 			// add mw-ui-button separately, so the descriptor doesn't need to set it
-			$flags .= $prefix.'button';
+			$flags .= ' ' . $prefix.'button';
 		}
 		foreach ( $this->mFlags as $flag ) {
 			$flags .= ' ' . $prefix . $flag;
diff --git a/includes/htmlform/HTMLForm.php b/includes/htmlform/HTMLForm.php
index da58f20d24..08fa0a91ef 100644
--- a/includes/htmlform/HTMLForm.php
+++ b/includes/htmlform/HTMLForm.php
@@ -710,6 +710,21 @@ class HTMLForm extends ContextSource {
 		return $this;
 	}
 
+	/**
+	 * Get header text.
+	 *
+	 * @param string|null $section The section to get the header text for
+	 * @since 1.26
+	 * @return string
+	 */
+	function getHeaderText( $section = null ) {
+		if ( is_null( $section ) ) {
+			return $this->mHeader;
+		} else {
+			return isset( $this->mSectionHeaders[$section] ) ? $this->mSectionHeaders[$section] : '';
+		}
+	}
+
 	/**
 	 * Add footer text, inside the form.
 	 *
@@ -750,6 +765,21 @@ class HTMLForm extends ContextSource {
 		return $this;
 	}
 
+	/**
+	 * Get footer text.
+	 *
+	 * @param string|null $section The section to get the footer text for
+	 * @since 1.26
+	 * @return string
+	 */
+	function getFooterText( $section = null ) {
+		if ( is_null( $section ) ) {
+			return $this->mFooter;
+		} else {
+			return isset( $this->mSectionFooters[$section] ) ? $this->mSectionFooters[$section] : '';
+		}
+	}
+
 	/**
 	 * Add text to the end of the display.
 	 *
@@ -868,15 +898,15 @@ 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 )
-			// In OOUI forms, we handle mHeader elsewhere. FIXME This is horrible.
-			. ( $this->getDisplayFormat() === 'ooui' ? '' : $this->mHeader )
+			. $this->getHeaderText()
 			. $this->getBody()
 			. $this->getHiddenFields()
 			. $this->getButtons()
-			. $this->mFooter;
+			. $this->getFooterText();
 
 		$html = $this->wrapForm( $html );
 
@@ -1333,7 +1363,7 @@ class HTMLForm extends ContextSource {
 		&$hasUserVisibleFields = false ) {
 		$displayFormat = $this->getDisplayFormat();
 
-		$html = '';
+		$html = array();
 		$subsectionHtml = '';
 		$hasLabel = false;
 
@@ -1345,7 +1375,7 @@ class HTMLForm extends ContextSource {
 				$v = empty( $value->mParams['nodata'] )
 					? $this->mFieldData[$key]
 					: $value->getDefault();
-				$html .= $value->$getFieldHtmlMethod( $v );
+				$html[] = $value->$getFieldHtmlMethod( $v );
 
 				$labelValue = trim( $value->getLabel() );
 				if ( $labelValue != '&#160;' && $labelValue !== '' ) {
@@ -1372,12 +1402,9 @@ class HTMLForm extends ContextSource {
 
 					$legend = $this->getLegend( $key );
 
-					if ( isset( $this->mSectionHeaders[$key] ) ) {
-						$section = $this->mSectionHeaders[$key] . $section;
-					}
-					if ( isset( $this->mSectionFooters[$key] ) ) {
-						$section .= $this->mSectionFooters[$key];
-					}
+					$section = $this->getHeaderText( $key ) .
+						$section .
+						$this->getFooterText( $key );
 
 					$attributes = array();
 					if ( $fieldsetIDPrefix ) {
@@ -1391,45 +1418,7 @@ class HTMLForm extends ContextSource {
 			}
 		}
 
-		if ( $displayFormat !== 'raw' ) {
-			$classes = array();
-
-			if ( !$hasLabel ) { // Avoid strange spacing when no labels exist
-				$classes[] = 'mw-htmlform-nolabel';
-			}
-
-			$attribs = array(
-				'class' => implode( ' ', $classes ),
-			);
-
-			if ( $sectionName ) {
-				$attribs['id'] = Sanitizer::escapeId( $sectionName );
-			}
-
-			if ( $displayFormat === 'table' ) {
-				$html = Html::rawElement( 'table',
-						$attribs,
-						Html::rawElement( 'tbody', array(), "\n$html\n" ) ) . "\n";
-			} elseif ( $displayFormat === 'inline' ) {
-				$html = Html::rawElement( 'span', $attribs, "\n$html\n" );
-			} elseif ( $displayFormat === 'ooui' ) {
-				$config = array(
-					'classes' => $classes,
-				);
-				if ( $sectionName ) {
-					$config['id'] = Sanitizer::escapeId( $sectionName );
-				}
-				if ( is_string( $this->mWrapperLegend ) ) {
-					$config['label'] = $this->mWrapperLegend;
-				}
-				$fieldset = new OOUI\FieldsetLayout( $config );
-				// Ewww. We should pass this as $config['items'], but there might be string snippets.
-				$fieldset->group->appendContent( new OOUI\HtmlSnippet( $html ) );
-				$html = $fieldset;
-			} else {
-				$html = Html::rawElement( 'div', $attribs, "\n$html\n" );
-			}
-		}
+		$html = $this->formatSection( $html, $sectionName, $hasLabel );
 
 		if ( $subsectionHtml ) {
 			if ( $this->mSubSectionBeforeFields ) {
@@ -1442,6 +1431,46 @@ class HTMLForm extends ContextSource {
 		}
 	}
 
+	/**
+	 * Put a form section together from the individual fields' HTML, merging it and wrapping.
+	 * @param array $fieldsHtml
+	 * @param string $sectionName
+	 * @param bool $anyFieldHasLabel
+	 * @return string HTML
+	 */
+	protected function formatSection( array $fieldsHtml, $sectionName, $anyFieldHasLabel ) {
+		$displayFormat = $this->getDisplayFormat();
+		$html = implode( '', $fieldsHtml );
+
+		if ( $displayFormat === 'raw' ) {
+			return $html;
+		}
+
+		$classes = array();
+
+		if ( !$anyFieldHasLabel ) { // Avoid strange spacing when no labels exist
+			$classes[] = 'mw-htmlform-nolabel';
+		}
+
+		$attribs = array(
+			'class' => implode( ' ', $classes ),
+		);
+
+		if ( $sectionName ) {
+			$attribs['id'] = Sanitizer::escapeId( $sectionName );
+		}
+
+		if ( $displayFormat === 'table' ) {
+			return Html::rawElement( 'table',
+					$attribs,
+					Html::rawElement( 'tbody', array(), "\n$html\n" ) ) . "\n";
+		} elseif ( $displayFormat === 'inline' ) {
+			return Html::rawElement( 'span', $attribs, "\n$html\n" );
+		} else {
+			return Html::rawElement( 'div', $attribs, "\n$html\n" );
+		}
+	}
+
 	/**
 	 * Construct the form fields from the Descriptor array
 	 */
diff --git a/includes/htmlform/HTMLFormField.php b/includes/htmlform/HTMLFormField.php
index 1d8137ef87..13756e3d64 100644
--- a/includes/htmlform/HTMLFormField.php
+++ b/includes/htmlform/HTMLFormField.php
@@ -558,23 +558,25 @@ abstract class HTMLFormField {
 	 *
 	 * @param string $value The value to set the input to.
 	 *
-	 * @return string
+	 * @return OOUI\\FieldLayout|OOUI\\ActionFieldLayout
 	 */
 	public function getOOUI( $value ) {
-		list( $errors, $errorClass ) = $this->getErrorsAndErrorClass( $value );
-
 		$inputField = $this->getInputOOUI( $value );
 
 		if ( !$inputField ) {
-			// This field doesn't have an OOUI implementation yet at all.
-			// OK, use this trick:
-			return $this->getDiv( $value );
+			// This field doesn't have an OOUI implementation yet at all. Fall back to getDiv() to
+			// generate the whole field, label and errors and all, then wrap it in a Widget.
+			// It might look weird, but it'll work OK.
+			return $this->getFieldLayoutOOUI(
+				new OOUI\Widget( array( 'content' => new OOUI\HtmlSnippet( $this->getDiv( $value ) ) ) ),
+				array( 'infusable' => false )
+			);
 		}
 
 		$infusable = true;
 		if ( is_string( $inputField ) ) {
-			// Mmm… We have an OOUI implementation, but it's not complete, and we got a load of HTML.
-			// Cheat a little and wrap it in a widget! It won't be infusable, though, since client-side
+			// We have an OOUI implementation, but it's not proper, and we got a load of HTML.
+			// Cheat a little and wrap it in a widget. It won't be infusable, though, since client-side
 			// JavaScript doesn't know how to rebuilt the contents.
 			$inputField = new OOUI\Widget( array( 'content' => new OOUI\HtmlSnippet( $inputField ) ) );
 			$infusable = false;
@@ -582,16 +584,21 @@ abstract class HTMLFormField {
 
 		$fieldType = get_class( $this );
 		$helpText = $this->getHelpText();
+		$errors = $this->getErrorsRaw( $value );
+		foreach ( $errors as &$error ) {
+			$error = new OOUI\HtmlSnippet( $error );
+		}
+
 		$config = array(
-			'classes' => array( "mw-htmlform-field-$fieldType", $this->mClass, $errorClass ),
+			'classes' => array( "mw-htmlform-field-$fieldType", $this->mClass ),
 			'align' => $this->getLabelAlignOOUI(),
 			'label' => $this->getLabel(),
 			'help' => $helpText !== null ? new OOUI\HtmlSnippet( $helpText ) : null,
+			'errors' => $errors,
 			'infusable' => $infusable,
 		);
-		$field = $this->getFieldLayoutOOUI( $inputField, $config );
 
-		return $field . $errors;
+		return $this->getFieldLayoutOOUI( $inputField, $config );
 	}
 
 	/**
@@ -778,7 +785,7 @@ abstract class HTMLFormField {
 	 * @since 1.20
 	 *
 	 * @param string $value The value of the input
-	 * @return array
+	 * @return array array( $errors, $errorClass )
 	 */
 	public function getErrorsAndErrorClass( $value ) {
 		$errors = $this->validate( $value, $this->mParent->mFieldData );
@@ -794,6 +801,32 @@ abstract class HTMLFormField {
 		return array( $errors, $errorClass );
 	}
 
+	/**
+	 * Determine form errors to display, returning them in an array.
+	 *
+	 * @since 1.26
+	 * @param string $value The value of the input
+	 * @return string[] Array of error HTML strings
+	 */
+	public function getErrorsRaw( $value ) {
+		$errors = $this->validate( $value, $this->mParent->mFieldData );
+
+		if ( is_bool( $errors ) || !$this->mParent->wasSubmitted() ) {
+			$errors = array();
+		}
+
+		if ( !is_array( $errors ) ) {
+			$errors = array( $errors );
+		}
+		foreach ( $errors as &$error ) {
+			if ( $error instanceof Message ) {
+				$error = $error->parse();
+			}
+		}
+
+		return $errors;
+	}
+
 	/**
 	 * @return string
 	 */
@@ -887,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 ) {
@@ -895,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/HTMLSelectNamespace.php b/includes/htmlform/HTMLSelectNamespace.php
index d6d564e91f..4efdfbf306 100644
--- a/includes/htmlform/HTMLSelectNamespace.php
+++ b/includes/htmlform/HTMLSelectNamespace.php
@@ -23,13 +23,10 @@ class HTMLSelectNamespace extends HTMLFormField {
 
 	public function getInputOOUI( $value ) {
 		return new MediaWiki\Widget\NamespaceInputWidget( array(
-			'valueNamespace' => $value,
-			'nameNamespace' => $this->mName,
+			'value' => $value,
+			'name' => $this->mName,
 			'id' => $this->mID,
 			'includeAllValue' => $this->mAllValue,
-			// Disable additional checkboxes
-			'nameInvert' => null,
-			'nameAssociated' => null,
 		) );
 	}
 }
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/htmlform/OOUIHTMLForm.php b/includes/htmlform/OOUIHTMLForm.php
index eec13eeb9b..84d40a14c8 100644
--- a/includes/htmlform/OOUIHTMLForm.php
+++ b/includes/htmlform/OOUIHTMLForm.php
@@ -25,6 +25,8 @@
  * Compact stacked vertical format for forms, implemented using OOUI widgets.
  */
 class OOUIHTMLForm extends HTMLForm {
+	private $oouiErrors;
+
 	public function __construct( $descriptor, $context = null, $messagePrefix = '' ) {
 		parent::__construct( $descriptor, $context, $messagePrefix );
 		$this->getOutput()->enableOOUI();
@@ -104,11 +106,97 @@ class OOUIHTMLForm extends HTMLForm {
 		return $html;
 	}
 
+	/**
+	 * Put a form section together from the individual fields' HTML, merging it and wrapping.
+	 * @param OOUI\\FieldLayout[] $fieldsHtml
+	 * @param string $sectionName
+	 * @param bool $anyFieldHasLabel Unused
+	 * @return string HTML
+	 */
+	protected function formatSection( array $fieldsHtml, $sectionName, $anyFieldHasLabel ) {
+		$config = array(
+			'items' => $fieldsHtml,
+		);
+		if ( $sectionName ) {
+			$config['id'] = Sanitizer::escapeId( $sectionName );
+		}
+		if ( is_string( $this->mWrapperLegend ) ) {
+			$config['label'] = $this->mWrapperLegend;
+		}
+		return new OOUI\FieldsetLayout( $config );
+	}
+
+	/**
+	 * @param string|array|Status $err
+	 * @return string
+	 */
+	function getErrors( $err ) {
+		if ( !$err ) {
+			$errors = array();
+		} else if ( $err instanceof Status ) {
+			if ( $err->isOK() ) {
+				$errors = array();
+			} else {
+				$errors = $err->getErrorsByType( 'error' );
+				foreach ( $errors as &$error ) {
+					// Input:  array( 'message' => 'foo', 'errors' => array( 'a', 'b', 'c' ) )
+					// Output: array( 'foo', 'a', 'b', 'c' )
+					$error = array_merge( array( $error['message'] ), $error['params'] );
+				}
+			}
+		} else {
+			$errors = $err;
+			if ( !is_array( $errors ) ) {
+				$errors = array( $errors );
+			}
+		}
+
+		foreach ( $errors as &$error ) {
+			if ( is_array( $error ) ) {
+				$msg = array_shift( $error );
+			} else {
+				$msg = $error;
+				$error = array();
+			}
+			$error = $this->msg( $msg, $error )->parse();
+			$error = new OOUI\HtmlSnippet( $error );
+		}
+
+		// Used in getBody()
+		$this->oouiErrors = $errors;
+		return '';
+	}
+
+	function getHeaderText( $section = null ) {
+		if ( is_null( $section ) ) {
+			// We handle $this->mHeader elsewhere, in getBody()
+			return '';
+		} else {
+			return parent::getHeaderText( $section );
+		}
+	}
+
 	function getBody() {
 		$fieldset = parent::getBody();
 		// FIXME This only works for forms with no subsections
 		if ( $fieldset instanceof OOUI\FieldsetLayout ) {
-			$fieldset->group->prependContent( new OOUI\HtmlSnippet( $this->mHeader ) );
+			$classes = array( 'mw-htmlform-ooui-header' );
+			if ( !$this->mHeader ) {
+				$classes[] = 'mw-htmlform-ooui-header-empty';
+			}
+			if ( $this->oouiErrors ) {
+				$classes[] = 'mw-htmlform-ooui-header-errors';
+			}
+			$fieldset->addItems( array(
+				new OOUI\FieldLayout(
+					new OOUI\LabelWidget( array( 'label' => new OOUI\HtmlSnippet( $this->mHeader ) ) ),
+					array(
+						'align' => 'top',
+						'errors' => $this->oouiErrors,
+						'classes' => $classes,
+					)
+				)
+			), 0 );
 		}
 		return $fieldset;
 	}
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/MssqlInstaller.php b/includes/installer/MssqlInstaller.php
index 5a8403f552..4d79d9665b 100644
--- a/includes/installer/MssqlInstaller.php
+++ b/includes/installer/MssqlInstaller.php
@@ -537,7 +537,6 @@ class MssqlInstaller extends DatabaseInstaller {
 		$this->setupSchemaVars();
 		$dbName = $this->getVar( 'wgDBname' );
 		$this->db->selectDB( $dbName );
-		$server = $this->getVar( 'wgDBserver' );
 		$password = $this->getVar( 'wgDBpassword' );
 		$schemaName = $this->getVar( 'wgDBmwschema' );
 
diff --git a/includes/installer/MysqlUpdater.php b/includes/installer/MysqlUpdater.php
index 36d2c1dd31..aa60c01b5b 100644
--- a/includes/installer/MysqlUpdater.php
+++ b/includes/installer/MysqlUpdater.php
@@ -267,12 +267,14 @@ class MysqlUpdater extends DatabaseUpdater {
 				'patch-fa_major_mime-chemical.sql' ),
 
 			// 1.25
-			array( 'dropTable', 'hitcounter' ),
-			array( 'dropField', 'site_stats', 'ss_total_views', 'patch-drop-ss_total_views.sql' ),
-			array( 'dropField', 'page', 'page_counter', 'patch-drop-page_counter.sql' ),
 			array( 'doUserNewTalkUseridUnsigned' ),
 			// note this patch covers other _comment and _description fields too
 			array( 'modifyField', 'recentchanges', 'rc_comment', 'patch-editsummary-length.sql' ),
+
+			// 1.26
+			array( 'dropTable', 'hitcounter' ),
+			array( 'dropField', 'site_stats', 'ss_total_views', 'patch-drop-ss_total_views.sql' ),
+			array( 'dropField', 'page', 'page_counter', 'patch-drop-page_counter.sql' ),
 		);
 	}
 
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/azb.json b/includes/installer/i18n/azb.json
index baf4f6df5d..775e6e6ae4 100644
--- a/includes/installer/i18n/azb.json
+++ b/includes/installer/i18n/azb.json
@@ -1,7 +1,9 @@
 {
 	"@metadata": {
 		"authors": [
-			"Mousa"
+			"Mousa",
+			"Koroğlu",
+			"Ebrahimi-amir"
 		]
 	},
 	"config-desc": "مئدیاویکی قوروجوسو",
diff --git a/includes/installer/i18n/ca.json b/includes/installer/i18n/ca.json
index 6d28a5823b..ee33109c2d 100644
--- a/includes/installer/i18n/ca.json
+++ b/includes/installer/i18n/ca.json
@@ -80,8 +80,6 @@
 	"config-db-install-account": "Compte d'usuari per a la instal·lació",
 	"config-db-username": "Nom d'usuari de la base de dades:",
 	"config-db-password": "Contrasenya de la base de dades:",
-	"config-db-password-empty": "Si us plau, introduïu una contrasenya pel nou usuari de la base de dades $1. Tot i que es poden crear usuaris sense contrasenyes, no és segur.",
-	"config-db-username-empty": "Heu d'introduir un valor per a «{{int:config-db-username}}»",
 	"config-db-install-username": "Introduïu el nom d'usuari que s'utilitzarà per connectar a la base de dades durant el procés d'instal·lació. Aquest no és el nom d'usuari de MediaWiki, és el nom d'usuari de la vostra base de dades.",
 	"config-db-install-password": "Introduïu la contrasenya que s'utilitzarà per connectar a la base de dades durant el procés d'instal·lació. Aquesta no és la contrasenya del vostre compte a MediaWiki, és la contrasenya de la vostra base de dades.",
 	"config-db-install-help": "Introduïu el nom d'usuari i la contrasenya que s'empraran per connectar a la base de dades durant el procés d'instal·lació.",
@@ -204,6 +202,7 @@
 	"config-memcached-servers": "Servidors de Memcache:",
 	"config-memcache-badip": "Heu introduït una adreça IP no vàlida per al Memcached: $1.",
 	"config-memcache-noport": "No heu especificat un port per utilitzar el servidor Memcached: $1.\nSi no coneixeu el port, per defecte és 11211.",
+	"config-memcache-badport": "Els números de port de Memcached han de ser entre $1 i $2.",
 	"config-extensions": "Extensions",
 	"config-skins": "Aparences",
 	"config-skins-use-as-default": "Utilitza aquest tema per defecte",
diff --git a/includes/installer/i18n/de-ch.json b/includes/installer/i18n/de-ch.json
index 3a73c3ed39..b28a40dabe 100644
--- a/includes/installer/i18n/de-ch.json
+++ b/includes/installer/i18n/de-ch.json
@@ -1,8 +1,12 @@
 {
 	"@metadata": {
 		"authors": [
-			"Geitost"
+			"Geitost",
+			"Das Schäfchen"
 		]
 	},
+	"config-copyright": "=== Lizenz und Nutzungsbedingungen ===\n\n$1\n\nDieses Programm ist freie Software, d. h. es kann, gemäss den Bedingungen der von der Free Software Foundation veröffentlichten ''GNU General Public License'', weiterverteilt und/oder modifiziert werden. Dabei kann die Version 2, oder nach eigenem Ermessen, jede neuere Version der Lizenz verwendet werden.\n\nDieses Programm wird in der Hoffnung verteilt, dass es nützlich sein wird, allerdings '''ohne jegliche Garantie''' und sogar ohne die implizierte Garantie einer '''Marktgängigkeit''' oder '''Eignung für einen bestimmten Zweck'''. Hierzu sind weitere Hinweise in der ''GNU General Public License'' enthalten.\n\nEine <doclink href=Copying>Kopie der GNU General Public License</doclink> sollte zusammen mit diesem Programm verteilt worden sein. Sofern dies nicht der Fall war, kann eine Kopie bei der Free Software Foundation Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA, schriftlich angefordert oder auf deren Website [http://www.gnu.org/copyleft/gpl.html online gelesen] werden.",
+	"config-unicode-pure-php-warning": "'''Warnung:''' Die [http://pecl.php.net/intl PECL-Erweiterung intl] ist für die Unicode-Normalisierung nicht verfügbar, so dass stattdessen die langsame pure-PHP-Implementierung genutzt wird.\nSofern eine Website mit grosser Benutzeranzahl betrieben wird, sollten weitere Informationen auf der Webseite [//www.mediawiki.org/wiki/Special:MyLanguage/Unicode_normalization_considerations Unicode-Normalisierung (en)] gelesen werden.",
+	"config-uploads-not-safe": "'''Warnung:''' Das Standardverzeichnis für hochgeladene Dateien <code>$1</code> ist für die willkürliche Ausführung von Skripten anfällig.\nObwohl MediaWiki die hochgeladenen Dateien auf Sicherheitsrisiken überprüft, wird dennoch dringend empfohlen, diese [//www.mediawiki.org/wiki/Special:MyLanguage/Manual:Security#Upload_security Sicherheitslücke] zu schliessen, bevor das Hochladen von Dateien aktiviert wird.",
 	"config-license-help": "Viele öffentliche Wikis publizieren alle Beiträge unter einer [http://freedomdefined.org/Definition/De freien Lizenz.]\nDies trägt dazu bei, ein Gefühl von Gemeinschaft zu schaffen, und ermutigt zu längerfristiger Mitarbeit.\nHingegen ist im Allgemeinen eine freie Lizenz auf geschlossenen Wikis nicht notwendig.\n\nSofern man Texte aus der Wikipedia verwenden möchte und umgekehrt, sollte die ''Creative-Commons''-Lizenz „Namensnennung – Weitergabe unter gleichen Bedingungen“ gewählt werden.\n\nDie Wikipedia nutzte vormals die GNU-Lizenz für freie Dokumentation (GFDL).\nDie GFDL ist eine gültige Lizenz, die allerdings schwer zu verstehen ist.\nEs ist zudem schwierig, gemäss dieser Lizenz lizenzierte Inhalte wiederzuverwenden."
 }
diff --git a/includes/installer/i18n/el.json b/includes/installer/i18n/el.json
index 8fe729423e..d8405cf8b0 100644
--- a/includes/installer/i18n/el.json
+++ b/includes/installer/i18n/el.json
@@ -5,7 +5,8 @@
 			"Protnet",
 			"ZaDiak",
 			"Astralnet",
-			"Geraki"
+			"Geraki",
+			"Stam.nikos"
 		]
 	},
 	"config-desc": "Το πρόγραμμα εγκατάστασης για το MediaWiki",
@@ -14,8 +15,11 @@
 	"config-localsettings-key": "Κλειδί αναβάθμισης:",
 	"config-localsettings-badkey": "Το κλειδί που δώσατε είναι εσφαλμένο.",
 	"config-upgrade-key-missing": "Έχει εντοπιστεί μια υπάρχουσα εγκατάσταση του MediaWiki.\nΓια να αναβαθμίσετε αυτήν την εγκατάσταση, παρακαλούμε να βάλετε την ακόλουθη γραμμή στο κάτω μέρος του <code>LocalSettings.php</code> σας:\n\n$1",
+	"config-session-error": "Σφάλμα κατά την εκκίνηση συνεδρίας: $1",
 	"config-your-language": "Η γλώσσα σας:",
+	"config-your-language-help": "Επιλέξτε μία γλώσσα για τη διαδικασία της εγκατάστασης.",
 	"config-wiki-language": "Γλώσσα του wiki:",
+	"config-wiki-language-help": "Επιλέξτε τη γλώσσα που θα γραφεί το wiki πρωταρχικά.",
 	"config-back": "← Πίσω",
 	"config-continue": "Συνέχεια →",
 	"config-page-language": "Γλώσσα",
@@ -35,10 +39,15 @@
 	"config-page-existingwiki": "Υπάρχον wiki",
 	"config-help-restart": "Θέλετε να καταργήσετε όλα τα αποθηκευμένα δεδομένα που έχετε εισαγάγει και να επανεκκινήσετε τη διαδικασία εγκατάστασης;",
 	"config-restart": "Ναι, κάντε επανεκκίνηση",
+	"config-welcome": "=== Περιβαλλοντικοί έλεγχοι ===\nΤώρα θα γίνουν βασικοί έλεγχοι για να δούμε αν αυτό το περιβάλλον είναι κατάλληλο για την εγκατάσταση του MediaWiki.\nΘυμηθείτε να συμπεριλάβετε αυτές τις πληροφορίες εάν αναζητήσετε υποστήριξη για το πώς να ολοκληρώσετε την εγκατάσταση.",
+	"config-copyright": "=== Πνευματικά δικαιώματα και Όροι ===\n\n$1\n\nΑυτό το πρόγραμμα είναι ελεύθερο λογισμικό• μπορείτε να το αναδιανείμετε ή και να το τροποποιήσετε υπό τους όρους της Γενικής Άδειας Δημόσιας Χρήσης GNU, όπως αυτή δημοσιεύεται από το Ίδρυμα Ελεύθερου Λογισμικού• είτε της έκδοσης 2 της Άδειας, είτε (κατά την επιλογή σας) οποιασδήποτε μεταγενέστερης έκδοσης.\n\nΑυτό το πρόγραμμα διανέμεται με την ελπίδα ότι θα είναι χρήσιμο, αλλά <strong>χωρίς καμία εγγύηση</strong>• χωρίς καν την υπονοούμενη εγγύηση της <strong>εμπορευσιμότητας</strong> ή της <strong>καταλληλοτότητας για συγκεκριμένο σκοπό</strong>.\nΔείτε την Γενική Άδεια Δημόσιας Χρήσης GNU για περισσότερες λεπτομέρειες.\n\nΘα πρέπει να έχετε λάβει <doclink href=\"Copying\">ένα αντίγραφο της Γενικής Άδειας Δημόσιας Χρήσης GNU</doclink> μαζί με αυτό το πρόγραμμα• αν όχι, γράψτε στο Free Software Foundation,\n51 Franklin Street, Fifth Floor,\nBoston, MA 02110-1335\nUSA ή [http://www.gnu.org/copyleft/gpl.html διαβάστε online].",
+	"config-sidebar": "* [//www.mediawiki.org Αρχική MediaWiki]\n* [//www.mediawiki.org/wiki/Special:MyLanguage/Help:Contents Οδηγός Χρήστη]\n* [//www.mediawiki.org/wiki/Special:MyLanguage/Manual:Contents Οδηγός Διαχειριστή]\n* [//www.mediawiki.org/wiki/Special:MyLanguage/Manual:FAQ Συχνές ερωτήσεις]\n----\n* <doclink href=\"Readme\">Διαβάστε με</doclink>\n* <doclink href=\"ReleaseNotes\">Σημειώσεις έκδοσης</doclink>\n* <doclink href=\"Copying\">Αντιγραφή</doclink>\n* <doclink href=\"UpgradeDoc\">Αναβάθμιση</doclink>",
 	"config-env-good": "Το περιβάλλον έχει ελεγχθεί.\nΜπορείτε να εγκαταστήσετε το MediaWiki.",
 	"config-env-bad": "Το περιβάλλον έχει ελεγχθεί.\nΔεν μπορείτε να εγκαταστήσετε το MediaWiki.",
 	"config-env-php": "H PHP $1 είναι εγκατεστημένη.",
 	"config-env-hhvm": "Το HHVM $1 είναι εγκατεστημένο.",
+	"config-unicode-using-intl": "Χρησιμοποιώντας την [http://pecl.php.net/intl επέκταση intl PECL] για κανονικοποίηση Unicode.",
+	"config-unicode-pure-php-warning": "<strong>Προειδοποίηση:</strong> Η [http://pecl.php.net/intl επέκταση intl PECL] δεν είναι διαθέσιμη για να χειριστεί την κανονικοποίηση Unicode, επιστρέφουμε στην αργή αμιγώς PHP εφαρμογή.\nΕάν λειτουργείτε έναν ιστότοπο υψηλής επισκεψιμότητας, θα πρέπει να ρίξετε μια ματιά στην [//www.mediawiki.org/wiki/Special:MyLanguage/Unicode_normalization_considerations κανονικοποίηση Unicode].",
 	"config-apc": "Το [http://www.php.net/apc APC] είναι εγκατεστημένο",
 	"config-diff3-bad": "Το GNU diff3 δεν βρέθηκε.",
 	"config-db-type": "Τύπος βάσης δεδομένων:",
@@ -77,6 +86,7 @@
 	"config-mysql-engine": "Μηχανή αποθήκευσης:",
 	"config-mysql-innodb": "InnoDB",
 	"config-mysql-myisam": "MyISAM",
+	"config-mysql-charset": "Σύνολο χαρακτήρων βάσης δεδομένων:",
 	"config-mysql-binary": "Δυαδικό",
 	"config-mysql-utf8": "UTF-8",
 	"config-mssql-auth": "Τύπος ελέγχου ταυτότητας:",
@@ -127,11 +137,15 @@
 	"config-instantcommons": "Ενεργοποίηση Instant Commons",
 	"config-cc-again": "Επιλέξτε ξανά...",
 	"config-advanced-settings": "Προηγμένες ρυθμίσεις παραμέτρων",
+	"config-cache-options": "Ρυθμίσεις για την προσωρινή αποθήκευση αντικειμένου:",
 	"config-extensions": "Επεκτάσεις",
 	"config-skins": "Θέματα εμφάνισης",
 	"config-skins-help": "Τα θέματα εμφάνισης που αναφέρονται παραπάνω εντοπίστηκαν στον κατάλογο <code>./skins</code>. Πρέπει να  ενεργοποιήσετε τουλάχιστον ένα και να επιλέξτε ποιο θα είναι το προεπιλεγμένο.",
 	"config-skins-use-as-default": "Χρήση αυτού του θέματος εμφάνισης ως προεπιλογή",
+	"config-skins-must-enable-some": "Πρέπει να επιλέξετε τουλάχιστον μία εμφάνιση να την ενεργοποιήσετε.",
 	"config-skins-must-enable-default": "Το θέμα εμφάνισης που επιλέχθηκε ως προεπιλεγμένο πρέπει να είναι ενεργοποιημένο.",
+	"config-install-alreadydone": "<strong>Προειδοποίηση:</strong> Φαίνεται πως έχετε ήδη εγκατεστημένο το MediaWiki και προσπαθείτε να το εγκαταστήσετε ξανά.\nΠαρακαλώ προχωρήστε στην επόμενη σελίδα.",
+	"config-install-begin": "Πατώντας «{{int:config-continue}}» θα ξεκινήσει η εγκατάσταση του MediaWiki.\nΕάν θέλετε ακόμα να κάνετε αλλαγές, πατήστε «{{int:config-back}}».",
 	"config-install-step-done": "έγινε",
 	"config-install-step-failed": "απέτυχε",
 	"config-install-extensions": "Γίνεται συμπερίληψη των επεκτάσεων",
diff --git a/includes/installer/i18n/es.json b/includes/installer/i18n/es.json
index 5a26449732..8da312894b 100644
--- a/includes/installer/i18n/es.json
+++ b/includes/installer/i18n/es.json
@@ -66,7 +66,7 @@
 	"config-help-restart": "¿Deseas borrar todos los datos guardados que has escrito y reiniciar el proceso de instalación?",
 	"config-restart": "Sí, reiniciarlo",
 	"config-welcome": "=== Comprobación del entorno ===\nAhora se van a realizar comprobaciones básicas para ver si el entorno es adecuado para la instalación de MediaWiki.\nRecuerda suministrar los resultados de tales comprobaciones si necesitas ayuda para completar la instalación.",
-	"config-copyright": "=== Derechos de autor y Términos de uso ===\n\n$1\n\nEste programa es software libre; puedes redistribuirlo y/o modificarlo en los términos de la Licencia Pública General de GNU, tal como aparece publicada por la Fundación para el Software Libre, tanto la versión 2 de la Licencia, como cualquier versión posterior (según prefiera).\n\nEste programa es distribuido en la esperanza de que sea útil, pero '''sin cualquier garantía'''; inclusive, sin la garantía implícita de la '''posibilidad de ser comercializado''' o de '''idoneidad para cualquier finalidad específica'''.\nConsulte la licencia *GNU General *Public *License para más detalles.\n\nEn conjunto con este programa debe haber recibido <doclink href=Copying>una copia de la Licencia Pública General de GNU</doclink>; si no la recibió, pídala por escrito a Fundación para el Software Libre, Inc., 51 Franklin Street, Fifth Floor, Boston, ME La 02110-1301, USA o [http://www.gnu.org/copyleft/gpl.html léala en internet].",
+	"config-copyright": "=== Derechos de autor y Términos de uso ===\n\n$1\n\nEste programa es software libre; puedes redistribuirlo y/o modificarlo en los términos de la Licencia Pública General de GNU, tal como aparece publicada por la Fundación para el Software Libre, tanto la versión 2 de la Licencia, como cualquier versión posterior (según prefieras).\n\nEste programa es distribuido con la esperanza de que sea útil, pero <strong>sin ninguna garantía</strong>; inclusive, sin la garantía implícita de la <strong>posibilidad de ser comercializado</strong> o de <strong>idoneidad para cualquier finalidad específica</strong>.\nConsulta la Licencia Pública General de GNU para más detalles.\n\nEn conjunto con este programa debes haber recibido <doclink href=Copying>una copia de la Licencia Pública General de GNU</doclink>; caso contrario, pídela por escrito a la Fundación para el Software Libre, Inc., 51 Franklin Street, Fifth Floor, Boston, ME La 02110-1301, USA o [http://www.gnu.org/copyleft/gpl.html léela en Internet].",
 	"config-sidebar": "* [//www.mediawiki.org Página principal de MediaWiki]\n* [//www.mediawiki.org/wiki/Special:MyLanguage/Help:Contents Guía del usuario]\n* [//www.mediawiki.org/wiki/Special:MyLanguage/Manual:Contents Guía del administrador]\n* [//www.mediawiki.org/wiki/Special:MyLanguage/Manual:FAQ Preguntas frecuentes]\n----\n* <doclink href=Readme>Léeme</doclink>\n* <doclink href=ReleaseNotes>Notas de la versión</doclink>\n* <doclink href=Copying>Copia</doclink>\n* <doclink href=UpgradeDoc>Actualización</doclink>",
 	"config-env-good": "El entorno ha sido comprobado.\nPuedes instalar MediaWiki.",
 	"config-env-bad": "El entorno ha sido comprobado.\nNo puedes instalar MediaWiki.",
@@ -87,7 +87,7 @@
 	"config-xml-bad": "Falta el módulo XML de PHP.\nMediaWiki requiere funciones de este módulo y no funcionará en esta configuración.\nPuede que necesites instalar el el paquete RPM llamado php-xml.",
 	"config-pcre-old": "'''Fatal:''' Se requiere PCRE $1 o posterior.\nSu PHP binario está enlazado con PCRE $2.\n[https://www.mediawiki.org/wiki/Manual:Errors_and_symptoms/PCRE Más información].",
 	"config-pcre-no-utf8": "'''Error fatal ''': Parece que el módulo PCRE de PHP fue compilado sin el soporte PCRE_UTF8.\nMediaWiki requiere compatibilidad con UTF-8 para funcionar correctamente.",
-	"config-memory-raised": "el parámetro <code>memory_limit</code> de PHP es $1, aumentada a $2.",
+	"config-memory-raised": "El parámetro <code>memory_limit</code> de PHP es $1. Se aumenta a $2.",
 	"config-memory-bad": "<strong>Advertencia:</strong> el parámetro <code>memory_limit</code> de PHP es $1.\nProbablemente sea demasiado bajo.\n¡La instalación puede fallar!",
 	"config-ctype": "'''Fatal''': Se necesita compilar PHP con compatibilidad para la [http://www.php.net/manual/en/ctype.installation.php extensión Ctype].",
 	"config-iconv": "<strong>Fatal:</strong> PHP debe ser compilado con soporte para la [http://www.php.net/manual/en/iconv.installation.php extensión iconv].",
@@ -176,8 +176,8 @@
 	"config-postgres-old": "Se requiere PostgreSQL $1 o posterior. Tienes la versión $2.",
 	"config-mssql-old": "Se requiere Microsoft SQL Server $1 o posterior. Tienes la versión $2.",
 	"config-sqlite-name-help": "Elige el nombre que identificará a tu wiki.\nNo uses espacios o guiones.\nEste nombre se usará como nombre del archivo de datos de SQLite.",
-	"config-sqlite-parent-unwritable-group": "No se puede crear el directorio de datos <code><nowiki>$1</nowiki></code> , porque el directorio padre <code><nowiki>$2</nowiki></code> no es accesible en escritura por el servidor Web.\n\nEl instalador ha determinado el usuario cuyo servidor Web se está ejecutando.\nConceda permisos de escritura en el directorio <code><nowiki>$3</nowiki></code> para continuar.\nEn un sistema Unix/Linux haga:\n\n<pre>cd $2\nmkdir $3\nchgrp $4 $3\nchmod g+w $3</pre>",
-	"config-sqlite-parent-unwritable-nogroup": "No se puede crear el directorio de datos <code><nowiki>$1</nowiki></code> , porque el directorio padre <code><nowiki>$2</nowiki></code> no es accesible en escritura por el servidor Web.\n\nEl programa de instalación no pudo determinar el usuario que se ejecuta en el servidor Web\nConceda permisos de escritura en el directorio <code><nowiki>$3</nowiki></code> para continuar.\nEn un sistema Unix/Linux haga:\n\n<pre>cd $2\nmkdir $3\nchmod a+w $3</pre>",
+	"config-sqlite-parent-unwritable-group": "No se puede crear el directorio de datos <code><nowiki>$1</nowiki></code>, porque el servidor web no tiene permiso de escribir en el directorio padre <code><nowiki>$2</nowiki></code>.\n\nEl instalador ha determinado el usuario con el que se ejecuta tu servidor web.\nConcede permisos de escritura a él en el directorio <code><nowiki>$3</nowiki></code> para continuar.\nEn un sistema Unix/Linux haz:\n\n<pre>cd $2\nmkdir $3\nchgrp $4 $3\nchmod g+w $3</pre>",
+	"config-sqlite-parent-unwritable-nogroup": "No se puede crear el directorio de datos <code><nowiki>$1</nowiki></code>, porque el servidor web no tiene permiso de escribir en el directorio padre <code><nowiki>$2</nowiki></code>.\n\nEl instalador no pudo determinar el usuario con el que se ejecuta tu servidor web.\nConcede permisos de escritura a él (¡y a otros!) en el directorio <code><nowiki>$3</nowiki></code> para continuar.\nEn un sistema Unix/Linux haz:\n\n<pre>cd $2\nmkdir $3\nchmod a+w $3</pre>",
 	"config-sqlite-mkdir-error": "Error al crear el directorio de datos \"$1\".\nComprueba la ubicación e inténtalo de nuevo.",
 	"config-sqlite-dir-unwritable": "No se puede escribir en el directorio \"$1\".\nModifica sus permisos para que el servidor web pueda escribir en él, y vuelve a intentarlo.",
 	"config-sqlite-connection-error": "$1.\n\nVerifica el directorio de datos y el nombre de la base de datos mostrada a continuación, e inténtalo nuevamente.",
@@ -237,7 +237,7 @@
 	"config-admin-error-bademail": "Has escrito una dirección de correo electrónico no válida.",
 	"config-subscribe": "Suscribirse a la [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce lista de correo de anuncios de versiones].",
 	"config-subscribe-help": "Esta es una lista de divulgación de bajo volumen para anuncios de lanzamiento de versiones nuevas, incluyendo anuncios de seguridad importantes.\nTe recomendamos suscribirte y actualizar tu instalación MediaWiki cada vez que se lance una nueva versión.",
-	"config-subscribe-noemail": "Ha intentado suscribirse a la lista de correo de anuncios de nuevos lanzamientos sin proporcionar una dirección de correo electrónico.\nProporcione una dirección de correo electrónico si desea suscribirse a la lista de correo.",
+	"config-subscribe-noemail": "Has intentado suscribirte a la lista de correo de anuncios de nuevos lanzamientos sin proporcionar una dirección de correo electrónico.\nProporciona una dirección de correo electrónico si quieres suscribirte a la lista de correo.",
 	"config-almost-done": "¡Ya casi has terminado!\nAhora puedes saltarte el resto de los pasos e instalar el wiki ya.",
 	"config-optional-continue": "Hazme más preguntas.",
 	"config-optional-skip": "Ya estoy aburrido, sólo instala el wiki.",
@@ -264,7 +264,7 @@
 	"config-email-user-help": "Permitir que todos los usuarios intercambien correos electrónicos si lo han activado en sus preferencias.",
 	"config-email-usertalk": "Activar notificaciones de páginas de discusión de usuarios",
 	"config-email-usertalk-help": "Permitir a los usuarios recibir notificaciones de cambios en la página de discusión de usuario, si lo han activado en sus preferencias.",
-	"config-email-watchlist": "Activar notificación de alteraciones a la páginas vigiladas",
+	"config-email-watchlist": "Activar la notificación de la lista de seguimiento",
 	"config-email-watchlist-help": "Permitir a los usuarios recibir notificaciones de cambios en la páginas que vigilan, si lo han activado en sus preferencias.",
 	"config-email-auth": "Activar autenticación del correo electrónico",
 	"config-email-auth-help": "Si esta opción está habilitada, los usuarios tienen que confirmar su dirección de correo electrónico mediante un enlace que se les envía a ellos cuando éstos lo establecen o lo cambian.\nSolo las direcciones de correo electrónico autenticadas pueden recibir correos electrónicos de otros usuarios o correos electrónicos de notificación de cambios.\nEsta opción está '''recomendada''' para wikis públicos debido a posibles abusos de las características del correo electrónico.",
@@ -273,7 +273,7 @@
 	"config-upload-settings": "Cargas de imágenes y archivos",
 	"config-upload-enable": "Habilitar la subida de archivos",
 	"config-upload-help": "La carga de archivos expone potencialmente su servidor a riesgos de seguridad.\nPara obtener más información, lea la [//www.mediawiki.org/wiki/Special:MyLanguage/Manual:Security sección de seguridad] en el manual.\n\nPara habilitar la carga de archivos, cambie el modo en el subdirectorio <code>images</code> bajo el directorio raíz de MediaWiki para que el servidor web pueda escribir en él.\nA continuación, habilite esta opción.",
-	"config-upload-deleted": "*Directorio para los archivos eliminados:",
+	"config-upload-deleted": "Directorio para los archivos eliminados:",
 	"config-upload-deleted-help": "Elige un directorio en el que guardar los archivos eliminados.\nLo ideal es una carpeta no accesible desde la red.",
 	"config-logo": "URL del logo :",
 	"config-logo-help": "La apariencia predeterminada de MediaWiki incluye espacio para un logotipo de 135x160 píxeles encima del menú de la barra lateral.\nCarga una imagen de tamaño adecuado y escribe la dirección URL aquí.\n\nPuedes usar <code>$wgStylePath</code> o <code>$wgScriptPath</code> si tu logotipo es relativo a esas rutas.\n\nSi no deseas un logotipo, deja esta casilla en blanco.",
@@ -302,7 +302,7 @@
 	"config-skins-missing": "No se encontró ninguna apariencia; MediaWiki utilizará una apariencia anterior hasta que instales unas apariencias adecuadas.",
 	"config-skins-must-enable-some": "Debes seleccionar al menos una apariencia para activar.",
 	"config-skins-must-enable-default": "La apariencia elegida como predeterminada debe estar habilitada.",
-	"config-install-alreadydone": "'''Aviso:''' Parece que ya habías instalado MediaWiki y estás intentando instalarlo nuevamente.\nPasa a la próxima página, por favor.",
+	"config-install-alreadydone": "<strong>Advertencia:</strong> parece que ya habías instalado MediaWiki y estás intentando instalarlo nuevamente.\nPasa a la próxima página.",
 	"config-install-begin": "Al pulsar en «{{int:config-continue}}» comenzará el proceso de instalación de MediaWiki.\nSi quieres realizar algún cambio, pulsa en «{{int:config-back}}».",
 	"config-install-step-done": "hecho",
 	"config-install-step-failed": "falló",
@@ -315,22 +315,22 @@
 	"config-install-pg-plpgsql": "Comprobación de lenguaje PL/pgSQL",
 	"config-pg-no-plpgsql": "Necesitas instalar el lenguaje PL/pgSQL en la base de datos $1",
 	"config-pg-no-create-privs": "La cuenta especificada para la instalación no tiene suficientes privilegios para crear una cuenta.",
-	"config-pg-not-in-role": "La cuenta especificada para el usuario web ya existe.\nLa cuenta especificada para la instalación no es de un superusuario y no es miembro del grupo de usuarios con acceso a la web, por lo que es incapaz de crear objetos pertenecientes al usuario web.\n\nMediaWiki requiere actualmente que las tablas sean propiedad del usuario web. Especifique otro nombre de cuenta web, o haga clic en \"atrás\" y especifique un usuario de instalación con los privilegios convenientes.",
+	"config-pg-not-in-role": "La cuenta especificada para el usuario web ya existe.\nLa cuenta especificada para la instalación no es de un superusuario y no es miembro del grupo de usuarios con acceso a la web, por lo que es incapaz de crear objetos pertenecientes al usuario web.\n\nMediaWiki requiere actualmente que las tablas sean propiedad del usuario web. Especifica otro nombre de cuenta web, o haz clic en \"atrás\" y especifica un usuario de instalación con los privilegios convenientes.",
 	"config-install-user": "Creando el usuario de la base de datos",
 	"config-install-user-alreadyexists": "El usuario \"$1\" ya existe",
 	"config-install-user-create-failed": "La creación del usuario \"$1\" falló:  $2",
 	"config-install-user-grant-failed": "La concesión de permisos al usuario \"$1\" falló: $2",
 	"config-install-user-missing": "El usuario especificado \"$1\" no existe.",
-	"config-install-user-missing-create": "El usuario especificado \"$1\" no existe.\nPor favor, haga clic en la casilla \"Crear cuenta\" que aparece a continuación si desea crearlo.",
+	"config-install-user-missing-create": "El usuario especificado \"$1\" no existe.\nHaz clic en la casilla \"Crear cuenta\" debajo si quieres crearlo.",
 	"config-install-tables": "Creando tablas",
-	"config-install-tables-exist": "'''Advertencia''': Al parecer, las tablas de MediaWiki ya existen. Saltándose su creación.",
-	"config-install-tables-failed": "'''Error''': La creación de las tablas falló con el siguiente error: $1",
+	"config-install-tables-exist": "<strong>Advertencia:</strong> al parecer, las tablas de MediaWiki ya existen. Saltándose su creación.",
+	"config-install-tables-failed": "<strong>Error:</strong> la creación de las tablas falló con el siguiente error: $1",
 	"config-install-interwiki": "Llenando la tabla interwiki predeterminada",
-	"config-install-interwiki-list": "No se pudo encontrar el archivo <code>interwiki.list</code>.",
-	"config-install-interwiki-exists": "'''Advertencia''': La tabla de interwikis parece ya contener entradas.\nSe omitirá la lista predeterminada.",
+	"config-install-interwiki-list": "No se pudo leer el archivo <code>interwiki.list</code>.",
+	"config-install-interwiki-exists": "<strong>Advertencia:</strong> la tabla de interwikis parece ya contener entradas.\nSe omitirá la lista predeterminada.",
 	"config-install-stats": "Iniciando las estadísticas",
 	"config-install-keys": "Generando claves secretas",
-	"config-insecure-keys": "''' Atención:'' '  {{PLURAL:$2|Una clave de seguridad generada|Las claves de seguridad generadas}} ($1) durante la instalación no  {{PLURAL:$2|es totalmente segura|son totalmente seguras}}. Considere {{PLURAL:$2| cambiarla|cambiarlas}} manualmente.",
+	"config-insecure-keys": "<strong>Advertencia:</strong> {{PLURAL:$2|una clave de seguridad generada|las claves de seguridad generadas}} ($1) durante la instalación no  {{PLURAL:$2|es totalmente segura|son totalmente seguras}}. Considera {{PLURAL:$2| cambiarla|cambiarlas}} manualmente.",
 	"config-install-updates": "Evitar ejecutar actualizaciones innecesarias",
 	"config-install-updates-failed": "<strong>Error:</strong> falló la inserción de claves de actualización en las tablas con el siguiente error: $1",
 	"config-install-sysop": "Creando la cuenta de usuario del administrador",
@@ -340,7 +340,7 @@
 	"config-install-extension-tables": "Creando las tablas para las extensiones habilitadas",
 	"config-install-mainpage-failed": "No se pudo insertar la página principal: $1",
 	"config-install-done": "<strong>¡Felicidades!</strong>\nHas instalado MediaWiki correctamente.\n\nEl instalador ha generado un  archivo <code>LocalSettings.php</code>.\nEste contiene toda su configuración.\n\nDeberás descargarlo y ponerlo en la base de la instalación de wiki (el mismo directorio que index.php). La descarga debería haber comenzado automáticamente.\n\nSi no comenzó la descarga, o si se ha cancelado, puedes reiniciar la descarga haciendo clic en el siguiente enlace:\n\n$3\n\n<strong>Nota</strong>: Si no haces esto ahora, este archivo de configuración generado no estará disponible más tarde si sales de la instalación sin descargarlo.\n\nCuando lo hayas hecho, podrás <strong>[$2  entrar en tu wiki]</strong>.",
-	"config-download-localsettings": "Descargar archivo <code>LocalSettings.php</code>",
+	"config-download-localsettings": "Descargar <code>LocalSettings.php</code>",
 	"config-help": "ayuda",
 	"config-help-tooltip": "haz clic para ampliar",
 	"config-nofile": "El archivo \"$1\" no se pudo encontrar. ¿Se ha eliminado?",
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/km.json b/includes/installer/i18n/km.json
index 8318e9cc09..f5dff47e65 100644
--- a/includes/installer/i18n/km.json
+++ b/includes/installer/i18n/km.json
@@ -26,7 +26,10 @@
 	"config-page-install": "តំលើង",
 	"config-page-complete": "បញ្ចប់!",
 	"config-page-restart": "តំលើងឡើងវិញ",
+	"config-install-sysop": "កំពុងបង្កើតគណនីអភិបាល",
 	"config-help": "ជំនួយ",
+	"config-help-tooltip": "ចុចដើម្បីពន្លាត",
+	"config-nofile": "រកមិនឃើញឯកសារ \"$1\" ទេ។ វាប្រហែលជាត្រូវបានលុបចោលហើយ។",
 	"mainpagetext": "'''មេឌាវិគីត្រូវបានដំឡើងសំរេចហើយ​។'''",
 	"mainpagedocfooter": "សូមពិនិត្យមើល [//meta.wikimedia.org/wiki/Help:Contents ខ្លឹមសារ​ណែនាំ​ប្រើប្រាស់]សម្រាប់​ព័ត៌មាន​​បន្ថែមអំពី​ការប្រើប្រាស់សូហ្វវែរវិគី​។\n\n== ការចាប់ផ្ដើម ==\n* [//www.mediawiki.org/wiki/Special:MyLanguage/Manual:Configuration_settings បញ្ជីការកំណត់នានា]\n* [//www.mediawiki.org/wiki/Special:MyLanguage/Manual:FAQ/km សំណួរញឹកញាប់​ក្នុងមេឌាវិគី]\n* [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce បញ្ជី​អ៊ីមែលផ្សព្វផ្សាយ​របស់​មេឌាវិគី]\n* [//www.mediawiki.org/wiki/Special:MyLanguage/Localisation#Translation_resources ការប្រែសម្រួលមេឌាវិគីសម្រាប់ភាសារបស់អ្នក]"
 }
diff --git a/includes/installer/i18n/ko.json b/includes/installer/i18n/ko.json
index cef7efe4e3..573172d76b 100644
--- a/includes/installer/i18n/ko.json
+++ b/includes/installer/i18n/ko.json
@@ -47,12 +47,12 @@
 	"config-help-restart": "입력한 모든 저장된 데이터를 지우고 설치 과정을 다시 시작하겠습니까?",
 	"config-restart": "예, 다시 시작합니다",
 	"config-welcome": "=== 사용 환경 검사 ===\n기본 검사는 지금 이 환경이 미디어위키 설치에 적합한지 수행합니다.\n설치를 완료하는 방법에 대한 지원을 찾는다면 이 정보를 포함해야 하는 것을 기억하세요.",
-	"config-copyright": "=== 저작권 및 약관 ===\n\n$1\n\n이 프로그램은 자유 소프트웨어입니다. 당신은 자유 소프트웨어 재단이 발표한 GNU 일반 공중 사용 허가서 버전 2나 그 이후 버전에 따라 이 프로그램을 재배포하거나 수정할 수 있습니다.\n\n이 프로그램이 유용하게 사용될 수 있기를 바라지만 <strong>상용으로 사용</strong>되거나 <strong>특정 목적에 맞을 것</strong>이라는 것을 <strong>보증하지 않습니다</strong>.\n자세한 내용은 GNU 일반 공중 사용 허가서를 참고하십시오.\n\n당신은 이 프로그램을 통해 <doclink href=Copying>GNU 일반 공중 사용 허가서 전문</doclink>을 받았습니다. 그렇지 않다면, Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA로 편지를 보내주시거나 [http://www.gnu.org/copyleft/gpl.html 온라인으로 읽어보시기] 바랍니다.",
+	"config-copyright": "=== 저작권 및 약관 ===\n\n$1\n\n이 프로그램은 자유 소프트웨어입니다. 당신은 자유 소프트웨어 재단이 발표한 GNU 일반 공중 사용 허가서 버전 2나 그 이후 버전에 따라 이 프로그램을 재배포하거나 수정할 수 있습니다.\n\n이 프로그램이 유용하게 사용될 수 있기를 바라지만 <strong>상용으로 사용</strong>되거나 <strong>특정 목적에 맞을 것</strong>이라는 것을 <strong>보증하지 않습니다</strong>.\n자세한 내용은 GNU 일반 공중 사용 허가서를 참조하십시오.\n\n당신은 이 프로그램을 통해 <doclink href=Copying>GNU 일반 공중 사용 허가서 전문</doclink>을 받았습니다. 그렇지 않다면, Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA로 편지를 보내주시거나 [http://www.gnu.org/copyleft/gpl.html 온라인으로 읽어보시기] 바랍니다.",
 	"config-sidebar": "* [//www.mediawiki.org 미디어위키 홈]\n* [//www.mediawiki.org/wiki/Special:MyLanguage/Help:Contents 사용자 가이드]\n* [//www.mediawiki.org/wiki/Special:MyLanguage/Manual:Contents 관리자 가이드]\n* [//www.mediawiki.org/wiki/Special:MyLanguage/Manual:FAQ FAQ]\n----\n* <doclink href=Readme>읽어보기</doclink>\n* <doclink href=ReleaseNotes>릴리스 노트</doclink>\n* <doclink href=Copying>전문</doclink>\n* <doclink href=UpgradeDoc>업그레이드하기</doclink>",
 	"config-env-good": "환경이 확인되었습니다.\n미디어위키를 설치할 수 있습니다.",
 	"config-env-bad": "환경이 확인되었습니다.\n미디어위키를 설치할 수 없습니다.",
 	"config-env-php": "PHP $1이(가) 설치되어 있습니다.",
-	"config-env-hhvm": "HHMV $1이(가) 설치되어 있습니다.",
+	"config-env-hhvm": "HHVM $1이(가) 설치되어 있습니다.",
 	"config-unicode-using-intl": "유니코드 정규화에 [http://pecl.php.net/intl intl PECL 확장 기능]을 사용합니다.",
 	"config-unicode-pure-php-warning": "<strong>경고:</strong> 유니코드 정규화를 처리할 [http://pecl.php.net/intl intl PECL 확장 기능]을 사용할 수 없기 때문에 느린 pure-PHP 구현을 대신 사용합니다.\n트래픽이 높은 사이트에서 실행하시려면 [//www.mediawiki.org/wiki/Special:MyLanguage/Unicode_normalization_considerations 유니코드 정규화]를 읽어보셔야 합니다.",
 	"config-unicode-update-warning": "<strong>경고:</strong> 유니코드 정규화 래퍼의 설치된 버전은 [http://site.icu-project.org/ ICU 프로젝트]의 라이브러리의 이전 버전을 사용합니다.\n만약 유니코드를 사용하는 것에 대해 우려가 된다면 [//www.mediawiki.org/wiki/Special:MyLanguage/Unicode_normalization_considerations 업그레이드]해야합니다.",
diff --git a/includes/installer/i18n/ksh.json b/includes/installer/i18n/ksh.json
index 03ef46d7db..bffdf057d0 100644
--- a/includes/installer/i18n/ksh.json
+++ b/includes/installer/i18n/ksh.json
@@ -223,7 +223,7 @@
 	"config-profile-no-anon": "Schriever möße enlogge",
 	"config-profile-fishbowl": "Bloß ußdröcklesch zohjelohße Schriever",
 	"config-profile-private": "E jeschloße Privat_Wiki",
-	"config-profile-help": "Wikis loufe et bäß, wam_mer esu vill Lück wi möjjelesch draan metmaache un schrieve löht.\nMet MediaWiki es et ejfach, de neuste Änderonge ze beloore un wat ahnungslose udder fiese Lück kapott jemaat han wider retuur ze maache.\n\nBloß, mänsch eine häd_eruß jefonge, dat mer MediaWiki jood en en jruuße Zahl ongerscheidlijje Rolle bruche kann, un nit emmer es et leisch, ene vum onverfälschte Wiki_Wääsch ze övverzeuje.\nEsu häß De de Wahl:\n\n'''{{int:config-profile-wiki}}''' löht jeder_ein metschrieve, och ohne sesch enzelogge.\n\n'''{{int:config-profile-no-anon}}''', dat sorsch för mieh seeschbaa Verantwootlischkeite, künnt ävver zohfällije Methellefer verschrecke.\n\n'''{{int:config-profile-fishbowl}}''' löht nor de ußjesöhk Metmaacher schrieve, ävver de janze Öffentleshkeit kann et lässe un süht och de ällder Versione, un wat wää wann draan jedonn hät.\n\n'''{{int:config-profile-private}}''' kann nur lässe, wäh en et Wiki zohjelohße es, un desellve Jropp kann uch schrieve.\n\nNoch ander un un opwändijere Enschtellunge för de Rääschte sin möjjelesch, wann et Wiki ens aam Loufe es. Loor Der doför de [//www.mediawiki.org/wiki/Special:MyLanguage/Manual:User_rights zopaß Hölp em Handbooch] aan.",
+	"config-profile-help": "Wikkis loufe et bäß, wam_mer esu vill Lück wi möjjelesch draan metmaache un schrieve löht.\nMet MehdijaWikki es et ejfach, de neuste Änderonge ze beloore un wat ahnungslose udder fiese Lück kapott jemaat han wider retuur ze maache.\n\nBloß, mänsch eine häd_eruß jefonge, dat mer MediaWiki jood en en jruuße Zahl ongerscheidlijje Rolle bruche kann, un nit emmer es et leisch, ene vum onverfälschte Wiki_Wääsch ze övverzeuje.\nEsu häß De de Wahl:\n\n'''{{int:config-profile-wiki}}''' löht jeder_ein metschrihve, och ohne sesch enzelogge.\n\n'''{{int:config-profile-no-anon}}''', dat sorsch för mieh seeschbaa Verantwootlischkeite, künnt ävver zohfällije Methellefer verschrecke.\n\n'''{{int:config-profile-fishbowl}}''' löht nor de ußjesöhk Metmaacher schrieve, ävver de janze Öffentleshkeit kann et lässe un süht och de ällder Versione, un wat wää wann draan jedonn hät.\n\n'''{{int:config-profile-private}}''' kann nur lässe, wäh en et Wikki zohjelohße es, un desellve Jropp kann och schrieve.\n\nNoch ander un un opwändijere Enschtällonge för de Rääschte sin müjjelesch, wann et Wikki ens aam Loufe es. Loor Der doför de [//www.mediawiki.org/wiki/Special:MyLanguage/Manual:User_rights zopaß Hölp em Handbooch] aan.",
 	"config-license": "Urhävverrääsch un Lizänz:",
 	"config-license-none": "Kein Fooßreih övver de Lizänz",
 	"config-license-cc-by-sa": "<i lang=\"en\">Creative Commons</i> Der Name moß jenannt sin, et Wiggerjävve es zohjelohße onger dersellve Bedengunge",
@@ -236,9 +236,9 @@
 	"config-license-help": "Ättlijje öffentleje Wikis donn iehr Beidrääsch onger en [http://freedomdefined.org/Definition freije Lizänz] schtelle.\nDat hellef, e Jeföhl vun Jemeinsamkeid opzeboue, un op lange Seesch emmer wider Beidrääsch ze krijje.\nDat es nit onbedengk nüüdesh för e Jeschäffs- udder Privaat_Wiki.\n\nWä Stöcke uß de Wikipedia bruche well, un dröm han well, dat mer för Wikipedia uss_em eije Wiki jät övvernämme kann, sullt „'''<i lang=\"en\">Creative Commons</i>, dem Schriever singe Name moß jenannt wääde, un Wiggerjävve zoh dersellve Bedengunge es zohjelohße'''“ ußwähle.\n\nDe su jenannte '''<i lang=\"en\">GNU Free Documentation License</i>''' (de freije Lizänz för Dokemäntazjuhne vun dä GNU) sen de ahle Lizänzbedenonge vun de Wikipedia. Se es emmer noch in Odenong un jöltesch, ävver se es schwer ze verschtonn un et Wiggerjävve un widder Bruche es ens schwieerejer domet.",
 	"config-email-settings": "Enschtellunge för de <i lang=\"en\">e-mail</i>",
 	"config-enable-email": "De <i lang=\"en\">e-mail</i> noh druße zohlohße",
-	"config-enable-email-help": "Sulle <i lang=\"en\">e-mails</i> zohjelohße sin, moß mer, domet et noher flupp, de [http://www.php.net/manual/en/mail.configuration.php Enschtellunge em PHP för de <i lang=\"en\">e-mails</i>] zopaß jemaat han.\nWann kein <i lang=\"en\">e-mails</i> nüüdesch sin, kam_mer se heh afschallde.",
+	"config-enable-email-help": "Sulle \n<i lang=\"en\" xml:lang=\"en\" dir=\"ltr\" title=\"„de eläktrohnesche Poß“\">e-mails</i> zohjelohße sin, moß mer, domet et noher flupp, dä Datteij <code lang=\"en\" xml:lang=\"en\" dir=\"ltr\">[http://www.php.net/manual/en/mail.configuration.php</code> Enschtällonge em PHP för de <i lang=\"en\" xml:lang=\"en\" dir=\"ltr\" title=\"„de eläktrohnesche Poß“\">e-mail</i>] zopaß jemaat han.\nWann kein <i lang=\"en\" xml:lang=\"en\" dir=\"ltr\" title=\"„de eläktrohnesche Poß“\">e-mails</i> nüüdesch sin, kam_mer se heh afschallde.",
 	"config-email-user": "<i lang=\"en\">e-mails</i> zwesche de Metmaacher zohlohße",
-	"config-email-user-help": "Määt et müjjelesch, dat sesch de Metmaacher jääjesiggesch <i lang=\"en\">e-mails</i> schecke künne, wann se dat en iehre eije Enschtellunge och enjeschalldt han.",
+	"config-email-user-help": "Määt et müjjelesch, dat sesch de Metmaacher jääjesiggesch \n<i lang=\"en\" xml:lang=\"en\" dir=\"ltr\" title=\"„de eläktrohnesche Poß“\">e-mails</i> scheke künne, wann se dat en iehre eije Enschtällonge och enjeschalldt han.",
 	"config-email-usertalk": "<i lang=\"en\">e-mails</i> mem Bescheid zohlohße, dat einem sing Klaafsigg verändert woodt",
 	"config-email-usertalk-help": "Maach et müjjelesch, dat Metmaaacher en iere Enschtällonge <i lang=\"en\" xml:lang=\"en\" dir=\"ltr\" title=\"„de eläktrohnesche Poß“\">e-mails</i>mem Bescheid zohlohße, dat einem sing Klaafsigg veränndert woodt.",
 	"config-email-watchlist": "Nohreeschte övver Änderonge aan Sigg op de Opaßleßte zohlohße",
@@ -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/lv.json b/includes/installer/i18n/lv.json
index 6a177622b3..69bbc835a6 100644
--- a/includes/installer/i18n/lv.json
+++ b/includes/installer/i18n/lv.json
@@ -44,8 +44,10 @@
 	"config-header-mssql": "Microsoft SQL servera iestatījumi",
 	"config-mysql-innodb": "InnoDB",
 	"config-mysql-myisam": "MyISAM",
+	"config-admin-name": "Tavs lietotājvārds:",
 	"config-admin-password": "Parole:",
 	"config-admin-password-confirm": "Parole vēlreiz:",
+	"config-admin-name-blank": "Ievadiet administratora lietotājvārdu.",
 	"config-admin-email": "E-pasta adrese:",
 	"config-cc-again": "Izvēlies vēlreiz...",
 	"config-install-step-done": "Gatavs",
diff --git a/includes/installer/i18n/nap.json b/includes/installer/i18n/nap.json
index da15667d2f..733a3ab1ff 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à.",
@@ -60,7 +60,7 @@
 	"config-magic-quotes-sybase": "<strong>Fatale: [http://www.php.net/manual/en/ref.info.php#ini.magic-quotes-sybase magic_quotes_sybase] è attivo!'</strong>\nSt'opzione scassa 'e date 'e na manera scanusciuta.\nNun se può installà o ausà MediaWiki si nun se stuta st'opzione.",
 	"config-mbstring": "<strong>Fatale: [http://www.php.net/manual/en/ref.mbstring.php#mbstring.overload mbstring.func_overload] è attivo!'</strong>\nSt'opzione scassa 'e date 'e na manera scanusciuta.\nNun se può installà o ausà MediaWiki si nun se stuta st'opzione.",
 	"config-safe-mode": "<strong>Warning:</strong> PHP's [http://www.php.net/features.safe-mode safe mode] è attivato.\nPutesse fà cocche probblema, specialmente si state ausanno 'a funziona 'e carrecà file e 'o supporto d' ' e funziune <code>math</code>.",
-	"config-xml-bad": "'O modulo XML 'e PHP è mancante.\nA MediaWiki servessero 'e funziune prisente dint'a stu modulo e nun faticarrà c' 'a configurazione 'e mò.\nSi se sta eseguenno Mandrake, installare 'o pacco php-xml.",
+	"config-xml-bad": "'O modulo XML 'e PHP è mancante.\nA MediaWiki servessero 'e funziune prisente dint'a stu modulo e nun faticarrà c' 'a configurazione 'e mò.\nSi se sta eseguenno Mandrake, installare 'o pacco php-xml RPM.",
 	"config-pcre-old": "<strong>Errore fatale:</strong> s'addimanna PCRE  $1 o succiessivo.\n'O file vuosto binario PHP è acucchiato c' 'o PCRE $2.\n[https://www.mediawiki.org/wiki/Manual:Errors_and_symptoms/PCRE Cchiù nfurmaziune].",
 	"config-pcre-no-utf8": "<strong>Fatale:</strong> 'E module PCRE d' 'o PHP pare ca se so' compilate senza PCRE_UTF8 supporto.\nA MediaWiki serve nu supporto UTF-8 pe' putè funziunà apposto.",
 	"config-memory-raised": "'O valore 'e PHP <code>memory_limit</code> è $1, aumentato a $2.",
@@ -171,6 +171,7 @@
 	"config-mysql-engine": "Mutore d'astipo:",
 	"config-mysql-innodb": "InnoDB",
 	"config-mysql-myisam": "MyISAM",
+	"config-mysql-myisam-dep": "<strong>Attenziò:</strong> avite scigliuto MyISAM comm' 'o mutore 'archiviaziona MySQL, ca nun è raccummannato pe' l'ausà cu MediaWiki, pecché:\n* supporta debolmente 'a concorrenza p' 'o blocco d' 'a tabbella\n* è cchiù inchine 'a corruzione 'e l'ati mutore\n* 'o codece 'e base 'e MediaWiki nun gestisce sempe MyISAM comme l'avess'a gistiunà\n\nSi ll'installazione vosta MySQL suppuorta InnoDB, è autamente raccummandato ca si scigliesse a 'o posto suo.\nSi 'a installazione MySQL nun suppurtasse InnoDB, forse è 'o mumento 'e ll'agghiurnà.",
 	"config-mysql-engine-help": "<strong>InnoDB</strong> è quase sempe 'a meglia opzione, pecché ave nu buono suppuorto concorrente.\n\n<strong>MyISAM</strong> putesse ghì cchiù ampressa int'a na installazione mono-utente e liegge-surtanto.\n'E database MyISAM se scassano cchiù spisso d' 'e database InnoDB.",
 	"config-mysql-charset": "Nzieme 'e carattere d' 'o database:",
 	"config-mysql-binary": "Binario",
@@ -242,6 +243,7 @@
 	"config-cc-not-chosen": "Sciglite quale licienza Creative Commons desiderate e cliccate ncopp' 'a \"prucede\".",
 	"config-advanced-settings": "Configurazione avanzata",
 	"config-cache-options": "Mpustaziune p' 'a cache d'oggette:",
+	"config-cache-none": "Nisciuna memorizzazione n cache (nisciuna funziunalità è luvata, ma 'a velocità se putesse ffà a meno dint' 'e wiki cchiù gruosse)",
 	"config-memcached-servers": "Server memcached:",
 	"config-memcached-help": "Elenco 'e ll'indirizzi IP p' 'e putè ausà p' 'o Memcached.\nS'avess'a specificà uno pe' riga e scrivere 'a porta 'e trasuta. P'esempio:\n 127.0.0.1:11211\n 192.168.1.25:1234",
 	"config-memcache-needservers": "È stato scigliuto 'o tipo 'e caching Memcached, ma nun è stato mpustato 'a nisciunu server.",
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/pl.json b/includes/installer/i18n/pl.json
index 661502673c..6a1d4a4f7a 100644
--- a/includes/installer/i18n/pl.json
+++ b/includes/installer/i18n/pl.json
@@ -18,7 +18,8 @@
 			"Alan ffm",
 			"Matik7",
 			"Pio387",
-			"Darellur"
+			"Darellur",
+			"The Polish"
 		]
 	},
 	"config-desc": "Instalator MediaWiki",
@@ -321,6 +322,7 @@
 	"config-install-keys": "Generowanie tajnych kluczy",
 	"config-insecure-keys": "'''Ostrzeżenie:''' {{PLURAL:$2|Klucz bezpieczeństwa|Klucze bezpieczeństwa|Klucze bezpieczeństwa}} ($1) utworzone podczas instalacji {{PLURAL:$2|utworzony podczas instalacji nie jest|utworzone podczas instalacji nie są|utworzone podczas instalacji nie są}} w pełni bezpieczne. Być może warto wygenerować {{PLURAL:$2|własny klucz|własne klucze|własne klucze}}.",
 	"config-install-updates": "Zapobieganie uruchamianiu niepotrzebnych aktualizacji",
+	"config-install-updates-failed": "<strong>Błąd:</strong> Wstawianie kluczy aktualizacji d0 tabeli nie powiodło się z powodu następującego błędu: $1",
 	"config-install-sysop": "Tworzenie konta administratora",
 	"config-install-subscribe-fail": "Nie można zapisać na listę „mediawiki-announce” – $1",
 	"config-install-subscribe-notpossible": "cURL nie jest zainstalowany, więc <code>allow_url_fopen</code> nie jest dostępne.",
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/ro.json b/includes/installer/i18n/ro.json
index fcade71fd7..e0c78b7ca5 100644
--- a/includes/installer/i18n/ro.json
+++ b/includes/installer/i18n/ro.json
@@ -5,7 +5,8 @@
 			"Minisarm",
 			"Stelistcristi",
 			"XXN",
-			"Tuxilina"
+			"Tuxilina",
+			"Strainu"
 		]
 	},
 	"config-desc": "Programul de instalare pentru MediaWiki",
@@ -43,19 +44,28 @@
 	"config-help-restart": "Doriți să ștergeți toate datele salvate introduse și să reporniți procesul de instalare?",
 	"config-restart": "Da, repornește.",
 	"config-env-good": "Verificarea mediului a fost efectuată cu succes.\nPuteți instala MediaWiki.",
+	"config-env-bad": "Verificarea mediului a fost efectuată.\nNu puteți instala MediaWiki.",
 	"config-env-php": "PHP $1 este instalat.",
 	"config-env-hhvm": "HHVM $1 este instalat.",
 	"config-xcache": "[http://xcache.lighttpd.net/ XCache] este instalat",
 	"config-apc": "[http://www.php.net/apc APC] este instalat",
 	"config-wincache": "[http://www.iis.net/download/WinCacheForPhp WinCache] este instalat",
+	"config-diff3-bad": "GNU diff3 nu a fost găsit.",
+	"config-no-uri": "<strong>Eroare:</strong> Nu pot determina URI-ul curent.\nInstalare întreruptă.",
 	"config-db-type": "Tipul bazei de date:",
 	"config-db-host": "Gazdă bază de date:",
 	"config-db-host-oracle": "Baza de date TNS:",
 	"config-db-wiki-settings": "Identificați acest wiki",
 	"config-db-name": "Numele bazei de date:",
 	"config-db-name-oracle": "Schema bazei de date:",
+	"config-db-install-account": "Contul de utilizator pentru instalare",
 	"config-db-username": "Nume de utilizator pentru baza de date:",
 	"config-db-password": "Parola bazei de date:",
+	"config-db-install-username": "Introduceți numele de utilizator care va fi utilizat pentru conexiunea la baza de date în timpul procesului de instalare.\nNu este numele de utilizator al contului MediaWiki; este numele de utilizator al bazei dumneavoastră de date.",
+	"config-db-install-password": "Introduceți parola care va fi utilizată pentru conexiunea la baza de date în timpul procesului de instalare.\nNu este parola contului MediaWiki; este parola bazei dumneavoastră de date.",
+	"config-db-install-help": "Introduceți numele de utilizator și parola care vor fi utilizate pentru conexiunea la baza de date în timpul procesului de instalare.",
+	"config-db-account-lock": "Folosește același nume de utilizator și parolă în timpul funcționării normale",
+	"config-db-wiki-account": "Contul de utilizator pentru funcționarea normală",
 	"config-db-prefix": "Prefixul tabelelor din baza de date:",
 	"config-db-charset": "Setul de caractere al bazei de date",
 	"config-charset-mysql5-binary": "MySQL 4.1/5.0 binar",
@@ -65,6 +75,8 @@
 	"config-sqlite-dir": "Director de date SQLite:",
 	"config-oracle-def-ts": "Spațiu de stocare („tablespace”) implicit:",
 	"config-oracle-temp-ts": "Spațiu de stocare („tablespace”) temporar:",
+	"config-type-mysql": "MySQL (sau compatibil)",
+	"config-type-mssql": "Microsoft SQL Server",
 	"config-header-mysql": "Setările MySQL",
 	"config-header-postgres": "Setări PostgreSQL",
 	"config-header-sqlite": "Setări SQLite",
diff --git a/includes/installer/i18n/sq.json b/includes/installer/i18n/sq.json
index f3bb6dd92e..7f0ad67f51 100644
--- a/includes/installer/i18n/sq.json
+++ b/includes/installer/i18n/sq.json
@@ -1,5 +1,43 @@
 {
-	"@metadata": [],
+	"@metadata": {
+		"authors": [
+			"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/jobqueue/JobQueueRedis.php b/includes/jobqueue/JobQueueRedis.php
index 1b1a193531..29c8068a63 100644
--- a/includes/jobqueue/JobQueueRedis.php
+++ b/includes/jobqueue/JobQueueRedis.php
@@ -613,6 +613,8 @@ LUA;
 			$job = Job::factory( $item['type'], $title, $item['params'] );
 			$job->metadata['uuid'] = $item['uuid'];
 			$job->metadata['timestamp'] = $item['timestamp'];
+			// Add in attempt count for debugging at showJobs.php
+			$job->metadata['attempts'] = $conn->hGet( $this->getQueueKey( 'h-attempts' ), $uid );
 
 			return $job;
 		} catch ( RedisException $e ) {
diff --git a/includes/jobqueue/JobRunner.php b/includes/jobqueue/JobRunner.php
index 700a63dc34..130436293a 100644
--- a/includes/jobqueue/JobRunner.php
+++ b/includes/jobqueue/JobRunner.php
@@ -195,13 +195,20 @@ class JobRunner implements LoggerAwareInterface {
 				$timeMs = intval( ( microtime( true ) - $jobStartTime ) * 1000 );
 				$timeMsTotal += $timeMs;
 
+				// Record how long jobs wait before getting popped
 				$readyTs = $job->getReadyTimestamp();
 				if ( $readyTs ) {
-					// Record time to run for the job type
 					$pickupDelay = $popTime - $readyTs;
 					$stats->timing( 'jobqueue.pickup_delay.all', 1000 * $pickupDelay );
 					$stats->timing( "jobqueue.pickup_delay.$jType", 1000 * $pickupDelay );
 				}
+				// Record root job age for jobs being run
+				$root = $job->getRootJobParams();
+				if ( $root['rootJobTimestamp'] ) {
+					$age = $popTime - wfTimestamp( TS_UNIX, $root['rootJobTimestamp'] );
+					$stats->timing( "jobqueue.pickup_root_age.$jType", 1000 * $age );
+				}
+				// Track the execution time for jobs
 				$stats->timing( "jobqueue.run.$jType", $timeMs );
 
 				// Mark the job as done on success or when the job cannot be retried
diff --git a/includes/jobqueue/jobs/RefreshLinksJob.php b/includes/jobqueue/jobs/RefreshLinksJob.php
index c66da4181f..dec944a80d 100644
--- a/includes/jobqueue/jobs/RefreshLinksJob.php
+++ b/includes/jobqueue/jobs/RefreshLinksJob.php
@@ -83,7 +83,6 @@ class RefreshLinksJob extends Job {
 			} else {
 				$extraParams['masterPos'] = false;
 			}
-			$extraParams['triggeredRecursive'] = true;
 			// Convert this into no more than $wgUpdateRowsPerJob RefreshLinks per-title
 			// jobs and possibly a recursive RefreshLinks job for the rest of the backlinks
 			$jobs = BacklinkJobUtils::partitionBacklinkJob(
@@ -197,12 +196,6 @@ class RefreshLinksJob extends Job {
 		}
 
 		$updates = $content->getSecondaryDataUpdates( $title, null, false, $parserOutput );
-		foreach ( $updates as $key => $update ) {
-			if ( $update instanceof LinksUpdate && isset( $this->params['triggeredRecursive'] ) ) {
-				$update->setTriggeredRecursive();
-			}
-		}
-
 		DataUpdate::runUpdates( $updates );
 
 		InfoAction::invalidateCache( $title );
diff --git a/includes/jobqueue/jobs/UploadFromUrlJob.php b/includes/jobqueue/jobs/UploadFromUrlJob.php
index a15d51e835..ade481068d 100644
--- a/includes/jobqueue/jobs/UploadFromUrlJob.php
+++ b/includes/jobqueue/jobs/UploadFromUrlJob.php
@@ -166,11 +166,11 @@ class UploadFromUrlJob extends Job {
 	}
 
 	/**
-	 * Initialize the session data. Sets the intial result to queued.
+	 * Initialize the session data. Sets the initial result to queued.
 	 */
 	public function initializeSessionData() {
 		$session =& self::getSessionData( $this->params['sessionKey'] );
-		$$session['result'] = 'Queued';
+		$session['result'] = 'Queued';
 	}
 
 	/**
diff --git a/includes/libs/CSSMin.php b/includes/libs/CSSMin.php
index b386a92755..26489214a0 100644
--- a/includes/libs/CSSMin.php
+++ b/includes/libs/CSSMin.php
@@ -60,13 +60,15 @@ class CSSMin {
 	/* Static Methods */
 
 	/**
-	 * Gets a list of local file paths which are referenced in a CSS style sheet
+	 * Gets a list of local file paths which are referenced in a CSS style sheet.
 	 *
-	 * This function will always return an empty array if the second parameter is not given or null
-	 * for backwards-compatibility.
+	 * If you wish non-existent files to be listed too, use getAllLocalFileReferences().
 	 *
-	 * @param string $source CSS data to remap
-	 * @param string $path File path where the source was read from (optional)
+	 * For backwards-compatibility, if the second parameter is not given or null,
+	 * this function will return an empty array instead of erroring out.
+	 *
+	 * @param string $source CSS stylesheet source to process
+	 * @param string $path File path where the source was read from
 	 * @return array List of local file references
 	 */
 	public static function getLocalFileReferences( $source, $path = null ) {
@@ -74,6 +76,25 @@ class CSSMin {
 			return array();
 		}
 
+		$files = self::getAllLocalFileReferences( $source, $path );
+
+		// Skip non-existent files
+		$files = array_filter( $files, function ( $file ) {
+			return file_exists( $file );
+		} );
+
+		return $files;
+	}
+
+	/**
+	 * Gets a list of local file paths which are referenced in a CSS style sheet, including
+	 * non-existent files.
+	 *
+	 * @param string $source CSS stylesheet source to process
+	 * @param string $path File path where the source wa
+	 * @return array List of local file references
+	 */
+	public static function getAllLocalFileReferences( $source, $path ) {
 		$path = rtrim( $path, '/' ) . '/';
 		$files = array();
 
@@ -87,13 +108,7 @@ class CSSMin {
 					break;
 				}
 
-				$file = $path . $url;
-				// Skip non-existent files
-				if ( file_exists( $file ) ) {
-					break;
-				}
-
-				$files[] = $file;
+				$files[] = $path . $url;
 			}
 		}
 		return $files;
@@ -399,7 +414,7 @@ class CSSMin {
 
 		if ( $local === false ) {
 			// Assume that all paths are relative to $remote, and make them absolute
-			return $remote . '/' . $url;
+			$url = $remote . '/' . $url;
 		} else {
 			// We drop the query part here and instead make the path relative to $remote
 			$url = "{$remote}/{$file}";
@@ -418,8 +433,11 @@ class CSSMin {
 			}
 			// If any of these conditions failed (file missing, we don't want to embed it
 			// or it's not embeddable), return the URL (possibly with ?timestamp part)
-			return $url;
 		}
+		if ( function_exists( 'wfRemoveDotSegments' ) ) {
+			$url = wfRemoveDotSegments( $url );
+		}
+		return $url;
 	}
 
 	/**
diff --git a/includes/libs/HashRing.php b/includes/libs/HashRing.php
index 2022b225c7..e7a10997cc 100644
--- a/includes/libs/HashRing.php
+++ b/includes/libs/HashRing.php
@@ -223,8 +223,8 @@ class HashRing {
 	 * @return array List of locations
 	 * @throws UnexpectedValueException
 	 */
-	public function getLiveLocations( $item ) {
-		return $this->getLiveRing()->getLocations( $item );
+	public function getLiveLocations( $item, $limit ) {
+		return $this->getLiveRing()->getLocations( $item, $limit );
 	}
 
 	/**
diff --git a/includes/libs/IPSet.php b/includes/libs/IPSet.php
deleted file mode 100644
index c1c841e634..0000000000
--- a/includes/libs/IPSet.php
+++ /dev/null
@@ -1,276 +0,0 @@
-<?php
-/**
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- * http://www.gnu.org/copyleft/gpl.html
- *
- * @file
- * @author Brandon Black <blblack@gmail.com>
- */
-
-/**
- * Matches IP addresses against a set of CIDR specifications
- *
- * Usage:
- *   // At startup, calculate the optimized data structure for the set:
- *   $ipset = new IPSet( $wgSquidServersNoPurge );
- *   // runtime check against cached set (returns bool):
- *   $allowme = $ipset->match( $ip );
- *
- * In rough benchmarking, this takes about 80% more time than
- * in_array() checks on a short (a couple hundred at most) array
- * of addresses.  It's fast either way at those levels, though,
- * and IPSet would scale better than in_array if the array were
- * much larger.
- *
- * For mixed-family CIDR sets, however, this code gives well over
- * 100x speedup vs iterating IP::isInRange() over an array
- * of CIDR specs.
- *
- * The basic implementation is two separate binary trees
- * (IPv4 and IPv6) as nested php arrays with keys named 0 and 1.
- * The values false and true are terminal match-fail and match-success,
- * otherwise the value is a deeper node in the tree.
- *
- * A simple depth-compression scheme is also implemented: whole-byte
- * tree compression at whole-byte boundaries only, where no branching
- * occurs during that whole byte of depth.  A compressed node has
- * keys 'comp' (the byte to compare) and 'next' (the next node to
- * recurse into if 'comp' matched successfully).
- *
- * For example, given these inputs:
- * 25.0.0.0/9
- * 25.192.0.0/10
- *
- * The v4 tree would look like:
- * root4 => array(
- *     'comp' => 25,
- *     'next' => array(
- *         0 => true,
- *         1 => array(
- *             0 => false,
- *             1 => true,
- *         ),
- *     ),
- * );
- *
- * (multi-byte compression nodes were attempted as well, but were
- * a net loss in my test scenarios due to additional match complexity)
- *
- * @since 1.24
- */
-class IPSet {
-	/** @var array $root4: the root of the IPv4 matching tree */
-	private $root4 = array( false, false );
-
-	/** @var array $root6: the root of the IPv6 matching tree */
-	private $root6 = array( false, false );
-
-	/**
-	 * __construct() instantiate the object from an array of CIDR specs
-	 *
-	 * @param array $cfg array of IPv[46] CIDR specs as strings
-	 * @return IPSet new IPSet object
-	 *
-	 * Invalid input network/mask values in $cfg will result in issuing
-	 * E_WARNING and/or E_USER_WARNING and the bad values being ignored.
-	 */
-	public function __construct( array $cfg ) {
-		foreach ( $cfg as $cidr ) {
-			$this->addCidr( $cidr );
-		}
-
-		self::recOptimize( $this->root4 );
-		self::recCompress( $this->root4, 0, 24 );
-		self::recOptimize( $this->root6 );
-		self::recCompress( $this->root6, 0, 120 );
-	}
-
-	/**
-	 * Add a single CIDR spec to the internal matching trees
-	 *
-	 * @param string $cidr string CIDR spec, IPv[46], optional /mask (def all-1's)
-	 */
-	private function addCidr( $cidr ) {
-		// v4 or v6 check
-		if ( strpos( $cidr, ':' ) === false ) {
-			$node =& $this->root4;
-			$defMask = '32';
-		} else {
-			$node =& $this->root6;
-			$defMask = '128';
-		}
-
-		// Default to all-1's mask if no netmask in the input
-		if ( strpos( $cidr, '/' ) === false ) {
-			$net = $cidr;
-			$mask = $defMask;
-		} else {
-			list( $net, $mask ) = explode( '/', $cidr, 2 );
-			if ( !ctype_digit( $mask ) || intval( $mask ) > $defMask ) {
-				trigger_error( "IPSet: Bad mask '$mask' from '$cidr', ignored", E_USER_WARNING );
-				return;
-			}
-		}
-		$mask = intval( $mask ); // explicit integer convert, checked above
-
-		// convert $net to an array of integer bytes, length 4 or 16:
-		$raw = inet_pton( $net );
-		if ( $raw === false ) {
-			return; // inet_pton() sends an E_WARNING for us
-		}
-		$rawOrd = array_map( 'ord', str_split( $raw ) );
-
-		// special-case: zero mask overwrites the whole tree with a pair of terminal successes
-		if ( $mask == 0 ) {
-			$node = array( true, true );
-			return;
-		}
-
-		// iterate the bits of the address while walking the tree structure for inserts
-		$curBit = 0;
-		while ( 1 ) {
-			$maskShift = 7 - ( $curBit & 7 );
-			$node =& $node[( $rawOrd[$curBit >> 3] & ( 1 << $maskShift ) ) >> $maskShift];
-			++$curBit;
-			if ( $node === true ) {
-				// already added a larger supernet, no need to go deeper
-				return;
-			} elseif ( $curBit == $mask ) {
-				// this may wipe out deeper subnets from earlier
-				$node = true;
-				return;
-			} elseif ( $node === false ) {
-				// create new subarray to go deeper
-				$node = array( false, false );
-			}
-		}
-	}
-
-	/**
-	 * Match an IP address against the set
-	 *
-	 * @param string $ip string IPv[46] address
-	 * @return bool true is match success, false is match failure
-	 *
-	 * If $ip is unparseable, inet_pton may issue an E_WARNING to that effect
-	 */
-	public function match( $ip ) {
-		$raw = inet_pton( $ip );
-		if ( $raw === false ) {
-			return false; // inet_pton() sends an E_WARNING for us
-		}
-
-		$rawOrd = array_map( 'ord', str_split( $raw ) );
-		if ( count( $rawOrd ) == 4 ) {
-			$node =& $this->root4;
-		} else {
-			$node =& $this->root6;
-		}
-
-		$curBit = 0;
-		while ( 1 ) {
-			if ( isset( $node['comp'] ) ) {
-				// compressed node, matches 1 whole byte on a byte boundary
-				if ( $rawOrd[$curBit >> 3] != $node['comp'] ) {
-					return false;
-				}
-				$curBit += 8;
-				$node =& $node['next'];
-			} else {
-				// uncompressed node, walk in the correct direction for the current bit-value
-				$maskShift = 7 - ( $curBit & 7 );
-				$node =& $node[( $rawOrd[$curBit >> 3] & ( 1 << $maskShift ) ) >> $maskShift];
-				++$curBit;
-			}
-
-			if ( $node === true || $node === false ) {
-				return $node;
-			}
-		}
-	}
-
-	/**
-	 * Recursively merges adjacent nets into larger supernets
-	 *
-	 * @param array &$node Tree node to optimize, by-reference
-	 *
-	 *  e.g.: 8.0.0.0/8 + 9.0.0.0/8 -> 8.0.0.0/7
-	 */
-	private static function recOptimize( &$node ) {
-		if ( $node[0] !== false && $node[0] !== true && self::recOptimize( $node[0] ) ) {
-			$node[0] = true;
-		}
-		if ( $node[1] !== false && $node[1] !== true && self::recOptimize( $node[1] ) ) {
-			$node[1] = true;
-		}
-		if ( $node[0] === true && $node[1] === true ) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Recursively compresses a tree
-	 *
-	 * @param array &$node Tree node to compress, by-reference
-	 * @param integer $curBit current depth in the tree
-	 * @param integer $maxCompStart maximum depth at which compression can start, family-specific
-	 *
-	 * This is a very simplistic compression scheme: if we go through a whole
-	 * byte of address starting at a byte boundary with no real branching
-	 * other than immediate false-vs-(node|true), compress that subtree down to a single
-	 * byte-matching node.
-	 * The $maxCompStart check elides recursing the final 7 levels of depth (family-dependent)
-	 */
-	private static function recCompress( &$node, $curBit, $maxCompStart ) {
-		if ( !( $curBit & 7 ) ) { // byte boundary, check for depth-8 single path(s)
-			$byte = 0;
-			$cnode =& $node;
-			$i = 8;
-			while ( $i-- ) {
-				if ( $cnode[0] === false ) {
-					$byte |= 1 << $i;
-					$cnode =& $cnode[1];
-				} elseif ( $cnode[1] === false ) {
-					$cnode =& $cnode[0];
-				} else {
-					// partial-byte branching, give up
-					break;
-				}
-			}
-			if ( $i == -1 ) { // means we did not exit the while() via break
-				$node = array(
-					'comp' => $byte,
-					'next' => &$cnode,
-				);
-				$curBit += 8;
-				if ( $cnode !== true ) {
-					self::recCompress( $cnode, $curBit, $maxCompStart );
-				}
-				return;
-			}
-		}
-
-		++$curBit;
-		if ( $curBit <= $maxCompStart ) {
-			if ( $node[0] !== false && $node[0] !== true ) {
-				self::recCompress( $node[0], $curBit, $maxCompStart );
-			}
-			if ( $node[1] !== false && $node[1] !== true ) {
-				self::recCompress( $node[1], $curBit, $maxCompStart );
-			}
-		}
-	}
-}
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/objectcache/BagOStuff.php b/includes/libs/objectcache/BagOStuff.php
index d72e1a551e..ddbe8eaa3e 100644
--- a/includes/libs/objectcache/BagOStuff.php
+++ b/includes/libs/objectcache/BagOStuff.php
@@ -43,16 +43,17 @@ use Psr\Log\NullLogger;
  * @ingroup Cache
  */
 abstract class BagOStuff implements LoggerAwareInterface {
-	private $debugMode = false;
-
+	/** @var array[] Lock tracking */
+	protected $locks = array();
 	/** @var integer */
 	protected $lastError = self::ERR_NONE;
 
-	/**
-	 * @var LoggerInterface
-	 */
+	/** @var LoggerInterface */
 	protected $logger;
 
+	/** @var bool */
+	private $debugMode = false;
+
 	/** Possible values for getLastError() */
 	const ERR_NONE = 0; // no error
 	const ERR_NO_RESPONSE = 1; // no response
@@ -200,10 +201,11 @@ abstract class BagOStuff implements LoggerAwareInterface {
 
 		$this->clearLastError();
 		$currentValue = $this->get( $key );
-		if ( !$this->getLastError() ) {
+		if ( $this->getLastError() ) {
+			$success = false;
+		} else {
 			// Derive the new value from the old value
 			$value = call_user_func( $callback, $this, $key, $currentValue );
-
 			if ( $value === false ) {
 				$success = true; // do nothing
 			} else {
@@ -220,49 +222,77 @@ abstract class BagOStuff implements LoggerAwareInterface {
 	}
 
 	/**
+	 * Acquire an advisory lock on a key string
+	 *
+	 * Note that if reentry is enabled, duplicate calls ignore $expiry
+	 *
 	 * @param string $key
 	 * @param int $timeout Lock wait timeout; 0 for non-blocking [optional]
 	 * @param int $expiry Lock expiry [optional]; 1 day maximum
+	 * @param string $rclass Allow reentry if set and the current lock used this value
 	 * @return bool Success
 	 */
-	public function lock( $key, $timeout = 6, $expiry = 6 ) {
+	public function lock( $key, $timeout = 6, $expiry = 6, $rclass = '' ) {
+		// Avoid deadlocks and allow lock reentry if specified
+		if ( isset( $this->locks[$key] ) ) {
+			if ( $rclass != '' && $this->locks[$key]['class'] === $rclass ) {
+				++$this->locks[$key]['depth'];
+				return true;
+			} else {
+				return false;
+			}
+		}
+
 		$expiry = min( $expiry ?: INF, 86400 );
 
 		$this->clearLastError();
 		$timestamp = microtime( true ); // starting UNIX timestamp
 		if ( $this->add( "{$key}:lock", 1, $expiry ) ) {
-			return true;
+			$locked = true;
 		} elseif ( $this->getLastError() || $timeout <= 0 ) {
-			return false; // network partition or non-blocking
+			$locked = false; // network partition or non-blocking
+		} else {
+			$uRTT = ceil( 1e6 * ( microtime( true ) - $timestamp ) ); // estimate RTT (us)
+			$sleep = 2 * $uRTT; // rough time to do get()+set()
+
+			$attempts = 0; // failed attempts
+			do {
+				if ( ++$attempts >= 3 && $sleep <= 5e5 ) {
+					// Exponentially back off after failed attempts to avoid network spam.
+					// About 2*$uRTT*(2^n-1) us of "sleep" happen for the next n attempts.
+					$sleep *= 2;
+				}
+				usleep( $sleep ); // back off
+				$this->clearLastError();
+				$locked = $this->add( "{$key}:lock", 1, $expiry );
+				if ( $this->getLastError() ) {
+					$locked = false; // network partition
+					break;
+				}
+			} while ( !$locked && ( microtime( true ) - $timestamp ) < $timeout );
 		}
 
-		$uRTT = ceil( 1e6 * ( microtime( true ) - $timestamp ) ); // estimate RTT (us)
-		$sleep = 2 * $uRTT; // rough time to do get()+set()
-
-		$attempts = 0; // failed attempts
-		do {
-			if ( ++$attempts >= 3 && $sleep <= 5e5 ) {
-				// Exponentially back off after failed attempts to avoid network spam.
-				// About 2*$uRTT*(2^n-1) us of "sleep" happen for the next n attempts.
-				$sleep *= 2;
-			}
-			usleep( $sleep ); // back off
-			$this->clearLastError();
-			$locked = $this->add( "{$key}:lock", 1, $expiry );
-			if ( $this->getLastError() ) {
-				return false; // network partition
-			}
-		} while ( !$locked && ( microtime( true ) - $timestamp ) < $timeout );
+		if ( $locked ) {
+			$this->locks[$key] = array( 'class' => $rclass, 'depth' => 1 );
+		}
 
 		return $locked;
 	}
 
 	/**
+	 * Release an advisory lock on a key string
+	 *
 	 * @param string $key
 	 * @return bool Success
 	 */
 	public function unlock( $key ) {
-		return $this->delete( "{$key}:lock" );
+		if ( isset( $this->locks[$key] ) && --$this->locks[$key]['depth'] <= 0 ) {
+			unset( $this->locks[$key] );
+
+			return $this->delete( "{$key}:lock" );
+		}
+
+		return true;
 	}
 
 	/**
@@ -277,24 +307,27 @@ abstract class BagOStuff implements LoggerAwareInterface {
 	 * @param string $key
 	 * @param int $timeout Lock wait timeout; 0 for non-blocking [optional]
 	 * @param int $expiry Lock expiry [optional]; 1 day maximum
+	 * @param string $rclass Allow reentry if set and the current lock used this value
 	 * @return ScopedCallback|null Returns null on failure
 	 * @since 1.26
 	 */
-	final public function getScopedLock( $key, $timeout = 6, $expiry = 30 ) {
+	final public function getScopedLock( $key, $timeout = 6, $expiry = 30, $rclass = '' ) {
 		$expiry = min( $expiry ?: INF, 86400 );
 
-		if ( !$this->lock( $key, $timeout, $expiry ) ) {
+		if ( !$this->lock( $key, $timeout, $expiry, $rclass ) ) {
 			return null;
 		}
 
 		$lSince = microtime( true ); // lock timestamp
+		// PHP 5.3: Can't use $this in a closure
 		$that = $this;
+		$logger = $this->logger;
 
-		return new ScopedCallback( function() use ( $that, $key, $lSince, $expiry ) {
+		return new ScopedCallback( function() use ( $that, $logger, $key, $lSince, $expiry ) {
 			$latency = .050; // latency skew (err towards keeping lock present)
 			$age = ( microtime( true ) - $lSince + $latency );
 			if ( ( $age + $latency ) >= $expiry ) {
-				$this->logger->warning( "Lock for $key held too long ($age sec)." );
+				$logger->warning( "Lock for $key held too long ($age sec)." );
 				return; // expired; it's not "safe" to delete the key
 			}
 			$that->unlock( $key );
diff --git a/includes/libs/objectcache/HashBagOStuff.php b/includes/libs/objectcache/HashBagOStuff.php
index e03c83f53a..b685e41fc3 100644
--- a/includes/libs/objectcache/HashBagOStuff.php
+++ b/includes/libs/objectcache/HashBagOStuff.php
@@ -68,10 +68,6 @@ class HashBagOStuff extends BagOStuff {
 	}
 
 	function delete( $key ) {
-		if ( !isset( $this->bag[$key] ) ) {
-			return false;
-		}
-
 		unset( $this->bag[$key] );
 
 		return true;
diff --git a/includes/libs/objectcache/ReplicatedBagOStuff.php b/includes/libs/objectcache/ReplicatedBagOStuff.php
index 20e146d281..9e80e9fd1a 100644
--- a/includes/libs/objectcache/ReplicatedBagOStuff.php
+++ b/includes/libs/objectcache/ReplicatedBagOStuff.php
@@ -104,8 +104,8 @@ class ReplicatedBagOStuff extends BagOStuff {
 		return $this->writeStore->decr( $key, $value );
 	}
 
-	public function lock( $key, $timeout = 6, $expiry = 6 ) {
-		return $this->writeStore->lock( $key, $timeout, $expiry );
+	public function lock( $key, $timeout = 6, $expiry = 6, $rclass = '' ) {
+		return $this->writeStore->lock( $key, $timeout, $expiry, $rclass );
 	}
 
 	public function unlock( $key ) {
diff --git a/includes/libs/objectcache/WANObjectCache.php b/includes/libs/objectcache/WANObjectCache.php
index 36250b07c4..130caeba29 100644
--- a/includes/libs/objectcache/WANObjectCache.php
+++ b/includes/libs/objectcache/WANObjectCache.php
@@ -73,6 +73,10 @@ class WANObjectCache {
 	const CHECK_KEY_TTL = 31536000; // 1 year
 	/** Seconds to keep lock keys around */
 	const LOCK_TTL = 5;
+	/** Default remaining TTL at which to consider pre-emptive regeneration */
+	const LOW_TTL = 10;
+	/** Default TTL for temporarily caching tombstoned keys */
+	const TEMP_TTL = 5;
 
 	/** Idiom for set()/getWithSetCallback() TTL */
 	const TTL_NONE = 0;
@@ -256,15 +260,25 @@ class WANObjectCache {
 	/**
 	 * Purge a key from all clusters
 	 *
-	 * This instantiates a hold-off period where the key cannot be
-	 * written to avoid race conditions where dependent keys get updated
-	 * with a stale value (e.g. from a DB slave). This is implemented by
-	 * storing a special "tombstone" value at the cache key that this
-	 * class recognizes; get() calls will return false for the key.
-	 *
 	 * This should only be called when the underlying data (being cached)
-	 * changes in a significant way. If called twice on the same key, then
-	 * the last TTL takes precedence.
+	 * changes in a significant way. This deletes the key and starts a hold-off
+	 * period where the key cannot be written to for a few seconds (HOLDOFF_TTL).
+	 * This is done to avoid the following race condition:
+	 *   a) Some DB data changes and delete() is called on a corresponding key
+	 *   b) A request refills the key with a stale value from a lagged DB
+	 *   c) The stale value is stuck there until the key is expired/evicted
+	 *
+	 * This is implemented by storing a special "tombstone" value at the cache
+	 * key that this class recognizes; get() calls will return false for the key
+	 * and any set() calls will refuse to replace tombstone values at the key.
+	 * For this to always avoid writing stale values, the following must hold:
+	 *   a) Replication lag is bounded to being less than HOLDOFF_TTL; or
+	 *   b) If lag is higher, the DB will have gone into read-only mode already
+	 *
+	 * If called twice on the same key, then the last hold-off TTL takes
+	 * precedence. For idempotence, the $ttl should not vary for different
+	 * delete() calls on the same key. Also note that lowering $ttl reduces
+	 * the effective range of the 'lockTSE' parameter to getWithSetCallback().
 	 *
 	 * @param string $key Cache key
 	 * @param integer $ttl How long to block writes to the key [seconds]
@@ -272,6 +286,8 @@ class WANObjectCache {
 	 */
 	final public function delete( $key, $ttl = self::HOLDOFF_TTL ) {
 		$key = self::VALUE_KEY_PREFIX . $key;
+		// Avoid indefinite key salting for sanity
+		$ttl = max( $ttl, 1 );
 		// Update the local cluster immediately
 		$ok = $this->cache->set( $key, self::PURGE_VAL_PREFIX . microtime( true ), $ttl );
 		// Publish the purge to all clusters
@@ -455,18 +471,18 @@ class WANObjectCache {
 	 *               Other threads will try to use stale values if possible.
 	 *               If, on miss, the time since expiration is low, the assumption
 	 *               is that the key is hot and that a stampede is worth avoiding.
-	 *   - tempTTL : when 'lockTSE' is set, this determines the TTL of the temp
-	 *               key used to cache values while a key is tombstoned.
-	 *               This avoids excessive regeneration of hot keys on delete() but
-	 *               may result in stale values.
+	 *               Setting this above WANObjectCache::HOLDOFF_TTL makes no difference.
+	 *   - tempTTL : TTL of the temp key used to cache values while a key is tombstoned.
+	 *               This avoids excessive regeneration of hot keys on delete() but may
+	 *               result in stale values.
 	 * @return mixed Value to use for the key
 	 */
 	final public function getWithSetCallback(
 		$key, $callback, $ttl, array $checkKeys = array(), array $opts = array()
 	) {
-		$lowTTL = isset( $opts['lowTTL'] ) ? $opts['lowTTL'] : min( 10, $ttl );
+		$lowTTL = isset( $opts['lowTTL'] ) ? $opts['lowTTL'] : min( self::LOW_TTL, $ttl );
 		$lockTSE = isset( $opts['lockTSE'] ) ? $opts['lockTSE'] : -1;
-		$tempTTL = isset( $opts['tempTTL'] ) ? $opts['tempTTL'] : 5;
+		$tempTTL = isset( $opts['tempTTL'] ) ? $opts['tempTTL'] : self::TEMP_TTL;
 
 		// Get the current key value
 		$curTTL = null;
@@ -478,23 +494,24 @@ class WANObjectCache {
 			return $value;
 		}
 
+		// A deleted key with a negative TTL left must be tombstoned
 		$isTombstone = ( $curTTL !== null && $value === false );
 		// Assume a key is hot if requested soon after invalidation
 		$isHot = ( $curTTL !== null && $curTTL <= 0 && abs( $curTTL ) <= $lockTSE );
 
-		$locked = false;
+		$lockAcquired = false;
 		if ( $isHot ) {
 			// Acquire a cluster-local non-blocking lock
 			if ( $this->cache->lock( $key, 0, self::LOCK_TTL ) ) {
 				// Lock acquired; this thread should update the key
-				$locked = true;
+				$lockAcquired = true;
 			} elseif ( $value !== false ) {
 				// If it cannot be acquired; then the stale value can be used
 				return $value;
 			}
 		}
 
-		if ( !$locked && ( $isTombstone || $isHot ) ) {
+		if ( !$lockAcquired && ( $isTombstone || $isHot ) ) {
 			// Use the stash value for tombstoned keys to reduce regeneration load.
 			// For hot keys, either another thread has the lock or the lock failed;
 			// use the stash value from the last thread that regenerated it.
@@ -516,7 +533,7 @@ class WANObjectCache {
 			$this->cache->set( self::STASH_KEY_PREFIX . $key, $value, $tempTTL );
 		}
 
-		if ( $locked ) {
+		if ( $lockAcquired ) {
 			$this->cache->unlock( $key );
 		}
 
@@ -617,7 +634,7 @@ class WANObjectCache {
 	 * moves from $lowTTL to 0 seconds. This handles widely varying
 	 * levels of cache access traffic.
 	 *
-	 * @param float|INF $curTTL Approximate TTL left on the key if present
+	 * @param float $curTTL Approximate TTL left on the key if present
 	 * @param float $lowTTL Consider a refresh when $curTTL is less than this
 	 * @return bool
 	 */
diff --git a/includes/libs/virtualrest/ParsoidVirtualRESTService.php b/includes/libs/virtualrest/ParsoidVirtualRESTService.php
index 32a27f7956..43dfab3cf2 100644
--- a/includes/libs/virtualrest/ParsoidVirtualRESTService.php
+++ b/includes/libs/virtualrest/ParsoidVirtualRESTService.php
@@ -24,21 +24,27 @@
  */
 class ParsoidVirtualRESTService extends VirtualRESTService {
 	/**
-	 * Example requests:
-	 *  GET /local/v1/page/$title/html/$oldid
-	 *   * $oldid is optional
-	 *  POST /local/v1/transform/html/to/wikitext/$title/$oldid
+	 * Example Parsoid v3 requests:
+	 *  GET /local/v3/page/html/$title/{$revision}
+	 *   * $revision is optional
+	 *  POST /local/v3/transform/html/to/wikitext/{$title}{/$revision}
 	 *   * body: array( 'html' => ... )
-	 *   * $title and $oldid are optional
-	 *  POST /local/v1/transform/wikitext/to/html/$title
-	 *   * body: array( 'wikitext' => ... ) or array( 'wikitext' => ..., 'body' => true/false )
+	 *   * $title and $revision are optional
+	 *  POST /local/v3/transform/wikitext/to/html/{$title}{/$revision}
+	 *   * body: array( 'wikitext' => ... ) or array( 'wikitext' => ..., 'bodyOnly' => true/false )
 	 *   * $title is optional
+	 *   * $revision is optional
+     *
+	 * There are also deprecated "v1" requests; see onParsoid1Request
+	 * for details.
 	 * @param array $params Key/value map
 	 *   - url            : Parsoid server URL
-	 *   - prefix         : Parsoid prefix for this wiki
+	 *   - domain         : Wiki domain to use
 	 *   - timeout        : Parsoid timeout (optional)
 	 *   - forwardCookies : Cookies to forward to Parsoid, or false. (optional)
 	 *   - HTTPProxy      : Parsoid HTTP proxy (optional)
+	 *   - restbaseCompat : whether to parse URL as if they were meant for RESTBase
+	 *                       boolean (optional)
 	 */
 	public function __construct( array $params ) {
 		// for backwards compatibility:
@@ -46,7 +52,30 @@ class ParsoidVirtualRESTService extends VirtualRESTService {
 			$params['url'] = $params['URL'];
 			unset( $params['URL'] );
 		}
-		parent::__construct( $params );
+		// set up defaults and merge them with the given params
+		$mparams = array_merge( array(
+			'name' => 'parsoid',
+			'url' => 'http://localhost:8000/',
+			'prefix' => 'localhost',
+			'domain' => 'localhost',
+			'forwardCookies' => false,
+			'HTTPProxy' => null,
+		), $params );
+		// Ensure that the url parameter has a trailing slash.
+		$mparams['url'] = preg_replace(
+			'#/?$#',
+			'/',
+			$mparams['url']
+		);
+		// Ensure the correct domain format: strip protocol, port,
+		// and trailing slash if present.  This lets us use
+		// $wgCanonicalServer as a default value, which is very convenient.
+		$mparams['domain'] = preg_replace(
+			'/^(https?:\/\/)?([^\/:]+?)(:\d+)?\/?$/',
+			'$2',
+			$mparams['domain']
+		);
+		parent::__construct( $mparams );
 	}
 
 	public function onRequests( array $reqs, Closure $idGeneratorFunc ) {
@@ -56,71 +85,143 @@ class ParsoidVirtualRESTService extends VirtualRESTService {
 
 			list(
 				$targetWiki, // 'local'
-				$version, // 'v1'
-				$reqType // 'page' or 'transform'
+				$version, // 'v3' ('v1' for restbase compatibility)
+				$reqType, // 'page' or 'transform'
+				$format, // 'html' or 'wikitext'
+				// $title (optional)
+				// $revision (optional)
 			) = $parts;
 
+			if ( isset( $this->params['restbaseCompat'] ) && $this->params['restbaseCompat'] ) {
+				if ( $version !== 'v1' ) {
+					throw new Exception( "Only RESTBase v1 API is supported." );
+				}
+				# Map RESTBase v1 API to Parsoid v3 API (pretty easy)
+				$req['url'] = preg_replace( '#^local/v1/#', 'local/v3/', $req['url'] );
+			} elseif ( $version !== 'v3' ) {
+				$result[$key] = $this->onParsoid1Request( $req, $idGeneratorFunc );
+				continue;
+			}
 			if ( $targetWiki !== 'local' ) {
+
 				throw new Exception( "Only 'local' target wiki is currently supported" );
-			} elseif ( $version !== 'v1' ) {
-				throw new Exception( "Only version 1 exists" );
-			} elseif ( $reqType !== 'page' && $reqType !== 'transform' ) {
-				throw new Exception( "Request type must be either 'page' or 'transform'" );
 			}
-
-			$req['url'] = $this->params['url'] . '/' . urlencode( $this->params['prefix'] ) . '/';
-
-			if ( $reqType === 'page' ) {
-				$title = $parts[3];
-				if ( $parts[4] !== 'html' ) {
-					throw new Exception( "Only 'html' output format is currently supported" );
-				}
-				if ( isset( $parts[5] ) ) {
-					$req['url'] .= $title . '?oldid=' . $parts[5];
-				} else {
-					$req['url'] .= $title;
-				}
-			} elseif ( $reqType === 'transform' ) {
-				if ( $parts[4] !== 'to' ) {
-					throw new Exception( "Part index 4 is not 'to'" );
-				}
-
-				if ( isset( $parts[6] ) ) {
-					$req['url'] .= $parts[6];
-				}
-
-				if ( $parts[3] === 'html' & $parts[5] === 'wikitext' ) {
-					if ( !isset( $req['body']['html'] ) ) {
-						throw new Exception( "You must set an 'html' body key for this request" );
-					}
-					if ( isset( $parts[7] ) ) {
-						$req['body']['oldid'] = $parts[7];
-					}
-				} elseif ( $parts[3] == 'wikitext' && $parts[5] == 'html' ) {
-					if ( !isset( $req['body']['wikitext'] ) ) {
-						throw new Exception( "You must set a 'wikitext' body key for this request" );
-					}
-					$req['body']['wt'] = $req['body']['wikitext'];
-					unset( $req['body']['wikitext'] );
-				} else {
-					throw new Exception( "Transformation unsupported" );
-				}
+			if ( $reqType !== 'page' && $reqType !== 'transform' ) {
+				throw new Exception( "Request action must be either 'page' or 'transform'" );
 			}
-
-			if ( isset( $this->params['HTTPProxy'] ) && $this->params['HTTPProxy'] ) {
+			if ( $format !== 'html' && $format !== 'wikitext' ) {
+				throw new Exception( "Request format must be either 'html' or 'wt'" );
+			}
+			// replace /local/ with the current domain
+			$req['url'] = preg_replace( '#^local/#', $this->params['domain'] . '/', $req['url'] );
+			// and prefix it with the service URL
+			$req['url'] = $this->params['url'] . $req['url'];
+			// set the appropriate proxy, timeout and headers
+			if ( $this->params['HTTPProxy'] ) {
 				$req['proxy'] = $this->params['HTTPProxy'];
 			}
-			if ( isset( $this->params['timeout'] ) ) {
+			if ( $this->params['timeout'] != null ) {
 				$req['reqTimeout'] = $this->params['timeout'];
 			}
-
-			// Forward cookies
-			if ( isset( $this->params['forwardCookies'] ) ) {
+			if ( $this->params['forwardCookies'] ) {
 				$req['headers']['Cookie'] = $this->params['forwardCookies'];
 			}
-
 			$result[$key] = $req;
 		}
 		return $result;
 	}
+
+	/**
+	 * Remap a Parsoid v1 request to a Parsoid v3 request.
+	 *
+	 * Example Parsoid v1 requests:
+	 *  GET /local/v1/page/$title/html/$oldid
+	 *   * $oldid is optional
+	 *  POST /local/v1/transform/html/to/wikitext/$title/$oldid
+	 *   * body: array( 'html' => ... )
+	 *   * $title and $oldid are optional
+	 *  POST /local/v1/transform/wikitext/to/html/$title
+	 *   * body: array( 'wikitext' => ... ) or array( 'wikitext' => ..., 'body' => true/false )
+	 *   * $title is optional
+	 *
+	 * NOTE: the POST APIs aren't "real" Parsoid v1 APIs, they are just what
+	 * Visual Editor "pretends" the V1 API is like.  A previous version of
+	 * ParsoidVirtualRESTService translated these to the "real" Parsoid v1
+	 * API.  We now translate these to the "real" Parsoid v3 API.
+	 */
+	public function onParsoid1Request( array $req, Closure $idGeneratorFunc ) {
+
+		$parts = explode( '/', $req['url'] );
+		list(
+			$targetWiki, // 'local'
+			$version, // 'v1'
+			$reqType // 'page' or 'transform'
+		) = $parts;
+		if ( $targetWiki !== 'local' ) {
+			throw new Exception( "Only 'local' target wiki is currently supported" );
+		} elseif ( $version !== 'v1' ) {
+			throw new Exception( "Only v1 and v3 are supported." );
+		} elseif ( $reqType !== 'page' && $reqType !== 'transform' ) {
+			throw new Exception( "Request type must be either 'page' or 'transform'" );
+		}
+		$req['url'] = $this->params['url'] . $this->params['domain'] . '/v3/';
+		if ( $reqType === 'page' ) {
+			$title = $parts[3];
+			if ( $parts[4] !== 'html' ) {
+				throw new Exception( "Only 'html' output format is currently supported" );
+			}
+			$req['url'] .= 'page/html/' . $title;
+			if ( isset( $parts[5] ) ) {
+				$req['url'] .= '/' . $parts[5];
+			} elseif ( isset( $req['query']['oldid'] ) && $req['query']['oldid'] ) {
+				$req['url'] .= '/' . $req['query']['oldid'];
+				unset( $req['query']['oldid'] );
+			}
+		} elseif ( $reqType === 'transform' ) {
+			$req['url'] .= 'transform/'. $parts[3] . '/to/' . $parts[5];
+			// the title
+			if ( isset( $parts[6] ) ) {
+				$req['url'] .= '/' . $parts[6];
+			}
+			// revision id
+			if ( isset( $parts[7] ) ) {
+				$req['url'] .= '/' . $parts[7];
+			} elseif ( isset( $req['body']['oldid'] ) && $req['body']['oldid'] ) {
+				$req['url'] .= '/' . $req['body']['oldid'];
+				unset( $req['body']['oldid'] );
+			}
+			if ( $parts[4] !== 'to' ) {
+				throw new Exception( "Part index 4 is not 'to'" );
+			}
+			if ( $parts[3] === 'html' && $parts[5] === 'wikitext' ) {
+				if ( !isset( $req['body']['html'] ) ) {
+					throw new Exception( "You must set an 'html' body key for this request" );
+				}
+			} elseif ( $parts[3] == 'wikitext' && $parts[5] == 'html' ) {
+				if ( !isset( $req['body']['wikitext'] ) ) {
+					throw new Exception( "You must set a 'wikitext' body key for this request" );
+				}
+				if ( isset( $req['body']['body'] ) ) {
+					$req['body']['bodyOnly'] = $req['body']['body'];
+					unset( $req['body']['body'] );
+				}
+			} else {
+				throw new Exception( "Transformation unsupported" );
+			}
+		}
+		// set the appropriate proxy, timeout and headers
+		if ( $this->params['HTTPProxy'] ) {
+			$req['proxy'] = $this->params['HTTPProxy'];
+		}
+		if ( $this->params['timeout'] != null ) {
+			$req['reqTimeout'] = $this->params['timeout'];
+		}
+		if ( $this->params['forwardCookies'] ) {
+			$req['headers']['Cookie'] = $this->params['forwardCookies'];
+		}
+
+		return $req;
+
+	}
+
 }
diff --git a/includes/libs/virtualrest/RestbaseVirtualRESTService.php b/includes/libs/virtualrest/RestbaseVirtualRESTService.php
index 8fe5b9214b..3a7bc5877c 100644
--- a/includes/libs/virtualrest/RestbaseVirtualRESTService.php
+++ b/includes/libs/virtualrest/RestbaseVirtualRESTService.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Virtual HTTP service client for Restbase
+ * Virtual HTTP service client for RESTBase
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,23 +19,23 @@
  */
 
 /**
- * Virtual REST service for Restbase
+ * Virtual REST service for RESTBase
  * @since 1.25
  */
 class RestbaseVirtualRESTService extends VirtualRESTService {
 	/**
-	 * Example requests:
-	 *  GET /local/v1/page/{title}/html{/revision}
+	 * Example RESTBase v1 requests:
+	 *  GET /local/v1/page/html/{title}{/revision}
 	 *  POST /local/v1/transform/html/to/wikitext{/title}{/revision}
 	 *   * body: array( 'html' => ... )
 	 *  POST /local/v1/transform/wikitext/to/html{/title}{/revision}
 	 *   * body: array( 'wikitext' => ... ) or array( 'wikitext' => ..., 'bodyOnly' => true/false )
 	 *
 	 * @param array $params Key/value map
-	 *   - url            : Restbase server URL
+	 *   - url            : RESTBase server URL
 	 *   - domain         : Wiki domain to use
 	 *   - timeout        : request timeout in seconds (optional)
-	 *   - forwardCookies : cookies to forward to Restbase/Parsoid (as a Cookie
+	 *   - forwardCookies : cookies to forward to RESTBase/Parsoid (as a Cookie
 	 *                       header string) or false (optional)
 	 *                       Note: forwardCookies will in the future be a boolean
 	 *                       only, signifing request cookies should be forwarded
@@ -48,18 +48,27 @@ class RestbaseVirtualRESTService extends VirtualRESTService {
 	public function __construct( array $params ) {
 		// set up defaults and merge them with the given params
 		$mparams = array_merge( array(
-			'url' => 'http://localhost:7231',
+			'name' => 'restbase',
+			'url' => 'http://localhost:7231/',
 			'domain' => 'localhost',
 			'timeout' => 100,
 			'forwardCookies' => false,
 			'HTTPProxy' => null,
 			'parsoidCompat' => false
 		), $params );
-		// ensure the correct domain format
+		// Ensure that the url parameter has a trailing slash.
+		$mparams['url'] = preg_replace(
+			'#/?$#',
+			'/',
+			$mparams['url']
+		);
+		// Ensure the correct domain format: strip protocol, port,
+		// and trailing slash if present.  This lets us use
+		// $wgCanonicalServer as a default value, which is very convenient.
 		$mparams['domain'] = preg_replace(
-				'/^(https?:\/\/)?([^\/:]+?)(\/|:\d+\/?)?$/',
-				'$2',
-				$mparams['domain']
+			'/^(https?:\/\/)?([^\/:]+?)(:\d+)?\/?$/',
+			'$2',
+			$mparams['domain']
 		);
 		parent::__construct( $mparams );
 	}
@@ -73,7 +82,7 @@ class RestbaseVirtualRESTService extends VirtualRESTService {
 		$result = array();
 		foreach ( $reqs as $key => $req ) {
 			// replace /local/ with the current domain
-			$req['url'] = preg_replace( '/^\/local\//', '/' . $this->params['domain'] . '/', $req['url'] );
+			$req['url'] = preg_replace( '#^local/#', $this->params['domain'] . '/', $req['url'] );
 			// and prefix it with the service URL
 			$req['url'] = $this->params['url'] . $req['url'];
 			// set the appropriate proxy, timeout and headers
@@ -94,83 +103,164 @@ class RestbaseVirtualRESTService extends VirtualRESTService {
 	}
 
 	/**
-	 * Remaps Parsoid requests to Restbase paths
+	 * Remaps Parsoid v1/v3 requests to RESTBase v1 requests.
 	 */
 	public function onParsoidRequests( array $reqs, Closure $idGeneratorFunc ) {
 
 		$result = array();
 		foreach ( $reqs as $key => $req ) {
 			$parts = explode( '/', $req['url'] );
-			list(
-				$targetWiki, // 'local'
-				$version, // 'v1'
-				$reqType // 'page' or 'transform'
-			) = $parts;
-			if ( $targetWiki !== 'local' ) {
-				throw new Exception( "Only 'local' target wiki is currently supported" );
-			} elseif ( $reqType !== 'page' && $reqType !== 'transform' ) {
-				throw new Exception( "Request type must be either 'page' or 'transform'" );
+			if ( $parts[1] === 'v3' ) {
+				$result[$key] = $this->onParsoid3Request( $req, $idGeneratorFunc );
+			} elseif ( $parts[1] === 'v1' ) {
+				$result[$key] = $this->onParsoid1Request( $req, $idGeneratorFunc );
+			} else {
+				throw new Exception( "Only v1 and v3 are supported." );
 			}
-			$req['url'] = $this->params['url'] . '/' . $this->params['domain'] . '/v1/' . $reqType . '/';
-			if ( $reqType === 'page' ) {
-				$title = $parts[3];
-				if ( $parts[4] !== 'html' ) {
-					throw new Exception( "Only 'html' output format is currently supported" );
-				}
-				$req['url'] .= 'html/' . $title;
-				if ( isset( $parts[5] ) ) {
-					$req['url'] .= '/' . $parts[5];
-				} elseif ( isset( $req['query']['oldid'] ) && $req['query']['oldid'] ) {
-					$req['url'] .= '/' . $req['query']['oldid'];
-					unset( $req['query']['oldid'] );
-				}
-			} elseif ( $reqType === 'transform' ) {
-				// from / to transform
-				$req['url'] .= $parts[3] . '/to/' . $parts[5];
-				// the title
-				if ( isset( $parts[6] ) ) {
-					$req['url'] .= '/' . $parts[6];
-				}
-				// revision id
-				if ( isset( $parts[7] ) ) {
-					$req['url'] .= '/' . $parts[7];
-				} elseif ( isset( $req['body']['oldid'] ) && $req['body']['oldid'] ) {
-					$req['url'] .= '/' . $req['body']['oldid'];
-					unset( $req['body']['oldid'] );
-				}
-				if ( $parts[4] !== 'to' ) {
-					throw new Exception( "Part index 4 is not 'to'" );
-				}
-				if ( $parts[3] === 'html' & $parts[5] === 'wikitext' ) {
-					if ( !isset( $req['body']['html'] ) ) {
-						throw new Exception( "You must set an 'html' body key for this request" );
-					}
-				} elseif ( $parts[3] == 'wikitext' && $parts[5] == 'html' ) {
-					if ( !isset( $req['body']['wikitext'] ) ) {
-						throw new Exception( "You must set a 'wikitext' body key for this request" );
-					}
-					if ( isset( $req['body']['body'] ) ) {
-						$req['body']['bodyOnly'] = $req['body']['body'];
-						unset( $req['body']['body'] );
-					}
-				} else {
-					throw new Exception( "Transformation unsupported" );
-				}
+		}
+
+		return $result;
+
+	}
+
+	/**
+	 * Remap a Parsoid v1 request to a RESTBase v1 request.
+	 *
+	 * Example Parsoid v1 requests:
+	 *  GET /local/v1/page/$title/html/$oldid
+	 *   * $oldid is optional
+	 *  POST /local/v1/transform/html/to/wikitext/$title/$oldid
+	 *   * body: array( 'html' => ... )
+	 *   * $title and $oldid are optional
+	 *  POST /local/v1/transform/wikitext/to/html/$title
+	 *   * body: array( 'wikitext' => ... ) or array( 'wikitext' => ..., 'body' => true/false )
+	 *   * $title is optional
+	 *
+	 * NOTE: the POST APIs aren't "real" Parsoid v1 APIs, they are just what
+	 * Visual Editor "pretends" the V1 API is like.  (See
+	 * ParsoidVirtualRESTService.)
+	 */
+	public function onParsoid1Request( array $req, Closure $idGeneratorFunc ) {
+		$parts = explode( '/', $req['url'] );
+		list(
+			$targetWiki, // 'local'
+			$version, // 'v1'
+			$reqType // 'page' or 'transform'
+		) = $parts;
+		if ( $targetWiki !== 'local' ) {
+			throw new Exception( "Only 'local' target wiki is currently supported" );
+		} elseif ( $version !== 'v1' ) {
+			throw new Exception( "Version mismatch: should not happen." );
+		} elseif ( $reqType !== 'page' && $reqType !== 'transform' ) {
+			throw new Exception( "Request type must be either 'page' or 'transform'" );
+		}
+		$req['url'] = $this->params['url'] . $this->params['domain'] . '/v1/' . $reqType . '/';
+		if ( $reqType === 'page' ) {
+			$title = $parts[3];
+			if ( $parts[4] !== 'html' ) {
+				throw new Exception( "Only 'html' output format is currently supported" );
 			}
-			// set the appropriate proxy, timeout and headers
-			if ( $this->params['HTTPProxy'] ) {
-				$req['proxy'] = $this->params['HTTPProxy'];
+			$req['url'] .= 'html/' . $title;
+			if ( isset( $parts[5] ) ) {
+				$req['url'] .= '/' . $parts[5];
+			} elseif ( isset( $req['query']['oldid'] ) && $req['query']['oldid'] ) {
+				$req['url'] .= '/' . $req['query']['oldid'];
+				unset( $req['query']['oldid'] );
 			}
-			if ( $this->params['timeout'] != null ) {
-				$req['reqTimeout'] = $this->params['timeout'];
+		} elseif ( $reqType === 'transform' ) {
+			// from / to transform
+			$req['url'] .= $parts[3] . '/to/' . $parts[5];
+			// the title
+			if ( isset( $parts[6] ) ) {
+				$req['url'] .= '/' . $parts[6];
 			}
-			if ( $this->params['forwardCookies'] ) {
-				$req['headers']['Cookie'] = $this->params['forwardCookies'];
+			// revision id
+			if ( isset( $parts[7] ) ) {
+				$req['url'] .= '/' . $parts[7];
+			} elseif ( isset( $req['body']['oldid'] ) && $req['body']['oldid'] ) {
+				$req['url'] .= '/' . $req['body']['oldid'];
+				unset( $req['body']['oldid'] );
+			}
+			if ( $parts[4] !== 'to' ) {
+				throw new Exception( "Part index 4 is not 'to'" );
+			}
+			if ( $parts[3] === 'html' && $parts[5] === 'wikitext' ) {
+				if ( !isset( $req['body']['html'] ) ) {
+					throw new Exception( "You must set an 'html' body key for this request" );
+				}
+			} elseif ( $parts[3] == 'wikitext' && $parts[5] == 'html' ) {
+				if ( !isset( $req['body']['wikitext'] ) ) {
+					throw new Exception( "You must set a 'wikitext' body key for this request" );
+				}
+				if ( isset( $req['body']['body'] ) ) {
+					$req['body']['bodyOnly'] = $req['body']['body'];
+					unset( $req['body']['body'] );
+				}
+			} else {
+				throw new Exception( "Transformation unsupported" );
 			}
-			$result[$key] = $req;
+		}
+		// set the appropriate proxy, timeout and headers
+		if ( $this->params['HTTPProxy'] ) {
+			$req['proxy'] = $this->params['HTTPProxy'];
+		}
+		if ( $this->params['timeout'] != null ) {
+			$req['reqTimeout'] = $this->params['timeout'];
+		}
+		if ( $this->params['forwardCookies'] ) {
+			$req['headers']['Cookie'] = $this->params['forwardCookies'];
 		}
 
-		return $result;
+		return $req;
+
+	}
+
+	/**
+	 * Remap a Parsoid v3 request to a RESTBase v1 request.
+	 *
+	 * Example Parsoid v3 requests:
+	 *  GET /local/v3/page/html/$title/{$revision}
+	 *   * $revision is optional
+	 *  POST /local/v3/transform/html/to/wikitext/{$title}{/$revision}
+	 *   * body: array( 'html' => ... )
+	 *   * $title and $revision are optional
+	 *  POST /local/v3/transform/wikitext/to/html/{$title}{/$revision}
+	 *   * body: array( 'wikitext' => ... ) or array( 'wikitext' => ..., 'bodyOnly' => true/false )
+	 *   * $title is optional
+	 *   * $revision is optional
+	 */
+	public function onParsoid3Request( array $req, Closure $idGeneratorFunc ) {
+
+		$parts = explode( '/', $req['url'] );
+		list(
+			$targetWiki, // 'local'
+			$version, // 'v3'
+			$action, // 'transform' or 'page'
+			$format, // 'html' or 'wikitext'
+			// $title, // optional
+			// $revision, // optional
+		) = $parts;
+		if ( $targetWiki !== 'local' ) {
+			throw new Exception( "Only 'local' target wiki is currently supported" );
+		} elseif ( $version !== 'v3' ) {
+			throw new Exception( "Version mismatch: should not happen." );
+		}
+		// replace /local/ with the current domain, change v3 to v1,
+		$req['url'] = preg_replace( '#^local/v3/#', $this->params['domain'] . '/v1/', $req['url'] );
+		// and prefix it with the service URL
+		$req['url'] = $this->params['url'] . $req['url'];
+		// set the appropriate proxy, timeout and headers
+		if ( $this->params['HTTPProxy'] ) {
+			$req['proxy'] = $this->params['HTTPProxy'];
+		}
+		if ( $this->params['timeout'] != null ) {
+			$req['reqTimeout'] = $this->params['timeout'];
+		}
+		if ( $this->params['forwardCookies'] ) {
+			$req['headers']['Cookie'] = $this->params['forwardCookies'];
+		}
+
+		return $req;
 
 	}
 
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/XMP.php b/includes/media/XMP.php
index 12550a59ef..64a7e8a805 100644
--- a/includes/media/XMP.php
+++ b/includes/media/XMP.php
@@ -348,7 +348,7 @@ class XMPReader implements LoggerAwareInterface {
 			// could declare entities unsafe to parse with xml_parse (T85848/T71210).
 			if ( $this->parsable !== self::PARSABLE_OK ) {
 				if ( $this->parsable === self::PARSABLE_NO ) {
-					throw new Exception( 'Unsafe doctype declaration in XML.' );
+					throw new RuntimeException( 'Unsafe doctype declaration in XML.' );
 				}
 
 				$content = $this->xmlParsableBuffer . $content;
@@ -361,29 +361,44 @@ class XMPReader implements LoggerAwareInterface {
 					$msg = ( $this->parsable === self::PARSABLE_NO ) ?
 						'Unsafe doctype declaration in XML.' :
 						'No root element found in XML.';
-					throw new Exception( $msg );
+					throw new RuntimeException( $msg );
 				}
 			}
 
 			$ok = xml_parse( $this->xmlParser, $content, $allOfIt );
 			if ( !$ok ) {
-				$error = xml_error_string( xml_get_error_code( $this->xmlParser ) );
-				$where = 'line: ' . xml_get_current_line_number( $this->xmlParser )
-					. ' column: ' . xml_get_current_column_number( $this->xmlParser )
-					. ' byte offset: ' . xml_get_current_byte_index( $this->xmlParser );
-
-				$this->logger->info( "XMPReader::parse : Error reading XMP content: $error ($where)" );
+				$code = xml_get_error_code( $this->xmlParser );
+				$error = xml_error_string( $code );
+				$line = xml_get_current_line_number( $this->xmlParser );
+				$col = xml_get_current_column_number( $this->xmlParser );
+				$offset = xml_get_current_byte_index( $this->xmlParser );
+
+				$this->logger->warning(
+					'{method} : Error reading XMP content: {error} ' .
+					'(line: {line} column: {column} byte offset: {offset})',
+					array(
+						'method' => __METHOD__,
+						'error_code' => $code,
+						'error' => $error,
+						'line' => $line,
+						'column' => $col,
+						'offset' => $offset,
+						'content' => $content,
+				) );
 				$this->results = array(); // blank if error.
 				$this->destroyXMLParser();
 				return false;
 			}
 		} catch ( Exception $e ) {
-			$this->logger->info( 'XMP parse error: ' . $e );
+			$this->logger->warning(
+				'{method} Exception caught while parsing: ' . $e->getMessage(),
+				array(
+					'method' => __METHOD__,
+					'exception' => $e,
+					'content' => $content,
+				)
+			);
 			$this->results = array();
-
-			if ( $allOfIt ) {
-				$this->destroyXMLParser();
-			}
 			return false;
 		}
 		if ( $allOfIt ) {
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/objectcache/MultiWriteBagOStuff.php b/includes/objectcache/MultiWriteBagOStuff.php
index b5f3bd96d2..bbfaa5e1c9 100644
--- a/includes/objectcache/MultiWriteBagOStuff.php
+++ b/includes/objectcache/MultiWriteBagOStuff.php
@@ -121,12 +121,13 @@ class MultiWriteBagOStuff extends BagOStuff {
 	 * @param string $key
 	 * @param int $timeout
 	 * @param int $expiry
+	 * @param string $rclass
 	 * @return bool
 	 */
-	public function lock( $key, $timeout = 6, $expiry = 6 ) {
+	public function lock( $key, $timeout = 6, $expiry = 6, $rclass = '' ) {
 		// Lock only the first cache, to avoid deadlocks
 		if ( isset( $this->caches[0] ) ) {
-			return $this->caches[0]->lock( $key, $timeout, $expiry );
+			return $this->caches[0]->lock( $key, $timeout, $expiry, $rclass );
 		} else {
 			return true;
 		}
diff --git a/includes/objectcache/ObjectCache.php b/includes/objectcache/ObjectCache.php
index 8a99f53f41..601910578f 100644
--- a/includes/objectcache/ObjectCache.php
+++ b/includes/objectcache/ObjectCache.php
@@ -28,15 +28,46 @@ use MediaWiki\Logger\LoggerFactory;
  *
  * The word "cache" has two main dictionary meanings, and both
  * are used in this factory class. They are:
- *   - a) A place to store copies or computations on existing data
- *        for higher access speeds (the computer science definition)
- *   - b) A place to store lightweight data that is not canonically
- *        stored anywhere else (e.g. a "hoard" of objects)
+ *
+ *   - a) Cache (the computer science definition).
+ *        A place to store copies or computations on existing data for
+ *        higher access speeds.
+ *   - b) Storage.
+ *        A place to store lightweight data that is not canonically
+ *        stored anywhere else (e.g. a "hoard" of objects).
  *
  * The former should always use strongly consistent stores, so callers don't
  * have to deal with stale reads. The later may be eventually consistent, but
  * callers can use BagOStuff:READ_LATEST to see the latest available data.
  *
+ * Primary entry points:
+ *
+ * - ObjectCache::newAccelerator( $fallbackType )
+ *   Purpose: Cache.
+ *   Stored only on the individual web server.
+ *   Not associated with other servers.
+ *
+ * - wfGetMainCache()
+ *   Purpose: Cache.
+ *   Stored centrally within the local data-center.
+ *   Not replicated to other DCs.
+ *   Also known as $wgMemc. Configured by $wgMainCacheType.
+ *
+ * - ObjectCache::getMainWANInstance()
+ *   Purpose: Cache.
+ *   Stored in the local data-center's main cache (uses different cache keys).
+ *   Delete events are broadcasted to other DCs. See WANObjectCache for details.
+ *
+ * - ObjectCache::getMainStashInstance()
+ *   Purpose: Ephemeral storage.
+ *   Stored centrally within the local data-center.
+ *   Changes are replicated to other DCs (eventually consistent).
+ *   To retrieve the latest value (e.g. not from a slave), use BagOStuff:READ_LATEST.
+ *   This store may be subject to LRU style evictions.
+ *
+ * - wfGetCache( $cacheType )
+ *   Get a specific cache type by key in $wgObjectCaches.
+ *
  * @ingroup Cache
  */
 class ObjectCache {
@@ -49,10 +80,10 @@ class ObjectCache {
 	/**
 	 * Get a cached instance of the specified type of cache object.
 	 *
-	 * @param string $id
+	 * @param string $id A key in $wgObjectCaches.
 	 * @return BagOStuff
 	 */
-	static function getInstance( $id ) {
+	public static function getInstance( $id ) {
 		if ( !isset( self::$instances[$id] ) ) {
 			self::$instances[$id] = self::newFromId( $id );
 		}
@@ -61,13 +92,13 @@ class ObjectCache {
 	}
 
 	/**
-	 * Get a cached instance of the specified type of cache object.
+	 * Get a cached instance of the specified type of WAN cache object.
 	 *
 	 * @since 1.26
-	 * @param string $id
+	 * @param string $id A key in $wgWANObjectCaches.
 	 * @return WANObjectCache
 	 */
-	static function getWANInstance( $id ) {
+	public static function getWANInstance( $id ) {
 		if ( !isset( self::$wanInstances[$id] ) ) {
 			self::$wanInstances[$id] = self::newWANCacheFromId( $id );
 		}
@@ -75,22 +106,14 @@ class ObjectCache {
 		return self::$wanInstances[$id];
 	}
 
-	/**
-	 * Clear all the cached instances.
-	 */
-	static function clear() {
-		self::$instances = array();
-		self::$wanInstances = array();
-	}
-
 	/**
 	 * Create a new cache object of the specified type.
 	 *
-	 * @param string $id
+	 * @param string $id A key in $wgObjectCaches.
 	 * @return BagOStuff
 	 * @throws MWException
 	 */
-	static function newFromId( $id ) {
+	public static function newFromId( $id ) {
 		global $wgObjectCaches;
 
 		if ( !isset( $wgObjectCaches[$id] ) ) {
@@ -102,13 +125,17 @@ class ObjectCache {
 	}
 
 	/**
-	 * Create a new cache object from parameters
+	 * Create a new cache object from parameters.
 	 *
-	 * @param array $params
+	 * @param array $params Must have 'factory' or 'class' property.
+	 *  - factory: Callback passed $params that returns BagOStuff.
+	 *  - class: BagOStuff subclass constructed with $params.
+	 *  - loggroup: Alias to set 'logger' key with LoggerFactory group.
+	 *  - .. Other parameters passed to factory or class.
 	 * @return BagOStuff
 	 * @throws MWException
 	 */
-	static function newFromParams( $params ) {
+	public static function newFromParams( $params ) {
 		if ( isset( $params['loggroup'] ) ) {
 			$params['logger'] = LoggerFactory::getInstance( $params['loggroup'] );
 		} else {
@@ -129,7 +156,7 @@ class ObjectCache {
 	}
 
 	/**
-	 * Factory function referenced from DefaultSettings.php for CACHE_ANYTHING
+	 * Factory function for CACHE_ANYTHING (referenced from DefaultSettings.php)
 	 *
 	 * CACHE_ANYTHING means that stuff has to be cached, not caching is not an option.
 	 * If a caching method is configured for any of the main caches ($wgMainCacheType,
@@ -141,7 +168,7 @@ class ObjectCache {
 	 * @param array $params
 	 * @return BagOStuff
 	 */
-	static function newAnything( $params ) {
+	public static function newAnything( $params ) {
 		global $wgMainCacheType, $wgMessageCacheType, $wgParserCacheType;
 		$candidates = array( $wgMainCacheType, $wgMessageCacheType, $wgParserCacheType );
 		foreach ( $candidates as $candidate ) {
@@ -153,17 +180,20 @@ class ObjectCache {
 	}
 
 	/**
-	 * Factory function referenced from DefaultSettings.php for CACHE_ACCEL.
+	 * Factory function for CACHE_ACCEL (referenced from DefaultSettings.php)
 	 *
 	 * This will look for any APC style server-local cache.
 	 * A fallback cache can be specified if none is found.
 	 *
-	 * @param array $params
+	 * @param array $params [optional]
 	 * @param int|string $fallback Fallback cache, e.g. (CACHE_NONE, "hash") (since 1.24)
 	 * @return BagOStuff
 	 * @throws MWException
 	 */
-	static function newAccelerator( $params, $fallback = null ) {
+	public static function newAccelerator( $params = array(), $fallback = null ) {
+		if ( !is_array( $params ) && $fallback === null ) {
+			$fallback = $params;
+		}
 		if ( function_exists( 'apc_fetch' ) ) {
 			$id = 'apc';
 		} elseif ( function_exists( 'xcache_get' ) && wfIniGetBool( 'xcache.var_size' ) ) {
@@ -190,19 +220,19 @@ class ObjectCache {
 	 * @param array $params
 	 * @return MemcachedPhpBagOStuff
 	 */
-	static function newMemcached( $params ) {
+	public static function newMemcached( $params ) {
 		return new MemcachedPhpBagOStuff( $params );
 	}
 
 	/**
-	 * Create a new cache object of the specified type
+	 * Create a new cache object of the specified type.
 	 *
 	 * @since 1.26
-	 * @param string $id
+	 * @param string $id A key in $wgWANObjectCaches.
 	 * @return WANObjectCache
 	 * @throws MWException
 	 */
-	static function newWANCacheFromId( $id ) {
+	public static function newWANCacheFromId( $id ) {
 		global $wgWANObjectCaches;
 
 		if ( !isset( $wgWANObjectCaches[$id] ) ) {
@@ -220,18 +250,20 @@ class ObjectCache {
 	}
 
 	/**
-	 * Get the main WAN cache object
+	 * Get the main WAN cache object.
 	 *
 	 * @since 1.26
 	 * @return WANObjectCache
 	 */
-	static function getMainWANInstance() {
+	public static function getMainWANInstance() {
 		global $wgMainWANCache;
 
 		return self::getWANInstance( $wgMainWANCache );
 	}
 
 	/**
+	 * Get the cache object for the main stash.
+	 *
 	 * Stash objects are BagOStuff instances suitable for storing light
 	 * weight data that is not canonically stored elsewhere (such as RDBMS).
 	 * Stashes should be configured to propagate changes to all data-centers.
@@ -247,9 +279,17 @@ class ObjectCache {
 	 * @return BagOStuff
 	 * @since 1.26
 	 */
-	static function getMainStashInstance() {
+	public static function getMainStashInstance() {
 		global $wgMainStash;
 
 		return self::getInstance( $wgMainStash );
 	}
+
+	/**
+	 * Clear all the cached instances.
+	 */
+	public static function clear() {
+		self::$instances = array();
+		self::$wanInstances = array();
+	}
 }
diff --git a/includes/page/Article.php b/includes/page/Article.php
index 54db19ce0a..29a38baee5 100644
--- a/includes/page/Article.php
+++ b/includes/page/Article.php
@@ -1091,11 +1091,6 @@ class Article implements Page {
 		// to get the recentchanges row belonging to that entry
 		// (with rc_new = 1).
 
-		// Check for cached results
-		if ( $cache->get( wfMemcKey( 'NotPatrollablePage', $this->getTitle()->getArticleID() ) ) ) {
-			return false;
-		}
-
 		if ( $this->mRevision
 			&& !RecentChange::isInRCLifespan( $this->mRevision->getTimestamp(), 21600 )
 		) {
@@ -1104,6 +1099,12 @@ class Article implements Page {
 			return false;
 		}
 
+		// Check for cached results
+		$key = wfMemcKey( 'NotPatrollablePage', $this->getTitle()->getArticleID() );
+		if ( $cache->get( $key ) ) {
+			return false;
+		}
+
 		$dbr = wfGetDB( DB_SLAVE );
 		$oldestRevisionTimestamp = $dbr->selectField(
 			'revision',
@@ -1121,20 +1122,30 @@ class Article implements Page {
 					'rc_new' => 1,
 					'rc_timestamp' => $oldestRevisionTimestamp,
 					'rc_namespace' => $this->getTitle()->getNamespace(),
-					'rc_cur_id' => $this->getTitle()->getArticleID(),
-					'rc_patrolled' => 0
+					'rc_cur_id' => $this->getTitle()->getArticleID()
 				),
 				__METHOD__,
 				array( 'USE INDEX' => 'new_name_timestamp' )
 			);
+		} else {
+			// Cache the information we gathered above in case we can't patrol
+			// Don't cache in case we can patrol as this could change
+			$cache->set( $key, '1' );
 		}
 
 		if ( !$rc ) {
-			// No RC entry around
+			// Don't cache: This can be hit if the page gets accessed very fast after
+			// its creation or in case we have high slave lag. In case the revision is
+			// too old, we will already return above.
+			return false;
+		}
+
+		if ( $rc->getAttribute( 'rc_patrolled' ) ) {
+			// Patrolled RC entry around
 
 			// Cache the information we gathered above in case we can't patrol
 			// Don't cache in case we can patrol as this could change
-			$cache->set( wfMemcKey( 'NotPatrollablePage', $this->getTitle()->getArticleID() ), '1' );
+			$cache->set( $key, '1' );
 
 			return false;
 		}
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/page/WikiPage.php b/includes/page/WikiPage.php
index c173ac932a..69b675b462 100644
--- a/includes/page/WikiPage.php
+++ b/includes/page/WikiPage.php
@@ -1199,10 +1199,9 @@ class WikiPage implements Page, IDBAccessObject {
 	 * Best if all done inside a transaction.
 	 *
 	 * @param DatabaseBase $dbw
-	 * @return int The newly created page_id key, or false if the title already existed
+	 * @return int|bool The newly created page_id key; false if the title already existed
 	 */
 	public function insertOn( $dbw ) {
-
 		$page_id = $dbw->nextSequenceValue( 'page_page_id_seq' );
 		$dbw->insert( 'page', array(
 			'page_id'           => $page_id,
@@ -1223,9 +1222,11 @@ class WikiPage implements Page, IDBAccessObject {
 			$newid = $dbw->insertId();
 			$this->mId = $newid;
 			$this->mTitle->resetArticleID( $newid );
-		}
 
-		return $affected ? $newid : false;
+			return $newid;
+		} else {
+			return false;
+		}
 	}
 
 	/**
@@ -2180,9 +2181,6 @@ class WikiPage implements Page, IDBAccessObject {
 			$updates = $content->getSecondaryDataUpdates(
 				$this->getTitle(), null, $recursive, $editInfo->output );
 			foreach ( $updates as $update ) {
-				if ( $update instanceof LinksUpdate ) {
-					$update->setRevision( $revision );
-				}
 				DeferredUpdates::addUpdate( $update );
 			}
 		}
@@ -2856,7 +2854,7 @@ class WikiPage implements Page, IDBAccessObject {
 		// Clone the title, so we have the information we need when we log
 		$logTitle = clone $this->mTitle;
 
-		// Log the deletion, if the page was suppressed, log it at Oversight instead
+		// Log the deletion, if the page was suppressed, put it in the suppression log instead
 		$logtype = $suppress ? 'suppress' : 'delete';
 
 		$logEntry = new ManualLogEntry( $logtype, 'delete' );
@@ -3227,10 +3225,10 @@ class WikiPage implements Page, IDBAccessObject {
 
 		// Purge squid for this page only
 		$title->purgeSquid();
-
-		$revid = $revision ? $revision->getId() : null;
 		// Clear file cache for this page only
 		HTMLFileCache::clearFileCache( $title );
+
+		$revid = $revision ? $revision->getId() : null;
 		DeferredUpdates::addCallableUpdate( function() use ( $title, $revid ) {
 			InfoAction::invalidateCache( $title, $revid );
 		} );
diff --git a/includes/pager/TablePager.php b/includes/pager/TablePager.php
index 8095539806..ea619f1a72 100644
--- a/includes/pager/TablePager.php
+++ b/includes/pager/TablePager.php
@@ -233,6 +233,13 @@ abstract class TablePager extends IndexPager {
 		}
 	}
 
+	/**
+	 * @return stdClass
+	 */
+	protected function getCurrentRow() {
+		return $this->mCurrentRow;
+	}
+
 	/**
 	 * Get any extra attributes to be applied to the given cell. Don't
 	 * take this as an excuse to hardcode styles; use classes and
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 2eec08bf91..677da63bd7 100644
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -509,6 +509,9 @@ class Parser {
 			if ( $wgShowHostnames ) {
 				$limitReport .= 'Parsed by ' . wfHostname() . "\n";
 			}
+			$limitReport .= 'Cached time: ' . $this->mOutput->getCacheTime() . "\n";
+			$limitReport .= 'Cache expiry: ' . $this->mOutput->getCacheExpiry() . "\n";
+			$limitReport .= 'Dynamic content: ' . ( $this->mOutput->hasDynamicContent() ? 'true' : 'false' ) . "\n";
 			foreach ( $this->mOutput->getLimitReportData() as $key => $value ) {
 				if ( Hooks::run( 'ParserLimitReportFormat',
 					array( $key, &$value, &$limitReport, false, false )
@@ -1280,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 ) {
@@ -1332,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
@@ -1628,12 +1629,10 @@ class Parser {
 							$firstspace = $i;
 						}
 					} elseif ( $x2 === ' ' ) {
-						if ( $firstsingleletterword == -1 ) {
-							$firstsingleletterword = $i;
-							// if $firstsingleletterword is set, we don't
-							// look at the other options, so we can bail early.
-							break;
-						}
+						$firstsingleletterword = $i;
+						// if $firstsingleletterword is set, we don't
+						// look at the other options, so we can bail early.
+						break;
 					} else {
 						if ( $firstmultiletterword == -1 ) {
 							$firstmultiletterword = $i;
@@ -3325,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;
 		}
 
@@ -5326,6 +5326,7 @@ class Parser {
 		$ig->setParser( $this );
 		$ig->setHideBadImages();
 		$ig->setAttributes( Sanitizer::validateTagAttributes( $params, 'table' ) );
+		$this->getOutput()->addModuleStyles( 'mediawiki.page.gallery.styles' );
 
 		if ( isset( $params['showfilename'] ) ) {
 			$ig->setShowFilename( true );
diff --git a/includes/parser/ParserCache.php b/includes/parser/ParserCache.php
index 44b0bc9e16..47fcd30a64 100644
--- a/includes/parser/ParserCache.php
+++ b/includes/parser/ParserCache.php
@@ -26,7 +26,7 @@
  * @todo document
  */
 class ParserCache {
-	/** @var MWMemcached */
+	/** @var BagOStuff */
 	private $mMemc;
 	/**
 	 * Get an instance of this object
@@ -46,7 +46,7 @@ class ParserCache {
 	 * Setup a cache pathway with a given back-end storage mechanism.
 	 * May be a memcached client or a BagOStuff derivative.
 	 *
-	 * @param MWMemcached $memCached
+	 * @param BagOStuff $memCached
 	 * @throws MWException
 	 */
 	protected function __construct( $memCached ) {
diff --git a/includes/parser/ParserOptions.php b/includes/parser/ParserOptions.php
index 100656d1e2..1073aed817 100644
--- a/includes/parser/ParserOptions.php
+++ b/includes/parser/ParserOptions.php
@@ -34,145 +34,145 @@ class ParserOptions {
 	/**
 	 * Interlanguage links are removed and returned in an array
 	 */
-	public $mInterwikiMagic;
+	private $mInterwikiMagic;
 
 	/**
 	 * Allow external images inline?
 	 */
-	public $mAllowExternalImages;
+	private $mAllowExternalImages;
 
 	/**
 	 * If not, any exception?
 	 */
-	public $mAllowExternalImagesFrom;
+	private $mAllowExternalImagesFrom;
 
 	/**
 	 * If not or it doesn't match, should we check an on-wiki whitelist?
 	 */
-	public $mEnableImageWhitelist;
+	private $mEnableImageWhitelist;
 
 	/**
 	 * Date format index
 	 */
-	public $mDateFormat = null;
+	private $mDateFormat = null;
 
 	/**
 	 * Create "edit section" links?
 	 */
-	public $mEditSection = true;
+	private $mEditSection = true;
 
 	/**
 	 * Allow inclusion of special pages?
 	 */
-	public $mAllowSpecialInclusion;
+	private $mAllowSpecialInclusion;
 
 	/**
 	 * Use tidy to cleanup output HTML?
 	 */
-	public $mTidy = false;
+	private $mTidy = false;
 
 	/**
 	 * Which lang to call for PLURAL and GRAMMAR
 	 */
-	public $mInterfaceMessage = false;
+	private $mInterfaceMessage = false;
 
 	/**
 	 * Overrides $mInterfaceMessage with arbitrary language
 	 */
-	public $mTargetLanguage = null;
+	private $mTargetLanguage = null;
 
 	/**
 	 * Maximum size of template expansions, in bytes
 	 */
-	public $mMaxIncludeSize;
+	private $mMaxIncludeSize;
 
 	/**
 	 * Maximum number of nodes touched by PPFrame::expand()
 	 */
-	public $mMaxPPNodeCount;
+	private $mMaxPPNodeCount;
 
 	/**
 	 * Maximum number of nodes generated by Preprocessor::preprocessToObj()
 	 */
-	public $mMaxGeneratedPPNodeCount;
+	private $mMaxGeneratedPPNodeCount;
 
 	/**
 	 * Maximum recursion depth in PPFrame::expand()
 	 */
-	public $mMaxPPExpandDepth;
+	private $mMaxPPExpandDepth;
 
 	/**
 	 * Maximum recursion depth for templates within templates
 	 */
-	public $mMaxTemplateDepth;
+	private $mMaxTemplateDepth;
 
 	/**
 	 * Maximum number of calls per parse to expensive parser functions
 	 */
-	public $mExpensiveParserFunctionLimit;
+	private $mExpensiveParserFunctionLimit;
 
 	/**
 	 * Remove HTML comments. ONLY APPLIES TO PREPROCESS OPERATIONS
 	 */
-	public $mRemoveComments = true;
+	private $mRemoveComments = true;
 
 	/**
 	 * Callback for current revision fetching. Used as first argument to call_user_func().
 	 */
-	public $mCurrentRevisionCallback =
+	private $mCurrentRevisionCallback =
 		array( 'Parser', 'statelessFetchRevision' );
 
 	/**
 	 * Callback for template fetching. Used as first argument to call_user_func().
 	 */
-	public $mTemplateCallback =
+	private $mTemplateCallback =
 		array( 'Parser', 'statelessFetchTemplate' );
 
 	/**
 	 * Enable limit report in an HTML comment on output
 	 */
-	public $mEnableLimitReport = false;
+	private $mEnableLimitReport = false;
 
 	/**
 	 * Timestamp used for {{CURRENTDAY}} etc.
 	 */
-	public $mTimestamp;
+	private $mTimestamp;
 
 	/**
 	 * Target attribute for external links
 	 */
-	public $mExternalLinkTarget;
+	private $mExternalLinkTarget;
 
 	/**
 	 * Clean up signature texts?
 	 * @see Parser::cleanSig
 	 */
-	public $mCleanSignatures;
+	private $mCleanSignatures;
 
 	/**
 	 * Transform wiki markup when saving the page?
 	 */
-	public $mPreSaveTransform = true;
+	private $mPreSaveTransform = true;
 
 	/**
 	 * Whether content conversion should be disabled
 	 */
-	public $mDisableContentConversion;
+	private $mDisableContentConversion;
 
 	/**
 	 * Whether title conversion should be disabled
 	 */
-	public $mDisableTitleConversion;
+	private $mDisableTitleConversion;
 
 	/**
 	 * Automatically number headings?
 	 */
-	public $mNumberHeadings;
+	private $mNumberHeadings;
 
 	/**
 	 * Thumb size preferred by the user.
 	 */
-	public $mThumbSize;
+	private $mThumbSize;
 
 	/**
 	 * Maximum article size of an article to be marked as "stub"
@@ -182,38 +182,38 @@ class ParserOptions {
 	/**
 	 * Language object of the User language.
 	 */
-	public $mUserLang;
+	private $mUserLang;
 
 	/**
 	 * @var User
 	 * Stored user object
 	 */
-	public $mUser;
+	private $mUser;
 
 	/**
 	 * Parsing the page for a "preview" operation?
 	 */
-	public $mIsPreview = false;
+	private $mIsPreview = false;
 
 	/**
 	 * Parsing the page for a "preview" operation on a single section?
 	 */
-	public $mIsSectionPreview = false;
+	private $mIsSectionPreview = false;
 
 	/**
 	 * Parsing the printable version of the page?
 	 */
-	public $mIsPrintable = false;
+	private $mIsPrintable = false;
 
 	/**
 	 * Extra key that should be present in the caching key.
 	 */
-	public $mExtraKey = '';
+	private $mExtraKey = '';
 
 	/**
 	 * Function to be called when an option is accessed.
 	 */
-	protected $onAccessCallback = null;
+	private $onAccessCallback = null;
 
 	/**
 	 * If the page being parsed is a redirect, this should hold the redirect
@@ -372,16 +372,17 @@ class ParserOptions {
 	}
 
 	/**
-	 * Get the user language used by the parser for this page.
+	 * Get the user language used by the parser for this page and split the parser cache.
 	 *
-	 * You shouldn't use this. Really. $parser->getFunctionLang() is all you need.
+	 * @warning: Calling this causes the parser cache to be fragmented by user language!
+	 * To avoid cache fragmentation, output should not depend on the user language.
+	 * Use Parser::getFunctionLang() or Parser::getTargetLanguage() instead!
 	 *
-	 * To avoid side-effects where the page will be rendered based on the language
-	 * of the user who last saved, this function will triger a cache fragmentation.
-	 * Usage of this method is discouraged for that reason.
-	 *
-	 * When saving, this will return the default language instead of the user's.
+	 * @note This function will trigger a cache fragmentation by recording the
+	 * 'userlang' option, see optionUsed(). This is done to avoid cache pollution
+	 * when the page is rendered based on the language of the user.
 	 *
+	 * @note When saving, this will return the default language instead of the user's.
 	 * {{int: }} uses this which used to produce inconsistent link tables (bug 14404).
 	 *
 	 * @return Language
@@ -395,6 +396,12 @@ class ParserOptions {
 	/**
 	 * Same as getUserLangObj() but returns a string instead.
 	 *
+	 * @warning: Calling this causes the parser cache to be fragmented by user language!
+	 * To avoid cache fragmentation, output should not depend on the user language.
+	 * Use Parser::getFunctionLang() or Parser::getTargetLanguage() instead!
+	 *
+	 * @see getUserLangObj()
+	 *
 	 * @return string Language code
 	 * @since 1.17
 	 */
@@ -700,6 +707,10 @@ class ParserOptions {
 
 	/**
 	 * Called when an option is accessed.
+	 * Calls the watcher that was set using registerWatcher().
+	 * Typically, the watcher callback is ParserOutput::registerOption().
+	 * The information registered that way will be used by ParserCache::save().
+	 *
 	 * @param string $optionName Name of the option
 	 */
 	public function optionUsed( $optionName ) {
@@ -791,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/ParserOutput.php b/includes/parser/ParserOutput.php
index 15321c2186..2eb1dc9f95 100644
--- a/includes/parser/ParserOutput.php
+++ b/includes/parser/ParserOutput.php
@@ -686,6 +686,8 @@ class ParserOutput extends CacheTime {
 	/**
 	 * Tags a parser option for use in the cache key for this parser output.
 	 * Registered as a watcher at ParserOptions::registerWatcher() by Parser::clearState().
+	 * The information gathered here is available via getUsedOptions(),
+	 * and is used by ParserCache::save().
 	 *
 	 * @see ParserCache::getKey
 	 * @see ParserCache::save
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/password/EncryptedPassword.php b/includes/password/EncryptedPassword.php
index 39da32d1aa..6723793cc1 100644
--- a/includes/password/EncryptedPassword.php
+++ b/includes/password/EncryptedPassword.php
@@ -47,7 +47,7 @@ class EncryptedPassword extends ParameterizedPassword {
 					$secret, 0, base64_decode( $this->args[0] )
 				) );
 		} else {
-			$underlyingPassword = $this->factory->newFromType( $this->config['underlying'], $this->config );
+			$underlyingPassword = $this->factory->newFromType( $this->config['underlying'] );
 		}
 
 		$underlyingPassword->crypt( $password );
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/poolcounter/PoolWorkArticleView.php b/includes/poolcounter/PoolWorkArticleView.php
index a702d2e885..d601467d01 100644
--- a/includes/poolcounter/PoolWorkArticleView.php
+++ b/includes/poolcounter/PoolWorkArticleView.php
@@ -142,8 +142,12 @@ class PoolWorkArticleView extends PoolCounterWork {
 
 		// Timing hack
 		if ( $time > 3 ) {
-			wfDebugLog( 'slow-parse', sprintf( "%-5.2f %s", $time,
-				$this->page->getTitle()->getPrefixedDBkey() ) );
+			// TODO: Use Parser's logger (once it has one)
+			$logger = MediaWiki\Logger\LoggerFactory::getInstance( 'slow-parse' );
+			$logger->info( '{time} {title}', array(
+				'time' => number_format( $time, 2 ),
+				'title' => $this->page->getTitle()->getPrefixedDBkey(),
+			) );
 		}
 
 		if ( $this->cacheable && $this->parserOutput->isCacheable() && $isCurrent ) {
diff --git a/includes/registration/ExtensionProcessor.php b/includes/registration/ExtensionProcessor.php
index 68e5a17796..ca84a513ef 100644
--- a/includes/registration/ExtensionProcessor.php
+++ b/includes/registration/ExtensionProcessor.php
@@ -59,7 +59,6 @@ class ExtensionProcessor implements Processor {
 		'wgHooks' => 'array_merge_recursive',
 		// credits are handled in the ExtensionRegistry
 		//'wgExtensionCredits' => 'array_merge_recursive',
-		'wgExtraNamespaces' => 'array_plus',
 		'wgExtraGenderNamespaces' => 'array_plus',
 		'wgNamespacesWithSubpages' => 'array_plus',
 		'wgNamespaceContentModels' => 'array_plus',
@@ -213,7 +212,7 @@ class ExtensionProcessor implements Processor {
 			foreach ( $info['namespaces'] as $ns ) {
 				$id = $ns['id'];
 				$this->defines[$ns['constant']] = $id;
-				$this->globals['wgExtraNamespaces'][$id] = $ns['name'];
+				$this->attributes['ExtensionNamespaces'][$id] = $ns['name'];
 				if ( isset( $ns['gender'] ) ) {
 					$this->globals['wgExtraGenderNamespaces'][$id] = $ns['gender'];
 				}
@@ -306,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 7414925f48..787a4b0a53 100644
--- a/includes/registration/ExtensionRegistry.php
+++ b/includes/registration/ExtensionRegistry.php
@@ -81,7 +81,7 @@ class ExtensionRegistry {
 		// we don't want to fail here if $wgObjectCaches is not configured
 		// properly for APC setup
 		try {
-			$this->cache = ObjectCache::newAccelerator( array() );
+			$this->cache = ObjectCache::newAccelerator();
 		} catch ( MWException $e ) {
 			$this->cache = new EmptyBagOStuff();
 		}
@@ -222,17 +222,10 @@ 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];
+					$GLOBALS[$key] += $val;
 					break;
 				case 'array_merge':
 					$GLOBALS[$key] = array_merge( $val, $GLOBALS[$key] );
diff --git a/includes/resourceloader/ResourceLoader.php b/includes/resourceloader/ResourceLoader.php
index cecb6a2706..945985a9c2 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 */";
 				}
@@ -941,11 +940,11 @@ class ResourceLoader implements LoggerAwareInterface {
 	protected static function formatExceptionNoComment( $e ) {
 		global $wgShowExceptionDetails;
 
-		if ( $wgShowExceptionDetails ) {
-			return $e->__toString();
-		} else {
-			return wfMessage( 'internalerror' )->text();
+		if ( !$wgShowExceptionDetails ) {
+			return 'Internal error';
 		}
+
+		return $e->__toString();
 	}
 
 	/**
@@ -1012,7 +1011,7 @@ MESSAGE;
 							$out .= $scripts;
 						} elseif ( is_array( $scripts ) ) {
 							// ...except when $scripts is an array of URLs
-							$out .= self::makeLoaderImplementScript( $name, $scripts, array(), array() );
+							$out .= self::makeLoaderImplementScript( $name, $scripts, array(), array(), array() );
 						}
 						break;
 					case 'styles':
@@ -1486,9 +1485,7 @@ MESSAGE;
 		$query = self::createLoaderQuery( $context, $extraQuery );
 		$script = $this->getLoadScript( $source );
 
-		// Prevent the IE6 extension check from being triggered (bug 28840)
-		// by appending a character that's invalid in Windows extensions ('*')
-		return wfExpandUrl( wfAppendQuery( $script, $query ) . '&*', PROTO_RELATIVE );
+		return wfAppendQuery( $script, $query );
 	}
 
 	/**
@@ -1516,9 +1513,7 @@ MESSAGE;
 			$only, $printable, $handheld, $extraQuery
 		);
 
-		// Prevent the IE6 extension check from being triggered (bug 28840)
-		// by appending a character that's invalid in Windows extensions ('*')
-		return wfExpandUrl( wfAppendQuery( $wgLoadScript, $query ) . '&*', PROTO_RELATIVE );
+		return wfAppendQuery( $wgLoadScript, $query );
 	}
 
 	/**
@@ -1630,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 efb151e346..112ebc0052 100644
--- a/includes/resourceloader/ResourceLoaderFileModule.php
+++ b/includes/resourceloader/ResourceLoaderFileModule.php
@@ -152,6 +152,12 @@ class ResourceLoaderFileModule extends ResourceLoaderModule {
 	 */
 	protected $localFileRefs = array();
 
+	/**
+	 * @var array Place where readStyleFile() tracks file dependencies for non-existent files.
+	 * Used in tests to detect missing dependencies.
+	 */
+	protected $missingLocalFileRefs = array();
+
 	/* Methods */
 
 	/**
@@ -591,9 +597,14 @@ class ResourceLoaderFileModule extends ResourceLoaderModule {
 
 		$options = array();
 		foreach ( array(
-			// T104950: Do not include localBasePath! That path 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 incorporate 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',
@@ -601,14 +612,9 @@ class ResourceLoaderFileModule extends ResourceLoaderModule {
 			'languageScripts',
 			'skinScripts',
 			'skinStyles',
-			'dependencies',
 			'messages',
-			'targets',
 			'templates',
-			'group',
-			'position',
 			'skipFunction',
-			'remoteBasePath',
 			'debugRaw',
 			'raw',
 		) as $member ) {
@@ -917,10 +923,14 @@ class ResourceLoaderFileModule extends ResourceLoaderModule {
 		$localDir = dirname( $localPath );
 		$remoteDir = dirname( $remotePath );
 		// Get and register local file references
-		$this->localFileRefs = array_merge(
-			$this->localFileRefs,
-			CSSMin::getLocalFileReferences( $style, $localDir )
-		);
+		$localFileRefs = CSSMin::getAllLocalFileReferences( $style, $localDir );
+		foreach ( $localFileRefs as $file ) {
+			if ( file_exists( $file ) ) {
+				$this->localFileRefs[] = $file;
+			} else {
+				$this->missingLocalFileRefs[] = $file;
+			}
+		}
 		return CSSMin::remap(
 			$style, $localDir, $remoteDir, true
 		);
diff --git a/includes/resourceloader/ResourceLoaderForeignApiModule.php b/includes/resourceloader/ResourceLoaderForeignApiModule.php
new file mode 100644
index 0000000000..7ed08317eb
--- /dev/null
+++ b/includes/resourceloader/ResourceLoaderForeignApiModule.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * ResourceLoader module for mediawiki.ForeignApi that has dynamically
+ * generated dependencies, via a hook usable by extensions.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ */
+
+/**
+ * ResourceLoader module for mediawiki.ForeignApi and its generated data
+ */
+class ResourceLoaderForeignApiModule extends ResourceLoaderFileModule {
+	public function getDependencies( ResourceLoaderContext $context = null ) {
+		$dependencies = $this->dependencies;
+		Hooks::run( 'ResourceLoaderForeignApiModules', array( &$dependencies, $context ) );
+		return $dependencies;
+	}
+}
diff --git a/includes/revisiondelete/RevDelList.php b/includes/revisiondelete/RevDelList.php
index 837557cb53..7aac3b8925 100644
--- a/includes/revisiondelete/RevDelList.php
+++ b/includes/revisiondelete/RevDelList.php
@@ -251,7 +251,7 @@ abstract class RevDelList extends RevisionListBase {
 		if ( !$field ) {
 			throw new MWException( "Bad log URL param type!" );
 		}
-		// Put things hidden from sysops in the oversight log
+		// Put things hidden from sysops in the suppression log
 		if ( ( $params['newBits'] | $params['oldBits'] ) & $this->getSuppressBit() ) {
 			$logType = 'suppress';
 		} else {
diff --git a/includes/search/SearchResultSet.php b/includes/search/SearchResultSet.php
index 0a05eef159..8d18b0e6ed 100644
--- a/includes/search/SearchResultSet.php
+++ b/includes/search/SearchResultSet.php
@@ -60,6 +60,33 @@ class SearchResultSet {
 		return null;
 	}
 
+	/**
+	 * Some search modes will run an alternative query that it thinks gives
+	 * a better result than the provided search. Returns true if this has
+	 * occured.
+	 *
+	 * @return bool
+	 */
+	function hasRewrittenQuery() {
+		return false;
+	}
+
+	/**
+	 * @return string|null The search the query was internally rewritten to,
+	 *  or null when the result of the original query was returned.
+	 */
+	function getQueryAfterRewrite() {
+		return null;
+	}
+
+	/**
+	 * @return string|null Same as self::getQueryAfterRewrite(), but in HTML
+	 *  and with changes highlighted. Null when the query was not rewritten.
+	 */
+	function getQueryAfterRewriteSnippet() {
+		return null;
+	}
+
 	/**
 	 * Some search modes return a suggested alternate term if there are
 	 * no exact hits. Returns true if there is one on this set.
diff --git a/includes/skins/Skin.php b/includes/skins/Skin.php
index 53af3e7da9..4e6201cd73 100644
--- a/includes/skins/Skin.php
+++ b/includes/skins/Skin.php
@@ -200,16 +200,15 @@ abstract class Skin extends ContextSource {
 		);
 
 		// Add various resources if required
-		if ( $wgUseAjax ) {
-			if ( $wgEnableAPI ) {
-				if ( $wgEnableWriteAPI && $wgAjaxWatch && $user->isLoggedIn()
-					&& $user->isAllowed( 'writeapi' )
-				) {
-					$modules['watch'][] = 'mediawiki.page.watch.ajax';
-				}
-
-				$modules['search'][] = 'mediawiki.searchSuggest';
+		if ( $wgUseAjax && $wgEnableAPI ) {
+			if ( $wgEnableWriteAPI && $wgAjaxWatch && $user->isLoggedIn()
+				&& $user->isAllowedAll( 'writeapi', 'viewmywatchlist', 'editmywatchlist' )
+				&& $this->getRelevantTitle()->canExist()
+			) {
+				$modules['watch'][] = 'mediawiki.page.watch.ajax';
 			}
+
+			$modules['search'][] = 'mediawiki.searchSuggest';
 		}
 
 		if ( $user->getBoolOption( 'editsectiononrightclick' ) ) {
@@ -238,8 +237,8 @@ abstract class Skin extends ContextSource {
 			$titles[] = $user->getTalkPage();
 		}
 
-		// Other tab link
-		if ( $title->isSpecialPage() ) {
+		// Check, if the page can hold some kind of content, otherwise do nothing
+		if ( !$title->canExist() ) {
 			// nothing
 		} elseif ( $title->isTalkPage() ) {
 			$titles[] = $title->getSubjectPage();
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/specialpage/ChangesListSpecialPage.php b/includes/specialpage/ChangesListSpecialPage.php
index 0938316488..23bd394ccb 100644
--- a/includes/specialpage/ChangesListSpecialPage.php
+++ b/includes/specialpage/ChangesListSpecialPage.php
@@ -144,7 +144,6 @@ abstract class ChangesListSpecialPage extends SpecialPage {
 		$opts->add( 'hideliu', false );
 		$opts->add( 'hidepatrolled', false );
 		$opts->add( 'hidemyself', false );
-		$opts->add( 'hidecategorization', false );
 
 		$opts->add( 'namespace', '', FormOptions::INTNULL );
 		$opts->add( 'invert', false );
@@ -250,9 +249,6 @@ abstract class ChangesListSpecialPage extends SpecialPage {
 				$conds[] = 'rc_user_text != ' . $dbr->addQuotes( $user->getName() );
 			}
 		}
-		if ( $opts['hidecategorization'] === true ) {
-			$conds[] = 'rc_type != ' . $dbr->addQuotes( RC_CATEGORIZE );
-		}
 
 		// Namespace filtering
 		if ( $opts['namespace'] !== '' ) {
diff --git a/includes/specials/SpecialAncientpages.php b/includes/specials/SpecialAncientpages.php
index b0830327be..2da24a8ed6 100644
--- a/includes/specials/SpecialAncientpages.php
+++ b/includes/specials/SpecialAncientpages.php
@@ -32,7 +32,7 @@ class AncientPagesPage extends QueryPage {
 		parent::__construct( $name );
 	}
 
-	function isExpensive() {
+	public function isExpensive() {
 		return true;
 	}
 
@@ -40,7 +40,7 @@ class AncientPagesPage extends QueryPage {
 		return false;
 	}
 
-	function getQueryInfo() {
+	public function getQueryInfo() {
 		return array(
 			'tables' => array( 'page', 'revision' ),
 			'fields' => array(
@@ -56,7 +56,7 @@ class AncientPagesPage extends QueryPage {
 		);
 	}
 
-	function usesTimestamps() {
+	public function usesTimestamps() {
 		return true;
 	}
 
diff --git a/includes/specials/SpecialBlock.php b/includes/specials/SpecialBlock.php
index e0f35c65dd..cd6cc76e8e 100644
--- a/includes/specials/SpecialBlock.php
+++ b/includes/specials/SpecialBlock.php
@@ -662,8 +662,8 @@ class SpecialBlock extends FormSpecialPage {
 		if ( $data['HideUser'] ) {
 			if ( !$performer->isAllowed( 'hideuser' ) ) {
 				# this codepath is unreachable except by a malicious user spoofing forms,
-				# or by race conditions (user has oversight and sysop, loads block form,
-				# and is de-oversighted before submission); so need to fail completely
+				# or by race conditions (user has hideuser and block rights, loads block form,
+				# and loses hideuser rights before submission); so need to fail completely
 				# rather than just silently disable hiding
 				return array( 'badaccess-group0' );
 			}
@@ -787,7 +787,7 @@ class SpecialBlock extends FormSpecialPage {
 		$logParams['5::duration'] = $data['Expiry'];
 		$logParams['6::flags'] = self::blockLogFlags( $data, $type );
 
-		# Make log entry, if the name is hidden, put it in the oversight log
+		# Make log entry, if the name is hidden, put it in the suppression log
 		$log_type = $data['HideUser'] ? 'suppress' : 'block';
 		$logEntry = new ManualLogEntry( $log_type, $logaction );
 		$logEntry->setTarget( Title::makeTitle( NS_USER, $target ) );
diff --git a/includes/specials/SpecialBrokenRedirects.php b/includes/specials/SpecialBrokenRedirects.php
index 1bbdbeab93..701f75f047 100644
--- a/includes/specials/SpecialBrokenRedirects.php
+++ b/includes/specials/SpecialBrokenRedirects.php
@@ -32,7 +32,7 @@ class BrokenRedirectsPage extends QueryPage {
 		parent::__construct( $name );
 	}
 
-	function isExpensive() {
+	public function isExpensive() {
 		return true;
 	}
 
@@ -48,7 +48,7 @@ class BrokenRedirectsPage extends QueryPage {
 		return $this->msg( 'brokenredirectstext' )->parseAsBlock();
 	}
 
-	function getQueryInfo() {
+	public function getQueryInfo() {
 		$dbr = wfGetDB( DB_SLAVE );
 
 		return array(
diff --git a/includes/specials/SpecialComparePages.php b/includes/specials/SpecialComparePages.php
index da1a54cd04..0f8b7291b1 100644
--- a/includes/specials/SpecialComparePages.php
+++ b/includes/specials/SpecialComparePages.php
@@ -50,10 +50,12 @@ class SpecialComparePages extends SpecialPage {
 		$this->setHeaders();
 		$this->outputHeader();
 
+		# Form (.mw-searchInput enables suggestions)
 		$form = new HTMLForm( array(
 			'Page1' => array(
 				'type' => 'text',
 				'name' => 'page1',
+				'cssclass' => 'mw-searchInput',
 				'label-message' => 'compare-page1',
 				'size' => '40',
 				'section' => 'page1',
@@ -70,6 +72,7 @@ class SpecialComparePages extends SpecialPage {
 			'Page2' => array(
 				'type' => 'text',
 				'name' => 'page2',
+				'cssclass' => 'mw-searchInput',
 				'label-message' => 'compare-page2',
 				'size' => '40',
 				'section' => 'page2',
diff --git a/includes/specials/SpecialConfirmemail.php b/includes/specials/SpecialConfirmemail.php
index 63561552a4..147f67e8d2 100644
--- a/includes/specials/SpecialConfirmemail.php
+++ b/includes/specials/SpecialConfirmemail.php
@@ -43,6 +43,10 @@ class EmailConfirmation extends UnlistedSpecialPage {
 	 * @throws UserNotLoggedIn
 	 */
 	function execute( $code ) {
+		// Ignore things like master queries/connections on GET requests.
+		// It's very convenient to just allow formless link usage.
+		Profiler::instance()->getTransactionProfiler()->resetExpectations();
+
 		$this->setHeaders();
 
 		$this->checkReadOnly();
@@ -151,6 +155,10 @@ class EmailInvalidation extends UnlistedSpecialPage {
 	}
 
 	function execute( $code ) {
+		// Ignore things like master queries/connections on GET requests.
+		// It's very convenient to just allow formless link usage.
+		Profiler::instance()->getTransactionProfiler()->resetExpectations();
+
 		$this->setHeaders();
 		$this->checkReadOnly();
 		$this->checkPermissions();
diff --git a/includes/specials/SpecialDoubleRedirects.php b/includes/specials/SpecialDoubleRedirects.php
index 47b426dce7..6d40985bbd 100644
--- a/includes/specials/SpecialDoubleRedirects.php
+++ b/includes/specials/SpecialDoubleRedirects.php
@@ -32,7 +32,7 @@ class DoubleRedirectsPage extends QueryPage {
 		parent::__construct( $name );
 	}
 
-	function isExpensive() {
+	public function isExpensive() {
 		return true;
 	}
 
@@ -99,7 +99,7 @@ class DoubleRedirectsPage extends QueryPage {
 		return $retval;
 	}
 
-	function getQueryInfo() {
+	public function getQueryInfo() {
 		return $this->reallyGetQueryInfo();
 	}
 
diff --git a/includes/specials/SpecialEditTags.php b/includes/specials/SpecialEditTags.php
index f41a1f1ded..d2b2e70846 100644
--- a/includes/specials/SpecialEditTags.php
+++ b/includes/specials/SpecialEditTags.php
@@ -123,7 +123,7 @@ class SpecialEditTags extends UnlistedSpecialPage {
 
 		// Either submit or create our form
 		if ( $this->isAllowed && $this->submitClicked ) {
-			$this->submit( $request );
+			$this->submit();
 		} else {
 			$this->showForm();
 		}
@@ -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/SpecialEditWatchlist.php b/includes/specials/SpecialEditWatchlist.php
index 3d688138af..74662aec8e 100644
--- a/includes/specials/SpecialEditWatchlist.php
+++ b/includes/specials/SpecialEditWatchlist.php
@@ -299,7 +299,9 @@ class SpecialEditWatchlist extends UnlistedSpecialPage {
 	 */
 	private function getWatchlist() {
 		$list = array();
-		$dbr = wfGetDB( DB_MASTER );
+
+		$index = $this->getRequest()->wasPosted() ? DB_MASTER : DB_SLAVE;
+		$dbr = wfGetDB( $index );
 
 		$res = $dbr->select(
 			'watchlist',
@@ -312,6 +314,7 @@ class SpecialEditWatchlist extends UnlistedSpecialPage {
 		);
 
 		if ( $res->numRows() > 0 ) {
+			/** @var Title[] $titles */
 			$titles = array();
 			foreach ( $res as $row ) {
 				$title = Title::makeTitleSafe( $row->wl_namespace, $row->wl_title );
diff --git a/includes/specials/SpecialExport.php b/includes/specials/SpecialExport.php
index 69b795d9e4..39c4d77111 100644
--- a/includes/specials/SpecialExport.php
+++ b/includes/specials/SpecialExport.php
@@ -30,7 +30,6 @@
  */
 class SpecialExport extends SpecialPage {
 	private $curonly, $doExport, $pageLinkDepth, $templates;
-	private $images;
 
 	public function __construct() {
 		parent::__construct( 'Export' );
@@ -46,7 +45,6 @@ class SpecialExport extends SpecialPage {
 		$this->doExport = false;
 		$request = $this->getRequest();
 		$this->templates = $request->getCheck( 'templates' );
-		$this->images = $request->getCheck( 'images' ); // Doesn't do anything yet
 		$this->pageLinkDepth = $this->validateLinkDepth(
 			$request->getIntOrNull( 'pagelink-depth' )
 		);
@@ -279,13 +277,6 @@ class SpecialExport extends SpecialPage {
 		}
 
 		$formDescriptor += array(
-			/* Enable this when we can do something useful exporting/importing image information.
-			'images' => array(
-				'type' => 'check',
-				'name' => 'images',
-				'id' => 'wpExportImages',
-				'default' => false,
-			),*/
 			'wpDownload' => array(
 				'type' => 'check',
 				'name' =>'wpDownload',
@@ -359,11 +350,6 @@ class SpecialExport extends SpecialPage {
 				$pageSet = $this->getPageLinks( $inputPages, $pageSet, $linkDepth );
 			}
 
-			// Enable this when we can do something useful exporting/importing image information.
-			// if( $this->images ) ) {
-			// $pageSet = $this->getImages( $inputPages, $pageSet );
-			// }
-
 			$pages = array_keys( $pageSet );
 
 			// Normalize titles to the same format and remove dupes, see bug 17374
@@ -549,24 +535,6 @@ class SpecialExport extends SpecialPage {
 		return $pageSet;
 	}
 
-	/**
-	 * Expand a list of pages to include images used in those pages.
-	 *
-	 * @param array $inputPages List of titles to look up
-	 * @param array $pageSet Associative array indexed by titles for output
-	 *
-	 * @return array Associative array index by titles
-	 */
-	private function getImages( $inputPages, $pageSet ) {
-		return $this->getLinks(
-			$inputPages,
-			$pageSet,
-			'imagelinks',
-			array( 'namespace' => NS_FILE, 'title' => 'il_to' ),
-			array( 'page_id=il_from' )
-		);
-	}
-
 	/**
 	 * Expand a list of pages to include items used in those pages.
 	 * @param array $inputPages Array of page titles
diff --git a/includes/specials/SpecialFewestrevisions.php b/includes/specials/SpecialFewestrevisions.php
index dc9d57c2ee..406233b475 100644
--- a/includes/specials/SpecialFewestrevisions.php
+++ b/includes/specials/SpecialFewestrevisions.php
@@ -32,7 +32,7 @@ class FewestrevisionsPage extends QueryPage {
 		parent::__construct( $name );
 	}
 
-	function isExpensive() {
+	public function isExpensive() {
 		return true;
 	}
 
@@ -40,7 +40,7 @@ class FewestrevisionsPage extends QueryPage {
 		return false;
 	}
 
-	function getQueryInfo() {
+	public function getQueryInfo() {
 		return array(
 			'tables' => array( 'revision', 'page' ),
 			'fields' => array(
diff --git a/includes/specials/SpecialFileDuplicateSearch.php b/includes/specials/SpecialFileDuplicateSearch.php
index da79bb8153..4c0c75fbe2 100644
--- a/includes/specials/SpecialFileDuplicateSearch.php
+++ b/includes/specials/SpecialFileDuplicateSearch.php
@@ -48,7 +48,7 @@ class FileDuplicateSearchPage extends QueryPage {
 		return false;
 	}
 
-	function isCached() {
+	public function isCached() {
 		return false;
 	}
 
@@ -82,7 +82,7 @@ class FileDuplicateSearchPage extends QueryPage {
 		$this->getOutput()->addHtml( implode( "\n", $html ) );
 	}
 
-	function getQueryInfo() {
+	public function getQueryInfo() {
 		return array(
 			'tables' => array( 'image' ),
 			'fields' => array(
@@ -95,7 +95,7 @@ class FileDuplicateSearchPage extends QueryPage {
 		);
 	}
 
-	function execute( $par ) {
+	public function execute( $par ) {
 		$this->setHeaders();
 		$this->outputHeader();
 
diff --git a/includes/specials/SpecialLinkSearch.php b/includes/specials/SpecialLinkSearch.php
index 67683f2b5f..f474867445 100644
--- a/includes/specials/SpecialLinkSearch.php
+++ b/includes/specials/SpecialLinkSearch.php
@@ -80,7 +80,7 @@ class LinkSearchPage extends QueryPage {
 		return false;
 	}
 
-	function execute( $par ) {
+	public function execute( $par ) {
 		$this->initServices();
 
 		$this->setHeaders();
@@ -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 ) {
@@ -218,7 +218,7 @@ class LinkSearchPage extends QueryPage {
 		return $params;
 	}
 
-	function getQueryInfo() {
+	public function getQueryInfo() {
 		$dbr = wfGetDB( DB_SLAVE );
 		// strip everything past first wildcard, so that
 		// index-based-only lookup would be done
diff --git a/includes/specials/SpecialListDuplicatedFiles.php b/includes/specials/SpecialListDuplicatedFiles.php
index 1e3dff6f34..317b62fe6f 100644
--- a/includes/specials/SpecialListDuplicatedFiles.php
+++ b/includes/specials/SpecialListDuplicatedFiles.php
@@ -34,7 +34,7 @@ class ListDuplicatedFilesPage extends QueryPage {
 		parent::__construct( $name );
 	}
 
-	function isExpensive() {
+	public function isExpensive() {
 		return true;
 	}
 
@@ -53,7 +53,7 @@ class ListDuplicatedFilesPage extends QueryPage {
 	 * with however we are doing cached special pages.
 	 * @return array
 	 */
-	function getQueryInfo() {
+	public function getQueryInfo() {
 		return array(
 			'tables' => array( 'image' ),
 			'fields' => array(
diff --git a/includes/specials/SpecialListredirects.php b/includes/specials/SpecialListredirects.php
index 2df4834729..fa94b4ab68 100644
--- a/includes/specials/SpecialListredirects.php
+++ b/includes/specials/SpecialListredirects.php
@@ -33,7 +33,7 @@ class ListredirectsPage extends QueryPage {
 		parent::__construct( $name );
 	}
 
-	function isExpensive() {
+	public function isExpensive() {
 		return true;
 	}
 
@@ -45,7 +45,7 @@ class ListredirectsPage extends QueryPage {
 		return false;
 	}
 
-	function getQueryInfo() {
+	public function getQueryInfo() {
 		return array(
 			'tables' => array( 'p1' => 'page', 'redirect', 'p2' => 'page' ),
 			'fields' => array( 'namespace' => 'p1.page_namespace',
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/SpecialMIMEsearch.php b/includes/specials/SpecialMIMEsearch.php
index 64d4982a20..32344a84a8 100644
--- a/includes/specials/SpecialMIMEsearch.php
+++ b/includes/specials/SpecialMIMEsearch.php
@@ -34,7 +34,7 @@ class MIMEsearchPage extends QueryPage {
 		parent::__construct( $name );
 	}
 
-	function isExpensive() {
+	public function isExpensive() {
 		return true;
 	}
 
@@ -123,7 +123,7 @@ class MIMEsearchPage extends QueryPage {
 					Xml::closeElement( 'form' );
 	}
 
-	function execute( $par ) {
+	public function execute( $par ) {
 		$this->mime = $par ? $par : $this->getRequest()->getText( 'mime' );
 		$this->mime = trim( $this->mime );
 		list( $this->major, $this->minor ) = File::splitMime( $this->mime );
diff --git a/includes/specials/SpecialMediaStatistics.php b/includes/specials/SpecialMediaStatistics.php
index 7a7979c4ae..e5ba8c60b5 100644
--- a/includes/specials/SpecialMediaStatistics.php
+++ b/includes/specials/SpecialMediaStatistics.php
@@ -36,7 +36,7 @@ class MediaStatisticsPage extends QueryPage {
 		$this->shownavigation = false;
 	}
 
-	function isExpensive() {
+	public function isExpensive() {
 		return true;
 	}
 
diff --git a/includes/specials/SpecialMostcategories.php b/includes/specials/SpecialMostcategories.php
index c70bbdbad0..18083f614a 100644
--- a/includes/specials/SpecialMostcategories.php
+++ b/includes/specials/SpecialMostcategories.php
@@ -34,7 +34,7 @@ class MostcategoriesPage extends QueryPage {
 		parent::__construct( $name );
 	}
 
-	function isExpensive() {
+	public function isExpensive() {
 		return true;
 	}
 
@@ -42,7 +42,7 @@ class MostcategoriesPage extends QueryPage {
 		return false;
 	}
 
-	function getQueryInfo() {
+	public function getQueryInfo() {
 		return array(
 			'tables' => array( 'categorylinks', 'page' ),
 			'fields' => array(
diff --git a/includes/specials/SpecialMostinterwikis.php b/includes/specials/SpecialMostinterwikis.php
index ab3d9c91f0..b07b8331dc 100644
--- a/includes/specials/SpecialMostinterwikis.php
+++ b/includes/specials/SpecialMostinterwikis.php
@@ -34,7 +34,7 @@ class MostinterwikisPage extends QueryPage {
 		parent::__construct( $name );
 	}
 
-	function isExpensive() {
+	public function isExpensive() {
 		return true;
 	}
 
@@ -42,7 +42,7 @@ class MostinterwikisPage extends QueryPage {
 		return false;
 	}
 
-	function getQueryInfo() {
+	public function getQueryInfo() {
 		return array(
 			'tables' => array(
 				'langlinks',
diff --git a/includes/specials/SpecialMostlinked.php b/includes/specials/SpecialMostlinked.php
index ae0b07087e..019df4937a 100644
--- a/includes/specials/SpecialMostlinked.php
+++ b/includes/specials/SpecialMostlinked.php
@@ -35,7 +35,7 @@ class MostlinkedPage extends QueryPage {
 		parent::__construct( $name );
 	}
 
-	function isExpensive() {
+	public function isExpensive() {
 		return true;
 	}
 
@@ -43,7 +43,7 @@ class MostlinkedPage extends QueryPage {
 		return false;
 	}
 
-	function getQueryInfo() {
+	public function getQueryInfo() {
 		return array(
 			'tables' => array( 'pagelinks', 'page' ),
 			'fields' => array(
diff --git a/includes/specials/SpecialMostlinkedcategories.php b/includes/specials/SpecialMostlinkedcategories.php
index cc718e06ab..6eeab91bc3 100644
--- a/includes/specials/SpecialMostlinkedcategories.php
+++ b/includes/specials/SpecialMostlinkedcategories.php
@@ -38,7 +38,7 @@ class MostlinkedCategoriesPage extends QueryPage {
 		return false;
 	}
 
-	function getQueryInfo() {
+	public function getQueryInfo() {
 		return array(
 			'tables' => array( 'category' ),
 			'fields' => array( 'title' => 'cat_title',
diff --git a/includes/specials/SpecialMovepage.php b/includes/specials/SpecialMovepage.php
index e77479f32a..8091f1b0dc 100644
--- a/includes/specials/SpecialMovepage.php
+++ b/includes/specials/SpecialMovepage.php
@@ -104,7 +104,9 @@ class MovePageForm extends UnlistedSpecialPage {
 		$permErrors = $this->oldTitle->getUserPermissionsErrors( 'move', $user );
 		if ( count( $permErrors ) ) {
 			// Auto-block user's IP if the account was "hard" blocked
-			$user->spreadAnyEditBlock();
+			DeferredUpdates::addCallableUpdate( function() use ( $user ) {
+				$user->spreadAnyEditBlock();
+			} );
 			throw new PermissionsError( 'move', $permErrors );
 		}
 
@@ -145,6 +147,7 @@ class MovePageForm extends UnlistedSpecialPage {
 		$out = $this->getOutput();
 		$out->setPageTitle( $this->msg( 'move-page', $this->oldTitle->getPrefixedText() ) );
 		$out->addModules( 'mediawiki.special.movePage' );
+		$out->addModuleStyles( 'mediawiki.special.movePage.styles' );
 		$this->addHelpLink( 'Help:Moving a page' );
 
 		$newTitle = $this->newTitle;
@@ -288,7 +291,6 @@ class MovePageForm extends UnlistedSpecialPage {
 		// is enforced in the mediawiki.special.movePage module
 
 		$immovableNamespaces = array();
-
 		foreach ( array_keys( $this->getLanguage()->getNamespaces() ) as $nsId ) {
 			if ( !MWNamespace::isMovable( $nsId ) ) {
 				$immovableNamespaces[] = $nsId;
@@ -297,202 +299,207 @@ class MovePageForm extends UnlistedSpecialPage {
 
 		$handler = ContentHandler::getForTitle( $this->oldTitle );
 
-		$out->addHTML(
-			Xml::openElement(
-				'form',
-				array(
-					'method' => 'post',
-					'action' => $this->getPageTitle()->getLocalURL( 'action=submit' ),
-					'id' => 'movepage'
-				)
-			) .
-			Xml::openElement( 'fieldset' ) .
-			Xml::element( 'legend', null, $this->msg( 'move-page-legend' )->text() ) .
-			Xml::openElement( 'table', array( 'id' => 'mw-movepage-table' ) )
+		$out->enableOOUI();
+		$fields = array();
+
+		$fields[] = new OOUI\FieldLayout(
+			new OOUI\LabelWidget( array(
+				'label' => new OOUI\HtmlSnippet( "<strong>$oldTitleLink</strong>" )
+			) ),
+			array(
+				'label' => $this->msg( 'movearticle' )->text(),
+				'align' => 'top',
+			)
 		);
 
-		$out->addHTML(
-			"<tr>
-				<td class='mw-label'>" .
-					$this->msg( 'movearticle' )->escaped() .
-				"</td>
-				<td class='mw-input'>
-					<strong>{$oldTitleLink}</strong>
-				</td>
-			</tr>
-			<tr>
-				<td class='mw-label'>" .
-					Xml::label( $this->msg( 'newtitle' )->text(), 'wpNewTitleMain' ) .
-				"</td>
-				<td class='mw-input'>" .
-					Html::namespaceSelector(
-						array(
-							'selected' => $newTitle->getNamespace(),
-							'exclude' => $immovableNamespaces
-						),
-						array( 'name' => 'wpNewTitleNs', 'id' => 'wpNewTitleNs' )
-					) .
-					Xml::input(
-						'wpNewTitleMain',
-						60,
-						$wgContLang->recodeForEdit( $newTitle->getText() ),
-						array(
-							'type' => 'text',
-							'id' => 'wpNewTitleMain',
-							'maxlength' => 255
-						)
-					) .
-					Html::hidden( 'wpOldTitle', $this->oldTitle->getPrefixedText() ) .
-				"</td>
-			</tr>
-			<tr>
-				<td class='mw-label'>" .
-					Xml::label( $this->msg( 'movereason' )->text(), 'wpReason' ) .
-				"</td>
-				<td class='mw-input'>" .
-					Xml::input( 'wpReason', 60, $this->reason, array(
-						'type' => 'text',
-						'id' => 'wpReason',
-						'maxlength' => 200,
-					) ) .
-				"</td>
-			</tr>"
+		$fields[] = new OOUI\FieldLayout(
+			new MediaWiki\Widget\ComplexTitleInputWidget( array(
+				'id' => 'wpNewTitle',
+				'namespace' => array(
+					'id' => 'wpNewTitleNs',
+					'name' => 'wpNewTitleNs',
+					'value' => $newTitle->getNamespace(),
+					'exclude' => $immovableNamespaces,
+				),
+				'title' => array(
+					'id' => 'wpNewTitleMain',
+					'name' => 'wpNewTitleMain',
+					'value' => $wgContLang->recodeForEdit( $newTitle->getText() ),
+					// Inappropriate, since we're expecting the user to input a non-existent page's title
+					'suggestions' => false,
+				),
+				'infusable' => true,
+			) ),
+			array(
+				'label' => $this->msg( 'newtitle' )->text(),
+				'align' => 'top',
+			)
+		);
+
+		$fields[] = new OOUI\FieldLayout(
+			new OOUI\TextInputWidget( array(
+				'name' => 'wpReason',
+				'id' => 'wpReason',
+				'maxLength' => 200,
+				'infusable' => true,
+			) ),
+			array(
+				'label' => $this->msg( 'movereason' )->text(),
+				'align' => 'top',
+			)
 		);
 
 		if ( $considerTalk ) {
-			$out->addHTML( "
-				<tr>
-					<td></td>
-					<td class='mw-input'>" .
-						Xml::checkLabel(
-							$this->msg( 'movetalk' )->text(),
-							'wpMovetalk',
-							'wpMovetalk',
-							$this->moveTalk
-						) .
-					"</td>
-				</tr>"
+			$fields[] = new OOUI\FieldLayout(
+				new OOUI\CheckboxInputWidget( array(
+					'name' => 'wpMovetalk',
+					'id' => 'wpMovetalk',
+					'value' => '1',
+					'selected' => $this->moveTalk,
+				) ),
+				array(
+					'label' => $this->msg( 'movetalk' )->text(),
+					'align' => 'inline',
+				)
 			);
 		}
 
 		if ( $user->isAllowed( 'suppressredirect' ) ) {
 			if ( $handler->supportsRedirects() ) {
 				$isChecked = $this->leaveRedirect;
-				$options = array();
+				$isDisabled = false;
 			} else {
 				$isChecked = false;
-				$options = array(
-					'disabled' => 'disabled'
-				);
+				$isDisabled = true;
 			}
-			$out->addHTML( "
-				<tr>
-					<td></td>
-					<td class='mw-input'>" .
-						Xml::checkLabel(
-							$this->msg( 'move-leave-redirect' )->text(),
-							'wpLeaveRedirect',
-							'wpLeaveRedirect',
-							$isChecked,
-							$options
-						) .
-					"</td>
-				</tr>"
+			$fields[] = new OOUI\FieldLayout(
+				new OOUI\CheckboxInputWidget( array(
+					'name' => 'wpLeaveRedirect',
+					'id' => 'wpLeaveRedirect',
+					'value' => '1',
+					'selected' => $isChecked,
+					'disabled' => $isDisabled,
+				) ),
+				array(
+					'label' => $this->msg( 'move-leave-redirect' )->text(),
+					'align' => 'inline',
+				)
 			);
 		}
 
 		if ( $hasRedirects ) {
-			$out->addHTML( "
-				<tr>
-					<td></td>
-					<td class='mw-input'>" .
-						Xml::checkLabel(
-							$this->msg( 'fix-double-redirects' )->text(),
-							'wpFixRedirects',
-							'wpFixRedirects',
-							$this->fixRedirects
-						) .
-					"</td>
-				</tr>"
+			$fields[] = new OOUI\FieldLayout(
+				new OOUI\CheckboxInputWidget( array(
+					'name' => 'wpFixRedirects',
+					'id' => 'wpFixRedirects',
+					'value' => '1',
+					'selected' => $this->fixRedirects,
+				) ),
+				array(
+					'label' => $this->msg( 'fix-double-redirects' )->text(),
+					'align' => 'inline',
+				)
 			);
 		}
 
 		if ( $canMoveSubpage ) {
 			$maximumMovedPages = $this->getConfig()->get( 'MaximumMovedPages' );
-			$out->addHTML( "
-				<tr>
-					<td></td>
-					<td class='mw-input'>" .
-						Xml::check(
-							'wpMovesubpages',
-							# Don't check the box if we only have talk subpages to
-							# move and we aren't moving the talk page.
-							$this->moveSubpages && ( $this->oldTitle->hasSubpages() || $this->moveTalk ),
-							array( 'id' => 'wpMovesubpages' )
-						) . '&#160;' .
-						Xml::tags(
-							'label',
-							array( 'for' => 'wpMovesubpages' ),
-							$this->msg(
-								( $this->oldTitle->hasSubpages()
-									? 'move-subpages'
-									: 'move-talk-subpages' )
-							)->numParams( $maximumMovedPages )->params( $maximumMovedPages )->parse()
-						) .
-					"</td>
-				</tr>"
+			$fields[] = new OOUI\FieldLayout(
+				new OOUI\CheckboxInputWidget( array(
+					'name' => 'wpMovesubpages',
+					'id' => 'wpMovesubpages',
+					'value' => '1',
+					# Don't check the box if we only have talk subpages to
+					# move and we aren't moving the talk page.
+					'selected' => $this->moveSubpages && ( $this->oldTitle->hasSubpages() || $this->moveTalk ),
+				) ),
+				array(
+					'label' => new OOUI\HtmlSnippet(
+						$this->msg(
+							( $this->oldTitle->hasSubpages()
+								? 'move-subpages'
+								: 'move-talk-subpages' )
+						)->numParams( $maximumMovedPages )->params( $maximumMovedPages )->parse()
+					),
+					'align' => 'inline',
+				)
 			);
 		}
 
-		$watchChecked = $user->isLoggedIn() && ( $this->watch || $user->getBoolOption( 'watchmoves' )
-			|| $user->isWatched( $this->oldTitle ) );
 		# Don't allow watching if user is not logged in
 		if ( $user->isLoggedIn() ) {
-			$out->addHTML( "
-				<tr>
-					<td></td>
-					<td class='mw-input'>" .
-						Xml::checkLabel(
-							$this->msg( 'move-watch' )->text(),
-							'wpWatch',
-							'watch',
-							$watchChecked
-						) .
-					"</td>
-				</tr>"
+			$watchChecked = $user->isLoggedIn() && ( $this->watch || $user->getBoolOption( 'watchmoves' )
+				|| $user->isWatched( $this->oldTitle ) );
+			$fields[] = new OOUI\FieldLayout(
+				new OOUI\CheckboxInputWidget( array(
+					'name' => 'wpWatch',
+					'id' => 'watch', # ew
+					'value' => '1',
+					'selected' => $watchChecked,
+				) ),
+				array(
+					'label' => $this->msg( 'move-watch' )->text(),
+					'align' => 'inline',
+				)
 			);
 		}
 
 		if ( $confirm ) {
-			$out->addHTML( "
-				<tr>
-					<td></td>
-					<td class='mw-input'>" .
-						Xml::checkLabel(
-							$this->msg( 'delete_and_move_confirm' )->text(),
-							'wpConfirm',
-							'wpConfirm'
-						) .
-					"</td>
-				</tr>"
+			$watchChecked = $user->isLoggedIn() && ( $this->watch || $user->getBoolOption( 'watchmoves' )
+				|| $user->isWatched( $this->oldTitle ) );
+			$fields[] = new OOUI\FieldLayout(
+				new OOUI\CheckboxInputWidget( array(
+					'name' => 'wpConfirm',
+					'id' => 'wpConfirm',
+					'value' => '1',
+				) ),
+				array(
+					'label' => $this->msg( 'delete_and_move_confirm' )->text(),
+					'align' => 'inline',
+				)
 			);
 		}
 
-		$out->addHTML( "
-			<tr>
-				<td></td>
-				<td class='mw-submit'>" .
-					Xml::submitButton( $movepagebtn, array( 'name' => $submitVar ) ) .
-				"</td>
-			</tr>"
+		$fields[] = new OOUI\FieldLayout(
+			new OOUI\ButtonInputWidget( array(
+				'name' => $submitVar,
+				'value' => $movepagebtn,
+				'label' => $movepagebtn,
+				'flags' => array( 'progressive', 'primary' ),
+				'type' => 'submit',
+			) ),
+			array(
+				'align' => 'top',
+			)
+		);
+
+		$fieldset = new OOUI\FieldsetLayout( array(
+			'label' => $this->msg( 'move-page-legend' )->text(),
+			'id' => 'mw-movepage-table',
+			'items' => $fields,
+		) );
+
+		$form = new OOUI\FormLayout( array(
+			'method' => 'post',
+			'action' => $this->getPageTitle()->getLocalURL( 'action=submit' ),
+			'id' => 'movepage',
+		) );
+		$form->appendContent(
+			$fieldset,
+			new OOUI\HtmlSnippet(
+				Html::hidden( 'wpOldTitle', $this->oldTitle->getPrefixedText() ) .
+				Html::hidden( 'wpEditToken', $user->getEditToken() )
+			)
 		);
 
 		$out->addHTML(
-			Xml::closeElement( 'table' ) .
-			Html::hidden( 'wpEditToken', $user->getEditToken() ) .
-			Xml::closeElement( 'fieldset' ) .
-			Xml::closeElement( 'form' ) .
-			"\n"
+			new OOUI\PanelLayout( array(
+				'classes' => array( 'movepage-wrapper' ),
+				'expanded' => false,
+				'padded' => true,
+				'framed' => true,
+				'content' => $form,
+			) )
 		);
 
 		$this->showLogFragment( $this->oldTitle );
diff --git a/includes/specials/SpecialPagesWithProp.php b/includes/specials/SpecialPagesWithProp.php
index 670a3973b9..f211ec9b4f 100644
--- a/includes/specials/SpecialPagesWithProp.php
+++ b/includes/specials/SpecialPagesWithProp.php
@@ -40,7 +40,7 @@ class SpecialPagesWithProp extends QueryPage {
 		return false;
 	}
 
-	function execute( $par ) {
+	public function execute( $par ) {
 		$this->setHeaders();
 		$this->outputHeader();
 		$this->getOutput()->addModuleStyles( 'mediawiki.special.pagesWithProp' );
@@ -100,7 +100,7 @@ class SpecialPagesWithProp extends QueryPage {
 		return false;
 	}
 
-	function getQueryInfo() {
+	public function getQueryInfo() {
 		return array(
 			'tables' => array( 'page_props', 'page' ),
 			'fields' => array(
@@ -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/SpecialRecentchanges.php b/includes/specials/SpecialRecentchanges.php
index 4b2d2d4e35..96d512c4a5 100644
--- a/includes/specials/SpecialRecentchanges.php
+++ b/includes/specials/SpecialRecentchanges.php
@@ -83,7 +83,6 @@ class SpecialRecentChanges extends ChangesListSpecialPage {
 		$opts->add( 'hideliu', false );
 		$opts->add( 'hidepatrolled', $user->getBoolOption( 'hidepatrolled' ) );
 		$opts->add( 'hidemyself', false );
-		$opts->add( 'hidecategorization', $user->getBoolOption( 'hidecategorization' ) );
 
 		$opts->add( 'categories', '' );
 		$opts->add( 'categories_any', false );
@@ -139,9 +138,6 @@ class SpecialRecentChanges extends ChangesListSpecialPage {
 			if ( 'hidemyself' === $bit ) {
 				$opts['hidemyself'] = true;
 			}
-			if ( 'hidecategorization' === $bit ) {
-				$opts['hidecategorization'] = true;
-			}
 
 			if ( is_numeric( $bit ) ) {
 				$opts['limit'] = $bit;
@@ -727,8 +723,7 @@ class SpecialRecentChanges extends ChangesListSpecialPage {
 			'hideanons' => 'rcshowhideanons',
 			'hideliu' => 'rcshowhideliu',
 			'hidepatrolled' => 'rcshowhidepatr',
-			'hidemyself' => 'rcshowhidemine',
-			'hidecategorization' => 'rcshowhidecategorization'
+			'hidemyself' => 'rcshowhidemine'
 		);
 
 		$showhide = array( 'show', 'hide' );
@@ -746,8 +741,7 @@ class SpecialRecentChanges extends ChangesListSpecialPage {
 			// The following messages are used here:
 			// rcshowhideminor-show, rcshowhideminor-hide, rcshowhidebots-show, rcshowhidebots-hide,
 			// rcshowhideanons-show, rcshowhideanons-hide, rcshowhideliu-show, rcshowhideliu-hide,
-			// rcshowhidepatr-show, rcshowhidepatr-hide, rcshowhidemine-show, rcshowhidemine-hide,
-			// rcshowhidecategorization-show, rcshowhidecategorization-hide.
+			// rcshowhidepatr-show, rcshowhidepatr-hide, rcshowhidemine-show, rcshowhidemine-hide.
 			$linkMessage = $this->msg( $msg . '-' . $showhide[1 - $options[$key]] );
 			// Extensions can define additional filters, but don't need to define the corresponding
 			// messages. If they don't exist, just fall back to 'show' and 'hide'.
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/SpecialSearch.php b/includes/specials/SpecialSearch.php
index af2dc94b32..6606c7f883 100644
--- a/includes/specials/SpecialSearch.php
+++ b/includes/specials/SpecialSearch.php
@@ -216,6 +216,7 @@ class SpecialSearch extends SpecialPage {
 		global $wgContLang;
 
 		$search = $this->getSearchEngine();
+		$search->setFeatureData( 'rewrite', $this->runSuggestion );
 		$search->setLimitOffset( $this->limit, $this->offset );
 		$search->setNamespaces( $this->namespaces );
 		$search->prefix = $this->mPrefix;
@@ -272,12 +273,8 @@ class SpecialSearch extends SpecialPage {
 		// did you mean... suggestions
 		$didYouMeanHtml = '';
 		if ( $showSuggestion && $textMatches && !$textStatus ) {
-			if ( $this->shouldRunSuggestedQuery( $textMatches ) ) {
-				$newMatches = $search->searchText( $textMatches->getSuggestionQuery() );
-				if ( $newMatches instanceof SearchResultSet && $newMatches->numRows() > 0 ) {
-					$didYouMeanHtml = $this->getDidYouMeanRewrittenHtml( $term, $textMatches );
-					$textMatches = $newMatches;
-				}
+			if ( $textMatches->hasRewrittenQuery() ) {
+				$didYouMeanHtml = $this->getDidYouMeanRewrittenHtml( $term, $textMatches );
 			} elseif ( $textMatches->hasSuggestion() ) {
 				$didYouMeanHtml = $this->getDidYouMeanHtml( $textMatches );
 			}
@@ -463,7 +460,7 @@ class SpecialSearch extends SpecialPage {
 		// Showing results for '$rewritten'
 		// Search instead for '$orig'
 
-		$params = array( 'search' => $textMatches->getSuggestionQuery() );
+		$params = array( 'search' => $textMatches->getQueryAfterRewrite() );
 		if ( $this->fulltext != null ) {
 			$params['fulltext'] = $this->fulltext;
 		}
@@ -471,7 +468,7 @@ class SpecialSearch extends SpecialPage {
 
 		$rewritten = Linker::linkKnown(
 			$this->getPageTitle(),
-			$textMatches->getSuggestionSnippet() ?: null,
+			$textMatches->getQueryAfterRewriteSnippet() ?: null,
 			array(),
 			$stParams
 		);
diff --git a/includes/specials/SpecialShortpages.php b/includes/specials/SpecialShortpages.php
index 7ec69e06f0..ba11862e5e 100644
--- a/includes/specials/SpecialShortpages.php
+++ b/includes/specials/SpecialShortpages.php
@@ -37,7 +37,7 @@ class ShortPagesPage extends QueryPage {
 		return false;
 	}
 
-	function getQueryInfo() {
+	public function getQueryInfo() {
 		return array(
 			'tables' => array( 'page' ),
 			'fields' => array(
diff --git a/includes/specials/SpecialUnusedcategories.php b/includes/specials/SpecialUnusedcategories.php
index 713823bb62..0d3216cd81 100644
--- a/includes/specials/SpecialUnusedcategories.php
+++ b/includes/specials/SpecialUnusedcategories.php
@@ -29,7 +29,7 @@ class UnusedCategoriesPage extends QueryPage {
 		parent::__construct( $name );
 	}
 
-	function isExpensive() {
+	public function isExpensive() {
 		return true;
 	}
 
@@ -37,7 +37,7 @@ class UnusedCategoriesPage extends QueryPage {
 		return $this->msg( 'unusedcategoriestext' )->parseAsBlock();
 	}
 
-	function getQueryInfo() {
+	public function getQueryInfo() {
 		return array(
 			'tables' => array( 'page', 'categorylinks' ),
 			'fields' => array(
diff --git a/includes/specials/SpecialUnusedtemplates.php b/includes/specials/SpecialUnusedtemplates.php
index 0c2b870708..33444f637a 100644
--- a/includes/specials/SpecialUnusedtemplates.php
+++ b/includes/specials/SpecialUnusedtemplates.php
@@ -34,7 +34,7 @@ class UnusedtemplatesPage extends QueryPage {
 		parent::__construct( $name );
 	}
 
-	function isExpensive() {
+	public function isExpensive() {
 		return true;
 	}
 
@@ -46,7 +46,7 @@ class UnusedtemplatesPage extends QueryPage {
 		return false;
 	}
 
-	function getQueryInfo() {
+	public function getQueryInfo() {
 		return array(
 			'tables' => array( 'page', 'templatelinks' ),
 			'fields' => array(
diff --git a/includes/specials/SpecialUnwatchedpages.php b/includes/specials/SpecialUnwatchedpages.php
index bb07c19759..b3ca006c71 100644
--- a/includes/specials/SpecialUnwatchedpages.php
+++ b/includes/specials/SpecialUnwatchedpages.php
@@ -35,7 +35,7 @@ class UnwatchedpagesPage extends QueryPage {
 		parent::__construct( $name, 'unwatchedpages' );
 	}
 
-	function isExpensive() {
+	public function isExpensive() {
 		return true;
 	}
 
@@ -43,7 +43,7 @@ class UnwatchedpagesPage extends QueryPage {
 		return false;
 	}
 
-	function getQueryInfo() {
+	public function getQueryInfo() {
 		return array(
 			'tables' => array( 'page', 'watchlist' ),
 			'fields' => array(
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/specials/SpecialVersion.php b/includes/specials/SpecialVersion.php
index f6fa5ea36f..38baf5b953 100644
--- a/includes/specials/SpecialVersion.php
+++ b/includes/specials/SpecialVersion.php
@@ -92,7 +92,14 @@ class SpecialVersion extends SpecialPage {
 					if ( $file ) {
 						$wikiText = file_get_contents( $file );
 						if ( substr( $file, -4 ) === '.txt' ) {
-							$wikiText = Html::element( 'pre', array(), $wikiText );
+							$wikiText = Html::element(
+								'pre',
+								array(
+									'lang' => 'en',
+									'dir' => 'ltr',
+								),
+								$wikiText
+							);
 						}
 					}
 				}
@@ -109,7 +116,14 @@ class SpecialVersion extends SpecialPage {
 					$file = $this->getExtLicenseFileName( dirname( $extNode['path'] ) );
 					if ( $file ) {
 						$wikiText = file_get_contents( $file );
-						$wikiText = "<pre>$wikiText</pre>";
+						$wikiText = Html::element(
+							'pre',
+							array(
+								'lang' => 'en',
+								'dir' => 'ltr',
+							),
+							$wikiText
+						);
 					}
 				}
 
@@ -1124,7 +1138,10 @@ class SpecialVersion extends SpecialPage {
 		if ( is_array( $list ) && count( $list ) == 1 ) {
 			$list = $list[0];
 		}
-		if ( is_object( $list ) ) {
+		if ( $list instanceof Closure ) {
+			// Don't output stuff like "Closure$;1028376090#8$48499d94fe0147f7c633b365be39952b$"
+			return 'Closure';
+		} elseif ( is_object( $list ) ) {
 			$class = wfMessage( 'parentheses' )->params( get_class( $list ) )->escaped();
 
 			return $class;
diff --git a/includes/specials/SpecialWatchlist.php b/includes/specials/SpecialWatchlist.php
index 088a3fe276..20f577603b 100644
--- a/includes/specials/SpecialWatchlist.php
+++ b/includes/specials/SpecialWatchlist.php
@@ -110,7 +110,6 @@ class SpecialWatchlist extends ChangesListSpecialPage {
 		$opts->add( 'hideliu', $user->getBoolOption( 'watchlisthideliu' ) );
 		$opts->add( 'hidepatrolled', $user->getBoolOption( 'watchlisthidepatrolled' ) );
 		$opts->add( 'hidemyself', $user->getBoolOption( 'watchlisthideown' ) );
-		$opts->add( 'hidecategorization', $user->getBoolOption( 'watchlisthidecategorization' ) );
 
 		$opts->add( 'extended', $user->getBoolOption( 'extendwatchlist' ) );
 
@@ -424,8 +423,7 @@ class SpecialWatchlist extends ChangesListSpecialPage {
 			'hideanons' => 'rcshowhideanons',
 			'hideliu' => 'rcshowhideliu',
 			'hidemyself' => 'rcshowhidemine',
-			'hidepatrolled' => 'rcshowhidepatr',
-			'hidecategorization' => 'rcshowhidecategorization',
+			'hidepatrolled' => 'rcshowhidepatr'
 		);
 		foreach ( $this->getCustomFilters() as $key => $params ) {
 			$filters[$key] = $params['msg'];
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/IP.php b/includes/utils/IP.php
index ae3736aeec..666660aa30 100644
--- a/includes/utils/IP.php
+++ b/includes/utils/IP.php
@@ -21,6 +21,8 @@
  * @author Antoine Musso "<hashar at free dot fr>", Aaron Schulz
  */
 
+use IPSet\IPSet;
+
 // Some regex definition to "play" with IP address and IP address blocks
 
 // An IPv4 address is made of 4 bytes from x00 to xFF which is d0 to d255
diff --git a/includes/utils/MWCryptHKDF.php b/includes/utils/MWCryptHKDF.php
index 950dd846f1..740df92241 100644
--- a/includes/utils/MWCryptHKDF.php
+++ b/includes/utils/MWCryptHKDF.php
@@ -161,7 +161,7 @@ class MWCryptHKDF {
 	 * @throws MWException
 	 */
 	protected static function singleton() {
-		global $wgHKDFAlgorithm, $wgHKDFSecret, $wgSecretKey;
+		global $wgHKDFAlgorithm, $wgHKDFSecret, $wgSecretKey, $wgMainCacheType;
 
 		$secret = $wgHKDFSecret ?: $wgSecretKey;
 		if ( !$secret ) {
@@ -176,11 +176,7 @@ class MWCryptHKDF {
 		$context[] = gethostname();
 
 		// Setup salt cache. Use APC, or fallback to the main cache if it isn't setup
-		try {
-			$cache = ObjectCache::newAccelerator( array() );
-		} catch ( Exception $e ) {
-			$cache = wfGetMainCache();
-		}
+		$cache = ObjectCache::newAccelerator( $wgMainCacheType );
 
 		if ( is_null( self::$singleton ) ) {
 			self::$singleton = new self( $secret, $wgHKDFAlgorithm, $cache, $context );
diff --git a/includes/utils/UIDGenerator.php b/includes/utils/UIDGenerator.php
index 2d7d932331..04c8e1945c 100644
--- a/includes/utils/UIDGenerator.php
+++ b/includes/utils/UIDGenerator.php
@@ -283,7 +283,7 @@ class UIDGenerator {
 		$cache = null;
 		if ( ( $flags & self::QUICK_VOLATILE ) && PHP_SAPI !== 'cli' ) {
 			try {
-				$cache = ObjectCache::newAccelerator( array() );
+				$cache = ObjectCache::newAccelerator();
 			} catch ( Exception $e ) {
 				// not supported
 			}
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/includes/widget/ComplexNamespaceInputWidget.php b/includes/widget/ComplexNamespaceInputWidget.php
new file mode 100644
index 0000000000..21c57099fb
--- /dev/null
+++ b/includes/widget/ComplexNamespaceInputWidget.php
@@ -0,0 +1,110 @@
+<?php
+/**
+ * MediaWiki Widgets – ComplexNamespaceInputWidget class.
+ *
+ * @copyright 2011-2015 MediaWiki Widgets Team and others; see AUTHORS.txt
+ * @license The MIT License (MIT); see LICENSE.txt
+ */
+namespace MediaWiki\Widget;
+
+/**
+ * Namespace input widget. Displays a dropdown box with the choice of available namespaces, plus two
+ * checkboxes to include associated namespace or to invert selection.
+ */
+class ComplexNamespaceInputWidget extends \OOUI\Widget {
+
+	protected $config;
+	protected $namespace;
+	protected $associated = null;
+	protected $associatedLabel = null;
+	protected $invert = null;
+	protected $invertLabel = null;
+
+	/**
+	 * @param array $config Configuration options
+	 * @param array $config['namespace'] Configuration for the NamespaceInputWidget dropdown with list
+	 *     of namespaces
+	 * @param string $config['namespace']['includeAllValue'] If specified, add a "all namespaces"
+	 *     option to the dropdown, and use this as the input value for it
+	 * @param array|null $config['invert'] Configuration for the "invert selection" CheckboxInputWidget. If
+	 *     null, the checkbox will not be generated.
+	 * @param array|null $config['associated'] Configuration for the "include associated namespace"
+	 *     CheckboxInputWidget. If null, the checkbox will not be generated.
+	 * @param array $config['invertLabel'] Configuration for the FieldLayout with label wrapping the
+	 *     "invert selection" checkbox
+	 * @param string $config['invertLabel']['label'] Label text for the label
+	 * @param array $config['associatedLabel'] Configuration for the FieldLayout with label wrapping
+	 *     the "include associated namespace" checkbox
+	 * @param string $config['associatedLabel']['label'] Label text for the label
+	 */
+	public function __construct( array $config = array() ) {
+		// Configuration initialization
+		$config = array_merge(
+			array(
+				// Config options for nested widgets
+				'namespace' => array(),
+				'invert' => array(),
+				'invertLabel' => array(),
+				'associated' => array(),
+				'associatedLabel' => array(),
+			),
+			$config
+		);
+
+		// Parent constructor
+		parent::__construct( $config );
+
+		// Properties
+		$this->config = $config;
+
+		$this->namespace = new NamespaceInputWidget( $config['namespace'] );
+		if ( $config['associated'] !== null ) {
+			$this->associated = new \OOUI\CheckboxInputWidget( array_merge(
+				array( 'value' => '1' ),
+				$config['associated']
+			) );
+			// TODO Should use a LabelWidget? But they don't work like HTML <label>s yet
+			$this->associatedLabel = new \OOUI\FieldLayout(
+				$this->associated,
+				array_merge(
+					array( 'align' => 'inline' ),
+					$config['associatedLabel']
+				)
+			);
+		}
+		if ( $config['invert'] !== null ) {
+			$this->invert = new \OOUI\CheckboxInputWidget( array_merge(
+				array( 'value' => '1' ),
+				$config['invert']
+			) );
+			// TODO Should use a LabelWidget? But they don't work like HTML <label>s yet
+			$this->invertLabel = new \OOUI\FieldLayout(
+				$this->invert,
+				array_merge(
+					array( 'align' => 'inline' ),
+					$config['invertLabel']
+				)
+			);
+		}
+
+		// Initialization
+		$this
+			->addClasses( array( 'mw-widget-complexNamespaceInputWidget' ) )
+			->appendContent( $this->namespace, $this->associatedLabel, $this->invertLabel );
+	}
+
+	protected function getJavaScriptClassName() {
+		return 'mw.widgets.ComplexNamespaceInputWidget';
+	}
+
+	public function getConfig( &$config ) {
+		$config = array_merge(
+			$config,
+			array_intersect_key(
+				$this->config,
+				array_fill_keys( array( 'namespace', 'invert', 'invertLabel', 'associated', 'associatedLabel' ), true )
+			)
+		);
+		return parent::getConfig( $config );
+	}
+}
diff --git a/includes/widget/ComplexTitleInputWidget.php b/includes/widget/ComplexTitleInputWidget.php
new file mode 100644
index 0000000000..73ef54c848
--- /dev/null
+++ b/includes/widget/ComplexTitleInputWidget.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * MediaWiki Widgets – ComplexTitleInputWidget class.
+ *
+ * @copyright 2011-2015 MediaWiki Widgets Team and others; see AUTHORS.txt
+ * @license The MIT License (MIT); see LICENSE.txt
+ */
+namespace MediaWiki\Widget;
+
+/**
+ * Complex title input widget.
+ */
+class ComplexTitleInputWidget extends \OOUI\Widget {
+
+	protected $namespace = null;
+	protected $title = null;
+
+	/**
+	 * Like TitleInputWidget, but the namespace has to be input through a separate dropdown field.
+	 *
+	 * @param array $config Configuration options
+	 * @param array $config['namespace'] Configuration for the NamespaceInputWidget dropdown with list
+	 *     of namespaces
+	 * @param array $config['title'] Configuration for the TitleInputWidget text field
+	 */
+	public function __construct( array $config = array() ) {
+		// Configuration initialization
+		$config = array_merge(
+			array(
+				'namespace' => array(),
+				'title' => array(),
+			),
+			$config
+		);
+
+		// Parent constructor
+		parent::__construct( $config );
+
+		// Properties
+		$this->config = $config;
+		$this->namespace = new NamespaceInputWidget( $config['namespace'] );
+		$this->title = new TitleInputWidget( array_merge(
+			$config['title'],
+			array(
+				// The inner TitleInputWidget shouldn't be infusable, only the ComplexTitleInputWidget itself can be.
+				'infusable' => false,
+				'relative' => true,
+				'namespace' => isset( $config['namespace']['value'] ) ? $config['namespace']['value'] : null,
+			)
+		) );
+
+		// Initialization
+		$this
+			->addClasses( array( 'mw-widget-complexTitleInputWidget' ) )
+			->appendContent( $this->namespace, $this->title );
+	}
+
+	protected function getJavaScriptClassName() {
+		return 'mw.widgets.ComplexTitleInputWidget';
+	}
+
+	public function getConfig( &$config ) {
+		$config['namespace'] = $this->config['namespace'];
+		$config['title'] = $this->config['title'];
+		return parent::getConfig( $config );
+	}
+}
diff --git a/includes/widget/NamespaceInputWidget.php b/includes/widget/NamespaceInputWidget.php
index f10ea709e9..696c8adf15 100644
--- a/includes/widget/NamespaceInputWidget.php
+++ b/includes/widget/NamespaceInputWidget.php
@@ -8,98 +8,38 @@
 namespace MediaWiki\Widget;
 
 /**
- * Namespace input widget. Displays a dropdown box with the choice of available namespaces, plus two
- * checkboxes to include associated namespace or to invert selection.
+ * Namespace input widget. Displays a dropdown box with the choice of available namespaces.
  */
-class NamespaceInputWidget extends \OOUI\Widget {
+class NamespaceInputWidget extends \OOUI\DropdownInputWidget {
 
-	protected $namespace = null;
-	protected $associated = null;
-	protected $invert = null;
-	protected $allValue = null;
+	protected $includeAllValue = null;
 
 	/**
 	 * @param array $config Configuration options
-	 * @param string $config['nameNamespace'] HTML input name for the namespace dropdown box (default:
-	 *     'namespace')
-	 * @param string $config['nameInvert'] HTML input name for the "invert selection" checkbox. If
-	 *     null, the checkbox will not be generated. (default: 'invert')
-	 * @param string $config['nameAssociated'] HTML input name for the "include associated namespace"
-	 *     checkbox. If null, the checkbox will not be generated. (default: 'associated')
 	 * @param string $config['includeAllValue'] If specified, add a "all namespaces" option to the
 	 *     namespace dropdown, and use this as the input value for it
-	 * @param int|string $config['valueNamespace'] Input value of the namespace dropdown box. May be a
-	 *     string only if 'includeAllValue' is set.
-	 * @param boolean $config['valueInvert'] Input value of the "invert selection" checkbox (default:
-	 *     false)
-	 * @param boolean $config['valueAssociated'] Input value of the "include associated namespace"
-	 *     checkbox (default: false)
-	 * @param string $config['labelInvert'] Text of label to use for "invert selection" checkbox
-	 * @param string $config['labelAssociated'] Text of label to use for "include associated
-	 *     namespace" checkbox
+	 * @param number[] $config['exclude'] List of namespace numbers to exclude from the selector
 	 */
 	public function __construct( array $config = array() ) {
 		// Configuration initialization
-		$config = array_merge(
-			array(
-				'nameNamespace' => 'namespace',
-				'nameInvert' => 'invert',
-				'nameAssociated' => 'associated',
-				// Choose first available: either main namespace or the "all namespaces" option
-				'valueNamespace' => null,
-				'valueInvert' => false,
-				'valueAssociated' => false,
-			),
-			$config
-		);
+		$config['options'] = $this->getNamespaceDropdownOptions( $config );
 
 		// Parent constructor
 		parent::__construct( $config );
 
 		// Properties
-		$this->allValue = isset( $config['includeAllValue'] ) ? $config['includeAllValue'] : null;
-		$this->namespace = new \OOUI\DropdownInputWidget( array(
-			'name' => $config['nameNamespace'],
-			'value' => $config['valueNamespace'],
-			'options' => $this->getNamespaceDropdownOptions( $config ),
-		) );
-		if ( $config['nameAssociated'] !== null ) {
-			// FIXME Should use a LabelWidget? But they don't work like HTML <label>s yet
-			$this->associated = new \OOUI\FieldLayout(
-				new \OOUI\CheckboxInputWidget( array(
-					'name' => $config['nameAssociated'],
-					'selected' => $config['valueAssociated'],
-					'value' => '1',
-				) ),
-				array(
-					'align' => 'inline',
-					'label' => $config['labelAssociated'],
-				)
-			);
-		}
-		if ( $config['nameInvert'] !== null ) {
-			$this->invert = new \OOUI\FieldLayout(
-				new \OOUI\CheckboxInputWidget( array(
-					'name' => $config['nameInvert'],
-					'selected' => $config['valueInvert'],
-					'value' => '1',
-				) ),
-				array(
-					'align' => 'inline',
-					'label' => $config['labelInvert'],
-				)
-			);
-		}
+		$this->includeAllValue = isset( $config['includeAllValue'] ) ? $config['includeAllValue'] : null;
+		$this->exclude = isset( $config['exclude'] ) ? $config['exclude'] : array();
 
 		// Initialization
-		$this
-			->addClasses( array( 'mw-widget-namespaceInputWidget' ) )
-			->appendContent( $this->namespace, $this->associated, $this->invert );
+		$this->addClasses( array( 'mw-widget-namespaceInputWidget' ) );
 	}
 
 	protected function getNamespaceDropdownOptions( array $config ) {
-		$namespaceOptionsParams = isset( $config['includeAllValue'] ) ?
-			array( 'all' => $config['includeAllValue'] ) : array();
+		$namespaceOptionsParams = array(
+			'all' => isset( $config['includeAllValue'] ) ? $config['includeAllValue'] : null,
+			'exclude' => isset( $config['exclude'] ) ? $config['exclude'] : null
+		);
 		$namespaceOptions = \Html::namespaceSelectorOptions( $namespaceOptionsParams );
 
 		$options = array();
@@ -118,10 +58,9 @@ class NamespaceInputWidget extends \OOUI\Widget {
 	}
 
 	public function getConfig( &$config ) {
-		$config['namespace'] = $this->namespace;
-		$config['associated'] = $this->associated;
-		$config['invert'] = $this->invert;
-		$config['allValue'] = $this->allValue;
-		return parent::getConfig( $config );
+		$config['includeAllValue'] = $this->includeAllValue;
+		$config['exclude'] = $this->exclude;
+		// Skip DropdownInputWidget's getConfig(), we don't need 'options' config
+		return \OOUI\InputWidget::getConfig( $config );
 	}
 }
diff --git a/includes/widget/TitleInputWidget.php b/includes/widget/TitleInputWidget.php
index d3e2851982..8ac7014eb8 100644
--- a/includes/widget/TitleInputWidget.php
+++ b/includes/widget/TitleInputWidget.php
@@ -14,24 +14,28 @@ class TitleInputWidget extends \OOUI\TextInputWidget {
 
 	protected $namespace = null;
 	protected $relative = null;
+	protected $suggestions = null;
 
 	/**
 	 * @param array $config Configuration options
 	 * @param int|null $config['namespace'] Namespace to prepend to queries
 	 * @param bool|null $config['relative'] If a namespace is set, return a title relative to it (default: true)
+	 * @param bool|null $config['suggestions'] Display search suggestions (default: true)
 	 */
 	public function __construct( array $config = array() ) {
 		// Parent constructor
-		parent::__construct( array_merge( $config, array( 'infusable' => true ) ) );
+		parent::__construct( array_merge( array( 'infusable' => true, 'maxLength' => 255 ), $config ) );
 
 		// Properties, which are ignored in PHP and just shipped back to JS
 		if ( isset( $config['namespace'] ) ) {
 			$this->namespace = $config['namespace'];
 		}
-
 		if ( isset( $config['relative'] ) ) {
 			$this->relative = $config['relative'];
 		}
+		if ( isset( $config['suggestions'] ) ) {
+			$this->suggestions = $config['suggestions'];
+		}
 
 		// Initialization
 		$this->addClasses( array( 'mw-widget-titleInputWidget' ) );
@@ -48,6 +52,9 @@ class TitleInputWidget extends \OOUI\TextInputWidget {
 		if ( $this->relative !== null ) {
 			$config['relative'] = $this->relative;
 		}
+		if ( $this->suggestions !== null ) {
+			$config['suggestions'] = $this->suggestions;
+		}
 		return parent::getConfig( $config );
 	}
 }
diff --git a/includes/widget/UserInputWidget.php b/includes/widget/UserInputWidget.php
index e5663c31d7..1e2d3d618a 100644
--- a/includes/widget/UserInputWidget.php
+++ b/includes/widget/UserInputWidget.php
@@ -17,7 +17,7 @@ class UserInputWidget extends \OOUI\TextInputWidget {
 	 */
 	public function __construct( array $config = array() ) {
 		// Parent constructor
-		parent::__construct( array_merge( $config, array( 'infusable' => true ) ) );
+		parent::__construct( array_merge( array( 'infusable' => true ), $config ) );
 
 		// Initialization
 		$this->addClasses( array( 'mw-widget-userInputWidget' ) );
diff --git a/languages/Language.php b/languages/Language.php
index b698bebf43..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];
@@ -2838,7 +2843,7 @@ class Language {
 	 * @return bool
 	 */
 	function isMultibyte( $str ) {
-		return (bool)preg_match( '/[\x80-\xff]/', $str );
+		return strlen( $str ) !== mb_strlen( $str );
 	}
 
 	/**
diff --git a/languages/Names.php b/languages/Names.php
index fdc44b7b1b..a81f17f168 100644
--- a/languages/Names.php
+++ b/languages/Names.php
@@ -41,6 +41,8 @@
 	'aa' => 'Qafár af',	# Afar
 	'ab' => 'Аҧсшәа',	# Abkhaz
 	'ace' => 'Acèh',	# Aceh
+	'ady' => 'адыгабзэ',	# Adyghe
+	'ady-cyrl' => 'адыгабзэ',	# Adyghe
 	'aeb' => 'تونسي/Tûnsî',	# Tunisian Arabic (multiple scripts - defaults to Arabic)
 	'aeb-arab' => 'تونسي',	# Tunisian Arabic (Arabic Script)
 	'aeb-latn' => 'Tûnsî',	# Tunisian Arabic (Latin Script)
diff --git a/languages/i18n/ace.json b/languages/i18n/ace.json
index fef06bc68c..5bab69ad66 100644
--- a/languages/i18n/ace.json
+++ b/languages/i18n/ace.json
@@ -461,7 +461,6 @@
 	"passwordreset": "Atô keulayi lageuëm rahsia",
 	"passwordreset-text-one": "Neupeuleungkap formulir nyoë keu meuatô keulayi narit rahsia",
 	"passwordreset-text-many": "{{PLURAL:$1|Neupasoë saboh kutak dimeuyub nyoë keu neuteumèe narit rahsia siat rot e-surat}}",
-	"passwordreset-legend": "Atô keulayi lageuëm rahsia",
 	"passwordreset-disabled": "Meuatô narit rahsia keulayi ka geupeumaté lam wiki nyoë",
 	"passwordreset-emaildisabled": "Tanda e-surat ka geupeumaté lam wiki nyoë",
 	"passwordreset-username": "Ureueng ngui:",
@@ -470,7 +469,7 @@
 	"passwordreset-capture-help": "Meunyoë droëneuh neuceuë kutak nyoë, e-surat (ngon narit rahsia siat) ka geupeuleumah keudroëneuh ngon geukirém cit keu ureuëng ngui",
 	"passwordreset-email": "Alamat surat-e:",
 	"passwordreset-emailtitle": "Teuneurang nan ureueng ngui bak {{SITENAME}}",
-	"passwordreset-emailelement": "Nan ureuëng ngui: $1\nLageuëm rahsia sijamong: $2",
+	"passwordreset-emailelement": "Nan ureuëng ngui: \n$1\n\nLageuëm rahsia sijamong: \n$2",
 	"changeemail": "Gantoe alamat surat-e",
 	"changeemail-no-info": "Droeneuh suwah neutamöng mangat jeuet neu'eu laman nyoe",
 	"changeemail-oldemail": "Alamat surat-e jinoe:",
@@ -965,7 +964,6 @@
 	"emailuser": "Surat-e ureuëng ngui",
 	"emailuser-title-target": "Peu'ét surat-e keu {{GENDER:$1|ureuëng ngui}} nyoë",
 	"emailuser-title-notarget": "Peu'ét surat-e",
-	"emailpage": "Peu'ét surat-e keu ureuëng ngui",
 	"emailusername": "Ureueng ngui:",
 	"emailusernamesubmit": "Kirém",
 	"email-legend": "Kirém surat-e keu ureueng ngui {{SITENAME}} la'én",
diff --git a/languages/i18n/ady-cyrl.json b/languages/i18n/ady-cyrl.json
new file mode 100644
index 0000000000..2b6bd5806e
--- /dev/null
+++ b/languages/i18n/ady-cyrl.json
@@ -0,0 +1,1305 @@
+{
+	"@metadata": {
+		"authors": [
+			"Adamsa123",
+			"Amire80",
+			"Bedynokue.nart",
+			"Celekan",
+			"GR44 Luc",
+			"H.2B.H",
+			"Highlander45temp",
+			"Inyzh",
+			"Peserey",
+			"SamGamgee",
+			"SmartNart12",
+			"TheRossatron"
+		]
+	},
+	"tog-underline": "Зэпыщэхэм якIэгъэтхъын:",
+	"tog-hideminor": "ЗэхъокӀ цIыкIухэр бэмышIхэм къащымгъэлъагъу",
+	"tog-hidepatrolled": "УплъэкIужьыгъэ зэхъокӀхэр бэмышIхэм къащымгъэлъагъу",
+	"tog-newpageshidepatrolled": "НэкIубгъуакIэ купым и уплъэкIужьыгъэ нэкIубгъохэр гъэбылъ",
+	"tog-extendwatchlist": "КӀэлъыплъэ тхылъыр зэхэщ зэхъокӀ пстэур плъэгъунэу, бэмышӀхэм ямызакъоу",
+	"tog-usenewrc": "БэмышI зэхъокIхэм ыкIи лъыплъэ купым щыщ зэхъокIхэр куп-купэу гъэзаф",
+	"tog-numberheadings": "Аутоматэу цӀэшъхьаӀхэм номер ятын",
+	"tog-showtoolbar": "Къэгъэлъагъу еIэзэн Ӏэмэ-псымэхэр",
+	"tog-editondblclick": "ТIо-теIункIэмкIэ нэкIубгъомэ яIаз",
+	"tog-editsectiononrightclick": "Жъабгъу тIо-теIункIэмкIэ уеIэзэшъунэу къэшI",
+	"tog-watchcreations": "СшIыгъэ нэкIубгъохэр ыкIи ислъхьэгъэ файлэхэр си лъыплъэ купым хэгъахъу",
+	"tog-watchdefault": "СызэIэзэрэ нэкIубгъохэр ыкIи файлхэр си лъыплъэ купым хэгъахъу",
+	"tog-watchmoves": "ЗыцIэ схъожьыгъэ нэкIубгъохэмрэ файлэхэмрэ си лъыплъэ купым хэгъахъу",
+	"tog-watchdeletion": "ТезгъэкIыгъэ нэкIубгъохэмрэ файлхэмрэ си лъыплъэ купым хэгъахъу",
+	"tog-minordefault": "АпэмкIэ еIэзэн пстэур мэхьанэшхо зимыIэ фэдэу къэгъэлъагъу",
+	"tog-previewontop": "Ыпэтеплъэр еIэзалъэ-плIэмыем ыпэ къэгъэлъагъу",
+	"tog-previewonfirst": "Ыпэтеплъэр къэгъэлъагъу апэрэ еIэзэным ыпэ",
+	"tog-enotifwatchlistpages": "Си лъыплъэ купым щыщэу нэкIубгъом е файлым еIэзагъэхэмэ емэйл къысфегъэхь",
+	"tog-enotifusertalkpages": "Поштэ къысфегъэхь си тегущыIэн нэкIубгъор зэхъокIыгъэмэ",
+	"tog-enotifminoredits": "Ащ нэмыкIэу еIэзэн цIыкIу щыIэмэ емэйл къысфегъэхь",
+	"tog-enotifrevealaddr": "Къэбар къэӀофыгъохэм си поштэ адресыр къыщыгъэлъагъу",
+	"tog-shownumberswatching": "Лъыплъэрэ хэлэжьэкIо пчъагъэ къэгъэлъагъу",
+	"tog-oldsig": "Джырэ кIэтхэжьыкIэ:",
+	"tog-fancysig": "КIэтхэжьыкIэр викитекстэу лъытэ (аутоматик зэпыщэ имыIэу)",
+	"tog-uselivepreview": "Ыпэеплъ шӀэхыр гъэфедэн",
+	"tog-forceeditsummary": "СэгъашI, гъэтэрэзыным и гурыIогъапIэм зи имытхагъэмэ",
+	"tog-watchlisthideown": "Лъыплъэ тхылъым си еIэзэнхэр къыщымгъэлъагъу",
+	"tog-watchlisthidebots": "Бот еIэзэныгъэхэр лъыплъэ купым хэх",
+	"tog-watchlisthideminor": "МэхьанэцIыкIу еIэзэныгъэхэр лъыплъэ купым хэх",
+	"tog-watchlisthideliu": "Системэм хэхьэгъэ нэбгырэмэ я еIэзэнхэр лъыплъэ купым хэх",
+	"tog-watchlisthideanons": "Системэм хэмыхьэгъэ нэбгырэмэ я еIэзэнхэр лъыплъэ купым хэх",
+	"tog-watchlisthidepatrolled": "УплъэкIужьыгъэ еIэзэнхэр лъыплъэ купым хэх",
+	"tog-ccmeonemails": "Емэйлэу фязгъэхьхэрэр сэри къысфэдзыжьых",
+	"tog-diffonly": "Зэгъэпшалъэм ычIэгъ нэкIубгъом итыр къэмгъэлъагъу",
+	"tog-showhiddencats": "Гъэбылъыгъэ категориехэр къэгъэлъагъу",
+	"tog-norollbackdiff": "ЗэкIэдзэжьым ыуж зэгъэпшалъэр къэмгъэлъагъу",
+	"tog-useeditwarning": "СэгъашI сызэIазэрэ нэкIубгъом темгъэпытыхьагъэу сыкъекIымэ",
+	"tog-prefershttps": "Ренэу зэпышIэныгъэ шъэфыр гъэфед, системэм ухэхьагъэу щытмэ",
+	"underline-always": "Ренэу",
+	"underline-never": "ЗэнэмыIэ",
+	"editfont-style": "ЕIэзалъэ плIэмыем ытхыбзэ теплъ:",
+	"editfont-default": "Шрифтыр браузерым зэрэщыгъэпсыгъэм фэдэу",
+	"sunday": "Тхьаумаф",
+	"monday": "Блыпэ",
+	"tuesday": "Гъубдж",
+	"wednesday": "Бэрэскэжъый",
+	"thursday": "Мэфэку",
+	"friday": "Бэрэскэшху",
+	"saturday": "Мэфэзакъу",
+	"sun": "Тмф",
+	"mon": "Блп",
+	"tue": "Гбж",
+	"wed": "Брж",
+	"thu": "Мфк",
+	"fri": "Брш",
+	"sat": "Мфз",
+	"january": "Щылэ",
+	"february": "Мэзай",
+	"march": "Гъэтхапэ",
+	"april": "Мэлылъфэгъу",
+	"may_long": "ЖъоныгъуакӀ",
+	"june": "Мэкъуогъу",
+	"july": "Бэдзэогъу",
+	"august": "ШышъхьэӀу",
+	"september": "Ӏоныгъу",
+	"october": "Чъэпыогъу",
+	"november": "ШэкӀогъу",
+	"december": "Тыгъэгъаз",
+	"january-gen": "Щылэ",
+	"february-gen": "Мэзай",
+	"march-gen": "Гъэтхапэ",
+	"april-gen": "Мэлылъфэгъу",
+	"may-gen": "ЖъоныгъуакӀ",
+	"june-gen": "Мэкъуогъу",
+	"july-gen": "Бэдзэогъу",
+	"august-gen": "ШышъхьаӀу",
+	"september-gen": "Ӏоныгъу",
+	"october-gen": "Чъэпыогъу",
+	"november-gen": "ШэкӀогъу",
+	"december-gen": "Тыгъэгъаз",
+	"jan": "Щл",
+	"feb": "Мзй",
+	"mar": "Гътп",
+	"apr": "Мллъ",
+	"may": "Жън",
+	"jun": "Мкъгъ",
+	"jul": "Бдз",
+	"aug": "Шшъхь",
+	"sep": "Ӏон",
+	"oct": "Чъп",
+	"nov": "Шкгъ",
+	"dec": "Тгъ",
+	"january-date": "Щылэ мазэ $1",
+	"february-date": "Мэзай $1",
+	"march-date": "Гъэтхапэ $1",
+	"april-date": "Мэлылъфэгъу $1",
+	"may-date": "ЖъоныгъуакӀ $1",
+	"june-date": "Мэкъуогъу $1",
+	"july-date": "Бэдзэогъу $1",
+	"august-date": "ШышъхьаӀу $1",
+	"september-date": "Ӏоныгъо $1",
+	"october-date": "Чъэпыогъу $1",
+	"november-date": "ШэкӀогъу $1",
+	"december-date": "Тыгъэгъаз $1",
+	"pagecategories": "{{PLURAL:$1|Категорий|Категориехэр}}",
+	"category_header": "НэкӀубгъохэр категориеу \"$1\"-м щыщхэр",
+	"subcategories": "КӀэкӀэт категориехэр",
+	"category-media-header": "\"$1\" категорием хэт медиэр",
+	"category-empty": "<em>Мы категорием нэкIубгъо е медиэ пари джыри илъэп.</em>",
+	"hidden-categories": "{{PLURAL:$1|Гъэбылъыгъэ категорие|Гъэбылъыгъэ категориехэр}}",
+	"hidden-category-category": "Гъэбылъыгъэ категориехэр",
+	"category-subcat-count": "{{PLURAL:$2|Мы категорием мы кIэткатегорие закъу иIэр.|Мы категорием мы {{PLURAL:$1|кIэткатегорие|$1 кIэткатегориехэр}}, $2 пстэум щыщэу.}}",
+	"category-subcat-count-limited": "Мы категорием мы {{PLURAL:$1|кIэткатегорие|$1 кIэткатегориехэр}} иIэр.",
+	"category-article-count": "{{PLURAL:$2|Мы категорием мы нэкIубгъо закъор илъ.|Мы {{PLURAL:$1|нэкIубгъор|$1 нэкIубгъохэр}} мы категорием илъых, $2 пстэумкIэ.}}",
+	"category-article-count-limited": "КIэлъыкIорэ {{PLURAL:$1|файлыр илъ|$1 файлэхэр илъых}} мы категорием.",
+	"category-file-count": "{{PLURAL:$2|Мы категорием къык1элъык1орэ файлэ закъо илъ.|Мы {{PLURAL:$1|файлыр|$1 файлэхэр}} мы категорием илъхэр, $2 пстэумк1э.}}",
+	"category-file-count-limited": "КIэлъыкIорэ {{PLURAL:$1|файлыр илъ|$1 файлэхэр илъых}} мы категорием.",
+	"listingcontinuesabbrev": "пэубл.",
+	"index-category": "Индекс хъурэ нэкIубгъохэр",
+	"noindex-category": "Индекс мыхъурэ нэкIубгъохэр",
+	"broken-file-category": "Къончэ зэпыщэхэр зиIэ нэкIубгъохэр",
+	"about": "Фэгъэхьыгъэу",
+	"article": "Дэтхэр",
+	"newwindow": "(шъхьангъупчъэ шъхьафым къыщызэӀух)",
+	"cancel": "Ыуж икӀ",
+	"moredotdotdot": "Джыри...",
+	"morenotlisted": "Мы купыр джыри изэп.",
+	"mypage": "НэкIубгъо",
+	"mytalk": "ГущыӀ",
+	"anontalk": "Мы IP-адресым тегущыI",
+	"navigation": "Зыплъыхьэн",
+	"and": "&#32;ыкӀи",
+	"qbfind": "Къэгъот",
+	"qbbrowse": "Хаплъ",
+	"qbedit": "ЕIаз",
+	"qbpageoptions": "Мы нэкIубгъор",
+	"qbmyoptions": "Си нэкIубгъохэр",
+	"faq": "ПчъаЗы",
+	"faqpage": "Project:ПчъаЗы",
+	"actions": "ШӀагъэхэр",
+	"namespaces": "ЦӀэчӀыпӀ",
+	"variants": "Вариантхэр",
+	"navigation-heading": "Зыплъыхьэн меню",
+	"errorpagetitle": "Хэукъоныгъэ",
+	"returnto": "$1-м егъэзэжь",
+	"tagline": "{{SITENAME}}-м щыщ",
+	"help": "ӀэпыӀэгъу",
+	"search": "Лъыхъу",
+	"searchbutton": "Лъыхъу",
+	"go": "КӀо",
+	"searcharticle": "КӀо",
+	"history": "Тхьапэм итарихъ",
+	"history_short": "Тарихъ",
+	"updatedmarker": "мыщпэм сыкъызихьагъэм азфагу кIэмэ уплъэкIужьыгъэ",
+	"printableversion": "Хэутын теплъ",
+	"permalink": "Ренэу щыт зэпыщ",
+	"print": "Къыхэут",
+	"view": "Еплъ",
+	"view-foreign": "Сайтэу $1-м къыщыгъэлъагъу",
+	"edit": "ХэӀэзыхь",
+	"edit-local": "Хьанэгъунэ гурыӀоныгъэм еIэзэн",
+	"create": "КъэшӀ",
+	"create-local": "Хьанэгъунэ гурыӀоныгъэ пыдзэжь",
+	"editthispage": "Гъэтэрэзыжь мы нэкӀубгъор",
+	"create-this-page": "Къэубл мы тхылъыр",
+	"delete": "ТегъэкI",
+	"deletethispage": "Мы нэкIубгъор тегъэкI",
+	"undeletethispage": "ТемыгъэкI мы нэкIубгъор",
+	"undelete_short": "ТемыгъэкI {{PLURAL:$1|зы еIэзэныгъэ|$1 еIэзэныгъэхэр}}",
+	"viewdeleted_short": "Къэгъэлъагъу {{PLURAL:$1|зы тегъэкIыгъэ еIэзэныгъэ|$1 тегъэкIыгъэ еIэзэныгъэхэр}}",
+	"protect": "Ухъум",
+	"protect_change": "зэблэхъу",
+	"protectthispage": "Ухъум мы нэкIубгъор",
+	"unprotect": "Ухъумэныгъэр зэблэхъу",
+	"unprotectthispage": "Мы нэкIубгъом и ухъумэныгъэ зэблэхъу",
+	"newpage": "НэкӀубгъуакӀэ",
+	"talkpage": "ТегущыI мы нэкIубгъом",
+	"talkpagelinktext": "ГущыӀ",
+	"specialpage": "ХэшыкӀыгъэ нэкӀубгъу",
+	"personaltools": "СиӀэмэпсымэхэр",
+	"articlepage": "КӀоцӀытхагъэм еплъ",
+	"talk": "ТегущыӀэн",
+	"views": "Еплъыгъэхэр",
+	"toolbox": "Ӏэмэ-псымэхэр",
+	"userpage": "Нэбгырэм инэкIубгъо еплъ",
+	"projectpage": "Проектым и нэкӀубгъо еплъ",
+	"imagepage": "Файлым и нэкIубгъо еплъ",
+	"mediawikipage": "Тхыгъэм инэкIубгъо еплъ",
+	"templatepage": "Шапхъэм и нэкIубгъо еплъ",
+	"viewhelppage": "IэпыIэгъу нэкIубгъом еплъ",
+	"categorypage": "Категорием и нэкIубгъо еплъ",
+	"viewtalkpage": "ТегущыIэныгъэм еплъ",
+	"otherlanguages": "ПэмыкӀ бзэхэмкӀэ",
+	"redirectedfrom": "($1-м къикӀыгъ)",
+	"redirectpagesub": "ЕгъэкIокI нэкIубгъор",
+	"redirectto": "МыдыкӀэ егъэкӀокӀ:",
+	"lastmodifiedat": "Мыщпэм мы нэкӀубгъор зеӀэзагъэхэр $1, $2-м.",
+	"viewcount": "Мы нэкIубгъом еплъыгъэх {{PLURAL:$1|зэ|$1-рэ}}.",
+	"protectedpage": "Ухъумагъэ нэкIубгъу",
+	"jumpto": "МыкӀэ пкӀэ:",
+	"jumptonavigation": "зыплъыхьэн",
+	"jumptosearch": "лъыхъу",
+	"pool-timeout": "Уахътэр икIыгъэ, гъэпытэныр къэсыфэ",
+	"pool-queuefull": "Упч1эмэ я Iатэр изы",
+	"pool-errorunknown": "ЗэхэмышIагъэ къончагъэ",
+	"poolcounter-usage-error": "Гъэфедэныгъэм и къончагъэ: $1",
+	"aboutsite": "{{SITENAME}} фэгъэхьыгъэу",
+	"aboutpage": "Project:Фэгъэхьыгъэу",
+	"copyright": "$1-м тетэу кIоцIрытыр олъэгъу, нэмыкIым игугъу къамышIмэ.",
+	"copyrightpage": "{{ns:project}}:Ауторфитныгъэхэр",
+	"currentevents": "Джыр хъугъэ-шӀагъэхэр",
+	"currentevents-url": "Project:Джыр хъугъэ-шӀагъэхэр",
+	"disclaimers": "ПшъэдэкӀ умыхьын",
+	"disclaimerpage": "Project:ПшъэдэкӀ умыхьын",
+	"edithelp": "ХэӀэзэнымкӀэ ӀэпыӀэгъу",
+	"helppage-top-gethelp": "ӀэпыӀэгъу",
+	"mainpage": "НэкӀубгъо шъхьаӀ",
+	"mainpage-description": "НэкӀубгъо шъхьаӀ",
+	"policy-url": "Project:Хабзэхэр",
+	"portal": "Лъэпкъэгъу ӀухьапӀ",
+	"portal-url": "Project:Лъэпкъэгъу ӀухьапӀ",
+	"privacy": "Зыушъэфын хабзэр",
+	"privacypage": "Project:Зыушъэфын хабзэр",
+	"badaccess": "Фитыныгъэм и къончагъэ",
+	"badaccess-group0": "УзыкIэупчъэрэ шIэн-мурадым пае фитыныгъэ уиIэп.",
+	"versionrequired": "MediaWiki-м и $1-рэ версие ищыкIагъ",
+	"versionrequiredtext": "MediaWiki-м и $1-рэ версие ищыкIагъ.\nЕплъ [[Special:Version|version page]].",
+	"ok": "Хъун",
+	"retrievedfrom": "\"$1\" - м къикӀыгъ",
+	"youhavenewmessages": "{{PLURAL:$3|УиI}} $1 ($2).",
+	"newmessageslinkplural": "{{PLURAL:$1|зы тхыгхакIэ|999=тхыгъакIэхэр}}",
+	"newmessagesdifflinkplural": "ыужрэ {{PLURAL:$1|зэхъокIыныгъэ|999=зэхъокIыныгъэхэр}}",
+	"youhavenewmessagesmulti": "ТхыгъакIэхэр уиI $1-кIэ",
+	"editsection": "хэӀэзыхь",
+	"editold": "еӀаз",
+	"viewsourceold": "еплъ лъапсэм",
+	"editlink": "еӀаз",
+	"viewsourcelink": "лъапсэм еплъ",
+	"editsectionhint": "Пычыгъом хатх: $1",
+	"toc": "Дэлъхэр",
+	"showtoc": "къэгъэлъагъу",
+	"hidetoc": "гъэбылъ",
+	"collapsible-collapse": "Зэхэгъахь",
+	"collapsible-expand": "Зэхэщ",
+	"confirmable-confirm": "{{GENDER:$1|Уэ}} пытэу ошIа?",
+	"confirmable-yes": "Ары",
+	"confirmable-no": "ХьаIу",
+	"thisisdeleted": "Еплъ е зэкIэдзэжь $1?",
+	"viewdeleted": "Еплъ $1?",
+	"restorelink": "{{PLURAL:$1|зы еIэзэн тегъэкIыгъ|$1 еIэзэн тегъэкIыгъэхэр}}",
+	"feedlinks": "Теплъэр мифэд:",
+	"feed-invalid": "КIэтхакIэ каналым и типыр къуанчэ",
+	"feed-unavailable": "Синдикацие чэзыухэр щыIэп",
+	"site-rss-feed": "$1 RSS чэзыу",
+	"site-atom-feed": "$1 Atom чэзыу",
+	"page-rss-feed": "$1 RSS чэзыу",
+	"page-atom-feed": "$1 Atom чэзыу",
+	"red-link-title": "$1 (нэкӀубгъор щыӀэп)",
+	"sort-descending": "Ехырэ чэзыу",
+	"sort-ascending": "ДэкIуаерэ чэзыу",
+	"nstab-main": "НэкӀубгъо",
+	"nstab-user": "Сэ ситхьап",
+	"nstab-media": "Медиэ нэкIубгъо",
+	"nstab-special": "ХэшыкӀыгъэ нэкӀубгъу",
+	"nstab-project": "Проектым фэгъэхьыгъэу",
+	"nstab-image": "Файл",
+	"nstab-mediawiki": "Тхыгъэ",
+	"nstab-template": "Шапхъэ",
+	"nstab-help": "IэпыIэгъу нэкIубгъу",
+	"nstab-category": "Категорие",
+	"nosuchaction": "Ащ фэдэ шIагъэ щыIэп",
+	"nosuchspecialpage": "Афэдэ специал нэкIубгъо щыIэп",
+	"error": "Къончагъэ",
+	"databaseerror": "Датэбазэм и къончагъэ",
+	"databaseerror-query": "КIэупчIэн: $1",
+	"databaseerror-function": "Функцие: $1",
+	"databaseerror-error": "Хэукъоныгъэ: $1",
+	"laggedslavemode": "<strong>Сакъ:</strong> НэкIубгъом имылъын лъэкIыщт хэIэзэныкIэмэ ащыщ.",
+	"readonly": "Датэбазэр гъэпытагъэ",
+	"missingarticle-rev": "(версиеу № $1)",
+	"missingarticle-diff": "(Зэгъапш: $1, $2)",
+	"internalerror": "ЫкIоцI хэукъоныгъэ",
+	"internalerror_info": "ЫкIоцI фыкъуагъэ: $1",
+	"filecopyerror": "\"$1\"-файлыр \"$2\"-м копи шIын лъэкIыгъэп.",
+	"filerenameerror": "Файлэу \"$1\" ыц1э \"$2\" фэдэу хъожьын лъэкIырэп.",
+	"filedeleteerror": "Файлэу \"$1\" тегъэкIын лъэкIырэп.",
+	"directorycreateerror": "Директориеу \"$1\" къэублэн лъэкIыгъэп.",
+	"directoryreadonlyerror": "Директориер \"$1\" еджэн пэе закъу.",
+	"directorynotreadableerror": "Директорием \"$1\" еджэн лъэкIырэп.",
+	"filenotfound": "Файлэу \"$1\" гъотыгъэн лъэкIырэп.",
+	"formerror": "Хэукъоныгъэ: Формэр тегъэпытыхьан лъэкIыгъэп.",
+	"badarticleerror": "Мы хъугъэ-шIагъэр мы нэкIубгъом щызэшIогъэкIын лъэкIыщтэп.",
+	"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убгъор ухъумагъэу щыт.",
+	"viewsourcetext": "Мы нэкIубгъом ылъапсэм уеплъын и копи пшIышъущт.",
+	"viewyourtext": "<strong>Уэ уи еIэзэнхэм</strong> я лъапсэ уеплъын е копи пшIын плъэкIыыщт мы нэкIубгъом.",
+	"translateinterface": "ЗэкIэ викимэ язэдзэкIмэ ахэбгъэхъон е еIэзэн пшIоигъомэ, [//translatewiki.net/ translatewiki.net] гъэфед, MediaWiki и хьанэгъуналъэ сайт.",
+	"namespaceprotected": "<strong>$1</strong> цIэчIыпIэм и нэкIубгъомэ уяIэзэнэу фитыныгъэ уиIэп.",
+	"mycustomcssprotected": "Мы CSS-нэкIубгъом уеIэзэн уфитэп.",
+	"mycustomjsprotected": "Мы JavaScript нэкIубгъом уеIэзэн уфитэп.",
+	"myprivateinfoprotected": "Уи шъэф информацием уеIэзэн уфитэп.",
+	"mypreferencesprotected": "Уи Iэмэпсымэхэм уяIэзэн уфитэп.",
+	"ns-specialprotected": "Специал нэкIубгъохэр зэхъокIын хъущтэп.",
+	"exception-nologin": "Системэм хэхьагъэп",
+	"exception-nologin-text": "Системэм хахьэба мы нэкIубгъом е шIэным унэсышъунэу.",
+	"virus-badscanner": "ЗэтегъэпсыхьакIэ дэй: ЗэхэмышIыкIыгъэ вирус сканер: <em>$1</em>",
+	"virus-scanfailed": "сканшIын къуанч (кодэу $1)",
+	"virus-unknownscanner": "зэхэмышIыкIыгъэ антивирус:",
+	"welcomeuser": "Къеблагъ, $1!",
+	"yourname": "НэбгырацIэ:",
+	"userlogin-yourname": "НэбгырацӀэр",
+	"userlogin-yourname-ph": "Итх уи нэбгырацIэ",
+	"createacct-another-username-ph": "Итх уи нэбгырацӀэр",
+	"yourpassword": "ШъэфгущыI:",
+	"userlogin-yourpassword": "ШъэфгущыI",
+	"userlogin-yourpassword-ph": "Уи шъэфгущыIэ итх",
+	"createacct-yourpassword-ph": "Къэтх шъэфгущыIэ горэ",
+	"yourpasswordagain": "Джыри зэ къэтх шъэфгущыIэр:",
+	"createacct-yourpasswordagain": "Тегъэпытыхь шъэфгущыIэр",
+	"createacct-yourpasswordagain-ph": "Къэтх шъэфгущыIэр джыри зэ",
+	"userlogin-remembermypassword": "Системэм сыхэтэу сыкъэгъан",
+	"userlogin-signwithsecure": "Ухъумэгъэ зэпышIэныгъэр гъэфед",
+	"yourdomainname": "Уи домен:",
+	"password-change-forbidden": "Мы виким и шъэфгущыIэхэр зэблэпхъун уфитэп.",
+	"login": "Системэм хахь",
+	"nav-login-createaccount": "Къыхахь / аккаунт къэубл",
+	"userlogin": "Къыхахь / аккаунт къэубл",
+	"userloginnocreate": "Системэм хахь",
+	"logout": "ХэкӀыжь",
+	"userlogout": "ХэкӀыжь",
+	"notloggedin": "Системэм хэхьагъэп",
+	"userlogin-noaccount": "Аккаунт уиӏэба?",
+	"userlogin-joinproject": "{{SITENAME}} зигъэгъус",
+	"nologin": "Аккаунт уиӏэба? $1.",
+	"nologinlink": "Аккаунт къэубл",
+	"createaccount": "Аккаунт къэубл",
+	"gotaccount": "Аккаунт уиӏаха? $1.",
+	"gotaccountlink": "Системэм хахь",
+	"userlogin-resetlink": "Уи хэхьан датэхэр пщыгъупшагъа?",
+	"userlogin-resetpassword-link": "УишъэфгущыIэр пщыгъупшагъа?",
+	"userlogin-helplink2": "Системэм сыхэхьанэу къыздеӏ",
+	"userlogin-createanother": "НэмыкI аккаунт къэубл",
+	"createacct-emailrequired": "Емэйл адрес",
+	"createacct-emailoptional": "Емэйл адрес (егъэзыгъэп)",
+	"createacct-email-ph": "Игъахь уи емэйл адресыр",
+	"createacct-another-email-ph": "Игъахь уи емэйл адресыр",
+	"createacct-realname": "ЦIэ шъыпкъэр (егъэзыгъэп)",
+	"createaccountreason": "ЗыпкъырыкIырэр:",
+	"createacct-reason": "ЗыпкъырыкIырэр:",
+	"createacct-reason-ph": "Сыда пэмыкI аккаунт зэкIэублэрэр?",
+	"createacct-captcha": "Щынэгъончъэгъэ уплъэкӀун",
+	"createacct-imgcaptcha-ph": "ЫшъхьагъкӀэ плъэгъурэ текстыр итх",
+	"createacct-submit": "Уи аккаунт бгъэпсын",
+	"createacct-another-submit": "НэмыкI аккаунт къэубл",
+	"createacct-benefit-heading": "{{SITENAME}}-м ощ фэдэхэр дэлажьэх.",
+	"createacct-benefit-body1": "{{PLURAL:$1|еӀэзэныгъэ|еӀэзэныгъ}}",
+	"createacct-benefit-body2": "{{PLURAL:$1|нэкӀубгъо|нэкӀубгъу}}",
+	"createacct-benefit-body3": "бэмышӀэу {{PLURAL:$1|хэлэжьакӀу|хэлэжьакӀо}}",
+	"badretype": "ШъэфгущыIэу ибгъэхьагъэхэр зэтефэрэп.",
+	"userexists": "Ибгъэхьэгъэ нэбгырацIэр агъэфедэ.\nНэмыкI цIэ горэ къыхэхба.",
+	"loginerror": "Системэ хэхьаныгъэр къуанчэ",
+	"createacct-error": "Аккаунт къэублэныгъэ къончагъ",
+	"createaccounterror": "Аккаунт ублэн лъэкIыгъэп: $1",
+	"noname": "НэбгырацIэ тэрэз итхагъэп.",
+	"loginsuccesstitle": "ШIоу ухэхьагъ",
+	"nouserspecified": "НэбгырацIэр птхын фае.",
+	"wrongpassword": "ШъэфгущыIэр тэрэзэп.\nДжыри зэ еплъ.",
+	"wrongpasswordempty": "ШъэфгущыIэр нэкIы.\nДжыри зэ еплъ.",
+	"passwordtooshort": "ШъэфгущыIэр мыхъуми {{PLURAL:$1|1 символ |символ $1}} хъун фае.",
+	"password-name-match": "Уи шъэфгущыIэр уи нэбгырацIэм фэдапэ хъущтэп.",
+	"mailmypassword": "Зэтедз шъэфгущыIэр",
+	"noemailcreate": "Емэйл тэрэз птхын фае.",
+	"mailerror": "Емэйл егъэхьыныр къуанчэ: $1",
+	"emailauthenticated": "Уи емэйл адресыр уплъэкIужьыгъы, мафэр $2, уахъэр $3",
+	"emailconfirmlink": "Тегъэпытыхь уи емэйл адресыр",
+	"emaildisabled": "Мы сайтым емэйлхэр ыгъэхьын лъэкIырэп.",
+	"accountcreated": "Аккаунтыр ублагъэ",
+	"createaccount-title": "Аккаунт къэублэн, {{SITENAME}} пае",
+	"login-abort-generic": "Уи системэ хэхьакIэр шIоп",
+	"loginlanguagelabel": "Бзэ: $1",
+	"pt-login": "Системэм хахь",
+	"pt-login-button": "Системэм хахь",
+	"pt-createaccount": "Аккаунт егъажь",
+	"pt-userlogout": "ХэкӀыжь системэм",
+	"php-mail-error-unknown": "PHP-функциеу mail()-м къончагъэ горэ иI.",
+	"user-mail-no-addy": "Емэйл адрес имыIэу емэйл аригъэхьынэу фэягъ.",
+	"user-mail-no-body": "Емэйл ебгъэхьынэу уфаягъ, нэкIэу е мэхьанэнчъэ кIакоу.",
+	"changepassword": "ШъэфгущыIэр зэблэхъу",
+	"resetpass_announce": "Системэ хэхьаныр зэшIобгъэкIынэу, шъэфгущыIакIэ бгъэпсын фае.",
+	"resetpass_header": "Аккаунтым и шъэфгущыIэр зэблэхъу",
+	"oldpassword": "ШъэфгущыIэжъыр:",
+	"newpassword": "ШъэфгущыIакIэр:",
+	"retypenew": "Къэтхыжь шъэфгущыIэр:",
+	"resetpass_submit": "ШъэфгущыIэр гъэпси, къыхахь",
+	"changepassword-success": "Уи шъэфгущыIэр шIоу зэблэхъугъэ!",
+	"resetpass_forbidden": "ШъэфгущыIэр зэблэхъун лъэкIыщтэп",
+	"resetpass-no-info": "Мы нэкIубгъом занкIэу укIонэу уфаемэ, системэм ухэхьэгъэн фае.",
+	"resetpass-submit-loggedin": "ШъэфгущыIэр зэблэхъу",
+	"resetpass-submit-cancel": "Ыуж икӀ",
+	"resetpass-recycled": "УишъэфгущыIэр зэтедзба джырэм фэмыдэу.",
+	"resetpass-expired": "ШъэфгущыIэм и зэман икIыгъ. ШъэфгущыIакIэ горэ гъэпсба.",
+	"passwordreset": "Зэтедз шъэфгущыIэр",
+	"passwordreset-disabled": "Мы виким шъэфгущыIэр щызэтебдзэшъущтэп.",
+	"passwordreset-emaildisabled": "Мы виким емэйл-Iофыгъохэр щылажьэхэрэп.",
+	"passwordreset-username": "НэбгырацIэ:",
+	"passwordreset-domain": "Домен:",
+	"passwordreset-capture": "Къэхъурэ емэйлым уеплъыщта?",
+	"passwordreset-email": "Емэйл адрес:",
+	"passwordreset-emailtitle": "Аккаунт и гъэпсыкIэхэр, мий щыI {{SITENAME}}",
+	"passwordreset-emailelement": "НэбгырацIэ: \n$1\n\nTemporary password: \n$2",
+	"passwordreset-emailsent": "ШъэфгущыIэм и зэтедзым пае емэйл агъэхьыгъ.",
+	"passwordreset-emailsent-capture": "ШъэфгущыIэм изэтедз фэгъэхьыгъэ емэйлыр гъахьыгъэ, ычIэгъкIэ ар олъэгъу.",
+	"changeemail": "Зэблэхъу емэйл адресыр",
+	"changeemail-oldemail": "Джырэ емэйл адрес:",
+	"changeemail-newemail": "Емэйл адресыкIэр:",
+	"changeemail-none": "(зи)",
+	"changeemail-password": "Уи {{SITENAME}} ишъэфгущыI:",
+	"changeemail-submit": "Емэйлыр зэблэхъу",
+	"resettokens": "Токенхэр зэтедзэх",
+	"resettokens-no-tokens": "Токен зэтебзынэу щыIэп.",
+	"resettokens-tokens": "Токенхэр:",
+	"resettokens-done": "Токенхэр зэтедзыгъэх.",
+	"resettokens-resetbutton": "ХэшыпыкIыгъэ токенхэр зэтедзэх",
+	"bold_sample": "Тхыбзэ Ӏужъу",
+	"bold_tip": "Тхыбзэ Ӏужъу",
+	"italic_sample": "Италикэ текст",
+	"italic_tip": "Италикэ текст",
+	"link_sample": "Зэпыщэм ыцӀэр",
+	"link_tip": "Къыдахьэрэ зэпыщэ",
+	"extlink_sample": "http://www.example.com зэпыщэм ыцӀэ",
+	"extlink_tip": "ДэкӀырэ зэпыщэ (http:// пэрыт пычыгъор зыщымгъэгъупш)",
+	"headline_sample": "Сатырышъхьэ текст",
+	"headline_tip": "Я-2-рэ чэзыу сатырышъхь",
+	"nowiki_sample": "Формат-хэӀэн зимыщыкӀэгъэ текстыр къигъэуцу",
+	"nowiki_tip": "Земгъэгъап вики-форматшэным",
+	"image_tip": "КӀоцӀрыгъэуцогъэ файл",
+	"media_tip": "Файл къакӀорэ зэпыщ",
+	"sig_tip": "Уи кӀэтхэжьыкӀэрэ уахътэрэ",
+	"hr_tip": "Горизонтал сатыр (пчъагъэу умыгъэфед)",
+	"summary": "КӀэкӀэу:",
+	"minoredit": "Мыр хэӀэзэныгъэ цӀыкӀу",
+	"watchthis": "Мы нэкӀубгъом лъыплъ",
+	"savearticle": "НэкӀубгъор дэтхэжь",
+	"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": "Уи ыпэтеплъэмэ я къэгъэлъэгъон игъо зы къончагъэ горэ хъугъэ.",
+	"blockednoreason": "къызыпкъырыкIрэр итхагъэп",
+	"nosuchsectiontitle": "Секциер гъотыгъэн лъэкIырэп",
+	"loginreqtitle": "Ухэхьанэу ищыкIагъ",
+	"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эзэнхэр джыри дэгъэпытыхьагъэхэп.",
+	"continue-editing": "ЕIэзалъэ плIэмыем кIо",
+	"editing": "$1 и еӀэзэн",
+	"creating": "$1 нэкӀубгъом и егъэжьэн",
+	"editingsection": "$1-м (секцие) и еӀэзэныгъэ",
+	"editingcomment": "$1-м (секциякIэ) и еӀэзэныгъэ",
+	"editconflict": "ЕIэзэным зэгурымыIоныгъэ: $1",
+	"yourtext": "Уи текст",
+	"editpage-cannot-use-custom-model": "Мы нэкӀубгъом ыкӀоцӀрытым и модел зэхъокӀын хъущтэп.",
+	"templatesused": "{{PLURAL:$1|Шапхъэ|Шапхъэхэр}} мы нэкIубгъом щагъэфедагъэх:",
+	"template-protected": "(ухъумагъэ)",
+	"template-semiprotected": "(ызныкъокӀэ ухъумагъэ)",
+	"hiddencategories": "Мы нэкIубгъор зыщыщыр мы {{PLURAL:$1|1 категорие гъэбылъыгъэр|$1 категорие гъэбылъыгъэхэр}} ары:",
+	"nocreate-loggedin": "НэкIубгъуакIэ ебгъэжьэ уфитэп.",
+	"permissionserrors": "Фитыныгъэм и къончагъэ",
+	"permissionserrorstext-withaction": "$2-кIэ фитыныгъэ уиIэп, къыкIэлъыкIорэ {{PLURAL:$1|резонкIэ|резонхэмкIэ}}:",
+	"moveddeleted-notice": "Мы нэкӀубгъор тегъэкӀыжьыгъэу щыт.\nТегъэкӀыжьыным ыкӀи кощыным и лог-нэкӀубгъор кӀэлъыкӀорэ зэпыщэмкӀэ къэбгъотышъущт.",
+	"log-fulllog": "Лог псаом еплъ",
+	"edit-conflict": "ЕIэзэным зэгурымыIоныгъэ.",
+	"postedit-confirmation-created": "НэкIубгъор ублагъэ.",
+	"postedit-confirmation-restored": "НэкIубгъор зэтегъэуцожьыгъэу щыт.",
+	"postedit-confirmation-saved": "Уи еIэзэныгъэр тегъэпытыхьагъ.",
+	"edit-already-exists": "НэкIубгъуакIэр егъэжьэгъэн лъэкIыгъэп.\nАщ фэдэр щыIах.",
+	"invalid-content-data": "КIоцIрытыр тэрэзэп",
+	"content-model-wikitext": "вики-текст",
+	"content-model-text": "текст занкI",
+	"content-model-javascript": "JavaScript",
+	"content-json-empty-object": "Объект нэкI",
+	"content-json-empty-array": "Массив нэкI",
+	"cantcreateaccounttitle": "Аккаунт ублэн лъэкIыгъэп",
+	"viewpagelogs": "Мы нэкӏубгъом и логхэр къэгъэлъагъу",
+	"nohistory": "Мы нэкIубгъом и еIэзэнмэ я тарихъ щыIэп.",
+	"currentrev": "Ыужрэ версие",
+	"currentrev-asof": "Джырэ версие, $1-м тетэу",
+	"revisionasof": "$1-м щытыгъэр",
+	"revision-info": "$1-м тетэу версие, зиер {{GENDER:$6|$2}}$7",
+	"previousrevision": "← Пэсэрэ теплъэжьыр",
+	"nextrevision": "Кӏэлъыкӏорэр →",
+	"currentrevisionlink": "Ыужрэ теплъэр",
+	"cur": "джр",
+	"next": "кIэлъ.",
+	"last": "ыпэ",
+	"page_first": "апэрэ",
+	"page_last": "ыужрэ",
+	"history-fieldset-title": "Хаплъ тарихъым",
+	"history-show-deleted": "ТегъэкIыгъэ закъохэр",
+	"histfirst": "нахьыжъдэдэхэр",
+	"histlast": "кIэдэдэхэр",
+	"historysize": "({{PLURAL:$1|1 байт|$1 байтхэр}})",
+	"historyempty": "(нэкI)",
+	"history-feed-title": "ЕIэзэнмэ я тарихъ",
+	"history-feed-description": "Мы нэкIубгъом и еIэзэнмэ я тарихъ викимкIэ",
+	"history-edit-tags": "ХэшыпыкIыгъэ версиемэ я тегхэр зэблэхъу",
+	"rev-deleted-comment": "(еIэзэныгъэм и къэбар тегъэкIыжьыгъэ)",
+	"rev-deleted-user": "(нэбгырацIэр тегъэкIыгъэ)",
+	"rev-deleted-event": "(лог деталхэр тегъэкIыгъэх)",
+	"rev-delundel": "къэгъэлъагъу/гъэбылъ",
+	"rev-showdeleted": "къэгъэлъагъу",
+	"revdelete-no-file": "Зигугъу шIыгъэ файлыр щыIэп.",
+	"revdelete-show-file-submit": "Ары",
+	"revdelete-hide-text": "Версием и текст",
+	"revdelete-hide-image": "Файлым кIоцIрытыр гъэбылъ",
+	"revdelete-hide-comment": "ЕIэзэнмэ якъэбар",
+	"revdelete-hide-user": "ЕIэзакIом и нэбгырацI/IP-адрес",
+	"revdelete-radio-same": "(зэблэмыхъу)",
+	"revdelete-radio-set": "(гъэбылъыгъэ)",
+	"revdelete-radio-unset": "Плъэгъушъунэу",
+	"revdelete-log": "ЗыпкъырыкIырэр:",
+	"revdel-restore": "плъэгъушъущтыр зэблэхъу",
+	"pagehist": "НэкIубгъом и тарихъ",
+	"deletedhist": "ТегъэкIыгъэмэ я тарихъ",
+	"revdelete-reasonotherlist": "ПэмыкI къызпкъырыкIрэр",
+	"revdelete-offender": "Версием и аутор:",
+	"mergehistory": "НэкIубгъомэ ятарихъхэр зэпыдз",
+	"mergehistory-box": "НэкIубгъуитIум ятарихъхэр зэпыдзэх:",
+	"mergehistory-from": "Лъапсэ нэкIубгъор:",
+	"mergehistory-into": "ЗыдакIорэ нэкIубгъор:",
+	"mergehistory-go": "Зэпыбдзэшъурэ еIэзэнхэр къэгъэлъагъу",
+	"mergehistory-submit": "Зэпыдз версиехэр",
+	"mergehistory-no-source": "Лъапсэ нэкIубгъоу $1 щыIэп.",
+	"mergehistory-invalid-source": "Лъапсэ нэкIубгъом цIэ тэрэз иIэн фай.",
+	"mergehistory-reason": "ЗыпкъырыкIырэр:",
+	"mergelog": "Зэпыдзэмэ я лог",
+	"revertmerge": "ЗэхэгъэкӀыжь",
+	"history-title": "ЗэхъокIыныгъэмэ я тарихъ - \"$1\"",
+	"difference-title": "\"$1\" - версиемэ зэгъэпшэн",
+	"lineno": "Сатыр $1:",
+	"compareselectedversions": "Хэгъэщыгъэ версиехэр зэгъапш",
+	"editundo": "зэкӀэгъэкӀожь",
+	"diff-empty": "(зэфэмыдэ яIэп)",
+	"diff-multi-sameuser": "({{PLURAL:$1|Зы гурыт версие горэ|$1 гурыт версиехэр}} зы нэбгырэм иеу къэгъэлъэгъуагъэп)",
+	"searchresults": "Къэгъотынэу хъугъэр",
+	"searchresults-title": "$1-м пае къэгъот",
+	"prevn": "ыпэ {{PLURAL:$1|$1}}",
+	"nextn": "кӀэлъыкӀорэ {{PLURAL:$1|$1}}",
+	"prev-page": "ыпэит нэкIубгъу",
+	"next-page": "кIэлъыкIорэ нэкIубгъу",
+	"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": "ЗэкӀэ",
+	"searchprofile-advanced": "Зэхэщыгъэу",
+	"searchprofile-articles-tooltip": "Хэлъыхъу $1-м",
+	"searchprofile-images-tooltip": "Файлэхэм алъыхъу",
+	"searchprofile-everything-tooltip": "Тхыгъэм зэкӀэм щылъыхъу (гущыӀэ нэкӀубгъохэри ахэтэу)",
+	"searchprofile-advanced-tooltip": "Къатыгъэ чӀыпӀацӀэмэ къащылъыхъу",
+	"search-result-size": "$1({{PLURAL:$2|$2 гущыӀ}})",
+	"search-redirect": "(гъэкӀожь $1-м)",
+	"search-section": "(секцие $1)",
+	"search-category": "(категориеу $1)",
+	"search-suggest": "Мыра къэпӀонэу узфэягъэр: $1",
+	"search-interwiki-caption": "Iахьыл проектхэр",
+	"search-interwiki-more": "(джыри)",
+	"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эмэ ащылъыхъу:",
+	"powersearch-togglelabel": "Гъэнаф:",
+	"powersearch-toggleall": "ЗэкIэ",
+	"powersearch-togglenone": "Зи",
+	"preferences": "Iамэ-псымэхэр",
+	"mypreferences": "ГъэпсыкӀэхэр",
+	"prefs-edits": "ЕIэзэнмэ япчъагъэ:",
+	"prefs-skin": "Ышъотеплъ",
+	"skin-preview": "Ыпэтеплъ",
+	"prefs-user-pages": "Нэбгырэм и нэкIубгъу",
+	"prefs-personal": "Нэбгырэм и профил",
+	"prefs-rc": "Ыужрэ зэхъокӀыныгъэхэр",
+	"prefs-watchlist": "Лъыплъэ куп",
+	"prefs-editwatchlist": "Лъыплъэ купым еIэзэн",
+	"prefs-editwatchlist-raw": "Лъыплъэ купым щыщэу сатырым еIэзэн",
+	"prefs-editwatchlist-clear": "Лъыплъэ купыр унэкI",
+	"prefs-watchlist-days": "Мафэ пчъагъэр:",
+	"prefs-watchlist-days-max": "Максимум $1 {{PLURAL:$1|маф|мафэхэр}}",
+	"prefs-watchlist-edits-max": "Нахьинышъущт нумер: 1000",
+	"prefs-watchlist-token": "Лъыплъэ купым и токен:",
+	"prefs-misc": "ПэмыкI гъэпсыкIэхэр",
+	"prefs-resetpass": "ШъэфгущыIэр зэблэхъу",
+	"prefs-changeemail": "Зэблэхъу емэйл адресыр",
+	"prefs-setemail": "Игъахь уи емэйл адресыр",
+	"prefs-email": "Емэйл гъэпсыкIэхэр",
+	"prefs-rendering": "Ышъотеплъэ",
+	"saveprefs": "Игъэпытыхь",
+	"prefs-editing": "ЕIэзэныгъэ",
+	"rows": "Сатырхэу:",
+	"searchresultshead": "Лъыхъу",
+	"stub-threshold-disabled": "ГъэкIуэсагъэ",
+	"recentchangesdays-max": "Максимум $1 {{PLURAL:$1|маф|мафэхэр}}",
+	"savedprefs": "Уи гъэпсыкIэхэр джы игъэпытыхьагъэх.",
+	"timezonelegend": "Сыхьат зон:",
+	"localtime": "Хьанэгъунэ уахът:",
+	"timezoneuseoffset": "НэмыкI (къэгъэлъагъу кощыр)",
+	"servertime": "Сервер уахът:",
+	"guesstimezone": "Браузерым къитхыкI",
+	"timezoneregion-africa": "Африкэ",
+	"timezoneregion-america": "Америкэ",
+	"timezoneregion-antarctica": "Антарктикэ",
+	"timezoneregion-arctic": "Арктикэ",
+	"timezoneregion-asia": "Азие",
+	"timezoneregion-atlantic": "Атлантик Океан",
+	"timezoneregion-australia": "Аустралие",
+	"timezoneregion-europe": "Еуропэ",
+	"timezoneregion-indian": "Индие Океан",
+	"timezoneregion-pacific": "Океан Шъэф",
+	"prefs-searchoptions": "Лъыхъу",
+	"prefs-namespaces": "ЦӀэчӀыпӀэхэр",
+	"prefs-files": "Файлэхэр",
+	"prefs-emailconfirm-label": "Емэйл уплъэкIуныгъэ:",
+	"youremail": "Емэйл:",
+	"username": "{{GENDER:$1|НэбгырацI}}:",
+	"prefs-registration": "Регистрацие уахът:",
+	"yourrealname": "ЦIэ шъыпкъэр:",
+	"yourlanguage": "Бзэ:",
+	"yourvariant": "КIоцIрытым ыбзэ и вариант:",
+	"yournick": "КIэтхэжьыкIакIэ:",
+	"badsig": "КIэтхэжьыкIэр къуанчэ.\nHTML тегхэр уплъэкIу.",
+	"gender-male": "Вики нэкIубгъомэ яIазэ",
+	"gender-female": "Вики нэкIубгъомэ яIазэ",
+	"email": "Емэйл",
+	"prefs-help-email-required": "Емэйл адрес ищыкIагъ.",
+	"prefs-info": "Къэбар шъхьаIэр",
+	"prefs-i18n": "Интернационализацие",
+	"prefs-signature": "КIэтхэжьыкIэ",
+	"prefs-dateformat": "Мафэ формат",
+	"prefs-timeoffset": "Уахътэм и кощ",
+	"prefs-editor": "ЕIэзакIо",
+	"prefs-preview": "Ыпэтеплъ",
+	"prefs-advancedrc": "ГъэпсыкIэ игъэкIотыгъэхэр",
+	"prefs-advancedrendering": "ГъэпсыкIэ игъэкIотыгъэхэр",
+	"prefs-advancedsearchoptions": "ГъэпсыкIэ игъэкIотыгъэхэр",
+	"prefs-advancedwatchlist": "ГъэпсыкIэ игъэкIотыгъэхэр",
+	"prefs-displayrc": "ГъэпсыкIэхэр къэгъэлъагъу",
+	"prefs-displaywatchlist": "ГъэпсыкIэхэр къэгъэлъагъу",
+	"prefs-tokenwatchlist": "Токен",
+	"email-address-validity-valid": "Емэйл адресыр тэрэзым фэд",
+	"email-address-validity-invalid": "Емэйл адрес тэрэз итх",
+	"userrights-lookup-user": "Нэбгырэмэ якупхэр гъэпс",
+	"userrights-user-editname": "Итх уи нэбгырацӀэр:",
+	"editusergroup": "Нэбгырэмэ я купмэ яIаз",
+	"userrights-editusergroup": "Нэбгырэмэ я купмэ яIаз",
+	"userrights-groupsmember": "Мы купмэ ахахьэ:",
+	"userrights-reason": "ЗыпкъырыкIырэр:",
+	"userrights-nodatabase": "Датэбазэу $1 щыIэп е хьанэгъунэу щытэп.",
+	"userrights-changeable-col": "Купхэу узхэIэзыхьашъущтхэр",
+	"userrights-unchangeable-col": "Купхэу узхэМыIэзыхьашъущтхэр",
+	"group": "Куп:",
+	"group-user": "Нэбгырэхэр",
+	"group-autoconfirmed": "АутоуплъэкIугъэ нэбгырэхэр",
+	"group-bot": "Ботхэр",
+	"group-sysop": "Ιэшъхьэтетхэр",
+	"group-bureaucrat": "Бюрократхэр",
+	"group-all": "(зэкIэ)",
+	"group-user-member": "{{GENDER:$1|нэбгырэ}}",
+	"group-autoconfirmed-member": "{{GENDER:$1|аутоуплъэкIугъэ нэбгырэ}}",
+	"group-bot-member": "{{GENDER:$1|бот}}",
+	"group-sysop-member": "{{GENDER:$1|Iэшъхьэтет}}",
+	"group-bureaucrat-member": "{{GENDER:$1|бюрократ}}",
+	"grouppage-user": "{{ns:project}}:Нэбгырэхэр",
+	"grouppage-autoconfirmed": "{{ns:project}}:АутоуплъэкIугъэ нэбгырэхэр",
+	"grouppage-bot": "{{ns:project}}:Ботхэр",
+	"grouppage-sysop": "{{ns:project}}:Ӏэшъхьэтетхэр",
+	"grouppage-bureaucrat": "{{ns:project}}:Бюрократхэр",
+	"right-read": "НэкIубгъомэ яплъ",
+	"right-edit": "НэкIубгъомэ яIаз",
+	"right-createtalk": "ТегущыIэнэ нэкIубгъохэр шIы",
+	"right-createaccount": "Нэбгырэмэ я аккаунт кIэхэр шIы",
+	"right-minoredit": "ЕIэзэнхэр цIыкIухэу гъэнафэх",
+	"right-move": "НэкIубгъомэ ацIэхэр хъожь",
+	"right-move-subpages": "Хьых нэкIубгъохэмрэ кIэтнэкIубгъохэмрэ",
+	"right-move-categorypages": "Хьы категорием и нэкIубгъохэр",
+	"right-movefile": "Файлэмэ ацIэхэр хъожь",
+	"right-upload": "Файлыр илъхь",
+	"right-reupload": "ЩыIэ файлхэм ашъхьэтетхэн",
+	"right-upload_by_url": "URL-м файлэхэр къищых",
+	"right-writeapi": "Итхэным пае API игъэфедэн",
+	"right-delete": "ТегъэкI нэкIбгъохэр",
+	"right-bigdelete": "ТегъэкI нэкIубгъохэр тарихъ кIахь зиIэ",
+	"right-browsearchive": "ТегъэкIыжьыгъэ нэкIубгъомэ алъыхъу",
+	"right-undelete": "ТемыгъэкI нэкIубгъор",
+	"right-viewsuppressed": "ЗэкIэмэ ашIогъэбылъыгъэ версиемэ яплъ",
+	"right-editcontentmodel": "НэкIубгъом и кIоцIырытым и модел зэблэхъун",
+	"right-editinterface": "Нэбгырэ-интерфейсым еIэзэн",
+	"right-editusercssjs": "НэмыкI нэбгырэмэ я CSS, JavaScript файлэмэ яIэзэн",
+	"right-editusercss": "НэмыкI нэбгырэмэ я CSS файлэмэ яIэзэн",
+	"right-edituserjs": "НэмыкI нэбгырэмэ я JavaScript файлэмэ яIэзэн",
+	"right-editmyusercss": "Уи CSS файлэмэ яIэзэн",
+	"right-editmyuserjs": "Уи JavaScript файлэмэ яIэзэн",
+	"right-viewmywatchlist": "Уи лъыплъэ купым еплъ",
+	"right-editmyoptions": "УигъэпсыкIэмэ яIаз",
+	"right-unwatchedpages": "Зылъымыплъэрэ нэкIубгъо купым еплъ",
+	"right-mergehistory": "НэкIубгъомэ ятарихъхэр зэпыдзэх",
+	"right-sendemail": "НэмыкIмэ емэйл афегъэхь",
+	"right-passwordreset": "ШъэфгущыIэм фэгъэхьыгъэ емэйлхэм яплъ",
+	"newuserlogpage": "ХэлэжьакӀомэ яублэн лог",
+	"action-read": "едж мы нэкIубгъом",
+	"action-edit": "мы нэкIубгъом еIаз",
+	"action-createpage": "нэкIубгъомэ я ублэн",
+	"action-createtalk": "тегущыIэнэ нэкIубгъомэ я ублэн",
+	"action-createaccount": "мы нэбгырэм и аккаунт ублэн",
+	"action-history": "мы нэкIубгъом и тарихъым еплъын",
+	"action-minoredit": "мы еIэзэныгъэр цIыкIоу гъэнаф",
+	"action-move": "мы нэкIубгъом ыцIэ хъожь",
+	"action-move-subpages": "хьы мы нэкIубгъори, кIэтнэкIубгъохэри",
+	"action-move-categorypages": "хьы категорием и нэкIубгъохэр",
+	"action-movefile": "хьы мы файлыр",
+	"action-upload": "илъхь мы файлэр",
+	"action-reupload": "мы файлыр икIэу къэтхыжь",
+	"action-upload_by_url": "илъхь мы файлыр мы URL-кIэ",
+	"action-writeapi": "еIэзэныгъэмэ апае API гъэфедэн",
+	"action-delete": "мы нэкIубгъор тегъэкI",
+	"action-deleterevision": "мы версиер тегъэкI",
+	"action-deletedhistory": "мы нэкIубгъом и тегъэкIыгъэ тарихъым еплъын",
+	"action-browsearchive": "тегъэкIыжьыгъэ нэкIубгъомэ алъыхъу",
+	"action-undelete": "мы нэкIубгъор теМыгъэкI",
+	"action-suppressrevision": "еплъи зэтегъэуцожь мы гъэбылъыгъэ версиер",
+	"action-import": "нэмыкI виким нэкIубгъохэр къих",
+	"action-importupload": "илъхьэгъэ файлэм нэкIубгъохэр къих",
+	"action-unwatchedpages": "зылъыМыплъэхэрэ нэкIубгъо купым яплъын",
+	"action-sendemail": "емэйлхэр ягъэхь",
+	"action-editmywatchlist": "уи лъыплъэ купым еIаз",
+	"action-viewmywatchlist": "уи лъыплъэ купым еплъ",
+	"nchanges": "$1 {{PLURAL:$1|зэхъокIыныгъэ|зэхъокIыныгъэхэр}}",
+	"enhancedrc-since-last-visit": "$1 {{PLURAL:$1|ыужрэ хэхьагъум азыфагу}}",
+	"enhancedrc-history": "тарихъ",
+	"recentchanges": "Ыужрэ зэхъокӀыныгъэхэр",
+	"recentchanges-legend": "БэмышӀ хэӀэзэгъу лъэкӀхэр",
+	"recentchanges-summary": "Мы нэкӀубгъом и вики и бэмышӀ зэхъокӀыныгъэхэм алъыплъ.",
+	"recentchanges-label-newpage": "Мы хэӀэзэныгъэм нэкӀубгъуакӀэ къышӀыгъ",
+	"recentchanges-label-minor": "Мыр хэӀэзэныгъэ цӀыкӀу",
+	"recentchanges-label-bot": "Мы хэӀэзэныгъэр ботым ышӀыгъ",
+	"recentchanges-label-unpatrolled": "Мы хэӀэзэныгъэм джыри патрулэу ауплъэкӀугъэп",
+	"recentchanges-label-plusminus": "НэкIубгъом ионтэгъугъэ мыщ фэдиз байт пчъагъэкIэ зэхъокIыгъэ",
+	"recentchanges-legend-heading": "'''Тхыдэ:'''",
+	"recentchanges-legend-newpage": "{{int:recentchanges-label-newpage}} (нэмыкӀэу еплъ [[Special:NewPages|нэкӀубгъуакӀэ куп]])",
+	"rclistfrom": "ХэIэзэныкIэхэр къэгъэлъагъу мыщ щегъэжьагъэу $2, $3",
+	"rcshowhideminor": "$1 зэхъокӀыныгъэ цӀыкӀу",
+	"rcshowhideminor-show": "Къэгъэлъагъу",
+	"rcshowhideminor-hide": "Гъэбылъ",
+	"rcshowhidebots": "$1 бот",
+	"rcshowhidebots-show": "Къэгъэлъагъу",
+	"rcshowhidebots-hide": "Гъэбылъ",
+	"rcshowhideliu": "$1 хэхьэгъэ хэлэжьакӀу",
+	"rcshowhideliu-show": "Къэгъэлъагъу",
+	"rcshowhideliu-hide": "Гъэбылъ",
+	"rcshowhideanons": "$1 цӀэрамыӀо нэбгырэхэр",
+	"rcshowhideanons-show": "Къэгъэлъагъу",
+	"rcshowhideanons-hide": "Гъэбылъ",
+	"rcshowhidepatr": "$1 уплъэкIужьыгъэ еIэзэн",
+	"rcshowhidepatr-show": "Къэгъэлъагъу",
+	"rcshowhidepatr-hide": "Гъэбылъ",
+	"rcshowhidemine": "$1 си хэӀэзэнхэр",
+	"rcshowhidemine-show": "Къэгъэлъагъу",
+	"rcshowhidemine-hide": "Гъэбылъ",
+	"rclinks": "Ыужрэ $1 зэхъокIыныгъэ къэгъэлъагъу мэфэ $2 ыкIоцI<br />$3",
+	"diff": "зэфэшъхь",
+	"hist": "тар",
+	"hide": "Гъэбылъ",
+	"show": "Къэгъэлъагъу",
+	"minoreditletter": "ц",
+	"newpageletter": "КӀ",
+	"boteditletter": "б",
+	"rc_categories_any": "ХэшыпыкIыгъэмэ ащыщ горэ",
+	"rc-change-size-new": "$1 {{PLURAL:$1|байт}} зэхъокӀым ыуж",
+	"newsectionsummary": "/* $1 */ секциякIэ",
+	"rc-enhanced-expand": "Ӏэмэ-псымэхэр къэгъэлъагъу",
+	"rc-enhanced-hide": "Жъыиэ паркӀэхэр гъэбылъых",
+	"recentchangeslinked": "ЕхьылӀэгъэ зэхъокӀыныгъэхэр",
+	"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": "Файлыр илъхь",
+	"uploadbtn": "Файлыр илъхь",
+	"uploadnologin": "Системэм хэхьагъэп",
+	"uploaderror": "Файл илъхьаныр фыкъуагъэ",
+	"uploadlogpage": "Илъхьанхэм я лог",
+	"filename": "ФайлыцIэ",
+	"filedesc": "КӀэкӀэу",
+	"fileuploadsummary": "КӀэкӀэу:",
+	"filereuploadsummary": "Файлым и зэблэхъунхэр:",
+	"filesource": "Лъапсэ:",
+	"minlength1": "ФайлэцIэр зы буквэу щытын фае мыхъуми.",
+	"filename-toolong": "ФайлыцIэр байт 240 нахьыбэ хъун лъэкIыщтэп.",
+	"badfilename": "ФайлыцIэр хъожьыгъэ мыщкIэ \"$1\".",
+	"filetype-missing": "Мы файлым зэхэщьыгъэ пари еIэп (\".jpg\" фэдэу).",
+	"empty-file": "Ебгъэхьыгъэ файлыр нэкIы.",
+	"file-too-large": "Ебгъэхьыгъэ файлыр иныщэ.",
+	"filename-tooshort": "ФайлыцIэр кIэкуащэ.",
+	"filetype-banned": "Мыфэдэ файл типыр адэрэп.",
+	"verification-error": "Мы файлым файл-уплъэкIуныр ыкIушъугъэп.",
+	"illegal-filename": "Мы файлыцIэр адэрэп.",
+	"overwrite": "ЩыIахэ файлым ушъхьатетхэ хъущтэп.",
+	"unknown-error": "Къончагъэ гор.",
+	"savefile": "Файлыр итх",
+	"uploadvirus": "Файлым вирусхэр илъыъ!\nКъэбар: $1",
+	"upload-source": "Лъэпсэ файл",
+	"sourcefilename": "Лъэпсэ файлым ыцI:",
+	"sourceurl": "Лъэпсэ URL:",
+	"destfilename": "ЗдакIорэ файлым цыI:",
+	"upload-maxfilesize": "Файлым иинагъэ максимум: $1",
+	"upload-description": "Файлым и къэбар",
+	"upload-options": "Илъхьан гъэпсыкIэхэр",
+	"watchthisupload": "Мы файлым лъыплъ",
+	"upload-success-subj": "ШIоу илъхьагъ",
+	"upload-proto-error": "Протокол фыкъуагъэ",
+	"upload-file-error": "ЫкIоцI фыкъуагъэ",
+	"upload-misc-error": "ЗэхэмышIыкIыгъэ илъхьан фыкъуагъэ",
+	"upload-http-error": "HTTP фыкъуагъэ горэ хъугъэ: $1",
+	"upload-dialog-title": "Файлыр илъхь",
+	"upload-dialog-error": "Фыкъуагъэ горэ хъугъэ",
+	"upload-dialog-button-cancel": "Ыуж икӀ",
+	"upload-dialog-button-done": "ЗэшIуэкIыгъэ",
+	"upload-dialog-button-save": "Итх",
+	"upload-dialog-button-upload": "Илъхь",
+	"upload-dialog-label-select-file": "Къыхэх файл",
+	"upload-dialog-label-infoform-title": "Къэбар",
+	"upload-dialog-label-infoform-name": "ЦIэ",
+	"upload-dialog-label-infoform-description": "АгурыбгъэIон",
+	"upload-dialog-label-usage-title": "Гъэфедэныгъэ",
+	"upload-dialog-label-usage-filename": "ФайлыцIэ",
+	"backend-fail-notexists": "Файлэу $1 щыIэп.",
+	"backend-fail-delete": "Файлэу \"$1\" тегъэкIын лъэкIырэп.",
+	"backend-fail-read": "Файлэу \"$1\" еплъын лъэкIырэп.",
+	"backend-fail-create": "Файлэу \"$1\" еIэзэн лъэкIырэп.",
+	"uploadstash": "Илъхьан шъэф",
+	"http-invalid-url": "URL къуанч: $1",
+	"http-read-error": "HTTP и еджэн фыкъуагъэ.",
+	"upload-curl-error6": "URL-м нэсын лъэкIырэп",
+	"license-header": "ЛицензиешӀын",
+	"nolicense": "Зи хэшыпыкIыгъэп",
+	"license-nopreview": "(Ыпэтеплъэр гъэпсыгъэп)",
+	"upload_source_file": "(къыхэпхыгъэ файлыр уи компьютер щыщ)",
+	"listfiles-delete": "ТегъэкI",
+	"listfiles_search_for": "ФайлыцIэмкIэ лыхъу:",
+	"imgfile": "файл",
+	"file-anchor-link": "Файл",
+	"filehist": "Файл тарихъ",
+	"filehist-help": "Мафэ/уахътэм теӀункӀ итеплъэр ащыгъум зэрэщытыгъэр плъэгъуным пае.",
+	"filehist-revert": "зэкIэгъэкIон",
+	"filehist-current": "джырэ",
+	"filehist-datetime": "Мафэ/Уахътэ",
+	"filehist-thumb": "рэсым цӀыку",
+	"filehist-thumbtext": "Зэманэу $1-м и версие и теплъэцIыкIу",
+	"filehist-user": "Нэбгрэ",
+	"filehist-dimensions": "Иинагъэхэр",
+	"filehist-comment": "ПыӀухьажь",
+	"imagelinks": "Файлым и гъэфедэн",
+	"linkstoimage": "КIэлъыкIорэ {{PLURAL:$1|нэкIубгъор ещэ|$1 нэкIубгъохэм ащэ}} мы файлым:",
+	"nolinkstoimage": "Мыщ къэзыщэу нэкӀубгъо пари щыӀэп.",
+	"sharedupload-desc-here": "Мы файлыр мыщ къикIыгъ $1 ыкIи нэмыкI проектхэм ащыгъэфедэн лъэкIыщт.\nИнформациеу [$2 файлым и гурыIон-тхыгъэм] щыщыр ычIэгъкIэ щыт.",
+	"upload-disallowed-here": "Мы файлым ухэӀэзахьыжьын уфитэп.",
+	"mimesearch": "MIME лъыхъун",
+	"mimetype": "MIME-тип",
+	"unwatchedpages": "Пари лымыплъэрэ нэкIубгъохэр",
+	"unusedtemplateswlh": "нэмыкI зэпыщэхэр",
+	"randompage": "ОшӀэдэмышӀэ нэкӀубгъу",
+	"randomincategory-category": "Категорие:",
+	"randomincategory-legend": "Категорием щыщэу ошIэдэмышIэ нэкIубгъу",
+	"randomincategory-submit": "КӀо",
+	"statistics": "Статистикэ",
+	"statistics-header-pages": "Нэк1убгъо статистикэ",
+	"statistics-header-edits": "ЕIэзэнхэм ястатистикэ",
+	"statistics-header-users": "Нэбгырэмэ ястатистикэ",
+	"statistics-header-hooks": "НэмыкI статистикэ",
+	"statistics-pages": "НэкӀубгъохэр",
+	"statistics-files": "Илъхьэгъэ файлэхэр",
+	"pageswithprop-submit": "КӀо",
+	"brokenredirects-edit": "еӀаз",
+	"brokenredirects-delete": "тегъэкI",
+	"withoutinterwiki": "Бзэ зэпыщэ зимыIэ нэкIубгъохэр",
+	"withoutinterwiki-summary": "Мы нэкIубгъомэ нэмыкI бзэ версиехэм ащэрэп.",
+	"withoutinterwiki-submit": "Къэгъэлъагъу",
+	"nbytes": "$1{{PLURAL:$1|байт|байтхэр}}",
+	"nmembers": "$1 {{PLURAL:$1|объект|объектхэр}}",
+	"uncategorizedcategories": "Категорие мыхьыгъэ категориехэр",
+	"uncategorizedimages": "Категорие мыхьыгъэ файлхэр",
+	"uncategorizedtemplates": "Категорие мыхьыгъэ шапхъэхэр",
+	"unusedcategories": "Мыгъэсэбэпыгъэ категориехэр",
+	"unusedimages": "Мыгъэсэбэпыгъэ файлхэр",
+	"wantedcategories": "ИщыкIэгъэ категориехэр",
+	"wantedpages": "ИщыкIэгъэ нэкIубгъохэр",
+	"wantedfiles": "ИщыкIэгъэ файлхэр",
+	"wantedtemplates": "ИщыкIэгъэ шапхъэхэр",
+	"mostlinked": "Нахьыбэу зыдащэрэ нэкIубгъохэр",
+	"mostlinkedcategories": "Нахьыбэу зыдащэрэ категориехэр",
+	"mostcategories": "Категорие нахьыбэ зиIэ нэкIубгъохэр",
+	"mostimages": "Нахьыбэу зыдащэрэ файлхэр",
+	"shortpages": "НэкIубгъо кIакIохэр",
+	"longpages": "НэкIубгъо кIахьхэр",
+	"protectedpages-page": "НэкӀубгъо",
+	"protectedpages-reason": "ЗыпкъырыкIырэр",
+	"protectedpages-unknown-timestamp": "ЗэхэмышIыкIыгъэ",
+	"newpages": "НэкӀубгъуакӀэхэр",
+	"newpages-username": "НэбгырацIэ:",
+	"ancientpages": "Жъыдэдэ нэкIубгъохэр",
+	"move": "Хьы",
+	"movethispage": "ЫцIэ зэблэхъу мы нэкIубгъом",
+	"pager-older-n": "{{PLURAL:$1|нахьыжъэу 1|нахьыжъхэу $1}}",
+	"booksources": "Тхылъхэр къыздикӀыгъэхэр",
+	"booksources-search-legend": "Тхылъ лъапсэхэм алъыхъу",
+	"booksources-search": "Лъыхъу",
+	"log": "Логхэр",
+	"log-title-wildcard": "Мы символхэмкIэ къежьэрэ нэкIубгъуацIэмэ алъыхъу",
+	"allpages": "НэкIубгъо пстэур",
+	"nextpage": "КIэлъыкIорэ нэкIубгъор ($1)",
+	"prevpage": "Ыпэит нэкубгъор ($1)",
+	"allarticles": "НэкӀубгъо пстэур",
+	"allinnamespace": "НэкIубгъо пстэур ($1 цIэчIыпIэр)",
+	"allpagessubmit": "KӀо",
+	"cachedspecial-refresh-now": "Ыуждэдэм еплъын.",
+	"categories": "Категориехэр",
+	"special-categories-sort-count": "гъэзаф пчъагъэкIэ",
+	"special-categories-sort-abc": "гъэзаф алфыбэкIэ",
+	"sp-deletedcontributions-contribs": "лэжьыгъэ",
+	"linksearch-pat": "Лъыхъун шапхъ:",
+	"linksearch-ns": "ЦӀэчӀыпӀ:",
+	"linksearch-ok": "Лъыхъу",
+	"listusers-submit": "Къэгъэлъагъу",
+	"listusers-noresult": "Нэбгырэ пари гъотыгъэп.",
+	"activeusers-hidebots": "Ботхэр гъэбылъ",
+	"activeusers-hidesysops": "Администраторхэр гъэбылъ",
+	"activeusers-noresult": "Нэбгырэ пари гъотыгъэп.",
+	"listgrouprights": "Нэбгырэмэ якупмэ яфитыныгъэхэр",
+	"listgrouprights-group": "Куп",
+	"listgrouprights-rights": "Фитыныгъэхэр",
+	"listgrouprights-helppage": "Help:Купхэм яфитыныгъэхэр",
+	"listgrouprights-members": "(хэлэжьэкIо пстэур)",
+	"listgrouprights-addgroup-all": "Куп пстэум хэгъахъу",
+	"listgrouprights-removegroup-all": "Куп пстэур тегъэкI",
+	"listgrouprights-namespaceprotection-namespace": "ЦӀэчӀыпӀ",
+	"trackingcategories": "Лъыплъэрэ категориехэр",
+	"trackingcategories-msg": "Лъыплъэрэ категорие",
+	"trackingcategories-name": "Мессаджым ыцIэ",
+	"mailnologin": "Гъахьыным пае адрес щыIэп",
+	"emailuser": "Нэбгырэм емэйл фегъэхь",
+	"emailuser-title-notarget": "Нэбгырэм емэйл фегъэхьын",
+	"noemailtitle": "Емэйл адресыр щыIэп",
+	"emailusername": "НэбгырацIэ:",
+	"emailusernamesubmit": "Егъэхь",
+	"emailmessage": "Мессадж:",
+	"emailsend": "Егъэхь",
+	"emailccme": "Симессаджым икопие къысфегъэхь.",
+	"emailsent": "Емэйлыр гъахьыгъэ",
+	"emailsenttext": "Уиемэйлыр моу джы гъахьыгъэ.",
+	"usermessage-summary": "Системэ мессадж къэгъан.",
+	"watchlist": "Лъыплъэ куп",
+	"mywatchlist": "Лъыплъэ куп",
+	"watchlistfor2": "$1 $2 пае",
+	"watchnologin": "Системэм хэхьагъэп",
+	"addwatch": "Лъыплъэ купым хэгъахъу",
+	"removewatch": "Лъыплъэ купым хэгъэкI",
+	"removedwatchtext-short": "НэкIубгъоу \"$1\" лъыплъэ купым хэгъэкIыгъэ.",
+	"watch": "Лъыплъ",
+	"watchthispage": "Мы нэкӀубгъом лъыплъ",
+	"unwatch": "Лъымыплъэжь",
+	"unwatchthispage": "Лъыплъэныр щыгъэт",
+	"watching": "Лъыплъ...",
+	"unwatching": "Лъымплъэжь...",
+	"enotif_impersonal_salutation": "{{SITENAME}} инэбгырэ",
+	"enotif_anon_editor": "ТымышӀэрэ нэбгыр $1",
+	"created": "къагъэхъуыгъ",
+	"changed": "зэблэхъугъэ",
+	"deletepage": "ТегъэкI нэкIубгъор",
+	"confirm": "Теубыт",
+	"excontent": "дэтхэгъагъэр: \"$1\"",
+	"excontentauthor": "дэтхэгъагъэр: \"$1\" (хэлэжьэкIо закъоэр \"[[Special:Contributions/$2|$2]]\")",
+	"delete-confirm": "ТегъэкI \"$1\"",
+	"delete-legend": "ТегъэкI",
+	"actioncomplete": "ЗэшIогъэкIыгъэ",
+	"actionfailed": "ЗэшIогъэкIыгъэп",
+	"dellogpage": "Тегъэкӏыкӏэ лог",
+	"dellogpagetext": "Анахь бэмышI тегъэкIынмэ я куп ычIэгъкIэ",
+	"deletionlog": "тегъэкӏынмэ я лог",
+	"reverted": "Ыпэрэ версие горэм дзыгъэ",
+	"deletecomment": "ЗыпкъырыкIырэр:",
+	"deletereasonotherlist": "ПэмыкI къызпкъырыкIрэр",
+	"delete-edit-reasonlist": "ТегъэкIын къызпкъырыкIхэм яIэзэн",
+	"deleteprotected": "Мы нэкIубгъор ухъумагъэшъ, тебгъэкIышъущтэп.",
+	"rollback": "ЕIэзэнхэр зэкIэгъэкIожь",
+	"rollbacklink": "къегъэгъэзэжъ",
+	"rollbacklinkcount": "зэкIэгъакIу $1 {{PLURAL:$1|зэхъокIыныгъэ|зэхъокIыныгъэхэр}}",
+	"sessionfailure-title": "Сессиер зэтеуагъ",
+	"changecontentmodel": "НэкIубгъом и кIоцIырытым и модел зэблэхъун",
+	"changecontentmodel-legend": "КIоцIырытым и модел зэблэхъун",
+	"changecontentmodel-title-label": "НэкIубгъуацIэ",
+	"changecontentmodel-model-label": "КIоцIырытым и моделыкIэ",
+	"changecontentmodel-reason-label": "ЗыпкъырыкIырэр:",
+	"changecontentmodel-success-title": "КIоцIырытым и модел зэблэхъугъэ",
+	"log-name-contentmodel": "КIоцIырыт моделым и зэхъокIхэм я тарихъ",
+	"protectlogpage": "Ухъумэным и лог",
+	"protectedarticle": "ухъумагъэ «[[$1]]»",
+	"unprotectedarticle": "\"[[$1]]\" и ухъумэныгъэр техыгъ",
+	"prot_1movedto2": "[[$1]]-р мыдыкIэ кощыгъэ [[$2]]",
+	"protect-badnamespace-title": "Мыухъумэгъэ цIэчIыпI",
+	"protect-badnamespace-text": "ЦIэчIыпIэм илъ нэкIубгъохэр ухъумэгъэн лъэкIырэп.",
+	"protect-norestrictiontypes-title": "Мыухъумэгъэ нэкIубгъу",
+	"protect-legend": "Тегъэпытыхь ухъумэныгъэр",
+	"protectcomment": "ЗыпкъырыкIырэр:",
+	"protectexpiry": "ЕкΙыжьы:",
+	"protect_expiry_invalid": "ИкI-зэманыр къуанчэ.",
+	"protect-default": "Мыухъумагъэ",
+	"protect-level-autoconfirmed": "АутоуплъэкIужьыгъэ нэбгырэ закъохэр ары фитхэр",
+	"protect-level-sysop": "Администратор закъохэр ары фитхэр",
+	"protect-summary-cascade": "каскадэу",
+	"protect-expiring": "екIыжьы $1 (UTC)",
+	"protect-expiring-local": "екIыжьы $1",
+	"protect-othertime": "ПэмыкI зэман:",
+	"protect-othertime-op": "пэмыкI зэман",
+	"protect-otherreason-op": "ПэмыкI къызпкъырыкIрэр",
+	"protect-edit-reasonlist": "Ухъумэн къызпкъырыкIхэм яIэзэн",
+	"restriction-type": "Фитыныгъэ:",
+	"minimum-size": "Минимал инагъэ",
+	"maximum-size": "Максимал инагъэ:",
+	"pagesize": "(байт)",
+	"restriction-edit": "ЕIаз",
+	"restriction-move": "Хьы",
+	"restriction-create": "КъэшI",
+	"restriction-upload": "Къыхащ",
+	"restriction-level-sysop": "зэрэпсаоу ухъумагъэ",
+	"restriction-level-autoconfirmed": "(ызныкъокӀэ ухъумагъэ)",
+	"undelete": "ТегъэкIыгъэ нэкIубгъохэр къэгъэлъагъу",
+	"undeletepage": "ТегъэкIыгъэ нэкIубгъохэр къэгъэлъагъу, зэшIогъэуцожьых",
+	"viewdeletedpage": "ТегъэкIыгъэ нэкIубгъохэр къэгъэлъагъу",
+	"undelete-fieldset-title": "Версиехэр зэшIогъэуцожь",
+	"undeletebtn": "ЗэшIогъэуцожь",
+	"undeletelink": "еплъ/зэкIэгъакIу",
+	"undeleteviewlink": "еплъ",
+	"undeletecomment": "ЗыпкъырыкIырэр:",
+	"undelete-search-title": "ТегъэкIыжьыгъэ нэкIубгъомэ алъыхъу",
+	"undelete-search-box": "ТегъэкIыжьыгъэ нэкIубгъомэ алъыхъу",
+	"undelete-search-prefix": "Къэгъэлъагъу нэкIубгъохэр мыщкIэ къежьэхэрэр:",
+	"undelete-search-submit": "Лъыхъу",
+	"undelete-show-file-submit": "Ары",
+	"namespace": "ЦӀэчӀыпӀ:",
+	"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 нэбгырэм и лэжьыгъэ",
+	"mycontris": "Лэжьыгъэ",
+	"contribsub2": "{{GENDER:$3|$1}} пае ($2)",
+	"contributions-userdoesnotexist": "Аккаунтэу \"$1\" регистрацие шIыгъэп.",
+	"uctop": "(джырэ)",
+	"month": "Мазэм ыкӀоцӀ (ыкӀи нахь жьэу):",
+	"year": "Илъэсым ыкӀоцӀ (ыкӀи нахь жьэу):",
+	"sp-contributions-newbies": "Аккаунт кШэ закъомэ я лэжьыгъэр къэгъэлъагъу",
+	"sp-contributions-newbies-sub": "Аккаунт кIэмэ апай",
+	"sp-contributions-logs": "Логхэр",
+	"sp-contributions-talk": "тегущыI",
+	"sp-contributions-username": "IP-адрес е нэбгырацIэ:",
+	"sp-contributions-submit": "Лъыхъу",
+	"whatlinkshere": "Мы нэкӀубгъом къэзыщэрэ зэпыщэхэр",
+	"whatlinkshere-title": "\"$1\"-м къэзыщэрэ нэкӀубгъохэр",
+	"whatlinkshere-page": "НэкӀубгъо:",
+	"linkshere": "Мы нэкӀубгъомэ зэпыщэр мыщ къащэ <strong>[[:$1]]</strong>:",
+	"isredirect": "езгъэкӀокӀырэ нэкӀубгъо",
+	"istemplate": "хэлъхьаныгъэ",
+	"isimage": "файл зэпыщэ",
+	"whatlinkshere-prev": "{{PLURAL:$1|ыпэ ит|ыпэ ит $1}}",
+	"whatlinkshere-next": "{{PLURAL:$1|кӀэлъыкӀорэр|кӀэлъыкӀорэ $1}}",
+	"whatlinkshere-links": "← зэпыщэхэр",
+	"whatlinkshere-hideredirs": "$1 гъэкӀожьын",
+	"whatlinkshere-hidetrans": "$1 хэлъхьаныгъэ",
+	"whatlinkshere-hidelinks": "$1 зэпыщ",
+	"whatlinkshere-filters": "Филтрэхэр",
+	"ipaddressorusername": "IP-адрес е нэбгырацIэ:",
+	"ipbreason": "ЗыпкъырыкIырэр:",
+	"ipbemailban": "Нэбгырэм емэйл ымыгъэхьышъунэу шIы",
+	"ipboptions": "сыхьатитIу:2 hours, зымаф:1 day,мэфищ:3 days, зытхьамаф:1 week, тхьамафитӀу:2 weeks, зымаз:1 month, мэзищ:3 months, мэзих:6 months, зыилъэс:1 year, ренэу:infinite",
+	"badipaddress": "IP адрес фыкъуагъэ",
+	"blocklist-reason": "ЗыпкъырыкIырэр",
+	"ipblocklist-submit": "Лъыхъу",
+	"ipblocklist-empty": "Блок купыр нэкIы.",
+	"blocklink": "егъэт",
+	"unblocklink": "Ӏухъотещ",
+	"change-blocklink": "Ӏухъор зэблэхъу",
+	"contribslink": "лъэжьыгъэ",
+	"movelogpage": "Кощхэм я лог",
+	"revertmove": "зэкIэгъэкIон",
+	"export": "НэкӀубгъохэр къыхэщын",
+	"export-addcattext": "Хэгъахъу нэкIубгъохэр категорием щыщэу:",
+	"export-addcat": "Хэгъахъу",
+	"export-addnstext": "Хэгъахъу нэкIубгъохэр цIэчIыпIэм щыщэу:",
+	"export-addns": "Хэгъахъу",
+	"allmessages": "Системэ мессаджхэр",
+	"allmessagesname": "ЦIэ",
+	"allmessagescurrent": "Джырэ мессаджым итекст",
+	"allmessages-filter-legend": "Филтр",
+	"allmessages-filter-unmodified": "ЗэмыхъакIыгъэ",
+	"allmessages-filter-all": "ЗэкIэ",
+	"allmessages-filter-modified": "ЗэхъокIыгъэ",
+	"allmessages-language": "Бзэ:",
+	"allmessages-filter-submit": "КӀо",
+	"allmessages-filter-translate": "ЗэдзэкI",
+	"thumbnail-more": "Джадэ къэшӀ",
+	"filemissing": "Файлыр щэкIэ",
+	"thumbnail_error_remote": "Къончагъэм имессадж, зиер $1: $2",
+	"import-interwiki-sourcewiki": "Лъапсэм и вики:",
+	"import-interwiki-sourcepage": "Лъапсэ нэкIубгъор:",
+	"import-interwiki-submit": "Къих",
+	"import-mapping-namespace": "Къихи цIэчIыпIэм къилъхь:",
+	"import-upload-filename": "ФайлыцIэ:",
+	"import-comment": "ПыIухьажь:",
+	"tooltip-pt-userpage": "Ситхьапэ",
+	"tooltip-pt-mytalk": "Уи гущыӀэ нэкӀубгъу",
+	"tooltip-pt-preferences": "Сызыфаехэр",
+	"tooltip-pt-watchlist": "НэкӀубгъоу зэӀазэхэрэм узылъыплъэу куп",
+	"tooltip-pt-mycontris": "Силэжьыгъэр",
+	"tooltip-pt-login": "Системэм ухахьэмэ дэгъу; егъэзыгъэ Ӏофэп",
+	"tooltip-pt-logout": "ХэкӀыжь системэм",
+	"tooltip-pt-createaccount": "Ӏамал щыӀэмэ аккаунт егъажьи системэм хахь; ау егъэзыгъэ Ӏоф хэлъэп",
+	"tooltip-ca-talk": "Апэ мэхьанэ нэкӀубгъом и тегущыӀэн",
+	"tooltip-ca-edit": "Гъэтэрэзыжь мы нэкӀубгъор",
+	"tooltip-ca-addsection": "Секцие кӀэ горэ къэубл",
+	"tooltip-ca-viewsource": "Мы нэкубгъор ухъумагъ.\nАу ылъапсэ плъэгъушъущт",
+	"tooltip-ca-history": "Мы нэкӀубгъом иверсиежъхэр",
+	"tooltip-ca-move": "Хьы мы нэкӀубгъор",
+	"tooltip-ca-watch": "НэкӀубгъор лъыплъэ купым хэгъахъу",
+	"tooltip-ca-unwatch": "Мы нэкIубгъор си лъыплъэ купым хэгъэкI",
+	"tooltip-search": "{{SITENAME}}-ым лъыхъу",
+	"tooltip-search-go": "ЩыӀэмэ, мыр зыцӀэ дэдэ нэкӀубгъом кӀо",
+	"tooltip-search-fulltext": "Мы тхыгъэр нэкӀубгъомэ къахэгъуат",
+	"tooltip-p-logo": "НэкӀубгъо шъхьаӀэм кӀо",
+	"tooltip-n-mainpage": "НэкӀубгъо шъхьаӀэм кӀо",
+	"tooltip-n-mainpage-description": "НэкӀубгъо шъхьаӀэм кӀо",
+	"tooltip-n-portal": "Проектым пае, пшӀэшъущтыр, сыд пӀомэ узэплъыщтыр",
+	"tooltip-n-currentevents": "КъэбаркӀэ нэкӀубгъу",
+	"tooltip-n-recentchanges": "Мы виким и аужрэ зэхъокӀыгъохэр",
+	"tooltip-n-randompage": "ОшӀэдэмышӀэ нэкӀубгъогорэ къигъахь",
+	"tooltip-n-help": "ӀэпыӀэгъу зыщыбгъотыщт чӀыпӀэр",
+	"tooltip-t-whatlinkshere": "Мы нэкӀубгъом къэзыщэрэ зэпыщэ пстэур",
+	"tooltip-t-recentchangeslinked": "Мы нэкӀубгъом пышӀагъэ нэкӀубгъорхэмэ яаужрэ зэблэхъухэр",
+	"tooltip-feed-atom": "Мы нэкӀубгъом ехьылӀэгъэ Atom чэзыур",
+	"tooltip-t-contributions": "Мы нэбгырэм и лэжьыгъэхэр",
+	"tooltip-t-upload": "Файлэхэр къилъхь",
+	"tooltip-t-specialpages": "Шъхьаф нэкӀубгъо пстэур",
+	"tooltip-t-print": "НэкӀубгъом ихэутын теплъ",
+	"tooltip-t-permalink": "Мы нэкӀубгъом къакIорэ зэмыхъокӀ зэпыщ",
+	"tooltip-ca-nstab-main": "КӀоцӀытхагъэм еплъ",
+	"tooltip-ca-nstab-user": "ЦӀыфым итхьапэ еплъ",
+	"tooltip-ca-nstab-special": "Мы нэкӀубгъор шъхьафы, зыцэ хэптхэжьын хъущтэп",
+	"tooltip-ca-nstab-project": "Проектым и нэкӀубгъу",
+	"tooltip-ca-nstab-image": "Тхьапэм и файл еплъ",
+	"tooltip-ca-nstab-mediawiki": "Систем мессаджым еплъ",
+	"tooltip-ca-nstab-template": "Шапхъэ къэгъэлъагъу",
+	"tooltip-ca-nstab-category": "Категорие тхьапэм еплъ",
+	"tooltip-minoredit": "Мэхьанэ зимыIэ хэIэзэныгъэу къэгъэлъагъу",
+	"tooltip-save": "Зэблэпхъугъэхэр дэтхэжь",
+	"tooltip-preview": "Ыпэ яплъ уи хэӀэзэнхэм, мыр гъэфедэба бгъэпытэным ыпэ!",
+	"tooltip-diff": "Яплъ зэпхъокӀыгъэхэмэ",
+	"tooltip-rollback": "\"ЗэкIэгъакIу\"-эм зэтеIункIэу зэкIегъэкIожьы еIэзэнхэу ыужрэ хэлэжьакIомкIэ шIыгъэхэр",
+	"tooltip-undo": "«КӀэгъэкӀожьын»-ым мы зэхъокӀыныгъэр зэкӀегъэкӀожьы ыкӀи еӀэзэкӀо формэр утеплъэшъунэу къызэӀуехы. ЗыфызэкӀэбгъэкӀожьыгъэри пыптхэжьышъущт.",
+	"tooltip-summary": "Къэбар тӀэкӀу горэ итх",
+	"simpleantispam-label": "Спам-ебэнрэ уплъэкӀун.\nМыщ зи хаптхэ <strong>хъущтэп</strong>!",
+	"pageinfo-language": "НэкIубгъом ыбз",
+	"pageinfo-toolboxlink": "НэкӀубгъом и информацие",
+	"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.",
+	"show-big-image-other": "НэпэмыкI {{PLURAL:$2|зэхэщыкIэ|зэхэщыкIэхэр}}: $1.",
+	"show-big-image-size": "Пиксел $1 × $2",
+	"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э",
+	"exif-datetime": "Файлым и зэхъокӀын мафэрэ, и зэманрэ",
+	"exif-make": "Камерэр къыдэзгъэкӀыгъэр",
+	"exif-model": "Камерэм и модел",
+	"exif-software": "Программ купэу гъэфедагъэр",
+	"exif-exifversion": "Exif версиер",
+	"exif-colorspace": "Теплъэшъо чӀыпӀэ",
+	"exif-datetimeoriginal": "Датэм и къежьэпӀэ мафэрэ уахътэрэ",
+	"exif-datetimedigitized": "ЦифрэшӀыным и мафэрэ, и уахътэрэ",
+	"exif-languagecode": "Бзэ",
+	"exif-orientation-1": "Тэрэз",
+	"namespacesall": "зэкӀэ",
+	"monthsall": "зэкӀэ",
+	"signature": "[[{{ns:user}}:$1|$2]] ([[{{ns:user_talk}}:$1|тегущыIэныр]])",
+	"fileduplicatesearch-submit": "Лъыхъу",
+	"specialpages": "ЯӀамышӀыкӀ нэкӀубгъохэр",
+	"specialpages-group-login": "Къыхахь / аккаунт къэубл",
+	"tag-filter": "[[Special:Tags|Tag]] филтрэр:",
+	"tag-list-wrapper": "([[Special:Tags|{{PLURAL:$1|Гъэнэфалъ|Гъэнэфалъэхэр}}]]: $2)",
+	"logentry-delete-delete": "$3 нэкӀубгъор $1 {{GENDER:$2|Ӏыгъ}}",
+	"logentry-move-move": "$1 {{GENDER:$2|ыгъэкощыгъэ}} нэкIубгъоу $3-р $4-м",
+	"logentry-newusers-create": "ХэлэжьэкIо аккаунтэу $1 {{GENDER:$2|ублагъэ}}",
+	"logentry-upload-upload": "$1 {{GENDER:$2|къырищыгъ}} $3",
+	"feedback-message": "Мессадж:",
+	"searchsuggest-search": "Лъыхъу",
+	"api-error-badtoken": "ЫкIоцI фыкъуагъэ: Токен дэй.",
+	"api-error-empty-file": "Ебгъэхьыгъэ файлыр нэкIы.",
+	"expand_templates_input": "Ихьэрэ текст:",
+	"expand_templates_output": "Резултат",
+	"expand_templates_xml_output": "XML къикIырэр",
+	"expand_templates_ok": "Хъун",
+	"expand_templates_remove_comments": "ТегъэкI комментхэр",
+	"expand_templates_preview": "Ыпэтеплъ",
+	"pagelanguage": "НэкIубгъом ыбзэ къыхэх",
+	"pagelang-name": "НэкӀубгъо",
+	"pagelang-language": "Бзэ",
+	"pagelang-select-lang": "Бзэр къыхэх",
+	"right-pagelang": "НэкIубгъом ыбзэр зэблэхъу",
+	"action-pagelang": "мы нэкIубгъом ыбзэ зэблэхъу",
+	"log-name-pagelang": "Бзэ зэблэхъунхэм я журнал",
+	"mediastatistics-table-mimetype": "MIME-тип",
+	"mediastatistics-table-count": "Файл пчъагъэр",
+	"mediastatistics-table-totalbytes": "Пстэум ионтэгъугъэ",
+	"mediastatistics-header-unknown": "ЗэхэмышIыкIыгъэ",
+	"mediastatistics-header-drawing": "Сурэтхэр (вектор сурэтхэр)",
+	"mediastatistics-header-audio": "Мэкъамэ",
+	"mediastatistics-header-video": "Видео",
+	"mediastatistics-header-multimedia": "Мултимедиэ",
+	"mediastatistics-header-office": "Офис",
+	"mediastatistics-header-text": "Текстхэр",
+	"mediastatistics-header-archive": "Фызыгъэ форматхэр",
+	"json-error-state-mismatch": "Мыхъун е фыкъуэгъэ JSON",
+	"json-error-syntax": "Синтакс къончагъэ",
+	"headline-anchor-title": "Мы секцием къэзыщэрэ зэпыщ",
+	"special-characters-group-latin": "Латин",
+	"special-characters-group-latinextended": "Латин зэхэщыгъэ",
+	"special-characters-group-ipa": "ДФА",
+	"special-characters-group-symbols": "Символхэр",
+	"special-characters-group-greek": "Урым",
+	"special-characters-group-cyrillic": "Кирилл",
+	"special-characters-group-arabic": "Арап",
+	"special-characters-group-arabicextended": "Арап зэхэщыгъэ",
+	"special-characters-group-persian": "Перс",
+	"special-characters-group-hebrew": "Джурт",
+	"special-characters-group-bangla": "Бенгал",
+	"special-characters-group-tamil": "Тамил",
+	"special-characters-group-telugu": "Телугу",
+	"special-characters-group-sinhala": "Сингал",
+	"special-characters-group-gujarati": "Гуджарати",
+	"special-characters-group-devanagari": "Деванагари",
+	"special-characters-group-thai": "Тай",
+	"special-characters-group-lao": "Лао",
+	"special-characters-group-khmer": "Кхмер",
+	"special-characters-title-endash": "ыку-тире",
+	"special-characters-title-emdash": "тире кIахь",
+	"special-characters-title-minus": "минус символ",
+	"mw-widgets-dateinput-no-date": "Мафэр гъэнэфагъэп",
+	"mw-widgets-titleinput-description-new-page": "нэкIубгъор джыри щыIэп",
+	"mw-widgets-titleinput-description-redirect": "гъакIо мыкIэ $1"
+}
diff --git a/languages/i18n/aeb-arab.json b/languages/i18n/aeb-arab.json
index 291ff16190..906ef0c76f 100644
--- a/languages/i18n/aeb-arab.json
+++ b/languages/i18n/aeb-arab.json
@@ -8,7 +8,8 @@
 			"아라",
 			"Aħmedbaɛl",
 			"GeekEmad",
-			"Nemo bis"
+			"Nemo bis",
+			"Shbib Al-Subaie"
 		]
 	},
 	"tog-usenewrc": ")جمّع التعديلات حسب الصفحة في أحدث التغييرات وقائمة المراقبة (يتطلب جافاسكربت",
@@ -220,7 +221,7 @@
 	"passwordreset-emailtitle": "تفاصيل حساب {{SITENAME}}",
 	"passwordreset-emailtext-ip": "احد ما (قد يكون انت$1)طلب مذكرة تفاصيل الحساب ل{{SITENAME}} ($4).المستخدم الاتي {{PLURAL:$3|الحساب هو|الحسابات هي}} قد قرن بهذا العنوان :\n\n$2\n\n{{PLURAL:$3|كلمة المرور المؤقتة|كلمات المرور المؤقة}}سينتهي في {{PLURAL:$5|يوم|ايام$5 }}\nمن الافضل ان تسجل الدخول وتختار كلمة مرور جديدة الان .\nإذا قام شخص آخر بهذا الطلب، أو إذا  تذكرت كلمة المرور الأصلية الخاصة بك،ولم تعد ترغب في تغييره، يمكنك تجاهل هذه الرسالة ومتابعة استخدام  كلمة المرورالقديمة.",
 	"passwordreset-emailtext-user": "احد ما (قد يكون انت$1)طلب مذكرة تفاصيل الحساب ل{{SITENAME}} ($4).المستخدم الاتي {{PLURAL:$3|الحساب هو|الحسابات هي}} قد قرن بهذا العنوان :\n\n$2\n\n{{PLURAL:$3|كلمة المرور المؤقتة|كلمات المرور المؤقة}}سينتهي في {{PLURAL:$5|يوم|ايام$5 }}\nمن الافضل ان تسجل الدخول وتختار كلمة مرور جديدة الان .\nإذا قام شخص آخر بهذا الطلب، أو إذا  تذكرت كلمة المرور الأصلية الخاصة بك،ولم تعد ترغب في تغييره، يمكنك تجاهل هذه الرسالة ومتابعة استخدام  كلمة المرورالقديمة.",
-	"passwordreset-emailelement": "اسم المستخدم: $1\nكلمة السر المؤقتة: $2",
+	"passwordreset-emailelement": "اسم المستخدم: \n$1\n\nكلمة السر المؤقتة: \n$2",
 	"passwordreset-emailsent": "أرسل بريد إلكتروني تذكيري",
 	"passwordreset-emailsent-capture": "أرسل بريد إلكتروني تذكيري وهو معروض بالأسفل.",
 	"passwordreset-emailerror-capture": "ولّد بريد إلكتروني تذكيري وهو معروض بالأسفل لكن فشل إرساله للمستخدم: $1",
@@ -585,7 +586,7 @@
 	"isredirect": "صفحة تحويل",
 	"istemplate": "مضمن",
 	"isimage": "وصلة ملف",
-	"whatlinkshere-next": "{{PLURAL:$1|القادمة|ال$1 القادمة}}",
+	"whatlinkshere-next": "{{PLURAL:$1|التالية|ال$1 التالية}}",
 	"whatlinkshere-links": "← وصلات",
 	"whatlinkshere-hideredirs": "$1 التحويلات",
 	"whatlinkshere-hidetrans": "$1 التضمينات",
diff --git a/languages/i18n/af.json b/languages/i18n/af.json
index 7a6bc77e65..d1a8fd4a99 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",
@@ -174,13 +175,13 @@
 	"navigation-heading": "Navigasie-keuseskerm",
 	"errorpagetitle": "Fout",
 	"returnto": "Keer terug na $1.",
-	"tagline": "in {{SITENAME}}",
+	"tagline": "Vanaf {{SITENAME}}",
 	"help": "Hulp",
 	"search": "Soek",
 	"searchbutton": "Soek",
 	"go": "Wys",
 	"searcharticle": "Wys",
-	"history": "Ouer weergawes",
+	"history": "Bladsygeskiedenis",
 	"history_short": "Geskiedenis",
 	"updatedmarker": "opgedateer sedert my laaste besoek",
 	"printableversion": "Drukbare weergawe",
@@ -241,7 +242,7 @@
 	"aboutsite": "Inligting oor {{SITENAME}}",
 	"aboutpage": "Project:Omtrent",
 	"copyright": "Inhoud is onderhewig aan $1, tensy anders vermeld",
-	"copyrightpage": "{{ns:project}}:kopiereg",
+	"copyrightpage": "{{ns:project}}:Kopieregte",
 	"currentevents": "Huidige gebeure",
 	"currentevents-url": "Project:Huidige gebeure",
 	"disclaimers": "Voorbehoud",
@@ -289,9 +290,9 @@
 	"feed-invalid": "Voertipe word nie ondersteun nie.",
 	"feed-unavailable": "Sindikasievoer is nie beskikbaar",
 	"site-rss-feed": "$1 RSS-voer",
-	"site-atom-feed": "$1 Atom-voer",
+	"site-atom-feed": "$1 Atoomvoer",
 	"page-rss-feed": "\"$1\" RSS-voer",
-	"page-atom-feed": "\"$1\" Atom-voer",
+	"page-atom-feed": "\"$1\" Atoomvoer",
 	"red-link-title": "$1 (bladsy bestaan nie)",
 	"sort-descending": "Sorteer aflopend",
 	"sort-ascending": "Sorteer oplopend",
@@ -513,7 +514,7 @@
 	"passwordreset-emailtitle": "Gebruiker se details op {{site name}}",
 	"passwordreset-emailtext-ip": "Iemand, waarskynlik u vanaf die IP-adres $1, het u gebruikersgegewens vir {{SITENAME}} ($4) opgevra.\nDie volgende {{PLURAL:$3|gebruiker is|gebruikers is}} aan die e-posadres gekoppel:\n\n$2\n\n{{PLURAL:$3|Die tydelike wagwoord verval|Hierdie tydelike wagwoorde verval}} oor {{PLURAL:$5|een dag|$5 dae}}.\nMeld asseblief nou aan en wysig u wagwoord. As u dit nie versoek het nie, of as u die oorspronklike wagwoord nog ken en dit nie wil verander nie, ignoreer die berig en hou aan om u ou wagwoord te gebruik.",
 	"passwordreset-emailtext-user": "Gebruiker $1 op die webtuiste {{SITENAME}} het u gebruikersgegewens vir {{SITENAME}} ($4) opgevra.\nDie volgende {{PLURAL:$3|gebruiker is|gebruikers is}} aan die e-posadres gekoppel:\n\n$2\n\n{{PLURAL:$3|Die tydelike wagwoord verval|Hierdie tydelike wagwoorde verval}} oor {{PLURAL:$5|een dag|$5 dae}}.\nMeld asseblief aan en verander u wagwoord nou. As u dit nie versoek het nie, of as u die oorspronklike wagwoord nog ken en dit nie wil verander nie, ignoreer die berig en hou aan om u ou wagwoord te gebruik.",
-	"passwordreset-emailelement": "Gebruikersnaam: $1\nTydelike wagwoord: $2",
+	"passwordreset-emailelement": "Gebruikersnaam: \n$1\n\nTydelike wagwoord: \n$2",
 	"passwordreset-emailsent": "'n E-pos is gestuur om u wagwoord te herstel.",
 	"passwordreset-emailsent-capture": "'n E-pos vir die herstel van 'n wagwoord is gestuur. Dit word hieronder vertoon.",
 	"passwordreset-emailerror-capture": "'n E-pos vir die herstel van 'n wagwoord is saamgestel. Dit word hieronder vertoon. Die uitstuur daarvan na die {{GENDER:$2|gebruiker}} het egter gefaal: $1",
@@ -526,7 +527,7 @@
 	"changeemail-password": "U wagwoord vir {{SITENAME}}:",
 	"changeemail-submit": "Wysig E-posadres",
 	"resettokens-token-label": "$1 (huidige waarde: $2)",
-	"bold_sample": "Vetgedrukte teks",
+	"bold_sample": "Vetdruk",
 	"bold_tip": "Vetdruk",
 	"italic_sample": "Skuinsgedrukte teks",
 	"italic_tip": "Skuinsdruk",
@@ -539,9 +540,9 @@
 	"nowiki_sample": "Plaas ongeformatteerde teks hier",
 	"nowiki_tip": "Ignoreer wiki-formattering",
 	"image_sample": "Voorbeeld.jpg",
-	"image_tip": "Beeld/prentjie/diagram",
+	"image_tip": "Medialêer",
 	"media_sample": "Voorbeeld.ogg",
-	"media_tip": "Skakel na ander tipe medialêer",
+	"media_tip": "Lêerskakel",
 	"sig_tip": "Handtekening met datum",
 	"hr_tip": "Horisontale streep (selde nodig)",
 	"summary": "Opsomming:",
@@ -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.'''",
@@ -681,9 +682,9 @@
 	"viewpagelogs": "Bekyk logboeke vir hierdie bladsy",
 	"nohistory": "Daar is geen wysigingsgeskiedenis vir hierdie bladsy nie.",
 	"currentrev": "Huidige wysiging",
-	"currentrev-asof": "Huidige wysiging per $1",
+	"currentrev-asof": "Huidige wysiging sedert $1",
 	"revisionasof": "Wysiging soos op $1",
-	"revision-info": "Weergawe deur {{GENDER:$6|$2}} op $4 om $5$7",
+	"revision-info": "Weergawe deur {{GENDER:$6|$2}} op $1$7",
 	"previousrevision": "← Ouer weergawe",
 	"nextrevision": "Nuwer weergawe →",
 	"currentrevisionlink": "Huidige weergawe",
@@ -787,8 +788,8 @@
 	"mergelog": "Versmeltingslogboek",
 	"revertmerge": "Samesmelting ongedaan maak",
 	"mergelogpagetext": "Hieronder is 'n lys van die mees onlangse versmeltings van een bladsy se geskiedenis na 'n ander.",
-	"history-title": "$1: weergawegeskiedenis",
-	"difference-title": "$1: verskil tussen weergawes",
+	"history-title": "Weergawegeskiedenis van \"$1\"",
+	"difference-title": "Verskil tussen weergawes van \"$1\"",
 	"difference-title-multipage": "$1 en $2: verskil tussen bladsye",
 	"difference-multipage": "(Verskil tussen bladsye)",
 	"lineno": "Lyn $1:",
@@ -796,6 +797,7 @@
 	"showhideselectedversions": "Wys/versteek gekose weergawes",
 	"editundo": "maak ongedaan",
 	"diff-empty": "(Geen verskil)",
+	"diff-multi-sameuser": "({{PLURAL:$1|Een tussenin wysiging|$1 tussenin wysigings}} deur dieselfde gebruiker nie gewys nie)",
 	"diff-multi-manyusers": "({{PLURAL:$1|Een tussenin wysiging|$1 tussenin wysigings}} deur meer as $2 {{PLURAL:$2|gebruiker|gebruikers}} nie gewys nie)",
 	"difference-missing-revision": "{{PLURAL:$2|'n Weergawe|$2 weergawes}} van die verskil ($1) {{PLURAL:$2|is|is}} nie gevind nie.\n\nDit word meestal veroorsaak deur die volg van 'n verouderde verwysing na 'n bladsy wat verwyder is.\nDetails kan in die [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} skraplogboek] gevind word.",
 	"searchresults": "Soekresultate",
@@ -809,7 +811,7 @@
 	"next-page": "volgende bladsy",
 	"prevn-title": "Vorige {{PLURAL:$1|resultaat|$1 resultate}}",
 	"nextn-title": "Volgende {{PLURAL:$1|resultaat|$1 resultate}}",
-	"shown-title": "$1 {{PLURAL:$1|resultaat|resultate}} per bladsy",
+	"shown-title": "Wys $1 {{PLURAL:$1|resultaat|resultate}} per bladsy",
 	"viewprevnext": "Wys ($1 {{int:pipe-separator}} $2) ($3).",
 	"searchmenu-exists": "'''Daar is reeds 'n bladsy genaamd \"[[:$1]]\" op die wiki'''",
 	"searchmenu-new": "<strong>Skep die bladsy \"[[:$1]]\" op hierdie wiki</strong> {{PLURAL:$2|0=|Sien ook die bladsy wat in u soektog gevind is.|Sien ook die soekresultate wat gevind is.}}",
@@ -836,7 +838,7 @@
 	"searchall": "alle",
 	"showingresults": "Hier volg {{PLURAL:$1|'''1''' resultaat|'''$1''' resultate}} vanaf #'''$2'''.",
 	"search-showingresults": "{{PLURAL:$4|Resultaat <strong>$1</strong> van <strong>$2</strong>|Resultate <strong>$1 - $2</strong> van <strong>$3</strong>}}",
-	"search-nonefound": "Daar is geen resultate vir u soekopdrag nie.",
+	"search-nonefound": "Daar is geen resultate vir die navraag nie.",
 	"powersearch-legend": "Gevorderde soektog",
 	"powersearch-ns": "Soek in naamruimtes:",
 	"powersearch-togglelabel": "Kies:",
@@ -1111,7 +1113,7 @@
 	"recentchanges-feed-description": "Hierdie voer laat u toe om die mees onlangse wysigings aan die wiki te volg.",
 	"recentchanges-label-newpage": "Met die wysiging is 'n nuwe bladsy geskep.",
 	"recentchanges-label-minor": "Hierdie is 'n klein wysiging",
-	"recentchanges-label-bot": "Hierdie wysiging is deur 'n bot uitgevoer",
+	"recentchanges-label-bot": "Hierdie wysiging is deur 'n bot gemaak",
 	"recentchanges-label-unpatrolled": "Die wysiging is nog nie gekontroleer nie",
 	"recentchanges-label-plusminus": "Bladsy is met die aantal grepe gewysig",
 	"recentchanges-legend-heading": "'''Sleutel:'''",
@@ -1363,7 +1365,7 @@
 	"imagelinks": "Lêergebruik",
 	"linkstoimage": "Die volgende {{PLURAL:$1|bladsy|$1 bladsye}} gebruik hierdie prent:",
 	"linkstoimage-more": "Daar is meer as $1 {{PLURAL:$1|skakel|skakels}} na hierdie lêer.\nDie volgende lys vertoon slegs die eerste {{PLURAL:$1|skakel|$1 skakels}} wat na die lêer verwys.\n'n [[Special:WhatLinksHere/$2|Volledige lys]] is ook beskikbaar.",
-	"nolinkstoimage": "Daar is geen bladsye wat hierdie prent gebruik nie.",
+	"nolinkstoimage": "Daar is geen bladsye wat skakel na hierdie lêer nie.",
 	"morelinkstoimage": "Wys [[Special:WhatLinksHere/$1|meer skakels]] na die lêer.",
 	"linkstoimage-redirect": "$1 (lêeraanstuur) $2",
 	"duplicatesoffile": "Die volgende {{PLURAL:$1|lêer is 'n duplikaat|$1 lêers is duplikate}} van die lêer ([[Special:FileDuplicateSearch/$2|meer details]]):",
@@ -1598,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.",
@@ -1607,7 +1610,6 @@
 	"emailuser": "Stuur e-pos na hierdie gebruiker",
 	"emailuser-title-target": "E-pos die {{GENDER:$1|gebruiker}}",
 	"emailuser-title-notarget": "E-pos gebruiker",
-	"emailpage": "Stuur e-pos na gebruiker",
 	"emailpagetext": "As {{GENDER:$1|dié gebruiker}} 'n geldige e-posadres in sy/haar gebruikersvoorkeure het, sal hierdie vorm 'n enkele boodskap stuur. Die e-posadres in u [[Special:Preferences|gebruikersvoorkeure]] sal verskyn as die \"Van\"-adres van die pos. Dus sal die ontvanger kan terug antwoord.",
 	"defemailsubject": "E-pos van {{SITENAME}}-gebruiker \"$1\"",
 	"usermaildisabled": "E-pos deur gebruikers is gedeaktiveer.",
@@ -1701,7 +1703,7 @@
 	"delete-toobig": "Die bladsy het 'n lang wysigingsgeskiedenis, meer as $1 {{PLURAL:$1|weergawe|weergawes}}.\nVerwydering van die soort blaaie is beperk om ontwrigting van {{SITENAME}} te voorkom.",
 	"delete-warning-toobig": "Hierdie bladsy het 'n lang wysigingsgeskiedenis; meer as $1 {{PLURAL:$1|wysiging|wysigings}}.\nDeur weg te doen met hierdie bladsy mag dalk die werking van {{SITENAME}} versteur;\nTree asseblief versigtig op.",
 	"rollback": "Rol veranderinge terug",
-	"rollbacklink": "Rol terug",
+	"rollbacklink": "rol terug",
 	"rollbacklinkcount": "rol {{PLURAL:$1|een wysiging|$1 wysigings}} terug",
 	"rollbacklinkcount-morethan": "rol meer as {{PLURAL:$1|een wysiging|$1 wysigings}} terug",
 	"rollbackfailed": "Terugrol onsuksesvol",
@@ -1713,7 +1715,7 @@
 	"rollback-success": "Wysigings deur $1 is teruggerol.\nDie laaste weergawe van $2 is teruggeplaas.",
 	"sessionfailure-title": "Sessie het gefaal",
 	"sessionfailure": "Dit lyk of daar 'n probleem met u sessie is.\nHierdie aksie is gekanselleer omdat dit 'n veiligheidsrisiko is (moontlike kaping van u sessie).\nGaan een bladsy terug, herlaai die bladsy en probeer dan weer.",
-	"protectlogpage": "Beskermlogboek",
+	"protectlogpage": "Beskermingboekstaaf",
 	"protectlogtext": "Hieronder is 'n lys van veranderinge wat aan die beveilig van bladsye aangebring is.\nSien die [[Special:ProtectedPages|lys van beveiligde bladsye]] vir alle bladsye wat tans operasioneel beveilig is.",
 	"protectedarticle": "het [[$1]] beskerm",
 	"modifiedarticleprotection": "Die beskermingsvlak vir \"[[$1]]\" is gewysig",
@@ -2130,10 +2132,10 @@
 	"tooltip-pt-watchlist": "Die lys bladsye wat u vir veranderinge dophou",
 	"tooltip-pt-mycontris": "Lys van my bydraes",
 	"tooltip-pt-login": "U word aangemoedig om aan te meld. Dit is egter nie verpligtend nie.",
-	"tooltip-pt-logout": "Teken uit",
+	"tooltip-pt-logout": "Meld af",
 	"tooltip-pt-createaccount": "U word aangemoedig om 'n gebruiker te skep en aan te meld, hoewel dit nie verpligtend is nie.",
 	"tooltip-ca-talk": "Bespreking oor die inhoudbladsy",
-	"tooltip-ca-edit": "U kan hierdie bladsy wysig. Gebruik asseblief die voorskoufunksie vóór u dit stoor.",
+	"tooltip-ca-edit": "Wysig hierdie bladsy",
 	"tooltip-ca-addsection": "Begin 'n nuwe bespreking",
 	"tooltip-ca-viewsource": "Hierdie bladsy is beskerm. U kan die bronteks besigtig.",
 	"tooltip-ca-history": "Ouer weergawes van hierdie bladsy",
@@ -2151,17 +2153,17 @@
 	"tooltip-n-mainpage": "Besoek die Tuisblad",
 	"tooltip-n-mainpage-description": "Gaan na die tuisblad",
 	"tooltip-n-portal": "Meer oor die projek, wat jy kan doen, nuttige skakels",
-	"tooltip-n-currentevents": "'n Plek waar almal gesellig kan verkeer",
+	"tooltip-n-currentevents": "Agtergrondinligting oor aktuele sake",
 	"tooltip-n-recentchanges": "'n Lys van onlangse wysigings",
 	"tooltip-n-randompage": "Laai 'n lukrake bladsye",
 	"tooltip-n-help": "Vind meer uit oor iets",
 	"tooltip-t-whatlinkshere": "'n Lys bladsye wat hierheen skakel",
 	"tooltip-t-recentchangeslinked": "Onlangse wysigings aan bladsye wat vanaf hierdie bladsy geskakel is",
 	"tooltip-feed-rss": "RSS-voed vir hierdie bladsy",
-	"tooltip-feed-atom": "Atom-voed vir hierdie bladsy",
+	"tooltip-feed-atom": "Atoomvoer vir hierdie bladsy",
 	"tooltip-t-contributions": "Bekyk 'n lys van bydraes deur hierdie gebruiker",
 	"tooltip-t-emailuser": "Stuur 'n e-pos aan hierdie gebruiker",
-	"tooltip-t-upload": "Laai beelde of ander medialêers op",
+	"tooltip-t-upload": "Laai lêers op",
 	"tooltip-t-specialpages": "'n Lys van al die spesiale bladsye",
 	"tooltip-t-print": "Drukbare weergawe van hierdie bladsy",
 	"tooltip-t-permalink": "'n Permanente skakel na hierdie weergawe van die bladsy",
@@ -2170,7 +2172,7 @@
 	"tooltip-ca-nstab-media": "Bekyk die mediabladsy",
 	"tooltip-ca-nstab-special": "Hierdie is 'n spesiale bladsy; u kan dit nie wysig nie",
 	"tooltip-ca-nstab-project": "Bekyk die projekbladsy",
-	"tooltip-ca-nstab-image": "Bekyk die leêrbladsy",
+	"tooltip-ca-nstab-image": "Bekyk die lêerbladsy",
 	"tooltip-ca-nstab-mediawiki": "Bekyk die stelselboodskap",
 	"tooltip-ca-nstab-template": "Bekyk die sjabloon",
 	"tooltip-ca-nstab-help": "Bekyk die hulpbladsy",
@@ -2185,8 +2187,8 @@
 	"tooltip-watchlistedit-raw-submit": "Opdateer dophoulys",
 	"tooltip-recreate": "Herskep hierdie bladsy al is dit voorheen geskrap",
 	"tooltip-upload": "Begin oplaai",
-	"tooltip-rollback": "Rol met een kliek die laaste gebruiker se wysiging(s) van aan hierdie bladsy terug.",
-	"tooltip-undo": "Met \"ongedaan maak\" maak u hierdie wysiging ongedaan en land u in die wysigingsvenster.\nU kan daar 'n wysigingsopsomming byvoeg.",
+	"tooltip-rollback": "Rol met een kliek die laaste gebruiker se wysiging(s) aan hierdie bladsy terug.",
+	"tooltip-undo": "\"Maak ongedaan\" keer die wysiging om wys die wysigingsbladsy met 'n voorskou. U kan daar 'n wysigingsopsomming byvoeg.",
 	"tooltip-preferences-save": "Stoor voorkeure",
 	"tooltip-summary": "Verskaf 'n kort opsomming",
 	"interlanguage-link-title": "$1 – $2",
@@ -2208,7 +2210,7 @@
 	"spam_reverting": "Besig met terugrol na die laaste weergawe wat nie skakels na $1 bevat nie",
 	"spam_blanking": "Alle weergawes met 'n skakel na $1 word verwyder",
 	"spam_deleting": "Alle weergawes bevat verwysings na $1. Bladsy verwyder",
-	"simpleantispam-label": "Antispam-kontrole.\n<strong>Moenie</strong> die veld invul nie!",
+	"simpleantispam-label": "<strong>Moenie</strong> die veld invul nie!",
 	"pageinfo-title": "Inligting oor \"$1\"",
 	"pageinfo-not-current": "Hierdie gegewens is slegs vir die huidige weergawe beskikbaar.",
 	"pageinfo-header-basic": "Basiese inligting",
@@ -2329,7 +2331,7 @@
 	"yesterday-at": "Gister om $1",
 	"bad_image_list": "Die formaat is as volg:\n\nSlegs lys-items (lyne wat met * begin) word verwerk.\nDie eerste skakel op 'n lyn moet na 'n ongewenste lêer skakel.\nEnige opeenvolgende skakels op dieselfde lyn word as uitsonderings beskou, bv. blaaie waar die lêer inlyn kan voorkom.",
 	"metadata": "Metadata",
-	"metadata-help": "Die lêer bevat aanvullende inligting wat moontlik deur 'n digitale kamera of skandeerder bygevoeg is.\nAs die lêer verander is, mag sekere inligting nie meer ooreenkom met die van die gewysigde lêer nie.",
+	"metadata-help": "Die lêer bevat aanvullende inligting wat moontlik deur 'n digitale kamera of skandeerder bygevoeg is.\nAs die lêer verander is, sal sekere inligting dalk nie meer ooreenkom met dié van die gewysigde lêer nie.",
 	"metadata-expand": "Wys uitgebreide gegewens",
 	"metadata-collapse": "Versteek uitgebreide gegewens",
 	"metadata-fields": "Die velde in die boodskap word ook gewys op 'n beeldbladsy as die metadatatabel toegevou is.\nAnder velde sal versteek wees.\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",
@@ -2356,12 +2358,12 @@
 	"exif-referenceblackwhite": "Paar swart en wit verwysingswaardes",
 	"exif-datetime": "Tydstip laaste lêerwysiging",
 	"exif-imagedescription": "Beeldtitel",
-	"exif-make": "Kamera vervaardiger:",
-	"exif-model": "Kamera model",
+	"exif-make": "Kameravervaardiger:",
+	"exif-model": "Kameramodel",
 	"exif-software": "Sagteware gebruik",
 	"exif-artist": "Outeur",
 	"exif-copyright": "Kopiereghouer",
-	"exif-exifversion": "Exif weergawe",
+	"exif-exifversion": "Exif-weergawe",
 	"exif-flashpixversion": "Ondersteunde Flashpix-weergawe",
 	"exif-colorspace": "Kleurruimte",
 	"exif-componentsconfiguration": "Betekenis van elke komponent",
@@ -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/am.json b/languages/i18n/am.json
index 5716334bb2..1a649c8b7a 100644
--- a/languages/i18n/am.json
+++ b/languages/i18n/am.json
@@ -406,11 +406,10 @@
 	"resetpass-wrong-oldpass": "ጊዜያዊው ወይም ያሁኑኑ መግቢያ ቃል አይስማማም።\nምናልባት መግቢያ ቃልዎን መቀይሩ ተከናወነ፣ ወይም አዲስ ጊዜያዊ መግቢያ ቃልን ጠየቁ።",
 	"resetpass-temp-password": "ኅላፊ (ጊዜያዊ) መግቢያ ቃል፦",
 	"passwordreset": "መግቢያ ቃል መቀይር",
-	"passwordreset-legend": "መግቢያ ቃልዎን ለመቀይር",
 	"passwordreset-disabled": "በዚሁ ዊኪ መግቢያ ቃል መቀይር አልተቻለም",
 	"passwordreset-username": "የብዕር ስም:",
 	"passwordreset-email": "የኢ-ሜል አድራሻ:",
-	"passwordreset-emailelement": "የአባል ስም፦ $1\nጊዜያዊ መግቢያ ቃል፦ $2",
+	"passwordreset-emailelement": "የአባል ስም፦ \n$1\n\nጊዜያዊ መግቢያ ቃል፦ \n$2",
 	"passwordreset-emailsent": "የማስታወሻ ኢ-ሜል ተልኳል።",
 	"passwordreset-emailsent-capture": "የማስታወሻ ኢ-ሜል ተልኳል፤ ከዚህም ታች ይታያል።",
 	"passwordreset-emailerror-capture": "የማስታወሻ ኢ-ሜል ተልኳል፤ ከዚህም ታች ይታያል፤ ነገር ግን ወደ ተጠቃሚው ለመላክ ስንል አልተከናወነም፡",
@@ -1058,7 +1057,6 @@
 	"nlinks": "$1 መያያዣዎች",
 	"nmembers": "$1 {{PLURAL:$1|መጣጥፍ|መጣጥፎች}}",
 	"nrevisions": "$1 ለውጦች",
-	"nviews": "$1 {{PLURAL:$1|ዕይታ|ዕይታዎች}}",
 	"nimagelinks": "በ$1 {{PLURAL:$1|ገጽ|ገጾች}} ላይ ይጠቀማል።",
 	"ntransclusions": "በ$1 {{PLURAL:$1|ገጽ|ገጾች}} ይጠቀማል።",
 	"specialpage-empty": "(ይህ ገጽ ባዶ ነው።)",
@@ -1157,7 +1155,6 @@
 	"emailuser": "ለዚህ/ች ሰው ኢሜል መላክ",
 	"emailuser-title-target": "{{GENDER:$1|ለዚህ|ለዚች}} አባል ኢ-ሜል መላክ",
 	"emailuser-title-notarget": "ወደ አባል ኢ-ሜል ለመላክ",
-	"emailpage": "ወደዚህ/ች አባል ኢ-ሜል ለመላክ",
 	"emailpagetext": "አባሉ በሳቸው «ምርጫዎች» ክፍል ተግባራዊ ኢ-ሜል አድራሻ ያስገቡ እንደሆነ፣ ከታች ያለው ማመልከቻ አንድን ደብዳቤ በቀጥታ ይልካቸዋል።\n\nተቀባዩም መልስ በቀጥታ ሊሰጡዎ እንዲችሉ፣ በእርስዎ «ምርጫዎች» ክፍል ያስገቡት ኢ-ሜል አድራሻ በደብዳቤዎ «From:» መስመር ይታይላቸዋል።",
 	"defemailsubject": "{{SITENAME}} Email / ኢ-ሜል",
 	"usermaildisabledtext": "በዚሁ ዊኪ ኢ-ሜል ለአባላት መላክ አይችሉም።",
diff --git a/languages/i18n/an.json b/languages/i18n/an.json
index a3d10dc452..3351302143 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:",
@@ -433,7 +434,7 @@
 	"passwordreset-emailtitle": "Detalles d'a cuenta en {{SITENAME}}",
 	"passwordreset-emailtext-ip": "Belún (probablement vusté, dende l'adreza IP $1) ha demandau un recordatorio d'a información d'a suya cuenta en  {{SITENAME}} ($4). {{PLURAL:$3|A cuenta d'usuario siguient ye asociata|As cuentas d'usuario siguients son asociatas}} a ista adreza de correu-e:\n\n$2\n\n{{PLURAL:$3|Ista clau temporal circumducirá|Istas claus temporals circumducirán}} en {{PLURAL:$5|un día|$5 días}}. Habría de connectar-se agora y trigar una nueva clau. Si ista demanda no dimana de vusté, u ya se'n ha acordau d'a suya clau inicial y ya no deseya modificar-la, puet ignorar iste mensache y continar emplegando a suya viella clau.",
 	"passwordreset-emailtext-user": "L'usuario $1 en {{SITENAME}} ha demandau un recordatorio d'a información d'a suya cuenta en {{SITENAME}} ($4). {{PLURAL:$3|A cuenta d'usuario siguient ye asociata|As cuentas d'usuario siguients son asociatas}} a ista adreza de correu-e:\n\n$2\n\n{{PLURAL:$3|Ista clau d'acceso temporal circumducirá|Istas claus d'acceso temporals circumducirán}} en {{PLURAL:$5|un día|$5 días}}. Habría de connectar-se agora y trigar una nueva clau. Si ista demanda no dimana de vusté, u ya se'n ha acordau d'a suya clau inicial y ya no deseya modificar-la, puet ignorar iste mensache y continar emplegando a suya viella clau.",
-	"passwordreset-emailelement": "Nombre de usuario: $1\nClau d'acceso temporal: $2",
+	"passwordreset-emailelement": "Nombre de usuario: \n$1\n\nClau d'acceso temporal: \n$2",
 	"passwordreset-emailsent": "S'ha ninviau un recordatorio por correu-e.",
 	"passwordreset-emailsent-capture": "Se le ha ninviau un recordatorio por correu electronico, que s'amuestra contino.",
 	"passwordreset-emailerror-capture": "S'ha chenerau un recordatorio por correu electronico, que s'amuestra contino, pero o ninvío ta l'usuario ha fallau: $1",
@@ -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/ang.json b/languages/i18n/ang.json
index 1bf03a3ee3..f5b8df07d6 100644
--- a/languages/i18n/ang.json
+++ b/languages/i18n/ang.json
@@ -173,12 +173,12 @@
 	"history": "Trametes stǣr",
 	"history_short": "Stǣr",
 	"updatedmarker": "nīwod æfter mīnre lætestan sōcne",
-	"printableversion": "Ūtmǣlendlīc fadung",
+	"printableversion": "Ūtmǣlendlicu fadung",
 	"permalink": "Fæst hlenca",
 	"print": "Ūtmǣlan",
 	"view": "Sihþ",
 	"view-foreign": "Sihþ on $1",
-	"edit": "Adihtan",
+	"edit": "Ādihtan",
 	"create": "Scieppan",
 	"create-local": "Besettan stōwlice gemearcunge",
 	"editthispage": "Adihtan þisne tramet",
@@ -223,7 +223,7 @@
 	"view-pool-error": "Wālā, þā þegntōlas nū oferlīce wyrcaþ.\nTō mænige brūcendas gesēcaþ tō sēonne þisne tramet.\nWē biddaþ þæt þū abīde scortne tīman ǣr þū gesēce to sēonne þisne tramet eft.\n\n$1",
 	"pool-errorunknown": "Uncūþ wōh",
 	"aboutsite": "Gecȳþness ymbe {{GRAMMAR:wrēgendlīc|{{SITENAME}}}}",
-	"aboutpage": "Project:Gecȳþness",
+	"aboutpage": "Project:Gefrǣge",
 	"copyright": "Man mæg innunge under $1 findan, būton þǣr hit is elles amearcod.",
 	"copyrightpage": "{{ns:project}}:Gelīcnessriht",
 	"currentevents": "Gelimpunga þisses tīman",
@@ -238,7 +238,7 @@
 	"portal": "Gemǣnscipes ingang",
 	"portal-url": "Project:Gemǣnscipes ingang",
 	"privacy": "Ānlēpnesse rǣd",
-	"privacypage": "Project:Ānlēpnesse rǣd",
+	"privacypage": "Project:Ānlīēpnesse rǣd",
 	"badaccess": "Þafunge wōh",
 	"badaccess-group0": "Þū ne mōst dōn þā dǣde þǣre þe þū hafast abede.",
 	"badaccess-groups": "Þēos dǣd þǣre þū hafast abeden is synderlīce alȳfedlic brūcendum on {{PLURAL:$2|þissum þrēate|ānum þāra þrēata}}: $1.",
@@ -415,7 +415,6 @@
 	"resetpass-submit-loggedin": "Andwendan þafungword",
 	"resetpass-submit-cancel": "Undōn",
 	"passwordreset": "Settan þafungword eft",
-	"passwordreset-legend": "Settan þafungword eft",
 	"passwordreset-username": "Brūcendnama:",
 	"bold_sample": "Þicce traht",
 	"bold_tip": "Þicce traht",
@@ -603,8 +602,8 @@
 	"recentchanges-legend": "NÄ«wra andwendunga cyras",
 	"recentchanges-summary": "Sēon þā nīwostan andwendunga þisses wiki on þissum tramete",
 	"recentchanges-feed-description": "Īwan þā nīwostan andwendunga þæs wiki mid þissum strēame",
-	"recentchanges-label-newpage": "Þēos adihtung scōp nīwne tramet",
-	"recentchanges-label-minor": "Þēos is lytel adihtung",
+	"recentchanges-label-newpage": "Þēos ādihtung scōp nīwne tramet",
+	"recentchanges-label-minor": "Þēos is lytel ādihtung",
 	"recentchanges-label-bot": "Searuþrǣl fremede þās adihtunge",
 	"recentchanges-label-plusminus": "Þæs trametes micelness wæs andwended þȳs rīme grēatbitena",
 	"recentchanges-legend-newpage": "{{int:recentchanges-label-newpage}} (seoh ēac [[Special:NewPages|getæl nīwra trameta]])",
@@ -696,7 +695,7 @@
 	"filerevert-legend": "Settan ymelan on bæc",
 	"filedelete-submit": "Forlēosan",
 	"unusedtemplateswlh": "ōðre hlencan",
-	"randompage": "Gelimplīc tramet",
+	"randompage": "Gelimplic tramet",
 	"statistics": "Cȳþþu",
 	"statistics-articles": "Innunge trametas",
 	"statistics-pages": "Trametas",
@@ -898,7 +897,7 @@
 	"allmessages-filter-modified": "Andwended",
 	"allmessages-language": "Sprǣc:",
 	"allmessages-filter-submit": "Gān",
-	"thumbnail-more": "MÇ£rsian",
+	"thumbnail-more": "Gerȳman",
 	"filemissing": "Ymele is æfweard",
 	"import": "Inbringan trametas",
 	"import-interwiki-submit": "Inbringan",
@@ -916,7 +915,7 @@
 	"tooltip-pt-logout": "Ūtmeldian",
 	"tooltip-pt-createaccount": "Þū āhst wyrcan grīman tō brūcenne, ac þū ne þearft þæt dōn.",
 	"tooltip-ca-talk": "Mōtung ymbe þone innunge tramet",
-	"tooltip-ca-edit": "Þū meaht þisne tramet adihtan. Brūc lā þone forebysene cnæpp ǣr þū hordie.",
+	"tooltip-ca-edit": "Þisne tramet ādihtan.",
 	"tooltip-ca-addsection": "Beginnan nīwne dǣl",
 	"tooltip-ca-viewsource": "Þes tramet is borgen.\nÞū canst his fruman sēon.",
 	"tooltip-ca-history": "Ǣrran fadunga þisses trametes",
@@ -1071,6 +1070,7 @@
 	"specialpages-group-other": "Ōðre syndrige trametas",
 	"specialpages-group-users": "Brūcendas and riht",
 	"blankpage": "Tramet is æmettig",
+	"tag-filter": "[[Special:Tags|Mearcincles]] siftere:",
 	"tags-edit": "adihtan",
 	"htmlform-submit": "Forþsendan",
 	"htmlform-reset": "Undōn andwendunga",
diff --git a/languages/i18n/ar.json b/languages/i18n/ar.json
index 94ed9b8ffa..ad3d672cd7 100644
--- a/languages/i18n/ar.json
+++ b/languages/i18n/ar.json
@@ -52,7 +52,8 @@
 			"Emara",
 			"Macofe",
 			"Yahya Sakhnini",
-			"Mervat Salman"
+			"Mervat Salman",
+			"Shbib Al-Subaie"
 		]
 	},
 	"tog-underline": "سطر تحت الوصلات:",
@@ -381,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البيانات هنا لن يتم تحديثها حاليا.",
@@ -470,6 +472,7 @@
 	"createacct-benefit-body2": "{{PLURAL:$1|صفحة}}",
 	"createacct-benefit-body3": "آخر {{PLURAL:$1|مساهم|مساهمين}}",
 	"badretype": "كلمات السر التي أدخلتها لا تتطابق.",
+	"usernameinprogress": "إن عملية إنشاء حساب لاسم المستخدم هذا جارية بالفعل. برجاء الانتظار.",
 	"userexists": "اسم المستخدم الذي تم إدخاله مستعمل بالفعل.\nالرجاء اختيار اسم مختلف.",
 	"loginerror": "خطأ في الدخول",
 	"createacct-error": "خطأ في إنشاء حساب",
@@ -559,7 +562,7 @@
 	"passwordreset-emailtitle": "تفاصيل حساب {{SITENAME}}",
 	"passwordreset-emailtext-ip": "أحد ما (قد يكون أنت، من العنوان $1)  طلب إعادة ضبط كلمة سر حسابك على {{SITENAME}} ($4). {{PLURAL:$3||الحساب|الحسابان| الحسابات}} أدناه قد اقترنت ببريدك الإلكتروني :\n\n$2\n\n{{PLURAL:$3||كلمة السر المؤقتة|كلمات السر المؤقتة}} ستنتهي صلاحيتها في {{PLURAL:$5||يوم واحد|يومين|$5 أيام|$5 يوما|$5 يوم}}\nيمكنك تسجيل الدخول واختيار كلمة سر جديدة. إذا كان هذا الطلب تم بواسطة شخص أخر، أو إذا تذكرت كلمة السر الأصلية الخاصة بك، ولم تعد ترغب في تغييرها، يمكنك تجاهل هذه الرسالة ومتابعة استخدام كلمة السر القديمة.",
 	"passwordreset-emailtext-user": "المستخدم $1 على {{SITENAME}} طلب إعادة ضبط كلمة سر حسابك على {{SITENAME}} ($4). {{PLURAL:$3||الحساب|الحسابان| الحسابات}} أدناه قد اقترنت ببريدك الإلكتروني :\n\n$2\n\n{{PLURAL:$3||كلمة السر المؤقتة|كلمات السر المؤقتة}} ستنتهي صلاحيتها في {{PLURAL:$5||يوم واحد|يومين|$5 أيام|$5 يوما|$5 يوم}}\nيمكنك تسجيل الدخول واختيار كلمة سر جديدة. إذا كان هذا الطلب تم بواسطة شخص أخر، أو إذا تذكرت كلمة السر الأصلية الخاصة بك، ولم تعد ترغب في تغييرها، يمكنك تجاهل هذه الرسالة ومتابعة استخدام كلمة السر القديمة.",
-	"passwordreset-emailelement": "اسم {{GENDER:$1|المستخدم|المستخدمة}}: $1\nكلمة السر المؤقتة: $2",
+	"passwordreset-emailelement": "اسم {{GENDER:$1\n|المستخدم|المستخدمة}}: \n$1\n\nكلمة السر المؤقتة: \n$2",
 	"passwordreset-emailsent": "أُرسل بريد إلكتروني لإعادة ضبط كلمة السر.",
 	"passwordreset-emailsent-capture": "أُرسل بريد إلكتروني لإعادة ضبط كلمة السر، وهو معروض بالأسفل.",
 	"passwordreset-emailerror-capture": "تم توليد رسالة بريد إلكتروني لتصفير كلمة السر نصّه التالي، إلا أنه تعذّر إرسال الرّسالة إلى {{GENDER:$2|المستخدم|المستخدمة}}: $1",
@@ -955,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 يوم}}",
@@ -1236,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": "عرض التفاصيل",
@@ -1347,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 غير موجود.",
@@ -1731,7 +1748,6 @@
 	"emailuser": "مراسلة المستخدم",
 	"emailuser-title-target": "راسل بالبريد الإلكتروني هذا  {{GENDER:$1| المستخدم}}",
 	"emailuser-title-notarget": "مراسلة المستخدم",
-	"emailpage": "إرسال رسالة للمستخدم",
 	"emailpagetext": "يمكنك استخدام الاستمارة بالأسفل لإرسال رسالة بريد إلكتروني إلى {{GENDER:$1|هذا المستخدم|هذه المستخدمة}}.\n'''يمكن أن يرى المرسل إليه عنوان بريدك الإلكتروني''' الذي أدخلته في [[Special:Preferences|تفضيلاتك]] كعنوان المرسل في البريد الإلكتروني، كي يستطيع المتلقي الرد عليك مباشرة.",
 	"defemailsubject": "رسالة {{SITENAME}} من المستخدم \"$1\"",
 	"usermaildisabled": "بريد المستخدم الإلكتروني معطل",
@@ -1753,7 +1769,7 @@
 	"emailccsubject": "نسخة من رسالتك إلى $1: $2",
 	"emailsent": "أُرسل البريد الإلكتروني",
 	"emailsenttext": "أُرسلت رسالتك الإلكترونية.",
-	"emailuserfooter": "هذا البريد الإلكتروني تم إرساله بواسطة $1 إلى $2 بواسطة وظيفة \"{{int:emailpage}}\" في {{SITENAME}}.",
+	"emailuserfooter": "هذا البريد الإلكتروني تم إرساله بواسطة $1 إلى $2 بواسطة وظيفة \"{{int:emailuser}}\" في {{SITENAME}}.",
 	"usermessage-summary": "ترك رسالة نظام.",
 	"usermessage-editor": "مراسل النظام",
 	"watchlist": "قائمة مراقبتي",
@@ -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": "بحث عن مساهمات",
@@ -1989,7 +2005,7 @@
 	"istemplate": "مضمن",
 	"isimage": "وصلة ملف",
 	"whatlinkshere-prev": "{{PLURAL:$1|السابق|ال$1 السابقة}}",
-	"whatlinkshere-next": "{{PLURAL:$1|القادمة|ال$1 القادمة}}",
+	"whatlinkshere-next": "{{PLURAL:$1|التالية|ال$1 التالية}}",
 	"whatlinkshere-links": "وصلات",
 	"whatlinkshere-hideredirs": "$1 التحويلات",
 	"whatlinkshere-hidetrans": "$1 التضمينات",
@@ -2195,7 +2211,7 @@
 	"allmessagesname": "الاسم",
 	"allmessagesdefault": "النص الافتراضي",
 	"allmessagescurrent": "النص الحالي",
-	"allmessagestext": "هذه قائمة برسائل النظام المتوفرة في نطاق ميدياويكي.\nمن فضلك زر [https://www.mediawiki.org/wiki/Special:MyLanguage/Localisation ترجمة ميدياويكي] و [//translatewiki.net بيتاويكي] لو كنت ترغب في المساهمة في ترجمة ميدياويكي الأساسية.",
+	"allmessagestext": "هذه قائمة برسائل النظام المتوفرة في نطاق ميدياويكي.\nمن فضلك زر [https://www.mediawiki.org/wiki/Special:MyLanguage/Localisation ترجمة ميدياويكي] و [//translatewiki.net ترانسليت ويكي دوت نت] لو كنت ترغب في المساهمة في ترجمة ميدياويكي الأساسية.",
 	"allmessagesnotsupportedDB": "هذه الصفحة لا يمكن استخدامها لأن '''$wgUseDatabaseMessages''' تم تعطيله.",
 	"allmessages-filter-legend": "المرشح",
 	"allmessages-filter": "رشح حسب حالة التخصيص:",
@@ -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/arq.json b/languages/i18n/arq.json
index a15dabd8c5..fc2fc815e6 100644
--- a/languages/i18n/arq.json
+++ b/languages/i18n/arq.json
@@ -503,7 +503,6 @@
 	"passwordreset": "صفّي كلمت` السرّ",
 	"passwordreset-text-one": "كمّل هاد الجدوال تاع الإختيارات باش تلحق لك كلمت` سرّ جديدة بل إيمال.",
 	"passwordreset-text-many": "{{PLURAL:$1|عمّر واحد من هاد قويبسات باش تلحق لك كلمت` سرّ جديدة بل إيمال.}}",
-	"passwordreset-legend": "استرجع كلمت` السرّ",
 	"passwordreset-disabled": "التبدال تاع كلمت` السرّ راهي محبّسة ف هاد الويكي.",
 	"passwordreset-emaildisabled": "الفعاليّات تاع الإيمال راهي محبّسة ف هاد الويكي.",
 	"passwordreset-username": "سميّت` المستعملي:",
@@ -514,7 +513,7 @@
 	"passwordreset-emailtitle": "وصافات تاع الحساب ف {{SITENAME}}",
 	"passwordreset-emailtext-ip": "شي واحد (يكون بالاك نتا، لادريسة إيپي $1) راه طلَب المصاوبة تاع كلمت` السرّ تاعك ف {{SITENAME}} ($4). {{PLURAL:$3|هاد الحساب |هاد الحسابات}} تاع المستعملي {{PLURAL:$3|راه مربوط|راهم مربوطين}} ب لادريسة تاع الإيمال:\n\n$2\n\n{{PLURAL:$3|هاد كلمت` السرّ المأقّتة|هادي كلمات` السرّ المأقّتة}} غادي يكمل صلوحها منّا على {{PLURAL:$5|نهار واحد|$5 إيّام}}.\nمليح لوكان تدخُل ل`السيت من ضركا و تبدّل كلمت` السرّ.\nيلا كاش ما وحداخُر دار هاد المطلب ولا راك تفكّرت كلمت` السرّ تاعك و ما بقيتش باغي تبدّلها، تنجم برك تنسا هاد الميساج و تستعمل كلمت` السرّ تاعك تاع مضاري.",
 	"passwordreset-emailtext-user": "المستعملي $1 ف {{SITENAME}} راه طلب تبدال ف كلمت` السرّ تاعك ف {{SITENAME}}\n($4). {{PLURAL:$3|الحساب|الحسايات}} تاع المستعملي {{PLURAL:$3|راه مربوط|راهم مربوطين}} ب لادريسة تاع ليمال هادي:\n\n$2\n\n{{PLURAL:$3|هاد كلمت` السرّ المأقّتة|هادي كلمات` السرّ المأقّتة}} غادي يكمل صلوحها منّا على {{PLURAL:$5|نهار واحد|$5 إيّام}}.\nمادابيك تسجّل داخل ضركا و تختار كلمت` سرّ جديدة. يلا كان وحداخُر دار هاد المطلب، ولا راك ضركا تفكّرت كلمت` السرّ تاعك القديمة و ما بقيتش باغي تبدّلها، تنجم برك تتنسّا هاد الميساج و تدخُل ب كلمت` السرّ تاعك تاع مضاري.",
-	"passwordreset-emailelement": "سميّت` المستعملي: $1\nكلمت` السرّ المأقّتة: $2",
+	"passwordreset-emailelement": "سميّت` المستعملي: \n$1\n\nكلمت` السرّ المأقّتة: \n$2",
 	"passwordreset-emailsent": "راه نبعَت إيمال تاع تبدال كلمت` السرّ.",
 	"passwordreset-emailsent-capture": "راه اترسل إيمال تاع تبدال كلمت` السرّ، و راه محطوط هنا لتحت.",
 	"passwordreset-emailerror-capture": "راه اترسل الإيمال تاع تبدال كلمت` السرّ، الّي راح محطوط هنا لتحت، بصّح البعيت تاعهُ لل {{GENDER:$2|مستعملي}} ما نجحش: $1",
@@ -530,7 +529,6 @@
 	"resettokens": "بدّل المفاتح",
 	"resettokens-text": "تنجم تبدّل المفاتح الّي يخلّيوك توصل ل شي معلومات خوصوصيّة، مربوطة بل حساب تاعك هنا.\n\nلازم لك تديرها يلا كُنت نتا مدّيتهم ل شي واحد ولا بلا كان الحساب تاعك اتهدّد.",
 	"resettokens-no-tokens": "ما كاين حتا مفاتح تنجم تبدّلهم.",
-	"resettokens-legend": "بدّل المفاتح",
 	"resettokens-tokens": "مفاتح:",
 	"resettokens-token-label": "$1 (القيمة تاع ضركا: $2)",
 	"resettokens-watchlist-token": "المفتاح تاع السيل (Atom/RSS) تاع [[Special:Watchlist|التبدالات الّي فل ليستة تاع المتابعة تاعك]]",
diff --git a/languages/i18n/ary.json b/languages/i18n/ary.json
index 48225efb30..9d4f6c4ff6 100644
--- a/languages/i18n/ary.json
+++ b/languages/i18n/ary.json
@@ -391,14 +391,13 @@
 	"resetpass-wrong-oldpass": "klmṫ s-srr ḫaliyya wlla mo'aqata ma ṣalḫa-ċ.\nymkn ṫkon bddalṫiha bĝda wlla ṫlbti klmṫ srr mo'qaṫa jdida.",
 	"resetpass-temp-password": "mot de passe moaqata",
 	"passwordreset": "ĝawd klmṫ s-srr",
-	"passwordreset-legend": "ĝawd klmṫ s-srr",
 	"passwordreset-disabled": "maymkn-ċ ṫĝawd klmṫ s-srr f-had l-wiki.",
 	"passwordreset-username": "smiṫ l-mosṫĥdim:",
 	"passwordreset-email": "ĝonwan l-email:",
 	"passwordreset-emailtitle": "ṫafaṣil l-ḫisab f-{{SITENAME}}",
 	"passwordreset-emailtext-ip": "ċi waḫd (ġaliban nṫa, mn ĝonwan l-IP $1) tlḅ ṫdkir\nb-ṫṫafaṣil dial l-ḫisab ṫaĝk f-{{SITENAME}} ($4). {{PLURAL:$3|l-ḫisab lli mrṫabt|l-ḫisabat lli mrṫabta}}\nb-had l-ĝonwan dl-email {{PLURAL:$3|howa|hiya}}:\n\n$2\n\nhad {{PLURAL:$3|klmṫ|klmaṫ}} s-srr l-mo'qaṫa ġadi ṫṫḫyyad mn bĝd {{PLURAL:$5|nhar waḫd|$5 yyam/yom}}.\nĥaṣṣk ṫdĥol o-ṫbddal klmṫ s-srr. ila kan ċi waḫd aĥor hwwa lli dar had\ntalab, wlla ila ṫfkkarṫi klmṫ s-srr l-qdima, o-ma bqiti-ċ baġi ṫbddalha, ġir bqa ĥddam biha o-nsa ĝlik had l-mesaj.",
 	"passwordreset-emailtext-user": "l_mosṫĥdim $1 f-{{SITENAME}} tlḅ ṫdkir b-ṫṫafaṣil dial l-ḫisab ṫaĝk f-{{SITENAME}} ($4). {{PLURAL:$3|l-ḫisab lli mrṫabt|l-ḫisabat lli mrṫabta}} b-had l-ĝonwan dl-email {{PLURAL:$3|howa|hiya}}:\n\n$2\n\nhad {{PLURAL:$3|klmṫ|klmaṫ}} s-srr l-mo'qaṫa ġadi ṫṫḫyyad mn bĝd {{PLURAL:$5|nhar waḫd|$5 yyam/yom}}.\nĥaṣṣk ṫdĥol o-ṫbddal klmṫ s-srr. ila kan ċi waḫd aĥor hwwa lli dar had\ntalab, wlla ila ṫfkkarṫi klmṫ s-srr l-qdima, o-ma bqiti-ċ baġi ṫbddalha, ġir bqa ĥddam biha o-nsa ĝlik had l-mesaj.",
-	"passwordreset-emailelement": "smiṫ l-mosṫĥdim: $1\nklmṫ s-srr l-mo'qaṫa: $2",
+	"passwordreset-emailelement": "smiṫ l-mosṫĥdim: \n$1\n\nklmṫ s-srr l-mo'qaṫa: \n$2",
 	"passwordreset-emailsent": "ṫsift email liṫ-ṫdkir.",
 	"changeemail": "bddel ĝonwan l-email",
 	"changeemail-no-info": "ĥaṣṣ tkon daĥol baĥ tqdr twṣl l-had ṣfḫa niċan.",
@@ -440,8 +439,8 @@
 	"summary-preview": "Prévizualizasyon dyal l-moleĥĥaṣ:",
 	"subject-preview": "moĝayanat l-moḍoĝ/l-ĝonwan:",
 	"blockedtitle": "had lmostakhdim tbloka",
-	"blockedtext": "'''smiṫ l-mosṫĥdim wlla ĝonwan l-IP ṫaĝk rah ṫbloka.'''\n\nlli blokak howa $1.\ns-sabab lli ĝtah howa ''$2''.\n\n* bda l-blok: $8\n* ġa ystala: $6\n* lli mqṣod b-lblok: $7\n\nymkn lik ṫṫaṣl b-$1 wlla ċi [[{{MediaWiki:Grouppage-sysop}}|idari]] aĥor baċ ṫnaqċ l-blok.\nma ymkn-likċ ṫĥddm l-ĥaṣṣiya ṫaĝ '{{MediaWiki:emailpage}}' ġir ila konti ĥṫariṫi ċi ĝonwan dl-email is f-[[Special:Preferences|ṫfḍilaṫ l-ḫisab]] ṫaĝk o-ma konti-ċ mbloki mn l-ĥdma bih.\nĝonwan l-IP ṫaĝk daba howa $3, o-lmoĝrrif d-lblok howa #$5.\nmli ṫkṫb ċi talab ĥaṣṣk ṫĝti fih gaĝ had ṫ-ṫafaṣil lli l-foq.",
-	"autoblockedtext": "ĝonwan l-IP ṫaĝk rah ṫbloka ṫilqa'iyyan ḫqqaċ ĥdm bih ċi waḫd aĥor blokah $1.\ns-sabab lli ĝtah howa\n\n:''$2''\n\n* bda l-blok: $8\n* ġa ystala: $6\n* lli mqṣod b-lblok: $7\n\nymkn lik ṫṫaṣl b-$1 wlla ċi [[{{MediaWiki:Grouppage-sysop}}|idari]] aĥor baċ ṫnaqċ l-blok.\n\nĥaṣṣk ṫĝrf billa ma ymkn-likċ ṫĥddm l-ĥaṣṣiya ṫaĝ '{{MediaWiki:emailpage}}' ġir ila konti ĥṫariṫi ċi ĝonwan dl-email is f-[[Special:Preferences|ṫfḍilaṫ l-ḫisab]] ṫaĝk o-ma konti-ċ mbloki mn l-ĥdma bih.\n\nĝonwan l-IP ṫaĝk daba howa $3, o-lmoĝrrif d-lblok howa #$5.\nmli ṫkṫb ċi talab ĥaṣṣk ṫĝti fih gaĝ had ṫ-ṫafaṣil lli l-foq.",
+	"blockedtext": "'''smiṫ l-mosṫĥdim wlla ĝonwan l-IP ṫaĝk rah ṫbloka.'''\n\nlli blokak howa $1.\ns-sabab lli ĝtah howa ''$2''.\n\n* bda l-blok: $8\n* ġa ystala: $6\n* lli mqṣod b-lblok: $7\n\nymkn lik ṫṫaṣl b-$1 wlla ċi [[{{MediaWiki:Grouppage-sysop}}|idari]] aĥor baċ ṫnaqċ l-blok.\nma ymkn-likċ ṫĥddm l-ĥaṣṣiya ṫaĝ '{{int:emailuser}}' ġir ila konti ĥṫariṫi ċi ĝonwan dl-email is f-[[Special:Preferences|ṫfḍilaṫ l-ḫisab]] ṫaĝk o-ma konti-ċ mbloki mn l-ĥdma bih.\nĝonwan l-IP ṫaĝk daba howa $3, o-lmoĝrrif d-lblok howa #$5.\nmli ṫkṫb ċi talab ĥaṣṣk ṫĝti fih gaĝ had ṫ-ṫafaṣil lli l-foq.",
+	"autoblockedtext": "ĝonwan l-IP ṫaĝk rah ṫbloka ṫilqa'iyyan ḫqqaċ ĥdm bih ċi waḫd aĥor blokah $1.\ns-sabab lli ĝtah howa\n\n:''$2''\n\n* bda l-blok: $8\n* ġa ystala: $6\n* lli mqṣod b-lblok: $7\n\nymkn lik ṫṫaṣl b-$1 wlla ċi [[{{MediaWiki:Grouppage-sysop}}|idari]] aĥor baċ ṫnaqċ l-blok.\n\nĥaṣṣk ṫĝrf billa ma ymkn-likċ ṫĥddm l-ĥaṣṣiya ṫaĝ '{{int:emailuser}}' ġir ila konti ĥṫariṫi ċi ĝonwan dl-email is f-[[Special:Preferences|ṫfḍilaṫ l-ḫisab]] ṫaĝk o-ma konti-ċ mbloki mn l-ĥdma bih.\n\nĝonwan l-IP ṫaĝk daba howa $3, o-lmoĝrrif d-lblok howa #$5.\nmli ṫkṫb ċi talab ĥaṣṣk ṫĝti fih gaĝ had ṫ-ṫafaṣil lli l-foq.",
 	"blockednoreason": "ta sabab mamaatich",
 	"whitelistedittext": "khassk  $1 bach taadl sfahi",
 	"confirmedittext": "ĥaṣṣk ṫ'kkd l-ĝonwan dl-email dialk qbl ma ṫĝddl ṣ-ṣfaḫi.\ndĥĥel o-'kked l-ĝonwan dl-email dialk fṫ-[[Special:Preferences|ṫfḍilaṫ]] dialk.",
@@ -1062,7 +1061,6 @@
 	"nlinks": "$1 {{PLURAL:$1|l-wṣla|dl-wṣlaṫ}}",
 	"nmembers": "$1 {{PLURAL:$1|Ĝoḍw|Aĝḍa'}}",
 	"nrevisions": "$1 {{PLURAL:$1|l-ṃoṛajaĝa|dl-ṃoṛajaĝaṫ}}",
-	"nviews": "$1 {{PLURAL:$1|l-ṃoċahada|dl-ṃoċahadaṫ}}",
 	"nimagelinks": "mosṫĥmal f-$1 {{PLURAL:$1|ṣ-ṣfḫa|dṣ-ṣfaḫi}}",
 	"ntransclusions": "mosṫĥmal f-$1 {{PLURAL:$1|ṣ-ṣfḫa|dṣ-ṣfaḫi}}",
 	"lonelypages": "sfahi itima",
@@ -1160,7 +1158,6 @@
 	"listgrouprights-removegroup-self": "hyyed mn l-ḫisab ṫaĝi {{PLURAL:$2|mjmoĝṫ|mjmoĝaṫ}}: $1",
 	"mailnologin": "Ma kayenċ l-ĝonwan dyal l-morasil",
 	"emailuser": "Ṣifet imayl le had l-mosṫeĥdim",
-	"emailpage": "sift email lhad lmostkhdim",
 	"defemailsubject": "Imayl dyal {{SITENAME}}",
 	"usermaildisabled": "L-Mosṫeḫdim ma mĥeddemċ l-imayl dyalo.",
 	"usermaildisabledtext": "Ma ymken lekċ ṫṣifet ċi imayl le l-mosṫeĥdimin l-ĥrin fe had l-wiki",
diff --git a/languages/i18n/arz.json b/languages/i18n/arz.json
index 1c235949c2..301dcc836a 100644
--- a/languages/i18n/arz.json
+++ b/languages/i18n/arz.json
@@ -36,7 +36,7 @@
 	"tog-shownumberswatching": "بين عدد اليوزرز المراقبين",
 	"tog-oldsig": "الامضا دلوقتى:",
 	"tog-fancysig": "امضا خام (من غير لينك أوتوماتيك)",
-	"tog-uselivepreview": "استخدم البروفه السريعه (تجريبي)",
+	"tog-uselivepreview": "استخدم البروفه السريعه",
 	"tog-forceeditsummary": "نبهنى عند تدخيل ملخص للتعديل  فاضي",
 	"tog-watchlisthideown": "خبى التعديلات بتاعتى من لستة المراقبة",
 	"tog-watchlisthidebots": "خبى التعديلات بتاعة البوت من لستة المراقبة",
@@ -129,7 +129,7 @@
 	"hidden-category-category": "تصنيفات مستخبية",
 	"category-subcat-count": "{{PLURAL:$2| التصنيف دا فيه  التصنيف الفرعى الجاى بس.|التصنيف دا فيه {{PLURAL:$1|تصنيف فرعى|$1 تصنيف فرعى}}، من إجمالى $2.}}",
 	"category-subcat-count-limited": " التصنيف دا فيه {{PLURAL:$1|تصنيف فرعي|$1 تصنيف فرعي}} كدا.",
-	"category-article-count": "{{PLURAL:$2| التصنيف دا فيه  الصفحة دى بس.|تحت {{PLURAL:$1|ملف|$1 ملف}} فى  التصنيف دا ، من إجمالى $2.}}",
+	"category-article-count": "{{PLURAL:$2|التصنيف دا فيه الصفحه دى بس.|{{PLURAL:$1|الصفحه دى|$1 الصفحات دول}} فى التصنيف دا، من إجمالى $2.}}",
 	"category-article-count-limited": "تحت {{PLURAL:$1|صفحة|$1 صفحة}} فى التصنيف الحالى.",
 	"category-file-count": "{{PLURAL:$2| التصنيف دا  فيه الملف الجاى دا بس.|تحت {{PLURAL:$1|ملف|$1 ملف}} فى  التصنيف دا، من إجمالى $2.}}",
 	"category-file-count-limited": "تحت {{PLURAL:$1|ملف|$1 ملف}} فى التصنيف الحالى.",
@@ -174,15 +174,18 @@
 	"permalink": "لينك دايم",
 	"print": "اطبع",
 	"view": "شوف",
+	"view-foreign": "اعرض على $1",
 	"edit": "تعديل",
+	"edit-local": "تعديل الوصف المحلى",
 	"create": "إبتدى",
+	"create-local": "ضيف وصف محلى",
 	"editthispage": "عدل الصفحه دى",
 	"create-this-page": "أنشيء الصفحه دى",
 	"delete": "مسح",
 	"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": "احمى الصفحه دى",
@@ -208,6 +211,7 @@
 	"otherlanguages": "بلغات تانيه",
 	"redirectedfrom": "(تحويل من $1)",
 	"redirectpagesub": "صفحة تحويل",
+	"redirectto": "تحويل ل",
 	"lastmodifiedat": "الصفحه دى اتعدلت اخر مره فى $1,‏ $2.",
 	"viewcount": "الصفحة دى اتدخل عليها{{PLURAL:$1|مرة واحدة|مرتين|$1 مرات|$1 مرة}}.",
 	"protectedpage": "صفحه محميه",
@@ -215,6 +219,7 @@
 	"jumptonavigation": "استكشاف",
 	"jumptosearch": "تدوير",
 	"view-pool-error": "متأسفين, السيرفرات عليها حمل كبير دلوقتى.\nفى يوزرات كتير قوى بيحاولو يشوفو الصفحه دى.\nلو سمحت تستنا شويه قبل ما تحاول تستعرض الصفحه دى من تانى.\n\n$1",
+	"generic-pool-error": "متأسفين, السيرفرات عليها حمل كبير دلوقتى.\nفى يوزرات كتير قوى بيحاولو يشوفو الصفحه دى.\nلو سمحت تستنا شويه قبل ما تحاول تستعرض الصفحه دى من تانى.",
 	"pool-timeout": "انتهاء الانتظار للقفل",
 	"pool-queuefull": "طابور الانتخاب مليان",
 	"pool-errorunknown": "غلط مش معروف",
@@ -227,6 +232,7 @@
 	"disclaimers": "تنازل عن مسئوليه",
 	"disclaimerpage": "Project:تنازل عن مسئوليه عمومى",
 	"edithelp": "مساعده فى التعديل",
+	"helppage-top-gethelp": "مساعده",
 	"mainpage": "الصفحه الرئيسيه",
 	"mainpage-description": "الصفحه الرئيسيه",
 	"policy-url": "Project:سياسة",
@@ -245,7 +251,7 @@
 	"youhavenewmessagesfromusers": "{{PLURAL:$4|عندك}} $1 من {{PLURAL:${{PLURAL:$3|}}3|يوزر واحد|يوزر واحد|اتنين يوزر |$3 مستخدمين|$3 يوزر}} ($2).",
 	"youhavenewmessagesmanyusers": "عندك $1 من يوزرات كتير  ($2).",
 	"newmessageslinkplural": "{{PLURAL:$1|رساله جديده|999=رسايل جديده}}",
-	"newmessagesdifflinkplural": "{{PLURAL:$1|تعديل|تعديلين|$1 تعديلات|$1 تعديل|$1 تعديل}}",
+	"newmessagesdifflinkplural": "أحدث {{PLURAL:$1|تغيير|999=تغييرات}}",
 	"youhavenewmessagesmulti": "عندك ميسيدج جديدة فى $1",
 	"editsection": "تعديل",
 	"editold": "تعديل",
@@ -258,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 تعديل ملغي}}",
@@ -300,6 +309,7 @@
 	"readonly_lag": "قاعدة البيانات (الـ database) اتقفلت اوتوماتيكى علشان تقدر السيرڤرات الـ slave تلحق السيرڤر الـ master",
 	"internalerror": "غلط جوّانى",
 	"internalerror_info": "غلط جوّانى: $1",
+	"internalerror-fatal-exception": "استثناء مميت من النوع \"$1\"",
 	"filecopyerror": "ما نفع ش  يتنسخ الفايل \"$1\" لـ \"$2\".",
 	"filerenameerror": "ما نفع ش يتغير اسم الفايل \"$1\" لـ \"$2\".",
 	"filedeleteerror": "ما نفع ش يتمسح الفايل \"$1\".",
@@ -318,10 +328,10 @@
 	"actionthrottled": "العمليه دى اتزنقت",
 	"actionthrottledtext": "علشان نمنع ال سبام ،أنت ممنوع تعمل  الفعل دا عدد كبير من المرات فى فترة زمنية قصيرة، و انت ا تجاوزت  الحد دا . لو سمحت تحاول مرة ثانية بعد دقائق.",
 	"protectedpagetext": "الصفحة دى اتحمت من التعديل.",
-	"viewsourcetext": "ممكن تشوف وتنسخ مصدر  الصفحه دى:",
+	"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''.",
@@ -333,9 +343,12 @@
 	"welcomecreation-msg": "اتفتحلك حساب.\nلو تحب ممكن تغير [[Special:Preferences|تفضيلاتك ف {{SITENAME}}]].",
 	"yourname": "اليوزرنيم:",
 	"userlogin-yourname": "اسم اليوزر",
+	"userlogin-yourname-ph": "إكتب اسم اليوزر بتاعك:",
 	"createacct-another-username-ph": "إكتب اسم يوزر:",
 	"yourpassword": "الباسوورد:",
+	"userlogin-yourpassword": "الباسورد:",
 	"yourpasswordagain": "اكتب الباسورد تاني:",
+	"createacct-yourpasswordagain": "أكد كلمه السر",
 	"remembermypassword": " (لمدة   $1 {{PLURAL:$1|يوم|يوم}})خليك فاكر دخولى على الكمبيوتر دا",
 	"yourdomainname": "النطاق بتاعك:",
 	"externaldberror": "يا إما فى حاجة غلط فى الدخول على قاعدة البيانات الخارجية أو انت مش مسموح لك تعمل تحديث لحسابك الخارجي.",
@@ -346,14 +359,22 @@
 	"logout": "خروج",
 	"userlogout": "خروج",
 	"notloggedin": "انت مش مسجل دخولك",
+	"userlogin-noaccount": "معندكش حساب؟",
+	"userlogin-joinproject": "انضم ل {{SITENAME}}",
 	"nologin": "معندكش حساب؟ '''$1'''.",
 	"nologinlink": "افتح حساب",
 	"createaccount": "افتح حساب",
 	"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|صفحه|صفحات}}",
 	"badretype": "كلمتين السر اللى  كتبتهم مش  زى بعضهم",
 	"userexists": "اسم اليوزر اللى كتبته بيستعمله يوزر غيرك.\nاكتت اسم يوزر تانى.",
 	"loginerror": "غلط فى الدخول",
@@ -393,8 +414,12 @@
 	"createaccount-text": "فى واحد فتح حساب باسم الايمل بتاعك على {{SITENAME}} ($4) بالاسم \"$2\"، وبباسورد \"$3\". لازم تسجل دخولك دلوقتى و تغير الباسورد بتاعتك.\n\nلو سمحت تتجاهل الرسالة دى اذا الحساب دا اتفتحلك بالغلط.",
 	"login-throttled": "انت عملت  محاولات لوجين كتيره  ع الحساب ده.\nمن فضلك استنى $1 قبل المحاولة مرة تانيه.",
 	"loginlanguagelabel": "اللغة: $1",
+	"pt-login": "دخول",
+	"pt-login-button": "دخول",
+	"pt-createaccount": "افتح حساب",
+	"pt-userlogout": "خروج",
 	"changepassword": "غير الباسورد",
-	"resetpass_announce": "اتسجل دخولك دلوقتى بالكود اللى اتبعتلك فى الايميل. علشان تخلص عملية الدخول ،لازم تعملك باسورد جديدة هنا:",
+	"resetpass_announce": " علشان تخلص عملية  تسجيل الدخول ،لازم تعملك باسورد جديده:",
 	"resetpass_text": "<!-- أضف نصا هنا -->",
 	"resetpass_header": "غيّر الباسورد بتاعة الحساب",
 	"oldpassword": "الباسورد القديمة:",
@@ -402,6 +427,7 @@
 	"retypenew": "اكتب الباسورد الجديده تانى:",
 	"resetpass_submit": "اظبط الباسورد و ادخل",
 	"changepassword-success": "الباسورد بتاعتك اتغيرت بنجاح!",
+	"changepassword-throttled": "انت عملت  محاولات لوجين كتيره  ع الحساب ده.\nمن فضلك استنى $1 قبل المحاولة مرة تانيه.",
 	"resetpass_forbidden": "مش ممكن تغيير الباسورد",
 	"resetpass-no-info": "لازم تسجل دخولك علشان تقدر توصل للصفحة دى على طول.",
 	"resetpass-submit-loggedin": "غير الباسورد",
@@ -434,7 +460,7 @@
 	"preview": "بروفه",
 	"showpreview": "عرض البروفه",
 	"showdiff": "بيين التعديلات",
-	"anoneditwarning": "'''تحذير:''' انت ما عملتش لوجين.\nعنوان الاى  بى  بتاعك هايتسجل فى تاريخ الصفحه .",
+	"anoneditwarning": "<strong>تحذير:'</strong> انت ما عملتش لوجين. عنوان الاى  بى  بتاعك هايتسجل ف تاريخ الصفحه. لو  <strong>[$1 عملت لوجين ]</strong> او <strong>[$2 فتحت حساب ]</strong>,   اليوزرنيم بتاعك هايتسجل ف تاريخ الصفحه.",
 	"missingsummary": "'''خد بالك:''' انت ما كتبتش ملخص للتعديل.\nلو دوست على سييڤ الصفحه مرة تانية التعديل بتاعك ح يتحفظ من غير ملخص.",
 	"missingcommenttext": "لو سمحت اكتب تعليق تحت.",
 	"missingcommentheader": "'''.خد بالك:''' انت ما كتبتش عنوان\\موضوع للتعليق دا\nلو دوست على {{int:savearticle}} مرة تانيه، تعليقك ح يتحفظ من غير عنوان.",
@@ -475,6 +501,7 @@
 	"session_fail_preview_html": "'''ماقدرناش نعالج تعديلك بسبب ضياع بيانات الجلسة.'''\n\n''لأن {{SITENAME}} بها HTML هل الخام شغاله، البروفه مخفيه كاحتياط ضد هجمات الجافا سكريبت.''\n\n'''إذا كانت دى محاولة تعديل صادقه، من فضلك حاول مرة تانيه. إذا كانت لسه مش شغاله، حاول [[Special:UserLogout|تسجيل الخروج]] و تسجيل الدخول من جديد.'''",
 	"token_suffix_mismatch": "'''تعديلك اترفض لأن عميلك غلط فى علامات الترقيم\nفى نص التعديل. التعديل اترفض علشان ما يبوظش نص المقالة.\nدا ساعات بيحصل لما تستعمل خدمة بروكسى مجهولة بايظة أساسها الويب.'''",
 	"editing": "تعديل $1",
+	"creating": "إنشاء «$1»",
 	"editingsection": "تعديل $1 (جزء)",
 	"editingcomment": "تعديل $1 (قسم جديد)",
 	"editconflict": "تضارب فى التحرير: $1",
@@ -492,7 +519,7 @@
 	"semiprotectedpagewarning": "'''ملاحظه:''' الصفحه دى اتقفلت بطريقه تخلّى اليوزرات المتسجلين بس هما اللى يقدرو يعدّلوها.\nاخر سجل محطوط تحت علشان المراجعه:",
 	"cascadeprotectedwarning": "<strong>تحذير: الصفحة دى اتقفلت بطريقة تخلى اليوزرز السيوبات بس هم اللى يقدرو يعدلوها، ودا علشان هى مدموجة فى {{PLURAL:$1|الصفحة|الصفحات}} التالية واللى اتعملها حمتية بخاصية \"حماية الصفحات المدموجة\":</strong>",
 	"titleprotectedwarning": "'''تحذير: الصفحه دى اتحمت بطريقه تخلّى [[Special:ListGroupRights|حقوق متحدده]] لازم تحتاجها علشان تعمل الصفحه.'''\nاخر سجل محطوط تحت علشان المراجعه:",
-	"templatesused": "{{PLURAL:$1|القالب المستعمل |القوالب المستعمله }}ا فى الصفحه دى:",
+	"templatesused": "{{PLURAL:$1|القالب المستعمل |القوالب المستعمله }} ف الصفحه دى:",
 	"templatesusedpreview": "{{PLURAL:$1|القالب المستعمل |القوالب المستعمله}} فى البروفه دى",
 	"templatesusedsection": "{{PLURAL:$1|القالب|القوالب}} اللى بتستخدم فى القسم دا:",
 	"template-protected": "(حمايه كامله)",
@@ -542,7 +569,7 @@
 	"currentrev": "النسخه دلوقتى",
 	"currentrev-asof": "المراجعة الحالية بتاريخ $1",
 	"revisionasof": "تعديلات من $1",
-	"revision-info": "نسخه $1 بواسطة $2",
+	"revision-info": "نسخة $1 ل {{GENDER:$6|$2}}$7",
 	"previousrevision": "←نسخه اقدم",
 	"nextrevision": "نسخه احدث→",
 	"currentrevisionlink": "النسخه دلوقتى",
@@ -647,11 +674,13 @@
 	"revertmerge": "استرجاع الدمج",
 	"mergelogpagetext": "فى تحت لستة بأحدث عمليات الدمج لتاريخ صفحة فى التانية.",
 	"history-title": " «$1»: تاريخ التعديل",
+	"difference-title": "«$1»: الفرق بين النسختين",
 	"difference-multipage": "(الفرق بين الصفحتين)",
 	"lineno": "سطر $1:",
 	"compareselectedversions": "قارن بين النسختين المختارتين",
 	"showhideselectedversions": "عرض/تخبية المراجعات المختاره.",
 	"editundo": "استرجاع",
+	"diff-multi-sameuser": "({{PLURAL:$1|نسخه واحده متوسطه|$1 نسخ متوسطه}}  بواسطة {{PLURAL:|يوزر واحد |يوزرات}}  مش معروضه)",
 	"diff-multi-manyusers": "({{PLURAL:$1|نسخه واحده متوسطه|$1 نسخ متوسطه}} by {{PLURAL:$2|يوزر واحد |$2 يوزرات}}  مش معروضه)",
 	"searchresults": "نتايج التدوير",
 	"searchresults-title": "نتايج التدوير على \"$1\"",
@@ -665,7 +694,7 @@
 	"shown-title": "اعرض $1 {{PLURAL:$1|نتيجه|نتايج}} فى كل صفحه",
 	"viewprevnext": "شوف ($1 {{int:pipe-separator}} $2) ($3)",
 	"searchmenu-exists": "'''فيه صفحه اسمها \"[[:$1]]\" على الويكى ده.''' {{PLURAL:$2|0=|بص كمان على نتايج البحث التانيه.}}",
-	"searchmenu-new": "'''ابتدى الصفحه \"[[:$1]]\" ع الويكى دا!''' {{PLURAL:$2|0=|بص كمان على الصفحه اللى لقيناها من بحثك.|بص كمان على نتايج البحث اللى لقيناها.}}",
+	"searchmenu-new": "<strong>ابتدى الصفحه \"[[:$1]]\" ع الويكى دا!</strong>  {{PLURAL:$2|0=|بص كمان على الصفحه اللى لقيناها من تدويرك.|بص كمان على نتايج التدوير.}}",
 	"searchprofile-articles": "صفحات محتوى",
 	"searchprofile-images": "مالتيميديا",
 	"searchprofile-everything": "كل شىء",
@@ -686,6 +715,7 @@
 	"searchrelated": "مرتبطه",
 	"searchall": "الكل",
 	"showingresults": "القائمة دى بتعرض {{PLURAL:$1|'''1''' نتيجة|'''$1''' نتيجة}} من أول  رقم '''$2'''.",
+	"search-showingresults": "{{PLURAL:$4|النتايج <strong>$1</strong> من <strong>$3</strong>|النتايج <strong>$1 - $2</strong> من أصل <strong>$3</strong>}}",
 	"search-nonefound": "لا توجد نتائج تطابق الاستعلام.",
 	"powersearch-legend": "تدوير متقدم",
 	"powersearch-ns": "تدوير فى اسم المساحه:",
@@ -921,6 +951,7 @@
 	"action-userrights-interwiki": "تعديل صلاحيات اليوزر لليوزرز فى الويكيات التانية",
 	"action-siteadmin": "غلق أو رفع غلق قاعدة البيانات",
 	"nchanges": "{{PLURAL:$1|تعديل|تعديلين|$1 تعديلات|$1 تعديل|$1 تعديل}}",
+	"enhancedrc-history": "تاريخ",
 	"recentchanges": "اخر التعديلات",
 	"recentchanges-legend": "اختيارات اخر التعديلات",
 	"recentchanges-summary": "تابع آخر التغييرات فى الويكى على الصفحة دى.",
@@ -929,15 +960,25 @@
 	"recentchanges-label-minor": "ده تعديل صغير",
 	"recentchanges-label-bot": "التعديل ده عمله بوت",
 	"recentchanges-label-unpatrolled": "التعديل ده مإتراجعش لسه",
+	"recentchanges-legend-heading": "شرح",
 	"recentchanges-legend-newpage": "{{int:recentchanges-label-newpage}} (بص كمان على [[Special:NewPages|قايمه الصفحات الجديده]])",
 	"rcnotefrom": "دى التعديلات من '''$2''' (ل '''$1''' معروضه).",
 	"rclistfrom": "اظهر التعديلات بدايه من $3 $2",
 	"rcshowhideminor": "$1 تعديلات صغيره",
+	"rcshowhideminor-show": "اعرض",
+	"rcshowhideminor-hide": "تخبية",
 	"rcshowhidebots": "$1 البوتات",
+	"rcshowhidebots-show": "عرض",
+	"rcshowhidebots-hide": "تخبية",
 	"rcshowhideliu": "$1 اليوزرز المتسجلين",
+	"rcshowhideliu-hide": "تخبية",
 	"rcshowhideanons": "$1 اليوزرز المجهولين",
+	"rcshowhideanons-show": "عرض",
+	"rcshowhideanons-hide": "تخبية",
 	"rcshowhidepatr": "$1 التعديلات المتراجعه",
 	"rcshowhidemine": "$1 تعديلاتى",
+	"rcshowhidemine-show": "اعرض",
+	"rcshowhidemine-hide": "تخبية",
 	"rclinks": "بيين اخر $1 تعديل فى اخر $2 يوم، $3",
 	"diff": "التغيير",
 	"hist": "تاريخ",
@@ -949,6 +990,7 @@
 	"number_of_watching_users_pageview": "[$1 {{PLURAL:$1| يوزر مراقب|يوزر مراقب}}]",
 	"rc_categories": "حصر لتصنيفات (مفصولة برمز \"|\")",
 	"rc_categories_any": "أى",
+	"rc-change-size-new": "$1 {{PLURAL:$1|بايت|بايتس}} بعد التغيير",
 	"newsectionsummary": "/* $1 */ قسم جديد",
 	"rc-enhanced-expand": "[اعرض التفاصيل]",
 	"rc-enhanced-hide": "إخفاء التفاصيل",
@@ -1221,6 +1263,7 @@
 	"suppress": "أوفرسايت",
 	"booksources": "مصادر من كتب",
 	"booksources-search-legend": "التدوير على مصادر الكتب",
+	"booksources-search": "تدوير",
 	"booksources-text": "فى تحت لستة بوصلات لمواقع تانية بتبيع الكتب الجديدة والمستعملة، كمان ممكن تلاقى معلومات إضافية عن الكتب اللى يتدور عليها :",
 	"booksources-invalid-isbn": "رقم الـ ISBN اللى كتبته شكله مش صحيح؛ اتإكد من الغلطات بتاعة النسخ من المصدر الاصلى.",
 	"specialloguserlabel": "اليوزر:",
@@ -1285,7 +1328,6 @@
 	"mailnologin": "مافيش عنوان نبعت عليه",
 	"mailnologintext": "لازم تعمل [[Special:UserLogin|تسجيل الدخول]] و تدخل ايميل صحيح فى صفحة [[Special:Preferences|التفضيلات]] علشان تقدر تبعت ايميلات لليوزرز التانيين.",
 	"emailuser": "ابعت ايميل لليوزر دا",
-	"emailpage": "ابعت ايميل لليوزر ده",
 	"emailpagetext": "ممكن تستعمل الاستمارة اللى تحت دى عشان تيعت ايميل {{GENDER:$1|لليوزر}} دا.\nعنوان الايميل اللى كتبته فى [[Special:Preferences|التفضيلات بتاعتك]] ح يظهر على انه عنوان الاستمارة، و بكدة اللى حيستقبله ح يقدر يرد على الايميل.",
 	"defemailsubject": "ايميل {{SITENAME}} من اليوزر \"$1\"",
 	"noemailtitle": "مافيش  عنوان ايميل",
@@ -1357,6 +1399,7 @@
 	"delete-warning-toobig": "الصفحة دى ليها تاريخ تعديل كبير، أكتر من $1 {{PLURAL:$1|مراجعة|مراجعة}}.\nممكن مسحها يعمل اضطراب  فى عمليات قاعدة البيانات فى {{SITENAME}}؛\nاستمر بس خد بالك.",
 	"rollback": "إرجع فى التعديلات",
 	"rollbacklink": "ترجيع",
+	"rollbacklinkcount": "استرجع {{PLURAL:$1|لا تعديلات|تعديل واحد|تعديلين|$1 تعديلات|$1 تعديل|تعديل}}",
 	"rollbackfailed": "الترجيع ما نفعش",
 	"cantrollback": "ماقدرناش نرجع فى التعديل؛ آخر مساهم هوه الوحيد اللى ساهم فى الصفحة دي.",
 	"alreadyrolled": "ماقدرناش نرجع التعديل الاخير لـ [[:$1]] بتاع [[User:$2|$2]] ([[User talk:$2|نقاش]]{{int:pipe-separator}}[[Special:Contributions/$2|{{int:contribslink}}]]);\nفى واحد تانى عدل الصفحه او عمل استرجاع قبل كده.\n\nاخر تعديل للصفحه دى عمله [[User:$3|$3]] ([[User talk:$3|نقاش]]{{int:pipe-separator}}[[Special:Contributions/$3|{{int:contribslink}}]]).",
@@ -1717,8 +1760,9 @@
 	"tooltip-pt-mycontris": "ليستة تعديلاتك",
 	"tooltip-pt-login": "يستحسن تسجل دخولك; لكن, ده مش اجبارى",
 	"tooltip-pt-logout": "خروج",
+	"tooltip-pt-createaccount": "نشجعك على عمل حساب وتسجيل دخولك; لكنه مش  ضروري",
 	"tooltip-ca-talk": "مناقشة صفحة الموضوع",
-	"tooltip-ca-edit": "ممكن تعدل الصفحه دى.\nبس لو سمحت استعمل زرار الپروڤه قبل ما تسييڤها.",
+	"tooltip-ca-edit": "عدل الصفحه دى",
 	"tooltip-ca-addsection": "ابتدى قسم جديد",
 	"tooltip-ca-viewsource": "الصفحه دى محميه.\nممكن تشوف مصدرها.",
 	"tooltip-ca-history": "نسخ قديمه من الصفحه دى",
@@ -1753,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": "اعرض رسالة النظام",
@@ -1791,7 +1835,8 @@
 	"spambot_username": "تنظيف سبام ميدياويكى",
 	"spam_reverting": "ترجيع آخر نسخة مافيهاش لينكات لـ $1",
 	"spam_blanking": "كل النسخ فيها لينكات ل $1، فضيها",
-	"simpleantispam-label": "اختبار انتي-سبام.\n'''ماتعبيش''' دا!",
+	"simpleantispam-label": "اختبار انتيسبام.\nاكتب <strong>ماتكتبش</strong> دا!",
+	"pageinfo-toolboxlink": "معلومات عن الصفحه",
 	"markaspatrolleddiff": "علم عليها انها متراجعة",
 	"markaspatrolledtext": "علم على المقاله دى إنها متراجعة",
 	"markedaspatrolled": "اتعلم عليها متراجعة",
@@ -1822,6 +1867,8 @@
 	"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|برواز|براويز}}",
 	"newimages": "جاليرى الصور الجديده",
@@ -2243,6 +2290,7 @@
 	"tags": "وسوم التغيير الصحيحة",
 	"tag-filter": "فلتر [[Special:Tags|الوسم]]:",
 	"tag-filter-submit": "فلتر",
+	"tag-list-wrapper": "([[Special:Tags|{{PLURAL:$1||وسم|وسمين|وسوم}}]]: $2)",
 	"tags-title": "وسوم",
 	"tags-intro": "الصفحه دى فيها ليستة الوسوم اللى ممكن البرنامج يعلم عى التعديل بيها، و معانيهم",
 	"tags-tag": "اسم الوسم",
@@ -2269,8 +2317,11 @@
 	"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": "ملخص التعديل",
 	"searchsuggest-search": "تدوير",
diff --git a/languages/i18n/as.json b/languages/i18n/as.json
index 694c504d47..f8a88f2028 100644
--- a/languages/i18n/as.json
+++ b/languages/i18n/as.json
@@ -87,8 +87,8 @@
 	"march": "মাৰ্চ",
 	"april": "এপ্ৰিল",
 	"may_long": "মে'",
-	"june": "june",
-	"july": "july",
+	"june": "জুন",
+	"july": "জুলাই",
 	"august": "আগষ্ট",
 	"september": "ছেপ্টেম্বৰ",
 	"october": "অক্টোবৰ",
@@ -100,7 +100,7 @@
 	"april-gen": "এপ্ৰিল",
 	"may-gen": "মে’",
 	"june-gen": "জুন",
-	"july-gen": "july",
+	"july-gen": "জুলাই",
 	"august-gen": "আগষ্ট",
 	"september-gen": "ছেপ্টেম্বৰ",
 	"october-gen": "অক্টোবৰ",
@@ -114,10 +114,10 @@
 	"jun": "জুন",
 	"jul": "জুলাই",
 	"aug": "আগষ্ট",
-	"sep": "ছেপ্টেম্বৰ:",
-	"oct": "অক্টোবৰ:",
+	"sep": "ছেপ্টেম্বৰ",
+	"oct": "অক্টোবৰ",
 	"nov": "নৱেম্বৰ:",
-	"dec": "ডিচেম্বৰ:",
+	"dec": "ডিচেম্বৰ",
 	"january-date": "জানুৱাৰী $1",
 	"february-date": "ফেব্ৰুৱাৰী $1",
 	"march-date": "মাৰ্চ $1",
@@ -139,9 +139,9 @@
 	"hidden-category-category": "অদৃশ্য শ্ৰেণীসমূহ",
 	"category-subcat-count": "{{PLURAL:$2|এই শ্ৰেণীত নিম্নলিখিত উপশ্ৰেণীসমূহ আছে। মুঠ $2টা উপশ্ৰেণীৰ ভিতৰত এই শ্ৰেণীত নিম্নলিখিত {{PLURAL:$1|এটা উপশ্ৰেণী|$1 টা উপশ্ৰেণী}} আছে।}}",
 	"category-subcat-count-limited": "এই শ্ৰেণীত নিম্নলিখিত {{PLURAL:$1|টা উপশ্ৰেণী আছে|$1টা উপশ্ৰেণী আছে}}।",
-	"category-article-count": "{{PLURAL:$2|এই শ্ৰেণীটোত কেৱল তলত দিয়া পৃষ্ঠাহে আছে। মুঠ $2 খনৰ ভিতৰত এই শ্ৰেণীটোত তলৰ {{PLURAL:$1|এটা পৃষ্ঠা আছে|$1 টা পৃষ্ঠা আছে}}।}}",
+	"category-article-count": "{{PLURAL:$2|এই শ্ৰেণীটোত কেৱল তলত দেখুওৱা পৃষ্ঠাহে আছে।| মুঠ $2 টাৰ ভিতৰত এই শ্ৰেণীটোত তলৰ {{PLURAL:$1|এটা পৃষ্ঠা আছে|$1 টা পৃষ্ঠা আছে।}}}}",
 	"category-article-count-limited": "এই {{PLURAL:$1|পৃষ্ঠা|$1 পৃষ্ঠাসমূহ}} সাম্প্ৰতিক শ্ৰেণীত আছে ।",
-	"category-file-count": "{{PLURAL:$2|এই শ্ৰেণীটোত কেবল তলত দিয়া ফাইলটোহে আছে। মুঠ $2টাৰ ভিতৰত এই শ্ৰেণীটোত তলৰ {{PLURAL:$1|এটা ফাইল|$1 টা ফাইল}} আছে।}}",
+	"category-file-count": "{{PLURAL:$2|এই শ্ৰেণীটোত কেৱল তলত দিয়া ফাইলটোহে আছে। মুঠ $2টাৰ ভিতৰত এই শ্ৰেণীটোত তলৰ {{PLURAL:$1|এটা ফাইল|$1 টা ফাইল}} আছে।}}",
 	"category-file-count-limited": "তলৰ {{PLURAL:$1|ফাইলটো|$1 ফাইলসমূহ}} সাম্প্ৰতিক শ্ৰেণীত আছে।",
 	"listingcontinuesabbrev": "আগলৈ",
 	"index-category": "সূচীকৃত পৃষ্ঠাসমূহ",
@@ -323,10 +323,13 @@
 	"readonly_lag": "তথ্যকোষ স্বয়ংক্ৰিয়ভাৱে বন্ধ হৈছে যাতে দ্বিতীয় শ্ৰেণীৰ তথ্যকোষৰ চাৰ্ভাৰ প্ৰধান তথ্যকোষৰ চাৰ্ভাৰৰ অৱস্থালৈ আহিব পাৰে ।",
 	"internalerror": "আভ্যন্তৰীণ ত্ৰুটি",
 	"internalerror_info": "আভ্যন্তৰীণ ত্ৰুটি: $1",
+	"internalerror-fatal-exception": " \"$1\" ধৰণৰ মাৰাত্মক ব্যতিক্ৰম",
 	"filecopyerror": "\"$1\" ফাইলটো \"$2\"লৈ প্ৰতিলিপি কৰিব পৰা নগ’ল।",
 	"filerenameerror": "\"$1\" ফাইলৰ নাম সলনি কৰি \"$2\" কৰিব পৰা নগ’ল ।",
 	"filedeleteerror": "\"$1\" ফাইলতো বিলোপ কৰিব পৰা নগ’ল।",
 	"directorycreateerror": "\"$1\" নিৰ্দেশিকা সৃষ্টি কৰিব পৰা নগ’ল।",
+	"directoryreadonlyerror": "নিৰ্দেশিকা \"$1\" কেৱল পাঠযোগ্য।",
+	"directorynotreadableerror": "নিৰ্দেশিকা \"$1\" পাঠযোগ্য নহয়।",
 	"filenotfound": "\"$1\" নামৰ ফাইলটো বিচাৰি পোৱা নগ’ল।",
 	"unexpected": "অনাকাংক্ষিত মূল্য: \"$1\"=\"$2\".",
 	"formerror": "ত্ৰুটি: প্ৰপত্ৰখন জমা দিব পৰা নগ’ল",
@@ -339,11 +342,11 @@
 	"badtitletext": "আপুনি বিচৰা পৃষ্ঠাটোৰ শিৰোনামা অযোগ্য, খালী বা ভুলকৈ জড়িত আন্তৰ্ভাষিক বা আন্তৰ্ৱিকি শিৰোনামা। ইয়াত এক বা ততোধিক বৰ্ণ আছে যাক শিৰোনামাত ব্যৱহাৰ কৰিব নোৱাৰি।",
 	"title-invalid-empty": "অনুৰোধ কৰা পৃষ্ঠা খালি নাইবা কেৱল এটা নামস্থানৰ নামহে আছে।",
 	"title-invalid-utf8": "অনুৰোধ কৰা পৃষ্ঠাৰ শিৰোনামত এটা অবৈধ UTF-8 শৃংখল আছে।",
-	"title-invalid-interwiki": "শিৰোনামত এটা আন্তঃৱিকি সংযোগ আছে",
+	"title-invalid-interwiki": "অনুৰোধ কৰা শিৰোনামত এটা আন্তঃৱিকি সংযোগ আছে যিটো শিৰোনামত ব্যৱহাৰ কৰিব নোৱাৰি।",
 	"title-invalid-talk-namespace": "অনুৰোধ কৰা পৃষ্ঠাৰ শিৰোনামে এটা আলোচনা পৃষ্ঠা সূচাইছে যিটো থাকিব নোৱাৰে।",
 	"title-invalid-characters": "অনুৰোধ কৰা পৃষ্ঠাৰ শিৰোনামত অবৈধ চিহ্ন আছে: \"$1\"।",
 	"title-invalid-magic-tilde": "অনুৰোধ কৰা পৃষ্ঠাৰ শিৰোনামত অবৈধ যাদুকৰী টাইল্ড শৃংখল আছে (<nowiki>~~~</nowiki>)।",
-	"title-invalid-too-long": "অনুৰোধ কৰা পৃষ্ঠাৰ শিৰোনাম অতি দীঘল। UTF-8 এন্‌ক'ডিঙত ই $1 বাইটতকৈ দীঘল হ'ব নালাগে।",
+	"title-invalid-too-long": "অনুৰোধ কৰা পৃষ্ঠাৰ শিৰোনাম অতি দীঘল। UTF-8 এন্‌ক'ডিঙত ই {PLURAL:$1|বাইট}}তকৈ দীঘল হ'ব নালাগে।",
 	"title-invalid-leading-colon": "অনুৰোধ কৰা পৃষ্ঠাৰ শিৰোনামৰ আৰম্ভণিত এটা অবৈধ ক'ল'ন আছে।",
 	"perfcached": "তলত দিয়া তথ্যখিনি আগতে জমা কৰি থোৱা (cached) আৰু সাম্প্ৰতিক নহ'ব পাৰে। এই তথ্যখিনিত সৰ্বোচ্চ {{PLURAL:$1|এটা ফলাফল|$1টা ফলাফল}} উপলব্ধ।",
 	"perfcachedts": "তলত দিয়া তথ্য খিনি আগতে জমা কৰি থোৱা (cached) আৰু শেষবাৰৰ কাৰণে $1 ত নবীকৰণ কৰা হৈছিল। সৰ্বাধিক {{PLURAL:$4|এটা ফলাফল|$4 টা ফলাফল}} এই কেশ্বত পাব।",
@@ -353,8 +356,8 @@
 	"actionthrottled": "কাৰ্য লেহেম কৰা হৈছে",
 	"actionthrottledtext": "স্পাম ৰোধ কৰিবলৈ এই ক্ৰিয়াতো কম সময়ৰ ভিতৰত বহু বেছি বাৰ কৰাতো ৰোধ কৰা হৈছে, আৰু আপুনি ইতিমধ্যে সেই সীমা অতিক্ৰম কৰিলে।\nঅনুগ্ৰহ কৰি কিছু সময় পাছত চেষ্টা কৰক।",
 	"protectedpagetext": "সম্পাদনা ৰোধ কৰিবলৈ এই পৃষ্ঠাটো সুৰক্ষিত কৰা হৈছে।",
-	"viewsourcetext": "আপুনি এই পৃষ্ঠাটোৰ উৎস চাব আৰু নকল কৰিব পাৰে",
-	"viewyourtext": "আপুনি '''আপোনাৰ সম্পাদনাসমূহ'''ৰ উৎস চাব আৰু এই পৃষ্ঠালৈ নকল কৰিব পাৰে:",
+	"viewsourcetext": "আপুনি এই পৃষ্ঠাটোৰ উৎস চাব আৰু প্ৰতিলিপি কৰিব পাৰে।",
+	"viewyourtext": "আপুনি <strong>আপোনাৰ সম্পাদনাসমূহ</strong>ৰ উৎস চাব আৰু এই পৃষ্ঠালৈ প্ৰতিলিপি কৰিব পাৰে।",
 	"protectedinterface": "এই পৃষ্ঠাই ৱিকি ছফ্টৱেৰৰ ইণ্টাৰফে’চ বাৰ্তা প্ৰদান কৰে আৰু ইয়াক সুৰক্ষিত কৰি ৰখা হৈছে।\nসকলো ৱিকিৰ বাবে অনুবাদ যোগ কৰিবলৈ বা সলাবলৈ অনুগ্ৰহ কৰি মিডিয়াৱিকি স্থানীয়কৰণ প্ৰকল্প [//translatewiki.net/ translatewiki.net] ব্যৱহাৰ কৰক।",
 	"editinginterface": "<strong>সাৱধানবাণী:</strong> আপুনি সম্পাদনা কৰি থকা পৃষ্ঠাটো এই ছফ্টৱেৰৰ ইণ্টাৰফে’চ বাৰ্তা দিবলৈ ব্যৱহাৰ হয়।\nএই পৃষ্ঠাৰ সাল-সলনিয়ে এই ৱিকিত আন ব্যৱহাৰকাৰীৰ বাবে ইণ্টাৰফে’চত প্ৰভাৱ পেলাব।",
 	"translateinterface": "সকলো ৱিকিৰ বাবে অনুবাদ যোগ বা সালসলনি কৰিবৰ বাবে অনুগ্ৰহ কৰি মিডিয়াৱিকি স্থানীয়কৰণ প্ৰকল্প //translatewiki.net/ translatewiki.net] ব্যৱহাৰ কৰক।",
@@ -523,7 +526,7 @@
 	"passwordreset-emailtitle": "{{SITENAME}}ত একাউণ্টৰ সবিশেষ তথ্য আছে ।",
 	"passwordreset-emailtext-ip": "কোনোবাই (IP ঠিকনা $1 ৰ পৰা সম্ভৱতঃ আপুনিয়েই) {{SITENAME}} ($4) ৰ বাবে আপোনাৰ গুপ্তশব্দ ন-কৈ বহুৱাবলৈ অনুৰোধ জনাইছিল। ইমেইল ঠিকনাটোৰ লগত এই সদস্যৰ {{PLURAL:$3|একাউণ্ট|একাউণ্টবোৰ}} জড়িত হৈ আছে ।\n\n$2\n \n{{PLURAL:$3|এই অস্থায়ী গুপ্তশব্দ|এই অস্থায়ী গুপ্তশব্দবোৰ}} {{PLURAL:$5|এদিনত|$5 দিনত }} নাইকীয়া হ’ব । আপুনি লগ-ইন কৰি এটা নতুন গুপ্তশব্দ দিয়া উচিত । যদি আন কোনোবাই এই অনুৰোধ কৰিছিল, বা আপুনি নিজৰ পূৰ্বৰ গুপ্তশব্দ মনত পেলাইছে আৰু ইয়াক সলাব খোজা নাই, তেন্তে আপুনি এই বাৰ্তাক অগ্ৰাহ্য কৰি নিজৰ পূৰ্বৰ গুপ্তশব্দ ব্যৱহাৰ কৰি থাকিব পাৰে ।",
 	"passwordreset-emailtext-user": "{{SITENAME}}ত $1 ব্যৱহাৰকাৰীয়ে {{SITENAME}} ($4)ৰ বাবে আপোনাৰ গুপ্তশব্দ ন-কৈ বহুৱাবলৈ অনুৰোধ জনাইছিল। ই-পত্ৰ ঠিকনাটোৰ লগত এই সদস্যৰ {{PLURAL:$3|একাউণ্ট|একাউণ্টসমূহ}} জড়িত হৈ আছে।\n \n$2\n \n{{PLURAL:$3|এই অস্থায়ী গুপ্তশব্দ|এই অস্থায়ী গুপ্তশব্দবোৰ}} {{PLURAL:$5|এদিনত|$5 দিনত }} নাইকীয়া হ’ব । আপুনি লগ-ইন কৰি এটা নতুন গুপ্তশব্দ দিয়া উচিত। যদি আন কোনোবাই এই অনুৰোধ কৰিছিল, বা আপুনি নিজৰ পূৰ্বৰ গুপ্তশব্দ মনত পেলাইছে আৰু ইয়াক সলাব খোজা নাই, তেন্তে আপুনি এই বাৰ্তাক অগ্ৰাহ্য কৰি নিজৰ পূৰ্বৰ গুপ্তশব্দ ব্যৱহাৰ কৰি থাকিব পাৰে।",
-	"passwordreset-emailelement": "সদস্যনাম: $1\nঅস্থায়ী গুপ্তশব্দ: $2",
+	"passwordreset-emailelement": "সদস্যনাম: \n$1\n\nঅস্থায়ী গুপ্তশব্দ: \n$2",
 	"passwordreset-emailsent": "এখন গুপ্তশব্দ উদ্ধাৰ ই-মেইল পঠিওৱা হৈছে।",
 	"passwordreset-emailsent-capture": "এখন গুপ্তশব্দ উদ্ধাৰ ইমেইল পঠিওৱা হৈছে, এইখন তলত দেখা পাব।",
 	"passwordreset-emailerror-capture": "এখন গুপ্তশব্দ উদ্ধাৰ ইমেইল সৃষ্টি কৰা হ'ল, কিন্তু {{GENDER:$2|সদস্যজনলৈ}} পঠিয়াব পৰা নগ'ল। সেইখন তলত দেখুওৱা হৈছে: $1",
@@ -723,6 +726,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": "(ল'গ সবিশেষ আঁতৰোৱা হ'ল)",
@@ -1177,9 +1181,9 @@
 	"newpageletter": "ন",
 	"boteditletter": "ব",
 	"number_of_watching_users_pageview": "[$1 {{PLURAL:$1|জন সদস্যই|জন সদস্যই}} এই পৃষ্ঠা নিৰীক্ষণ কৰিছে]",
-	"rc_categories": "অনুচ্ছেদৰ সীমাবদ্ধতা (\"|\" দি পৃথক কৰক)",
-	"rc_categories_any": "যিকোনো",
-	"rc-change-size-new": "সালসলনিৰ পিছত $1 {{PLURAL:$1|বাইট|বাইট}}",
+	"rc_categories": "শ্ৰেণীসমূহৰ সীমাবদ্ধতা (\"|\" দি পৃথক কৰক):",
+	"rc_categories_any": "বাছনি কৰাৰ মাজত যিকোনো",
+	"rc-change-size-new": "$1 {{PLURAL:$1|বাইট}} যোগ দিয়া হ’ল",
 	"newsectionsummary": "/* $1 */ নতুন অনুচ্ছেদ",
 	"rc-enhanced-expand": "সবিশেষ দেখুৱাওক",
 	"rc-enhanced-hide": "সবিশেষ  লুকুৱাওক",
@@ -1285,6 +1289,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-backup": "$1 ফাইলটো বেকআপ্‌ কৰিব পৰা নগ'ল।",
 	"backend-fail-notexists": "$1 ফাইলটোৰ কোনো অস্তিত্ব নাই।",
@@ -1451,6 +1468,9 @@
 	"randomincategory": "শ্ৰেণীৰ যিকোনো পৃষ্ঠা",
 	"randomincategory-invalidcategory": "\"$1\" বৈধ শ্ৰেণী নাম নহয়।",
 	"randomincategory-nopages": "[[:Category:$1|$1]] শ্ৰেণীত কোনো পৃষ্ঠা নাই।",
+	"randomincategory-category": "শ্ৰেণী:",
+	"randomincategory-legend": "শ্ৰেণীৰ যিকোনো পৃষ্ঠা",
+	"randomincategory-submit": "যাওক",
 	"randomredirect": "অনিৰ্ধাৰিত পুননিৰ্দেশ",
 	"randomredirect-nopages": "\"$1\" নামস্থানত কোনো পুননিৰ্দেশ নাই ।",
 	"statistics": "পৰিসংখ্যা",
@@ -1639,7 +1659,6 @@
 	"emailuser": "এই সদস্যজনলৈ ই-মেইল পঠিয়াওক",
 	"emailuser-title-target": "{{GENDER:$1|সদস্যজনলৈ}} ইমেইল পঠিয়াওক",
 	"emailuser-title-notarget": "ব্যৱহাৰকাৰী ই-পত্ৰ প্ৰেৰণ কৰক",
-	"emailpage": "ই-পত্ৰ ব্যৱহাৰকাৰী",
 	"emailpagetext": "তলৰ প্ৰপত্ৰখন ব্যৱহাৰ কৰি আপুনি এই {{GENDER:$1|সদস্যজনলৈ}} ই-মেইল পঠাব পাৰে ।\nআপুনি [[Special:Preferences|আপোনাৰ সদস্য পছন্দসমূহ]]ত প্ৰৱেশ কৰা ই-মেইল ঠিকনাটো প্ৰেৰকৰ ঠিকনা হিছাপে দেখা যাব, যাতে মেইলৰ প্ৰাপকে আপোনাক উত্তৰ দিব পাৰে ।",
 	"defemailsubject": "\"$1\" সদস্যৰ পৰা {{SITENAME}} ই-মেইল",
 	"usermaildisabled": "ব্যৱহাৰকাৰীৰ ই-মেইল নিষ্ক্ৰিয়",
@@ -1746,6 +1765,7 @@
 	"rollback-success": "$1 ৰ সম্পাদনাসমূহ পূৰ্বৰ অৱস্থালৈ ঘূৰাই নিয়া হৈছে;\nপৃষ্ঠাটো $2 য়ে কৰা শেষ সংশোধনীলৈ ঘূৰাই নিয়া হৈছে ।",
 	"sessionfailure-title": "ছেছন বিফল",
 	"sessionfailure": "আপোনাৰ লগ-ইন ছেছনত সম্ভৱত: কোনো সমস্যা হৈছে;\nছেছন হাইজেকিং প্ৰতিৰোধ কৰিবলৈ এই কামটো বাতিল কৰা হৈছে ।\nঅনুগ্ৰহ কৰি আগৰ পৃষ্ঠালৈ ঘূৰি গৈ ৰিল’ড কৰি পুনৰ চেষ্টা কৰক ।",
+	"logentry-contentmodel-change-revert": "আগৰ অৱস্থালৈ ঘূৰি যাওক",
 	"protectlogpage": "সুৰক্ষা সূচী",
 	"protectlogtext": "পৃষ্ঠা সুৰক্ষাৰ সালসলনিসমূহৰ তালিকা তলত দিয়া হ’ল ।\nবৰ্তমান কাৰ্য্যৰত পৃষ্ঠা সুৰক্ষাসমূহৰ বাবে [[Special:ProtectedPages|সুৰক্ষিত পৃষ্ঠাৰ তালিকা]] চাওক ।",
 	"protectedarticle": "সুৰক্ষিত \"[[$1]]\"",
@@ -2168,7 +2188,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": "এই পৃষ্ঠাৰ যোৱা সংস্কৰণসমূহ",
@@ -2242,7 +2262,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": "প্ৰাথমিক তথ্য",
@@ -2430,7 +2450,7 @@
 	"exif-subjectarea": "বিষয়বস্তুৰ ক্ষেত্ৰফল",
 	"exif-flashenergy": "ফ্লেছ শক্তি",
 	"exif-focalplanexresolution": "X ফোকাচ তলৰ ৰিজলিউশ্যন",
-	"exif-focalplaneyresolution": "Y ফোকাচ তলৰ ৰিজলিউশ্যন",
+	"exif-focalplaneyresolution": "Y ফ'কাচ তলৰ ৰিজলিউশ্যন",
 	"exif-focalplaneresolutionunit": "ফ'কেল তল ৰিজলিউশ্যন একক",
 	"exif-subjectlocation": "বিষয়বস্তুৰ স্থান",
 	"exif-exposureindex": "উন্মুক্ত সূচী",
diff --git a/languages/i18n/ast.json b/languages/i18n/ast.json
index d22ff19b50..f615bed11f 100644
--- a/languages/i18n/ast.json
+++ b/languages/i18n/ast.json
@@ -18,7 +18,6 @@
 	"tog-hideminor": "Anubrir les ediciones menores nos cambeos recientes",
 	"tog-hidepatrolled": "Anubrir les ediciones vixilaes nos cambeos recientes",
 	"tog-newpageshidepatrolled": "Anubrir les páxines vixilaes na llista de páxines nueves",
-	"tog-hidecategorization": "Tapecer la categorización de páxines",
 	"tog-extendwatchlist": "Espander la llista de siguimientu p'amosar tolos cambeos, non solo los más recientes",
 	"tog-usenewrc": "Agrupar los cambeos por páxina nos cambeos recientes y na llista de siguimientu",
 	"tog-numberheadings": "Autonumberar los encabezaos",
@@ -48,7 +47,6 @@
 	"tog-watchlisthideliu": "Anubrir les ediciones d'usuarios identificaos na llista de siguimientu",
 	"tog-watchlisthideanons": "Anubrir les ediciones d'usuarios anónimos na llista de siguimientu",
 	"tog-watchlisthidepatrolled": "Anubrir les ediciones patrullaes na llista de siguimientu",
-	"tog-watchlisthidecategorization": "Tapecer la categorización de páxines",
 	"tog-ccmeonemails": "Mandame copies de los correos qu'unvio a otros usuarios",
 	"tog-diffonly": "Nun amosar el conteníu de la páxina embaxo de les diferencies",
 	"tog-showhiddencats": "Amosar categoríes anubríes",
@@ -433,6 +431,7 @@
 	"createacct-benefit-body2": "{{PLURAL:$1|páxina|páxines}}",
 	"createacct-benefit-body3": "{{PLURAL:$1|collaborador|collaboradores}} de recién",
 	"badretype": "Les contraseñes qu'escribisti nun concuayen.",
+	"usernameinprogress": "Yá ta creándose una cuenta pa esti nome d'usuariu.\nEspera.",
 	"userexists": "El nome d'usuariu conseñáu yá ta usándose.\nPor favor escueyi un nome diferente.",
 	"loginerror": "Error d'aniciu de sesión",
 	"createacct-error": "Error de creación de cuenta",
@@ -523,7 +522,7 @@
 	"passwordreset-emailtitle": "Detalles de la cuenta en {{SITENAME}}",
 	"passwordreset-emailtext-ip": "Dalguién (seique vusté, dende la direición IP $1)solicitó'l reaniciu de la so contraseña de {{SITENAME}} ($4).\n{{PLURAL:$3|La cuenta d'usuariu siguiente ta asociada|Les cuentes d'usuariu siguientes tán asociaes}}\na esta direición de corréu electrónicu:\n\n$2\n\n{{PLURAL:$3|Esta contraseña provisional caduca|Estes contraseñes provisionales caduquen}} {{PLURAL:$5|nun día|en $5 díes}}.\nTendría d'aniciar sesión y escoyer una contraseña nueva agora. Si esta solicitú la fizo otra persona,\no si recordó la clave orixinal y yá nun quier camudala, pue escaecer esti mensaxe y siguir\nusando la contraseña antigua.",
 	"passwordreset-emailtext-user": "L'usuariu $1 de {{SITENAME}} solicitó un reaniciu de la so contraseña de {{SITENAME}} ($4). {{PLURAL:$3|La cuenta d'usuariu siguiente ta asociada|Les cuentes d'usuariu siguientes tán asociaes}} con esta direición de corréu electrónicu:\n\n$2\n\n{{PLURAL:$3|Esta contraseña provisional caduca|Estes contraseñes provisionales caduquen}} {{PLURAL:$5|nun día|en $5 díes}}.\nTendría d'aniciar sesión y escoyer una contraseña nueva agora. Si esta solicitú la fizo otra persona, o si recordó la clave orixinal y yá nun quier camudala, pue escaecer esti mensaxe y siguir usando la contraseña antigua.",
-	"passwordreset-emailelement": "Nome d'usuariu: $1\nContraseña temporal: $2",
+	"passwordreset-emailelement": "Nome d'usuariu: \n$1\n\nContraseña temporal: \n$2",
 	"passwordreset-emailsent": "Unvióse un corréu electrónicu pa reaniciar la contraseña.",
 	"passwordreset-emailsent-capture": "Unvióse un corréu electrónicu pa reaniciar la contraseña, que s'amuesa abaxo.",
 	"passwordreset-emailerror-capture": "Unvióse un corréu electrónicu pa reaniciar la contraseña, que s'amuesa abaxo, pero falló l'unviu {{GENDER:$2|al usuariu|a la usuaria}}: $1",
@@ -922,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}})",
@@ -1197,9 +1197,6 @@
 	"rcshowhidemine": "$1 les mios ediciones",
 	"rcshowhidemine-show": "Amosar",
 	"rcshowhidemine-hide": "Anubrir",
-	"rcshowhidecategorization": "$1 la categorización de páxina",
-	"rcshowhidecategorization-show": "Amosar",
-	"rcshowhidecategorization-hide": "Tapecer",
 	"rclinks": "Amosar los caberos $1 cambeos de los caberos $2 díes <br />$3",
 	"diff": "dif",
 	"hist": "hist",
@@ -1223,10 +1220,6 @@
 	"recentchangeslinked-summary": "Esta ye una llista de los caberos cambios fechos nes páxines enllaciaes dende una páxina determinada (o nos miembros d'una categoría determinada).\nLes páxines de [[Special:Watchlist|la to llista de siguimientu]] tán en <strong>negrina</strong>.",
 	"recentchangeslinked-page": "Nome de la páxina:",
 	"recentchangeslinked-to": "Amosar los cambios de les páxines qu'enllacen en cuenta de los de la páxina dada",
-	"recentchanges-page-added-to-category": "[[:$1]] amestóse a la categoría",
-	"recentchanges-page-added-to-category-bundled": "[[:$1]] y {{PLURAL:$2|otra páxina|otres $2 páxines}} amestaes a la categoría",
-	"recentchanges-page-removed-from-category": "[[:$1]] desanicióse de la categoría",
-	"recentchanges-page-removed-from-category-bundled": "[[:$1]] y {{PLURAL:$2|otra páxina|otres $2 páxines}} desaniciaes de la categoría",
 	"upload": "Xubir ficheru",
 	"uploadbtn": "Xubir ficheru",
 	"reuploaddesc": "Cancelar la xubida y tornar al formulariu de xubíes",
@@ -1647,7 +1640,7 @@
 	"booksources-text": "Esta ye una llista d'enllaces a otros sitios que vienden llibros nuevos y usaos, y que puen tener más información sobre los llibros que ta buscando:",
 	"booksources-invalid-isbn": "El códigu ISBN que puxisti nun paez que valga; mira que te vien copiáu de la fonte orixinal.",
 	"specialloguserlabel": "Fecho por:",
-	"speciallogtitlelabel": "Oxetivu (títulu o usuariu):",
+	"speciallogtitlelabel": "Oxetivu (títulu o {{ns:user}}:nome d'usuariu):",
 	"log": "Rexistros",
 	"all-logs-page": "Tolos rexistros públicos",
 	"alllogstext": "Visualización combinada de tolos rexistros disponibles de {{SITENAME}}.\nPues filtrar la visualización seleicionando una mena de rexistru, el nome d'usuariu (teniendo en cuenta les mayúscules y minúscules) o la páxina afectada (teniendo en cuenta tamién les mayúscules y minúscules).",
@@ -1733,7 +1726,6 @@
 	"emailuser": "Manda-y un corréu a esti usuariu",
 	"emailuser-title-target": "Unviar un corréu electrónicu a {{GENDER:$1|esti usuariu|esta usuaria}}",
 	"emailuser-title-notarget": "Unviar un corréu electrónicu a un usuariu",
-	"emailpage": "Envigar un corréu electrónicu a un usuariu",
 	"emailpagetext": "Pues usar el formulariu de más abaxo pa unviar un corréu electrónicu a {{GENDER:$1|esti usuariu|esta usuaria}}.\nLa direición de corréu electrónicu qu'especificasti nes [[Special:Preferences|tos preferencies d'usuariu]] va apaecer como la direición \"Dende\" del corréu, pa que'l que lo recibe seya quien a respondete direutamente a ti.",
 	"defemailsubject": "Corréu electrónicu del usuariu «$1» de {{SITENAME}}",
 	"usermaildisabled": "Corréu del usuariu desactiváu",
@@ -1755,7 +1747,7 @@
 	"emailccsubject": "Copia del to mensaxe a $1: $2",
 	"emailsent": "Corréu unviáu",
 	"emailsenttext": "Unviose'l to mensaxe de corréu.",
-	"emailuserfooter": "Esti corréu electrónicu unviólu $1 a $2 per aciu de la función «{{int:emailpage}}» de {{SITENAME}}.",
+	"emailuserfooter": "Esti corréu electrónicu unviólu $1 a $2 per aciu de la función «{{int:emailuser}}» de {{SITENAME}}.",
 	"usermessage-summary": "Dexar un mensaxe del sistema.",
 	"usermessage-editor": "Mensaxería del sistema",
 	"watchlist": "Llista de siguimientu",
@@ -2326,7 +2318,7 @@
 	"tooltip-ca-nstab-main": "Ver la páxina de conteníu",
 	"tooltip-ca-nstab-user": "Ver la páxina d'usuariu",
 	"tooltip-ca-nstab-media": "Amuesa la páxina de multimedia",
-	"tooltip-ca-nstab-special": "Esta ye una páxina especial, nun pues editar la propia páxina",
+	"tooltip-ca-nstab-special": "Esta ye una páxina especial y nun pué editase",
 	"tooltip-ca-nstab-project": "Vera la páxina de proyeutu",
 	"tooltip-ca-nstab-image": "Ver la páxina del ficheru",
 	"tooltip-ca-nstab-mediawiki": "Amuesa'l mensaxe de sistema",
@@ -3186,6 +3178,7 @@
 	"logentry-newusers-create2": "$1 {{GENDER:$2|creó}} la cuenta d'usuariu $3",
 	"logentry-newusers-byemail": "$1 {{GENDER:$2|creó}} la cuenta d'usuariu $3 y la contraseña unvióse per corréu electrónicu",
 	"logentry-newusers-autocreate": "La cuenta $1 {{GENDER:$2|creóse}} automáticamente",
+	"logentry-protect-move_prot": "$1 {{GENDER:$2|treslladó}} les preferencies de protección de $4 a $3",
 	"logentry-rights-rights": "$1 {{GENDER:$2|camudó}} la pertenencia a grupos de $3 dende $4 a $5",
 	"logentry-rights-rights-legacy": "$1 {{GENDER:$2|camudó}} la pertenencia a grupos de $3",
 	"logentry-rights-autopromote": "$1 {{GENDER:$2|promocionó}} automáticamente de $4 a $5",
diff --git a/languages/i18n/avk.json b/languages/i18n/avk.json
index 2d2e09ab1f..14b9db718e 100644
--- a/languages/i18n/avk.json
+++ b/languages/i18n/avk.json
@@ -352,12 +352,11 @@
 	"resetpass-submit-cancel": "Kuidera",
 	"resetpass-temp-password": "Ugaloraf remravlem :",
 	"passwordreset": "Va remravlem tolbazel",
-	"passwordreset-legend": "Va remravlem tolbazel",
 	"passwordreset-username": "Favesikyolt :",
 	"passwordreset-domain": "Ind",
 	"passwordreset-email": "E-mail mane",
 	"passwordreset-emailtitle": "Pinta va pata dene {{SITENAME}}",
-	"passwordreset-emailelement": "Favesikyolt : $1\nUgaloraf remravlem : $2",
+	"passwordreset-emailelement": "Favesikyolt : \n$1\n\nUgaloraf remravlem : \n$2",
 	"changeemail": "Betara va e-mail mane",
 	"changeemail-oldemail": "Noelafe e-mail mane",
 	"changeemail-newemail": "Warzafe e-mail mane",
@@ -930,7 +929,6 @@
 	"nlinks": "$1 {{PLURAL:$1|gluyasiki|gluyasiki}}",
 	"nmembers": "$1 {{PLURAL:$1|bewik}}",
 	"nrevisions": "$1 betara",
-	"nviews": "$1 rupera",
 	"specialpage-empty": "Mek trasiks tori bat munsteks.",
 	"lonelypages": "Avuwikaf bueem",
 	"lonelypagestext": "Batu bu tid gluyasikiiskafu male aru bu koe {{SITENAME}}.",
@@ -1020,7 +1018,6 @@
 	"mailnologin": "Meke mane",
 	"mailnologintext": "Rin gotil [[Special:UserLogin|dogluyarakiraf]]\nis bazeyes va wadafe internetmane ko rinaf [[Special:Preferences|lodamaceem]]\nta da pu ar favesik rostaksal.",
 	"emailuser": "Staksara va bat favesik",
-	"emailpage": "E-mail staksara va tel favesik",
 	"emailpagetext": "Si cet utilisateur a indiqué une adresse électronique valide dans ses préférences, le formulaire ci-dessous lui enverra un message.\nL'adresse électronique que vous avez indiquée dans vos préférences apparaîtra dans le champ « Expéditeur » de votre message afin que le destinataire puisse vous répondre.",
 	"defemailsubject": "internettwa staksayana mal {{SITENAME}}",
 	"noemailtitle": "Me internetmane",
diff --git a/languages/i18n/awa.json b/languages/i18n/awa.json
index e00af38a6b..e331139ffd 100644
--- a/languages/i18n/awa.json
+++ b/languages/i18n/awa.json
@@ -506,7 +506,7 @@
 	"passwordreset-emailtitle": "{{SITENAME}} पे खाता कय विवरण",
 	"passwordreset-emailtext-ip": "केहु (शायद आप कय, $1 आइ॰पी ठहर से) {{SITENAME}} ($4) पे अपने {{PLURAL:$3|गुप्त कुंजी}} कय रीसेट करेक अनुरोध करे है। इ ई-मेल ठहर से निचे  कय{{PLURAL:$3|खाता जोड़ान् है}}:\n\n$2\n\n{{PLURAL:$3|इ}} अस्थायी गुप्त कुंजी {{PLURAL:$5|दिन}} कय बाद काम नाइ करि। आप लॉग इन कई कय एकठु नँवा गुप्त कुंजी अभीनै चुन लुहा जाए। यदि इ अनुरोध केहु अउर करे है, या फिर आप कय आपन गुप्त कुंजी याद आइ गा है, औ आप {{PLURAL:$3|आपन}} गुप्त कुंजी नाइ बदलेक चाहा जात है तव आप इ संदेश कय अनदेखा कई कय आपन पुरान गुप्तकुंजी कय प्रयोग कै सका जात है।",
 	"passwordreset-emailtext-user": "{{SITENAME}} ($4) पे सदस्य $1 आपकय {{PLURAL:$3|खाता}} कय गुप्तकुंजी कय रीसेट करेक अनुरोध करे हैं। इ ई-मेल ठहर से इ {{PLURAL:$3|खाता जोडान है}}:\n\n$2\n\n{{PLURAL:$3|ई}} अस्थायी गुप्तकुंजी {{PLURAL:$5|दिन}} कय बाद काम नाइ करि।\nआप लॉग इन कइकै एकठु नँवा गुप्त कुंजी अभीन लै लेक चाहि। यदि इ अनुरोध केहु दुसर करे है, या फिर आप कय आपन गुप्त कुंजी याद आई गा है, अव आप {{PLURAL:$3|आपन}} गुप्तकुंजी नाई बदलेक चाहा जात है, आप इ संदेश कय अनदेखा कई कय आपन पुरान गुप्तकुंजी कय प्रयोग कइ सका जात है।",
-	"passwordreset-emailelement": "सदस्यनाँव: $1\nअस्थायी गुप्तकुंजी: $2",
+	"passwordreset-emailelement": "सदस्यनाँव: \n$1\n\nअस्थायी गुप्तकुंजी: \n$2",
 	"passwordreset-emailsent": "एक गुप्तकुंजी रीसेट ई-मेल भेज दिहा गा है।",
 	"passwordreset-emailsent-capture": "नीचे जवन देखावा है ओकर गुप्तकुंजी रीसेट ई-मेल भेज दिहा गा है।",
 	"passwordreset-emailerror-capture": "नीचे दिहा गुप्त कुंजी रीसेट ई-मेल पैदा भा रहा, लेकिन ओका {{GENDER:$2|सदस्य}} कय भेजब असफल रहा।\nत्रुटि: $1",
@@ -1654,7 +1654,6 @@
 	"emailuser": "इ सदस्य कय ई-मेल पठवा जाय",
 	"emailuser-title-target": "इ {{GENDER:$1|सदस्य|सदस्या}} कय ई-मेल करा जाय।",
 	"emailuser-title-notarget": "सदस्य कय ई-मेल करा जाय",
-	"emailpage": "सदस्य कय ई-मेल करा जाय",
 	"emailpagetext": "नीचे कय पर्चा से आप इ {{GENDER:$1|सदस्य}} कय ई-मेल भेजि सका जात है।\nआप जवन ठहर [[Special:Preferences|आप कय पसंद]] में दिहा गा है उ इ ई-मेल कय \"भेजय वाले\" कय तौर पे आइ, इही से प्राप्तकर्ता आप कय सीधय जवाब दई सकत हैं।",
 	"defemailsubject": "{{SITENAME}} ई-मेल \"$1\" सदस्य से",
 	"usermaildisabled": "सदस्य ई-मेल अक्षम कै गय",
diff --git a/languages/i18n/az.json b/languages/i18n/az.json
index 278c26f1b7..1a0ea3b9ff 100644
--- a/languages/i18n/az.json
+++ b/languages/i18n/az.json
@@ -510,7 +510,7 @@
 	"passwordreset-domain": "Domen:",
 	"passwordreset-email": "E-mail ünvanı:",
 	"passwordreset-emailtitle": "{{SITENAME}} hesabın yaradılması",
-	"passwordreset-emailelement": "İstifadəçi adı: $1\nMüvəqqəti parol: $2",
+	"passwordreset-emailelement": "İstifadəçi adı: \n$1\n\nMüvəqqəti parol: \n$2",
 	"passwordreset-emailsent": "Xəbərdarlıq məktubu e-maillə göndərildi.",
 	"changeemail": "E-məktub ünvanını dəyiş",
 	"changeemail-oldemail": "Hazırkı e-poçt ünvanı:",
@@ -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)",
@@ -974,7 +974,7 @@
 	"action-reupload": "Mövcud faylın yeni versiyasının yüklənməsi",
 	"action-upload_by_url": "URL ünvanından bu faylı yükləmək",
 	"action-writeapi": "API yazıdan istifadə",
-	"action-delete": "bu səhifəni sil",
+	"action-delete": "bu səhifəni silmək",
 	"action-deleterevision": "bu yoxlamaı ləğv et",
 	"action-deletedhistory": "səhifənin silinmə tarixinə baxmaq",
 	"action-browsearchive": "Silinmiş səhifələri axtar",
@@ -1346,7 +1346,6 @@
 	"listgrouprights-removegroup-self-all": "Bütün qrupları öz hesabından çıxara bilər",
 	"mailnologin": "Ünvan yoxdur",
 	"emailuser": "İstifadəçiyə e-məktub göndər",
-	"emailpage": "İstifadəçiyə e-məktub yolla",
 	"defemailsubject": "\"$1\" adlı istifadəçidən {{SITENAME}} e-məktubu",
 	"usermaildisabled": "İstifadəçi e-maili işləmir",
 	"noemailtitle": "E-məktub ünvanı yoxdur",
@@ -1361,7 +1360,7 @@
 	"emailmessage": "Mesaj:",
 	"emailsend": "Göndər",
 	"emailccme": "Məktubun surətini elektron ünvanıma göndər.",
-	"emailccsubject": " $1: $2-yə olan ismarıclarınızın surəti",
+	"emailccsubject": "$1 adlı istifadəçiyə olan ismarıcınızın surəti: $2",
 	"emailsent": "E-məktub göndərildi",
 	"emailsenttext": "E-məktub mesajınız göndərildi.",
 	"usermessage-summary": "Sistem mesajı qoyun.",
@@ -1420,6 +1419,7 @@
 	"deletereasonotherlist": "Digər səbəb",
 	"deletereason-dropdown": "*Əsas silmə səbəbi\n** Müəllif istəyi\n** Müəllif hüququ pozuntusu\n** Vandalizm",
 	"delete-edit-reasonlist": "Silmə səbəblərinin redaktəsi",
+	"delete-toobig": "Bu səhifə $1-dən artıq redaktə ilə çox böyük redaktə tarixçəsinə malikdir.\n\"{{SITENAME}}\" saytının fəaliyyətində problemlər yaratmamaq üçün bu cür səhifələrin silinməsi qadağandır.",
 	"rollback": "əvvəlki halına qaytar",
 	"rollbacklink": "əvvəlki halına qaytar",
 	"rollbacklinkcount": "$1 {{PLURAL:$1|dəyişikliyi|dəyişikliyi}} geri qaytar",
@@ -1575,7 +1575,7 @@
 	"blockipsuccesssub": "Bloklandı",
 	"blockipsuccesstext": "[[Special:Contributions/$1|$1]] bloklanıb.<br />\nBlokları yoxlamaq üçün [[Special:BlockList|bloklama siyahısına]] baxın.",
 	"ipb-blockingself": "Özünü bloklayacaqsınız.! Bunu etmək istədiyinizdən əminsinizmi?",
-	"ipb-confirmhideuser": "İstifadəçini bloklamaq və redaktə siyahısından onun adını silmək üzərəsiniz. Bunu etmək istədiyinizdən əminsinizmi?",
+	"ipb-confirmhideuser": "Siz \"istifadəçini gizlə\" bəndini aktiv edərək istifadəçini bloklamaq üzrəsiniz. Bu halda istifadəçinin adı bütün siyahılarda və qeydiyyat jurnallarında görünməyəcək. Bunu etmək istədiyinizdən əminsinizmi?",
 	"ipb-edit-dropdown": "Bloklama səbəblərini redaktə et",
 	"ipb-unblock-addr": "$1 üzərindəki blok götürüldü",
 	"ipb-unblock": "Bloku götür",
@@ -1615,7 +1615,7 @@
 	"blocklink": "blokla",
 	"unblocklink": "bloklamanı kənarlaşdır",
 	"change-blocklink": "bloklamanı dəyişdir",
-	"contribslink": "Köməklər",
+	"contribslink": "töhfələr",
 	"emaillink": "e-məktub göndər",
 	"autoblocker": "Avtomatik olaraq bloklanmısınız. Çünki, qısa müddət əvvəl sizin IP-ünvanınız \"[[User:$1|$1]]\" tərəfindən istifadə edilmişdir.\n$1 adlı istifadəçinin bloklanma səbəbi: \"$2\"",
 	"blocklogpage": "Bloklama qeydləri",
diff --git a/languages/i18n/azb.json b/languages/i18n/azb.json
index 45623a63b2..d2c36df836 100644
--- a/languages/i18n/azb.json
+++ b/languages/i18n/azb.json
@@ -15,13 +15,15 @@
 			"Koroğlu",
 			"Baloch Afghanistan",
 			"Macofe",
-			"Sadiqr"
+			"Sadiqr",
+			"Mjbmr",
+			"Alp Er Tunqa"
 		]
 	},
 	"tog-underline": "باغلانتی‌لارین آلتینی خطله:",
 	"tog-hideminor": "سوْن دییشیکلیکلرده کیچیکلری گیزلت",
 	"tog-hidepatrolled": "سوْن دییشیکلیکلرده نظارتلنمیش دَییشیکلیکلری گیزلت",
-	"tog-newpageshidepatrolled": "نظارتلنمیش صحیفه‌لری یئنی صحیفه‌لر لیستین‌دن گیزلت",
+	"tog-newpageshidepatrolled": "یوْخلانمیش صفحه‌لری یئنی صفحه‌لر لیستیندن گیزلت",
 	"tog-extendwatchlist": "ایزله‌دیک‌لری، یالنیز یئنی‌لر اۆچون یوْخ، بۆتون دییشیک‌لیک‌لری گؤرستمک اۆچون، گنیشلندیر.",
 	"tog-usenewrc": "دَییشیک‌لیک‌لری سوْن دَییشیک‌لیک‌لر صفحه‌سینده ایزله‌دیک‌لر صفحه‌سینده گروپ‌لا (جاوااسکریپت گرک‌دیر)",
 	"tog-numberheadings": "باشلیق‌لاری اوْتوماتیک نۆمره‌له",
@@ -30,8 +32,8 @@
 	"tog-editsectiononrightclick": "بؤلوم‌لرین دَییشدیرمه‌سینی، باشلیق‌لارین اۆستونده ساغ‌کلیک ائتمک‌‌له ایجازه وئر",
 	"tog-watchcreations": "ياراتدیغیم صفحه‌‌لری و يۆکله‌دیگیم فايل‌لاری، ایزله‌دیک‌لریمه آرتیر",
 	"tog-watchdefault": "دَییشدیردیگیم صفحه‌‌لری و فايل‌لاری، ایزله‌دیک‌لریمه آرتیر",
-	"tog-watchmoves": "داشیدیغیم صحیفه‌‌لری و فايل‌لاری گؤزله‌دیکلریمه آرتیر",
-	"tog-watchdeletion": "سیلدیگیم صحیفه‌‌لری و فايل‌لاری گؤزله‌دیکلریمه آرتیر",
+	"tog-watchmoves": "داشیدیغیم صفحه‌‌لری و فايللاری ایزله‌دیکلریمه آرتیر",
+	"tog-watchdeletion": "سیلدیگیم صفحه‌‌لری و فايللاری ایزله‌دیکلریمه آرتیر",
 	"tog-watchrollback": "قایتاریلمیش صفحه لری ایزلدیکلریمه آرتیر",
 	"tog-minordefault": "دفالت اوْلاراق، بۆتون دَییشدیر‌مه‌لری کیچیک کیمی علامتله",
 	"tog-previewontop": "اؤن‌گؤستریشی، يازماق قۇتوسوندان قاباق گؤرست",
@@ -87,7 +89,7 @@
 	"june": "ژوئن",
 	"july": "ژولای",
 	"august": "آقوست",
-	"september": "سئپتامبر",
+	"september": "سپتامبر",
 	"october": "اوْکتوبر",
 	"november": "نوْوامبر",
 	"december": "دئسامبر",
@@ -99,7 +101,7 @@
 	"june-gen": "ژوئن",
 	"july-gen": "جولای",
 	"august-gen": "آقوست",
-	"september-gen": "سئپتامبر",
+	"september-gen": "سپتامبر",
 	"october-gen": "اوکتوبر",
 	"november-gen": "نووامبر",
 	"december-gen": "دئسامبر",
@@ -111,7 +113,7 @@
 	"jun": "ژوئن",
 	"jul": "ژولای",
 	"aug": "آقوست",
-	"sep": "سئپتامبر",
+	"sep": "سپتامبر",
 	"oct": "اوْکتوبر",
 	"nov": "نوْوامبر",
 	"dec": "دئسامبر",
@@ -219,7 +221,7 @@
 	"redirectedfrom": "($1-دن يوْل‌لاندیریلمیش)",
 	"redirectpagesub": "یوْل‌لاندیرما صحیفه‌سی",
 	"redirectto": "مسیزپرین دَییشیب:",
-	"lastmodifiedat": "بۇ صفحه‌‌ سوْن کز $1، $2 چاغیندا دَییشیلمیش‌دیر.",
+	"lastmodifiedat": "بۇ صفحه‌‌ سوْن دفعه $1، $2 تاریخینده دَییشیلمیشدیر.",
 	"viewcount": "بۇ صحیفه {{PLURAL:$1|بیر|$1}} دفعه گؤرولوبدور.",
 	"protectedpage": "قوْرونموش صفحه",
 	"jumpto": "آتیل:",
@@ -297,7 +299,7 @@
 	"nstab-image": "فایل",
 	"nstab-mediawiki": "مئساژ",
 	"nstab-template": "شابلون",
-	"nstab-help": "یاردیم صحیفه‌سی",
+	"nstab-help": "یاردیم صفحه‌سی",
 	"nstab-category": "بؤلمه",
 	"nosuchaction": "بئله چالیشما یوْخدور",
 	"nosuchactiontext": "URL طرفیندن بیلینن ایش گئچرسیزدیر.\nURL-ی یانلیش یازمیش، یا یانلیش بیر باغلانتی ایله گلمیش، اوْلابیلرسیز.\nهم‌ده بۇ، {{SITENAME}} سایتی ایشلدن یازیلیمین خطاسینی گؤستره بیلر.",
@@ -338,9 +340,9 @@
 	"badtitle": "پیس باشلیق",
 	"badtitletext": "آختاریلان صحیفه‌‌ آدی سهودیر و يا بوْشدور، يا دا دۆزگون اوْلمايان دیللر‌آراسی، ياخود ویکیلرآراسی کئچید ایستیفاده ائدیلیب. \nباشلیقلاردا ایستیفاده ائدیلمه‌سی قاداغان اوْلونان بیر و يا داها چوْخ سیمووْل ایستیفاده ائدیلمیش اوْلا بیلر.",
 	"title-invalid-empty": "آختاردیٛغیٛنیٛز صفحه‌‌نین آدیٛ بوْشدۇر و یا آدلارفضاسیٛندا یالنیٛز آدیٛ وار.",
-	"title-invalid-utf8": "ایستنیلن صفحه‌نین آدیندا بیر یانلیش UTF-8 کاراکتِری وار.",
+	"title-invalid-utf8": "ایسته‌نیلن صفحه‌نین آدیندا بیر یانلیش UTF-8 کاراکتِری وار.",
 	"title-invalid-interwiki": "آختاردیٛغیٛنیٛز صفحه‌ آدیٛیٛندا بیر ایستیفاده‌ اوْلۇنا بیلمه‌‌ین اینتئر ویکی باغلانتیٛسیٛ وار.",
-	"title-invalid-characters": "ایستنیلن صفحه‌نین آدیندا، یانلیش کاراکتِرلر وار: «$1»",
+	"title-invalid-characters": "ایسته‌نیلن صفحه‌نین آدیندا، یانلیش کاراکتِرلر وار: «$1»",
 	"perfcached": "بو بیلگی، کَش اولوب‌دور و اولا بیلر گونجل اولماسین. چوخو {{PLURAL:$1|بیر نتیجه|$1 نتیجه}} کَش‌ده‌دیر.",
 	"perfcachedts": "بو بیلگی کَش اولوب‌دور، سون دفعه $1 واختیندا گونجلیب‌دیر. چوخو {{PLURAL:$4|بیر نتیجه|$4 نتیجه}} کَش‌ده‌دیر.",
 	"querypage-no-updates": "بو یارپاق‌دا گونجل‌له‌مک ایندی باغلانیب‌دیر.\nبورداکی بیلگیلر یئنی‌لشمیه‌جکلر.",
@@ -378,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": "آرخایین باغلانتی ایشلدین",
@@ -409,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لوطفاً باشقا بیر آد سئچین.",
@@ -519,7 +521,7 @@
 	"passwordreset-emailtitle": "{{SITENAME}}-ده حساب بیلگیلری",
 	"passwordreset-emailtext-ip": "بیر کس (احتیمالاً سیز، $1 آی‌پی آدرسی‌له)، {{SITENAME}} ($4) سایتینداکی حسابینیز اوچون رمزی یئنیله‌مک ایسته‌ییب‌دیر. آشاغیداکی ایستیفاده‌چی {{PLURAL:$3|حسابی|حسابلاری}} بو ایمیل ایله ایلگی‌لی‌دیرلر:\n\n$2\n\nبو گئچیجی {{PLURAL:$3|رمز|رمزلر}}، {{PLURAL:$5|بیر گون|$5 گون}}‌ده {{PLURAL:$3|واختی|واختلاری}} قورتاراجاق‌دیر.\nسیز گرک ایندی سایتا گیریب و یئنی بیر رمز سئچه‌سینیز. باشقا آدام بو ایستَگی وئرمیش‌سه، یوخسا سیز اسکی رمزینیزی یادا گتیرمیشسینیزسه، و داها اونو چئویرمک ایسته‌میرسینیزسه، بو مئساژی سایماییب و اسکی رمزینیزی ایشلدمگه داوام ائده بیلرسینیز.",
 	"passwordreset-emailtext-user": "{{SITENAME}} سایتیندا، $1 ایستیفاده‌چی، سیزین اوردا ($4) حسابینیزین رمزینی یئنیله‌مک ایستگی وئریب‌دیر. آشاغیداکی {{PLURAL:$3|ایستیفاده‌چی|ایستیفاده‌چیلر}} بو ایمیل ایله ایلگیلیدیرلر:\n\n$2\n\nبو گئچیجی {{PLURAL:$3|رمز|رمزلر}}، {{PLURAL:$5|بیر|$5گون}} سونرا واختلاری قورتاراجاق‌دیر. \nسیز گرک ایندی گیریب و بیر یئنی رمز سئچه‌سینیز. باشقا آدام بو ایستَگی وئرمیش‌سه، یوخسا سیز اسکی رمزینیزی یادا گتیرمیشسینیزسه، و داها اونو چئویرمک ایسته‌میرسینیزسه، بو مئساژی سایماییب و اسکی رمزینیزی ایشلدمگه داوام ائده بیلرسینیز.",
-	"passwordreset-emailelement": "ایستیفاده‌چی آدی: $1\nگئچیجی رمز: $2",
+	"passwordreset-emailelement": "ایستیفاده‌چی آدی: \n$1\n\nگئچیجی رمز: \n$2",
 	"passwordreset-emailsent": "بیر رمز یئنیله‌مه ایمیلی گؤندریلیب‌دیر.",
 	"passwordreset-emailsent-capture": "آشاغیدا گؤستریلن کیمی بیر رمز یئنیله‌مه ایمیلی گؤندریلیب‌دیر.",
 	"passwordreset-emailerror-capture": "آشاغیدا گؤستریلن کیمی بیر رمز یئنیله‌مه ایمیلی یارادیلیب‌دیر، اما {{GENDER:$2ایستیفاده‌چی}}‌یه گؤندرمگی باشاریلی اولمادی: $1",
@@ -887,7 +889,7 @@
 	"prefs-rc": "سون دَییشیکلیکلر",
 	"prefs-watchlist": "ایزله‌دیکلر",
 	"prefs-editwatchlist": "ایزله‌دیکلریم صفحه‌‌لری دَییشدیر",
-	"prefs-editwatchlist-label": "هامی ایزلدیکلرینیزین دَییشدیرمه سی:",
+	"prefs-editwatchlist-label": "بۆتون ایزله‌دیکلرینیزین دَییشدیرمه‌سی:",
 	"prefs-editwatchlist-edit": "ایزلدیکلرینیزدن گورمک هابئله باشلیق لارین سیلمک",
 	"prefs-editwatchlist-raw": "ایزله‌دیگیم خام لیستی دَییشدیر",
 	"prefs-editwatchlist-clear": "ایزله دیگیم لیستی سیلمک",
@@ -954,7 +956,7 @@
 	"prefs-help-signature": "دانیشیق صحیفه‌لرینده یاخیشلار گرک «<nowiki>~~~~</nowiki>» ایله ایمضالانالار. بو نیشان اوتوماتیک‌جه سیزین آدینیز و تاریخه دؤنه‌جک‌دیر.",
 	"badsig": "یانلیش خام ایمضا.\nاچ‌تی‌ام‌ال تگ‌لرینی یوخلایین.",
 	"badsiglength": "ایمضانیز چوخ اوزون‌دور.\nاو گرک {{PLURAL:$1|بیر|$1}} حرف‌دن اوزون اولمایا.",
-	"yourgender": "ترجیح وئریرسیز نجور توصیف اولونسون؟",
+	"yourgender": "ترجیح وئریرسینیز نئجه توصیف اولونسون؟",
 	"gender-unknown": "ترجیح وئریرم بیلیندیرمییم",
 	"gender-male": "کیشی",
 	"gender-female": "خانیم",
@@ -969,15 +971,15 @@
 	"prefs-signature": "ایمضا",
 	"prefs-dateformat": "تاریخ فورمتی",
 	"prefs-timeoffset": "چاغ بؤلگه‌سینین فرقی",
-	"prefs-advancedediting": "گنل تنظیم‌لر",
+	"prefs-advancedediting": "عومومی تنظیملر",
 	"prefs-editor": "دَییشدیرن",
 	"prefs-preview": "اؤن‌گؤستریش",
 	"prefs-advancedrc": "گلیشمیش سئچَنکلر",
 	"prefs-advancedrendering": "گلیشمیش سئچَنکلر",
 	"prefs-advancedsearchoptions": "گلیشمیش سئچَنکلر",
 	"prefs-advancedwatchlist": "گلیشمیش سئچَنکلر",
-	"prefs-displayrc": "گؤرونتو سئچَنکلری",
-	"prefs-displaywatchlist": "گؤرونتو سئچَنکلری",
+	"prefs-displayrc": "عکس سئچَنکلری",
+	"prefs-displaywatchlist": "عکس سئچَنکلری",
 	"prefs-tokenwatchlist": "آدرس",
 	"prefs-diffs": "فرق‌لر",
 	"prefs-help-prefershttps": "سیزین بو ترجیحینیزین اثری سیزین سونراکی گیریشینیز دن سونرا اولاجاق.",
@@ -1146,16 +1148,16 @@
 	"enhancedrc-history": "گئچمیش",
 	"recentchanges": "سون دَییشیکلیکلر",
 	"recentchanges-legend": "سون دَییشیکلیکلر سئچمه‌لری",
-	"recentchanges-summary": "بو صحیفه‌ده، بو ویکی‌ده وئریلن ان سون دَییشیکلیکلری ایزله‌یین.",
+	"recentchanges-summary": "بۇ صفحه‌ده، بۇ ویکیده وئریلن ان سوْن دَییشیکلیکلری ایزله‌یین.",
 	"recentchanges-noresult": "وئریلمیش دؤنم‌ده، بو معیارلارا تطبیق اولان دَییشدیرمه یوخدور.",
 	"recentchanges-feed-description": "ویکی‌ده‌کی ان سون ديَیشیکلیک‌لری بو يايیم کانالیندان ایزله‌يین.",
 	"recentchanges-label-newpage": "بو دییشیک یئنی بیر صفحه یاراتدی",
 	"recentchanges-label-minor": "بو بیر کیچیک دَییشدیرمه‌دیر",
 	"recentchanges-label-bot": "بو دییشیک بیر بوت طرفیندن ائدیلیب‌دیر",
 	"recentchanges-label-unpatrolled": "بو دییشیکلیک هله گؤزدن گئچیریلمه‌ییب‌دیر",
-	"recentchanges-label-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",
@@ -1164,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",
@@ -1635,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": "ایستیفاده‌چی قروپ حاقلاری",
@@ -1671,7 +1673,6 @@
 	"emailuser": "بو ایستیفاده‌چی‌یه ایمیل گؤندر",
 	"emailuser-title-target": "بو {{GENDER:$1|ایستیفاده‌چی}}‌یه ایمیل گؤندر",
 	"emailuser-title-notarget": "ایستیفاده‌چی‌یه ایمیل گؤندر",
-	"emailpage": "ایشلدنه ایمیل گؤندر",
 	"emailpagetext": "آشغیداکی فورم‌دان، بو {{GENDER:$1|ایستیفاده‌چی}}‌یه ایمیل گؤندرمک اوچون ایستیفاده ائده بیلرسینیز.\n[[Special:Preferences|اؤز ترجیحلرینیز]]ده وئرن ایمیل آدرسی، بو ایمیلین \"From\" یئرینده گؤستریله‌جک‌دیر و بونا گؤره ایمیلی آلان سیزه موستقیم جاواب گؤندره بیلر.",
 	"defemailsubject": "«$1» آدلی ایستیفاده‌چی‌دن، {{SITENAME}} ایمیلی",
 	"usermaildisabled": "ایستیفاده‌چی ایمیلی باغلی‌دیر",
@@ -1693,7 +1694,7 @@
 	"emailccsubject": "سیزین $1-ه مئساژینیزین کوپی‌سی: $2",
 	"emailsent": "ایمیل گؤنده‌ریلدی",
 	"emailsenttext": "ایمیل مئساژینیز گئنده‌ریلدی.",
-	"emailuserfooter": "بو ایمیل، {{SITENAME}}-ده «{{int:emailpage}}» ایمکانی ایله، $1-دن $2-ه گؤندریلیب‌دیر.",
+	"emailuserfooter": "بو ایمیل، {{SITENAME}}-ده «{{int:emailuser}}» ایمکانی ایله، $1-دن $2-ه گؤندریلیبدیر.",
 	"usermessage-summary": "مئساژ گئنده‌ریلدی.",
 	"usermessage-editor": "سیستِم مئساژ گؤندَرَنی",
 	"watchlist": "ایزله‌دیکلر",
@@ -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}} ایله یارانیب‌دیر",
@@ -1856,7 +1857,7 @@
 	"undeleteviewlink": "باخ",
 	"undeleteinvert": "سئچیلنی دؤندر",
 	"undeletecomment": "ندن:",
-	"undeletedrevisions": "جمعی {{PLURAL:$1|1 دییش|$1 دییشدیر}} گئری قایتاریلدی.",
+	"undeletedrevisions": "جمعی {{PLURAL:$1|بیر دییش|$1 دییشدیر}} گئری قایتاریلدی.",
 	"undeletedrevisions-files": "{{PLURAL:$1|1 نوسخه|$1 نوسخه}} و {{PLURAL:$2|1 فایل|$2 فایل}} برپا ائدیلدی",
 	"undeletedfiles": "{{PLURAL:$1|1 فایل|$1 فایل}} برپا اولوندو",
 	"cannotundelete": "برپا ائدیلمه اولمادی\n\n$1",
@@ -1880,7 +1881,7 @@
 	"invert": "سئچیلنی دؤندر",
 	"tooltip-invert": "بو قوتونی علامتله یین تا انتخاب اولان آد فضا سینین ایچری صحیفه لری دییشیک لیک لری(و اوبیری علامتلنمیش فضالار) گیزله نه آدی",
 	"tooltip-whatlinkshere-invert": "سئچیلمیش آدفضاسیندان اولان باغلانتیلاری گیزلتمک اوچون بو قوتویا نیشان قویون.",
-	"namespace_association": "ایلگیلی آدفضاسی",
+	"namespace_association": "باغلی آدفضاسی",
 	"tooltip-namespace_association": "بو قوتونو علامت له ین یالنیز آد بحث فضاسی یا مرتبط اولان آد فضاسی ایله انتخاب اولا",
 	"blanknamespace": "(آنا)",
 	"contributions": "{{GENDER:$1|ایشلدن}} چالیشمالاری",
@@ -2249,7 +2250,7 @@
 	"tooltip-ca-nstab-image": "فايل صفحه‌‌سینه باخین",
 	"tooltip-ca-nstab-mediawiki": "سیستم مئساژلرینه باخ",
 	"tooltip-ca-nstab-template": "شابلونا باخ",
-	"tooltip-ca-nstab-help": "یاردیم صحیفه‌‌سی",
+	"tooltip-ca-nstab-help": "یاردیم صفحه‌‌سی",
 	"tooltip-ca-nstab-category": "بؤلمه صحیفه‌‌سینی گؤستر",
 	"tooltip-minoredit": "بو دییشیگی کیچیک دییشیک کیمی قئید ائت",
 	"tooltip-save": "ديَیشیکلیکلرینیزی قئيد ائدین",
@@ -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": "قارشی‌لاش‌دیر",
@@ -3096,7 +3097,7 @@
 	"action-pagelang": "صفحه دیلینی دَییشدیر",
 	"default-skin-not-found-row-enabled": "* <code>$1</code> / $2 (ائتکین)",
 	"default-skin-not-found-row-disabled": "* <code>$1</code> / $2 ('''ائتکیسیز''')",
-	"mediastatistics": "مئدیا آمارلاری",
+	"mediastatistics": "مدیا آمارلاری",
 	"mediastatistics-nbytes": "{{PLURAL:$1|$1}} بایت ($2؛ ٪$3)",
 	"mediastatistics-table-mimetype": "MIME تیپی",
 	"mediastatistics-table-count": "فایل‌لارین سایی",
@@ -3131,5 +3132,5 @@
 	"special-characters-title-minus": "منفی علامتی",
 	"mw-widgets-dateinput-no-date": "تاریخ سئچیلمه‌ییب",
 	"mw-widgets-titleinput-description-new-page": "صفحه هله‌لیک یوخدور",
-	"mw-widgets-titleinput-description-redirect": "$1-ه یول‌لاندیر"
+	"mw-widgets-titleinput-description-redirect": "$1-ه داشی"
 }
diff --git a/languages/i18n/ba.json b/languages/i18n/ba.json
index d2f7c5b65d..c3e558a7c7 100644
--- a/languages/i18n/ba.json
+++ b/languages/i18n/ba.json
@@ -505,7 +505,7 @@
 	"passwordreset-emailtitle": "{{SITENAME}} иҫәп яҙыуы мәғлүмәттәре",
 	"passwordreset-emailtext-ip": "Берәү (бәлки һәҙ, $1 IP-адресынан ) {{SITENAME}} ($4) проектындағы иҫәп яҙыуығыҙҙы хәтерләтеүҙе һоратты.\nКиләһе ҡулланыусы {{PLURAL:$3|1=иҫәп яҙыуы|иҫәп яҙыуҙары}} был электрон почта адресы менән бәйле:\n\n$2\n\nБыл ваҡытлыса {{PLURAL:$3|1=серһүҙ|серһүҙҙәр}} {{PLURAL:$5|$5 көн}} ғәмәлдә буласаҡ.\nҺеҙ системала танылырға һәм яңы серһүҙ һайларға тейешһегеҙ.\nӘгәр, һеҙ быны һоратмаған булһағыҙ йәки элекке серһүҙегеҙҙе киренән иҫләһәгеҙ һәм уны үҙгәртергә теләмәһәгеҙ, был хатҡа иғтибар итмәгеҙ һәм элекке серһүҙегеҙҙе ҡулланыуҙы дауам итегеҙ.",
 	"passwordreset-emailtext-user": "{{SITENAME}} проектындағы $1 ҡулланыусыһы {{SITENAME}} ($4) проектындағы иҫәп яҙыуығыҙҙы хәтерләтеүҙе һоратты. Киләһе ҡулланыусы {{PLURAL:$3|1=иҫәп яҙыуы|иҫәп яҙыуҙары}} был электрон почта адресы менән бәйле:\n\n$2\n\nБыл ваҡытлыса {{PLURAL:$3|1=серһүҙ|серһүҙҙәр}} {{PLURAL:$5|$5 көн}} ғәмәлдә буласаҡ.\nҺеҙ системала танылырға һәм яңы серһүҙ һайларға тейешһегеҙ.\nӘгәр, һеҙ быны һоратмаған булһағыҙ йәки элекке серһүҙегеҙҙе киренән иҫләһәгеҙ һәм уны үҙгәртергә теләмәһәгеҙ, был хатҡа иғтибар итмәгеҙ һәм элекке серһүҙеҙҙе ҡулланыуҙы дауам итегеҙ.",
-	"passwordreset-emailelement": "Ҡулланыусы исеме: $1\nВаҡытлыса серһүҙ: $2",
+	"passwordreset-emailelement": "Ҡулланыусы исеме: \n$1\n\nВаҡытлыса серһүҙ: \n$2",
 	"passwordreset-emailsent": "Серһүҙҙе ташлау тураһындағы мәғлүмәт менән электрон почта аша хат ебәрелде.",
 	"passwordreset-emailsent-capture": "Серһүҙҙе ташлау тураһындағы мәғлүмәт менән электрон хат ебәрелде, уның тексы түбәндә бирелә:",
 	"passwordreset-emailerror-capture": "Серһүҙҙе ташлау тураһында хәбәр итеүсе электрон хат булдырылғайны, ләкин уны  {{GENDER:$2|kullanıcıya}} түбәндәге сәбәп арҡаһында ебәреп булманы: $1",
@@ -1609,7 +1609,6 @@
 	"emailuser": "Ҡатнашыусыға хат",
 	"emailuser-title-target": "{{GENDER:$1|Ҡатнашыусыға}} хат яҙыу",
 	"emailuser-title-notarget": "Ҡатнашыусыға хат",
-	"emailpage": "Ҡатнашыусыға хат",
 	"emailpagetext": "Был {{GENDER:$1|ҡатнашыусы}} электрон почта аша хат ебәреү өсөн, һеҙ түбәндәге форманы ҡуллана алаһығыҙ.\nЯуап өсөн адрес булараҡ һеҙ [[Special:Preferences|көйләүҙәрегеҙҙә]] күрһәткән электрон почта адресы күрһәтеләсәк, шулай итеп, хатты алыусы һеҙгә тура яуап ебәрә аласаҡ.",
 	"defemailsubject": "{{SITENAME}} — $1 ҡулланыусыһынан хат",
 	"usermaildisabled": "Ҡатнашыусының электрон почтаһы һүндерелгән",
diff --git a/languages/i18n/bcc.json b/languages/i18n/bcc.json
index b280c97df5..f6a041bdcf 100644
--- a/languages/i18n/bcc.json
+++ b/languages/i18n/bcc.json
@@ -507,7 +507,7 @@
 	"passwordreset-emailtitle": "اکانتء جزئیات مان {{SITENAME}}",
 	"passwordreset-emailtext-ip": "یک شهسء (بلکین شما، گون آی‌پیء نشانیگ $1) شمئی پسوردء واترء {{SITENAME}} ($4) لوٹتگ انت. {{PLURAL:$3|اکانت|اکانتان}} گون ائ ایمیل ادرسء همگرنچ انت:\n\n$2\n\n{{PLURAL:$3|ائ موکتین پسورد|ائ موکتین پسوردان}} رند چه {{PLURAL:$5|یک روچ|$5 روچ}} باطل بیت انت.\nشما پیکن انیگء لاگین کن ات ءُ نوکین پسوردء بزیر ات. اگان شمئی پگر انت که ادگر شهسء ائ لوٹء راهیگ کتگ یانکه وتی پیسریگین پسوردء هیال کت ات ءُ رندء نلوٹیت آئرا ٹگل دئیت، بیت که ائ پیگامء ناگند بزان ات ءُ وتی پیسریگین پسوردء کارمرز کن ات.",
 	"passwordreset-emailtext-user": "کاربر $1 چه {{SITENAME}} شمئی پسوردء واترء لوٹ مان {{SITENAME}} ($4) کتگ انت. {{PLURAL:$3|اکانت|اکانتان}} چیریگین کاربر گون ائ ایمیل ادرس همگرنچ انت:\n\n$2\n\n{{PLURAL:$3|ائ موکتین پسورد|ائ موکتین پسوردان}} رند چه {{PLURAL:$5|یک روچ|$5 روچ}} باطل بیت انت.\nشما ضرور انت انیگء لاگین کن ات ءُ نوکین پسوردء بزیر ات. اگان ادگر شهسء ائ لوٹء راهیگ کتگ انت، یانکه وتی اصلیگین پسوردء هیال کت ات ءُ رندء نلوٹ ات آئرا ٹگل دئیت، بیت که ائ پیگامء نگند بزان ات ءُ وتی پیسریگین پسوردء کارمرز کن ات.",
-	"passwordreset-emailelement": "یوزرنام: $1\nموکتین پسورد: $2",
+	"passwordreset-emailelement": "یوزرنام: \n$1\n\nموکتین پسورد: \n$2",
 	"passwordreset-emailsent": "یک ایمیلء گون پسوردء واترء راهیگ بوت.",
 	"passwordreset-emailsent-capture": "یک ایمیلء پر پسورد واترء واسته که جهلیگء پیش دارگ بیت، راهیگ بیتگ انت.",
 	"passwordreset-emailerror-capture": "واترین ایمیل، که جهلیگء پیش دارگ بیت، اڈ بوت، بلئی آئی راهیگ پر {{GENDER:$2|کاربر}} پکا نبوت: $1",
@@ -1600,7 +1600,6 @@
 	"mailnologin": "هچ آدرس دیم دهگ",
 	"mailnologintext": "شما بایدن [[Special:UserLogin|وارد بیت]] و یک معتبرین آدرس ایمیلی داشته بیت ته وتی [[Special:Preferences|ترجیحات]] په دیم داتن ایمیل په دگه کاربران",
 	"emailuser": "په ای کابر ایمیل دیم دی",
-	"emailpage": "ایمیل کاربر",
 	"emailpagetext": "گر ای کاربر یک معتبرین آدرس ایمیلی ته وتی ترجیحات کاربری وارد کتت،جهلگین فرم په آیء یک کوله ای دیم دنت.\nآدرس ایمیلی که شما وارد کتت ته [[Special:Preferences|وتی ترجیحات]] په داب آدرس  \"From\" پیش دارگ بیت، اچه گروک ایمیل تونیت پسوء دنت.",
 	"defemailsubject": "{{SITENAME}} ایمیل",
 	"noemailtitle": "هچ آدرس ایمیل",
diff --git a/languages/i18n/bcl.json b/languages/i18n/bcl.json
index 1b0e2ed8b9..ddd2575f43 100644
--- a/languages/i18n/bcl.json
+++ b/languages/i18n/bcl.json
@@ -499,7 +499,7 @@
 	"passwordreset-emailtitle": "Mga detalye kan panindog sa {{SITENAME}}",
 	"passwordreset-emailtext-ip": "May sarong tawo (pwedeng ika gayod, gikan sa IP address na $1) naghahagad nin pagliliwat kan saimong sekretong panlaog para sa{{SITENAME}}($4). An minasunod na paragamit {{PLURAL:$3|panindog iyo an|mga panindog iyo an}} na asosyado kaining e-surat na adres:\n\n$2\n\n{{PLURAL:$3|Ining temporaryong sekretong panlaog|Ining mga temporaryong sekretong panlaog}} mapapaso sa laog nin {{PLURAL:$5|sarong aldaw|$5 mga aldaw}}.\nDapat kang maglaog asin magpili nin sarong baguhon na sekretong panlaog ngunyan. Kun ibang tawo an naghimo kaining kahagadan, o kun saimo nang nagiromdoman an saimong orihinal na sekretong panlaog, asin habo mo nang ribayan ini, ipasipara mo na sana ining mensahe asin ipagpadagos mo nang gamiton an luma mong sekretong panlaog.",
 	"passwordreset-emailtext-user": "Paragamit $1 sa {{SITENAME}} naghahagad nin sarong pagiromdom kan detalye nin saimong panindog para sa {{SITENAME}}\n($4). An minasunod na paragamit {{PLURAL:$3|panindog iyo an|mga panindog iyo an}} na asosyado kaining e-koreong address:\n\n$2\n\n\n{{PLURAL:$3|Ining temporaryong sekretong panlaog|Ining mga temporaryong panlaog}} mapapaso sa {{PLURAL:$5|sarong aldaw|$5 mga aldaw}}.\nIka dapat na maglaog asin magpili nin sarong bagong sekretong panlaog ngunyan. Kun ibang tawo an naghimo kaining kahagadan, o kun saimo nang nagiromdoman an saimong orihinal na sekretong panlaog, asin habo mo nang ribayan ini, ipasapara mo na sana an mensaheng ini asin ipadagos mo nang gamiton an saimong lumang sekretong panlaog.",
-	"passwordreset-emailelement": "Paragamit-ngaran: $1\nTemporaryong sekretong panlaog: $2",
+	"passwordreset-emailelement": "Paragamit-ngaran: \n$1\n\nTemporaryong sekretong panlaog: \n$2",
 	"passwordreset-emailsent": "Sarong e-surat sa pagliliwat kan sekretong panlaog an ipinadara na.",
 	"passwordreset-emailsent-capture": "Sarong e-surat sa pagliliwat kan sekretong panlaog an ipinadara na, yaon ipinapahiling sa ibaba.",
 	"passwordreset-emailerror-capture": "Sarong e-surat sa pagliliwat kan sekretong panlaog an pinagpuyos na, yaon ipinapahiling sa ibaba, alagad sa pagpapadara kaini sa {{GENDER:$2|paragamit}} nagpalya: $1",
@@ -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 b7218692fc..8fbfdf4830 100644
--- a/languages/i18n/be-tarask.json
+++ b/languages/i18n/be-tarask.json
@@ -21,7 +21,6 @@
 	"tog-hideminor": "Хаваць дробныя праўкі ў сьпісе апошніх зьменаў",
 	"tog-hidepatrolled": "Хаваць патруляваныя праўкі ў сьпісе апошніх зьменаў",
 	"tog-newpageshidepatrolled": "Хаваць патруляваныя старонкі ў сьпісе новых старонак",
-	"tog-hidecategorization": "Схаваць катэгарызацыю старонак",
 	"tog-extendwatchlist": "Пашырыць сьпіс назіраньня, каб ён паказваў усе зьмены, а ня толькі апошнія",
 	"tog-usenewrc": "Групаваць зьмены па старонках у апошніх зьменах і сьпісе назіраньня",
 	"tog-numberheadings": "Аўтаматычная нумарацыя загалоўкаў",
@@ -51,7 +50,6 @@
 	"tog-watchlisthideliu": "Хаваць праўкі зарэгістраваных удзельнікаў у сьпісе назіраньня",
 	"tog-watchlisthideanons": "Хаваць праўкі ананімаў у сьпісе назіраньня",
 	"tog-watchlisthidepatrolled": "Хаваць патруляваныя праўкі ў сьпісе назіраньня",
-	"tog-watchlisthidecategorization": "Хаваць катэгарызацыю старонак",
 	"tog-ccmeonemails": "Адпраўляць мне копіі лістоў, якія я дасылаю іншым удзельнікам",
 	"tog-diffonly": "Не паказваць зьмест старонкі пад параўнаньнем зьменаў",
 	"tog-showhiddencats": "Паказваць схаваныя катэгорыі",
@@ -437,6 +435,7 @@
 	"createacct-benefit-body2": "{{PLURAL:$1|старонка|старонкі|старонак}}",
 	"createacct-benefit-body3": "{{PLURAL:$1|удзельнік|удзельнікі|удзельнікаў}} за апошні час",
 	"badretype": "Уведзеныя Вамі паролі не супадаюць.",
+	"usernameinprogress": "Стварэньне рахунку з гэтым імем удзельніка ўжо ідзе. Калі ласка, пачакайце.",
 	"userexists": "Уведзенае Вамі імя ўдзельніка ўжо выкарыстоўваецца кімсьці іншым. \nКалі ласка, выберыце іншае імя.",
 	"loginerror": "Памылка ўваходу",
 	"createacct-error": "Памылка стварэньня рахунку",
@@ -526,7 +525,7 @@
 	"passwordreset-emailtitle": "Падрабязнасьці рахунку ў {{GRAMMAR:месны|{{SITENAME}}}}",
 	"passwordreset-emailtext-ip": "Нехта (магчыма Вы, з IP-адрасу $1) зрабіў запыт на скіданьне вашага паролю ў {{GRAMMAR:месны|{{SITENAME}}}} ($4). {{PLURAL:$3|1=Наступны рахунак удзельніка зьвязаны|Наступныя рахункі ўдзельнікаў зьвязаныя}} з гэтым адрасам электроннай пошты:\n\n$2\n\n{{PLURAL:$3|1=Гэты часовы пароль будзе|Гэтыя часовыя паролі будуць}} дзейнічаць $5 {{PLURAL:$5|дзень|дні|дзён}}.\nЦяпер Вам неабходна ўвайсьці і выбраць новы пароль. Калі нехта іншы зрабіў гэты запыт, ці Вы ўспомнілі Ваш пачатковы пароль, які ня хочаце мяняць, Вы можаце праігнараваць гэтае паведамленьне, і працягваць выкарыстоўваць стары пароль.",
 	"passwordreset-emailtext-user": "Удзельнік $1 зрабіў запыт на скіданьне вашага паролю ў {{GRAMMAR:месны|{{SITENAME}}}} ($4). {{PLURAL:$3|1=Наступны рахунак удзельніка зьвязаны|Наступныя рахункі ўдзельнікаў зьвязаныя}} з гэтым адрасам электроннай пошты:\n\n$2\n\n{{PLURAL:$3|1=Гэты часовы пароль будзе|Гэтыя часовыя паролі будуць}} дзейнічаць $5 {{PLURAL:$5|дзень|дні|дзён}}.\nЦяпер Вам неабходна ўвайсьці і выбраць новы пароль. Калі нехта іншы зрабіў гэты запыт, ці Вы ўспомнілі Ваш пачатковы пароль, які ня хочаце мяняць, Вы можаце праігнараваць гэтае паведамленьне, і працягваць выкарыстоўваць стары пароль.",
-	"passwordreset-emailelement": "Імя ўдзельніка: $1\nЧасовы пароль: $2",
+	"passwordreset-emailelement": "Імя ўдзельніка: \n$1\n\nЧасовы пароль: \n$2",
 	"passwordreset-emailsent": "Ліст пра скіданьне паролю быў дасланы.",
 	"passwordreset-emailsent-capture": "Ліст пра скіданьне паролю быў дасланы, што паказана ніжэй.",
 	"passwordreset-emailerror-capture": "Ліст пра скіданьне паролю быў створаны і паказаны ніжэй, але не ўдалося адправіць яго {{GENDER:$2|ўдзельніку|ўдзельніцы}}: $1",
@@ -861,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:|файл|файлы|файлаў}})",
@@ -924,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|дзень|дні|дзён}})",
@@ -1048,7 +1048,7 @@
 	"right-minoredit": "пазначэньне рэдагаваньняў як дробныя",
 	"right-move": "перанос старонак",
 	"right-move-subpages": "перанос старонак разам зь іх падстаронкамі",
-	"right-move-rootuserpages": "Перанос карэнных старонак удзельнікаў",
+	"right-move-rootuserpages": "перанос карэнных старонак удзельнікаў",
 	"right-move-categorypages": "перанос старонак катэгорыяў",
 	"right-movefile": "перайменаваньне файлаў",
 	"right-suppressredirect": "не ствараць перанакіраваньне са старой назвы пасьля пераносу старонкі",
@@ -1062,10 +1062,10 @@
 	"right-bot": "лічыцца аўтаматычным працэсам",
 	"right-nominornewtalk": "не паведамляць удзельнікам пра новыя паведамленьні на іх старонках гутарак, калі зробленыя там праўкі былі дробнымі",
 	"right-apihighlimits": "менш абмежаваньняў на выкананьне API-запытаў",
-	"right-writeapi": "выкарыстаньне API для запісаў",
+	"right-writeapi": "выкарыстаньне API для запісу",
 	"right-delete": "выдаленьне старонак",
 	"right-bigdelete": "Выдаленьне старонак зь вялікімі гісторыямі",
-	"right-deletelogentry": "Выдаленьне і аднаўленьне асобных запісаў журналу",
+	"right-deletelogentry": "выдаленьне і аднаўленьне асобных запісаў журналу",
 	"right-deleterevision": "выдаленьне і аднаўленьне асобных вэрсіяў старонак",
 	"right-deletedhistory": "прагляд выдаленай гісторыі старонак без доступу да выдаленага тэксту",
 	"right-deletedtext": "прагляд выдаленага тэксту і зьменаў паміж выдаленымі вэрсіямі старонак",
@@ -1198,8 +1198,6 @@
 	"rcshowhidemine": "$1 мае праўкі",
 	"rcshowhidemine-show": "Паказаць",
 	"rcshowhidemine-hide": "Схаваць",
-	"rcshowhidecategorization": "$1 катэгарызацыю старонак",
-	"rcshowhidecategorization-show": "Паказаць",
 	"rclinks": "Паказаць апошнія $1 зьменаў за мінулыя $2 дзён<br />$3",
 	"diff": "розьн",
 	"hist": "гіст",
@@ -1220,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": "Загрузіць файл",
@@ -1334,6 +1332,17 @@
 	"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 не існуе.",
@@ -1632,7 +1641,7 @@
 	"booksources-text": "Ніжэй знаходзіцца сьпіс спасылак на іншыя сайты, якія прадаюць новыя і патрыманыя кнігі, і могуць таксама мець інфармацыю пра кнігі, якія Вы шукаеце:",
 	"booksources-invalid-isbn": "Пададзены няслушны ISBN; праверце, магчыма ўзьніклі памылкі пры пераносе нумару з арыгінальнай крыніцы.",
 	"specialloguserlabel": "Выканаўца:",
-	"speciallogtitlelabel": "Мэта (назва ці удзельнік):",
+	"speciallogtitlelabel": "Мэта (назва ці {{ns:user}}:імя_ўдзельніка для ўдзельніка):",
 	"log": "Журналы падзеяў",
 	"all-logs-page": "Усе публічныя журналы падзеяў",
 	"alllogstext": "Сумесны паказ усіх журналаў падзеяў {{GRAMMAR:родны|{{SITENAME}}}}.\nВы можаце адфільтраваць вынікі па тыпе журналу, удзельніку ці старонцы.",
@@ -1718,7 +1727,6 @@
 	"emailuser": "Даслаць ліст",
 	"emailuser-title-target": "Адправіць гэта па электроннай пошце {{GENDER:$1|гэтаму ўдзельніку|гэтай удзельніцы}}",
 	"emailuser-title-notarget": "Даслаць ліст ўдзельніку ці ўдзельніцы па электроннай пошце",
-	"emailpage": "Даслаць ліст ўдзельніку ці ўдзельніцы па электроннай пошце",
 	"emailpagetext": "Вы можаце выкарыстаць форму ніжэй, каб даслаць {{GENDER:$1|гэтаму ўдзельніку|гэтай удзельніцы}} ліст па электроннай пошце.\nАдрас электроннай пошты, які Вы пазначалі ў [[Special:Preferences|сваіх наладах]], будзе пазначаны ў полі ліста «Ад», і {{GENDER:$1|ўдзельнік|ўдзельніца}} зможа даслаць на гэты адрас адказ.",
 	"defemailsubject": "Ліст з {{GRAMMAR:родны|{{SITENAME}}}} ад {{GENDER:$1|удзельніка|удзельніцы}} «$1»",
 	"usermaildisabled": "Электронная пошта ўдзельніка адключаная",
@@ -1740,7 +1748,7 @@
 	"emailccsubject": "Копія Вашага ліста да $1: $2",
 	"emailsent": "Ліст адасланы",
 	"emailsenttext": "Ваш ліст быў адасланы.",
-	"emailuserfooter": "Гэты ліст быў дасланы {{GENDER:$2|ўдзельнікам|ўдзельніцай}} $1 да {{GENDER:$2|ўдзельніка|ўдзельніцы}} $2 з дапамогай функцыі «{{int:emailpage}}» {{GRAMMAR:родны|{{SITENAME}}}}.",
+	"emailuserfooter": "Гэты ліст быў дасланы {{GENDER:$2|ўдзельнікам|ўдзельніцай}} $1 да {{GENDER:$2|ўдзельніка|ўдзельніцы}} $2 з дапамогай функцыі «{{int:emailuser}}» {{GRAMMAR:родны|{{SITENAME}}}}.",
 	"usermessage-summary": "Паведамленьне пра выхад з сыстэмы.",
 	"usermessage-editor": "Дастаўка сыстэмных паведамленьняў",
 	"watchlist": "Сьпіс назіраньня",
@@ -2311,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": "Паказаць сыстэмнае паведамленьне",
@@ -3013,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": "Крыніца",
@@ -3072,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]]:",
@@ -3085,6 +3099,9 @@
 	"tags-edit-remove": "Выдаліць гэтыя меткі:",
 	"tags-edit-remove-all-tags": "(выдаліць усе меткі)",
 	"tags-edit-chosen-placeholder": "Абярыце меткі",
+	"tags-edit-chosen-no-results": "Адпаведныя меткі ня знойдзеныя",
+	"tags-edit-reason": "Прычына:",
+	"tags-edit-revision-submit": "Дастасаваць зьмены да {{PLURAL:$1|1=гэтай вэрсіі|$1 вэрсіяў}}",
 	"comparepages": "Параўнаньне старонак",
 	"compare-page1": "Старонка 1",
 	"compare-page2": "Старонка 2",
diff --git a/languages/i18n/be.json b/languages/i18n/be.json
index 61b60cbbb4..e387bd648e 100644
--- a/languages/i18n/be.json
+++ b/languages/i18n/be.json
@@ -523,7 +523,7 @@
 	"passwordreset-emailtitle": "Інфармацыя пра рахунак на сайце {{SITENAME}}",
 	"passwordreset-emailtext-ip": "Нехта (магчыма вы, з IP-адрасу $1) запытаў скід  вашага пароля ў праекце {{SITENAME}} ($4).\n{{PLURAL:$3|Наступны ўліковы запіс звязаны|Наступныя ўліковыя запісы звязаны}} з гэтым адрасам электроннай пошты:\n\n$2\n\n{{PLURAL:$3|Гэты часовы пароль будзе|Гэтыя часовыя паролі будуць}} дзейнічаць {{PLURAL:$5|адзін дзень|$5 дні|$5 дзён}}.\nВы павінны зараз увайсці ў сістэму і абраць новы пароль. Калі вы не рабілі гэтага запыту, ці ўспомнілі свой зыходны пароль і не жадаеце яго мяняць, вы можаце праігнараваць гэтае паведамленне і працягнуць выкарыстоўваць свой стары пароль.",
 	"passwordreset-emailtext-user": "Удзельнік $1 з праекта {{SITENAME}} запытаў скід вашага пароля ў праекце {{SITENAME}}\n($4).\n{{PLURAL:$3|Наступны ўліковы запіс звязаны|Наступныя уліковыя запісы звязаны}} з гэтым адрасам электроннай пошты:\n\n$2\n\n{{PLURAL:$3|Гэты часовы пароль будзе|Гэтыя часовыя паролі будуць}} дзейнічаць {{PLURAL:$5|$5 дзень |$5 дні |$5 дзён}}.\nВы павінны зараз увайсці ў сістэму і выбраць новы пароль. Калі вы не рабілі гэтага запыту, ці ўспомнілі свой зыходны пароль і не жадаеце яго мяняць, вы можаце праігнараваць гэтае паведамленне і працягваць выкарыстоўваць свой стары пароль.",
-	"passwordreset-emailelement": "Імя ўдзельніка: $1\nЧасовы пароль: $2",
+	"passwordreset-emailelement": "Імя ўдзельніка: \n$1\n\nЧасовы пароль: \n$2",
 	"passwordreset-emailsent": "Па электроннай пошце быў адпраўлены ліст пра скід пароля.",
 	"passwordreset-emailsent-capture": "Ніжэй прыведзены адпраўлены ліст пра скід пароля.",
 	"passwordreset-emailerror-capture": "Ніжэй прыведзены створаны ліст пра скід пароля, яго адпраўка не атрымалася па прычыне: $1",
@@ -1663,7 +1663,6 @@
 	"emailuser": "Эл.пошта ўдзельніка",
 	"emailuser-title-target": "Напісаць ліст {{GENDER:$1|удзельніку|удзельніцы}}",
 	"emailuser-title-notarget": "Напісанне электроннага ліста ўдзельніку",
-	"emailpage": "Зварот да ўдзельніка праз эл.пошту",
 	"emailpagetext": "Тут можна выслаць эл.пошту гэта{{GENDER:$1|му ўдзельніку|й удзельніцы}}.\nАдрас эл.пошты, уведзены вамі ў [[Special:Preferences|сваіх настройках]], з'явіцца ў полі \"Ад каго (From)\" вашага ліста, і атрымальнік зможа адказаць на ваш ліст.",
 	"defemailsubject": "{{SITENAME}} — Ліст ад $1",
 	"usermaildisabled": "Электронная пошта ўдзельніка не працуе",
diff --git a/languages/i18n/bg.json b/languages/i18n/bg.json
index 5f71422fad..bbe437f777 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": "Използването на това потребителско име и парола е забранено.",
@@ -525,7 +526,7 @@
 	"passwordreset-emailtitle": "Подробности за сметката в {{SITENAME}}",
 	"passwordreset-emailtext-ip": "Някой (вероятно вие, от IP адрес $1) поиска възстановяване на паролата за сметката в {{SITENAME}} ($4). За {{PLURAL:$3|следната сметка|следните сметки}}\nе посочен този адрес за електронна поща:\n\n$2\n\n{{PLURAL:$3|Тази временна парола ще бъде активна|Тези временни пароли ще бъдат активни}} {{PLURAL:$5|един ден|$5 дни}}.\nСега би трябвало да влезете в системата и да си изберете нова парола. Ако заявката е направена от друг или пък сте си спомнили паролата и не искате да я променяте, можете да пренебрегнете това съобщение и да продължите да използвате старата си парола.",
 	"passwordreset-emailtext-user": "Потребител $1 от {{SITENAME}} поиска възстановяване на паролата за сметката в {{SITENAME}}\n($4). За {{PLURAL:$3|следната сметка|следните сметки}} е посочен този адрес за електронна поща:\n\n$2\n\n{{PLURAL:$3|Тази временна парола ще бъде активна|Тези временни пароли ще бъдат активни}} {{PLURAL:$5|един ден|$5 дни}}.\nСега би трябвало да влезете в системата и да изберете нова парола. Ако заявката е направена \nот друг или пък сте си спомнили паролата и не искате да я променяте, можете да пренебрегнете \nтова съобщение и да продължите да използвате старата си парола.",
-	"passwordreset-emailelement": "Потребителско име: $1\nВременна парола: $2",
+	"passwordreset-emailelement": "Потребителско име: \n$1\n\nВременна парола: \n$2",
 	"passwordreset-emailsent": "На електронната поща беше изпратено писмо за възстановяване на паролата.",
 	"passwordreset-emailsent-capture": "По-долу е показано електронното писмо за възстановяване на паролата, което беше изпратено.",
 	"passwordreset-emailerror-capture": "По-долу е показано създадено електронно писмо за възстановяване на паролата, което не беше изпратено на {{GENDER:$2|потребителя}}: $1",
@@ -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/bgn.json b/languages/i18n/bgn.json
index cf126099b6..2c93cc78f4 100644
--- a/languages/i18n/bgn.json
+++ b/languages/i18n/bgn.json
@@ -501,7 +501,7 @@
 	"passwordreset-capture-help": "اگه ای گزینه ئا بگیندیت ، ایمیل (گو موقتین پاسوردا) بی شما نشان داته ئه بیئت و په کار زوروکا هم دیم داته ئه بیئت.",
 	"passwordreset-email": "ایمیل ادرس:",
 	"passwordreset-emailtitle": "حسابئ مئلومات بی {{SITENAME}}",
-	"passwordreset-emailelement": "کار زوروکئ نام: $1\nموقت ئین چیهرگال: $2",
+	"passwordreset-emailelement": "کار زوروکئ نام: \n$1\n\nموقت ئین چیهرگال: \n$2",
 	"passwordreset-emailsent": "یک ایمیل په چیهر گالئ  پاک بوتین  خاتیرا دیم داته بوت.",
 	"passwordreset-emailsent-capture": "یک ایمیلئ په بیئرگردینتین ئا پاسوردئ خاتیرا، دیم داته بوت.",
 	"changeemail": "ایمیل ادرسی تغیر داتین",
@@ -1509,7 +1509,6 @@
 	"emailuser": "ای کار زوروکئ ایمیل",
 	"emailuser-title-target": "ایمیل په {{GENDER:$1|کار زوروکا}}",
 	"emailuser-title-notarget": "کار زوروکی ایمیل",
-	"emailpage": "کار زوروکی ایمیل",
 	"defemailsubject": "{{SITENAME}} ایمیل شه کار زوروکئ نیمگا «$1»",
 	"usermaildisabled": "کار زوروکئ ایمیل غیر پئال اینت",
 	"usermaildisabledtext": "شما نه توانیت ای ویکی تا په دیگه رین کارزوروکان ایمیل دیم دهیت.",
diff --git a/languages/i18n/bho.json b/languages/i18n/bho.json
index b0a7ed131a..94678109e6 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": "खाता निर्माण त्रुटि",
@@ -505,7 +515,7 @@
 	"passwordreset-emailtitle": "{{SITENAME}} पर खाता विवरण",
 	"passwordreset-emailtext-ip": "केहु (शायद रउए, $1 आइ॰पी पता से) {{SITENAME}} ($4) पर आपन {{PLURAL:$3|गुप्तशब्द}} के रीसेट करे के अनुरोध कईले बानी। इ ई-मेल पता से निम्न {{PLURAL:$3|खाता जुड़ल बा}}:\n\n$2\n\n{{PLURAL:$3|इ}} अस्थायी गुप्तशब्द {{PLURAL:$5|एक दिन|$5 दिन}} के बाद काम ना करी। रउआ खाता में प्रवेश करके एगो नया गुप्तशब्द अभी चुन लेवे के चाहीं। यदि इ अनुरोध केहु अउर कइले बा, या फिर रउआ आपन मूल गुप्तशब्द याद आ गईल बा, अउर आप {{PLURAL:$3|आपन}} गुप्तशब्द नइखी बदले के चाहत त, रउआ इ संदेश के अनदेखा कर के आपन पुरानका गुप्तशब्द के प्रयोग जारी रख सकत बानी।",
 	"passwordreset-emailtext-user": "{{SITENAME}} ($4) पर सदस्य $1 राउर {{PLURAL:$3|खाता}} के गुप्तशब्द के पुनर्स्थापित करे के अनुरोध कइले बानी। इ ई-मेल पता से निम्न {{PLURAL:$3|खाता जुड़ल बा}}:\n\n$2\n\n{{PLURAL:$3|इ}} अस्थायी गुप्तशब्द {{PLURAL:$5|एक दिन|$5 दिन}} के बाद काम ना करी।\nरउआ खाता में प्रवेश करके एगो नया गुप्तशब्द अभीये चुन लेवे के चाहीं। यदि इ अनुरोध केहु अउर कइले बा, या फिर रउआ आपन मूल गुप्तशब्द याद आ गईल बा, अउर रउआ {{PLURAL:$3|आपन}} गुप्तशब्द नईखीं बदले के चाहत त, रउआ इ संदेश के अनदेखा कर के आपन पुरनका गुप्तशब्द के प्रयोग जारी रख सकत बानीं।",
-	"passwordreset-emailelement": "सदस्यनाम: $1\nअस्थायी गुप्तशब्द: $2",
+	"passwordreset-emailelement": "सदस्यनाम: \n$1\n\nअस्थायी गुप्तशब्द: \n$2",
 	"passwordreset-emailsent": "एगो गुप्तशब्द रिसेट ई-मेल भेजल जा चुकल बा।",
 	"passwordreset-emailsent-capture": "नीचे दिखावल गईल गुप्तशब्द पुनर्स्थापना ई-मेल भेज दिहल गईल बा।",
 	"passwordreset-emailerror-capture": "नीचे दिखावल गईल गुप्तशब्द पुनर्स्थापना ई-मेल उत्पन्न करल गईल रहल, परंतु उ के {{GENDER:$2|सदस्य}} के भेजे के क्रिया असफल रहल।\nत्रुटि: $1",
@@ -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/bjn.json b/languages/i18n/bjn.json
index 863182a06d..643313feb2 100644
--- a/languages/i18n/bjn.json
+++ b/languages/i18n/bjn.json
@@ -417,7 +417,7 @@
 	"passwordreset-emailtitle": "Rarincian akun pada {{SITENAME}}",
 	"passwordreset-emailtext-ip": "Ada urang (pinanya Pian, matan alamat IP $1) maminta sabuting pangingat hagan rarincian akun Pian gasan {{SITENAME}} ($4). Pamakai barikut {{PLURAL:$3|akun|akun}}\ntarait awan suril:\n\n$2\n\n{{PLURAL:$3|katasunduk pahadangan ngini|kakatasunduk pahadangan ngini}} akan kadaluarsa dalam {{PLURAL:$5|asa hari|$5 hari}}.\nPian parlu babuat log wan mamilih katasunduk hanyar wayah ni jua. Amun urang lain nang maminta ngini, atawa amun Pian sudah paingatan awan katasunduk Pian, wan Pian kada handak maubahnya, Pian kawa kada mahuwal pasan ngini wan manyambung mamuruk katasunduk lawas Pian.",
 	"passwordreset-emailtext-user": "Ada urang (pinanya Pian, matan alamat IP $1) maminta sabuting pangingat hagan rarincian akun Pian gasan {{SITENAME}} ($4). Pamakai barikut {{PLURAL:$3|akun|akun}}\ntarait awan suril:\n\n$2\n\n{{PLURAL:$3|katasunduk pahadangan ngini|kakatasunduk pahadangan ngini}} akan kadaluarsa dalam {{PLURAL:$5|asa hari|$5 hari}}.\nPian parlu babuat log wan mamilih katasunduk hanyar wayah ini jua. Amun urang lain nang maminta ngini, atawa amun Pian sudah paingatan awan katasunduk Pian, wan Pian kada handak maubahnya, Pian kawa kada mahuwal pasan ngini wan manyambung mamuruk katasunduk lawas Pian.",
-	"passwordreset-emailelement": "Ngaran pamakai: $1\nKatasunduk pahadangan: $2",
+	"passwordreset-emailelement": "Ngaran pamakai: \n$1\n\nKatasunduk pahadangan: \n$2",
 	"passwordreset-emailsent": "Sabuting suril pangingat sudah takirim.",
 	"passwordreset-emailsent-capture": "Sabuting suril pangingat sudah dikirim, nangkaya ditampaiakan di bawah.",
 	"passwordreset-emailerror-capture": "Suril paugingat, nang ditampaikan di bawah, hudah dihasilakan, tagal gagal mangirimakannya ka pamakai: $1",
@@ -1392,7 +1392,6 @@
 	"mailnologin": "Kadada alamat kirim",
 	"mailnologintext": "Pian musti [[Special:UserLogin|babuat log]] wan baisi sabuah alamat suril sah di [[Special:Preferences|kakatujuan]] Pian hagan mangirim suril ka papamuruk lain.",
 	"emailuser": "Suril pamakai",
-	"emailpage": "Surili pamakai",
 	"emailpagetext": "Pian kawa mamuruk purmulir di bawah hagan mangirim sabuah suril ka pamuruk ngini.\nAlamat sril Pian pintang [[Special:Preferences|kakatujuan pamuruk Pian]] akan cungul  sawagai \"Matan\" alamat suril, lalu-ai panarima akan kawa langsung mambalas ka Pian.",
 	"defemailsubject": "Suril {{SITENAME}} matan pamuruk \"$1\"",
 	"usermaildisabled": "Suril pamuruk dipajahakan",
diff --git a/languages/i18n/bn.json b/languages/i18n/bn.json
index 3a8cf97625..6b167bb1fd 100644
--- a/languages/i18n/bn.json
+++ b/languages/i18n/bn.json
@@ -32,7 +32,6 @@
 	"tog-hideminor": "অনুল্লেখ্য সম্পাদনাগুলো সাম্প্রতিক পরিবর্তনসমূহে আড়াল করো",
 	"tog-hidepatrolled": "পরীক্ষিত সম্পাদনা গুলো সাম্প্রতিক পরিবর্তনসমূহে আড়াল করো",
 	"tog-newpageshidepatrolled": "পরীক্ষিত পাতা গুলো নতুন পাতার তালিকায় আড়াল করো",
-	"tog-hidecategorization": "পাতার শ্রেণীবদ্ধকরণ লুকান",
 	"tog-extendwatchlist": "শুধু সাম্প্রতিক পরিবর্তনই নয়, সকল পরিবর্তন দেখতে নজর তালিকা সম্প্রসারণ করুন",
 	"tog-usenewrc": "সাম্প্রতিক পরিবর্তনসমূহ এবং নজরতালিকা পাতায় পরিবর্তনগুলো একত্রে প্রদর্শন",
 	"tog-numberheadings": "শিরোনামগুলোকে স্বয়ংক্রিয়ভাবে ক্রমিক নম্বর দাও",
@@ -62,7 +61,6 @@
 	"tog-watchlisthideliu": "নজরতালিকাতে অ্যাকাউন্টে লগ-ইন করা ব্যবহারকারীদের সম্পাদনা আড়ালে রাখা হোক",
 	"tog-watchlisthideanons": "নজরতালিকাতে বেনামী ব্যবহারকারীদের সম্পাদনা আড়ালে রাখা হোক",
 	"tog-watchlisthidepatrolled": "পরীক্ষিত সম্পাদনা গুলো নজরতালিকায় আড়াল করো",
-	"tog-watchlisthidecategorization": "পাতার শ্রেণীবদ্ধকরণ লুকান",
 	"tog-ccmeonemails": "অন্য ব্যবহারকারীর কাছে আমার পাঠানো ইমেইলের একটি অনুলিপি আমাকে পাঠানো হোক",
 	"tog-diffonly": "পার্থক্যের নিচে পাতার বিষয়বস্তু না দেখানো হোক",
 	"tog-showhiddencats": "লুকায়িত বিষয়শ্রেণীসমূহ দেখাও",
@@ -381,7 +379,7 @@
 	"myprivateinfoprotected": "আপনার ব্যক্তিগত তথ্য সম্পাদনা করতে আপনার অনুমতি নেই",
 	"mypreferencesprotected": "আপনার পছন্দসমূহ সম্পাদনা করতে আপনার অনুমতি নেই",
 	"ns-specialprotected": "{{ns:special}} নামস্থানে পাতাসমূহ সম্পাদনা করা যাবে না।",
-	"titleprotected": "[[User:$1|$1]]-কে এই শিরোনামের পাতা সৃষ্টি করতে বাধা দেয়া হচ্ছে। কারণ: ''$2''।",
+	"titleprotected": "[[User:$1|$1]] কর্তৃক এই শিরোনামটি সৃষ্টি করা থেকে সুরক্ষিত করা হয়েছে। কারণ: \"<em>$2</em>\"।",
 	"filereadonlyerror": "\"$1\" ফাইলটিকে পরিবর্তন করা সম্ভব হচ্ছে না কারন \"$2\" ফাইল রিপোসিটোরি রিড-অনলি-মোডে আছে।\n\nএকজন প্রশাসক যিনি এটাকে লকড করেছেন তার যৌক্তিকতা দেওয়া হল: \"$3\"",
 	"invalidtitle-knownnamespace": "অবৈধ শিরোনাম, যেখানে নামস্থান \"$2\" এবং লেখা হয়েছে \"$3\"",
 	"invalidtitle-unknownnamespace": "অবৈধ শিরোনাম, যেখানে ব্যবহৃত হয়েছে অপরিচিত নামস্থান সংখ্যা $1 এবং লেখা হয়েছে \"$2\"",
@@ -448,6 +446,7 @@
 	"createacct-benefit-body2": "{{PLURAL:$1|টি পাতা}}",
 	"createacct-benefit-body3": "জন সাম্প্রতিক {{PLURAL:$1|অবদানকারী}}",
 	"badretype": "আপনার প্রবেশ করানো পাসওয়ার্ডটি মিলছে না।",
+	"usernameinprogress": "এই ব্যবহারকারী নামের জন্য একটি অ্যাকাউন্ট তৈরি আগে থেকেই চলছে। দয়া করে অপেক্ষা করুন।",
 	"userexists": "এই ব্যবহারকারী নামটি ইতমধ্যে ব্যবহার করা হয়েছে।\nঅনুগ্রহ করে অন্য নাম বেছে নিন।",
 	"loginerror": "প্রবেশ করতে সমস্যা হয়েছে",
 	"createacct-error": "অ্যাকাউন্ট তৈরি ত্রুটি",
@@ -538,7 +537,7 @@
 	"passwordreset-emailtitle": "{{SITENAME}} সাইটে ব্যবহারকারীর বিস্তারিত তথ্যাদি",
 	"passwordreset-emailtext-ip": "কেউ একজন (সম্ভবত আপনি, $1 আইপি ঠিকানা থেকে) {{SITENAME}} ($4) সাইটের জন্য আপনার\nপাসওয়ার্ড বদলের জন্য অনুরোধ করেছে। নিচের ব্যবহারকারী {{PLURAL:$3|অ্যাকাউন্টটি|অ্যাকাউন্টগুলো}}\nএই ই-মেইল ঠিকানার সাথে সংযুক্ত:\n\n$2\n\n{{PLURAL:$3|এই অস্থায়ী পাসওয়ার্ডটি|এই অস্থায়ী পাসওয়ার্ডগুলো}} আগামী {{PLURAL:$5|এক দিন|$5 দিন}} পর মেয়াদোত্তীর্ণ হয়ে যাবে।\nআপনার অবশ্যই লগ-ইন করে একটি নতুন পাসওয়ার্ড পছন্দ করা উচিত। যদি অন্য কেউ এই অনুরোধ করে থাকে,\nঅথবা আপনি যদি পুরোনো পাসওয়ার্ড মনে করতে পারেন, এবং আপনার সেটি পরিবর্তন করার কোনো ইচ্ছা না থাকে, তবে\nআপনি এই বার্তাটি উপেক্ষা করতে পারে, এবং আপনার পুরোনো পাসওয়ার্ড ব্যবহার করা চালিয়ে যেতে পারেন।",
 	"passwordreset-emailtext-user": "ব্যবহারকারী $1 {{SITENAME}} ($4) সাইটের জন্য আপনার পাসওয়ার্ড বদলের জন্য অনুরোধ করেছে। নিচের ব্যবহারকারী {{PLURAL:$3|অ্যাকাউন্টটি|অ্যাকাউন্টগুলো}}\nএই ই-মেইল ঠিকানার সাথে সংযুক্ত:\n\n$2\n\n{{PLURAL:$3|এই অস্থায়ী পাসওয়ার্ডটি|এই অস্থায়ী পাসওয়ার্ডগুলো}} আগামী {{PLURAL:$5|এক দিন|$5 দিন}} পর মেয়াদোত্তীর্ণ হয়ে যাবে।\nআপনার অবশ্যই লগ-ইন করে একটি নতুন পাসওয়ার্ড পছন্দ করা উচিত। যদি অন্য কেউ এই অনুরোধ করে থাকে,\nঅথবা আপনি যদি পুরোনো পাসওয়ার্ড মনে করতে পারেন, এবং আপনার সেটি পরিবর্তন করার কোনো ইচ্ছা না থাকে, তবে\nআপনি এই বার্তাটি উপেক্ষা করতে পারে, এবং আপনার পুরোনো পাসওয়ার্ড ব্যবহার করা চালিয়ে যেতে পারেন।",
-	"passwordreset-emailelement": "ব্যবহারকারী নাম: $1\nঅস্থায়ী পাসওয়ার্ড: $2",
+	"passwordreset-emailelement": "ব্যবহারকারী নাম: \n$1\n\nঅস্থায়ী পাসওয়ার্ড: \n$2",
 	"passwordreset-emailsent": "পাসওয়ার্ড বদলের একটি ই-মেইল পাঠানো হয়েছে।",
 	"passwordreset-emailsent-capture": "স্মরণ করিয়ে দেয়ার জন্য একটি ইমেইল করা হয়েছে, যা নিচে দেখানো হচ্ছে।",
 	"passwordreset-emailerror-capture": "স্মরণ করিয়ে দেয়ার জন্য একটি ইমেইল তৈরী করা হয়েছিল, যা নিচে দেখানো হচ্ছে, তবে $1 {{GENDER:$2|ব্যবহারকারীকে}} এটি পাঠানো যায়নি!",
@@ -659,6 +658,7 @@
 	"template-protected": "(সুরক্ষিত)",
 	"template-semiprotected": "(অর্ধ-সুরক্ষিত)",
 	"hiddencategories": "এই পাতাটি {{PLURAL:$1|১টি লুকায়িত বিষয়শ্রেণীর|$1টি লুকায়িত বিষয়শ্রেণীর}} সদস্য:",
+	"edittools": "<!-- সম্পাদনা এবং আপলোড ফরমের নীচে এখানের লেখা দেখানো হবে। -->",
 	"edittools-upload": "-",
 	"nocreatetext": "{{SITENAME}}-এ নতুন পাতা সৃষ্টি করার ক্ষমতা সীমাবদ্ধ করা হয়েছে।\nআপনি ফিরে গিয়ে ইতিমধ্যে বিদ্যমান কোন পাতা সম্পাদনা করতে পারেন, অথবা [[Special:UserLogin|অ্যাকাউন্টে প্রবেশ কিংবা অ্যাকাউন্ট সৃষ্টি করতে পারেন]]।",
 	"nocreate-loggedin": "নতুন পাতা তৈরিতে আপনাকে অনুমোতি দেওয়া হয়নি।",
@@ -906,7 +906,7 @@
 	"mypreferences": "পছন্দসমূহ",
 	"prefs-edits": "সম্পাদনা সংখ্যা:",
 	"prefsnologintext2": "আপনার পছন্দসমূহ পরিবর্তন করতে প্রবেশ করুন।",
-	"prefs-skin": "আবরণ (Skin)",
+	"prefs-skin": "আবরণ",
 	"skin-preview": "প্রাকদর্শন",
 	"datedefault": "কোন পছন্দ নেই",
 	"prefs-labs": "পরীক্ষাগার বৈশিষ্টসমূহ",
@@ -1211,9 +1211,6 @@
 	"rcshowhidemine": "আমার সম্পাদনাগুলো $1",
 	"rcshowhidemine-show": "দেখাও",
 	"rcshowhidemine-hide": "আড়াল করো",
-	"rcshowhidecategorization": "পাতা শ্রেণীবদ্ধকরণ $1",
-	"rcshowhidecategorization-show": "দেখাও",
-	"rcshowhidecategorization-hide": "আড়াল করো",
 	"rclinks": "'''প্রদর্শনের ধরন'''<br />\n* বিগত ($2) দিনের শেষ ($1)টি পরিবর্তন দেখাও\n* $3",
 	"diff": "পরিবর্তন",
 	"hist": "ইতিহাস",
@@ -1237,10 +1234,6 @@
 	"recentchangeslinked-summary": "একটি নির্দিষ্ট পাতা (অথবা নির্দিষ্ট বিষয়শ্রেণীতে) থেকে সংযুক্ত এ পাতার সাম্প্রতিক পরিবর্তনের তালিকা দেওয়া হয়েছে। আপনার [[Special:Watchlist|আপনার নজরতালিকায়]] রাখা পাতাগুলি '''গাঢ়''' করে দেখানো হয়েছে।",
 	"recentchangeslinked-page": "পাতার নাম:",
 	"recentchangeslinked-to": "প্রদত্ত পাতায় সংযুক্ত আছে এমন পাতাগুলোর পরিবর্তন দেখাও",
-	"recentchanges-page-added-to-category": "বিষয়শ্রেণীতে [[:$1]] যোগ করা হয়েছে",
-	"recentchanges-page-added-to-category-bundled": "বিষয়শ্রেণীতে [[:$1]] এবং {{PLURAL:$2|একটি পাতা|$2টি পাতা}} যোগ করা হয়েছে",
-	"recentchanges-page-removed-from-category": "বিষয়শ্রেণী থেকে [[:$1]] সরানো হয়েছে",
-	"recentchanges-page-removed-from-category-bundled": "বিষয়শ্রেণী থেকে [[:$1]] এবং {{PLURAL:$2|একটি পাতা|$2টি পাতা}} সরানো হয়েছে",
 	"upload": "আপলোড",
 	"uploadbtn": "ফাইল আপলোড করুন",
 	"reuploaddesc": "আপলোড বাতিল করো এবং আপলোড ফর্মে ফেরত যাও।",
@@ -1724,7 +1717,6 @@
 	"emailuser": "ইমেইল করো",
 	"emailuser-title-target": "{{GENDER:$1|ব্যবহারকারীকে}} ইমেইল পাঠান",
 	"emailuser-title-notarget": "ব্যবহারকারীকে ই-মেইল করুন",
-	"emailpage": "ব্যবহারকারীকে ই-মেইল করুন",
 	"emailpagetext": "আপনি নিচের ফর্মটি ব্যবহার করে এই {{GENDER:$1|ব্যবহারকারীকে}} একটি ই-মেইল পাঠাতে পারেন।\nআপনি [[Special:Preferences|আপনার ব্যবহারকারী পছন্দে]] যে ই-মেইল ঠিকানাটি প্রবেশ করিয়েছেন সেটিকে ই-মেইলের ''প্রেরক'' হিসেবে দেখানো হবে, যেনো মেইলের প্রাপক আপনাকে উত্তর দিতে পারেন।",
 	"defemailsubject": "{{SITENAME}} ব্যবহারকারী \"$1\" প্রেরিত ইমেইল",
 	"usermaildisabled": "ব্যবহারকারী ই-মেইল নিস্ক্রিয়",
@@ -1746,7 +1738,7 @@
 	"emailccsubject": "আপনার বার্তার অনুলিপি $1-কে: $2",
 	"emailsent": "ই-মেইল প্রেরণ করা হয়েছে",
 	"emailsenttext": "আপনার ই-মেইল বার্তা প্রেরণ করা হয়েছে।",
-	"emailuserfooter": "এই ইমেইলটি {{SITENAME}} সাইটের \"{{int:emailpage}}\" সুবিধা ব্যবহার করে $1-এর পক্ষ থেকে $2-এর নিকট পাঠানো হয়েছে।",
+	"emailuserfooter": "এই ইমেইলটি {{SITENAME}} সাইটের \"{{int:emailuser}}\" সুবিধা ব্যবহার করে $1-এর পক্ষ থেকে $2-এর নিকট পাঠানো হয়েছে।",
 	"usermessage-summary": "বাদবাকি সিস্টেম বার্তা",
 	"usermessage-editor": "সিস্টেম ম্যাসেঞ্জার",
 	"watchlist": "নজর তালিকা",
@@ -2877,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 জিবিপিএস",
@@ -2985,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": "সংস্করণ",
@@ -3075,6 +3069,8 @@
 	"tags-edit-logentry-selected": "{{PLURAL:$1|নির্বাচিত লগ ইভেন্ট}}:",
 	"tags-edit-existing-tags": "বিদ্যমান ট্যাগ:",
 	"tags-edit-new-tags": "নতুন ট্যাগ:",
+	"tags-edit-chosen-placeholder": "কিছু ট্যাগ নির্বাচন করুন",
+	"tags-edit-chosen-no-results": "কোন ট্যাগ মিল পাওয়া যায়নি",
 	"tags-edit-reason": "কারণ:",
 	"tags-edit-success": "পরিবর্তন সফলভাবে প্রয়োগ করা হয়েছে।",
 	"tags-edit-failure": "পরিবর্তন প্রয়োগ করা যায়নি: $1",
@@ -3112,6 +3108,11 @@
 	"htmlform-cloner-create": "আরও যোগ করুন",
 	"htmlform-cloner-delete": "অপসারণ",
 	"htmlform-cloner-required": "অন্তত একটি মূল্য আবশ্যক।",
+	"htmlform-title-badnamespace": "[[:$1]] \"{{ns:$2}}\" নামস্থানে খুঁজে পাওয়া যায়নি।",
+	"htmlform-title-not-creatable": "\"$1\" সৃষ্টিযোগ্য পাতার শিরোনাম নয়",
+	"htmlform-title-not-exists": "[[:$1]]-এর অস্তিত্ব নেই।",
+	"htmlform-user-not-exists": "<strong>$1</strong>-এর অস্তিত্ব নেই।",
+	"htmlform-user-not-valid": "<strong>$1</strong> একটি বৈধ ব্যবহারকারীর নাম নয়।",
 	"sqlite-has-fts": "$1 সহ পূর্ণ টেক্সট সার্চ সমর্থন",
 	"sqlite-no-fts": "$1 বাদে পূর্ণ টেক্সট সার্চ সমর্থন",
 	"logentry-delete-delete": "$1 কর্তৃক $3 পাতাটি অপসারিত হয়েছে",
@@ -3135,8 +3136,12 @@
 	"revdelete-unrestricted": "এই সীমাবদ্ধতা প্রশাসকের ক্ষেত্রে তুলে নাও",
 	"logentry-block-block": "$1 {{GENDER:$4|$3}} কে $5 মেয়াদের জন্য {{GENDER:$2|বাধাদান}} করেছেন $6",
 	"logentry-block-unblock": "$1 {{GENDER:$4|$3}}-এর উপর থেকে বাধা তুলে {{GENDER:$2|নিয়েছেন}}",
+	"logentry-block-reblock": "$1 {{GENDER:$4|$3}}-এর জন্য বাধাদান সেটিং $5 সময়ের জন্য {{GENDER:$2|পরিবর্তন}} করেছেন $6",
+	"logentry-suppress-block": "$1 {{GENDER:$4|$3}} কে $5 মেয়াদের জন্য {{GENDER:$2|বাধাদান}} করেছেন $6",
+	"logentry-suppress-reblock": "$1 {{GENDER:$4|$3}}-এর জন্য বাধাদান সেটিং $5 সময়ের জন্য {{GENDER:$2|পরিবর্তন}} করেছেন $6",
 	"logentry-import-upload": "$1 ফাইল আপলোড দ্বারা $3 {{GENDER:$2|আমদানি করেছেন}}",
 	"logentry-import-interwiki": "$1 অন্য একটি উইকিতে থেকে $3 {{GENDER:$2|আমদানি করেছে}}",
+	"logentry-merge-merge": "$1 $4-এ $3 {{GENDER:$2|একত্রীকরণ করেছেন}} ($5 তারিখের সংশোধন পর্যন্ত)",
 	"logentry-move-move": "$1 ব্যবহারকারী $3 পাতাটিকে $4 শিরোনামে {{GENDER:$2|স্থানান্তর}} করেছেন",
 	"logentry-move-move-noredirect": "$1 ব্যবহারকারী $3 পাতাটিকে $4 শিরোনামে কোনো পুনর্নির্দেশনা ছাড়াই {{GENDER:$2|স্থানান্তর}} করেছেন",
 	"logentry-move-move_redir": "$1 ব্যবহারকারী $3 পাতাটিকে $4 শিরোনামে পুনির্নির্দেশনার মাধ্যমে {{GENDER:$2|স্থানান্তর}} করেছেন",
@@ -3148,6 +3153,7 @@
 	"logentry-newusers-create2": "$1 ব্যবহারকারী $3 নামের অ্যাকাউন্টটি {{GENDER:$2|তৈরী}} করেছেন",
 	"logentry-newusers-byemail": "$1, $3 ব্যবহারকরী অ্যাকাউন্টটি {{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 দলের সদস্যপদ পরিবর্তন করেছেন {{GENDER:$2|changed}} এর জন্য $3",
 	"logentry-rights-autopromote": "$1 সয়ংক্রিয়ভাবে $4 থেকে $5 এ {{GENDER:$2|উন্নীত}} হয়েছে",
@@ -3315,6 +3321,7 @@
 	"special-characters-title-endash": "en ড্যাশ",
 	"special-characters-title-emdash": "em ড্যাশ",
 	"special-characters-title-minus": "বিয়োগ চিহ্ন",
+	"mw-widgets-dateinput-no-date": "কোন তারিখ নির্বাচন করা হয়নি",
 	"mw-widgets-titleinput-description-new-page": "পাতা এখনো বিদ্যমান নয়",
 	"mw-widgets-titleinput-description-redirect": "$1-এ পুনঃনির্দেশিত"
 }
diff --git a/languages/i18n/br.json b/languages/i18n/br.json
index 50a8f7f70c..c442873c67 100644
--- a/languages/i18n/br.json
+++ b/languages/i18n/br.json
@@ -505,7 +505,7 @@
 	"passwordreset-emailtitle": "Titouroù kont war {{SITENAME}}",
 	"passwordreset-emailtext-ip": "Unan bennak (c'hwi moarvat gant ar chomlec'h IP $1) en deus goulennet ma vefe degaset soñj dezhañ eus titouroù e gont evit {{SITENAME}} ($4). Emañ liammet {{PLURAL:$3|ar gont implijer|ar c'hontoù implijer}} da-heul gant ar chomlec'h postel-mañ :\n\n$2\n\nMont a raio da get {{PLURAL:$3|ar ger-tremen da c'hortoz|ar gerioù-tremen da c'hortoz}} a-benn {{PLURAL:$5|un devezh|$5 deiz}}.\nMat e vefe deoc'h kevreañ ha dibab ur ger-tremen nevez bremañ. Mard eo bet goulennet kement-se gant unan bennak all pe m'hoc'h eus soñj eus ho ker-tremen orin ha mar ne fell ket deoc'h e cheñch ken, na daolit ket evezh ouzh ar gemennadenn-mañ ha dalc'hit d'ober gant ho ker-tremen kozh.",
 	"passwordreset-emailtext-user": "Goulennet en deus an implijer $1 war  {{SITENAME}} e vefe degaset soñj dezhañ eus titouroù e gont evit {{SITENAME}} ($4). Emañ liammet {{PLURAL:$3|ar gont implijer|ar c'hontoù implijer}} da-heul gant ar chomlec'h postel-mañ :\n\n$2\n\nMont a raio da get {{PLURAL:$3|ar ger-tremen da c'hortoz|ar gerioù-tremen da c'hortoz}} a-benn {{PLURAL:$5|un devezh|$5 deiz}}.\nMat e vefe deoc'h kevreañ ha dibab ur ger-tremen nevez bremañ. Mard eo bet goulennet kement-se gant unan bennak all pe m'hoc'h eus soñj eus ho ker-tremen orin ha mar ne fell ket deoc'h e cheñch ken, na daolit ket evezh ouzh ar gemennadenn-mañ ha dalc'hit d'ober gant ho ker-tremen kozh.",
-	"passwordreset-emailelement": "Anv implijer :           $1\nGer-tremen da c'hortoz : $2",
+	"passwordreset-emailelement": "Anv implijer :           \n$1\n\nGer-tremen da c'hortoz : \n$2",
 	"passwordreset-emailsent": "Kaset ez eus bet ur postel deoc'h da adderaouekaat ho ker-tremen.",
 	"passwordreset-emailsent-capture": "Ur postel evit aderaouekaat ho ker-tremen, evel diskouezet amañ dindan, zo bet kaset.",
 	"passwordreset-emailerror-capture": "Kaset ez eus bet ur postel degas da soñj evel m'emañ diskouezet amañ dindan met c'hwitet eo bet ar gasadenn d'an {{GENDER:$2|implijer|implijerez}} : $1",
@@ -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 5ec7a30c45..ec73427d67 100644
--- a/languages/i18n/bs.json
+++ b/languages/i18n/bs.json
@@ -532,7 +532,7 @@
 	"passwordreset-emailtitle": "Detalji računa na {{SITENAME}}",
 	"passwordreset-emailtext-ip": "Neko (vjerovatno Vi, s IP adrese $1) je zatražio podsjetnik Vaših detalja računa za {{SITENAME}} ($4). Sljedeći {{PLURAL:$3|račun korisnika je|računi korisnika su}} povezani s ovom e-mail adresom:\n\n$2\n\n{{PLURAL:$3|Ova privremena šifra|Ove privremene šifre}} će isteći za {{PLURAL:$5|jedan dan|$5 dana}}.\nTrebate se prijaviti i odabrati novu šifru. Ako je neko drugi napravio ovaj zahtjev, ili ako ste se sjetili Vaše početne šifre, a ne želite je promijeniti, možete zanemariti ovu poruku i nastaviti koristiti staru šifru.",
 	"passwordreset-emailtext-user": "Korisnik $1 na {{SITENAME}} je zatražio podsjetnik o detaljima Vašeg računa za {{SITENAME}} ($4). Sljedeći {{PLURAL:$3|korisnički račun je|korisnički računi su}} povezani s ovom e-mail adresom:\n\n$2\n\n{{PLURAL:$3|Ova privremena šifra|Ove privremene šifre}} će isteći za {{PLURAL:$5|jedan dan|$5 dana}}.\nTrebate se prijaviti i odabrati novu šifru. Ako je neko drugi napravio ovaj zahtjev, ili ako ste se sjetili Vaše originalne šifre, a ne želite je više promijeniti, možete zanemariti ovu poruku i nastaviti koristiti staru šifru.",
-	"passwordreset-emailelement": "Korisničko ime: $1\nPrivremena šifra: $2",
+	"passwordreset-emailelement": "Korisničko ime: \n$1\n\nPrivremena šifra: \n$2",
 	"passwordreset-emailsent": "Podsjetnik na lozinku poslan je na Vašu e-mail adresu.",
 	"passwordreset-emailsent-capture": "Poslan je podsjetnik preko e-pošte (prikazano ispod).",
 	"passwordreset-emailerror-capture": "E-poruka za resetiranje lozinke, prikazano ispod, poslana je, ali slanje {{GENDER:$2|korisniku|korisnici}} nije uspjelo: $1",
@@ -661,9 +661,9 @@
 	"sectioneditnotsupported-text": "Uređivanje sekcije nije podržano na ovoj stranici.",
 	"permissionserrors": "Greške pri odobrenju",
 	"permissionserrorstext": "Nemate dopuštenje da to uradite, iz {{PLURAL:$1|slijedećeg razloga|slijedećih razloga}}:",
-	"permissionserrorstext-withaction": "Nemate dopuštenje da $2, iz {{PLURAL:$1|slijedećeg|slijedećih}} razloga:",
+	"permissionserrorstext-withaction": "Nemate dopuštenje da $2, iz {{PLURAL:$1|sljedećeg|sljedećih}} razloga:",
 	"recreate-moveddeleted-warn": "'''Upozorenje: Postavljate stranicu koja je prethodno brisana.'''\n\nRazmotrite da li je nastavljanje uređivanja ove stranice u skladu s pravilima.\nOvdje je naveden zapisnik brisanja i premještanja s obrazloženjem:",
-	"moveddeleted-notice": "Ova stranica je obrisana.\nZapis brisanja i pomjeranja stranice je prikazan ispod kao referenca.",
+	"moveddeleted-notice": "Ova stranica je obrisana.\nZapisnik brisanja i premještanja stranice je prikazan ispod kao referenca.",
 	"log-fulllog": "Vidi potpuni zapisnik",
 	"edit-hook-aborted": "Izmjena je poništena putem interfejsa.\nNije ponuđeno nikakvo objašnjenje.",
 	"edit-gone-missing": "Stranica se nije mogla osvježiti.\nIzgleda da je obrisana.",
@@ -707,11 +707,11 @@
 	"parser-unstrip-loop-warning": "Pronađena petlja",
 	"parser-unstrip-recursion-limit": "Prekoračeno ograničenje rekurzije ($1)",
 	"converter-manual-rule-error": "Pronađena je greška u pravilu za ručno pretvaranje jezika",
-	"undo-success": "Izmjena se može vratiti.\nMolimo da provjerite usporedbu ispod da budete sigurni da ovo želite uraditi, a zatim sačuvajte promjene da bi ste završili vraćanje izmjene.",
-	"undo-failure": "Izmjena se ne može vratiti zbog sukoba izmjena.",
-	"undo-norev": "Izmjena se ne može vratiti jer ne postoji ranija ili je obrisana.",
+	"undo-success": "Izmjenu je moguće poništiti.\nMolimo da ispod uporedite razlike u verzijama kako biste bili sigurni da ovo zaista želite uraditi, te sačuvajte stranicu i izmjene će biti poništene.",
+	"undo-failure": "Ova izmjena se ne može poništiti jer se međuverzije sukobe.",
+	"undo-norev": "Izmjena se ne može poništiti jer ne postoji ili je obrisana.",
 	"undo-nochange": "Izgleda da je izmjena već vraćena.",
-	"undo-summary": "Vraćena izmjena $1 {{GENDER:$2|korisnika|korisnice}} [[Special:Contributions/$2|$2]] ([[User talk:$2|razgovor]])",
+	"undo-summary": "Poništena izmjena $1 {{GENDER:$2|korisnika|korisnice}} [[Special:Contributions/$2|$2]] ([[User talk:$2|razgovor]])",
 	"undo-summary-username-hidden": "Poništi izmjenu $1 od skrivenog korisnika",
 	"cantcreateaccounttitle": "Nije moguće napraviti korisnički račun",
 	"cantcreateaccount-text": "Pravljenje korisničkog računa sa ove IP adrese ('''$1''') je blokirano od strane [[User:$3|$3]].\n\nRazlog koji je naveo $3 je ''$2''",
@@ -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:",
@@ -834,14 +834,14 @@
 	"mergelog": "Zapisnik spajanja",
 	"revertmerge": "Vrati spajanje",
 	"mergelogpagetext": "Ispod je spisak nedavnih spajanja historija stranica.",
-	"history-title": "Historija izmjena stranice \"$1\"",
+	"history-title": "$1: Historija izmjena",
 	"difference-title": "Razlike između verzija stranice \"$1\"",
 	"difference-title-multipage": "Razlika između stranica \"$1\" i \"$2\"",
 	"difference-multipage": "(Razlika između stranica)",
 	"lineno": "Red $1:",
-	"compareselectedversions": "Uporedite označene verzije",
+	"compareselectedversions": "Uporedi označene verzije",
 	"showhideselectedversions": "Pokaži/sakrij odabrane verzije",
-	"editundo": "vrati",
+	"editundo": "poništi",
 	"diff-empty": "(Nema razlike)",
 	"diff-multi-sameuser": "({{PLURAL:$1|Nije prikazana jedna međurevizija|Nisu prikazane $1 međurevizije}} istog korisnika)",
 	"diff-multi-otherusers": "(Nije prikazana {{PLURAL:$1|jedna međuverzija|$1 međuverzija}} {{PLURAL:$2|drugog korisnika|$2 korisnika}})",
@@ -905,14 +905,14 @@
 	"datedefault": "Nije bitno",
 	"prefs-labs": "Eksperimentalne mogućnosti",
 	"prefs-user-pages": "Korisničke stranice",
-	"prefs-personal": "Korisnički profil",
+	"prefs-personal": "Profil",
 	"prefs-rc": "Nedavne izmjene",
-	"prefs-watchlist": "Praćeni članci",
-	"prefs-editwatchlist": "Uredi spisak praćenja",
-	"prefs-editwatchlist-label": "Uredi unose na spisku praćenja:",
-	"prefs-editwatchlist-edit": "Pregledaj i ukloni članke sa spiska praćenja",
-	"prefs-editwatchlist-raw": "Napredno uređivanje spiska praćenja",
-	"prefs-editwatchlist-clear": "Očisti spisak praćenja",
+	"prefs-watchlist": "Spisak praćenja",
+	"prefs-editwatchlist": "Uređivanje spiska praćenja",
+	"prefs-editwatchlist-label": "Uređivanje spiska:",
+	"prefs-editwatchlist-edit": "Uredi spisak",
+	"prefs-editwatchlist-raw": "Napredno uredi spisak",
+	"prefs-editwatchlist-clear": "Isprazni spisak",
 	"prefs-watchlist-days": "Broj dana za prikaz u spisku praćenja:",
 	"prefs-watchlist-days-max": "Najviše $1 {{PLURAL:$1|dan|dana}}",
 	"prefs-watchlist-edits": "Najveći broj izmjena za prikaz u proširenom spisku praćenja:",
@@ -1037,8 +1037,8 @@
 	"group-user-member": "{{GENDER:$1|korisnik|korisnica}}",
 	"group-autoconfirmed-member": "Potvrđeni korisnik",
 	"group-bot-member": "bot",
-	"group-sysop-member": "Administrator",
-	"group-bureaucrat-member": "Birokrat",
+	"group-sysop-member": "{{GENDER:$1|administrator|administratorica}}",
+	"group-bureaucrat-member": "{{GENDER:$1|birokrat|birokratica}}",
 	"group-suppress-member": "Nadzornik",
 	"grouppage-user": "{{ns:project}}:Korisnici",
 	"grouppage-autoconfirmed": "{{ns:project}}:Potvrđeni korisnici",
@@ -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",
@@ -1719,7 +1719,6 @@
 	"emailuser": "Pošalji e-poštu",
 	"emailuser-title-target": "Pošalji e-poruku {{GENDER:$1|korisniku|korisnici|korisniku}}",
 	"emailuser-title-notarget": "Pošalji e-mail korisniku",
-	"emailpage": "Pošalji e-mail korisniku",
 	"emailpagetext": "Možete korisiti obrazac ispod za slanje poruke e-poštom {{GENDER:$1|ovom korisniku|ovoj korisnici|ovom korisniku}}.\nAdresa e-pošte koju ste unijeli u [[Special:Preferences|svojim korisničkim postavkama]] će biti prikazana kao adresa pošiljaoca, tako da će primaoc poruke moći da Vam odgovori.",
 	"defemailsubject": "{{SITENAME}} e-pošta od {{GENDER:$1|korisnika|korisnice|korisnika}} $1",
 	"usermaildisabled": "Korisnički e-mail onemogućen",
@@ -1741,7 +1740,7 @@
 	"emailccsubject": "Kopiraj Vašu poruku za $1: $2",
 	"emailsent": "Poruka poslata",
 	"emailsenttext": "Vaša poruka je poslata e-poštom.",
-	"emailuserfooter": "Ovaj e-mail je poslao $1 korisniku $2 putem funkcije \"{{int:emailpage}}\" sa {{SITENAME}}.",
+	"emailuserfooter": "Ovaj e-mail je poslao $1 korisniku $2 putem funkcije \"{{int:emailuser}}\" sa {{SITENAME}}.",
 	"usermessage-summary": "Ostavljanje sistemske poruke.",
 	"usermessage-editor": "Sistem za poruke",
 	"watchlist": "Spisak praćenja",
@@ -1791,9 +1790,9 @@
 	"changed": "promijenjena",
 	"deletepage": "Obrišite stranicu",
 	"confirm": "Potvrdite",
-	"excontent": "sadržaj je bio: '$1'",
-	"excontentauthor": "sadržaj je bio: '$1' (i jedini korisnik koji je mijenjao bio je '[[Special:Contributions/$2|$2]]')",
-	"exbeforeblank": "sadržaj prije brisanja je bio: '$1'",
+	"excontent": "sadržaj je bio: \"$1\"",
+	"excontentauthor": "sadržaj je bio: \"$1\" (a jedini urednik \"[[Special:Contributions/$2|$2]]\")",
+	"exbeforeblank": "sadržaj prije brisanja je bio: \"$1\"",
 	"delete-confirm": "Brisanje \"$1\"",
 	"delete-legend": "Obriši",
 	"historywarning": "<strong>Upozorenje</strong>: Stranica koju želite da obrišete ima historiju sa otprilike $1 {{PLURAL:$1|revizijom|revizije|revizija}}:",
@@ -1806,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",
@@ -1815,16 +1814,16 @@
 	"deleteprotected": "Ne možete obrisati ovu stranicu jer je zaštićena.",
 	"deleting-backlinks-warning": "'''Upozorenje:''' [[Special:WhatLinksHere/{{FULLPAGENAME}}|Druge stranice]] sadrže link ili vode na stranicu koju brišete.",
 	"rollback": "Vrati izmjene",
-	"rollbacklink": "ukloni",
+	"rollbacklink": "vrati",
 	"rollbacklinkcount": "vrati $1 {{PLURAL:$1|izmjenu|izmjene|izmjena}}",
 	"rollbacklinkcount-morethan": "vrati više od $1 {{PLURAL:$1|izmjene|izmjene|izmjena}}",
 	"rollbackfailed": "Neuspešno vraćanje",
 	"cantrollback": "Ne mogu vratiti izmjenu;\nposljednji autor je ujedno i jedini.",
 	"alreadyrolled": "Ne može se vratiti posljednja izmjena [[:$1]] od korisnika [[User:$2|$2]] ([[User talk:$2|razgovor]]{{int:pipe-separator}}[[Special:Contributions/$2|{{int:contribslink}}]]); neko je već izmijenio ili vratio članak na prethodnu provjerenu verziju.\n\nPosljednju izmjenu napravio je korisnik [[User:$3|$3]] ([[User talk:$3|razgovor]]{{int:pipe-separator}}[[Special:Contributions/$3|{{int:contribslink}}]]).",
 	"editcomment": "Sažetak izmjene je bio: \"''$1''\".",
-	"revertpage": "Vraćene izmjene korisnika [[Special:Contributions/$2|$2]] ([[User talk:$2|razgovor]]) na posljednju izmjenu koju je napravio [[User:$1|$1]]",
+	"revertpage": "Vraćene izmjene {{GENDER:$2|korisnika|korisnice}} [[Special:Contributions/$2|$2]] ([[User talk:$2|razgovor]]) na posljednju izmjenu {{GENDER:$1|korisnika|korisnice}} [[User:$1|$1]]",
 	"revertpage-nouser": "Vraćene izmjene skrivenog korisnika na posljednju reviziju, koju je {{GENDER:$1|napravio|napravila}} [[User:$1|$1]]",
-	"rollback-success": "Poništene izmjene korisnika $1;\nvraćeno na posljednju verziju koju je sačuvao $2.",
+	"rollback-success": "Vraćene izmjene {{GENDER:$2|korisnika|korisnice}} $1 na posljednju verziju {{GENDER:$2|korisnika|korisnice}} $2.",
 	"sessionfailure-title": "Greška u sesiji",
 	"sessionfailure": "Izgleda da postoji problem sa vašom sesijom; ova akcija je otkazana kao prevencija protiv napadanja sesija. Kliknite \"back\" (''nazad'') i osvježite stranicu sa koje ste došli, i opet pokušajte.",
 	"changecontentmodel": "Promijeni model sadržaja stranice",
@@ -1843,24 +1842,24 @@
 	"logentry-contentmodel-change-revert": "vrati",
 	"protectlogpage": "Zapisnik zaključavanja",
 	"protectlogtext": "Ispod je spisak promjena zaštićenja stranice.\nPogledajte [[Special:ProtectedPages|spisak zaštićenih stranica]] za pregled trenutno zaštićenih stranica.",
-	"protectedarticle": "stranica \"[[$1]]\" je zaštićena",
-	"modifiedarticleprotection": "promijenjen stepen zaštite za \"[[$1]]\"",
+	"protectedarticle": "{{GENDER:|zaštitio|zaštitila}} je stranicu \"[[$1]]\"",
+	"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''':",
@@ -1873,17 +1872,17 @@
 	"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-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,zauvijek:infinite",
+	"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:",
 	"minimum-size": "Najmanja veličina",
@@ -1999,9 +1998,9 @@
 	"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:",
-	"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,zauvijek:infinite",
+	"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",
 	"ipb-disableusertalk": "Onemogući ovog korisnika da uređuje svoju stranicu za razgovor dok je blokiran",
@@ -2041,7 +2040,7 @@
 	"ipblocklist-submit": "Traži",
 	"ipblocklist-localblock": "Lokalna blokada",
 	"ipblocklist-otherblocks": "Ostale {{PLURAL:$1|blokada|blokade}}",
-	"infiniteblock": "neograničeno",
+	"infiniteblock": "beskonačno",
 	"expiringblock": "ističe dana $1 u $2",
 	"anononlyblock": "samo anonimni korisnici",
 	"noautoblockblock": "automatsko blokiranje onemogućeno",
@@ -2050,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",
@@ -2066,9 +2065,9 @@
 	"block-log-flags-anononly": "samo anonimni korisnici",
 	"block-log-flags-nocreate": "onemogućeno pravljenje računa",
 	"block-log-flags-noautoblock": "automatsko blokiranje onemogućeno",
-	"block-log-flags-noemail": "e-mail je blokiran",
+	"block-log-flags-noemail": "e-pošta blokirana",
 	"block-log-flags-nousertalk": "ne može uređivati vlastitu stranicu za razgovor",
-	"block-log-flags-angry-autoblock": "omogućeno napredno autoblokiranje",
+	"block-log-flags-angry-autoblock": "uključeno poboljšano automatsko blokiranje",
 	"block-log-flags-hiddenname": "korisničko ime sakriveno",
 	"range_block_disabled": "Administratorska mogućnost da blokira grupe je isključena.",
 	"ipb_expiry_invalid": "Neispravno vrijeme isteka.",
@@ -2329,8 +2328,8 @@
 	"tooltip-watchlistedit-raw-submit": "Ažuriraj spisak praćenja",
 	"tooltip-recreate": "Ponovno pravljenje stranice iako je već brisana",
 	"tooltip-upload": "Započni postavljanje",
-	"tooltip-rollback": "Brzo vraćanje izmjene(izmjena) ove stranice posljednjeg uređivača jednim klikom.",
-	"tooltip-undo": "Vraća posljednju izmjenu i otvara formu za uređivanje u modu pregleda.\nDopušta unos razloga u sažetak.",
+	"tooltip-rollback": "\"Vrati\" vraća izmjene posljednjeg uređivača jednim klikom",
+	"tooltip-undo": "Dugme \"poništi\" poništava ovu izmjenu, te otvara stranicu u režimu za uređivanje s pregledom izmjena koje će biti poništene. Također omogućava unošenje razloga poništenja u sažetak.",
 	"tooltip-preferences-save": "Sačuvaj podešavanja",
 	"tooltip-summary": "Unesite kratki sažetak",
 	"common.css": "/* CSS umetnut ovdje primijenit će se na sve skinove */",
@@ -2871,7 +2870,7 @@
 	"img-lang-go": "Idi",
 	"ascending_abbrev": "rast",
 	"descending_abbrev": "opad",
-	"table_pager_next": "Slijedeća stranica",
+	"table_pager_next": "Sljedeća stranica",
 	"table_pager_prev": "Prethodna stranica",
 	"table_pager_first": "Prva stranica",
 	"table_pager_last": "Posljednja stranica",
@@ -2903,11 +2902,11 @@
 	"watchlistedit-raw-done": "Vaš spisak praćenja je ažuriran.",
 	"watchlistedit-raw-added": "{{PLURAL:$1|1 naslov je dodan|$1 naslova su dodana|$1 naslova je dodano}}:",
 	"watchlistedit-raw-removed": "{{PLURAL:$1|1 naslov je uklonjen|$1 naslova je uklonjeno}}:",
-	"watchlistedit-clear-title": "Očišćen spisak nadgledanja",
-	"watchlistedit-clear-legend": "Očisti spisak nadgledanja",
-	"watchlistedit-clear-explain": "Svi naslovi će biti uklonjeni iz vašeg spiska nadgledanja",
+	"watchlistedit-clear-title": "Pražnjenje spiska praćenja",
+	"watchlistedit-clear-legend": "Isprazni spisak praćenja",
+	"watchlistedit-clear-explain": "Sve stranice će biti uklonjene iz Vašeg spiska praćenja",
 	"watchlistedit-clear-titles": "Naslovi:",
-	"watchlistedit-clear-submit": "Isprazni spisak nadgledanja (Ovo je trajno!)",
+	"watchlistedit-clear-submit": "Isprazni spisak praćenja (Ovo je nepovratno!)",
 	"watchlistedit-clear-done": "Vaš spisak praćenja je očišćen.",
 	"watchlistedit-clear-removed": "{{PLURAL:$1|1 naslov je uklonjen|$1 naslova su uklonjena|$1 naslova je uklonjeno}}:",
 	"watchlistedit-too-many": "Ima previše stranica za prikaz ovdje.",
@@ -3167,7 +3166,7 @@
 	"htmlform-int-toohigh": "Vrijednost koju ste naveli je iznad maksimuma od $1",
 	"htmlform-required": "Ova vrijednost je obavezna",
 	"htmlform-submit": "Pošalji",
-	"htmlform-reset": "Vrati izmjene",
+	"htmlform-reset": "Poništi izmjene",
 	"htmlform-selectorother-other": "Ostalo",
 	"htmlform-no": "Ne",
 	"htmlform-yes": "Da",
@@ -3214,13 +3213,14 @@
 	"logentry-move-move_redir": "$1 {{GENDER:$2|premjestio|premjestila}} je stranicu $3 na $4 preko preusmjeravanja",
 	"logentry-move-move_redir-noredirect": "$1 {{GENDER:$2|premjestio|premjestila}} je stranicu $3 na $4 preko preusmjeravanja bez ostavljanja preusmjeravanja",
 	"logentry-patrol-patrol": "$1 je {{GENDER:$2|označio|označila}} izmjenu $4 stranice $3 pregledanim",
-	"logentry-patrol-patrol-auto": "$1 je automatski {{GENDER:$2|označio|označila}} izmjenu $4 stranice $3 pregledanim",
+	"logentry-patrol-patrol-auto": "$1 automatski je {{GENDER:$2|označio|označila}} verziju $4 stranice $3 pregledanom",
 	"logentry-newusers-newusers": "Korisnički račun $1 je {{GENDER:$2|napravljen}}",
 	"logentry-newusers-create": "Korisnički račun $1 je {{GENDER:$2|napravljen}}",
 	"logentry-newusers-create2": "$1 je {{GENDER:$2|napravio|napravila}} korisnički račun $3",
 	"logentry-newusers-byemail": "Korisnički račun $3 je {{GENDER:$2|napravio|napravila}} $1 i lozinka/šifra je poslana putem e-maila",
-	"logentry-newusers-autocreate": "Korisnički račun $1 je automatski {{GENDER:$2|napravljen}}",
-	"logentry-rights-rights": "$1 je {{GENDER:$2|promijenio|promijenila|promijenio}} članstvo grupe za $3 iz $4 u $5",
+	"logentry-newusers-autocreate": "Korisnički račun $1 automatski je {{GENDER:$2|napravljen}}",
+	"logentry-protect-move_prot": "$1 {{GENDER:$2|premjestio|premjestila}} je postavke zaštite sa $4 na $3",
+	"logentry-rights-rights": "$1 {{GENDER:$2|promijenio|promijenila}} je članstvo grupe za $3 iz $4 u $5",
 	"logentry-rights-rights-legacy": "$1 je {{GENDER:$2|promijenio|promijenila|promijenio}} članstvo grupe za $3",
 	"logentry-rights-autopromote": "$1 {{GENDER:$1|je automatski promijenjeno članstvo|su automatski promijenjena članstva}} iz $4 u $5",
 	"logentry-upload-upload": "$1 {{GENDER:$2|postavio|postavila}} je $3",
diff --git a/languages/i18n/ca.json b/languages/i18n/ca.json
index 3a1f17f575..189d882a0e 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",
@@ -567,7 +568,7 @@
 	"passwordreset-emailtitle": "Detalls del compte a {{SITENAME}}",
 	"passwordreset-emailtext-ip": "Algú (vós mateix segurament, des de l'adreça IP $1) ha demanat una reinicialització de la vostra contrasenya al projecte {{SITENAME}} ($4). {{PLURAL:$3|El següent compte d'usuari està associat|Els següents comptes d'usuari estan associats}} amb aquesta adreça de correu electrònic:\n\n$2\n\n{{PLURAL:$3|Aquesta contrasenya temporal caducarà|Aquestes contrasenyes temporals caducaran}} en {{PLURAL:$5|un dia|$5 dies}}.\nHauríeu d'entrar al compte per a fixar-hi una nova contrasenya al més aviat possible. Si algú que no sou vós és qui ha fet aquesta petició o si heu recordat la contrasenya original i ja no la voleu canviar, podeu ignorar aquest missatge i seguir utilitzant la vostra antiga contrasenya.",
 	"passwordreset-emailtext-user": "L'usuari $1 de {{SITENAME}} ha demanat una reinicialització de la vostra contrasenya per al projecte {{SITENAME}} ($4). {{PLURAL:$3|El següent compte d'usuari està associat|Els següents comptes d'usuari estan associats}} amb aquesta adreça de correu electrònic:\n\n$2\n\n{{PLURAL:$3|Aquesta contrasenya temporal caducarà|Aquestes contrasenyes temporals caducaran}} en {{PLURAL:$5|un dia|$5 dies}}.\nHauríeu d'entrar ara per fixar una nova contrasenya. Si algú que no sou vós és qui ha fet aquesta petició o si heu recordat la contrasenya original i ja no la voleu canviar, podeu ignorar aquest missatge i seguir utilitzant la vostra antiga contrasenya.",
-	"passwordreset-emailelement": "Nom d'usuari: $1\nContrasenya temporal: $2",
+	"passwordreset-emailelement": "Nom d'usuari: \n$1\n\nContrasenya temporal: \n$2",
 	"passwordreset-emailsent": "S'ha enviat un correu de reinicialització de contrasenya.",
 	"passwordreset-emailsent-capture": "S'ha enviat un correu electrònic de reinicialització de contrasenya, tal com es mostra a continuació.",
 	"passwordreset-emailerror-capture": "S'ha generat un correu electrònic de renovació de contrasenya, que es mostra a continuació, però ha fallat l'enviament a {{GENDER:$2:l'usuari|la usuària}}: $1",
@@ -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}})",
@@ -1256,7 +1258,7 @@
 	"boteditletter": "b",
 	"unpatrolledletter": "!",
 	"number_of_watching_users_pageview": "[{{PLURAL:$1|Un usuari vigila|$1 usuaris vigilen}} aquesta pàgina]",
-	"rc_categories": "Limita a les categories (separades amb \"|\")",
+	"rc_categories": "Limita a les categories (separades amb «|»):",
 	"rc_categories_any": "Qualsevol de les triades",
 	"rc-change-size": "$1",
 	"rc-change-size-new": "$1 {{PLURAL:$1|byte|bytes}} després del canvi",
@@ -1370,6 +1372,7 @@
 	"upload-copy-upload-invalid-domain": "Les càrregues de còpia no són disponibles des d'aquest domini.",
 	"upload-dialog-title": "Carrega un fitxer",
 	"upload-dialog-error": "S’ha produït un error",
+	"upload-dialog-warning": "S'ha produït un avís",
 	"upload-dialog-button-cancel": "Cancel·la",
 	"upload-dialog-button-done": "Fet",
 	"upload-dialog-button-save": "Desa",
@@ -1765,7 +1768,6 @@
 	"emailuser": "Envia un missatge de correu electrònic a aquest usuari",
 	"emailuser-title-target": "Envia un missatge electrònic a {{GENDER:$1|aquest usuari|aquesta usuària}}",
 	"emailuser-title-notarget": "Enviar un correu electrònic a un usuari",
-	"emailpage": "Correu electrònic a usuari",
 	"emailpagetext": "Podeu usar el següent formulari per a enviar un missatge de correu electrònic a {{GENDER:$1|aquest usuari|aquesta usuària}}.\nL'adreça electrònica que vau indicar a [[Special:Preferences|les vostres preferències d'usuari]] apareixerà com a remitent del correu electrònic, de manera que el destinatari us podrà respondre directament.",
 	"defemailsubject": "Correu electrònic de l'usuari \"$1\" de {{SITENAME}}",
 	"usermaildisabled": "Correu electrònic d'usuaris deshabilitat",
@@ -1787,7 +1789,7 @@
 	"emailccsubject": "Còpia del vostre missatge a $1: $2",
 	"emailsent": "Correu electrònic enviat",
 	"emailsenttext": "S'ha enviat el vostre correu electrònic.",
-	"emailuserfooter": "Aquest missatge de correu electrònic l'ha enviat $1 a $2 amb la funció «{{int:emailpage}}» de {{SITENAME}}.",
+	"emailuserfooter": "Aquest missatge de correu electrònic l'ha enviat $1 a $2 amb la funció «{{int:emailuser}}» de {{SITENAME}}.",
 	"usermessage-summary": "Deixant missatges de sistema.",
 	"usermessage-editor": "Missatger del sistema",
 	"watchlist": "Llista de seguiment",
@@ -1873,6 +1875,7 @@
 	"rollback-success": "Edicions revertides de $1; s'ha canviat a la darrera versió de $2.",
 	"sessionfailure-title": "Error de sessió",
 	"sessionfailure": "S'ha produït un error amb la vostra sessió. S'ha anul·lat aquesta acció en prevenció de pirateig de sessió. Premeu «Torna», recarregueu la pàgina des d'on veniu i torneu-ho a intentar.",
+	"changecontentmodel": "Canvia el model de contingut d'una pàgina",
 	"changecontentmodel-legend": "Canvia el model de contingut",
 	"changecontentmodel-title-label": "Títol de la pàgina",
 	"changecontentmodel-model-label": "Nou model de contingut",
@@ -1883,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ó",
@@ -1945,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.",
@@ -2011,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",
@@ -2358,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",
@@ -3156,6 +3160,7 @@
 	"tags-edit-reason": "Motiu:",
 	"tags-edit-success": "S’han aplicat els canvis correctament.",
 	"tags-edit-failure": "No s’han pogut aplicar els canvis:\n$1",
+	"tags-edit-nooldid-title": "Revisió de l'objectiu no vàlida",
 	"tags-edit-none-selected": "Seleccioneu com a mínim una etiqueta per afegir o suprimir.",
 	"comparepages": "Comparar pàgines",
 	"compare-page1": "Pàgina 1",
@@ -3422,6 +3427,7 @@
 	"special-characters-title-endash": "guió curt",
 	"special-characters-title-emdash": "guió llarg",
 	"special-characters-title-minus": "signe menys",
+	"mw-widgets-dateinput-no-date": "No s'ha seleccionat cap data",
 	"mw-widgets-dateinput-placeholder-day": "AAAA-MM-DD",
 	"mw-widgets-dateinput-placeholder-month": "AAAA-MM",
 	"mw-widgets-titleinput-description-new-page": "la pàgina no existeix encara",
diff --git a/languages/i18n/ce.json b/languages/i18n/ce.json
index 3992509824..8350f129b2 100644
--- a/languages/i18n/ce.json
+++ b/languages/i18n/ce.json
@@ -192,8 +192,8 @@
 	"protectthispage": "Ларъе хӀара агӀо",
 	"unprotect": "ГӀароллех къаста",
 	"unprotectthispage": "ГӀароллех къаста",
-	"newpage": "Керла агӀо",
-	"talkpage": "Дийцаре йила хӀара агӀо",
+	"newpage": "Керла агӀонаш",
+	"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": "нисъе",
@@ -276,7 +276,7 @@
 	"viewdeleted": "Хьожий $1?",
 	"restorelink": "{{PLURAL:$1|1=$1 дӀадаьккхина нийсдар|$1 дӀадяхна нийсдарш}}",
 	"feedlinks": "Тайпанехь:",
-	"feed-invalid": "Тайпан нийсадоцу талол оцу куьгтаlорна.",
+	"feed-invalid": "Тайпан нийса доцу талол оцу куьгтаlорна.",
 	"feed-unavailable": "Хаитарца йолу асанаш тlекхочучехь яц",
 	"site-rss-feed": "$1 — RSS-аса",
 	"site-atom-feed": "$1 — Atom-аса",
@@ -341,7 +341,7 @@
 	"viewsource-title": "Агӏона $1 дуьххьарлера йозане хьажар",
 	"actionthrottled": "Сиххалин доза тохар",
 	"actionthrottledtext": "Спам цахилийта хӀара дешдерг кӀезиг хенахь дукху ца дайта дихкина ду. Дехар до массийта минот яьлча гӀорта.",
-	"protectedpagetext": "ХӀара агӀо дӀакъоьвлина ю тадарш ца дайта.",
+	"protectedpagetext": "ХӀара агӀо ларйина ю хийцамаш ца байта.",
 	"viewsourcetext": "Хьоьга далундерг хьажар а дезахь хlокху агlон чура йоза хьаэцар:",
 	"viewyourtext": "Хьан йиш ю '''хьой нисдинчу''' дӀадолалун йозе хьажа а, цуна копи ян а:",
 	"protectedinterface": "ХӀокху агӀона чохь интерфейсан программа латторан хаам бу. Зулам ца дайта цуна хийцам бан куьйгалхошна бен цало.\nХӀокху хааман гоч тӀетоха я хийца лелае локализацин сайт MediaWiki [//translatewiki.net/ translatewiki.net]",
@@ -512,7 +512,7 @@
 	"passwordreset-emailtitle": "{{SITENAME}}: декъашхочун дӀаяздарх лаьцна хаам",
 	"passwordreset-emailtext-ip": "{{SITENAME}} ($4) проектехь цхьам я ахьа хӀокху IP-адрес $1 тӀера хьа декъашхочун пароль кхоссар дехна,\nоьцу электронан адресца дихкина ду {{PLURAL:$3|1хӀара декъашхочун дӀаяздар|хӀара декъашхочун дӀаяздар}}:\n\n$2\n\n{{PLURAL:$3|ХӀара хана пароль|ХӀара хана паролаш}} лелар ю {{PLURAL:$5|$5 дийнахь}}.\nСистемин чугӀой харжа керла пароль. \nХьой пароль кхоссар дехна дацахь я хьалхалера пароль дага еънехь хӀума цадеш Ӏад битта хӀара хаам хьа йиш ю шира пароль лелаян.",
 	"passwordreset-emailtext-user": "{{SITENAME}} ($4) проектера декъашхочо $1 хьа декъашхочун пароль кхоссар дехна,\nоьцу электронан адресца дихкина ду {{PLURAL:$3|1хӀара декъашхочун дӀаяздар|хӀара декъашхочун дӀаяздар}}:\n\n$2\n\n{{PLURAL:$3|ХӀара хана пароль|ХӀара хана паролаш}} лелар ю {{PLURAL:$5|$5 дийнахь}}.\nСистемин чугӀой харжа керла пароль. \nХьой пароль кхоссар дехна дацахь я хьалхалера пароль дага еънехь хӀума цадеш Ӏад битта хӀара хаам хьа йиш ю шира пароль лелаян.",
-	"passwordreset-emailelement": "Декъашхочун цӀе: $1\nХанна йолу пароль: $2",
+	"passwordreset-emailelement": "Декъашхочун цӀе: \n$1\n\nХанна йолу пароль: \n$2",
 	"passwordreset-emailsent": "Электронан хаам баийтина кхоьссинчу паролах лаьцна хаам чохь болуш.",
 	"passwordreset-emailsent-capture": "Электронан хаам баийтина кхоьссинчу паролах лаьцна хаам чохь болуш. \nцуна йозане хьажа йиш ю лахахь.",
 	"passwordreset-emailerror-capture": "Пароль кхоссаран хаам чохь болуш электронан кехат кхоьллина, цуна йоза хьажа йиш ю лахахь, амма иза {{GENDER:$2|декъашхочунга}} дӀадахьийта тар цаделира бахьнехь: $1",
@@ -611,7 +611,7 @@
 	"storedversion": "Ӏалашйина верси",
 	"editingold": "'''ДӀахьедар. Ахьа таеш ю хӀокху агӀона шира елла верси.'''\nАгӀо Ӏалаш йинчул тӀехьа хьалхо бина хийцамаш дӀабяра бу.",
 	"yourdiff": "Башхаллаш",
-	"copyrightwarning": "Тергаме хьажа, массо яззаман чутухуш долу йозан хийцам хьажарехь бу, арахоьцушсанна оцу лицензи хьоляхь $2 (хьаж. $1).\nНагахь хьо лууш вацахь хьай йозанаш маьрша даржа а кхечаьрга хийцам байта, мадаха уьш кху чу.<br />\nИшта чӀагӀо йой ахьа, айхьа далош долучуьн хьо куьг да ву аьлла, я хьаэцна цхьан\nхьостера, хийцам ба а дӀаса даржада а чулацам болуш.<br />\n'''МАТОХИЙШ БАКЪО ЙОЦУ ГӀИРСАШ КХУ ЧУ, КУЬГ ДЕ БАКЪО ЛАР ЙЕШ ЙОЛУ!'''",
+	"copyrightwarning": "Тергаме хьажа, массо яззаман чутухуш долу йозан хийцам хьажарехь бу, арахоьцуш санна оцу лицензи хьолехь.\nНагахь хьо лууш вацахь хьайн йозанаш маьрша даржа а кхечаьрга хийцам байта, мадаха уьш кху чу.<br />\nИштта чӀагӀо йой ахьа, айхьа далош долучуьнна хьо куьг да ву аьлла, я хьаэцна цхьан\nхьостера, хийцам ба а дӀаса даржада а чулацам болуш.<br />\n'''МА-КХИССА БАКЪО ЙОЦУ ГӀИРСАШ КХУ ЧУ, КУЬЙГАЛХОЧУЬННА БАКЪО ЛАРЪЕШ ЙОЛУ!'''",
 	"readonlywarning": "'''ДӀАХЬЕДО. ГӀирса бух блоктоьхна оьшуш долучу хьаштан, цундера хӀинц хьоьга дӀа ца йазло хийцам.\nХила мега, ахьа Ӏалаш дан дезаш хьайн йоза, юха тӀаьхьо леладан иза йоза.'''\n\nКуьйгалхочо блоктоьхна гӀирса бух, цо битина кхетош хӀара хаам: $1",
 	"protectedpagewarning": "'''ДӀахьедар. ХӀара агӀо ларйина ю хийцам цабайта, иза хийца я нисъян а бакъо йолуш куьйгалла лелош болу декъашхой бе бац.'''\nЛахахьа гойту хаамаш тӀаьххьара бина болу хийцамна тептар чура:",
 	"semiprotectedpagewarning": "'''ДӀахьедо.''' ХӀара агӀо ларйина ю; дӀабазбиначу декъашхошка бе цӀе хийцалуш яц.\nЛахахьа тептаро балийна тӀаьххьаралера дӀаязбина хаам:",
@@ -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,11 +1089,11 @@
 	"enhancedrc-history": "истори",
 	"recentchanges": "Керла нисдарш",
 	"recentchanges-legend": "Керлачу хийцамийн нисдарш",
-	"recentchanges-summary": "Лахахь гайтина хене хьаьжжина Википедин агӀонашкахь тӀаьхьара бина хийцамаш",
+	"recentchanges-summary": "Лахахь гайтина хене хьаьжжина Википедин агӀонашкахь тӀаьххьара бина хийцамаш",
 	"recentchanges-noresult": "Билгал йинчу хенахь цхьа хийцамаш бина бац.",
 	"recentchanges-feed-description": "Тергам бе тӀаьххьара вики хийцаман хӀокху ларца.",
 	"recentchanges-label-newpage": "Оцу нисдарца кхоьллина керла агӀо.",
-	"recentchanges-label-minor": "Хlара нисдинарг къастийна жимо долушсан",
+	"recentchanges-label-minor": "ХӀара пайда боцу хийцам бу",
 	"recentchanges-label-bot": "ХӀара нисдар бото дина",
 	"recentchanges-label-unpatrolled": "ХӀара нисдар хӀинца цхьано патрулировать дина дац",
 	"recentchanges-label-plusminus": "байташкахь барам хийцар",
@@ -1370,10 +1370,10 @@
 	"pageswithprop-prophidden-binary": "шалха маьӀна долу хӀума хьулйина ($1)",
 	"doubleredirects": "Шалха дIасахьажийнарш",
 	"doubleredirectstext": "ХӀокху агӀонехь ю дӀасахьажорашан тӀе хьажийна йолу дӀасахьажораш.\n<del>ТӀехула сиз хаькхна </del>нисйина чарна.",
-	"double-redirect-fixed-move": "АгӀон [[$1]] цӀе хийцина, хӀинца иза дӀахьажийна оцу [[$2]]",
+	"double-redirect-fixed-move": "[[$1]] агӀонан цӀе хийцина.\nХӀинца иза авто-карлаяьккхина а [[$2]] агӀона тӀехьажийна.",
 	"double-redirect-fixed-maintenance": "Шалха дӀасахьажинарг нисъяр [[$1]] → [[$2]].",
 	"double-redirect-fixer": "ДӀасахьажинарш нисерг",
-	"brokenredirects": "ДIахаьдна долу дIасахьажораш",
+	"brokenredirects": "ДIадаьхна долу дIасахьажораш",
 	"brokenredirectstext": "Лахара дӀасахьажийнарш ю йоцучу агӀонийн тӀе хьажийна:",
 	"brokenredirects-edit": "нисъе",
 	"brokenredirects-delete": "дӀаяккха",
@@ -1464,7 +1464,7 @@
 	"speciallogtitlelabel": "Ӏалашо (цӀе я декъашхо):",
 	"log": "Тéптарш",
 	"all-logs-page": "Дерриге тӀекхочучехь долу тептарш",
-	"alllogstext": "Массо тéптар могӀам. {{SITENAME}}.\nШуьга харжалур бу хилам оцу тептаре хьаьжжина, декъашхочун цӀе (дӀаяздар диц а цадеш) я цо хьейина агӀонаш (ишта дӀаяздар а диц цадеш).",
+	"alllogstext": "Массо юкъара журлийн могӀам. {{SITENAME}}.\nШуьга харжалур бу хилам оцу тептаре хьаьжжина, декъашхочун цӀе (дӀаяздар диц а цадеш) я цо хьейина агӀонаш (ишта дӀаяздар а диц цадеш).",
 	"logempty": "Тептарш чохь хӀокху агӀона дӀаяздарш дац.",
 	"log-title-wildcard": "ХӀокху символашца болалуш болу кортанаш карабе",
 	"showhideselectedlogentries": "Гайта/къайлаяха хаьржина башхонаш",
@@ -1534,7 +1534,6 @@
 	"emailuser": "Декъашхочун хааман кехат",
 	"emailuser-title-target": "{{GENDER:$1|декъашхочунга}} электронан хаам базбар",
 	"emailuser-title-notarget": "Декъашхочунга кехат яздар",
-	"emailpage": "Декъашхочунга кехат яздар",
 	"emailpagetext": "ХӀокху агӀона гӀоьнца йиш ю {{GENDER:$1|декъашхочун}} электронан почте хаам бахьийта.\nХьоьга жоп лур ду ахьа [[Special:Preferences|хьайн гӀирса чу]] дӀаяздина долу адрес тӀе.",
 	"defemailsubject": "Хаам {{grammar:genitive|{{SITENAME}}}} чура бу",
 	"usermaildisabled": "Декъашхочун электронан пошт дӀаяйина ю",
@@ -1570,7 +1569,7 @@
 	"watchthispage": "Тергам бé хӀокху агӀона",
 	"unwatch": "Тергамах къаста",
 	"unwatchthispage": "ДӀадаккха терго яр",
-	"notanarticle": "Бац яззам",
+	"notanarticle": "Яззам бац",
 	"notvisiblerev": "Верси дӀаяьккхина хила",
 	"watchlist-details": "Хьан тергаме могӀанца $1 {{PLURAL:$1|агӀо}} ю, дийцаре агӀонаш йоцуш.",
 	"wlheader-enotif": "Электронан почте хаамаш байтар латина ду.",
@@ -1638,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»",
@@ -1664,7 +1663,7 @@
 	"protect-expiring": "чакхйолу $1 (UTC)",
 	"protect-expiring-local": "чекхйолу $1",
 	"protect-expiry-indefinite": "хан чаккхе йоцуш",
-	"protect-cascade": "Ларъе агӀонаш, хӀокху агӀонца хӀоттайелларш (чахчарé ларяър)",
+	"protect-cascade": "АгӀонаш ларъяр, хӀокху агӀонца хӀоттайелларш (чахчарé ларъяр)",
 	"protect-cantedit": "Хьéга хийцам цабало хӀокху агӀон гlаролли локхалан, хӀуд аьлча хьан бакъо яц оцунна тадар дан.",
 	"protect-othertime": "Кхин хан:",
 	"protect-othertime-op": "кхин хан",
@@ -1672,7 +1671,7 @@
 	"protect-existing-expiry-infinity": "Карара чекхйолу хан: чаккхе йоцу",
 	"protect-otherreason": "Кхин бахьана/тӀетохар:",
 	"protect-otherreason-op": "Кхин бахьана",
-	"protect-dropdown": "* Лаъръяран баьхьаш \n** сих-сиха зулам дар \n** дуккха спам хилар\n** нисдарийн тӀом \n** гӀараялл агӀо",
+	"protect-dropdown": "* Лаъръяран бахьанаш \n** сих-сиха зулам дар \n** дуккха спам хилар\n** нисдарийн тӀом \n** гӀараяьлла агӀо",
 	"protect-edit-reasonlist": "Бахьанин могӀам нисбар",
 	"protect-expiry-options": "1 сахьт:1 hour,1 де:1 day,1 кӀиран:1 week,2 кӀиран:2 weeks,1 бутт:1 month,3 бутт:3 months,6 бутт:6 months,1 шо:1 year,цlкъа:infinite",
 	"restriction-type": "Бакъонаш:",
@@ -1993,7 +1992,7 @@
 	"tooltip-ca-talk": "Дийцаре агlон чулацам",
 	"tooltip-ca-edit": "Тае хӀара агӀо",
 	"tooltip-ca-addsection": "Кхолла керла дакъа",
-	"tooltip-ca-viewsource": "Хlара агlо хийцам цабайта гароллехь ю, хьоьга далундерг хьажар а дезахь чура йоза хьаэцар",
+	"tooltip-ca-viewsource": "ХӀара агӀо ларъеш ю, хийцамаш ца-байта, амма хьо хьажа а, копи яккхан а мегар ду",
 	"tooltip-ca-history": "ХӀокху агӀона хийцамаш болу тептар",
 	"tooltip-ca-protect": "Ларъе агӀо хийцамаш цабайта",
 	"tooltip-ca-unprotect": "Дlадаккха хlокху агlонна долу гаролла",
@@ -2013,7 +2012,7 @@
 	"tooltip-n-randompage": "Хьажа цахууш нисйеллачу агlоне",
 	"tooltip-n-help": "ГӀоде меттиг",
 	"tooltip-t-whatlinkshere": "Массо агӀон могӀам, хӀокху агӀонтӀе хьажийна йолу",
-	"tooltip-t-recentchangeslinked": "Тlаьхьарлера хийцамаш хlокху агlонашкахь, мичхьа хьажийна хlара агlо",
+	"tooltip-t-recentchangeslinked": "ТӀаьххьарлера хийцамаш хӀокху агӀонашкахь, хьажийна хӀара агӀо болу",
 	"tooltip-feed-rss": "ХӀокху агӀона трансляци RSS-рца",
 	"tooltip-feed-atom": "Хьагайтар оцу Atom цани хlокху агlон",
 	"tooltip-t-contributions": "ХӀокху декъашхочо хийцина йолу агӀонийн могӀам",
@@ -2441,7 +2440,7 @@
 	"autosumm-blank": "Агӏон чулацам дӏабяккхина",
 	"autosumm-replace": "АгӀона чуьраниг хийцина → «$1»",
 	"autoredircomment": "[[$1]] тӀе хьажийна",
-	"autosumm-new": "Керла агlо: «$1»",
+	"autosumm-new": "Керла агӀо: «$1»",
 	"autosumm-newblank": "Кхоьллина еса агӀо",
 	"lag-warn-normal": "{{PLURAL:$1|$1 Секунд}} хьалха бина хийцамаш хӀокху могӀамехь гуш ца хилла мега.",
 	"lag-warn-high": "Сервераш синхронизаци еш тӀехьайисарна, {{PLURAL:$1|$1 секунд}} хьалха бина хийцамаш хӀокху могӀамехь гуш ца хилла мега.",
@@ -2655,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 bc238c4b92..9d220dc28c 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: سیاسەت",
@@ -487,7 +488,7 @@
 	"passwordreset-emailtitle": "وردەکارییەکانی ھەژمار لە {{SITENAME}}",
 	"passwordreset-emailtext-ip": "‫کەسێک (لەوانەیە خۆت، بە ناونیشانی ئایپیی $1) داوای ڕیسێتکردنەوەی تێپەڕوشەکەت لە {{SITENAME}}دا ($4) کردووە. {{PLURAL:$3|ھەژماری بەکارھێنەریی ژێرەوە پەیوەندیی ھەیە|ھەژمارە بەکارھێنەرییەکانی ژێرەوە پەیوەندییان ھەیە}} بەم ناونیشانەی ئیمەیلەوە:\n\n$2\n\n{{PLURAL:$3|ئەم تێپەڕوشە کاتییە|ئەم تێپەڕوشە کاتییانە}} لە {{PLURAL:$5|ڕۆژێک|$5 ڕۆژ}}دا بەسەردەچێت.\nدەبێ بچیتە ژوورەوە و ھەر ئێستا تێپەڕوشەیەکی نوێ ھەڵبژێریت. ئەگەر کەسێکی تر ئەم داواکارییەی کردووە،\nیان ئەگەر تێپەڕوشە سەرەتاییەکەت ھاتووەتەوە بیرت و ئیتر ناتەوێ بیگۆڕی، دەتوانی گوێ بەم پەیامە نەدەیت و ھەر لە تێپەڕوشە کۆنەکەت کەڵک وەربگریت.",
 	"passwordreset-emailtext-user": "‫بەکارھێنەر $1 لە {{SITENAME}} ڕیسێتکردنەوەی تێپەڕوشەکەت لە {{SITENAME}}دا ($4) کردووە. {{PLURAL:$3|ھەژماری بەکارھێنەریی ژێرەوە پەیوەندیی ھەیە|ھەژمارە بەکارھێنەرییەکانی ژێرەوە پەیوەندییان ھەیە}} بەم ناونیشانەی ئیمەیلەوە:\n\n$2\n\n{{PLURAL:$3|ئەم تێپەڕوشە کاتییە|ئەم تێپەڕوشە کاتییانە}} لە {{PLURAL:$5|ڕۆژێک|$5 ڕۆژ}}دا بەسەردەچێت.\nدەبێ بچیتە ژوورەوە و ھەر ئێستا تێپەڕوشەیەکی نوێ ھەڵبژێریت. ئەگەر کەسێکی تر ئەم داواکارییەی کردووە، یان ئەگەر تێپەڕوشە سەرەتاییەکەت ھاتووەتەوە بیرت و ئیتر ناتەوێ بیگۆڕی، \nدەتوانی گوێ بەم پەیامە نەدەیت و ھەر لە تێپەڕوشە کۆنەکەت کەڵک وەربگریت.",
-	"passwordreset-emailelement": "ناوی بەکارھێنەری: $1\nتێپەڕوشەی کاتی: $2",
+	"passwordreset-emailelement": "ناوی بەکارھێنەری: \n$1\n\nتێپەڕوشەی کاتی: \n$2",
 	"passwordreset-emailsent": "ئیمەیلێکی ڕیسێتکردنەوەی تێپەڕوشە نێردرا.",
 	"passwordreset-emailsent-capture": "ئیمەیلێکی ڕیسێتکردنەوەی تێپەڕوشە نێردرا، کە لە ژێرەوە نیشان دراوە.",
 	"passwordreset-emailerror-capture": "ئیمەیلێکی ڕیسێتکردنەوەی تێپەڕوشە نێردرا، کە لە ژێرەوە نیشان دراوە، بەڵام ناردنەکەی بۆ {{GENDER:$2|بەکارھێنەر}} سەرکەوتوو نەبوو: $1",
@@ -1098,7 +1099,7 @@
 	"hide": "بشارەوە",
 	"show": "نیشان بدە",
 	"minoreditletter": "ب",
-	"newpageletter": "نوێ",
+	"newpageletter": "ن",
 	"boteditletter": "بۆت",
 	"number_of_watching_users_pageview": "[$1 {{PLURAL:$1|بەکارھێنەر}}ی چاودێر]",
 	"rc_categories": "بەرتەسک‌کردنەوە بە هاوپۆلەکان (به «|» جیای بکەوە‌)",
@@ -1479,7 +1480,6 @@
 	"emailuser": "ئیمەیل بنێرە بۆ ئەم بەکارھێنەرە",
 	"emailuser-title-target": "ئیمەیلی ئەم {{GENDER:$1|بەکارھێنەر}}ە",
 	"emailuser-title-notarget": "ئیمەیل بۆ بەکارھێنەر",
-	"emailpage": "ئیمەیل بۆ بەکارھێنەر",
 	"emailpagetext": "دەتوانی لەم فۆرمەی ژێرەوە بۆ ناردنی ئیمەیلێک بۆ ئەم {{GENDER:$1|بەکارھێنەر}}ە کەڵک وەربگریت.\nئەو ناونیشانە ئیمەیلە لە [[Special:Preferences|ھەڵبژاردەکانی بەکارھێنەر‌یتدا]] نووسیوتە، لە ناونیشانی «لەلایەن»ی (From) ئیمەیلەکەدا نیشان دەدرێت، کە وایە بەکارھێنەری وەرگر دەتوانێ ڕاستەوخۆ وەڵامت بداتەوە.",
 	"defemailsubject": "ئیمەیلی {{SITENAME}} لە بەکارھێنەر «$1»ەوە",
 	"usermaildisabled": "ئیمەیڵی بەکارهێنەر لەکاردانیە",
@@ -1695,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/crh-cyrl.json b/languages/i18n/crh-cyrl.json
index deae1057c4..29d0707138 100644
--- a/languages/i18n/crh-cyrl.json
+++ b/languages/i18n/crh-cyrl.json
@@ -1008,7 +1008,6 @@
 	"mailnologin": "Мектюп ёлланаджакъ адреси ёкътыр",
 	"mailnologintext": "Дигер къулланыджыларгъа электрон мектюплер ёллап олмакъ ичюн [[Special:UserLogin|отурым ачмалысынъыз]] ве [[Special:Preferences|сазламаларынъызда]] мевджут олгъан e-mail адресининъ саиби олмалысынъыз.",
 	"emailuser": "Къулланыджыгъа мектюп",
-	"emailpage": "Къулланыджыгъа электрон мектюп ёлла",
 	"emailpagetext": "Ашагъыдаки форманы толдурып бу къулланыджыгъа мектюп ёллап олурсынъыз.\n[[Special:Preferences|Озь сазламаларынъызда]] язгъан электрон адресинъиз мектюпнинъ «Кимден» сатырында языладжакъ, бунынъ ичюн мектюп алыджы догърудан-догъру сизинъ адресинъизге джевап ёллап олур.",
 	"defemailsubject": "{{SITENAME}} e-mail",
 	"noemailtitle": "E-mail адреси ёкътыр",
diff --git a/languages/i18n/crh-latn.json b/languages/i18n/crh-latn.json
index a102c178f6..2cccdc1790 100644
--- a/languages/i18n/crh-latn.json
+++ b/languages/i18n/crh-latn.json
@@ -1008,7 +1008,6 @@
 	"mailnologin": "Mektüp yollanacaq adresi yoqtır",
 	"mailnologintext": "Diger qullanıcılarğa elektron mektüpler yollap olmaq içün [[Special:UserLogin|oturım açmalısıñız]] ve [[Special:Preferences|sazlamalarıñızda]] mevcut olğan e-mail adresiniñ saibi olmalısıñız.",
 	"emailuser": "Qullanıcığa mektüp",
-	"emailpage": "Qullanıcığa elektron mektüp yolla",
 	"emailpagetext": "Aşağıdaki formanı toldurıp bu qullanıcığa mektüp yollap olursıñız.\n[[Special:Preferences|Öz sazlamalarıñızda]] yazğan elektron adresiñiz mektüpniñ \"Kimden\" satırında yazılacaq, bunıñ içün mektüp alıcı doğrudan-doğru siziñ adresiñizge cevap yollap olur.",
 	"defemailsubject": "{{SITENAME}} e-mail",
 	"noemailtitle": "E-mail adresi yoqtır",
diff --git a/languages/i18n/cs.json b/languages/i18n/cs.json
index e37172fe02..aee7150404 100644
--- a/languages/i18n/cs.json
+++ b/languages/i18n/cs.json
@@ -34,7 +34,6 @@
 	"tog-hideminor": "Skrýt malé editace v posledních změnách",
 	"tog-hidepatrolled": "Skrýt patrolované editace v posledních změnách",
 	"tog-newpageshidepatrolled": "Skrýt patrolované stránky v seznamu nových stránek",
-	"tog-hidecategorization": "Skrýt kategorizaci stránek",
 	"tog-extendwatchlist": "Na seznamu sledovaných stránek zobrazovat všechny změny, ne jen tu poslední",
 	"tog-usenewrc": "V posledních změnách a sledovaných stránkách seskupovat změny podle stránek",
 	"tog-numberheadings": "Automaticky číslovat nadpisy",
@@ -64,7 +63,6 @@
 	"tog-watchlisthideliu": "Na seznamu sledovaných stránek skrýt editace přihlášených uživatelů",
 	"tog-watchlisthideanons": "Na seznamu sledovaných stránek skrýt editace nepřihlášených uživatelů",
 	"tog-watchlisthidepatrolled": "Skrýt patrolované editace ve sledovaných stránkách",
-	"tog-watchlisthidecategorization": "Skrýt kategorizaci stránek",
 	"tog-ccmeonemails": "Zasílat mi kopie e-mailů, které pošlu jiným uživatelům",
 	"tog-diffonly": "Nezobrazovat obsah stránky pod rozdílem verzí",
 	"tog-showhiddencats": "Zobrazit skryté kategorie",
@@ -450,6 +448,7 @@
 	"createacct-benefit-body2": "{{PLURAL:$1|stránka|stránky|stránek}}",
 	"createacct-benefit-body3": "{{PLURAL:$1|nedávný přispěvatel|nedávní přispěvatelé|nedávných přispěvatelů}}",
 	"badretype": "Vámi napsaná hesla nesouhlasí.",
+	"usernameinprogress": "Vytváření účtu tohoto uživatele již probíhá. Čekejte prosím.",
 	"userexists": "Zadané uživatelské jméno se již používá.\nZvolte si prosím jiné jméno.",
 	"loginerror": "Chyba při přihlašování",
 	"createacct-error": "Chyba při zakládání účtu",
@@ -540,7 +539,7 @@
 	"passwordreset-emailtitle": "Informace k účtu na {{grammar:6sg|{{SITENAME}}}}",
 	"passwordreset-emailtext-ip": "Někdo (patrně vy, z IP adresy $1) zažádal na {{grammar:6sg|{{SITENAME}}}} ($4) o nastavení nového hesla k vašemu účtu. K této adrese {{PLURAL:$3|je přiřazen následující účet|jsou přiřazeny následující účty}}:\n\n$2\n\n{{PLURAL:$3|Toto dočasné heslo|Tato dočasná hesla}} vyprší za {{PLURAL:$5|jeden den|$5 dny|$5 dnů}}.\nNyní byste se měli přihlásit a zvolit si nové heslo. Pokud tento požadavek poslal někdo jiný nebo jste si na své staré heslo vzpomněli, a nechcete ho tedy změnit, můžete tuto zprávu ignorovat a nadále používat původní heslo.",
 	"passwordreset-emailtext-user": "{{gender:$1|Uživatel|Uživatelka}} $1 na {{grammar:6sg|{{SITENAME}}}} {{gender:$1|zažádal|zažádala}} na {{grammar:6sg|{{SITENAME}}}} ($4) o nastavení nového hesla k vašemu\núčtu. K této adrese {{PLURAL:$3|je přiřazen následující účet|jsou přiřazeny následující účty}}:\n\n$2\n\n{{PLURAL:$3|Toto dočasné heslo|Tato dočasná hesla}} vyprší {{PLURAL:$5|za jeden den|za $5 dny|za $5 dnů}}.\nNyní byste se měl(a) přihlásit a zvolit si nové heslo. Pokud tento požadavek\nposlal někdo jiný nebo jste si na své staré heslo vzpomněl(a), a nechcete ho\ntedy změnit, můžete tuto zprávu ignorovat a nadále používat původní heslo.",
-	"passwordreset-emailelement": "Uživatelské jméno: $1\nDočasné heslo: $2",
+	"passwordreset-emailelement": "Uživatelské jméno: \n$1\n\nDočasné heslo: \n$2",
 	"passwordreset-emailsent": "E-mail pro získání nového hesla byl odeslán.",
 	"passwordreset-emailsent-capture": "Byl odeslán e-mail pro získání nového hesla, který je zobrazen níže.",
 	"passwordreset-emailerror-capture": "Byl vygenerován e-mail pro získání nového hesla, který je zobrazen níže, ale {{GENDER:$2|uživateli|uživatelce}} se ho nepodařilo odeslat: $1",
@@ -939,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í}}",
@@ -1214,9 +1214,6 @@
 	"rcshowhidemine": "$1 moje editace",
 	"rcshowhidemine-show": "Zobrazit",
 	"rcshowhidemine-hide": "Skrýt",
-	"rcshowhidecategorization": "$1 kategorizaci stránek",
-	"rcshowhidecategorization-show": "Zobrazit",
-	"rcshowhidecategorization-hide": "Skrýt",
 	"rclinks": "Ukázat $1 posledních změn během posledních $2 dnů<br />\n$3",
 	"diff": "rozdíl",
 	"hist": "historie",
@@ -1240,10 +1237,6 @@
 	"recentchangeslinked-summary": "Níže je seznam nedávných změn stránek odkazovaných ze zadané stránky (nebo patřících do dané kategorie). Vaše [[Special:Watchlist|sledované stránky]] jsou '''zvýrazněny'''.",
 	"recentchangeslinked-page": "Název stránky:",
 	"recentchangeslinked-to": "Zobrazit změny na stránkách odkazujících na zadanou stránku",
-	"recentchanges-page-added-to-category": "Stránka [[:$1]] zařazena do kategorie",
-	"recentchanges-page-added-to-category-bundled": "Stránka [[:$1]] a {{PLURAL:$2|jedna další zařazeny|$2 další zařazeny|$2 dalších zařazeno}} do kategorie",
-	"recentchanges-page-removed-from-category": "Stránka [[:$1]] vyřazena z kategorie",
-	"recentchanges-page-removed-from-category-bundled": "Stránka [[:$1]] a {{PLURAL:$2|jedna další vyřazeny|$2 další vyřazeny|$2 dalších vyřazeno}} z kategorie",
 	"upload": "Načíst soubor",
 	"uploadbtn": "Načíst soubor",
 	"reuploaddesc": "Zrušit načítání a vrátit se do formuláře.",
@@ -1356,10 +1349,16 @@
 	"upload-copy-upload-invalid-domain": "Načítání kopírováním není dostupné z této domény.",
 	"upload-dialog-title": "Načtení souboru",
 	"upload-dialog-error": "Došlo k chybě",
+	"upload-dialog-warning": "Objevilo se upozornění",
 	"upload-dialog-button-cancel": "Storno",
 	"upload-dialog-button-done": "Hotovo",
 	"upload-dialog-button-save": "Uložit",
 	"upload-dialog-button-upload": "Načíst",
+	"upload-dialog-label-select-file": "Výběr souboru",
+	"upload-dialog-label-infoform-title": "Podrobnosti",
+	"upload-dialog-label-infoform-name": "Název",
+	"upload-dialog-label-infoform-description": "Popis",
+	"upload-dialog-label-usage-title": "Použití",
 	"upload-dialog-label-usage-filename": "Jméno souboru",
 	"backend-fail-stream": "Soubor $1 nelze streamovat.",
 	"backend-fail-backup": "Soubor $1 nelze zazálohovat.",
@@ -1658,7 +1657,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).",
@@ -1744,7 +1743,6 @@
 	"emailuser": "Poslat e-mail",
 	"emailuser-title-target": "Poslat e-mail {{GENDER:$1|tomuto uživateli|této uživatelce}}",
 	"emailuser-title-notarget": "Poslat e-mail uživateli",
-	"emailpage": "Poslat e-mail",
 	"emailpagetext": "Pomocí níže zobrazeného formuláře můžete {{GENDER:$1|tomuto uživateli|této uživatelce}} poslat zprávu e-mailem.\nE-mailová adresa, kterou máte uvedenu v [[Special:Preferences|nastavení]], se objeví jako adresa odesílatele pošty, aby vám adresát mohl odpovědět přímo.",
 	"defemailsubject": "E-mail z {{grammar:2sg|{{SITENAME}}}} od {{gender:$1|uživatele|uživatelky|uživatele}} „$1“",
 	"usermaildisabled": "Posílání e-mailů je vypnuto",
@@ -1766,7 +1764,7 @@
 	"emailccsubject": "Kopie Vaší zprávy pro uživatele $1: $2",
 	"emailsent": "E-mail odeslán",
 	"emailsenttext": "Váš e-mail byl odeslán.",
-	"emailuserfooter": "Tento e-mail byl odeslán z {{grammar:2sg|{{SITENAME}}}} pomocí funkce „{{int:emailpage}}“; {{GENDER:$1|odeslal ho uživatel|odeslala ho uživatelka}} $1 {{GENDER:$2|uživateli|uživatelce}} $2.",
+	"emailuserfooter": "Tento e-mail byl odeslán z {{grammar:2sg|{{SITENAME}}}} pomocí funkce „{{int:emailuser}}“; {{GENDER:$1|odeslal ho uživatel|odeslala ho uživatelka}} $1 {{GENDER:$2|uživateli|uživatelce}} $2.",
 	"usermessage-summary": "Doručena zpráva od systému.",
 	"usermessage-editor": "Systémový poslíček",
 	"watchlist": "Sledované stránky",
@@ -3250,6 +3248,7 @@
 	"logentry-newusers-create2": "$1 {{GENDER:$2|založil|založila}} uživatelský účet $3",
 	"logentry-newusers-byemail": "$1 {{GENDER:$2|založil|založila}} uživatelský účet $3, heslo bylo posláno e-mailem",
 	"logentry-newusers-autocreate": "Automaticky byl {{GENDER:$2|založen}} účet $1",
+	"logentry-protect-move_prot": "$1 {{GENDER:$2|přesunul|přesunula}} nastavení zámků ze stránky $4 na stránku $3",
 	"logentry-rights-rights": "$1 {{GENDER:$2|změnil|změnila}} členství $3 ve skupinách z $4 na $5",
 	"logentry-rights-rights-legacy": "$1 {{GENDER:$2|změnil|změnila}} členství $3 ve skupinách",
 	"logentry-rights-autopromote": "$1 {{GENDER:$2|byl automaticky povýšen|byla automaticky povýšena}} z $4 na $5",
diff --git a/languages/i18n/cv.json b/languages/i18n/cv.json
index c57b00d8b4..dba2662716 100644
--- a/languages/i18n/cv.json
+++ b/languages/i18n/cv.json
@@ -105,9 +105,9 @@
 	"category-subcat-count": "{{PLURAL:$2|Ку категоринче çак айри категори пур.|$2-ран(-рен,-тан,-тен) {{PLURAL:$1|$1 айри категорине кăтартнă|$1 айри категорине кăтартнă|$1 айри категорине кăтартнă}}.}}",
 	"category-subcat-count-limited": "Ку категоринче {{PLURAL:$1|$1 айри категори|$1 айри категори|$1 айри категори}}.",
 	"category-article-count": "{{PLURAL:$2|1=Ку категоринче пĕр страница кăна.|Ку категорири $2 страницăран $1 кăтартнă.}}",
-	"category-article-count-limited": "Ку категоринче $1 страница.",
+	"category-article-count-limited": "Ку категоринче {{PLURAL:$1|страница|$1 страницăсем}}.",
 	"category-file-count": "{{PLURAL:$2|1=Ку категоринче пĕр файл кăна.|Ку категоринчи $2 файлтан $1 кăтартнă.}}",
-	"category-file-count-limited": "Ку категоринче $1 файл.",
+	"category-file-count-limited": "Ку категоринче {{PLURAL:$1|файл|$1 файлсем}}.",
 	"listingcontinuesabbrev": "(малалли)",
 	"about": "Ăнлантарни",
 	"article": "Статья",
@@ -217,7 +217,7 @@
 	"hidetoc": "кӑтартмалла мар",
 	"thisisdeleted": "$1 пăхса каялла тавăрмалла-и?",
 	"viewdeleted": "$1 пăхар-и?",
-	"restorelink": "$1 кăларса пăрахнă тӳрлетĕве",
+	"restorelink": "{{PLURAL:$1|кăларса пăрахнă тӳрлетнине|$1 кăларса пăрахнă тӳрлетнисене}}",
 	"feedlinks": "Çапла кур:",
 	"feed-invalid": "Çырăнмашкăн ку канал тĕсĕ каймасть.",
 	"feed-unavailable": "{{SITENAME}} сайтри синдикаци хăйăвĕсем тупăнмарĕç",
@@ -261,7 +261,7 @@
 	"unexpected": "Тĕрĕс мар пĕлтерĕш: «$1»=«$2».",
 	"formerror": "Йăнăш: формăри даннăйсене леçме май çук",
 	"badarticleerror": "Çак страницăра эсир ку ĕçĕ тăваймастăр.",
-	"cannotdelete": "Эсир кăтартнă страницăна е файла кăларса пăрахаймастпăр. Ăна, тен, урăххи кăларса пăрахнă?",
+	"cannotdelete": "Эсир кăтартнă страницăна е файла \"$1\" кăларса пăрахаймастпăр.\nĂна, тен, урăххи кăларса пăрахнă.",
 	"badtitle": "Ку ят килĕшмест",
 	"badtitletext": "Эсир кăтартнă статья ячĕ тĕрĕс мар, пушă, е чĕлхе хушшинчипе интервики ячĕ тĕрĕс мар. Ятра усă курма юраман паллăсене çырнинче пулма пултарать.",
 	"perfcached": "Ку даннăйсене кэшран илнĕ, çавна май унта юлашки улшăнусем палăрмасăр пултараççĕ. A maximum of {{PLURAL:$1|1=one result is|$1 results are}} available in the cache.",
@@ -323,7 +323,7 @@
 	"blocked-mailpassword": "Ку IP-адреслисене статьясене тӳрлетме чарнă. Вăрттăн сăмаха аса илмелли функципе те усă кураймăр.",
 	"mailerror": "Çыру яраймарăмăр, йăнăш тухрĕ: $1",
 	"acct_creation_throttle_hit": "Сирĕн $1 хутшăнакан пур ĕнтĕ, урăх кĕртейместĕр.",
-	"emailauthenticated": "Сирĕн электронлă адреса çирĕплетнĕ $1.",
+	"emailauthenticated": "Сирĕн электронлă адреса çирĕплетнĕ $2 $3.",
 	"emailconfirmlink": "Хăвăр эл. почтăн адресне çирĕплетĕр",
 	"accountcreated": "Сире хутшăнакансем шутне кĕртрĕмĕр",
 	"accountcreatedtext": "Хутшăнакансем шутне $1 ятлă çĕнĕ хутшăнакана кĕртрĕмĕр.",
@@ -382,7 +382,7 @@
 	"accmailtitle": "Пароле леçрĕмĕр.",
 	"accmailtext": "$1 вăрттăн сăмахне кунта леçрĕмĕр: $2.",
 	"newarticle": "(Çĕнни)",
-	"newarticletext": "Ссылка урлă эсир халлĕхе çук статья çине куçрăр.\nÇĕнĕ статьяна кĕртес тесен аяларах вырнаçнă чӳречере текста çырăр.\n(тĕплĕнрех пĕлес тесен [[Help:Пулăшу|пулăшу страниципе] паллашăр).\nЕнчен те эсир кунта йăнăшпа лекнĕ пулсан — сирĕн браузерăн «Каялла» кнопка çине пусăр.",
+	"newarticletext": "Ссылка урлă эсир халлĕхе çук статья çине куçрăр.\nÇĕнĕ статьяна кĕртес тесен аяларах вырнаçнă чӳречере текста çырăр.\n(тĕплĕнрех пĕлес тесен [$1 пулăшу страниципе] паллашăр).\nЕнчен те эсир кунта йăнăшпа лекнĕ пулсан — сирĕн браузерăн <strong>Каялла</strong> кнопка çине пусăр.",
 	"usercsspreview": "'''Ан манăр, эсир сирĕн css файл епле пулассине çеç куратăр, ăна халлĕхе çырса хуман!'''",
 	"userjspreview": "'''Астăвăр, ку сирĕн javascript-файлăн малтанхи курăмĕ кăна, ăна хальлĕхе çырса хуман!'''",
 	"updated": "(Çĕнелнĕ)",
@@ -504,15 +504,15 @@
 	"yourvariant": "Чĕлхе варианчĕ",
 	"yournick": "Сирĕн ят (алă пусма усă курăнĕ):",
 	"badsig": "Алă пуснинче йăнăш пур. HTML тэгĕсене тĕрĕслĕр.",
-	"badsiglength": "Алă пусни ытла вăрăм, $1 символтан кĕскерех пулмалла.",
+	"badsiglength": "Сирĕн алă пусни ытлаши вăрăм.\nВăл {{PLURAL:$1|символ|символсенчен}} вăрăмрах пулмалла мар.",
 	"email": "Эл. почта",
 	"prefs-help-email": "Электронлă почта (вăл кирлисем шутне кĕмест пулин те) ытти хутшăнакансене сирĕнпе ун урлă çыхăнма май парать. Çыхăну тытнă вăхăтра ыттисем сирĕн адреса пĕлеймеççĕ.",
 	"prefs-help-email-required": "Электронлă почтăн адресне кăтартмалла.",
 	"prefs-editor": "Редактор",
 	"userrights": "Хутшăнакансен прависемпе ĕçлесси",
 	"userrights-lookup-user": "Хутшăнакансен ушкăнĕсемпе ĕçлесси",
-	"userrights-user-editname": "Хутшăнакан ятне кăтартăр:",
-	"editinguser": "тӳрлетни '''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
+	"userrights-user-editname": "Хутшăнакан ятне кĕртĕр:",
+	"editinguser": "{{GENDER:$1|хутшăнакан}} правине улăштарни <strong>[[User:$1|$1]]</strong> $2",
 	"userrights-editusergroup": "Хутшăнакансен ушкăнĕсене улăштар",
 	"saveusergroups": "Хутшăнаканăн ушкăнĕсем астуса юл",
 	"userrights-groupsmember": "Çак ушкăнсене кĕрет:",
@@ -581,7 +581,7 @@
 	"upload": "Файла кĕртесси",
 	"uploadbtn": "Файла кĕрт",
 	"uploadnologin": "Эсир сайта кĕмен.",
-	"uploadnologintext": "Файла кĕртес умĕн сирĕн малтан [[Special:UserLogin|сайта кĕмелле]].",
+	"uploadnologintext": "Сирĕн $1 файлсем кĕртес тесен.",
 	"uploaderror": "Файла кĕртне чухне йăнăш пулчĕ",
 	"uploadlogpage": "Файлсене кĕртнине кăтартакан журнал",
 	"uploadlogpagetext": "Аяларах эсир юлашкинчен кĕртнĕ файлсене куратăр.\nПур çĕрте те сервер вăхăтне (Гринвич тăрăх, UTC) кăтартнă.",
@@ -718,8 +718,10 @@
 	"linksearch-ok": "Шырамалли",
 	"listusers-submit": "Кăтарт",
 	"listusers-noresult": "Хутшăнакансем тупăнмарĕç.",
+	"activeusers-hidesysops": "Администраторĕсене пытар",
 	"listgrouprights-group": "Ушкăн",
 	"listgrouprights-helppage": "Help:Ушкăн прависем",
+	"listgrouprights-members": "(хутшăнакансен списокĕ)",
 	"emailuser": "Хутшăнакана çыру яр... (Письмо участнику)",
 	"noemailtitle": "Электронлă почта адресĕ çук",
 	"noemailtext": "Ку хутшăнакан электронлă адресне кăтартман е ытти хутшăнакансенчен çыру илесшĕн мар.",
@@ -777,10 +779,11 @@
 	"restriction-edit": "Тӳрлет",
 	"undelete": "Кăларса пăрахнă страницăсене пăх",
 	"viewdeletedpage": "Кăларса пăрахнă страницăсене пăх",
-	"undeleterevisions": "Архивра пурĕ $1 верси",
+	"undeleterevisions": "$1 {{PLURAL:$1|верси|версисене}} пăса утнă",
 	"undeletebtn": "Каялла тавăр!",
 	"undeleteviewlink": "пăх",
-	"undeletedrevisions": "$1 кăларса пăрахнă тӳрлетӳсене каялла тавăрнă",
+	"undeletedrevisions": "{{PLURAL:$1|1 улăштарни|$1 улăштарнисене}} тавăрнă.",
+	"undeletedfiles": "{{PLURAL:$1|1 файл|$1 файлсене}} тавăрнă",
 	"undelete-search-box": "Кăларса пăрахнă страницăсен хушшинчи шырав",
 	"undelete-search-submit": "Шыра",
 	"blanknamespace": "(Тĕп)",
@@ -806,7 +809,7 @@
 	"whatlinkshere-links": "← каçăсем",
 	"whatlinkshere-hideredirs": "куçарнисене $1",
 	"whatlinkshere-filters": "Аласем",
-	"blockip": "Хăтшăнакана ĕçлеме чар",
+	"blockip": "{{GENDER:$1|хутшăнакана}} чар",
 	"ipaddressorusername": "IP адрес е усă куракан ят:",
 	"ipbreason": "Сăлтавĕ",
 	"ipbother": "Урăх вăхăт:",
@@ -840,7 +843,7 @@
 	"delete_and_move": "Кăларса пăрахса куçарасси",
 	"delete_and_move_text": "==Кăларса пăрахмалла==\n[[:$1|«$1»]] ятлă страница пур. Урăх ят парас тесе ăна кăларса пăрахмалла-и?",
 	"delete_and_move_confirm": "Ку страницăна чăнах та кăларса пăрахмалла",
-	"delete_and_move_reason": "Урăх ят памашкăн кăларса парахнă",
+	"delete_and_move_reason": "Ятне улăштарма кăларса пăрахнă \"[[$1]]\"",
 	"export": "Статьясен экспорчĕ",
 	"export-submit": "Экспортла",
 	"export-addcat": "Хуш",
@@ -885,7 +888,7 @@
 	"tooltip-save": "Тӳрлетӳсене астуса хăвармалла",
 	"tooltip-watch": "Çак страницăна пăхса тăмаллисем шутне хуш",
 	"tooltip-summary": "Кĕскĕн ăнлантарса парăр",
-	"anonymous": "{{GRAMMAR:genitive|{{SITENAME}}}} анонимлă хутшăнакансем",
+	"anonymous": "Паллă мар {{PLURAL:$1|хутшăнакан|хутшăнакансем}} {{SITENAME}}",
 	"siteuser": "{{SITENAME}} усă куракан $1",
 	"lastmodifiedatby": "Ку страницăна юлашки хут $2, $1 вăхăтра $3 улăштарнă.",
 	"othercontribs": "$1 ĕçĕ çинче никĕсленнĕ.",
@@ -945,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/cy.json b/languages/i18n/cy.json
index 20b56244d8..e162552cca 100644
--- a/languages/i18n/cy.json
+++ b/languages/i18n/cy.json
@@ -506,7 +506,7 @@
 	"passwordreset-emailtitle": "Manylion eich cyfrif ar {{SITENAME}}",
 	"passwordreset-emailtext-ip": "Mae rhywun (chi yn ôl pob tebyg, o'r cyfeiriad IP $1) wedi gofyn am ailosod eich cyfrinair ar {{SITENAME}} ($4). Mae'r {{PLURAL:$3|cyfrif|cyfrif|cyfrifon}} canlynol ynghlwm wrth y cyfeiriad e-bost hwn:\n\n$2\n\nBydd y {{PLURAL:$3||cyfrinair dros dro hwn|cyfrineiriau dros dro hyn}} yn dod i ben ymhen {{PLURAL:$5||diwrnod |deuddydd|tridiau|$5 diwrnod}}. Dylech fewngofnodi nawr a dewis cyfrinair newydd. Os mai rhywun arall a ofynodd am ailosod y cyfrinair, neu os ydych wedi cofio eich cyfrinair gwreiddiol, neu os nad ydych am ei newid bellach, gallwch anwybyddu'r neges hon a pharhau i ddefnyddio eich hen gyfrinair.",
 	"passwordreset-emailtext-user": "Gofynodd y defnyddiwr $1 ar {{SITENAME}} am gael ailosod ei gyfrinair ar {{SITENAME}}\n($4). Mae'r {{PLURAL:$3||cyfrif|cyfrifon}} canlynol ynghlwm wrth y cyfeiriad e-bost hwn:\n\n$2\n\nBydd y {{PLURAL:$3||cyfrinair|cyfrineiriau}} dros dro hyn yn dod i ben ymhen {{PLURAL:$5||diwrnod|deuddydd|tridiau|$5 diwrnod}}.\nDylech fewngofnodi nawr a dewis cyfrinair newydd. Os mai rhywun arall a ofynodd am ailosod y cyfrinair, neu os ydych wedi cofio eich cyfrinair gwreiddiol, neu os nad ydych am ei newid bellach, gallwch anwybyddu'r neges hon a pharhau i ddefnyddio eich hen gyfrinair.",
-	"passwordreset-emailelement": "Enw'r defnyddiwr: $1\nY cyfrinair dros dro: $2",
+	"passwordreset-emailelement": "Enw'r defnyddiwr: \n$1\n\nY cyfrinair dros dro: \n$2",
 	"passwordreset-emailsent": "Anfonwyd e-bost i ailosod eich cyfrinair atoch.",
 	"passwordreset-emailsent-capture": "Anfonwyd e-bost i ailosod cyfrinair, ac fe'i ddangosir isod.",
 	"passwordreset-emailerror-capture": "Lluniwyd e-bost i ailosod cyfrinair fel ag a welir isod, ond ni lwyddwyd i'w anfon at y {{GENDER:$2|defnyddiwr}}: $1",
@@ -1651,7 +1651,6 @@
 	"emailuser": "Anfon e-bost at y defnyddiwr hwn",
 	"emailuser-title-target": "Ebostio'r {{GENDER:$1|defnyddiwr hwn}}",
 	"emailuser-title-notarget": "Anfon e-bost at ddefnyddiwr",
-	"emailpage": "Anfon e-bost at ddefnyddiwr",
 	"emailpagetext": "Os yw'r cyfeiriad e-bost sydd yn newisiadau'r {{GENDER:$1|defnyddiwr}} hwn yn un dilys, gellir anfon neges ato o'i ysgrifennu ar y ffurflen isod.\nBydd y cyfeiriad e-bost a osodoch yn eich [[Special:Preferences|dewisiadau]] yn ymddangos ym maes \"Oddi wrth\" yr e-bost, fel bod y defnyddiwr arall yn gallu anfon ateb uniongyrchol atoch.",
 	"defemailsubject": "{{SITENAME}} yn anfon e-bost oddi wrth y defnyddiwr \"$1\"",
 	"usermaildisabled": "Dim modd anfon e-bost at ddefnyddwyr",
diff --git a/languages/i18n/da.json b/languages/i18n/da.json
index affb47364f..065e734e35 100644
--- a/languages/i18n/da.json
+++ b/languages/i18n/da.json
@@ -559,7 +559,7 @@
 	"passwordreset-emailtitle": "Kontooplysninger på {{SITENAME}}",
 	"passwordreset-emailtext-ip": "Nogen (sandsynligvis dig, fra IP-adressen $1) har anmodet om at få nulstillet din adgangskode til {{SITENAME}} ($4). {{PLURAL:$3|Den følgende brugerkonto er associeret|De følgende brugerkonti er associerede}} med denne e-mailadresse:\n\n$2\n\n{{PLURAL:$3|Denne midlertidige adgangskode|Disse midlertidige adgangskoder}} vil udløbe om {{PLURAL:$5|en dag|$5 dage}}.\nDu bør logge på og vælge en ny adgangskode nu. Hvis en anden end dig har lavet denne anmodning, eller hvis du er kommet i tanke om din oprindelig adgangskode og ikke længere ønsker at ændre den, kan du ignorere denne meddelelse og fortsætte med at bruge din gamle adgangskode.",
 	"passwordreset-emailtext-user": "Brugeren $1 på {{SITENAME}} har anmodet om at få nulstillet din adgangskode til {{SITENAME}} ($4). {{PLURAL:$3|Den følgende brugerkonto er associeret|De følgende brugerkonti er associerede}} med denne e-mailadresse:\n\n$2\n\n{{PLURAL:$3|Denne midlertidige adgangskode|Disse midlertidige adgangskoder}} vil udløbe om {{PLURAL:$5|en dag|$5 dage}}.\nDu bør logge på og vælge en ny adgangskode nu. Hvis en anden end dig har lavet denne anmodning, eller hvis du er kommet i tanke om din oprindelig adgangskode og ikke længere ønsker at ændre den, kan du ignorere denne meddelelse og fortsætte med at bruge din gamle adgangskode.",
-	"passwordreset-emailelement": "Brugernavn: $1\nMidlertidig adgangskode: $2",
+	"passwordreset-emailelement": "Brugernavn: \n$1\n\nMidlertidig adgangskode: \n$2",
 	"passwordreset-emailsent": "En e-mail om nulstilling af adgangskode er blevet sendt.",
 	"passwordreset-emailsent-capture": "En e-mail om nulstilling af adgangskode, som vist nedenfor, er blevet sendt.",
 	"passwordreset-emailerror-capture": "En mail om nulstilling af adgangskode, som vist nedenfor, blev genereret, men det lykkedes ikke at sende den til {{GENDER:$2|bruger}}: $1",
@@ -1733,7 +1733,6 @@
 	"emailuser": "E-mail til denne bruger",
 	"emailuser-title-target": "Send e-mail til denne {{GENDER:$1|bruger}}",
 	"emailuser-title-notarget": "Send e-mail til en bruger",
-	"emailpage": "E-mail til bruger",
 	"emailpagetext": "Du kan bruge formularen nedenfor til at sende en e-mail til denne {{GENDER:$1|bruger}}.\nDen e-mailadresse, du har angivet i [[Special:Preferences|dine indstillinger]], vil dukke op i \"fra\"-feltet på e-mailen, så modtageren kan svare dig.",
 	"defemailsubject": "{{SITENAME}}-e-mail fra brugeren \"$1\"",
 	"usermaildisabled": "Bruger-e-mail deaktiveret",
@@ -1755,7 +1754,7 @@
 	"emailccsubject": "Kopi af din besked til $1: $2",
 	"emailsent": "E-mail sendt",
 	"emailsenttext": "Din e-mail er blevet sendt.",
-	"emailuserfooter": "Denne e-mail er sendt af $1 til $2 ved hjælp af funktionen \"{{int:emailpage}}\" på {{SITENAME}}.",
+	"emailuserfooter": "Denne e-mail er sendt af $1 til $2 ved hjælp af funktionen \"{{int:emailuser}}\" på {{SITENAME}}.",
 	"usermessage-summary": "Efterlader system besked.",
 	"usermessage-editor": "System messenger",
 	"watchlist": "Overvågningsliste",
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 bfac000f48..95d5f107cf 100644
--- a/languages/i18n/de.json
+++ b/languages/i18n/de.json
@@ -79,14 +79,15 @@
 			"Robby",
 			"Andreasburmeister",
 			"Tiin",
-			"Freddy2001"
+			"Freddy2001",
+			"Luke081515",
+			"J. 'mach' wust"
 		]
 	},
 	"tog-underline": "Links unterstreichen:",
 	"tog-hideminor": "Kleine Änderungen in den „Letzten Änderungen“ ausblenden",
 	"tog-hidepatrolled": "Kontrollierte Änderungen in den „Letzten Änderungen“ ausblenden",
 	"tog-newpageshidepatrolled": "Kontrollierte Seiten bei den „Neuen Seiten“ ausblenden",
-	"tog-hidecategorization": "Kategorisierungen von Seiten ausblenden",
 	"tog-extendwatchlist": "In der Beobachtungsliste alle und nicht nur die aktuellsten Änderungen anzeigen",
 	"tog-usenewrc": "Änderungen auf „Letzte Änderungen“ und der Beobachtungsliste nach Seite gruppieren",
 	"tog-numberheadings": "Überschriften automatisch nummerieren",
@@ -116,7 +117,6 @@
 	"tog-watchlisthideliu": "Bearbeitungen angemeldeter Benutzer in der Beobachtungsliste ausblenden",
 	"tog-watchlisthideanons": "Bearbeitungen anonymer Benutzer (IP-Adressen) in der Beobachtungsliste ausblenden",
 	"tog-watchlisthidepatrolled": "Kontrollierte Änderungen in der Beobachtungsliste ausblenden",
-	"tog-watchlisthidecategorization": "Kategorisierungen von Seiten ausblenden",
 	"tog-ccmeonemails": "Schicke mir Kopien der E-Mails, die ich anderen Benutzern sende",
 	"tog-diffonly": "Beim Versionsvergleich nur die Unterschiede und nicht die vollständige Seite anzeigen",
 	"tog-showhiddencats": "Versteckte Kategorien anzeigen",
@@ -496,12 +496,13 @@
 	"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}}",
 	"createacct-benefit-body3": "{{PLURAL:$1|aktiver Autor|aktive Autoren}}",
 	"badretype": "Die beiden Passwörter stimmen nicht überein.",
+	"usernameinprogress": "Eine Benutzerkontenerstellung für diesen Benutzernamen ist bereits in Bearbeitung.\nBitte warten.",
 	"userexists": "Dieser Benutzername ist schon vergeben.\nBitte wähle einen anderen.",
 	"loginerror": "Fehler bei der Anmeldung",
 	"createacct-error": "Fehler beim Erstellen des Benutzerkontos",
@@ -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.",
@@ -523,9 +524,9 @@
 	"password-name-match": "Dein Passwort muss sich von deinem Benutzernamen unterscheiden.",
 	"password-login-forbidden": "Die Verwendung dieses Benutzernamens und Passwortes ist nicht erlaubt.",
 	"mailmypassword": "Passwort zurücksetzen",
-	"passwordremindertitle": "Neues Passwort für dein {{SITENAME}}-Benutzerkonto",
+	"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.",
@@ -580,7 +581,7 @@
 	"resetpass-expired-soft": "Dein Passwort ist abgelaufen und muss zurückgesetzt werden. Bitte wähle jetzt ein neues Passwort aus oder klicke auf „{{int:resetpass-submit-cancel}}“, um es später zurückzusetzen.",
 	"resetpass-validity-soft": "Dein Passwort ist nicht gültig: $1\n\nBitte wähle jetzt ein neues Passwort oder klicke auf „{{int:resetpass-submit-cancel}}“, um es später zurückzusetzen.",
 	"passwordreset": "Passwort zurücksetzen",
-	"passwordreset-text-one": "Fülle dieses Formular aus, um dein Passwort zurückzusetzen.",
+	"passwordreset-text-one": "Fülle dieses Formular aus, um ein temporäres Passwort per E-Mail zu erhalten.",
 	"passwordreset-text-many": "{{PLURAL:$1|Füll eines der Felder aus, um ein temporäres Passwort per E-Mail zugesandt zu bekommen.}}",
 	"passwordreset-disabled": "Das Zurücksetzen von Passwörtern wurde in diesem Wiki deaktiviert.",
 	"passwordreset-emaildisabled": "Die E-Mail-Funktionen wurden auf diesem Wiki deaktiviert.",
@@ -592,7 +593,7 @@
 	"passwordreset-emailtitle": "Benutzerkontoinformationen auf {{SITENAME}}",
 	"passwordreset-emailtext-ip": "Jemand mit der IP-Adresse $1, wahrscheinlich du selbst, hat eine Zurücksetzung deines Passworts bei {{SITENAME}} angefordert ($4). {{PLURAL:$3|Das folgende Benutzerkonto ist|Die folgenden Benutzerkonten sind}} mit dieser E-Mail-Adresse verknüpft:\n\n$2\n\n{{PLURAL:$3|Dieses temporäre Passwort läuft|Diese temporären Passwörter laufen}} innerhalb von {{PLURAL:$5|einem Tag|$5 Tagen}} ab.\nDu solltest dich anmelden und ein neues Passwort vergeben. Falls jemand anderes diese Anfrage getätigt hat oder du dich wieder an dein ursprüngliches Passwort erinnern kannst und es nicht länger ändern möchtest, kannst du diese Nachricht ignorieren und weiterhin dein altes Passwort benutzen.",
 	"passwordreset-emailtext-user": "Benutzer $1 bei {{SITENAME}} hat eine Zurücksetzung deines Passworts bei {{SITENAME}} angefordert ($4). {{PLURAL:$3|Das folgende Benutzerkonto ist|Die folgenden Benutzerkonten sind}} mit dieser E-Mail-Adresse verknüpft:\n\n$2\n\n{{PLURAL:$3|Dieses temporäre Passwort läuft|Diese temporären Passwörter laufen}} innerhalb von {{PLURAL:$5|einem Tag|$5 Tagen}} ab. Du solltest dich anmelden und ein neues Passwort vergeben. Falls jemand anderes diese Anfrage getätigt hat oder du dich wieder an dein ursprüngliches Passwort erinnern kannst und es nicht ändern möchtest, kannst du diese Nachricht ignorieren und weiterhin dein altes Passwort benutzen.",
-	"passwordreset-emailelement": "Benutzername: $1\nTemporäres Passwort: $2",
+	"passwordreset-emailelement": "Benutzername: \n$1\n\nTemporäres Passwort: \n$2",
 	"passwordreset-emailsent": "Eine Passwortzurücksetzungs-E-Mail wurde versandt.",
 	"passwordreset-emailsent-capture": "Eine Passwortzurücksetzungs-E-Mail wurde versandt, die unten angezeigt wird.",
 	"passwordreset-emailerror-capture": "Die unten angezeigte Passwortzurücksetzungs-E-Mail wurde generiert, allerdings ist der Versand an {{GENDER:$2|den Benutzer|die Benutzerin}} gescheitert: $1",
@@ -644,7 +645,7 @@
 	"anonpreviewwarning": "''Du bist nicht angemeldet. Beim Speichern wird deine IP-Adresse in der Versionsgeschichte aufgezeichnet.''",
 	"missingsummary": "'''Hinweis:''' Du hast keine Zusammenfassung angegeben. Wenn du erneut auf „{{int:savearticle}}“ klickst, wird deine Änderung ohne Zusammenfassung übernommen.",
 	"selfredirect": "<strong>Warnung:</strong> Du leitest auf diese Seite selbst weiter.\nDu hast vermutlich das falsche Weiterleitungsziel angegeben oder du bearbeitest die falsche Seite.\nWenn du erneut auf „{{int:savearticle}}“ klickst, wird die Weiterleitung dennoch erstellt.",
-	"missingcommenttext": "Dein Abschnitt enthält keinen Text.",
+	"missingcommenttext": "Bitte gib unten einen Kommentar ein.",
 	"missingcommentheader": "'''Achtung:''' Du hast kein Betreff/Überschrift eingegeben. Wenn du erneut auf „{{int:savearticle}}“ klickst, wird deine Bearbeitung ohne Überschrift gespeichert.",
 	"summary-preview": "Vorschau der Zusammenfassungszeile:",
 	"subject-preview": "Vorschau der Zusammenfassungszeile:",
@@ -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.",
@@ -1269,9 +1271,6 @@
 	"rcshowhidemine": "Eigene Beiträge $1",
 	"rcshowhidemine-show": "anzeigen",
 	"rcshowhidemine-hide": "ausblenden",
-	"rcshowhidecategorization": "Seitenkategorisierungen $1",
-	"rcshowhidecategorization-show": "anzeigen",
-	"rcshowhidecategorization-hide": "ausblenden",
 	"rclinks": "Zeige die letzten $1 Änderungen der letzten $2 Tage.<br />$3",
 	"diff": "Unterschied",
 	"hist": "Versionen",
@@ -1296,10 +1295,6 @@
 	"recentchangeslinked-summary": "Diese Spezialseite listet die letzten Änderungen an den verlinkten Seiten auf (bzw. an in dieser Kategorie enthaltenen Kategorien). Seiten auf deiner [[Special:Watchlist|Beobachtungsliste]] sind <strong>fett</strong> dargestellt.",
 	"recentchangeslinked-page": "Seite:",
 	"recentchangeslinked-to": "Zeige nur Änderungen an Seiten, die auf diese Seite verlinken",
-	"recentchanges-page-added-to-category": "[[:$1]] zur Kategorie hinzugefügt",
-	"recentchanges-page-added-to-category-bundled": "[[:$1]] und {{PLURAL:$2|eine weitere Seite|$2 weitere Seiten}} zur Kategorie hinzugefügt",
-	"recentchanges-page-removed-from-category": "[[:$1]] von der Kategorie entfernt",
-	"recentchanges-page-removed-from-category-bundled": "[[:$1]] und {{PLURAL:$2|eine weitere Seite|$2 weitere Seiten}} von der Kategorie entfernt",
 	"upload": "Datei hochladen",
 	"uploadbtn": "Datei hochladen",
 	"reuploaddesc": "Abbrechen und zurück zur Hochladen-Seite",
@@ -1720,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).",
@@ -1755,7 +1750,7 @@
 	"linksearch-pat": "Suchmuster:",
 	"linksearch-ns": "Namensraum:",
 	"linksearch-ok": "Suchen",
-	"linksearch-text": "Diese Spezialseite ermöglicht die Suche nach Seiten, in denen bestimmte Weblinks enthalten sind. Dabei können Platzhalter wie beispielsweise <code>*.beispiel.de</code> benutzt werden. Es muss mindestens eine Top-Level-Domain, z. B. „*.org“. angegeben werden. <br />{{PLURAL:$2|Unterstütztes Protokoll|Unterstützte Protokolle}}: $1 (Standard ist http, falls kein Protokoll angegeben ist.)",
+	"linksearch-text": "Diese Spezialseite ermöglicht die Suche nach Seiten, in denen bestimmte Weblinks enthalten sind. Dabei können Platzhalter, wie beispielsweise <code>*.beispiel.de</code>, benutzt werden. Es muss mindestens eine Top-Level-Domain, z. B. „*.org“, angegeben werden. <br />{{PLURAL:$2|Unterstütztes Protokoll|Unterstützte Protokolle}}: $1 (Standard ist http, falls kein Protokoll angegeben ist.)",
 	"linksearch-line": "$1 ist verlinkt von $2",
 	"linksearch-error": "Wildcards können nur am Anfang der URL verwendet werden.",
 	"listusersfrom": "Zeige Benutzer ab:",
@@ -1788,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].",
@@ -1806,7 +1801,6 @@
 	"emailuser": "E-Mail an diesen Benutzer",
 	"emailuser-title-target": "E-Mail an {{GENDER:$1|diesen Benutzer|diese Benutzerin}} senden",
 	"emailuser-title-notarget": "E-Mail an Benutzer",
-	"emailpage": "E-Mail an Benutzer",
 	"emailpagetext": "Du kannst {{GENDER:$1|dem Benutzer|der Benutzerin}} mit dem unten stehenden Formular eine E-Mail senden.\nAls Absender wird die E-Mail-Adresse aus deinen [[Special:Preferences|Einstellungen]] eingetragen, damit {{GENDER:$1|der Benutzer|die Benutzerin}} dir direkt antworten kann.",
 	"defemailsubject": "{{SITENAME}} – E-Mail von Benutzer „$1“",
 	"usermaildisabled": "E-Mail-Empfang deaktiviert",
@@ -1828,7 +1822,7 @@
 	"emailccsubject": "Kopie deiner Nachricht an $1: $2",
 	"emailsent": "E-Mail verschickt",
 	"emailsenttext": "Deine E-Mail wurde verschickt.",
-	"emailuserfooter": "Diese E-Mail wurde von „$1“ an „$2“ durch die Funktion „{{int:emailpage}}“ bei {{SITENAME}} gesendet.",
+	"emailuserfooter": "Diese E-Mail wurde von „$1“ an „$2“ durch die Funktion „{{int:emailuser}}“ bei {{SITENAME}} gesendet.",
 	"usermessage-summary": "Systemnachricht gespeichert.",
 	"usermessage-editor": "System-Messenger",
 	"usermessage-template": "MediaWiki:Benutzernachricht",
@@ -2049,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:",
@@ -2145,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.",
@@ -2400,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",
@@ -2438,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.",
@@ -3278,6 +3272,7 @@
 	"logentry-newusers-create2": "Benutzerkonto $3 wurde von $1 {{GENDER:$2|erstellt}}",
 	"logentry-newusers-byemail": "Benutzerkonto $3 wurde von $1 {{GENDER:$2|erstellt}} und das Passwort wurde per E-Mail zugesandt",
 	"logentry-newusers-autocreate": "Benutzerkonto $1 wurde automatisch {{GENDER:$2|erstellt}}",
+	"logentry-protect-move_prot": "$1 {{GENDER:$2|verschob}} die Schutzeinstellungen von $4 nach $3",
 	"logentry-rights-rights": "$1 {{GENDER:$2|änderte}} die Gruppenzugehörigkeit für $3 von $4 zu $5",
 	"logentry-rights-rights-legacy": "$1 {{GENDER:$2|änderte}} die Gruppenzugehörigkeit für $3",
 	"logentry-rights-autopromote": "$1 wurde automatisch von $4 zu $5 {{GENDER:$2|zugeordnet}}",
diff --git a/languages/i18n/diq.json b/languages/i18n/diq.json
index 445e27cb83..f6fcaf1952 100644
--- a/languages/i18n/diq.json
+++ b/languages/i18n/diq.json
@@ -511,7 +511,7 @@
 	"passwordreset-emailtitle": "Hesab timarê {{SITENAME}}",
 	"passwordreset-emailtext-ip": "Jeweri, {{SITENAME}} ra (ma heta şımayê, $1 IP adresi ra) ($4) teferuatê hesabdê şıma  va wa biyaro xo viri. Karbero ke cêrdeyo {{PLURAL:$3|hesaba|eno hesaba}} ena e-posta adresiya aleqey cı esto:\n\n$2\n\n{{PLURAL:$3|ena parola idaretena|ena parola idareten}} {{PLURAL:$5|jew roc|$5  roca}}rêya.\nEna parolaya deqewe de u xorê ju parolaya newi bıweçine. Parolaya şıma emaya şıma viri se  yana  ena e-posta şıma nê weştase u şıma qayıl niye parolaya xo bıvurnese, ena mesacer peygoş bıkerê.",
 	"passwordreset-emailtext-user": "$1 enê karberi, {{SITENAME}}  ra ($4) teferuatê hesab dê şıma  va wa biyaro xo viri. Karbero ke cêrdeyo {{PLURAL:$3|hesaba|eno hesaba}} ena e-posta adresiya aleqey cı esto:\n\n$2\n\n{{PLURAL:$3|ena parola idaretena|ena parola idareten}} {{PLURAL:$5|jew roc|$5  roca}}rêya.\nEna parolaya deqewe de u xorê ju parolaya newi bıweçine. Parolaya şıma emaya şıma viri se  yana  ena e-posta şıma nê weştase u şıma qayıl niye parolaya xo bıvurnese, ena mesacer peygoş bıkerê.",
-	"passwordreset-emailelement": "Nameyê karberi: $1\nParolaya vêrdiye: $2",
+	"passwordreset-emailelement": "Nameyê karberi: \n$1\n\nParolaya vêrdiye: \n$2",
 	"passwordreset-emailsent": "Yew e-posteyê esterıtışê parola rışiya.",
 	"passwordreset-emailsent-capture": "Yew e-posteyê esterıtışê parolayo ke rışiya, no cêr mocniyayo.",
 	"passwordreset-emailerror-capture": "Yew e-posteyê esterıtışê parolayo ke rışiya, no cêr mocniyayo, ema {{GENDER:$2|karber}}i rê rıştış de mıwefeq nêbi: $1",
@@ -1626,7 +1626,6 @@
 	"emailuser": "Ena karberi rê mesac bırse",
 	"emailuser-title-target": "Na E-postaya {{GENDER:$1|karberi}}ya",
 	"emailuser-title-notarget": "E-postaya karberi",
-	"emailpage": "karberi re e-posta bırışê",
 	"emailpagetext": "Şıma şenê nê formê cêrêni nê {{GENDER:$1|karber}}i rê e-poste rıştış de bıgurenê.\n[[Special:Preferences|Tercihanê şımayê karberi]] de adresa e-posteya ke şıma daya, na adrese qısmê adresa e-postey de \"kami ra\" asena, no sebeb ra gırewtoğ şeno direkt cewab bıdero şıma.",
 	"defemailsubject": "\"$1\" ra e-postay {{SITENAME}} amê",
 	"usermaildisabled": "E-mailê karberani kafiliyeya",
diff --git a/languages/i18n/dsb.json b/languages/i18n/dsb.json
index b7b1cb8866..2dc526cb9e 100644
--- a/languages/i18n/dsb.json
+++ b/languages/i18n/dsb.json
@@ -504,7 +504,7 @@
 	"passwordreset-emailtitle": "Kontowe drobnostki na {{GRAMMAR:lokatiw|{{SITENAME}}}}",
 	"passwordreset-emailtext-ip": "Něchten (nejskerjej ty, z IP-adresu $1) jo anulěrowanje gronidła za {{GRAMMAR:akuzatiw|{{SITENAME}}}} pominał ($4).  {{PLURAL:$3|Slědujuce wužywarske konto jo|Slědujucej wužywarskej konśe stej|Slědujuce wužywarske konta su}} z toś tej e-mailoweju adresu {{PLURAL:$3|zwězane|zwězanej|zwězane}}:\n\n$2\n\n{{PLURAL:$3|Toś to nachylne gronidło spadnjo|Toś tej nachylnej gronidle spadnjotej|Toś te nachylne gronidła spadnu}} za {{PLURAL:$5|jaden źeń|$5 dnja|$5 dny|$5 dnjow}}.\nTy by měł se něnto pśizjawiś a nowe gronidło wustajiś. Jolic něchten drugi jo toś to napšašowanje pósłał, abo jolic sy se zasej na spócetne gronidło spomnjeł a wěcej njocoš jo změniś, móžoš toś to zdźělenje ignorěrowaś a swójo stare gronidło dalej wužywaś.",
 	"passwordreset-emailtext-user": "Wužywaŕ $1 jo anulěrowanje gronidła za {{GRAMMAR:akuzatiw|{{SITENAME}}}} pominał ($4).  {{PLURAL:$3|Slědujuce wužywarske konto jo|Slědujucej wužywarskej konśe stej|Slědujuce wužywarske konta su}} z toś tej e-mailoweju adresu {{PLURAL:$3|zwězane|zwězanej|zwězane}}:\n\n$2\n\n{{PLURAL:$3|Toś to nachylne gronidło spadnjo|Toś tej nachylnej gronidle spadnjotej|Toś te nachylne gronidła spadnu}} za {{PLURAL:$5|jaden źeń|$5 dnja|$5 dny|$5 dnjow}}.\nTy by měł se něnto pśizjawiś a nowe gronidło wustajiś. Jolic něchten drugi jo toś to napšašowanje pósłał, abo jolic sy se zasej na spócetne gronidło spomnjeł a wěcej njocoš jo změniś, móžoš toś to zdźělenje ignorěrowaś a swójo stare gronidło dalej wužywaś.",
-	"passwordreset-emailelement": "Wužywarske mě: $1\nNachylne gronidło: $2",
+	"passwordreset-emailelement": "Wužywarske mě: \n$1\n\nNachylne gronidło: \n$2",
 	"passwordreset-emailsent": "E-mail za anulěrowanje gronidła jo se pósłała.",
 	"passwordreset-emailsent-capture": "E-mail za anulěrowanje gronidła jo se pósłała, kótaraž pokazujo se dołojce.",
 	"passwordreset-emailerror-capture": "E-mail za anulěrowanje gronidła jo se napórała, kótaraž se dołojce pokazujo, ale słanje {{GENDER:$2|wužywarjeju|wužywarce}} njejo se raźiło: $1",
@@ -1624,7 +1624,6 @@
 	"emailuser": "Toś tomu wužywarjeju e-mail pósłaś",
 	"emailuser-title-target": "E-mail na {{GENDER:$1|toś tomu wužywarjeju|toś tej wužywarce}} pósłaś",
 	"emailuser-title-notarget": "E-mail wužywarjeju",
-	"emailpage": "E-mail wužywarjeju",
 	"emailpagetext": "Móžoš slědujucy formular wužywaś, aby toś tomu {{GENDER:$1|wužywarjeju}} e-mail pósłał.\nE-mailowa adresa, kótaruž sy zapódał w [[Special:Preferences|swójich wužywarskich nastajenjach]], zjawi se ako adresa w pólu \"Wót\" e-maile, aby dostawaŕ móžo śi direktnje wótegroniś.",
 	"defemailsubject": "{{SITENAME}} - e-mail wót wužywarja \"$1\"",
 	"usermaildisabled": "Wužywarska e-mail znjemóžnjona",
diff --git a/languages/i18n/dtp.json b/languages/i18n/dtp.json
index de7ba430a9..56af462929 100644
--- a/languages/i18n/dtp.json
+++ b/languages/i18n/dtp.json
@@ -443,7 +443,6 @@
 	"resetpass-wrong-oldpass": "Nokosilap kaatalib daamot toi iy maso gunoon.\nNaalanannu noh kaatalib toi nokopokianu koh no do kaatalib daamot.",
 	"resetpass-temp-password": "Kaatalib daamot:",
 	"passwordreset": "Pudoliai kawagu kaatalib",
-	"passwordreset-legend": "Pudoliai kawagu kaatalib",
 	"passwordreset-disabled": "Pomudolian kawagu do kaatalib kitaantob id wiki diti.",
 	"passwordreset-username": "Ngarandait:",
 	"passwordreset-domain": "Sumanganu:",
@@ -451,7 +450,7 @@
 	"passwordreset-capture-help": "Nung goritannu id kutak diti, surat-i (ii ki-kaa-talib daamot) mangan pokitanai montok dia om nogi porikoton montok momomoguno diti.",
 	"passwordreset-email": "Porikatan surat-i:",
 	"passwordreset-emailtitle": "Kointalangan takaun id {{SITENAME}}",
-	"passwordreset-emailelement": "Ngaranmoguno: $1\nKaatalib daamot: $2",
+	"passwordreset-emailelement": "Ngaranmoguno: \n$1\n\nKaatalib daamot: \n$2",
 	"passwordreset-emailsent": "Surat-i pononsorou nakaatod noh.",
 	"passwordreset-emailsent-capture": "Surat-i pononsorou nakaatod noh, miagal id siriba diti.",
 	"passwordreset-emailerror-capture": "Surat-i pononsorou nopudali noh, miagal id siriba diti, nga awu kaatod id momomoguno: $1",
diff --git a/languages/i18n/dty.json b/languages/i18n/dty.json
index 414a55922e..8da702b1e0 100644
--- a/languages/i18n/dty.json
+++ b/languages/i18n/dty.json
@@ -289,7 +289,7 @@
 	"nstab-help": "सहायता पानो",
 	"nstab-category": "श्रेणी",
 	"nosuchaction": "यसो काम हैन",
-	"nosuchactiontext": "URL ले खुलाएको काम मान्य छैन ।\nतमुले URL गलत टाइपगरेका हौ , वा गलत लिंकक पछाडी लागेका हुनसक्देहौ ।\nयै{{SITENAME}}ले सफ्टवेयरमी भएको गल्ति देखायाको पनि हुनसक्छ ।",
+	"nosuchactiontext": "URL ले खुलाएको काम मान्य छैन ।\nतमीले URL गलत टाइपगरेका हौ , वा गलत लिंकक पछाडी लागेका हुनसक्देहौ ।\nयो {{SITENAME}}ले सफ्टवेयरमी भयाको गल्ति देखायाको लै हुनसक्छ ।",
 	"nosuchspecialpage": "तसो विशेष पानो छैन",
 	"nospecialpagetext": "<strong>तमीले अनुरोध गर्याको विशेष पानो अमान्य छ ।</strong>\n\nमान्य पानाहरूको सूची यहाँ [[Special:SpecialPages|{{int:specialpages}}]] उपलब्ध छ ।",
 	"error": "त्रुटी",
@@ -334,9 +334,15 @@
 	"viewsource": "स्रोत हेर",
 	"viewsource-title": " $1 को स्रोत हेर",
 	"actionthrottled": "कार्य रोकिईयो",
+	"actionthrottledtext": "स्पामको रोकथामको लागि , तमीलाई यो कार्य नापै समयमी मैथै पटक गद्दाबठे सिमित गरियाको छ, र तमीले आफ्नो सिमा पार गरिसक्याछौ ।\nकृपया केही मिनेट पछि पुन: प्रयास गर  ।",
 	"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": "थानभया एन्टीभाइरस:",
@@ -392,9 +398,11 @@
 	"createacct-benefit-body2": "{{PLURAL:$1|पाना|पानाहरू}}",
 	"createacct-benefit-body3": "हालैका {{PLURAL:$1|योगदानकर्ता|योगदानकर्ताहरू}}",
 	"badretype": "तमले दिया पासवर्ड मिल्लो नाइँ।",
+	"userexists": "तमीले प्रविष्ट गर्याको प्रयोगकर्ता नाम पैल्ली बठे प्रयोगमी छ ।\nकृपया फरक नाम छान ।",
 	"loginerror": "प्रवेश गल्ती",
 	"createacct-error": "खाता बनाउँन्ज्या गल्ती",
 	"createaccounterror": "खाता बनाउन सकिएन: $1",
+	"noname": "तमीले सही प्रयोगकर्ता नाम दिएनौ।",
 	"loginsuccesstitle": "प्रवेश सफल",
 	"loginsuccess": "'''तमले {{SITENAME}}मी  \"$1\" को रुपमी प्रवेश गरया छौ।'''",
 	"nouserspecified": "प्रयोगकर्ता नाम दिनु अनिवार्य छ।",
@@ -413,6 +421,7 @@
 	"createaccount-text": "कसैले तमरो इमेल ठेगानालाई {{SITENAME}} ($4) मी \"$2\" नामको खाता बनायाको छ, जैको पासवर्ड \"$3\" छ ।\nअब तमी तुरुन्त लगइन गरिबर आफ्नो पासवर्डशब्द परिवर्तन गर ।\nयदी यो खाता गल्तिले खोलियाको रहेछ भण्या तम यै सन्देशलाई बेवास्ता गद्द सक्द्याहौ ।",
 	"login-migrated-generic": "तमरो खाता स्थानान्तरण भयाको छ, र तमरो प्रयोगकर्ता नाम यै विकिमी नाइथि ।",
 	"loginlanguagelabel": "भाषा: $1",
+	"createacct-another-realname-tip": "वास्तविक नाम ऐच्छिक हो ।\nतमले यो खुलायौ भण्या तमरो काममी प्रयोगकर्ता श्रेय दिनका निउती यैको प्रयोग गरिन्या छ ।",
 	"pt-login": "प्रवेश (लग ईन)",
 	"pt-login-button": "प्रवेश",
 	"pt-createaccount": "नयाँ खाता खोल",
@@ -443,9 +452,10 @@
 	"passwordreset-capture": "निस्कने इमेलको नमुना हेर्ने ?",
 	"passwordreset-email": "इमेल ठेगाना:",
 	"passwordreset-emailtitle": "{{SITENAME}}मा खाता विवरण",
-	"passwordreset-emailelement": "प्रयोगकर्ताको नाम: $1\nअस्थाई पासवर्ड: $2",
+	"passwordreset-emailelement": "प्रयोगकर्ताको नाम: \n$1\n\nअस्थाई पासवर्ड: \n$2",
 	"passwordreset-emailsent": "पासवर्ड परिवर्तनका लागि इमेल पठाइया छ।",
 	"changeemail": "इमेल ठेगाना बदेल",
+	"changeemail-text": "आफ्नो इमेल ठेगाना परिवर्तन गद्द यो फारम भर । यैलाई पुष्टि गद्द तमीले आफ्नो पासवर्ड हाल्नु पडन्छ।",
 	"changeemail-oldemail": "अईलको इमेल-ठेगाना:",
 	"changeemail-newemail": "नयाँ इमेल-ठेगाना:",
 	"changeemail-none": "(के लै नाइँ)",
@@ -485,22 +495,24 @@
 	"showdiff": "परिवर्तन धेकाउन्या",
 	"blankarticle": "<strong>चेतावनी:</strong> तम एक खालि पानाको निर्माण गद्द लाग्याछौ ।\nयदि तमले \"{{int:savearticle}}\" लाई पुनः थिच्यौ भण्या पानो बिना कुनै सामग्री नै निर्मित गरिन्याछ ।",
 	"anoneditwarning": "<strong>चेतावनी:</strong> तमले प्रवेश अरेको नाइथिन । तमरो आइपि ठेगाना पाना सम्पादन इतिहासमि दर्ता गरिन्या छ र यो सब्बैले हेद्द सक्कान । यदि तमलाईँ <strong>[$1 लगईन]</strong> वा <strong>[$2 नयाँ खाता बनाउन्या] गर्याभण्या तमबठे गरियाको सम्पादन तमरो प्रयोगकर्तानाममि जोडिन्याछ ।",
+	"missingsummary": "'''यादगर्या :''' तमीले सम्पादन सारांश दियाका छैनौ ।\nयदि तमीले \"{{int:savearticle}}\"  थिच्यौ भण्या , सारांश बिना नै सङ्ग्रहित गरिन्या छ ।",
 	"selfredirect": "<strong>चेतावनी:</strong> तम यै पानालाई आफुमी पुनः निर्देशित गद्द लाग्याछौ ।\nहुनसक्छ तम अनुप्रेषितको लागि गलत लक्ष्य निर्दिष्ट गद्द लाग्याछौ, वा गलत पानाको सम्पादन गद्द लाग्याछौ ।\nतम पुनः एकपल्ट \"{{int:savearticle}}\" क्लिक गद्दाछौ, पुनः निर्देशित तसै लै बनाइन्याछ।",
 	"missingcommentheader": "'''याद गर :''' तमीले टिप्पणीमी विषय /शीर्ष पंक्ति  दियाका छैनौ ।\nतमीले फेरि \"{{int:savearticle}}\"  थिच्यौ भण्या , तमरो सम्पादन यसै रुपमी संग्रहित हुन्याछ ।",
 	"summary-preview": "सारांश पूर्वालोकन:",
 	"subject-preview": "विषय/शीर्षपंक्ति पूर्वरुप:",
 	"previewerrortext": "तमरो परिवर्तनको पूर्वावलोकन बनाउन खोज्दा समस्या आयाको छ ।",
 	"blockedtitle": "प्रयोककर्तालाई रोक लगाइया छ",
-	"blockedtext": "'''तमरो प्रयोगकर्ता नाम या IP ठेगानालाई रोक लगाइएको छ ।'''\n\nरोक लगाउने  $1.\nरोक लगाउनाको कारण ''$2''.\n\n* रोक सुरू हुने : $8\n* रोक सकिने: $6\n* रोकबाट लक्षित: $7\n\nतमले  $1 वा और कोइ  [[{{MediaWiki:Grouppage-sysop}}|administrator]] सँग रोकको बारेमी छलफल गर्न सम्पर्क गर्न सकुन्छौ ।\nतमले  'प्रयोगकर्तालाई इ-मेल गर्ने ' सुविधा मान्य इमेल ठेगाना [[Special:Preferences|account preferences]] मी नखुलाए सम्म प्रयोगगर्न पाउनुहुन्या छैन र येको प्रयोग गर्नबठे रोक लगाइया छैन ।\nतमरो IP ठेगाना $3 को, र रोक्का संख्या #$5.\nकृपया तमरा प्रश्नमी सबै जानकारी खुलाया ।",
+	"blockedtext": "'''तमरो प्रयोगकर्ता नाम या IP ठेगानालाई रोक लगाइएको छ ।'''\n\nरोक लगाउने  $1.\nरोक लगाउनाको कारण ''$2''.\n\n* रोक सुरू हुने : $8\n* रोक सकिने: $6\n* रोकबाट लक्षित: $7\n\nतमले  $1 वा और कोइ  [[{{MediaWiki:Grouppage-sysop}}|प्रवन्धक]] सँग रोकको बारेमी छलफल गर्न सम्पर्क गद्द सकुन्छौ ।\nतमले  'प्रयोगकर्तालाई इ-मेल गर्ने ' सुविधा मान्य इमेल ठेगाना [[Special:Preferences|रोजाइहरू]] मी नखुलाए सम्म प्रयोगगर्न पाउनुहुन्या छैन र यैको प्रयोग गर्नबठे रोक लगाइया छैन ।\nतमरो IP ठेगाना $3 को, र रोक्का संख्या #$5.\nकृपया तमरा प्रश्नमी सबै जानकारी खुलाया ।",
+	"autoblockedtext": "तमरो IP ठेगानामी रोक लगाइयाकोछ किन भण्या यो अर्को प्रयोगकर्ताले प्रयोग गर्याको थ्यो, जैलाई $1ले रोक लगायाका थ्या । \nरोक लगाउनाको कारण:\n:''$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 गद्दु पडन्छ।",
 	"nosuchsectiontext": "तमले तसो खण्डको सम्पादन गद्या प्रयास गर्यौ जो अस्तित्वमी छैन।\nयैको नाम बदलियाको अथवा मेटाइयाको हुनुपडन्छ जब तमी यै पानालाई हेद्द लाग्याका छियौ ।",
 	"loginreqtitle": "प्रवेशगर्नु जरुरी छ।",
 	"loginreqlink": "प्रवेश (लग ईन)",
-	"loginreqpagetext": "अरु पृष्ठहेर्न तमले $1 गद्दु पडन्छ ।",
+	"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>.",
@@ -616,7 +628,8 @@
 	"revdel-restore": "दृष्टि परिवर्तन गर्न्या",
 	"pagehist": "पाना इतिहास",
 	"deletedhist": "मेटाईया इतिहास",
-	"revdelete-concurrent-change": " $2, $1 मिति गरियाको वस्तु परिवर्तन गद्द सकिएन: यसको स्थितीले तमीले परिवर्तन गर्नलाग्दे बेला कोहीअरुले नै परिवर्तन गर्याजसो धेकाउँछ\nकृपया लगहरू हेर्न सकन्छौ ।",
+	"revdelete-concurrent-change": " $2, $1 मिति गरियाको वस्तु परिवर्तन गद्द सकिएन: यैको स्थितीले तमीले परिवर्तन गर्नलाग्दे बेला कोहीअरुले नै परिवर्तन गर्याजसो धेकाउँछ\nकृपया लगहरू हेर्न सकन्छौ ।",
+	"revdelete-only-restricted": "$2, $1 मिति भयाको वस्तु लुकाउँदा त्रुटी भया छ:तमीले वस्तुहरूलाई प्रवन्धकहरूको दृष्टीबठे दमन गद्द सक्दाइनौ अझ कुनै पनि अरु दृष्टी विकल्पहरू नछानीकन।",
 	"revdelete-otherreason": "और/थप कारण:",
 	"revdelete-reasonotherlist": "और कारण",
 	"revdelete-edit-reasonlist": "मेट्ने कार्यहरु सम्पादन गर्ने",
@@ -693,7 +706,9 @@
 	"powersearch-togglelabel": "जाँच्ने :",
 	"powersearch-toggleall": "सबै",
 	"powersearch-togglenone": "कोइ लै होइनन",
+	"powersearch-remember": "चयन गर्याकोलाई भविष्यमी गरिन्या खोजहरूमी सम्झन्या",
 	"search-external": "भाइरका खोज",
+	"searchdisabled": "{{SITENAME}} खोज निस्क्रिय पारियाको छ ।\nअहिल तमी गूगलद्वारा खोज्न सकन्छौ ।\nयाद गर्या उनीहरूको {{SITENAME}}को सूची सामग्री पुरानो भयाको हुनसकन्छ ।",
 	"preferences": "मेरी रोजाई",
 	"mypreferences": "मेरी रोजाई",
 	"prefs-edits": "सम्पादन संख्या:",
@@ -739,9 +754,11 @@
 	"timezoneregion-australia": "अष्ट्रेलिया",
 	"timezoneregion-indian": "हिन्द महासागर",
 	"prefs-files": "फाइलहरू",
+	"prefs-help-signature": "कुरडी पानाका टिप्पणीहरू \"<nowiki>~~~~</nowiki>\" द्वारा दस्तखत गरिनुपडन्छ ,त्यो पछि तमरो दस्तखत र समयरेखामी रुपान्तरित हुनेछ ।",
 	"badsiglength": "तमरो दस्तखत मैथै लामो छ।\nयो $1 {{PLURAL:$1|अक्षर|अक्षरहरू}} भन्दा लामो हुनु हुँदैन ।",
 	"prefs-help-realname": "वास्तविक नाम ऐच्छिक हो ।\nतमीले खुलायौ भण्या तमरो कामको श्रेय दिनको लेखा यैको प्रयोग गरिन्या छ ।",
 	"prefs-help-prefershttps": "यो रोजाई तमरो अर्को  लग इन बठे लागु हुन्याछ ।",
+	"userrights-unchangeable-col": "तमीले परिवर्तन गद्द नसक्ने समूहहरू",
 	"userrights-conflict": "प्रयोगकर्ताको अधिकार परिवर्तनमी मतभेद भयो ! कृपया तमरो परिवर्तन पुनरावलोकन तथा पुष्टि गर ।",
 	"userrights-removed-self": "तमीले सफलतापूर्वक आफ्नो अधिकारहरूलाई मेटायौ । त्यै कारण तमी अब यो पानो हेद्द नाइसक्दा ।",
 	"group-user": "प्रयोगकर्ताहरू",
@@ -802,8 +819,6 @@
 	"rcshowhidemine": "$1 मेरा सम्पादनहरू",
 	"rcshowhidemine-show": "धेकाइदिय",
 	"rcshowhidemine-hide": "लुकाइदिय",
-	"rcshowhidecategorization-show": "धेकाउन्या",
-	"rcshowhidecategorization-hide": "लुकाउन्या",
 	"rclinks": "पछिल्ला $1 परिवर्तनहरू पछाडिका $2 दिनहरूमी<br />$3",
 	"diff": "फरक",
 	"hist": "इतिहास",
@@ -825,6 +840,7 @@
 	"upload-recreate-warning": "'''चेतावनी: त्यस नाममी रह्याका फाइलहरू सारियाको या हटायाको छ।'''\n\nयै पानाको सारियाको र हटायाको लग तमरो सहजताको लागि दियाको छ।",
 	"filedesc": "सारांश:",
 	"large-file": "यो सिफारिस गर्याछकि फाइलहरूको आकार $1 भन्दा ठूला हुनु हुँदैन;\nयै फाइलको आकार $2 छ ।",
+	"emptyfile": "तमीले अपलोड गर्याको फाइल रित्तो छ ।\nयो फाइल नाम गलत राख्याका कारणले भयाको हुनसकन्छ\nयो फाइल साँच्चै अपलोड गद्दे कुरडीमी निश्चित होइजाओ ।",
 	"fileexists": "यै नामको फाइल पैल्ली नैं छ, यदि तम परिवर्तन गद्या कुरडीमू सुनिश्चित छैनौ भण्या कृपया <strong>[[:$1]]</strong> जाँच गर।\n[[$1|thumb]]",
 	"filewasdeleted": "यै नामको एक फाइल पहिली पनि अपलोड गरिबर पछि हटाई सकियाको छ।\nपुनः अपलोड गद्दु पूर्व तम $1 लाई निक्करी जाँच गर ।",
 	"upload-dialog-title": "चित्र अपलोड गर",
@@ -863,6 +879,7 @@
 	"morelinkstoimage": "यै फाइलको [[Special:WhatLinksHere/$1|थप लिंकहरू]] हेर ।",
 	"sharedupload-desc-here": "यो फाइल $1 बठे हो र और  परियोजनाहरू बठे पन प्रयोग गद्द सकिन्याछ । \nताखाइ यैको [$2 फ़ाइल विवरण पानो]मि रयाका विवरण तल्तिर दियाको छ।",
 	"upload-disallowed-here": "तमलाई यो फाइल अधिलेखन गद्द नाइसक्का ।",
+	"filedelete-intro-old": "तमी <strong>[[Media:$1|$1]]</strong> को संस्करणलाई [$4 $3, $2] हुन्या गरि मेट्ट लाग्याछौ ।",
 	"filedelete-maintenance": "रखरखाव चलिरह्याको हुनाले अस्थायी रुपमी फाइलहरू मेट्ट्या र मेट्याकोलाई पुनर्बहाली गर्न निष्क्रिय गरियाकोछ।",
 	"mimesearch-summary": "MIME-प्रकार अनुसार फाइलहरू खोज्न यै पानाको प्रयोग गद्द सकिन्याछ ।\nइनपुट: फाइलको प्रकार/उपप्रकार, उदा. <code>image/jpeg</code>।",
 	"randompage": "कोइ एक लेख",
@@ -886,10 +903,13 @@
 	"newpages": "नयाँ पानाहरू",
 	"move": "नाम बदल",
 	"movethispage": "पानाको नाम बदल्न्या",
+	"notargettext": "यै कार्यका लेखाई तमीले कुनै लक्षित पानो वा प्रयोगकर्ता निर्दिष्ट गर्याको छैनौ ।",
+	"nopagetext": "तमीले खुलायाको गन्तव्य पानो अस्तित्वमी  छैन।",
 	"pager-older-n": "{{PLURAL:$1|पुरानो १|पुरानो $1}}",
 	"booksources": "किताबका श्रोतहरु",
 	"booksources-search-legend": "किताबका श्रोतहरु खोज्या",
 	"booksources-search": "खोज अर",
+	"booksources-text": "तल दियाको सूची नौला तथा पूराना किताब बेच्न्या लगायत तमीले खोज्याका किताबका बारेमी थप जानकारी भयाका अन्य साइटका लिंकहरू हुन् ।",
 	"log": "लगहरू",
 	"all-logs-page": "सब्बै सार्वजनिक लगहरू",
 	"allarticles": "सब्बै लेखहरू",
@@ -922,6 +942,7 @@
 	"confirmdeletetext": "तमी यो पानो र यैको इतिहास मेट्ट लाग्याछौ । कृपया पुष्टि गर कि [[{{MediaWiki:Policy-url}}|नियम]] मुताबिक तम मेट्ट लाग्याछौ।",
 	"dellogpage": "मेटाइयाको लग",
 	"delete-toobig": "यै पानाको सम्पादन इतिहास भौतै र  $1 {{PLURAL:$1|पुनरावलोक|पुनरावलोकहरू}}भन्दा बढी रह्याको छ।\n {{SITENAME}}मी दुर्घटनाको कारणले गडबडी आउनसक्द्या कुरडीलाई रोक्न यसा पानाहरूलाई मेट्नबठे निषेध गरियाको छ ।",
+	"deleteprotected": "यै पानालाई सुरक्षित गर्याकोले तमी यैलाई मेटाउन सक्दाइनौ ।",
 	"rollback": "सम्पादनहरू उल्टाउन्या",
 	"rollbacklink": "पैल्लिका रुपमि फर्काउन्या",
 	"rollbacklinkcount": "रोल्ब्याक $1 {{PLURAL:$1|सम्पादन|सम्पादनहरू}}",
@@ -981,7 +1002,9 @@
 	"block-log-flags-anononly": "नाम नभयाका प्रयोकर्ताहरू मात्र",
 	"proxyblockreason": "तमरो IP ठेगानामी रोक लगायाको छ किनकी यो खुला प्रोक्सी हो ।\nकृपया तमरो इन्टरनेट सेवा प्रदायक या प्राविधिक सहायतासँग सम्पर्क गरीबर यै सुरक्षा समस्याका बारेमी जानकारी गराओ ।",
 	"sorbsreason": "तमरो IP ठेगाना खुल्ला प्रोक्सीको रुपमी  DNSBL मा सूचीकरण गरिएको छ यैलाई{{SITENAME}}ले प्रयोगमी ल्यायाको छ।",
+	"sorbs_create_account_reason": "तमरो IP ठेगाना खुल्ला प्रोक्सीको रुपमी  DNSBL मी सूचीकरण गरियाको छ यैलाई{{SITENAME}}ले प्रयोगमी ल्यायाको छ ।\nतम खाता खोल्न नाइसक्दा ।",
 	"xffblockreason": "एउटा आइपि ठेगाना जुन X-Forwarded-For हेडरमी रह्याको छ, या त तमरो हो वा त्यै प्रक्सी सर्भरको हो जैको प्रयोग तमी गद्दा छौ रे यै माथि प्रतिबन्ध लगाइयाको छ । वास्तविक कारण थ्यो:$1",
+	"cant-see-hidden-user": "तमीले ब्लक गद्द खोज्याको प्रयोगकर्ता पहिले नै ब्लक गरि लुकाइ सक्याको छ ।\nतमीसँग hideuser अधिकार नभयाकोले यैलाई हेद्द या सम्पादन गद्द सक्दाइनौ ।",
 	"ipbblocked": "तमी अरु प्रयोगकर्तानहरूलाई ब्लक गर्न वा उनीहरूको ब्लक खोल्न नाइसक्दा किनभने तमी आफै ब्लक भयाका छौ ।",
 	"ipbnounblockself": "तमी आफुलाई आफै अनब्लक गद्द नाइ सक्दा ।",
 	"lockdbtext": "डेटाबेसमी ताला लगाउनाले सबै प्रयोगकर्ता पृष्ठ सम्पादन, आफ्नो रौजाईमी परिवर्तन, आफ्नो ध्यानसूचीमी सम्पादन, र अन्य वस्तु जैको लागि डेटाबेसमी परिवर्तन गरें हुन्छ, त्यैबठे वन्चित हुन्याछ । कृपया यो सुनिश्चित गर कि तम यो गर्न चाहन्छौ, र तम रक्षण पश्चात ताला खोल्न्या हौ ।",
@@ -989,6 +1012,9 @@
 	"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 सम्मको )",
 	"movepage-max-pages": "अधिकतम $1 {{PLURAL:$1|पाना|पानाहरू}}को नाम बदलि सकियाको छ र अरु स्वत: नाम बदलिन्या छैन ।",
@@ -1003,8 +1029,11 @@
 	"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 ठेगानाको रुपमी सम्पादन गद्दै छौ , त्यैको प्रयोगकर्ता पानो निम्न छ :",
 	"tooltip-pt-mytalk": "तमरो कुरडीकानी पानो",
 	"tooltip-pt-preferences": "तमरा अभिरुचिहरू",
 	"tooltip-pt-watchlist": "पृष्ठहरूको सूची जैका फेरबदलहरुलाई तमले पहरा गरिराखेका छौ ।",
@@ -1041,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": "टेम्प्लेट(नमूना) हेरिदिय",
@@ -1097,9 +1126,11 @@
 	"confirmemail_pending": "तमरो इमेलमी प्रपाणिकरण कोड पैल्ली नै पठाइ सकियाको छ;\nयदि तमले अल्लै खाता खोल्याका भया कोडका निउती पुन: अनुरोध गद्द अघाडी कोड नआइपुगुन्ज्या कृपया एक पल्ट पख ।",
 	"confirmemail_oncreate": "प्रमाणिकरण कोड तमरो इमेल ठेगानामी पठायाको छ ।\nयो कोड लगइन गद्दाका लागि अत्यवश्यक छैन, तर यै विकिमी इमेल ठेगानामी आधारित सेवाहरू उपभोग गद्द कोड उपलब्ध गराउनु पड्ड्या हुन्छ ।",
 	"confirmemail_sendfailed": "{{SITENAME}} प्रमाणिकरण इमेल पठाई सकियोन।\nतमरा इमेलमी अमान्य अक्षरहरू छन् कि जाँचियल ।\n\nमेलरले पठायाको त्रुटी रैबार: $1",
+	"confirmemail_needlogin": "तमीले आफ्नो इमेल प्रमाणिकरण गराउन $1 गद्दु पडन्छ ।",
 	"confirmemail_success": "तमरो इमेल ठेगाना प्रमाणिकरण गरियाको छ ।\nअब तमी [[Special:UserLogin|प्रवेश गरी]] विकिको मजा लिन सक्द्याहौ ।",
 	"confirmemail_loggedin": "तमरो इमेल ठेगाना प्रमाणित भयाको छ।",
 	"confirmrecreate": "प्रयोगकर्ता [[User:$1|$1]] ([[User talk:$1|कुरडी]])ले  तमले  सम्पादन सुरु गर्यापछि यो पानो मेट्याकाछन् । कारण थ्यो:\n: ''$2''\nकृपया सुनिश्चित गर कि तम यो पानो साँच्चै निर्माण गद्द चाहन्छौ ।",
+	"confirmrecreate-noreason": "प्रयोगकर्ता [[User:$1|$1]] ([[User talk:$1|कुरडी ]])ले यो पानो तमी सम्पादन गद्द थाल्या पछि मेट्याका छन् । यै पानालाई पुन: सिर्जना गद्दे भया कृपया पुष्टि गर ।",
 	"size-bytes": "$1 अक्षरहरू",
 	"size-kilobytes": "$1 किलोबाइट",
 	"size-megabytes": "$1 मेगाबाइट",
@@ -1110,7 +1141,7 @@
 	"watchlistedit-clear-explain": "तमरा ध्यान सूचीबठे सम्पूर्ण पाना हटाइया",
 	"watchlistedit-clear-done": "तमरो ध्यान सूची खाली गरीयाको छ।",
 	"watchlisttools-view": "आधारित फेरबदलीहरू हेर",
-	"signature": "[[{{एनस:प्रयोगकर्ता}}:$1|$2]]([[{{एनस:प्रयोगकर्ता_कुरडी}}:$1|कुरडी]])",
+	"signature": "[[{{ns:user}}:$1|$2]] ([[{{ns:user_talk}}:$1|कुरडी]])",
 	"specialpages": "खास पानो",
 	"specialpages-note": "* साधारण खास पानाहरू।\n* <span class=\"mw-specialpagerestricted\">निषेधित खास पानाहरू।</span>",
 	"specialpages-group-changes": "अल्लैका परिवर्तन लगहरू",
@@ -1118,9 +1149,21 @@
 	"tag-filter": "[[Special:Tags|पुछड]] छानिन्या",
 	"tag-list-wrapper": "([[Special:Tags|{{PLURAL:$1|ट्याग|ट्यागहरू}}]]: $2)",
 	"tags-hitcount": "$1 {{PLURAL:$1|परिवर्तन|परिवर्तनहरू}}",
+	"tags-create-no-name": "तमीले ट्याग नाम निर्दिष्ट गद्दु पड्ड्या हुन्छ ।",
 	"tags-create-warnings-below": "क्या तमी यो ट्याग बनाउन्या काम जारी राख्न चाहन्छौ ?",
+	"tags-delete-explanation-initial": "तमी ट्याग \"$1\" लाई डाटावेसबठे हटाउँन लाग्याछौ ।",
 	"tags-delete-explanation-warning": "यो क्रिया <strong>अपरिवर्तनीय</strong> हो र <strong>त्यसलाई परिवर्तन गर्न नाईसकिंदो</strong>, डेटाबेस प्रवन्धक पनि यैलाई केहि गद्द सक्दाइनन् । विश्वासपूर्ण रूपले तम तय गर कि तमी यै ट्यागलाई हटाउन चाहन्छौ ।",
+	"tags-activate-question": "तमी ट्याग \"$1\"लाई सक्रिय गद्द लाग्याछौ ।",
+	"tags-deactivate-question": "तमी ट्याग \"$1\" लाई निस्क्रिय गद्द लाग्याछौ ।",
+	"compare-invalid-title": "तमीले खुलायाको शिर्षक अमान्य छ ।",
+	"compare-title-not-exists": "तमीले खुलायाको शिर्षक उपलब्ध छैन ।",
+	"compare-revision-not-exists": "तमीले खुलायाको संस्करण उपलब्ध छैन ।",
+	"dberr-usegoogle": "तमी अहिले गुगलबठे खोज्न्या प्रयास गद्द सक्न्याहौ ।",
 	"htmlform-invalid-input": "तमले प्रविष्ठ गर्याका कुनै सामग्रीहरू ठिक नाइथिन्",
+	"htmlform-select-badoption": "तमीले खुलायाको मान मान्य विकल्प हैन ।",
+	"htmlform-float-invalid": "तमीले जनायाको मान कुनै संख्या हैन ।",
+	"htmlform-int-toolow": "तमीले जनायाको मान न्युनतम $1 भन्दा कम भयो ।",
+	"htmlform-int-toohigh": "तमीले जनायाको मान अधिकतम $1 भन्दा बढी भयो ।",
 	"logentry-delete-delete": "$1 बठे पानो $3 {{GENDER:$2|मेटाइयो}}",
 	"logentry-move-move": "$1 {{GENDER:$2|द्वारा}} $3 पृष्ठलाई $4 मि सारियो",
 	"logentry-newusers-create": "प्रयोगकर्ता खाता $1 {{GENDER:$2|खोलियो}}",
diff --git a/languages/i18n/egl.json b/languages/i18n/egl.json
index ac0a41574f..e79ad805d4 100644
--- a/languages/i18n/egl.json
+++ b/languages/i18n/egl.json
@@ -5,7 +5,8 @@
 			"Reder",
 			"Geitost",
 			"아라",
-			"Shirayuki"
+			"Shirayuki",
+			"Gloria sah"
 		]
 	},
 	"tog-underline": "Tîra 'na rîga sòta i colegamèint.",
@@ -336,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.",
@@ -495,7 +496,6 @@
 	"passwordreset": "Câmbia la cêva 'd ingrès",
 	"passwordreset-text-one": "Impés cól môdul ché per  turnêr a impustêr la tó cêva 'd ingrès.",
 	"passwordreset-text-many": "{{PLURAL:$1|Impés ûn di câmp per ricēver 'na cêva 'd ingrès pruvişôria per mèz ed la pôsta eletrônica}}",
-	"passwordreset-legend": "Tōrna mèter la cêva 'd ingrès",
 	"passwordreset-disabled": "In cla wiki ché an pōlen mia turnêr impustêr al cêvi 'd ingrès",
 	"passwordreset-emaildisabled": "In cla wiki ché è stê bluchê al funsiòun ed la pôsta eletrônica.",
 	"passwordreset-username": "Nòm utèint:",
@@ -506,7 +506,7 @@
 	"passwordreset-emailtitle": "Particulêr ed l'utèint só {{SITENAME}}",
 	"passwordreset-emailtext-ip": "Quelchidûn (prubabilmèint té, cun l'indirés IP $1) l'à dmandê de spidîregh 'na nōva cêva 'd ingrès per andêr dèinter a {{SITENAME}} ($4). {{PLURAL:$3|L'utèint inscrét| J utèint inscrét}} a sté indirés ed pôsta eletrônica în:\n \n$2 \n\n{{PLURAL:$3|Cla cêva 'd ingrès pruvişôria la scadrà| St' al cêvi 'd ingrès pruvişôri ché scadrân}} dôp {{PLURAL:$5|ûn dé|$5 dé}}. Ét duvrés andêr dèinter e sernîr 'na cêva 'd ingrès nōva adès. \n\nSe t'é mìa stê té a fêr la dmânda, o s' ét t'é ricurdê la cêva 'd ingrès uriginêla e an 't vō mia pió cambiêrla, ét pō scanşlêr cól mesâg ché e cuntinvêr a druvêr la tó cêva 'd ingrès vècia.",
 	"passwordreset-emailtext-user": "L'utèint $1 ed {{SITENAME}} l'à dmandê de spidîregh 'na nōva cêva 'd ingrès per andêr dèinter a {{SITENAME}} ($4). {{PLURAL:$3|L'utèint inscrét| J utèint inscrét}} a sté indirés ed pôsta eletrônica în:\n\n$2 \n\n{{PLURAL:$3|Cla cêva 'd ingrès pruvişôria ché la scadrà| St' al cêvi 'd ingrès pruvişôri ché scadrân}} dôp {{PLURAL:$5|ûn dé|$5 dé}}. Ét duvrés andêr dèinter e sernîr 'na cêva 'd ingrès nōva adès. \n\nSe t'é mìa stê té a fêr la dmânda, o s' ét t'é ricurdê la cêva 'd ingrès uriginêla e an 't vō mia pió cambiêrla, ét pō scanşlêr cól mesâg ché e cuntinvêr a druvêr la tó cêva 'd ingrès vècia",
-	"passwordreset-emailelement": "Nòm utèint: $1.\nCêva 'd ingrès pruvişôria: $2",
+	"passwordreset-emailelement": "Nòm utèint: \n$1\n.\nCêva 'd ingrès pruvişôria: \n$2",
 	"passwordreset-emailsent": "É stê spidî un mesâg ed pôsta eletrônica per turnêr a impustêr la cêva 'd ingrès.",
 	"passwordreset-emailsent-capture": "É stê spidî un mesâg ed pôsta eletrônica per turnêr a impustêr la cêva 'd ingrès, ché sòta a gh'é al tèst che gh'é scrét.",
 	"passwordreset-emailerror-capture": "É stê fât un mesâg ed pôsta eletrônica per turnêr a impustêr la cêva 'd ingrès, scréta ché 'd sègvit. La spedisiòun {{GENDER:$2|a l'utèint}} an n'é mia 'riusîda:$1",
@@ -522,7 +522,6 @@
 	"resettokens": "Tōrna 'd impustêr la cêva",
 	"resettokens-text": "Ché 't pō turnêr a impustêr al cêvi ch'ét permèten l'ingrès a precîşi infurmasiòun privêdi lighêdi a la tó utèinsa. Ét duvrés fêrel se per chêş ét j ê spartîdi cun quelchidûn o se al j infurmasiòun ed la tó utèinsa în  in perécol.",
 	"resettokens-no-tokens": "An gh'é mìa di token da turnêr a impustêr.",
-	"resettokens-legend": "Tōrna 'd impustêr la cêva",
 	"resettokens-tokens": " Token:",
 	"resettokens-token-label": "$1 (valōr 'd adèsa: $2)",
 	"resettokens-watchlist-token": "Token p'r al feed web (Atom/RSS) dal [[Special:Watchlist|mudéfichi al pàgini ch'ét tîn sòt' ôc]]",
@@ -1542,6 +1541,7 @@
 	"pageinfo-watchers": "Nómer  'd utèint che gh'àn la pàgina sòt ôc.",
 	"pageinfo-edits": "Nómer totêl dal mudéfichi",
 	"pageinfo-authors": "Nómer totêl di divêrs avtôr",
+	"pageinfo-toolboxlink": "Infurmasiòun in sìm'ala pàśna",
 	"previousdiff": "← Diferèinsa 'd préma",
 	"nextdiff": "Diferèinsa dôp →",
 	"file-info-size": "$1 × $2 pixel, amzûra dal file:$3, gèner MIME: $4",
@@ -1604,5 +1604,6 @@
 	"rightsnone": "(nisûn)",
 	"feedback-cancel": "Scanşela",
 	"feedback-message": "Mesâg",
-	"feedback-subject": "Argomèint:"
+	"feedback-subject": "Argomèint:",
+	"searchsuggest-search": "Sèirca"
 }
diff --git a/languages/i18n/el.json b/languages/i18n/el.json
index 03fe0c6c90..03e3cbb635 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": "Εντάξει",
@@ -462,6 +462,7 @@
 	"createacct-benefit-body2": "{{PLURAL:$1|σελίδα|σελίδες}}",
 	"createacct-benefit-body3": "πρόσφατοι {{PLURAL:$1|συνεισφέρων|συνεισφέροντες}}",
 	"badretype": "Οι κωδικοί που έχετε δηλώσει δεν συμφωνούν μεταξύ τους.",
+	"usernameinprogress": "Μία δημιουργία λογαριασμού για αυτό το όνομα χρήστη είναι ήδη σε εξέλιξη.\nΠαρακαλώ περιμένετε.",
 	"userexists": "Το όνομα χρήστη που εισαγάγατε βρίσκεται ήδη σε χρήση.\nΠαρακαλούμε, διαλέξτε ένα διαφορετικό.",
 	"loginerror": "Σφάλμα σύνδεσης",
 	"createacct-error": "Σφάλμα δημιουργίας λογαριασμού",
@@ -552,7 +553,7 @@
 	"passwordreset-emailtitle": "Λεπτομέρειες λογαριασμού για {{SITENAME}}",
 	"passwordreset-emailtext-ip": "Κάποιος (πιθανώς εσείς, από την διεύθυνση IP $1) ζήτησε την επαναφορά του κωδικού σας σε {{SITENAME}} ($4).  {{PLURAL:$3|Ο ακόλουθος λογαριασμός|Οι ακόλουθοι λογαριασμοί}} χρήστη συνδέονται με αυτή τη διεύθυνση e-mail:\n\n$2\n\n{{PLURAL:$3|Αυτός ο προσωρινός κωδικός πρόσβασης θα λήξει|Αυτοί οι προσωρινοί κωδικοί πρόσβασης θα λήξουν}} σε {{PLURAL:$5|μία ημέρα|$5 ημέρες}}.\nΘα πρέπει να συνδεθείτε τώρα και να επιλέξετε ένα νέο κωδικό. Αν κάποιος άλλος έκανε αυτό το αίτημα ή αν έχετε θυμηθεί τον αρχικό κωδικό πρόσβασής σας, και δεν επιθυμείτε πια να τον αλλάξετε, μπορείτε να αγνοήσετε αυτό το μήνυμα και να συνεχίσετε να χρησιμοποιείτε τον παλιό σας κωδικό πρόσβασης.",
 	"passwordreset-emailtext-user": "Ο χρήστης $1 στη {{SITENAME}} ζήτησε μια επαναφορά του κωδικού πρόσβασης σας σε {{SITENAME}} ($4). {{PLURAL:$3|Ο ακόλουθος λογαριασμός|Οι ακόλουθοι λογαριασμοί}} χρήστη συνδέονται με αυτή τη διεύθυνση e-mail:\n\n$2\n\n{{PLURAL:$3|Αυτός ο προσωρινός κωδικός πρόσβασης θα λήξει| Αυτοί οι προσωρινοί κωδικοί πρόσβασης θα λήξουν}} σε {{PLURAL:$5| μία ημέρα| $5 ημέρες}}.\nΘα πρέπει να συνδεθείτε τώρα και να επιλέξετε ένα νέο κωδικό. Αν κάποιος άλλος έκανε αυτό το αίτημα ή αν έχετε θυμηθεί τον αρχικό κωδικό πρόσβασής σας, και δεν επιθυμείτε πια να τον αλλάξετε, μπορείτε να αγνοήσετε αυτό το μήνυμα και να συνεχίσετε να χρησιμοποιείτε τον παλιό σας κωδικό πρόσβασης.",
-	"passwordreset-emailelement": "Όνομα χρήστη: $1\nΠροσωρινός κωδικός πρόσβασης:$2",
+	"passwordreset-emailelement": "Όνομα χρήστη: \n$1\n\nΠροσωρινός κωδικός πρόσβασης:\n$2",
 	"passwordreset-emailsent": "Έχει αποσταλεί email επαναφοράς κωδικού.",
 	"passwordreset-emailsent-capture": "Έχει αποσταλεί email επαναφοράς κωδικού, το οποίο φαίνεται πιο κάτω.",
 	"passwordreset-emailerror-capture": "Ένα email επαναφοράς κωδικού έχει δημιουργηθεί, το οποίο φαίνεται πιο κάτω, αλλά απέτυχε η αποστολή του στο  {{GENDER:$2|χρήστη}}: $1",
@@ -681,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": "Εμφάνιση πλήρους αρχείου",
@@ -951,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|ημέρα|ημέρες}} το μέγιστο)",
@@ -1321,6 +1323,8 @@
 	"uploaded-event-handler-on-svg": "Δεν επιτρέπεται ο ορισμός ιδιοτήτων χειρισμού συμβάντων <code>$1=\"$2\"</code> σε αρχεία SVG.",
 	"uploaded-href-attribute-svg": "Δεν επιτρέπονται οι ιδιότητες href <code>&lt;$1 $2=\"$3\"&gt;</code> με μη τοπικό προορισμό (π.χ. http://, javascript:, κ.τ.λ.) σε αρχεία SVG.",
 	"uploaded-href-unsafe-target-svg": "Βρέθηκε href προς έναν μη ασφαλή προορισμό <code>&lt;$1 $2=\"$3\"&gt;</code> στο ανεβασμένο αρχείο SVG.",
+	"uploaded-animate-svg": "Βρέθηκε μία ετικέτα <code>&lt;animate&gt;</code> που ίσως να αλλάζει το href, με την ιδιότητα \"from\" <code>&lt;$1 $2=\"$3\"&gt;</code> στο ανεβασμένο αρχείο SVG.",
+	"uploaded-setting-event-handler-svg": "Η ρύθμιση ιδιοτήτων χειρισμού σφαλμάτων είναι αποκλεισμένη, βρέθηκε <code>&lt;$1 $2=\"$3\"&gt;</code> στο ανεβασμένο αρχείο SVG.",
 	"uploaded-setting-href-svg": "Η χρήση της ετικέτας «set» για την προσθήκη του χαρακτηριστικού «href» στο γονικό στοιχείο είναι αποκλεισμένη.",
 	"uploaded-wrong-setting-svg": "Η χρήση της ετικέτας «set» για την προσθήκη απομακρυσμένου προορισμού/προορισμού δεδομένων/προορισμού δέσμης ενεργειών είναι αποκλεισμένη. Βρέθηκε <code>&lt;set to=\"$1\"&gt;</code> στο ανεβασμένο αρχείο SVG.",
 	"uploaded-setting-handler-svg": "Κάθε SVG που θέτει το χαρακτηριστικό «χειρισμού» με απομακρυσμένο προορισμό/προορισμό δεδομένων/προορισμό δέσμης ενεργειών είναι αποκλεισμένο. Βρέθηκε <code>$1=\"$2\"</code> στο ανεβασμένο αρχείο SVG.",
@@ -1356,6 +1360,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-backup": "Αδύνατη η δημιουργία αντίγραφου ασφαλείας του αρχείου $1.",
 	"backend-fail-notexists": "Το αρχείο $1 δεν υπάρχει.",
@@ -1392,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! Δεν μπορεί να ελεγχθεί  δεόντως ως προς την ασφάλεια.",
@@ -1513,6 +1531,7 @@
 	"unwatchedpages": "Μη παρακολουθούμενες σελίδες",
 	"listredirects": "Λίστα ανακατευθύνσεων",
 	"listduplicatedfiles": "Κατάλογος αρχείων με διπλότυπα",
+	"listduplicatedfiles-summary": "Αυτή είναι μια λίστα αρχείων, όπου η πιο πρόσφατη έκδοση του κάθε αρχείου είναι ένα αντίγραφο της πιο πρόσφατης έκδοσης κάποιου άλλου αρχείου. Μόνο τοπικά αρχεία λαμβάνονται υπόψη.",
 	"listduplicatedfiles-entry": "Το [[:File:$1|$1]] έχει [[$3|{{PLURAL:$2|διπλότυπο|$2 διπλότυπα}}]].",
 	"unusedtemplates": "Αχρησιμοποίητα πρότυπα",
 	"unusedtemplatestext": "Αυτή η σελίδα περιέχει όλες τις σελίδες στην περιοχή ονομάτος των {{ns:template}}, οι οποίες δεν περιλαμβάνονται σε άλλη σελίδα. Θυμηθείτε να ελέγξετε για άλλους συνδέσμους προς τα πρότυπα πριν τα διαγράψετε.",
@@ -1546,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]].",
@@ -1580,6 +1601,7 @@
 	"unusedimages": "Αχρησιμοποίητες εικόνες",
 	"wantedcategories": "Επιθυμητές κατηγορίες",
 	"wantedpages": "Ζητούμενες σελίδες",
+	"wantedpages-summary": "Λίστα των ανύπαρκτων σελίδων με τους περισσότερους συνδέσμους προς αυτές, εξαιρουμένων των σελίδων στις οποίες συνδέονται μόνο σελίδες ανακατεύθυνσης. Για μία λίστα με τις ανύπαρκτες σελίδες στις οποίες συνδέονται σελίδες ανακατεύθυνσης, δείτε [[{{#special:BrokenRedirects}}| τη λίστα με τις λανθασμένες ανακατευθύνσεις]].",
 	"wantedpages-badtitle": "Μη εγκυρός τίτλος στο σύνολο αποτελέσματος: $1",
 	"wantedfiles": "Ζητούμενα αρχεία",
 	"wantedfiletext-cat": "Τα ακόλουθα αρχεία χρησιμοποιούνται αλλά δεν υπάρχουν. Αρχεία από εξωτερικά αποθετήρια ενδέχεται να παρατίθενται παρότι υπάρχουν. Κάθε τέτοιες λανθασμένες αναφορές θα <del>διαγραμμίζονται</del>. Επιπλέον, σελίδες που ενσωματώνουν αρχεία που δεν υπάρχουν παρατίθενται στο [[:$1]].",
@@ -1603,6 +1625,7 @@
 	"deadendpagestext": "Οι σελίδες που ακολουθούν δεν συνδέονται με άλλες σελίδες στο {{SITENAME}}.",
 	"protectedpages": "Προστατευμένες σελίδες",
 	"protectedpages-indef": "Προστασίες επαόριστον μόνο",
+	"protectedpages-summary": "Αυτή η σελίδα περιέχει υπάρχουσες σελίδες που τώρα είναι προστατευμένες. Για μία λίστα τίτλων που προστατεύονται από τη δημιουργία των σελίδων, δείτε τους [[{{#special:ProtectedTitles}}|Προστατευμένους τίτλους]].",
 	"protectedpages-cascade": "Μόνο διαδοχικές προστασίες",
 	"protectedpages-noredirect": "Απόκρυψη ανακατευθύνσεων",
 	"protectedpagesempty": "Καμία σελίδα με αυτές τις παραμέτρους δεν είναι προς το παρόν προστατευμένη.",
@@ -1615,6 +1638,7 @@
 	"protectedpages-unknown-timestamp": "Άγνωστο",
 	"protectedpages-unknown-performer": "Άγνωστος χρήστης",
 	"protectedtitles": "Προστατευμένοι τίτλοι",
+	"protectedtitles-summary": "Αυτή η σελίδα περιέχει τίτλους που προστατεύονται από δημιουργία σελίδας. Για μία λίστα υπάρχουσων σελίδων που προστατεύονται, δείτε τις [[{{#special:ProtectedPages}}|{{int:protectedpages}}]].",
 	"protectedtitlesempty": "Δεν υπάρχουν προστατευμένοι τίτλοι με αυτές τις παραμέτρους.",
 	"listusers": "Κατάλογος χρηστών",
 	"listusers-editsonly": "Εμφάνιση μόνο των χρηστών με επεξεργασίες",
@@ -1646,7 +1670,7 @@
 	"booksources-text": "Παρακάτω είναι μια λίστα συνδέσμων σε άλλους ιστοτόπους οι οποίοι πωλούν νέα και μεταχειρισμένα βιβλία, και μπορεί επίσης να έχουν περισσότερες πληροφορίες για βιβλία για τα οποία ψάχνετε:",
 	"booksources-invalid-isbn": "Το δοσμένο ISBN δεν φαίνεται να είναι έγκυρο· ελέγξτε για λάθη κατά την αντιγραφή από την αρχική πηγή.",
 	"specialloguserlabel": "",
-	"speciallogtitlelabel": "Στόχος (τίτλος ή χρήστης):",
+	"speciallogtitlelabel": "Στόχος (τίτλος ή {{ns:user}}:χρήστης για χρήστη):",
 	"log": "Αρχεία καταγραφών",
 	"all-logs-page": "Όλες οι δημόσιες καταγραφές γεγονότων",
 	"alllogstext": "Εποπτική εμφάνιση όλων των ενεργειών φόρτωσης αρχείων, διαγραφής, προστασίας, φραγής και όλων των καταγραφών των διαχειριστών στο αρχείο γεγονότων του {{SITENAME}}. Μπορείτε να περιορίσετε τα αποτελέσματα που εμφανίζονται επιλέγοντας συγκεκριμένο είδος γεγονότων, όνομα χρήστη ή τη σελίδα που επηρεάστηκε.",
@@ -1732,7 +1756,6 @@
 	"emailuser": "Αποστολή μηνύματος ηλεκτρονικού ταχυδρομείου σε αυτόν τον χρήστη",
 	"emailuser-title-target": "Αποστολή e-mail {{GENDER:$1|στο|στη}} χρήστη",
 	"emailuser-title-notarget": "Αποστολή e-mail σε χρήστη",
-	"emailpage": "Αποστολή μηνύματος ηλεκτρονικού ταχυδρομείο στο χρήστη",
 	"emailpagetext": "Μπορείτε να χρησιμοποιήσετε την παρακάτω φόρμα για να στείλετε ένα μήνυμα ηλεκτρονικού ταχυδρομείου σε {{GENDER:$1|αυτόν το χρήστη|αυτήν τη χρήστρια}}.\nΗ διεύθυνση ηλεκτρονικού ταχυδρομείου που έχετε εισαγάγει στις [[Special:Preferences|προτιμήσεις χρήστη σας]] θα εμφανιστεί ως διεύθυνση αποστολέα του μηνύματος ηλεκτρονικού ταχυδρομείου, ούτως ώστε ο παραλήπτης να μπορέσει να απαντήσει απευθείας σε σας.",
 	"defemailsubject": "{{SITENAME}} e-mail από τον χρήστη \"$1\"",
 	"usermaildisabled": "To e-mail χρήστη είναι απενεργοποιημένο",
@@ -1754,7 +1777,7 @@
 	"emailccsubject": "Αντίγραφο του μηνυματός σας στο $1: $2",
 	"emailsent": "Το μήνυμα έχει σταλεί",
 	"emailsenttext": "Το μήνυμά σας έχει σταλεί.",
-	"emailuserfooter": "Αυτό το μήνυμα ηλεκτρονικού ταχυδρομείου στάλθηκε από {{GENDER:$1|το χρήστη|τη χρήστρια}} $1 σ{{GENDER:$2|το χρήστη|τη χρήστρια}} $2 μέσω της λειτουργίας «{{int:emailpage}}» στο {{SITENAME}}.",
+	"emailuserfooter": "Αυτό το μήνυμα ηλεκτρονικού ταχυδρομείου στάλθηκε από {{GENDER:$1|το χρήστη|τη χρήστρια}} $1 σ{{GENDER:$2|το χρήστη|τη χρήστρια}} $2 μέσω της λειτουργίας «{{int:emailuser}}» στο {{SITENAME}}.",
 	"usermessage-summary": "Φεύγετε από τις ειδοποιήσεις συστήματος.",
 	"usermessage-editor": "Μηνύματα συστήματος",
 	"usermessage-template": "MediaWiki:UserMessage",
@@ -1765,10 +1788,10 @@
 	"watchlistanontext": "Παρακαλούμε συνδεθείτε για να δείτε ή να επεξεργαστείτε αντικείμενα στη λίστα παρακολούθησής σας.",
 	"watchnologin": "Δεν έχετε συνδεθεί.",
 	"addwatch": "Προσθήκη στη λίστα παρακολούθησης",
-	"addedwatchtext": "Η σελίδα «[[:$1]]» έχει προστεθεί στη [[Special:Watchlist|λίστα παρακολούθησής σας]].\nΜελλοντικές αλλαγές σε αυτή τη σελίδα και στη συσχετισμένη σελίδα συζήτησής της θα εμφανίζονται εδώ.",
+	"addedwatchtext": "Το λήμμα «[[:$1]]» και η σελίδα συζήτησής του έχουν προστεθεί στη [[Special:Watchlist|λίστα παρακολούθησής]] σας.",
 	"addedwatchtext-short": "Η σελίδα «$1» έχει προστεθεί στην λίστα παρακολούθησής σας.",
 	"removewatch": "Αφαίρεση από τη λίστα παρακολούθησης",
-	"removedwatchtext": "Η σελίδα \"[[:$1]]\" έχει αφαιρεθεί από [[Special:Watchlist|τη λίστα παρακολούθησής σας]].",
+	"removedwatchtext": "Το λήμμα «[[:$1]]» και η σελίδα συζήτησής του έχουν αφαιρεθεί από τη [[Special:Watchlist|λίστα παρακολούθησής]] σας.",
 	"removedwatchtext-short": "Η σελίδα «$1» έχει αφαιρεθεί από τη λίστα παρακολούθησής σας.",
 	"watch": "Παρακολούθηση",
 	"watchthispage": "Παρακολούθηση αυτής της σελίδας",
@@ -1841,6 +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]]»",
@@ -1864,7 +1895,7 @@
 	"protect-locked-blocked": "Δεν μπορείτε να αλλάξετε επίπεδα προστασίας ενώ είστε σε φραγή.\nΕδώ είναι οι τρέχουσες ρυθμίσεις για τη σελίδα '''$1''':",
 	"protect-locked-dblock": "Τα επίπεδα προστασίας δεν μπορούν να αλλαχθούν λόγω ενός ενεργού κλεδώματος της βάσης δεδομένων.\nΕδώ είναι οι τρέχουσες ρυθμίσεις για τη σελίδα '''$1''':",
 	"protect-locked-access": "Ο λογαριασμός σας δεν έχει δικαίωμα να αλλάξει τα επίπεδα προστασίας σελίδας.\nΕδώ είναι οι τρέχουσες ρυθμίσεις για τη σελίδα '''$1''':",
-	"protect-cascadeon": "Αυτή η σελίδα είναι προς το παρόν προστατευμένη επειδή περιλαμβάνεται {{PLURAL:$1|στην ακόλουθη σελίδα, η οποία έχει|στις ακόλουθες σελίδες, οι οποίες έχουν}} τη διαδοχική προστασία ενεργοποιημένη. Αλλαγές στο επίπεδο προστασίας αυτής της σελίδας δεν θα επηρεάσουν τη διαδοχική προστασία.",
+	"protect-cascadeon": "Αυτή η σελίδα είναι προς το παρόν προστατευμένη επειδή ενσωματώνεται {{PLURAL:$1|στην ακόλουθη σελίδα, η οποία έχει|στις ακόλουθες σελίδες, οι οποίες έχουν}} τη διαδοχική προστασία ενεργοποιημένη. Αλλαγές στο επίπεδο προστασίας αυτής της σελίδας δεν θα επηρεάσουν τη διαδοχική προστασία.",
 	"protect-default": "Να επιτρέπονται όλοι οι χρήστες",
 	"protect-fallback": "Να επιτρέπεται μόνο σε χρήστες με δικαιώματα «$1»",
 	"protect-level-autoconfirmed": "Να επιτρέπονται μόνο αυτοεπιβεβαιωμένοι χρήστες",
@@ -1903,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πριν τη διαγραφή. Το αρχικό κείμενο αυτών των διεγραμμένων αναθεωρήσεων είναι διαθέσιμο μόνο στους διαχειριστές.",
@@ -2086,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": "Δεν έχετε το δικαίωμα να βγάλετε την φραγή από τον εαυτό σας",
@@ -2309,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": "Δείτε το μήνυμα του συστήματος",
@@ -2351,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": "Ιστορικό επεξεργασίας",
@@ -2367,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": "Υποσελίδες αυτής της σελίδας",
@@ -2382,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": "Ναι",
@@ -2411,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",
@@ -2843,7 +2878,7 @@
 	"deletedwhileediting": "'''Προσοχή''': Αυτή η σελίδα έχει διαγραφεί αφότου ξεκινήσατε την επεξεργασία!",
 	"confirmrecreate": "Ο χρήστης [[User:$1|$1]] ([[User talk:$1|συζήτηση]]) διέγραψε αυτή τη σελίδα αφότου ξεκινήσατε την επεξεργασία με αιτιολόγηση:\n: ''$2''\nΠαρακαλώ επιβεβαιώστε ότι θέλετε πραγματικά να ξαναδημιουργήσετε αυτή τη σελίδα.",
 	"confirmrecreate-noreason": "Ο χρήστης [[User:$1|$1]] ([[User talk:$1|συζήτηση]]) διέγραψε αυτή τη σελίδα αφότου ξεκινήσατε την επεξεργασία.\nΠαρακαλούμε επιβεβαιώστε ότι θέλετε πραγματικά να ξαναδημιουργήσετε αυτή τη σελίδα.",
-	"recreate": "Η σελίδα έχει διαγραφεί από τότε που αρχίσατε να την επεξεργάζεστε. Πατήστε \"$1\" για να τη δημιουργήσετε ξανά.",
+	"recreate": "Αναδημιουργία",
 	"confirm_purge_button": "Εντάξει",
 	"confirm-purge-top": "Καθαρισμός της λανθάνουσας μνήμης αυτής της σελίδας.",
 	"confirm-purge-bottom": "Η εκκαθάριση μιας σελίδας εκκαθαρίζει την μνήμη cache και εξαναγκάζει την πλέον πρόσφατη έκδοση να εμφανιστεί.",
@@ -2903,6 +2938,8 @@
 	"watchlisttools-raw": "Επεξεργασία πρωτογενούς λίστας παρακολούθησης",
 	"signature": "[[{{ns:user}}:$1|$2]] ([[{{ns:user_talk}}:$1|συζήτηση]])",
 	"duplicate-defaultsort": "'''Προειδοποίηση:''' Το προεπιλεγμένο κλειδί ταξινόμησης «$2» υπερισχύει του προηγούμενου προεπιλεγμένου κλειδιού «$1».",
+	"duplicate-displaytitle": "<strong>Προειδοποίηση:</strong> Ο εμφανιζόμενος τίτλος «$2» παρακάμπτει τον προηγούμενο «$1».",
+	"invalid-indicator-name": "<strong>Σφάλμα:</strong> Η ιδιότητα <code>name</code> των δεικτών κατάστασης σελίδων δεν πρέπει να είναι κενή.",
 	"version": "Έκδοση",
 	"version-extensions": "Εγκαταστημένες επεκτάσεις",
 	"version-skins": "Εγκατεστημένα θέματα εμφάνισης",
@@ -2945,6 +2982,9 @@
 	"version-libraries": "Εγκαταστημένες βιβλιοθήκες",
 	"version-libraries-library": "Βιβλιοθήκη",
 	"version-libraries-version": "Έκδοση",
+	"version-libraries-license": "Άδεια χρήσης",
+	"version-libraries-description": "Περιγραφή",
+	"version-libraries-authors": "Δημιουργοί",
 	"redirect": "Ανακατεύθυνση κατά αρχείο, χρήστη, σελίδα ή αναγνωριστικό αναθεώρησης",
 	"redirect-legend": "Ανακατεύθυνση σε ένα αρχείο ή μια σελίδα",
 	"redirect-submit": "Μετάβαση",
@@ -3024,6 +3064,8 @@
 	"tags-delete-reason": "Αιτία:",
 	"tags-delete-submit": "Μη αναστρέψιμη διαγραφή αυτής της ετικέτας",
 	"tags-delete-not-found": "Η ετικέτα «$1» δεν υπάρχει.",
+	"tags-delete-too-many-uses": "Η ετικέτα «$1» εφαρμόζεται σε πάνω από {{PLURAL:$2|μία αναθεώρηση|$2 αναθεωρήσεις}}, που σημαίνει ότι δεν μπορεί να διαγραφεί.",
+	"tags-delete-warnings-after-delete": "Η ετικέτα «$1» διαγράφηκε με επιτυχία, αλλά {{PLURAL:$2|προέκυψε η ακόλουθη προειδοποίηση|προέκυψαν οι ακόλουθες προειδοποιήσεις}}:",
 	"tags-activate-title": "Ενεργοποίηση ετικέτας",
 	"tags-activate-question": "Πρόκειται να ενεργοποιήσετε την ετικέτα «$1».",
 	"tags-activate-reason": "Αιτία:",
@@ -3043,6 +3085,9 @@
 	"tags-update-remove-not-allowed-one": "Η ετικέτα «$1» δεν επιτρέπεται να αφαιρεθεί.",
 	"tags-edit-title": "Επεξεργασία ετικετών",
 	"tags-edit-manage-link": "Διαχείριση ετικετών",
+	"tags-edit-logentry-selected": "{{PLURAL:$1|Επιλεγμένο γεγονός|Επιλεγμένα γεγονότα}} αρχείου καταγραφής:",
+	"tags-edit-revision-legend": "Προσθαφαιρέσετε ετικέτες {{PLURAL:$1|από αυτή την αναθεώρηση|και από τις $1 αναθεωρήσεις}}",
+	"tags-edit-logentry-legend": "Προσθαφαιρέσετε ετικέτες {{PLURAL:$1|από αυτήν την καταχώριση|και από τις $1 καταχωρίσεις}} του αρχείου καταγραφής",
 	"tags-edit-existing-tags": "Υπάρχουσες ετικέτες:",
 	"tags-edit-existing-tags-none": "''Καμία''",
 	"tags-edit-new-tags": "Νέες ετικέτες:",
@@ -3052,6 +3097,8 @@
 	"tags-edit-chosen-placeholder": "Επιλέξτε μερικές ετικέτες",
 	"tags-edit-chosen-no-results": "Δεν βρέθηκαν ετικέτες που να ταιριάζουν",
 	"tags-edit-reason": "Αιτία:",
+	"tags-edit-revision-submit": "Εφαρμογή αλλαγών σε {{PLURAL:$1|αυτή την αναθεώρηση|$1 αναθεωρήσεις}}",
+	"tags-edit-logentry-submit": "Εφαρμογή αλλαγών σε {{PLURAL:$1|αυτήν την καταχώρηση|$1 καταχωρήσεις}} του αρχείου καταγραφής",
 	"tags-edit-success": "Οι αλλαγές εφαρμόστηκαν με επιτυχία.",
 	"tags-edit-failure": "Οι αλλαγές δεν ήταν δυνατόν να εφαρμοστούν:\n$1",
 	"tags-edit-nooldid-title": "Μη έγκυρη αναθεώρηση προορισμού",
@@ -3088,6 +3135,9 @@
 	"htmlform-cloner-create": "Προσθήκη περισσοτέρων",
 	"htmlform-cloner-delete": "Αφαίρεση",
 	"htmlform-cloner-required": "Απαιτείται τουλάχιστον μία τιμή.",
+	"htmlform-title-not-exists": "Ο τίτλος [[:$1]] δεν υπάρχει.",
+	"htmlform-user-not-exists": "Δεν υπάρχει χρήστης με όνομα <strong>$1</strong>.",
+	"htmlform-user-not-valid": "Το <strong>$1</strong> δεν είναι έγκυρο όνομα χρήστη.",
 	"sqlite-has-fts": "$1 με υποστήριξη αναζήτησης πλήρους κειμένου",
 	"sqlite-no-fts": "$1 χωρίς την υποστήριξη αναζήτησης πλήρους κειμένου",
 	"logentry-delete-delete": "{{GENDER:$1|Ο|Η}} $1 διέγραψε τη σελίδα $3",
@@ -3136,7 +3186,12 @@
 	"logentry-upload-revert": "{{GENDER:$2|Ο|Η}} $1 ανέβασε το $3",
 	"log-name-managetags": "Αρχείο καταγραφών διαχείρισης ετικετών",
 	"logentry-managetags-create": "{{GENDER:$2|Ο|Η}} $1 δημιούργησε την ετικέτα «$4»",
+	"logentry-managetags-delete": "{{GENDER:$2|Ο|Η}} $1 διέγραψε την ετικέτα «$4» (αφαιρέθηκε από $5 {{PLURAL:$5|αναθεώρηση ή καταχώρηση αρχείου καταγραφής|αναθεωρήσεις και/ή καταχωρήσεις του αρχείου καταγραφής}})",
+	"logentry-managetags-deactivate": "{{GENDER:$2|Ο|Η}} $1 απενεργοποίησε την ετικέτα «$4» για χρήση από χρήστες και bots",
 	"log-name-tag": "Αρχείο καταγραφών ετικετών",
+	"logentry-tag-update-add-revision": "{{GENDER:$2|Ο|Η}} $1 πρόσθεσε {{PLURAL:$7|την ετικέτα|τις ετικέτες}} $6 στην αναθεώρηση $4 της σελίδας $3",
+	"logentry-tag-update-remove-revision": "{{GENDER:$2|Ο|Η}} $1 αφαίρεσε {{PLURAL:$9|την ετικέτα|τις ετικέτες}} $8 από την αναθεώρηση $4 της σελίδας $3",
+	"logentry-tag-update-revision": "{{GENDER:$2|Ο|Η}} $1 ενημέρωσε ετικέτες στην αναθεώρηση $4 της σελίδας $3 (πρόσθεσε {{PLURAL:$7|την|τις}} $6• αφαίρεσε {{PLURAL:$9|την|τις}} $8)",
 	"rightsnone": "(κανένα)",
 	"revdelete-summary": "επεξεργασία σύνοψης",
 	"feedback-adding": "Προσθήκη σχολίων στην σελίδα...",
@@ -3158,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.",
@@ -3297,6 +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-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 d50190677a..3bf72d5c0b 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -7,7 +7,6 @@
 	"tog-hideminor": "Hide minor edits from recent changes",
 	"tog-hidepatrolled": "Hide patrolled edits from recent changes",
 	"tog-newpageshidepatrolled": "Hide patrolled pages from new page list",
-	"tog-hidecategorization": "Hide categorization of pages",
 	"tog-extendwatchlist": "Expand watchlist to show all changes, not just the most recent",
 	"tog-usenewrc": "Group changes by page in recent changes and watchlist",
 	"tog-numberheadings": "Auto-number headings",
@@ -37,7 +36,6 @@
 	"tog-watchlisthideliu": "Hide edits by logged in users from the watchlist",
 	"tog-watchlisthideanons": "Hide edits by anonymous users from the watchlist",
 	"tog-watchlisthidepatrolled": "Hide patrolled edits from the watchlist",
-	"tog-watchlisthidecategorization": "Hide categorization of pages",
 	"tog-ccmeonemails": "Send me copies of emails I send to other users",
 	"tog-diffonly": "Do not show page content below diffs",
 	"tog-showhiddencats": "Show hidden categories",
@@ -551,7 +549,7 @@
 	"passwordreset-emailtitle": "Account details on {{SITENAME}}",
 	"passwordreset-emailtext-ip": "Someone (probably you, from IP address $1) requested a reset of your\npassword for {{SITENAME}} ($4). The following user {{PLURAL:$3|account is|accounts are}}\nassociated with this email address:\n\n$2\n\n{{PLURAL:$3|This temporary password|These temporary passwords}} will expire in {{PLURAL:$5|one day|$5 days}}.\nYou should log in and choose a new password now. If someone else made this\nrequest, or if you have remembered your original password, and you no longer\nwish to change it, you may ignore this message and continue using your old\npassword.",
 	"passwordreset-emailtext-user": "User $1 on {{SITENAME}} requested a reset of your password for {{SITENAME}}\n($4). The following user {{PLURAL:$3|account is|accounts are}} associated with this email address:\n\n$2\n\n{{PLURAL:$3|This temporary password|These temporary passwords}} will expire in {{PLURAL:$5|one day|$5 days}}.\nYou should log in and choose a new password now. If someone else made this\nrequest, or if you have remembered your original password, and you no longer\nwish to change it, you may ignore this message and continue using your old\npassword.",
-	"passwordreset-emailelement": "Username: $1\nTemporary password: $2",
+	"passwordreset-emailelement": "Username:\n$1\n\nTemporary password:\n$2",
 	"passwordreset-emailsent": "A password reset email has been sent.",
 	"passwordreset-emailsent-capture": "A password reset email has been sent, which is shown below.",
 	"passwordreset-emailerror-capture": "A password reset email was generated, which is shown below, but sending it to the {{GENDER:$2|user}} failed: $1",
@@ -975,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}}",
@@ -1260,9 +1259,6 @@
 	"rcshowhidemine": "$1 my edits",
 	"rcshowhidemine-show": "Show",
 	"rcshowhidemine-hide": "Hide",
-	"rcshowhidecategorization": "$1 page categorization",
-	"rcshowhidecategorization-show": "Show",
-	"rcshowhidecategorization-hide": "Hide",
 	"rclinks": "Show last $1 changes in last $2 days<br />$3",
 	"diff": "diff",
 	"hist": "hist",
@@ -1289,10 +1285,6 @@
 	"recentchangeslinked-summary": "This is a list of changes made recently to pages linked from a specified page (or to members of a specified category).\nPages on [[Special:Watchlist|your watchlist]] are <strong>bold</strong>.",
 	"recentchangeslinked-page": "Page name:",
 	"recentchangeslinked-to": "Show changes to pages linked to the given page instead",
-	"recentchanges-page-added-to-category": "[[:$1]] added to category",
-	"recentchanges-page-added-to-category-bundled": "[[:$1]] and {{PLURAL:$2|one page|$2 pages}} added to category",
-	"recentchanges-page-removed-from-category": "[[:$1]] removed from category",
-	"recentchanges-page-removed-from-category-bundled": "[[:$1]] and {{PLURAL:$2|one page|$2 pages}} removed from category",
 	"upload": "Upload file",
 	"uploadbtn": "Upload file",
 	"reuploaddesc": "Cancel upload and return to the upload form",
@@ -1763,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).",
@@ -1857,7 +1849,6 @@
 	"emailuser-title-target": "Email this {{GENDER:$1|user}}",
 	"emailuser-title-notarget": "Email user",
 	"emailuser-summary": "",
-	"emailpage": "Email user",
 	"emailpagetext": "You can use the form below to send an email message to this {{GENDER:$1|user}}.\nThe email address you entered in [[Special:Preferences|your user preferences]] will appear as the \"From\" address of the email, so the recipient will be able to reply directly to you.",
 	"defemailsubject": "{{SITENAME}} email from user \"$1\"",
 	"usermaildisabled": "User email disabled",
@@ -1879,7 +1870,7 @@
 	"emailccsubject": "Copy of your message to $1: $2",
 	"emailsent": "Email sent",
 	"emailsenttext": "Your email message has been sent.",
-	"emailuserfooter": "This email was sent by $1 to $2 by the \"{{int:emailpage}}\" function at {{SITENAME}}.",
+	"emailuserfooter": "This email was sent by $1 to $2 by the \"{{int:emailuser}}\" function at {{SITENAME}}.",
 	"usermessage-summary": "Leaving system message.",
 	"usermessage-editor": "System messenger",
 	"usermessage-template": "MediaWiki:UserMessage",
@@ -2534,7 +2525,7 @@
 	"tooltip-t-recentchangeslinked": "Recent changes in pages linked from this page",
 	"tooltip-feed-rss": "RSS feed for this page",
 	"tooltip-feed-atom": "Atom feed for this page",
-	"tooltip-t-contributions": "A list of contributions of this user",
+	"tooltip-t-contributions": "A list of contributions by this user",
 	"tooltip-t-emailuser": "Send an email to this user",
 	"tooltip-t-info": "More information about this page",
 	"tooltip-t-upload": "Upload files",
@@ -2544,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",
@@ -3222,7 +3213,7 @@
 	"autosumm-new": "Created page with \"$1\"",
 	"autosumm-newblank": "Created blank page",
 	"autoblock_whitelist": "AOL http://webmaster.info.aol.com/proxyinfo.html\n*64.12.96.0/19\n*149.174.160.0/20\n*152.163.240.0/21\n*152.163.248.0/22\n*152.163.252.0/23\n*152.163.96.0/22\n*152.163.100.0/23\n*195.93.32.0/22\n*195.93.48.0/22\n*195.93.64.0/19\n*195.93.96.0/19\n*195.93.16.0/20\n*198.81.0.0/22\n*198.81.16.0/20\n*198.81.8.0/23\n*202.67.64.128/25\n*205.188.192.0/20\n*205.188.208.0/23\n*205.188.112.0/20\n*205.188.146.144/30\n*207.200.112.0/21",
-	"size-bytes": "$1 B",
+	"size-bytes": "$1 {{PLURAL:$1|byte|bytes}}",
 	"size-kilobytes": "$1 KB",
 	"size-megabytes": "$1 MB",
 	"size-gigabytes": "$1 GB",
@@ -3231,7 +3222,7 @@
 	"size-exabytes": "$1 EB",
 	"size-zetabytes": "$1 ZB",
 	"size-yottabytes": "$1 YB",
-	"size-pixel": "$1 P",
+	"size-pixel": "$1 {{PLURAL:$1|pixel|pixels}}",
 	"size-kilopixel": "$1 KP",
 	"size-megapixel": "$1 MP",
 	"size-gigapixel": "$1 GP",
diff --git a/languages/i18n/eo.json b/languages/i18n/eo.json
index f86e4e7cfb..0ff7744917 100644
--- a/languages/i18n/eo.json
+++ b/languages/i18n/eo.json
@@ -550,7 +550,7 @@
 	"passwordreset-emailtitle": "Kontaj detaloj en {{SITENAME}}",
 	"passwordreset-emailtext-ip": "Iu (verŝajne vi, de IP-adreso $1) petis restarigon de via pasvorto por {{SITENAME}} ($4). La {{PLURAL:$3|jena uzanto-konto estas asociita|jenaj uzanto-kontoj estas asociitaj}} kun ĉi tiu retpoŝtadreso:\n\n$2\n\nĈi {{PLURAL:$3|tiu provizora pasvorto|tiuj provizoraj pasvortoj}} findatiĝos {{PLURAL:$5|unu tagon|$5 tagojn}}.\nVi ensalutu kaj elektu novan pasvorton nun. Se iu alia petis ĉi tion,\naŭ se vi memoris vian originalan pasvorton, kaj vi ne plu volas\nŝanĝi ĝin, vi povas ignori ĉi tiun mesaĝon kaj plu uzi vian \nmalnovan pasvorton.",
 	"passwordreset-emailtext-user": "Uzanto $1 de {{SITENAME}} petis restarigo de via pasvorto por {{SITENAME}}\n($4). La {{PLURAL:$3|jena uzanto-konto estas asociita|jenaj uzanto-kontoj estas asociitaj}} kun ĉi tiu retpoŝtadreso:\n\n$2\n\nĈi {{PLURAL:$3|tiu provizora pasvorto|tiuj provizoraj pasvortoj}} findatiĝos {{PLURAL:$5|unu tagon|$5 tagojn}}.\nVi devas ensaluti kaj elekti novan pasvorton nun. Se iu alia petis ĉi tion,\naŭ se vi memoris vian originalan pasvorton, kaj vi ne plu volas ŝanĝi\nĝin, vi povas ignori ĉi tiun mesaĝon kaj uzi vian malnovan pasvorton.",
-	"passwordreset-emailelement": "Salutnomo: $1\nProvizora pasvorto: $2",
+	"passwordreset-emailelement": "Salutnomo: \n$1\n\nProvizora pasvorto: \n$2",
 	"passwordreset-emailsent": "Renovigita pasvorto estis retpoŝte sendita.",
 	"passwordreset-emailsent-capture": "Retpoŝto kun renovigita pasvorto estis sendita, kiu estas montrata malsupre.",
 	"passwordreset-emailerror-capture": "Retpoŝto kun renovigita pasvorto estis generita, montrata sube, sed sendado al la {{GENDER:$2|uzanto}} malsukcesis: $1",
@@ -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",
@@ -1721,7 +1721,6 @@
 	"emailuser": "Retpoŝti ĉi tiun uzanton",
 	"emailuser-title-target": "Retpoŝti ĉi tiun {{GENDER:$1|uzanton}}",
 	"emailuser-title-notarget": "Retpoŝti uzanton",
-	"emailpage": "Retpoŝti uzanton",
 	"emailpagetext": "Vi povas uzi la jenan paĝon por sendi retpoŝtan mesaĝon al ĉi tiu {{GENDER:$1|uzanto|uzantino}}.\nLa retadreso kiun vi enigis en [[Special:Preferences|viaj preferoj]] aperos kiel la \"De\" adreso de la retpoŝto, do la ricevonto eblos respondi rekte al vi.",
 	"defemailsubject": "{{SITENAME}} retmesaĝo de uzanto \"$1\"",
 	"usermaildisabled": "Retpoŝto de uzantoj estas malŝaltita",
@@ -1743,7 +1742,7 @@
 	"emailccsubject": "Kopio de via mesaĝo al $1: $2",
 	"emailsent": "Retmesaĝo sendita",
 	"emailsenttext": "Via retmesaĝo estas sendita.",
-	"emailuserfooter": "Ĉi tiun retpoŝton sendis $1 al $2 per la funkcio \"{{int:emailpage}}\" ĉe {{SITENAME}}.",
+	"emailuserfooter": "Ĉi tiun retpoŝton sendis $1 al $2 per la funkcio \"{{int:emailuser}}\" ĉe {{SITENAME}}.",
 	"usermessage-summary": "Lasanta sisteman mesaĝon.",
 	"usermessage-editor": "Mesaĝanto de sistemo",
 	"watchlist": "Mia atentaro",
@@ -2268,7 +2267,7 @@
 	"tooltip-pt-logout": "Elsaluti",
 	"tooltip-pt-createaccount": "Ni rekomendas al vi kreon de uzantokonto kaj ensaluto; tamen, tio ne estas deviga",
 	"tooltip-ca-talk": "Diskuto pri la artikolo",
-	"tooltip-ca-edit": "Vi povas redakti tiun ĉi paĝon. Bv uzi la antaŭvidbutonon antaŭ ol konservi.",
+	"tooltip-ca-edit": "Redakti tiun ĉi paĝon",
 	"tooltip-ca-addsection": "Starti novan sekcion",
 	"tooltip-ca-viewsource": "Tiu paĝo estas protektita. Vi povas nur rigardi ties fonton.",
 	"tooltip-ca-history": "Antaŭaj versioj de tiu ĉi paĝo.",
@@ -2304,7 +2303,7 @@
 	"tooltip-ca-nstab-main": "Vidi la artikolon",
 	"tooltip-ca-nstab-user": "Vidi la personan paĝon de la uzanto",
 	"tooltip-ca-nstab-media": "Vidi la paĝon de la dosiero",
-	"tooltip-ca-nstab-special": "Estas speciala paĝo, vi ne rajtas redakti ĝin.",
+	"tooltip-ca-nstab-special": "Tio ĉi estas speciala paĝo kaj ĝi ne povas esti redaktita",
 	"tooltip-ca-nstab-project": "Rigardi la paĝon de la projekto",
 	"tooltip-ca-nstab-image": "Rigardi la dosierpaĝon",
 	"tooltip-ca-nstab-mediawiki": "Rigardi la sisteman mesaĝon",
@@ -2355,7 +2354,7 @@
 	"spam_reverting": "Restarigo de lasta versio ne entenante ligilojn al $1",
 	"spam_blanking": "Forviŝo de ĉiuj versioj entenantaj ligilojn al $1",
 	"spam_deleting": "Ĉiuj versioj enhavis ligilojn al $1 - forigante",
-	"simpleantispam-label": "Kontrolo kontraÅ­ spamo.\n'''NE ENIGU''' ion ajn!",
+	"simpleantispam-label": "Kontrolo kontraÅ­ spamo.\n<strong>Ne entajpu</strong> ion ajn!",
 	"pageinfo-title": "Informoj por \"$1\"",
 	"pageinfo-not-current": "Informoj povas esti montritaj nur por la nuna versio",
 	"pageinfo-header-basic": "Baza informo",
@@ -2402,7 +2401,7 @@
 	"pageinfo-category-subcats": "Nombro de subkategorioj",
 	"pageinfo-category-files": "Nombro de dosieroj",
 	"markaspatrolleddiff": "Marki kiel patrolitan",
-	"markaspatrolledtext": "Marki ĉi tiun paĝon kiel patrolitan",
+	"markaspatrolledtext": "Marki ĉi tiun paĝon patrolita",
 	"markedaspatrolled": "Markita kiel patrolita",
 	"markedaspatrolledtext": "La elektita versio [[:$1]] estas markita kiel patrolita.",
 	"rcpatroldisabled": "Patrolado de lastaj ŝanĝoj malaktivigita",
diff --git a/languages/i18n/es.json b/languages/i18n/es.json
index 62ae0aefd5..3cd780cdf1 100644
--- a/languages/i18n/es.json
+++ b/languages/i18n/es.json
@@ -128,10 +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-hidecategorization": "Ocultar la categorización de páginas",
+	"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",
@@ -155,13 +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-watchlisthidecategorization": "Ocultar la categorización de páginas",
+	"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",
@@ -170,7 +168,7 @@
 	"tog-prefershttps": "Utilizar siempre conexiones seguras en mis sesiones",
 	"underline-always": "Siempre",
 	"underline-never": "Nunca",
-	"underline-default": "Configuración predeterminada del tema o el navegador",
+	"underline-default": "Configuración predeterminada de la apariencia o el navegador",
 	"editfont-style": "Tipo de letra del área de edición:",
 	"editfont-default": "Predeterminado del navegador",
 	"editfont-monospace": "Tipo de letra monoespaciado",
@@ -546,6 +544,7 @@
 	"createacct-benefit-body2": "{{PLURAL:$1|página|páginas}}",
 	"createacct-benefit-body3": "{{PLURAL:$1|colaborador reciente|colaboradores recientes}}",
 	"badretype": "Las contraseñas no coinciden.",
+	"usernameinprogress": "Ya está en marcha la creación de una cuenta para este nombre de usuario.\nEspera.",
 	"userexists": "El nombre de usuario indicado ya está en uso.\nElige un nombre diferente.",
 	"loginerror": "Error de inicio de sesión",
 	"createacct-error": "Error al crear la cuenta",
@@ -636,7 +635,7 @@
 	"passwordreset-emailtitle": "Detalles de la cuenta en {{SITENAME}}",
 	"passwordreset-emailtext-ip": "Alguien (probablemente tú, desde la dirección IP $1) ha solicitado el restablecimiento de tu contraseña en {{SITENAME}} ($4). {{PLURAL:$3|La siguiente cuenta está asociada|Las siguientes cuentas están asociadas}}\na esta dirección de correo electrónico:\n\n$2\n\n{{PLURAL:$3|Esta contraseña temporal|Estas contraseñas temporales}} caducarán en {{PLURAL:$5|un día|$5 días}}.\nAhora puedes iniciar sesión y establecer una nueva contraseña. Si fue otra persona la que realizó esta solicitud, o si ya recuerdas tu contraseña original y, por tanto, no deseas cambiarla, puedes ignorar este mensaje y continuar usando tu contraseña anterior.",
 	"passwordreset-emailtext-user": "El usuario $1 de {{SITENAME}} solicitó el restablecimiento de tu contraseña en {{SITENAME}}\n($4). {{PLURAL:$3|La siguiente cuenta está asociada|Las siguientes cuentas están asociadas}} a esta dirección de correo electrónico:\n\n$2\n\n{{PLURAL:$3|Esta contraseña temporal|Estas contraseñas temporales}} caducarán en {{PLURAL:$5|un día|$5 días}}.\nAhora puedes iniciar sesión y establecer una nueva contraseña. Si fue otra persona la que realizó esta solicitud, o si ya recuerdas tu contraseña original y, por tanto, no deseas cambiarla, puedes ignorar este mensaje y continuar usando tu contraseña anterior.",
-	"passwordreset-emailelement": "Nombre de {{GENDER:$1|usuario|usuaria}}: $1\nContraseña temporal: $2",
+	"passwordreset-emailelement": "Nombre de {{GENDER:$1\n|usuario|usuaria}}: \n$1\n\nContraseña temporal: \n$2",
 	"passwordreset-emailsent": "Se ha enviado un correo electrónico para el restablecimiento de tu contraseña.",
 	"passwordreset-emailsent-capture": "Se ha enviado un correo para el restablecimiento de la contraseña, el cual se muestra a continuación.",
 	"passwordreset-emailerror-capture": "Se ha generado un correo electrónico de restablecimiento de contraseña, que se muestra a continuación, pero ha fallado el envío {{GENDER:$2|al usuario|a la usuaria}}: $1",
@@ -790,7 +789,7 @@
 	"content-model-css": "CSS",
 	"content-json-empty-object": "Objeto vacío",
 	"content-json-empty-array": "Matriz vacía",
-	"duplicate-args-warning": "<strong>Aviso:</strong> [[:$1]] convoca a [[:$2]] con más de un valor para el parámetro «$3». Se usará solo el último valor proporcionado.",
+	"duplicate-args-warning": "<strong>Aviso:</strong> [[:$1]] llama a [[:$2]] con más de un valor para el parámetro «$3». Se usará solo el último valor proporcionado.",
 	"duplicate-args-category": "Páginas que usan argumentos duplicados en invocaciones de plantillas",
 	"duplicate-args-category-desc": "La página contiene invocaciones de plantillas que utilizan argumentos duplicados, como <code><nowiki>{{foo|bar=1|bar=2}}</nowiki></code> o <code><nowiki>{{foo|bar|1=baz}}</nowiki></code>.",
 	"expensive-parserfunction-warning": "<strong>Advertencia:</strong> esta página contiene demasiadas llamadas a funciones sintácticas costosas.\n\nTiene {{PLURAL:$1|una llamada|$1 llamadas}}, pero debería tener menos de {{PLURAL:$2|una|$2}}.",
@@ -882,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",
@@ -1035,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}}",
@@ -1133,20 +1133,20 @@
 	"userrights-removed-self": "Has eliminado con éxito tus propios permisos. Por tanto, ya no podrás volver a acceder a esta página.",
 	"group": "Grupo:",
 	"group-user": "Usuarios",
-	"group-autoconfirmed": "Usuarios autoconfirmados",
+	"group-autoconfirmed": "Autoconfirmados",
 	"group-bot": "Bots",
 	"group-sysop": "Administradores",
 	"group-bureaucrat": "Burócratas",
 	"group-suppress": "Supresores",
 	"group-all": "(todos)",
 	"group-user-member": "{{GENDER:$1|usuario|usuaria}}",
-	"group-autoconfirmed-member": "{{GENDER:$1|usuario autoconfirmado|usuaria autoconfirmada}}",
+	"group-autoconfirmed-member": "{{GENDER:$1|autoconfirmado|autoconfirmada}}",
 	"group-bot-member": "{{GENDER:$1|bot}}",
 	"group-sysop-member": "{{GENDER:$1|administrador|administradora}}",
 	"group-bureaucrat-member": "{{GENDER:$1|burócrata}}",
 	"group-suppress-member": "{{GENDER:$1|supresor|supresora}}",
 	"grouppage-user": "{{ns:project}}:Usuarios",
-	"grouppage-autoconfirmed": "{{ns:project}}:Usuarios autoconfirmados",
+	"grouppage-autoconfirmed": "{{ns:project}}:Autoconfirmados",
 	"grouppage-bot": "{{ns:project}}:Bots",
 	"grouppage-sysop": "{{ns:project}}:Administradores",
 	"grouppage-bureaucrat": "{{ns:project}}:Burócratas",
@@ -1212,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",
@@ -1285,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]])",
@@ -1303,15 +1303,12 @@
 	"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",
 	"rcshowhidemine-show": "Mostrar",
 	"rcshowhidemine-hide": "Ocultar",
-	"rcshowhidecategorization": "$1 categorización de página",
-	"rcshowhidecategorization-show": "Mostrar",
-	"rcshowhidecategorization-hide": "Ocultar",
 	"rclinks": "Ver los últimos $1 cambios en los últimos $2 días.<br />$3",
 	"diff": "dif",
 	"hist": "hist",
@@ -1335,10 +1332,6 @@
 	"recentchangeslinked-summary": "Esta página es una lista de los últimos cambios en las páginas enlazadas desde una página dada (o en las pertenecientes a una categoría dada). Las páginas que están en tu [[Special:Watchlist|lista de seguimiento]] aparecen en <strong>negrita</strong>.",
 	"recentchangeslinked-page": "Nombre de la página:",
 	"recentchangeslinked-to": "Mostrar los cambios en páginas enlazadas con la página seleccionada",
-	"recentchanges-page-added-to-category": "[[:$1]] añadida a la categoría",
-	"recentchanges-page-added-to-category-bundled": "[[:$1]] y {{PLURAL:$2|una página|$2 páginas}} añadidas a la categoría",
-	"recentchanges-page-removed-from-category": "[[:$1]] eliminada de la categoría",
-	"recentchanges-page-removed-from-category-bundled": "[[:$1]] y {{PLURAL:$2|una página|$2 páginas}} eliminadas de la categoría",
 	"upload": "Subir archivo",
 	"uploadbtn": "Subir un archivo",
 	"reuploaddesc": "Cancelar subida y volver al formulario",
@@ -1374,16 +1367,16 @@
 	"filetype-banned-type": "{{PLURAL:$4|El tipo de archivo|Los tipos de archivo}} <strong>\".$1\"</strong> no {{PLURAL:$4|está permitido|están permitidos}}.\n{{PLURAL:$3|El único tipo de archivo permitido es|Los tipos de archivos permitidos son}} $2.",
 	"filetype-missing": "El archivo no tiene extensión (como «.jpg»).",
 	"empty-file": "El archivo que enviaste estaba vacío.",
-	"file-too-large": "El archivo que enviste era demasiado grande.",
-	"filename-tooshort": "El nombre de archivo es demasiado corto.",
+	"file-too-large": "El archivo que enviaste era demasiado grande.",
+	"filename-tooshort": "El nombre del archivo es demasiado corto.",
 	"filetype-banned": "El tipo de archivo está prohibido.",
 	"verification-error": "Este archivo no superó la verificación de archivos.",
 	"hookaborted": "Una extensión ha impedido la modificación que intentaste realizar.",
-	"illegal-filename": "El nombre de archivo no está permitido.",
-	"overwrite": "Sobrescribir un archivo existente no está permitido.",
+	"illegal-filename": "El nombre del archivo no está permitido.",
+	"overwrite": "No está permitido sobrescribir un archivo existente.",
 	"unknown-error": "Ocurrió un error desconocido.",
 	"tmp-create-error": "No se pudo crear archivo temporal.",
-	"tmp-write-error": "Error al escribir archivo temporal.",
+	"tmp-write-error": "Error al escribir el archivo temporal.",
 	"large-file": "Se recomienda que los archivos no sean mayores de $1; este archivo ocupa $2.",
 	"largefileserver": "El tamaño de este archivo es mayor del que este servidor admite por configuración.",
 	"emptyfile": "El archivo que has intentado subir parece estar vacío; por favor, verifica que realmente se trate del archivo que intentabas subir.",
@@ -1448,7 +1441,7 @@
 	"upload-misc-error-text": "Ha ocurrido un error durante la subida.\nVerifica que la URL es válida y accesible e inténtalo de nuevo.\nSi el problema persiste, contacta con un [[Special:ListUsers/sysop|administrador]].",
 	"upload-too-many-redirects": "La URL contenía demasiadas redirecciones",
 	"upload-http-error": "Ha ocurrido un error HTTP: $1",
-	"upload-copy-upload-invalid-domain": "No se pueden realizar cargas remotas desde este dominio.",
+	"upload-copy-upload-invalid-domain": "No se pueden realizar subidas remotas desde este dominio.",
 	"upload-dialog-title": "Subir archivo",
 	"upload-dialog-error": "Ha ocurrido un error",
 	"upload-dialog-warning": "Ha ocurrido una advertencia",
@@ -1609,7 +1602,7 @@
 	"filedelete-nofile": "<strong>$1</strong> no existe.",
 	"filedelete-nofile-old": "No existe una versión guardada de <strong>$1</strong> con los atributos especificados.",
 	"filedelete-otherreason": "Otra razón:",
-	"filedelete-reason-otherlist": "Otra razón",
+	"filedelete-reason-otherlist": "Otro motivo",
 	"filedelete-reason-dropdown": "*Razones habituales de borrado\n** Violación de derechos de autor\n** Archivo duplicado",
 	"filedelete-edit-reasonlist": "Edita los motivos del borrado",
 	"filedelete-maintenance": "Borrado y restauración de archivos temporalmente deshabilitados durante el mantenimiento.",
@@ -1741,7 +1734,7 @@
 	"ancientpages": "Artículos más antiguos",
 	"move": "Trasladar",
 	"movethispage": "Trasladar esta página",
-	"unusedimagestext": "Los siguientes archivos existen pero no están insertados en ninguna página.\nPor favor note que otros sitios web pueden vincular a un archivo con un URL directo, y por tanto pueden ser listados aquí a pesar de estar en uso activo.",
+	"unusedimagestext": "Los siguientes archivos existen pero no están insertados en ninguna página.\nTen en cuenta que otros sitios web pueden enlazar un archivo directamente por la URL, y por tanto pueden estar listados aquí a pesar de estar siendo usados de forma activa.",
 	"unusedcategoriestext": "Las siguientes categorías han sido creadas, pero ningún artículo o categoría las utiliza.",
 	"notargettitle": "No hay página objetivo",
 	"notargettext": "No has especificado sobre qué página deseas llevar a cabo esta acción.",
@@ -1759,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.",
@@ -1845,7 +1838,6 @@
 	"emailuser": "Enviar un mensaje de correo a {{GENDER:{{BASEPAGENAME}}|este usuario|esta usuaria}}",
 	"emailuser-title-target": "Enviar un mensaje a {{GENDER:$1|este usuario|esta usuaria}}",
 	"emailuser-title-notarget": "Enviar un correo electrónico al usuario",
-	"emailpage": "Enviar mensaje al usuario",
 	"emailpagetext": "Puedes usar el formulario de abajo para enviar un correo electrónico a {{GENDER:$1|este usuario|esta usuaria}}.\nLa dirección de correo electrónico que indicaste en [[Special:Preferences|tus preferencias de usuario]] aparecerá en el campo \"Remitente\" o \"De\" para que el destinatario pueda responderte.",
 	"defemailsubject": "Correo electrónico enviado por el usuario «$1» desde {{SITENAME}}",
 	"usermaildisabled": "Correo electrónico del usuario desactivado",
@@ -2006,7 +1998,7 @@
 	"protect-existing-expiry": "Fecha de caducidad actual: $2 a las $3",
 	"protect-existing-expiry-infinity": "Tiempo de caducidad existente: infinito",
 	"protect-otherreason": "Otra razón:",
-	"protect-otherreason-op": "Otra razón",
+	"protect-otherreason-op": "Otro motivo",
 	"protect-dropdown": "*Razones de protección habituales\n**Vandalismo excesivo\n**Spam excesivo\n**Guerra de ediciones\n**Página muy visitada",
 	"protect-edit-reasonlist": "Editar las razones de protección",
 	"protect-expiry-options": "1 hora:1 hour,1 día:1 day,1 semana:1 week,2 semanas:2 weeks,1 mes:1 month,3 meses:3 months,6 meses:6 months,1 año:1 year,para siempre:infinite",
@@ -2209,7 +2201,7 @@
 	"ip_range_invalid": "El rango de IP no es válido.",
 	"ip_range_toolarge": "Los bloqueos de rango superiores a /$1 no están permitidos.",
 	"proxyblocker": "Bloqueador de proxies",
-	"proxyblockreason": "Su dirección IP ha sido bloqueada porque es un proxy abierto. Por favor, contacte con su proveedor de servicios de Internet o con su servicio de asistencia técnica e infórmeles de este grave problema de seguridad.",
+	"proxyblockreason": "Tu dirección IP ha sido bloqueada porque es un proxy abierto.\nContacta con tu proveedor de servicios de Internet o con tu servicio de asistencia técnica e infórmales de este grave problema de seguridad.",
 	"sorbsreason": "Su dirección IP está listada como proxy abierto en DNSBL.",
 	"sorbs_create_account_reason": "Su dirección IP está listada como proxy abierto en DNSBL. No puede crear una cuenta",
 	"xffblockreason": "Una dirección IP presente en la cabecera X-Forwarded-For, tuya o del servidor proxy que estás usando, ha sido bloqueada. El motivo original del bloqueo fue: $1",
@@ -2224,7 +2216,7 @@
 	"unlockconfirm": "Sí, realmente quiero desbloquear la base de datos.",
 	"lockbtn": "Bloquear la base de datos",
 	"unlockbtn": "Desbloquear la base de datos",
-	"locknoconfirm": "No ha confirmado lo que desea hacer.",
+	"locknoconfirm": "No has confirmado lo que quieres hacer.",
 	"lockdbsuccesssub": "El bloqueo se ha realizado con éxito",
 	"unlockdbsuccesssub": "El desbloqueo se ha realizado con éxito",
 	"lockdbsuccesstext": "La base de datos de {{SITENAME}} ha sido bloqueada.\n<br />Recuerde retirar el bloqueo después de completar las tareas de mantenimiento.",
@@ -2300,7 +2292,7 @@
 	"export-submit": "Exportar",
 	"export-addcattext": "Añadir páginas desde la categoría:",
 	"export-addcat": "Añadir",
-	"export-addnstext": "Agregar páginas del nombre del sitio:",
+	"export-addnstext": "Agregar páginas desde el espacio de nombres:",
 	"export-addns": "Agregar",
 	"export-download": "Guardar como archivo",
 	"export-templates": "Incluir plantillas",
@@ -2352,7 +2344,7 @@
 	"importstart": "Importando páginas...",
 	"import-revision-count": "$1 {{PLURAL:$1|revisión|revisiones}}",
 	"importnopages": "No hay páginas que importar.",
-	"imported-log-entries": "Importados $1 {{PLURAL:$1|entradas de registro|entradas de registro}}.",
+	"imported-log-entries": "{{PLURAL:$1|Se importó|Se importaron}} $1 {{PLURAL:$1|entrada|entradas}} de registro.",
 	"importfailed": "La importación ha fallado: $1",
 	"importunknownsource": "Tipo de fuente de importación desconocida",
 	"importcantopen": "No se pudo importar el archivo",
@@ -2438,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",
@@ -2475,13 +2467,13 @@
 	"group-sysop.js": "/* Cualquier código JavaScript escrito aquí se cargará para todos los usuarios del grupo Administradores */",
 	"group-bureaucrat.js": "/* Cualquier código JavaScript escrito aquí se cargará para todos los usuarios del grupo Burócratas */",
 	"anonymous": "{{PLURAL:$1|Usuario anónimo|Usuarios anónimos}} de {{SITENAME}}",
-	"siteuser": "{{GENDER:$1|Usuario|Usuaria}} $1 de {{SITENAME}}",
-	"anonuser": "{{SITENAME}} usuario anónimo $1",
-	"lastmodifiedatby": "Esta página fue modificada por última vez en $2, $1 por $3.",
+	"siteuser": "{{GENDER:$1|el usuario|la usuaria}} $1 de {{SITENAME}}",
+	"anonuser": "el usuario anónimo $1 de {{SITENAME}}",
+	"lastmodifiedatby": "Esta página fue modificada por última vez el $1 a las $2 por $3.",
 	"othercontribs": "Basado en el trabajo de $1.",
 	"others": "otros",
-	"siteusers": "{{PLURAL:$2|Usuario|Usuarios}} $1 de {{SITENAME}}",
-	"anonusers": "{{SITENAME}} {{PLURAL:$2|usuario|usuarios}} anónimos $1",
+	"siteusers": "{{PLURAL:$2|el usuario|los usuarios}} $1 de {{SITENAME}}",
+	"anonusers": "{{PLURAL:$2|el usuario anónimo|los usuarios anónimos}} $1 de {{SITENAME}}",
 	"creditspage": "Créditos de la página",
 	"nocredits": "No hay información de créditos para esta página.",
 	"spamprotectiontitle": "Filtro de protección contra spam",
@@ -2540,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",
@@ -3060,7 +3052,7 @@
 	"invalid-indicator-name": "<strong>Error:</strong> el atributo <code>name</code> de los indicadores de estado de página no debe estar vacío.",
 	"version": "Versión",
 	"version-extensions": "Extensiones instaladas",
-	"version-skins": "Temas instalados",
+	"version-skins": "Apariencias instaladas",
 	"version-specialpages": "Páginas especiales",
 	"version-parserhooks": "Extensiones del analizador sintáctico",
 	"version-variables": "Variables",
@@ -3247,13 +3239,13 @@
 	"dberr-usegoogle": "Mientras tanto puedes probar buscando a través de Google.",
 	"dberr-outofdate": "Ten en cuenta que su índice de nuestro contenido puede estar desactualizado.",
 	"dberr-cachederror": "La siguiente es una página guardada de la página solicitada, y puede no estar actualizada.",
-	"htmlform-invalid-input": "Hay problemas con alguno de los datos que has ingresado",
+	"htmlform-invalid-input": "Hay problemas con alguno de los datos que has ingresado.",
 	"htmlform-select-badoption": "El valor que especificaste no es una opción válida.",
 	"htmlform-int-invalid": "El valor que especificaste no es un entero.",
 	"htmlform-float-invalid": "El valor que ha especificado no es un número.",
-	"htmlform-int-toolow": "El valor que especificaste está debajo del mínimo de $1",
-	"htmlform-int-toohigh": "El valor que especificaste está arriba del máximo de $1",
-	"htmlform-required": "Este valor es obligatorio",
+	"htmlform-int-toolow": "El valor que especificaste está debajo del mínimo de $1.",
+	"htmlform-int-toohigh": "El valor que especificaste está arriba del máximo de $1.",
+	"htmlform-required": "Este valor es obligatorio.",
 	"htmlform-submit": "Enviar",
 	"htmlform-reset": "Deshacer cambios",
 	"htmlform-selectorother-other": "Otro",
@@ -3262,7 +3254,7 @@
 	"htmlform-chosen-placeholder": "Selecciona una opción",
 	"htmlform-cloner-create": "Añadir más",
 	"htmlform-cloner-delete": "Eliminar",
-	"htmlform-cloner-required": "Se requiere al menos un valor",
+	"htmlform-cloner-required": "Se requiere al menos un valor.",
 	"htmlform-title-badnamespace": "[[:$1]] no está en el espacio de nombres \"{{ns:$2}}\".",
 	"htmlform-title-not-creatable": "\"$1\" no es un título de página que se pueda crear",
 	"htmlform-title-not-exists": "[[:$1]] no existe.",
@@ -3270,13 +3262,13 @@
 	"htmlform-user-not-valid": "<strong>$1</strong> no es un nombre de usuario válido.",
 	"sqlite-has-fts": "$1 con soporte para búsqueda de texto completo",
 	"sqlite-no-fts": "$1 sin soporte para búsqueda de texto completo",
-	"logentry-delete-delete": "$1 {{GENDER:$2|borró}} la página «$3»",
+	"logentry-delete-delete": "$1 {{GENDER:$2|borró}} la página $3",
 	"logentry-delete-restore": "$1 restauró la página «$3»",
 	"logentry-delete-event": "$1 {{GENDER:$2|modificó}} la visibilidad de {{PLURAL:$5|un evento|$5 eventos}} del registro en $3: $4",
 	"logentry-delete-revision": "$1 {{GENDER:$2|modificó}} la visibilidad de {{PLURAL:$5|una revisión |$5 revisiones}} en la página  $3: $4",
 	"logentry-delete-event-legacy": "$1 ha {{GENDER:$2|cambiado}} la visibilidad de registro de eventos en $3",
 	"logentry-delete-revision-legacy": "$1 ha {{GENDER:$2|cambiado}} la visibilidad de las revisiones en la página $3",
-	"logentry-suppress-delete": "$1 {{GENDER:$2|borró}}, con restricciones para administradores aplicadas, la página $3",
+	"logentry-suppress-delete": "$1 {{GENDER:$2|borró}} la página $3",
 	"logentry-suppress-event": "$1 {{GENDER:$2|modificó}} secretamente la visibilidad de {{PLURAL:$5|una edición|$5 ediciones}} en la página $3: $4",
 	"logentry-suppress-revision": "$1 {{GENDER:$2|modificó}} secretamente la visibilidad de {{PLURAL:$5|una edición|$5 ediciones}} en la página $3: $4",
 	"logentry-suppress-event-legacy": "$1 {{GENDER:$2|modificó}} secretamente la visibilidad de los eventos del registro en $3",
@@ -3301,13 +3293,14 @@
 	"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",
 	"logentry-newusers-byemail": "La cuenta de usuario $3 ha sido {{GENDER:$2|creada}} por $1 y la contraseña ha sido enviada por correo",
 	"logentry-newusers-autocreate": "La cuenta $1 se {{GENDER:$2|creó}} automáticamente",
+	"logentry-protect-move_prot": "$1 {{GENDER:$2|trasladó}} las preferencias de protección de $4 a $3",
 	"logentry-rights-rights": "$1 modificó los grupos a los que pertenece $3: de $4 a $5",
 	"logentry-rights-rights-legacy": "$1 {{GENDER:$2|modificó}} los grupos a los que pertenece $3",
 	"logentry-rights-autopromote": "$1 ha sido {{GENDER:$2|promocionado|promocionada}} automáticamente de $4 a $5",
@@ -3435,12 +3428,12 @@
 	"expand_templates_html_output": "Salida HTML en crudo",
 	"expand_templates_ok": "Aceptar",
 	"expand_templates_remove_comments": "Eliminar comentarios (<!-- ... -->)",
-	"expand_templates_remove_nowiki": "Suprimir <nowiki> etiquetas en resultado",
+	"expand_templates_remove_nowiki": "Suprimir etiquetas <nowiki> en el resultado",
 	"expand_templates_generate_xml": "Mostrar el árbol XML.",
 	"expand_templates_generate_rawhtml": "Mostrar HTML en crudo",
 	"expand_templates_preview": "Previsualización",
-	"expand_templates_preview_fail_html": "<em>Se ha ocultado la previsualización como precaución frente a ataques JavaScript. Esto se debe a que {{SITENAME}} tiene habilitada la característica de código HTML en bruto, y se perdieron los datos de la sesión.</em>\n\n<strong>Si se trata de un intento de previsualización legítimo, por favor inténtelo de nuevo.</strong>\nSi aun así no funciona, pruebe a [[Special:UserLogout|cerrar sesión]] y volver a acceder.",
-	"expand_templates_preview_fail_html_anon": "<em>Se ha ocultado la previsualización como precaución frente a ataques JavaScript. Esto se debe a que {{SITENAME}} tiene habilitada la característica de código HTML en bruto, y usted no ha iniciado sesión.</em>\n\n<strong>Si se trata de un intento de previsualización legítimo, por favor [[Special:UserLogin|inicie sesión]] e inténtelo de nuevo.</strong>",
+	"expand_templates_preview_fail_html": "<em>Se ha ocultado la previsualización como precaución frente a ataques JavaScript. Esto se debe a que {{SITENAME}} tiene habilitada la característica de código HTML en bruto, y se perdieron los datos de la sesión.</em>\n\n<strong>Si se trata de un intento de previsualización legítimo, inténtalo de nuevo.</strong>\nSi aun así no funciona, intenta [[Special:UserLogout|cerrar sesión]] y volver a acceder.",
+	"expand_templates_preview_fail_html_anon": "<em>Se ha ocultado la previsualización como precaución frente a ataques JavaScript. Esto se debe a que {{SITENAME}} tiene habilitada la característica de código HTML en bruto, y no has iniciado sesión.</em>\n\n<strong>Si se trata de un intento de previsualización legítimo, [[Special:UserLogin|inicia sesión]] e inténtalo de nuevo.</strong>",
 	"pagelanguage": "Selector de idioma de página",
 	"pagelang-name": "Página",
 	"pagelang-language": "Idioma",
diff --git a/languages/i18n/et.json b/languages/i18n/et.json
index bf80fdc591..a2bf8e7327 100644
--- a/languages/i18n/et.json
+++ b/languages/i18n/et.json
@@ -32,7 +32,6 @@
 	"tog-hideminor": "Peida pisiparandused viimastes muudatustes",
 	"tog-hidepatrolled": "Peida kontrollitud redaktsioonid viimastes muudatustes",
 	"tog-newpageshidepatrolled": "Peida uute lehtede loendis kontrollitud leheküljed",
-	"tog-hidecategorization": "Peida lehekülgede kategoriseerimine",
 	"tog-extendwatchlist": "Laienda jälgimisloendit, et näha kõiki muudatusi, mitte vaid kõige värskemaid",
 	"tog-usenewrc": "Rühmita viimased muudatused ja muudatused jälgimisloendis lehekülje järgi",
 	"tog-numberheadings": "Pealkirjade automaatnummerdus",
@@ -62,7 +61,6 @@
 	"tog-watchlisthideliu": "Peida sisselogitud kasutajate muudatused jälgimisloendist",
 	"tog-watchlisthideanons": "Peida anonüümsete kasutajate muudatused jälgimisloendist",
 	"tog-watchlisthidepatrolled": "Peida kontrollitud muudatused jälgimisloendist",
-	"tog-watchlisthidecategorization": "Peida lehekülgede kategoriseerimine",
 	"tog-ccmeonemails": "Saada mulle koopiad minu läkitatud e-kirjadest",
 	"tog-diffonly": "Ära näita erinevuste vaate all lehe sisu",
 	"tog-showhiddencats": "Näita peidetud kategooriaid",
@@ -448,6 +446,7 @@
 	"createacct-benefit-body2": "{{PLURAL:$1|lehekülg|lehekülge}}",
 	"createacct-benefit-body3": "{{PLURAL:$1|hiljutine kaastööline|hiljutist kaastöölist}}",
 	"badretype": "Sisestatud paroolid ei lange kokku.",
+	"usernameinprogress": "Selle kasutajanimega konto loomine on juba pooleli.\nPalun oota.",
 	"userexists": "Sisestatud kasutajanimi on juba kasutusel.\nPalun valige uus nimi.",
 	"loginerror": "Viga sisselogimisel",
 	"createacct-error": "Tõrge konto loomisel",
@@ -538,7 +537,7 @@
 	"passwordreset-emailtitle": "{{GRAMMAR:genitive|{{SITENAME}}}} konto andmed",
 	"passwordreset-emailtext-ip": "Keegi, arvatavasti sina ise, IP-aadressilt $1 palus lähtestada sinu {{GRAMMAR:genitive|{{SITENAME}}}} ($4) parooli. Selle e-posti aadressiga on seotud {{PLURAL:$3|järgmine konto|järgmised kontod}}:\n\n$2\n\n{{PLURAL:$3|See ajutine parool aegub|Need ajutised paroolid aeguvad}} {{PLURAL:$5|ühe|$5}} päeva pärast.\nPeaksid nüüd sisse logima ja uue parooli valima. Kui selle palve esitas keegi teine või kui sulle meenus su parool ja sa ei soovi seda enam muuta, võid teadet eirata ja jätkata vana parooli kasutamist.",
 	"passwordreset-emailtext-user": "{{GRAMMAR:genitive|{{SITENAME}}}} kasutaja $1 palus lähtestada sinu {{GRAMMAR:genitive|{{SITENAME}}}} ($4) parooli. Selle e-posti aadressiga on seotud {{PLURAL:$3|järgmine konto|järgmised kontod}}:\n\n$2\n\n{{PLURAL:$3|See ajutine parool aegub|Need ajutised paroolid aeguvad}} {{PLURAL:$5|ühe|$5}} päeva pärast.\nPeaksid nüüd sisse logima ja uue parooli valima. Kui selle palve esitas keegi teine või kui sulle meenus su parool ja sa ei soovi seda enam muuta, võid teadet eirata ja jätkata vana parooli kasutamist.",
-	"passwordreset-emailelement": "Kasutajanimi: $1\nAjutine parool: $2",
+	"passwordreset-emailelement": "Kasutajanimi: \n$1\n\nAjutine parool: \n$2",
 	"passwordreset-emailsent": "Parooli lähtestamise e-kiri on saadetud.",
 	"passwordreset-emailsent-capture": "E-kirjatsi on saadetud allpool näidatav parooli lähtestuskiri.",
 	"passwordreset-emailerror-capture": "Koostati allpool näidatav parooli lähtestuskiri, aga selle e-kirjatsi {{GENDER:$2|kasutajale}} saatmine ebaõnnestus: $1",
@@ -609,7 +608,7 @@
 	"accmailtitle": "Parool saadetud",
 	"accmailtext": "Kasutajale [[User talk:$1|$1]] genereeritud juhuslik parool saadeti aadressile $2.\n\nSeda saab pärast sisselogimist muuta ''[[Special:ChangePassword|parooli muutmise]]'' leheküljel.",
 	"newarticle": "(Uus)",
-	"newarticletext": "Lehekülge, kuhu link sind suunas, pole veel.\nLehekülje loomiseks alusta allolevasse kasti kirjutamist (lisateave [$1 juhendist]).\nKui sattusid siia kogemata, klõpsa võrgulehitseja ''tagasi''-nupule.",
+	"newarticletext": "Lehekülge, kuhu link sind suunas, pole veel.\nEt lehekülg luua, alusta allolevas kastis kirjutamist (lisateave [$1 juhendist]).\nKui sattusid siia kogemata, klõpsa veebilehitseja ''tagasi''-nupule.",
 	"anontalkpagetext": "----''See on anonüümse kasutaja arutelulehekülg. See kasutaja pole kontot loonud või ei kasuta seda. Sellepärast tuleb meil kasutaja tuvastamiseks kasutada tema IP-aadressi. Sellist IP-aadressi võib kasutada mitu kasutajat. Kui oled osutatud IP-aadressi kasutaja ning leiad, et siinsed kommentaarid ei puutu kuidagi sinusse, [[Special:UserLogin/signup|loo palun kasutajakonto]] või [[Special:UserLogin|logi sisse]], et sind edaspidi teiste anonüümsete kasutajatega segi ei aetaks.''",
 	"noarticletext": "Käesoleval leheküljel hetkel teksti ei ole.\nVõid [[Special:Search/{{PAGENAME}}|otsida pealkirjaks olevat fraasi]] teistelt lehtedelt,\n<span class=\"plainlinks\">[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} uurida asjassepuutuvaid logisid] või [{{fullurl:{{FULLPAGENAME}}|action=edit}} puuduva lehekülje ise luua]</span>.",
 	"noarticletext-nopermission": "Sellel leheküljel pole praegu teksti.\nSaad [[Special:Search/{{PAGENAME}}|otsida selle lehekülje pealkirja]] teistelt lehekülgedelt või <span class=\"plainlinks\">[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} otsida seonduvatest logidest]</span>, aga sul pole õigust seda lehekülge alustada.",
@@ -883,7 +882,7 @@
 	"search-category": "(kategooria \"$1\")",
 	"search-file-match": "(vastab faili sisule)",
 	"search-suggest": "Kas mõtlesid: $1",
-	"search-rewritten": "Vasted otsingule $1. Otsi hoopis teksti $2.",
+	"search-rewritten": "Vasted otsingule $1. Otsi selle asemel teksti $2.",
 	"search-interwiki-caption": "Sõsarprojektid",
 	"search-interwiki-default": "Tulemused asukohast $1:",
 	"search-interwiki-more": "(veel)",
@@ -937,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}}",
@@ -1211,9 +1211,6 @@
 	"rcshowhidemine": "Minu parandused ($1)",
 	"rcshowhidemine-show": "näita",
 	"rcshowhidemine-hide": "peida",
-	"rcshowhidecategorization": "Kategoriseerimine ($1)",
-	"rcshowhidecategorization-show": "näita",
-	"rcshowhidecategorization-hide": "peida",
 	"rclinks": "Näita viimast $1 muudatust viimase $2 päeva jooksul<br />$3",
 	"diff": "erin",
 	"hist": "ajal",
@@ -1237,10 +1234,6 @@
 	"recentchangeslinked-summary": "Siin on loetletud määratud leheküljelt viidatud (või määratud kategooria) lehekülgedel tehtud viimased muudatused.\nSinu [[Special:Watchlist|jälgimisloendi]] leheküljed on  '''rasvaselt''' esile toodud.",
 	"recentchangeslinked-page": "Lehekülje nimi:",
 	"recentchangeslinked-to": "Näita hoopis muudatusi lehekülgedel, mis sellele lehele lingivad",
-	"recentchanges-page-added-to-category": "kategooriasse lisatud \"[[:$1]]\"",
-	"recentchanges-page-added-to-category-bundled": "kategooriasse lisatud \"[[:$1]]\" ja veel {{PLURAL:$2|üks lehekülg|$2 lehekülge}}",
-	"recentchanges-page-removed-from-category": "kategooriast eemaldatud \"[[:$1]]\"",
-	"recentchanges-page-removed-from-category-bundled": "kategooriast eemaldatud \"[[:$1]]\" ja veel {{PLURAL:$2|üks lehekülg|$2 lehekülge}}",
 	"upload": "Faili üleslaadimine",
 	"uploadbtn": "Laadi fail üles",
 	"reuploaddesc": "Tagasi üleslaadimise vormi juurde.",
@@ -1661,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).",
@@ -1681,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",
@@ -1747,7 +1740,6 @@
 	"emailuser": "Saada sellele kasutajale e-kiri",
 	"emailuser-title-target": "{{GENDER:$1|Kasutajale}} e-kirja saatmine",
 	"emailuser-title-notarget": "Kasutajale e-kirja saatmine",
-	"emailpage": "Saada kasutajale e-kiri",
 	"emailpagetext": "Alloleva vormi kaudu saad sellele {{GENDER:$1|kasutajale}} e-kirja saata. Et kasutaja saaks vastata, täidetakse kirja saatja väli e-posti aadressiga, mille oled sisestanud [[Special:Preferences|oma eelistuste leheküljel]].",
 	"defemailsubject": "E-kiri {{GRAMMAR:genitive|{{SITENAME}}}} kasutajalt $1",
 	"usermaildisabled": "Kasutajatele e-kirjade saatmine keelatud",
@@ -1769,7 +1761,7 @@
 	"emailccsubject": "Koopia sinu sõnumist kasutajale $1: $2",
 	"emailsent": "E-kiri saadetud",
 	"emailsenttext": "Sinu teade on e-kirjaga saadetud.",
-	"emailuserfooter": "Selle e-kirja saatis $1 {{GRAMMAR:elative|{{SITENAME}}}} kasutajale $2 toimingu \"{{int:emailpage}}\" abil.",
+	"emailuserfooter": "Selle e-kirja saatis $1 {{GRAMMAR:elative|{{SITENAME}}}} kasutajale $2 toimingu \"{{int:emailuser}}\" abil.",
 	"usermessage-summary": "Jätan süsteemiteate.",
 	"usermessage-editor": "Süsteemiteadete edastaja",
 	"watchlist": "Jälgimisloend",
@@ -2153,7 +2145,7 @@
 	"move-watch": "Jälgi lähte- ja sihtlehekülge",
 	"movepagebtn": "Teisalda lehekülg",
 	"pagemovedsub": "Lehekülg on teisaldatud",
-	"movepage-moved": "'''\"$1\" teisaldatud pealkirja \"$2\" alla'''",
+	"movepage-moved": "<strong>\"$1\" on teisaldatud pealkirja \"$2\" alla.</strong>",
 	"movepage-moved-redirect": "Ümbersuunamisleht loodud.",
 	"movepage-moved-noredirect": "Ümbersuunamist ei loodud.",
 	"articleexists": "Sellise pealkirjaga lehekülg on juba olemas või pole valitud pealkiri lubatav.\nPalun vali teistsugune pealkiri.",
@@ -2221,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",
@@ -2340,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",
@@ -2498,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",
@@ -2878,9 +2870,9 @@
 	"confirmemail_success": "Sinu e-posti aadress on kinnitatud\nVõid nüüd [[Special:UserLogin|sisse logida]].",
 	"confirmemail_loggedin": "Sinu e-posti aadress on nüüd kinnitatud.",
 	"confirmemail_subject": "{{GRAMMAR:genitive|{{SITENAME}}}} e-posti aadressi kinnitamine",
-	"confirmemail_body": "Keegi IP-aadressilt $1, ilmselt sa ise, registreeris selle e-posti aadressiga {{GRAMMAR:inessive|{{SITENAME}}}} konto \"$2\".\n\nKinnitamaks, et see kasutajakonto tõepoolest kuulub sulle ning e-posti teenuste aktiveerimiseks, ava oma võrgulehitsejas järgmine link:\n\n$3\n\nKui see *pole* sinu loodud konto, ava järgmine link kinnituse tühistamiseks:\n\n$5\n\nKinnituskood aegub kuupäeval $4.",
+	"confirmemail_body": "Keegi IP-aadressilt $1, ilmselt sa ise, registreeris selle e-posti aadressiga {{GRAMMAR:inessive|{{SITENAME}}}} konto \"$2\".\n\nKinnitamaks, et kasutajakonto tõepoolest kuulub sulle ning et aktiveerida e-posti teenused, ava veebilehitsejas järgmine link:\n\n$3\n\nKui sa *pole* kontot registreerinud, ava järgmine link kinnituse tühistamiseks:\n\n$5\n\nKinnituskoodi aegumistähtaeg: $4.",
 	"confirmemail_body_changed": "Keegi IP-aadressilt $1, ilmselt sa ise,\nmuutis {{GRAMMAR:inessive|{{SITENAME}}}} konto \"$2\" e-posti aadressiks selle aadressi.\n\nKinnitamaks, et see konto tõepoolest kuulub sulle ja e-posti teenuste taasaktiveerimiseks, ava oma veebilehitsejas järgmine link:\n\n$3\n\nKui see *pole* sinu konto, ava järgmine link\nkinnituse tühistamiseks:\n\n$5\n\nKinnituskood aegub kuupäeval $4.",
-	"confirmemail_body_set": "Keegi, arvatavasti sina ise, IP-aadressilt $1 on {{GRAMMAR:genitive|{{SITENAME}}}} konto \"$2\" e-posti aadressiks määranud selle aadressi.\n\nKinnitamaks, et see konto kuulub tõesti sulle ja {{GRAMMAR:genitive|{{SITENAME}}}} e-posti funktsioonide aktiveerimiseks ava võrgulehitsejas järgmine link:\n\n$3\n\nKui konto *ei* kuulu sulle, kasuta e-posti aadressi kinnituse tühistamiseks järgmist linki:\n\n$5\n\nSelle kinnituskoodi aegumistähtaeg on $4.",
+	"confirmemail_body_set": "Keegi IP-aadressilt $1, arvatavasti sina ise, on {{GRAMMAR:genitive|{{SITENAME}}}} konto \"$2\" e-posti aadressiks määranud selle aadressi.\n\nKinnitamaks, et see konto kuulub tõesti sulle ja et aktiveerida e-posti teenused, ava võrgulehitsejas järgmine link:\n\n$3\n\nKui konto *ei* kuulu sulle, kasuta e-posti aadressi kinnituse tühistamiseks järgmist linki:\n\n$5\n\nSelle kinnituskoodi aegumistähtaeg on $4.",
 	"confirmemail_invalidated": "E-posti aadressi kinnitamine tühistati",
 	"invalidateemail": "E-posti aadressi kinnituse tühistamine",
 	"scarytranscludedisabled": "[Vikidevaheline mallina kasutamine on keelatud]",
@@ -2921,6 +2913,8 @@
 	"autoredircomment": "Ümbersuunamine lehele [[$1]]",
 	"autosumm-new": "Uus lehekülg: '$1'",
 	"autosumm-newblank": "Alustatud tühja leheküljega",
+	"size-bytes": "$1 {{PLURAL:$1|bait|baiti}}",
+	"size-pixel": "$1 {{PLURAL:$1|piksel|pikslit}}",
 	"lag-warn-normal": "Viimase {{PLURAL:$1|ühe sekundi|$1 sekundi}} jooksul tehtud muudatused ei pruugi selles loendis näha olla.",
 	"lag-warn-high": "Andmebaasiserveri töö viivituste tõttu ei pruugi viimase {{PLURAL:$1|ühe sekundi|$1 sekundi}} jooksul tehtud muudatused selles loendis näha olla.",
 	"watchlistedit-normal-title": "Jälgimisloendi redigeerimine",
@@ -3202,6 +3196,7 @@
 	"logentry-newusers-create2": "$1 {{GENDER:$2|lõi}} kasutajakonto $3",
 	"logentry-newusers-byemail": "$1 {{GENDER:$2|lõi}} kasutajakonto $3 ja parool saadeti e-kirjatsi",
 	"logentry-newusers-autocreate": "Konto $1 {{GENDER:$2|loodi}} automaatselt",
+	"logentry-protect-move_prot": "$1 {{GENDER:$2|teisaldas}} kaitsesätted leheküljelt $4 leheküljele $3",
 	"logentry-rights-rights": "$1 {{GENDER:$2|muutis}} kasutaja $3 rühmaliikmesust; enne oli $4, nüüd on $5",
 	"logentry-rights-rights-legacy": "$1 {{GENDER:$2|muutis}} kasutaja $3 rühmaliikmesust",
 	"logentry-rights-autopromote": "$1 {{GENDER:$2|viidi}} automaatselt üle teise rühma; enne oli $4, nüüd on $5",
@@ -3228,7 +3223,7 @@
 	"feedback-back": "Tagasi",
 	"feedback-bugcheck": "Hästi! Kontrolli vaid, ega tegu pole juba [$1 teada oleva veaga].",
 	"feedback-bugnew": "Kontrollisin. Teata uuest veast",
-	"feedback-bugornote": "Kui arvad, et oskad tehnilist probleemi üksikasjalikult kirjeldada, [$1 teata veast].\nKui ei, kasuta allolevat lihtsat vormi. Sinu kommentaar lisatakse koos kasutajanime ja teabega kasutatava võrgulehitsejaga kohta leheküljele \"[$3 $2]\".",
+	"feedback-bugornote": "Kui arvad, et oskad tehnilist probleemi üksikasjalikult kirjeldada, [$1 teata veast].\nKui ei, kasuta allolevat lihtsat vormi. Sinu kommentaar lisatakse koos kasutajanimega leheküljele \"[$3 $2]\".",
 	"feedback-cancel": "Loobu",
 	"feedback-close": "Valmis",
 	"feedback-external-bug-report-button": "Koosta tehniline tööülesanne",
diff --git a/languages/i18n/eu.json b/languages/i18n/eu.json
index ced9668662..4d582fb3d9 100644
--- a/languages/i18n/eu.json
+++ b/languages/i18n/eu.json
@@ -509,7 +509,7 @@
 	"passwordreset-capture-help": "Kutxa hau hautatzen baduzu behin-behineko pasahitza duen e-posta erakutsiko zatzaizu, eta erabiltzaileari bidaliko zaio.",
 	"passwordreset-email": "E-mail helbidea:",
 	"passwordreset-emailtitle": "{{SITENAME}}-rako kontuaren xehetasunak",
-	"passwordreset-emailelement": "Erabiltzaile izena: $1\nBehin-behineko pasahitza: $2",
+	"passwordreset-emailelement": "Erabiltzaile izena: \n$1\n\nBehin-behineko pasahitza: \n$2",
 	"passwordreset-emailsent": "Pasahitza berrezartzeko e-posta bidali da.",
 	"passwordreset-emailsent-capture": "Pasahitza berrezartzeko e-posta bat bidali dizugu, behean erakusten dena.",
 	"changeemail": "Aldatu e-mail helbidea",
@@ -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]]",
@@ -1588,7 +1588,6 @@
 	"emailuser": "Erabiltzaile honi e-posta bidali",
 	"emailuser-title-target": "{{GENDER:$1|Erabiltzale}} honi e-posta bidali",
 	"emailuser-title-notarget": "Erabiltzaileari e-maila bidali",
-	"emailpage": "Erabiltzaileari e-posta bidali",
 	"emailpagetext": "{{GENDER:$1|Erabiltzaile}} honek baliozko e-posta helbide bat ezarri badu bere hobespenetan, beheko formularioa erabiliz mezu bat bidal dakioke.\n[[Special:Preferences|Hobespenetan]] daukazun e-posta helbidea azalduko da mezuaren bidaltzaile bezala eta beraz erantzun ahal izango dizu.",
 	"defemailsubject": "{{SITENAME}} e-posta \"$1\" lankideak",
 	"usermaildisabled": "Erabiltzailearen e-maila desaktibatuta",
@@ -1610,7 +1609,7 @@
 	"emailccsubject": "Zure mezuaren kopia $1(r)i: $2",
 	"emailsent": "Mezua bidali egin da",
 	"emailsenttext": "Zure e-posta mezua bidali egin da.",
-	"emailuserfooter": "E-posta hau $1(e)k bidali dio $2(r)i {{SITENAME}}ko \"{{int:emailpage}}\" funtzioa erabiliz.",
+	"emailuserfooter": "E-posta hau $1(e)k bidali dio $2(r)i {{SITENAME}}ko \"{{int:emailuser}}\" funtzioa erabiliz.",
 	"usermessage-summary": "Sistema mezua uzten.",
 	"usermessage-editor": "Sistemako mezularia",
 	"watchlist": "Jarraipen zerrenda",
@@ -2749,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",
@@ -2855,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:",
@@ -2892,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 c2796bfa07..095f7e6ddd 100644
--- a/languages/i18n/fa.json
+++ b/languages/i18n/fa.json
@@ -390,7 +390,7 @@
 	"actionthrottledtext": "به منظور جلوگیری از انتشار اسپم، اجازه ندارید که چنین عملی را بیش از چند بار در یک مدت زمان کوتاه انجام بدهید.\nلطفاً پس از چند دقیقه دوباره تلاش کنید.",
 	"protectedpagetext": "این صفحه برای جلوگیری از ویرایش یا فعالیت دیگر محافظت شده‌است.",
 	"viewsourcetext": "می‌توانید متن مبدأ این صفحه را مشاهده کنید یا از آن نسخه بردارید:",
-	"viewyourtext": "می‌توانید کد مبدأ '''ویرایش‌هایتان''' در این صفحه را ببینید و کپی کنید:",
+	"viewyourtext": "می‌توانید کد مبدأ <strong>ویرایش‌هایتان</strong> در این صفحه را ببینید و کپی کنید.",
 	"protectedinterface": "این صفحه ارائه‌دهندهٔ متنی برای واسط کاربر این نرم‌افزار در این ویکی است و به منظور پیشگیری از خرابکاری محافظت شده‌است.\nبرای افزودن یا تغییر دادن ترجمه برای همهٔ ویکی‌ها، لطفاً از [//translatewiki.net/ translatewiki.net]، پروژهٔ محلی‌سازی مدیاویکی، استفاده کنید.",
 	"editinginterface": "<strong>هشدار:</strong> صفحه‌ای که ویرایش می‌کنید شامل متنی است که در واسط کاربر این نرم‌افزار به کار رفته‌است.\nتغییر این صفحه منجر به تغییر ظاهر واسط کاربر این نرم‌افزار برای دیگر کاربران خواهد شد.",
 	"translateinterface": "برای افزودن یا تغییر دادن ترجمه برای همهٔ ویکی‌ها، لطفاً از [//translatewiki.net/ translatewiki.net]، پروژهٔ محلی‌سازی مدیاویکی، استفاده کنید.",
@@ -470,6 +470,7 @@
 	"createacct-benefit-body2": "{{PLURAL:$1|صفحه}}",
 	"createacct-benefit-body3": "{{PLURAL:$1|مشارکت‌کنندهٔ}} اخیر",
 	"badretype": "گذرواژه‌هایی که وارد کرده‌اید یکسان نیستند.",
+	"usernameinprogress": "ایجاد حساب برای این نام کاربر در جریان است. لطفا صبور باشید.",
 	"userexists": "نام کاربری‌ای که وارد کردید قبلاً استفاده شده‌است.\nلطفاً یک نام دیگر انتخاب کنید.",
 	"loginerror": "خطا در ورود به سامانه",
 	"createacct-error": "خطای ایجاد حساب کاربری",
@@ -560,7 +561,7 @@
 	"passwordreset-emailtitle": "جزئیات حساب در {{SITENAME}}",
 	"passwordreset-emailtext-ip": "یک نفر (احتمالاً شما، با نشانی آی‌پی $1) درخواست بازنشانی گذرواژه‌تان در {{SITENAME}} ($4) را کرده‌است. {{PLURAL:$3|حساب|حساب‌های}} کاربری زیر با این آدرس ایمیل مرتبط هستند:\n\n$2\n\n{{PLURAL:$3|این گذرواژهٔ موقت|این گذرواژه‌های موقت}} پس از {{PLURAL:$5|یک روز|$5 روز}} باطل خواهند شد.\nشما باید هم‌اکنون ثبت ورود کنید و گذرواژه‌ای جدید برگزینید. اگر فکر می‌کنید شخص دیگری این درخواست را داده است یا اگر گذرواژهٔ اصلی‌تان را به یاد آوردید و دیگر نمی‌خواهید آن را تغییر دهید، می‌توانید این پیغام را نادیده بگیرید و به استفاده از گذرواژهٔ قبلی‌تان ادامه دهید.",
 	"passwordreset-emailtext-user": "کاربر $1 از {{SITENAME}} درخواست بازنشانی گذرواژهٔ شما در {{SITENAME}} ($4) را کرده است. {{PLURAL:$3|حساب|حساب‌های}} کاربری زیر با این آدرس ایمیل مرتبط است:\n\n$2\n\n{{PLURAL:$3|این گذرواژهٔ موقت|این گذرواژه‌های موقت}} تا {{PLURAL:$5|یک روز|$5 روز}} باطل می‌شود.\nشما باید هم‌اکنون وارد شده و یک گذرواژهٔ جدید برگزینید. اگر شخص دیگری این درخواست را داده است، یا اگر گذرواژهٔ اصلی‌تان را به خاطر آوردید و دیگر نمی‌خواهید آن را تغییر دهید، می‌توانید این پیغام را نادیده بگیرید و به استفاده از گذرواژهٔ قبلی‌تان ادامه دهید.",
-	"passwordreset-emailelement": "نام کاربری: $1\nگذرواژهٔ موقت: $2",
+	"passwordreset-emailelement": "نام کاربری: \n$1\n\nگذرواژهٔ موقت: \n$2",
 	"passwordreset-emailsent": "یک نامهٔ بازنشانی گذرواژه فرستاده شده‌است.",
 	"passwordreset-emailsent-capture": "یک ایمیل بازنشانی که در پایین نمایش داده شده، فرستاده شده است.",
 	"passwordreset-emailerror-capture": "ایمیل بازنشانی، که در زیر نمایش داده شده، ایجاد شد، ولی ارسال آن به {{GENDER:$2|کاربر}} موفقیت‌آمیز نبود: $1",
@@ -905,6 +906,7 @@
 	"search-category": "(رده  $1)",
 	"search-file-match": "(تشابه محتوی پرونده)",
 	"search-suggest": "آیا منظورتان این بود: $1",
+	"search-rewritten": "نمایش نتایج $1. جستجوی به جای $2.",
 	"search-interwiki-caption": "پروژه‌های خواهر",
 	"search-interwiki-default": "نتایج از $1 :",
 	"search-interwiki-more": "(بیشتر)",
@@ -958,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|روز}}",
@@ -1060,20 +1063,20 @@
 	"group-bot": "ربات‌ها",
 	"group-sysop": "مدیران",
 	"group-bureaucrat": "دیوان‌سالاران",
-	"group-suppress": "ناظران",
+	"group-suppress": "پنهانگران",
 	"group-all": "(همه)",
 	"group-user-member": "{{GENDER:$1|کاربر}}",
 	"group-autoconfirmed-member": "{{GENDER:$1|کاربر تأییدشده}}",
 	"group-bot-member": "ربات",
 	"group-sysop-member": "{{GENDER:$1|مدیر}}",
 	"group-bureaucrat-member": "{{GENDER:$1|دیوان‌سالار}}",
-	"group-suppress-member": "{{GENDER:$1|نظارت}}",
+	"group-suppress-member": "{{GENDER:$1|پنهانگر}}",
 	"grouppage-user": "{{ns:project}}:کاربران",
 	"grouppage-autoconfirmed": "{{ns:project}}:کاربران تأییدشده",
 	"grouppage-bot": "{{ns:project}}:ربات‌ها",
 	"grouppage-sysop": "{{ns:project}}:مدیران",
 	"grouppage-bureaucrat": "{{ns:project}}:دیوان‌سالاران",
-	"grouppage-suppress": "{{ns:project}}:نظارت",
+	"grouppage-suppress": "{{ns:project}}:پنهانگر",
 	"right-read": "خواندن صفحه",
 	"right-edit": "ویرایش صفحه",
 	"right-createpage": "ایجاد صفحه (در مورد صفحه‌های غیر بحث)",
@@ -1242,8 +1245,8 @@
 	"newpageletter": "نو",
 	"boteditletter": "ر",
 	"number_of_watching_users_pageview": "[$1 {{PLURAL:$1|کاربر}} پی‌گیرنده]",
-	"rc_categories": "محدود به این رده‌ها (رده‌ها را با «|» جدا کنید)",
-	"rc_categories_any": "هر کدام",
+	"rc_categories": "محدود به این رده‌ها (رده‌ها را با «|» جدا کنید):",
+	"rc_categories_any": "هر کدام از منتخب‌ها",
 	"rc-change-size-new": "$1 {{PLURAL:$1|بایت}} پس از تغییر",
 	"newsectionsummary": "/* $1 */ بخش جدید",
 	"rc-enhanced-expand": "نمایش جزئیات",
@@ -1365,6 +1368,19 @@
 	"upload-too-many-redirects": "نشانی اینترتی حاوی تعداد بیش از اندازه‌ای تغییرمسیر است",
 	"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-stream": "نمی‌توان پروندهٔ $1 را ارسال کرد.",
 	"backend-fail-backup": "نمی‌توان نسخهٔ پشتیبان برای پروندهٔ $1 ایجاد کرد.",
 	"backend-fail-notexists": "پروندهٔ $1 وجود ندارد.",
@@ -1663,7 +1679,7 @@
 	"booksources-text": "در زیر فهرستی از پیوندها به وبگاه‌های دیگر آمده‌است که کتاب‌های نو و دست دوم می‌فروشند، و همچنین ممکن است اطلاعات بیشتری راجع به کتاب مورد نظر شما داشته باشند:",
 	"booksources-invalid-isbn": "شابک داده شده مجاز به نظر نمی‌رسد؛ از جهت اشکالات هنگام کپی کردن از منبع اصلی بررسی کنید.",
 	"specialloguserlabel": "مجری:",
-	"speciallogtitlelabel": "هدف (عنوان یا کاربر):",
+	"speciallogtitlelabel": "هدف (عنوان یا {{ns:user}}:نام کاربر برای کاربر):",
 	"log": "سیاهه‌ها",
 	"all-logs-page": "تمام سیاهه‌های عمومی",
 	"alllogstext": "نمایش یک‌جای تمام سیاهه‌های موجود در {{SITENAME}}.\nمی‌توانید با انتخاب نوع سیاهه، نام کاربری (حساس به کوچکی و بزرگی حروف) و صفحه‌های تغییریافته (حساس به بزرگی و کوچکی حروف)، نمایش را محدودتر سازید.",
@@ -1749,7 +1765,6 @@
 	"emailuser": "ایمیل به این کاربر",
 	"emailuser-title-target": "ارسال ایمیل به این {{GENDER:$1|کاربر}}",
 	"emailuser-title-notarget": "ارسال ایمیل به کاربر",
-	"emailpage": "ایمیل به کاربر",
 	"emailpagetext": "شما می‌توانید از فرم زیر برای ارسال ایمیلی به این {{GENDER:$1|کاربر}} استفاده کنید.\nنشانی ایمیلی که در [[Special:Preferences|ترجیحات کاربریتان]] وارد کرده‌اید در نشانی فرستندهٔ ایمیل خواهد آمد، تا گیرنده بتواند پاسخ دهد.",
 	"defemailsubject": "ایمیل {{SITENAME}} از طرف کاربر «$1»",
 	"usermaildisabled": "ایمیل کاربر غیر قعال است",
@@ -1771,7 +1786,7 @@
 	"emailccsubject": "رونوشت پیغام شما به $1: $2",
 	"emailsent": "ایمیل ارسال شد",
 	"emailsenttext": "پیام ایمیل شما فرستاده شد.",
-	"emailuserfooter": "این ایمیل با استفاده از ویژگی «{{int:emailpage}}» {{SITENAME}} توسط $1 به $2 ارسال شد.",
+	"emailuserfooter": "این ایمیل با استفاده از ویژگی «{{int:emailuser}}» {{SITENAME}} توسط $1 به $2 ارسال شد.",
 	"usermessage-summary": "گذاشتن پیغام سامانه.",
 	"usermessage-editor": "پیغام رسان سامانه",
 	"watchlist": "فهرست پی‌گیری",
@@ -1781,10 +1796,10 @@
 	"watchlistanontext": "برای مشاهده و ویرایش فهرست پی‌گیری‌های خود از $1 استفاده کنید.",
 	"watchnologin": "به سامانه وارد نشده‌اید",
 	"addwatch": "افزودن به فهرست پی‌گیری",
-	"addedwatchtext": "صفحهٔ «[[:$1]]» به [[Special:Watchlist|فهرست پی‌گیری‌های]] شما اضافه شد.\nتغییرات این صفحه و صفحهٔ بحث متناظرش در آینده در اینجا فهرست خواهد شد.",
+	"addedwatchtext": "«[[:$1]]» و صفحهٔ بحث آن به [[Special:Watchlist|فهرست پی‌گیری‌های]] شما اضافه شد.",
 	"addedwatchtext-short": "صفحه \" $1 \" به فهرست پیگیریهای خود اضافه شده است.",
 	"removewatch": "حذف از فهرست پی‌گیری",
-	"removedwatchtext": "صفحهٔ «[[:$1]]» از [[Special:Watchlist|فهرست پی‌گیری‌های شما]] برداشته شد.",
+	"removedwatchtext": "صفحهٔ «[[:$1]]» و صفحهٔ بحث آن از [[Special:Watchlist|فهرست پی‌گیری‌های شما]] برداشته شد.",
 	"removedwatchtext-short": "صفحهٔ \"$1\" از فهرست پیگیری‌های شما حذف شده‌است.",
 	"watch": "پی‌گیری",
 	"watchthispage": "پی‌گیری این صفحه",
@@ -1933,7 +1948,7 @@
 	"undeletepagetext": "{{PLURAL:$1|صفحهٔ زیر حدف شده|صفحه‌های زیر حذف شده‌اند}} ولی هنوز در بایگانی {{PLURAL:$1|هست|هستند}} و {{PLURAL:$1|می‌تواند احیا شود|می‌توانند احیا شوند}}.\nاین بایگانی ممکن است هر چند وقت تمیز شود.",
 	"undelete-fieldset-title": "احیای نسخه‌ها",
 	"undeleteextrahelp": "برای احیای تمام تاریخچهٔ صفحه، همهٔ جعبه‌ها را خالی رها کرده و دکمهٔ '''''{{int:undeletebtn}}''''' را کلیک کنید.\nبرای انجام احیای انتخابی، جعبه‌های متناظر با نسخه‌های مورد نظر برای احیا را علامت زده و دکمهٔ '''''{{int:undeletebtn}}''''' را کلیک کنید.",
-	"undeleterevisions": "$1 نسخه بایگانی {{PLURAL:$1|شده‌است|شده‌اند}}",
+	"undeleterevisions": "$1 نسخه حذف {{PLURAL:$1|شده‌است|شده‌اند}}",
 	"undeletehistory": "اگر این صفحه را احیا کنید، همهٔ نسخه‌های آن در تاریخچه احیا خواهند شد.\nاگر صفحهٔ جدیدی با نام یکسان از زمان حذف ایجاد شده باشد، نسخه‌های احیاشده در تاریخچهٔ قبلی خواهند آمد.",
 	"undeleterevdel": "احیای صفحه‌های در حالتی که باعث حذف شدن بخشی از آخرین نسخهٔ صفحه یا پرونده بشود مقدور نیست.\nدر این حالت شما باید جدیدترین نسخهٔ حذف شده را نیز احیا کنید.",
 	"undeletehistorynoadmin": "این مقاله حذف شده‌است.\nدلیل حذف این مقاله به همراه مشخصات کاربرانی که قبل از حذف این صفحه را ویرایش کرده‌اند، در خلاصهٔ زیر آمده‌است.\nمتن واقعی این ویرایش‌های حذف شده فقط در دسترس مدیران است.",
@@ -2342,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": "نمایش پیغام سامانه",
@@ -2383,7 +2398,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": "اطلاعات اولیه",
@@ -3258,6 +3273,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|ارتقاء داد}}",
@@ -3455,6 +3471,7 @@
 	"special-characters-title-endash": "خط فاصله",
 	"special-characters-title-emdash": "خط فاسله کشیده",
 	"special-characters-title-minus": "علامت منفی",
+	"mw-widgets-dateinput-no-date": "هیچ داده‌ای انتخاب نشده",
 	"mw-widgets-titleinput-description-new-page": "این صفحه هنوز وجود ندارد",
 	"mw-widgets-titleinput-description-redirect": "تغییر مسیر به $1"
 }
diff --git a/languages/i18n/fi.json b/languages/i18n/fi.json
index 644bd2d11b..fd8d5d58d5 100644
--- a/languages/i18n/fi.json
+++ b/languages/i18n/fi.json
@@ -81,7 +81,6 @@
 	"tog-watchlisthideliu": "Piilota kirjautuneiden käyttäjien muokkaukset tarkkailulistalta",
 	"tog-watchlisthideanons": "Piilota rekisteröitymättömien käyttäjien muokkaukset tarkkailulistalta",
 	"tog-watchlisthidepatrolled": "Piilota muutostentarkastajien hyväksymät muokkaukset tarkkailulistalta",
-	"tog-watchlisthidecategorization": "Piilota muutokset, jotka koskevat sivujeen lisäämistä tai poistamista luokkiin",
 	"tog-ccmeonemails": "Lähetä minulle kopio MediaWikin kautta lähetetyistä sähköposteista",
 	"tog-diffonly": "Älä näytä sivun sisältöä eroavaisuusvertailun alapuolella",
 	"tog-showhiddencats": "Näytä piilotetut luokat",
@@ -467,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",
@@ -557,7 +557,7 @@
 	"passwordreset-emailtitle": "Tunnuksen tiedot {{GRAMMAR:inessive|{{SITENAME}}}}",
 	"passwordreset-emailtext-ip": "Joku (todennäköisesti sinä, IP-osoitteesta $1) pyysi salasanasi\nvaihtamista sivustolla {{SITENAME}} ($4). {{PLURAL:$3|Seuraava käyttäjätunnus on|Seuraavat käyttäjätunnukset ovat}}\nyhdistettynä tähän sähköpostiosoitteeseen:\n\n$2\n\n{{PLURAL:$3|Tämä väliaikainen salasana vanhentuu|Nämä väliaikaiset salasanat vanhentuvat}} {{PLURAL:$5|yhden päivän|$5 päivän}} kuluttua.\nKirjaudu sisään nyt ja valitse uusi salasana heti. Jos joku toinen teki tämän pyynnön \ntai jos muistitkin vanhan salasanasi etkä halua enää muuttaa sitä,\nvoit jättää tämän viestin huomiotta ja jatkaa vanhan salasanasi käyttämistä.",
 	"passwordreset-emailtext-user": "Käyttäjä $1 pyysi muistutusta tunnuksesi tiedoista sivustolla {{SITENAME}} ($4).\n{{PLURAL:$3|Seuraava käyttäjätunnus on|Seuraavat käyttäjätunnukset ovat}} liitetty tähän sähköpostiosoitteeseen:\n\n$2\n\n{{PLURAL:$3|Tämä väliaikainen salasana vanhentuu|Nämä väliaikaiset salasanat vanhentuvat}} {{PLURAL:$5|yhden päivän|$5 päivän}} kuluttua.\nSinun kannattaa kirjautua sisään ja valita uusi salasana. Jos joku toinen teki tämän\npyynnön, tai muistat sittenkin vanhan salasanasi, etkä halua muuttaa sitä,\nvoit jättää tämän viestin huomiotta ja jatkaa vanhan salasanan käyttöä.",
-	"passwordreset-emailelement": "Käyttäjätunnus: $1\nVäliaikainen salasana: $2",
+	"passwordreset-emailelement": "Käyttäjätunnus: \n$1\n\nVäliaikainen salasana: \n$2",
 	"passwordreset-emailsent": "Salasanan uudistamisesta kertova viesti on lähetetty sähköpostitse.",
 	"passwordreset-emailsent-capture": "Salasanan uudistamisesta kertova sähköpostiviesti on lähetetty, ja se näkyy myös alla.",
 	"passwordreset-emailerror-capture": "Allaoleva sähköpostiviesti luotiin, mutta sen lähettäminen {{GENDER:$2|käyttäjälle}} epäonnistui: $1",
@@ -956,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ää}}",
@@ -1231,9 +1232,6 @@
 	"rcshowhidemine": "$1 omat muutokset",
 	"rcshowhidemine-show": "Näytä",
 	"rcshowhidemine-hide": "Piilota",
-	"rcshowhidecategorization": "$1 sivujen luokkien muutokset",
-	"rcshowhidecategorization-show": "Näytä",
-	"rcshowhidecategorization-hide": "Piilota",
 	"rclinks": "Näytä $1 tuoretta muutosta viimeisten $2 päivän ajalta.<br />$3",
 	"diff": "ero",
 	"hist": "historia",
@@ -1367,6 +1365,19 @@
 	"upload-too-many-redirects": "URL sisälsi liian monta ohjausta",
 	"upload-http-error": "HTTP-virhe: $1",
 	"upload-copy-upload-invalid-domain": "Tiedostojen tallentamista tästä verkko-osoitteesta ei ole sallittu.",
+	"upload-dialog-title": "Tiedoston tallennus",
+	"upload-dialog-error": "Tapahtui virhe",
+	"upload-dialog-warning": "Sisältää varoituksen",
+	"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.",
 	"backend-fail-notexists": "Tiedostoa $1 ei ole olemassa.",
@@ -1664,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ä.",
@@ -1750,7 +1761,6 @@
 	"emailuser": "Lähetä sähköpostia tälle käyttäjälle",
 	"emailuser-title-target": "Lähetä sähköpostia tälle {{GENDER:$1|käyttäjälle}}",
 	"emailuser-title-notarget": "Lähetä sähköpostia käyttäjälle",
-	"emailpage": "Lähetä sähköpostia käyttäjälle",
 	"emailpagetext": "Jos tämä {{GENDER:$1|käyttäjä}} on antanut asetuksissaan kelvollisen sähköpostiosoitteen, alla olevalla lomakkeella voit lähettää hänelle viestin. [[Special:Preferences|Omissa asetuksissasi]] annettu sähköpostiosoite näkyy sähköpostin lähettäjän osoitteena, jotta vastaanottaja voi suoraan vastata viestiin.",
 	"defemailsubject": "Sähköpostia käyttäjältä $1 sivustolta {{SITENAME}}",
 	"usermaildisabled": "Käyttäjien sähköposti poistettu käytöstä",
@@ -1772,7 +1782,7 @@
 	"emailccsubject": "Kopio lähettämästäsi viestistä osoitteeseen $1: $2",
 	"emailsent": "Sähköposti lähetetty",
 	"emailsenttext": "Sähköpostiviestisi on lähetetty.",
-	"emailuserfooter": "Tämän sähköpostin lähetti $1 vastaanottajalle $2 käyttämällä ”{{int:emailpage}}” -toimintoa {{GRAMMAR:inessive|{{SITENAME}}}}.",
+	"emailuserfooter": "Tämän sähköpostin lähetti $1 vastaanottajalle $2 käyttämällä ”{{int:emailuser}}” -toimintoa {{GRAMMAR:inessive|{{SITENAME}}}}.",
 	"usermessage-summary": "Jätetään järjestelmäviesti.",
 	"usermessage-editor": "Järjestelmäviestittäjä",
 	"watchlist": "Tarkkailulista",
@@ -1934,7 +1944,7 @@
 	"undeletepagetext": "{{PLURAL:$1|Seuraava sivu|Seuraavat sivut}} on poistettu, mutta {{PLURAL:$1|se löytyy|ne löytyvät}} vielä arkistosta, joten {{PLURAL:$1|se|ne}} voidaan palauttaa takaisin. Arkisto saatetaan tyhjentää aika ajoin.",
 	"undelete-fieldset-title": "Palauta versioita",
 	"undeleteextrahelp": "Palauttaaksesi sivun koko muutoshistorian jätä kaikki valintalaatikot tyhjiksi ja napsauta '''''{{int:undeletebtn}}'''''.\nVoit palauttaa versioita valikoivasti valitsemalla vain niiden versioiden valintalaatikot, jotka haluat palauttaa.",
-	"undeleterevisions": "$1 {{PLURAL:$1|versio|versiota}} on arkistoitu.",
+	"undeleterevisions": "$1 {{PLURAL:$1|versio|versiota}} on poistettu.",
 	"undeletehistory": "Jos palautat sivun, kaikki versiot lisätään sivun historiaan. Jos uusi sivu samalla nimellä on luotu poistamisen jälkeen, palautetut versiot lisätään sen historiaan.",
 	"undeleterevdel": "Palautusta ei tehdä, jos sen seurauksena sivun uusin versio olisi osittain piilotettu. \nTässä tilanteessa älä valitse palautettavaksi näkyviin viimeisintä poistettua versiota tai poista version piilotus.",
 	"undeletehistorynoadmin": "Tämä sivu on poistettu. \nSyy sivun poistamiseen näkyy alla olevassa yhteenvedossa, jossa on myös tiedot, ketkä olivat muokanneet tätä sivua ennen poistamista. \nNäiden poistettujen versioiden varsinainen tekstisisältö on vain ylläpitäjien luettavissa.",
@@ -2343,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",
@@ -2395,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",
@@ -3220,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/fo.json b/languages/i18n/fo.json
index 058248df0d..7ef64c90c7 100644
--- a/languages/i18n/fo.json
+++ b/languages/i18n/fo.json
@@ -499,7 +499,7 @@
 	"passwordreset-emailtitle": "konto upplýsingar á {{SITENAME}}",
 	"passwordreset-emailtext-ip": "Onkur (óiva tú, frá IP adressu $1) hevur biðið um nullstillan av tínum loyniorði til {{SITENAME}} ($4). Fylgjandi brúkara {{PLURAL:$3|konta er|kontur eru}}\nsettar í samband við hesa t-post adressu:\n\n$2\n\n{{PLURAL:$3|Hetta fyribils loyniorðið|Hesi fyribils loyniorðini}} ganga út um {{PLURAL:$5|ein dag|$5 dagar}}.\nTú eigur at rita inn og velja eitt nýtt loyniorð nú. Um onkur annar hevur gjørt hesa umbønina, ella um tú ert komin í tankar um títt uppruna loyniorð, og tú ikki longur ynskir at broyta tað, so kanst tú síggja burtur frá hesum boðum og halda fram at brúka títt gamla loyniorð.",
 	"passwordreset-emailtext-user": "Brúkari $1 á {{SITENAME}} hevur biðið um eina nullstillan av tínum loyniorði til {{SITENAME}} \n($4). Fylgjandi brúkara {{PLURAL:$3|konta er|kontur eru}} settar í samband við hesa t-post adressuna:\n\n$2\n\n{{PLURAL:$3|Hetta fyribils loyniorðið|Hesi fyribils loyniorðini}} ganga út um {{PLURAL:$5|ein dag|$5 dagar}}.\nTú eigur at rita inn og velja eitt nýtt loyniorð nú. Um onkur annar hevur gjørt hesa umbøn, ella um tú ert komin í tankar um títt uppruna loyniorð, og tú ikki longur ynskir at broyta tað, so kanst tú síggja burtur frá hesum boðum og halda fram at brúka títt gamla loyniorð.",
-	"passwordreset-emailelement": "Brúkaranavn: $1\nFyribils loyniorð: $2",
+	"passwordreset-emailelement": "Brúkaranavn: \n$1\n\nFyribils loyniorð: \n$2",
 	"passwordreset-emailsent": "Ein teldupostur har tú kanst nullstillað loyniorðið er blivin sendur.",
 	"passwordreset-emailsent-capture": "Ein teldupostur, har ið tú kanst nullstilla loyniorðið, er blivin sendur, sum víst niðanfyri.",
 	"passwordreset-emailerror-capture": "Ein teldupostur við nullstillaðum loyniorði var gjørdur, sum víst niðanfyri, men tað miseydnaðist at senda til {{GENDER:$2|brúkaran}}: $1",
@@ -1519,7 +1519,6 @@
 	"emailuser": "Send t-post til brúkara",
 	"emailuser-title-target": "Send teldupost til henda {{GENDER:$1|brúkaran}}",
 	"emailuser-title-notarget": "Send t-post til brúkara",
-	"emailpage": "Send t-post til brúkara",
 	"emailpagetext": "Tú kanst brúka skjalið niðanfyri til at senda ein teldupost til henda {{GENDER:$1|brúkara}}.\nTeldupost adressan sum tú skrivaði í [[Special:Preferences|tíni brúkara ynskir]] kemur síðan fram sum \"Frá\" adressan í teldupostinum, soleiðis at móttakarin kann svara beinleiðis til tín.",
 	"defemailsubject": "{{SITENAME}} t-postur frá brúkara $1",
 	"usermaildisabled": "Brúkara t-postur er óvirkin",
diff --git a/languages/i18n/fr.json b/languages/i18n/fr.json
index a46cfa3ec5..68970f2fa7 100644
--- a/languages/i18n/fr.json
+++ b/languages/i18n/fr.json
@@ -137,7 +137,6 @@
 	"tog-hideminor": "Masquer les modifications mineures dans les changements récents",
 	"tog-hidepatrolled": "Masquer les modifications surveillées dans les modifications récentes",
 	"tog-newpageshidepatrolled": "Masquer les pages surveillées dans la liste des nouvelles pages",
-	"tog-hidecategorization": "Masquer la catégorisation des pages",
 	"tog-extendwatchlist": "Étendre la liste de suivi pour afficher toutes les modifications et pas uniquement les plus récentes",
 	"tog-usenewrc": "Grouper les changements par page dans les modifications récentes et la liste de suivi",
 	"tog-numberheadings": "Numéroter automatiquement les titres de section",
@@ -165,13 +164,12 @@
 	"tog-watchlisthidebots": "Masquer les modifications faites par des robots dans la liste de suivi",
 	"tog-watchlisthideminor": "Masquer les modifications mineures dans la liste de suivi",
 	"tog-watchlisthideliu": "Masquer les modifications faites par des utilisateurs inscrits dans la liste de suivi",
-	"tog-watchlisthideanons": "Masquer les modifications anonymes dans la liste de suivi",
+	"tog-watchlisthideanons": "Masquer les modifications d'utilisateurs anonymes dans la liste de suivi",
 	"tog-watchlisthidepatrolled": "Masquer les modifications surveillées dans la liste de suivi",
-	"tog-watchlisthidecategorization": "Masquer la catégorisation des pages",
 	"tog-ccmeonemails": "M'envoyer une copie des courriels que j'envoie aux autres utilisateurs",
 	"tog-diffonly": "Ne pas afficher le contenu des pages sous les diffs",
 	"tog-showhiddencats": "Afficher les catégories cachées",
-	"tog-norollbackdiff": "Ne pas afficher le diff lors d'une révocation",
+	"tog-norollbackdiff": "Ne pas afficher le diff après avoir révoqué",
 	"tog-useeditwarning": "M'avertir quand je quitte une page de modification sans publier les changements",
 	"tog-prefershttps": "Toujours utiliser une connexion sécurisée en étant connecté(e)",
 	"underline-always": "Toujours",
@@ -253,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.",
@@ -389,8 +387,8 @@
 	"toc": "Sommaire",
 	"showtoc": "afficher",
 	"hidetoc": "masquer",
-	"collapsible-collapse": "masquer",
-	"collapsible-expand": "afficher",
+	"collapsible-collapse": "Replier",
+	"collapsible-expand": "Développer",
 	"confirmable-confirm": "Êtes-vous sûr{{GENDER:$1||e}} ?",
 	"confirmable-yes": "Oui",
 	"confirmable-no": "Non",
@@ -553,6 +551,7 @@
 	"createacct-benefit-body2": "{{PLURAL:$1|article|articles}}",
 	"createacct-benefit-body3": "{{PLURAL:$1|contributeur récent|contributeurs récents}}",
 	"badretype": "Les mots de passe que vous avez saisis ne correspondent pas.",
+	"usernameinprogress": "Une création de compte pour ce nom d’utilisateur est déjà en cours.\nVeuillez patienter.",
 	"userexists": "Nom d'utilisateur entré déjà utilisé.\nVeuillez choisir un nom différent.",
 	"loginerror": "Erreur de connexion",
 	"createacct-error": "Erreur lors de la création du compte",
@@ -643,7 +642,7 @@
 	"passwordreset-emailtitle": "Détails du compte sur {{SITENAME}}",
 	"passwordreset-emailtext-ip": "Quelqu'un (probablement vous, depuis l'adresse IP $1) a demandé un réinitialisation de votre mot de passe pour {{SITENAME}} ($4). {{PLURAL:$3|Le compte utilisateur suivant est associé|Les comptes utilisateurs suivants sont associés}} à cette adresse de courriel :\n\n$2\n\n{{PLURAL:$3|Ce mot de passe temporaire expirera|Ces mots de passe temporaires expireront}} dans {{PLURAL:$5|un jour|$5 jours}}. Vous devez maintenant vous connecter et choisir un nouveau mot de passe. Si cette demande ne provient pas de vous, ou que vous avez retrouvé votre mot de passe initial, et ne souhaitez plus le modifier, vous pouvez ignorer ce message et continuer à utiliser votre ancien mot de passe.",
 	"passwordreset-emailtext-user": "L'utilisateur $1 sur {{SITENAME}} a demandé un réinitialisation de votre mot de passe pour {{SITENAME}} ($4). {{PLURAL:$3|Le compte utilisateur suivant est associé|Les comptes utilisateurs suivants sont associés}} à cette adresse de courriel :\n\n$2\n\n{{PLURAL:$3|Ce mot de passe temporaire expirera|Ces mots de passe temporaires expireront}} dans {{PLURAL:$5|un jour|$5 jours}}. Vous devez maintenant vous connecter et choisir un nouveau mot de passe. Si cette demande ne provient pas de vous, ou que vous avez retrouvé votre mot de passe initial, et ne souhaitez plus le modifier, vous pouvez ignorer ce message et continuer à utiliser votre ancien mot de passe.",
-	"passwordreset-emailelement": "Nom d'utilisateur : $1\nMot de passe temporaire : $2",
+	"passwordreset-emailelement": "Nom d'utilisateur : \n$1\n\nMot de passe temporaire : \n$2",
 	"passwordreset-emailsent": "Un courriel de réinitialisation de mot de passe a été envoyé.",
 	"passwordreset-emailsent-capture": "Un courriel de réinitialisation de mot de passe a été envoyé, qui est affiché ci-dessous.",
 	"passwordreset-emailerror-capture": "Un courriel de réinitialisation de mot de passe a été généré, qui est affiché ci-dessous, mais l'envoi à l'{{GENDER:$2|utilisateur|utilisatrice}} a échoué : $1",
@@ -701,7 +700,7 @@
 	"subject-preview": "Prévisualisation du sujet/titre :",
 	"previewerrortext": "Une erreur s’est produite lors de la tentative de prévisualisation de vos modifications.",
 	"blockedtitle": "L’utilisateur est bloqué.",
-	"blockedtext": "'''Votre compte utilisateur ou votre adresse IP a été bloqué.'''\n\nLe blocage a été effectué par $1.\nLa raison invoquée est la suivante : ''$2''.\n\n* Début du blocage : $8\n* Expiration du blocage : $6\n* Compte bloqué : $7.\n\nVous pouvez contacter $1 ou un autre [[{{MediaWiki:Grouppage-sysop}}|administrateur]] pour en discuter.\nVous ne pouvez utiliser la fonction « {{MediaWiki:emailpage}} » que si une adresse de courriel valide est spécifiée dans vos [[Special:Preferences|préférences]] et que si cette fonctionnalité n’a pas été bloquée.\nVotre adresse IP actuelle est $3 et votre identifiant de blocage est $5.\nVeuillez préciser ces indications dans toutes les requêtes que vous ferez.",
+	"blockedtext": "'''Votre compte utilisateur ou votre adresse IP a été bloqué.'''\n\nLe blocage a été effectué par $1.\nLa raison invoquée est la suivante : ''$2''.\n\n* Début du blocage : $8\n* Expiration du blocage : $6\n* Compte bloqué : $7.\n\nVous pouvez contacter $1 ou un autre [[{{MediaWiki:Grouppage-sysop}}|administrateur]] pour en discuter.\nVous ne pouvez utiliser la fonction « {{int:emailuser}} » que si une adresse de courriel valide est spécifiée dans vos [[Special:Preferences|préférences]] et que si cette fonctionnalité n’a pas été bloquée.\nVotre adresse IP actuelle est $3 et votre identifiant de blocage est $5.\nVeuillez préciser ces indications dans toutes les requêtes que vous ferez.",
 	"autoblockedtext": "Votre adresse IP a été bloquée automatiquement car elle a été utilisée par un autre utilisateur, lui-même bloqué par $1.\nLa raison invoquée est :\n\n:''$2''\n\n* Début du blocage : $8\n* Expiration du blocage : $6\n* Compte bloqué : $7\n\nVous pouvez contacter $1 ou l’un des autres [[{{MediaWiki:Grouppage-sysop}}|administrateurs]] pour discuter de ce blocage.\n\nNotez que vous ne pourrez utiliser la fonctionnalité d’envoi de courriel que si vous avez une adresse de courriel validée dans vos [[Special:Preferences|préférences]] et que si cette fonctionnalité n’a pas été désactivée.\n\nVotre adresse IP actuelle est $3, et le numéro de blocage est $5.\nVeuillez préciser ces indications dans toutes les requêtes que vous ferez.",
 	"blockednoreason": "aucune raison donnée",
 	"whitelistedittext": "Vous devez vous $1 pour avoir la permission de modifier le contenu.",
@@ -1044,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}})",
@@ -1319,9 +1319,6 @@
 	"rcshowhidemine": "$1 mes modifications",
 	"rcshowhidemine-show": "Afficher",
 	"rcshowhidemine-hide": "Masquer",
-	"rcshowhidecategorization": "$1 la catégorisation des pages",
-	"rcshowhidecategorization-show": "Afficher",
-	"rcshowhidecategorization-hide": "Cacher",
 	"rclinks": "Afficher les $1 dernières modifications effectuées au cours des $2 derniers jours<br />$3.",
 	"diff": "diff",
 	"hist": "hist",
@@ -1345,10 +1342,6 @@
 	"recentchangeslinked-summary": "Cette page spéciale montre les modifications récentes sur les pages qui sont liées. Les pages de votre liste de suivi sont '''en gras'''.",
 	"recentchangeslinked-page": "Nom de la page :",
 	"recentchangeslinked-to": "Afficher les modifications des pages qui comportent un lien vers la page donnée plutôt que l'inverse",
-	"recentchanges-page-added-to-category": "[[:$1]] ajouté à la catégorie",
-	"recentchanges-page-added-to-category-bundled": "[[:$1]] et {{PLURAL:$2|une page ajoutée|$2 pages ajoutées}} à la catégorie",
-	"recentchanges-page-removed-from-category": "[[:$1]] supprimé de la catégorie",
-	"recentchanges-page-removed-from-category-bundled": "[[:$1]] et {{PLURAL:$2|une page retirée|$2 pages retirées}} de la catégorie",
 	"upload": "Importer un fichier",
 	"uploadbtn": "Importer le fichier",
 	"reuploaddesc": "Annuler et retourner au formulaire d'import",
@@ -1459,13 +1452,13 @@
 	"upload-too-many-redirects": "L’URL contient trop de redirections.",
 	"upload-http-error": "Une erreur HTTP est survenue : $1",
 	"upload-copy-upload-invalid-domain": "La copie des téléversements n’est pas disponible depuis ce domaine.",
-	"upload-dialog-title": "Télécharger un fichier",
+	"upload-dialog-title": "Téléverser un fichier",
 	"upload-dialog-error": "Une erreur est survenue",
 	"upload-dialog-warning": "Un avertissement s’est produit",
 	"upload-dialog-button-cancel": "Annuler",
 	"upload-dialog-button-done": "Fait",
 	"upload-dialog-button-save": "Enregistrer",
-	"upload-dialog-button-upload": "Télécharger",
+	"upload-dialog-button-upload": "Téléverser",
 	"upload-dialog-label-select-file": "Sélectionner un fichier",
 	"upload-dialog-label-infoform-title": "Détails",
 	"upload-dialog-label-infoform-name": "Nom",
@@ -1771,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).",
@@ -1857,7 +1850,6 @@
 	"emailuser": "Lui envoyer un courriel",
 	"emailuser-title-target": "Envoyer un courriel à {{GENDER:$1|cet utilisateur|cette utilisatrice}}",
 	"emailuser-title-notarget": "Envoyer un courriel à l'utilisateur",
-	"emailpage": "Envoyer un courriel à l'utilisateur",
 	"emailpagetext": "Vous pouvez utiliser le formulaire ci-dessous pour envoyer un courriel à {{GENDER:$1|cet utilisateur|cette utilisatrice}}.\nL'adresse électronique que vous avez indiquée dans [[Special:Preferences|vos préférences]] apparaîtra dans le champ « Expéditeur » de votre message ; ainsi, le destinataire pourra vous répondre directement.",
 	"defemailsubject": "Courriel de {{SITENAME}} de l'utilisateur « $1 »",
 	"usermaildisabled": "L'envoi de courriels entre utilisateurs est désactivé",
@@ -1879,7 +1871,7 @@
 	"emailccsubject": "Copie de votre message à $1 : $2",
 	"emailsent": "Courriel envoyé",
 	"emailsenttext": "Votre message a été envoyé par courriel.",
-	"emailuserfooter": "Ce courriel a été envoyé par « $1 » à « $2 » par la fonction « {{int:emailpage}} » de {{SITENAME}}.",
+	"emailuserfooter": "Ce courriel a été envoyé par « $1 » à « $2 » par la fonction « {{int:emailuser}} » de {{SITENAME}}.",
 	"usermessage-summary": "A laissé un message système.",
 	"usermessage-editor": "Messager du système",
 	"watchlist": "Liste de suivi",
@@ -2451,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",
@@ -3401,11 +3393,12 @@
 	"logentry-newusers-create2": "Le compte utilisateur $3 {{GENDER:$2|a été créé}} par $1",
 	"logentry-newusers-byemail": "Le compte utilisateur $3 {{GENDER:$2|a été créé}} par $1 et le mot de passe a été envoyé par courriel",
 	"logentry-newusers-autocreate": "Le compte $1 {{GENDER:$2|a été créé}} automatiquement",
+	"logentry-protect-move_prot": "$1 {{GENDER:$2|a déplacé}} les paramètres de protection de $4 vers $3",
 	"logentry-rights-rights": "$1 {{GENDER:$2|a modifié}} l'appartenance au groupe pour $3 de $4 à $5",
 	"logentry-rights-rights-legacy": "$1 {{GENDER:$2|a modifié}} l'appartenance au groupe pour $3",
 	"logentry-rights-autopromote": "$1 {{GENDER:$2|a été promu}} automatiquement de $4 à $5",
 	"logentry-upload-upload": "$1 {{GENDER:$2|a téléchargé}} $3",
-	"logentry-upload-overwrite": "$1 {{GENDER:$2|a téléchargé}} une nouvelle version de $3",
+	"logentry-upload-overwrite": "$1 {{GENDER:$2|a téléversé}} une nouvelle version de $3",
 	"logentry-upload-revert": "$1 {{GENDER:$2|a téléchargé}} $3",
 	"log-name-managetags": "Journal des modifications de balises",
 	"log-description-managetags": "Cette page recense les tâches de maintenance liées aux [[Special:Tags|balises]]. Le journal contient uniquement les actions faites manuellement par un administrateur ; les balises peuvent être créées ou supprimées par le logiciel wiki sans que cette action ne soit inscrite dans ce journal.",
diff --git a/languages/i18n/frp.json b/languages/i18n/frp.json
index 7f610674f5..4812b02a90 100644
--- a/languages/i18n/frp.json
+++ b/languages/i18n/frp.json
@@ -478,7 +478,7 @@
 	"passwordreset-emailtitle": "Dètalys du compto dessus {{SITENAME}}",
 	"passwordreset-emailtext-ip": "Yon (probâblament vos, dês l’adrèce IP $1) at demandâ na remês’a zérô de voutron\ncontresegno por {{SITENAME}} ($4). {{PLURAL:$3|Ceti compto utilisator est associyê|Cetos comptos utilisators sont associyês}}\na cel’adrèce èlèctronica :\n\n$2\n\n{{PLURAL:$3|Cél contresegno temporèro èxpirerat|Celos contresegnos temporèros èxpireront}} dens {{PLURAL:$5|un jorn|$5 jorns}}.\nOra vos vos dête branchiér et pués chouèsir un contresegno novél. Se cela demanda vint pas de vos\nou ben que vos vos éte rapelâ de voutron contresegno originâl et que vos souhètâd pas més lo changiér,\nvos pouede ignorar ceti mèssâjo et continuar a empleyér voutron viely contresegno.",
 	"passwordreset-emailtext-user": "L’utilisator $1 dessus {{SITENAME}} at demandâ na remês’a zérô de voutron contresegno por {{SITENAME}}\n($4). {{PLURAL:$3|Ceti compto utilisator est associyê|Cetos comptos utilisators sont associyês}}\na cel’adrèce èlèctronica :\n\n$2\n\n{{PLURAL:$3|Cél contresegno temporèro èxpirerat|Celos contresegnos temporèros èxpireront}} dens {{PLURAL:$5|un jorn|$5 jorns}}.\nOra vos vos dête branchiér et pués chouèsir un contresegno novél. Se cela demanda vint pas de vos\nou ben que vos vos éte rapelâ de voutron contresegno originâl et que vos souhètâd pas més lo changiér,\nvos pouede ignorar ceti mèssâjo et continuar a empleyér voutron viely contresegno.",
-	"passwordreset-emailelement": "Nom d’utilisator : $1\nContresegno temporèro : $2",
+	"passwordreset-emailelement": "Nom d’utilisator : \n$1\n\nContresegno temporèro : \n$2",
 	"passwordreset-emailsent": "Un mèssâjo de remês’a zérô de contresegno est étâ mandâ.",
 	"passwordreset-emailsent-capture": "Un mèssâjo de remês’a zérô de contresegno est étâ mandâ, qu’est montrâ ce-desot.",
 	"passwordreset-emailerror-capture": "Un mèssâjo de remês’a zérô de contresegno est étâ fêt, qu’est montrâ ce-desot, mas l’èxpèdicion a l’utilisat{{GENDER:$2|or|rice}} at pas reussi : $1",
@@ -1507,7 +1507,6 @@
 	"emailuser": "Lui mandar un mèssâjo",
 	"emailuser-title-target": "Mandar un mèssâjo a cet’utilisat{{GENDER:$1|or|rice}}",
 	"emailuser-title-notarget": "Mandar un mèssâjo a l’utilisator",
-	"emailpage": "Mandar un mèssâjo a l’utilisator",
 	"emailpagetext": "Vos pouede empleyér lo formulèro ce-desot por mandar un mèssâjo a cet’utilisat{{GENDER:$1|or|rice}}.\nL’adrèce èlèctronica que vos éd buchiêe dens voutres [[Special:Preferences|prèferences]] aparêtrat dedens lo champ « Èxpèdior » de voutron mèssâjo ; d’ense, lo dèstinatèro vos porrat rèpondre tot drêt.",
 	"defemailsubject": "Mèssâjo de {{SITENAME}} de l’utilisator « $1 »",
 	"usermaildisabled": "L’èxpèdicion de mèssâjos entre utilisators est dèsactivâye",
diff --git a/languages/i18n/frr.json b/languages/i18n/frr.json
index 62a05cb035..087e20248d 100644
--- a/languages/i18n/frr.json
+++ b/languages/i18n/frr.json
@@ -15,7 +15,6 @@
 	"tog-hideminor": "Letj anrangen fersteeg",
 	"tog-hidepatrolled": "Letj anrangen fersteeg",
 	"tog-newpageshidepatrolled": "Kontroliaret sidjen bi a \"Nei sidjen\" fersteeg",
-	"tog-hidecategorization": "Kategorisiarang faan sidjen fersteeg",
 	"tog-extendwatchlist": "Ütjwidjet list faan sidjen, diar dü uun't uug behual wel",
 	"tog-usenewrc": "Ütjwidjet uunwisin faan a ''Leetst feranrangen'' an bi a sidjen, diar dü ''Uun't uug behual'' wel",
 	"tog-numberheadings": "Auerskraften automaatisk numeriare",
@@ -45,7 +44,6 @@
 	"tog-watchlisthideliu": "Feranrangen faan uunmeldet brükern bi sidjen, diar ik uun't uug behual wal, fersteeg",
 	"tog-watchlisthideanons": "Feranrangen faan anonüüm brükern (IPs) bi sidjen, diar ik uun't uug behual wal, fersteeg",
 	"tog-watchlisthidepatrolled": "Kontroliaret feranrangen bi a sidjen, diar ik uun't uug behual wal, fersteeg",
-	"tog-watchlisthidecategorization": "Kategorisiarang faan sidjen fersteeg",
 	"tog-ccmeonemails": "Schüür mi kopiin faan e-mails, diar ik tu ööder brükern schüür",
 	"tog-diffonly": "Bi en werjuunsferglik bluas di ferskeel uunwise, ei det hialer sidj",
 	"tog-showhiddencats": "Ferbürgen kategoriin uunwise",
@@ -435,6 +433,7 @@
 	"createacct-benefit-body2": "{{PLURAL:$1|sidj|sidjen}}",
 	"createacct-benefit-body3": "aktiif {{PLURAL:$1|skriiwer|skriiwern}}",
 	"badretype": "Jo tau paaswurden san ei likedenang.",
+	"usernameinprogress": "För didiar brükernööm woort jüst en konto maaget. Teew en uugenblak.",
 	"userexists": "Didiar brükernööm as al wech.\nWees so gud an schük di en öödern.",
 	"loginerror": "Bi't uunmeldin as wat skiaf gingen",
 	"createacct-error": "Bi't iinrachten faan det brükerkonto as wat skiaf gingen",
@@ -452,6 +451,7 @@
 	"wrongpassword": "Det paaswurd as ferkiard.\nWees so gud an ferschük det noch ans.",
 	"wrongpasswordempty": "Dü heest nian paaswurd iinden.\nFerschük det man noch ans.",
 	"passwordtooshort": "Paaswurden skel tumanst {{PLURAL:$1|1 tiaken|$1 tiakens}} lung wees.",
+	"passwordtoolong": "Paaswurden kön ei linger üs {{PLURAL:$1|1 tiaken|$1 tiakens}} wees.",
 	"password-name-match": "Dü könst dan brükernööm ei üs paaswurd nem.",
 	"password-login-forbidden": "Didiar brükernööm mä detdiar paaswurd as ei tuläät.",
 	"mailmypassword": "Paaswurd turagsaat",
@@ -523,7 +523,7 @@
 	"passwordreset-emailtitle": "Brükerkonto aw {{SITENAME}}",
 	"passwordreset-emailtext-ip": "Hoker mä det IP-Adres $1, woorskiinelk dü salew, wul hal brükerinformatsjuunen för {{SITENAME}} tusjüürd fu ($4). {{PLURAL:$3|Detdiar brükerkonto as|Jodiar brükerkontos san}} mä detdiar E-Mail-adres ferbünjen:\n\n$2\n\n{{PLURAL:$3|Detheer tidjwiis paaswurd lääpt|Joheer tidjwiis paaswurden luup}} efter {{PLURAL:$5|ään dai|$5 daar}} uf. \nDü skulst di uunmelde an en nei paaswurd iinracht. Wan hoker ööders detheer uunfraag steld hää an dü din ual paaswurd käänst, do säärst dü niks widjer onernem. Melde di ianfach widjerhen mä din ual paaswurd uun.",
 	"passwordreset-emailtext-user": "Di brüker $1 üüb {{SITENAME}} hää am brükerinformatsjuunen för {{SITENAME}} uunfraaget ($4). {{PLURAL:$3|Detdiar brükerkonto as|Jodiar brükerkontos san}} mä detdiar E-Mail-Adres ferbünjen:\n\n$2\n\n{{PLURAL:$3|Detheer tidjwiis paaswurd lääpt|Joheer tidjwiis paaswurden luup}} efter {{PLURAL:$5|ään dai|$5 daar}} uf. Dü skulst di uunmelde an en nei paaswurd iinracht. Wan hoker ööders detheer uunfraag steld hää of dü din ual paaswurd käänst, säärst dü niks widjer onernem. Melde di ianfach mä din ual paaswurd uun.",
-	"passwordreset-emailelement": "Brükernööm: $1\nTidjwiis paaswurd: $2",
+	"passwordreset-emailelement": "Brükernööm: \n$1\n\nTidjwiis paaswurd: \n$2",
 	"passwordreset-emailsent": "Diar as en E-Mail tu di onerwais.",
 	"passwordreset-emailsent-capture": "Detdiar E-Mail, wat oner uunwiset woort, as tu di onerwais.",
 	"passwordreset-emailerror-capture": "Detdiar E-Mail, wat oner uunwiset woort, wiar tu di onerwais, oober küd ei tu di {{GENDER:$2|brüker}} ufsjüürd wurd: $1",
@@ -577,6 +577,7 @@
 	"missingcommentheader": "'''Paase üüb:''' Dü heest nian auerskraft uunden.\nWan dü det sidj seekerst, woort det saner auerskraft auernimen.",
 	"summary-preview": "Föörskau faan det tuupfaadang:",
 	"subject-preview": "Föörskau faan det auerskraft:",
+	"previewerrortext": "Diar as wat skiaf gingen, üs en föörskau faan din feranrangen wiset wurd skul.",
 	"blockedtitle": "Brüker as speret",
 	"blockedtext": "'''Dan brükernööm of din IP-adres as speret wurden.'''\n\nDet as maaget wurden faan $1.\nDi grünj as ''$2''.\n\n* Began: $8\n* Aanj: $6\n* Bedraapt: $7\n\nDü könst $1 kontaktiare of uk en [[{{MediaWiki:Grouppage-sysop}}|administraator]] am det tu diskutiarin.\n\nDü könst ei det e-mail-funktjuun 'E-mail tu didiar brüker' brük, so loong dü nian e-mail-adres uun din [[Special:Preferences|brükerkonto-iinstelangen]] uunden heest of wan det e-mail-funktjuun för di speret wurden as.\n\nUugenblakelk as din IP-addres $3, an det sper-ID as #$5.\nFör arke uunfraag wurd aal jo informatjuunen boowen brükt.",
 	"autoblockedtext": "'''Din IP-adres as speret wurden, auer det faan en öödern spereten brüker brükt wurden as.'''\n\nDi grünj as:\n: ''$2''.\n\n* Began: $8\n* Aanj: $6\n* Bedraapt: $7\n\nDü könst $1 kontaktiare of uk en [[{{MediaWiki:Grouppage-sysop}}|administraator]] am det tu diskutiarin.\n\nDü könst ei det e-mail-funktjuun 'E-mail tu didiar brüker' brük, so loong dü nian e-mail-adres uun din [[Special:Preferences|brükerkonto-iinstelangen]] uunden heest of wan det e-mail-funktjuun för di speret wurden as.\n\nUugenblakelk as din IP-addres $3, an det sper-ID as #$5.\nFör arke uunfraag wurd aal jo informatjuunen boowen brükt.",
@@ -629,6 +630,7 @@
 	"yourdiff": "Ferskeeler",
 	"copyrightwarning": "Seenk diaram, dat bidracher tu {{SITENAME}} oner det $1 ütjden wurd (muar stäänt bi $2).\nWan dü ei wel, dat öödern dan bidrach widjer bewerke, do trak ei üüb \"Seekre\".<br />\nDü ferspräächst, dat dü di tekst salew skrewen heest of dat diar nian kopiarrochten üüb lei.\n'''Dü mutst nian werk mä kopiarrochten saner ferloof heer iinstel!'''",
 	"copyrightwarning2": "Seenk diaram, dat det sidj {{SITENAME}} faan öödern bewerket, feranert of uk stregen wurd koon. Wan dü det ei wel, do skriiw heer niks iin! \n\nWan dü heer wat iinskrafst, do beest dü diarmä iinferstenen an seekerst tu, dat dü det '''salew skrewen''' heest of faan en steed auernimen heest, huar '''nian rochten''' üüb lei. (Luke bi $1, wan dü muar wed wel.)\n\n'''Auerdreeg nään frääm teksten an bilen saner ferloof!'''",
+	"editpage-cannot-use-custom-model": "Det muude faan detheer sidj koon ei feranert wurd.",
 	"longpageerror": "'''Error: Dan tekst as {{PLURAL:$1|ian kilobyte|$1 kilobytes}} lung, hi mut oober ei linger wees üs {{PLURAL:$2|ian kilobyte|$2 kilobytes}}.'''Hi koon ei ufspiikerd wurd.",
 	"readonlywarning": "'''Paase üüb: Dü könst uun uugenblak ei üüb det dootenbeenk tugrip. Din dooten kön ei seekert wurd.''' Wees so gud an seekre dan tekst iarst ans üüb dan reegner, an ferschük leederhen, ham tu auerdreegen.\n\nGrünj för det sperin: $1",
 	"protectedpagewarning": "'''Paase üüb: Detdiar sidj as speret wurden. Bluas administratooren kön det bewerke.'''\nUun't logbuk stäänt muar diartu:",
@@ -854,7 +856,7 @@
 	"searchprofile-advanced": "Ütjwidjet",
 	"searchprofile-articles-tooltip": "Schük uun $1",
 	"searchprofile-images-tooltip": "Bilen schük",
-	"searchprofile-everything-tooltip": "Schük aueraal (uk diskusjuunssidjen)",
+	"searchprofile-everything-tooltip": "Schük aueraal (uk diskuschuunsidjen)",
 	"searchprofile-advanced-tooltip": "Uun ööder nöömrümer schük",
 	"search-result-size": "$1 ({{PLURAL:$2|1 wurd|$2 wurden}})",
 	"search-result-category-size": "{{PLURAL:$1|1 sidj|$1 sidjen}} ({{PLURAL:$2|1 onerkategorii|$2 onerkategoriin}}, {{PLURAL:$3|1 datei|$3 datein}})",
@@ -960,7 +962,7 @@
 	"yourvariant": "Spriak:",
 	"prefs-help-variant": "Uun hün skriiwwiis skel a sidjen uunwiset wurd:",
 	"yournick": "Nei signatuur:",
-	"prefs-help-signature": "Wees so gud an onerskriiw üüb diskusjuunssidjen mä „<nowiki>~~~~</nowiki>“. Diar komt do dan brükernööm an det klooktidj bi ütj.",
+	"prefs-help-signature": "Wees so gud an onerskriiw üüb diskuschuunsidjen mä „<nowiki>~~~~</nowiki>“. Diar komt do dan brükernööm an det klooktidj bi ütj.",
 	"badsig": "Diar stemet wat ei mä't signatuur. Preewe at HTML.",
 	"badsiglength": "Din signatuur mut ei muar üs $1 {{PLURAL:$1|tiaken|tiakens}} haa.",
 	"yourgender": "Hü wel dü betiakent wurd?",
@@ -1035,8 +1037,8 @@
 	"grouppage-suppress": "{{ns:project}}:Oversighter",
 	"right-read": "Sidjen lees",
 	"right-edit": "Sidjen bewerke",
-	"right-createpage": "Sidjen maage (saner diskusjuunssidjen)",
-	"right-createtalk": "Diskusjuunssidjen maage",
+	"right-createpage": "Sidjen maage (saner diskuschuunsidjen)",
+	"right-createtalk": "Diskuschuunsidjen maage",
 	"right-createaccount": "Brükerkonto iinracht",
 	"right-minoredit": "Feranrangen üs letj kääntiakne",
 	"right-move": "Sidjen fersküüw",
@@ -1053,7 +1055,7 @@
 	"right-purge": "Sidjen-cache leesag maage saner efterfraagin",
 	"right-autoconfirmed": "Ei troch IP-limits beskäären",
 	"right-bot": "Automatisiaret bewerke",
-	"right-nominornewtalk": "Letj feranrangen üüb diskusjuunssidjen wurd ei üs „nei noorachten“ uunwiset.",
+	"right-nominornewtalk": "Letj feranrangen üüb diskuschuunsidjen wurd ei üs „nei bööd“ uunwiset.",
 	"right-apihighlimits": "Huuger taalen für API-uunfraagen brük",
 	"right-writeapi": "Write-API brük",
 	"right-delete": "Sidjen strik",
@@ -1114,7 +1116,7 @@
 	"action-read": "jüdeer sid leese",
 	"action-edit": "detdiar sidj tu bewerkin",
 	"action-createpage": "nei sidjen tu maagin",
-	"action-createtalk": "diskusjuunssidjen maage",
+	"action-createtalk": "diskuschuunsidjen maage",
 	"action-createaccount": "jüdeer brükerkonto mååge",
 	"action-history": "di ferluup faan detdiar sidj uuntulukin.",
 	"action-minoredit": "detdiar feranrang üs letj kääntiakne",
@@ -1192,9 +1194,6 @@
 	"rcshowhidemine": "$1 min bidracher",
 	"rcshowhidemine-show": "Wise",
 	"rcshowhidemine-hide": "Fersteeg",
-	"rcshowhidecategorization": "$1 kategorisiarang faan sidjen",
-	"rcshowhidecategorization-show": "Wise",
-	"rcshowhidecategorization-hide": "Fersteeg",
 	"rclinks": "Wise a leetst $1 feranrangen faan a leetst $2 daar.<br />$3",
 	"diff": "ferskeel",
 	"hist": "werjuunen",
@@ -1218,10 +1217,6 @@
 	"recentchangeslinked-summary": "Detdiar spezial-sidj wiset a leetst feranrangen faan ferwiset sidjen (of faan sidjen uun en was kategorii). Sidjen, diar dü [[Special:Watchlist|uun't uug behual]] wel, san '''fäät''' skrewen.",
 	"recentchangeslinked-page": "Sidjennööm:",
 	"recentchangeslinked-to": "Wise feranrangen üüb sidjen, diar heerhen ferwise.",
-	"recentchanges-page-added-to-category": "[[:$1]] tu kategorii saat",
-	"recentchanges-page-added-to-category-bundled": "[[:$1]] an {{PLURAL:$2|ian sidj muar|$2 muar sidjen}} tu kategorii saat",
-	"recentchanges-page-removed-from-category": "[[:$1]] faan't kategorii wechnimen",
-	"recentchanges-page-removed-from-category-bundled": "[[:$1]] an {{PLURAL:$2|ian sidj muar|$2 muar sidjen}} faan det kategorii wechnimen",
 	"upload": "Datei huuchschüür",
 	"uploadbtn": "Datei huuchschüür",
 	"reuploaddesc": "Ufbreeg an turag tu't sidj för't huuchschüüren",
@@ -1322,6 +1317,19 @@
 	"upload-too-many-redirects": "Det URL hää tuföl widjerfeerangen.",
 	"upload-http-error": "Diar as en HTTP-feeler mä: $1",
 	"upload-copy-upload-invalid-domain": "Kopiin faan datein kön faan detdiar domeen ei huuchschüürd wurd.",
+	"upload-dialog-title": "Datei huuchschüür",
+	"upload-dialog-error": "Diar as wat skiaf gingen",
+	"upload-dialog-warning": "Diar as en wäärnang kimen",
+	"upload-dialog-button-cancel": "Ufbreeg",
+	"upload-dialog-button-done": "Klaar",
+	"upload-dialog-button-save": "Seekre",
+	"upload-dialog-button-upload": "Huuchschüür",
+	"upload-dialog-label-select-file": "Datei ütjschük",
+	"upload-dialog-label-infoform-title": "Enkelthaiden",
+	"upload-dialog-label-infoform-name": "Nööm",
+	"upload-dialog-label-infoform-description": "Beskriiwang",
+	"upload-dialog-label-usage-title": "Brük",
+	"upload-dialog-label-usage-filename": "Dateinööm",
 	"backend-fail-stream": "Det datei $1 küd ei auerdraanj wurd.",
 	"backend-fail-backup": "Det datei $1 küd ei seekert wurd.",
 	"backend-fail-notexists": "Det datei $1 jaft at ei.",
@@ -1402,6 +1410,7 @@
 	"listfiles-delete": "strik",
 	"listfiles-summary": "Üüb detdiar spezialsidj wurd aal a huuchschüürd datein uunwiset.",
 	"listfiles_search_for": "Schük efter det datei:",
+	"listfiles-userdoesnotexist": "Son brükerkonto \"$1\" jaft at ei.",
 	"imgfile": "datei",
 	"listfiles": "List faan datein",
 	"listfiles_thumb": "Letjer bil",
@@ -1491,6 +1500,7 @@
 	"randomincategory-nopages": "Diar san nian sidjen uun [[:Category:$1]].",
 	"randomincategory-category": "Kategorii:",
 	"randomincategory-legend": "Tufelag sidj uun't kategorii",
+	"randomincategory-submit": "Widjer",
 	"randomredirect": "Tufelag widjerfeerang",
 	"randomredirect-nopages": "Uun di nöömrüm „$1“ san nian widjerfeerangen.",
 	"statistics": "Statistik",
@@ -1500,7 +1510,7 @@
 	"statistics-header-hooks": "Ööder statistiken",
 	"statistics-articles": "Artiikler",
 	"statistics-pages": "Sidjen",
-	"statistics-pages-desc": "Aal a sidjen uun det wiki, mä diskusjuunssidjen, widjerfeerangen asw.",
+	"statistics-pages-desc": "Aal a sidjen uun det wiki, mä diskuschuunsidjen, widjerfeerangen ...",
 	"statistics-files": "Huuchschüürd datein",
 	"statistics-edits": "Feranrangen, sant {{SITENAME}} maaget wurden as",
 	"statistics-edits-average": "Feranrangen per sidj uun't madel",
@@ -1623,6 +1633,7 @@
 	"logempty": "Diar as niks uun.",
 	"log-title-wildcard": "Sidjennööm begant mä ...",
 	"showhideselectedlogentries": "Wise/fersteeg jodiar logbukiindracher",
+	"log-edit-tags": "Markiarangen faan enkelt logbuk-iindracher bewerke",
 	"allpages": "Aal a sidjen",
 	"nextpage": "Naist sidj ($1)",
 	"prevpage": "Leetst sidj ($1)",
@@ -1701,7 +1712,6 @@
 	"emailuser": "E-mail tu didiar brüker",
 	"emailuser-title-target": "E-mail tu {{GENDER:$1|didiar brüker|detdiar brükerin}} schüür",
 	"emailuser-title-notarget": "E-mail tu brüker",
-	"emailpage": "E-mail tu brüker",
 	"emailpagetext": "Dü könst {{GENDER:$1|di brüker|det brükerin}} mä det formulaar en e-mail schüür.\nDin aanj e-mail adres faan din [[Special:Preferences|iinstelangen]] woort uunwiset, so dat {{GENDER:$1|di brüker|det brükerin}} di saner amwai swaare koon.",
 	"defemailsubject": "{{SITENAME}} e-mail faan brüker „$1“",
 	"usermaildisabled": "E-mail fun as ei aktiif",
@@ -1723,7 +1733,7 @@
 	"emailccsubject": "Kopii faan din mädialang tu $1: $2",
 	"emailsent": "E-mail as wechschüürd wurden",
 	"emailsenttext": "Din e-mail as wechschüürd wurden.",
-	"emailuserfooter": "Detdiar e-mail as faan „$1“ tu „$2“ auer det funktjuun „{{int:emailpage}}“ bi {{SITENAME}} schüürd wurden.",
+	"emailuserfooter": "Detdiar e-mail as faan „$1“ tu „$2“ auer det funktjuun „{{int:emailuser}}“ bi {{SITENAME}} schüürd wurden.",
 	"usermessage-summary": "Süsteemnooracht seekert.",
 	"usermessage-editor": "Süsteemnoorachten siinst",
 	"watchlist": "Uun't uug behual",
@@ -1809,6 +1819,20 @@
 	"rollback-success": "Feranrangen faan $1 turagsaat an det leetst werjuun faan $2 weder iinsteld.",
 	"sessionfailure-title": "session feeler",
 	"sessionfailure": "Diar as wat skiaf gingen bi't auerdreegen faan din brükerdooten.\nAm dat diar ei noch muar skiaf gongt, as det aktjuun ufbreegen wurden.\nGung turag, an began faan föören.",
+	"changecontentmodel": "Det muude faan det sidj feranre",
+	"changecontentmodel-legend": "Det muude feranre",
+	"changecontentmodel-title-label": "Sidjennööm",
+	"changecontentmodel-model-label": "Nei muude",
+	"changecontentmodel-reason-label": "Grünj:",
+	"changecontentmodel-success-title": "Det muude as feranert wurden",
+	"changecontentmodel-success-text": "Det muude faan [[:$1]] as feranert wurden.",
+	"changecontentmodel-cannot-convert": "Det muude faan [[:$1]] koon ei tu typ $2 feranert wurd.",
+	"changecontentmodel-nodirectediting": "Uun det $1 muude könst dü ei direkt bewerke",
+	"log-name-contentmodel": "Muude-feranrang-logbuk",
+	"log-description-contentmodel": "Föörkemen am det sidjenmuude",
+	"logentry-contentmodel-change": "$1 {{GENDER:$2|hää}} det muude faan sidj $3 faan „$4“ efter „$5“ feranert.",
+	"logentry-contentmodel-change-revertlink": "turagsaat",
+	"logentry-contentmodel-change-revert": "turagsaat",
 	"protectlogpage": "Sidjenseekerangs-logbuk",
 	"protectlogtext": "Detheer as det logbuk mä seekert sidjen.\nÜüb [[Special:ProtectedPages|detdiar list]] stun a seekert sidjen.",
 	"protectedarticle": "hää „[[$1]]“ seekert.",
@@ -2078,7 +2102,7 @@
 	"move-page-legend": "Sidj fersküüw",
 	"movepagetext": "Mä detdiar formulaar könst dü en sidj mä aal sin werjuunen amnääm.\nDi ual tiitel woort üüb di nei widjerfeerd.\nDü könst widjerfeerangen, diar üüb di ual tiitel wise, automaatisk üüb di nei tiitel widjerfeer läät.\nWan dü det oober ei dääst, paase üüb, dat dü aal a [[Special:DoubleRedirects|dobelt]] of [[Special:BrokenRedirects|breegen]] widjerfeerangen noch ans efterlukest.\nBluas dü könst diarför surge, dat ferwisangen widjerhen rocht werke.\n\nDet sidj woort '''ei''' fersköwen, wan't al en sidj mä di nei nööm jaft. Det loket bluas do, wan di nei nööm salew en widjerfeerang as. Det ment, dat dü det amnäämen turagsaat könst, wan dü niks ferkiard maaget heest. Dü könst oober nian sidj, diar't al jaft, auerskriiw.\n\n'''Paase üüb!'''\nDet fersküüwen hää widjloftag fulgen för ööder sidjen. Dü skulst begreben haa, wat dü diar maage wel.",
 	"movepagetext-noredirectfixer": "Mä detdiar formulaar könst dü en sidj mä aal sin werjuunen amnääm.\nDi ual tiitel woort üüb di nei widjerfeerd.\nDü könst widjerfeerangen, diar üüb di ual tiitel wise, automaatisk üüb di nei tiitel widjer feer läät.\nWan dü det oober ei dääst, paase üüb, dat dü aal a [[Special:DoubleRedirects|dobelt]] of [[Special:BrokenRedirects|breegen]] widjerfeerangen noch ans efterlukest.\nBluas dü könst diarför surge, dat ferwisangen widjerhen rocht werke.\n\nDet sidj woort '''ei''' fersköwen, wan't al en sidj mä di nei nööm jaft. Det loket bluas do, wan di nei nööm salew en widjerfeerang as. Det ment, dat dü det amnäämen turagsaat könst, wan dü niks ferkiard maaget heest. Dü könst oober nian sidj, diar't al jaft, auerskriiw.\n\n'''Paase üüb!'''\nDet fersküüwen hää widjloftag fulgen för ööder sidjen. Dü skulst begreben haa, wat dü diar maage wel.",
-	"movepagetalktext": "Uk det diskusjuunssidj woort fersköwen, wan det diar as, '''oober ei, wan:'''\n*Diar al en diskusjuunssidj mä didiar nööm as, of\n*Dü detdiar mögelkhaid ütjslotst.\n\nUun didiar faal skel dü a diskusjuunssidjen faan hun tuupfeer.\n\nDreeg di '''nei''' tiitel bi '''ööder sidj''' iin, an diaroner '''en grünj''' för't amnäämen.",
+	"movepagetalktext": "Uk det diskuschuunsidj woort fersköwen, wan det diar as, <strong>oober ei, wan:</strong>\n*Diar al en diskuschuunsidj mä didiar nööm as, of\n*Dü detdiar mögelkhaid ütjslotst.\n\nUun didiar faal skel dü a diskuschuunsidjen faan hun tuupfeer.",
 	"movearticle": "Sidj fersküüw:",
 	"moveuserpage-warning": "'''Paase üüb:''' Dü wel en brükersidj fersküüw. Seenk diaram, dat bluas det brükersidj amnäämd woort, oober '''ei''' di brüker. Hi behäält san ual nööm.",
 	"movecategorypage-warning": "<strong>Paase üüb:</strong> Dü wel jüst en kategoriisidj fersküüw. Seenk diaram, dat bluas det sidj fersköwen woort. A sidjen uun det kategorii wurd <em>ei</em> nei kategorisiaret.",
@@ -2092,7 +2116,7 @@
 	"newtitle": "Müülj:",
 	"move-watch": "Jodiar sidjen uun't uug behual",
 	"movepagebtn": "Sidj fersküüw",
-	"pagemovedsub": "Ferschüwing luket",
+	"pagemovedsub": "Fersküüwen hää loket",
 	"movepage-moved": "'''Det sidj „$1“ as efter „$2“ fersköwen wurden.'''",
 	"movepage-moved-redirect": "En widjerfeerang as iinracht wurden.",
 	"movepage-moved-noredirect": "Det maagin faan en widjerfeerang as ferhanert wurden.",
@@ -2185,6 +2209,9 @@
 	"import-interwiki-history": "Aal a werjuunen faan det sidj importiare",
 	"import-interwiki-templates": "Mä aal a föörlaagen",
 	"import-interwiki-submit": "Import",
+	"import-mapping-default": "Tu normool seekerangsteeden importiare",
+	"import-mapping-namespace": "Tu en nöömrüm importiare:",
+	"import-mapping-subpage": "Üs onersidjen faan detdiar sidj importiare:",
 	"import-upload-filename": "Dateinööm:",
 	"import-comment": "Komentaar:",
 	"importtext": "Wees so gud an eksportiare det datei mä det spezial-sidj [[Special:Export|Eksport]] ütj det ööder Wiki. Det seekerst dü üüb dan reegner an schüürst det do heer huuch.",
@@ -2333,7 +2360,9 @@
 	"pageinfo-robot-index": "Tuläät",
 	"pageinfo-robot-noindex": "Ei tuläät",
 	"pageinfo-watchers": "Taal faan brükern, diar det sidj uun't uug haa",
+	"pageinfo-visiting-watchers": "Taal faan beschükern, diar a leetst feranrangen beluket haa",
 	"pageinfo-few-watchers": "Maner üs {{PLURAL:$1|ään brüker|$1 brükern}}, diar det sidj uun't uug haa",
+	"pageinfo-few-visiting-watchers": "At as ei seeker, wäär diar en beschüker a leetst feranrangen besoocht hää",
 	"pageinfo-redirects-name": "Taal faan widjerfeerangen tu detdiar sidj",
 	"pageinfo-subpages-name": "Onersidjen faan detdiar sidj",
 	"pageinfo-subpages-value": "$1 ($2 {{PLURAL:$2|widjerfeerang|widjerfeerangen}}; $3 {{PLURAL:$3|onersidj|onersidjen}})",
@@ -2358,6 +2387,7 @@
 	"pageinfo-protect-cascading-yes": "Ja",
 	"pageinfo-protect-cascading-from": "Sidjen mä kaskaadenseekerhaid faan",
 	"pageinfo-category-info": "Kategorii-informatjuun",
+	"pageinfo-category-total": "Taal faan lasmooten",
 	"pageinfo-category-pages": "Taal faan sidjen",
 	"pageinfo-category-subcats": "Taal faan onerkategoriin",
 	"pageinfo-category-files": "Taal faan datein",
@@ -2375,6 +2405,7 @@
 	"patrol-log-page": "Kontrol-logbuk",
 	"patrol-log-header": "Det as det kontrol-logbuk.",
 	"log-show-hide-patrol": "Kontrol-logbuk $1",
+	"log-show-hide-tag": "Markiarang-logbuk $1",
 	"deletedrevision": "Ual werjuun $1 stregen",
 	"filedeleteerror-short": "Bi't striken faan det datei $1 as wat skiaf gingen.",
 	"filedeleteerror-long": "Bi't striken faan det datei as wat skiaf gingen:\n\n$1",
@@ -2911,6 +2942,9 @@
 	"version-libraries": "Instaliaret bibleteeken",
 	"version-libraries-library": "Bibleteek",
 	"version-libraries-version": "Werjuun",
+	"version-libraries-license": "Lisens",
+	"version-libraries-description": "Beskriiwang",
+	"version-libraries-authors": "Skriiwern",
 	"redirect": "Widjerfeerang faan en brüker, en sidj, en sidjenwerjuun of en datei.",
 	"redirect-legend": "Widjerfeerang üüb en sidjenwerjuun of datei.",
 	"redirect-summary": "Detdiar spezial-sidj feert widjer üüb en brükersidj, sidj, sidjenwerjuun of datei.\nAn det woort so brükt:  [[{{#Special:Redirect}}/user/101]], [[{{#Special:Redirect}}/page/64308]], [[{{#Special:Redirect}}/revision/328429]] of [[{{#Special:Redirect}}/file/Example.jpg]].",
@@ -3007,6 +3041,18 @@
 	"tags-deactivate-reason": "Grünj:",
 	"tags-deactivate-not-allowed": "Dü könst det markiarang \"$1\" ei de-aktiwiare.",
 	"tags-deactivate-submit": "De-aktiwiare",
+	"tags-edit-title": "Markiarangen bewerke",
+	"tags-edit-manage-link": "Markiarangen ferwalte",
+	"tags-edit-existing-tags": "Markiarangen:",
+	"tags-edit-existing-tags-none": "\"Nianen\"",
+	"tags-edit-new-tags": "Nei markiarangen:",
+	"tags-edit-add": "Jodiar markiarangen diartusaat:",
+	"tags-edit-remove": "Jodiar markiarangen wechnem:",
+	"tags-edit-remove-all-tags": "(aal a markiarangen wechnem)",
+	"tags-edit-chosen-placeholder": "Enkelt markiarangen ütjschük",
+	"tags-edit-chosen-no-results": "Sok markiarangen ei fünjen",
+	"tags-edit-reason": "Grünj:",
+	"tags-edit-nooldid-title": "Nian werjuun uunden",
 	"comparepages": "Sidjen ferglik",
 	"compare-page1": "Sidj 1",
 	"compare-page2": "Sidj 2",
@@ -3039,6 +3085,9 @@
 	"htmlform-cloner-create": "Muar diartudu",
 	"htmlform-cloner-delete": "Wechnem",
 	"htmlform-cloner-required": "Dü skel tumanst ään wäärs uundu.",
+	"htmlform-title-not-exists": "[[:$1]] jaft at ei.",
+	"htmlform-user-not-exists": "<strong>$1</strong> jaft at ei.",
+	"htmlform-user-not-valid": "<strong>$1</strong> as nään tuläät brükernööm",
 	"sqlite-has-fts": "Werjuun $1 mä halep för't schüken uun di hialer tekst.",
 	"sqlite-no-fts": "Werjuun $1 saner halep för't schüken uun di hialer tekst.",
 	"logentry-delete-delete": "$1 {{Gender:$2}} hää det sidj $3 stregen",
@@ -3091,6 +3140,7 @@
 	"logentry-managetags-delete": "$1 {{GENDER:$2|hää}} det markiarang „$4“ stregen (faan {{PLURAL:$5|ian werjuun of ään logbuk-iindrach|$5 werjuunen an/of logbuk-iindracher}} wechnimen).",
 	"logentry-managetags-activate": "$1 {{GENDER:$2|hää}} det markiarang \"$4\" för't bewerkin faan brükern of bots iinracht.",
 	"logentry-managetags-deactivate": "$1 {{GENDER:$2|hää}} det markiarang \"$4\" för't bewerkin faan brükern of bots de-aktiwiaret.",
+	"log-name-tag": "Markiarang-logbuk",
 	"rightsnone": "(-)",
 	"revdelete-summary": "tuhuupefootings-komäntoor",
 	"feedback-adding": "Komentaar woort tu det sidj skrewen ...",
@@ -3266,5 +3316,8 @@
 	"special-characters-group-khmer": "Khmer",
 	"special-characters-title-endash": "seenkstreg",
 	"special-characters-title-emdash": "speegelstreg",
-	"special-characters-title-minus": "minus tiaken"
+	"special-characters-title-minus": "minus tiaken",
+	"mw-widgets-dateinput-no-date": "Nian dootem ütjsoocht",
+	"mw-widgets-titleinput-description-new-page": "sidj jaft at noch ei",
+	"mw-widgets-titleinput-description-redirect": "widjerfeerang tu $1"
 }
diff --git a/languages/i18n/fy.json b/languages/i18n/fy.json
index e98c3828e2..cbe879baff 100644
--- a/languages/i18n/fy.json
+++ b/languages/i18n/fy.json
@@ -447,7 +447,7 @@
 	"passwordreset-domain": "Domein:",
 	"passwordreset-email": "E-mailadres:",
 	"passwordreset-emailtitle": "Akkountdetails op {{SITENAME}}",
-	"passwordreset-emailelement": "Brûkersnamme: $1\nTydlik wachtwurd: $2",
+	"passwordreset-emailelement": "Brûkersnamme: \n$1\n\nTydlik wachtwurd: \n$2",
 	"changeemail": "Feroarje e-mailadres",
 	"changeemail-newemail": "Nij e-mailadres:",
 	"changeemail-none": "(gjin)",
@@ -1298,7 +1298,6 @@
 	"mailnologintext": "Jo moatte [[Special:UserLogin|oanmelden]] wêze, en in jildich e-postadres [[Special:Preferences|ynsteld]] hawwe, om oan oare meidoggers e-post stjoere te kinnen.",
 	"emailuser": "E-mail meidogger",
 	"emailuser-title-notarget": "E-mail nei meidogger",
-	"emailpage": "E-mail nei meidogger",
 	"emailpagetext": "Fia dit berjocht kinne jo in e-mail oan dizze brûker ferstjoere.\nIt e-mailadres dat jo opjûn hawwe by [[Special:Preferences|jo foarkarren]] wurdt as ôfstjoerder  brûkt.\nDe ûntfanger kin dus daliks nei jo reagearje.",
 	"defemailsubject": "E-mail fan {{SITENAME}}-brûker \"$1\"",
 	"noemailtitle": "Gjin e-postadres",
diff --git a/languages/i18n/ga.json b/languages/i18n/ga.json
index 4bb53e2b85..eeecb0761d 100644
--- a/languages/i18n/ga.json
+++ b/languages/i18n/ga.json
@@ -867,7 +867,6 @@
 	"mailnologin": "Níl aon seoladh maith ann",
 	"mailnologintext": "Ní mór duit bheith  [[Special:UserLogin|logáilte isteach]]\nagus bheith le seoladh ríomhphoist bhailí i do chuid [[Special:Preferences|sainroghanna]]\nmás mian leat ríomhphost a sheoladh chuig úsáideoirí eile.",
 	"emailuser": "Cuir ríomhphost chuig an úsáideoir seo",
-	"emailpage": "Seol ríomhphost",
 	"emailpagetext": "Má d'iontráil an úsáideoir seo seoladh ríomhphoist bhailí ina chuid sainroghanna úsáideora, cuirfidh an foirm anseo thíos teachtaireacht amháin do.\nBeidh do seoladh ríomhphoist a d'iontráil tú i [[Special:Preferences|do chuid sainroghanna úsáideora]] sa bhosca \"Seoltóir\" an riomhphoist, agus mar sin ba féidir léis an faighteoir ríomhphost eile a chur leatsa.",
 	"defemailsubject": "Ríomhphost {{GRAMMAR:genitive|{{SITENAME}}}}",
 	"noemailtitle": "Níl aon seoladh ríomhphoist ann",
diff --git a/languages/i18n/gd.json b/languages/i18n/gd.json
index fe95271664..c9cb743b89 100644
--- a/languages/i18n/gd.json
+++ b/languages/i18n/gd.json
@@ -516,7 +516,7 @@
 	"passwordreset-emailtitle": "Dàta a' chunntais air {{SITENAME}}",
 	"passwordreset-emailtext-ip": "Dh'iarr cuideigin (thu fhèin, 's mathaid, on t-seòladh IP $1) am facal-faire airson {{SITENAME}} ($4) ath-shuidheachadh. Tha {{PLURAL:$3|an cunntas|na cunntasan}} a leanas co-cheangailte ris a' phost-d seo:\n\n$2\n\nFalbhaidh an ùine air {{PLURAL:$3|an fhacal-fhaire shealach|na faclan-faire sealach}} seo an ceann $5 {{PLURAL:$5|latha|latha|làithean|latha}}.\nBu chòir dhut logadh a-steach agus facal-faire ùr a thaghadh an-dràsta. Ma dh'iarr cuideigin eile seo no ma chuimhnich thu air an fhacal-fhaire agad 's mur eil thu airson atharrachadh tuilleadh, leig seachad an teachdaireachd seo 's lean ort leis an t-seann fhacal-fhaire.",
 	"passwordreset-emailtext-user": "Dh'iarr an cleachdaiche $1 air {{SITENAME}} ath-shuidheachadh an fhacail-fhaire air {{SITENAME}} ($4). Tha {{PLURAL:$3|an cunntas-cleachdaiche|na cunntasan-cleachdaiche}} a leanas co-cheangailte ris an t-seòladh puist-d seo:\n\n$2\n\nFalbhaidh an ùine air {{PLURAL:$3|an fhacal-fhaire shealach|na faclan-faire sealach}} seo an ceann $5 {{PLURAL:$5|latha|latha|làithean|latha}}.\nBu chòir dhut logadh a-steach agus facal-faire ùr a thaghadh an-dràsta. Ma dh'iarr cuideigin eile seo no ma chuimhnich thu air an fhacal-fhaire agad 's mur eil thu airson atharrachadh tuilleadh, leig seachad an teachdaireachd seo 's lean ort leis an t-seann fhacal-fhaire.",
-	"passwordreset-emailelement": "Ainm-cleachdaiche: $1\nFacal-faire sealach: $2",
+	"passwordreset-emailelement": "Ainm-cleachdaiche: \n$1\n\nFacal-faire sealach: \n$2",
 	"passwordreset-emailsent": "Chaidh post-d airson ath-shuidheachadh an fhacail-fhaire a chur.",
 	"passwordreset-emailsent-capture": "Chaidh post-d a chum ath-shuidheachadh an fhacail-fhaire a chur agus chì thu sin gu h-ìosal.",
 	"passwordreset-emailerror-capture": "Chaidh post-d a chum ath-shuidheachadh an fhacail-fhaire a ghintinn agus chì thu sin gu h-ìosal ach cha b' urrainn dhuinn a chur dhan chleachdaiche: $1",
@@ -1688,7 +1688,6 @@
 	"emailuser": "Cuir post-dealain dhan chleachdaiche seo",
 	"emailuser-title-target": "Cuir post-d dhan chleachdaiche seo",
 	"emailuser-title-notarget": "Cuir post-d gu cleachdaiche",
-	"emailpage": "Cuir post-d gun chleachdaiche",
 	"emailpagetext": "'S urrainn dhut am foirm gu h-ìosal a chleachdadh gus post-d a chur dhan chleachdaiche seo.\nNochdaidh an seòladh a chuir thu a-steach [[Special:Preferences|sna roghainnean agad]] mar an seòladh \"O\" sa post-d, mar sin 's urrainn dhan fhaightear freagairt a chur thugad gu dìreach.",
 	"defemailsubject": "Post-d on chleachdaiche \"$1\" air {{SITENAME}}",
 	"usermaildisabled": "Chaidh post-d nan cleachdaichean a chur à comas.",
diff --git a/languages/i18n/gl.json b/languages/i18n/gl.json
index 77b77ff53a..736f351203 100644
--- a/languages/i18n/gl.json
+++ b/languages/i18n/gl.json
@@ -441,6 +441,7 @@
 	"createacct-benefit-body2": "{{PLURAL:$1|páxina|páxinas}}",
 	"createacct-benefit-body3": "{{PLURAL:$1|colaborador recente|colaboradores recentes}}",
 	"badretype": "Os contrasinais que inseriu non coinciden.",
+	"usernameinprogress": "Xa está en marcha a creación dunha conta para este nome de usuario.\nPor favor, agarde.",
 	"userexists": "O nome de usuario que inseriu xa está en uso.\nEscolla un nome diferente.",
 	"loginerror": "Erro ao acceder ao sistema",
 	"createacct-error": "Erro ao crear a conta",
@@ -531,7 +532,7 @@
 	"passwordreset-emailtitle": "Detalles da conta de {{SITENAME}}",
 	"passwordreset-emailtext-ip": "Alguén (probablemente vostede, desde o enderezo IP $1) solicitou o restablecemento do seu\ncontrasinal de {{SITENAME}} ($4). {{PLURAL:$3|A seguinte conta de usuario está asociada|As seguintes contas de usuarios están asociadas}}\na este enderezo de correo electrónico:\n\n$2\n\n{{PLURAL:$3|Este contrasinal temporal caducará|Estes contrasinais temporais caducarán}} {{PLURAL:$5|nun día|en $5 días}}.\nDebería acceder ao sistema e elixir un novo contrasinal agora. Se outra persoa fixo esta\nsolicitude ou se lembrou o seu contrasinal orixinal e xa non o quere cambiar,\nignore esta mensaxe e continúe empregando o seu contrasinal vello.",
 	"passwordreset-emailtext-user": "O usuario $1 solicitou o restablecemento do contrasinal de {{SITENAME}}\n($4). {{PLURAL:$3|A seguinte conta de usuario está asociada|As seguintes contas de usuarios están asociadas}}\na este enderezo de correo electrónico:\n\n$2\n\n{{PLURAL:$3|Este contrasinal temporal caducará|Estes contrasinais temporais caducarán}} {{PLURAL:$5|nun día|en $5 días}}.\nDebería acceder ao sistema e elixir un novo contrasinal agora. Se outra persoa fixo esta\nsolicitude ou se lembrou o seu contrasinal orixinal e xa non o quere cambiar,\nignore esta mensaxe e continúe empregando o seu contrasinal vello.",
-	"passwordreset-emailelement": "Nome de usuario: $1\nContrasinal temporal: $2",
+	"passwordreset-emailelement": "Nome de usuario: \n$1\n\nContrasinal temporal: \n$2",
 	"passwordreset-emailsent": "Enviouse o correo electrónico de restablecemento do contrasinal.",
 	"passwordreset-emailsent-capture": "Enviouse un correo electrónico de restablecemento do contrasinal, mostrado a continuación.",
 	"passwordreset-emailerror-capture": "Xerouse un correo electrónico de restablecemento do contrasinal, mostrado a continuación, pero o envío {{GENDER:$2|ao usuario|á usuaria}} fallou: $1",
@@ -612,12 +613,12 @@
 	"blocked-notice-logextract": "Este usuario está bloqueado.\nVelaquí está a última entrada do rexistro de bloqueos, por se quere consultala:",
 	"clearyourcache": "'''Nota:''' Despois de gardar, cómpre limpar a memoria caché do seu navegador para ver os cambios.\n* '''Firefox/Safari:''' Prema ''Maiúsculas'' á vez que en ''Recargar'', ou prema en ''Ctrl-F5'' ou ''Ctrl-R'' (''⌘-R'' nos Mac)\n* '''Google Chrome:''' Prema en ''Ctrl-Maiús-R'' (''⌘-Maiús-R'' nos Mac)\n* '''Internet Explorer:''' Prema ''Ctrl'' ao tempo que fai clic en ''Refrescar'', ou prema en ''Ctrl-F5''\n* '''Opera:''' Limpe a súa memoria caché en ''Ferramentas → Preferencias''",
 	"usercssyoucanpreview": "'''Nota:''' Use o botón \"{{int:showpreview}}\" para verificar o novo CSS antes de gardalo.",
-	"userjsyoucanpreview": "'''Nota:''' Use o botón \"{{int:showpreview}}\" para verificar o novo JS antes de gardalo.",
+	"userjsyoucanpreview": "<strong>Nota:</strong> Use o botón \"{{int:showpreview}}\" para verificar o novo JavaScript antes de gardalo.",
 	"usercsspreview": "'''Lembre que só está vendo a vista previa do seu CSS de usuario.'''\n'''Este aínda non foi gardado!'''",
 	"userjspreview": "'''Lembre que só está probando/previsualizando o seu JavaScript de usuario.'''\n'''Este aínda non foi gardado!'''",
 	"sitecsspreview": "'''Lembre que só está vendo a vista previa deste CSS.'''\n'''Este aínda non foi gardado!'''",
 	"sitejspreview": "'''Lembre que só está vendo a vista previa deste código JavaScript.'''\n'''Este aínda non foi gardado!'''",
-	"userinvalidcssjstitle": "'''Aviso:''' Non hai ningunha aparencia chamada \"$1\".\nLembre que as páxinas .css e .js personalizadas utilizan un título en minúsculas, como por exemplo \"{{ns:user}}:Foo/vector.css\" no canto de \"{{ns:user}}:Foo/Vector.css\".",
+	"userinvalidcssjstitle": "<strong>Aviso:</strong> Non hai ningunha aparencia chamada \"$1\".\nLembre que as páxinas .css e .js personalizadas utilizan un título en minúsculas, como por exemplo \"{{ns:user}}:Exemplo/vector.css\" no canto de \"{{ns:user}}:Exemplo/Vector.css\".",
 	"updated": "(Actualizado)",
 	"note": "'''Nota:'''",
 	"previewnote": "'''Lembre que esta é só unha vista previa e que aínda non gardou os seus cambios!'''",
@@ -930,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}}",
@@ -960,8 +962,8 @@
 	"default": "predeterminado",
 	"prefs-files": "Ficheiros",
 	"prefs-custom-css": "CSS personalizado",
-	"prefs-custom-js": "JS personalizado",
-	"prefs-common-css-js": "CSS/JS compartido por todas as aparencias:",
+	"prefs-custom-js": "JavaScript personalizado",
+	"prefs-common-css-js": "CSS/JavaScript compartido por todas as aparencias:",
 	"prefs-reset-intro": "Pode usar esta páxina para restablecer as súas preferencias ás que veñen dadas por defecto.\nEste cambio non se poderá desfacer.",
 	"prefs-emailconfirm-label": "Confirmación do correo:",
 	"youremail": "Correo electrónico:",
@@ -1648,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.",
@@ -1723,7 +1725,7 @@
 	"noindex-category-desc": "A páxina non está indexada polos bots porque contén a palabra máxica <code><nowiki>__NOINDEX__</nowiki></code> e está nun espazo de nomes no que esa marca está permitida.",
 	"index-category-desc": "A páxina contén a palabra máxica <code><nowiki>__INDEX__</nowiki></code> (e está nun espazo de nomes no que esa marca está permitida) e, polo tanto, será indexada polos bots cando non debera selo normalmente.",
 	"post-expand-template-inclusion-category-desc": "O tamaño da páxina é maior que <code>$wgMaxArticleSize</code> despois de expandir todos os modelos; algúns modelos non se expandiron.",
-	"post-expand-template-argument-category-desc": "A páxina é maior que <code>$wgMaxArticleSize</code> despois de expandir o argumento dun modelo (algo entre chaves triples, como <code>{{{Proba}}}</code>).",
+	"post-expand-template-argument-category-desc": "A páxina é maior que <code>$wgMaxArticleSize</code> despois de expandir o argumento dun modelo (algo entre chaves triples, como <code>{{{Exemplo}}}</code>).",
 	"expensive-parserfunction-category-desc": "A páxina utiliza demasiadas funcións analíticas custosas (como <code>#ifexist</code>). Consulte [https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:$wgExpensiveParserFunctionLimit Manual:$wgExpensiveParserFunctionLimit].",
 	"broken-file-category-desc": "A páxina contén unha ligazón de ficheiro rota (unha ligazón para incorporar un ficheiro que non existe).",
 	"hidden-category-category-desc": "A categoría contén a palabra máxica <code><nowiki>__HIDDENCAT__</nowiki></code>, que impide que se mostre por defecto na caixa de categorías das páxinas.",
@@ -1734,7 +1736,6 @@
 	"emailuser": "Enviar un correo electrónico a {{GENDER:{{BASEPAGENAME}}|este usuario|esta usuaria}}",
 	"emailuser-title-target": "Enviar un correo electrónico a {{GENDER:$1|este usuario|esta usuaria}}",
 	"emailuser-title-notarget": "Enviar un correo electrónico a un usuario",
-	"emailpage": "Enviar un correo electrónico a un usuario",
 	"emailpagetext": "Pode usar o seguinte formulario para enviar unha mensaxe de correo electrónico a {{GENDER:$1|este usuario|esta usuaria}}.\nO enderezo de correo electrónico que inseriu [[Special:Preferences|nas súas preferencias]] aparecerá no campo \"De:\" do correo, polo que {{GENDER:$1|o receptor|a receptora}} da mensaxe poderá responderlle directamente.",
 	"defemailsubject": "Correo electrónico do usuario $1 de {{SITENAME}}",
 	"usermaildisabled": "O correo electrónico do usuario está desactivado",
@@ -1756,7 +1757,7 @@
 	"emailccsubject": "Copia da súa mensaxe para $1: $2",
 	"emailsent": "Mensaxe enviada",
 	"emailsenttext": "A súa mensaxe de correo electrónico foi enviada.",
-	"emailuserfooter": "Este correo electrónico foi enviado por $1 a $2 mediante a función \"{{int:emailpage}}\" en {{SITENAME}}.",
+	"emailuserfooter": "Este correo electrónico foi enviado por $1 a $2 mediante a función \"{{int:emailuser}}\" en {{SITENAME}}.",
 	"usermessage-summary": "Mensaxe deixada polo sistema.",
 	"usermessage-editor": "Editor das mensaxes do sistema",
 	"watchlist": "Lista de vixilancia",
@@ -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",
@@ -3189,6 +3190,7 @@
 	"logentry-newusers-create2": "$1 {{GENDER:$2|creou}} a conta de usuario $3",
 	"logentry-newusers-byemail": "$1 {{GENDER:$2|creou}} a conta de usuario $3; o contrasinal enviouse por correo electrónico",
 	"logentry-newusers-autocreate": "A conta de {{GENDER:$2|usuario|usuaria}} $1 creouse automaticamente",
+	"logentry-protect-move_prot": "$1 {{GENDER:$2|trasladou}} a protección de \"$4\" a \"$3\"",
 	"logentry-rights-rights": "$1 {{GENDER:$2|cambiou}} o grupo ao que pertence $3 de $4 a $5",
 	"logentry-rights-rights-legacy": "$1 {{GENDER:$2|cambiou}} o grupo ao que pertence $3",
 	"logentry-rights-autopromote": "$1 foi {{GENDER:$2|promovido|promovida}} automaticamente de $4 a $5",
@@ -3356,7 +3358,7 @@
 	"json-warn-trailing-comma": "{{PLURAL:$1|Eliminouse $1 coma final|Elimináronse $1 comas finais}} do JSON.",
 	"json-error-unknown": "Houbo un problema co JSON. Erro: $1",
 	"json-error-depth": "Superouse o número máximo de ficheiros apartados.",
-	"json-error-state-mismatch": "O JSON non é válido.",
+	"json-error-state-mismatch": "O JSON non é válido ou ten un formato incorrecto",
 	"json-error-ctrl-char": "Produciuse un erro de carácter de control, trátase probablemente dun problema de codificación.",
 	"json-error-syntax": "Erro de sintaxe",
 	"json-error-utf8": "Hai caracteres UTF-8 incorrectos, trátase probablemente dun problema de codificación.",
diff --git a/languages/i18n/gom-deva.json b/languages/i18n/gom-deva.json
index 279fab509d..15b91561b1 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": "सत्र शेवट",
@@ -348,7 +348,7 @@
 	"passwordreset-username": "वापरप्याचे नांव",
 	"passwordreset-domain": "डोमेन:",
 	"passwordreset-email": "ईमेल नामो:",
-	"passwordreset-emailelement": "वापरप्याचें नांव: $1\nतात्पुरतें गुपीत उतर: $2",
+	"passwordreset-emailelement": "वापरप्याचें नांव: \n$1\n\nतात्पुरतें गुपीत उतर: \n$2",
 	"passwordreset-emailsent": "गुपीत उतर परतून तयार करपाचो ईमेल धाडला",
 	"changeemail": "ईमेल संदेश बदल्ला",
 	"changeemail-oldemail": "सद्याचो ईमेल नामो:",
@@ -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..b38176e269 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",
@@ -351,7 +351,7 @@
 	"passwordreset-username": "Vapurpeache nanv:",
 	"passwordreset-domain": "Domain:",
 	"passwordreset-email": "Email potto:",
-	"passwordreset-emailelement": "Vapurpeachem nanv: $1\nTatpurtem gupitutor: $2",
+	"passwordreset-emailelement": "Vapurpeachem nanv: \n$1\n\nTatpurtem gupitutor: \n$2",
 	"passwordreset-emailsent": "Gupitutor portun tharaipacho email dhadla.",
 	"changeemail": "Email potto bodol",
 	"changeemail-oldemail": "Sodhyacho email potto:",
@@ -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 6302baa3ef..94c5a0b0ab 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",
@@ -341,6 +341,15 @@
 	"no-null-revision": "Di nej Nullversion fir d Syte „$1“ het nit chennen aagleit wäre",
 	"badtitle": "Ugültiger Titel",
 	"badtitletext": "Dr Titel vu dr agforderte Syte isch nit giltig gsi, leer, oder e nit giltig Sprochgleich vun eme andre Wiki.",
+	"title-invalid-empty": "Der beatreit Sytetitel isch läär oder beisteit nur us em Name vomene Namensruum.",
+	"title-invalid-utf8": "Im beatreite Sytetitel het’s Zeiche, wo gäge UTF-8 verstoosse.",
+	"title-invalid-interwiki": "Im beatreite Sytetitel het’s en Interwiki-Link. Das geit imne Titel nid.",
+	"title-invalid-talk-namespace": "Der beatreit Sytetitel beziet sech uf’ne Diskussionssyte wo’s nid cha gä.",
+	"title-invalid-characters": "Im beatreite Sytetitel het’s ungültigi Zeiche: «$1».",
+	"title-invalid-relative": "Im Titel het’s e relative Pfad (./, ../). Relativi Pfäd sy i Title nid zuegla. Si chöü derzue füere, das e Browser d Syte nid cha erreiche.",
+	"title-invalid-magic-tilde": "Im beatreite Sytetitel het’s ds magische Wort <nowiki>~~~</nowiki>. Das isch nid zuegla.",
+	"title-invalid-too-long": "Der beatreit Sytetitel isch z läng. Är darf nid länger sy als $1 {{PLURAL:$1|Byte|Bytes}} ir UTF-8-Codierig.",
+	"title-invalid-leading-colon": "Der beatreit Sytetitel fat mit emne Strichpunkt a. Das isch nid zuegla.",
 	"perfcached": "Die Informatione chemme us em Zwischespycher un sin derwyl villicht nit aktuäll. Maximal {{PLURAL:$1|ei Ergebnis isch|$1 Ergebnis sin}} im Cache verfiegbar.",
 	"perfcachedts": "Die Date stamme us em Zwischespycher un sin am $1 s letscht Mol aktualisiert wore. Maximal {{PLURAL:$4|ei Ergebnis isch|$4 Ergebnis sin}} im Zwischespycher verfiegbar.",
 	"querypage-no-updates": "'''D Aktualisierigsfunktion fir die Syte isch im Momänt deaktiviert. D Date wäre vorerscht nit ernejert.'''",
@@ -349,8 +358,8 @@
 	"actionthrottled": "Aktionsaazahl limitiert",
 	"actionthrottledtext": "As Schutz vor Spam cha die Aktion im e churze Zytabstand nume begränzt durgfiert wäre. Du bisch ebe an die Gränz cho. Bitte versuech s in e paar Minute non emol.",
 	"protectedpagetext": "Die Syte isch fir s Bearbeite gsperrt.",
-	"viewsourcetext": "Quelltext vo dere Syte:",
-	"viewyourtext": "Du chasch dr Quälltext vu '''Dyre Bearbeitig''' vu däre Syte aaluege un kopiere:",
+	"viewsourcetext": "Du chasch der Quelltext vo dere Syten aluegen u kopiere.",
+	"viewyourtext": "Du chasch dr Quälltext vu '''Dyne Bearbeitige''' vu däre Syte aaluege un kopiere.",
 	"protectedinterface": "In däre Syte het s Text fir s Sproch-Interface vu dr Software un si isch gsperrt, zum Missbruch z verhindre.",
 	"editinginterface": "<strong>Warnig:</strong> Uf däre Syte het s Täxt, wu vu dr MediaWiki-Software brucht wird. Änderigen uf däre Syte wirke si uf d Benutzeroberflechi vu däm Wiki uus.",
 	"translateinterface": "Go Ibersetzige fir alli Wiki zuefiege oder ändere, bruuch bitte [//translatewiki.net/ translatewiki.net], s MediaWiki-Lokalisierigsprojäkt.",
@@ -430,6 +439,7 @@
 	"createacct-benefit-body2": "{{PLURAL:$1|Syte|Syte}}",
 	"createacct-benefit-body3": "{{PLURAL:$1|aktive Autor|aktivi Autore}}",
 	"badretype": "Di beidi Passwörter stimme nid zämme.",
+	"usernameinprogress": "Es Konto für dä Namen isch am erstellt wärde.\nBitte warte.",
 	"userexists": "Dä Benutzername git s scho.\nBitte nimm e andere.",
 	"loginerror": "Fähler bir Aamäldig",
 	"createacct-error": "Fähler bim Aalege vum Benutzerkonto",
@@ -520,7 +530,7 @@
 	"passwordreset-emailtitle": "Benutzerkontoinformationen uf {{SITENAME}}",
 	"passwordreset-emailtext-ip": "Eber mit dr IP-Adresse $1, wahrschyns Du sälber, het e Erinnerig an Dyyni Benutzerkonteninformatione fir {{SITENAME}} aagforderet ($4). \n\n{{PLURAL:$3|Des Benutzerkonto isch|Die Benutzerkonte sin}} mit däre E-Mail-Adräss verchnipft: \n\n$2 \n\n{{PLURAL:$3|Des temporär Passwort lauft|Die temporäre Passwerter laufe}} in {{PLURAL:$5|eim Tag|$5 Täg}} ab.\nDu sottsch di aamälden un e nej Passwort vergee. Wänn eber ander die Aafrog gstellt het oder Du di wider an Dyy alt Passwort chasch erinnere un s nimi wettsch ändere, chasch die Nochricht ignorieren un alsfurt Dyy alt Passwort bruche.",
 	"passwordreset-emailtext-user": "Dr Benutzer $1 bi {{SITENAME}} het e Zrucksetzig vu Dym Passwort bi {{SITENAME}} aagforderet ($4). \n\n{{PLURAL:$3|Des Benutzerkonto isch|Die Benutzerkonte sin}} mit däre E-Mail-Adräss verchnipft: \n\n$2 \n\n{{PLURAL:$3|Des temporär Passwort lauft|Die temporäre Passwerter laufe}} in {{PLURAL:$5|eim Tag|$5 Täg}} ab.\nDu sottsch di aamälden un e nej Passwort vergee. Wänn eber ander die Aafrog gstellt het oder Du di wider an Dyy alt Passwort chasch erinnere un s nimi wettsch ändere, chasch die Nochricht ignorieren un alsfurt Dyy alt Passwort bruche.",
-	"passwordreset-emailelement": "Benutzername: $1\nTemporär Passwort: $2",
+	"passwordreset-emailelement": "Benutzername: \n$1\n\nTemporär Passwort: \n$2",
 	"passwordreset-emailsent": "E Passwort-Zrucksetzig isch per E-Mail verschickt wore.",
 	"passwordreset-emailsent-capture": "E Passwort-Zrucksetzigs-Mail isch vergschickt worde, un isch unte aazeigt.",
 	"passwordreset-emailerror-capture": "Die unten angezeigte Passwortzrucksetzigsmail, wu unten aazeigt wird, isch generiert wore, aber dr Versand an {{GENDER:$2|dr Benutzer|d Benutzeri}} het nit funktioniert: $1",
@@ -566,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.",
@@ -627,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}}:",
@@ -669,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.",
@@ -714,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}})",
@@ -723,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].",
@@ -743,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",
@@ -759,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",
@@ -803,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.",
@@ -824,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",
@@ -833,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",
@@ -851,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",
@@ -866,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",
@@ -880,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:",
@@ -897,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}})",
@@ -943,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",
@@ -959,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.",
@@ -985,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",
@@ -1014,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",
@@ -1035,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",
@@ -1044,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",
@@ -1065,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",
@@ -1074,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",
@@ -1104,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",
@@ -1117,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",
@@ -1146,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",
@@ -1165,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",
@@ -1209,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",
@@ -1226,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.",
@@ -1254,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.",
@@ -1327,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",
@@ -1341,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.",
@@ -1399,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.",
@@ -1431,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:",
@@ -1450,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}}",
@@ -1464,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",
@@ -1508,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)",
@@ -1528,7 +1660,7 @@
 	"allpagesto": "Syten aazeige bis:",
 	"allarticles": "alli Artikel",
 	"allinnamespace": "alli Sytene im Namensruum $1",
-	"allpagessubmit": "gang",
+	"allpagessubmit": "Sueche",
 	"allpagesprefix": "Alli Sytene mit em Präfix:",
 	"allpagesbadtitle": "Dr Sytename, wu yygee hesch, isch nit giltig: Er het entwäder e vorgstellt Sproch-, e Interwiki-Chirzel oder s het ei oder meh Zeiche din, wu in eme Sytename nit derfe brucht wäre.",
 	"allpages-bad-ns": "Dr Namensruum „$1“ isch in {{SITENAME}} nit vorhande.",
@@ -1577,12 +1709,28 @@
 	"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",
 	"emailuser-title-target": "E-Mail an {{GENDER:$1|dää Benutzer|die Benutzeri}} schicke",
 	"emailuser-title-notarget": "E-Mail an Benutzer",
-	"emailpage": "E-Mail an Benutzer",
 	"emailpagetext": "Du chasch {{GENDER:$1|em Benutzer|dr Benutzeri}} mit däm Formular e E-Mail schicke.\nAs Absender wird d E-Mail-Adräss us Dyyne [[Special:Preferences|Yystellige]] yytrait, ass {{GENDER:$1|dr Benutzer|d Benutzeri}} Dir cha Antwort gee.",
 	"defemailsubject": "{{SITENAME}}-E-Mail vum Benutzer „$1“",
 	"usermaildisabled": "Benutzer-E-Mail abgstellt",
@@ -1604,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 …",
@@ -1657,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",
@@ -1673,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",
@@ -1686,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",
@@ -1709,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",
@@ -1723,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",
@@ -1747,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.",
@@ -1782,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-)",
@@ -1789,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:",
@@ -1797,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",
@@ -1806,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",
@@ -1828,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",
@@ -1852,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",
@@ -1893,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:",
@@ -1924,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",
@@ -1950,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",
@@ -2027,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.",
@@ -2057,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.",
@@ -2073,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",
@@ -2099,7 +2287,7 @@
 	"tooltip-pt-logout": "Abmälde",
 	"tooltip-pt-createaccount": "Du chasch gärn e Bentuzerkonto aalege un Di aamälde. Du muesch s aber nit",
 	"tooltip-ca-talk": "Diskussion zum Artikelinhalt",
-	"tooltip-ca-edit": "Syte bearbeite. Bitte vor em Spychere d Vorschou aaluege.",
+	"tooltip-ca-edit": "Die Syte bearbeite",
 	"tooltip-ca-addsection": "Neje Abschnitt aafange",
 	"tooltip-ca-viewsource": "Die Syte isch geschützt. Du chasch der Quelltext aaluege.",
 	"tooltip-ca-history": "Früecheri Versione vo dere Syte.",
@@ -2127,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.",
@@ -2172,7 +2361,7 @@
 	"spam_reverting": "Letschti Version ohni Links zue $1 widerhärgstellt.",
 	"spam_blanking": "In allene Versione het s Links zue $1 gha, sufer gmacht.",
 	"spam_deleting": "Alli Versione mit eme Link zue $1 sin glescht woret.",
-	"simpleantispam-label": "Spamschutz-Priefig. \nDo <strong>NYT</strong> yytrage!",
+	"simpleantispam-label": "Spamschutz-Priefig. \nDo <strong>nyt</strong> yytrage!",
 	"pageinfo-title": "Informatione zue „$1“",
 	"pageinfo-not-current": "Die Informatione chenne leider nit fir alti Versionen aazeigt wäre.",
 	"pageinfo-header-basic": "Basisinformatione",
@@ -2184,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}})",
@@ -2213,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",
@@ -2226,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",
@@ -2248,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.",
@@ -2264,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",
@@ -2272,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.",
@@ -2654,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!",
@@ -2675,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",
@@ -2690,14 +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",
@@ -2710,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",
@@ -2731,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]].",
@@ -2779,11 +3011,84 @@
 	"tags-tag": "Markierigsname",
 	"tags-display-header": "Benännig uf dr Änderigslischte",
 	"tags-description-header": "Vollständigi Bschryybig",
+	"tags-source-header": "Ursprung",
+	"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",
@@ -2795,8 +3100,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.",
@@ -2813,19 +3118,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",
@@ -2834,35 +3147,71 @@
 	"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-termsofuse": "I stimme zue, Rückmäldig z liferen i Überystimmig mit de Nutzigsbedingige.",
 	"feedback-thanks": "Dankschen. Dyy Ruckmäldig isch uf dr Syte „[$2 $1]“ gspycheret wore.",
+	"feedback-thanks-title": "Merci!",
+	"feedback-useragent": "User Agent:",
 	"searchsuggest-search": "Suechi",
 	"searchsuggest-containing": "din het s …",
 	"api-error-badaccess-groups": "Du derfsch keini Dateie in des Wiki uffelade.",
@@ -2896,6 +3245,15 @@
 	"api-error-ok-but-empty": "Intärne Fähler: Dr Server reagiert nit.",
 	"api-error-overwrite": "S Iberschryybe vun ere Datei, wu s scho git, isch nit erlaubt.",
 	"api-error-stashfailed": "Intärne Fähler: Dr Server het kei temporäri Datei chenne spychere.",
+	"api-error-publishfailed": "Interne Fähler: Der Server het di temporäri Datei nid chönne veröffentleche.",
+	"api-error-stasherror": "Bim Ufelade vor Datei het’s e Fähler ’gä.",
+	"api-error-stashedfilenotfound": "Di gspychereti Datei het sech nümm la finde bim Versuech, se vom Spycher ufezlade.",
+	"api-error-stashpathinvalid": "Der Pfad isch ungültig, wo di gspychereti Datei hätt sölle sy.",
+	"api-error-stashfilestorage": "Bim Spychere vor Datei het’s e Fähler ’gä.",
+	"api-error-stashzerolength": "Der Server het d Datei nid chönne spychere, wil si e Lengi vo Null het.",
+	"api-error-stashnotloggedin": "Du muesch di ylogge, für Dateie zum Ufelade chönne z spychere.",
+	"api-error-stashwrongowner": "D Datei ghört nid dir, wo du probiert hesch im Spycher druf zuezgryffe.",
+	"api-error-stashnosuchfilekey": "Der Dateischlüssel git’s nid, wo du probiert hesch im Spycher druf zuezgryffe.",
 	"api-error-timeout": "Dr Server het kei antwort gee in dr erwartete Zyt.",
 	"api-error-unclassified": "S het e nit bekannte Fähler gee.",
 	"api-error-unknown-code": "Nit bekannte Fähler: „$1“",
@@ -2913,17 +3271,77 @@
 	"duration-decades": "$1 {{PLURAL:$1|Johrzehnt|Johrzeht}}",
 	"duration-centuries": "$1 {{PLURAL:$1|Johrhundert|Johrhundert}}",
 	"duration-millennia": "$1 {{PLURAL:$1|Jahrtöusert|Jahrtöusert}}",
+	"rotate-comment": "Bild um $1 {{PLURAL:$1|Grad}} im Uhrzeigersinn ’drähjt.",
+	"limitreport-title": "Parser-Profilingdate:",
+	"limitreport-cputime": "Beaspruchti CPU-Zyt",
+	"limitreport-cputime-value": "{{PLURAL:$1|Ei|$1}} Sekunde",
+	"limitreport-walltime": "Beaspruchti Zyt",
+	"limitreport-walltime-value": "{{PLURAL:$1|Ei|$1}} Sekunde",
+	"limitreport-ppvisitednodes": "Azahl vom Präprozässer bsuechti Chnote",
+	"limitreport-ppgeneratednodes": "Azahl vom Präprozässer generierti Chnote",
+	"limitreport-postexpandincludesize": "Ybindigsgröössi nach em Expandiere",
+	"limitreport-postexpandincludesize-value": "$1/$2 {{PLURAL:$2|Byte}}",
+	"limitreport-templateargumentsize": "Vorlagenargumäntgröössi",
+	"limitreport-templateargumentsize-value": "$1/$2 {{PLURAL:$2|Byte}}",
+	"limitreport-expansiondepth": "Grösti Expansionstieffi",
+	"limitreport-expensivefunctioncount": "Azahl ufwändigi Parserfunktione",
 	"expandtemplates": "Vorlage expandiere",
-	"expand_templates_intro": "In däre Spezialsyte cha Täxt yygee wäre und alli Vorlage in ere wäre rekursiv expandiert. Au Parserfunkione wie <nowiki>{{</nowiki>#language:…}} un Variable wie <nowiki>{{</nowiki>CURRENTDAY}} wäre usgwärtet - faktisch alles was in dopplete gschweifte Chlammere din isch. Des gschiht dur dr Ufruef vu dr jewyylige Parser-Phase in MediaWiki.",
+	"expand_templates_intro": "Die Spezialsyte nimt Text und expandiert alli Vorlage rekursiv, wo drinn stöh.\nSi expandiert ou Parserfunkione wi <code><nowiki>{{</nowiki>#language:…}}</code> und Variable wi <code><nowiki>{{</nowiki>CURRENTDAY}}</code>.\nEigetlech expandiert si praktisch alles, wo i dopplete gschweiffte Chlammere steit.",
 	"expand_templates_title": "Kontexttitel, fir {{FULLPAGENAME}} etc.:",
 	"expand_templates_input": "Yygabfäld:",
 	"expand_templates_output": "Ergebnis",
 	"expand_templates_xml_output": "XML-Usgab",
+	"expand_templates_html_output": "Usgab i rohem HTML",
 	"expand_templates_ok": "Uusfiere",
 	"expand_templates_remove_comments": "Kommentar useneh",
 	"expand_templates_remove_nowiki": "<nowiki>-Befähl im Ergebnis unterdrucke",
 	"expand_templates_generate_xml": "Zeig XML-Parser-Baum",
+	"expand_templates_generate_rawhtml": "Rohs HTML azeige",
 	"expand_templates_preview": "Vorschou",
+	"expand_templates_preview_fail_html": "<em>Wil uf {{SITENAME}} rohs HTML aktiviert isch und wil Sitzigsdate sy verlore ’gange, isch d Vorschou zum Schutz vor JavaScript-Agriffe versteckt.</em>\n\n<strong>We das e legitime Versuech für’ne Vorschou isch, de versuech’s bitte nomal.</strong>\nWe’s immer no nid geit, probier di [[Special:UserLogout|abzmälden]] und wider azmälde.",
+	"expand_templates_preview_fail_html_anon": "<em>Wil uf {{SITENAME}} rohs HTML aktiviert isch und wil Sitzigsdate sy verlore ’gange, isch d Vorschou zum Schutz vor JavaScript-Agriffe versteckt.</em>\n\n<strong>We das e legitime Versuech für’ne Vorschou isch, de [[Special:UserLogin|mäld di bitte a]] und versuech’s nomal.</strong>",
+	"pagelanguage": "Uswahl vor Sytesprach",
+	"pagelang-name": "Syte",
+	"pagelang-language": "Sprach",
+	"pagelang-use-default": "Standardsprach bruuche",
+	"pagelang-select-lang": "Sprach ussueche",
+	"right-pagelang": "Sytesprach ändere",
+	"action-pagelang": "d Sytesprach z ändere",
+	"log-name-pagelang": "Sprachänderigs-Logbuech",
+	"log-description-pagelang": "Das isch es Logbuech für Änderige vo Sytesprache.",
+	"logentry-pagelang-pagelang": "{{GENDER:$2|Der $1|D $1|$1}} het d Sytesprach vo $3 vo $4 uf $5 g’änderet.",
+	"default-skin-not-found": "He nu so de! Di vorygstellti Benutzeroberflächi für dys Wiki – definiert under <code dir=\"ltr\">$wgDefaultSkin</code> als <code>$1</code> – steit nid zur Verfüegig.\n\nI dyren Installation het’s schynt’s di {{PLURAL:$4|folgendi Benutzeroberflächi|folgende Benutzeroberflächine}}:\n\n$2\n\nLueg under [https://www.mediawiki.org/wiki/Manual:Skin_configuration Manual: Skin configuration] für Information drüber, wie d’se chasch {{PLURAL:$4|aktiviere|aktivieren und eini dervo chasch vorystelle}}.\n\n; Falls du MediaWiki grad installiert hesch:\n: Müglecherwys hesch es ab git installiert oder mit eren andere Methode diräkt ab em Quellcode. De isch es z erwarte. Probier [https://www.mediawiki.org/wiki/Category:All_skins Benutzeroberflächine us em Verzeichnis vo mediawiki.org] z installiere. Es git mehreri Müglechkeite derzue:\n:* Der [https://www.mediawiki.org/wiki/Download Installierer als tar.gz-Datei] abelade. Är het mehreri Benutzeroberflächinen und Erwyterige derby. Du chasch ds Benutzeroberflächine-Verzeichnis <code>skins/</code> druus use kopiere.\n:* tar.gz-Dateie für einzelni Benutzeroberflächine vo [https://www.mediawiki.org/wiki/Special:SkinDistributor mediawiki.org] abelade.\n:* [https://www.mediawiki.org/wiki/Download_from_Git#Using_Git_to_download_MediaWiki_skins Git zum Abelade vo MediaWiki-Benutzeroberflächine bruuche].\n: We du e MediaWiki-Entwickler/in bisch, söt’s derby nid zu Konflikte mit dym git repository cho.\n\n; Falls du MediaWiki grad ufe nöüst Stand hesch ’bracht:\n: MediaWiki ab 1.24 aktiviert di installierte Benutzeroberflächine nümm automatisch (lueg [https://www.mediawiki.org/wiki/Manual:Skin_autodiscovery Manual: Skin autodiscovery]). Für di {{PLURAL:$5|installierti Benutzeroberflächi|installierte Benutzeroberflächine}} z aktiviere, chasch di {{PLURAL:$5|folgendi Zyle|folgende Zyle}} i d Datei <code>LocalSettings.php</code> kopiere:\n\n<pre dir=\"ltr\">$3</pre>\n\n; Falls du grad d Datei <code>LocalSettings.php</code> hesch g’änderet:\n: Lueg genau nache, öb’s vilech Tippfähler het i de Näme vo de Benutzeroberflächine.",
+	"default-skin-not-found-no-skins": "He nu so de! Di vorygstellti Benutzeroberflächi für dys Wiki – definiert under <code dir=\"ltr\">$wgDefaultSkin</code> als <code>$1</code> – steit nid zur Verfüegig.\n\nDu hesch kener Benutzeroberflächinen installiert.\n\n; Falls du MediaWiki grad installiert oder ufe nöüst Stand ’bracht hesch:\n: Müglecherwys hesch es ab git installiert oder mit eren andere Methode diräkt ab em Quellcode. De isch es z erwarte. MediaWiki ab 1.24 het kener Benutzeroberflächinen im Houpt-Repository derby. Probier [https://www.mediawiki.org/wiki/Category:All_skins Benutzeroberflächine us em Verzeichnis vo mediawiki.org] z installiere. Es git mehreri Müglechkeite derzue:\n:* Der [https://www.mediawiki.org/wiki/Download Installierer als tar.gz-Datei] abelade. Är het mehreri Benutzeroberflächinen und Erwyterige derby. Du chasch ds Benutzeroberflächine-Verzeichnis <code>skins/</code> druus use kopiere.\n:* tar.gz-Dateie für einzelni Benutzeroberflächine vo [https://www.mediawiki.org/wiki/Special:SkinDistributor mediawiki.org] abelade.\n:* [https://www.mediawiki.org/wiki/Download_from_Git#Using_Git_to_download_MediaWiki_skins Git zum Abelade vo MediaWiki-Benutzeroberflächine bruuche].\n: We du e MediaWiki-Entwickler/in bisch, söt’s derby nid zu Konflikte mit dym Git-Repository cho. Lueg under [https://www.mediawiki.org/wiki/Manual:Skin_configuration Manual: Skin configuration] für Information drüber, wie du Benutzeroberflächi chasch aktivieren und vorystelle.",
+	"default-skin-not-found-row-enabled": "* <code>$1</code> / $2 (aktiviert)",
+	"default-skin-not-found-row-disabled": "* <code>$1</code> / $2 ('''deaktiviert''')",
+	"mediastatistics": "Statistike zu Dateitype",
+	"mediastatistics-summary": "Statistiken über di ufegladnige Dateitype. Berücksichtiget isch jewyle nume di nöüsti Version von ere Datei. Alti oder glöschti Versione sy nid berücksichtiget.",
+	"mediastatistics-nbytes": "{{PLURAL:$1|Eis|$1}} Byte ($2; $3 %)",
+	"mediastatistics-table-mimetype": "MIME-Typ",
+	"mediastatistics-table-extensions": "Müglechi Erwyterige",
+	"mediastatistics-table-count": "Azahl Dateie",
+	"mediastatistics-table-totalbytes": "Gsamtgröössi",
+	"mediastatistics-header-unknown": "Unbekannt",
+	"mediastatistics-header-bitmap": "Bitmap-Bilder",
+	"mediastatistics-header-drawing": "Zeichnige (Vektorbilder)",
+	"mediastatistics-header-audio": "Audio",
+	"mediastatistics-header-video": "Video",
+	"mediastatistics-header-multimedia": "Rich Media",
+	"mediastatistics-header-office": "Office",
+	"mediastatistics-header-text": "Text",
+	"mediastatistics-header-executable": "Usfüerbari Dateie",
+	"mediastatistics-header-archive": "Komprimierti Dateie",
+	"json-warn-trailing-comma": "Us em JSON {{PLURAL:$1|isch eis aghänkts Komma|sy $1 aghänkti Komma}} furtgnoh worde.",
+	"json-error-unknown": "Es het es Problem mit em JSON ’gä. Fähler: $1",
+	"json-error-depth": "Di maximali Tieffi zum Bygelen isch überschritte",
+	"json-error-state-mismatch": "Ungültigs oder fählerhafts JSON",
+	"json-error-ctrl-char": "Stüürzeichefähler, müglecherwys falschi Kodierig",
+	"json-error-syntax": "Syntax-Fähler",
+	"json-error-utf8": "Ungültigi UTF-8-Zeiche, müglecherwys falschi Kodierig",
+	"json-error-recursion": "Eini oder meh rekursivi Referänzen im Wärt sy z kodiere",
+	"json-error-inf-or-nan": "Eine oder meh NAN- oder INF-Wärte sy z kodiere",
+	"json-error-unsupported-type": "Es isch e Wärt für’ne Typ a’gä worde, wo sech nid lat la kodiere",
+	"headline-anchor-title": "Link zu däm Abschnitt",
 	"special-characters-group-latin": "Latynisch",
 	"special-characters-group-latinextended": "Latin Extended",
 	"special-characters-group-ipa": "IPA",
@@ -2943,6 +3361,12 @@
 	"special-characters-group-thai": "Thai",
 	"special-characters-group-lao": "Lao",
 	"special-characters-group-khmer": "Khmer",
+	"special-characters-title-endash": "Halbgviertstrich",
+	"special-characters-title-emdash": "Gviertstrich",
+	"special-characters-title-minus": "Minus-Zeiche",
+	"mw-widgets-dateinput-no-date": "Keis Datum usgsuecht",
 	"mw-widgets-dateinput-placeholder-day": "JJJJ-MM-TT",
-	"mw-widgets-dateinput-placeholder-month": "JJJJ-MM"
+	"mw-widgets-dateinput-placeholder-month": "JJJJ-MM",
+	"mw-widgets-titleinput-description-new-page": "d Syte git’s no nid",
+	"mw-widgets-titleinput-description-redirect": "Wyterleitig uf $1"
 }
diff --git a/languages/i18n/gu.json b/languages/i18n/gu.json
index f3b46f10c1..3dae27dd16 100644
--- a/languages/i18n/gu.json
+++ b/languages/i18n/gu.json
@@ -510,7 +510,7 @@
 	"passwordreset-emailtitle": "{{SITENAME}} પર ખાતાની માહિતી",
 	"passwordreset-emailtext-ip": "કોઈકે (કદાચ તમોએ , $1 IP એડ્રેસ થી) તમારી વેબસાઈટ {{SITENAME}}  ($4) નો પાસવર્ડ રિસેટ કરવાની રજૂઆત કરી છે. આ ઈમેઈલ એડ્રેસ સાથે {{PLURAL:$3|નું ખાતું|ના ખાતા}} જોડાયેલા છે.\n.\n.\n\n$2\n\n{{PLURAL:$3|આ કામચલાઉ પાસવર્ડ|આ બધા કામચલાઉ પાસવર્ડ}} {{PLURAL:$5|એક દિવસ|$5 દિવસો}} માં નષ્ટ થઇ જશે. તમારે અત્યારે જ ખાતું ખોલીને નવો પાસવર્ડ સેટ કરી લેવો જોઈએ .જો કોઈ બીજા એ આ રજૂઆત કરી હોય, અથવા જો તમને પોતાનો અસલ પાસવર્ડ યાદ હોય, અને તેને બદલવા નથી માગતા, તો આ સંદેશાને જતો કરીને પોતાના અસલ પાસવર્ડ ને વાપરી શકો છો.",
 	"passwordreset-emailtext-user": "વેબસાઈટ  {{SITENAME}} ના વપરાશકર્તા $1 એ તમારા {{SITENAME}} ($4) નો પાસવર્ડ રિસેટ કરવાની રજૂઆત કરી છે. આ ઈમેઈલ એડ્રેસ સાથે {{PLURAL:$3|નું ખાતું|ના ખાતા}} જોડાયેલ છે.\n\n$2\n\n{{PLURAL:$3|આ કામચલાઉ પાસવર્ડ|આ બધા કામચલાઉ પાસવર્ડ}} {{PLURAL:$5|એક દિવસ|$5 દિવસ}} માં નષ્ટ થઇ જશે. તમારે અત્યારે જ ખાતું ખોલીને નવો પાસવર્ડ સેટ કરી લેવો જોઈએ .જો કોઈ બીજા એ આ રજૂઆત કરી હોય, અથવા જો તમને પોતાનો અસલ પાસવર્ડ યાદ હોય, અને તેને બદલવા નથી માગતા, તો આ સંદેશાને જતો કરીને પોતાના અસલ પાસવર્ડ ને વાપરી શકો છો..",
-	"passwordreset-emailelement": "વપરાશકર્તા નામ: $1\nકામચલાઉ પાસવર્ડ: $2",
+	"passwordreset-emailelement": "વપરાશકર્તા નામ: \n$1\n\nકામચલાઉ પાસવર્ડ: \n$2",
 	"passwordreset-emailsent": "પાસવર્ડ બદલવાનો ઇમેલ મોકલવામાં આવ્યો છે.",
 	"passwordreset-emailsent-capture": "પાસવર્ડ બદલવાનો ઇમેલ મોકલવામાં આવ્યો છે, જે નીચે પ્રમાણે છે.",
 	"passwordreset-emailerror-capture": "પાસવર્ડ ફરી ગોઠવવા માટેનો ઇમેલ બનાવવામાં આવ્યો છે, જે નીચે પ્રમાણે છે, પરંતુ તે {{GENDER:$2|સભ્ય}}ને મોકલવામાં નિષ્ફળ થયો છે: $1",
@@ -1591,7 +1591,6 @@
 	"emailuser": "સભ્યને ઇ-મેલ કરો",
 	"emailuser-title-target": "આ {{GENDER:$1|સભ્ય}}ને ઇમેલ કરો",
 	"emailuser-title-notarget": "ઇ-મેલ વપરાશકર્તા",
-	"emailpage": "ઈ-મેલ સભ્ય",
 	"emailpagetext": "તમે નીચે દર્શાવેલ ફોર્મ વાપરી આ {{GENDER:$1|સભ્ય}}ને ઇ-મેલ મોકલી શકો છો.\nતમે [[Special:Preferences|તમારી પસંદમાં]] જે ઇ-મેલ સરનામું લખ્યું હશે તે \"દ્વારા\"ના નામ હેઠળ દેખાશે, જેથી ઇ-મેલ મેળવનાર તમને સંદેશાનો જવાબ આપી શકશે.",
 	"defemailsubject": "{{SITENAME}} સભ્ય $1 તરફથી ઈ-મેલ",
 	"usermaildisabled": "સભ્યનો ઈ-મેલ નિષ્ક્રિય કરાયો",
@@ -1613,7 +1612,7 @@
 	"emailccsubject": "$1ને તમે મોકલેલા સંદેશાની પ્રત: $2",
 	"emailsent": "ઈ-મેલ મોકલી દેવાયો",
 	"emailsenttext": "તમારો ઈ-મેલ મોકલી દેવાયો છે",
-	"emailuserfooter": "આ પત્ર $1 દ્વારા $2ને  {{SITENAME}} પરની \"{{int:emailpage}} (સભ્યને ઇ-મેલ કરો)\" કડી મારફતે મોકલવામાં આવ્યો છે.",
+	"emailuserfooter": "આ પત્ર $1 દ્વારા $2ને  {{SITENAME}} પરની \"{{int:emailuser}} (સભ્યને ઇ-મેલ કરો)\" કડી મારફતે મોકલવામાં આવ્યો છે.",
 	"usermessage-summary": "તંત્ર સંદેશ મૂક્યો",
 	"usermessage-editor": "તંત્ર સંદેશાઓ",
 	"watchlist": "ધ્યાનસૂચી",
@@ -1968,7 +1967,7 @@
 	"movepagebtn": "પાનું ખસેડો",
 	"pagemovedsub": "પાનું સફળતા પૂર્વક ખસેડવામાં આવ્યું છે",
 	"movepage-moved": "'''\"$1\" નું નામ બદલીને \"$2\" કરવામાં આવ્યું છે'''",
-	"movepage-moved-redirect": "દિશાનિર્દેશના રચાયું",
+	"movepage-moved-redirect": "દિશાનિર્દેશ રચાયું",
 	"movepage-moved-noredirect": "દિશાનિર્દેશન ટાળવામાં આવ્યું છે",
 	"articleexists": "આ નામનું પાનું અસ્તિત્વમાં છે, અથવાતો તમે પસંદ કરેલું નામ અસ્વિકાર્ય છો.\nકૃપા કરી અન્ય નામ પસંદ કરો.",
 	"cantmove-titleprotected": "આ સ્થાને તમે પાનું નહીં હટાવી શકો કેમ કે નવું શીર્ષક રચના કરવા પહેલેથી આરક્ષીત છે",
@@ -2143,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/gv.json b/languages/i18n/gv.json
index 46b89e1392..8c2d845b49 100644
--- a/languages/i18n/gv.json
+++ b/languages/i18n/gv.json
@@ -325,7 +325,7 @@
 	"resetpass-submit-loggedin": "Caghlaa fockle yn arrey",
 	"passwordreset-username": "Dt'ennym ymmydeyr:",
 	"passwordreset-email": "Enmys post-L:",
-	"passwordreset-emailelement": "Ennym ymmydeyr: $1\nFockle arrey shallidagh: $2",
+	"passwordreset-emailelement": "Ennym ymmydeyr: \n$1\n\nFockle arrey shallidagh: \n$2",
 	"passwordreset-emailsent": "Ta post-l cur gys cooinaghtyn er ny chur dhyt.",
 	"passwordreset-emailsent-capture": "Ta post-l cur gys cooinaghtyn er ny chur dhyt, as eshyn heese.",
 	"passwordreset-emailerror-capture": "Ta post-l cur gys cooinaghtyn er ny chur dhyt, as eshyn heese, agh cha rosh eh yn ymmydeyr: $1",
diff --git a/languages/i18n/he.json b/languages/i18n/he.json
index 20e5cdead9..03e36a7a34 100644
--- a/languages/i18n/he.json
+++ b/languages/i18n/he.json
@@ -29,36 +29,36 @@
 			"Matanya",
 			"GilCahana",
 			"Ldorfman",
-			"LaG roiL"
+			"LaG roiL",
+			"Eraab"
 		]
 	},
 	"tog-underline": "סימון קישורים בקו תחתי:",
 	"tog-hideminor": "הסתרת שינויים משניים ברשימת השינויים האחרונים",
 	"tog-hidepatrolled": "הסתרת שינויים בדוקים ברשימת השינויים האחרונים",
 	"tog-newpageshidepatrolled": "הסתרת דפים בדוקים ברשימת הדפים החדשים",
-	"tog-hidecategorization": "הסתרת הוספות והסרות של דפים מקטגוריות",
 	"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-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-enotifwatchlistpages": "לשלוח אליי דוא\"ל כאשר משתנה דף או קובץ ברשימת המעקב שלי",
+	"tog-enotifusertalkpages": "לשלוח אליי דוא\"ל כאשר נעשה שינוי בדף שיחת המשתמש שלי",
+	"tog-enotifminoredits": "לשלוח אליי דוא\"ל גם על עריכות משניות של דפים וקבצים",
+	"tog-enotifrevealaddr": "חשיפת כתובת הדוא\"ל שלי בהתראות דוא\"ל",
 	"tog-shownumberswatching": "הצגת מספר המשתמשים העוקבים",
 	"tog-oldsig": "החתימה הנוכחית:",
 	"tog-fancysig": "התייחסות לחתימה כקוד ויקי (ללא קישור אוטומטי)",
-	"tog-uselivepreview": "שימוש בתצוגה מקדימה מהירה",
+	"tog-uselivepreview": "שימוש בתצוגה מקדימה חיה",
 	"tog-forceeditsummary": "הצגת אזהרה בעת הכנסת תקציר עריכה ריק",
 	"tog-watchlisthideown": "הסתרת העריכות שלי ברשימת המעקב",
 	"tog-watchlisthidebots": "הסתרת עריכות של בוטים ברשימת המעקב",
@@ -66,7 +66,6 @@
 	"tog-watchlisthideliu": "הסתרת עריכות של משתמשים רשומים ברשימת המעקב",
 	"tog-watchlisthideanons": "הסתרת עריכות של משתמשים אנונימיים ברשימת המעקב",
 	"tog-watchlisthidepatrolled": "הסתרת עריכות בדוקות ברשימת המעקב",
-	"tog-watchlisthidecategorization": "הסתרת הוספות והסרות של דפים מקטגוריות",
 	"tog-ccmeonemails": "לשלוח אליי העתקים של הודעות דואר אלקטרוני ששלחתי למשתמשים אחרים",
 	"tog-diffonly": "ביטול הצגת תוכן הדף מתחת להשוואות הגרסאות",
 	"tog-showhiddencats": "הצגת קטגוריות מוסתרות",
@@ -453,6 +452,7 @@
 	"createacct-benefit-body2": "{{PLURAL:$1|דף|דפים}}",
 	"createacct-benefit-body3": "{{PLURAL:$1|תורם|תורמים}} לאחרונה",
 	"badretype": "הסיסמאות שהזנת אינן מתאימות.",
+	"usernameinprogress": "יצירת חשבון עבור שם המשתמש הזה כבר התחילה.\nנא להמתין.",
 	"userexists": "שם המשתמש שבחרתם כבר נמצא בשימוש.\nאנא בחרו שם אחר.",
 	"loginerror": "שגיאה בכניסה לאתר",
 	"createacct-error": "שגיאה ביצירת חשבון",
@@ -543,7 +543,7 @@
 	"passwordreset-emailtitle": "פרטי חשבון ב{{grammar:תחילית|{{SITENAME}}}}",
 	"passwordreset-emailtext-ip": "מישהו (ככל הנראה אתם, מכתובת ה־IP מספר $1) ביקש איפוס של\nהסיסמה שלכם ב{{grammar:תחילית|{{SITENAME}}}} ($4). {{PLURAL:$3|חשבון המשתמש הבא שייך|חשבונות המשתמש הבאים שייכים}}\nלכתובת הדואר האלקטרוני הזאת:\n\n$2\n\n{{PLURAL:$3|סיסמה זמנית זו תפקע|סיסמאות זמניות אלה יפקעו}} תוך {{PLURAL:$5|יום|יומיים|$5 ימים}}.\nעליכם להיכנס ולבחור סיסמה חדשה עכשיו. אם מישהו אחר ביצע בקשה זו, או שנזכרתם בסיסמתכם\nהמקורית ואינכם רוצים עוד לשנות אותה, באפשרותכם להתעלם מהודעה זו ולהמשיך להשתמש בסיסמה\nהישנה.",
 	"passwordreset-emailtext-user": "{{GENDER:$1|המשתמש|המשתמשת}} $1 ב{{GRAMMAR:תחילית|{{SITENAME}}}} {{GENDER:$1|ביקש|ביקשה}} איפוס של הסיסמה שלכם ב{{GRAMMAR:תחילית|{{SITENAME}}}}\n($4). {{PLURAL:$3|חשבון המשתמש הבא שייך|חשבונות המשתמש הבאים שייכים}} לכתובת הדואר האלקטרוני הזאת:\n\n$2\n\n{{PLURAL:$3|סיסמה זמנית זו תפקע|סיסמאות זמניות אלה יפקעו}} תוך {{PLURAL:$5|יום|יומיים|$5 ימים}}.\nעליכם להיכנס ולבחור סיסמה חדשה עכשיו. אם מישהו אחר ביצע בקשה זו, או שנזכרתם בסיסמתכם\nהמקורית ואינכם רוצים עוד לשנות אותה, באפשרותכם להתעלם מהודעה זו ולהמשיך להשתמש בסיסמה\nהישנה.",
-	"passwordreset-emailelement": "שם משתמש: $1\nסיסמה זמנית: $2",
+	"passwordreset-emailelement": "שם משתמש: \n$1\n\nסיסמה זמנית: \n$2",
 	"passwordreset-emailsent": "נשלח דואר אלקטרוני לאיפוס הסיסמה.",
 	"passwordreset-emailsent-capture": "נשלח דואר אלקטרוני לאיפוס הסיסמה, והוא מוצג להלן.",
 	"passwordreset-emailerror-capture": "נוצר דואר אלקטרוני לאיפוס הסיסמה, והוא מוצג להלן, אך שליחתו ל{{GENDER:$2|משתמש|משתמשת}} נכשלה: $1",
@@ -926,7 +926,7 @@
 	"prefs-watchlist-days": "מספר הימים המרבי שיוצגו ברשימת המעקב:",
 	"prefs-watchlist-days-max": "לכל היותר {{PLURAL:$1|יום אחד|יומיים|$1 ימים}}",
 	"prefs-watchlist-edits": "מספר העריכות המרבי שיוצגו ברשימת המעקב המורחבת:",
-	"prefs-watchlist-edits-max": "מספר מירבי: 1000",
+	"prefs-watchlist-edits-max": "מספר מרבי: 1000",
 	"prefs-watchlist-token": "אסימון לרשימת המעקב:",
 	"prefs-misc": "שונות",
 	"prefs-resetpass": "שינוי סיסמה",
@@ -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 ימים}}",
@@ -1215,9 +1216,6 @@
 	"rcshowhidemine": "$1 עריכות שלי",
 	"rcshowhidemine-show": "הצגת",
 	"rcshowhidemine-hide": "הסתרת",
-	"rcshowhidecategorization": "$1 הוספות והסרות של דפים מקטגוריות",
-	"rcshowhidecategorization-show": "הצגת",
-	"rcshowhidecategorization-hide": "הסתרת",
 	"rclinks": "הצגת $1 שינויים אחרונים ב־$2 הימים האחרונים.<br /> $3",
 	"diff": "הבדל",
 	"hist": "היסטוריה",
@@ -1241,10 +1239,6 @@
 	"recentchangeslinked-summary": "בדף מיוחד זה רשומים השינויים האחרונים בדפים המקושרים מתוך הדף (או בדפים הכלולים בקטגוריה).\nדפים ב[[Special:Watchlist|רשימת המעקב שלכם]] מוצגים ב'''הדגשה'''.",
 	"recentchangeslinked-page": "שם הדף:",
 	"recentchangeslinked-to": "הצגת השינויים בדפים המקשרים לדף הנתון במקום זאת",
-	"recentchanges-page-added-to-category": "הדף [[:$1]] נוסף לקטגוריה",
-	"recentchanges-page-added-to-category-bundled": "הדף [[:$1]] {{PLURAL:$2|ועוד דף אחד|ועוד $2 דפים}} נוספו לקטגוריה",
-	"recentchanges-page-removed-from-category": "הדף [[:$1]] הוסר מקטגוריה",
-	"recentchanges-page-removed-from-category-bundled": "הדף [[:$1]] {{PLURAL:$2|ועוד דף אחד|ועוד $2 דפים}} הוסרו מקטגוריה",
 	"upload": "העלאת קובץ לשרת",
 	"uploadbtn": "העלאה",
 	"reuploaddesc": "ביטול ההעלאה וחזרה לטופס העלאת קבצים לשרת",
@@ -1667,7 +1661,7 @@
 	"booksources-text": "להלן רשימת קישורים לאתרים אחרים המוכרים ספרים חדשים ויד־שנייה, ושבהם עשוי להיות מידע נוסף לגבי ספרים שאתם מחפשים:",
 	"booksources-invalid-isbn": "המסת\"ב שניתן כנראה אינו תקין; אנא בדקו אם ביצעתם טעויות בהעתקה מהמידע המקורי.",
 	"specialloguserlabel": "בוצעו על־ידי המשתמש:",
-	"speciallogtitlelabel": "יעד (כותרת או משתמש):",
+	"speciallogtitlelabel": "יעד (כותרת או {{ns:user}}:שם עבור משתמש):",
 	"log": "יומנים",
 	"all-logs-page": "כל היומנים הציבוריים",
 	"alllogstext": "תצוגה משולבת של כל סוגי היומנים הזמינים ב{{grammar:תחילית|{{SITENAME}}}}.\nניתן לצמצם את התצוגה על־ידי בחירת סוג היומן, שם המשתמש (תלוי רישיות) או הדף המושפע (גם כן תלוי רישיות).",
@@ -1753,7 +1747,6 @@
 	"emailuser": "שליחת דואר אלקטרוני למשתמש זה",
 	"emailuser-title-target": "שליחת דוא\"ל {{GENDER:$1|למשתמש זה|למשתמשת זו}}",
 	"emailuser-title-notarget": "שליחת דוא\"ל למשתמש",
-	"emailpage": "שליחת דואר למשתמש",
 	"emailpagetext": "ניתן להשתמש בטופס כדי לשלוח הודעת דואר אלקטרוני {{GENDER:$1|למשתמש זה|למשתמשת זו}}.\nכתובת הדואר האלקטרוני שכתבת ב[[Special:Preferences|העדפות המשתמש שלך]] תופיע ככתובת שההודעה נשלחה ממנה, כדי לאפשר תגובה ישירה.",
 	"defemailsubject": "דוא\"ל מ{{grammar:תחילית|{{SITENAME}}}} מהמשתמש \"$1\"",
 	"usermaildisabled": "שליחת דוא\"ל למשתמשים מבוטלת",
@@ -1775,7 +1768,7 @@
 	"emailccsubject": "העתק של הודעתך למשתמש $1: $2",
 	"emailsent": "הדואר נשלח",
 	"emailsenttext": "הודעת הדואר האלקטרוני שלך נשלחה.",
-	"emailuserfooter": "דואר זה נשלח על־ידי $1 ל{{GRAMMAR:תחילית|$2}} באמצעות פעולת \"{{int:emailpage}}\" ב{{GRAMMAR:תחילית|{{SITENAME}}}}.",
+	"emailuserfooter": "דואר זה נשלח על־ידי $1 ל{{GRAMMAR:תחילית|$2}} באמצעות פעולת \"{{int:emailuser}}\" ב{{GRAMMAR:תחילית|{{SITENAME}}}}.",
 	"usermessage-summary": "השארת הודעת מערכת.",
 	"usermessage-editor": "שולח הודעות המערכת",
 	"watchlist": "רשימת המעקב",
@@ -2346,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": "צפייה בהודעת המערכת",
@@ -2934,7 +2927,7 @@
 	"autoredircomment": "הפניה לדף [[$1]]",
 	"autosumm-new": "יצירת דף עם התוכן \"$1\"",
 	"autosumm-newblank": "יצירת דף ריק",
-	"size-bytes": "$1 בייט",
+	"size-bytes": "{{PLURAL:$1|בייט אחד|$1 בייט}}",
 	"size-kilobytes": "$1 קילו־בייט",
 	"size-megabytes": "$1 מגה־בייט",
 	"size-gigabytes": "$1 ג'יגה־בייט",
@@ -2943,6 +2936,7 @@
 	"size-exabytes": "$1 אקסה־בייט",
 	"size-zetabytes": "$1 זטה־בייט",
 	"size-yottabytes": "$1 יוטה־בייט",
+	"size-pixel": "{{PLURAL:$1|פיקסל אחד|$1 פיקסלים}}",
 	"lag-warn-normal": "שינויים שבוצעו לפני פחות מ{{PLURAL:$1|שנייה אחת|־$1 שניות}} אינם מוצגים ברשימה זו.",
 	"lag-warn-high": "בגלל עיכוב בעדכון בסיס הנתונים, שינויים שבוצעו לפני פחות מ{{PLURAL:$1|שנייה אחת|־$1 שניות}} אינם מוצגים ברשימה זו.",
 	"watchlistedit-normal-title": "עריכת רשימת המעקב",
@@ -3274,6 +3268,7 @@
 	"logentry-newusers-create2": "חשבון המשתמש $3 נוצר על־ידי $1",
 	"logentry-newusers-byemail": "חשבון המשתמש $3 נוצר על־ידי $1 והסיסמה נשלחה בדוא\"ל",
 	"logentry-newusers-autocreate": "חשבון המשתמש $1 {{GENDER:$2|נוצר}} אוטומטית",
+	"logentry-protect-move_prot": "$1 {{GENDER:$2|העביר|העבירה}} את הגדרות ההגנה מהדף $4 אל הדף $3",
 	"logentry-rights-rights": "$1 {{GENDER:$2|שינה|שינתה}} את ההרשאות של $3 מ{{GRAMMAR:תחילית|$4}} ל{{GRAMMAR:תחילית|$5}}&rlm;",
 	"logentry-rights-rights-legacy": "$1 {{GENDER:$2|שינה|שינתה}} את ההרשאות של $3&rlm;",
 	"logentry-rights-autopromote": "$1 קודם אוטומטית מ{{GRAMMAR:תחילית|$4}} ל{{GRAMMAR:תחילית|$5}}",
diff --git a/languages/i18n/hi.json b/languages/i18n/hi.json
index 8f468ea216..893070de05 100644
--- a/languages/i18n/hi.json
+++ b/languages/i18n/hi.json
@@ -576,7 +576,7 @@
 	"passwordreset-emailtitle": "{{SITENAME}} पर खाते का विवरण",
 	"passwordreset-emailtext-ip": "किसी ने (शायद आपने ही, $1 आइ॰पी पते से) {{SITENAME}} ($4) पर अपने {{PLURAL:$3|कूटशब्द|कूटशब्दों}} को रीसेट करने का अनुरोध किया है। इस ई-मेल पते से निम्न {{PLURAL:$3|खाता जुड़ा है|खाते जुड़े हैं}}:\n\n$2\n\n{{PLURAL:$3|यह|ये}} अस्थायी कूटशब्द {{PLURAL:$5|एक दिन|$5 दिनों}} के बाद काम नहीं करेंगे। आपको लॉग इन करके एक नया कूटशब्द अभी चुन लेना चाहिए। यदि यह अनुरोध किसी और ने किया है, या फिर आपको अपना मूल कूटशब्द याद आ गया है, और आप {{PLURAL:$3|अपना|अपने}} कूटशब्द नहीं बदलना चाहते, आप इस संदेश को अनदेखा कर के अपने पुराने कूटशब्द का प्रयोग जारी रख सकते हैं।",
 	"passwordreset-emailtext-user": "{{SITENAME}} ($4) पर सदस्य $1 ने आपके {{PLURAL:$3|खाते|खातों}} के कूटशब्द को रीसेट करने का अनुरोध किया है। इस ई-मेल पते से निम्न {{PLURAL:$3|खाता जुड़ा है|खाते जुड़े हैं}}:\n\n$2\n\n{{PLURAL:$3|यह|ये}} अस्थायी कूटशब्द {{PLURAL:$5|एक दिन|$5 दिनों}} के बाद काम नहीं करेंगे।\nआपको लॉग इन करके एक नया कूटशब्द अभी चुन लेना चाहिए। यदि यह अनुरोध किसी और ने किया है, या फिर आपको अपना मूल कूटशब्द याद आ गया है, और आप {{PLURAL:$3|अपना|अपने}} कूटशब्द नहीं बदलना चाहते, आप इस संदेश को अनदेखा कर के अपने पुराने कूटशब्द का प्रयोग जारी रख सकते हैं।",
-	"passwordreset-emailelement": "सदस्यनाम: $1\nअस्थायी कूटशब्द: $2",
+	"passwordreset-emailelement": "सदस्यनाम: \n$1\n\nअस्थायी कूटशब्द: \n$2",
 	"passwordreset-emailsent": "एक कूटशब्द रीसेट ई-मेल भेज दिया गया है।",
 	"passwordreset-emailsent-capture": "नीचे दिखाया गया कूटशब्द रीसेट ई-मेल भेज दिया गया है।",
 	"passwordreset-emailerror-capture": "नीचे दृष्टित कूटशब्द रीसेट ई-मेल उत्पन्न किया गया था, परंतु उसे {{GENDER:$2|सदस्य}} को भेजना असफल रहा।\nत्रुटि: $1",
@@ -1757,7 +1757,6 @@
 	"emailuser": "इस सदस्य को ई-मेल भेजें",
 	"emailuser-title-target": "इस {{GENDER:$1|सदस्य|सदस्या}} को ई-मेल करें।",
 	"emailuser-title-notarget": "सदस्य को ई-मेल करें",
-	"emailpage": "सदस्य को ई-मेल करें",
 	"emailpagetext": "नीचे दिए पर्चे को जरिए आप इस {{GENDER:$1|सदस्य}} को ई-मेल भेज सकते हैं।\nआपने जो पता [[Special:Preferences|अपनी पसंद]] में दिया था वह इस ई-मेल के \"भेजने वाले\" के तौर पर आएगा, अतः प्राप्तकर्ता आपको सीधे जवाब दे सकेंगे।",
 	"defemailsubject": "{{SITENAME}} ई-मेल \"$1\" सदस्य से",
 	"usermaildisabled": "सदस्य ई-मेल अक्षम किया गया",
@@ -1779,7 +1778,7 @@
 	"emailccsubject": "आपके ई-मेल की प्रति जो $1 को भेजा गया: $2",
 	"emailsent": "ई-मेल भेज दिया गया है।",
 	"emailsenttext": "आपका ई-मेल संदेश भेज दिया गया है।",
-	"emailuserfooter": "इस ई-मेल को $1 द्वारा $2 को भेजा गया था जिसके लिए \"{{int:emailpage}}\" कार्य को {{SITENAME}} पर प्रयोग में लाया गया था।",
+	"emailuserfooter": "इस ई-मेल को $1 द्वारा $2 को भेजा गया था जिसके लिए \"{{int:emailuser}}\" कार्य को {{SITENAME}} पर प्रयोग में लाया गया था।",
 	"usermessage-summary": "प्रणाली सन्देश छोड़ रहा है।",
 	"usermessage-editor": "सिस्टम दूत",
 	"watchlist": "ध्यानसूची",
diff --git a/languages/i18n/hif-latn.json b/languages/i18n/hif-latn.json
index 6291572657..9c90dcc9df 100644
--- a/languages/i18n/hif-latn.json
+++ b/languages/i18n/hif-latn.json
@@ -512,7 +512,7 @@
 	"passwordreset-emailtitle": "{{SITENAME}} me account ke jaankari",
 	"passwordreset-emailtext-ip": "Koi (hoe sake aap, IP address $1 se) {{SITENAME}} ($4) pe aap ke account ke baare me jaankari maanga hae. Niche likha gias sadasya ii e-mail se associated hae.  {{PLURAL:$3|account hae|accounts hae}}\n\n$2\n\n{{PLURAL:$3|Ii temporary password|Ii sab temporary passwords}}  {{PLURAL:$5|ek din|$5 din}} me khalaas hoi.\nAap ke chaahi ki aap login kar ke ek nawaa password banao.  Agar aur koi ii request karis hae, nai to agae aap aapan purana paasword ke yaad kar liya hae, tab ii sandes ke baare me bhuul jaao aur purana password use karte raho.",
 	"passwordreset-emailtext-user": "\nSadasya $1 {{SITENAME}} pe aap ke account details ke {{SITENAME}} $4 ke khaatir  reminder maagis hae\n NIche ke sadasya {{PLURAL:$3|account hae|accounts hae}} ii e-mail address: $2 se associatied hae\n\n{{PLURAL:$3|Ii temporary password|Ii sab temporary passwords}}  {{PLURAL:$5|ek din|$5 din}} me khalaas hoi.\nAap ke chaahi ki aap login kar ke ek nawaa password banao.  Agar aur koi ii request karis hae, nai to agae aap aapan purana paasword ke yaad kar liya hae, tab ii sandes ke baare me bhuul jaao aur purana password use karte raho.",
-	"passwordreset-emailelement": "Sadasya ke naam: $1\nKuchh din ke khatir password: $2",
+	"passwordreset-emailelement": "Sadasya ke naam: \n$1\n\nKuchh din ke khatir password: \n$2",
 	"passwordreset-emailsent": "Aap ke password yaad karae ke khatir ek e-mail ke bhej dewa gais hae.",
 	"passwordreset-emailsent-capture": "Ek password yaad karae waala e-mail, jiske niche dekhawa jaawe hae, ke bhej dewa gais hae.",
 	"passwordreset-emailerror-capture": "Ek password yaad karae waala e-mail ke banawa gais hae, jiske niche dekhawa jaawe hae, lekin jiske {{GENDER:$2|user}} ke lage bheje nai jawa sake hae: $1",
@@ -1670,7 +1670,6 @@
 	"emailuser": "Ii user ke E-mail karo",
 	"emailuser-title-target": "Ii {{GENDER:$1|sadasya}} ke E-mail karo",
 	"emailuser-title-notarget": "Sadasya ke E-mail karo",
-	"emailpage": "User ke e-mail karo",
 	"emailpagetext": "Aap niche ke form ke kaam me laae ke ii {{GENDER:$1|sadasya}} ke e-mail bheje saktaa hae.\nJon e-mail address aap [[Special:Preferences|your user preferences]] me enter karaa rahaa, \"From\" ke e-mail rahii, jisse ki e-mail ke mile waala jan aap ke sidha jawaab de sake hae.",
 	"defemailsubject": "{{SITENAME}} e-mail sadasya \"$1\" se",
 	"usermaildisabled": "Sadasya ke e-mail ke rok dewa gais hae",
diff --git a/languages/i18n/hil.json b/languages/i18n/hil.json
index ddb95b47ed..872f935204 100644
--- a/languages/i18n/hil.json
+++ b/languages/i18n/hil.json
@@ -429,7 +429,7 @@
 	"passwordreset-emailtitle": "Ang mga detalye sang akawnt sa {{SITENAME}}",
 	"passwordreset-emailtext-ip": "May tawo nga (mahimo ikaw, halin sa IP adres nga $1) nagpangabay sang pahanumdom sang mga detalye\nsang imo akawnt para sa {{SITENAME}} ($4). Ang masunod nga {{PLURAL:$3|akawnt|mga akawnt}} sang manuggamit\nmay kabahin sa sini nga adres sang e-mail:\n\n$2\n\n{{PLURAL:$3|Ang ini nga temporaryo nga pasword|Ang mga ini nga temporaryo nga pasword}} indi na magamit sa {{PLURAL:$5|isa ka adlaw|$5 ka adlaw}}.\nKinahanglan mo nga magsulod kag magpili sang bag-o nga pasword subong. Kon lain nga tawo ang nagbuhat sini\nnga pagpangabay, ukon nadumduman mo na ang imo pasword, kag indi mo na kinahanglan nga ini\npaga-ilisan, mahimo mo nga pabay-an ang ini nga pahanumdom kag magpadayon sa paggamit sang imo daan nga pasword.",
 	"passwordreset-emailtext-user": "Ang manuggamit nga si $1 sa {{SITENAME}} nagpangabay sang pahanumdom sang mga detalye sang imo akawnt para sa {{SITENAME}} \n($4). Ang masunod nga {{PLURAL:$3|akawnt|mga akawnt}} sang manuggamit may kabahin sa sini nga adres sang e-mail:\n\n$2\n\n{{PLURAL:$3|Ang ini nga temporaryo nga pasword|Ang mga ini nga temporaryo nga pasword}} indi na magamit sa {{PLURAL:$5|isa ka adlaw|$5 ka adlaw}}.\nKinahanglan mo nga magsulod kag magpili sang bag-o nga pasword subong. Kon lain nga tawo ang nagbuhat sini\nnga pagpangabay, ukon nadumduman mo na ang imo pasword, kag indi mo na kinahanglan nga ini\npaga-ilisan, mahimo mo nga pabay-an ang ini nga pahanumdom kag magpadayon sa paggamit sang imo daan nga pasword.",
-	"passwordreset-emailelement": "Gamit-pangalan: $1\nTemporaryo nga pasword: $2",
+	"passwordreset-emailelement": "Gamit-pangalan: \n$1\n\nTemporaryo nga pasword: \n$2",
 	"passwordreset-emailsent": "May pahanumdom nga e-mail nga ginpadala.",
 	"passwordreset-emailsent-capture": "May e-mail nga nagapahanumdum, nga ginapakita sa idalom.",
 	"passwordreset-emailerror-capture": "May e-mail nga nagapahanumdom nga ginbuhat, nga ginapakita sa idalom, apang ang pagpadala sa manuggamit indi madinalag-on: $1",
@@ -1082,6 +1082,7 @@
 	"uploadnewversion-linktext": "Uplod sang bag-o nga bersiyon sang sini nga file",
 	"filedelete-submit": "Panason",
 	"randompage": "Bisan ano nga panid",
+	"randomincategory-submit": "Lakat",
 	"statistics": "Mga Statistik",
 	"brokenredirects-edit": "ilisan",
 	"brokenredirects-delete": "panason",
diff --git a/languages/i18n/hr.json b/languages/i18n/hr.json
index 104e2f202b..fc9c64903a 100644
--- a/languages/i18n/hr.json
+++ b/languages/i18n/hr.json
@@ -526,7 +526,7 @@
 	"passwordreset-emailtitle": "Pojedinosti o računu na {{SITENAME}}",
 	"passwordreset-emailtext-ip": "Netko (vjerojatno Vi, s IP adrese $1) zatražio je podsjetnik za Vaše detalje računa\nza {{SITENAME}} ($4). Sljedeći {{PLURAL:$3|račun suradnika je|računi suradnika su}}\npovezani s ovom e-mail adresom:\n\n$2\n\n{{PLURAL:$3|Ova privremena lozinka|Ove privremene lozinke}} će isteći u {{PLURAL:$5|jedan dan|$5 dana}}.\nTrebate se prijaviti i odabrati novu lozinku. Ukoliko je netko drugi napravio ovaj\nzahtjev, ili ako ste sjeti Vaše izvorne lozinke, a vi je više ne želite promijeniti, \nmožete zanemariti ovu poruku i nastavite koristiti staru lozinku.",
 	"passwordreset-emailtext-user": "Suradnik $1 na {{SITENAME}} zatražio podsjetnik o pojedinostima vašeg računa za {{SITENAME}}\n($4). Sljedeći {{PLURAL:$3|račun suradnika je|računi suradnika su}} povezani s ovom e-mail adresom:\n\n$2\n\n{{PLURAL:$3|Ova privremena lozinka|Ove privremene lozinke}} će isteći u {{PLURAL:$5|jedan dan|$5 dana}}.\nTrebate se prijaviti i odabrati novu lozinku. Ukoliko je netko drugi napravio ovaj\nzahtjev, ili ako ste sjeti Vaše izvorne lozinke, a vi je više ne želite promijeniti, \nmožete zanemariti ovu poruku i nastavite koristiti staru lozinku.",
-	"passwordreset-emailelement": "Suradničko ime: $1\nPrivremena lozinka: $2",
+	"passwordreset-emailelement": "Suradničko ime: \n$1\n\nPrivremena lozinka: \n$2",
 	"passwordreset-emailsent": "E-mail podsjetnik zaporke je poslan.",
 	"passwordreset-emailsent-capture": "Poslan Vam je podsjetnik kao e-pošta (tekst je prikazan dolje).",
 	"passwordreset-emailerror-capture": "Napravljena je e-poruka za ponovno postavljanje zaporke (prikazana ispod), ali njeno slanje suradniku nije uspjelo: $1",
@@ -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/hrx.json b/languages/i18n/hrx.json
index 5a2d9f3b37..e0235d399c 100644
--- a/languages/i18n/hrx.json
+++ b/languages/i18n/hrx.json
@@ -492,7 +492,7 @@
 	"passwordreset-emailtitle": "Benutzerkontoinformatione uff {{SITENAME}}",
 	"passwordreset-emailtext-ip": "Jemand mit der IP-Adress $1, wahrscheinlich du sellebst, hot en Zurücksetzung von dein Passworts bei {{SITENAME}} oongefordert ($4). {{PLURAL:$3|Das follichend Benutzerkonto ist|Die follichende Benutzerkonte sind}}\nmit der E-Mail-Adress verknüpft:\n\n$2\n\n{{PLURAL:$3|Das temporär Passwort looft|Die temporäre Passwörter loofe}} innerhalb von {{PLURAL:$5|em Tooch|$5 Tooche}} ab.\nDu sollst dich oonmelde und en neies Passwort vergewe. Falls jemand annres die Oonfroch getätigt hot orrer du dich wieder an dein ursprüngliches Passwort erinnre kannst und das netmeh\nännre möchst, kannst du die Nachricht ignoriere und weiterhin dein altes\nPasswort benutze.",
 	"passwordreset-emailtext-user": "Benutzer $1 bei {{SITENAME}} hot en Zurücksetzung von dein Passwort bei {{SITENAME}} oongefordert ($4). {{PLURAL:$3|Das follichend Benutzerkonto ist|Die follichend Benutzerkonte sind}} mit der E-Mail-Adress verknüpft:\n\n$2\n\n{{PLURAL:$3|Das temporär Passwort looft|Die temporäre Passwörter loofe}} innerhalb von {{PLURAL:$5|em Tooch|$5 Tooche}} ab. Du sollst dich oonmelde und en neies Passwort vergewe. Falls jemand annres die Oonfroch getäticht hot orrer du dich wieder an den ursprüngliches Passwort erinnre kannst und das net ännre möchst, kannst du die Nachricht ignoriere und weiterhin dein altes Passwort benutze.",
-	"passwordreset-emailelement": "Benutzernoome: $1\nTemporäres Passwort: $2",
+	"passwordreset-emailelement": "Benutzernoome: \n$1\n\nTemporäres Passwort: \n$2",
 	"passwordreset-emailsent": "En Passwortzurücksetzung-E-Mail woard versandt.",
 	"passwordreset-emailsent-capture": "En Passwortzurücksetzung-E-Mail woard versandt, die unne oongezeicht weard.",
 	"passwordreset-emailerror-capture": "Die unne oongezeichte Passwortzurücksetzungs-E-Mail woard generiert, awer der Versand an {{GENDER:$2|den Benutzer|die Benutzrin}} ist gescheitert: $1",
@@ -1618,7 +1618,6 @@
 	"emailuser": "E-Mail an den Benutzer",
 	"emailuser-title-target": "E-Mail an {{GENDER:$1|den Benutzer|die Benutzrin}} schicke",
 	"emailuser-title-notarget": "E-Mail an Benutzer",
-	"emailpage": "E-Mail an Benutzer",
 	"emailpagetext": "Du kannst {{GENDER:$1|dem Benutzer|der Benutzrin}} mit dem do unne stehnde Formular en E-Mail schicke.\nAls Absender weard die E-Mail-Adress aus deine [[Special:Preferences|Einstellunge]] ingetrooht, damit {{GENDER:$1|der Benutzer|die Benutzrin}} dir direkt antworte kann.",
 	"defemailsubject": "{{SITENAME}} – E-Mail von Benutzer \"$1\"",
 	"usermaildisabled": "E-Mail-Empfang deaktiviert",
diff --git a/languages/i18n/hsb.json b/languages/i18n/hsb.json
index eace87cb26..28625c272f 100644
--- a/languages/i18n/hsb.json
+++ b/languages/i18n/hsb.json
@@ -514,7 +514,7 @@
 	"passwordreset-emailtitle": "Kontowe podrobnosće na {{GRAMMAR:lokatiw|{{SITENAME}}}}",
 	"passwordreset-emailtext-ip": "Něchtó (najskerje ty, z IP-adresu $1) je anulowanje hesła za {{GRAMMAR:akuzatiw|{{SITENAME}}}} požadał ($4).  {{PLURAL:$3|Slědowace wužiwarske konto je|Slědowacej wužiwarskej konće stej|Slědowace wužiwarske konta su}} z tutej e-mejlowej adresu {{PLURAL:$3|zwjazane|zwjazanej|zwjazane}}:\n\n$2\n\n{{PLURAL:$3|Tute nachwilne hesło spadnje|Tutej nachwilnej hesle spadnjetej|Tute nachwilne hesła spadnu}} za {{PLURAL:$5|jedyn dźeń|$5 dnjej|$5 dny|$5 dnjow}}.\nTy měł so nětko přizjewić a nowe hesło wubrać. Jeli něchtó druhi je tute naprašowanje pósłał, abo jeli sy so zaso na prěnjotne hesło dopomnił a wjace nochceš jo změnić, móžeš tutu zdźělenku ignorować a swoje stare hesło dale wužiwać.",
 	"passwordreset-emailtext-user": "Wužiwar $1 na {{GRAMMAR:lokatiw|{{SITENAME}}}} je anulowanje twojeho hesła za {{GRAMMAR:akuzatiw|{{SITENAME}}}} požadał ($4).  {{PLURAL:$3|Slědowace wužiwarske konto je|Slědowacej wužiwarskej konće stej|Slědowace wužiwarske konta su}} z tutej e-mejlowej adresu {{PLURAL:$3|zwjazane|zwjazanej|zwjazane}}:\n\n$2\n\n{{PLURAL:$3|Tute nachwilne hesło spadnje|Tutej nachwilnej hesle spadnjetej|Tute nachwilne hesła spadnu}} za {{PLURAL:$5|jedyn dźeń|$5 dnjej|$5 dny|$5 dnjow}}.\nTy měł so nětko přizjewić a nowe hesło wubrać. Jeli něchtó druhi je tute naprašowanje pósłał, abo jeli sy so zaso na prěnjotne hesło dopomnił a wjace nochceš jo změnić, móžeš tutu zdźělenku ignorować a swoje stare hesło dale wužiwać.",
-	"passwordreset-emailelement": "Wužiwarske mjeno: $1\nNachwilne hesło: $2",
+	"passwordreset-emailelement": "Wužiwarske mjeno: \n$1\n\nNachwilne hesło: \n$2",
 	"passwordreset-emailsent": "E-mejl za anulowanje hesło je so pósłała.",
 	"passwordreset-emailsent-capture": "E-mejl za anulowanje hesła je so pósłała, kotraž so deleka pokazuje.",
 	"passwordreset-emailerror-capture": "E-mejl za anulowanje hesła je so wutworiła, kotraž so deleka pokazuje, ale słanje {{GENDER:$2|wužiwarjej|wužiwarce}} je so njeporadźiło: $1",
@@ -1677,7 +1677,6 @@
 	"emailuser": "Wužiwarjej mejlku pósłać",
 	"emailuser-title-target": "E-mejl na {{GENDER:$1|tutomu wužiwarjej|tutej wužiwarce}} pósłać",
 	"emailuser-title-notarget": "Wužiwarjej mejlku pósłać",
-	"emailpage": "Wužiwarjej mejlku pósłać",
 	"emailpagetext": "Móžeš slědowacy formular wužiwać, zo by tutomu {{GENDER:$1|wužiwarjej}} e-mejlku pósłał.\nE-mejlowa adresa, kotruž sy w [[Special:Preferences|swojich wužiwarskich nastajenjach]] zapodał, zjewi so jako adresa \"Wot\" e-mejlki, tak zo přijimowar móže ći direktnje wotmołwić.",
 	"defemailsubject": "{{SITENAME}} - e-mejlka wot wužiwarja \"$1\"",
 	"usermaildisabled": "Wužiwarska e-mejl znjemóžnjena",
@@ -1699,7 +1698,7 @@
 	"emailccsubject": "Kopija twojeje powěsće wužiwarjej $1: $2",
 	"emailsent": "Mejlka wotesłana",
 	"emailsenttext": "Twoja mejlka bu wotesłana.",
-	"emailuserfooter": "Tuta e-mejlka je so z pomocu funkcije \"{{int:emailpage}}\" na {{GRAMMAR:lokatiw|{{SITENAME}}}} wot $1 do $2 pósłała.",
+	"emailuserfooter": "Tuta e-mejlka je so z pomocu funkcije \"{{int:emailuser}}\" na {{GRAMMAR:lokatiw|{{SITENAME}}}} wot $1 do $2 pósłała.",
 	"usermessage-summary": "Systemowu  zdźělenku zawostajić.",
 	"usermessage-editor": "Systemowy powěstnik",
 	"watchlist": "Wobkedźbowanki",
diff --git a/languages/i18n/hu.json b/languages/i18n/hu.json
index fb13227de8..45aaf687f9 100644
--- a/languages/i18n/hu.json
+++ b/languages/i18n/hu.json
@@ -550,7 +550,7 @@
 	"passwordreset-emailtitle": "A(z) {{SITENAME}}-fiók adatai",
 	"passwordreset-emailtext-ip": "Valaki (vélhetően Te, a $1 IP-címről) a jelszavad visszaállítását kérte a {{SITENAME}} ($4) oldalon felvett {{PLURAL:$3|fiókban|fiókokban}}. A következő felhasználói {{PLURAL:$3|fiók van|fiókok vannak}} hozzárendelve ehhez az e-mail címhez:\n\n$2\n\n{{PLURAL:$3|Ez az ideiglenes jelszó|Ezek az ideiglenes jelszavak}} $5 nap múlva {{PLURAL:$3|jár|járnak}} le. Jelentkezz be, és cseréld le a jelszavadat. Ha valaki más kérte az emlékeztetőt, vagy eszedbe jutott a régi jelszó, és nem akarod lecserélni a jelszavadat, hagyd figyelmen kívül ezt az üzenetet, és használd a régi jelszavadat.",
 	"passwordreset-emailtext-user": "$1 felhasználó jelszó-visszaállítást kért a {{SITENAME}} ($4) oldalon felvett {{PLURAL:$3|fiókban|fiókokban}}. A következő felhasználói {{PLURAL:$3|fiók van|fiókok vannak}} hozzárendelve ehhez az e-mail címhez:\n\n$2\n\n{{PLURAL:$3|Ez az ideiglenes jelszó|Ezek az ideiglenes jelszavak}} $5 nap múlva {{PLURAL:$3|jár|járnak}} le. Jelentkezz be, és cseréld le a jelszavadat. Ha valaki más kérte az emlékeztetőt, vagy eszedbe jutott a régi jelszó, és nem akarod lecserélni a jelszavadat, hagyd figyelmen kívül ezt az üzenetet, és használd a régi jelszavadat.",
-	"passwordreset-emailelement": "Felhasználónév: $1\nIdeiglenes jelszó: $2",
+	"passwordreset-emailelement": "Felhasználónév: \n$1\n\nIdeiglenes jelszó: \n$2",
 	"passwordreset-emailsent": "Jelszó-visszaállító e-mail elküldve.",
 	"passwordreset-emailsent-capture": "Az alább látható jelszó-visszaállító e-mail lett elküldve.",
 	"passwordreset-emailerror-capture": "A jelszó-visszaállító e-mail generálása megtörtént, mint az alább látszik, de elküldése a {{GENDER:$2|szerkesztőnek}} nem sikerült: $1",
@@ -1736,7 +1736,6 @@
 	"emailuser": "E-mail küldése ezen szerkesztőnek",
 	"emailuser-title-target": "E-mail küldése ennek a felhasználónak: $1",
 	"emailuser-title-notarget": "E-mail küldése a felhasználónak",
-	"emailpage": "E-mail küldése",
 	"emailpagetext": "Ezzel az űrlappal tudsz ennek a {{GENDER:$1|felhasználónak}} e-mailt küldeni.\nFeladóként a [[Special:Preferences|beállításaidnál]] megadott e-mail címed fog szerepelni, így a címzett közvetlenül tud majd válaszolni neked.",
 	"defemailsubject": "{{SITENAME}} e-mail a következő felhasználótól: „$1”",
 	"usermaildisabled": "Email fogadás letiltva",
@@ -1758,7 +1757,7 @@
 	"emailccsubject": "$1 szerkesztőnek küldött $2 tárgyú üzenet másolata",
 	"emailsent": "E-mail elküldve",
 	"emailsenttext": "E-mail üzenetedet elküldtük.",
-	"emailuserfooter": "Ezt az e-mailt $1 küldte $2 számára, az „{{int:emailpage}}” funkció használatával a(z) {{SITENAME}} wikin.",
+	"emailuserfooter": "Ezt az e-mailt $1 küldte $2 számára, az „{{int:emailuser}}” funkció használatával a(z) {{SITENAME}} wikin.",
 	"usermessage-summary": "Rendszerüzenet megadása.",
 	"usermessage-editor": "Rendszerüzenetek",
 	"watchlist": "Figyelőlistám",
@@ -1791,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/hy.json b/languages/i18n/hy.json
index 149cc429f1..b014448b92 100644
--- a/languages/i18n/hy.json
+++ b/languages/i18n/hy.json
@@ -487,7 +487,7 @@
 	"passwordreset-domain": "Դոմեն՝",
 	"passwordreset-email": "Էլ-փոստի հասցեն՝",
 	"passwordreset-emailtitle": "{{SITENAME}} հաշվի մանրամասները",
-	"passwordreset-emailelement": "Մասնակցային անունը՝ $1\nԺամանակավոր գաղտնաբառը՝ $2",
+	"passwordreset-emailelement": "Մասնակցային անունը՝ \n$1\n\nԺամանակավոր գաղտնաբառը՝ \n$2",
 	"passwordreset-emailsent": "Ուղարկվեց հիշեցնող էլ․ նամակ։",
 	"passwordreset-emailsent-capture": "Ուղարկվեց հիշեցնող էլ․ նամակ։ Այն ներկայացված է ստորև։",
 	"passwordreset-emailerror-capture": "Ուղարկվեց հիշեցնող էլ․ նամակ։ Այն ներկայացված է ստորև։ Սակայն մասնակցին ուղարկելը չհաջողվեց․",
@@ -609,7 +609,7 @@
 	"content-model-wikitext": "վիքիտեքստ",
 	"content-model-javascript": "ՋավաՍկրիպտ",
 	"content-model-css": "ՍիԷսԷս",
-	"duplicate-args-category": "Կաղապարներում կրկնակի արգումենտներով էջեր",
+	"duplicate-args-category": "Կաղապարներում կրկնվող արգումենտներով էջեր",
 	"undo-success": "Խմբագրումը կարող է հետ շրջվել։ Ստուգեք տարբերակների համեմատությունը ստորև, որպեսզի համոզվեք, որ դա է ձեզ հետաքրքրող փոփոխությունը և մատնահարեք «Հիշել էջը»՝ գործողությունն ավարտելու համար։",
 	"undo-failure": "Խմբագրումը չի կարող հետ շրջվել միջանկյալ խմբագրումների ընդհարման պատճառով։",
 	"undo-summary": "Հետ է շրջվում $1 խմբագրումը, որի հեղինակն է՝ [[Special:Contributions/$2|$2]] ([[User talk:$2|քննարկում]]) {{GENDER:$2|մասնակիցը|մասնակցուհին}}",
@@ -1207,7 +1207,6 @@
 	"emailuser": "էլ-նամակ ուղարկել այս մասնակցին",
 	"emailuser-title-target": "Ուղարկել էլ․ նամակ {{GENDER:$1|մասնակցին}}",
 	"emailuser-title-notarget": "Ուղարկել էլ․ նամակ",
-	"emailpage": "Էլ-նամակ ուղարկել մասնակցին",
 	"emailpagetext": "Դուք կարող եք օգտագործել ներքևի ձևը այս {{GENDER:$1|մասնակցին}} էլ-նամաակ ուղարկելու համար։\n\nՁեր նախընտրանքներում նշված էլ-հասցեն կերևա «Ումից» դաշտում և ստացողը կարող է անմիջապես պատասխանել ձեզ։",
 	"defemailsubject": "{{SITENAME}} Õ§Õ¬-Õ¶Õ¡Õ´Õ¡Õ¯",
 	"usermaildisabled": "Էլ․ նամակ ուղարկելը թույլատրված չէ։",
diff --git a/languages/i18n/ia.json b/languages/i18n/ia.json
index 3aba75bc11..cb00042e21 100644
--- a/languages/i18n/ia.json
+++ b/languages/i18n/ia.json
@@ -21,7 +21,6 @@
 	"tog-hideminor": "Celar le modificationes minor in le modificationes recente",
 	"tog-hidepatrolled": "Celar le modificationes patruliate in le modificationes recente",
 	"tog-newpageshidepatrolled": "Celar le paginas patruliate del lista de nove paginas",
-	"tog-hidecategorization": "Celar le categorisation de paginas",
 	"tog-extendwatchlist": "Displicar le observatorio pro monstrar tote le modificationes, non solmente les plus recente",
 	"tog-usenewrc": "Gruppar modificationes per pagina in modificationes recente e observatorio",
 	"tog-numberheadings": "Numerar titulos automaticamente",
@@ -51,7 +50,6 @@
 	"tog-watchlisthideliu": "Celar modificationes de usatores registrate in le observatorio",
 	"tog-watchlisthideanons": "Celar modificationes de usatores anonyme in le observatorio",
 	"tog-watchlisthidepatrolled": "Celar le modificationes patruliate in le observatorio",
-	"tog-watchlisthidecategorization": "Celar le categorisation de paginas",
 	"tog-ccmeonemails": "Inviar me copias del messages de e-mail que io invia a altere usatores",
 	"tog-diffonly": "Non monstrar le contento del pagina sub le comparation de duo versiones",
 	"tog-showhiddencats": "Monstrar categorias celate",
@@ -436,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",
@@ -526,7 +525,7 @@
 	"passwordreset-emailtitle": "Detalios del conto in {{SITENAME}}",
 	"passwordreset-emailtext-ip": "Un persona (probabilemente tu, ab le adresse IP $1) requestava le reinitialisation de tu\ncontrasigno de {{SITENAME}} ($4). Le {{PLURAL:$3|conto|contos}} de usator sequente es\nassociate con iste adresse de e-mail:\n\n$2\n\nIste {{PLURAL:$3|contrasigno|contrasignos}} temporari expirara post {{PLURAL:$5|un die|$5 dies}}.\nTu deberea ora aperir session e eliger un nove contrasigno. Si un altere persona faceva iste\nrequesta, o si tu te ha rememorate tu contrasigno original e non plus\nvole cambiar lo, tu pote ignorar iste message e continuar a usar le ancian\ncontrasigno.",
 	"passwordreset-emailtext-user": "Le usator $1 in {{SITENAME}} requestava un reinitialisation de tu contrasigno in {{SITENAME}}\n($4). Le {{PLURAL:$3|conto|contos}} de usator sequente es associate con iste adresse de e-mail:\n\n$2\n\nIste {{PLURAL:$3|contrasigno|contrasignos}} temporari expirara post {{PLURAL:$5|un die|$5 dies}}.\nTu deberea ora aperir session e eliger un nove contrasigno. Si un altere persona faceva iste\nrequesta, o si tu te ha rememorate tu contrasigno original e non plus\nvole cambiar lo, tu pote ignorar iste message e continuar a usar le ancian\ncontrasigno.",
-	"passwordreset-emailelement": "Nomine de usator: $1\nContrasigno temporari: $2",
+	"passwordreset-emailelement": "Nomine de usator: \n$1\n\nContrasigno temporari: \n$2",
 	"passwordreset-emailsent": "Un message de e-mail pro le reinitialisation del contrasigno ha essite inviate.",
 	"passwordreset-emailsent-capture": "Un message de e-mail pro le reinitialisation del contrasigno ha essite inviate; iste message es monstrate hic infra.",
 	"passwordreset-emailerror-capture": "Un e-mail pro le reinitialisation del contrasigno ha essite generate; iste message es monstrate hic infra, ma le invio al {{GENDER:$2|usator}} ha fallite: $1",
@@ -925,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}})",
@@ -1200,9 +1200,6 @@
 	"rcshowhidemine": "$1 mi modificationes",
 	"rcshowhidemine-show": "Monstrar",
 	"rcshowhidemine-hide": "Celar",
-	"rcshowhidecategorization": "$1 le categorisation de paginas",
-	"rcshowhidecategorization-show": "Monstrar",
-	"rcshowhidecategorization-hide": "Celar",
 	"rclinks": "Monstrar le $1 ultime modificationes in le $2 ultime dies<br />$3",
 	"diff": "diff",
 	"hist": "hist",
@@ -1226,10 +1223,6 @@
 	"recentchangeslinked-summary": "Isto es un lista de modificationes facite recentemente in paginas ligate ab un pagina specific (o in membros de un categoria specific).\nLe paginas presente in [[Special:Watchlist|tu observatorio]] appare in litteras '''grasse'''.",
 	"recentchangeslinked-page": "Nomine del pagina:",
 	"recentchangeslinked-to": "Monstrar modificationes in paginas con ligamines al pagina specificate",
-	"recentchanges-page-added-to-category": "[[:$1]] addite al categoria",
-	"recentchanges-page-added-to-category-bundled": "[[:$1]] e {{PLURAL:$2|un pagina|$2 paginas}} addite al categoria",
-	"recentchanges-page-removed-from-category": "[[:$1]] removite del categoria",
-	"recentchanges-page-removed-from-category-bundled": "[[:$1]] e {{PLURAL:$2|un pagina|$2 paginas}} removite del categoria",
 	"upload": "Incargar file",
 	"uploadbtn": "Incargar file",
 	"reuploaddesc": "Cancellar e retornar al formulario de incargamento",
@@ -1649,7 +1642,7 @@
 	"booksources-text": "Infra es un lista de ligamines a altere sitos que vende libros nove e usate, e pote etiam haber altere informationes super libros que tu cerca:",
 	"booksources-invalid-isbn": "Le ISBN date non pare esser valide; verifica que tu non ha facite errores copiante lo del fonte original.",
 	"specialloguserlabel": "Executor:",
-	"speciallogtitlelabel": "Objectivo (titulo o usator):",
+	"speciallogtitlelabel": "Objectivo (titulo o {{ns:user}}:nomine de usator):",
 	"log": "Registros",
 	"all-logs-page": "Tote le registros public",
 	"alllogstext": "Presentation combinate de tote le registros disponibile de {{SITENAME}}.\nPro restringer le presentation, selige un typo de registro, le nomine de usator (sensibile al majusculas e minusculas), o le pagina in question (etiam sensibile al majusculas e minusculas).",
@@ -1735,7 +1728,6 @@
 	"emailuser": "Inviar e-mail a iste usator",
 	"emailuser-title-target": "Inviar e-mail a iste {{GENDER:$1|usator|usatrice}}",
 	"emailuser-title-notarget": "Inviar e-mail al usator",
-	"emailpage": "Inviar e-mail al usator",
 	"emailpagetext": "Le formulario sequente es pro inviar un message de e-mail a iste {{GENDER:$1|usator}}.\nLe adresse de e-mail que tu specificava in [[Special:Preferences|tu preferentias de usator]] apparera\ncomo le adresse del expeditor, de sorta que le destinatario potera responder te directemente.",
 	"defemailsubject": "E-mail del usator \"$1\" de {{SITENAME}}",
 	"usermaildisabled": "E-mail a usatores disactivate",
@@ -1757,7 +1749,7 @@
 	"emailccsubject": "Copia de tu message a $1: $2",
 	"emailsent": "E-mail inviate",
 	"emailsenttext": "Tu message de e-mail ha essite inviate.",
-	"emailuserfooter": "Iste e-mail ha essite inviate per $1 a $2 con le function \"{{int:emailpage}}\" in {{SITENAME}}.",
+	"emailuserfooter": "Iste e-mail ha essite inviate per $1 a $2 con le function \"{{int:emailuser}}\" in {{SITENAME}}.",
 	"usermessage-summary": "Lassante un message de systema.",
 	"usermessage-editor": "Messagero del systema",
 	"watchlist": "Observatorio",
@@ -2328,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",
@@ -2730,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",
@@ -3177,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 83f90fab21..05b26821cf 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:",
@@ -548,7 +549,7 @@
 	"passwordreset-emailtitle": "Detail akun di {{SITENAME}}",
 	"passwordreset-emailtext-ip": "Seseorang (mungkin Anda, dari alamat IP $1) meminta pengingat\ndetail akun untuk {{SITENAME}} ($4). {{PLURAL:$3|Akun|Akun-akun}} berikut\nterkait dengan alamat surel ini:\n\n$2\n\n{{PLURAL:$3|Sandi sementara}} berikut akan kedaluwarsa dalam {{PLURAL:$5|$5 hari}}.\nAnda harus masuk dan memilih sandi baru sekarang. Jika orang lain membuat\npermintaan ini atau jika Anda ingat sandi asli dan tidak lagi\ningin mengubahnya, Anda dapat mengabaikan pesan ini dan terus menggunakan sandi lama.",
 	"passwordreset-emailtext-user": "Seseorang (mungkin Anda, dari alamat IP $1) meminta pengingat detail akun untuk {{SITENAME}} ($4).\n{{PLURAL:$3|Akun|Akun-akun}} berikut terkait dengan alamat surel ini:\n\n$2\n\n{{PLURAL:$3|Sandi sementara}} berikut akan kedaluwarsa dalam {{PLURAL:$5|$5 hari}}.\nAnda harus masuk dan memilih sandi baru sekarang. Jika orang lain membuat\npermintaan ini atau jika Anda ingat sandi asli dan tidak lagi\ningin mengubahnya, Anda dapat mengabaikan pesan ini dan terus menggunakan sandi lama.",
-	"passwordreset-emailelement": "Nama pengguna: $1\nSandi sementara: $2",
+	"passwordreset-emailelement": "Nama pengguna: \n$1\n\nSandi sementara: \n$2",
 	"passwordreset-emailsent": "Surel setel ulang kata sandi telah dikirimkan.",
 	"passwordreset-emailsent-capture": "Surel setel ulang kata sandi telah dikirim, yang ditampilkan di bawah.",
 	"passwordreset-emailerror-capture": "Surel setel ulang kata sandi telah dibuat, yang ditampilkan di bawah, namun pengiriman pada {{GENDER:$2|pengguna}} gagal: $1",
@@ -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).",
@@ -1730,7 +1731,6 @@
 	"emailuser": "Surel pengguna",
 	"emailuser-title-target": "Kirim surel ke {{GENDER:$1|pengguna}} ini",
 	"emailuser-title-notarget": "Kirim surel",
-	"emailpage": "Kirim surel ke pengguna ini",
 	"emailpagetext": "Anda dapat menggunakan formulir di bawah ini untuk mengirimkan surel ke {{GENDER:$1|pengguna}} ini.\nAlamat surel yang Anda masukkan di [[Special:Preferences|preferensi akun Anda]] akan muncul sebagai alamat \"Dari\" dalam surel tersebut, sehingga penerima dapat langsung membalas kepada Anda.",
 	"defemailsubject": "Surel {{SITENAME}} dari pengguna \"$1\"",
 	"usermaildisabled": "Surel pengguna dinonaktifkan",
@@ -1752,7 +1752,7 @@
 	"emailccsubject": "Salinan pesan Anda untuk $1: $2",
 	"emailsent": "Surel terkirim",
 	"emailsenttext": "Surel Anda telah dikirimkan.",
-	"emailuserfooter": "Email ini dikirimkan dengan $1 pada $2 dengan fungsi \"{{int:emailpage}}\" pada {{SITENAME}}.",
+	"emailuserfooter": "Email ini dikirimkan dengan $1 pada $2 dengan fungsi \"{{int:emailuser}}\" pada {{SITENAME}}.",
 	"usermessage-summary": "Tinggalkan pesan sistem.",
 	"usermessage-editor": "Penyampai pesan sistem",
 	"usermessage-template": "MediaWiki:UserMessage",
@@ -2310,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/ig.json b/languages/i18n/ig.json
index 293b656062..d8dae893ba 100644
--- a/languages/i18n/ig.json
+++ b/languages/i18n/ig.json
@@ -341,7 +341,7 @@
 	"resetpass-submit-cancel": "Kàchá",
 	"resetpass-temp-password": "mkpurụ okwu ejị a gafẹ I gi kushi ngwa ngwa:",
 	"passwordreset": "Nkuwaria okwúngáfè",
-	"passwordreset-emailelement": "Áhà Ọ'banife: $1\nPasswod nke gi gbanwe: $2",
+	"passwordreset-emailelement": "Áhà Ọ'banife: \n$1\n\nPasswod nke gi gbanwe: \n$2",
 	"changeemail-none": "(efù)",
 	"bold_sample": "Mkpúrù èdè íke",
 	"bold_tip": "Mkpúrù èdè íke",
@@ -710,6 +710,7 @@
 	"unusedtemplates": "Àtụ hè jí gị",
 	"unusedtemplateswlh": "jikodo ndi ozor",
 	"randompage": "Edemede nkeówúlạ",
+	"randomincategory-submit": "Gá",
 	"statistics": "Olìlé ọtụ ihe dị",
 	"statistics-header-pages": "Ọmúmú-nà-ńlé ihü",
 	"statistics-header-edits": "Rüwá ọmúmú-nà-ńlé",
@@ -730,7 +731,6 @@
 	"nlinks": "{{PLURAL:$1|jikodo|jikodo}} $1",
 	"nmembers": "{{PLURAL:$1|ọ'bànifé|Ndi n'bànifé}} $1",
 	"nrevisions": "{{PLURAL:$1|orübà|orübà}} $1",
-	"nviews": "{{PLURAL:$1|he lèrè nke|he lèrè nke}} $1",
 	"lonelypages": "Ihü nke ogbènyè",
 	"wantedpages": "Ihü há chọrọ",
 	"prefixindex": "Ihü nílé jírí mkpụrụ édémédé nke mbu",
@@ -780,7 +780,6 @@
 	"listgrouprights-addgroup": "Gbàkọ {{PLURAL:$2|ọtú|ọtú}}: $1",
 	"listgrouprights-addgroup-all": "Tìnyé ọtú nílé",
 	"emailuser": "Zi onye á ózí-nsónùsòrò",
-	"emailpage": "Mé ọ'bànifé e-mailù",
 	"defemailsubject": "e-mail {{SITENAME}}",
 	"emailfrom": "Onye banyere ya:",
 	"emailto": "Onye o gi ru:",
diff --git a/languages/i18n/ilo.json b/languages/i18n/ilo.json
index a3886aac32..63fd383bb3 100644
--- a/languages/i18n/ilo.json
+++ b/languages/i18n/ilo.json
@@ -15,7 +15,6 @@
 	"tog-hideminor": "Ilemmeng dagiti bassit nga inurnos manipud iti kaudian a balbaliw",
 	"tog-hidepatrolled": "Ilemmeng dagiti napatruliaan nga inurnos manipud iti kaudian a balbaliw",
 	"tog-newpageshidepatrolled": "Ilemmeng dagiti napatruliaan a panid manipud iti baro a listaan ti panid",
-	"tog-hidecategorization": "Ilemmeng ti pannakaikategoria dagiti panid",
 	"tog-extendwatchlist": "Ipalawa ti listaan ti bambantayan tapno maipakita amin a nasukatan, saan laeng a ti kabiitan",
 	"tog-usenewrc": "Dagiti grupo a panagbaliw babaen ti panid ti kaudian a balbaliw ken listaan ti bambantayan",
 	"tog-numberheadings": "Automatiko a pabilangan dagiti paulo",
@@ -45,7 +44,6 @@
 	"tog-watchlisthideliu": "Ilemmeng dagiti inurnos babaen dagiti nakastrek nga agar-aramat manipud iti listaan ti bambantayan",
 	"tog-watchlisthideanons": "Ilemmeng dagiti inurnos babaen dagiti di ammo nga agar-aramat manipud iti listaan ti bambantayan",
 	"tog-watchlisthidepatrolled": "Ilemmeng dagiti napatruliaan nga inurnos manipud iti listaan ti bambantayan",
-	"tog-watchlisthidecategorization": "Ilemmeng ti pannakaikategoria dagiti panid",
 	"tog-ccmeonemails": "Patulodandak kadagiti kopia ti esurat nga ipatulodko kadagiti sabali nga agar-aramat",
 	"tog-diffonly": "Saan nga iparang ti linaon ti panid dita baba dagiti pagiddiatan",
 	"tog-showhiddencats": "Ipakita dagiti nailemmeng a kategoria",
@@ -131,7 +129,7 @@
 	"hidden-category-category": "Nailemmeng a katkategoria",
 	"category-subcat-count": "{{PLURAL:$2|Daytoy a kategoria ket addaan laeng iti sumaganad a subkategoria.|Daytoy a kategoria ket addaan {{PLURAL:$1|iti sumaganad a  subkategoria|kadagiti sumaganad a $1 a subkategoria}}, manipud iti $2 a dagup.}}",
 	"category-subcat-count-limited": "Daytoy a kategoria ket addaan {{PLURAL:$1|iti sumaganad a subkategoria|kadagiti sumaganad a $1 a subkategoria}}.",
-	"category-article-count": "{{PLURAL:$2|Daytoy a kategoria ket aglaon laeng iti sumaganad a panid.|{{PLURAL:$1|Ti sumaganad a panid|Dagiti sumaganad a $1 a panid}} ket adda iti daytoy a kategoria, manipud ti $2 a dagup.}}",
+	"category-article-count": "{{PLURAL:$2|Daytoy a kategoria ket aglaon laeng iti sumaganad a panid.|{{PLURAL:$1|Ti sumaganad a panid|Dagiti sumaganad a $1 a panid}} ket adda iti daytoy a kategoria, manipud iti $2 a dagup.}}",
 	"category-article-count-limited": "{{PLURAL:$1|Ti sumaganad a panid|Dagiti sumaganad a $1 a panid}} ket adda iti agdama a kategoria.",
 	"category-file-count": "{{PLURAL:$2|Daytoy a kategoria ket aglaon laeng iti sumaganad a papeles.|{{PLURAL:$1|Ti sumaganad a papeles|Dagiti sumaganad a $1 a papeles}} ket adda iti daytoy a kategoria, iti $2 a dagup.}}",
 	"category-file-count-limited": "{{PLURAL:$1|Ti sumaganad a papeles|Dagiti sumaganad a $1 a papeles}} ket adda iti agdama a kategoria.",
@@ -519,7 +517,7 @@
 	"passwordreset-emailtitle": "Dagiti salaysay ti pakabilangan iti {{SITENAME}}",
 	"passwordreset-emailtext-ip": "Adda (baka sika, ti naggapuan ti IP a pagtaengan $1) a nagkiddaw ti maysa a panangisaad manen ti kontrasenias para iti {{SITNAME}} ($4) . {{PLURAL:$3|Ti |Dagiti}} sumaganad a pakabilangan ti agar-aramat ket\nmainaig iti daytoy nga esurat a pagtaengan:\n\n$2\n\n{{PLURAL:$3|Daytoy temporario a kontrasenias|Dagitoy temporario a kontrasenias}} ket agpaso {{PLURAL:$5|iti maysa nga aldaw|kadagiti $5 nga aldaw}}.\nSumrekka koman tapno agpilika ti baro a kontraseniasmo tattan. No adda met sabali a nagaramid daytoy a \npanagkiddaw, wenno malagipmo ti dati a kontraseniasmo, ket saanmo a kayaten a sukatan, saanmo nga ikaskaso daytoy a mensahe ken \nagtuloyka nga agusar ti daan a kontrasenias.",
 	"passwordreset-emailtext-user": "Daytoy nga agar-aramat $1 iti {{SITENAME}} ket nagkiddaw ti maysa a panangisaad manen ti bukod a kontrasenias para iti {{SITENAME}}\n($4) . {{PLURAL:$3|Ti|Dagiti}} sumaganad a pakabilangan ti agar-aramat ket\nmainaig iti daytoy nga esurat a pagtaengan:\n\n$2\n\n{{PLURAL:$3|Daytoy temporario a kontrasenias|Dagitoy temporario a kontrasenias}} ket agpaso {{PLURAL:$5|iti maysa nga aldaw|kadagiti $5 nga aldaw}}.\nSumrekka koman tapno agpilika ti baro a kontraseniasmo tattan. No adda met sabali a nagaramid daytoy a \npanagkiddaw, wenno malagipmo ti dati a kontraseniasmo, ken saanmo a kayaten a sukatan, saanmo nga ikaskaso daytoy a mensahe ken \nagtuloykan nga agusar ti daan a kontraseniasmo.",
-	"passwordreset-emailelement": "Nagan ti agar-aramat: $1\nTemporario a kontrasenias: $2",
+	"passwordreset-emailelement": "Nagan ti agar-aramat: \n$1\n\nTemporario a kontrasenias: \n$2",
 	"passwordreset-emailsent": "Ti maysa nga esurat ti panangisaad manen ti kontrasenias ket naipatuloden.",
 	"passwordreset-emailsent-capture": "Ti maysa nga esurat ti panangisaad manen ti kontrasenias ket naipatuloden, a naipakita dita baba.",
 	"passwordreset-emailerror-capture": "Naaramid ti maysa nga esurat a panangisaad manen ti kontrasenias, a napaikita dita baba, ngem ti panangitulod kenni {{GENDER:$2|agar-aramat}} ket napaay: $1",
@@ -590,7 +588,7 @@
 	"newarticle": "(Baro)",
 	"newarticletext": "Nasurotmo ti silpo ti awan pay a panid. \nTi mangpartuat ti panid, rugiamon ti agmakinilia iti kahon dita baba (kitaen ti [$1 panid ti tulong] para iti adu pay a pakaammo). \nNo addaka ditoy babaen ti biddut, pindutem ti buton ti <strong>back</strong> ti pagbasabasam.",
 	"anontalkpagetext": "----\n<em>Daytoy ti pakitungtungan a panid para iti di ammo nga agar-aramat a saan pay a nakapartuat iti pakabilangan, wenno saanna nga us-usaren.</em>\nIsu nga agusarkami ti numero nga IP a pagtaengan tapno mailasin isuda a lalaki/babai.\nTi kastoy nga IP a pagtaengan ket us-usaren a bingayan babaen ti nadumaduma nga agar-aramat.\nNo sika ket maysa a di ammo nga agar-aramat ken dagiti awan ti pategna a komentario ket napaitudo kenka, pangngaasi nga [[Special:UserLogin/signup|agpartuatka iti pakabilangam]] wenno [[Special:UserLogin|sumrekka]] \ntapno maliklikan ti pannakaiyallilaw kadagiti sabali a di ammo nga agar-aramat.",
-	"noarticletext": "Awan ti agdama a testo daytoy a panid.\nMabalinmo ti [[Special:Search/{{PAGENAME}}|agbiruk iti kastoy a titulo ti panid]] kadagiti sabali a panid,\n<span class=\"plainlinks\">[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} agbiruk kadagiti mainaig a listaan],\nwenno [{{fullurl:{{NAMESPACE}}:{{PAGENAME}}|action=edit}} urnosem daytoy a panid]</span>.",
+	"noarticletext": "Awan ti agdama a teksto iti daytoy a panid.\nMabalinmo ti [[Special:Search/{{PAGENAME}}|agbiruk iti kastoy a titulo ti panid]] kadagiti sabali a panid,\n<span class=\"plainlinks\">[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} agbiruk kadagiti mainaig a listaan],\nwenno [{{fullurl:{{NAMESPACE}}:{{PAGENAME}}|action=edit}} urnosem daytoy a panid]</span>.",
 	"noarticletext-nopermission": "Awan ti agdama  a linaon daytoy a panid.\nMabalinmo ti [[Special:Search/{{PAGENAME}}|agbiruk para iti titulo ti daytoy a panid]] kadagiti sabali a panid, wenno <span class=\"plainlinks\">[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} agbiruk kadagiti mainaig a listaan]</span>, ngem awan ti pammalubosmo a mangpartuat iti daytoy a panid.",
 	"missing-revision": "Ti panagbalbaliw ti #$1 iti daytoy a panid a nanaganan ti \"{{FULLPAGENAME}}\" ket awan.\n\nDaytoy ket kadawyan a gapuanan babaen ti sumaganad a silpo ti baak a pakasaritaan iti maysa a naikkaten a panid.\nDagiti salaysay ket mabalin a mabirukan idiay [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} listaan ti panagikkat].",
 	"userpage-userdoesnotexist": "Ti pakabilangan ti agar-aramat ni \"$1\" ket saan a nakarehistro. \nPangngaasi a kitaem no kayatmo ti agpartuat/agurnos iti daytoy a panid.",
@@ -1189,9 +1187,6 @@
 	"rcshowhidemine": "$1 dagiti inurnosko",
 	"rcshowhidemine-show": "Ipakita",
 	"rcshowhidemine-hide": "Ilemmeng",
-	"rcshowhidecategorization": "$1 a pannakaikategoria ti panid",
-	"rcshowhidecategorization-show": "Ipakita",
-	"rcshowhidecategorization-hide": "Ilemmeng",
 	"rclinks": "Ipakita dagiti naudi a $1 a sinukatan iti kallabes a $2 nga al-aldaw<br />$3",
 	"diff": "dip",
 	"hist": "hist",
@@ -1215,10 +1210,6 @@
 	"recentchangeslinked-summary": "Daytoy ket listaan dagiti kaudian a sinukatan kadagiti pampanid a nakasilpo manipud iti naisangayan a panid (wenno kadagiti kameng ti maysa a nainaganan a kategoria).\nDagiti panid iti [[Special:Watchlist|listaan ti bambantayam]] ket dagiti <strong>napuskol</strong>.",
 	"recentchangeslinked-page": "Nagan ti panid:",
 	"recentchangeslinked-to": "Ipakita dagiti sinukatan kadagiti panid nga imbes a naisilpo iti naited a panid",
-	"recentchanges-page-added-to-category": "nainayon ti [[:$1]] iti kategoria",
-	"recentchanges-page-added-to-category-bundled": "nainayon ti [[:$1]] ken {{PLURAL:$2|maysa a panid|$2 a pampanid}} iti kategoria",
-	"recentchanges-page-removed-from-category": "naikkat ti [[:$1]] manipud iti kategoria",
-	"recentchanges-page-removed-from-category-bundled": "Naikkat ti [[:$1]] ken {{PLURAL:$2|maysa a panid|$2 a pampanid}} manipud iti kategoria",
 	"upload": "Agikarga iti papeles",
 	"uploadbtn": "Agikarga iti papeles",
 	"reuploaddesc": "Ukasen ti panagikarga ken agsubli idiay porma ti panagikarga",
@@ -1719,7 +1710,6 @@
 	"emailuser": "Esuratan daytoy nga agar-aramat",
 	"emailuser-title-target": "Esuratam daytoy nga {{GENDER:$1|agar-aramat}}",
 	"emailuser-title-notarget": "Esuratan ti agar-aramat",
-	"emailpage": "Esuratan ti agar-aramat",
 	"emailpagetext": "Mabalinmo nga usaren ti porma dita baba tapno makaipatulod iti esurat a mensahe iti daytoy nga {{GENDER:$1|agar-aramat}}.\nTi esurat nga inkabilmo iti [[Special:Preferences|kakaykayatam]] ket agparang a kas \"Naggapo\" a pagtaengan ti esurat, tapno ti nagipatulodam ket makasungbat kenka.",
 	"defemailsubject": "Esurat ti {{SITENAME}} a naggapo kenni \"$1\"",
 	"usermaildisabled": "Saanmo a mabalin ti agipatulod ti esurat",
@@ -1741,7 +1731,7 @@
 	"emailccsubject": "Kopia ti mensahem kenni $1: $2",
 	"emailsent": "Naipatuloden ti esurat",
 	"emailsenttext": "Naipatuloden ti esurat a mensahem.",
-	"emailuserfooter": "Daytoy nga esurat ket impatulod babaen ni $1 kenni $2 iti \"{{int:emailpage}}\" nga annong iti {{SITENAME}}",
+	"emailuserfooter": "Daytoy nga esurat ket impatulod babaen ni $1 kenni $2 iti \"{{int:emailuser}}\" nga annong iti {{SITENAME}}",
 	"usermessage-summary": "Pumanpanaw iti mesahe ti sistema.",
 	"usermessage-editor": "Mensahero ti sistema",
 	"watchlist": "Bambantayan",
@@ -2277,7 +2267,7 @@
 	"tooltip-pt-createaccount": "Maaw-awis nga agpartuatka iti pakabilangan ken sumrek; nupay kasta, daytoy ket saan a nasken",
 	"tooltip-ca-talk": "Pagtungtungan a maipapan ti linaon ti panid",
 	"tooltip-ca-edit": "Urnosen daytoy a panid",
-	"tooltip-ca-addsection": "Mangirugi ti baro a paset",
+	"tooltip-ca-addsection": "Mangirugi iti baro a seksion",
 	"tooltip-ca-viewsource": "Nasalakniban daytoy a panid.\nMabalinmo a kitaen ti taudanna.",
 	"tooltip-ca-history": "Dagiti napalabas a rebision iti daytoy a panid.",
 	"tooltip-ca-protect": "Salakniban daytoy a panid",
@@ -2293,7 +2283,7 @@
 	"tooltip-p-logo": "Sarungkaran ti umuna a panid",
 	"tooltip-n-mainpage": "Sarungkaran ti umuna a panid",
 	"tooltip-n-mainpage-description": "Sarungkaran ti umuna a panid",
-	"tooltip-n-portal": "Maipapan ti gandat, ti aniaman a maaramidmo, no sadino ti pagbirukam kadagiti banbanag",
+	"tooltip-n-portal": "Maipapan iti proyekto, no ania ti maaramidmo, ti pagbirukan kadagiti banag",
 	"tooltip-n-currentevents": "Agsapul ti pakaammo kadagiti agdama a paspasamak",
 	"tooltip-n-recentchanges": "Listaan dagiti naudi a sinukatan iti wiki",
 	"tooltip-n-randompage": "Agikarga iti pugto a panid",
diff --git a/languages/i18n/is.json b/languages/i18n/is.json
index da8aff750d..0f697a944e 100644
--- a/languages/i18n/is.json
+++ b/languages/i18n/is.json
@@ -497,7 +497,7 @@
 	"passwordreset-emailtitle": "Notendaupplýsingar á {{SITENAME}}",
 	"passwordreset-emailtext-ip": "Einhver (líklegast þú, á vistfanginu $1) hefur beðið um \nendursetningu lykilorðsins þíns fyrir {{SITENAME}} ($4). Aðgangur eftirfarandi {{PLURAL:$3|notanda er|notendum eru}} tengd þessu netfangi:\n\n$2\n\nEf þetta er það sem þú vildir, þarftu að skrá þig inn og velja nýtt lykilorð. {{PLURAL:$3|Tímabundna lykilorðið rennur|Tímabundnu lykilorðin renna}} út eftir $5 {{PLURAL:$5|dag|daga}}.\n\nEf það varst ekki þú sem fórst fram á þetta, eða ef þú manst lykilorðið þitt, og villt ekki lengur breyta því, skaltu hunsa þessi skilaboð og halda áfram að nota gamla lykilorðið.",
 	"passwordreset-emailtext-user": "Notandinn $1 á {{SITENAME}} hefur beðið um endursetningu lykilorðsins þíns fyrir {{SITENAME}} ($4). Aðgangur eftirfarandi {{PLURAL:$3|notanda er|notendum eru}} tengd þessu netfangi:\n\n$2\n\nEf þetta er það sem þú vildir, þarftu að skrá þig inn og velja nýtt lykilorð. {{PLURAL:$3|Tímabundna lykilorðið rennur|Tímabundnu lykilorðin renna}} út eftir $5 {{PLURAL:$5|dag|daga}}.\n\nEf það varst ekki þú sem fórst fram á þetta, eða ef þú manst aftur lykilorðið þitt, og vilt ekki lengur breyta því, skaltu hunsa þessi skilaboð og halda áfram að nota gamla lykilorðið.",
-	"passwordreset-emailelement": "Notendanafn: $1\nTímabundið lykilorð: $2",
+	"passwordreset-emailelement": "Notendanafn: \n$1\n\nTímabundið lykilorð: \n$2",
 	"passwordreset-emailsent": "Töluvpóstur til að endursetja lykilorðið hefur verið sendur.",
 	"passwordreset-emailsent-capture": "Tölvupóstur til að endursetja lykilorðið hefur verið sendur í tölvupósti, sem er sýndur hér fyrir neðan.",
 	"passwordreset-emailerror-capture": "Tölvupóstur til að endursetja lykilorðið var búinn til, sem er sýndur hér fyrir neðan, en ekki tókst að senda hana til {{GENDER:$2|notandans}}: $1",
@@ -1593,7 +1593,6 @@
 	"emailuser": "Senda þessum notanda tölvupóst",
 	"emailuser-title-target": "Sendu þessum {{GENDER:$1|notanda}} tölvupóst",
 	"emailuser-title-notarget": "Senda tölvupóst",
-	"emailpage": "Senda tölvupóst",
 	"emailpagetext": "Hafi notandinn tilgreint netfang í stillingunum sínum er hægt að senda póst til {{GENDER:$1|hans|hennar|hans}} hér.\nPóstfangið sem þú tilgreindir í [[Special:Preferences|stillingunum þínum]] birtist í \"Frá:\" hluta tölvupóstsins, svo að viðtakandi hans geti svarað beint til þín.",
 	"defemailsubject": "{{SITENAME}} skilaboð frá notandanum \"$1\"",
 	"usermaildisabled": "Netfang notenda er óvirkt",
@@ -1615,7 +1614,7 @@
 	"emailccsubject": "Afrit af skilaboðinu þínu til $1: $2",
 	"emailsent": "Sending tókst",
 	"emailsenttext": "Skilaboðin þín hafa verið send.",
-	"emailuserfooter": "Þessi tölvupóstur var sendur af $1 til $2 með möguleikanum \"{{int:emailpage}}\" á {{SITENAME}}.",
+	"emailuserfooter": "Þessi tölvupóstur var sendur af $1 til $2 með möguleikanum \"{{int:emailuser}}\" á {{SITENAME}}.",
 	"usermessage-summary": "Skil eftir meldingu.",
 	"usermessage-editor": "Meldinga sendiboði",
 	"watchlist": "Vaktlistinn",
diff --git a/languages/i18n/it.json b/languages/i18n/it.json
index 1f238fab77..bc3d1bc4a8 100644
--- a/languages/i18n/it.json
+++ b/languages/i18n/it.json
@@ -89,14 +89,14 @@
 			"Fringio",
 			"Aquatech",
 			"Statix64",
-			"CassiodoroVicinetti"
+			"CassiodoroVicinetti",
+			"Bultro"
 		]
 	},
 	"tog-underline": "Sottolinea i collegamenti:",
 	"tog-hideminor": "Nascondi le modifiche minori nelle ultime modifiche",
 	"tog-hidepatrolled": "Nascondi le modifiche verificate nelle ultime modifiche",
 	"tog-newpageshidepatrolled": "Nascondi le pagine verificate dall'elenco delle pagine più recenti",
-	"tog-hidecategorization": "Nascondi la categorizzazione delle pagine",
 	"tog-extendwatchlist": "Mostra tutte le modifiche agli osservati speciali, non solo l'ultima",
 	"tog-usenewrc": "Raggruppa le modifiche per pagina nelle ultime modifiche e negli osservati speciali",
 	"tog-numberheadings": "Numerazione automatica dei titoli di sezione",
@@ -126,7 +126,6 @@
 	"tog-watchlisthideliu": "Nascondi le modifiche degli utenti registrati negli osservati speciali",
 	"tog-watchlisthideanons": "Nascondi le modifiche degli utenti anonimi negli osservati speciali",
 	"tog-watchlisthidepatrolled": "Nascondi le modifiche verificate negli osservati speciali",
-	"tog-watchlisthidecategorization": "Nascondi la categorizzazione delle pagine",
 	"tog-ccmeonemails": "Inviami una copia dei messaggi spediti agli altri utenti",
 	"tog-diffonly": "Non visualizzare il contenuto della pagina dopo il confronto tra versioni",
 	"tog-showhiddencats": "Mostra le categorie nascoste",
@@ -430,8 +429,8 @@
 	"actionthrottled": "Azione ritardata",
 	"actionthrottledtext": "Come misura di sicurezza contro lo spam, l'esecuzione di alcune azioni è limitata a un numero massimo di volte in un determinato periodo di tempo, limite che in questo caso è stato superato. Si prega di riprovare tra qualche minuto.",
 	"protectedpagetext": "Questa pagina è stata protetta per impedirne la modifica o altre operazioni.",
-	"viewsourcetext": "È possibile visualizzare e copiare il codice sorgente di questa pagina:",
-	"viewyourtext": "È possibile visualizzare e copiare il codice sorgente delle '''tue modifiche''' a questa pagina:",
+	"viewsourcetext": "È possibile visualizzare e copiare il codice sorgente di questa pagina.",
+	"viewyourtext": "È possibile visualizzare e copiare il codice sorgente delle <strong>tue modifiche</strong> a questa pagina.",
 	"protectedinterface": "Questa pagina contiene un elemento che fa parte dell'interfaccia utente del software di questo sito ed è protetta per evitare possibili abusi.\nPer aggiungere o modificare le traduzioni valide su tutti i wiki, usa [//translatewiki.net/ translatewiki.net], il progetto di localizzazione di MediaWiki.",
 	"editinginterface": "<strong>Attenzione:</strong> il testo di questa pagina fa parte dell'interfaccia utente del software di questo sito. Tutte le modifiche apportate a questa pagina si riflettono sui messaggi visualizzati per tutti gli utenti su questo wiki.",
 	"translateinterface": "Per aggiungere o modificare le traduzioni valide su tutti i wiki, usa [//translatewiki.net/ translatewiki.net], il progetto MediaWiki per la localizzazione.",
@@ -511,6 +510,7 @@
 	"createacct-benefit-body2": "{{PLURAL:$1|pagina|pagine}}",
 	"createacct-benefit-body3": "{{PLURAL:$1|contributore recente|contributori recenti}}",
 	"badretype": "Le password inserite non coincidono tra loro.",
+	"usernameinprogress": "La creazione di account con questo nome utente è già in corso.\nSi prega di attendere.",
 	"userexists": "Il nome utente inserito è già utilizzato.\nScegli un nome utente diverso.",
 	"loginerror": "Errore durante l'accesso",
 	"createacct-error": "Errore durante la creazione dell'utenza",
@@ -601,7 +601,7 @@
 	"passwordreset-emailtitle": "Dettagli dell'utente su {{SITENAME}}",
 	"passwordreset-emailtext-ip": "Qualcuno (probabilmente tu, con indirizzo IP $1) ha richiesto l'invio di una nuova password per l'accesso a {{SITENAME}} ($4). {{PLURAL:$3|L'utente associato|Gli utenti associati}} a questo indirizzo email sono:\n\n$2\n\n{{PLURAL:$3|Questa password temporanea scadrà|Queste password temporanee scadranno}} dopo {{PLURAL:$5|un giorno|$5 giorni}}.\nDovresti accedere e scegliere una nuova password ora. \n\nSe non sei stato tu a fare la richiesta, o se ti sei ricordato la password originale e non vuoi più cambiarla, puoi ignorare questo messaggio e continuare al utilizzare la tua vecchia password.",
 	"passwordreset-emailtext-user": "L'utente $1 di {{SITENAME}} ha richiesto l'invio di una nuova password per l'accesso a {{SITENAME}} ($4). {{PLURAL:$3|L'utente associato|Gli utenti associati}} a questo indirizzo email sono:\n\n$2\n\n{{PLURAL:$3|Questa password temporanea scadrà|Queste password temporanee scadranno}} dopo {{PLURAL:$5|un giorno|$5 giorni}}.\nDovresti accedere e scegliere una nuova password ora. \n\nSe non sei stato tu a fare la richiesta, o se ti sei ricordato la password originale e non vuoi più cambiarla, puoi ignorare questo messaggio e continuare al utilizzare la tua vecchia password.",
-	"passwordreset-emailelement": "Nome utente: $1\nPassword temporanea: $2",
+	"passwordreset-emailelement": "Nome utente: \n$1\n\nPassword temporanea: \n$2",
 	"passwordreset-emailsent": "È stata inviata una email di reimpostazione della password.",
 	"passwordreset-emailsent-capture": "È stata inviata una email di reimpostazione della password, il contenuto è riportato di seguito.",
 	"passwordreset-emailerror-capture": "È stata generata una email di reimpostazione della password, riportata di seguito. L'invio {{GENDER:$2|all'utente}} non è riuscito: $1",
@@ -1000,7 +1000,8 @@
 	"rows": "Righe:",
 	"columns": "Colonne:",
 	"searchresultshead": "Ricerca",
-	"stub-threshold": "Valore minimo per i <a href=\"#\" class=\"stub\">collegamenti agli stub</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}})",
@@ -1077,7 +1078,7 @@
 	"prefs-tabs-navigation-hint": "Suggerimento: è possibile utilizzare i tasti freccia sinistra e destra per spostarsi tra le schede nell'elenco delle schede.",
 	"email-address-validity-valid": "L'indirizzo e-mail sembra valido",
 	"email-address-validity-invalid": "Inserisci un indirizzo e-mail valido",
-	"userrights": "Gestione dei permessi relativi agli utenti",
+	"userrights": "Gestione dei permessi degli utenti",
 	"userrights-lookup-user": "Gestione dei gruppi utente",
 	"userrights-user-editname": "Inserire il nome utente:",
 	"editusergroup": "Modifica gruppi utente",
@@ -1253,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",
@@ -1275,9 +1276,6 @@
 	"rcshowhidemine": "$1 le mie modifiche",
 	"rcshowhidemine-show": "Mostra",
 	"rcshowhidemine-hide": "Nascondi",
-	"rcshowhidecategorization": "$1 la categorizzazione della pagina",
-	"rcshowhidecategorization-show": "Mostra",
-	"rcshowhidecategorization-hide": "Nascondi",
 	"rclinks": "Mostra le $1 modifiche più recenti apportate negli ultimi $2 giorni<br />$3",
 	"diff": "diff",
 	"hist": "cron",
@@ -1287,8 +1285,8 @@
 	"newpageletter": "N",
 	"boteditletter": "b",
 	"number_of_watching_users_pageview": "[osservata da {{PLURAL:$1|un utente|$1 utenti}}]",
-	"rc_categories": "Limita alle categorie (separate da \"|\")",
-	"rc_categories_any": "Qualsiasi",
+	"rc_categories": "Limita alle categorie (separate da \"|\"):",
+	"rc_categories_any": "Qualsiasi fra quelle indicate",
 	"rc-change-size-new": "$1 {{PLURAL:$1|byte}} dopo la modifica",
 	"newsectionsummary": "/* $1 */ nuova sezione",
 	"rc-enhanced-expand": "Mostra dettagli",
@@ -1301,10 +1299,6 @@
 	"recentchangeslinked-summary": "Questa pagina speciale mostra le modifiche più recenti alle pagine collegate da quella specificata (o contenute nella categoria specificata).\nLe pagine contenute nella propria lista degli [[Special:Watchlist|Osservati speciali]] sono evidenziate in <strong>grassetto</strong>.",
 	"recentchangeslinked-page": "Nome della pagina:",
 	"recentchangeslinked-to": "Mostra solo le modifiche alle pagine collegate a quella specificata",
-	"recentchanges-page-added-to-category": "[[:$1]] aggiunto alla categoria",
-	"recentchanges-page-added-to-category-bundled": "[[:$1]] e {{PLURAL:$2|una pagina è aggiunta|$2 pagine sono aggiunte}} alla categoria",
-	"recentchanges-page-removed-from-category": "[[:$1]] rimosso dalla categoria",
-	"recentchanges-page-removed-from-category-bundled": "[[:$1]] e {{PLURAL:$2|una pagina è rimossa|$2 pagine sono rimosse}} dalla categoria",
 	"upload": "Carica un file",
 	"uploadbtn": "Carica",
 	"reuploaddesc": "Torna al modulo per il caricamento.",
@@ -1722,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).",
@@ -1808,7 +1802,6 @@
 	"emailuser": "Invia una email all'utente",
 	"emailuser-title-target": "Invia una email a questo {{GENDER:$1|utente}}",
 	"emailuser-title-notarget": "Invia una email a un utente",
-	"emailpage": "Invia una email all'utente",
 	"emailpagetext": "Usare il modulo sottostante per inviare un messaggio e-mail all'{{GENDER:$1|utente}} indicato. L'indirizzo specificato nelle [[Special:Preferences|preferenze]] del mittente apparirà nel campo \"Da:\" del messaggio per consentire al destinatario di rispondere direttamente.",
 	"defemailsubject": "Messaggio da {{SITENAME}} dall'utente \"$1\"",
 	"usermaildisabled": "e-mail utente disabilitata",
@@ -1830,7 +1823,7 @@
 	"emailccsubject": "Copia del messaggio inviato a $1: $2",
 	"emailsent": "Messaggio inviato",
 	"emailsenttext": "Il messaggio e-mail è stato inviato.",
-	"emailuserfooter": "Questa email è stata inviata da $1 a $2 attraverso la funzione \"{{int:emailpage}}\" su {{SITENAME}}.",
+	"emailuserfooter": "Questa email è stata inviata da $1 a $2 attraverso la funzione \"{{int:emailuser}}\" su {{SITENAME}}.",
 	"usermessage-summary": "Messaggio di sistema",
 	"usermessage-editor": "Messaggero di sistema",
 	"usermessage-template": "MediaWiki:MessaggioUtente",
@@ -1841,10 +1834,10 @@
 	"watchlistanontext": "Per visualizzare e modificare l'elenco degli osservati speciali è necessario eseguire l'accesso.",
 	"watchnologin": "Accesso non effettuato",
 	"addwatch": "Aggiungi agli osservati speciali",
-	"addedwatchtext": "La pagina \"[[:$1]]\" è stata aggiunta alla propria [[Special:Watchlist|lista degli osservati speciali]].\nD'ora in poi, le modifiche apportate alla pagina e alla sua discussione verranno elencate in quella sede.",
+	"addedwatchtext": "\"[[:$1]]\" e la sua pagina di discussione sono state aggiunte alla propria [[Special:Watchlist|lista degli osservati speciali]].",
 	"addedwatchtext-short": "La pagina \"$1\" è stata aggiunta alla propria lista degli osservati speciali.",
 	"removewatch": "Rimuovi dagli osservati speciali",
-	"removedwatchtext": "La pagina \"[[:$1]]\" è stata rimossa dalla propria [[Special:Watchlist|lista degli osservati speciali]].",
+	"removedwatchtext": "\"[[:$1]]\" e la sua pagina di discussione sono state rimosse dalla propria [[Special:Watchlist|lista degli osservati speciali]].",
 	"removedwatchtext-short": "La pagina \"$1\" è stata rimossa dalla propria lista degli osservati speciali.",
 	"watch": "Segui",
 	"watchthispage": "Segui questa pagina",
@@ -1993,7 +1986,7 @@
 	"undeletepagetext": "{{PLURAL:$1|La pagina indicata di seguito è stata cancellata, ma è ancora in archivio e pertanto può essere recuperata|Le pagine indicate di seguito sono state cancellate, ma sono ancora in archivio e pertanto possono essere recuperate}}. L'archivio può essere svuotato periodicamente.",
 	"undelete-fieldset-title": "Ripristina versioni",
 	"undeleteextrahelp": "Per recuperare l'intera cronologia della pagina, lasciare tutte le caselle deselezionate e fare clic su '''''{{int:undeletebtn}}'''''.\nPer effettuare un ripristino selettivo, selezionare le caselle corrispondenti alle versioni da ripristinare e fare clic su '''''{{int:undeletebtn}}'''''.",
-	"undeleterevisions": "{{PLURAL:$1|Una versione|$1 versioni}} in archivio",
+	"undeleterevisions": "{{PLURAL:$1|Una versione cancellata|$1 versioni cancellate}}",
 	"undeletehistory": "Recuperando questa pagina, tutte le sue versioni saranno ripristinate nella relativa cronologia.\nSe dopo la cancellazione è stata creata una nuova pagina con lo stesso titolo, le versioni recuperate saranno inserite nella cronologia precedente.",
 	"undeleterevdel": "Il ripristino non verrà effettuato se determina la cancellazione parziale della versione attuale della pagina o del file interessato. In tal caso, è necessario rimuovere il segno di spunta o l'oscuramento dalle versioni cancellate più recenti.",
 	"undeletehistorynoadmin": "Questa pagina è stata cancellata.\nIl motivo della cancellazione è mostrato qui sotto, assieme ai dettagli dell'utente che ha modificato questa pagina prima della cancellazione.\nIl testo contenuto nelle versioni cancellate è disponibile solo agli amministratori.",
@@ -2402,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",
@@ -3277,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",
@@ -3474,6 +3468,7 @@
 	"special-characters-title-endash": "lineetta enne",
 	"special-characters-title-emdash": "lineetta emme",
 	"special-characters-title-minus": "segno meno",
+	"mw-widgets-dateinput-no-date": "Nessuna data selezionata",
 	"mw-widgets-dateinput-placeholder-day": "AAAA-MM-GG",
 	"mw-widgets-dateinput-placeholder-month": "AAAA-MM",
 	"mw-widgets-titleinput-description-new-page": "questa pagina non esiste ancora",
diff --git a/languages/i18n/ja.json b/languages/i18n/ja.json
index 7060214a52..8feadff12a 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": "ログインまたはアカウント作成",
@@ -489,6 +489,7 @@
 	"createacct-benefit-body2": "{{PLURAL:$1|ページ}}",
 	"createacct-benefit-body3": "最近の{{PLURAL:$1|投稿者数}}",
 	"badretype": "入力したパスワードが一致しません。",
+	"usernameinprogress": "この利用者名のためのアカウント作成は、すでに進行中です。お待ちください。",
 	"userexists": "入力した利用者名は既に使用されています。\n別の利用者名を指定してください。",
 	"loginerror": "ログインのエラー",
 	"createacct-error": "アカウント作成エラー",
@@ -497,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|新たにアカウントを作成]]してください。",
@@ -580,7 +581,7 @@
 	"passwordreset-emailtitle": "{{SITENAME}}上のアカウントの詳細",
 	"passwordreset-emailtext-ip": "誰か (おそらくあなた、IP アドレス $1) が {{SITENAME}} ($4)\nでのパスワードを再設定するよう申請しました。\n以下の利用者{{PLURAL:$3|アカウント|アカウント群}}がこのメールアドレスと紐付けられています。\n\n$2\n\n{{PLURAL:$3|この仮パスワード|これらの仮パスワード}}は {{PLURAL:$5|$5 日|$5 日間}}で有効期限が切れます。\nあなたはすぐにログインして新しいパスワードを設定する必要があります。\nこれが他の誰かによる申請である場合、あるいはあなたが自分の元のパスワードを\n覚えていてそれを変更したくない場合には、このメッセージを無視して以前のパスワードを\n使用し続けることができます。",
 	"passwordreset-emailtext-user": "{{SITENAME}} の利用者 $1 があなたの {{SITENAME}} ($4)\nでのパスワードを再設定するよう申請しました。\n以下の利用者{{PLURAL:$3|アカウント|アカウント群}}がこのメールアドレスと紐付けられています。\n\n$2\n\n{{PLURAL:$3|この仮パスワード|これらの仮パスワード}}は{{PLURAL:$5|$5日}}で有効期限が切れます。\nあなたは、すぐにログインして新しいパスワードを設定する必要があります。\nこの申請が他の誰かによるものの場合、あるいはあなたが自分の元のパスワードを\n覚えていて、変更したくない場合は、このメッセージを無視して\n以前のパスワードを使い続けることができます。",
-	"passwordreset-emailelement": "利用者名: $1\n仮パスワード: $2",
+	"passwordreset-emailelement": "利用者名: \n$1\n\n仮パスワード: \n$2",
 	"passwordreset-emailsent": "パスワード再設定メールをお送りしました。",
 	"passwordreset-emailsent-capture": "下記の内容の、パスワード再設定メールをお送りしました。",
 	"passwordreset-emailerror-capture": "以下の内容のパスワード再設定メールを生成しましたが、{{GENDER:$2|利用者}}への送信に失敗しました: $1",
@@ -592,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": "再設定できるトークンはありません。",
@@ -626,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>",
@@ -636,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お問い合わせの際は、上記の情報を必ず書いてください。",
@@ -770,8 +771,8 @@
 	"currentrev-asof": "$1時点における最新版",
 	"revisionasof": "$1時点における版",
 	"revision-info": "$1時点における{{GENDER:$6|$2}}による版$7",
-	"previousrevision": "←前の版",
-	"nextrevision": "次の版→",
+	"previousrevision": "← 古い版",
+	"nextrevision": "新しい版 →",
 	"currentrevisionlink": "最新版",
 	"cur": "最新",
 	"next": "次",
@@ -785,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}}}} 秘匿記録]に詳細情報があるかもしれません。",
@@ -806,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の版を本当に閲覧しますか?",
@@ -831,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": "復元版に対する制限を除去",
@@ -925,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": "(続き)",
@@ -978,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|日|日間}})",
@@ -987,7 +990,7 @@
 	"prefs-help-watchlist-token2": "これはあなたのウォッチリスト フィードの秘密のコードです。\nこのトークンを知っている人は誰でもあなたのウォッチリストを読めてしまうため、他の人に教えないでください。\n[[Special:ResetTokens|トークンを再設定する必要がある場合はここをクリックしてください]]。",
 	"savedprefs": "個人設定を保存しました。",
 	"timezonelegend": "タイムゾーン:",
-	"localtime": "ローカルの時刻:",
+	"localtime": "地域の時刻:",
 	"timezoneuseserverdefault": "ウィキの既定を使用 ($1)",
 	"timezoneuseoffset": "その他 (時差を指定)",
 	"servertime": "サーバーの時刻:",
@@ -1008,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": "メールアドレスの確認:",
@@ -1044,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": "トークン",
@@ -1069,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": "あなたには利用者権限を追加/除去する権限がありません。",
@@ -1257,9 +1260,6 @@
 	"rcshowhidemine": "自分の編集を$1",
 	"rcshowhidemine-show": "表示",
 	"rcshowhidemine-hide": "非表示",
-	"rcshowhidecategorization": "$1 ページ カテゴリ化",
-	"rcshowhidecategorization-show": "表示",
-	"rcshowhidecategorization-hide": "非表示",
 	"rclinks": "最近 $2 日間の更新を最大 $1 件表示<br />$3",
 	"diff": "差分",
 	"hist": "履歴",
@@ -1356,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",
@@ -1386,6 +1395,9 @@
 	"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": "保存",
@@ -1626,6 +1638,7 @@
 	"unusedimages": "使われていないファイル",
 	"wantedcategories": "カテゴリページが存在しないカテゴリ",
 	"wantedpages": "ページが存在しないリンク",
+	"wantedpages-summary": "そのページのみへのリダイレクトリンクを含むページを除いた、ほとんどリンクが存在しないページの一覧です。そのページへのリダイレクトリンクを含む存在しないページの一覧は、[[{{#special:BrokenRedirects}}|迷子のリダイレクトの一覧]]を参照してください。",
 	"wantedpages-badtitle": "結果が、無効なページ名を含んでいます: $1",
 	"wantedfiles": "ファイル情報ページが存在しないファイル",
 	"wantedfiletext-cat": "以下のファイルは使用されていますが存在しません。外部リポジトリ由来のファイルは、存在していてもここに列挙される場合があります。その場合は<del>取り消し線</del>が付きます。さらに、存在しないファイルを埋め込んでいるページは[[:$1]]に列挙されます。",
@@ -1694,7 +1707,7 @@
 	"booksources-text": "お探しの書籍の新品/中古品を販売している外部サイトへのリンクを以下に列挙します。この書籍についてさらに詳しい情報があるかもしれません:",
 	"booksources-invalid-isbn": "指定した ISBN は有効ではないようです。情報源から写し間違えていないか確認してください。",
 	"specialloguserlabel": "実行者:",
-	"speciallogtitlelabel": "対象 (ページまたは利用者):",
+	"speciallogtitlelabel": "対象 (ページまたは{{ns:user}}:利用者のための利用者名):",
 	"log": "記録",
 	"all-logs-page": "すべての公開記録",
 	"alllogstext": "{{SITENAME}}の取得できる記録をまとめて表示しています。\n記録の種類、実行した利用者 (大文字小文字は区別)、影響を受けたページ (大文字小文字は区別) による絞り込みができます。",
@@ -1782,7 +1795,6 @@
 	"emailuser": "この利用者にメールを送信",
 	"emailuser-title-target": "この{{GENDER:$1|利用者}}にメールを送信",
 	"emailuser-title-notarget": "利用者にメールを送信",
-	"emailpage": "利用者にメールを送信",
 	"emailpagetext": "以下のフォームを使用してこの{{GENDER:$1|利用者}}にメールを送信できます。\n「差出人」として、[[Special:Preferences|利用者の個人設定]]で入力したメールアドレスが設定されます。これにより、受信者があなたに直接返信できるようになります。",
 	"defemailsubject": "{{SITENAME}} 利用者「$1」からのメール",
 	"usermaildisabled": "利用者メール機能は無効です",
@@ -1804,7 +1816,7 @@
 	"emailccsubject": "$1 に送信したメールの控え: $2",
 	"emailsent": "メールを送信しました",
 	"emailsenttext": "メールを送信しました。",
-	"emailuserfooter": "このメールは$1から$2へ、{{SITENAME}}の「{{int:emailpage}}」機能で送信されました。",
+	"emailuserfooter": "このメールは$1から$2へ、{{SITENAME}}の「{{int:emailuser}}」機能で送信されました。",
 	"usermessage-summary": "システムメッセージを残す。",
 	"usermessage-editor": "システムメッセンジャー",
 	"watchlist": "ウォッチリスト",
@@ -1891,7 +1903,8 @@
 	"sessionfailure-title": "セッションの失敗",
 	"sessionfailure": "ログインのセッションに問題が発生しました。\nセッション乗っ取りを防ぐため、操作を取り消しました。\n前のページへ戻って再度読み込んだ後に、もう一度試してください。",
 	"changecontentmodel": "ページのコンテント・モデルの変更",
-	"changecontentmodel-title-label": "ページ タイトル",
+	"changecontentmodel-legend": "コンテンツモデルを変更",
+	"changecontentmodel-title-label": "ページ名",
 	"changecontentmodel-model-label": "新しい コンテンツ モデル",
 	"changecontentmodel-reason-label": "理由:",
 	"changecontentmodel-success-title": "コンテント・モデルは変更されました",
@@ -2376,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": "システムメッセージを表示",
@@ -3238,6 +3251,7 @@
 	"tags-deactivate-reason": "理由:",
 	"tags-deactivate-not-allowed": "タグ「$1」は無効化できません。",
 	"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": "あなたには個々の版または記録項目のタグの追加または除去を行う権限はありません。",
@@ -3265,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",
@@ -3343,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|昇格しました}}",
@@ -3356,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": "ページへのフィードバックの追加...",
@@ -3420,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」",
@@ -3466,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/jv.json b/languages/i18n/jv.json
index bc12e9a46b..a31af010d5 100644
--- a/languages/i18n/jv.json
+++ b/languages/i18n/jv.json
@@ -491,7 +491,7 @@
 	"passwordreset-emailtitle": "Rincian akun nèng {{SITENAME}}",
 	"passwordreset-emailtext-ip": "Ana uwong (mbok menawa Sampéyan, mawa angka IP $1) njaluk ganti tembung sandhiné Sampéyan ana ing {{SITENAME}} ($4). {{PLURAL:$3|Rèkèning|Rèkèning-rèkèning}} ngisor iki magepokan karo padunungané layang èlèktronik iki:\n\n$2\n\n{{PLURAL:$3|Tembung sandhi sawetara iki}} bakal kedaluwarsa ing {{PLURAL:$5|sak dina|$5 dina}}.\nSampéyan kudu mlebu log lan milih siji tembung sandhi anyar saiki. Yèn wong liya sing njaluk iki, utawa yèn Sampéyan jebul wis kèlingan tembung sandhiné sing lawas saéngga ora ana niyat kanggo ngganti, Sampéyan bisa ngejaraké wara-wara iki lan bacutaké nganggo tembung sandhiné lawas Sampéyan.",
 	"passwordreset-emailtext-user": "Panganggo $1 seka {{SITENAME}} njaluk ganti tembung sandhiné Sampéyan ana ing {{SITENAME}} ($4). {{PLURAL:$3|Rèkèning|Rèkèning-rèkèning}} ngisor iki magepokan karo padunungané layang èlèktronik iki:\n\n$2\n\n{{PLURAL:$3|Tembung sandhi sawetara iki}} bakal kedaluwarsa ing {{PLURAL:$5|sak dina|$5 dina}}.\nSampéyan kudu mlebu log lan milih siji tembung sandhi anyar saiki. Yèn wong liya sing njaluk iki, utawa yèn Sampéyan jebul wis kèlingan tembung sandhiné sing lawas saéngga ora ana niyat kanggo ngganti, Sampéyan bisa ngejaraké wara-wara iki lan bacutaké nganggo tembung sandhiné lawas Sampéyan.",
-	"passwordreset-emailelement": "Jeneng panganggo: $1\nTembung sandhi sawetara: $2",
+	"passwordreset-emailelement": "Jeneng panganggo: \n$1\n\nTembung sandhi sawetara: \n$2",
 	"passwordreset-emailsent": "Layang èlèktronik kanggo mbalèkaké tembung sandhi wis dikirim.",
 	"passwordreset-emailsent-capture": "Layang èlèktronik kanggo mbalèkaké tembung sandhi wis dikirim, bisa didelok ngisor iki.",
 	"passwordreset-emailerror-capture": "Layang èlèktronik pangèling tembung sandhi wis digawe, yaiku sing ditampilaké nèng ngisor iki, nanging ora kasil dikirim ing {{GENDER:$2|panganggo}}: $1",
@@ -1561,7 +1561,6 @@
 	"emailuser": "Kirim e-mail panganggo iki",
 	"emailuser-title-target": "Kirim surel ke {{GENDER:$1|pengguna}} ini",
 	"emailuser-title-notarget": "Kirimi panganggo iki layang e-mail",
-	"emailpage": "Kirimi panganggo iki layang e-mail",
 	"emailpagetext": "Panjenengan bisa migunakaké formulir ing ngisor kanggo ngirim layang-e marang {{GENDER:$1|panganggo}} iki.\nAlamat layang-e sing panjenengan lebokaké ing [[Special:Preferences|préferèsi panjenengan]] bakal dadi alamat \"Saka\" jroning layang-e kasebut, mula panampa layang-e bakal bisa mbalesi langsung menyang panjenengan.",
 	"defemailsubject": "{{SITENAME}} layang èlèktronik saka panganggo \"$1\"",
 	"usermaildisabled": "E-mail panganggo dinonaktifaké",
diff --git a/languages/i18n/ka.json b/languages/i18n/ka.json
index 58c5ed70d7..3366552f3a 100644
--- a/languages/i18n/ka.json
+++ b/languages/i18n/ka.json
@@ -540,7 +540,7 @@
 	"passwordreset-emailtitle": "ანგარიშის მონაცემები {{SITENAME}}-თვის",
 	"passwordreset-emailtext-ip": "ვიღაცამ (შესაძლოა თქვენ, ამ IP-მისამართიდან $1) მოითხოვა თქვენი \nპაროლის თავიდან დაყენება საიტისათვის {{SITENAME}} ($4).\n{{PLURAL:$3|შემდეგი ანგარიში მიბმულია|შემდეგი ანგარიშები მიბმულია}} ამ ელ.ფოსტის მისამართზე:\n\n$2\n\n{{PLURAL:$3|ეს დროებითი პაროლი|ეს დროებითი პაროლები}} იმოქმედებს {{PLURAL:$5|ერთი დღე|$5 დღე}}.\nთქვენ უნდა შეხვიდეთ სისტემაში და აირჩიოთ ახალი პაროლი.\nთუ თქვენ არ გაგიკეთებიათ აღნიშნული მოთხოვნა, ან გაიხსენეთ თქვენი პაროლი\nდა აღარ გსურთ მისი შეცვლა, მაშინ შეგიძლიათ იგნორირება გაუკეთოთ ამ შეტყობინებას\nდა გააგრძელოთ თქვენი ძველი პაროლის გამოყენება.",
 	"passwordreset-emailtext-user": "მომხმარებელმა $1 პროექტიდან {{SITENAME}} მოითხოვა თქვენი \nპაროლის თავიდან დაყენება საიტისათვის {{SITENAME}} ($4).\n{{PLURAL:$3|შემდეგი ანგარიში მიბმულია|შემდეგი ანგარიშები მიბმულია}} ამ ელ.ფოსტის მისამართზე:\n\n$2\n\n{{PLURAL:$3|ეს დროებითი პაროლი|ეს დროებითი პაროლები}} იმოქმედებს {{PLURAL:$5|ერთი დღე|$5 დღე}}.\nთქვენ უნდა შეხვიდეთ სისტემაში და აირჩიოთ ახალი პაროლი.\nთუ თქვენ არ გაგიკეთებიათ აღნიშნული მოთხოვნა, ან გაიხსენეთ თქვენი პაროლი\nდა აღარ გსურთ მისი შეცვლა, მაშინ შეგიძლიათ იგნორირება გაუკეთოთ ამ შეტყობინებას\nდა გააგრძელოთ თქვენი ძველი პაროლის გამოყენება.",
-	"passwordreset-emailelement": "მომხმარებლის სახელი: $1\nდროებითი პაროლი: $2",
+	"passwordreset-emailelement": "მომხმარებლის სახელი: \n$1\n\nდროებითი პაროლი: \n$2",
 	"passwordreset-emailsent": "პაროლის თავიდან დასაყენებელი ელ.ფოსტა გაიგზავნა.",
 	"passwordreset-emailsent-capture": "ქვემოთ ნაჩვენები პაროლის თავიდან დასაყენებელი წერილი გაიგზავნა.",
 	"passwordreset-emailerror-capture": "ქვემოთ მოცემულია შექმნილი პაროლის დასაყენებელი წერილი, რომლის გაგზავნაც {{GENDER:$2|მომხმარებელთან}} ვერ მოხერხდა: $1 გამო",
@@ -1724,7 +1724,6 @@
 	"emailuser": "გაუგზავნეთ იმეილი ამ მომხმარებელს",
 	"emailuser-title-target": "ელ. ფოსტის მიწერა {{GENDER:$1|მომხმარებელთან}}",
 	"emailuser-title-notarget": "ელ. ფოსტის გაგზავნა მომხმარებელთან",
-	"emailpage": "ელ. ფოსტა მომხმარებელს",
 	"emailpagetext": "თუ ამ მომხმარებელმა თავის პარამეტრებში ელ. ფოსტის მოქმედი მისამართი მიუთითა, ქვემოთ მოყვანილი ფორმის შევსებისას შეგიძლიათ {{GENDER:$1|მისთვის}} შეტყობინების გაგზავნა. ელ. ფოსტის მისამართი, რომელიც [[Special:Preferences|თქვენს პარამეტრებში]] მიუთითეთ, დაფიქსირდება „გამომგზავნის“ ველში, რათა ადრესატმა პასუხის გაცემა შეძლოს.",
 	"defemailsubject": "ელ-ფოსტა საიტის {{SITENAME}} მომხმარებლისგან „$1“",
 	"usermaildisabled": "მომხმარებლის e-mail გათიშულია",
diff --git a/languages/i18n/kab.json b/languages/i18n/kab.json
index 011a9fb599..43ce460773 100644
--- a/languages/i18n/kab.json
+++ b/languages/i18n/kab.json
@@ -11,10 +11,11 @@
 			"Teak",
 			"Urhixidur",
 			"아라",
-			"SalemB"
+			"SalemB",
+			"Mezgoug"
 		]
 	},
-	"tog-underline": "Derrer izdayen:",
+	"tog-underline": "Aderrer n yezdayen:",
 	"tog-hideminor": "Ffer ibeddlen ifessasen deg yibeddlen imaynuten",
 	"tog-hidepatrolled": "Ffer ibeddlen iεessan deg yibeddlen imaynuten",
 	"tog-newpageshidepatrolled": "Ffer isebtaren iɛessan gar umuɣ n isebtaren imaynuten",
@@ -484,7 +485,7 @@
 	"passwordreset-emailtitle": "Tilɣa n umiḍan ɣef {{SITENAME}}",
 	"passwordreset-emailtext-ip": "Yiwen (Ahat kečč/kem, seg tansa IP $1) yessutered awennez n awal n uɛaddi i {{SITENAME}} ($4). {{PLURAL:$3|Amiḍan n useqdac agi yeqqen|imiḍanen n iseqdacen agi qqenen}} s tansa e-mail agi :\n\n$2\n\n{{PLURAL:$3|Awal n uɛaddi uɛḍil agi ad i aff tasewti-s|Awalen n uɛaddi uɛḍilen agi ad affen taseweti nsen}} deg {{PLURAL:$5|yiwen ass|$5 ussan}}. Ilaq tura ad qqeneḍ dɣa ad freneḍ awal n uɛaddi amaynut. Lukan mačči d kečč/kem i xedmen asuter agi, naɣ tecfiḍ tura i awal n uɛaddi inek/inem, tzemreḍ ad eǧǧeḍ izen agi.",
 	"passwordreset-emailtext-user": "Aseqdac $1 ɣef {{SITENAME}} yessutered awennez n awal n uɛaddi i {{SITENAME}} ($4). {{PLURAL:$3|Amiḍan n useqdac agi yeqqen|imiḍanen n iseqdacen agi qqenen}} s tansa e-mail agi :\n\n$2\n\n{{PLURAL:$3|Awal n uɛaddi uɛḍil agi ad i aff tasewti-s|Awalen n uɛaddi uɛḍilen agi ad affen taseweti nsen}} deg {{PLURAL:$5|yiwen ass|$5 ussan}}. Ilaq tura ad qqeneḍ dɣa ad freneḍ awal n uɛaddi amaynut. Lukan mačči d kečč/kem i xedmen asuter agi, naɣ tecfiḍ tura i awal n uɛaddi inek/inem, tzemreḍ ad eǧǧeḍ izen agi.",
-	"passwordreset-emailelement": "Isem n useqdac : $1\nAwal n uɛddi akudan : $2",
+	"passwordreset-emailelement": "Isem n useqdac : \n$1\n\nAwal n uɛddi akudan : \n$2",
 	"passwordreset-emailsent": "Tirawt n uwennez n awal n uɛaddi tetwaceggaɛ.",
 	"passwordreset-emailsent-capture": "Tirawt n uwennez n awal n uɛaddi tetwaceggaɛ, ẓeṛ-itt ddaw agi.",
 	"passwordreset-emailerror-capture": "Tirawt n uwennez n awal n uɛaddi t-arewed, ẓeṛ-itt ddaw agi, lamaɛna aceggaɛ i {{GENDER:$2|umseqdac}} yefkad anezri : $1",
@@ -1553,7 +1554,6 @@
 	"emailuser": "Azen e-mail i wemseqdac-agi",
 	"emailuser-title-target": "Ceggaɛ tirawt i {{GENDER:$1|aseqdac agi|taseqdact agi}}",
 	"emailuser-title-notarget": "Ceggaɛ tirawt i useqdac",
-	"emailpage": "Ceggaɛ tirawt i useqdac",
 	"emailpagetext": "Tzemreḍ ad seqdeceḍ tiferkit ddaw agi iwakken ad ceggɛeḍ tirawt i {{GENDER:$1|umseqdac|tamseqdact}} agi.\nTansa e-mail id ekfeḍ deg [[Special:Preferences|iɣewwaren inek/inem]] ad tban deg urti \"Amceggaɛ\" n izen ; akka, anermas ad yezmer ak/akem yefk tiririt.",
 	"defemailsubject": "{{SITENAME}} tirawt n useqdac « $1 »",
 	"usermaildisabled": "Aceggaɛ n tira gar iseqdacen yensa",
diff --git a/languages/i18n/kk-cyrl.json b/languages/i18n/kk-cyrl.json
index 2e1162c6e9..da2b2ce750 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": "Сұранымдар жинақтауышысы толық",
@@ -433,6 +433,7 @@
 	"createacct-benefit-body2": "{{PLURAL:$1|бет|бет}}",
 	"createacct-benefit-body3": "жуықтағы {{PLURAL:$1|қатысушы|қатысушы}}",
 	"badretype": "Енгізген құпия сөздеріңіз бір-біріне сәйкес емес.",
+	"usernameinprogress": "Бұл қатысушы есіміне тіркелгі жасау әлдеқашан басталды. Күте тұрыңыз.",
 	"userexists": "Енгізген қатысушы атыңыз әлдеқашан пайдалануда.\nӨзге атауды таңдаңыз.",
 	"loginerror": "Кіру қатесі",
 	"createacct-error": "Тіркелгі жасауада қате кетті",
@@ -522,7 +523,7 @@
 	"passwordreset-emailtitle": "{{SITENAME}} тіркелгісі туралы анықтама",
 	"passwordreset-emailtext-ip": "Әлде кім (мүмкін сіз болуыңыз, $1 IP адресінен) {{SITENAME}} сайтында ($4) құпия сөзді өзгертуге өтініш білдірді. Мына қатысушы {{PLURAL:$3|аккаунты|аккаунттары}} осы электронды почта қатысты:\n\n$2\n\n{{PLURAL:$3|Бұл уақытша құпия сөз|Бұл уақытша құпия сөздер}} {{PLURAL:$5|бір күнде|$5 күнде}}уақыты аяқталады.\nСіз кіруіңіз және жаңа құпия сөзді таңдауыңыз керек. Егер бұл өтінішті басқа біреу жасаса, немесе сіз  бұрынғы құпия сөзіңізді еске түсірсеңіз және құпия сөзді ауыстыруды қаламасаңыз, сіз бұл хабарламаны ескермей және бұрынғы құпия сөзді қолдана беруіңізге болады.",
 	"passwordreset-emailtext-user": "$1 есімді қатысушы {{SITENAME}} сайтында ($4) құпия сөзді өзгертуге өтініш білдірді. Мына қатысушы {{PLURAL:$3|аккаунт|аккаунттар}} осы електронды почта қатысты:\n\n$2\n\n{{PLURAL:$3|Бұл уақытша құпия сөз|Бұл уақытша құпия сөздер}} {{PLURAL:$5|бір күнде|$5 күнде}}уақыты аяқталады.\nСіз кіруіңіз және жаңа құпия сөзді таңдауыңыз керек. Егер бұл өтінішті басқа біреу жасаса, немесе сіз  бұрынғы құпия сөзіңізді еске түсірсеңіз, және құпия сөзді ауыстыруды қаламасаңыз, сіз бұл хабарламаны ескермей және бұрыңғы құпия сөзді қолдана беруіңізге болады.",
-	"passwordreset-emailelement": "Қатысушы есімі: $1\nУақытша құпия сөз: $2",
+	"passwordreset-emailelement": "Қатысушы есімі: \n$1\n\nУақытша құпия сөз: \n$2",
 	"passwordreset-emailsent": "Құпия сөзді өзгерту электронды пошта арқылы жөнелтілді.",
 	"passwordreset-emailsent-capture": "Құпия сөзді өзгерту электронды пошта арқылы жөнелтілді, ол төменде көрсетілген.",
 	"passwordreset-emailerror-capture": "Құпиясөзді өзгерту электрон хаты жасалды, ол төменде көрсетілген, бірақ ол {{GENDER:$2|қатысушыға}} жөнелтілмеді: $1",
@@ -863,6 +864,7 @@
 	"search-category": "(Санат:$1)",
 	"search-file-match": "(файлдың мазмұны сәйкес келеді)",
 	"search-suggest": "Мүмкін осы болар: $1",
+	"search-rewritten": "$1 дегенге қатысты нәтижелер көрсетілуде. $2 дегенмен бірге іздеу.",
 	"search-interwiki-caption": "Бауырлас жобалар",
 	"search-interwiki-default": "$1 дегеннен нәтиже:",
 	"search-interwiki-more": "(көбірек)",
@@ -1200,8 +1202,8 @@
 	"newpageletter": "Ж",
 	"boteditletter": "б",
 	"number_of_watching_users_pageview": "[бақылаған $1 қатысушы]",
-	"rc_categories": "Санаттарға шектеу (\"|\" белгісімен бөліктеңіз)",
-	"rc_categories_any": "Кез келген",
+	"rc_categories": "Санаттарға шектеу («|» белгісімен бөлектеңіз):",
+	"rc_categories_any": "Таңдалғанның кез келгені",
 	"rc-change-size-new": "Өңдеуден кейінгі көлемі: $1 {{PLURAL:$1|байт|байт}}",
 	"newsectionsummary": "/* $1 */ жаңа бөлім",
 	"rc-enhanced-expand": "Толық ақпаратты көрсету",
@@ -1310,6 +1312,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-backup": "«$1» файлының сақтық есесі жасалмады.",
 	"backend-fail-notexists": "$1 файлы бар емес.",
@@ -1692,7 +1707,6 @@
 	"emailuser": "Қатысушыға хат жазу",
 	"emailuser-title-target": "Бұл {{GENDER:$1|қатысушы}} email-ы",
 	"emailuser-title-notarget": "Қатысушы е-поштасы",
-	"emailpage": "Қатысушыға хат жазу",
 	"emailpagetext": "Төмендегі пішін арқылы бұл {{GENDER:$1|қатысушыға}} е-пошта хабарламасын жөнелтуге болады.\n[[Special:Preferences|Қатысушы баптауыңызда]] енгізген е-пошта мекенжайыңыз «Кімнен» деген бас жолағында көрінеді, сондықтан хат алушысы тура жауап бере алады.",
 	"defemailsubject": "«$1» есімді қатысушының {{SITENAME}} е-поштасының хаты",
 	"usermaildisabled": "Қатысушының электронды поштасы қосылмаған",
@@ -1714,7 +1728,7 @@
 	"emailccsubject": "$1 дегенге хатыңыздың көшірмесі: $2",
 	"emailsent": "Хат жөнелтілді",
 	"emailsenttext": "Е-пошта хатыңыз жөнелтілді.",
-	"emailuserfooter": "Бұл электронды хатты {{SITENAME}} сайтындағы «{{int:emailpage}}» функцияцы арқылы $1 деген $2 дегенге жіберген.",
+	"emailuserfooter": "Бұл электронды хатты {{SITENAME}} сайтындағы «{{int:emailuser}}» функцияцы арқылы $1 деген $2 дегенге жіберген.",
 	"usermessage-summary": "Жүйе хабарламасы қалдырылуда.",
 	"usermessage-editor": "Жүйе мессенжері",
 	"watchlist": "Бақылау тізімі",
@@ -1867,7 +1881,7 @@
 	"undeletepagetext": "Келесі {{PLURAL:$1|бет жойылған бірақ|$1 бет жойылған бірақ}} мағлұматы мұрағатта бар\nжәне қалпына келтіруге болады. Мұрағат ұдайы тазаланып тұруы мүмкін.",
 	"undelete-fieldset-title": "Нұсқаларды қалпына келтіру",
 	"undeleteextrahelp": "Толық бет тарихын қалпына келтіру үшін барлық құсбелгі көздерді босатып <strong><em>{{int:undeletebtn}}</em></strong> батырмасын нұқыңыз.\nБөлектеумен қалпына келтіруді орындау үшін қалпына келтіру керек түзетулеріне сәйкес көздерге құсбелгімен белгілеп <strong><em>{{int:undeletebtn}}</em></strong> батырмасын басыңыз.",
-	"undeleterevisions": "$1 түзету мұрағатталды",
+	"undeleterevisions": "$1 {{PLURAL:$1|нұсқа|нұсқа}} жойылды",
 	"undeletehistory": "Егер бетті қалпына келтірсеңіз тарихындағы барлық түзетулер де қалпына келтіріледі. Егер жоюдан соң дәл солай атауымен жаңа бет басталса қалпына келтірілген түзетулер бұрынғы өңделу тарихында көрсетіледі.",
 	"undeleterevdel": "Егер бұл үстіңгі бетте аяқталса, не файл түзетуі жарым-жартылай жойылған болса, жою болдырмауы орындалмайды.\nОсындай жағдайларда, ең жаңа жойылған түзетуін алып тастауыңыз не жасыруын болдырмауыңыз жөн.",
 	"undeletehistorynoadmin": "Бұл бет жойылған.\nЖою себебі алдындағы өңдеген қатысушылар егжей-тегжейлерімен бірге төмендегі қысқаша мазмұндамасында көрсетілген.\nМына жойылған түзетулерін көкейкесті мәтіні тек әкімшілерге жетімді.",
@@ -1905,7 +1919,7 @@
 	"tooltip-whatlinkshere-invert": "Бұл белгіні қойсаңыз таңдалған есім кеңістігіндегі беттердегі сілтемелерді жасырады.",
 	"namespace_association": "Қатысты есім аясы",
 	"tooltip-namespace_association": "Бұл белгіні қойсаңыз кейде таңдалған есім кеңістігіне қатысты талқылау немесе бастауыш есім кеңістігіндегі өзгерістер қосылып көрсетіледі",
-	"blanknamespace": "Негізгі беттерден",
+	"blanknamespace": "Негізгі беттердегі",
 	"contributions": "{{GENDER:$1|Қатысушы}} үлестері",
 	"contributions-title": "$1 есімді қатысушының үлесі",
 	"mycontris": "Үлесім",
@@ -2303,7 +2317,7 @@
 	"anonymous": "{{SITENAME}} тіркелгісіз {{PLURAL:$1|қатысушысы|қатысушылары}}",
 	"siteuser": "{{SITENAME}} қатысушы $1",
 	"anonuser": "{{SITENAME}} анонимді қатысушы: $1",
-	"lastmodifiedatby": "Бұл бетті $3 қатысушы соңғы өзгерткен кезі: $2, $1.",
+	"lastmodifiedatby": "Бұл бетті $3 есімді қатысушы соңғы өзгерткен кезі: $2, $1.",
 	"othercontribs": "Шығарма негізін $1 жазған.",
 	"others": "басқалар",
 	"siteusers": "{{SITENAME}} {{PLURAL:$2|қатысушысы|қатысушылары}} $1",
@@ -2396,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",
@@ -3151,7 +3165,7 @@
 	"revdelete-unrestricted": "әкімшілерден тиымдарды аластады",
 	"logentry-block-block": "$1 {{GENDER:$4|$3}} дегенді $5 $6 мерзімге {{GENDER:$2|бұғаттады}}",
 	"logentry-block-unblock": "$1 {{GENDER:$4|$3}} деген қатысушыны {{GENDER:$2|бұғатынан босатты}}",
-	"logentry-block-reblock": "$1 {{GENDER:$4|$3}} дегеннің бұғаттау параметрлерін біту уақытын $5 $6 мерзіміне {{GENDER:$2|өзгерті}}",
+	"logentry-block-reblock": "$1 {{GENDER:$4|$3}} дегеннің бұғаттау параметрлерін біту уақытын $5 $6 мерзіміне {{GENDER:$2|өзгертті}}",
 	"logentry-suppress-block": "$1 {{GENDER:$4|$3}} дегенді $5 $6 мерзімге {{GENDER:$2|бұғаттады}}",
 	"logentry-suppress-reblock": "$1 {{GENDER:$4|$3}} есімді қатысушының бұғаттау параметрлерінің біту уақытын $5 $6 мерзіміне {{GENDER:$2|өзгертті}}",
 	"logentry-import-upload": "$1 $3 файл жүктемесі арқылы {{GENDER:$2|импорттады}}",
@@ -3168,8 +3182,9 @@
 	"logentry-newusers-create2": "$1 $3 деген аккаунт {{GENDER:$2|тіркеді}}",
 	"logentry-newusers-byemail": "$1 $3 деген аккаунт {{GENDER:$2|тіркеді}} және құпия сөзі е-пошта арқылы жіберілді",
 	"logentry-newusers-autocreate": "$1 қатысушы аккаунтын автоматты түрде {{GENDER:$2|тіркеді}}",
+	"logentry-protect-move_prot": "$1 protection settings from $4 дегеннен $3 дегенге қорғалу баптауларын {{GENDER:$2|жылжытты}}",
 	"logentry-rights-rights": "$1 $3 үшін топ мүшелігін $4 дегеннен $5 дегенге {{GENDER:$2|өзгертті}}",
-	"logentry-rights-rights-legacy": "$1 $3 үшін топ мүшелігін {{GENDER:$2|өзгерті}}",
+	"logentry-rights-rights-legacy": "$1 $3 үшін топ мүшелігін {{GENDER:$2|өзгертті}}",
 	"logentry-rights-autopromote": "$1 $4 дегенен $5 дегенге автоматты түрде {{GENDER:$2|деңгейі көтерілген}}",
 	"logentry-upload-upload": "$1 $3 файлын {{GENDER:$2|жүктеді}}",
 	"logentry-upload-overwrite": "$1 $3 дегеннің жаңа нұсқасын {{GENDER:$2|жүктеді}}",
@@ -3361,6 +3376,7 @@
 	"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": "бет жоқ екен",
diff --git a/languages/i18n/km.json b/languages/i18n/km.json
index 208744f211..0cc83c4260 100644
--- a/languages/i18n/km.json
+++ b/languages/i18n/km.json
@@ -22,7 +22,6 @@
 	"tog-hideminor": "លាក់​កំណែប្រែតិចតួច​ពីបញ្ជីបន្លាស់ប្ដូរថ្មីៗ",
 	"tog-hidepatrolled": "លាក់​កំណែប្រែ​ដែល​បាន​ល្បាតពីបញ្ជីបន្លាស់ប្ដូរ​ថ្មីៗ",
 	"tog-newpageshidepatrolled": "លាក់​ទំព័រ​ដែល​បាន​ល្បាតពី​បញ្ជី​ទំព័រ​ថ្មី",
-	"tog-hidecategorization": "លាក់ការដាក់ចំណាត់ថ្នាក់ក្រុមទំព័រ",
 	"tog-extendwatchlist": "ពន្លាត​បញ្ជីតាមដាន​ដើម្បី​បង្ហាញ​គ្រប់​បន្លាស់ប្ដូរទាំងអស់ មិន​មែន​ត្រឹមតែ​បន្លាស់ប្ដូរថ្មី​ៗ​នោះ​ទេ",
 	"tog-usenewrc": "បន្លាស់ប្ដូរជាក្រុមតាមទំព័រក្នុងបន្លាស់ប្តូរថ្មីៗនិងបញ្ជីតាមដាន",
 	"tog-numberheadings": "ដាក់លេខ​ចំណងជើងរង​ដោយស្វ័យប្រវត្តិ",
@@ -52,7 +51,6 @@
 	"tog-watchlisthideliu": "លាក់កំណែប្រែរបស់អ្នកប្រើប្រាស់ដែលបានកត់ឈ្មោះចូលពីបញ្ជីតាមដាន",
 	"tog-watchlisthideanons": "លាក់កំណែប្រែរបស់អ្នកប្រើប្រាស់អនាមិកពីបញ្ជីតាមដាន",
 	"tog-watchlisthidepatrolled": "លាក់​កំណែប្រែ​ដែល​បាន​ល្បាតពី​បញ្ជីតាមដាន",
-	"tog-watchlisthidecategorization": "លាក់ការដាក់ចំណាត់ថ្នាក់ក្រុមទំព័រ",
 	"tog-ccmeonemails": "ផ្ញើច្បាប់ចម្លង​អ៊ីមែលដែលខ្ញុំផ្ញើទៅកាន់អ្នកប្រើប្រាស់ផ្សេងទៀតមកខ្ញុំខ្លួនឯងផងដែរ",
 	"tog-diffonly": "កុំបង្ហាញខ្លឹមសារទំព័រនៅពីក្រោមតារាងប្រៀបធៀបចំណុចខុសគ្នា",
 	"tog-showhiddencats": "បង្ហាញចំណាត់ថ្នាក់ក្រុមដែលត្រូវបានលាក់",
@@ -510,7 +508,7 @@
 	"passwordreset-emailtitle": "ព័ត៌មានលំអិតពីគណនីនៅលើ {{SITENAME}}",
 	"passwordreset-emailtext-ip": "មាននរណាម្នាក់ (ប្រហែលជាខ្លួនអ្នកផ្ទាល់, មកពីអាស័យដ្ឋាន IP $1) បានស្នើសុំស្ដារពាក្យសម្ងាត់របស់អ្នកសម្រាប់ {{SITENAME}} ($4)។ {{PLURAL:$3|គណនី|គណនី}}អ្នកប្រើប្រាស់ដូចតទៅនេះ\nមានជាប់ទាក់ទិននឹងអាសយដ្ឋានអ៊ីមែលនេះ៖\n\n$2\n\n{{PLURAL:$3|ពាក្យសម្ងាត់បណ្ដោះអាសន្ននេះ|ពាក្យសម្ងាត់បណ្ដោះអាសន្នទាំងនេះ}} និងហួសសុពលភាពក្នុងរយៈពេល {{PLURAL:$5|មួយថ្ងៃ|$5 ថ្ងៃ}}។\nយកល្អអ្នកគួរតែកត់ឈ្មោះចូលរួចជ្រើសរើសពាក្យសម្ងាត់ថ្មីមួយ។ ប្រសិនបើមាននរណាម្នាក់ផ្សេងធ្វើការស្នើសុំនេះ \nឬប្រសិនបើអ្នកនឹកឃើញពាក្យសម្ងាត់ដើមរបស់អ្នក ហើយអ្នកមិនប្រាថ្នាផ្លាស់ប្ដូរវាទៀតទេនោះ អ្នកគ្រាន់តែ\nបំភ្លេចអំពីសារមួយនេះ ហើយបន្តប្រើប្រាស់ពាក្យសម្ងាត់ចាស់របស់អ្នកទៅបានហើយ។",
 	"passwordreset-emailtext-user": "អ្នកប្រើប្រាស់ $1 នៅក្នុង {{SITENAME}} បានស្នើសុំស្ដារពាក្យសម្ងាត់របស់អ្នកនៅក្នុង {{SITENAME}} ($4)។\n {{PLURAL:$3|គណនី|គណនី}}អ្នកប្រើប្រាស់ដូចតទៅនេះមានជាប់ទាក់ទិននឹងអាសយដ្ឋានអ៊ីមែលនេះ៖\n\n$2\n\n{{PLURAL:$3|ពាក្យសម្ងាត់បណ្ដោះអាសន្ននេះ|ពាក្យសម្ងាត់បណ្ដោះអាសន្នទាំងនេះ}} និងហួសសុពលភាពក្នុងរយៈពេល {{PLURAL:$5|មួយថ្ងៃ|$5 ថ្ងៃ}}។\nយកល្អអ្នកគួរតែកត់ឈ្មោះចូលរួចជ្រើសរើសពាក្យសម្ងាត់ថ្មីមួយ។ ប្រសិនបើមាននរណាម្នាក់ផ្សេងធ្វើការស្នើសុំនេះ \nឬប្រសិនបើអ្នកនឹកឃើញពាក្យសម្ងាត់ដើមរបស់អ្នក ហើយអ្នកមិនប្រាថ្នាផ្លាស់ប្ដូរវាទៀតទេនោះ អ្នកគ្រាន់តែ\nបំភ្លេចអំពីសារមួយនេះ ហើយបន្តប្រើប្រាស់ពាក្យសម្ងាត់ចាស់របស់អ្នកទៅបានហើយ។",
-	"passwordreset-emailelement": "អត្តនាម៖ $1\nពាក្យសម្ងាត់បណ្ដោះអាសន្ន៖ $2",
+	"passwordreset-emailelement": "អត្តនាម៖ \n$1\n\nពាក្យសម្ងាត់បណ្ដោះអាសន្ន៖ \n$2",
 	"passwordreset-emailsent": "អ៊ីមែលស្ដារពាក្យសម្ងាត់មួយត្រូវបានផ្ញើទៅហើយ។",
 	"passwordreset-emailsent-capture": "អ៊ីមែលស្ដារពាក្យសម្ងាត់មួយដូចបង្ហាញខាងក្រោមត្រូវបានផ្ញើទៅហើយ។",
 	"passwordreset-emailerror-capture": "អ៊ីមែលស្ដារពាក្យសម្ងាត់មួយដូចបង្ហាញខាងក្រោមត្រូវបានបង្កើតហើយ ប៉ុន្តែការផ្ញើទៅកាន់ {{GENDER:$2|អ្នកប្រើប្រាស់}}មិនបានសំរេចទេ៖ $1",
@@ -1118,8 +1116,6 @@
 	"rcshowhidemine": "$1កំណែប្រែរបស់ខ្ញុំ",
 	"rcshowhidemine-show": "បង្ហាញ",
 	"rcshowhidemine-hide": "លាក់",
-	"rcshowhidecategorization-show": "បង្ហាញ​",
-	"rcshowhidecategorization-hide": "លាក់",
 	"rclinks": "បង្ហាញបន្លាស់ប្ដូរ$1ចុងក្រោយធ្វើឡើងក្នុងរយៈពេល$2ថ្ងៃចុងក្រោយ<br />$3",
 	"diff": "ប្រៀបធៀប",
 	"hist": "ប្រវត្តិ",
@@ -1144,7 +1140,6 @@
 	"recentchangeslinked-summary": "នេះជាបញ្ជីបន្លាស់ប្ដូរនានា ដែលត្រូវបានធ្វើឡើងនៅលើទំព័រទាំងឡាយ ដែលមានតំណភ្ជាប់ពីទំព័រកំណត់មួយ(ឬ មានតំណភ្ជាប់ទៅទំព័រ ដែលមានក្នុងចំណាត់ថ្នាក់ក្រុមណាមួយ) នាពេលថ្មីៗនេះ ។ ទំព័រ​នានាក្នុង[[Special:Watchlist|បញ្ជីតាមដាន​របស់អ្នក]]ត្រូវបានសរសេរជា '''អក្សរដិត''' ។",
 	"recentchangeslinked-page": "ឈ្មោះទំព័រ៖",
 	"recentchangeslinked-to": "បង្ហាញ​បន្លាស់ប្ដូររបស់​ទំព័រដែល​មានតំណភ្ជាប់នឹង​ទំព័រ​ដែល​បាន​ផ្ដល់​ឱ្យ​​វិញ",
-	"recentchanges-page-added-to-category": "[[:$1]] ត្រូវបានបន្ថែមទៅក្នុងចំណាត់ថ្នាក់ក្រុម",
 	"upload": "ផ្ទុកឯកសារឡើង",
 	"uploadbtn": "ផ្ទុកឯកសារឡើង",
 	"reuploaddesc": "ឈប់ផ្ទុកឡើងរួចត្រឡប់ទៅបែបបទផ្ទុកឡើងវិញ។",
@@ -1554,7 +1549,6 @@
 	"emailuser": "ផ្ញើអ៊ីមែល​ទៅកាន់​អ្នក​ប្រើប្រាស់នេះ",
 	"emailuser-title-target": "ផ្ញើសារទៅកាន់ {{GENDER:$1|អ្នកប្រើប្រាស់}} នេះ",
 	"emailuser-title-notarget": "ផ្ញើអ៊ីមែលទៅកាន់អ្នកប្រើប្រាស់",
-	"emailpage": "ផ្ញើអ៊ីមែលទៅកាន់អ្នកប្រើប្រាស់",
 	"emailpagetext": "អ្នក​អាច​ប្រើសំនុំ​បែប​បទ​ខាង​ក្រោម​ក្នុង​ការ​ផ្ញើ​សារ​ជា​អ៊ីមែល​ទៅ​កាន់​{{GENDER:$1|អ្នកប្រើប្រាស់}}នេះ។\nអាសយដ្ឋាន​អ៊ីមែល​ដែល​អ្នក​បាន​វាយ​បញ្ចូល​ក្នុង [[Special:Preferences|ចំណង់ចំណូលចិត្តរបស់អ្នក]]នឹង​បង្ហាញ​ជា​អាសយដ្ឋាន​អ៊ីមែល \"From\" ដូច្នោះ​អ្នក​ទទួល​នឹង​អាច​ឆ្លើយ​តប​ទៅ​អ្នក​វិញ​ដោយ​ផ្ទាល់​។",
 	"defemailsubject": "អ៊ីមែល{{SITENAME}}ពី \"$1\"",
 	"usermaildisabled": "មិនប្រើអ៊ីមែល",
@@ -1576,7 +1570,7 @@
 	"emailccsubject": "ច្បាប់ចម្លងនៃសារដែលអ្នកផ្ញើទៅកាន់ $1 ៖ $2",
 	"emailsent": "អ៊ីមែលត្រូវបានផ្ញើទៅហើយ",
 	"emailsenttext": "សារអ៊ីមែលរបស់អ្នកត្រូវបានផ្ញើរួចហើយ។",
-	"emailuserfooter": "អ៊ីមែលនេះត្រូវបានផ្ញើដោយ$1ទៅកាន់$2ដោយប្រើមុខងារ\"{{int:emailpage}}\"របស់{{SITENAME}}។",
+	"emailuserfooter": "អ៊ីមែលនេះត្រូវបានផ្ញើដោយ$1ទៅកាន់$2ដោយប្រើមុខងារ\"{{int:emailuser}}\"របស់{{SITENAME}}។",
 	"usermessage-summary": "ទម្លាក់សារក្នុងប្រព័ន្ធ",
 	"usermessage-editor": "ប្រព័ន្ធផ្ញើសារ",
 	"watchlist": "បញ្ជីតាមដាន",
@@ -2151,7 +2145,7 @@
 	"markaspatrolleddiff": "ចំណាំថាបានល្បាត",
 	"markaspatrolledtext": "ចំណាំទំព័រនេះថាបានល្បាត",
 	"markedaspatrolled": "បានចំណាំថាបានល្បាត",
-	"rcpatroldisabled": "បំលាស់ប្តូរថ្មីៗនៃការតាមដានមិនត្រូវបានអនុញ្ញាតទេ",
+	"rcpatroldisabled": "បន្លាស់ប្តូរថ្មីៗនៃការតាមដានមិនត្រូវបានអនុញ្ញាតទេ",
 	"markedaspatrollederror": "មិនអាចគូសចំណាំថាបានល្បាត",
 	"patrol-log-page": "កំណត់ហេតុនៃការតាមដាន",
 	"patrol-log-header": "នេះជាកំណត់ហេតុនៃកំណែ​ប្រែ​ដែល​បាន​តាមដាន",
@@ -2496,7 +2490,7 @@
 	"size-kilobytes": "$1គីឡូបៃ",
 	"size-megabytes": "$1មេកាបៃ",
 	"size-gigabytes": "$1ជីកាបៃ",
-	"lag-warn-normal": "បំលាស់ប្តូរថ្មីជាង {{PLURAL:$1|second|វិនាទី}}អាចមិនត្រូវបានបង្ហាញក្នុងបញ្ជីនេះ​។",
+	"lag-warn-normal": "បន្លាស់ប្តូរក្រោយ {{PLURAL:$1|មួយវិនាទី|វិនាទី}}មុន អាចមិនត្រូវបានបង្ហាញក្នុងបញ្ជីនេះ​។",
 	"lag-warn-high": "ដោយសារប្រព័ន្ធបំរើការមូលដ្ឋានទិន្នន័យមានភាពយឺតយ៉ាវខ្លាំង បន្លាស់ប្ដូរដែលថ្មីជាង $1 វិនាទីមិនអាចបង្ហាញនៅក្នុងបញ្ជីនេះបានទេ។",
 	"watchlistedit-normal-title": "កែប្រែបញ្ជីតាមដាន",
 	"watchlistedit-normal-legend": "ដកចំណងជើងចេញពីបញ្ជីតាមដាន",
@@ -2571,7 +2565,7 @@
 	"specialpages-group-maintenance": "របាយការណ៍នានាអំពីតំហែទាំ",
 	"specialpages-group-other": "ទំព័រពិសេសៗផ្សេងៗទៀត",
 	"specialpages-group-login": "កត់ឈ្មោះចូល / បង្កើតគណនី",
-	"specialpages-group-changes": "បំលាស់ប្តូរថ្មីៗនិងកំណត់ហេតុ",
+	"specialpages-group-changes": "បន្លាស់ប្តូរថ្មីៗនិងកំណត់ហេតុ",
 	"specialpages-group-media": "របាយការណ៍មេឌានិងការផ្ទុកឯកសារ",
 	"specialpages-group-users": "អ្នកប្រើប្រាស់និងសិទ្ធិ",
 	"specialpages-group-highuse": "ទំព័រដែលត្រូវបានប្រើច្រើន",
@@ -2715,6 +2709,12 @@
 	"expand_templates_ok": "យល់ព្រម",
 	"expand_templates_remove_comments": "ដកចេញ វិចារនានា",
 	"expand_templates_preview": "បង្ហាញការមើលជាមុន",
+	"pagelanguage": "ឧបករណ៍ជ្រើសរើសភាសាទំព័រ",
+	"pagelang-language": "ភាសា",
+	"pagelang-use-default": "ប្រើភាសាតាមលំនាំដើម",
+	"right-pagelang": "ប្ដូរភាសាទំព័រ",
+	"log-name-pagelang": "កំណត់ហេតុបន្លាស់ប្ដូរភាសា",
+	"log-description-pagelang": "នេះជាកំណត់ហេតុបន្លាស់ប្ដូរភាសាទំព័រ។",
 	"special-characters-group-latin": "អក្សរឡាតាំង",
 	"special-characters-group-latinextended": "អក្សរឡាតាំងផ្សេងទៀត",
 	"special-characters-group-ipa": "អក្ខរក្រមសំលេងអន្តរជាតិ",
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 c2166e34d1..a9099799ca 100644
--- a/languages/i18n/ko.json
+++ b/languages/i18n/ko.json
@@ -51,7 +51,8 @@
 			"LiteHell",
 			"Lefion",
 			"Leeheonjin",
-			"Hwangjy9"
+			"Hwangjy9",
+			"Kurousagi"
 		]
 	},
 	"tog-underline": "링크에 밑줄:",
@@ -373,6 +374,10 @@
 	"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\".",
 	"perfcached": "다음 자료는 캐시된 것이며 최신이 아닐 수 있습니다. 캐시에 최대 {{PLURAL:$1|결과 한 개|결과 $1개}}가 있습니다.",
 	"perfcachedts": "다음 자료는 캐시된 것으로, $1에 마지막으로 업데이트되었습니다. 캐시에 최대 {{PLURAL:$4|결과 한 개|결과 $4개}}가 있습니다.",
@@ -387,7 +392,7 @@
 	"protectedinterface": "이 문서는 이 위키의 소프트웨어 인터페이스에 쓰이는 문서로, 부정 행위를 막기 위해 보호되어 있습니다.\n모든 위키에 대한 번역을 추가하거나 바꾸려면 미디어위키 지역화 프로젝트인 [//translatewiki.net/wiki/Main_Page?setlang=ko translatewiki.net]에 참여하시기 바랍니다.",
 	"editinginterface": "<strong>경고:</strong> 소프트웨어 인터페이스에 쓰이는 문서를 고치고 있습니다.\n이 문서에 있는 내용을 바꾸면 이 위키에 있는 모든 사용자에게 영향을 끼칩니다.",
 	"translateinterface": "모든 위키를 위해 번역을 추가하거나 바꾸려면, 미디어위키 지역화 프로젝트인 [//translatewiki.net/ translatewiki.net]을 사용해 주시기 바랍니다.",
-	"cascadeprotected": "이 문서는 다음 \"연쇄적\" 보호가 걸린 {{PLURAL:$1|문서}}에 포함되어 있어 함께 보호됩니다:\n$2",
+	"cascadeprotected": "이 문서는 다음 \"연쇄적\" 보호가 걸린 {{PLURAL:$1|문서|문서들}}에 포함되어 있어 함께 보호됩니다:\n$2",
 	"namespaceprotected": "<strong>$1</strong> 이름공간의 문서를 편집할 수 있는 권한이 없습니다.",
 	"customcssprotected": "여기에는 다른 사용자의 개인 설정이 포함되어 있기 때문에 이 CSS 문서를 편집할 수 없습니다.",
 	"customjsprotected": "여기에는 다른 사용자의 개인 설정이 포함되어 있기 때문에 이 자바스크립트 문서를 편집할 수 없습니다.",
@@ -463,6 +468,7 @@
 	"createacct-benefit-body2": "{{PLURAL:$1|문서}}",
 	"createacct-benefit-body3": "최근 {{PLURAL:$1|기여자}}",
 	"badretype": "입력한 비밀번호가 일치하지 않습니다.",
+	"usernameinprogress": "이 사용자 이름에 대한 계정 생성이 이미 시작되었습니다. 기다려 주세요.",
 	"userexists": "입력한 사용자 계정 이름이 이미 사용되고 있습니다.\n다른 이름을 선택하세요.",
 	"loginerror": "로그인 오류",
 	"createacct-error": "계정 만들기 오류",
@@ -553,14 +559,14 @@
 	"passwordreset-emailtitle": "{{SITENAME}} 계정에 대한 자세한 정보",
 	"passwordreset-emailtext-ip": "$1 IP 주소를 사용하는 누군가가 아마 자신이 {{SITENAME}} ($4)의 비밀번호 재설정을 요청하였습니다.\n이 이메일 주소와 연관된 {{PLURAL:$3|계정}}의 목록입니다:\n\n$2\n\n{{PLURAL:$3|이 임시 비밀번호}}는 {{PLURAL:$5|$5일}} 후에 만료됩니다.\n이 비밀번호로 로그인한 후 비밀번호를 바꾸십시오. 만약 당신이 아닌 다른 사람이 요청하였거나,\n원래의 비밀번호를 기억해냈다면, 이 메시지를 무시하고\n이전의 비밀번호를 계속 사용할 수 있습니다.",
 	"passwordreset-emailtext-user": "{{SITENAME}} ($4)의 사용자 $1이 비밀번호 재설정을 요청하였습니다.\n이 이메일 주소와 연관된 {{PLURAL:$3|계정}}의 목록입니다:\n\n$2\n\n{{PLURAL:$3|이 임시 비밀번호}}는 {{PLURAL:$5|$5일}} 후에 만료됩니다.\n이 비밀번호로 로그인한 후 비밀번호를 바꾸십시오. 만약 당신이 아닌 다른 사람이 요청하였거나,\n원래의 비밀번호를 기억해냈다면, 이 메시지를 무시하고\n이전의 비밀번호를 계속 사용할 수 있습니다.",
-	"passwordreset-emailelement": "사용자 이름: $1\n임시 비밀번호: $2",
+	"passwordreset-emailelement": "사용자 이름: \n$1\n\n임시 비밀번호: \n$2",
 	"passwordreset-emailsent": "비밀번호 재설정 이메일을 보냈습니다.",
 	"passwordreset-emailsent-capture": "비밀번호 재설정 이메일이 발송되었으며, 아래에 나타나 있습니다.",
 	"passwordreset-emailerror-capture": "비밀번호 재설정 이메일이 생성되어 아래에 보여져 있지만, {{GENDER:$2|사용자}}에게 발송하는 데에는 실패했습니다: $1",
 	"changeemail": "이메일 주소 바꾸기",
 	"changeemail-text": "이메일 주소를 바꾸려면 이 양식을 채우세요. 이 바뀜을 확인하기 위해 비밀번호를 입력해야 합니다.",
 	"changeemail-no-info": "이 특수 문서에 직접 접근하려면 반드시 로그인해야 합니다.",
-	"changeemail-oldemail": "현재 이메일 주소 :",
+	"changeemail-oldemail": "현재 이메일 주소:",
 	"changeemail-newemail": "새 이메일 주소:",
 	"changeemail-none": "(없음)",
 	"changeemail-password": "{{SITENAME}} 비밀번호:",
@@ -612,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이 문서를 보는 동안 문단이 이동되었거나 삭제되었을 수 있습니다.",
@@ -620,16 +626,16 @@
 	"loginreqlink": "로그인",
 	"loginreqpagetext": "다른 문서를 보기 위해서는 $1해야 합니다.",
 	"accmailtitle": "비밀번호를 보냈습니다",
-	"accmailtext": "[[User talk:$1|$1]] 사용자의 비밀번호를 임의로 만들어 $2(으)로 보냈습니다. 로그인하고 나서 [[Special:ChangePassword|비밀번호를 바꿀]] 수 있습니다.",
+	"accmailtext": "[[User talk:$1|$1]] 사용자의 비밀번호를 임의로 만들어 $2(으)로 보냈습니다. 로그인하고 나서 <em>[[Special:ChangePassword|비밀번호를 바꿀]]</em> 수 있습니다.",
 	"newarticle": "(새 문서)",
 	"newarticletext": "아직 없는 문서의 링크를 따라왔습니다.\n새 문서를 만들려면 아래 상자에 내용을 입력하면 됩니다. (자세한 내용은 [$1 도움말 문서]를 참조하세요)\n만약 잘못 찾아왔다면, 브라우저의 '''뒤로''' 버튼을 눌러 주세요.",
 	"anontalkpagetext": "----\n여기는 계정을 만들지 않았거나 사용하고 있지 않은 익명 사용자를 위한 토론 문서입니다.\n익명 사용자를 구별하기 위해서는 숫자로 된 IP 주소를 사용해야만 합니다.\nIP 주소는 여러 사용자가 공유할 수 있습니다.\n자신과 관계없는 의견이 자신에게 남겨져 있어 불쾌하다고 생각하는 익명 사용자는 [[Special:UserLogin/signup|계정을 만들고]] [[Special:UserLogin|로그인해서]] 나중에 다른 익명 사용자에게 줄 혼란을 줄일 수 있습니다.",
 	"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해당 사용자의 최근 차단 기록을 참고하십시오:",
+	"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>에서 캐시를 비움",
 	"usercssyoucanpreview": "'''안내''': CSS 문서를 저장하기 전에 \"{{int:showpreview}}\" 기능을 통해 작동을 확인해주세요.",
 	"userjsyoucanpreview": "'''안내''': 자바스크립트 문서를 저장하기 전에 \"{{int:showpreview}}\" 기능을 통해 작동을 확인해주세요.",
@@ -663,7 +669,7 @@
 	"longpageerror": "'''오류: 문서의 크기가 {{PLURAL:$1|$1킬로바이트}}로 최대 크기인 {{PLURAL:$2|$2킬로바이트}}보다 큽니다.'''\n저장할 수 없습니다.",
 	"readonlywarning": "'''경고: 데이터베이스가 관리를 위해 잠겨 있습니다. 따라서 문서를 편집한 내용을 지금 저장할 수 없습니다.'''\n편집 내용을 복사하여 붙여넣기 등을 사용하여 일단 다른 곳에 저장한 후, 나중에 다시 시도해 주세요.\n\n잠근 관리자가 남긴 설명은 다음과 같습니다: $1",
 	"protectedpagewarning": "<strong>경고: 이 문서는 관리자 권한이 있는 사용자만 편집할 수 있도록 보호되어 있습니다.</strong>\n이 문서의 최근 기록을 참조하십시오:",
-	"semiprotectedpagewarning": "<strong>참고:</strong> 이 문서는 계정을 등록한 사용자만이 편집할 수 있도록 잠겨 있습니다.\n이 문서의 최근 기록을 참고하십시오:",
+	"semiprotectedpagewarning": "<strong>참고:</strong> 이 문서는 계정을 등록한 사용자만이 편집할 수 있도록 잠겨 있습니다.\n이 문서의 최근 기록을 참조하십시오:",
 	"cascadeprotectedwarning": "<strong>경고:</strong> 이 문서는 잠겨 있어 관리자만 편집할 수 있습니다. 연쇄적 보호가 걸린 다음 {{PLURAL:$1|문서}}에서 이 문서를 사용하고 있습니다:",
 	"titleprotectedwarning": "<strong>경고: 이 문서는 잠겨 있어, 문서를 만드려면 [[Special:ListGroupRights|특정 권한]]이 필요합니다.</strong>\n아래 문서의 최근 기록을 참조하십시오:",
 	"templatesused": "이 문서에서 사용한 {{PLURAL:$1|틀}}:",
@@ -912,7 +918,7 @@
 	"powersearch-togglenone": "모두 제외",
 	"powersearch-remember": "향후 검색에 선택 기억하기",
 	"search-external": "바깥 검색",
-	"searchdisabled": "{{SITENAME}} 검색이 비활성화되어 있습니다.\n검색이 작동하지 않는 동안에는 Google(구글)을 통해 검색할 수 있습니다.\n검색 엔진의 내용은 최신이 아닐 수 있다는 점을 참고하세요.",
+	"searchdisabled": "{{SITENAME}} 검색이 비활성화되어 있습니다.\n검색이 작동하지 않는 동안에는 Google을 통해 검색할 수 있습니다.\n검색 엔진의 내용은 최신이 아닐 수 있다는 점을 참고하세요.",
 	"search-error": "검색하는 동안 오류가 발생했습니다: $1",
 	"preferences": "사용자 환경 설정",
 	"mypreferences": "환경 설정",
@@ -1223,8 +1229,6 @@
 	"rcshowhidemine": "내 편집을 $1",
 	"rcshowhidemine-show": "보이기",
 	"rcshowhidemine-hide": "숨기기",
-	"rcshowhidecategorization-show": "보이기",
-	"rcshowhidecategorization-hide": "숨기기",
 	"rclinks": "최근 $2일간의 $1개 바뀐 문서 보기<br />$3",
 	"diff": "차이",
 	"hist": "역사",
@@ -1235,7 +1239,7 @@
 	"boteditletter": "봇",
 	"number_of_watching_users_pageview": "[{{PLURAL:$1|사용자}} $1명이 주시하고 있음]",
 	"rc_categories": "다음 분류로 제한 (\"|\"로 구분):",
-	"rc_categories_any": "모두",
+	"rc_categories_any": "선택된 것 중 아무거나",
 	"rc-change-size-new": "바꾼 후 $1 {{PLURAL:$1|바이트}}",
 	"newsectionsummary": "/* $1 */ 새 문단",
 	"rc-enhanced-expand": "자세한 내용 보기",
@@ -1248,8 +1252,6 @@
 	"recentchangeslinked-summary": "지정된 문서를 가리키는 문서(또는 지정된 분류에 들어 있는 문서)에 대한 최근에 바뀐 목록입니다.\n[[Special:Watchlist|주시문서 목록]]에 있는 문서는 <strong>굵게</strong> 나타납니다.",
 	"recentchangeslinked-page": "문서 이름:",
 	"recentchangeslinked-to": "해당 문서를 가리키는 문서의 바뀜 보기",
-	"recentchanges-page-added-to-category": "[[:$1]]이(가) 분류에 추가되었습니다",
-	"recentchanges-page-removed-from-category": "[[:$1]]이(가) 분류에서 제거되었습니다",
 	"upload": "파일 올리기",
 	"uploadbtn": "파일 올리기",
 	"reuploaddesc": "올리기를 취소하고 올리기 양식으로 돌아가기",
@@ -1350,13 +1352,16 @@
 	"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\" 파일을 백업할 수 없습니다.",
@@ -1408,7 +1413,7 @@
 	"uploadstash-refresh": "파일 목록을 새로 고침",
 	"invalid-chunk-offset": "청크 오프셋이 잘못되었습니다.",
 	"img-auth-accessdenied": "접근이 거부됨",
-	"img-auth-nopathinfo": "PATH_INFO를 잃었습니다.\n서버가 이 정보를 받을 수 있도록 설정되어 있지 않습니다.\n이러한 경우는 서버가 CGI 기반이고 img_auth를 지원하지 않을 때 나타날 수 있습니다.\nhttps://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Image_Authorization 을 참고하십시오.",
+	"img-auth-nopathinfo": "PATH_INFO를 잃었습니다.\n서버가 이 정보를 받을 수 있도록 설정되어 있지 않습니다.\n이러한 경우는 서버가 CGI 기반이고 img_auth를 지원하지 않을 때 나타날 수 있습니다.\nhttps://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Image_Authorization 을 참조하십시오.",
 	"img-auth-notindir": "요청한 경로가 설정한 올리기 디렉터리에 없습니다.",
 	"img-auth-badtitle": "\"$1\"에서 올바른 제목을 만들 수 없습니다.",
 	"img-auth-nologinnWL": "로그인하지 않았으며 \"$1\" 파일은 화이트리스트에 존재하지 않습니다.",
@@ -1466,7 +1471,7 @@
 	"filehist-user": "사용자",
 	"filehist-dimensions": "크기",
 	"filehist-filesize": "파일 크기",
-	"filehist-comment": "덧글",
+	"filehist-comment": "댓글",
 	"imagelinks": "이 파일을 사용하는 문서",
 	"linkstoimage": "다음 {{PLURAL:$1|문서 $1개}}가 이 파일을 가리키고 있습니다:",
 	"linkstoimage-more": "$1개 이상의 {{PLURAL:$1|문서}}가 이 파일을 가리키고 있습니다.\n다음 목록은 이 파일을 {{PLURAL:$1|가리키는 처음 문서 $1개}}만 보여주고 있습니다.\n이 파일을 가리키는 [[Special:WhatLinksHere/$2|모든 문서 목록]]을 볼 수 있습니다.",
@@ -1636,7 +1641,7 @@
 	"newpages": "새 문서 목록",
 	"newpages-username": "사용자 이름:",
 	"ancientpages": "오래된 문서 목록",
-	"move": "옮기기",
+	"move": "이동",
 	"movethispage": "이 문서 옮기기",
 	"unusedimagestext": "다음은 어떠한 문서도 사용하지 않는 파일의 목록입니다.\n다른 사이트에서 URL 접근을 통해 파일을 사용할 수 있기 때문에, 아래 목록에 있는 파일도 실제로 사용 중일 가능성이 있다는 점을 주의해주세요.",
 	"unusedcategoriestext": "사용하지 않는 분류 문서의 목록입니다.",
@@ -1743,7 +1748,6 @@
 	"emailuser": "이메일 보내기",
 	"emailuser-title-target": "이 {{GENDER:$1|사용자}}에게 이메일 보내기",
 	"emailuser-title-notarget": "사용자에게 이메일 보내기",
-	"emailpage": "사용자에게 이메일 보내기",
 	"emailpagetext": "이 {{GENDER:$1|사용자}}가 환경 설정에 올바른 이메일 주소를 적었다면, 아래 양식을 통해 이메일을 보낼 수 있습니다.\n이메일을 받은 사용자가 바로 답장할 수 있도록 하기 위해 [[Special:Preferences|사용자 환경 설정]]에 적은 이메일 주소가 \"보내는 사람\" 정보에 들어갑니다. 따라서 받는 사람이 당신에게 직접 답장을 보낼 수 있습니다.",
 	"defemailsubject": "\"$1\" 사용자가 보낸 {{SITENAME}} 이메일",
 	"usermaildisabled": "사용자 이메일 비활성화됨",
@@ -1765,7 +1769,7 @@
 	"emailccsubject": "$1에게 보낸 메시지의 복사본: $2",
 	"emailsent": "이메일 보냄",
 	"emailsenttext": "이메일을 보냈습니다.",
-	"emailuserfooter": "이 이메일은 {{SITENAME}}의 $1 사용자가 $2 사용자에게 \"{{int:emailpage}}\" 기능을 통해 보냈습니다.",
+	"emailuserfooter": "이 이메일은 {{SITENAME}}의 $1 사용자가 $2 사용자에게 \"{{int:emailuser}}\" 기능을 통해 보냈습니다.",
 	"usermessage-summary": "시스템 메시지 남기기",
 	"usermessage-editor": "시스템 메신저",
 	"usermessage-template": "MediaWiki:UserMessage",
@@ -1879,7 +1883,7 @@
 	"protect-locked-blocked": "차단된 동안에는 보호 설정을 바꿀 수 없습니다.\n'''$1''' 문서의 보호 설정은 다음과 같습니다:",
 	"protect-locked-dblock": "데이터베이스가 잠겨 문서 보호 설정을 바꿀 수 없습니다.\n'''$1''' 문서의 현재 설정은 다음과 같습니다:",
 	"protect-locked-access": "문서 보호 수준을 바꿀 권한이 없습니다.\n'''$1''' 문서의 권한은 다음과 같습니다.",
-	"protect-cascadeon": "다음 {{PLURAL:$1|문서}}에 연쇄적 보호가 작동하고 있어 그 문서에 속한 이 문서도 현재 보호됩니다.\n이 문서의 보호 설정을 바꾸는 것은 연쇄적 보호에는 영향을 주지 않습니다.",
+	"protect-cascadeon": "다음 {{PLURAL:$1|문서|문서들}}에 연쇄적 보호가 작동하고 있어 그 문서에 속한 이 문서도 현재 보호됩니다.\n이 문서의 보호 설정을 바꾸는 것은 연쇄적 보호에는 영향을 주지 않습니다.",
 	"protect-default": "모든 사용자에게 허용",
 	"protect-fallback": "\"$1\" 권한의 사용자만 허용",
 	"protect-level-autoconfirmed": "자동 인증된 사용자만 허용",
@@ -1918,7 +1922,7 @@
 	"undeletepagetext": "다음 {{PLURAL:$1|문서는 삭제되었지만|문서 $1개는 삭제되었지만}} 아직 보관되어 있고 되살릴 수 있습니다.\n보관된 문서는 주기적으로 삭제될 것입니다.",
 	"undelete-fieldset-title": "문서 되살리기",
 	"undeleteextrahelp": "문서 역사 전체를 되살리려면 모든 체크박스의 선택을 해제하고 '''{{int:undeletebtn}}'''를 누르세요.\n특정한 버전만 되살리려면 되살리려는 버전을 선택하고 '''{{int:undeletebtn}}'''를 누르세요.",
-	"undeleterevisions": "{{PLURAL:$1|판}} $1개가 보존되어 있습니다",
+	"undeleterevisions": "{{PLURAL:$1|판|판들}} $1개가 보존되어 있습니다",
 	"undeletehistory": "문서를 되살리면 모든 역사가 같이 복구됩니다.\n문서가 삭제된 뒤 같은 이름의 문서가 만들어졌다면, 복구되는 역사는 지금 역사의 과거 부분에 나타날 것입니다.",
 	"undeleterevdel": "복구하려는 문서의 최신판이 삭제되어 있는 경우 문서를 되살릴 수 없습니다.\n이러한 경우 삭제된 최신판 문서의 확인 상자를 선택 해제하거나 숨김을 해제해야 합니다.",
 	"undeletehistorynoadmin": "이 문서는 삭제되었습니다.\n삭제된 이유와 삭제되기 전에 이 문서를 편집한 사용자가 아래에 나와 있습니다.\n삭제된 문서의 내용을 보려면 관리자 권한이 필요합니다.",
@@ -2177,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": "문서 내보내기",
@@ -2325,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": "시스템 메시지 보기",
@@ -2395,6 +2399,7 @@
 	"pageinfo-robot-index": "허용됨",
 	"pageinfo-robot-noindex": "불허됨",
 	"pageinfo-watchers": "문서를 주시하는 사용자 수",
+	"pageinfo-visiting-watchers": "이 문서를 최근에 방문한 주시하는 사용자 수",
 	"pageinfo-few-watchers": "{{PLURAL:$1|주시하는 사용자}} $1명보다 적음",
 	"pageinfo-redirects-name": "이 문서의 넘겨주기 수",
 	"pageinfo-redirects-value": "$1개",
@@ -2971,7 +2976,7 @@
 	"version-poweredby-others": "그 외 다른 개발자",
 	"version-poweredby-translators": "translatewiki.net 번역자",
 	"version-credits-summary": "[[Special:Version|미디어위키]]에 기여한 다음 사람에게 감사드립니다.",
-	"version-license-info": "미디어위키는 자유 소프트웨어입니다. 당신은 자유 소프트웨어 재단이 발표한 GNU 일반 공중 사용 허가서 버전 2나 그 이후 버전에 따라 이 파일을 재배포하거나 수정할 수 있습니다.\n\n미디어위키가 유용하게 사용될 수 있기를 바라지만 '''상용으로 사용'''되거나 '''특정 목적에 맞을 것'''이라는 것을 '''보증하지 않습니다'''. 자세한 내용은 GNU 일반 공중 사용 허가서 전문을 참고하십시오.\n\n당신은 이 프로그램을 통해 [{{SERVER}}{{SCRIPTPATH}}/COPYING GNU 일반 공중 사용 허가서 전문]을 받았습니다. 그렇지 않다면, Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA로 편지를 보내주시거나 [//www.gnu.org/licenses/old-licenses/gpl-2.0.html 온라인으로 읽어보시기] 바랍니다.",
+	"version-license-info": "미디어위키는 자유 소프트웨어입니다. 당신은 자유 소프트웨어 재단이 발표한 GNU 일반 공중 사용 허가서 버전 2나 그 이후 버전에 따라 이 파일을 재배포하거나 수정할 수 있습니다.\n\n미디어위키가 유용하게 사용될 수 있기를 바라지만 '''상용으로 사용'''되거나 '''특정 목적에 맞을 것'''이라는 것을 '''보증하지 않습니다'''. 자세한 내용은 GNU 일반 공중 사용 허가서 전문을 참조하십시오.\n\n당신은 이 프로그램을 통해 [{{SERVER}}{{SCRIPTPATH}}/COPYING GNU 일반 공중 사용 허가서 전문]을 받았습니다. 그렇지 않다면, Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA로 편지를 보내주시거나 [//www.gnu.org/licenses/old-licenses/gpl-2.0.html 온라인으로 읽어보시기] 바랍니다.",
 	"version-software": "설치된 소프트웨어",
 	"version-software-product": "제품",
 	"version-software-version": "버전",
@@ -3135,6 +3140,7 @@
 	"htmlform-cloner-create": "더 추가",
 	"htmlform-cloner-delete": "제거",
 	"htmlform-cloner-required": "적어도 하나의 값이 필요합니다.",
+	"htmlform-title-badnamespace": "[[:$1]] 문서는 \"{{ns:$2}}\" 이름공간에 없습니다.",
 	"htmlform-title-not-creatable": "\"$1\"은 만들 수 없는 문서 제목입니다.",
 	"htmlform-title-not-exists": "[[:$1]] 문서는 존재하지 않습니다.",
 	"htmlform-user-not-exists": "<strong>$1</strong> 문서는 존재하지 않습니다.",
@@ -3165,7 +3171,7 @@
 	"logentry-block-reblock": "$1 {{GENDER:$2|사용자가}} {{GENDER:$4|$3}} 사용자의 차단을 $5 $6 설정으로 변경했습니다.",
 	"logentry-suppress-block": "$1 {{GENDER:$2|사용자가}} {{GENDER:$4|$3}} 사용자를 $5 $6 설정으로 차단했습니다.",
 	"logentry-suppress-reblock": "$1 {{GENDER:$2|사용자가}} {{GENDER:$4|$3}} 사용자의 차단을 $5 $6 설정으로 변경했습니다.",
-	"logentry-import-upload": "$1 사용자가 $3을 파일 올리기로 {{GENDER:$2|가져왔습니다}}",
+	"logentry-import-upload": "$1 사용자가 $3 문서를 파일 올리기로 {{GENDER:$2|가져왔습니다}}",
 	"logentry-import-interwiki": "$1 사용자가 $3을 다른 위키에서 {{GENDER:$2|가져왔습니다}}",
 	"logentry-merge-merge": "$1 사용자가 $3 문서를 $4 안에 {{GENDER:$2|병합했습니다}} (판은 $5까지)",
 	"logentry-move-move": "$1 사용자가 $3 문서를 $4 문서로 {{GENDER:$2|옮겼습니다}}",
@@ -3179,6 +3185,7 @@
 	"logentry-newusers-create2": "$1 사용자가 $3 사용자 계정을 {{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|바꾸었습니다}}",
diff --git a/languages/i18n/krc.json b/languages/i18n/krc.json
index ee0c69e38c..a8e026da02 100644
--- a/languages/i18n/krc.json
+++ b/languages/i18n/krc.json
@@ -8,7 +8,8 @@
 			"Reedy",
 			"Къарачайлы",
 			"아라",
-			"Macofe"
+			"Macofe",
+			"Ernác"
 		]
 	},
 	"tog-underline": "Джибериулени черт:",
@@ -488,7 +489,7 @@
 	"passwordreset-capture-help": "Бу белгини салсагъыз, къошулуучугъа ийилген болджаллы пароль бла билдириу сизге кёргюзюллюкдю.",
 	"passwordreset-email": "Электрон почтаны адреси:",
 	"passwordreset-emailtitle": "{{SITENAME}} сайтдагъы тергеу джазыуну юсюнден билгиле",
-	"passwordreset-emailelement": "Къошулуучуну аты: $1\nБолджаллы пароль: $2",
+	"passwordreset-emailelement": "Къошулуучуну аты: \n$1\n\nБолджаллы пароль: \n$2",
 	"passwordreset-emailsent": "Пароль бла e-mail ийилди.",
 	"passwordreset-emailsent-capture": "Ийилген пароль эсгертиу e-mail тюбюрекде берилибди.",
 	"passwordreset-emailerror-capture": "Пароль эсгертиу e-mail генерация этилди (тюбюрекде берилибди), аны {{GENDER:$2|къошулуучугъа}} ашырыу джетишимсиз болду, чурум: $1",
@@ -1525,7 +1526,6 @@
 	"emailuser": "Къошулуучугъа письмо",
 	"emailuser-title-target": "{{GENDER:$1|Къошулуучугъа}} электрон джазма джазыу",
 	"emailuser-title-notarget": "Электрон джазма джазыу",
-	"emailpage": "Къошулуучугъа письмо джибер",
 	"emailpagetext": "Бу къошулуучуну почтасына письмо джиберир ючюн бу форманы толтурургъа боллукъсуз.\nЫзына адрес болуб, сиз [[Special:Preferences|джарашдырыуларыгъызда]] джазгъан адрес белгиленникди, ол себебден сизни письмогъузну аллыкъ сизге тюз джууаб берирге мадарлы боллукъду.",
 	"defemailsubject": "{{SITENAME}} — $1 къошулуучудан билдириу",
 	"usermaildisabled": "Къошулуучуну электрон почтасы джукъланыбды",
diff --git a/languages/i18n/ksh.json b/languages/i18n/ksh.json
index c726976312..bf5795439e 100644
--- a/languages/i18n/ksh.json
+++ b/languages/i18n/ksh.json
@@ -7,7 +7,8 @@
 			"Reedy",
 			"Rentenirer",
 			"לערי ריינהארט",
-			"아라"
+			"아라",
+			"TTO"
 		]
 	},
 	"tog-underline": "Dun de Lengks ongerschtriische:",
@@ -121,12 +122,12 @@
 	"december-date": "$1. Dezämber",
 	"pagecategories": "{{PLURAL:$1|Saachjropp|Saachjroppe|nix}}",
 	"category_header": "Atikkele en dä Saachjropp „$1“",
-	"subcategories": "Ungerjruppe",
+	"subcategories": "Ongerjroppe",
 	"category-media-header": "Dateije en dä Saachjropp „$1“",
 	"category-empty": "''En dä Saachjropp heh sin kein Sigge un kein Datteije.''",
 	"hidden-categories": "Verschtoche Saachjropp{{PLURAL:$1||e|e }}",
 	"hidden-category-category": "Verschtoche Saachjroppe",
-	"category-subcat-count": "En dä Saachrupp heh {{PLURAL:$2|es ein Ungerjrupp dren:|sin $2 Ungerjruppe dren, {{PLURAL:$1|un dovun weed heh nur ein|un dovun weede $1 heh|ävver dovun weed heh keine}} aanjezeich:|sinn_er kein Ungerjruppe dren.}}",
+	"category-subcat-count": "En dä Saachjropp heh {{PLURAL:$2|es ein Ongerjropp dren:|sin $2 Ongerjroppe dren, {{PLURAL:$1|un dovun weed heh nur ein|un dovun wehde $1 heh|ävver dovun weed heh keine}} aanjezeijsch:|sinn_er kein Ongerjroppe dren.}}",
 	"category-subcat-count-limited": "En dä Saachrupp heh {{PLURAL:$1|es ein Ungerjrupp dren:|sin $1 Ungerjruppe dren:|sin kein Ungerjruppe dren.}}",
 	"category-article-count": "En dä Saachjropp heh {{PLURAL:$2|es ein Sigg dren:|sin $2 Sigge dren, {{PLURAL:$1|un dovun weed heh nur ein|un dovun weede $1 heh|ävver dovun weed heh keine}} aanjezeijsch:|sin kein Sigge dren.}}",
 	"category-article-count-limited": "En dä Saachrupp heh {{PLURAL:$1|es ein Sigg dren:|sin $1 Sigge dren:|es kein Sigg dren.}}",
@@ -170,7 +171,7 @@
 	"history": "Väsjohne",
 	"history_short": "Väsjohne",
 	"updatedmarker": "(jeändert)",
-	"printableversion": "För ze Drocke",
+	"printableversion": "För ze Dröcke",
 	"permalink": "Ne Permalink noh heh",
 	"print": "Drocke",
 	"view": "Beloore",
@@ -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",
@@ -522,7 +525,7 @@
 	"passwordreset-emailtitle": "Einzelheite för der Zohjang op {{GRAMMAR:Akkusativ|{{SITENAME}}}}",
 	"passwordreset-emailtext-ip": "Do künns et sällver jewääse sin, öhnswää em Internet hät vun dä IP-Adräß $1 öm\ne neu Paßwoot jefrooch, för Dinge Zohjäng op {{GRAMMAR:Akkusativ|{{SITENAME}}}}\n$4\nHeh {{PLURAL:$3|dä Metmaacher hät|di Metmaacher han|hät keine Metmaacher}} Ding e-mail Addräß:\n\n$2\n\n{{PLURAL:$3|Dat Zweschepaßwoot leuf|Di Zweschepaßwööter loufe|Kein Zweschepaßwoot leuf}} en {{PLURAL:$5|enem Daach|$5 Dääsch|keinem Daach}} uß.\nDonn Desch jäz enlogge, un e neu Paßwoot faßlääje. Wann ene Andere wi\nDo dat heh aanjestüßße hät, udder wann De Desch widder aan Ding Paßwoot\nentsenne kanns, un et nimmih ändere wells, udder es suwwisu weiß, dann\nmoß De jäz jaa nix donn, un kanns Ding Paßwoot wigger bruche.",
 	"passwordreset-emailtext-user": "Dä Metmaacher $1 vun {{GRAMMAR:Dativ|{{SITENAME}}}} hät öm e neu Paßwoot jefrooch,\nför Dinge Zohjäng op {{GRAMMAR:Akkusativ|{{SITENAME}}}}\n$4\nHeh {{PLURAL:$3|dä Metmaacher hät|di Metmaacher han|hät keine Metmaacher}} Ding e-mail Addräß:\n\n$2\n\n{{PLURAL:$3|Dat Zweschepaßwoot leuf|Di Zweschepaßwööter loufe|Kein Zweschepaßwoot leuf}} en {{PLURAL:$5|enem Daach|$5 Dääsch|keinem Daach}} uß.\nDonn Desch jäz enlogge, un e neu Paßwoot faßlääje. Wann ene Andere wi\nDo dat heh aanjestüßße hät, udder wann De Desch widder aan Ding Paßwoot\nentsenne kanns, un et nimmih ändere wells, udder es suwwisu weiß, dann\nmoß De jäz jaa nix donn, un kanns Ding Paßwoot wigger bruche.",
-	"passwordreset-emailelement": "Metmaacher Name: $1\nEijmohl-Paßwoot: $2",
+	"passwordreset-emailelement": "Metmaacher Name: \n$1\n\nEijmohl-Paßwoot: \n$2",
 	"passwordreset-emailsent": "En <i lang=\"en\" xml:lang=\"en\" dir=\"ltr\" title=\"„de eläktrohnesche Poß“\">e-mail</i> met Aanjahbe zom neue Paßwoot för der Zohjang heh es verschek.",
 	"passwordreset-emailsent-capture": "En <i lang=\"en\" xml:lang=\"en\" dir=\"ltr\" title=\"„de eläktrohnesche Poß“\">e-mail</i> met Aanjahbe zom neue Paßwoot för der Zohjang heh es verschek woode. Heh dronger kanns De se lässe.",
 	"passwordreset-emailerror-capture": "En <i lang=\"en\" xml:lang=\"en\" dir=\"ltr\" title=\"„de eläktrohnesche Poß“\">e-mail</i> met Aanjahbe zom neue Paßwoot för der Zohjang heh sullt verschek wääde, ävver dat Verscheke aan {{GENDER:$2|dä|dat|dä Metmaacher|de|dat}} $2 hät nit jeflup: $1",
@@ -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.",
@@ -694,7 +697,7 @@
 	"expansion-depth-exceeded-category": "Sigge, woh de \"expansion depth\" övverschredde es",
 	"expansion-depth-exceeded-category-desc": "Dat heh es de Saachjropp för Sigge, woh de \"expansion depth\" övverschreddde es.",
 	"expansion-depth-exceeded-warning": "Heh di Sigg hät de \"expansion depth\" övverschredde",
-	"parser-unstrip-loop-warning": "Ene Befähl em Täx betrick sesch op sesch sellef.",
+	"parser-unstrip-loop-warning": "Ene Befähl em Täx betrek sesch op sesch sällefs.",
 	"parser-unstrip-recursion-limit": "Ene Befähl em Täx es mieh wi {{PLURAL:$1|eijmohl|$1 Mohl|jaa nit}} met  sesch sellef verschachtelt.",
 	"converter-manual-rule-error": "Doh es ene Fähler en ene händesche Önwandelongsrääjel zwesche de Schprohche.",
 	"undo-success": "De Änderong könnte mer zeröck nämme. Belohr Der de Ungerscheide un dann donn di Sigg avspeijschere, wann De dängks, et es en Ohdenong esu.",
@@ -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}})",
@@ -974,7 +978,7 @@
 	"gender-female": "Dat Su-wi-De-heiß schriiv heh em Wiki met.",
 	"prefs-help-gender": "* Moß mer nit aanjävve, un dat kritt de janne Welt ze sinn, nit nur Do allein.",
 	"email": "<i lang=\"en\">e-mail</i>",
-	"prefs-help-realname": "Dinge rechteje Nahme kanns De fott lohße.\nWann De en ävver nenne wells, dann kann dä jebruch weede, öm Ding Beidrähch domet ze schmöcke.",
+	"prefs-help-realname": "Dinge rechteje Nahme kanns De fott lohße.\nWann De en ävver nenne wells, dann kann dä jebruch wähde, öm Ding Beijdrähschdomet ze schmöke.",
 	"prefs-help-email": "Ding <i lang=\"en\">e-mail</i> Adress - kanns De fottlooße, un se es för Andre nit ze sinn - mäht et ävver müjjelich, Der e neu Passwoot ze schecke, wann De et ens verjäße häß.",
 	"prefs-help-email-others": "Do kannß och zohlohße, dat mer Der domet övver Ding Metmaacherklaafsigg en <i lang=\"en\">e-mail</i> schecke kann. Esu künne ander Metmaacher met Der en Kontak kumme, ohne dat se Dinge Name oder Ding <i lang=\"en\">e-Mail</i> Adress kenne mööte.",
 	"prefs-help-email-required": "Do moß en <i lang=\"en\" xml:lang=\"en\" dir=\"ltr\" title=\"„de eläktrohnesche Poß“\">e-mail</i>-Adräß aanjävve.",
@@ -1125,7 +1129,7 @@
 	"action-history": "de Leß met de fröhjere Väsohne vun heh dä Sigg ze belohre",
 	"action-minoredit": "heh di Änderong als klein „mini“ ze makkehre",
 	"action-move": "di Sigg ömzebenänne",
-	"action-move-subpages": "hee di Sigg un ier Ongersigge ömzebenänne",
+	"action-move-subpages": "heh di Sigg un ier Ongersigge ömzebenänne",
 	"action-move-rootuserpages": "enem Metmaacher sing (Houp)-Metmaacher-Sigg ömzenänne",
 	"action-move-categorypages": "Sigge vun Saachjroppe ömzebenänne",
 	"action-movefile": "Di Dattei ömnänne",
@@ -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.",
@@ -1508,7 +1515,7 @@
 	"unusedtemplates": "Schablohne uder Bauschteijn, di nit jebruch wähde",
 	"unusedtemplatestext": "Hee sin all de Schablohne opjeleß, di em Appachtameng „{{ns:template}}“ sin, di nit en ander Sigge enjeföhsch wähde. Ih De jet dovun fottschmiiß, dängk drahn, se künnte och op en ander Aat jebruch wähde, un luhr Der dä iehr andere Lengks aan!",
 	"unusedtemplateswlh": "ander Lengks",
-	"randompage": "Zofällije Sigg",
+	"randompage": "En zohfälleje Sigg",
 	"randompage-nopages": "En {{PLURAL:$2|dem Appachtemang|dä Appachtemangs|keinem Appachtemang}} „$1“ sin ja kein Sigge dren.",
 	"randomincategory": "En zohfälleje Sigg us ener Saachjropp",
 	"randomincategory-invalidcategory": "„$1“ es keine jölteje Nahme för en Saachjropp.",
@@ -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.",
@@ -1728,7 +1735,6 @@
 	"emailuser": "E-mail aan dä Metmaacher",
 	"emailuser-title-target": "<i lang=\"en\">E-mail</i> aan {{GENDER:$1|dä Metmaacher|di Metmaacherėn|dä Metmaacher|di Metmaacherėn|dä Metmaacher}} $1",
 	"emailuser-title-notarget": "Verschegg en <i lang=\"en\">e-mail</i> aan ene Metmaacher",
-	"emailpage": "Verscheck <i lang=\"en\">e-mail</i> aan ene Metmaacher",
 	"emailpagetext": "Wann {{GENDER:$1|dä Metmaacher heh|dat heh|heh dä Metmaacher|sei|dat heh}} en Adräß för sing <i lang=\"en\" xml:lang=\"en\" dir=\"ltr\" title=\"„de eläktrohnesche Poß“\">e-mail</i>aanjejovve hätt en singe Enstellunge, un di deihd et och, dann kanns De met däm Fomular heh unge en einzel <i lang=\"en\" xml:lang=\"en\" dir=\"ltr\" title=\"„de eläktrohnesche Poß“\">e-mail</i> aan {{GENDER:$1|inn|it|dä Metmaacher|heh di Metmaacherėn|et}} schecke.\n\nDing <i lang=\"en\" xml:lang=\"en\" dir=\"ltr\" title=\"„de eläktrohnesche Poß“\">e-mail</i>-Adräß, di De en [[Special:Preferences|Ding eije Enstellunge]] aanjejovve häs, di weed als em Afsender sing Adräß enjedrare.\nDomet kann, wä di <i lang=\"en\" xml:lang=\"en\" dir=\"ltr\" title=\"„de eläktrohnesche Poß“\">e-mail</i> kritt, drop antwoote, un di Antwood jeiht tirek aan Desch.\nAlles klor?",
 	"defemailsubject": "e-mail fum $1 {{GRAMMAR:fun|{{SITENAME}}}}.",
 	"usermaildisabled": "De <i lang=\"en\">e-mail</i> zwesche Metmaachere es ußjeschalt",
@@ -1750,7 +1756,7 @@
 	"emailccsubject": "En Kopie vun Dinger E-Mail aan $1: $2",
 	"emailsent": "De <i lang=\"en\">e-mail</i> es ongerwähs",
 	"emailsenttext": "Ding E-Mail es jetz lossjescheck woode.",
-	"emailuserfooter": "Hee di e-mail hät dä „$1“ an dä „$2“ jescheck, un doför {{GRAMMAR:en dative|{{SITENAME}}}} dat „{{int:emailpage}}“ jebruch.",
+	"emailuserfooter": "Hee di e-mail hät dä „$1“ an dä „$2“ jescheck, un doför {{GRAMMAR:en dative|{{SITENAME}}}} dat „{{int:emailuser}}“ jebruch.",
 	"usermessage-summary": "En Nohreesch vum Wiki afjelivvert.",
 	"usermessage-editor": "Name vum Metmaacher för de Täxte un Nohreshte vum Wiki ze beärbeide",
 	"watchlist": "ming Oppaßleß",
@@ -1943,7 +1949,7 @@
 	"blanknamespace": "(Atikkele)",
 	"contributions": "{{GENDER:$1|Däm Metmaacher|Däm|Däm Metmaacher|Dä Metmaacherėn|Däm}} $1 {{GENDER:$1|singe|singe|singe|iere|singe}} Beijdrähsch",
 	"contributions-title": "Beijdrähsch fum $1",
-	"mycontris": "Beidrähch",
+	"mycontris": "Beijdrähsch",
 	"contribsub2": "För {{GENDER:$3|dä|et|dä Metmaacher|de|dat}} $1: $1 ($2)",
 	"contributions-userdoesnotexist": "Ene Metmaacher mem Nahme „$1“ ham_mer nit.",
 	"nocontribs": "Mer han kein Änderunge jefonge, en de Logböcher, di do paße dähte.",
@@ -2312,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",
@@ -2345,7 +2351,7 @@
 	"common.js": "/* Jedes JavaScrip hee kütt för jede Metmaacher in jede Sigg erinn */",
 	"group-autoconfirmed.js": "/* De JavaSkreppte fun hee krijje bloß de autemattesch beshtääteschte Metmaacher jescheck */",
 	"group-user.js": "/* De JavaSkreppte heh aan dä Schtäll wirrek sesch nur op de enjeloggte Metmaacher uß */",
-	"group-bot.js": "/* De JavaSkreppte fun hee krijje bloß de Bots jescheck */",
+	"group-bot.js": "/* De JavaSkreppte fun heh krijje bloß de Bots jescheck */",
 	"group-sysop.js": "/* De JavaSkreppte fun hee krijje bloß de Wiki_Köbeße jescheck */",
 	"group-bureaucrat.js": "/* De JavaSkreppte fun hee krijje bloß de Bürrokrahde jescheck */",
 	"anonymous": "Namelose {{PLURAL:$1|Metmaacher|Metmaacher|Metmaacher}} vun {{GRAMMAR:Dat|{{SITENAME}}}}",
@@ -2870,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.",
@@ -2918,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",
@@ -2927,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",
@@ -3069,7 +3075,7 @@
 	"specialpages-group-media": "Dateije — Huhlahde un Opleßte",
 	"specialpages-group-users": "Metmaacher un denne ier Rääschte",
 	"specialpages-group-highuse": "Öff jebruch…",
-	"specialpages-group-pages": "Siggeliste",
+	"specialpages-group-pages": "Siggeleste",
 	"specialpages-group-pagetools": "Werrekzüch för Sigge",
 	"specialpages-group-wiki": "Werrekzüch un Daate vum Syßteem",
 	"specialpages-group-redirects": "{{int:nstab-special}}e, di ömleide, söhke, un fenge",
@@ -3242,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.",
@@ -3298,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ß.",
@@ -3357,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/ku-latn.json b/languages/i18n/ku-latn.json
index ddf03c91a1..b877a61057 100644
--- a/languages/i18n/ku-latn.json
+++ b/languages/i18n/ku-latn.json
@@ -461,7 +461,7 @@
 	"passwordreset-domain": "Domain:",
 	"passwordreset-email": "Navnîşana e-nameyê:",
 	"passwordreset-emailtitle": "Hûragahiyên hesab li ser {{SITENAME}}",
-	"passwordreset-emailelement": "Navê bikarhêner:$1\nŞîfreya niha:$2",
+	"passwordreset-emailelement": "Navê bikarhêner:\n$1\n\nŞîfreya niha:\n$2",
 	"passwordreset-emailsent": "E-nameyeke bibîrxistinê hate şandin.",
 	"changeemail": "E-nameyê biguherîne",
 	"changeemail-oldemail": "Navnîşana E-nameya niha:",
@@ -1152,7 +1152,6 @@
 	"mailnologintext": "Te gireke xwe [[Special:UserLogin|qeydbikê]] û adrêsa e-nameyan di [[Special:Preferences|tercihên xwe]] da nivîsandibe ji bo şandina e-nameyan ji bikarhênerên din ra.",
 	"emailuser": "Ji bikarhêner re e-name bişîne",
 	"emailuser-title-notarget": "E-nameyekê ji bikarhêner re bişîne",
-	"emailpage": "E-nameya bikarhêner",
 	"defemailsubject": "{{SITENAME}} e-name",
 	"noemailtitle": "Navnîşana e-name tune",
 	"emailusername": "Navê bikarhêner:",
diff --git a/languages/i18n/ky.json b/languages/i18n/ky.json
index 0dec0a0d04..8c5fa95418 100644
--- a/languages/i18n/ky.json
+++ b/languages/i18n/ky.json
@@ -22,7 +22,6 @@
 	"tog-hideminor": "Соңку өзгөрүүлөрдүн тизмесинен майда өзгөрүүлөрдү жашыруу",
 	"tog-hidepatrolled": "Соңку өзгөрүүлөрдүн тизмесинен күзөттөлгөн оңдоолорду жашыруу",
 	"tog-newpageshidepatrolled": "Жаңы барактар тизмесинен күзөттөлгөн барактарды жашыруу",
-	"tog-hidecategorization": "Барактардын категорияларын жашыруу",
 	"tog-extendwatchlist": "Бүт өзгөртүүлөрдү камтыган кеңири көзөмөл тизмеси, эң соңкуларды гана эмес",
 	"tog-usenewrc": "Өзгөртүүлөрдү соңку өзгөрүүлөргө жана көзөмөл тизмеме топтоо (JavaScript талап кылынат)",
 	"tog-numberheadings": "Башжазууларды автоматтык түрдө номердөө",
@@ -447,7 +446,7 @@
 	"passwordreset-capture": "Чыккан катты көрүү?",
 	"passwordreset-email": "E-mail дарек:",
 	"passwordreset-emailtitle": "{{SITENAME}} сайтындагы эсеп жазуусу жөнүндөгү маалымат",
-	"passwordreset-emailelement": "Колдонуучу аты: $1\nУбактылуу сырсөз: $2",
+	"passwordreset-emailelement": "Колдонуучу аты: \n$1\n\nУбактылуу сырсөз: \n$2",
 	"passwordreset-emailsent": "Сырсөздү алмаштыруу эмейлге жөнөтүлдү.",
 	"passwordreset-emailsent-capture": "Төмөндө көрсөтүлгөн эмейлге сырсөздү алмаштыруучу кат жөнөтүлдү.",
 	"passwordreset-emailerror-capture": "Төмөндө көрсөтүлгөн дарекке сырсөздү алмаштыруу кат түзүлдү,бирок аны  {{GENDER:$2|катышуучуга}} жөнөтүү оңунан чыккан жок: $1",
diff --git a/languages/i18n/la.json b/languages/i18n/la.json
index aac336c341..63bb0b35e2 100644
--- a/languages/i18n/la.json
+++ b/languages/i18n/la.json
@@ -414,7 +414,7 @@
 	"resetpass-temp-password": "Tessera temporaria:",
 	"passwordreset-username": "Nomen usoris:",
 	"passwordreset-email": "Inscriptio electronica:",
-	"passwordreset-emailelement": "Nomen usoris: $1\nMomentarius Tessera: $2",
+	"passwordreset-emailelement": "Nomen usoris: \n$1\n\nMomentarius Tessera: \n$2",
 	"changeemail-none": "(nulla)",
 	"changeemail-submit": "Inscriptionem electronicam mutare",
 	"bold_sample": "Litterae pingues",
@@ -961,6 +961,7 @@
 	"unusedtemplateswlh": "nexus alii",
 	"randompage": "Pagina fortuita",
 	"randompage-nopages": "Non est ulla pagina {{PLURAL:$2|hoc in spatio nominale|in his spatiis nominalibus}}: $1.",
+	"randomincategory-submit": "Ire",
 	"randomredirect": "Redirectio fortuita",
 	"randomredirect-nopages": "Non est ulla redirectio in spatio nominali \"$1\".",
 	"statistics": "Census",
@@ -1091,7 +1092,6 @@
 	"listgrouprights-addgroup-self-all": "Addere omnes greges ad rationem propriam",
 	"listgrouprights-removegroup-self-all": "Removere omnes greges ex ratione propria",
 	"emailuser": "Litteras electronicas usori mittere",
-	"emailpage": "Mittere litteras electronicas huic usori",
 	"emailpagetext": "Forma subter nuntium ad usorem mittet.\nInscriptio electronica quam in [[Special:Preferences|praeferentiis tuis]] dedis ut \"Ab\" inscriptione apparebit. Hoc modo usor tibi directe respondere poterit.",
 	"defemailsubject": "{{SITENAME}} - Litterae electronicae ab usore \"$1\"",
 	"noemailtitle": "Nulla inscriptio electronica",
diff --git a/languages/i18n/lad.json b/languages/i18n/lad.json
index a5e8183b0d..d0d98b4cf3 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",
@@ -396,7 +396,7 @@
 	"passwordreset-username": "Nombre de usador:",
 	"passwordreset-domain": "Dominio:",
 	"passwordreset-email": "Adresso de letral:",
-	"passwordreset-emailelement": "Usuario: $1\nKontrasenya temporal: $2",
+	"passwordreset-emailelement": "Usuario: \n$1\n\nKontrasenya temporal: \n$2",
 	"changeemail": "Kambiar adreso de korreo elektroniko",
 	"changeemail-oldemail": "Adreso de korreo elektroniko aktual:",
 	"changeemail-newemail": "Muevo adreso de korreo elektroniko:",
@@ -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 70d1536a13..1b4286c265 100644
--- a/languages/i18n/lb.json
+++ b/languages/i18n/lb.json
@@ -22,7 +22,6 @@
 	"tog-hideminor": "Kleng Ännerungen an de rezenten Ännerunge verstoppen",
 	"tog-hidepatrolled": "Nogekuckt Ännerungen an de \"Rezenten Ännerungen\" verstoppen",
 	"tog-newpageshidepatrolled": "Nogekuckt Säiten op der Lëscht vun den \"Neie Säite\" verstoppen",
-	"tog-hidecategorization": "Kategorisatioun vu Säite verstoppen",
 	"tog-extendwatchlist": "Iwwerwaachungslëscht op all Ännerungen ausbreeden, net nëmmen op déi rezentst",
 	"tog-usenewrc": "Rezent Ännerungen an Iwwerwaachungslëscht pro Säit weisen",
 	"tog-numberheadings": "Iwwerschrëften automatesch numeréieren",
@@ -52,7 +51,6 @@
 	"tog-watchlisthideliu": "Ännerunge vun ugemellte Benotzer verstoppen",
 	"tog-watchlisthideanons": "Ännerunge vun anonyme Benotzer (IP-Adressen) verstoppen",
 	"tog-watchlisthidepatrolled": "Iwwerkuckten Ännerungen op der Iwwerwaachungslëscht verstoppen",
-	"tog-watchlisthidecategorization": "Kategorisatioun vu Säite verstoppen",
 	"tog-ccmeonemails": "Schéck mir eng Kopie vun de Mailen, déi ech anere Benotzer schécken.",
 	"tog-diffonly": "Weis bei Versiounsvergläicher just d'Ënnerscheeder an net déi ganz Säit",
 	"tog-showhiddencats": "Verstoppt Kategorië weisen",
@@ -527,7 +525,7 @@
 	"passwordreset-emailtitle": "Detailer vum Benotzerkont op{{SITENAME}}",
 	"passwordreset-emailtext-ip": "Iergendee mat der IP-Adress $1, wahrscheinlech Dir selwer, huet d'Zrécksetze vun Ärem Passwuert op {{SITENAME}} gefrot ($4). {{PLURAL:$3|De Benotzerkont ass|D'Benutzerkonte si}} mat dëser E-Mail-Adress verbonn:\n\n$2\n\n{{PLURAL:$3|Dëst temporärt Passwuert leeft|Dës temporär Passwierder lafe}} bannent {{PLURAL:$5|engem Dag|$5 Deeg}} of.\nDir sollt Iech aloggen an een neit Passwuert festleeën. Wann een Aneren déi Ufro gemaach huet oder Dir Iech erëm un Äert Passwuert erënnere kënnt an et net ännere wëllt, kënnt Dir dës Noriicht ignoréieren an Äert aalt Passwuert weider benotzen.",
 	"passwordreset-emailtext-user": "De Benotzer $1 vu(n) {{SITENAME}} huet d'Zrécksetze vun Ärem Passwuert op {{SITENAME}} gefrot ($4). {{PLURAL:$3|De Benotzerkont|D'Benutzerkonte}} \n\n$2\n\n{{PLURAL:$3|ass|si}} mat dëser E-Mail-Adress verbonn.\n\n{{PLURAL:$3|Dëst temporärt Passwuert leeft|Dës temporär Passwierder lafe}} bannent {{PLURAL:$5|engem Dag|$5 Deeg}} of.\nDir sollt Iech aloggen an een neit Passwuert festleeën. Wann een Aneren déi Ufro gemaach huet oder Dir Iech erëm un Äert Passwuert erënnere kënnt an et net ännere wëllt, kënnt Dir dës Noriicht ignoréieren an Äert aalt Passwuert weider benotzen.",
-	"passwordreset-emailelement": "Benotzernumm: $1\nTemporärt Passwuert: $2",
+	"passwordreset-emailelement": "Benotzernumm: \n$1\n\nTemporärt Passwuert: \n$2",
 	"passwordreset-emailsent": "Eng Mail fir d'Passwuert zréckzesetze gouf geschéckt.",
 	"passwordreset-emailsent-capture": "Eng Mail fir d'Passwuert zréckzesetze gouf geschéckt, Dir gesitt se hei drënner.",
 	"passwordreset-emailerror-capture": "Eng Mail fir d'Passwuert zréckzesetze gouf geschéckt, Dir gesitt se hei drënner, awer de {{GENDER:$2|Benotzer}} konnt se net kréien: $1",
@@ -916,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}})",
@@ -1185,9 +1184,6 @@
 	"rcshowhidemine": "Meng Ännerunge $1",
 	"rcshowhidemine-show": "Weisen",
 	"rcshowhidemine-hide": "Verstoppen",
-	"rcshowhidecategorization": "Kategorisatioun vu Säite $1",
-	"rcshowhidecategorization-show": "Weisen",
-	"rcshowhidecategorization-hide": "Verstoppen",
 	"rclinks": "Déi lescht $1 Ännerunge vun de leschten $2 Deeg weisen.<br />$3",
 	"diff": "Ënnerscheed",
 	"hist": "Versiounen",
@@ -1212,10 +1208,6 @@
 	"recentchangeslinked-summary": "Dëst ass eng Lëscht mat Ännerunge vu verlinkte Säiten op eng bestëmmte Säit (oder vu Membersäite vun der spezifizéierter Kategorie).\nSäite vun [[Special:Watchlist|Ärer Iwwerwaachungslëscht]] si '''fett''' geschriwwen.",
 	"recentchangeslinked-page": "Säitennumm:",
 	"recentchangeslinked-to": "Weis Ännerungen zu de verlinkte Säiten aplaz vun der gefroter Säit",
-	"recentchanges-page-added-to-category": "[[:$1]] an d'Kategorie derbäigesat",
-	"recentchanges-page-added-to-category-bundled": "{{PLURAL:$2|}}[[:$1]] a(n) {{PLURAL:$2|eng Säit|$2 Säiten}} an d'Kategorie derbäigesat",
-	"recentchanges-page-removed-from-category": "[[:$1]] erausgeholl aus der Kategorie",
-	"recentchanges-page-removed-from-category-bundled": "{{PLURAL:$2|}}[[:$1]] a(n) {{PLURAL:$2|eng Säit|$2 Säiten}} aus der Kategorie erausgeholl",
 	"upload": "Eroplueden",
 	"uploadbtn": "Fichier eroplueden",
 	"reuploaddesc": "Eroplueden ofbriechen an zréck op de Formulaire fir Eropzelueden",
@@ -1617,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.",
@@ -1699,7 +1691,6 @@
 	"emailuser": "Dësem Benotzer eng E-Mail schécken",
 	"emailuser-title-target": "{{GENDER:$1|Dëser Benotzerin|Dësem Benotzer}} eng Mail schécken",
 	"emailuser-title-notarget": "Dem Benotzer eng E-Mail schécken",
-	"emailpage": "Dem Benotzer eng E-Mail schécken",
 	"emailpagetext": "Dir kënnt mat dësem Formulaire {{GENDER:$1|dësem Benotzer}} en E-Mail-Message schécken.\nD'E-Mail-Adress, déi Dir an [[Special:Preferences|Ären Astellungen]] aginn hutt, steet an der \"From\" Adress vun der Mail, sou datt den Destinataire Iech direkt äntwerte kann.",
 	"defemailsubject": "{{SITENAME}} E-Mail vum Benotzer \"$1\"",
 	"usermaildisabled": "Benotzer E-Mail ausgeschalt",
@@ -1721,7 +1712,7 @@
 	"emailccsubject": "Kopie vun denger Noriicht un $1: $2",
 	"emailsent": "E-Mail geschéckt",
 	"emailsenttext": "Är E-Mail gouf fortgeschéckt.",
-	"emailuserfooter": "Dës E-Mail gouf vum $1 dem $2 geschéckt dobäi gouf d'Funktioun \"{{int:emailpage}}\" op {{SITENAME}} benotzt.",
+	"emailuserfooter": "Dës E-Mail gouf vum $1 dem $2 geschéckt dobäi gouf d'Funktioun \"{{int:emailuser}}\" op {{SITENAME}} benotzt.",
 	"usermessage-summary": "Benoriichtegung hannerloossen.",
 	"usermessage-editor": "Benoriichtegungs-System",
 	"watchlist": "Iwwerwaachungslëscht",
@@ -2283,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/lez.json b/languages/i18n/lez.json
index 61899f673f..5b8c07d515 100644
--- a/languages/i18n/lez.json
+++ b/languages/i18n/lez.json
@@ -297,11 +297,10 @@
 	"resetpass-submit-loggedin": "Парол дегишарун",
 	"resetpass-submit-cancel": "Гьич авун",
 	"passwordreset": "Парол алудна гадрун",
-	"passwordreset-legend": "Парол алудна гадрун",
 	"passwordreset-username": "Уртахдин тlвар:",
 	"passwordreset-domain": "Домен:",
 	"passwordreset-email": "E-mail адрес",
-	"passwordreset-emailelement": "Уртахдин тIвар: $1\nВахтуналди тир пароль: $2",
+	"passwordreset-emailelement": "Уртахдин тIвар: \n$1\n\nВахтуналди тир пароль: \n$2",
 	"changeemail": "Э-почта дегишарун",
 	"changeemail-none": "(садни)",
 	"changeemail-submit": "E-адрес дегишун",
diff --git a/languages/i18n/lg.json b/languages/i18n/lg.json
index 192cba75a3..fe50952b6f 100644
--- a/languages/i18n/lg.json
+++ b/languages/i18n/lg.json
@@ -373,12 +373,11 @@
 	"resetpass-wrong-oldpass": "Okozesezza ekyama eky'ekiseerabuseera oba ekyaddala ekitakola.<br />\nOyinz'okuba nga wamaze okutegeka ekya ddala ekipya oba nga wakasabayo eky'ekiseerabuseera.",
 	"resetpass-temp-password": "Ekyama kyo eky'ekiseerabuseera:",
 	"passwordreset": "Damu okutegeka ekyama",
-	"passwordreset-legend": "Damu okutegeka ekyama",
 	"passwordreset-disabled": "Eby'okuddamu okutegeka ebyama biymirizidwa ku wiki eno.",
 	"passwordreset-username": "Ery'obwa memba:",
 	"passwordreset-email": "Endagiriro eya 'email':",
 	"passwordreset-emailtitle": "Ebya akawunti ey'oku {{SITENAME}}",
-	"passwordreset-emailelement": "Ery'obwa memba: $1 <br />\nEkyama kyo eky'ekiseerabuseera: $2",
+	"passwordreset-emailelement": "Ery'obwa memba: \n$1\n <br />\nEkyama kyo eky'ekiseerabuseera: \n$2",
 	"bold_sample": "Ennukuta z'owandika wano zonna ziba nziggumivu",
 	"bold_tip": "Bw'onyiga kano, ofuna w'oyinza okuwandikira ennukuta ezo ne zivaamu nga nziggumivu",
 	"italic_sample": "Ennukuta z'owandika wano zonna ziba za italiki",
@@ -693,7 +692,6 @@
 	"deleteotherreason": "Nsonga ndala:",
 	"deletereasonotherlist": "Nsonga ndala",
 	"rollback": "Jjululako ku bikyusidwamu",
-	"rollback_short": "Jjulula nkyukakyuka",
 	"rollbacklink": "julula nkyukakyuka",
 	"rollbackfailed": "Okujjulula tekusobose",
 	"protectlogpage": "Olukalala lw'ebifa ku mpapula ezisibidwa",
diff --git a/languages/i18n/li.json b/languages/i18n/li.json
index 896496b60d..5350ef2138 100644
--- a/languages/i18n/li.json
+++ b/languages/i18n/li.json
@@ -422,7 +422,7 @@
 	"passwordreset-emailtitle": "Gebroekersgegaeves óp {{SITENAME}}",
 	"passwordreset-emailtext-ip": "Emes, wersjienlik doe, vanaaf 't IP-adres $1, haet dien gebroekersgegaeves veur {{SITENAME}} ($4) ópgevraog.\nDe volgende {{PLURAL:$3|gebroeker is|gebroekers zint}} gekoppeld aan dit e-mailadres:\n\n$2\n\n{{PLURAL:$3|Dit tiedelik wachwaord vervilt|Dees tiedelike wachweurd vervallen}} euver {{PLURAL:$5|einen daag|$5 daag}}.\nMel dich aan en veranger 't wachwaord noe. Es se dit verzeuk neet zelf hes gedaon, of es se 't oorspronkelik wachwaord nog kins en 't neet anges wils, laot dit berich den en blief dien aad wachwaord gebroeke.",
 	"passwordreset-emailtext-user": "Gebroeker $1 op de site {{SITENAME}} haet dien gebroekersgegaeves veur {{SITENAME}} ($4) ópgevraog.\nDe volgende {{PLURAL:$3|gebroeker is|gebroekers zint}} gekoppeld aan dit e-mailadres:\n\n$2\n\n{{PLURAL:$3|Dit tiedelik wachwaord vervilt|Dees tiedelike wachweurd vervallen}} euver {{PLURAL:$5|einen daag|$5 daag}}.\nMel dich aan en veranger 't wachwaord noe. Es se dit verzeuk neet zelf hes gedaon, of es se 't oorspronkelik wachwaord nog kins en 't neet anges wils, laot dit berich den en blief dien aad wachwaord gebroeke.",
-	"passwordreset-emailelement": "Gebroekersnaam: $1\nTiedelik wachwaord: $2",
+	"passwordreset-emailelement": "Gebroekersnaam: \n$1\n\nTiedelik wachwaord: \n$2",
 	"passwordreset-emailsent": "d'r Is per mail 'n herinnering versjik.",
 	"passwordreset-emailsent-capture": "d'r Is 'ne herinneringse-mail versjik. Deze weurt hieónger getuind.",
 	"passwordreset-emailerror-capture": "d'r Is 'ne herinneringse-mail aangemaak. Deze weurt hieónger getuind. 't Verzènje nao de gebroeker is mislök óm de volgende raeje: $1",
@@ -1409,7 +1409,6 @@
 	"mailnologin": "Gein e-mailadres bekènd veur deze gebroeker",
 	"mailnologintext": "De mos zien [[Special:UserLogin|aangemèld]] en 'n gèldig e-mailadres in bie dien [[Special:Preferences|veurkäöre]] höbbe ingevuld om mail nao anger gebroekers te sjture.",
 	"emailuser": "Sjik deze gebroeker 'nen e-mail",
-	"emailpage": "Sjik gebroeker 'nen e-mail",
 	"emailpagetext": "Es deze gebroeker e geljig e-mailadres haet opgegaeve den kint g'r via dit formuleer e berich sjikke. 't E-mailadres wat geer heet opgegeve bie eur [[Special:Preferences|veurkäöre]] zal es versjikker aangegaeve waere.\nDae kin dös drek reazjere.",
 	"defemailsubject": "E-mail van {{SITENAME}}-gebroeker \"$1\"",
 	"usermaildisabled": "Gebroeker e-mail oetgezatj.",
diff --git a/languages/i18n/lij.json b/languages/i18n/lij.json
index 3a1d77123f..34241d19ca 100644
--- a/languages/i18n/lij.json
+++ b/languages/i18n/lij.json
@@ -375,7 +375,7 @@
 	"passwordreset-username": "Nomme utente",
 	"passwordreset-email": "Addresso e-mail:",
 	"passwordreset-emailtitle": "Dettaggi account sciu {{SITENAME}}",
-	"passwordreset-emailelement": "Nomme utente: $1\nPoula segretta temporannia: $2",
+	"passwordreset-emailelement": "Nomme utente: \n$1\n\nPoula segretta temporannia: \n$2",
 	"changeemail": "Cangia l'adresso e-mail",
 	"changeemail-newemail": "Noeuvo adresso e-mail",
 	"changeemail-none": "(nisciun)",
@@ -679,7 +679,6 @@
 	"listusers-noresult": "Utente non trovöo.",
 	"listgrouprights-members": "(Elenco di membri)",
 	"emailuser": "Invia 'na email a st'utente chi",
-	"emailpage": "Mandighe 'na léttia elettronega",
 	"defemailsubject": "{{SITENAME}} posta elettronega",
 	"noemailtitle": "Nisciûn conto e-mail",
 	"emailfrom": "Da",
diff --git a/languages/i18n/lmo.json b/languages/i18n/lmo.json
index 264bb8180f..100aaaf634 100644
--- a/languages/i18n/lmo.json
+++ b/languages/i18n/lmo.json
@@ -463,14 +463,13 @@
 	"resetpass-validity-soft": "La tò password l'è mìa bùna: $1\n\nTe g'harèset de catà fò 'n ótra password o clicà sö \"{{int:resetpass-submit-cancel}}\" per turnà a definìla piö tàrde.",
 	"passwordreset": "Tùrna a defenéser la password",
 	"passwordreset-text-one": "Empenés chèsto mòdulo per turnà a defenéser la tò password.",
-	"passwordreset-legend": "Tùrna a defenéser la password",
 	"passwordreset-disabled": "La ridefinisiù de la password l'è mìa atìva sö chèsta wiki",
 	"passwordreset-emaildisabled": "Le funsiù de pòsta eletrònica i è stàde disativàde sö chèsta wiki.",
 	"passwordreset-username": "Nòm de ütènt",
 	"passwordreset-domain": "Domini:",
 	"passwordreset-email": "Indirìs e-mail:",
 	"passwordreset-emailtitle": "Detài de l'ütènsa sö {{SITENAME}}",
-	"passwordreset-emailelement": "Nòm ütènt: $1\nPassword temporànea: $2",
+	"passwordreset-emailelement": "Nòm ütènt: \n$1\n\nPassword temporànea: \n$2",
 	"passwordreset-emailsent": "Gh'è stat mandàt vià 'na e-mail de redefinisiù de la password.",
 	"passwordreset-emailsent-capture": "Gh'è stat mandàt vià chèsta e-mail de redefinisiù de la password:",
 	"changeemail": "Càmbia l'indirìs e-mail",
@@ -480,7 +479,6 @@
 	"changeemail-throttled": "Te g'hét fat tròp tacc tentatìf de autenticàt, adès te g'hét de spetà $1 per püdì turnà a pröà.",
 	"resettokens": "Redefenés i tokens",
 	"resettokens-no-tokens": "Gh'è nisü token de redefenéser.",
-	"resettokens-legend": "Redefenés i tokens",
 	"resettokens-tokens": "Token:",
 	"resettokens-token-label": "$1 (valùr de adès: $2)",
 	"resettokens-done": "Tokens redefinìcc.",
@@ -1016,7 +1014,6 @@
 	"nmembers": "$1 {{PLURAL:$1|element|element}}",
 	"nmemberschanged": "$1 → $2 {{PLURAL:$2|elemènt|elemèncc}}",
 	"nrevisions": "$1 {{PLURAL:$1|reviziù}}",
-	"nviews": "$1 {{PLURAL:$1|vìzita|vìzite}}",
 	"nimagelinks": "Dopràt sö $1 {{PLURAL:$1|pàgina|pàgine}}",
 	"ntransclusions": "dopràt sö $1 {{PLURAL:$1|pàgina|pàgine}}",
 	"specialpage-empty": "Chèsta pàgina speciàl al momènt l'è öda.",
diff --git a/languages/i18n/lrc.json b/languages/i18n/lrc.json
index a8681c1400..3251a49789 100644
--- a/languages/i18n/lrc.json
+++ b/languages/i18n/lrc.json
@@ -522,7 +522,7 @@
 	"passwordreset-emailtitle": "جوزئیات حئساڤ ها د {{نوم مالگە}}",
 	"passwordreset-emailtext-ip": "یە کئسی(گاسی خوتوٙ، ڤا تیرنئشوٙن آی پی $1) د نۊ زئنە کئردئن رازینە گوڤاردئنئتوٙ د {{SITENAME}} حاستیتە($4).\nسی کاریار «$2» یئ گئل رازینە گوڤاردئن موڤأقتی رأڤأندیاری بییە و هومبأراڤأر «$3» ە.\nأر دالئتوٙ یە بییە ئیسئ ڤاس بیائیت ڤامین ساموٙنە و یئ گئل رازینە گوڤاردئن هأنی بئهایت.\n رازینە گوڤاردئن {{PLURAL:$3|ئی رازینە یا گوڤاردئن موڤأقأتی|ئی رازینە یا گوڤاردئن موڤأقأتی}} شوما د گات {{PLURAL:$5|یئ روٙ|$5 روٙ}} باطئل بوٙە.\n\nأر کأسی هأنی چئن حاستی داشتە یا یە کئ رازینە گوڤاردئن دئمایی شوما د ڤیرئتوٙ ئوٙما و دە نئمیهایت ڤئنە آلئشت کاری بأکیت، می توٙنیت د ئی پئیغوم تیە پوٙشی بأکیت و هأموٙ رازینە گوڤاردئن دئمایی نە بونیت د کار.",
 	"passwordreset-emailtext-user": "کاریار $1 د {{SITENAME}} د نۊ زئنە کئردئن رازینە گوڤاردئن شومانە د{{SITENAME}} ($4) حاستە. {{PLURAL:$3|حئساڤ|حئساڤیا}} کاریاری کئ هان د هار و ڤا ئی تیرنئشوٙن أنجومانامە هان د ئرتئڤاط:\n\n$2\n\n رازینە گوڤاردئن {{PLURAL:$3|ئی رازینە یا گوڤاردئن موڤأقأتی|ئی رازینە یا گوڤاردئن موڤأقأتی}} شوما د گات {{PLURAL:$5|یئ روٙ|$5 روٙ}} باطئل بوٙە.\nأر کأسی هأنی چئن حاستی داشتە یا یە کئ رازینە گوڤاردئن دئمایی شوما د ڤیرئتوٙ ئوٙما و دە نئمیهایت ڤئنە آلئشت کاری بأکیت، می توٙنیت د ئی پئیغوم تیە پوٙشی بأکیت و هأموٙ رازینە گوڤاردئن دئمایی نە بونیت د کار.",
-	"passwordreset-emailelement": "نوم کاریاری: $1\nرازینە گوڤاردئن موڤأقتی: $2",
+	"passwordreset-emailelement": "نوم کاریاری: \n$1\n\nرازینە گوڤاردئن موڤأقتی: \n$2",
 	"passwordreset-emailsent": "یئ گئل رازینە گوڤاردئن هأنی سی أنجومانامە کئل بییە.",
 	"passwordreset-emailsent-capture": "رازینە گوڤاردئن تازە توٙ سی أنجومانامە توٙ کئ ها د هار کئل بییە.",
 	"passwordreset-emailerror-capture": "رازینە گوڤاردئن د أنجومانامە د نۊ زئنە کون کئل بییە،و ڤئ د هار دیاری میکە، ڤألی کئل بییئن ڤئ سی {{GENDER:$2|کاریار}} ناخوش سأرنجوم بییە:$1",
@@ -598,42 +598,43 @@
 	"noarticletext": "د ئیسئنیا د ئی بألگؤ نیسئسە یی ڤوجوٙد ناشتە.\nشوما می توٙنیت د[[Special:Search/{{PAGENAME}}|بگردید]] د ئی بألگە یا د بألگە هأنی یا <span class=\"plainlinks\">[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} د هأنی نە پئی جوری بوٙە]</span>، <span class=\"plainlinks\">[{{fullurl:{{FULLPAGENAME}}|action=edit}} یا ئی بألگە نە ڤیرایئشت بأکیت]</span>.",
 	"noarticletext-nopermission": "د ئیسئنیا د ئی بألگؤ نیسئسە یی ڤوجوٙد ناشتە.\nشوما می توٙنیت د[[Special:Search/{{PAGENAME}}|بگردید]] د ئی بألگە یا د بألگە هأنی یا <span class=\"plainlinks\">[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} د هأنی نە پئی جوری بوٙە]</span>، <span class=\"plainlinks\">[{{fullurl:{{FULLPAGENAME}}|action=edit}}</span>.ڤألی شوما صئلا یە نە کئ ئی بألگە نە راس بأکیت ناریت.",
 	"missing-revision": "ڤانئیأری #$1 د بألگە یی کئ نومئش ڤئنە \"{{FULLPAGENAME}}\" ڤوجوٙد نارە.\n\nگاسی سی یئ گئل ڤیرگار ڤئ هئنگوم نأبییە کئ د یئ گئل بألگە پاکسا بییە هوم پئیڤأند بییە رأڤأندیاری بییە.\nگاسی جوزئیات د[{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} deletion log] دیاری بأکأن.",
-	"userpage-userdoesnotexist": "حساو کاریاری\"$1\" ثوت نام نبیه.\nار میهایت ای بلگه نه بسازیتو یا ویرایشت بکیت یه گل وارسی انجوم بئیت.",
+	"userpage-userdoesnotexist": "حئساڤ کاریاری \"$1\" ثأڤت نأم نأبییە.\nأر میھایت ئی بألگە نئ بأسازیت یا ڤیرایئشت کاری بأکیت یئ گئل ڤارئسی أنجوم بئیتوٙ.",
 	"userpage-userdoesnotexist-view": "حئساڤ کاریاری \"$1\" ثأڤت نأبییە.",
-	"blocked-notice-logextract": "ای کاریار ایسنی دسرسی ناره.\nآخری پهرستنومه قلف ورودی د هار ایچه سی سرچشمه آماده بیه:",
-	"clearyourcache": "<strong>د ویر داشتویت:</strong> نها اماییه کاری, شات مژبور وه وه کار ونن ویرگه نهو دوارته نیئر خوتو سی دیئن ای آلشتیا بوئیت .\n* <strong>فایرفاکس/ سفری:</strong> بپورنیت ری<em>شیفت</em> اوسه که می پورنیت<em>د نو سوار بوئه</em>یا هنی ری <em>Ctrl-F5</em> بپورنیت یا<em>Ctrl-R</em> (<em>⌘-R</em> د سامونه مک)\n* <strong>گوگل کروم:</ strong>بپورنیت ری <em>Ctrl-Shift-R</em> (<em>⌘-Shift-R</em> یا د سامونه)\n* <strong>اینترنت اکسپلورر:</strong> <em>Ctrl</em> واداریت اوسه که می پورنیت ری <em>Refresh</em>, یل بپورنیت ری<em>Ctrl-F5</em>\n* <strong>اوپرا:</strong> ویرگه نهو نه د <em>اوزاریا→ اولویتیا پاک بکیت</em>",
-	"usercssyoucanpreview": "<strong>نکته:</strong> د دگمه \"{{int:showpreview}}\" سی آزماشت کردن سی اس اس تازه دما اماییه کاری وه کار بیئریت.",
-	"userjsyoucanpreview": "<strong>نکته:</strong> د دگمه \"{{int:showpreview}}\" سی آزماشت کردن دما اماییه کاری جاوا اسکریپت تازه وه کار بیئریت.",
-	"usercsspreview": "<strong>د ویر داشتوئیت که شما فقط می تونیت سی اس اس کاریاری تونه پیش سیل بکیت. وه د ایسنی هنی اماییه نبیه!</strong>",
-	"userjspreview": "<strong>د ویر داشتوئیت که شما فقط می تونیت جاوا اسکریپت کاریاری تونه پیش سیل بکیت. وه د ایسنی هنی اماییه نبیه!</strong>",
-	"sitecsspreview": "<strong>د ویر داشتوئیت که شما فقط می تونیت ای سی اس اس  نه فقط پیش سیل بکیت. وه د ایسنی هنی اماییه نبیه!</strong>",
-	"sitejspreview": "<strong>د ویر داشتوئیت که شما فقط می تونیت ای ای جاوا اسکریپت نه فقط پیش سیل بکیت. وه د ایسنی هنی اماییه نبیه!</strong>",
-	"userinvalidcssjstitle": "<strong>زئنار:</strong> پوسه \"$1\" نیئش.\nسی اس اس جاونه و بلگه یا جاوا اسکریپت  سرون وا حرف کؤچک نه وه کار بسته، همچنو{{ns:کاریار}}:فو/وکتور.سی اس اس چی د ضد{{ns:کاریار}}:فو/وکتور. سی اس اسه.",
+	"blocked-notice-logextract": "ئی کاریار د ئیسئنی نئھاگئری بییە.\nآخئری پئرئستنوٙمە نئھاگئری ڤامین یاریا د ھار سی سأرچئشمە آمادە کاری بییە:",
+	"clearyourcache": "<strong>د ڤیر داشتوٙیت:</strong> نئها ئمایە کاری،گاسی شوما مأژبوٙر د ڤئ کار ڤأنئن ڤیرگە قام بییە دوڤارتە نییأر خوتوٙ سی دیئن ئی آلئشتکاری بوٙئیت.\n* <strong>فایئرفاکس/ سأفأری:</strong> بأپوٙرنیت ری<em>شیفت</em> ئوٙسئ کئ می پوٙرنیت <em> ڤئ د نۊ سۊڤار موٙە </em>یا ھأنی ری <em>Ctrl-F5</em> بأپوٙرنیت یا<em>Ctrl-R</em> (<em>⌘-R</em> د ساموٙنە مأک)\n* <strong>گوٙگئل کئروم:</ strong>بأپوٙرنیت ری <em>Ctrl-Shift-R</em> (<em>⌘-Shift-R</em> یا د ساموٙنە)\n* <strong>ئینتئرنئت ئکسپئلورئر:</strong> <em>Ctrl</em> نە ڤاداریت ئوٙسئ کئ می پوٙرنیت <em>ری کئلیت رئفرئش</em>،یا ڤاداشتیتە<em>Ctrl-F5</em>\n* <strong>اوپرا:</strong> ڤیرگە قام بییە د <em>أڤزاریا→ ئولأڤی یأتیانە پاکسا بأکیت</em>",
+	"usercssyoucanpreview": "<strong>چی ڤأرتیە گئر:</strong>  دوگمە\"{{int:showpreview}}\" سی ئزماشت کاری سی ئس ئس تازە دئما ئمایە کاری ڤئ کار بئیریت.",
+	"userjsyoucanpreview": "<strong>چی ڤأرتیە گئر:</strong>  دوگمە\"{{int:showpreview}}\" سی ئزماشت کاری جاڤا ئسکئریپت تازە دئما ئمایە کاری ڤئ کار بئیریت.",
+	"usercsspreview": "<strong>د ڤیر داشتوٙئیت کئ شوما فأقأط می توٙنیت سی ئس ئس کاریاری توٙنە پیش سئیل بأکیت. ڤئ ئیسئنی ئمایە نأبییە!</strong>",
+	"userjspreview": "<strong>د ڤیر داشتوٙئیت کئ شوما فأقأط می توٙنیت جاڤا ئسکئریپت کاریاری توٙنە پیش سئیل بأکیت. ڤئ ئیسئنی ئمایە نأبییە!</strong>",
+	"sitecsspreview": "<strong>د ڤیر داشتوٙئیت کئ شوما فأقأط می توٙنیت ئی سی ئس ئس کاریاری توٙنە پیش سئیل بأکیت. ڤئ ئیسئنی ئمایە نأبییە!</strong>",
+	"sitejspreview": "<strong>د ڤیر داشتوٙئیت کئ شوما فأقأط می توٙنیت ئی جاڤا ئسکئریپت کاریاری توٙنە پیش سئیل بأکیت. ڤئ ئیسئنی ئمایە نأبییە!</strong>",
+	"userinvalidcssjstitle": "<strong>زئنار:</strong> پوٙسە \"$1\" نیئش.\nسی ئس ئس جاڤأنە و بألگە یا جاڤا ئسکئریپت سأربألگ ڤا حأرفیا کوچئک نە ڤئ کار گئرئتە، ھأمچئنی {{ns:کاریار}}:فو/ڤئکتور.سی ئس ئس چی د ری ڤئ ری {{ns:کاریار}}:فو/ڤئکتور. سی ئس ئسە.",
 	"updated": "(ڤئ هئنگوم سازی بییە)",
 	"note": "'''نیسأنئن:'''",
-	"previewnote": "فقط ای پیش سیل د ویرتو با.\nآلشتیاتو هنی اماییه نبیه.",
+	"previewnote": "فأقأط ئی پیش سئیل د ڤیرتوٙ با.\nآلئشت کاریاتوٙ ھأنی ئمایە نأبینە",
 	"continue-editing": "رو د راساگە ڤیرایئشت کاری",
-	"previewconflict": "ورگشت پیش سیل د نیسسه د راساگه وارو ویرایشت چی شکل دیار بیین بوئه ار شما وه نه سی اماییه کردن انتخاو بکیت.",
-	"session_fail_preview": "<strong>د بدبختی ما سی یه که رسینه یا جلسه مونه د دس دئیمه نمی تونیم کار پردازشت ویرایشت شمانه انجوم بیئمو.</strong>\nلطفن هنی تلاش بکیت.\nار هنی کار وه دروس کار نکرد،[[Special:UserLogout|اومائن وه در]] نه ازمایشت بکیت و د نو بیایت وامین.",
-	"session_fail_preview_html": "<strong>د بدبختی ما سی یه که رسینه یا جلسه مونه د دس دئیمه نمی تونیم کار پردازشت ویرایشت شمانه انجوم بیئمو.</strong>\nلطفن هنی تلاش بکیت.\n\n<em>سی یه که {{نوم دیارگه}} یه گل ردیف اچ تی ام ال کنشتگر بیه داره، پیش سیل سی یه که د دس حمله یا جاوا اسکریپ د امون با قام کرده بیه..</em>\n\n<strong>ار وه گات قانونی تلاش سی ویرایشته،لطفا د نو تلاش بکیت.</strong>\nار هنی کار وه دروس کار نکرد،[[Special:UserLogout|اومائن وه در]] نه ازمایشت بکیت و د نو بیایت وامین.",
-	"token_suffix_mismatch": "<strong>ویرایشتیا شما سی یه که دووارته نئر شما نیسسه یا نقطه نیائن نه د رازینه امنیتی ویرایشت د یک تیچسه.</strong>\nویرایشت سی یه که د خراو بیئن نیسسه بلگه نهاگری با رد بیه.\nای رخ ون د گاتیایی پیش میا که شما د یه گل رسینه جا پروکسی استفاده می کیت.",
-	"edit_form_incomplete": "<strong>پاره ای د ویرایشتا وه رسینه جا نمی رسن، هنی وارسی بکیت سی یه که بوینیت ویرایشتیا شما خوئه و هنی تلاش بکیت .</strong>",
+	"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>",
 	"editing": "د حال و بال ڤیرایئشت $1",
 	"creating": "راس کئردئن $1",
 	"editingsection": "د حال و بال ڤیرایئشت $1 (بأرجا$1)",
 	"editingcomment": "د حال و بال ڤیرایئشت $1 (بأرجا تازە)",
 	"editconflict": "ری ڤئ ری کاری د ڤیرایئشت: $1",
-	"explainconflict": "داوسه که شما شرو د ویرایشت ای بلگه کردیته، یه نفر هنی ای بلگه نه آلشت دئه.\nراساگه وارو نیسسه بلگه نیسسه نه چی یه که وجود داشتوه د ور میئره.\nآلشتیا شما د نیسسه هاری نشو دئه هئ.\nشما با آلشتیاتونه د نیسسه که هئش یکی بکید.\nفقط متنی که ها د رو د گاتی که شما\"{{رقم:اماییه کاری گوتار}}\" نه گزارشت می کید اماییه بوئه",
+	"explainconflict": "د گاتی کئ شوما شوروٙ د ڤیرایئشت کاری د بألگە کئردیتە، یئ کأس ھأنی ئی بألگە نئ آلئشت دئە.\nراساگە ڤارو نیسئسە بألگە، نیسئسە نە چی یە کئ ڤوجوٙد داشتوٙە د ڤأر گئرئتە.\nآلئشتکاریا شوم د نیسئسە ھاری دیاری میکە.\nشوما بایأد آلئشت کاریاتوٙنە د نیسئسە یی کئ ھیش سأریأک بأکیت.\nفأقأط نیسئسە یی کئ ھا د ڤارو د گاتی کئ شوما\"{{int:savearticle}}\" نە گوزارئشت میکیت ئمایە بوٙە.",
 	"yourtext": "نیسئسە شوما",
 	"storedversion": "ڤانئیأری ئمایە بییە",
-	"nonunicodebrowser": "<strong>زئنار:دووارته نئر شما وا نیسسه یا یونیکد سازگاری ناره.</strong>\nیه گل راحل وه کار گرته بیه سی یه که شما بلگه یا نه وا امنیت ویرایشت بکیت:\nنیسه یا غیر-ASCII  د پایه رازینه یا 16 تایی دتو نشو دئه بوئه.",
-	"editingold": "<strong>زئنار:شما داریت یه گل وانئری نا به هنگوم بیه نه سی ای بلگه ویرایشت می کید</strong>\nار شما ونه اماییه بکیت،هر آلشتی که د اول سی ای وانئری انجوم بیه گم بوئه.",
+	"nonunicodebrowser": "<strong>د ڤیرئتوٙبا:دوڤارتە نیأر شوما ڤا نیسئسە یا یوٙنیکود سازئگاری نارە.</strong>\nیئ گئل را حأل ڤئ کار گئرئتئ بییە سی یە کئ شوما بألگە یا نە ڤا أمنیأت ڤیرایئشت بأکیت:\nنیسئسە یا غئر-ASCII  د پایە رازینە یا 16 تایی سی توٙ دیاری میکە.",
+	"editingold": "<strong>د ڤیرئتوٙ با:شوما داریت یئ گئل ڤانئیأری ڤئ ھئنگوم نأبییە نە سی ئی بألگە ڤیرایئشت کاری میکید.</strong>\nأر شوما ڤئنە ئمایە بأکیت، ھأر آلئشت کاری کئ د أڤأل سی ئی ڤانئیأری أنجوم بییە نادیار موٙە.",
 	"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آخرین سیائه سی سرچشمه یا د هار اماییه کاری بیه:",
+	"copyrightwarning": "لوطف بأکیت د ڤیر داشتوٙئیت کئ ئیچئ فأرض یأنە کئ ھأمە ھومیاریا شوما ڤا{{SITENAME}} د حال و بال «$2» دأرتیچ بوٙە(سی چیا تئر روئیت د $1).\nأر نئمیھایت کئ نیسئسە یا توٙ کئ فئرە ڤیرایئشت کاری بیینە و دئلحا دأرتیچ بان، د ئیچئ کئلئشوٙ نأکیت.<br />\nھأمچئنی شوما داریت ڤئ ئیما قول مئیت کئ خوتوٙ ڤئنوٙنە نیسأنیتە، یا ڤئنە د ڤئنوٙنە د یئ گئل سأرچئشمە آزاد ڤا بأرکئرد ھأمأگوٙنی یا چیایی چی ڤئ گئرتیتە.\n'''آرئنگیایی کئ صئلا دأرتیچئسئن (copyright) ھا دئشوٙ بی صئلا کئل نأکیت!'''",
+	"copyrightwarning2": "لوطف بأکیت د ڤیر داشتوٙئیت کئ ئیچئ فأرض یأنە کئ ھأمە ھومیاریا شوما ڤا{{SITENAME}} د حال و بال «$2» دأرتیچ بوٙە(سی چیا تئر روئیت د $1).\nأر نئمیھایت کئ نیسئسە یا توٙ کئ فئرە ڤیرایئشت کاری بیینە و دئلحا دأرتیچ بان، د ئیچئ کئلئشوٙ نأکیت.<br />\nھأمچئنی شوما داریت ڤئ ئیما قول مئیت کئ خوتوٙ ڤئنوٙنە نیسأنیتە، یا ڤئنە د ڤئنوٙنە د یئ گئل سأرچئشمە آزاد ڤا بأرکئرد ھأمأگوٙنی یا چیایی چی ڤئ گئرتیتە.\n'''آرئنگیایی کئ صئلا دأرتیچئسئن (copyright) ھا دئشوٙ بی صئلا کئل نأکیت!'''",
+	"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آخرین پهرستنومه دئه بیه سی سرچشمه دئن نهااماییه بیه:",
@@ -654,7 +655,7 @@
 	"recreate-moveddeleted-warn": "'''زنهار شما بلگه ای که وادما پاکسا بیه هنی راس کردیته'''\nشما باید دونسه بایت که آیا هنی سی نها گرتن ویرایشت ای بلگه خوئه.\nپاکسا بیئن و جمشت سی ای بلگه سی فراغتتو آماده بیه:",
 	"moveddeleted-notice": "ای بلگه پاکسا بیه.\nپاکسا بین و جمشت ای بلگه سی سرچشمه دئین آماده بیه",
 	"log-fulllog": "دیئن هأمە پئهئرستنوٙمە یا",
-	"edit-hook-aborted": "ویرایشت وا قلاو نهاگری بیه.\nهیچ توضیئ سیش نئ.",
+	"edit-hook-aborted": "ڤیرایئشت ڤا قولاڤ نئھاگئری بییە.\nھیچ توضیی سیش نی.",
 	"edit-gone-missing": "نبوئه ای بلگه نه وه هنگوم بکیت.\nوه نظر میا که وه پاکسا بیه.",
 	"edit-conflict": "ری ڤئ ری کاری د ڤیرایئشت.",
 	"edit-no-change": "سی یه که آلشتیا د یه گل نیسسه دروس بیه د ویرایشت شما تیه پوشی بیه.",
@@ -664,17 +665,17 @@
 	"edit-already-exists": "نبوئه یه گل بلگه تازه راس بکید.\nوه هئیش.",
 	"defaultmessagetext": "نیسسه پیغوم پیش فرض",
 	"content-failed-to-parse": "د یک تیچیسن چیا مئن $2 د مدل $1:$3",
-	"invalid-content-data": "دنسمنی مینونه نامعتور",
+	"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-wikitext": "ڤیکی نیسئسە",
+	"content-model-text": "نیسئسە سادە",
+	"content-model-javascript": "جاڤا ئسکئریپت",
 	"content-model-css": "سی اس اس",
-	"content-json-empty-object": "سرتال حالی",
-	"content-json-empty-array": "آرایه حالی",
+	"content-json-empty-object": "داسوٙن حالی",
+	"content-json-empty-array": "آرایە حالی",
 	"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 واحونیا}}ئه.",
@@ -704,7 +705,7 @@
 	"cantcreateaccounttitle": "نبوئه حساو راس بکید",
 	"cantcreateaccount-text": "حساو دروس بیه و ا ای تیرنشون آی پی(<strong>$1</strong>) وه دس ای [[کاریار:$3|$3]] قلف بیه.\n\n\nدلیل دئه بیه وا $3 ها د<em>$2</em>",
 	"cantcreateaccount-range-text": "حساو دروس بیه وا تیرنشون آی پی که د پوشینه '''$1''' ، که وه ئم مینونه دار تیرنشون آی پی شما ئم هئ('''$4''')، وه دس [[کاریار:$3|$3]]قلف بیه.\n\nدلیل دئه بیه وا $3، \"$2\" ئه.",
-	"viewpagelogs": "سی ای بلگه بوینتو.",
+	"viewpagelogs": "سئیل پئرئستنوٙمە یا ئی بألگە بأکیت",
 	"nohistory": "هیچ ویرگار ویرایشتی د ای بلگه نئ.",
 	"currentrev": "آخرین دوواره دیئن",
 	"currentrev-asof": "آخري وانئری چی $1",
@@ -792,8 +793,8 @@
 	"revdelete-concurrent-change": "خطا د قام کردن چیی که ها د ویرگار $2 ساعت $1: وه ویر و باور میا که د او گاتی که شما سی آلشت دئن حال و بار وه سعی می کردیته، حال و بارش وه دس کسی تر آلشت دئه بیه.\nلطفن پهرستنومه یا نه وارسی بکیت.",
 	"revdelete-only-restricted": "خطا د قام کردن چیی که ها د ویرگار $2 ساعت $1: شما نیمی تونیت چیانه د ورتیه دیوونداریا قام بکیتو مر یه که یه گل د گزینه یا دیاری کردن هنی نه انتخاو بکیت.",
 	"revdelete-reason-dropdown": "*دلیلیا جاونه سی پاکسا کردن\n** تیه پوشی د حق درتیچ کردن\n** ویر و باور یا دونسمنیا شخصی نامناسو\n** نوم کاریاری نامناسو\n** دونسمنیا فره تنادار",
-	"revdelete-otherreason": "دلیل هنی:",
-	"revdelete-reasonotherlist": "دلیل هنی",
+	"revdelete-otherreason": "دألیل ھأنی:",
+	"revdelete-reasonotherlist": "دألیل ھأنی",
 	"revdelete-edit-reasonlist": "دلیلیا پاکسا کردنه نه ویرایشت بکید",
 	"revdelete-offender": "نیسنه وانیری:",
 	"suppressionlog": "پهرستنومه پاکساگری",
@@ -871,7 +872,7 @@
 	"search-interwiki-more": "(بیشتر)",
 	"search-relatedarticle": "مرتوط",
 	"searchrelated": "مرتوط",
-	"searchall": "همه",
+	"searchall": "ھأمە",
 	"showingresults": "نمائشت بیشترونه {{PLURAL:$1|'''۱''' نتیجه|'''$1''' نتیجه}} د هار، شرو د شماره'''$2'''.",
 	"showingresultsinrange": "نمائشت بیشترونه {{PLURAL:$1|'''۱''' نتیجه|'''$1''' نتیجه}} د هار، شرو د شماره'''$2''' تا شماره '''$3'''.",
 	"search-showingresults": "{{PLURAL:$4|نتیجه یا<strong>$1</strong> د <strong>$3</strong>|نتیجه یا<strong>$1 - $2</strong د <strong>$3</strong>}}",
@@ -916,7 +917,7 @@
 	"saveprefs": "ئمایە کئردئن",
 	"restoreprefs": "د نو زنه کردن همه میزونکاریا پیش فرض(د همه جایا)",
 	"prefs-editing": "د حال و بال ڤیرایئشت",
-	"rows": "رديفيا:",
+	"rows": "رأگیا:",
 	"columns": "ستينا:",
 	"searchresultshead": "پئی جوٙری",
 	"stub-threshold": "آستونه ویرایشتیا د یک دیسسه<a href=\"#\" class=\"stub\">ناقص</a> (بایت):",
@@ -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": "بلگه یا هاری وه زون نسقه یا زونا تر هوم پیوند نبیه.",
@@ -1706,7 +1707,6 @@
 	"emailuser": "ای كارور نه ايميل كو",
 	"emailuser-title-target": "ایمیل سی ای {{GENDER:$1|کارور}}",
 	"emailuser-title-notarget": "أنجومانامە کاریار",
-	"emailpage": "أنجومانامه کاریار",
 	"emailpagetext": "شما می تونیت  نوم بلگه هار نه سی کل کردن یه گل انجومانامه وه ای  {{GENDER:$1|کاریار}} وه کار بئیرت.\nتیرنشون انجومانامه یی که د [[Special:Preferences|ترجیحات کاریارتو]] دئیه ته د تیرنشون کلکار انجومانامه میا، سی یه که گیرنه بتونه جواوش بیه.",
 	"defemailsubject": "{{نوم سیل جا}} ایمیل د کارور \"$1\"",
 	"usermaildisabled": "ایمیل کارور د کار افتائه",
@@ -1864,7 +1864,7 @@
 	"minimum-size": "انازه کمترونه",
 	"maximum-size": "انازه بیشترونه",
 	"pagesize": "(بایتیا)",
-	"restriction-edit": "ويرايشت",
+	"restriction-edit": "ڤیرایئشت",
 	"restriction-move": "جاوه جا بوئيت",
 	"restriction-create": "راس كردن",
 	"restriction-upload": "سوار کرد",
@@ -2333,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": "نشو دئن سرون",
@@ -2876,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 7900e30f2d..cda64a9b36 100644
--- a/languages/i18n/lt.json
+++ b/languages/i18n/lt.json
@@ -451,6 +451,7 @@
 	"createacct-benefit-body2": "{{PLURAL:$1|puslapis|puslapiai}}",
 	"createacct-benefit-body3": "Neseni {{PLURAL:$1|autorius|autoriai|autorių}}",
 	"badretype": "Įvesti slaptažodžiai nesutampa.",
+	"usernameinprogress": "Profilio kūrimas šiam naudotojo vardui jau vyksta.\nPrašome palaukti.",
 	"userexists": "Įvestasis naudotojo vardas jau naudojamas.\nPrašome pasirinkti kitą vardą.",
 	"loginerror": "Prisijungimo klaida",
 	"createacct-error": "Paskyros kūrimo klaida",
@@ -541,7 +542,7 @@
 	"passwordreset-emailtitle": "Paskyros informacija apie {{sitename}}",
 	"passwordreset-emailtext-ip": "Kažkas (tikriausiai jūs, IP adresu $1) paprašė priminti jūsų slaptažodį svetainėje {{SITENAME}} ($4). Šio naudotojo {PLURAL:$3|paskyra|paskyros}} yra susietos su šiuo elektroninio pašto adresu:\n\n$2\n\n{{PLURAL:$3|Šis laikinas slaptažodis |Šie laikini slaptažodžiai}} baigs galiot po {{PLURAL:$5|vienos dienos|$5 dienų}}. \n\nJūs turėtumėte prisijungti ir pasirinkti naują slaptažodį. Jei kažkas kitas padarė šį prašymą arba jūs prisiminėte savo pirminį slaptažodį, ir jums nebereikia jo pakeisti, galite ignoruoti šį pranešimą ir toliau naudotis savo senuoju slaptažodžiu.",
 	"passwordreset-emailtext-user": "Naudotojas $1 svetainėje {{SITENAME}} sukūrė užklausą slaptažodžio priminimui svetainėje {{SITENAME}}\n($4). Šio naudotojo {{PLURAL:$3|paskyra|paskyros}} susieto su šiuo elektroniniu paštu $2. \n\n{{PLURAL:$3|Šis laikinas slaptažodis|Šie laikini slaptažodžiai}} baigs galioti po {{PLURAL:$5|vienos dienos|$5 dienų}}. Jūs turėtumėte prisijungti ir pasirinkti naują slaptažodį. Jei kažkas padarė tai be jūsų žinios arba jūs prisiminėte savo pirminį slaptažodį, ir jūs nebenorite jo pakeisti, galite ignoruoti šį pranešimą ir toliau naudotis savo senuoju slaptažodžiu.",
-	"passwordreset-emailelement": "Naudotojo vardas: $1\nLaikinas slaptažodis: $2",
+	"passwordreset-emailelement": "Naudotojo vardas: \n$1\n\nLaikinas slaptažodis: \n$2",
 	"passwordreset-emailsent": "Slaptažodžio priminimo laiškas buvo išsiųstas.",
 	"passwordreset-emailsent-capture": "Slaptažodžio priminimo laiškas bus išsiųstas, toks koks parodytas.",
 	"passwordreset-emailerror-capture": "Priminimo elektroninis laiškas buvo sukurtas, toks, koks parodytas žemiau, bet pasiuntimas naudotojui buvo nesėkmingas: $1",
@@ -940,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ų}})",
@@ -1742,7 +1744,6 @@
 	"emailuser": "Rašyti laišką šiam naudotojui",
 	"emailuser-title-target": "Siųsti E-pašto žinutę {{GENDER:$1|user}}",
 	"emailuser-title-notarget": "El. pašto vartotojas",
-	"emailpage": "Siųsti el. laišką naudotojui",
 	"emailpagetext": "Jūs galite pasinaudoti šiuo pavyzdžiu, norėdami nusiųsti elektroninį laišką šiam naudotojui.\nElektroninio pašto adresas, kurį įvedėte [[Special:Preferences|savo naudotojo nustatymuose]], bus rodomas kaip el. pašto siuntėjo adresas, tam, kad gavėjas galėtų jums iškart atsakyti.",
 	"defemailsubject": "{{SITENAME}} el. pašto iš vartotojo \" $1 \"",
 	"usermaildisabled": "Naudotojo elektroninis paštas išjungtas",
@@ -1764,7 +1765,7 @@
 	"emailccsubject": "Laiško kopija naudotojui $1: $2",
 	"emailsent": "El. laiškas išsiųstas",
 	"emailsenttext": "Jūsų el. pašto žinutė išsiųsta.",
-	"emailuserfooter": "Šis el. laiškas buvo išsiųstas naudotojo $1 naudotojui $2 naudojant „{{int:emailpage}}“ funkciją {{SITENAME}}.",
+	"emailuserfooter": "Šis el. laiškas buvo išsiųstas naudotojo $1 naudotojui $2 naudojant „{{int:emailuser}}“ funkciją {{SITENAME}}.",
 	"usermessage-summary": "Paliekamas sistemos pranešimas.",
 	"usermessage-editor": "Sistemos pranešėjas",
 	"watchlist": "Stebimų sąrašas",
@@ -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ą",
@@ -3185,6 +3186,7 @@
 	"logentry-newusers-create2": "Vartotojo paskyra $3 buvo {{GENDER:$2|sukurta}} $1",
 	"logentry-newusers-byemail": "Vartotojo paskyra $3 buvo {{GENDER:$2|sukurta}} $1 ir slaptažodis išsiųstas el. paštu",
 	"logentry-newusers-autocreate": "Vartotojo paskyra $1 buvo {{GENDER:$2|sukurta}} automatiškai",
+	"logentry-protect-move_prot": "$1 {{GENDER:$2|perkėlė}} apsaugos nustatymus iš $4 į $3",
 	"logentry-rights-rights": "$1 {{GENDER:$2|pakeitė}} grupės narystę $3 iš $4 į $5",
 	"logentry-rights-rights-legacy": "$1 {{GENDER:$2|pakeista}} narystė grupėje $3",
 	"logentry-rights-autopromote": "$1 buvo automatiškai {{GENDER:$2|pervestas}} iš $4 į $5",
diff --git a/languages/i18n/lus.json b/languages/i18n/lus.json
index 1513f00eaf..fa8e3aabca 100644
--- a/languages/i18n/lus.json
+++ b/languages/i18n/lus.json
@@ -391,7 +391,7 @@
 	"passwordreset-domain": "Huamchin:",
 	"passwordreset-email": "E-chenhmun:",
 	"passwordreset-emailtitle": "{{SITENAME}}-a siangchan chanchin kim",
-	"passwordreset-emailelement": "Hmangtuhming: $1\nThurûk lailâwk: $2",
+	"passwordreset-emailelement": "Hmangtuhming: \n$1\n\nThurûk lailâwk: \n$2",
 	"passwordreset-emailsent": "Hriat nawntirna e-lehkha thawn fel a ni.",
 	"passwordreset-emailsent-capture": "Hriat nawntirna e-lehkha thawn a ni, a hnuaia tarlan ang khuan.",
 	"passwordreset-emailerror-capture": "Hriat nawntirna e-lehkha siam chhuah a ni a, a hnuaia tarlan ang khuan; mahsé thawn hlawhchham a ni: $1",
diff --git a/languages/i18n/lv.json b/languages/i18n/lv.json
index 6f61e3b8ea..1d8f1851d2 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",
@@ -87,42 +87,42 @@
 	"thu": "Ce",
 	"fri": "Pk",
 	"sat": "Se",
-	"january": "janvārī,",
-	"february": "februārī,",
-	"march": "martā,",
-	"april": "aprīlī,",
-	"may_long": "maijā,",
-	"june": "jūnijā,",
-	"july": "jūlijā,",
-	"august": "augustā,",
-	"september": "septembrī,",
-	"october": "oktobrī,",
-	"november": "novembrī,",
-	"december": "decembrī,",
-	"january-gen": "Janvāra",
-	"february-gen": "Februāra",
-	"march-gen": "Marta",
-	"april-gen": "Aprīļa",
-	"may-gen": "Maija",
-	"june-gen": "JÅ«nija",
-	"july-gen": "JÅ«lija",
-	"august-gen": "Augusta",
-	"september-gen": "Septembra",
-	"october-gen": "Oktobra",
-	"november-gen": "Novembra",
-	"december-gen": "Decembra",
-	"jan": "janvārī,",
-	"feb": "februārī,",
-	"mar": "martā,",
-	"apr": "aprīlī,",
-	"may": "maijā,",
-	"jun": "jūnijā,",
-	"jul": "jūlijā,",
-	"aug": "augustā,",
-	"sep": "septembrī,",
-	"oct": "oktobrī,",
-	"nov": "novembrī,",
-	"dec": "decembrī,",
+	"january": "janvāris",
+	"february": "februāris",
+	"march": "marts",
+	"april": "aprīlis",
+	"may_long": "maijs",
+	"june": "jūnijs",
+	"july": "jūlijs",
+	"august": "augusts",
+	"september": "septembris",
+	"october": "oktobris",
+	"november": "novembris",
+	"december": "decembris",
+	"january-gen": "janvāra",
+	"february-gen": "februāra",
+	"march-gen": "marta",
+	"april-gen": "aprīļa",
+	"may-gen": "maija",
+	"june-gen": "jūnija",
+	"july-gen": "jūlija",
+	"august-gen": "augusta",
+	"september-gen": "septembra",
+	"october-gen": "oktobra",
+	"november-gen": "novembra",
+	"december-gen": "decembra",
+	"jan": "janvāris",
+	"feb": "februāris",
+	"mar": "marts",
+	"apr": "aprīlis",
+	"may": "maijs",
+	"jun": "jūnijs",
+	"jul": "jūlijs",
+	"aug": "augusts",
+	"sep": "septembris",
+	"oct": "oktobris",
+	"nov": "novembris",
+	"dec": "decembris",
 	"january-date": "$1. janvāris",
 	"february-date": "$1. februāris",
 	"march-date": "$1. marts",
@@ -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",
@@ -349,7 +349,7 @@
 	"title-invalid-talk-namespace": "Pieprasītais lapas nosaukums norāda uz diskusijas lapu, kas nevar pastāvēt.",
 	"title-invalid-characters": "Pieprasītais lapas nosaukums satur nederīgus simbolus: \"$1\".",
 	"perfcached": "Šie dati ir no servera kešatmiņas un var būt novecojuši. A maximum of {{PLURAL:$1|one result is|$1 results are}} available in the cache.",
-	"perfcachedts": "Šie dati ir no servera kešatmiņas (''cache''), kas pēdējo reizi bija atjaunota $1. A maximum of {{PLURAL:$4|one result is|$4 results are}} available in the cache.",
+	"perfcachedts": "Šie dati ir no servera kešatmiņas (''cache''), kas pēdējo reizi bija atjaunota $1. Kešatmiņā {{PLURAL:$4|pieejami|pieejams|pieejami}} ne vairāk kā {{PLURAL:$4|$4 rezultāti|viens rezultāts|$4 rezultāti}}.",
 	"querypage-no-updates": "Šīs lapas atjaunošana pagaidām ir atslēgta. Te esošie dati tuvākajā laikā netiks atjaunoti.",
 	"viewsource": "Aplūkot kodu",
 	"viewsource-title": "Apskatīt $1 izejas kodu",
@@ -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",
@@ -498,7 +498,7 @@
 	"passwordreset-capture": "Apskatīt izveidoto e-pastu?",
 	"passwordreset-email": "E-pasta adrese:",
 	"passwordreset-emailtitle": "Konta informācija {{SITENAME}}",
-	"passwordreset-emailelement": "Lietotājvārds: $1\nPagaidu parole: $2",
+	"passwordreset-emailelement": "Lietotājvārds: \n$1\n\nPagaidu parole: \n$2",
 	"passwordreset-emailsent": "Paroles atiestatīšanas e-pasts ir nosūtīts.",
 	"passwordreset-emailsent-capture": "Atgādinājuma e-pasta ziņojums ir nosūtīts, tas parādīts zemāk.",
 	"passwordreset-emailerror-capture": "Atgādinājuma e-pasta ziņojums tika izveidots, tas parādīts zemāk, bet nosūtīšana lietotājam neizdevās: $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",
@@ -557,17 +557,17 @@
 	"accmailtitle": "Parole nosūtīta.",
 	"accmailtext": "Nejauši ģenerēta parole lietotājam [[User talk:$1|$1]] tika nosūtīta uz $2.\n\nŠī konta paroli pēc ielogošanās varēs nomainīt ''[[Special:ChangePassword|šeit]]''.",
 	"newarticle": "(Jauns raksts)",
-	"newarticletext": "Tu šeit nonāci sekojot saitei uz, pagaidām vēl neuzrakstītu, lapu.\nLai izveidotu lapu, sāc rakstīt teksta logā apakšā (par teksta formatēšanu un sīkākai informācija skatīt [$1 palīdzības lapu]).\nJa tu šeit nonāci kļūdas pēc, vienkārši uzspied '''back''' pogu pārlūkprogrammā.",
+	"newarticletext": "Šajā projektā vēl nav lapas ar šādu nosaukumu.\nLai izveidotu lapu, sāc rakstīt teksta logā apakšā (par teksta formatēšanu un sīkākai informācija skatīt [$1 palīdzības lapu]).\nJa tu šeit nonāci kļūdas pēc, vienkārši uzspied <strong>back</strong> pogu pārlūkprogrammā.",
 	"anontalkpagetext": "----''Šī ir diskusiju lapa anonīmam lietotājam, kurš vēl nav kļuvis par reģistrētu lietotāju vai arī neizmanto savu lietotājvārdu. Tādēļ mums ir jāizmanto skaitliskā IP adrese, lai viņu identificētu.\nŠāda IP adrese var būt vairākiem lietotājiem.\nJa tu esi anonīms lietotājs un uzskati, ka tev ir adresēti neatbilstoši komentāri, lūdzu, [[Special:UserLogin/signup|kļūsti par lietotāju]] vai arī [[Special:UserLogin|izmanto jau izveidotu lietotājvārdu]], lai izvairītos no turpmākām neskaidrībām un tu netiktu sajaukts ar citiem anonīmiem lietotājiem.''",
 	"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.",
@@ -779,6 +779,7 @@
 	"searchrelated": "saistītais",
 	"searchall": "viss",
 	"showingresults": "Šobrīd ir {{PLURAL:$1|redzamas|redzama|redzamas}} '''$1''' {{PLURAL:$1|lapas|lapa|lapas}}, sākot ar #'''$2'''.",
+	"showingresultsinrange": "Tiek {{PLURAL:$1|rādīti <strong>$1</strong> rezultāti|rādīts <strong>1</strong> rezultāts|rādīti <strong>$1</strong> rezultāti}} no <strong>$2</strong>. līdz <strong>$3</strong>. rezultātam.",
 	"search-nonefound": "Nav atrasti pieprasījumam atbilstoši rezultāti.",
 	"powersearch-legend": "Izvērstā meklēšana",
 	"powersearch-ns": "Meklēt šajās lapu grupās:",
@@ -795,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",
@@ -820,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}}",
@@ -843,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",
@@ -902,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",
@@ -932,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",
@@ -956,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",
@@ -979,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",
@@ -1011,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",
@@ -1019,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}}",
@@ -1045,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",
@@ -1057,8 +1059,6 @@
 	"rcshowhidemine": "$1 manus",
 	"rcshowhidemine-show": "Rādīt",
 	"rcshowhidemine-hide": "Slēpt",
-	"rcshowhidecategorization-show": "Rādīt",
-	"rcshowhidecategorization-hide": "Paslēpt",
 	"rclinks": "Parādīt pēdējās $1 izmaiņas pēdējās $2 dienās.<br />$3",
 	"diff": "izmaiņas",
 	"hist": "hronoloģija",
@@ -1067,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",
@@ -1415,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:",
@@ -1456,7 +1456,6 @@
 	"emailuser": "Sūtīt e-pastu šim lietotājam",
 	"emailuser-title-target": "Nosūtīt e-pastu {{GENDER:$1|šim lietotājam|šai lietotājai}}",
 	"emailuser-title-notarget": "Sūtīt e-pastu lietotājam",
-	"emailpage": "Sūtīt e-pastu lietotājam",
 	"emailpagetext": "Ar šo veidni ir iespējams nosūtīt e-pastu šim {{GENDER:$1|lietotājam}}.\nTā e-pasta adrese, kuru tu esi norādījis [[Special:Preferences|savā izvēļu lapā]], parādīsies e-pasta \"From\" lauciņā, tādejādi saņēmējs varēs tev atbildēt.",
 	"defemailsubject": "{{SITENAME}} e-pasts no lietotāja \"$1\"",
 	"usermaildisabled": "Lietotāja e-pasts atslēgts",
@@ -1507,7 +1506,7 @@
 	"enotif_impersonal_salutation": "{{SITENAME}} lietotājs",
 	"enotif_lastvisited": "$1 lai apskatītos visas izmaiņas kopš tava pēdējā apmeklējuma.",
 	"enotif_lastdiff": "$1 lai apskatītos šo izmaiņu.",
-	"enotif_anon_editor": "anonīms lietotājs $1",
+	"enotif_anon_editor": "anonīms dalībnieks $1",
 	"enotif_body": "$WATCHINGUSERNAME,\n\n\n{{grammar:ģenitīvs|{{SITENAME}}}} lapu $PAGETITLE $CHANGEDORCREATED $PAGEEDITOR, $PAGEEDITDATE, pašreizējā versja ir $PAGETITLE_URL.\n\n$NEWPAGE\n\nIzmaiņu kopsavilkums bija: $PAGESUMMARY $PAGEMINOREDIT\n\nSazināties ar attiecīgo lietotāju:\ne-pasts: $PAGEEDITOR_EMAIL\nwiki: $PAGEEDITOR_WIKI\n\nJa šo uzraugāmo lapu izmainīs vēl, turpmāku paziņojumu par to nebūs, kamēr tu to neatvērsi.\nTu arī vari atstatīt visu uzraugāmo lapu paziņojumu statusus uzraugāmo lapu sarakstā.\n\n             {{grammar:ģenitīvs|{{SITENAME}}}} paziņojumu sistēma\n\n--\nLai izmainītu uzraugāmo lapu saraksta uzstādījumus:\n{{canonicalurl:{{#special:EditWatchlist}}}}\n\nLai dzēstu lapu no uzraugāmo lapu saraksta:\n$UNWATCHURL\n\nPapildinformācija:\n$HELPPAGE",
 	"created": "izveidoja",
 	"changed": "izmainīja",
@@ -1633,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.",
@@ -1644,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",
@@ -1963,8 +1962,8 @@
 	"lastmodifiedatby": "Šo lapu pēdējoreiz izmainīja $3, $2, $1.",
 	"othercontribs": "Balstototies uz $1 darbu.",
 	"others": "citi",
-	"siteusers": "{{SITENAME}} {{PLURAL:$2|lietotāju|lietotāja|lietotāju}} $1",
-	"anonusers": "{{SITENAME}} anonīma {{PLURAL:$2|lietotāju|lietotāja|lietotāju}} $1",
+	"siteusers": "{{SITENAME}} {{PLURAL:$2|dalībnieku|dalībnieka|dalībnieku}} $1",
+	"anonusers": "{{SITENAME}} anonīma {{PLURAL:$2|dalībnieku|dalībnieka|dalībnieku}} $1",
 	"creditspage": "Lapas autori",
 	"nocredits": "Šai lapa nav pieejama informācija par autoriem.",
 	"spamprotectiontitle": "Spama filtrs",
@@ -2548,6 +2547,7 @@
 	"feedback-cancel": "Atcelt",
 	"feedback-close": "Gatavs",
 	"feedback-dialog-title": "Iesniegt atsauksmes",
+	"feedback-error-title": "Kļūda",
 	"feedback-error1": "Kļūda: API neatpazīts rezultāts",
 	"feedback-error2": "Kļūda: Labojums neizdevās",
 	"feedback-error3": "Kļūda: Nav atbildes no API",
diff --git a/languages/i18n/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/mai.json b/languages/i18n/mai.json
index 6802243ac7..784fb94f96 100644
--- a/languages/i18n/mai.json
+++ b/languages/i18n/mai.json
@@ -536,7 +536,7 @@
 	"passwordreset-emailtitle": "लेखा विवरण {{अन्तर्जालक नाम}}",
 	"passwordreset-emailtext-ip": "कियो (सम्भवतः अहाँ, अन्तर्जाल सेवा कल्पक $1 सँ) अपन लेखा विवरणक पुनःस्मरणक लेल अनुरोध केलहुँ ऐ लेल {{ अन्तर्जालक नाम}} ($4). ई प्रयोक्ता {{PLURAL:$3|लेखा अछि| लेखा सभ अछि}}\nऐ ई-पत्र संकेतसँ सम्बन्धित:\n\n$2\n\n{{PLURAL:$3|ई अल्पकालक कूटशब्द| ई सभ अल्पकालक कूटशब्द}} खतम भऽ जाएत {{PLURAL:$5|एक दिन|$5 पाँच दिन}}.\nअहाँ सम्प्रवेश करू आ एकटा नव कूटशब्द चुनू।. जौं कियो आन ई आग्रह केने अछि, वा अहाँकेँ अपन पुरान कूटशब्द मोन पड़ि गेल अछि , आ आब एकरा बदलबाक इच्छा नै राखै छी तँ अहाँ ऐ संदेशकेँ बिसरि जाउ आ अपन पुरान कूटशब्दक प्रयोग करैत रहू।",
 	"passwordreset-emailtext-user": "प्रयोक्ता $1 {{अन्तर्जाल}} पर अहाँक खाता विवरणक {{SITENAME}} लेल फेरसँ ($4) आग्रह केने छथि। ई प्रयोक्ता {{PLURAL:$3|खाता अछि|खाता सभ अछि}} ऐ ई-पत्र संकेतसँ जुड़ल: $2\n{{PLURAL:$3| ई अस्थायी कूटशब्द|ई सभ अस्थायी कूटशब्द}} खतम भऽ जाएत {{PLURAL:$5|एक दिन|$5 दिन}} मे।\nअहाँ सम्प्रवेश करू आ एकटा नव कूटशब्द आब चुनू। जँ कियो दोसर ई आग्रह केने छथि, वा जँ अहाँकेँ अपन मूल कूटशब्द मोन पड़ि गेल अछि, आ अहाँ आब ओइ कूटशब्दकेँ नै बदलऽ चाहै छी, अहाँ ऐ संदेशकेँ बिसरि सकै छी आ अपन पुरान कूटशब्दक प्रयोग जारी राखि सकै छी।",
-	"passwordreset-emailelement": "प्रयोक्ता: $1\nअस्थायी कूटशब्द: $2",
+	"passwordreset-emailelement": "प्रयोक्ता: \n$1\n\nअस्थायी कूटशब्द: \n$2",
 	"passwordreset-emailsent": "एकटा ई-पत्र मोन पाड़बा लेल पठाओल गेल अछि।",
 	"passwordreset-emailsent-capture": "एकटा स्मरण ई-पत्र पठाएल गेल अछि, जे नीचाँ देखाएल अछि।",
 	"passwordreset-emailerror-capture": "एकटा स्मरण ई-पत्र बनाएल गेल अछि, जे नीचाँ देखाएल अछि, मुदा प्र्योक्ताकेँ एकरा पठेबाक प्रयास विफल भेल: $1",
@@ -1677,7 +1677,6 @@
 	"emailuser": "ऐ प्रयोक्ताकेँ ई-पत्र पठाउ",
 	"emailuser-title-target": "इ {{GENDER:$1|प्रयोक्ता}} के ई-पत्र भेजु।",
 	"emailuser-title-notarget": "ई-पत्र प्रयोक्ता",
-	"emailpage": "ई-पत्र प्रयोक्ता",
 	"emailpagetext": "अहाँक नीचाँक आवेदन-पत्र ऐ प्रयोक्ताकेँ ई-पत्र संदेश पठेबा लेल प्रयोग कऽ सकै छी।\nई-पत्र जे अहाँ [[Special:Preferences|your user preferences]] मे देलहुँ से ई-पत्र\"एतएसँ\" पतासँ देखाएत, से प्राप्तकर्ता सोझे अहाँकेँ उत्तर देबामे समर्थ हेताह।",
 	"defemailsubject": "{{जालस्थल}} प्रयोक्ता \"$1\" सँ ई-पत्र",
 	"usermaildisabled": "प्रयोक्ता ई-पत्र अशक्त",
diff --git a/languages/i18n/map-bms.json b/languages/i18n/map-bms.json
index 17aafd7a2f..ac5cb5b6f4 100644
--- a/languages/i18n/map-bms.json
+++ b/languages/i18n/map-bms.json
@@ -482,7 +482,6 @@
 	"passwordreset": "Tembung sandhi di-''reset''",
 	"passwordreset-text-one": "Kumpliti formulir kiye kanggo nyetel maning tembung sandhine Rika.",
 	"passwordreset-text-many": "{{PLURAL:$1|Isi salah siji kotak kanggo nyetel maning tembung sandhine Rika.}}",
-	"passwordreset-legend": "Tembung sandhi di-''reset''",
 	"passwordreset-disabled": "''Reset'' tembung sandhi wis dipateni nang wiki kiye.",
 	"passwordreset-emaildisabled": "Fitur imel wis dinonaktifna nang wiki kiye.",
 	"passwordreset-username": "Jeneng panganggo:",
@@ -491,7 +490,7 @@
 	"passwordreset-capture-help": "Angger Rika nyonteng kotak kiye, imel (sing isi tembung sandhi sauntara) bakal ditidokna maring Rika barengan karo dikirimna maring panganggo.",
 	"passwordreset-email": "Alamat imel:",
 	"passwordreset-emailtitle": "Detil akun nang {{SITENAME}}",
-	"passwordreset-emailelement": "Jeneng panganggo: $1\nTembung sandhi sauntara: $2",
+	"passwordreset-emailelement": "Jeneng panganggo: \n$1\n\nTembung sandhi sauntara: \n$2",
 	"passwordreset-emailsent": "Imel nggo nyetel maning tembung sandhi uwis dikirim.",
 	"passwordreset-emailsent-capture": "Imel kanggo nyetel maning tembung sandhi uwis dikirim, kaya sing ditidokna nang ngisor kiye.",
 	"passwordreset-emailerror-capture": "Imel nggo nyetel maning tembung sandhi uwis digawe, kaya sing ditidokna nang ngisor kiye, ningen gole ngirim maring {{GENDER:$2|panganggo}} ora teyeng: $1",
@@ -504,7 +503,6 @@
 	"changeemail-password": "Tembung sandhi {{SITENAME}} Rika:",
 	"changeemail-submit": "Ganti imel",
 	"resettokens-no-tokens": "Ora ana token sing arep disetel maning.",
-	"resettokens-legend": "Nyetel maning token",
 	"resettokens-token-label": "$1 (biji sekiye:$2)",
 	"resettokens-done": "Token wis disetel maning.",
 	"resettokens-resetbutton": "Nyetel maning token sing dipilih",
@@ -1086,7 +1084,6 @@
 	"nlinks": "$1 {{PLURAL:$1|pranala|pranala}}",
 	"nmembers": "$1 {{PLURAL:$1|isi|isi}}",
 	"nrevisions": "$1 {{PLURAL:$1|revisi|revisi}}",
-	"nviews": "Wis ping $1 {{PLURAL:$1|dideleng|dideleng}}",
 	"nimagelinks": "Digunakna nang $1 {{PLURAL:$1|kaca|kaca}}",
 	"ntransclusions": "digunakna nang $1 {{PLURAL:$1|kaca|kaca}}",
 	"specialpage-empty": "Ora ana sing perlu dilaporna.",
diff --git a/languages/i18n/mg.json b/languages/i18n/mg.json
index e4f3d6e355..063159e08b 100644
--- a/languages/i18n/mg.json
+++ b/languages/i18n/mg.json
@@ -514,7 +514,7 @@
 	"passwordreset-emailtitle": "Antsipirihan'ny kaonty eo amin'i {{SITENAME}}",
 	"passwordreset-emailtext-ip": "Nisy olona (izay mety ianao, avy amin'ny adiresy IP $1) nangataka ny hamerina ny tenimiafin'ny kaontim-pikambany ho an'i {{SITENAME}} ($4). Mampiasa ity adiresy mailaka ity {{PLURAL:$3|ity kaontim-pikambana mpikambana io|ireo kaontim-mpikambana ireo}}:\n\n$2\n\nHitsahatra afaka $5 andro {{PLURAL:$3|io tenimiafina io|ireo tenimiafina ireo}}.\nTokony miditra ianao ary mifidy tenimiafina vaovao. Raha misy olon-kafa nanao ity hataka ity, na efa tadidinao indray ilay tenimiafinao taloha, ary raha tsy tia hanova azy intsony, azonao tsy raharahiana ity hafatra ity ary mitohy mampiasa ny tenimiafinao taloha.",
 	"passwordreset-emailtext-user": "Nisy mpikambana mitondra anarana $1 eo amin'i {{SITENAME}} nangataka fampatsiahivana mikasika ny kaontinao eo amin'i {{SITENAME}} ($4). Manana io adiresy imailaka {{PLURAL:$3|io kaontim-pikambana io|ireo kaontim-pikambana ireo}} :\n\n$2\n\nHitsahatra afaka {{PLURAL:$5|iray|$5}} andro {{PLURAL:$3|io|ireo}} tenimiafina {{PLURAL:$3|io|ireo}}. Mila miditra dien'izao ianao izao ary mifidy tenimiafina vaovao. Raha tsy avy aminao ity hataka ity na efa nahatadidy ny tenimiafinao taloha ianao, ary raha tsy tianao hovaina intsony ilay tenimiafinao, dia azonao tsy raharahiana ity hafatra ity ary mampiasa ny tenimiafinao taloha.",
-	"passwordreset-emailelement": "Anaram-pikambana : $1\nTenimiafina miserana : $2",
+	"passwordreset-emailelement": "Anaram-pikambana : \n$1\n\nTenimiafina miserana : \n$2",
 	"passwordreset-emailsent": "Lasa ny mailaka famerenana tenimiafina.",
 	"passwordreset-emailsent-capture": "Lasa ilay mailaka famerenana tenimiafina, izay aseho eo ambany.",
 	"passwordreset-emailerror-capture": "Nosoratana ilay mailaka famerenana tenimiafina, izay aseho eo ambany, fa tsy tafalefa tany amin'ilay mpikambana ilay izy : $1{{GENDER:$2}}",
@@ -845,6 +845,7 @@
 	"search-category": "(sokajy $1)",
 	"search-file-match": "(miady amin'ny votoatin-drakitra)",
 	"search-suggest": "Andramo : $1",
+	"search-rewritten": "Maneho vokam-pikarohana ho an'i $1. Hisolo ary hikaroka momba an'i $2.",
 	"search-interwiki-caption": "zandri-tetikasa",
 	"search-interwiki-default": "Valiny amin'ny $1 :",
 	"search-interwiki-more": "(be kokoa)",
@@ -852,6 +853,7 @@
 	"searchrelated": "voadinika",
 	"searchall": "rehetra",
 	"showingresults": "Omeo ny valiny{{PLURAL:$1||}} miisa hatramin'ny <b>$1</b> manomboka ny #<b>$2</b>.",
+	"showingresultsinrange": "Maneho hatramin'ny {{PLURAL:$1|valim-pikarohana <strong>1</strong> |valim-pikarohana <strong>$1</strong>}} amin'ny elanelana #<strong>$2</strong> hatramin'i #<strong>$3</strong>.",
 	"search-showingresults": "{{PLURAL:$4|Valim-pikarohana <strong>$1</strong> amin'ny <strong>$3</strong>| Valim-pikarohana <strong>$1 - $2</strong> amin'ny <strong>$3</strong>}}",
 	"search-nonefound": "Tsy nahitana valiny ilay fanontaniana.",
 	"powersearch-legend": "Fikarohana havanana",
@@ -944,7 +946,7 @@
 	"badsig": "Tsy mety io sonia io; hamarino ny kialo HTML.",
 	"badsiglength": "Lava loatra ny sonianao. {{PLURAL:$1||}}\nTokony mba manana lohavy ambanimbany kokoa non'ny $1",
 	"yourgender": "Tiana hofaritana ahoana ianao?",
-	"gender-unknown": "Tsy tia hanome ny antsipirihany aho",
+	"gender-unknown": "Rehefa milaza momba anao, hampiasa teny tsy mampilaza ny lahivavinao rehefa afaka atao.",
 	"gender-male": "Manova pejy wiki izy (lehilahy)",
 	"gender-female": "Manova pejy wiki izy (vehivavy)",
 	"prefs-help-gender": "Ankifidy : ampiasaina ho an'ny fifandraisan'ny rindrankajy aminao. Ho sarababem-bahoaka ity fampahalalana ity.",
@@ -1132,6 +1134,8 @@
 	"action-editmyprivateinfo": "Mijery ny fampahalalana sarababem-bahoakanao",
 	"action-editcontentmodel": "manova ny modelim-botoatin'ny pejy",
 	"action-managechangetags": "hamorona ary hamafa balizy ao amin'ny banky angona",
+	"action-applychangetags": "mampihatra balizy miaraka amin'ny fanovanao",
+	"action-changetags": "manampy ary manala balizy amin'ny versiona manokana ary iditry ny laogy",
 	"nchanges": "{{PLURAL:$1|fanovana|fanovana}} $1",
 	"enhancedrc-since-last-visit": "$1 ({{PLURAL:$1|hatry ny famangiana farany}})",
 	"enhancedrc-history": "tantara",
@@ -1176,8 +1180,8 @@
 	"newpageletter": "V",
 	"boteditletter": "r",
 	"number_of_watching_users_pageview": "[$1 {{PLURAL:$1|mpikambana|mpikambana}} manara-maso]",
-	"rc_categories": "Ferana amin'ireto sokajy ireto ihany (saraho amin'ny \"|\")",
-	"rc_categories_any": "Tsy misy fetrany",
+	"rc_categories": "Ferana amin'ireto sokajy ireto (saraho amin'ny \"|\")",
+	"rc_categories_any": "Anisan'ireo nofidiana",
 	"rc-change-size-new": "$1{{PLURAL:}} oktety taorian'ny fanovana",
 	"newsectionsummary": "/* $1 */ fizarana vaovao",
 	"rc-enhanced-expand": "Hijery ny antsipirihany",
@@ -1285,6 +1289,19 @@
 	"upload-too-many-redirects": "Be loatra ny fihodinan'ny URL.",
 	"upload-http-error": "Nisy tsy fetezana HTTP nitranga : $1",
 	"upload-copy-upload-invalid-domain": "Tsy misy eto amin'ity dômenina ity ny tahaky ny upload.",
+	"upload-dialog-title": "Hanafatra rakitra",
+	"upload-dialog-error": "Nisy hadisoana nitranga",
+	"upload-dialog-warning": "Nisy fampitandremana nitranga",
+	"upload-dialog-button-cancel": "Aoka",
+	"upload-dialog-button-done": "Vita",
+	"upload-dialog-button-save": "Tehirizina",
+	"upload-dialog-button-upload": "Mampiditra",
+	"upload-dialog-label-select-file": "Hifidy rakitra",
+	"upload-dialog-label-infoform-title": "Antsipirihany",
+	"upload-dialog-label-infoform-name": "Anarana",
+	"upload-dialog-label-infoform-description": "Famisavisana",
+	"upload-dialog-label-usage-title": "Fampiasana",
+	"upload-dialog-label-usage-filename": "Anaran-drakitra",
 	"backend-fail-stream": "Tsy afaka mamaky ilay rakitra $1.",
 	"backend-fail-backup": "Tsy afaka mitahiry ilay rakitra $1.",
 	"backend-fail-notexists": "Tsy misy ilay rakitra $1.",
@@ -1302,7 +1319,9 @@
 	"backend-fail-closetemp": "Tsy afaka manidy ilay rakitra miserana.",
 	"backend-fail-read": "Tsy afaka mamaky ilay rakitra $1.",
 	"backend-fail-create": "Tsy afaka manoratra anatin'ilay rakitra $1.",
+	"backend-fail-maxsize": "Tsy afaka nanoratra rakitra \"$1\" satria lehibe kokoa noho {{PLURAL:$2|iray oktety|$2 oktety}}.",
 	"backend-fail-readonly": "Amin'izao fotoana dia famakiana ihany ny fitahirizana terminal an'i \"$1\". \"''$2''\" no antony nomena",
+	"backend-fail-synced": "Anaty toetra tsy mitombina ilay rakitra \"$1\" ao amin'ny fitahirizana anaty",
 	"backend-fail-connect": "Tsy afaka mifandray amin'ny terminal fitahirizana \"$1\".",
 	"backend-fail-internal": "Hadisoana tsy fantatra tao anatin'ny terminal fitahirizana \"$1\".",
 	"backend-fail-contenttype": "Tsy afaka maminavina ny karazam-botoatin'ny rakitra hotahirizina ao amin'i \"$1\".",
@@ -1351,12 +1370,14 @@
 	"license": "Lisansy:",
 	"license-header": "Navoaka tambanin'ny lisansy",
 	"nolicense": "Tsy misy safidy",
+	"licenses-edit": "Hanova safidim-pahazoan-dalana",
 	"license-nopreview": "(Tsy misy topi-maso)",
 	"upload_source_url": " (URL misy ary azo vangian'ny daholobe)",
 	"upload_source_file": " (rakitra eo amin'ny milinao)",
 	"listfiles-delete": "fafao",
 	"listfiles-summary": "Ahitana ny rakitra rehetra nampidirina ity pejy manokana ity.",
 	"listfiles_search_for": "Hitady anarana media :",
+	"listfiles-userdoesnotexist": "Tsy nisoratra anarana i \"$1\".",
 	"imgfile": "rakitra",
 	"listfiles": "Lisitran'ny rakitra",
 	"listfiles_thumb": "Sary nakelezina",
@@ -1430,6 +1451,7 @@
 	"download": "Hampidina",
 	"unwatchedpages": "Pejy voaaisotra ny fanaraha-maso azy",
 	"listredirects": "Lisitra ny fihodinana",
+	"listduplicatedfiles": "Lisitry ny rakitra misy in-droa",
 	"unusedtemplates": "Endrika tsy miasa",
 	"unusedtemplatestext": "Ity pejy ity dia manalisitra ny pejy rehetra ao amin'ny anaran-tsehatra « {{ns:template}} » ao tsy anaty pejy hafa.\nAza manadino manamarina raha tsy misy rohy makany amin'ny endrika hafa alohan'ny mamafa azy.",
 	"unusedtemplateswlh": "rohy hafa",
@@ -1439,6 +1461,7 @@
 	"randomincategory-invalidcategory": "Tsy anaran-tsokajy azo raisina \"$1\"",
 	"randomincategory-nopages": "Tsy misy pejy ao amin'i [[:Category:$1]]",
 	"randomincategory-category": "Sokajy:",
+	"randomincategory-legend": "Pejy kisendra anaty sokajy",
 	"randomincategory-submit": "Lasa",
 	"randomredirect": "Pejy fihodinana kisendra",
 	"randomredirect-nopages": "Tsy misy pejy fihodinana eo amin'ny anaran-tsehatra «$1»",
@@ -1628,7 +1651,6 @@
 	"emailuser": "Andefaso imailaka io mpikambana io",
 	"emailuser-title-target": "Handefa mailaka any amin'ity mpikambana ity{{GENDER:$1}}",
 	"emailuser-title-notarget": "Handefa imailaka an'ilay mpikambana",
-	"emailpage": "Andefaso imailaka io mpikambana io",
 	"emailpagetext": "Azonao ampiasaina io fôrmiolera eo ambany io mba handefa mailaka mankany amin'ny mpikambana $1. Ho ao amin'ny saha \"Mpandefa\" (Expéditeur) ny adiresy mailakao ka ho afaka hamaly anao avy hatrany ilay mpandray ny hafatra.",
 	"defemailsubject": "{{SITENAME}} Mailaky ny mpikambana \"$1\"",
 	"usermaildisabled": "Tsy azo mifandefa imailaka ny mpikambana",
@@ -1721,6 +1743,12 @@
 	"rollback-success": "Fanesorana ny fiovana nataon'i $1 ;\nfiverenana amin'ny fiovana farany nataon'i $2.",
 	"sessionfailure-title": "Tsi-fetezaka mikasika ny kaonty idirana",
 	"sessionfailure": "Ohatry ny misy olana ny fidirana amin'ny kaontinao ; \nnofoanana ilay tao mba tsy hisy fanodinana fotaom-pidirana (session).\nTsindrio \"Mialoha\" ary vaozy ilay pejy niavianao ary andramo fanindroany.",
+	"changecontentmodel-title-label": "Lohatenim-pejy",
+	"changecontentmodel-model-label": "Môdelim-botoatiny",
+	"changecontentmodel-reason-label": "Antony :",
+	"changecontentmodel-success-title": "Niova ny môdelim-botoatiny",
+	"logentry-contentmodel-change-revertlink": "mamerina",
+	"logentry-contentmodel-change-revert": "mamerina",
 	"protectlogpage": "Laogim-piarovana",
 	"protectlogtext": "Eto ambany ny lisitry ny fiarovana/fanalana hidy ny pejy. \nHo ann'y fanazavana fanampiny, jereo [[Special:ProtectedPages|ny lisitry ny pejy voaaro]] ho an'ny pejy fiarovana amin'izao fotoana izao.",
 	"protectedarticle": "voaaro ny pejy \"[[$1]]\"",
@@ -1732,6 +1760,7 @@
 	"prot_1movedto2": "[[$1]] voaova anarana ho [[$2]]",
 	"protect-badnamespace-title": "Anaran-tsehatra tsy azo arovana",
 	"protect-badnamespace-text": "Tsy afaka arovana ny pejy ao amin'io anaran-tsehatra io.",
+	"protect-norestrictiontypes-text": "Tsy afaka arovana i ty pejy ity satria tsy misy karazam-petra hita.",
 	"protect-norestrictiontypes-title": "Pejy tsy azo arovana",
 	"protect-legend": "Fanekena ny fiarovana pejy",
 	"protectcomment": "Antony :",
@@ -2053,6 +2082,7 @@
 	"allmessages-prefix": "Tantavanina araka ny tovona :",
 	"allmessages-language": "Tenim-pirenena/fiteny :",
 	"allmessages-filter-submit": "Alefa",
+	"allmessages-filter-translate": "Dikaina",
 	"thumbnail-more": "Angedazina",
 	"filemissing": "Tsy hita ny rakitra",
 	"thumbnail_error": "Tsy fetezana eo am-panamboarana ilay saritapaka : $1",
diff --git a/languages/i18n/min.json b/languages/i18n/min.json
index 018e41592a..fa670f5257 100644
--- a/languages/i18n/min.json
+++ b/languages/i18n/min.json
@@ -454,7 +454,6 @@
 	"passwordreset": "Setel ulang kato sandi",
 	"passwordreset-text-one": "Lengkapkan formulir ko untuak manuka baliak kato sandi Sanak.",
 	"passwordreset-text-many": "{{PLURAL:$1|Masuakan data di bawah ko untuak manuka baliak kato sandi Sanak.}}",
-	"passwordreset-legend": "Tuka baliak kato sandi",
 	"passwordreset-disabled": "Pangubahan kato sandi alah dimatian di wiki iko.",
 	"passwordreset-emaildisabled": "Fitur surel alah dimatian pado wiki iko.",
 	"passwordreset-username": "Namo pangguno:",
@@ -465,7 +464,7 @@
 	"passwordreset-emailtitle": "Detail akun di {{SITENAME}}",
 	"passwordreset-emailtext-ip": "Sasaurang (mungkin Sanak, dari alamaik IP $1) mamintak parubahan kato sandi untuak {{SITENAME}} ($4). {{PLURAL:$3|Akun}} barikuik takaik jo alamaik surel ko:\n\n$2\n\n{{PLURAL:$3|Sandi samantaro}} barikuik akan habih masonyo dalam {{PLURAL:$5|$5 ari}}.\nSanak harus masuak dan mamiliah sandi baru. Jikok urang lain mambuek pamintaan ko atau jikok Sanak ingek sandi awal dan indak nio maubahnyo, Sanak dapek mangacuahkan pasan ko dan taruih manggunoan kato sandi lamo.",
 	"passwordreset-emailtext-user": "Sasaurang (mungkin Sanak, dari alamaik IP $1) mamintak parubahan kato sandi untuak {{SITENAME}} ($4).\n{{PLURAL:$3|Akun}} barikuik takaik jo alamaik surel ko:\n\n$2\n\n{{PLURAL:$3|Sandi samantaro}} barikuik akan habih masonyo dalam {{PLURAL:$5|$5 ari}}.\nSanak harus masuak dan mamiliah sandi baru. Jikok urang lain mambuek pamintaan ko atau jikok Sanak ingek sandi awal dan indak nio maubahnyo, Sanak dapek mangacuahkan pasan ko dan taruih manggunoan kato sandi lamo.",
-	"passwordreset-emailelement": "Namo pangguno: $1\nSandi samantaro: $2",
+	"passwordreset-emailelement": "Namo pangguno: \n$1\n\nSandi samantaro: \n$2",
 	"passwordreset-emailsent": "Surel parubahan kato sandi alah dikirim.",
 	"passwordreset-emailsent-capture": "Surel parubahan kato sandi alah dikirim, nan nampak di bawah ko.",
 	"passwordreset-emailerror-capture": "Surel parubahan kato sandi nan ditampilan di bawah, alah dibuek, tapi pangirimannyo ka {{GENDER:$2|pangguno}} gagal: $1",
@@ -1073,6 +1072,7 @@
 	"unusedtemplatestext": "Daftar barikuik adolah kasado laman pado ruangnamo {{ns:template}} nan indak dipakai di laman manopun.\nPariso dulu \"pautan baliak\" ka templat tasabuik sabalun manghapuihnyo.",
 	"unusedtemplateswlh": "pautan baliak",
 	"randompage": "Laman sumbarang",
+	"randomincategory-submit": "Tuju",
 	"randomredirect": "Pangaliahan sumbarang",
 	"statistics": "Statistik",
 	"statistics-header-pages": "Statistik laman",
@@ -1107,7 +1107,6 @@
 	"nlinks": "$1 {{PLURAL:$1|pautan}}",
 	"nmembers": "$1 {{PLURAL:$1|anggota}}",
 	"nrevisions": "$1 {{PLURAL:$1|revisi}}",
-	"nviews": "dilihek $1 {{PLURAL:$1|kali}}",
 	"nimagelinks": "Digunoan pado $1 {{PLURAL:$1|laman}}",
 	"ntransclusions": "digunoan pado $1 {{PLURAL:$1|laman}}",
 	"specialpage-empty": "Indak ado nan paralu dilaporan.",
@@ -1216,7 +1215,6 @@
 	"emailuser": "Surel pangguno",
 	"emailuser-title-target": "Kirim surel ka {{GENDER:$1|panggun}} ko",
 	"emailuser-title-notarget": "Kirim surel",
-	"emailpage": "Kirim surel ka pangguno ko",
 	"emailpagetext": "Sanak dapek manggunoan formulir di bawah ko untuak mangirimkan surel ka {{GENDER:$1|pangguna}} ko.\nAlamaik surel nan Sanak masuakkan di [[Special:Preferences|pangaturan akun]] akan kalua sabagai alamaik \"Dari\" pado surel tasabuik, jadi panarimo dapek langsuang mambalehnyo.",
 	"usermaildisabled": "Surel pangguno non-aktif",
 	"emailtarget": "Masuakan namo pangguno nan ka manarimo surel",
diff --git a/languages/i18n/mk.json b/languages/i18n/mk.json
index 619c32ae88..52b0e64f56 100644
--- a/languages/i18n/mk.json
+++ b/languages/i18n/mk.json
@@ -23,7 +23,6 @@
 	"tog-hideminor": "Скривај ги ситните уредувања во скорешните промени",
 	"tog-hidepatrolled": "Скриј испатролирани уредувања во скорешните промени",
 	"tog-newpageshidepatrolled": "Скриј испатролирани страници од списокот на нови страници",
-	"tog-hidecategorization": "Сокриј ја категоризацијата на страниците",
 	"tog-extendwatchlist": "Прошири го список на набљудувања за приказ на сите промени, не само скорешните",
 	"tog-usenewrc": "Промени во групи по страници во списокот на скорешни промени",
 	"tog-numberheadings": "Нумерирај ги заглавијата",
@@ -53,7 +52,6 @@
 	"tog-watchlisthideliu": "Скриј ги уредувањата на најавените корисници во набљудуваните",
 	"tog-watchlisthideanons": "Скриј ги уредувањата од анонимни корисници во набљудуваните",
 	"tog-watchlisthidepatrolled": "Скриј испатролирани уредувања од мојот список на набљудувања",
-	"tog-watchlisthidecategorization": "Сокриј ја категоризацијата на страниците",
 	"tog-ccmeonemails": "Испраќај ми мои примероци од писмата што ги праќам на другите корисници",
 	"tog-diffonly": "Не ја покажувај содржината на страницата под разликите",
 	"tog-showhiddencats": "Прикажи скриени категории",
@@ -175,8 +173,8 @@
 	"help": "Помош",
 	"search": "Пребарај",
 	"searchbutton": "Пребарај",
-	"go": "Оди",
-	"searcharticle": "Оди",
+	"go": "Дај",
+	"searcharticle": "Дај",
 	"history": "историја",
 	"history_short": "Историја",
 	"updatedmarker": "подновено од мојата последна посета",
@@ -442,6 +440,7 @@
 	"createacct-benefit-body2": "{{PLURAL:$1|страница|страници}}",
 	"createacct-benefit-body3": "{{PLURAL:$1|скорешен учесник|скорешни учесници}}",
 	"badretype": "Внесените лозинки не се совпаѓаат.",
+	"usernameinprogress": "Создавањето на сметката за овој корисни е веќе во тек.",
 	"userexists": "Корисничкото име што го внесовте е зафатено.\nИзберете друго име.",
 	"loginerror": "Грешка при најавувањето",
 	"createacct-error": "Грешка во создавањето на сметката",
@@ -533,7 +532,7 @@
 	"passwordreset-emailtitle": "Најавни податоци за {{SITENAME}}",
 	"passwordreset-emailtext-ip": "Некој (веројатно вие, од IP-адресата $1) побара измена на вашата\nлозинка за {{SITENAME}} ($4). Оваа е-поштенска адреса е наведена во\n{{PLURAL:$3|следнава корисничка сметка|следниве кориснички сметки}}:\n\n$2\n\n{{PLURAL:$3|Оваа привремена лозинка ќе истече|Овие привремени лозинки ќе истечат}} во рок од {{PLURAL:$5|еден ден|$5 дена}}.\nСега треба да се најавите и да внесете нова лозинка. Ако ова барање го\nпоставил некој друг, или пак во меѓувреме сте се сетиле на лозинката, и не сакате\nда ја менувате, тогаш слободно занемарете ја поракава и продолжете да ја користите старата.",
 	"passwordreset-emailtext-user": "Корисникот $1 на {{SITENAME}} побара измена на вашата лозинка на {{SITENAME}}\n($4). Оваа е-поштенска адреса е наведена во {{PLURAL:$3|следнава корисничка сметка|следниве кориснички сметки}}:\n\n$2\n\n{{PLURAL:$3|Оваа привремена лозинка ќе истече|Овие привремени лозинки ќе истечат}} во рок од {{PLURAL:$5|еден ден|$5 дена}}.\nСега треба да се најавите и да внесете нова лозинка. Ако ова барање го\nпоставил некој друг, или пак во меѓувреме сте се сетиле на лозинката, и не сакате\nда ја менувате, тогаш слободно занемарете ја поракава и продолжете да ја користите старата.",
-	"passwordreset-emailelement": "Корисничко име: $1\nПривремена лозинка: $2",
+	"passwordreset-emailelement": "Корисничко име: \n$1\n\nПривремена лозинка: \n$2",
 	"passwordreset-emailsent": "Испратено е писмо за измена на лозинката.",
 	"passwordreset-emailsent-capture": "Испратено е писмо за измена на лозинката (прикажано подолу).",
 	"passwordreset-emailerror-capture": "Создадено е писмо за измена на лозинката (прикажано подолу), но не успеав да го испратам на {{GENDER:$2|корисникот}}: $1",
@@ -933,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 дена}})",
@@ -1209,9 +1209,6 @@
 	"rcshowhidemine": "$1 мои уредувања",
 	"rcshowhidemine-show": "Прикажи",
 	"rcshowhidemine-hide": "Скриј",
-	"rcshowhidecategorization": "$1 ја категоризацијата на страниците",
-	"rcshowhidecategorization-show": "Прикажи",
-	"rcshowhidecategorization-hide": "Скриј",
 	"rclinks": "Прикажи скорешни $1 промени во последните $2 дена<br />$3",
 	"diff": "разл",
 	"hist": "истор",
@@ -1236,10 +1233,6 @@
 	"recentchangeslinked-summary": "Ова е список на промени направени на страниците поврзани преку назначената страница (или до членови на назначената категорија).\nСтраниците на [[Special:Watchlist|вашиот список на набљудувања]] се прикажани '''задебелено'''.",
 	"recentchangeslinked-page": "Име на страницата:",
 	"recentchangeslinked-to": "Прикажи ги промените на страниците поврзани со дадената страница",
-	"recentchanges-page-added-to-category": "[[:$1]] ставена во категорија",
-	"recentchanges-page-added-to-category-bundled": "[[:$1]] и уште {{PLURAL:$2|една страница ставена|$2 страници ставеи}} во категорија",
-	"recentchanges-page-removed-from-category": "[[:$1]] отстранета од категорија",
-	"recentchanges-page-removed-from-category-bundled": "[[:$1]] и уште {{PLURAL:$2|една страница отстранета|$2 страници отстранети}} од категорија",
 	"upload": "Подигање",
 	"uploadbtn": "Подигни",
 	"reuploaddesc": "Прекини и назад кон образецот за подигање",
@@ -1535,7 +1528,7 @@
 	"randomincategory-nopages": "Нема страници во [[:Category:$1]].",
 	"randomincategory-category": "Категорија:",
 	"randomincategory-legend": "Случајна страница во категорија",
-	"randomincategory-submit": "Оди",
+	"randomincategory-submit": "Дај",
 	"randomredirect": "Случајно пренасочување",
 	"randomredirect-nopages": "Нема пренасочувања во именскиот простор „$1“.",
 	"statistics": "Статистики",
@@ -1556,7 +1549,7 @@
 	"pageswithprop-legend": "Страници со својство",
 	"pageswithprop-text": "На страницава се наведени страници што користат дадено својство.",
 	"pageswithprop-prop": "Име на својството:",
-	"pageswithprop-submit": "Оди",
+	"pageswithprop-submit": "Дај",
 	"pageswithprop-prophidden-long": "долгата вредност на текстуалното својство е скриена ($1)",
 	"pageswithprop-prophidden-binary": "бинарната вредност на својството за долгиот текст е скриена  ($1)",
 	"doubleredirects": "Двојни пренасочувања",
@@ -1662,7 +1655,7 @@
 	"booksources-text": "Ова е список на врски кон други мрежни места кои продаваат нови и користени книги, и тие може\nда имаат повеќе информации за книгите што ги баравте:",
 	"booksources-invalid-isbn": "Наведениот ISBN се чини неправилен. Проверете да не настанала некоја грешка при копирањето од изворот.",
 	"specialloguserlabel": "Изведувач:",
-	"speciallogtitlelabel": "Цел (наслов или корисник):",
+	"speciallogtitlelabel": "Цел (наслов или {{ns:user}}:корисничко име на корисникот):",
 	"log": "Дневници",
 	"all-logs-page": "Сите јавни дневници",
 	"alllogstext": "Комбиниран приказ на сите расположиви дневници на {{SITENAME}}.\nМожете да го ограничите прикажаното избирајќи тип на дневник, корисничко име (разликува големи и мали букви), или страница (разликува големи и мали букви).",
@@ -1677,7 +1670,7 @@
 	"allpagesto": "Прикажи страници кои завршуваат со:",
 	"allarticles": "Сите страници",
 	"allinnamespace": "Сите страници (именски простор $1)",
-	"allpagessubmit": "Оди",
+	"allpagessubmit": "Дај",
 	"allpagesprefix": "Прикажи страници со претставка:",
 	"allpagesbadtitle": "Дадениот наслов е неважечки или има меѓујазичен или меѓувики-претставка. Може да содржи повеќе знаци кои не смеат да се користат во наслови.",
 	"allpages-bad-ns": "Википедија не содржи именски простор „$1“.",
@@ -1748,7 +1741,6 @@
 	"emailuser": "Пиши е-пошта на корисникот",
 	"emailuser-title-target": "Составување на е-пошта за {{GENDER:$1|корисникот}}",
 	"emailuser-title-notarget": "Е-пошта за корисникот",
-	"emailpage": "Е-пошта",
 	"emailpagetext": "Можете да го употребите следниов образец за да му испратите е-пошта на овој {{GENDER:$1|корисник}}.\nАдреса која ја имате наведено во [[Special:Preferences|вашите нагодувања]] ќе се прикаже во полето „Од“ на пораката, со што примачот ќе може да ви одговори непосредно вам.",
 	"defemailsubject": "{{SITENAME}} — писмо од корисникот „$1“",
 	"usermaildisabled": "Корисничката е-пошта е оневозможена",
@@ -1770,7 +1762,7 @@
 	"emailccsubject": "Копија од вашата порака до $1: $2",
 	"emailsent": "Писмото е испратено",
 	"emailsenttext": "Писмото е испратено.",
-	"emailuserfooter": "$1 го испрати писмово на $2 со помош на функцијата „{{int:emailpage}}“ на {{SITENAME}}.",
+	"emailuserfooter": "$1 го испрати писмово на $2 со помош на функцијата „{{int:emailuser}}“ на {{SITENAME}}.",
 	"usermessage-summary": "Оставете системска порака.",
 	"usermessage-editor": "Системски гласник",
 	"usermessage-template": "MediaWiki:КорисникПорака",
@@ -2223,7 +2215,7 @@
 	"allmessages-filter-modified": "Изменети",
 	"allmessages-prefix": "Филтрирај по претставка:",
 	"allmessages-language": "Јазик:",
-	"allmessages-filter-submit": "Оди",
+	"allmessages-filter-submit": "Дај",
 	"allmessages-filter-translate": "Преведување",
 	"thumbnail-more": "Зголеми",
 	"filemissing": "Недостасува податотека",
@@ -2968,7 +2960,7 @@
 	"table_pager_last": "Последна страница",
 	"table_pager_limit": "Прикажи $1 записи по страница",
 	"table_pager_limit_label": "Ставки по страница:",
-	"table_pager_limit_submit": "Оди",
+	"table_pager_limit_submit": "Дај",
 	"table_pager_empty": "Нема резултати",
 	"autosumm-blank": "Целосно избришана страница",
 	"autosumm-replace": "Ја заменувам страницата со '$1'",
@@ -3137,7 +3129,7 @@
 	"redirect": "Пренасочување по податотеки, корисник или назнака на преработка",
 	"redirect-legend": "Пренасочување кон податотека или страница",
 	"redirect-summary": "Оваа службена страница пренасочува кон податотека (се задава името), страница (се задава назнаката на преработката или страницата) или корисничка странца (се задава бројчената назнака на корисникот). Употреба: [[{{#Special:Redirect}}/file/Example.jpg]], [[{{#Special:Redirect}}/revision/328429]] или [[{{#Special:Redirect}}/user/101]].",
-	"redirect-submit": "Оди",
+	"redirect-submit": "Дај",
 	"redirect-lookup": "Пребарај:",
 	"redirect-value": "Вредност:",
 	"redirect-user": "Корисничка назнака",
@@ -3337,6 +3329,7 @@
 	"logentry-newusers-create2": "{{GENDER:$2|Направена}} корисничката сметка $3 од $1",
 	"logentry-newusers-byemail": "$1 {{GENDER:$2|ја направи}} корисничката сметка $3. Лозинката ви ја испративме по е-пошта",
 	"logentry-newusers-autocreate": "Автоматски {{GENDER:$2|создадена}} корисничката сметка $1",
+	"logentry-protect-move_prot": "$1 ги {{GENDER:$2|премести}} заштитните поставки од $4 на $3",
 	"logentry-rights-rights": "$1 {{GENDER:$2|го измени}} групното членство на $3 од $4 во $5",
 	"logentry-rights-rights-legacy": "$1 {{GENDER:$2|го измени}} групното членство во $3",
 	"logentry-rights-autopromote": "$1 автоматски {{GENDER:$2|унапреден|унапредена}} од $4 во $5",
diff --git a/languages/i18n/ml.json b/languages/i18n/ml.json
index f7ed855b5d..60f032c855 100644
--- a/languages/i18n/ml.json
+++ b/languages/i18n/ml.json
@@ -36,7 +36,6 @@
 	"tog-hideminor": "പുതിയ മാറ്റങ്ങളുടെ പട്ടികയിൽ ചെറിയ തിരുത്തുകൾ പ്രദർശിപ്പിക്കാതിരിക്കുക",
 	"tog-hidepatrolled": "റോന്തുചുറ്റിയ തിരുത്തുകൾ പുതിയമാറ്റങ്ങളിൽ പ്രദർശിപ്പിക്കാതിരിക്കുക",
 	"tog-newpageshidepatrolled": "റോന്തുചുറ്റപ്പെട്ട താളുകൾ പുതിയതാളുകളുടെ പട്ടികയിൽ പ്രദർശിപ്പിക്കാതിരിക്കുക",
-	"tog-hidecategorization": "താളുകളുടെ വർഗ്ഗീകരണം മറയ്ക്കുക",
 	"tog-extendwatchlist": "ഏറ്റവും പുതിയവ മാത്രമല്ല, എല്ലാ മാറ്റങ്ങളും ദൃശ്യമാകുന്ന വിധത്തിൽ ശ്രദ്ധിക്കുന്ന താളുകളുടെ പട്ടിക വികസിപ്പിക്കുക.",
 	"tog-usenewrc": "സമീപകാല മാറ്റങ്ങൾ, ശ്രദ്ധിക്കുന്നവയുടെ പട്ടിക എന്നീ താളുകളിൽ മാറ്റങ്ങൾ ഗണംതിരിക്കുക",
 	"tog-numberheadings": "ഉപവിഭാഗങ്ങൾക്ക് ക്രമസംഖ്യ കൊടുക്കുക",
@@ -66,7 +65,6 @@
 	"tog-watchlisthideliu": "ഞാൻ ശ്രദ്ധിക്കുന്ന താളുകളിലെ മാറ്റങ്ങളിൽ നിന്നും ലോഗിൻ ചെയ്തിട്ടുള്ളവരുടെ തിരുത്തുകൾ മറയ്ക്കുക",
 	"tog-watchlisthideanons": "ഞാൻ ശ്രദ്ധിക്കുന്ന താളുകളിലെ മാറ്റങ്ങളിൽ നിന്നും അജ്ഞാത ഉപയോക്താക്കളുടെ തിരുത്തുകൾ മറയ്ക്കുക",
 	"tog-watchlisthidepatrolled": "ഞാൻ ശ്രദ്ധിക്കുന്ന താളുകളുടെ പട്ടികയിൽനിന്ന് റോന്തുചുറ്റിയ തിരുത്തുകൾ മറയ്ക്കുക",
-	"tog-watchlisthidecategorization": "താളുകളുടെ വർഗ്ഗീകരണം മറയ്ക്കുക",
 	"tog-ccmeonemails": "ഞാൻ മറ്റുള്ളവർക്കയക്കുന്ന ഇമെയിലുകളുടെ ഒരു പകർപ്പ് എനിക്കും അയക്കുക",
 	"tog-diffonly": "രണ്ട് പതിപ്പുകൾ തമ്മിലുള്ള വ്യത്യാസത്തിനു താഴെ താളിന്റെ ഉള്ളടക്കം കാണിക്കരുത്.",
 	"tog-showhiddencats": "മറഞ്ഞിരിക്കുന്ന വർഗ്ഗങ്ങളെ കാണിക്കുക",
@@ -453,6 +451,7 @@
 	"createacct-benefit-body2": "{{PLURAL:$1|താൾ|താളുകൾ}}",
 	"createacct-benefit-body3": "സമീപകാലത്ത് സംഭാവന {{PLURAL:$1|ചെയ്തയാൾ|ചെയ്തവർ}}",
 	"badretype": "താങ്കൾ നൽകിയ രഹസ്യവാക്കുകൾ ഒത്തുപോകുന്നില്ല.",
+	"usernameinprogress": "ഈ ഉപയോക്തൃനാമത്തിലുള്ള അംഗത്വ നിർമ്മിതി നടന്നുകൊണ്ടിരിക്കുന്നു.\nദയവായി കാത്തിരിക്കുക.",
 	"userexists": "നൽകിയ ഉപയോക്തൃനാമം മുമ്പേ നിലവിലുണ്ട്.\nദയവായി മറ്റൊരു ഉപയോക്തൃനാമം തിരഞ്ഞെടുക്കുക.",
 	"loginerror": "പ്രവേശനം സാധിച്ചില്ല",
 	"createacct-error": "അംഗത്വസൃഷ്ടിക്കിടെ പിഴവുണ്ടായി",
@@ -543,7 +542,7 @@
 	"passwordreset-emailtitle": "{{SITENAME}} സംരംഭത്തിലെ അംഗത്വവിവരങ്ങൾ",
 	"passwordreset-emailtext-ip": "ആരോ ഒരാൾ (മിക്കവാറും താങ്കളായിരിക്കും, $1 എന്ന ഐ.പി. വിലാസത്തിൽ നിന്നും) {{SITENAME}} സംരംഭത്തിലെ ($4) താങ്കളുടെ രഹസ്യവാക്ക് പുനർസജ്ജീകരിക്കാൻ അഭ്യർത്ഥിച്ചിരിക്കുന്നു. ഈ ഇമെയിൽ വിലാസവുമായി ബന്ധപ്പെട്ടിരിക്കുന്ന {{PLURAL:$3|അംഗത്വം|അംഗത്വങ്ങൾ}} താഴെക്കൊടുത്തിരിക്കുന്നു:\n\n$2\n\n\nഈ {{PLURAL:$3|താത്കാലിക രഹസ്യവാക്ക്|താത്കാലിക രഹസ്യവാക്കുകൾ}} {{PLURAL:$5|ഒരു ദിവസം|$5 ദിവസങ്ങൾ}} കൊണ്ട് കാലഹരണപ്പെട്ട് പോകുന്നവയാണ്.\nതാങ്കൾ ഇപ്പോൾ തന്നെ പ്രവേശിച്ച് രഹസ്യവാക്ക് മാറ്റുന്നതാണ് ഉചിതം. ഈ അഭ്യർത്ഥന മറ്റാരോ ആണ് നടത്തിയത് അല്ലെങ്കിൽ, യഥാർത്ഥ രഹസ്യവാക്ക് താങ്കൾ ഓർമ്മിക്കുകയും അത് മാറ്റാൻ ആഗ്രഹിക്കാതിരിക്കുകയും ആണെങ്കിൽ, ഈ സന്ദേശം അവഗണിച്ച് താങ്കളുടെ പഴയ രഹസ്യവാക്ക് തുടർന്നും ഉപയോഗിക്കാവുന്നതാണ്.",
 	"passwordreset-emailtext-user": "{{SITENAME}} സംരംഭത്തിലെ ഉപയോക്താവായ $1 {{SITENAME}} സംരംഭത്തിലെ ($4) രഹസ്യവാക്ക് പുനർസജ്ജീകരിക്കാൻ അഭ്യർത്ഥിച്ചിരിക്കുന്നു. ഈ ഇമെയിൽ വിലാസവുമായി ബന്ധപ്പെട്ടിരിക്കുന്ന {{PLURAL:$3|അംഗത്വം|അംഗത്വങ്ങൾ}} താഴെക്കൊടുത്തിരിക്കുന്നു:\n\n$2\n\n\nഈ {{PLURAL:$3|താത്കാലിക രഹസ്യവാക്ക്|താത്കാലിക രഹസ്യവാക്കുകൾ}} {{PLURAL:$5|ഒരു ദിവസം|$5 ദിവസങ്ങൾ}} കൊണ്ട് കാലഹരണപ്പെട്ട് പോകുന്നവയാണ്.\nതാങ്കൾ ഇപ്പോൾ തന്നെ പ്രവേശിച്ച് രഹസ്യവാക്ക് മാറ്റുന്നതാണ് ഉചിതം. ഈ അഭ്യർത്ഥന മറ്റാരോ ആണ് നടത്തിയത് അല്ലെങ്കിൽ, യഥാർത്ഥ രഹസ്യവാക്ക് താങ്കൾ ഓർമ്മിക്കുകയും അത് മാറ്റാൻ ആഗ്രഹിക്കാതിരിക്കുകയും ആണെങ്കിൽ, ഈ സന്ദേശം അവഗണിച്ച് താങ്കളുടെ പഴയ രഹസ്യവാക്ക് തുടർന്നും ഉപയോഗിക്കാവുന്നതാണ്.",
-	"passwordreset-emailelement": "ഉപയോക്തൃനാമം: $1\nതാത്കാലിക രഹസ്യവാക്ക്: $2",
+	"passwordreset-emailelement": "ഉപയോക്തൃനാമം: \n$1\n\nതാത്കാലിക രഹസ്യവാക്ക്: \n$2",
 	"passwordreset-emailsent": "ഒരു രഹസ്യവാക്ക് പുനർസജ്ജീകരണ ഇമെയിൽ അയച്ചിട്ടുണ്ട്.",
 	"passwordreset-emailsent-capture": "രഹസ്യവാക്ക് പുനർസജ്ജീകരണ ഇമെയിൽ അയച്ചിട്ടുണ്ട്, അത് താഴെക്കൊടുക്കുന്നു.",
 	"passwordreset-emailerror-capture": "താഴെക്കൊടുത്തിരിക്കുന്ന, രഹസ്യവാക്ക് പുനർസജ്ജീകരണ ഇമെയിൽ സൃഷ്ടിക്കാനായെങ്കിലും, അത് {{GENDER:$2|ഉപയോക്താവിന്}} അയയ്ക്കുന്നത് പരാജയപ്പെട്ടു: $1",
@@ -938,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 ദിവസങ്ങൾ}}",
@@ -1212,9 +1212,6 @@
 	"rcshowhidemine": "എന്റെ തിരുത്തുകൾ $1",
 	"rcshowhidemine-show": "പ്രദർശിപ്പിക്കുക",
 	"rcshowhidemine-hide": "മറയ്ക്കുക",
-	"rcshowhidecategorization": "താളുകളുടെ വർഗ്ഗീകരണം $1",
-	"rcshowhidecategorization-show": "പ്രദർശിപ്പിക്കുക",
-	"rcshowhidecategorization-hide": "മറയ്ക്കുക",
 	"rclinks": "കഴിഞ്ഞ $2 ദിവസങ്ങൾക്കുള്ളിലുണ്ടായ $1 മാറ്റങ്ങൾ പ്രദർശിപ്പിക്കുക<br />$3",
 	"diff": "മാറ്റം",
 	"hist": "നാൾവഴി",
@@ -1239,10 +1236,6 @@
 	"recentchangeslinked-summary": "ഒരു പ്രത്യേക താളിൽ നിന്നു കണ്ണി ചേർക്കപ്പെട്ടിട്ടുള്ള താളുകളിൽ അവസാനമായി വരുത്തിയ മാറ്റങ്ങളുടെ പട്ടിക താഴെ പ്രദർശിപ്പിച്ചിരിക്കുന്നു. ഈ പട്ടികയിൽ പെടുന്ന [[Special:Watchlist|താങ്കൾ ശ്രദ്ധിക്കുന്ന താളുകൾ]] '''കടുപ്പിച്ച്''' കാണിച്ചിരിക്കുന്നു.",
 	"recentchangeslinked-page": "താളിന്റെ പേര്:",
 	"recentchangeslinked-to": "തന്നിരിക്കുന്ന താളിലെ മാറ്റങ്ങൾക്കു പകരം ബന്ധപ്പെട്ട താളുകളിലെ മാറ്റങ്ങൾ കാണിക്കുക",
-	"recentchanges-page-added-to-category": "[[:$1]] വർഗ്ഗത്തിലേക്ക് ചേർത്തിരിക്കുന്നു",
-	"recentchanges-page-added-to-category-bundled": "[[:$1]] താളും ഒപ്പം {{PLURAL:$2|മറ്റൊരു താളും|$2 താളുകളും}} വർഗ്ഗത്തിലേക്ക് ചേർത്തിരിക്കുന്നു",
-	"recentchanges-page-removed-from-category": "[[:$1]] വർഗ്ഗത്തിൽ നിന്ന് നീക്കംചെയ്തു",
-	"recentchanges-page-removed-from-category-bundled": "[[:$1]] താളും ഒപ്പം {{PLURAL:$2|മറ്റൊരു താളും|$2 താളുകളും}} വർഗ്ഗത്തിൽ നിന്ന് നീക്കംചെയ്തിരിക്കുന്നു",
 	"upload": "അപ്‌ലോഡ്‌",
 	"uploadbtn": "പ്രമാണം അപ്‌ലോഡ് ചെയ്യുക",
 	"reuploaddesc": "വീണ്ടും അപ്‌ലോഡ് ചെയ്ത് നോക്കാനായി തിരിച്ചു പോവുക.",
@@ -1660,7 +1653,7 @@
 	"booksources-text": "പുതിയതും ഉപയോഗിച്ചതുമായ പുസ്തകങ്ങൾ വിൽക്കുന്ന സൈറ്റുകളിലേക്കുള്ള ലിങ്കുകളുടെ പട്ടിക ആണ്‌ താഴെ. താങ്കൾ തിരയുന്ന പുസ്തകത്തെ പറ്റിയുള്ള കൂടുതൽ വിവരങ്ങൾ ഈ പട്ടികയിൽ നിന്നു ലഭിച്ചേക്കാം:",
 	"booksources-invalid-isbn": "തന്നിരിക്കുന്ന ഐ.എസ്.ബി.എൻ. സാധുവാണെന്നു തോന്നുന്നില്ല; യഥാർത്ഥ സ്രോതസ്സിൽ നിന്നും പകർത്തിയപ്പോൾ തെറ്റുപറ്റിയോ എന്നു പരിശോധിക്കുക",
 	"specialloguserlabel": "നടപ്പിലാക്കിയയാൾ:",
-	"speciallogtitlelabel": "ലക്ഷ്യം (തലക്കെട്ട് അല്ലെങ്കിൽ ഉപയോക്താവ്) :",
+	"speciallogtitlelabel": "ലക്ഷ്യം (തലക്കെട്ട് അല്ലെങ്കിൽ ഉപയോക്താവിനെ തിരയാനുള്ള {{ns:user}}:ഉപയോക്തൃനാമം) :",
 	"log": "പ്രവർത്തനരേഖകൾ",
 	"all-logs-page": "എല്ലാ പൊതുരേഖകളും",
 	"alllogstext": "{{SITENAME}} സംരംഭത്തിൽ ലഭ്യമായ വിവിധ പ്രവർത്തന രേഖകൾ ഈ താളിൽ ഒരുമിച്ച് കാണാം. താങ്കൾക്ക് രേഖകളുടെ സ്വഭാവം, ഉപയോക്തൃനാമം (കേസ് സെൻസിറ്റീവ്), ബന്ധപ്പെട്ട താൾ (കേസ് സെൻസിറ്റീവ്) മുതലായവ തിരഞ്ഞെടുത്ത് അന്വേഷണം കൂടുതൽ ക്ഌപ്തപ്പെടുത്താവുന്നതാണ്.",
@@ -1746,7 +1739,6 @@
 	"emailuser": "ഈ ഉപയോക്താവിനു ഇമെയിൽ അയക്കുക",
 	"emailuser-title-target": "ഈ {{GENDER:$1|ഉപയോക്താവിന്}} ഇമെയിൽ അയയ്ക്കുക",
 	"emailuser-title-notarget": "ഉപയോക്താവിന് ഇമെയിൽ അയക്കുക",
-	"emailpage": "ഉപയോക്താവിന് ഇമെയിൽ അയക്കുക",
 	"emailpagetext": "താഴെ കാണുന്ന ഫോം ഈ {{GENDER:$1|ഉപയോക്താവിന്‌}} ഇമെയിൽ അയക്കാൻ ഉപയോഗിക്കാവുന്നതാണ്.\n[[Special:Preferences|ഉപയോക്താവിന്റെ ക്രമീകരണങ്ങളിൽ]] കൊടുത്തിട്ടുള്ള ഇമെയിൽ വിലാസം \"ദാതാവ്\" ആയി വരുന്നതാണ്‌, അതുകൊണ്ട് സ്വീകർത്താവിന്‌ താങ്കൾക്ക് നേരിട്ട് മറുപടി അയക്കാൻ കഴിയും.",
 	"defemailsubject": "\"$1\" എന്ന ഉപയോക്താവ് അയച്ച {{SITENAME}} ഇമെയിൽ",
 	"usermaildisabled": "ഉപയോക്തൃ ഇമെയിൽ പ്രവർത്തനരഹിതമാക്കിയിരിക്കുന്നു",
@@ -1768,7 +1760,7 @@
 	"emailccsubject": "$1 എന്ന ഉപയോക്താവിനയച്ച സന്ദേശത്തിന്റെ പകർപ്പ്: $2",
 	"emailsent": "ഇമെയിൽ അയച്ചിരിക്കുന്നു",
 	"emailsenttext": "താങ്കളുടെ ഇമെയിൽ അയച്ചു കഴിഞ്ഞിരിക്കുന്നു.",
-	"emailuserfooter": "ഈ ഇമെയിൽ, {{SITENAME}} സംരംഭത്തിലെ \"{{int:emailpage}}\" എന്ന സൗകര്യം ഉപയോഗിച്ച്, $1 എന്ന ഉപയോക്താവ് $2 എന്ന ഉപയോക്താവിന് അയച്ചതാണ്.",
+	"emailuserfooter": "ഈ ഇമെയിൽ, {{SITENAME}} സംരംഭത്തിലെ \"{{int:emailuser}}\" എന്ന സൗകര്യം ഉപയോഗിച്ച്, $1 എന്ന ഉപയോക്താവ് $2 എന്ന ഉപയോക്താവിന് അയച്ചതാണ്.",
 	"usermessage-summary": "വ്യവസ്ഥാസന്ദേശം ഉപേക്ഷിക്കുക.",
 	"usermessage-editor": "വ്യവസ്ഥാസന്ദേശകൻ",
 	"watchlist": "ശ്രദ്ധിക്കുന്നവ",
@@ -1859,6 +1851,7 @@
 	"changecontentmodel-reason-label": "കാരണം:",
 	"changecontentmodel-success-title": "ഉള്ളടക്കരീതി മാറിയിരിക്കുന്നു",
 	"changecontentmodel-success-text": "[[:$1]] എന്നതിന്റെ ഉള്ളടക്കരീതി മാറിയിട്ടുണ്ട്.",
+	"changecontentmodel-cannot-convert": "[[:$1]] താളിലെ ഉള്ളടക്കം $2 തരത്തിലേക്ക് മാറ്റാനാവില്ല.",
 	"logentry-contentmodel-change-revertlink": "പൂർവ്വസ്ഥിതിയിലാക്കുക",
 	"logentry-contentmodel-change-revert": "പൂർവ്വസ്ഥിതിയിലാക്കുക",
 	"protectlogpage": "സംരക്ഷണ പ്രവർത്തനരേഖ",
@@ -2331,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": "വ്യവസ്ഥാസന്ദേശം കാണുക",
@@ -3195,6 +3188,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": "സംരക്ഷണ സജ്ജീകരണങ്ങൾ $4  എന്നതിൽ നിന്ന് $3 എന്നതിലേക്ക് $1 {{GENDER:$2|മാറ്റി}}",
 	"logentry-rights-rights": "$3 എന്ന ഉപയോക്താവിന്റെ സംഘ അംഗത്വം, $4 എന്നതിൽ നിന്നു $5 എന്നതിലേക്ക്, $1 {{GENDER:$2|മാറ്റിയിരിക്കുന്നു}}",
 	"logentry-rights-rights-legacy": "$3 എന്ന ഉപയോക്താവിന്റെ സംഘ അംഗത്വം $1 {{GENDER:$2|മാറ്റിയിരിക്കുന്നു}}",
 	"logentry-rights-autopromote": "$1 എന്ന ഉപയോക്താവ് $4 എന്നതിൽ നിന്നും $5 എന്നതിലേയ്ക്ക് സ്വയമേവ {{GENDER:$2|ഉയർത്തപ്പെട്ടിരിക്കുന്നു}}",
diff --git a/languages/i18n/mn.json b/languages/i18n/mn.json
index 60f05c0c67..3c380d910e 100644
--- a/languages/i18n/mn.json
+++ b/languages/i18n/mn.json
@@ -521,7 +521,7 @@
 	"passwordreset-emailtitle": "{{SITENAME}}-н бүртгэлийн мэдээлэл",
 	"passwordreset-emailtext-ip": "Хэн нэгэн ($1 гэсэн IP хаягаас) {{SITENAME}} ($4) дээр таны бүртгэлийн сануулга авахаар хүссэн байна. Дараах {{PLURAL:$3|бүртгэл|бүртгэл}}\nуг е-шуудантай холбоотой:\n\n$2\n\n{{PLURAL:$3|Уг түр хэрэглэх нууц үг|Уг түр хэрэглэх нууц үгүүд}} нь {{PLURAL:$5|нэг өдрийн|$5 өдрийн}} дотор устах болно.\nТа уг нууц үгээр нэвтэрч, түүнийг шинэчлэх хэрэгтэй. Хэрэв өөр нэгэн уг хүсэлтийг явуулсан бол \nэсвэл өөрийн ориг нууц үгээ санаж байгаад түүнийгээ өөрчлөхийг хүсэхгүй байгаа бол энэ захиаг үл ойшоож \nэнгийнээр нэвтэрч болно.",
 	"passwordreset-emailtext-user": "{{SITENAME}} дээрх $1 хэрэглэгч {{SITENAME}} ($4) дээр өөрийн тань бүртгэл дээр сануулга хүссэн байна. \nДараах {{PLURAL:$3|бүртгэл|бүртгэлүүд}} уг е-шуудантай холбоотой байна:\n\n$2\n\nЭнэ {{PLURAL:$3|түр нууц үг|түр нууц үгс}} {{PLURAL:$5|нэг өдрийн дараа|$5 өдрийн дараа}} устах болно.\nТүүгээр нэвтэрч ороод нууц үгээ шинэчилнэ үү. Энэ сануулгыг өөр хэн нэгэн хийсэн, эсвэл та\nнууц үгээ санаж байгаа бол энэ захиаг анхааралгүйгээр хуучнаараа ороход болно.",
-	"passwordreset-emailelement": "Хэрэглэгчийн нэр: $1\nТүр зуурын нууц үг: $2",
+	"passwordreset-emailelement": "Хэрэглэгчийн нэр: \n$1\n\nТүр зуурын нууц үг: \n$2",
 	"passwordreset-emailsent": "Нууц үг солин емайл илгээсэн.",
 	"passwordreset-emailsent-capture": "Доор харагдаж байгаа нь танируу илгээсэн нууц үг ресет хийх емайл.",
 	"passwordreset-emailerror-capture": "Доор харагдаж байгаа нууц үг ресет хийх емайл үүссэх боловч {{GENDER:$2|хэрэглэгчид}} илгээхэд алдаа гарлаа : $1",
@@ -1596,7 +1596,6 @@
 	"emailuser": "Энэ хэрэглэгчид мэйл илгээх",
 	"emailuser-title-target": "Энэ {{GENDER:$1|хэрэглэгчийг}} и-мейлээр явуулах",
 	"emailuser-title-notarget": "И-мейл хэрэглэгч",
-	"emailpage": "Хэрэглэгчид мэйл илгээх",
 	"emailpagetext": "Энэ хэрэглэгч рүү мэйл илгээхэд доорхийг бөглөнө.\nТаны өөрийн [[Special:Preferences|хэрэглэгчийн тохиргоонд]] оруулсан мэйл хаяг нь \"Хэнээс\" гэсэн хэсэгт гарах тул хүлээн авагч хариугаа тань руу шууд илгээх боломжтой.",
 	"defemailsubject": "{{SITENAME}} дахь \"$1\" хэрэглэгчийн и-мэйл хаяг",
 	"usermaildisabled": "Хэрэглэгчийн и-мэйлийг идэвхигүйжүүлэв",
diff --git a/languages/i18n/mr.json b/languages/i18n/mr.json
index a2691a9c66..ef5cbdf7f8 100644
--- a/languages/i18n/mr.json
+++ b/languages/i18n/mr.json
@@ -216,6 +216,7 @@
 	"view-foreign": "$1 वर पहा",
 	"edit": "संपादन",
 	"create": "तयार करा",
+	"create-local": "स्थानिक वर्णन जोडा",
 	"editthispage": "हे पृष्ठ संपादित करा",
 	"create-this-page": "हे पान तयार करा",
 	"delete": "वगळा",
@@ -259,6 +260,7 @@
 	"pool-timeout": "ताळ्यासाठी वाट पाहण्याची वेळ संपली",
 	"pool-queuefull": "सर्व्हरवर ताण आहे.",
 	"pool-errorunknown": "अपरिचित त्रुटी",
+	"poolcounter-usage-error": "वापर त्रूटी:$1",
 	"aboutsite": "{{SITENAME}}बद्दल",
 	"aboutpage": "Project:माहितीपृष्ठ",
 	"copyright": "येथील मजकूर $1च्या अंतर्गत उपलब्ध आहे जोपर्यंत इतर नोंदी केलेल्या नाहीत.",
@@ -300,6 +302,7 @@
 	"hidetoc": "लपवा",
 	"collapsible-collapse": "निपात करा",
 	"collapsible-expand": "विस्तार",
+	"confirmable-confirm": "{{GENDER:$1|आपणास}}खात्री आहे काय?",
 	"confirmable-yes": "होय",
 	"confirmable-no": "नाही",
 	"thisisdeleted": "$1चे अवलोकन किंवा पुनर्स्थापन करायचे ?",
@@ -352,6 +355,8 @@
 	"filerenameerror": "\"$1\" संचिकेचे \"$2\" असे नामांतर करता आले नाही.",
 	"filedeleteerror": "\"$1\" संचिका वगळता आली नाही.",
 	"directorycreateerror": "\"$1\" कार्यधारीका (डिरेक्टरी) तयार केली जाऊ शकली नाही.",
+	"directoryreadonlyerror": "कोश \"$1\" ला फक्त वाचता येऊ शकते.",
+	"directorynotreadableerror": "कोश \"$1\" ला वाचता येऊ शकत नाही.",
 	"filenotfound": "\"$1\" ही संचिका सापडत नाही.",
 	"unexpected": "अनपेक्षित मूल्य: \"$1\"=\"$2\"",
 	"formerror": "त्रुटी: आवेदन सादर करता आले नाही.",
@@ -362,6 +367,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": "सध्या या पानाकरिता नवी अद्यतने अनुपलब्ध केली आहेत.आत्ताच येथील विदा तरोताजा होणार नाही.",
@@ -533,7 +542,7 @@
 	"passwordreset-emailtitle": "{{SITENAME}} वरील खात्याची माहिती",
 	"passwordreset-emailtext-ip": "कुणीतरी (कदाचित तुम्ही, अंकपत्ता $1 वरुन) {{SITENAME}}($4) करिता नविन 'परवलीचा शब्द' पुनर्स्थापनेबद्दल विनंती केली आहे.\nखालील{{PLURAL:$3|सदस्यखाते}}या विपत्रपत्त्याशी निगडीत आहे: \n\"$2\"\n{{PLURAL:$3|हा तात्पुरता परवलीचा शब्द|हे तात्पुरते परवलीचे शब्द}}{{PLURAL:$5|एक दिवस|$5 दिवसात}} मुदतबाह्य होतील.आता आपण लॉग-ईन करून  नविन परवलीचा शब्द निवडा.जर ईतर कोणी ही विनंती केली असेल,किंवा जर आपणास परवलीच शब्द आठवला असेल तर,व जर आपण तो बदलु इच्छित नसाल तर आपण हा संदेश टाळा व आपला जुना परवलीचा शब्द वापरणे सुरू ठेवा.",
 	"passwordreset-emailtext-user": " {{SITENAME}}वरील सदस्य $1ने {{SITENAME}}($4) करिता नविन 'परवलीचा शब्द' पुनर्स्थापनेबद्दल विनंती केली आहे.\nखालील{{PLURAL:$3|सदस्यखाते}}या विपत्रपत्त्याशी निगडीत आहे: \n\n\"$2\"\n\n{{PLURAL:$3|हा तात्पुरता परवलीचा शब्द|हे तात्पुरते परवलीचे शब्द}}{{PLURAL:$5|एक दिवस|$5 दिवसात}} मुदतबाह्य होतील.आता आपण लॉग-ईन करून  नविन परवलीचा शब्द निवडा.जर ईतर कोणी ही विनंती केली असेल,किंवा जर आपणास परवलीच शब्द आठवला असेल तर,व, जर आपण तो बदलु इच्छित नसाल तर आपण हा संदेश टाळा व आपला जुना परवलीचा शब्द वापरणे सुरू ठेवा.",
-	"passwordreset-emailelement": "सदस्यनाव: $1\nअस्थायी परवलीचा शब्द: $2",
+	"passwordreset-emailelement": "सदस्यनाव: \n$1\n\nअस्थायी परवलीचा शब्द: \n$2",
 	"passwordreset-emailsent": "'परवलीचा शब्द' पुनर्स्थापनेबाबत एक विपत्र पाठवण्यात आले आहे.",
 	"passwordreset-emailsent-capture": "'परवलीचा शब्द' पुनर्स्थापनेबाबत एक विपत्र पाठवण्यात आले आहे जे खाली दर्शविण्यात आले आहे.",
 	"passwordreset-emailerror-capture": "'परवलीचा शब्द' पुनर्स्थापनेबाबत एक विपत्र निर्माण करण्यात आले, जे खाली दर्शविण्यात आले आहे.परंतु,{{GENDER:$2|सदस्य}}ला पाठविणे असफल झाले: $1",
@@ -578,7 +587,7 @@
 	"preview": "झलक",
 	"showpreview": "झलक दाखवा",
 	"showdiff": "बदल दाखवा",
-	"anoneditwarning": "'''इशारा:''' तुम्ही विकिपीडियाचे सदस्य म्हणून सनोंद-प्रवेश (लॉग-इन) केलेला नाही. या पानाच्या संपादन इतिहासात तुमचा अंकपत्ता (आयपी) नोंदला जाईल.",
+	"anoneditwarning": "<strong>इशारा:</strong> तुम्ही विकिपीडियाचे सदस्य म्हणून सनोंद-प्रवेश (लॉग-इन) केलेले नाही.आपण काही संपादन केले तर, तुमचा अंकपत्ता (आयपी) सार्वजनिक रित्या दृष्य होईल. जर आपण <strong>[$1 सनोंद प्रवेश केला]</strong> किंवा <strong>[$2 खाते उघडले]</strong>,तर आपण केलेली संपादने ही आपल्या नांवाशी संलग्न होतील, त्याशिवाय याचे इतरही फायदे आहेत.",
 	"anonpreviewwarning": "\"'''सावधान:''' तुम्ही विकिपीडियाचे सदस्य म्हणून सनोंद-प्रवेश (लॉग-इन) केलेला नाही. या पानाच्या संपादन इतिहासात तुमचा अंकपत्ता (आय.पी. ॲड्रेस) नोंदला जाईल.\"",
 	"missingsummary": "'''आठवण:''' आपण संपादन सारांश पुरवलेला नाही.आपण 'जतन करा' वर पुन्हा टिचकी मारली तर, ते त्याशिवायच जतन होईल.",
 	"missingcommenttext": "कृपया खाली प्रतिक्रिया भरा.",
@@ -818,6 +827,7 @@
 	"showhideselectedversions": "निवडलेल्या आवृत्त्या दाखवा / लपवा",
 	"editundo": "उलटवा",
 	"diff-empty": "(काही फरक नाही)",
+	"diff-multi-sameuser": "({{PLURAL:$1|याच सदस्याची एक माध्यमिक आवृत्ती|$1 याच सदस्याच्या माध्यमिक आवृत्त्या}} दर्श्यविण्यात आलेल्या नाहीत)",
 	"diff-multi-manyusers": "{{PLURAL:$2|सदस्याची|$2 सदस्यांच्या}} ({{PLURAL:$1|आवृत्ती|$1 आवृत्त्या}} दाखवल्या नाहीत)",
 	"difference-missing-revision": "या लेखाचे/ची  ($1) हे {{PLURAL:$2|संस्करण|$2 संस्करणे}} {{PLURAL:$2|सापडले नाही|सापडली नाहीत}}.वगळल्या गेलेल्या लेखपानाच्या जुन्या इतिहास-दुव्याचे अनुसरण केल्यामुळे, शक्यतोवर,असे घडु शकते.याबाबत अधिक तपशील  [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} वगळलेल्या नोंदी] येथे बघता येईल.",
 	"searchresults": "शोध निकाल",
@@ -1623,7 +1633,6 @@
 	"emailuser": "या सदस्याला ई-मेल पाठवा",
 	"emailuser-title-target": "{{GENDER:$1|सदस्याला}} विपत्र पाठवा",
 	"emailuser-title-notarget": "विपत्र (ईमेल) उपयोगकर्ता",
-	"emailpage": "विपत्र (ईमेल) उपयोगकर्ता",
 	"emailpagetext": "या {{GENDER:$1|सदस्याला}}विपत्र पाठविण्यास खालील आवेदनाचा आपण वापर करु शकता.\n\nआपल्या [[Special:Preferences|पसंतीक्रमात]] नमूद केलेला विपत्रपत्ता, \"च्या कडून\" पत्त्यात येईल म्हणजे  प्राप्तकर्ता आपल्याला थेट उत्तर देऊ शकेल.",
 	"defemailsubject": "{{SITENAME}} \"$1\" सदस्याकडून विपत्र",
 	"usermaildisabled": "सदस्य विपत्र निष्क्रिय आहे",
@@ -2143,8 +2152,9 @@
 	"tooltip-pt-mycontris": "तुमच्या योगदानांची यादी",
 	"tooltip-pt-login": "आपणांस सदस्यत्व घेण्याची विनंती करण्यात येत आहे. सदस्यत्व घेणे अनिवार्य नाही.",
 	"tooltip-pt-logout": "सनोंद निर्गम",
+	"tooltip-pt-createaccount": "आम्ही आपणास खाते उघडून सनोंद-प्रवेशास प्रोत्साहीत करत आहे;पण ते अत्यावश्यक नाही.",
 	"tooltip-ca-talk": "आशय पानाबद्दलच्या चर्चा",
-	"tooltip-ca-edit": "तुम्ही हे पान बद्लू शकता. कृपया जतन करण्यापूर्वी झलक कळ वापरून पहा.",
+	"tooltip-ca-edit": "या पानाचे संपादन करा",
 	"tooltip-ca-addsection": "नवीन विभाग सुरू करा",
 	"tooltip-ca-viewsource": "हे पान सुरक्षित आहे. तुम्ही याचा स्रोत पाहू शकता.",
 	"tooltip-ca-history": "या पानाच्या जुन्या आवृत्या.",
@@ -2179,7 +2189,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": "सिस्टीम संदेश पहा",
@@ -2217,7 +2227,7 @@
 	"spam_reverting": "$1शी दुवे नसलेल्या गेल्या आवर्तनाकडे परत उलटवत आहे",
 	"spam_blanking": "$1शी दुवे असलेली सर्व आवर्तने,रिक्त केली जात आहेत",
 	"spam_deleting": "यातील सर्व आवृत्त्यांचे $1शी दुवे आहेत.गाळत आहे",
-	"simpleantispam-label": "चिखलणी विरोधक तपासणी.\nहे भरू '''नका'''!",
+	"simpleantispam-label": "चिखलणी विरोधक तपासणी.\nहे<strong>भरु नका</strong>!\nहे भरू '''नका'''!",
 	"pageinfo-title": "\"$1\" च्याबद्दल माहिती",
 	"pageinfo-not-current": "माफ करा, जुन्या अवृतिला माहिती देणे अक्षक्य आहे|",
 	"pageinfo-header-basic": "मूलभूत माहिती",
@@ -2914,6 +2924,7 @@
 	"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|बढती दिल्या गेली}}",
+	"logentry-upload-upload": "$1 {{GENDER:$2|अपभारीत केली}} $3",
 	"rightsnone": "(काहीही नाही)",
 	"revdelete-summary": "संपादन माहिती",
 	"feedback-adding": "आपला पश्चप्रदाय (फिडबॅक)  जोडत आहोत या पानास.......",
diff --git a/languages/i18n/ms.json b/languages/i18n/ms.json
index 19d108922e..1a7d7d9d15 100644
--- a/languages/i18n/ms.json
+++ b/languages/i18n/ms.json
@@ -534,7 +534,7 @@
 	"passwordreset-emailtitle": "Butiran akaun di {{SITENAME}}",
 	"passwordreset-emailtext-ip": "Seseorang (mungkin anda, dari alamat IP $1) telah memohon supaya kata laluan diset semula untuk {{SITENAME}} anda ($4). {{PLURAL:$3|Akaun|Akaun-akaun}} pengguna yang berikut\ndikaitkan dengan alamat e-mel ini:\n\n$2\n\n{{PLURAL:$3|Kata|Kata-kata}} laluan sementara ini akan luput dalam masa $5 hari. Anda harus log masuk dan membuat kata laluan yang baru sekarang. Jika permohonan ini dibuat oleh orang lain, atau jika anda teringat kembali kata laluan asal anda dan anda tidak lagi berhasrat untuk mengubahnya, anda boleh mengabaikan pesanan ini dan terus menggunakan kata laluan lama anda.",
 	"passwordreset-emailtext-user": "Pengguna $1 telah memohon supaya kata laluan diset semula untuk {{SITENAME}} anda ($4). {{PLURAL:$3|Akaun|Akaun-akaun}} pengguna yang berikut\ndikaitkan dengan alamat e-mel ini:\n\n$2\n\n{{PLURAL:$3|Kata|Kata-kata}} laluan sementara ini akan luput dalam masa $5 hari. Anda harus log masuk dan membuat kata laluan yang baru sekarang. Jika permohonan ini dibuat oleh orang lain, atau jika anda teringat kembali kata laluan asal anda dan anda tidak lagi berhasrat untuk mengubahnya, anda boleh mengabaikan pesanan ini dan terus menggunakan kata laluan lama anda.",
-	"passwordreset-emailelement": "Nama pengguna: $1\nKata laluan sementara: $2",
+	"passwordreset-emailelement": "Nama pengguna: \n$1\n\nKata laluan sementara: \n$2",
 	"passwordreset-emailsent": "E-mel set semula kata laluan telah dihantar.",
 	"passwordreset-emailsent-capture": "E-mel set semula kata laluan telah dihantar, seperti yang dipaparkan di bawah.",
 	"passwordreset-emailerror-capture": "E-mel set semula kata laluan telah dihasilkan, seperti yang dipaparkan di bawah, tetapi tidak berjaya dihantar kepada {{GENDER:$2|pengguna}} berkenaan: $1",
@@ -1725,7 +1725,6 @@
 	"emailuser": "Kirim e-mel kepada pengguna ini",
 	"emailuser-title-target": "E-mel {{GENDER:$1|pengguna}} ini",
 	"emailuser-title-notarget": "E-mel pengguna",
-	"emailpage": "E-mel pengguna",
 	"emailpagetext": "Gunakan borang berikut untuk mengirim pesanan e-mel kepada {{GENDER:$1|pengguna}} ini.\n\nAlamat e-mel yang ditetapkan dalam [[Special:Preferences|keutamaan anda]] akan digunakan sebagai alamat \"Daripada\" dalam e-mel tersebut supaya si penerima boleh membalasnya.",
 	"defemailsubject": "E-mel {{SITENAME}} daripada pengguna \"$1\"",
 	"usermaildisabled": "E-mel pengguna telah dilumpuhkan",
@@ -1747,7 +1746,7 @@
 	"emailccsubject": "Salinan bagi mesej anda kepada $1: $2",
 	"emailsent": "E-mel dikirim",
 	"emailsenttext": "E-mel anda telah dikirim.",
-	"emailuserfooter": "E-mel ini telah dikirim oleh $1 kepada $2 oleh fungsi \"{{int:emailpage}}\" di {{SITENAME}}.",
+	"emailuserfooter": "E-mel ini telah dikirim oleh $1 kepada $2 oleh fungsi \"{{int:emailuser}}\" di {{SITENAME}}.",
 	"usermessage-summary": "Meninggalkan pesanan sistem.",
 	"usermessage-editor": "Utusan sistem",
 	"watchlist": "Senarai pantau",
diff --git a/languages/i18n/mt.json b/languages/i18n/mt.json
index 361049cd94..a8b84f9e4c 100644
--- a/languages/i18n/mt.json
+++ b/languages/i18n/mt.json
@@ -519,7 +519,7 @@
 	"passwordreset-emailtitle": "Dettalji tal-kont fuq {{SITENAME}}",
 	"passwordreset-emailtext-ip": "Xi ħadd (probabbilment int, mill-indirizz IP $1) għamel rikjesta sabiex jingħata password ġdida sabiex jaċċessa l-{{SITENAME}} ($4). L-{{PLURAL:$3|utent assoċjat|utenti assoċjati}} ma' dan l-indirizz elettroniku {{PLURAL:$3|huwa|huma}}:\n\n$2\n\n{{PLURAL:$3|Din il-password temporanja se tiskadi|Dawn il-passwords temporanji se jiskadu}} fi żmien {{PLURAL:$5|ġurnata|$5 jum}}. Inti għadek tidħol fil-kont tiegħek u tagħżel password ġdida issa. Jekk xi ħadd ieħor għamel din ir-rikjesta, jew jekk ftakart il-password oriġinali, u m'għadekx trid tbiddilha, inti tista' tinjora dan il-messaġġ u tibqa' tuża' l-password il-qadima.",
 	"passwordreset-emailtext-user": "{{PLURAL:$3|Din il-password temporanja se tiskadi|Dawn il-passwords temporanji se jiskadu}} fi żmien {{PLURAL:$5|ġurnata|$5 jum}}. Inti għadek tidħol fil-kont tiegħek u tagħżel password ġdida issa. Jekk xi ħadd ieħor għamel din ir-rikjesta, jew jekk ftakart il-password oriġinali, u m'għadikx trid tbiddilha, inti tista' tinjora dan il-messaġġ u tibqa' tuża' l-password il-qadima.",
-	"passwordreset-emailelement": "Isem tal-utent: $1\nPassword temporanja: $2",
+	"passwordreset-emailelement": "Isem tal-utent: \n$1\n\nPassword temporanja: \n$2",
 	"passwordreset-emailsent": "Intbagħtet ittra-e għall-issettjar mill-ġdid tal-password.",
 	"passwordreset-emailsent-capture": "Intbagħtet ittra-e għall-ssettjar mill-ġdid tal-password u l-kontenut jidher hawn taħt.",
 	"passwordreset-emailerror-capture": "Ġiet ġenerata ittra-e ta' tfakkira, li l-kontenut tagħha jidher hawn taħt. Madanakollu, il-posta ma ntbagħtitx lill-utent: $1",
@@ -1608,7 +1608,6 @@
 	"emailuser": "Ikteb lil dan l-utent",
 	"emailuser-title-target": "Ibgħat lill-{{GENDER:$1|utent}}",
 	"emailuser-title-notarget": "Ibgħat ittre lil utent",
-	"emailpage": "Ibgħat messaġġ lil dan l-utent bil-posta elettronika",
 	"emailpagetext": "Tista' tuża' din il-formola t'hawn taħt sabiex tibgħat ittra elettronika lil dan l-{{GENDER:$1|utent}}.\nL-indirizz elettroniku li daħħalt fil-[[Special:Preferences|preferenzi]] jidher fl-ispazju \"Minn\" tal-messaġġ, biex dak li jirċievi l-messaġġ ikun jista' jagħtik risposta.",
 	"defemailsubject": "Messaġ minn {{SITENAME}} mingħand l-utent \"$1\"",
 	"usermaildisabled": "Il-posta elettronika tal-utent mhux attivata",
@@ -1630,7 +1629,7 @@
 	"emailccsubject": "Kopja tal-messaġġ tiegħek lil $1: $2",
 	"emailsent": "Il-messaġġ intbagħat",
 	"emailsenttext": "Il-messaġġ bil-posta elettronika intbagħat.",
-	"emailuserfooter": "Din il-posta elettronika intbgħatet minn $1 lil $2 bl-użu tal-funzjoni \"{{int:emailpage}}\" fuq {{SITENAME}}.",
+	"emailuserfooter": "Din il-posta elettronika intbgħatet minn $1 lil $2 bl-użu tal-funzjoni \"{{int:emailuser}}\" fuq {{SITENAME}}.",
 	"usermessage-summary": "Messaġġ tas-sistema",
 	"usermessage-editor": "Messaġġier tas-sistema",
 	"watchlist": "Lista ta' osservazzjonijiet",
diff --git a/languages/i18n/myv.json b/languages/i18n/myv.json
index 79140a7e51..98983727b5 100644
--- a/languages/i18n/myv.json
+++ b/languages/i18n/myv.json
@@ -11,7 +11,8 @@
 			"Tupikovs",
 			"Urhixidur",
 			"Игорь Бродский",
-			"아라"
+			"아라",
+			"Denö"
 		]
 	},
 	"tog-underline": "Сюлмавома петнень алга черькстамс:",
@@ -419,7 +420,7 @@
 	"passwordreset": "Одов ладямс салававал",
 	"passwordreset-username": "Теиця леметь:",
 	"passwordreset-email": "Е-сёрмапаргот:",
-	"passwordreset-emailelement": "Теицянь леметь: $1\nНурькине шкань салававалот: $2",
+	"passwordreset-emailelement": "Теицянь леметь: \n$1\n\nНурькине шкань салававалот: \n$2",
 	"changeemail-oldemail": "Неень е-сёрмапаргот:",
 	"changeemail-newemail": "Од е-сёрмапаргот:",
 	"changeemail-none": "(арась мезе невтемс)",
@@ -776,6 +777,7 @@
 	"rcshowhideminor-hide": "Кекшемс",
 	"rcshowhidebots": "$1 ботт",
 	"rcshowhidebots-show": "Невтемс",
+	"rcshowhidebots-hide": "Кекшемс",
 	"rcshowhideliu": "$1 совавтозь теицят",
 	"rcshowhideliu-hide": "Кекшемс",
 	"rcshowhideanons": "$1 лемтеме теицят",
@@ -1030,7 +1032,6 @@
 	"listgrouprights-removegroup-all": "Весе куротнень нардамс",
 	"mailnologin": "Кучомс сёрма парго арась",
 	"emailuser": "Кучомс е-сёрма те теицянтень",
-	"emailpage": "Кучт э-сёрма теицянтень",
 	"defemailsubject": "{{SITENAME}} е-сёрма \"$1\"-нь пельде",
 	"usermaildisabled": "Теицянь е-сёрмась пекстазь",
 	"noemailtitle": "Е-сёрма парго арась",
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/nan.json b/languages/i18n/nan.json
index 63d9878b2d..2373ab7fe2 100644
--- a/languages/i18n/nan.json
+++ b/languages/i18n/nan.json
@@ -457,7 +457,7 @@
 	"passwordreset": "Têng siat bi̍t-bé",
 	"passwordreset-username": "Lí ê iōng-chiá miâ-chheng:",
 	"passwordreset-email": "Tiān-chú-phoe tē-chí:",
-	"passwordreset-emailelement": "Iōng-chiá: $1\nLîm-sî ê bi̍t-bé: $2",
+	"passwordreset-emailelement": "Iōng-chiá: \n$1\n\nLîm-sî ê bi̍t-bé: \n$2",
 	"passwordreset-emailsent": "Têng siat bi̍t-bé ê tiān-chú-phoe í-keng kià chhut-khì ah.",
 	"changeemail": "Kái tiān-chú-phoe ê tē-chí",
 	"changeemail-oldemail": "Chit-má ê E-mail tē-chí:",
@@ -763,7 +763,6 @@
 	"mailnologin": "Bô siu-phoe ê chū-chí",
 	"mailnologintext": "Lí it-tēng ài [[Special:UserLogin|teng-ji̍p]] jī-chhiáⁿ ū 1 ê ū-hāu ê e-mail chū-chí tī lí ê [[Special:Preferences|iōng-chiá siat-tēng]] chiah ē-tàng kià e-mail hō· pa̍t-ūi iōng-chiá.",
 	"emailuser": "Kià e-mail hō· iōng-chiá",
-	"emailpage": "E-mail iōng-chiá",
 	"emailpagetext": "Ká-sú chit ê iōng-chiá ū siat-tēng 1 ê ū-hāu ê e-mail chū-chí, lí tō ē-tàng ēng ē-kha chit tiuⁿ FORM hoat sìn-sek hō· i. Lí siat-tēng ê e-mail chū-chí ē chhut-hiān tī e-mail ê \"Kià-phoe-jîn\" (From) hit ūi. Án-ne siu-phoe-jîn chiah ū hoat-tō· kā lí hôe-phoe.",
 	"noemailtitle": "Bô e-mail chū-chí",
 	"noemailtext": "Chit ūi iōng-chiá pēng-bô lâu ū-hāu ê e-mail chū-chí, bô tio̍h-sī i bô beh chiap-siū pat-ūi iōng-chiá ê e-mail.",
diff --git a/languages/i18n/nap.json b/languages/i18n/nap.json
index 96ee1c14ed..e2b375cfc1 100644
--- a/languages/i18n/nap.json
+++ b/languages/i18n/nap.json
@@ -16,9 +16,8 @@
 	},
 	"tog-underline": "Sottolinia 'e jonte:",
 	"tog-hideminor": "Annascunne 'e cagne piccirille  'int'a ll'úrdeme cagne",
-	"tog-hidepatrolled": "Annascunne 'e cagne 'verificate' 'int'a ll'úrdeme cagne",
+	"tog-hidepatrolled": "Annascunne 'e cagne 'verificate' 'a ll'úrdeme cagnamiente",
 	"tog-newpageshidepatrolled": "Annascunne 'e paggene cuntrullate 'a ll'elenco 'e ppaggene",
-	"tog-hidecategorization": "Annascunne 'a categorizzaziona d' 'e paggene",
 	"tog-extendwatchlist": "Spanne ll'asservate speciale pe fà vedé tutte 'e cagnàmiente, nun solo l'ultimo",
 	"tog-usenewrc": "Urdeme càgnamiente avanzate (JavaScript)",
 	"tog-numberheadings": "Annúmmera automatecamente 'e títule",
@@ -48,7 +47,6 @@
 	"tog-watchlisthideliu": "Annascunne 'e cagnamiénte 'e l'utente riggistrate 'a l'elenco 'e cuntrollo",
 	"tog-watchlisthideanons": "Annascunne 'e cagnamiente fatte d'anonime 'a l'elenco 'e cuntrollo",
 	"tog-watchlisthidepatrolled": "Annascunne 'e modifiche cuntrullate 'a l'elenco 'e cuntrollo",
-	"tog-watchlisthidecategorization": "Annascunne 'a categorizzazione d' 'e paggene",
 	"tog-ccmeonemails": "Famme na masciata pùre c' 'a copia 'e le mail mannate a l'ati utente",
 	"tog-diffonly": "Nun me fà vedé cuntenute aropp'o cunfronto nfra verziune",
 	"tog-showhiddencats": "Fa' vedé 'e categurie annascunnute",
@@ -166,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",
@@ -207,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",
@@ -433,6 +431,7 @@
 	"createacct-benefit-body2": "{{PLURAL:$1|paggena|paggene}}",
 	"createacct-benefit-body3": "{{PLURAL:$1|contribbutòre recente|contribbuttore recente}}",
 	"badretype": "'E passwords ch'è mis nun songe eguale.",
+	"usernameinprogress": "Na criazione 'e cunto pe' st'utente è già nprugresso. Pe' piacere aspettate.",
 	"userexists": "'O nomme utente ch'avete miso è già ausàto.\nPe' piacere sciglite n'atu nomme.",
 	"loginerror": "Probblema 'e accièsso",
 	"createacct-error": "Errore 'e criazione 'e cunto",
@@ -468,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",
@@ -522,7 +521,7 @@
 	"passwordreset-emailtitle": "Dettaglie d' 'o cunto pe' {{SITENAME}}",
 	"passwordreset-emailtext-ip": "Coccherun (può darse ca sì tu, cu n'indirizzo IP $1) ha addimannato na mmasciata c' 'a password nova pe' putè trasì a {{SITENAME}} ($4). {{PLURAL:$3|L'utente associato|L'utente associate}} a st'indirizze e-mail songo:\n\n$2\n\n{{PLURAL:$3|Sta password temporanea ammaturarrà|Sti password temporanee ammaturarranno}} aropp'a {{PLURAL:$5|nu juorno|$5 ghiuorne}}.\nHè 'a trasì e scegliere na password nova mò. \n\nSi nun sì stato tu a fà sta richiesta, o te sì scurdat' 'a password origginale e nun 'a buò cagnà cchiù, lassa perde sta mmasciata e usa 'a password viecchia.",
 	"passwordreset-emailtext-user": "L'utente $1 di {{SITENAME}} ha addimannato na mmasciata c' 'a password nova pe' putè trasì a {{SITENAME}} ($4). {{PLURAL:$3|L'utente associato|L'utente associate}} a st'indirizze e-mail songo:\n\n$2\n\n{{PLURAL:$3|Sta password temporanea ammaturarrà|Sti password temporanee ammaturarranno}} aropp'a {{PLURAL:$5|nu juorno|$5 ghiuorne}}.\nHè 'a trasì e scegliere na password nova mò. \n\nSi nun sì stato tu a fà sta richiesta, o te sì scurdat' 'a password origginale e nun 'a buò cagnà cchiù, lassa perde sta mmasciata e usa 'a password viecchia.",
-	"passwordreset-emailelement": "Nomme utente: $1\nPassword temporanea: $2",
+	"passwordreset-emailelement": "Nomme utente: \n$1\n\nPassword temporanea: \n$2",
 	"passwordreset-emailsent": "Na mmasciata e-mail pe' riabbià 'a password è stata mannata.",
 	"passwordreset-emailsent-capture": "Na mmasciata e-mail pe' riabbià 'a password è stata mannata, chista mmasciata 'a putite vedé ccà abbascio.",
 	"passwordreset-emailerror-capture": "Na mmasciata e-mail pe' riabbià 'a password è stata mannata, 'a putite vedé ccà abbascio, ma aita sapé ca nun s'è mannata a {{GENDER:$2|l'utente}} pecché c'è stato cocch'errore: $1",
@@ -547,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",
@@ -560,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",
@@ -666,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",
@@ -919,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}}",
@@ -1193,9 +1193,6 @@
 	"rcshowhidemine": "$1 'e ffatiche mieie",
 	"rcshowhidemine-show": "Faje vedé",
 	"rcshowhidemine-hide": "Annascunne",
-	"rcshowhidecategorization": "$1 categorizzaziona d' 'a paggena",
-	"rcshowhidecategorization-show": "Faje vedé",
-	"rcshowhidecategorization-hide": "Annascunne",
 	"rclinks": "Faje vedé ll'urdeme $1 cagnamiente dint' ll'urdeme $2 juorne<br />$3",
 	"diff": "diff",
 	"hist": "cron",
@@ -1217,12 +1214,8 @@
 	"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",
-	"recentchanges-page-added-to-category": "[[:$1]] azzeccato â categurìa",
-	"recentchanges-page-added-to-category-bundled": "[[:$1]] e {{PLURAL:$2|na paggena|$2 paggene}} azzeccate â categurìa",
-	"recentchanges-page-removed-from-category": "[[:$1]] luvato d' 'a categurìa",
-	"recentchanges-page-removed-from-category-bundled": "[[:$1]] e {{PLURAL:$2|na paggena|$2 paggena}} luvate d' 'a categurìa",
 	"upload": "Carreca file",
 	"uploadbtn": "Carreca file",
 	"reuploaddesc": "Torna a 'o modulo pe ffà 'a carreca",
@@ -1641,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).",
@@ -1727,7 +1720,6 @@
 	"emailuser": "Email chisto utente",
 	"emailuser-title-target": "Manna n'email a chist'{{GENDER:$1|utente}}",
 	"emailuser-title-notarget": "E-mail 'e l'utente",
-	"emailpage": "E-mail 'e l'utente",
 	"emailpagetext": "Putite ausà 'o modulo ccà abbascio pe' mannà na mmasciata e-mail a st'{{GENDER:$1|utente}}.\nL'indirizzo e-mail ch'avite nzertàto dint' 'e [[Special:Preferences|preferenze vuoste]] accumpararrà dint' 'o campo \"'A\" dint' 'a mmasciata e-mail, accussì chillo ca ricevese 'a mail 'o sape ca v'avess'a risponnere direttamente a vuje.",
 	"defemailsubject": "e-mail 'e {{SITENAME}} 'a l'utente \"$1\"",
 	"usermaildisabled": "L'e-mail utente è stutato",
@@ -1749,7 +1741,7 @@
 	"emailccsubject": "Copia d' 'a mmasciata tua 'a $1: $2",
 	"emailsent": "Mmasciata e-mail mannata",
 	"emailsenttext": "'A mmasciata d' 'a toja s'è mannata.",
-	"emailuserfooter": "Chista mmasciata e-mail è stata mannata 'a $1 a $2 p' 'a funziona \"{{int:emailpage}}\" 'e {{SITENAME}}.",
+	"emailuserfooter": "Chista mmasciata e-mail è stata mannata 'a $1 a $2 p' 'a funziona \"{{int:emailuser}}\" 'e {{SITENAME}}.",
 	"usermessage-summary": "Lassanno na mmasciata 'e sistema.",
 	"usermessage-editor": "Mmasciatore d' 'o sistema",
 	"watchlist": "Paggene cuntrullate",
@@ -1990,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",
@@ -2302,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",
@@ -2319,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",
@@ -3162,6 +3154,7 @@
 	"logentry-newusers-create2": "'O cunto utente $3 fuje {{GENDER:$2|criato|criata}} pe' $1",
 	"logentry-newusers-byemail": "'O cunto utente $3 fuje {{GENDER:$2|criato|criata}} pe' $1 e 'a passuor è stata mannata pe' bbìa 'e na mmasciata e-mail",
 	"logentry-newusers-autocreate": "'O cunto utente $1 fuje {{GENDER:$2|criato|criata}} automatecamente",
+	"logentry-protect-move_prot": "$1 {{GENDER:$2|spustaje}} mpustaziune 'e pruteziona 'a $4 a $3",
 	"logentry-rights-rights": "$1 {{GENDER:$2|cagnaje}} 'e gruppo pe' $3 'a $4 a $5",
 	"logentry-rights-rights-legacy": "$1 {{GENDER:$2|cagnaje}} 'e gruppo pe' $3",
 	"logentry-rights-autopromote": "$1 è {{GENDER:$2|stato promosso|stata promossa}} automatecamente 'a $4 a $5",
@@ -3306,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 Ausanno Git pe' puté scarrecà skin].\n: A ffà chesto nun avesse nteferì c' 'o repositorio d' 'o git vuosto, si vuje site sviluppatore MediaWiki. Vedite [https://www.mediawiki.org/wiki/Manual:Skin_configuration Manuale: Mpustaziona skin] pe' n'avé nfurmaziune ncopp'a comme s'avesser'appiccià skin e scegliere 'o valore predefinito.",
 	"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 630cb5b865..0297d4140d 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",
@@ -554,7 +556,7 @@
 	"passwordreset-emailtitle": "Kontodetaljer på {{SITENAME}}",
 	"passwordreset-emailtext-ip": "Noen (sannsynligvis deg fra IP-adressen $1) ba om en tilbakestilling av ditt passord for {{SITENAME}} ($4). {{PLURAL:$3|Den følgende brukerkontoen|De følgende brukerkontoene}} er\ntilknyttet denne e-postadressen:\n\n$2\n\n{{PLURAL:$3|Dette midlertidige passordet|Disse midlertidige passordene}} utløper om {{PLURAL:$5|én dag|$5 dager}}.\nDu bør logge på og velge et nytt passord nå. Dersom noen andre kom med denne\nforespørselen, eller du har kommet på ditt opprinnelige passord, og ikke lenger\nønsker å endre det, kan du ignorere denne meldingen og fortsette å bruke ditt gamle\npassord.",
 	"passwordreset-emailtext-user": "Brukeren $1 på {{SITENAME}} ba om en tilbakestilling av passordet ditt for {{SITENAME}}\n($4). {{PLURAL:$3|Den følgende brukerkontoen|De følgende brukerkontoene}} er tilknyttet denne e-postadressen:\n\n$2\n\n{{PLURAL:$3|Dette midlertidige passordet|Disse midlertidige passordene}} utløper om {{én dag|$5 dager}}.\nDu bør logge på og velge et nytt passord nå. Dersom noen andre kom med denne\nforespørselen, eller du har kommet på ditt opprinnelige passord, og ikke lenger\nønsker å endre det, kan du ignorere denne meldingen og fortsette å bruke ditt gamle\npassord.",
-	"passwordreset-emailelement": "Brukernavn: $1\nMidlertidig passord: $2",
+	"passwordreset-emailelement": "Brukernavn: \n$1\n\nMidlertidig passord: \n$2",
 	"passwordreset-emailsent": "En passordtilbakestillingslenke har blitt sendt per e-post.",
 	"passwordreset-emailsent-capture": "Passordtilbakestillingseposten vist under har blitt sendt ut.",
 	"passwordreset-emailerror-capture": "En passordtilbakestillingsepost ble laget, men det lyktes ikke å sende denne til {{GENDER:$2|brukeren}}: $1",
@@ -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",
@@ -1732,7 +1736,6 @@
 	"emailuser": "E-post til denne brukeren",
 	"emailuser-title-target": "Send e-post til denne {{GENDER:$1|brukeren}}",
 	"emailuser-title-notarget": "E-post til bruker",
-	"emailpage": "E-post til bruker",
 	"emailpagetext": "Du kan bruke skjemaet under for å sende en e-post til denne {{GENDER:$1|brukeren}}.\nE-postadressen du har satt i [[Special:Preferences|innstillingene dine]] vil vises i «Fra»-feltet i e-posten, slik at mottakeren kan svare deg direkte.",
 	"defemailsubject": "E-post fra {{SITENAME}}-brukeren «$1»",
 	"usermaildisabled": "Brukerepost deaktivert",
@@ -1754,7 +1757,7 @@
 	"emailccsubject": "Kopi av din beskjed til $1: $2",
 	"emailsent": "E-post sendt",
 	"emailsenttext": "E-postbeskjeden er sendt",
-	"emailuserfooter": "Denne e-posten ble sendt av $1 til $2 via funksjonen «{{int:emailpage}}» på {{SITENAME}}.",
+	"emailuserfooter": "Denne e-posten ble sendt av $1 til $2 via funksjonen «{{int:emailuser}}» på {{SITENAME}}.",
 	"usermessage-summary": "Etterlater en systembeskjed.",
 	"usermessage-editor": "Systembudbringer",
 	"watchlist": "Overvåkningsliste",
@@ -2013,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",
@@ -2226,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.",
@@ -2255,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.",
@@ -2275,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",
@@ -2352,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",
@@ -2831,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/nds-nl.json b/languages/i18n/nds-nl.json
index e5cdad26fb..0e312ba720 100644
--- a/languages/i18n/nds-nl.json
+++ b/languages/i18n/nds-nl.json
@@ -505,7 +505,7 @@
 	"passwordreset-emailtitle": "Gebrukersgegevens op {{SITENAME}}",
 	"passwordreset-emailtext-ip": "Der hef der ene, waorschienlik jie zelf vanaof t IP-adres $1, n anvraag edaon um joew wachtwoord veur {{SITENAME}} ($4) opniej in te stellen.\nDe volgende {{PLURAL:$3|gebruker is|gebrukers bin}} ekoppeld an dit netpostadres:\n\n$2\n\n{{PLURAL:$3|Dit tiejelike wachtwoord vervölt|Disse tiejelike wachtwoorden vervallen}} over {{PLURAL:$5|één dag|$5 dagen}}.\nMeld je eigen noen an en wiezig t wachtwoord. A'j dit verzeuk niet zelf edaon hebben, of a'j t oorspronkelike wachtwoord nog kennen en t niet wiezigen willen, negeer dit bericht dan en blief joew ouwe wachtwoord gebruken.",
 	"passwordreset-emailtext-user": "De gebruker $1 van {{SITENAME}} hef n anvraag edaon um joew wachtwoord veur {{SITENAME}} ($4) opniej in te stellen. \nDe volgende {{PLURAL:$3|gebruker is|gebrukers bin}} ekoppeld an dit netpostadres:\n\n$2\n\n{{PLURAL:$3|Dit tiejelike wachtwoord vervölt|Disse tiejelike wachtwoorden vervallen}} over {{PLURAL:$5|één dag|$5 dagen}}.\nMeld je eigen noen an en wiezig t wachtwoord. A'j dit verzeuk niet zelf edaon hebben, of a'j t oorspronkelike wachtwoord nog kennen en t niet wiezigen willen, negeer dit bericht dan en blief joew ouwe wachtwoord gebruken.",
-	"passwordreset-emailelement": "Gebrukersnaam: $1\nTiedelik wachtwoord: $2",
+	"passwordreset-emailelement": "Gebrukersnaam: \n$1\n\nTiedelik wachtwoord: \n$2",
 	"passwordreset-emailsent": "Der is n bericht verstuurd um t wachtwoord opniej in te stellen.",
 	"passwordreset-emailsent-capture": "Der is n bericht verstuurd um joew wachtwoord opniej in te stellen. Dit ku'j hieronder lezen.",
 	"passwordreset-emailerror-capture": "Der is n bericht veur t opniej opstellen van joew wachwoord an-emaakt, dit ku'j hieronder lezen. t Versturen naor de {{GENDER:$2|gebruker}} is mislokt um de volgende reden: $1",
@@ -1585,7 +1585,6 @@
 	"emailuser": "n Bericht sturen",
 	"emailuser-title-target": "Disse {{GENDER:$1|gebruker}} n bericht sturen",
 	"emailuser-title-notarget": "Gebruker n bericht sturen",
-	"emailpage": "Gebruker n bericht sturen",
 	"emailpagetext": "Deur middel van dit formulier ku'j n bericht sturen naor disse {{GENDER:$1|gebruker}}.\nt Adres da'j op-egeven hebben bie [[Special:Preferences|joew veurkeuren]] zal as aofzender gebruukt wörden.\nDe ontvanger kan dus drek beantwoorden.",
 	"defemailsubject": "Bericht van {{SITENAME}}-gebruker \"$1\"",
 	"usermaildisabled": "n Persoonlik berichjen sturen geet niet.",
diff --git a/languages/i18n/ne.json b/languages/i18n/ne.json
index 059c931c7f..510ef794e6 100644
--- a/languages/i18n/ne.json
+++ b/languages/i18n/ne.json
@@ -219,7 +219,7 @@
 	"viewhelppage": "सहायता पृष्ठ हेर्ने",
 	"categorypage": "श्रेणी पृष्ठ हेर्नुहोस्",
 	"viewtalkpage": "छलफल हेर्नुहोस्",
-	"otherlanguages": "अरु भाषामा",
+	"otherlanguages": "अरू भाषाहरूमा",
 	"redirectedfrom": "($1बाट अनुप्रेषित)",
 	"redirectpagesub": "अनुप्रेषित पृष्ठ",
 	"redirectto": "अनुप्रेषित पृष्ठ:",
@@ -254,7 +254,7 @@
 	"privacy": "गोपनियता नीति",
 	"privacypage": "Project:गोपनीयता नीति",
 	"badaccess": "अनुमतिमा त्रुटि",
-	"badaccess-group0": "तपाईले अनुरोध गर्नुभएको कार्य गर्न तपाईलाई अनुमति दिइएको छैन।",
+	"badaccess-group0": "तपाईँले अनुरोध गरेको कार्य गर्न तपाईंलाई अनुमति दिइएको छैन।",
 	"badaccess-groups": "तपाईंले अनुरोध गर्नुभएको कार्य  {{PLURAL:$2|समूह |कुनै एक समूह}}: $1 मा रहेका प्रयोगकर्ताहरूले मात्र गर्नसक्छन ।",
 	"versionrequired": "MediaWiki संस्करण $1 चाहिने",
 	"versionrequiredtext": "यो पृष्ठ प्रयोग गर्नको लागि MediaWiki $1 संस्करण चाहिन्छ ।\nहेर्नुहोस्  [[Special:Version|version page]]",
@@ -309,7 +309,7 @@
 	"nstab-help": "सहायता पृष्ठ",
 	"nstab-category": "श्रेणी",
 	"nosuchaction": "यस्तो कार्य हैन",
-	"nosuchactiontext": "URL ले खुलाएको कार्य मान्य छैन ।\nतपाईले URL गलत टाइपगर्नु भएको , वा गलत लिंक पछ्याउनु भएको हुनसक्छ ।\nयस{{SITENAME}}ले सफ्टवेयरमा भएको गल्ति देखाएको पनि हुनसक्छ ।",
+	"nosuchactiontext": "URL ले खुलाएको कार्य मान्य छैन ।\nतपाईंले URL गलत टाइपगर्नु भएको , वा गलत लिंक पछ्याउनु भएको हुनसक्छ ।\nयो{{SITENAME}}ले सफ्टवेयरमा भएको गल्ति देखाएको पनि हुनसक्छ ।",
 	"nosuchspecialpage": "त्यस्तो विशेष पृष्ठ छैन",
 	"nospecialpagetext": "<strong>तपाईँले अनुरोध गर्नुभएको विशेष पृष्ठ अमान्य छ ।</strong>\n\nमान्य पृष्ठहरूको सूची यहाँ [[Special:SpecialPages|{{int:specialpages}}]] उपलब्ध छ ।",
 	"error": "त्रुटि",
@@ -361,7 +361,7 @@
 	"viewsource": "स्रोत हेर्नुहोस",
 	"viewsource-title": " $1 को स्रोत हेर्नुहोस",
 	"actionthrottled": "कार्य रोकियो",
-	"actionthrottledtext": "स्पामबाट बच्ने तरिकाको रुपमा , तपाईँलाई यो कार्य थोरै समयमा धेरै पटक गर्नबाट सिमित गरिएको छ, र तपाईले आफ्नो सिमा पार गरिसक्नु भयो ।\nकृपया केही मिनेटहरु पछि पुन: प्रयास गर्नुहोस्  ।",
+	"actionthrottledtext": "स्पाम रोकथामको लागि , तपाईँलाई यो कार्य थोरै समयमा धेरै पटक गर्नबाट सिमित गरिएको छ, र तपाईंले आफ्नो सिमा पार गरिसक्नु भयो ।\nकृपया केही मिनेट पछि पुन: प्रयास गर्नुहोस्  ।",
 	"protectedpagetext": "यो पृष्ठ सम्पादन हुनबाट बचाउन सम्पादनमा तथा अन्यकार्यमा रोक लगाइएको छ।",
 	"viewsourcetext": "तपाईँले यस पृष्ठको स्रोत हेर्न र प्रतिलिपी गर्न सक्नुहुन्छ ।",
 	"viewyourtext": "यस पृष्ठमा रहेका '''तपाईँका सम्पादनहरू''' हेर्न या प्रतिलिपी गर्न सक्नुहुन्छ :",
@@ -370,8 +370,8 @@
 	"translateinterface": "सबै विकिहरूको लागी अनुवाद जोड्न वा परिवर्तन गर्नका लागि मीडियाविकि क्षेत्रीयकरण परियोजना [//translatewiki.net/ ट्रान्सलेटविकि.नेट]को प्रयोग गर्नुहोस।",
 	"cascadeprotected": "यो पृष्ठ सम्पादन गर्नबाट सुरक्षित गरिएकोछ किनभनें {{PLURAL:$1|पृष्ठ |पृष्ठहरू}}मा सुरक्षित गर्नुका साथै प्रपात (\"cascading\") विकल्प खुल्ला राखिएको छ:\n$2",
 	"namespaceprotected": " '''$1'''  नेमस्पेसमा रहेका पृष्ठहरू सम्पादन गर्ने अनुमति यहाँलाई छैन ।",
-	"customcssprotected": "तपाईलाई यस  पृष्ठ सम्पादन गर्ने अनुमति छैन, किनकी यसमा कुनै अर्को प्रयोगकर्ताको व्यक्तिगत अभिरुचीहरु संग्रहित छन् ।",
-	"customjsprotected": "तपाईलाई यस जाभास्कृप्ट पृष्ठ सम्पादन गर्ने अनुमति छैन, किनकी यसमा कुनै अर्को प्रयोगकर्ताको व्यक्तिगत अभिरुचीहरु संग्रहित छन् ।",
+	"customcssprotected": "तपाईंलाई यो  पृष्ठ सम्पादन गर्ने अनुमति छैन, किनकी यसमा कुनै अर्को प्रयोगकर्ताको व्यक्तिगत अभिरुचीहरू संग्रहित छन् ।",
+	"customjsprotected": "तपाईंलाई यो जाभास्कृप्ट पृष्ठ सम्पादन गर्ने अनुमति छैन, किनकी यसमा कुनै अर्को प्रयोगकर्ताको व्यक्तिगत अभिरुचीहरू संग्रहित छन् ।",
 	"mycustomcssprotected": "यस CSSपृष्ठ सम्पादन गर्नको लागि लागि तपाईँलाई अनुमति छैन ।",
 	"mycustomjsprotected": "यस JavaScript पृष्ठ सम्पादन गर्नको लागि लागि तपाईँलाई अनुमति छैन ।",
 	"myprivateinfoprotected": "तपाईँसँग तपाईँको निजी जानकारीहरू सम्पादन गर्ने अनुमती छैन",
@@ -444,7 +444,7 @@
 	"createacct-benefit-body2": "{{PLURAL:$1|पृष्ठ|पृष्ठहरू}}",
 	"createacct-benefit-body3": "हालैका {{PLURAL:$1|योगदानकर्ता|योगदानकर्ताहरू}}",
 	"badretype": "तपाईंले दिनुभएको पासवर्ड मिल्दैन।",
-	"userexists": "तपाईले प्रविष्ट गर्नुभएको प्रयोगकर्ताको नाम पहिले देखिनै प्रयोगमा छ ।\nकृपया फरक नाम छान्नुहोस् ।",
+	"userexists": "तपाईंले प्रविष्ट गर्नु भएको प्रयोगकर्ता नाम पहिले देखिनै प्रयोगमा छ ।\nकृपया फरक नाम छान्नुहोस् ।",
 	"loginerror": "प्रवेश त्रुटि",
 	"createacct-error": "खाता बनाउँदा त्रुटि",
 	"createaccounterror": "खाता बनाउन सकिएन: $1",
@@ -452,7 +452,7 @@
 	"nocookieslogin": "{{SITENAME}} ले प्रयोगकर्ता प्रवेश गराउन कुकीहरू प्रयोग गर्छ । तपाईँको कुकीहरू निस्क्रिय गरिएको छ। कृपया सक्रिय बनाइ , नाम र प्रवेशशव्द राखी प्रवेश गर्नुहोला ।",
 	"nocookiesfornew": "प्रयोगकर्ताको खाता निर्माण गरिएन, हामीले यसको मूल स्रोत निर्धारण गर्न सकेनौं।\nनिश्चित गर्नुहोस् तपाईंले कुकी सक्रिय गर्नुभएको छ, पुनः यस पृष्ठलाई खोल्ने प्रयास गर्नुहोस्।",
 	"nocookiesforlogin": "{{int:nocookieslogin}}",
-	"noname": "तपाईले सही प्रयोगकर्ता नाम दिनु भएन।",
+	"noname": "तपाईंले सही प्रयोगकर्ता नाम दिनु भएन।",
 	"loginsuccesstitle": "प्रवेश सफल",
 	"loginsuccess": "'''तपाईंले {{SITENAME}}मा  \"$1\" को रुपमा प्रवेश गर्नुभएकोछ।'''",
 	"nosuchuser": "\"$1\" को नामबाट कुनै पनि प्रयोगकर्ता भेटिएनन् ।\nप्रयोगकर्ता नाम वर्णसंवेदनशील हुन्छन् ।\nहिज्जे जाँच्नुहोस् , या [[Special:UserLogin/signup|नयाँ खाता बनाउनुहोस्]].",
@@ -492,7 +492,7 @@
 	"login-migrated-generic": "तपाईंको खाता स्थानान्तरण भएको छ, र तपाईंको प्रयोगकर्ता नाम यस विकिमा छैन ।",
 	"loginlanguagelabel": "भाषा: $1",
 	"suspicious-userlogout": "तपाईंको निर्गमन अनुरोध अस्विकार गरिन्छ किन कि यो खराब ब्राउजर वा क्यासिङ प्रोक्सिले पठाएको जस्तो देखिन्छ।",
-	"createacct-another-realname-tip": "वास्तविक नाम ऐच्छिक हो ।\nतपाईले यो खुलाउनु भएको खण्डमा तपाईको काममा प्रयोगकर्ता श्रेय दिनको लागि यसको प्रयोग गरिने छ ।",
+	"createacct-another-realname-tip": "वास्तविक नाम ऐच्छिक हो ।\nतपाईंले यो खुलाउनु भएको खण्डमा तपाईंको काममा प्रयोगकर्ता श्रेय दिनको लागि यसको प्रयोग गरिने छ ।",
 	"pt-login": "प्रवेश (लग ईन)",
 	"pt-login-button": "प्रवेश",
 	"pt-createaccount": "खाता खोल्नुहोस्",
@@ -535,12 +535,12 @@
 	"passwordreset-emailtitle": "{{SITENAME}}मा खाता विवरण",
 	"passwordreset-emailtext-ip": "कसैले (सायद तपाईंले, $1 आईपि ठेगानाबाट) {{SITENAME}} ($4)मा तपाईंको खाता विवरणको निम्ति एउटा अनुस्मारकको अनुरोध गरेको छ। निम्न प्रयोगकर्ता {{PLURAL:$3|खाता यस इमेल ठेगानासित सम्बन्धित छ|खाताहरू यस इमेल ठेगानासित सम्बन्धित छन्}}:\n\n$2\n\n{{PLURAL:$3|यो अस्थाई पासवर्डको|यी अस्थाई पासवर्डहरुको}} समय {{PLURAL:$5|एक दिन|$5 दिन}}मा सकिनेछ।\nतपाईंले प्रवेश गरेर अहिले नैं नयाँ पासवर्ड छान्नुहोस्। यदि अरु कसैले अनुरोध गरेको भए अथवा यदि तपाईंलाई मूल पासवर्ड याद भए अनि यसलाई परिवर्तन गर्न चाहनुहुन्न भनें, तपाईंले यस सन्देशलाई अनदेखा गर्नुहोस् र पुरानै पासवर्डलाई चालू राख्नुहोस्।",
 	"passwordreset-emailtext-user": "{{SITENAME}} को $1 प्रयोगकर्ताले  {{SITENAME}} ($4)को लागि खाता विवरणको निम्ति एउटा अनुस्मारकको अनुरोध गरेको छ। निम्न प्रयोगकर्ता {{PLURAL:$3|खाता यस इमेल ठेगानासित सम्बन्धित छ|खाताहरू यस इमेल ठेगानासित सम्बन्धित छन्}}:\n\n$2\n\n{{PLURAL:$3|यो अस्थाई पासवर्डको|यी अस्थाई पासवर्डहरूको}} समय {{PLURAL:$5|एक दिन|$5 दिन}}मा सकिनेछ।\nतपाईंले प्रवेश गरेर अहिले नैं नयाँ पासवर्ड छान्नुहोस्। यदि अरु कसैले अनुरोध गरेको भए अथवा यदि तपाईंलाई मूल पासवर्ड याद भए अनि यसलाई परिवर्तन गर्न चाहनुहुन्न भनें, तपाईंले यस सन्देशलाई अनदेखा गर्नुहोस् र पुरानै पासवर्डलाई चालू राख्नुहोस्।",
-	"passwordreset-emailelement": "प्रयोगकर्ताको नाम: $1\nअस्थाई पासवर्ड: $2",
+	"passwordreset-emailelement": "प्रयोगकर्ताको नाम: \n$1\n\nअस्थाई पासवर्ड: \n$2",
 	"passwordreset-emailsent": "पासवर्ड परिवर्तनको लागि इमेल पठाइएको छ।",
 	"passwordreset-emailsent-capture": "पासवर्ड परिवर्तनको लागि इमेल पठाइयो, जुन तल देखाइएकोछ।",
 	"passwordreset-emailerror-capture": "पासवर्ड रिसेट इमेल जारि गरिएको छ, जुन तल देखाइएको छ, तर यसलाई {{GENDER:$2|प्रयोगकर्ता}}मा पठाउन विफल भयो: $1",
 	"changeemail": "इमेल ठेगाना परिवर्तन गर्नुहोस",
-	"changeemail-text": "आफ्नो इमेल ठेगाना परिवर्तन गर्न यो फारम भर्नुहोस। यसलाई पुष्टि गर्न तपाईले आफ्नो पासवर्ड हाल्नु पर्नेछ।",
+	"changeemail-text": "आफ्नो इमेल ठेगाना परिवर्तन गर्न यो फारम भर्नुहोस् । यसलाई पुष्टि गर्न तपाईंले आफ्नो पासवर्ड हाल्नु पर्नेछ।",
 	"changeemail-no-info": "यस पृष्ठमा सिधै जानको लागि प्रवेश गर्नु पर्ने हुन्छ ।",
 	"changeemail-oldemail": "हालको इमेल-ठेगाना:",
 	"changeemail-newemail": "नयाँ इमेल-ठेगाना:",
@@ -585,7 +585,7 @@
 	"blankarticle": "<strong>चेतावनी:</strong> तपाईं एउटा खालि पृष्ठको निर्माण गर्दै हुनुहुन्छ।\nयदि तपाईं \"{{int:savearticle}}\" लाई पुनः थिच्नुहुन्छ भने पृष्ठ बिना कुनै सामग्री नै निर्मित गरिनेछ।",
 	"anoneditwarning": "<strong>चेतावनी:</strong> तपाईँले प्रवेश गर्नु भएको छैन । तपाईँको आइपि ठेगाना पृष्ठ सम्पादन इतिहासमा दर्ता गरिने छ र यो सबैले हेर्न सक्छन । यदि तपाईं <strong>[$1 लगईन]</strong> वा <strong>[$2 नयाँ खाता बनाउने] गर्नुभयो भने तपाईंद्वारा गरिएको सम्पादन तपाईंको प्रयोगकर्तानाममा जोडिनेछ।",
 	"anonpreviewwarning": "''तपाईंले प्रवेश गर्नु भएको छैन। संग्रह (Save) गरेको खण्डमा पृष्ठको इतिहासमा तपाईंको IP ठेगाना अंकित गरिनेछ।''",
-	"missingsummary": "'''यादगर्नुहोस् :''' तपाईले सम्पादन सारांश दिनुभएको छैन ।\nयदि तपाईले संग्रहगर्नुहोस्  थिच्नुभयो भने , सारांश बिना नै संग्रहित गरिने छ ।",
+	"missingsummary": "'''यादगर्नुहोस् :''' तपाईंले सम्पादन सारांश दिनुभएको छैन ।\nयदि तपाईंले \"{{int:savearticle}}\"  थिच्नुभयो भने , सारांश बिना नै संग्रहित गरिने छ ।",
 	"selfredirect": "<strong>चेतावनी:</strong> तपाईं यस पृष्ठलाई आफुमा पुनः निर्देशित गर्दै हुनुहुन्छ।\nहुनसक्छ तपाईं अनुप्रेषितको लागि गलत लक्ष्य निर्दिष्ट गर्दै हुनुहुन्छ, वा गलत पृष्ठको सम्पादन गर्दै हुनुहुन्छ।\nतपाईं पुनः एकपटक \"{{int:savearticle}}\" क्लिक गर्नुहुन्छ, पुनः निर्देशित त्यसै पनि बनाइनेछ।",
 	"missingcommenttext": "कृपया टिप्पणी प्रविष्ठ गर्नुहोस् ।",
 	"missingcommentheader": "'''याद गर्नुहोस् :''' तपाईँले टिप्पणीमा विषय /शीर्ष पंक्ति  दिनुभएको छैन ।\nतपाईँले फेरि \"{{int:savearticle}}\"  थिच्नु भएमा , तपाईंको सम्पादन यसै रुपमा संग्रहित हुनेछ ।",
@@ -593,8 +593,8 @@
 	"subject-preview": "विषय/शीर्षपंक्ति पूर्वरुप:",
 	"previewerrortext": "तपाईंको परिवर्तनको पूर्वावलोकन बनाउन खोज्दा समस्या आएको छ ।",
 	"blockedtitle": "प्रयोककर्तालाई रोक लगाइएको छ",
-	"blockedtext": "'''तपाईँको प्रयोगकर्ता नाम या IP ठेगानालाई रोक लगाइएको छ ।'''\n\nरोक लगाउने  $1.\nरोक लगाउनाको कारण ''$2''.\n\n* रोक सुरू हुने : $8\n* रोक सकिने: $6\n* रोकबाट लक्षित: $7\n\nतपाईले  $1 वा अरु कुनै  [[{{MediaWiki:Grouppage-sysop}}|administrator]] सँग रोकको बारेमा छलफल गर्न सम्पर्क गर्न सक्नुहुन्छ ।\nतपाईँले  'प्रयोगकर्तालाई इ-मेल गर्ने ' सुविधा मान्य इमेल ठेगाना [[Special:Preferences|account preferences]] मा नखुलाए सम्म प्रयोगगर्न पाउनुहुने छैन र यसको प्रयोग गर्नबाट रोक लगाइएको छैन ।\nतपाईको IP ठेगाना $3 को, र रोक्का संख्या #$5.\nकृपया तपाईँको प्रश्नमा सबै जानकारी खुलाउनुहोला ।",
-	"autoblockedtext": "तपाईंको IP ठेगानामाथि रोक लगाइएकोछ किन भनें यो अर्को प्रयोगकर्ताले प्रयोग गरेको थियो, जसलाई $1ले रोक लगाएका थिए। \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कृपया कुनै बेला सोधनी गर्नु परे उपर्युक्त विवरण दर्शाउनु होला।",
+	"blockedtext": "'''तपाईँको प्रयोगकर्ता नाम या IP ठेगानालाई रोक लगाइएको छ ।'''\n\nरोक लगाउने  $1.\nरोक लगाउनाको कारण ''$2''.\n\n* रोक सुरू हुने : $8\n* रोक सकिने: $6\n* रोकबाट लक्षित: $7\n\nतपाईंले  $1 वा अरु कुनै  [[{{MediaWiki:Grouppage-sysop}}|प्रवन्धक]] सँग रोकको बारेमा छलफल गर्न सम्पर्क गर्न सक्नुहुन्छ ।\nतपाईँले  'प्रयोगकर्तालाई इ-मेल गर्ने ' सुविधा मान्य इमेल ठेगाना [[Special:Preferences|अभिरुचीहरू]]मा नखुलाए सम्म प्रयोगगर्न पाउनुहुने छैन र यसको प्रयोग गर्नबाट रोक लगाइएको छैन ।\nतपाईंको IP ठेगाना $3 को, र रोक्का संख्या #$5.\nकृपया तपाईँको प्रश्नमा सबै जानकारी खुलाउनुहोला ।",
+	"autoblockedtext": "तपाईंको IP ठेगानामाथि रोक लगाइएकोछ किन भनें यो अर्को प्रयोगकर्ताले प्रयोग गरेको थियो, जसलाई $1ले रोक लगाएका थिए। \nरोक लगाउनुको कारण:\n:''$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 गर्नु पर्दछ।",
 	"confirmedittext": "तपाईंले पृष्ठ संपादन गर्नअघि आफ्नो ई-मेल ठेगानाको पुष्टि गर्नुपर्छ।\nकृपया ई-मेल ठेगाना तयार गरी [[Special:Preferences|प्रयोगकर्ता अभिरूचि]] मार्फत मंजुर गराउनुहोस्।",
@@ -602,7 +602,7 @@
 	"nosuchsectiontext": "तपाईं त्यस्तो खण्डको सम्पादन गर्ने प्रयास गर्नुभयो जो अस्तित्वमा छैन।\nयो सारिएको अथवा मेटाइएको हुनुपर्छ जब तपाईं यस पृष्ठलाई हेर्नुहुँदैथियो।",
 	"loginreqtitle": "प्रवेशगर्नु जरुरी छ।",
 	"loginreqlink": "प्रवेश (लग ईन)",
-	"loginreqpagetext": "अरु पृष्ठहेर्न तपाईले $1 गर्नुपर्छ ।",
+	"loginreqpagetext": "अरु पृष्ठ हेर्न तपाईंले $1 गर्नुपर्छ ।",
 	"accmailtitle": "पासवर्ड पठाइयो",
 	"accmailtext": "जथाभावीरूपमा सृजना गरिएको प्रवेशशब्द प्रयोगकर्ता [[User talk:$1|$1]] को  $2 मा पठाइएको छ।\n\nयो नयाँ खाताको प्रवेशशब्द  ''[[Special:ChangePassword|change password]]'' मा प्रवेश गरेर परिवर्तन गर्न सकिन्छ ।",
 	"newarticle": "(नयाँ)",
@@ -799,11 +799,11 @@
 	"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कृपया लगहरू हेर्नुहोला ।",
-	"revdelete-only-restricted": "$2, $1 मिति भएको वस्तु लुकाउदा त्रुटी भएको छ:तपाईले वस्तुहरुलाई प्रवन्धकहरुको दृष्टीबाट दमन गर्न सक्नुहुन्न अझ कुनै पनि अरु दृष्टी विकल्पहरु नछानीकन।",
+	"revdelete-concurrent-change": " $2, $1 मिति गरिएको वस्तु परिवर्तन गर्न सकिएन: यसको स्थितीले तपाईंले परिवर्तन गर्नलाग्नुहुँदा कोहीअरुले नै परिवर्तन गरेजस्तो देखाउँछ\nकृपया लगहरू हेर्नुहोला ।",
+	"revdelete-only-restricted": "$2, $1 मिति भएको वस्तु लुकाउदा त्रुटी भएको छ:तपाईंले वस्तुहरूलाई प्रवन्धकहरूको दृष्टीबाट दमन गर्न सक्नुहुन्न अझ कुनै पनि अरु दृष्टी विकल्पहरू नछानीकन।",
 	"revdelete-reason-dropdown": "मेटाउनका सामान्य कारणहरु\n** कपीराइट उल्लंघन\n** अनुचित व्यक्तिगत जानकारी\n** अनुचित प्रयोगकर्ता नाम\n** संभावित अपमानजनक जानकारी",
 	"revdelete-otherreason": "अन्य/थप कारण:",
 	"revdelete-reasonotherlist": "अरु कारण",
@@ -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,9 +893,9 @@
 	"powersearch-togglelabel": "जाँच्ने :",
 	"powersearch-toggleall": "सबै",
 	"powersearch-togglenone": "कुनै पनि होइन",
-	"powersearch-remember": "चयन गरिएको लाई भविष्यमा गरिने खोजहरूको लागि सम्झिने",
+	"powersearch-remember": "चयन गरिएकोलाई भविष्यमा गरिने खोजहरूको लागि सम्झिने",
 	"search-external": "बाह्य खोज",
-	"searchdisabled": "{{SITENAME}} खोज निस्क्रिय पारिएको छ ।\nहाललाई तपाईले गूगलद्वारा खोज्न सक्नुहुन्छ ।\nयाद गर्नुहोस् उनीहरुको {{SITENAME}}को सूची सामग्री पुरानो भएको हुनसक्छ ।",
+	"searchdisabled": "{{SITENAME}} खोज निस्क्रिय पारिएको छ ।\nहाललाई तपाईं गूगलद्वारा खोज्न सक्नुहुन्छ ।\nयाद गर्नुहोस् उनीहरूको {{SITENAME}}को सूची सामग्री पुरानो भएको हुनसक्छ ।",
 	"search-error": "खोज्ने क्रममा समस्या देखियोः $1",
 	"preferences": "रोजाइहरू",
 	"mypreferences": "प्राथमिकताहरू",
@@ -963,7 +963,7 @@
 	"prefs-custom-css": "अनुकुलित CSS",
 	"prefs-custom-js": "अनुकुलित JS",
 	"prefs-common-css-js": "साझा CSS/जाभा स्क्रिप्ट सबै त्वचा(स्किन)को लागि:",
-	"prefs-reset-intro": "तपाईले यो पृष्ठ आफ्नो अभिरुचीहरू साइट पूर्वावस्थामा फर्काउन प्रयोग गर्न सक्नुहुन्छ ।\nयो रद्द गर्न सक्नुहुन्छ ।",
+	"prefs-reset-intro": "तपाईँ यो पृष्ठलाई आफ्नो अभिरुचीहरू साइट पूर्वावस्थामा फर्काउन प्रयोग गर्न सक्नुहुन्छ । त्यस पछि यसलाई रद्द गर्न सक्नुहुन्न ।",
 	"prefs-emailconfirm-label": "इ-मेल एकिन प्रक्रिया :",
 	"youremail": "ईमेल",
 	"username": "{{GENDER:$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": "कसरी वताउन चाहनुहुन्छ ?",
@@ -1026,7 +1026,7 @@
 	"userrights-nologin": "प्रयोगकर्ता अधिकार प्रदान गर्न तपाईंले प्रबन्धक खाताबाट [[Special:UserLogin|प्रवेश]] गर्नुपर्छ।",
 	"userrights-notallowed": "प्रयोगकर्तालाई अधिकार प्रदान गर्ने वा हटाउने अनुमति तपाईंलाई छैन।",
 	"userrights-changeable-col": "परिवर्तन गर्न सकिने समूहहरु",
-	"userrights-unchangeable-col": "तपाईले परिवर्तन गर्न सक्नुनहुने समूहहरु",
+	"userrights-unchangeable-col": "तपाईंले परिवर्तन गर्न नसक्ने समूहहरू",
 	"userrights-irreversible-marker": "$1*",
 	"userrights-conflict": "प्रयोगकर्ताको अधिकार परिवर्तनमा मतभेद भयो ! कृपया तपाईंको परिवर्तन पुनरावलोकन तथा पुष्टि गर्नुहोस् ।",
 	"userrights-removed-self": "तपाईंले सफलतापूर्वक आफ्नो अधिकारहरूलाई मेटाउनु भयो । त्यस कारण तपाईं अब यो पृष्ठ हेर्न सक्नु हुन्न ।",
@@ -1281,7 +1281,7 @@
 	"tmp-write-error": "अस्थायी फाइल लेख्दै गर्दा त्रुटि।",
 	"large-file": "यो सिफारिस गरिन्छ कि फाइलहरू  $1 भन्दा ठूला हुनु हुँदैन;\nयो फाइल $2 छ।",
 	"largefileserver": "उर्ध्वभरण गरिएको फाइल सर्भरमा निर्धारित सीमा भन्दा ठूलो छ।",
-	"emptyfile": "तपाईले उर्ध्वभरण गर्नुभएको फाइल रित्तो छ।\nयो फाइलनाम गलत राखिएको कारणले भएको हुनसक्छ\nयो फाइल साच्चै उर्ध्वभरण गर्नेकुरामा निश्चित हुनुहोस् ।",
+	"emptyfile": "तपाईंले उर्ध्वभरण गर्नुभएको फाइल रित्तो छ ।\nयो फाइल नाम गलत राखिएको कारणले भएको हुनसक्छ\nयो फाइल साँच्चै उर्ध्वभरण गर्नेकुरामा निश्चित हुनुहोस् ।",
 	"windows-nonascii-filename": "विशेष वर्ण सहितका फाइलनामहरु यस विकिद्वारा समर्थित छैनन् ।",
 	"fileexists": "यो नामको फाइल पहिले नैं छ, यदि तपाईं परिवर्तन गर्ने कुरामा सुनिश्चित हुनुहुन्न भने कृपया <strong>[[:$1]]</strong> जाँच गर्नुहोस्।\n[[$1|thumb]]",
 	"filepageexists": "यस फाइलको लागि विवरण पृष्ठ पहिले नै <strong>[[:$1]]</strong> बनाइ सकिएको छ, तर यस नामको कुनै फाइल अहिले उपस्थित छैन। \nतपाईं जुन विवरण दिनुहुन्छ त्यो विवरण पृष्ठमा देखिंदैन। \nतपाईंको आफ्नो विवरणलाई त्यहाँ राख्न म्यानुअली सम्पादन गर्नु पर्नेछ।\n[[$1|thumb]]",
@@ -1469,7 +1469,7 @@
 	"filedelete": " $1 मेट्नुहोस्",
 	"filedelete-legend": "फाइल मेट्ने",
 	"filedelete-intro": "तपाईं फाइल <strong>[[Media:$1|$1]]</strong> लाई इतिहास समेत हटाउन जाँदै हुनुहुन्छ।",
-	"filedelete-intro-old": "तपाईले <strong>[[Media:$1|$1]]</strong> को संस्करणलाई [$4 $3, $2] हुने गरि मेटाउदै हुनु हुन्छ ।",
+	"filedelete-intro-old": "तपाईं <strong>[[Media:$1|$1]]</strong> को संस्करणलाई [$4 $3, $2] हुने गरि मेटाउँदै हुनु हुन्छ ।",
 	"filedelete-comment": "कारण :",
 	"filedelete-submit": "मेट्ने",
 	"filedelete-success": "'''$1''' मेटियो ।",
@@ -1612,9 +1612,9 @@
 	"unusedimagestext": "निम्न फाइलहरू छन्, तर कुनै पनि पृष्ठमा प्रयोग गरिएको छैन। कृपया ध्यान दें कि अन्य वेबसाइट एउटा सिधै लिङ्कको फाइलसँग जोड्न सकिन्छ, र सक्रिय उपयोगमा हुँदा पनि यहाँ देखाउन सकिन्छ।",
 	"unusedcategoriestext": "तल श्रेणीका पृष्ठहरू उपलब्ध भएता पनि उक्त पृष्ठहरूलाई अन्य पृष्ठहरू तथा श्रेणीले प्रयोग गर्न सक्दैनन् ।",
 	"notargettitle": "कुनैपनि निसाना(टारगेट) छैन",
-	"notargettext": "यो कार्यको लागी तपाईले कुनै लक्ष्यित पृष्ठ वा प्रयोगकर्ता निर्दिष्ट गर्नु भएको छैन् ।",
+	"notargettext": "यो कार्यको लागी तपाईंले कुनै लक्षित पृष्ठ वा प्रयोगकर्ता निर्दिष्ट गर्नु भएको छैन ।",
 	"nopagetitle": "त्यस्तो गन्तव्या पृष्ठ भेटिएन",
-	"nopagetext": "तपाईले खुलाउनु भएको गन्तव्य पृष्ठ अस्तित्वमा  छैन।",
+	"nopagetext": "तपाईंले खुलाउनु भएको गन्तव्य पृष्ठ अस्तित्वमा  छैन।",
 	"pager-newer-n": "{{PLURAL:$1|नयाँ १|नयाँ $1}}",
 	"pager-older-n": "{{PLURAL:$1|पुरानो १|पुरानो $1}}",
 	"suppress": "अतिदृष्टि",
@@ -1624,7 +1624,7 @@
 	"booksources": "किताबका श्रोतहरु",
 	"booksources-search-legend": "किताबका श्रोतहरु खोज्ने",
 	"booksources-search": "खोज",
-	"booksources-text": "तल दिइएको सूची नयाँ तथा पूराना किताब बेच्ने लगायत तपाईले खोज्नु भएको किताबका बारेमा थप जानकारी भएको अन्य साइटका कडिहरू हुन् ।",
+	"booksources-text": "तल दिइएको सूची नयाँ तथा पूराना किताब बेच्ने लगायत तपाईंले खोज्नु भएको किताबका बारेमा थप जानकारी भएका अन्य साइटका लिंकहरू हुन् ।",
 	"booksources-invalid-isbn": "यो आइएसबीएन सहि छैन; मूल स्रोतबाट नक्कल गर्दा भएको त्रुटिको जाँच गर्नुहोस।",
 	"specialloguserlabel": "निष्पादक:",
 	"speciallogtitlelabel": "लक्ष्य (शीर्षक वा प्रयोगकर्ता)",
@@ -1713,7 +1713,6 @@
 	"emailuser": "यो प्रयोगकर्तालाई ई-मेल पठाउनुहोस्",
 	"emailuser-title-target": "{{GENDER:$1|प्रयोगकर्ता}}लाई इमेल गर्ने",
 	"emailuser-title-notarget": "प्रयोगकर्तालाई इमेल गर्नुहोस्",
-	"emailpage": "प्रयोगकर्तालाई इमेल गर्नुहोस्",
 	"emailpagetext": "तल दिइएको फर्मले तपाईं यस {{GENDER:$1|प्रयोगकर्ता}}लाई इमेल पठाउन सक्नुहुन्छ। तपाईंले जुन ठेगाना [[Special:Preferences|आफ्नो प्रयोगकर्ता अभिरूचीहरू]]मा दिनुभएको थियो त्यो यस इमेललाई \"पठाउने\" को रूपमा आउनेछ, अतः प्राप्तकर्ता तपाईंलाई सिधै जवाफ दिनसक्छ।",
 	"defemailsubject": "{{SITENAME}} प्रयपोगकर्ता \"$1\" बाट इमेल",
 	"usermaildisabled": "प्रयोगकर्ता इमेल निरस्त गरिएको",
@@ -1807,7 +1806,7 @@
 	"delete-edit-reasonlist": "मेट्नुको कारण सम्पादन गर्नुहोस्",
 	"delete-toobig": "यो पृष्ठको सम्पादन इतिहास धेरै र  $1 {{PLURAL:$1|पुनरावलोक|पुनरावलोकहरू}}भन्दा बढी रहेको छ।\n {{SITENAME}}मा दुर्घटनाको कारणले गडबडी आउनसक्ने कुरालाई रोक्न यस्ता पृष्ठहरूलाई मेट्नबाट निषेध गरिएको छ ।",
 	"delete-warning-toobig": "This page has a large edit history, over $1 {{PLURAL:$1|revision|revisions}}.\nDeleting it may disrupt database operations of {{SITENAME}};\nproceed with caution.",
-	"deleteprotected": "यो पृष्ठलाई सुरक्षित गरिएकोले तपाईले यसलाई मेटाउन सक्नु हुन्न ।",
+	"deleteprotected": "यो पृष्ठलाई सुरक्षित गरिएकोले तपाईं यसलाई मेटाउन सक्नु हुन्न ।",
 	"deleting-backlinks-warning": "'''चेतावनी:''' जुन पृष्ठ तपाईं हटाउन गइरहनु भएको छ त्यससँग [[Special:WhatLinksHere/{{FULLPAGENAME}}|अन्य पृष्ठहरू]] जोडिन्छ अथवा त्यसलाई ट्रान्सक्लयुड गर्छ।",
 	"rollback": "सम्पादनहरू पछाडि लिने",
 	"rollbacklink": "पहिलेको रुपमा फर्काउने",
@@ -2067,9 +2066,9 @@
 	"proxyblockreason": "तपाईंको IP ठेगानामा रोक लगाइएको छ किनकी यो खुला प्रोक्सी हो ।\nकृपया तपाईंको इन्टरनेट सेवा प्रदायक या प्राविधिक सहायतासँग सम्पर्क गरी यस सुरक्षा समस्याको बारेमा जानकारी गराउनुहोस् ।",
 	"sorbs": "DNSBL",
 	"sorbsreason": "तपाईंको IP ठेगाना खुल्ला प्रोक्सीको रुपमा  DNSBL मा सूचीकरण गरिएको छ यसलाई{{SITENAME}}ले प्रयोगमा ल्याएको छ।",
-	"sorbs_create_account_reason": "तपाईको IP ठेगाना खुल्ला प्रोक्सीको रुपमा  DNSBL मा सुचीकरण गरिएको छ यसलाई{{SITENAME}}ले प्रयोगमा ल्याएको छ।\nतपाईले खाता खोल्न सक्नुहुन्न ।",
+	"sorbs_create_account_reason": "तपाईंको IP ठेगाना खुल्ला प्रोक्सीको रुपमा  DNSBL मा सूचीकरण गरिएको छ यसलाई{{SITENAME}}ले प्रयोगमा ल्याएको छ।\nतपाईंले खाता खोल्न सक्नुहुन्न ।",
 	"xffblockreason": "एउटा आइपि ठेगाना जुन X-Forwarded-For हेडरमा रहेको छ, या त तपाईंको हो वा त्यस प्रक्सी सर्भरको हो जसको प्रयोग तपाईं गर्दै हुनुहुन्छ र यस माथि प्रतिबन्ध लगाइएको छ। वास्तविक कारण थियो:$1",
-	"cant-see-hidden-user": "तपाईले रोक लगाउन खोज्नु भएको प्रयोगकर्ता पहिले नै रोकलगाइ लुकाइ सकिएको छ ।\nतपाईसँग hideuser अधिकार नभएकोले यसलाई हेर्ना या सम्पादन गर्न सक्नुहुन्न ।",
+	"cant-see-hidden-user": "तपाईंले रोक लगाउन खोज्नु भएको प्रयोगकर्ता पहिले नै रोकलगाइ लुकाइ सकिएको छ ।\nतपाईंसँग hideuser अधिकार नभएकोले यसलाई हेर्न या सम्पादन गर्न सक्नुहुन्न ।",
 	"ipbblocked": "तपाईंले अरु प्रयोगकर्ताहरूलाई प्रतिबन्धित गर्न वा उनीहरूको प्रतिबन्ध खोल्न सक्नुहुन्न किनभने तपाईं आफै प्रतिबन्धित हुनुहुन्छ।",
 	"ipbnounblockself": "तपाईं आफैले आफैलाई रोक खुलाउन सक्नुहुन्न ।",
 	"lockdb": "डेटाबेस ताल्चामार्ने",
@@ -2101,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": "पृष्ठ सार्नुहोस्",
@@ -2111,7 +2110,7 @@
 	"movepage-moved-redirect": "अनुप्रेषित पृष्ठ सृजना गरियो।",
 	"movepage-moved-noredirect": "रिडाइरेक्ट पृष",
 	"articleexists": "यस नामको पृष्ठ पहिले देखि नै रहेको ,या तपाईँले छान्नु भएको नाम अमान्य छ।\nकृपया अर्कै नाम छान्नुहोस् ।",
-	"cantmove-titleprotected": "तपाईले यो स्थानमा पृष्ठ सार्न सक्नुहुन्न, किनकी यो नयाँ शिर्षकलाई सिर्जना हुनबाट जोगाइएको छ",
+	"cantmove-titleprotected": "तपाईं यो स्थानमा पृष्ठ सार्न सक्नुहुन्न, किनकी यो नयाँ शिर्षकलाई सिर्जना हुनबाट जोगाइएको छ",
 	"movetalk": "सम्बन्धित वार्ता पृष्ठ",
 	"move-subpages": "सहायक पृष्ठहरू सार्ने($1 सम्मको)",
 	"move-talk-subpages": "वार्तालाप पृष्ठको सह-पृष्ठहरू सार्ने($1 सम्मको )",
@@ -2226,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\" आयात गर्न सकिएन किनभने यसको आयात पश्चात जुन नाम हुन्थ्यो त्यो यस विकिमा मान्य छैन।",
@@ -2248,7 +2247,7 @@
 	"javascripttest-pagetext-skins": "परीक्षणको लागि खोल छान्नुहोस्:",
 	"javascripttest-qunit-intro": "mediawiki.org मा [$1 जाँचको कागजात] हेर्नुहोस् ।",
 	"tooltip-pt-userpage": "तपाईंको प्रयोगकर्ता पृष्ठ",
-	"tooltip-pt-anonuserpage": "तपाईले जुन IP ठेगानाको रुपमा सम्पादन गर्दै हुनुहुन्छ , त्यसको प्रयोगकर्ता पृष्ठ निम्न छ :",
+	"tooltip-pt-anonuserpage": "तपाईँ जुन IP ठेगानाको रुपमा सम्पादन गर्दै हुनुहुन्छ , त्यसको प्रयोगकर्ता पृष्ठ निम्न छ :",
 	"tooltip-pt-mytalk": "तपाईंको वार्ता पृष्ठ",
 	"tooltip-pt-anontalk": "यो IP ठेगानाबाट गरिएका सम्पादनका बारेमा बार्तालाप",
 	"tooltip-pt-preferences": "तपाईंका अभिरुचिहरू",
@@ -2258,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": "यस पृष्ठको पहिलेका पुनरावलोकनहरु",
@@ -2275,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": "जुन कुनै पृष्ठ खोल्ने",
@@ -2294,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": "प्रणाली सन्देश हेर्नुहोस्",
@@ -2334,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": "साधारण जानकारी",
@@ -2829,7 +2828,7 @@
 	"confirmemail_oncreate": "प्रमाणिकरण कोड तपाईंको इमेल ठेगानामा पठाइएको छ ।\nयो कोड प्रवेश गर्नको लागि अत्यवश्यक छैन, तर यस विकिमा इमेल ठेगानामा आधारित सेवाहरू उपभोग गर्न कोड उपलब्ध गराउनु पर्ने हुन्छ ।",
 	"confirmemail_sendfailed": "{{SITENAME}} प्रमाणिकरण इमेल पठाउन सकिएन।\nतपाईंको इमेलमा अमान्य वर्णहरू छन् कि जाँच गर्नुहोस् ।\n\nहुलाकीले दिएको त्रुटी सन्देश: $1",
 	"confirmemail_invalid": "अमान्य प्रमाणिकरण कोड ।\nकोडको मान्य अवधी समाप्त भएको हुनसक्छ ।",
-	"confirmemail_needlogin": "तपाईले आफ्नो इमेल प्रमाणिकरण गराउन $1 गर्नु पर्छ ।",
+	"confirmemail_needlogin": "तपाईंले आफ्नो इमेल प्रमाणिकरण गराउन $1 गर्नु पर्छ ।",
 	"confirmemail_success": "तपाईंको इमेल ठेगाना प्रमाणिकरण गरिएको छ ।\nअब तपाईं [[Special:UserLogin|प्रवेश गरी]] विकिको मजा लिन सक्नुहुन्छ ।",
 	"confirmemail_loggedin": "तपाईंको इमेल ठेगाना प्रमाणित भएको छ।",
 	"confirmemail_subject": "{{SITENAME}} ई मेलl ठेगानाको पुष्टि",
@@ -2844,7 +2843,7 @@
 	"scarytranscludetoolong": "[URL अति लामो छ ]",
 	"deletedwhileediting": "'''चेतावनी''': तपाईंले सम्पादन सुरु गरेपछि यो पृष्ठ मेटिएकोछ!",
 	"confirmrecreate": "प्रयोगकर्ता [[User:$1|$1]] ([[User talk:$1|वार्तालाप]])ले  तपाईंले  सम्पादन सुरु गरेपछि यो पृष्ठ मेटेकाछन् । कारण थियो:\n: ''$2''\nकृपया सुनिश्चित गर्नुहोस् कि तपाईं यो पृष्ठ साँच्चै निर्माण गर्न चाहनुहुन्छ।",
-	"confirmrecreate-noreason": "प्रयोगकर्ता [[User:$1|$1]] ले ([[User talk:$1|वार्तालाप ]])पृष्ठ तपाईले सम्पादन गर्न थाले पछि हटाइएका छन् । यो पृष्ठलाई पुन: सिर्जना गर्ने भए कृपया पुष्टि गर्नुहोस?",
+	"confirmrecreate-noreason": "प्रयोगकर्ता [[User:$1|$1]] ([[User talk:$1|वार्तालाप ]])ले यो पृष्ठ तपाईं सम्पादन गर्न थाले पछि हटाएका छन् । यो पृष्ठलाई पुन: सिर्जना गर्ने भए कृपया पुष्टि गर्नुहोस् ।",
 	"recreate": "पुनर्निर्माण",
 	"unit-pixel": "पिक्सेल",
 	"confirm_purge_button": "हुन्छ",
@@ -2968,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\" मा ओभररेड गरिंदै छ।",
@@ -3085,14 +3084,14 @@
 	"tags-create-tag-name": "ट्याग नाम:",
 	"tags-create-reason": "कारण:",
 	"tags-create-submit": "सृजना गर्ने",
-	"tags-create-no-name": "तपाईले ट्याग नाम निर्दिष्ट गर्नु पर्ने हुन्छ ।",
+	"tags-create-no-name": "तपाईंले ट्याग नाम निर्दिष्ट गर्नु पर्ने हुन्छ ।",
 	"tags-create-invalid-chars": "ट्याग नामहरूमा कमा(<code>,</code>) वा अगाडी स्ल्यास हुनु हुँदैन। (<code>/</code>)",
 	"tags-create-invalid-title-chars": "ट्याग नामहरूमा यस्तो क्यारेक्टर हुनुहुँदैन जुन पृष्ठको शीर्षकमा प्रयोग नहोस्।",
 	"tags-create-already-exists": "ट्याग $1 पहिला देखि नै उपलब्ध ।",
 	"tags-create-warnings-above": "निम्नलिखित {{PLURAL:$2|चेतावनी देखाइयो|चेतावनीहरू देखाइयो}} जब ट्याग \"$1\" बनाउने प्रयास गरिएको थियो:",
 	"tags-create-warnings-below": "के तपाईं यो ट्याग बनाउने काम जारी राख्न चाहनु हुन्छ ?",
 	"tags-delete-title": "ट्याग मेट्नुहोस्",
-	"tags-delete-explanation-initial": "तपाईले ट्याग \"$1\" लाई डाटावेसबाट हटाउन खोज्दै हुनु हुन्छ ।",
+	"tags-delete-explanation-initial": "तपाईं ट्याग \"$1\" लाई डाटावेसबाट हटाउँदै हुनुहुन्छ ।",
 	"tags-delete-explanation-in-use": "ट्यागलाई {{PLURAL:$2|$2 संशोधन वा लग प्रविष्टि|सबै $2 संशोधन र/वा लग प्रविष्टिहरू}}बाट हटाइनेछ जहाँ अहिले त्यसको प्रयोग गरिंदै छ।",
 	"tags-delete-explanation-warning": "यो क्रिया <strong>अपरिवर्तनीय</strong> हो र <strong>त्यसलाई परिवर्तन गर्न सकिंदैन</strong>, डेटाबेस प्रवन्धक पनि यसलाई केहि गर्न सक्दैनन्। विश्वासपूर्ण रूपले तपाईं तय गर्नुहोस् कि तपाईं यस ट्यागलाई हटाउन चाहनुहुन्छ।",
 	"tags-delete-explanation-active": "<strong>ट्याग \"$1\" अहिले पनि सक्रिय छ, र यसको प्रयोग भविष्यमा पनि जारी रहनेछ।</strong> यसलाई रोकनका लागि, ती स्थानहरूमा जानुहोस जहाँ यस ट्यागको प्रयोग भइरहेको छ र त्यहाँ देखि यसलाई अक्षम गर्नुहोस।",
@@ -3103,13 +3102,13 @@
 	"tags-delete-too-many-uses": "ट्याग \"$1\" को प्रयोग $2 सँग {{PLURAL:$2|संशोधन|संशोधनहरू}}भन्दा अधिक छ, जसको अर्थ यो छ कि त्यसलाई हटाउन सकिंदैन।",
 	"tags-delete-warnings-after-delete": "ट्याग \"$1\" लाई सफलतापूर्वक हटाइयो, तर निम्नलिखित {{PLURAL:$2|चेतावनी|चेतावनीहरू}} देखियो:",
 	"tags-activate-title": "ट्याग सक्रिय गर्नुहोस्",
-	"tags-activate-question": "तपाईले ट्याग \"$1\" सक्रिय गर्न लाग्नु भएको छ ।",
+	"tags-activate-question": "तपाईं ट्याग \"$1\"लाई सक्रिय गर्न लाग्नु भएको छ ।",
 	"tags-activate-reason": "कारणः",
 	"tags-activate-not-allowed": "ट्याग \"$1\" सक्रिय गर्न सम्भव छैन ।",
 	"tags-activate-not-found": "ट्याग \"$1\" उपलब्ध छैन् ।",
 	"tags-activate-submit": "सक्रिय",
 	"tags-deactivate-title": "ट्याग निष्क्रिय गर्नुहोस्",
-	"tags-deactivate-question": "तपाईले ट्याग \"$1\" निस्क्रिय गर्न लाग्नु भएको छ ।",
+	"tags-deactivate-question": "तपाईं ट्याग \"$1\" लाई निस्क्रिय गर्न लाग्नु भएको छ ।",
 	"tags-deactivate-reason": "कारण:",
 	"tags-deactivate-not-allowed": "ट्याग \"$1\" निस्क्रिय गर्न सम्भव छैन ।",
 	"tags-deactivate-submit": "निष्क्रिय",
@@ -3149,22 +3148,22 @@
 	"compare-rev1": "संशोधन 1",
 	"compare-rev2": "संशोधन 2",
 	"compare-submit": "दँजाउनुहोस्",
-	"compare-invalid-title": "तपाईले खुलाउनु भएको शिर्षक अमान्य छ।",
-	"compare-title-not-exists": "तपाईले खुलाउनु भएको शिर्षक उपलब्ध छैन ।",
-	"compare-revision-not-exists": "तपाईले खुलाउनु भएको संस्करण उपलब्ध छैन ।",
+	"compare-invalid-title": "तपाईंले खुलाउनु भएको शिर्षक अमान्य छ।",
+	"compare-title-not-exists": "तपाईंले खुलाउनु भएको शिर्षक उपलब्ध छैन ।",
+	"compare-revision-not-exists": "तपाईँले खुलाउनु भएको संस्करण उपलब्ध छैन ।",
 	"dberr-problems": "क्षमा पाउँ! यो साइटमा तकनीकी गड़बड़ी आइपरेकोछ।",
 	"dberr-again": "केही समय पर्खिएर पुन: लोड हुन दिनुहोस् ।",
 	"dberr-info": "(डेटाबेस सर्भर: $1 सँग सम्पर्क स्थापित गर्न सकिएन)",
 	"dberr-info-hidden": "(डेटाबेसमा सम्पर्क स्थापना गर्न सकिएन)",
-	"dberr-usegoogle": "तपाईले अहिले गुगलबाट खोज गर्न प्रयास गर्न सक्नुहुन्छ।",
+	"dberr-usegoogle": "तपाईं अहिले गुगलबाट खोज गर्न प्रयास गर्न सक्नुहुन्छ।",
 	"dberr-outofdate": "कृपया स्मरणमा राख्नुहोस् हाम्रा लेखहरूको सूची जुन उनीहरूले राखेका छन् त्यो अद्यावधिक नहुन सक्छ ।",
 	"dberr-cachederror": "यो अनुरोध गरिएको पृष्ठको क्याशमा रहेका प्रतिलिपी हो , र अद्यावधिक नहुन सक्छ ।",
 	"htmlform-invalid-input": "तपाईंको कुनै प्रविष्ठिहरू सही छैनन्",
-	"htmlform-select-badoption": "तपाईले खुलाउनु भएको मान मान्य विकल्प हैन ।",
-	"htmlform-int-invalid": "तपाईले खुलाउनु भएको मान कुनै इन्टिजर हैन ।",
-	"htmlform-float-invalid": "तपाईले जनाउनु भएको मान कुनै संख्या हैन ।",
-	"htmlform-int-toolow": "तपाईले जनाउनु भएको मान न्युनतम $1 भन्दा कम भयो ।",
-	"htmlform-int-toohigh": "तपाईले जनाउनु भएको मान अधिकतम $1 भन्दा बढी भयो ।",
+	"htmlform-select-badoption": "तपाईंले खुलाउनु भएको मान मान्य विकल्प हैन ।",
+	"htmlform-int-invalid": "तपाईंले खुलाउनु भएको मान कुनै इन्टिजर हैन ।",
+	"htmlform-float-invalid": "तपाईँले जनाउनु भएको मान कुनै संख्या हैन ।",
+	"htmlform-int-toolow": "तपाईंले जनाउनु भएको मान न्युनतम $1 भन्दा कम भयो ।",
+	"htmlform-int-toohigh": "तपाईंले जनाउनु भएको मान अधिकतम $1 भन्दा बढी भयो ।",
 	"htmlform-required": "यसको मूल्य(value) चाहिन्छ",
 	"htmlform-submit": "बुझाउने",
 	"htmlform-reset": "परिवर्तनहरू परित्याग गर्नुहोस्",
diff --git a/languages/i18n/nl.json b/languages/i18n/nl.json
index 7faff2fc74..01adf4e79a 100644
--- a/languages/i18n/nl.json
+++ b/languages/i18n/nl.json
@@ -113,7 +113,7 @@
 	"tog-prefershttps": "Altijd een beveiligde verbinding gebruiken wanneer u bent aangemeld",
 	"underline-always": "Altijd",
 	"underline-never": "Nooit",
-	"underline-default": "Standaard gedrag van vormgeving of webbrowser",
+	"underline-default": "Standaardgedrag van vormgeving of webbrowser",
 	"editfont-style": "Lettertypestijl bewerkingsvenster:",
 	"editfont-default": "Webbrowser-standaard",
 	"editfont-monospace": "Monospaced lettertype",
@@ -245,7 +245,7 @@
 	"delete": "Verwijderen",
 	"deletethispage": "Deze pagina verwijderen",
 	"undeletethispage": "Pagina terugplaatsen",
-	"undelete_short": "$1 {{PLURAL:$1|bewerking|bewerkingen}} terugplaatsen",
+	"undelete_short": "{{PLURAL:$1|één bewerking|$1 bewerkingen}} terugplaatsen",
 	"viewdeleted_short": "{{PLURAL:$1|Eén geschrapte bewerking |$1 geschrapte bewerkingen}} bekijken",
 	"protect": "Beveiligen",
 	"protect_change": "wijzigen",
@@ -295,7 +295,7 @@
 	"disclaimers": "Voorbehoud",
 	"disclaimerpage": "Project:Algemeen voorbehoud",
 	"edithelp": "Hulp bij bewerken",
-	"helppage-top-gethelp": "Help",
+	"helppage-top-gethelp": "Hulp",
 	"mainpage": "Hoofdpagina",
 	"mainpage-description": "Hoofdpagina",
 	"policy-url": "Project:Beleid",
@@ -310,8 +310,8 @@
 	"versionrequiredtext": "Versie $1 van MediaWiki is vereist om deze pagina te gebruiken.\nMeer informatie is beschikbaar op de pagina [[Special:Version|softwareversie]].",
 	"ok": "OK",
 	"retrievedfrom": "Overgenomen van \"$1\"",
-	"youhavenewmessages": "U hebt $1 ($2).",
-	"youhavenewmessagesfromusers": "U heeft $1 van {{PLURAL:$3|een andere gebruiker|$3 gebruikers}} ($2).",
+	"youhavenewmessages": "{{PLURAL:$3|U hebt}} $1 ($2).",
+	"youhavenewmessagesfromusers": "{{PLURAL:$4|U hebt}} $1 van {{PLURAL:$3|een andere gebruiker|$3 gebruikers}} ($2).",
 	"youhavenewmessagesmanyusers": "U heeft $1 van een groot aantal gebruikers ($2).",
 	"newmessageslinkplural": "{{PLURAL:$1|een nieuw bericht|999=nieuwe berichten}}",
 	"newmessagesdifflinkplural": "laatste {{PLURAL:$1|wijziging|999=wijzigingen}}",
@@ -364,7 +364,7 @@
 	"databaseerror-query": "Zoekopdracht: $1",
 	"databaseerror-function": "Functie: $1",
 	"databaseerror-error": "Fout: $1",
-	"laggedslavemode": "'''Waarschuwing:''' in deze pagina zijn recente wijzigingen mogelijk nog niet verwerkt.",
+	"laggedslavemode": "<strong>Waarschuwing:</strong> in deze pagina zijn recente wijzigingen mogelijk nog niet verwerkt.",
 	"readonly": "Database geblokkeerd",
 	"enterlockreason": "Geef een reden op voor de blokkade en geef op wanneer die waarschijnlijk wordt opgeheven",
 	"readonlytext": "De database is geblokkeerd voor bewerkingen, waarschijnlijk voor regulier databaseonderhoud. Na afronding wordt de functionaliteit hersteld.\n\nDe beheerder heeft de volgende reden opgegeven: $1",
@@ -398,7 +398,7 @@
 	"title-invalid-characters": "De opgevraagde paginanaam bevat ongeldige tekens: \"$1\".",
 	"title-invalid-relative": "De paginanaam bevat een relatief pad. Relatieve paginanamen (\"./\", \"../\") zijn ongeldig omdat ze vaak onbereikbaar zijn als de browser van een gebruiker ze toepast.",
 	"title-invalid-magic-tilde": "De opgevraagde paginanaam bevat een ongeldige volgorde van magische tildes (<nowiki>~~~</nowiki>).",
-	"title-invalid-too-long": "De opgevraagde paginanaam is te lang. Deze mag niet langer zijn dan {{PLURAL:$1|$1 bytes}} in UTF-8-codering.",
+	"title-invalid-too-long": "De opgevraagde paginanaam is te lang. Deze mag niet langer zijn dan $1 {{PLURAL:$1|byte|bytes}} in UTF-8-codering.",
 	"title-invalid-leading-colon": "De opgevraagde paginanaam bevat een ongeldige dubbele punt aan het begin.",
 	"perfcached": "Deze gegevens komen uit een cache en zijn mogelijk niet actueel. Er {{PLURAL:$1|is maximaal één resultaat|zijn maximaal $1 resultaten}} beschikbaar in de cache.",
 	"perfcachedts": "Deze gegevens komen uit een cache die voor het laatst is bijgewerkt op $2 om $3. Er {{PLURAL:$4|is maximaal één resultaat|zijn maximaal $4 resultaten}} beschikbaar in de cache.",
@@ -408,13 +408,13 @@
 	"actionthrottled": "Handeling tegengehouden",
 	"actionthrottledtext": "Als maatregel tegen spam is het aantal keren per tijdseenheid dat u deze handeling kunt verrichten beperkt.\nDe limiet is overschreden.\nProbeer het over een aantal minuten opnieuw.",
 	"protectedpagetext": "Deze pagina is beveiligd. Bewerken of andere handelingen zijn niet mogelijk.",
-	"viewsourcetext": "U kunt de brontekst van deze pagina bekijken en kopiëren:",
-	"viewyourtext": "U kunt '''uw bewerkingen''' aan de brontekst van deze pagina bekijken en kopiëren:",
+	"viewsourcetext": "U kunt de brontekst van deze pagina bekijken en kopiëren.",
+	"viewyourtext": "U kunt <strong>uw bewerkingen</strong> aan de brontekst van deze pagina bekijken en kopiëren.",
 	"protectedinterface": "Deze pagina bevat tekst voor berichten van de software op deze wiki en is beveiligd om misbruik te voorkomen.\nGebruik [//translatewiki.net/ translatewiki.net], het vertaalproject voor MediaWiki, om vertalingen voor alle wiki's toe te voegen of te wijzigen.",
 	"editinginterface": "<strong>Waarschuwing:</strong> u bewerkt een pagina die interfacetekst voor de software bevat.\nBewerkingen op deze pagina beïnvloeden de gebruikersinterface van iedereen op deze wiki.\nGebruik [//translatewiki.net/ translatewiki.net], het vertaalproject voor MediaWiki, om vertalingen toe te voegen of te wijzigen voor alle wiki's.",
 	"translateinterface": "Om vertalingen voor alle wiki's toe te voegen of te wijzigen kunt u gebruik maken van [//translatewiki.net/ translatewiki.net], het vertaalproject voor MediaWiki.",
-	"cascadeprotected": "Deze pagina kan niet bewerkt worden, omdat die is opgenomen in de volgende {{PLURAL:$1|pagina|pagina's}} die beveiligd {{PLURAL:$1|is|zijn}} met de cascade-optie:\n$2",
-	"namespaceprotected": "U hebt geen rechten om pagina's in de naamruimte '''$1''' te bewerken.",
+	"cascadeprotected": "Deze pagina kan niet bewerkt worden, omdat ze is opgenomen in de volgende {{PLURAL:$1|pagina|pagina's}} die beveiligd {{PLURAL:$1|is|zijn}} met de cascade-optie:\n$2",
+	"namespaceprotected": "U hebt geen rechten om pagina's in de naamruimte <strong>$1</strong> te bewerken.",
 	"customcssprotected": "U kunt deze CSS-pagina niet bewerken, omdat die persoonlijke instellingen van een andere gebruiker bevat.",
 	"customjsprotected": "U kunt deze JavaScriptpagina niet bewerken, omdat die persoonlijke instellingen van een andere gebruiker bevat.",
 	"mycustomcssprotected": "U hebt geen rechten om deze CSS-pagina te bewerken.",
@@ -422,17 +422,17 @@
 	"myprivateinfoprotected": "U hebt geen rechten om uw privégegevens te bewerken.",
 	"mypreferencesprotected": "U hebt geen rechten om uw voorkeuren aan te passen.",
 	"ns-specialprotected": "Pagina's in de naamruimte \"{{ns:special}}\" kunnen niet bewerkt worden.",
-	"titleprotected": "Het aanmaken van deze pagina is beveiligd door [[User:$1|$1]].\nDe gegeven reden is ''$2''.",
+	"titleprotected": "Het aanmaken van deze pagina is beveiligd door [[User:$1|$1]].\nDe gegeven reden is \"<em>$2</em>\".",
 	"filereadonlyerror": "Het was niet mogelijk het bestand \"$1\" aan te passen omdat de bestandsrepository \"$2\" op dit moment alleen-lezen is.\n\nDe opgegeven reden is \"''$3''\".",
 	"invalidtitle-knownnamespace": "Ongeldige titel met naamruimte \"$2\" en tekst \"$3\"",
 	"invalidtitle-unknownnamespace": "Ongeldige titel met onbekend naamruimtenummer $1 en tekst \"$2\"",
 	"exception-nologin": "Niet aangemeld",
 	"exception-nologin-text": "Meld u aan om deze pagina te bekijken of deze handeling uit te voeren.",
 	"exception-nologin-text-manual": "U moet $1 om deze pagina te kunnen bekijken of de handeling uit te voeren.",
-	"virus-badscanner": "Onjuiste configuratie: onbekende virusscanner: ''$1''.",
+	"virus-badscanner": "Onjuiste configuratie: onbekende virusscanner: <em>$1</em>.",
 	"virus-scanfailed": "scannen is mislukt (code $1)",
 	"virus-unknownscanner": "onbekend antivirusprogramma:",
-	"logouttext": "'''U bent nu afgemeld.'''\n\nSommige pagina's kunnen blijven weergegeven alsof u nog aangemeld bent, totdat u uw browsercache leegt.",
+	"logouttext": "<strong>U bent nu afgemeld.</strong>\n\nSommige pagina's kunnen blijven weergegeven alsof u nog aangemeld bent, totdat u uw browsercache leegt.",
 	"welcomeuser": "Welkom, $1!",
 	"welcomecreation-msg": "Uw account is aangemaakt.\nIndien gewenst kunt u uw [[Special:Preferences|voorkeuren]] voor {{SITENAME}} aanpassen.",
 	"yourname": "Gebruikersnaam:",
@@ -445,7 +445,7 @@
 	"createacct-yourpassword-ph": "Geef een wachtwoord op",
 	"yourpasswordagain": "Geef uw wachtwoord opnieuw in:",
 	"createacct-yourpasswordagain": "Bevestig wachtwoord",
-	"createacct-yourpasswordagain-ph": "Geef het wachtwoord opnieuw op",
+	"createacct-yourpasswordagain-ph": "Geef het wachtwoord opnieuw in",
 	"remembermypassword": "Aanmeldgegevens onthouden (maximaal $1 {{PLURAL:$1|dag|dagen}})",
 	"userlogin-remembermypassword": "Aangemeld blijven",
 	"userlogin-signwithsecure": "Beveiligde verbinding gebruiken",
@@ -470,7 +470,7 @@
 	"userlogin-resetpassword-link": "Wachtwoord vergeten?",
 	"userlogin-helplink2": "Hulp bij aanmelden",
 	"userlogin-loggedin": "U bent al aangemeld als {{GENDER:$1|$1}}.\nGebruik het onderstaande formulier om aan te melden als een andere gebruiker.",
-	"userlogin-createanother": "Een andere gebruiker aanmaken",
+	"userlogin-createanother": "Een andere gebruiker registreren",
 	"createacct-emailrequired": "E-mailadres",
 	"createacct-emailoptional": "E-mailadres (optioneel)",
 	"createacct-email-ph": "Geef uw e-mailadres op",
@@ -482,23 +482,24 @@
 	"createacct-reason-ph": "Waarom u een andere gebruiker aanmaakt",
 	"createacct-captcha": "Veiligheidscontrole",
 	"createacct-imgcaptcha-ph": "Geef de tekst in die u hierboven ziet",
-	"createacct-submit": "Gebruiker aanmaken",
+	"createacct-submit": "Account aanmaken",
 	"createacct-another-submit": "Gebruiker aanmaken",
 	"createacct-benefit-heading": "{{SITENAME}} wordt gemaakt door mensen zoals u.",
 	"createacct-benefit-body1": "bewerking{{PLURAL:$1||en}}",
 	"createacct-benefit-body2": "pagina{{PLURAL:$1||'s}}",
 	"createacct-benefit-body3": "recente bijdrager{{PLURAL:$1||s}}",
 	"badretype": "De ingevoerde wachtwoorden verschillen van elkaar.",
+	"usernameinprogress": "Het aanmaken van een gebruiker met die naam is al bezig.\nGelieve te wachten.",
 	"userexists": "De gekozen gebruikersnaam is al in gebruik.\nKies een andere naam.",
 	"loginerror": "Aanmeldfout",
 	"createacct-error": "Fout tijdens aanmaken gebruiker",
 	"createaccounterror": "Het was niet mogelijk de gebruiker aan te maken: $1",
 	"nocookiesnew": "De gebruiker is geregistreerd, maar niet aangemeld.\n{{SITENAME}} gebruikt cookies voor het aanmelden van gebruikers.\nSchakel die in en meld daarna aan met uw nieuwe gebruikersnaam en wachtwoord.",
-	"nocookieslogin": "{{SITENAME}} gebruikt cookies voor het aanmelden van gebruikers.\nCookies zijn uitgeschakeld in uw browser.\nSchakel deze optie aan en probeer het opnieuw.",
+	"nocookieslogin": "{{SITENAME}} gebruikt cookies voor het aanmelden van gebruikers.\nCookies zijn uitgeschakeld in uw browser.\nSchakel deze optie in en probeer het opnieuw.",
 	"nocookiesfornew": "De gebruiker is niet gemaakt omdat de bron niet bevestigd kon worden.\nZorg ervoor dat u cookies hebt ingeschakeld, herlaad deze pagina en probeer het opnieuw.",
 	"noname": "U hebt geen geldige gebruikersnaam opgegeven.",
 	"loginsuccesstitle": "Aanmelden geslaagd",
-	"loginsuccess": "'''U bent nu aangemeld bij {{SITENAME}} als \"$1\".'''",
+	"loginsuccess": "<strong>U bent nu aangemeld bij {{SITENAME}} als \"$1\".</strong>",
 	"nosuchuser": "De gebruiker \"$1\" bestaat niet.\nGebruikersnamen zijn hoofdlettergevoelig.\nControleer de schrijfwijze of [[Special:UserLogin/signup|maak een nieuw gebruiker aan]].",
 	"nosuchusershort": "De gebruiker \"$1\" bestaat niet.\nControleer de schrijfwijze.",
 	"nouserspecified": "Geef een gebruikersnaam op.",
@@ -579,7 +580,7 @@
 	"passwordreset-emailtitle": "Gebruikersgegevens op {{SITENAME}}",
 	"passwordreset-emailtext-ip": "Iemand, waarschijnlijk u, heeft vanaf het IP-adres $1 een aanvraag gedaan om uw wachtwoord voor {{SITENAME}} ($4) opnieuw in te stellen. De volgende {{PLURAL:$3|gebruiker is|gebruikers zijn}} gekoppeld aan dit e-mailadres:\n\n$2\n\n{{PLURAL:$3|Dit tijdelijke wachtwoord vervalt|Deze tijdelijke wachtwoorden vervallen}} over {{PLURAL:$5|een dag|$5 dagen}}. Meld u aan en wijzig het wachtwoord nu. Als u dit verzoek niet zelf heeft gedaan, of als u het oorspronkelijke wachtwoord nog kent en het niet wilt wijzigen, negeer dit bericht dan en blijf uw oude wachtwoord gebruiken.",
 	"passwordreset-emailtext-user": "Gebruiker $1 op de site {{SITENAME}} heeft een aanvraag gedaan om uw wachtwoord voor {{SITENAME}} ($4) opnieuw in te stellen. De volgende {{PLURAL:$3|gebruiker is|gebruikers zijn}} gekoppeld aan dit e-mailadres:\n\n$2\n\n{{PLURAL:$3|Dit tijdelijke wachtwoord vervalt|Deze tijdelijke wachtwoorden vervallen}} over {{PLURAL:$5|een dag|$5 dagen}}.\nMeld u aan en wijzig het wachtwoord nu. Als u dit verzoek niet zelf heeft gedaan, of als u het oorspronkelijke wachtwoord nog kent en het niet wilt wijzigen, negeer dit bericht dan en blijf uw oude wachtwoord gebruiken.",
-	"passwordreset-emailelement": "Gebruikersnaam: $1\nTijdelijk wachtwoord: $2",
+	"passwordreset-emailelement": "Gebruikersnaam: \n$1\n\nTijdelijk wachtwoord: \n$2",
 	"passwordreset-emailsent": "Er is een e-mail voor het opnieuw instellen van een wachtwoord verzonden.",
 	"passwordreset-emailsent-capture": "Er is een e-mail voor het opnieuw instellen van een wachtwoord verzonden. Deze wordt hieronder weergegeven.",
 	"passwordreset-emailerror-capture": "Er is een e-mail voor het opnieuw instellen van een wachtwoord aangemaakt. Deze wordt hieronder weergegeven. Het verzenden naar de {{GENDER:$2|gebruiker}} is mislukt om de volgende reden: $1",
@@ -627,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.",
@@ -635,7 +636,7 @@
 	"missingcommentheader": "'''Let op:''' u hebt geen onderwerp/kop voor deze opmerking opgegeven.\nAls u opnieuw op \"{{int:savearticle}}\" klikt, wordt uw wijziging zonder een onderwerp/kop opgeslagen.",
 	"summary-preview": "Bewerkingssamenvatting nakijken:",
 	"subject-preview": "Onderwerp/kop nakijken:",
-	"previewerrortext": "Er is een fout opgetreden bij het voorvertonen van je bewerkingen.",
+	"previewerrortext": "Er is een fout opgetreden tijdens het weergeven van uw wijzigingen.",
 	"blockedtitle": "Gebruiker is geblokkeerd",
 	"blockedtext": "'''Uw gebruiker of IP-adres is geblokkeerd.'''\n\nDe blokkade is uitgevoerd door $1.\nDe opgegeven reden is ''$2''.\n\n* Aanvang blokkade: $8\n* Einde blokkade: $6\n* Bedoeld te blokkeren: $7\n\nU kunt contact opnemen met $1 of een andere [[{{MediaWiki:Grouppage-sysop}}|beheerder]] om de blokkade te bespreken.\nU kunt geen gebruik maken van de functie \"Deze gebruiker e-mailen\", tenzij u een geldig e-mailadres hebt opgegeven in uw [[Special:Preferences|voorkeuren]] en het gebruik van deze functie niet geblokkeerd is.\nUw huidige IP-adres is $3 en het blokkadenummer is #$5.\nVermeld alle bovenstaande gegevens als u ergens op deze blokkade reageert.",
 	"autoblockedtext": "Uw IP-adres is automatisch geblokkeerd, omdat het is gebruikt door een andere gebruiker, die is geblokkeerd door $1.\nDe opgegeven reden is:\n\n:''$2''\n\n* Aanvang blokkade: $8\n* Einde blokkade: $6\n* Bedoeld te blokkeren: $7\n\nU kunt deze blokkade bespreken met $1 of een andere [[{{MediaWiki:Grouppage-sysop}}|beheerder]].\n\nU kunt geen gebruik maken van de functie \"Deze gebruiker e-mailen\", tenzij u een geldig e-mailadres hebt opgegeven in uw [[Special:Preferences|voorkeuren]] en het gebruik van deze functie niet is geblokkeerd.\n\nUw huidige IP-adres is $3 en het blokkadenummer is #$5.\nVermeld alle bovenstaande gegevens als u ergens op deze blokkade reageert.",
@@ -693,7 +694,7 @@
 	"readonlywarning": "'''Waarschuwing: u kunt deze bewerking nu niet opslaan omdat de database is geblokkeerd voor bewerkingen wegens onderhoudswerkzaamheden.'''\nHet is misschien verstandig om uw tekst tijdelijk in een tekstbestand op te slaan om dit te bewaren voor wanneer de blokkering van de database opgeheven is.\n\nEen beheerder heeft de database geblokkeerd om de volgende reden: $1",
 	"protectedpagewarning": "'''Waarschuwing: deze beveiligde pagina kan alleen door gebruikers met beheerdersrechten bewerkt worden.'''\nDe laatste logboekregel staat hieronder:",
 	"semiprotectedpagewarning": "'''Let op:''' deze pagina is beveiligd en kan alleen door geregistreerde gebruikers bewerkt worden.\nDe laatste logboekregel staat hieronder:",
-	"cascadeprotectedwarning": "'''Waarschuwing:''' deze pagina is beveiligd en kan alleen door beheerders bewerkt worden, omdat deze is opgenomen in de volgende {{PLURAL:$1|pagina|pagina's}} die beveiligd {{PLURAL:$1|is|zijn}} met de cascade-optie:",
+	"cascadeprotectedwarning": "<strong>Waarschuwing:</strong> deze pagina is beveiligd en kan alleen door beheerders bewerkt worden, omdat ze is opgenomen in de volgende {{PLURAL:$1|pagina|pagina's}} die beveiligd {{PLURAL:$1|is|zijn}} met de cascade-optie:",
 	"titleprotectedwarning": "'''Waarschuwing: Deze pagina is beveiligd. Er zijn [[Special:ListGroupRights|speciale rechten]] nodig om de pagina aan te kunnen maken.'''\nDe laatste logboekregel staat hieronder:",
 	"templatesused": "Op deze pagina {{PLURAL:$1|gebruikt sjabloon|gebruikte sjablonen}}:",
 	"templatesusedpreview": "{{PLURAL:$1|Sjabloon|Sjablonen}} gebruikt in deze voorvertoning:",
@@ -1215,7 +1216,7 @@
 	"action-editmyprivateinfo": "uw eigen privégegevens te bewerken",
 	"action-editcontentmodel": "de paginainhoudmodel te bewerken",
 	"action-managechangetags": "labels aanmaken en verwijderen",
-	"action-applychangetags": "labels aan je bewerkingen toe te voegen",
+	"action-applychangetags": "labels aan uw bewerkingen toe te voegen",
 	"action-changetags": "willekeurige labels toe te voegen aan en te verwijderen van versies en logboekregels",
 	"nchanges": "$1 {{PLURAL:$1|bewerking|bewerkingen}}",
 	"enhancedrc-since-last-visit": "$1 {{PLURAL:$1|sinds uw laatste bezoek}}",
@@ -1262,8 +1263,8 @@
 	"newpageletter": "N",
 	"boteditletter": "b",
 	"number_of_watching_users_pageview": "[$1 {{PLURAL:$1|keer|keer}} op een volglijst]",
-	"rc_categories": "Beperken tot categorieën (scheiden met een \"|\")",
-	"rc_categories_any": "Elke",
+	"rc_categories": "Beperken tot categorieën (scheiden met een \"|\"):",
+	"rc_categories_any": "Een van de aangeduide",
 	"rc-change-size-new": "$1 {{PLURAL:$1|byte|bytes}} na de wijziging",
 	"newsectionsummary": "/* $1 */ nieuwe subkop",
 	"rc-enhanced-expand": "Details weergeven",
@@ -1344,13 +1345,13 @@
 	"php-uploaddisabledtext": "Het uploaden van bestanden is uitgeschakeld in PHP.\nControleer de instelling \"file_uploads\".",
 	"uploadscripted": "Dit bestand bevat HTML- of scriptcode die foutief door uw browser kan worden weergegeven.",
 	"upload-scripted-pi-callback": "Het uploaden van een bestand met instructies voor de verwerking van XML-stijlbladen is niet mogelijk.",
-	"uploaded-script-svg": "Gevonden scriptable element \"$1\" in het geüploade SVG-bestand.",
-	"uploaded-hostile-svg": "Gevonden onveilige CSS in de stijl element van het geüploade SVG-bestand .",
+	"uploaded-script-svg": "Scriptable element \"$1\" in het geüploade SVG-bestand gevonden.",
+	"uploaded-hostile-svg": "Onveilige CSS in het \"style\"-element van het geüploade SVG-bestand gevonden.",
 	"uploaded-event-handler-on-svg": "Het instellen van de event-handler attributen <code>$1=\"$2\"</code> is niet toegestaan in SVG-bestanden.",
 	"uploaded-href-attribute-svg": "href-attributen <code>&lt;$1 $2=\"$3\"&gt;</code> met niet-lokaal doel (bv. http://, javascript:, enz.) zijn niet toegestaan in SVG-bestanden.",
-	"uploaded-href-unsafe-target-svg": "Gevonden href tot onveilige doel <code><$1 $2=\"$3\"></code> in het geüploade SVG-bestand .",
-	"uploaded-animate-svg": "Gevonden \"animeren\" tag die kan veranderen href behulp van de \"uit\" - attribuut <code><$1 $2=\"$3\"></code> in het geüploade svg-bestand.",
-	"uploaded-setting-event-handler-svg": "Het instellen van de event-handler attributen is geblokkeerd, gevonden <code><$1 $2=\"$3\"></code> in het geüploade SVG-bestand.",
+	"uploaded-href-unsafe-target-svg": "href met onveilig doel <code>&lt;$1 $2=\"$3\"&gt;</code> in het geüploade SVG-bestand gevonden.",
+	"uploaded-animate-svg": "\"animate\"-tag gevonden in het geüploade svg-bestand die href zou kunnen veranderen, met behulp van het \"from\"-attribuut <code>&lt;$1 $2=\"$3\"&gt;</code>.",
+	"uploaded-setting-event-handler-svg": "Het instellen van de event-handler-attributen is geblokkeerd, <code>&lt;$1 $2=\"$3\"&gt;</code> gevonden in het geüploade SVG-bestand.",
 	"uploaded-setting-href-svg": "Met behulp van de \"set\" tag toevoegen \"href\" attribuut te bovenliggende element is geblokkeerd.",
 	"uploaded-wrong-setting-svg": "Met behulp van de \"set\" tag toevoegen van een afstandsbediening/data/script doel aan een kenmerk is geblokkeerd. Gevonden <code><set=\"$1\"></code> in het geüploade SVG-bestand.",
 	"uploaded-setting-handler-svg": "SVG-dat stelt de \"handler\" attribuut met afstandsbediening/data/script geblokkeerd. Gevonden <code>$1=\"$2\"</code> in de SVG-bestand geüpload.",
@@ -1386,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.",
@@ -1616,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]].",
@@ -1770,7 +1784,6 @@
 	"emailuser": "Deze gebruiker e-mailen",
 	"emailuser-title-target": "Deze {{GENDER:$1|gebruiker}} e-mailen",
 	"emailuser-title-notarget": "Gebruiker e-mailen",
-	"emailpage": "Gebruiker e-mailen",
 	"emailpagetext": "Via dit formulier kunt u een e-mail aan {{GENDER:$1|deze gebruiker}} verzenden.\nHet e-mailadres dat u hebt opgegeven bij [[Special:Preferences|uw voorkeuren]] wordt als afzender gebruikt.\nDe ontvanger kan dus direct naar u reageren.",
 	"defemailsubject": "E-mail van {{SITENAME}}-gebruiker \"$1\"",
 	"usermaildisabled": "Gebruikerse-mail uitgeschakeld",
@@ -1792,7 +1805,7 @@
 	"emailccsubject": "Kopie van uw bericht aan $1: $2",
 	"emailsent": "E-mail verzonden",
 	"emailsenttext": "Uw e-mail is verzonden.",
-	"emailuserfooter": "Deze e-mail is verstuurd door $1 aan $2 door de functie \"{{int:emailpage}}\" van {{SITENAME}}.",
+	"emailuserfooter": "Deze e-mail is verstuurd door $1 aan $2 door de functie \"{{int:emailuser}}\" van {{SITENAME}}.",
 	"usermessage-summary": "Systeembericht achtergelaten",
 	"usermessage-editor": "Systeembericht",
 	"watchlist": "Volglijst",
@@ -2323,7 +2336,7 @@
 	"tooltip-pt-preferences": "Mijn voorkeuren",
 	"tooltip-pt-watchlist": "Overzicht van pagina's die u volgt",
 	"tooltip-pt-mycontris": "Overzicht van uw bijdragen",
-	"tooltip-pt-login": "U wordt van harte uitgenodigd om in te loggen, maar dit is niet verplicht",
+	"tooltip-pt-login": "U wordt van harte uitgenodigd om aan te melden, maar dit is niet verplicht",
 	"tooltip-pt-logout": "Afmelden",
 	"tooltip-pt-createaccount": "Registreer u vooral en meld u aan. Dit is echter niet vereist.",
 	"tooltip-ca-talk": "Overleg over deze pagina",
@@ -2344,7 +2357,7 @@
 	"tooltip-p-logo": "Naar de hoofdpagina gaan",
 	"tooltip-n-mainpage": "Naar de hoofdpagina gaan",
 	"tooltip-n-mainpage-description": "Naar de hoofdpagina gaan",
-	"tooltip-n-portal": "Informatie over het project: wat je kunt doen, waar je dingen kunt vinden",
+	"tooltip-n-portal": "Informatie over het project: wat u kunt doen, waar u dingen kunt vinden",
 	"tooltip-n-currentevents": "Achtergrondinformatie over actuele zaken",
 	"tooltip-n-recentchanges": "Een lijst met recente wijzigingen in deze wiki.",
 	"tooltip-n-randompage": "Een willekeurige pagina bekijken",
@@ -2363,7 +2376,7 @@
 	"tooltip-ca-nstab-main": "Inhoudspagina bekijken",
 	"tooltip-ca-nstab-user": "Gebruikerspagina bekijken",
 	"tooltip-ca-nstab-media": "Mediapagina bekijken",
-	"tooltip-ca-nstab-special": "Dit is een speciale pagina, u kunt de pagina zelf niet bewerken",
+	"tooltip-ca-nstab-special": "Dit is een speciale pagina die niet bewerkt kan worden",
 	"tooltip-ca-nstab-project": "Projectpagina bekijken",
 	"tooltip-ca-nstab-image": "Bestandspagina bekijken",
 	"tooltip-ca-nstab-mediawiki": "Systeembericht bekijken",
diff --git a/languages/i18n/nn.json b/languages/i18n/nn.json
index c4c38840e5..4d13fb71eb 100644
--- a/languages/i18n/nn.json
+++ b/languages/i18n/nn.json
@@ -506,7 +506,7 @@
 	"passwordreset-emailtitle": "↓Kontodetaljar på {{SITENAME}}",
 	"passwordreset-emailtext-ip": "Nokon (sannsynlegvis deg, frå IP-adressa $1) bad om ei påminning for kontodetaljane dine for {{SITENAME}} ($4). {{PLURAL:$3|Den fylgjande brukarkontoen|Dei fylgjande brukarkontoane}} er assosierte med denne e-postadressa:\n\n$2\n\n{{PLURAL:$3|Dette mellombels passordet|Desse mellombels passorda}} vil verta ugilde om {{PLURAL:$5|éin dag|$5 dagar}}.\nDu bør logga inn og velja eit nytt passord no. Om nokon andre enn deg bad om denne påminninga, eller du har kome i hug det opphavlege passordet og ikkje lenger ynskjer å endra det, kan du sjå bort frå denne meldinga og halda fram med å nytta det gamle passordet ditt.",
 	"passwordreset-emailtext-user": "Brukaren $1 på {{SITENAME}} bad om ei påminning for kontodetaljane dine for {{SITENAME}} ($4). {{PLURAL:$3|Den fylgjande brukarkontoen|Dei fylgjande brukarkontoane}} er assosierte med denne e-postadressa:\n\n$2\n\n{{PLURAL:$3|Dette mellombels passordet|Desse mellombels passorda}} vil verta ugilde om {{PLURAL:$5|éin dag|$5 dagar}}.\nDu bør logga inn og velja eit nytt passord no. Om nokon andre enn deg bad om denne påminninga, eller du har kome i hug det opphavlege passordet og ikkje lenger ynskjer å endra det, kan du sjå bort frå denne meldinga og halda fram med å nytta det gamle passordet ditt.",
-	"passwordreset-emailelement": "↓Brukarnamn: $1\nMellombels passord: $2",
+	"passwordreset-emailelement": "↓Brukarnamn: \n$1\n\nMellombels passord: \n$2",
 	"passwordreset-emailsent": "Ein e-post for attendestilling av passord er vorten send",
 	"passwordreset-emailsent-capture": "Ein e-post om attendestilling av passord - vist under - er vorten send",
 	"passwordreset-emailerror-capture": "Ein e-post om attendestilling av passord vart oppretta, og er vist nedanfor; men det lukkast ikkje å senda han til {{GENDER:$2|brukaren}}: $1",
@@ -1139,7 +1139,7 @@
 	"recentchangeslinked-title": "Endringar relaterte til «$1»",
 	"recentchangeslinked-summary": "Dette er ei liste over nylege endringar som er gjorde på sider som vert lenkja til frå ei oppgjeven side (eller på medlemer av ein oppgjeven kategori). Sider på [[Special:Watchlist|overvakingslista di]] er '''utheva'''.",
 	"recentchangeslinked-page": "Sidenamn:",
-	"recentchangeslinked-to": "Vis endringar på sider som lenkjer til den gitte sida i staden",
+	"recentchangeslinked-to": "Vis endringar på sider som lenkjar til den gitte sida i staden",
 	"upload": "Last opp fil",
 	"uploadbtn": "Last opp fil",
 	"reuploaddesc": "Attende til opplastingsskjemaet.",
@@ -1343,7 +1343,7 @@
 	"filehist-comment": "Kommentar",
 	"imagelinks": "Filbruk",
 	"linkstoimage": "{{PLURAL:$1|Den følgjande sida|Dei følgjande $1 sidene}} har lenkjer til denne fila:",
-	"linkstoimage-more": "Meir enn $1 {{PLURAL:$1|side|sider}} lenkjer til denne fila.\nFølgjande liste viser {{PLURAL:$1|den første sida|dei $1 første sidene}}.\nEi [[Special:WhatLinksHere/$2|fullstendig liste]] er tilgjengeleg.",
+	"linkstoimage-more": "Meir enn $1 {{PLURAL:$1|side|sider}} lenkjar til denne fila.\nDenne lista viser {{PLURAL:$1|den første sida|dei $1 første sidene}}.\nEi [[Special:WhatLinksHere/$2|fullstendig liste]] er tilgjengeleg.",
 	"nolinkstoimage": "Det finst ikkje noka side med lenkje til denne fila.",
 	"morelinkstoimage": "Vis [[Special:WhatLinksHere/$1|fleire lenkjer]] til denne fila.",
 	"linkstoimage-redirect": "$1 (filomdirigering) $2",
@@ -1555,7 +1555,7 @@
 	"linksearch-ns": "Namnerom:",
 	"linksearch-ok": "Søk",
 	"linksearch-text": "Jokerteikn som «*.wikipedia.org» kan nyttast.\nDet er påkravt med eit toppnivådomene, til dømes «*.org».<br />\n{{PLURAL:$2|Stødd protokoll|Stødde protokollar}}: $1 (nyttar http:// som standard om ingen protokoll er oppgjeven)",
-	"linksearch-line": "$2 lenkjer til $1",
+	"linksearch-line": "$2 lenkjar til $1",
 	"linksearch-error": "Jokerteikn kan berre nyttast føre tenarnamnet.",
 	"listusersfrom": "Vis brukarnamna frå og med:",
 	"listusers-submit": "Vis",
@@ -1596,7 +1596,6 @@
 	"emailuser": "Send e-post åt denne brukaren",
 	"emailuser-title-target": "Send epost åt {{GENDER:$1|brukaren}}",
 	"emailuser-title-notarget": "Send e-post åt brukar",
-	"emailpage": "Send e-post åt brukar",
 	"emailpagetext": "Du kan nytte skjemaet nedanfor til å sende ein e-post til denne {{GENDER:$1|brukaren}}.\nE-postadressa du har sett i [[Special:Preferences|innstillingane dine]] vil dukke opp i «frå»-feltet på denne e-posten, så mottakaren er i stand til å svare.",
 	"defemailsubject": "{{SITENAME}} epost frå brukar \"$1\"",
 	"usermaildisabled": "Brukare-post slegen av",
@@ -1689,7 +1688,7 @@
 	"delete-edit-reasonlist": "Endre grunnar til sletting",
 	"delete-toobig": "Denne sida har ein stor endringsshistorikk, med over {{PLURAL:$1|$1&nbsp;endring|$1&nbsp;endringar}}. Sletting av slike sider er avgrensa for å unngå utilsikta forstyrring av {{SITENAME}}.",
 	"delete-warning-toobig": "Denne sida har ein lang endringshistorikk, med meir enn {{PLURAL:$1|$1&nbsp;endring|$1&nbsp;endringar}}. Dersom du slettar henne kan det forstyrre handlingar i databasen til {{SITENAME}}, ver varsam.",
-	"deleting-backlinks-warning": "'''Åtvaring''': Andre sider lenkjer til eller inkluderer sida du er i ferd med å sletta.",
+	"deleting-backlinks-warning": "'''Åtvaring''': [[Special:WhatLinksHere/{{FULLPAGENAME}}|Andre sider]] lenkjar til eller inkluderer sida du er i ferd med å sletta.",
 	"rollback": "Rull attende endringar",
 	"rollbacklink": "rull attende",
 	"rollbacklinkcount": "rull attende {{PLURAL:$1|éi endring|$1 endringar}}",
@@ -2146,7 +2145,7 @@
 	"tooltip-n-randompage": "Vis ei tilfeldig side",
 	"tooltip-n-help": "Hjelp til å bruke alle funksjonane.",
 	"tooltip-t-whatlinkshere": "Liste over alle wikisidene som har lenkjer hit",
-	"tooltip-t-recentchangeslinked": "Siste endringar på sider denne sida lenkjer til",
+	"tooltip-t-recentchangeslinked": "Nylege endringar på sider denne sida lenkjar til",
 	"tooltip-feed-rss": "RSS-mating for denne sida",
 	"tooltip-feed-atom": "Atom-mating for denne sida",
 	"tooltip-t-contributions": "Sjå liste over bidrag frå denne brukaren",
diff --git a/languages/i18n/oc.json b/languages/i18n/oc.json
index 12bf5df2f7..5b54f9dd71 100644
--- a/languages/i18n/oc.json
+++ b/languages/i18n/oc.json
@@ -510,7 +510,7 @@
 	"passwordreset-emailtitle": "Detailhs d'un compte per {{SITENAME}}",
 	"passwordreset-emailtext-ip": "Qualqu'un (probablament vos, dempuèi l'adreça IP $1) a demandat una reïnicializacion de vòstre senhal per {{SITENAME}} ($4). {{PLURAL:$3|Lo compte d'utilizaire seguent es associat|Los comptes d'utilizaires seguents son associats}} a aquesta adreça de corrièr electronic :\n\n$2\n\n{{PLURAL:$3|Aqueste senhal temporari expirarà|Aquestes senhals temporaris expiraràn}} dins {{PLURAL:$5|un jorn|$5 jorns}}. Ara, vos cal vos connectar e causir un senhal novèl. Se aquesta demanda proven pas de vos, o que vos sètz remembrat de vòstre senhal inicial, e que volètz pas mai lo modificar, podètz ignorar aqueste messatge e contunhar d'utilizar vòstre ancian senhal.",
 	"passwordreset-emailtext-user": "L'utilizaire $1 sus {{SITENAME}} a demandat una reïnicializacion de vòstre senhal per {{SITENAME}} ($4). {{PLURAL:$3|Lo compte d'utilizaire seguent es associat|Los comptes d'utilizaires seguents son associats}} a aquesta adreça de corrièr electronic :\n\n$2\n\n{{PLURAL:$3|Aqueste senhal temporari expirarà|Aquestes senhals temporaris expiraràn}} dins {{PLURAL:$5|un jorn|$5 jorns}}. Ara, vos cal vos connectar e causir un senhal novèl. Se aquesta demanda proven pas de vos, o que vos sètz remembrat de vòstre senhal inicial, e que lo volètz pas mai modificar, podètz ignorar aqueste messatge e contunhar d'utilizar vòstre ancian senhal.",
-	"passwordreset-emailelement": "Utilizaire: $1\nSenhal temporari: $2",
+	"passwordreset-emailelement": "Utilizaire: \n$1\n\nSenhal temporari: \n$2",
 	"passwordreset-emailsent": "Un corrièr electronic de reïnicializacion de senhal es estat mandat.",
 	"passwordreset-emailsent-capture": "Un corrièr electronic de reïnicializacion senhal es estat mandat, qu'es afichat çaijós.",
 	"passwordreset-emailerror-capture": "Un corrièr electronic de reïnicializacion de senhal es estat generat, qu'es afichat çaijós, mas lo mandadís a l'{{GENDER:$2|utilizaire}} a fracassat : $1",
@@ -1652,7 +1652,6 @@
 	"emailuser": "Mandar un messatge a aqueste utilizaire",
 	"emailuser-title-target": "Mandar un corrièl a {{GENDER:$1|aqueste utilizaire|aquesta utilizaira}}",
 	"emailuser-title-notarget": "Mandar un corrièr electronic a l’utilizaire",
-	"emailpage": "Mandar un corrièr electronic a l’utilizaire",
 	"emailpagetext": "Podètz utilizar lo formulari çaijós per mandar un corrièr electronic a {{GENDER:$1|aqueste utilizaire|aquesta utilizaira}}.\nL'adreça electronica qu'avètz indicada dins [[Special:Preferences|vòstras preferéncias]] apareisserà dins lo camp « Expeditor » de vòstre messatge. E mai, lo destinatari vos poirà respondre dirèctament.",
 	"defemailsubject": "{{SITENAME}} Corrièl de l'utilizaire « $1 »",
 	"usermaildisabled": "Lo mandadís de corrièrs electronics entre utilizairers es desactivat",
diff --git a/languages/i18n/olo.json b/languages/i18n/olo.json
new file mode 100644
index 0000000000..17855310f8
--- /dev/null
+++ b/languages/i18n/olo.json
@@ -0,0 +1,748 @@
+{
+	"@metadata": {
+		"authors": [
+			"Denö",
+			"Hiloin Natoi",
+			"Ilja.mos",
+			"Mashoi7"
+		]
+	},
+	"tog-underline": "Linkien alleviivuamine:",
+	"tog-hideminor": "Peittiä pienet muutokset uuvet muutokset -listaspäi",
+	"tog-hidepatrolled": "Peittiä tarkastetut muutokset uvvet muutokset -listaspäi",
+	"tog-newpageshidepatrolled": "Peittiä tarkastetut sivut uuzien sivuloin listalpäi",
+	"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",
+	"ok": "OK",
+	"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: \n$1\n\nVäliaigaine peittosana: \n$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/or.json b/languages/i18n/or.json
index cc106dc3a4..017b9100d0 100644
--- a/languages/i18n/or.json
+++ b/languages/i18n/or.json
@@ -515,7 +515,7 @@
 	"passwordreset-emailtitle": "{{SITENAME}} ର ଖାତା ସବିଶେଷ",
 	"passwordreset-emailtext-ip": "କେହିଜଣେ (ବୋଧେ ଆପଣ, $1 IP addressରୁ) {{SITENAME}} ($4)ରେ ପାସୱାର୍ଡ଼ ରି-ସେଟ କରିବା ପାଇଁ ଅନୁରୋଧ କରିଛନ୍ତି । ଉକ୍ତ ଇମେଲ ଠିକଣା ସହିତ ଏହି {{PLURAL:$3|ସଭ୍ୟ ଖାତାଟି|ସଭ୍ୟ ଖାତାମାନ}} ସମ୍ବନ୍ଧିତ:\n\n$2\n\n{{PLURAL:$3|ଏହି ଅସ୍ଥାୟୀ ପାସୱାର୍ଡ଼ଟି|ଏହି ଅସ୍ଥାୟୀ ପାସୱାର୍ଡ଼ମାନ}} {{PLURAL:$5|ଦିନକ|$5 ଦିନ}}ରେ ଅଚଳ ହୋଇଯିବ ।\nଆପଣ ଏବେ ଲଗ ଇନ କରି ନୂଆ ପାସୱାର୍ଡ଼ଟିଏ ବାଛନ୍ତୁ । ଯଦି ଆଉ କେହି ଏହି ଅନୁରୋଧ କରିଥାନ୍ତି କିମ୍ବା ନିଜର ପୁରୁଣା ପାସୱାର୍ଡ଼ଟି ମନେପଡ଼ିଲା, ଏବଂ ଆଉ ପାସୱାର୍ଡ଼ଟି ବଦଳାଇବାକୁ ଚାହୁଁନାହାଁନ୍ତି ତାହେଲେ ଏହି ମେଲଟିକୁ ଅଣଦେଖା କରି ନିଜର ପୁରୁଣା ପାସୱାର୍ଡ଼ ବ୍ୟବହାର କରନ୍ତୁ ।",
 	"passwordreset-emailtext-user": "$1 ନାମକ ସଭ୍ୟଜଣକ {{SITENAME}}ରେ {{SITENAME}} ($4) ପାଇଁ ଆପଣଙ୍କ ପାସ ୱାର୍ଡ଼ ରିସେଟ କରିବାର ଅନୁରୋଧ କରିଛନ୍ତି । ତଳ {{PLURAL:$3|ଖାତାଟି|ଖାତାମାନ}} ଉକ୍ତ ଇମେଲ ସହିତ ସମ୍ବନ୍ଧିତ:\n\n$2\n\n{{PLURAL:$3|ଏହି ଅସ୍ଥାୟୀ ପାସୱାର୍ଡ଼ଟି|ଏହି ଅସ୍ଥାୟୀ ପାସୱାର୍ଡ଼ମାନ}} {{PLURAL:$5|ଦିନକ|$5 ଦିନ}}ରେ ଅଚଳ ହୋଇଯିବ ।\nଆପଣ ଲଗ ଇନ କରି ନୂଆ ପାସୱାର୍ଡ଼ଟିଏ ବାଛନ୍ତୁ । ଯଦି ଆଉ କେହି ଏହି ଅନୁରୋଧଟି କରିଥାନ୍ତି କିମ୍ବା ଆପଣଙ୍କର ନିଜ ପୁରୁଣା ପାସୱାର୍ଡ଼ଟି ମନେପଡ଼ିଗଲା ତେବେ ଆପଣଙ୍କୁ ଆଉ ପାସୱାର୍ଡ଼ ବଦଳାଇବାର ଆବଶ୍ୟକତା ନାହିଁ । ଆପଣ ଏହି ମେସେଜଟିକୁ ଅଣଦେଖା କରି ନିଜର ପୁରୁଣା ପାସୱାର୍ଡ଼ ବ୍ୟବହାର କରୁଥାନ୍ତୁ ।",
-	"passwordreset-emailelement": "ଇଉଜର ନାମ: $1\nଅସ୍ଥାୟୀ ପାସୱାର୍ଡ଼: $2",
+	"passwordreset-emailelement": "ଇଉଜର ନାମ: \n$1\n\nଅସ୍ଥାୟୀ ପାସୱାର୍ଡ଼: \n$2",
 	"passwordreset-emailsent": "ଏକ ପାସୱାର୍ଡ଼ ପୁନଃସ୍ଥାପନ ଇମେଲ ପଠାଇଦିଆଯାଇଅଛି ।",
 	"passwordreset-emailsent-capture": "ତଳେ ଦେଖାଯାଉଥିବା ଭଳି, ପାସୱାର୍ଡ଼ ପୁନଃସ୍ଥାପନ ଇମେଲଟିଏ ପଠାଇଦିଆଯାଇଛି ।",
 	"passwordreset-emailerror-capture": "ପାସୱାର୍ଡ଼ ବଦଳାଇବା ସୂଚନା ସହ ଇମେଲଟିଏ ତିଆରି ହୋଇଛି, ଯାହା ତଳେ ଦେଖିପାରିବେ । କିନ୍ତୁ ଏହାକୁ {{GENDER:$2|ସଭ୍ୟ}}ଙ୍କୁ ପଠାଇବାରେ ବିଫଳ ହେଲୁ, କାରଣ: $1",
@@ -1667,7 +1667,6 @@
 	"emailuser": "ଏହି ସଭ୍ୟଙ୍କୁ ଇମେଲ କରିବେ",
 	"emailuser-title-target": "{{GENDER:$1|user}}ଙ୍କୁ ଇ-ମେଲ କରନ୍ତୁ",
 	"emailuser-title-notarget": "ବ୍ୟବହାରକାରୀଙ୍କୁ ଇ-ମେଲ କରନ୍ତୁ",
-	"emailpage": "ବ୍ୟବହାରକାରୀଙ୍କୁ ଇ-ମେଲ କରନ୍ତୁ",
 	"emailpagetext": "ଆପଣ ତଳେ ଥିବା ଫର୍ମ ବ୍ୟବହାର କରି ଏହି {{GENDER:$1|ସଭ୍ୟ}}ଙ୍କୁ ଇମେଲ କରିପାରିବେ । [[Special:Preferences|ଆପଣଙ୍କ ପସନ୍ଦ]]ରେ ଥିବା ଇମେଲ ଠିକଣା \"ପ୍ରେରକ\" ଭାବରେ ଦେଖାଯିବ, ତେଣୁ ଇମେଲ ପାଇଥିବା ସଭ୍ୟ ଆପଣଙ୍କୁ ସିଧା ସଳଖ ଉତ୍ତର ଦେଇପାରିବେ ।",
 	"defemailsubject": "{{SITENAME}} \"$1\" ସଭ୍ୟଙ୍କ ଠାରୁ ଇ-ମେଲ କରିବେ",
 	"usermaildisabled": "ବ୍ୟବହାରକାରୀଙ୍କ ଈ-ମେଲ ଅଚଳ କରାଗଲା",
diff --git a/languages/i18n/os.json b/languages/i18n/os.json
index 37b8e59c59..b13db96fda 100644
--- a/languages/i18n/os.json
+++ b/languages/i18n/os.json
@@ -495,7 +495,6 @@
 	"resetpass-expired": "Дæ паролы æмгъуыд фæци. Ног пароль сæвæр, дæ хорзæхæй.",
 	"passwordreset": "Пароль раппарæн",
 	"passwordreset-text-one": "Ацы формæ байдзаг кæн цæмæй дæм барвитæм рæстæгмæ пароль дæ эл. посты адрисмæ.",
-	"passwordreset-legend": "Пароль раппарын",
 	"passwordreset-disabled": "Парол фæлварын ацы викийы хицæн у.",
 	"passwordreset-emaildisabled": "Электрон пост ацы викийы хицæн у.",
 	"passwordreset-username": "Фæсномыг:",
@@ -506,7 +505,7 @@
 	"passwordreset-emailtitle": "{{grammar:genitive|{{SITENAME}}}} акканты тыххæй",
 	"passwordreset-emailtext-ip": "Чидæр (уæццæгæн ды, $1 IP адрисæй) æрдомдта дæ {{grammar:genitive|{{SITENAME}}}} ($4) пароль ногæй сæвæрын. Ацы архайæджы {{PLURAL:$3|аккаунт баст у|аккаунттæ баст сты}} ацы электрон посты адрисимæ:\n\n$2\n\n{{PLURAL:$3|Ацы рæстæгмæ пароль|Ацы рæстæгмæ паролтæ}} кусдзысты {{PLURAL:$5|иу бон|$5 боны}}.\nНыр ды хъуамæ бахизай системæмæ æмæ равзарай ног пароль. Кæд ай æндæр чидæр æрдомдта, кæнæ кæд дæ пароль æрхъуыды кодтай æмæ дæ нал фæды фæивай йæ, уæд дæ бон у мацæмæ дарай ацы фыстæг æмæ дарддæр архайай дæ зæронд паролæй.",
 	"passwordreset-emailtext-user": "{{grammar:genitive|{{SITENAME}}}} архайæг $1 æрдомдта дæ {{grammar:genitive|{{SITENAME}}}} ($4) аккаунты пароль ногæй сæвæрын. Ацы архайæджы {{PLURAL:$3|аккаунт баст у|аккаунттæ баст сты}} ацы электрон посты адрисимæ:\n\n$2\n\n{{PLURAL:$3|Ацы рæстæгмæ пароль|Ацы рæстæгмæ паролтæ}} кусдзысты {{PLURAL:$5|иу бон|$5 боны}}.\nНыр ды хъуамæ бахизай системæмæ æмæ равзарай ног пароль. Кæд ай æндæр чидæр æрдомдта, кæнæ кæд дæ пароль æрхъуыды кодтай æмæ дæ нал фæды фæивай йæ, уæд дæ бон у мацæмæ дарай ацы фыстæг æмæ дарддæр архайай дæ зæронд паролæй.",
-	"passwordreset-emailelement": "Фæсномыг: $1\nРæстæгмæ пароль: $2",
+	"passwordreset-emailelement": "Фæсномыг: \n$1\n\nРæстæгмæ пароль: \n$2",
 	"passwordreset-emailsent": "Ног пароль сæвæрыны фыстæг æрвыст æрцыд.",
 	"passwordreset-emailsent-capture": "Ног пароль сæвæрыны фыстæг æрвыст æрцыд æмæ бындæр æвдыст у.",
 	"passwordreset-emailerror-capture": "Ног пароль сæвæрыны фыстæг арæзт æрцыд æмæ бындæр æвдыст у. Фæлæ йæ {{grammar:allative|{{GENDER:$2|user}}}} арвитын нæ бантыстис: $1",
@@ -521,7 +520,6 @@
 	"changeemail-throttled": "Æгæр бирæ фæлварыс бахизынмæ.\nДæ хорзæхæй, $1 фæлæуу ног фæлвæрды онг.",
 	"resettokens": "Токентæ æппарын",
 	"resettokens-no-tokens": "Æппаринаг токентæ нæй.",
-	"resettokens-legend": "Токентæ æппарын",
 	"resettokens-tokens": "Токентæ:",
 	"resettokens-token-label": "$1 (ныры мидис: $2)",
 	"resettokens-done": "Токентæ æппæрст æрцыдысты.",
@@ -1093,7 +1091,6 @@
 	"nmembers": "$1 {{PLURAL:$1|уæнг|уæнгы}}",
 	"nmemberschanged": "$1 → $2 {{PLURAL:$2|уæнг|уæнджы}}",
 	"nrevisions": "$1 {{PLURAL:$1|фæлтæр|фæлтæры}}",
-	"nviews": "$1 {{PLURAL:$1|æркаст|æркасты}}",
 	"nimagelinks": "Архайд цæуы $1 {{PLURAL:$1|фарсы}}",
 	"ntransclusions": "архайд цæуы $1 {{PLURAL:$1|фарсы}}",
 	"specialpage-empty": "Нæй фæстиуæг.",
@@ -1183,7 +1180,6 @@
 	"mailnologintext": "Фыстæгтæ æрвитынмæ хъуамæ [[Special:UserLogin|системæйæн дæхи бавдисай]] æмæ дæ бæлвырд электронон посты адрис [[Special:Preferences|ныффыссай]].",
 	"emailuser": "Ацы архайæгæн электронон фыстæг рарвитт",
 	"emailuser-title-notarget": "Архайæгæн фыстæг арвит",
-	"emailpage": "Электронон фыстæг йæм барвит",
 	"noemailtitle": "Эл. посты адрис нæй.",
 	"emailusername": "Фæсномыг:",
 	"emailusernamesubmit": "Афтæ уæд",
diff --git a/languages/i18n/pa.json b/languages/i18n/pa.json
index 8225de5962..9a2588dc1b 100644
--- a/languages/i18n/pa.json
+++ b/languages/i18n/pa.json
@@ -512,7 +512,7 @@
 	"passwordreset-emailtitle": "{{SITENAME}} ਤੇ ਖਾਤੇ ਦੀ ਜਾਣਕਾਰੀ",
 	"passwordreset-emailtext-ip": "ਕਿਸੇ ਨੇ (ਸ਼ਾਇਦ ਤੁਸੀਂ, IP ਪਤਾ $1 ਤੋਂ) {{SITENAME}}\n($4) ਲਈ ਖਾਤਾ ਤਫ਼ਸੀਲ ਯਾਦ-ਦਹਾਨੀ ਦੀ ਬੇਨਤੀ ਕੀਤੀ ਹੈ। ਇਹ {{PLURAL:\n$3|ਖਾਤਾ ਇਸ ਈ-ਮੇਲ ਪਤੇ ਨਾਲ਼ ਜੁੜਿਆ ਹੈ|ਖਾਤੇ ਇਸ ਈ-ਮੇਲ ਪਤੇ ਨਾਲ਼ ਜੁੜੇ ਹਨ}}:\n$2\n\nਇਹ ਆਰਜ਼ੀ ਪਾਸਵਰਡ\n{{PLURAL:$5|ਇੱਕ ਦਿਨ|$5 ਦਿਨਾਂ}} ਵਿਚ ਖ਼ਤਮ ਹੋ {{PLURAL:$3|ਜਾਵੇਗਾ|ਜਾਣਗੇ}}।\nਤੁਹਾਨੂੰ ਹੁਣੇ ਲਾਗਇਨ ਕਰਕੇ ਨਵਾਂ ਪਾਸਵਰਡ ਬਣਾਉਣਾ ਚਾਹੀਦਾ ਹੈ। ਜੇ ਕਿਸੇ ਹੋਰ ਨੇ ਇਹ ਬੇਨਤੀ ਕੀਤੀ ਸੀ ਜਾਂ ਜੇ ਤੁਹਾਨੂੰ ਆਪਣਾ ਪਾਸਵਰਡ ਯਾਦ ਹੈ ਅਤੇ ਤੁਸੀਂ ਇਸਨੂੰ ਬਦਲਣਾ ਨਹੀਂ ਚਾਹੁੰਦੇ ਤਾਂ ਤੁਸੀਂ ਇਸ ਸੁਨੇਹੇ ਨੂੰ ਨਜ਼ਰਅੰਦਾਜ਼ ਕਰ ਕੇ ਆਪਣਾ ਪੁਰਾਣਾ ਪਾਸਵਰਡ ਵਰਤਣਾ ਜਾਰੀ ਰੱਖ ਸਕਦੇ ਹੋ।",
 	"passwordreset-emailtext-user": "{{SITENAME}} 'ਤੇ User $1 ਨੇ ਤੁਹਾਡੇ {{SITENAME}} ($4) ਉਤਲੇ ਪਛਾਣ-ਸ਼ਬਦ ਨੂੰ ਮੁੜ-ਬਣਾਉਣ ਦੀ ਬੇਨਤੀ ਕੀਤੀ ਹੈ। ਇਸ ਈਮੇਲ ਪਤੇ ਨਾਲ਼ ਹੇਠ ਲਿਖੇ {{PLURAL:$3|ਖਾਤੇ|ਖਾਤਿਆਂ}} ਦਾ ਵਾਸਤਾ ਹੈ:\n\n$2\n\n{{PLURAL:$3|ਇਸ ਆਰਜ਼ੀ ਪਛਾਣ-ਸ਼ਬਦ|ਇਹਨਾਂ ਆਰਜ਼ੀ ਪਛਾਣ-ਸ਼ਬਦਾਂ}} ਦੀ ਮਿਆਦ {{PLURAL:$5|ਇੱਕ ਦਿਨ|$5 ਦਿਨਾਂ}} 'ਚ ਮੁੱਕ ਜਾਵੇਗੀ।\nਤੁਹਾਨੂੰ ਹੁਣੇ ਦਾਖ਼ਲ ਹੋ ਕੇ ਕੋਈ ਨਵਾਂ ਪਛਾਣ-ਸ਼ਬਦ ਬਣਾ ਲੈਣਾ ਚਾਹੀਦਾ ਹੈ। ਜੇਕਰ ਕਿਸੇ ਹੋਰ ਨੇ ਇਹ ਬੇਨਤੀ ਕੀਤੀ ਹੈ ਜਾਂ ਤੁਹਾਨੂੰ ਆਪਣਾ ਪਹਿਲਾ ਪਛਾਣ-ਸ਼ਬਦ ਯਾਦ ਆ ਗਿਆ ਹੈ ਅਤੇ ਹੁਣ ਤੁਸੀਂ ਉਹਨੂੰ ਬਦਲ਼ਨਾ ਨਹੀਂ ਲੋਚਦੇ ਤਾਂ ਤੁਸੀਂ ਇਸ ਸੁਨੇਹੇ ਨੂੰ ਅਣਡਿੱਠਾ ਕਰ ਕੇ ਆਪਣਾ ਪੁਰਾਣਾ ਪਛਾਣ-ਸ਼ਬਦ ਵਰਤਦੇ ਰਹਿ ਸਕਦੇ ਹੋ।",
-	"passwordreset-emailelement": "ਯੂਜ਼ਰ-ਨਾਂ: $1\nਆਰਜ਼ੀ ਪਾਸਵਰਡ: $2",
+	"passwordreset-emailelement": "ਯੂਜ਼ਰ-ਨਾਂ: \n$1\n\nਆਰਜ਼ੀ ਪਾਸਵਰਡ: \n$2",
 	"passwordreset-emailsent": "ਇੱਕ ਪਾਸਵਰਡ ਮੁੜ-ਸੈੱਟ ਈ-ਮੇਲ ਭੇਜੀ ਜਾ ਚੁੱਕੀ ਹੈ।",
 	"passwordreset-emailsent-capture": "ਇੱਕ ਯਾਦ-ਦਹਾਨੀ ਈ-ਮੇਲ, ਜਿਹੜੀ ਕਿ ਹੇਠਾਂ ਦਿੱਸ ਰਹੀ ਹੈ, ਭੇਜੀ ਜਾ ਚੁੱਕੀ ਹੈ।",
 	"passwordreset-emailerror-capture": "ਪਛਾਣ-ਸ਼ਬਦ ਮੁੜ ਬਣਾਉਣ ਵਾਸਤੇ ਈਮੇਲ ਤਿਆਰ ਹੋ ਗਈ ਸੀ, ਜੋ ਹੇਠਾਂ ਵਿਖਾਈ ਗਈ ਹੈ, ਪਰ ਇਹਨੂੰ {{GENDER:$2|ਵਰਤੋਂਕਾਰ}} ਵੱਲ ਨਹੀਂ ਘੱਲਿਆ ਜਾ ਸਕਿਆ: $1",
@@ -1380,7 +1380,6 @@
 	"emailuser": "ਇਸ ਵਰਤੋਂਕਾਰ ਨੂੰ ਈ-ਮੇਲ ਭੇਜੋ",
 	"emailuser-title-target": "ਇਹ {{GENDER:$1|ਯੂਜ਼ਰ}} ਨੂੰ ਈਮੇਲ ਭੇਜੋ",
 	"emailuser-title-notarget": "ਵਰਤੋਂਕਾਰ ਨੂੰ ਈਮੇਲ ਕਰੋ",
-	"emailpage": "ਵਰਤੋਂਕਾਰ ਨੂੰ ਈਮੇਲ ਕਰੋ",
 	"defemailsubject": "{{SITENAME}} ਈਮੇਲ",
 	"usermaildisabled": "ਵਰਤੋਂਕਾਰ ਦੀ ਈ-ਮੇਲ ਬੰਦ ਹੈ",
 	"usermaildisabledtext": "ਇਸ ਵਿਕੀ ’ਤੇ ਤੁਸੀਂ ਦੂਜੇ ਵਰਤੋਂਕਾਰਾਂ ਨੂੰ ਈ-ਮੇਲ ਨਹੀਂ ਭੇਜ ਸਕਦੇ",
diff --git a/languages/i18n/pam.json b/languages/i18n/pam.json
index ce750b87b1..e3b19e2995 100644
--- a/languages/i18n/pam.json
+++ b/languages/i18n/pam.json
@@ -717,7 +717,6 @@
 	"rcshowhideanons": "$1 talagamit a e migpakilala",
 	"rcshowhidepatr": "$1 edit a babanten (patrolled edits)",
 	"rcshowhidemine": "$1 deng elilan ku",
-	"rcshowhidecategorization-show": "Pakit",
 	"rclinks": "Pakit la reng tauling $1 miyalilan anyang tauling $2 aldo<br />$3",
 	"diff": "aliwa",
 	"hist": "amlat",
@@ -972,7 +971,6 @@
 	"mailnologin": "Alang piparalan (no send address)",
 	"mailnologintext": "Kailangan [[Special:UserLogin|maka-login]] ka at maki gaganang e-mail address kareng kekang  [[Special:Preferences|pinili]] ba kang makaparalang e-mail kareng aliwang talagamit.",
 	"emailuser": "E-mail me ing talagamit a ini",
-	"emailpage": "E-mail talagamit",
 	"emailpagetext": "Nung atin yang gaganang e-mail address ketang kayang pinili ning talagamit (user preferences) ing talagamit a ini, magparla yang metung a mensahi ing form king lalam. Lunto ya ing e-mail address a sinulat mu ketang kekang pinili ning talagamit ketang  \"From\" address (\"ibat kang\") ning sulat, ba yang makapakibat itang miparalan.",
 	"defemailsubject": "e-mail ning {{SITENAME}}",
 	"noemailtitle": "Alang e-mail address",
diff --git a/languages/i18n/pdc.json b/languages/i18n/pdc.json
index 5e0e4a8181..ec42bffb8d 100644
--- a/languages/i18n/pdc.json
+++ b/languages/i18n/pdc.json
@@ -240,7 +240,7 @@
 	"passwordreset": "Paesswatt zerricksetze",
 	"passwordreset-username": "Yuuser-Naame:",
 	"passwordreset-email": "E-Poschd:",
-	"passwordreset-emailelement": "Yuusernaame: $1\nPaesswatt fer nau: $2",
+	"passwordreset-emailelement": "Yuusernaame: \n$1\n\nPaesswatt fer nau: \n$2",
 	"changeemail-none": "(ken)",
 	"changeemail-submit": "E-Poschd ennere",
 	"bold_sample": "Wadde fett gmarrickt",
diff --git a/languages/i18n/pl.json b/languages/i18n/pl.json
index f5f0c3dd8a..e56aab6d29 100644
--- a/languages/i18n/pl.json
+++ b/languages/i18n/pl.json
@@ -79,7 +79,8 @@
 			"Kszapsza",
 			"Openbk",
 			"Doctore",
-			"PiotrAntosz"
+			"PiotrAntosz",
+			"The Polish"
 		]
 	},
 	"tog-underline": "Podkreślenie linków:",
@@ -500,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",
@@ -590,7 +592,7 @@
 	"passwordreset-emailtitle": "Dane konta w {{GRAMMAR:MS.lp|{{SITENAME}}}}",
 	"passwordreset-emailtext-ip": "Ktoś (prawdopodobnie Ty, spod adresu IP $1) poprosił o zresetowanie twojego hasła w {{GRAMMAR:MS.lp{{SITENAME}}}} ($4). Z tym adresem e‐mailowym powiązane {{PLURAL:$3|jest konto użytkownika|są następujące konta użytkowników:}}\n\n$2\n\n{{PLURAL:$3|Tymczasowego hasła|Tymczasowych haseł}} można użyć w ciągu {{PLURAL:$5|jednego dnia|$5 dni}}.\nPowinieneś zalogować się i zmienić hasło na nowe. Jeśli to ktoś inny poprosił o wysłanie przypomnienia lub jeśli pamiętasz aktualne hasło i nie chcesz go zmieniać wystarczy, że zignorujesz tę wiadomość i będziesz nadal korzystać ze swojego starego hasła.",
 	"passwordreset-emailtext-user": "Użytkownik $1 poprosił o zresetowanie twojego hasła w {{GRAMMAR:MS.lp{{SITENAME}}}} ($4). Z tym adresem e‐mailowym powiązane {{PLURAL:$3|jest konto użytkownika|są następujące konta użytkowników:}}\n\n$2\n\n{{PLURAL:$3|Tymczasowego hasła|Tymczasowych haseł}} można użyć w ciągu {{PLURAL:$5|jednego dnia|$5 dni}}.\nPowinieneś zalogować się i zmienić hasło na nowe. Jeśli to ktoś inny poprosił o wysłanie przypomnienia lub jeśli pamiętasz aktualne hasło i nie chcesz go zmieniać wystarczy, że zignorujesz tę wiadomość i będziesz nadal korzystać ze swojego starego hasła.",
-	"passwordreset-emailelement": "Nazwa użytkownika: $1\nTymczasowe hasło: $2",
+	"passwordreset-emailelement": "Nazwa użytkownika: \n$1\n\nTymczasowe hasło: \n$2",
 	"passwordreset-emailsent": "E‐mail resetowania hasła został wysłany.",
 	"passwordreset-emailsent-capture": "Wyświetlony poniżej e‐mail pozwalający na zresetowanie hasła został wysłany.",
 	"passwordreset-emailerror-capture": "Poniżej wyświetlony e‐mail pozwalający na zresetowanie hasła został wygenerowany, ale nie udało się wysłać go do {{GENDER:$2|użytkownika|użytkowniczki}}: $1",
@@ -989,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}})",
@@ -1384,6 +1387,19 @@
 	"upload-too-many-redirects": "URL zawiera zbyt wiele przekierowań",
 	"upload-http-error": "Wystąpił błąd protokołu HTTP – $1",
 	"upload-copy-upload-invalid-domain": "Przesyłanie kopii z tej domeny nie jest dostępne.",
+	"upload-dialog-title": "Prześlij plik",
+	"upload-dialog-error": "Wystąpił błąd",
+	"upload-dialog-warning": "Pojawiło się ostrzeżenie",
+	"upload-dialog-button-cancel": "Anuluj",
+	"upload-dialog-button-done": "Gotowe",
+	"upload-dialog-button-save": "Zapisz",
+	"upload-dialog-button-upload": "Prześlij",
+	"upload-dialog-label-select-file": "Wybierz plik",
+	"upload-dialog-label-infoform-title": "Szczegóły",
+	"upload-dialog-label-infoform-name": "Nazwa",
+	"upload-dialog-label-infoform-description": "Opis",
+	"upload-dialog-label-usage-title": "Korzystanie",
+	"upload-dialog-label-usage-filename": "Nazwa pliku",
 	"backend-fail-stream": "Nie można odczytać pliku $1.",
 	"backend-fail-backup": "Nie można utworzyć kopii zapasowej pliku  $1 .",
 	"backend-fail-notexists": "Plik  $1  nie istnieje.",
@@ -1767,7 +1783,6 @@
 	"emailuser": "Wyślij e‐mail do tego użytkownika",
 	"emailuser-title-target": "Wyślij e-mail do {{GENDER:$1|tego użytkownika|tej użytkowniczki|tego użytkownika}}",
 	"emailuser-title-notarget": "Wyślij wiadomość e‐mail",
-	"emailpage": "Wyślij e‐mail do użytkownika",
 	"emailpagetext": "Możesz użyć poniższego formularza, aby wysłać wiadomość e‐mail do {{GENDER:$1|tego użytkownika|tej użytkowniczki}}.\nAdres e‐mailowy, który został przez Ciebie wprowadzony w [[Special:Preferences|Twoich preferencjach]], zostanie umieszczony w polu „Od”, dzięki czemu odbiorca będzie mógł Ci odpowiedzieć.",
 	"defemailsubject": "{{SITENAME}} – e‐mail od użytkownika „$1”",
 	"usermaildisabled": "E‐mail użytkownika jest wyłączony",
@@ -1876,6 +1891,7 @@
 	"sessionfailure-title": "Błąd sesji",
 	"sessionfailure": "Wystąpił problem z weryfikacją zalogowania.\nPolecenie zostało anulowane, aby uniknąć przechwycenia sesji.\nNaciśnij „wstecz” w przeglądarce, przeładuj stronę, po czym ponownie wydaj polecenie.",
 	"changecontentmodel": "Edycja modelu zawartości strony",
+	"changecontentmodel-legend": "Zmienić model zawartości",
 	"changecontentmodel-title-label": "Tytuł strony",
 	"changecontentmodel-model-label": "Nowy model zawartości",
 	"changecontentmodel-reason-label": "Powód:",
@@ -2357,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",
@@ -2404,7 +2420,7 @@
 	"spam_reverting": "Przywracanie ostatniej wersji nie zawierającej linków do $1",
 	"spam_blanking": "Wszystkie wersje zawierały odnośniki do $1. Czyszczenie strony.",
 	"spam_deleting": "Wszystkie wersje zawierały linki do $1, usuwam.",
-	"simpleantispam-label": "Filtr antyspamowy.\n'''NIE''' wpisuj tu nic!",
+	"simpleantispam-label": "Filtr antyspamowy.\n<strong>Not</strong> wpisuj tu nic!",
 	"pageinfo-title": "Informacje o „$1”",
 	"pageinfo-not-current": "Niestety, te informacje nie są dostępne dla starych wersji stron.",
 	"pageinfo-header-basic": "Podstawowe informacje",
@@ -3252,6 +3268,7 @@
 	"logentry-newusers-create2": "$1 {{GENDER:$2|utworzył|utworzyła}} konto użytkownika $3",
 	"logentry-newusers-byemail": "Konto $3 zostało utworzone przez użytkownika $1, hasło wysłano e-mailem",
 	"logentry-newusers-autocreate": "$1 automatycznie {{GENDER:$2|utworzył|utworzyła|utworzył}} konto użytkownika",
+	"logentry-protect-move_prot": "$1 {{GENDER:$2|przeniósł|przeniosła}} ustawienia zabezpieczeń z $4 do $3",
 	"logentry-rights-rights": "$1 {{GENDER:$2|zmienił|zmieniła}} przynależność $3 do grup ($4 → $5)",
 	"logentry-rights-rights-legacy": "$1 {{GENDER:$2|zmienił|zmieniła}} przynależność $3 do grup",
 	"logentry-rights-autopromote": "$1 automatycznie {{GENDER:$2|zmienił|zmieniła}} przynależność ($4 → $5)",
diff --git a/languages/i18n/pms.json b/languages/i18n/pms.json
index 9b3450e03b..5f066f2ed4 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",
@@ -525,7 +526,7 @@
 	"passwordreset-emailtitle": "Detaj dël cont ansima a {{SITENAME}}",
 	"passwordreset-emailtext-ip": "Quaidun (a l'é bel fé ch'a sia chiel, da l'adrëssa IP $1) a l'ha ciamà na riampostassion ëd soa ciav për {{SITENAME}} ($4). {{PLURAL:$3|Ël cont utent sì-sota a l'é|Ij cont utent sì-sota a son}} \nassocià a st'adrëssa ëd pòsta eletrònica:\n\n$2\n\n{{PLURAL:$3|Costa ciav provisòria|Coste ciav provisòrie}} a scadran da-sì {{PLURAL:$5|un di|$5 di}}.\nA dovrìa intré ant ël sistema e serne na ciav neuva adess. Se quaidun d'àutr a l'ha fàit costa arcesta, o s'a l'é arcordasse soa ciav original, e a veul pa pi cangela, a peule ignoré ës mëssagi e continué a dovré soa veja ciav.",
 	"passwordreset-emailtext-user": "L'utent $1 ansima a {{SITENAME}} a l'ha ciamà na riampostassion ëd soa ciav për {{SITENAME}} ($4). {{PLURAL:$3|Ël cont utent sì-sota a l'é|Ij cont utent sì-sota a son}} associà a st'adrëssa ëd pòsta eletrònica:\n\n$2\n\n{{PLURAL:$3|Costa ciav provisòria|Coste ciav provisòrie}} a scadran da-sì {{PLURAL:$5|un di|$5 di}}.\nA dovrìa intré ant ël sistema e serne na ciav neuva adess. Se quaidun d'àutr a l'ha fàit costa arcesta, o s'a l'é arcordasse soa ciav original, e a veul pa pi cangela, a peul ignoré ës mëssagi e continué a dovré soa veja ciav.",
-	"passwordreset-emailelement": "Stranòm: $1\nCiav provisòria: $2",
+	"passwordreset-emailelement": "Stranòm: \n$1\n\nCiav provisòria: \n$2",
 	"passwordreset-emailsent": "Un mëssagi ëd riampostassion ëd la ciav a l'é stàit spedì.",
 	"passwordreset-emailsent-capture": "Un mëssagi ëd riampostassion ëd la ciav a l'é stàit mandà, e a l'é mostrà sì-sota.",
 	"passwordreset-emailerror-capture": "Un mëssagi ëd riampostassion ëd la ciav a l'é stàit generà, e a l'é smonù sì-sota, ma la spedission a {{GENDER:$2|l'utent}} a l'é falìa: $1",
@@ -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",
@@ -1711,7 +1716,6 @@
 	"emailuser": "Mandeje un mëssagi eletrònich a st'utent-sì",
 	"emailuser-title-target": "Mandé un mëssagi ëd pòsta eletrònica a cost {{GENDER:$1|utent}}",
 	"emailuser-title-notarget": "Mandeje un mëssagi ëd pòsta eletrònica a st'utent-sì",
-	"emailpage": "Mandeje un mëssagi ëd pòsta eletrònica a st'utent-sì",
 	"emailpagetext": "A peul dovré ël formolari sì-sota për mandé un mëssagi ëd pòsta eletrònica a st'{{GENDER:$1|utent}}-sì.\nL'adrëssa ëd pòsta eletrònica ch'a l'ha butà ant ij [[Special:Preferences|sò gust]] a sarà butà ant l'adrëssa «Da» ëd sò mëssagi, parèj chi ch'a l'arsèiv a podrà rësponde diretament a chiel.",
 	"defemailsubject": "Mëssagi da l'utent \"$1\"",
 	"usermaildisabled": "Pòsta eletrònica dl'utent disabilità",
@@ -1733,7 +1737,7 @@
 	"emailccsubject": "Còpia dël mëssagi mandà a $1: $2",
 	"emailsent": "Mëssagi eletrònich mandà",
 	"emailsenttext": "Sò mëssagi eletrònich a l'é stàit mandà",
-	"emailuserfooter": "Ës mëssagi eletrònich a l'é stàit mandà da $1 a $2 con la fonsion «{{int:emailpage}}» ëd {{SITENAME}}.",
+	"emailuserfooter": "Ës mëssagi eletrònich a l'é stàit mandà da $1 a $2 con la fonsion «{{int:emailuser}}» ëd {{SITENAME}}.",
 	"usermessage-summary": "A l'ha lassà un mëssagi ëd sistema.",
 	"usermessage-editor": "Mëssagerìa ëd sistema",
 	"watchlist": "Ròba che as ten sot-euj",
@@ -2254,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.",
@@ -2290,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.",
@@ -2330,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/pnb.json b/languages/i18n/pnb.json
index b2118c47be..62313d8906 100644
--- a/languages/i18n/pnb.json
+++ b/languages/i18n/pnb.json
@@ -431,7 +431,7 @@
 	"passwordreset-emailtitle": "{{SITENAME}} دے اتے کھاتے دی معلومات:",
 	"passwordreset-emailtext-ip": "کسے نے (خورے تساں  آئی پی پتے $1) تواڈے کھاتے دا ویروا منگیا اے {{SITENAME}} ($4) لئی۔ تھلے دتا گیا ورتنوالا {{PLURAL:$3|کھاتہ|کھاتے}} ایس ای-میل پتے نال جوڑ رکھدا اے:\n\n$2\n\n{{PLURAL:$3|اے عارضی کنجی|اے عارضی کنجیاں}} {{PLURAL:$5|اک دن|$5 دناں}} چ مک جاوے گی۔ تسیں لاگان ہوو تے اپنی اک نويں کنجی چنو. اگر کسے ہور نے اے کنجی والی چٹھی پیجی اے یا توانوں پرانی کنجی یاد آگئی اے تے تسیں پرانی کنجی نال ای کم چلانا چاندے او تے تسیں ایس سنیعے نوں پل جاؤ تے پرانی کنجی ای ورتو۔",
 	"passwordreset-emailtext-user": "ورتنوالے $1 نے {{سائیٹناں}} تے تواڈے کھاتے بارے پچھیا اے {{SITENAME}} لئی ($4)۔ تھلے دتا گیا ورتن {{PLURAL:$3|کھاتہ|کھاتے}} ایس ای-میل نال جڑدا اے۔\n\n$2\n\n{{PLURAL:$3|ایہ عارضی کنجی|اے عارضی کنجیاں}} مک جائیگا {{PLURAL:$5|اک دن|$5 دن}}۔ تسیں ہن لاکان ہوو تے نویں کنجی چنو۔ اگر کسے ہور نے اے چٹھی پیجی یا توانوں اپنی پہلی کنجی یاد آگئی اے تے تسیں اونوں بدلنا نئیں چاندے تے تسیں ایس سنیعے نوں پھل جاؤ تے پرانی کنجی نال ای کم چلاؤ۔",
-	"passwordreset-emailelement": "ورتن ناں: $1\nعارضی کنجی: $2",
+	"passwordreset-emailelement": "ورتن ناں: \n$1\n\nعارضی کنجی: \n$2",
 	"passwordreset-emailsent": "یاد کران واسطے اک ای-میل پیج دتی گئی اے۔",
 	"passwordreset-emailsent-capture": "اک یاد کران والی ای-میل پیج دتی گئی اے، جیہڑی تھلے دسی گئی اے۔",
 	"passwordreset-emailerror-capture": "اک یادکراؤ ای-میل بنائی گئی اے، جیہڑی کہ تھلے دسی گئی اے، پر ورتن والے تک پیجنا نئیں ہوسکیا:$1",
@@ -1407,7 +1407,6 @@
 	"mailnologin": "ناں پیح پتہ",
 	"mailnologintext": "تسیں لازمی [[Special:UserLogin|لاگان]] ہوو تے اک پکا ای-میل پتہ تواڈی [[Special:Preferences|تانگ]] چ ہووے تاں جے دوجے ورتن والے توانوں ای-میل کرسکن۔",
 	"emailuser": "اس ورتن والے نو ای میل کرو",
-	"emailpage": "ای-میل ورتن والا",
 	"emailpagetext": "تسیں تھلے دتا گیا فارم  ورت سکدے اوہ ایس ورتن والے نوں ای-میل سنیعہ کلن لئی۔ \nای-میل پتہ تساں [[Special:Preferences|تواڈے ورتن تانکآں]] چ پایا اے  ای-میل توں تواڈا پتہ دسے گا جتھے چٹھی چلی تاں جے چٹھی لین والا توانوں سدا جواب دے سکے۔",
 	"defemailsubject": "{{SITENAME}}ای-میل ورتن والے \"$1\" توں",
 	"usermaildisabled": "ورتن ای-میل ناکارہ",
diff --git a/languages/i18n/ps.json b/languages/i18n/ps.json
index 30be29292c..8f5e71350a 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 سرچينه کتل",
@@ -483,7 +484,7 @@
 	"passwordreset-capture": "د پايلې برېښليک کتل غواړې؟",
 	"passwordreset-email": "برېښليک پته:",
 	"passwordreset-emailtitle": "د {{SITENAME}} د گڼون څرگندنې",
-	"passwordreset-emailelement": "کارن-نوم: $1\nلنډمهاله پټنوم: $2",
+	"passwordreset-emailelement": "کارن-نوم: \n$1\n\nلنډمهاله پټنوم: \n$2",
 	"passwordreset-emailsent": "د پټنوم بيا پرځای کېدنې لپاره برېښليک درولېږل شو.",
 	"passwordreset-emailsent-capture": "د پټنوم بياپرځای کېدنې لپار مو يو برېښليک درولېږه، برېښليک په لاندې توگه ښودل شوی.",
 	"changeemail": "برېښليک پته بدلول",
@@ -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 دوتنه له پخوا نه شته.",
@@ -1359,7 +1374,6 @@
 	"emailuser": "کارن ته برېښليک لېږل",
 	"emailuser-title-target": "دې {{GENDER:$1|کارن}} ته برېښليک لېږل",
 	"emailuser-title-notarget": "کارن ته برېښليک لېږل",
-	"emailpage": "کارن ته برېښليک لېږل",
 	"defemailsubject": "د \"$1\" کارن لخوا د {{SITENAME}} برېښليک",
 	"usermaildisabled": "د کارن برېښليک ناچارند دی",
 	"usermaildisabledtext": "په دې ويکي تاسې نورو کارنانو ته برېښليک نه شی ورلېږلی",
@@ -1379,7 +1393,7 @@
 	"emailccsubject": "$1 ته ستاسې د پيغام لمېسه: $2",
 	"emailsent": "برېښليک مو ولېږل شو",
 	"emailsenttext": "ستاسې برېښليکي پيغام ولېږل شو.",
-	"emailuserfooter": "دا برېښليک $2 ته د $1 لخوا د \"{{int:emailpage}}\" کړنې په مرسته د {{SITENAME}} له لارې لېږل شوی.",
+	"emailuserfooter": "دا برېښليک $2 ته د $1 لخوا د \"{{int:emailuser}}\" کړنې په مرسته د {{SITENAME}} له لارې لېږل شوی.",
 	"usermessage-summary": "د غونډال پيغام پرېښودل.",
 	"usermessage-editor": "د غونډال پيغام رسونکی",
 	"watchlist": "کتنلړ",
@@ -1777,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": "د غونډال پيغامونه کتل",
@@ -1805,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 613a05e28d..55361f03dc 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",
@@ -596,7 +598,7 @@
 	"passwordreset-emailtitle": "Detalhes da conta em {{SITENAME}}",
 	"passwordreset-emailtext-ip": "Alguém (provavelmente você, a partir do endereço IP $1)\nsolicitou um lembrete dos seus detalhes de conta para {{SITENAME}} ($4).\n{{PLURAL:$3|A seguinte conta está associada|As seguintes contas estão associadas}} a este e-mail:\n\n$2\n\n{{PLURAL:$3|Esta senha temporária vai|Essas senhas temporárias vão}} expirar em {{PLURAL:$5|um dia|$5 dias}}.\nVocê deve efetuar login e escolher uma nova senha agora.\nSe você conseguir lembrar da senha, ignore este e-mail e continue\nusando sua senha anterior. Caso contrário, prossiga com as instruções\ndisponíveis no link.",
 	"passwordreset-emailtext-user": "O usuário $1 da {{SITENAME}} pediu a recuperação dos detalhes da sua conta na {{SITENAME}} ($4). {{PLURAL:$3|A seguinte conta está associada|As seguintes contas estão associadas}} a este e-mail:\n\n$2\n\n{{PLURAL:$3|Esta senha temporária irá|Estas senhas temporárias irão}} expirar dentro de {{PLURAL:$5|um dia|$5 dias}}. Deve autenticar-se e escolher uma senha nova agora. Se este pedido não foi feito por si, ou se entretanto se recordou da sua senha original e já não deseja alterá-la, pode ignorar esta mensagem e continuar a usar a senha antiga.",
-	"passwordreset-emailelement": "Usuário: $1\nSenha temporária: $2",
+	"passwordreset-emailelement": "Usuário: \n$1\n\nSenha temporária: \n$2",
 	"passwordreset-emailsent": "Foi enviado um e-mail de lembrete.",
 	"passwordreset-emailsent-capture": "Foi enviado um e-mail de lembrete, que é mostrado abaixo.",
 	"passwordreset-emailerror-capture": "Foi gerado um e-mail de recuperação da senha, conforme mostrado abaixo, mas o envio {{GENDER:$2|ao usuário|à usuária}} falhou. $1",
@@ -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}}.",
@@ -923,7 +927,7 @@
 	"shown-title": "Mostrar $1 {{PLURAL:$1|resultado|resultados}} por página",
 	"viewprevnext": "Ver ($1 {{int:pipe-separator}} $2) ($3).",
 	"searchmenu-exists": "<strong>Há uma página com o nome \"[[:$1]]\" nesta wiki.</strong> {{PLURAL:$2|0=|Veja também os outros resultados da pesquisa encontrados.}}",
-	"searchmenu-new": "<strong>Criar a página \"[[:$1]]\" nesta wiki!</strong>{{PLURAL:$2|0=| Veja também a página encontrada com sua pesquisa.|Veja também os resultados das pesquisas encontradas.}}",
+	"searchmenu-new": "<strong>Criar a página \"[[:$1]]\" nesta wiki!</strong> {{PLURAL:$2|0=|Veja também a página encontrada com sua pesquisa.|Veja também os resultados da pesquisa encontrados.}}",
 	"searchprofile-articles": "Páginas de conteúdo",
 	"searchprofile-images": "Multimídia",
 	"searchprofile-everything": "Tudo",
@@ -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,11 +1704,11 @@
 	"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).",
-	"logempty": "Nenhum item idêntico no registro.",
+	"logempty": "Nenhum item correspondente no registro.",
 	"log-title-wildcard": "Procurar por títulos que sejam iniciados com o seguinte texto",
 	"showhideselectedlogentries": "Exibir/ocultar os itens de registros selecionados",
 	"log-edit-tags": "Editar etiquetas das entradas selecionadas",
@@ -1770,7 +1790,6 @@
 	"emailuser": "Enviar-lhe um e-mail",
 	"emailuser-title-target": "Enviar e-mail para {{GENDER:$1|este usuário|esta usuária}}",
 	"emailuser-title-notarget": "Enviar e-mail",
-	"emailpage": "Enviar e-mail ao usuário",
 	"emailpagetext": "Você pode usar o formulário a seguir para enviar um e-mail para {{GENDER:$1|este usuário|esta usuária}}.\nO endereço de e-mail que você inseriu em [[Special:Preferences|suas preferências de usuário]] irá aparecer como o endereço do remetente da mensagem, com o destinatário podendo responder diretamente para você.",
 	"defemailsubject": "E-mail do usuário \"$1\" da {{SITENAME}}",
 	"usermaildisabled": "O e-mail do usuário foi desativado",
@@ -1792,7 +1811,7 @@
 	"emailccsubject": "Cópia de sua mensagem para $1: $2",
 	"emailsent": "E-mail enviado",
 	"emailsenttext": "Sua mensagem foi enviada.",
-	"emailuserfooter": "Este email foi enviado por $1 para $2 através da função\"{{int:emailpage}}\" do site {{SITENAME}}.",
+	"emailuserfooter": "Este email foi enviado por $1 para $2 através da função\"{{int:emailuser}}\" do site {{SITENAME}}.",
 	"usermessage-summary": "Deixar mensagem de sistema.",
 	"usermessage-editor": "Mensagens de sistema",
 	"watchlist": "Páginas vigiadas",
@@ -1878,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",
@@ -2312,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",
@@ -2335,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",
@@ -2392,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",
@@ -3388,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 e85b9adc80..3e41853542 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",
@@ -572,7 +573,7 @@
 	"passwordreset-emailtitle": "Detalhes da conta na {{SITENAME}}",
 	"passwordreset-emailtext-ip": "Alguém (provavelmente você, a partir do endereço IP $1) pediu a recuperação da palavra-passe no projeto {{SITENAME}} ($4). {{PLURAL:$3|A seguinte conta de utilizador está associada|As seguintes contas de utilizador estão associadas}} a este correio eletrónico:\n\n$2\n\n{{PLURAL:$3|Esta palavra-passe temporária irá|Estas palavras-passes temporárias irão}} expirar dentro de {{PLURAL:$5|um dia|$5 dias}}.\nDeve autenticar-se e escolher uma palavra-passe nova agora. Se outra pessoa fez este pedido, ou se entretanto se recordou da sua palavra-passe original e já não deseja alterá-la, pode ignorar esta mensagem e continuar a usar a palavra-passe antiga.",
 	"passwordreset-emailtext-user": "O utilizador $1 do projeto {{SITENAME}} pediu a recuperação da sua palavra-passe no projeto {{SITENAME}} ($4). {{PLURAL:$3|A seguinte conta de utilizador está associada|As seguintes contas de utilizador estão associadas}} a este endereço de correio eletrónico:\n\n$2\n\n{{PLURAL:$3|Esta palavra-passe temporária irá|Estas palavras-passes temporárias irão}} expirar dentro de {{PLURAL:$5|um dia|$5 dias}}.\nDeve autenticar-se e escolher uma palavra-passe nova agora. Se outra pessoa fez este pedido, ou se entretanto se recordou da sua palavra-passe original e já não deseja alterá-la, pode ignorar esta mensagem e continuar a usar a palavra-passe antiga.",
-	"passwordreset-emailelement": "Utilizador(a): $1\nPalavra-passe temporária: $2",
+	"passwordreset-emailelement": "{{GENDER:$1\n|Utilizador|Utilizadora}}: \n$1\n\nPalavra-passe temporária: \n$2",
 	"passwordreset-emailsent": "Foi enviado um correio eletrónico para recuperação da palavra-passe.",
 	"passwordreset-emailsent-capture": "Foi enviado um correio eletrónico para recuperação da palavra-passe, que é mostrado abaixo.",
 	"passwordreset-emailerror-capture": "Foi gerado um correio eletrónico para redefinição da palavra-passe, mostrado abaixo, mas o seu envio para {{GENDER:$2|o utilizador|a utilizadora}} falhou: $1",
@@ -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,11 +1677,11 @@
 	"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.",
-	"logempty": "Não há dados a apresentar.",
+	"logempty": "Nenhum item correspondente no registo.",
 	"log-title-wildcard": "Procurar títulos iniciados por este texto",
 	"showhideselectedlogentries": "Mostrar ou ocultar as entradas selecionadas",
 	"log-edit-tags": "Editar etiquetas das entradas de registo selecionadas",
@@ -1758,7 +1763,6 @@
 	"emailuser": "Enviar correio eletrónico a este utilizador",
 	"emailuser-title-target": "Enviar correio eletrónico a {{GENDER:$1|este utilizador|esta utilizadora}}",
 	"emailuser-title-notarget": "Enviar correio eletrónico ao utilizador",
-	"emailpage": "Enviar correio eletrónico ao utilizador",
 	"emailpagetext": "Pode usar o formulário abaixo para enviar uma mensagem por correio eletrónico para {{GENDER:$1|este utilizador|esta utilizadora}}.\nO endereço de correio que introduziu nas [[Special:Preferences|suas preferências]] irá aparecer no campo do remetente da mensagem \"De:\", para que o destinatário lhe possa responder diretamente.",
 	"defemailsubject": "Correio eletrónico da {{SITENAME}}, do utilizador \"$1\"",
 	"usermaildisabled": "O correio eletrónico do utilizador foi desativado",
@@ -1780,7 +1784,7 @@
 	"emailccsubject": "Cópia da sua mensagem para $1: $2",
 	"emailsent": "Mensagem enviada",
 	"emailsenttext": "A sua mensagem foi enviada.",
-	"emailuserfooter": "Esta mensagem foi enviada por $1 para $2 através da opção \"{{int:emailpage}}\" em {{SITENAME}}.",
+	"emailuserfooter": "Esta mensagem foi enviada por $1 para $2 através da opção \"{{int:emailuser}}\" em {{SITENAME}}.",
 	"usermessage-summary": "Deixar mensagem de sistema.",
 	"usermessage-editor": "Editor de mensagens de sistema",
 	"watchlist": "Páginas vigiadas",
@@ -1937,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.",
@@ -2263,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.",
@@ -2326,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",
@@ -2343,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",
@@ -2387,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",
@@ -2406,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}})",
@@ -3112,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",
@@ -3149,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",
@@ -3189,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",
@@ -3228,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.",
@@ -3343,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 b704a2b318..d3b5a99ddb 100644
--- a/languages/i18n/qqq.json
+++ b/languages/i18n/qqq.json
@@ -170,15 +170,16 @@
 			"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-hidecategorization": "Option in \"Recent changes\" tab of [[Special:Preferences]]. Offers user to hide/show categorization of pages. Appears next to messages such as {{msg-mw|tog-hideminor}}.",
 	"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.",
 	"tog-numberheadings": "[[Special:Preferences]], tab 'Misc'. Offers numbered headings on content pages to user. {{Gender}}",
@@ -202,13 +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-watchlisthidecategorization": "Option in Watchlist tab of [[Special:Preferences]]. Offers user to hide/show categorization of pages. Appears next to checkboxes with labels such as {{msg-mw|tog-watchlisthideminor}}.",
+	"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}}",
@@ -555,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]",
@@ -622,8 +622,8 @@
 	"createacct-benefit-head3": "In vertical-layout create account form, the text in the heading for the third benefit. Do not edit the magic word; if you replace it you will probably need to adjust CSS.\n\nFollowed by the message {{msg-mw|Createacct-benefit-body3}}.\n\nSee example: [{{canonicalurl:Special:UserLogin|type=signup&useNew=1}} Special:UserLogin?type=signup&useNew=1]",
 	"createacct-benefit-body3": "In vertical-layout create account form, the text for the third benefit.\n\nPreceded by the message {{msg-mw|Createacct-benefit-head3}} (number of contributors).\n\nSee example: [{{canonicalurl:Special:UserLogin|type=signup}} Special:UserLogin?type=signup]\n\nParameters:\n* $1 - number of contributors (users)",
 	"badretype": "Used as error message when the new password and its retype do not match.",
-	"userexists": "Used as error message in creating a user account.",
 	"usernameinprogress": "Used as error message in creating a user account.",
+	"userexists": "Used as error message in creating a user account.",
 	"loginerror": "Used as title of error message.\n{{Identical|Login error}}",
 	"createacct-error": "Used as heading for the error message.",
 	"createaccounterror": "Parameters:\n* $1 - an error message",
@@ -861,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.",
@@ -1146,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}}",
@@ -1431,9 +1432,6 @@
 	"rcshowhidemine": "Option text in [[Special:RecentChanges]]. Parameters:\n* $1 - the \"show/hide\" command, with the text taken from either {{msg-mw|rcshowhidemine-show}} or {{msg-mw|rcshowhidemine-hide}}",
 	"rcshowhidemine-show": "{{doc-actionlink}}\nOption text in [[Special:RecentChanges]] in conjunction with {{msg-mw|rcshowhidemine}}.\n\nSee also:\n* {{msg-mw|rcshowhidemine-hide}}\n{{Identical|show}}",
 	"rcshowhidemine-hide": "{{doc-actionlink}}\nOption text in [[Special:RecentChanges]] in conjunction with {{msg-mw|rcshowhidemine}}.\n\nSee also:\n* {{msg-mw|rcshowhidemine-show}}\n{{Identical|hide}}",
-	"rcshowhidecategorization": "Option text in [[Special:RecentChanges]]. Parameters:\n* $1 - the \"show/hide\" command, with the text taken from either {{msg-mw|rcshowhidecategorization-show}} or {{msg-mw|rcshowhidecategorization-hide}}",
-	"rcshowhidecategorization-show": "{{doc-actionlink}}\nOption text in [[Special:RecentChanges]] in conjunction with {{msg-mw|rcshowhidecategorization}}.\n\nSee also:\n* {{msg-mw|rcshowhidecategorization-hide}}\n{{Identical|show}}",
-	"rcshowhidecategorization-hide": "{{doc-actionlink}}\nOption text in [[Special:RecentChanges]] in conjunction with {{msg-mw|rcshowhidecategorization}}.\n\nSee also:\n* {{msg-mw|rcshowhidecategorization-show}}\n{{Identical|hide}}",
 	"rclinks": "Used on [[Special:RecentChanges]].\n* $1 - a list of different choices with number of pages to be shown.<br />&nbsp;Example: \"''50{{int:pipe-separator}}100{{int:pipe-separator}}250{{int:pipe-separator}}500\".\n* $2 - a list of clickable links with a number of days for which recent changes are to be displayed.<br />&nbsp;Example: \"''1{{int:pipe-separator}}3{{int:pipe-separator}}7{{int:pipe-separator}}14{{int:pipe-separator}}30''\".\n* $3 - a block of text that consists of other messages.<br />&nbsp;Example: \"''Hide minor edits{{int:pipe-separator}}Show bots{{int:pipe-separator}}Hide anonymous users{{int:pipe-separator}}Hide logged-in users{{int:pipe-separator}}Hide patrolled edits{{int:pipe-separator}}Hide my edits''\"\nList elements are separated by {{msg-mw|Pipe-separator}} each. Each list element is, or contains, a link.",
 	"diff": "Short form of \"differences\". Used on [[Special:RecentChanges]], [[Special:Watchlist]], ...\n{{Identical|Diff}}",
 	"hist": "Short form of \"history\". Used on [[Special:RecentChanges]], [[Special:Watchlist]], ...",
@@ -1460,10 +1458,6 @@
 	"recentchangeslinked-summary": "Summary of [[Special:RecentChangesLinked]].",
 	"recentchangeslinked-page": "{{Identical|Page name}}",
 	"recentchangeslinked-to": "Checkbox in [[Special:RecentChangesLinked]].",
-	"recentchanges-page-added-to-category": "Comment message for pages added to a category\n\nParameters:\n* $1 - name of the page being added",
-	"recentchanges-page-added-to-category-bundled": "Comment message for template embedded by other pages added to a category\n\nParameters:\n* $1 - name of the page being added\n* $2 - number of additional pages being affected",
-	"recentchanges-page-removed-from-category": "Comment message for pages removed from a category\n\nParameters:\n* $1 - name of the page being removed",
-	"recentchanges-page-removed-from-category-bundled": "Comment message for templates embedded by other pages removed from a category\n\nParameters:\n* $1 - name of the page being added\n* $2 - number of additional pages being affected",
 	"upload": "Display name for link to [[Special:Upload]] for uploading files to the wiki.\n\nSee also:\n* {{msg-mw|Upload}}\n* {{msg-mw|Accesskey-t-upload}}\n* {{msg-mw|Tooltip-t-upload}}\n{{Identical|Upload file}}",
 	"uploadbtn": "Button name in [[Special:Upload]].\n\nSee also:\n* {{msg-mw|Uploadbtn}}\n* {{msg-mw|Accesskey-upload}}\n* {{msg-mw|Tooltip-upload}}\n{{Identical|Upload file}}",
 	"reuploaddesc": "Used as button text in the Upload form on [[Special:Upload]].\n\nSee also:\n* {{msg-mw|upload-tryagain|Submit button text}}\n* {{msg-mw|ignorewarning|button text}}",
@@ -1533,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.",
@@ -1572,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}}",
@@ -1590,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",
@@ -1900,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}}",
@@ -2028,7 +2022,6 @@
 	"emailuser-title-target": "{{doc-special|EmailUser|unlisted=1}}\nUsed when a user was given to e-mail. Parameters:\n* $1 - a plain text username, used for GENDER.",
 	"emailuser-title-notarget": "{{doc-special|EmailUser|unlisted=1}}\nUsed when no user given to e-mail yet.",
 	"emailuser-summary": "{{doc-specialpagesummary|emailuser}}",
-	"emailpage": "Title of special page [[Special:EmailUser]], when it is the destination of the sidebar link {{msg-mw|Emailuser}} on a user's page.",
 	"emailpagetext": "This is the text that is displayed above the email form on [[Special:EmailUser]].\n\nSpecial:EmailUser appears when you click on the link \"Email this user\" in the sidebar, but only if there is an email address in the recipient's user preferences. If there isn't then the message {{msg-mw|Noemailtext}} will appear instead of Special:EmailUser.\n\nParameters:\n* $1 - username",
 	"defemailsubject": "The default subject of EmailUser emails. Parameters:\n* $1 - the username of the user sending the email and can be used for GENDER",
 	"usermaildisabled": "Caption for an error message ({{msg-mw|Usermaildisabledtext}}) shown when the user-to-user e-mail feature is disabled on the wiki (see [[mw:Manual:$wgEnableEmail]], [[mw:Manual:$wgEnableUserEmail]]).",
@@ -3393,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).",
@@ -3402,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).",
@@ -3517,7 +3510,7 @@
 	"version-api": "{{optional}}",
 	"version-other": "{{Identical|Other}}",
 	"version-mediahandlers": "Used in [[Special:Version]]. It is the title of a section for media handler extensions (e.g. [[mw:Extension:OggHandler]]).\nThere are no such extensions here, so look at [[wikipedia:Special:Version]] for an example.",
-	"version-hooks": "Shown in [[Special:Version]]",
+	"version-hooks": "Shown in [[Special:Version]]\n{{Identical|Hook}}",
 	"version-parser-extensiontags": "Part of [[Special:Version]].\nThis message is followed by the list of parser extension tags like <code><nowiki><charinsert></nowiki></code>, <code><nowiki><coordinates></nowiki></code>, etc.",
 	"version-parser-function-hooks": "Shown in [[Special:Version]]",
 	"version-hook-name": "Shown in [[Special:Version]].\n\nFor meaning of hook see [[mw:Special:MyLanguage/Manual:Hooks|mw:Manual:Hooks]] and [[w:Hooking]].",
@@ -3768,14 +3761,14 @@
 	"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.",
 	"logentry-newusers-byemail": "{{Logentry|[[Special:Log/newusers]]}}\n\n$4 is the name of the user that was created.",
 	"logentry-newusers-autocreate": "{{Logentry|[[Special:Log/newusers]]}}\n\n$4 is the gender of the target user.",
-	"logentry-protect-move_prot": "{{Logentry|[[Special:Log/protect]]}}\n\n* $4 - the old title",
+	"logentry-protect-move_prot": "{{Logentry|[[Special:Log/protect]]}}\n* $4 - the old title",
 	"logentry-rights-rights": "* $1 - username\n* $2 - (see below)\n* $3 - username\n* $4 - list of user groups or {{msg-mw|Rightsnone}}\n* $5 - list of user groups or {{msg-mw|Rightsnone}}\n----\n{{Logentry|[[Special:Log/rights]]}}",
 	"logentry-rights-rights-legacy": "* $1 - username\n* $2 - (see below)\n* $3 - username\n----\n{{Logentry|[[Special:Log/rights]]}}",
 	"logentry-rights-autopromote": "* $1 - username\n* $2 - (see below)\n* $3 - (see below)\n* $4 - comma separated list of old user groups or {{msg-mw|Rightsnone}}\n* $5 - comma separated list of new user groups\n----\n{{Logentry|[[Special:Log/rights]]}}",
@@ -3916,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/qu.json b/languages/i18n/qu.json
index 7ec0ccb13b..de2d53b671 100644
--- a/languages/i18n/qu.json
+++ b/languages/i18n/qu.json
@@ -500,7 +500,7 @@
 	"passwordreset-emailtitle": "{{SITENAME}}-paq rakiqunamanta willakuna",
 	"passwordreset-emailtext-ip": "Pipas (qamchiki, $1 IP huchhayuq tiyaymanta) {{SITENAME}}-paq ($4)\nrakiqunaykipaq yaykuna rimata kutichinatam mañakurqan. Kay qatiq ruraqpa {{PLURAL:$3|rakiqunanmi|rakiqunankunam}}\nkay e-chaski imamaytayuq kachkan:\n\n$2\n\nKay mit'alla yaykuna {{PLURAL:$3|rimaqa|rimakunaqa}} kunanmanta {{PLURAL:$5|huk p'unchawpi|$5 p'unchawpi}} mawk'ayanqam.\nYaykuspayki musuq yaykuna rimaykitam akllankiman. Pi wakiykipas kayta mañakurqaptinqa,\nicha qam ñawpaq yaykuna rimaykita yuyaspayki manaña wakinchayta munaspaykiqa,\nkay willayta mana qhawaspa mana imatapas ruraspa ñawpaq yaykuna rimaykiwanmi llamk'ayta atinki.",
 	"passwordreset-emailtext-user": "{{SITENAME}}-pi kaq $1 sutiyuq ruraqqa {{SITENAME}}-paq ($4)\nrakiqunaykipaq yaykuna rimata kutichinatam mañakurqan. Kay qatiq ruraqpa {{PLURAL:$3|rakiqunanmi|rakiqunankunam}}\nkay e-chaski imamaytayuq kachkan:\n\n$2\n\nKay mit'alla yaykuna {{PLURAL:$3|rimaqa|rimakunaqa}} kunanmanta {{PLURAL:$5|huk p'unchawpi|$5 p'unchawpi}} mawk'ayanqam.\nYaykuspayki musuq yaykuna rimaykitam akllankiman. Pi wakiykipas kayta mañakurqaptinqa,\nicha qam ñawpaq yaykuna rimaykita yuyaspayki manaña wakinchayta munaspaykiqa,\nkay willayta mana qhawaspa mana imatapas ruraspa ñawpaq yaykuna rimaykiwanmi llamk'ayta atinki.",
-	"passwordreset-emailelement": "Ruraqpa sutin: $1\nMit'alla yaykuna rima: $2",
+	"passwordreset-emailelement": "Ruraqpa sutin: \n$1\n\nMit'alla yaykuna rima: \n$2",
 	"passwordreset-emailsent": "Yaykuna rimata kutichina e-chaskiqa kachasqañam.",
 	"passwordreset-emailsent-capture": "Yaykuna rimata kutichina e-chaskiqa kachasqañam, kay qatiqpi rikunki.",
 	"passwordreset-emailerror-capture": "{{GENDER:$2|}}Yaykuna rimata kutichina e-chaskiqa rurasqa karqan, imatachus kay qatiqpi rikunki, ichataq kachasqa kaptin pantasqam tukurqan: $1",
@@ -1595,7 +1595,6 @@
 	"emailuser": "Kay ruraqman e-chaskita kachay",
 	"emailuser-title-target": "Kay {{GENDER:$1|ruraqman}} e-chaskita kachay",
 	"emailuser-title-notarget": "E-chaski kay ruraqman:",
-	"emailpage": "E-chaski kay ruraqman:",
 	"emailpagetext": "Kay uranpi kaq hunt'ana p'anqatam llamk'achiyta atinki kay {{GENDER:$1|ruraqman}} e-chaskita kachanaykipaq.\nQampa [[Special:Preferences|allinkachinaykikunapi]] qillqakamachisqayki imamaytaqa paqarinqa kachasqayki e-chaskipi chaskiqpa kutichisunaykita atinanpaq.",
 	"defemailsubject": "{{SITENAME}} p'anqamanta chaski \"$1\" sutiyuq ruraqmanta",
 	"usermaildisabled": "Ruraqpa e-chaskinqa hark'asqam",
diff --git a/languages/i18n/rm.json b/languages/i18n/rm.json
index 3ae979247c..efc7a1ff31 100644
--- a/languages/i18n/rm.json
+++ b/languages/i18n/rm.json
@@ -453,7 +453,7 @@
 	"passwordreset-emailtitle": "Detagls davart il conto sn {{SITENAME}}",
 	"passwordreset-emailtext-ip": "Insatgi (probablamain ti, da l'adressa IP $1) ha dumandà da redefinir il pled-clav per la pagina {{SITENAME}} ($4). \n{{PLURAL:$3|Il suandant conto d'utilisader è collià|Ils suandants contos d'utilisader èn colliads}} cun questa adressa d'e-mail:\n\n$2\n\n{{PLURAL:$3|Quest pled-clav temporar|Quests pleds-clav temporars}} èn valids {{PLURAL:$5|in di|$5 dis}}.\nTi duessas t'annunziar ussa e tscherner in nov pled-clav. Sch'enzatgi auter ha empustà quests novs pleds-clav u sche ti ta regordas puspè da tes pled-clav original e na vuls betg pli midar el, pos ti ignorar quest messadi e cuntinuar d'utilisar tes pled-clav original.",
 	"passwordreset-emailtext-user": "L'utilisader $1 sin {{SITENAME}} ha dumandà da redefinir il pled-clav per {{SITENAME}} ($4). \n{{PLURAL:$3|Il suandant conto d'utilisader è collià|Ils suandants contos d'utilisader èn colliads}} cun questa adressa dad e-mail:\n\n$2\n\n{{PLURAL:$3|Quest pled-clav temporar|Quests pled-clav temporars}} èn valids {{PLURAL:$5|in di|$5 dis}}.\nTi duessas t'annunziar ussa e tscherner in nov pled-clav. Sche ti na levas betg quests novs pleds-clav u sche ti ta regordas puspè da tes pled-clav original e na vuls betg pli midar il pled-clav pos ti ignorar quest messadi e cuntinuar dad utilisar tes pled-clav original.",
-	"passwordreset-emailelement": "Num d'utilisader: $1\nPled-clav temporar: $2",
+	"passwordreset-emailelement": "Num d'utilisader: \n$1\n\nPled-clav temporar: \n$2",
 	"passwordreset-emailsent": "In e-mail per redefinir il pled-clav è vegnì tramess.",
 	"passwordreset-emailsent-capture": "In e-mail (sco mussà sutvart) per redefinir il pled-clav è vegnì tramess.",
 	"passwordreset-emailerror-capture": "In e-mail (sco mussà sutvart) per redefinir il pled-clav è vegnì generà ma n'ha betg pudì envià a l'{{GENDER:$2|utilisader|utilisadra}}: $1",
@@ -1468,7 +1468,6 @@
 	"emailuser": "Trametter in e-mail a quest utilisader",
 	"emailuser-title-target": "Trametta in e-mail a {{GENDER:$1|quest utilisader|questa utilisadra}}",
 	"emailuser-title-notarget": "Trametter in e-mail a l'utilisader",
-	"emailpage": "Trametter in e-mail a l'utilisader",
 	"emailpagetext": "Ti pos utilisar il formular sutvart per trametter in'e-mail a {{GENDER:$1|quest utilisader|questa utilisadra}}.\nL'adressa dad e-mail che ti has endatà en [[Special:Preferences|tias preferenzas]] vegn inditgada sco speditur da l'e-mail, uschia {{GENDER:$1|ch'il retschavider|che la retschavidra}} po rispunder directamain a tai.",
 	"defemailsubject": "{{SITENAME}} e-mail da l'utilisader \"$1\"",
 	"usermaildisabled": "Trametter e-mails è deactivà",
diff --git a/languages/i18n/ro.json b/languages/i18n/ro.json
index 0479ec90ca..b80552fa1e 100644
--- a/languages/i18n/ro.json
+++ b/languages/i18n/ro.json
@@ -33,7 +33,6 @@
 	"tog-hideminor": "Ascunde modificările minore în schimbări recente",
 	"tog-hidepatrolled": "Ascunde modificările patrulate în schimbările recente",
 	"tog-newpageshidepatrolled": "Ascunde paginile patrulate din lista de pagini noi",
-	"tog-hidecategorization": "Ascunde categorisirea paginilor",
 	"tog-extendwatchlist": "Extinde lista de articole urmărite pentru a arăta toate schimbările efectuate, nu doar pe cele mai recente",
 	"tog-usenewrc": "Grupează modificările după pagină în cadrul schimbărilor recente și listei paginilor urmărite",
 	"tog-numberheadings": "Numerotează automat secțiunile",
@@ -63,7 +62,6 @@
 	"tog-watchlisthideliu": "Ascunde modificările făcute de utilizatori anonimi din lista de pagini urmărite",
 	"tog-watchlisthideanons": "Ascunde modificările făcute de utilizatori anonimi din lista de pagini urmărite",
 	"tog-watchlisthidepatrolled": "Ascunde paginile patrulate din lista de pagini urmărite",
-	"tog-watchlisthidecategorization": "Ascunde categorisirea paginilor",
 	"tog-ccmeonemails": "Doresc să primesc o copie a mesajelor e-mail pe care le trimit",
 	"tog-diffonly": "Nu arăta conținutul paginii sub dif",
 	"tog-showhiddencats": "Arată categoriile ascunse",
@@ -448,6 +446,7 @@
 	"createacct-benefit-body2": "{{PLURAL:$1|pagină|pagini|de pagini}}",
 	"createacct-benefit-body3": "{{PLURAL:$1|contribuitor recent|contribuitori recenți|de contribuitori recenți}}",
 	"badretype": "Parolele pe care le-ați introdus diferă.",
+	"usernameinprogress": "Crearea unui cont pentru acest nume de utilizator este deja în derulare. Vă rugăm să așteptați.",
 	"userexists": "Numele de utilizator pe care l-ați introdus este deja folosit.\nVă rugăm să alegeți un alt nume.",
 	"loginerror": "Eroare de autentificare",
 	"createacct-error": "Eroare la crearea contului",
@@ -538,7 +537,7 @@
 	"passwordreset-emailtitle": "Detalii despre cont pe {{SITENAME}}",
 	"passwordreset-emailtext-ip": "Cineva (probabil dumneavoastră, de la adresa IP $1) a solicitat resetarea parolei \npentru {{SITENAME}} ($4). {{PLURAL:$3|Următorul cont este asociat|Următoarele conturi sunt asociate}}\ncu această adresă de e-mail:\n\n$2\n\n{{PLURAL:$3|Această parolă temporară va|Aceste parole temporare vor}} expira {{PLURAL:$5|într-o zi|în $5 zile}}.\nAr trebui să vă autentificați și să schimbați parola acum. Dacă altcineva a făcut această cerere \nsau dacă v-ați reamintit parola inițială și nu mai doriți să o schimbați,\nputeți ignora acest mesaj, continuând să utilizați vechea parolă.",
 	"passwordreset-emailtext-user": "Utilizatorul $1 de pe {{SITENAME}} a solicitat o resetare a parolei dumneavoastră pentru {{SITENAME}} ($4). Următorul utilizator are {{PLURAL:$3|contul asociat|conturile asociate}} cu această adresă de e-mail:\n\n$2\n\n{{PLURAL:$3|Această parolă temporară va|Aceste parole temporare vor}} expira {{PLURAL:$5|într-o zi|în $5 zile}}.\nAr trebui să vă autentificați și să alegeți acum o nouă parolă. Dacă altcineva a făcut această solicitare, ori dacă v-ați reamintit parola originală și nu mai doriți modificarea ei, puteți ignora acest mesaj, continuând cu vechea parolă.",
-	"passwordreset-emailelement": "Nume de utilizator: $1\nParolă temporară: $2",
+	"passwordreset-emailelement": "Nume de utilizator: \n$1\n\nParolă temporară: \n$2",
 	"passwordreset-emailsent": "A fost trimis un e-mail de resetare a parolei.",
 	"passwordreset-emailsent-capture": "Un mesaj de resetare a parolei a fost trimis, fiind afișat mai jos.",
 	"passwordreset-emailerror-capture": "Un mesaj de resetare a parolei a fost generat (fiind afișat mai jos), dar trimiterea sa către {{GENDER:$2|utilizator}} a eșuat: $1",
@@ -937,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}})",
@@ -1212,9 +1212,6 @@
 	"rcshowhidemine": "$1 contribuțiile mele",
 	"rcshowhidemine-show": "Arată",
 	"rcshowhidemine-hide": "Ascunde",
-	"rcshowhidecategorization": "$1 categorisirea paginilor",
-	"rcshowhidecategorization-show": "Arată",
-	"rcshowhidecategorization-hide": "Ascunde",
 	"rclinks": "Se arată ultimele $1 modificări din ultimele $2 zile.<br />\n$3",
 	"diff": "dif",
 	"hist": "ist",
@@ -1240,10 +1237,6 @@
 	"recentchangeslinked-summary": "Aceasta este o listă a schimbărilor efectuate recent asupra paginilor cu legături de la o anumită pagină (sau asupra membrilor unei anumite categorii).\nPaginile pe care le [[Special:Watchlist|urmăriți]] apar cu <strong>aldine</strong>.",
 	"recentchangeslinked-page": "Numele paginii:",
 	"recentchangeslinked-to": "Afișează schimbările în paginile care se leagă de pagina dată",
-	"recentchanges-page-added-to-category": "[[:$1]] a fost adăugată în categorii",
-	"recentchanges-page-added-to-category-bundled": "[[:$1]] și încă {{PLURAL:$2|o pagină|$2 pagini|$2 de pagini}} au fost adăugate în categorii",
-	"recentchanges-page-removed-from-category": "[[:$1]] eliminată din categorii",
-	"recentchanges-page-removed-from-category-bundled": "[[:$1]] și încă {{PLURAL:$2|o pagină|$2 pagini|$2 de pagini}} au fost eliminate din categorii",
 	"upload": "Încărcare fișier",
 	"uploadbtn": "Încarcă fișier",
 	"reuploaddesc": "Revocare încărcare și întoarcere la formularul de trimitere.",
@@ -1662,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ă.",
@@ -1745,10 +1738,9 @@
 	"trackingcategories-disabled": "Categoria este dezactivată",
 	"mailnologin": "Nu există adresă de trimitere",
 	"mailnologintext": "Trebuie să fii [[Special:UserLogin|autentificat]] și să ai o adresă validă de e-mail în [[Special:Preferences|preferințe]] pentru a trimite e-mail altor utilizatori.",
-	"emailuser": "Trimiteți un e-mail",
+	"emailuser": "Trimite-i un e-mail",
 	"emailuser-title-target": "E-mail către {{GENDER:$1|acest utilizator|această utilizatoare}}",
 	"emailuser-title-notarget": "E-mail către utilizator",
-	"emailpage": "E-mail către utilizator",
 	"emailpagetext": "Puteți folosi formularul de mai jos pentru a trimite un e-mail {{GENDER:$1|acestui utilizator|acestei utilizatoare}}.\nAdresa de e-mail specificată de dumneavoastră în [[Special:Preferences|preferințele de utilizator]] va apărea ca adresa expeditorului e-mailului; astfel, destinatarul va putea să vă răspundă direct.",
 	"defemailsubject": "E-mail {{SITENAME}} de la utilizatorul „$1”",
 	"usermaildisabled": "E-mail dezactivat",
@@ -1770,7 +1762,7 @@
 	"emailccsubject": "O copie a mesajului la $1: $2",
 	"emailsent": "E-mail trimis",
 	"emailsenttext": "E-mailul dumneavoastră a fost trimis.",
-	"emailuserfooter": "Acest mesaj a fost trimis de $1 către $2 prin intermediul funcției „{{int:emailpage}}” de la {{SITENAME}}.",
+	"emailuserfooter": "Acest mesaj a fost trimis de $1 către $2 prin intermediul funcției „{{int:emailuser}}” de la {{SITENAME}}.",
 	"usermessage-summary": "a lăsat un mesaj de sistem",
 	"usermessage-editor": "Mesager de sistem",
 	"watchlist": "Pagini urmărite",
@@ -2341,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",
@@ -3191,6 +3183,7 @@
 	"logentry-newusers-create2": "Contul de utilizator $3 a fost {{GENDER:$2|creat}} de către $1",
 	"logentry-newusers-byemail": "Contul de utilizator $3 a fost {{GENDER:$2|creat}} de către $1, iar parola a fost trimisă prin e-mail",
 	"logentry-newusers-autocreate": "Contul de utilizator $1 a fost {{GENDER:$2|creat}} în mod automat",
+	"logentry-protect-move_prot": "$1 {{GENDER:$2|a mutat}} setările de protecție de la $4 la $3",
 	"logentry-rights-rights": "$1 {{GENDER:$2|a schimbat}} apartenența la grup pentru $3 de la $4 la $5",
 	"logentry-rights-rights-legacy": "$1 {{GENDER:$2|a schimbat}} apartenența la grup pentru $3",
 	"logentry-rights-autopromote": "$1 {{GENDER:$2|a fost promovat|a fost promovată}} în mod automat de la $4 la $5",
diff --git a/languages/i18n/roa-tara.json b/languages/i18n/roa-tara.json
index 5fae28f48b..0c47b6adde 100644
--- a/languages/i18n/roa-tara.json
+++ b/languages/i18n/roa-tara.json
@@ -525,7 +525,7 @@
 	"passwordreset-emailtitle": "Dettaglie d'u cunde utende sus a {{SITENAME}}",
 	"passwordreset-emailtext-ip": "Quacchedune (pò essere tu, da 'u 'ndirizze IP $1) ha richieste 'na mail pe arrecurdarse de le dettaglie d'u cunde sue pe {{SITENAME}} ($4). {{PLURAL:$3|'U cunde utende seguende jè|le cunde utinde seguende sonde}} associate cu st'indirizze e-mail:\n\n$2\n\n{{PLURAL:$3|Sta passuord temboranèe scade|Ste passuord temboranèe scadene}} 'mbrà {{PLURAL:$5|'nu sciurne|$5 sciurne}}.\nTu avissa trasè e scacchià 'na passuord nova. Ce quacchedun'otre ha fatte sta richieste, o ce tu t'è arrecurdate 'a passuord origgenale toje, e non g'a vuè ccu cange cchiù, tu puè ignorà stu messagge e condinuà ausanne 'a passuord vecchie.",
 	"passwordreset-emailtext-user": "L'utende $1 sus a {{SITENAME}} ave richieste 'na mail pe arrecurdarse le dettaglie d'u cunde sue pe {{SITENAME}}\n($4). {{PLURAL:$3|'U cunde utende seguende jè|le cunde utinde seguende sonde}} associate cu st'indirizze e-mail:\n\n$2\n\n{{PLURAL:$3|Sta passuord temboranèe scade|Ste passuord temboranèe scadene}}  'mbrà {{PLURAL:$5|'nu sciurne|$5 sciurne}}.\nTu avissa trasè e scacchià 'na passuord nova. Ce quacchedun'otre ha fatte sta richieste, o ce tu t'è arrecurdate 'a passuord origgenale toje, e non g'a vuè ccu cange cchiù, tu puè ignorà stu messagge e condinuà ausanne 'a passuord vecchie.",
-	"passwordreset-emailelement": "Nome utende: $1<br />\nPassuord temboranèe: $2",
+	"passwordreset-emailelement": "Nome utende: \n$1\n\nPassuord temboranèe: \n$2",
 	"passwordreset-emailsent": "'N'e-mail pe arrecurdarte ha state mannate.",
 	"passwordreset-emailsent-capture": "'Na e-mail pe azzeramende d'a passuord ha state mannate, ca jè fatte vedè aqquà sotte.",
 	"passwordreset-emailerror-capture": "'Na e-mail de azzeramende d'a passuord ha state generate, ca jè fatte vedè aqquà sotte, ma 'u 'nvie a {{GENDER:$2|l'utende}} ha fallite: $1",
@@ -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).",
@@ -1731,7 +1732,6 @@
 	"emailuser": "Manne n'email a stu utende",
 	"emailuser-title-target": "Manne n'email a quiste {{GENDER:$1|utende}}",
 	"emailuser-title-notarget": "E-mail de l'utende",
-	"emailpage": "E-mail de l'utende",
 	"emailpagetext": "Tu puè ausà 'a schermate aqquà sotte pe mannà 'n'email a stu {{GENDER:$1|utende}}.\nL'indirizze e-mail ca tu è 'nzerite jndr'à le [[Special:Preferences|preferenze tune]] iesse jndr'à 'u cambe \"Da\" de l'e-mail, accussì ce riceve 'a mail sape a ce addà responnere.",
 	"defemailsubject": "e-mail de {{SITENAME}} da l'utende \"$1\"",
 	"usermaildisabled": "L'e-mail de l'utende è disabbilitate",
@@ -1753,7 +1753,7 @@
 	"emailccsubject": "Copie de le messàgge tue a $1: $2",
 	"emailsent": "E-mail mannete",
 	"emailsenttext": "'U messagge email tue ha state mannete.",
-	"emailuserfooter": "Sta e-mail ha state mannate da $1 a $2 da 'a funziona \"{{int:emailpage}}\" de {{SITENAME}}.",
+	"emailuserfooter": "Sta e-mail ha state mannate da $1 a $2 da 'a funziona \"{{int:emailuser}}\" de {{SITENAME}}.",
 	"usermessage-summary": "Lassanne 'nu messagge de sisteme.",
 	"usermessage-editor": "Messaggiatore de sisteme",
 	"usermessage-template": "MediaWiki:UserMessage",
@@ -1840,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",
@@ -2321,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 0fb5cd5495..bffea86250 100644
--- a/languages/i18n/ru.json
+++ b/languages/i18n/ru.json
@@ -90,7 +90,6 @@
 	"tog-hideminor": "Скрывать малые правки из списка свежих правок",
 	"tog-hidepatrolled": "Скрывать патрулированные правки в списке свежих правок",
 	"tog-newpageshidepatrolled": "Скрывать отпатрулированные страницы в списке новых страниц",
-	"tog-hidecategorization": "Скрывать категоризацию страниц",
 	"tog-extendwatchlist": "Расширенный список наблюдения, включающий все изменения, а не только последние",
 	"tog-usenewrc": "Группировать изменения в свежих правках и списке наблюдения",
 	"tog-numberheadings": "Автоматически нумеровать заголовки",
@@ -120,7 +119,6 @@
 	"tog-watchlisthideliu": "Скрывать правки представившихся участников из списка наблюдения",
 	"tog-watchlisthideanons": "Скрывать правки анонимных участников из списка наблюдения",
 	"tog-watchlisthidepatrolled": "Скрывать отпатрулированные правки из списка наблюдения",
-	"tog-watchlisthidecategorization": "Скрывать категоризацию страниц",
 	"tog-ccmeonemails": "Отправлять мне копии писем, которые я посылаю другим участникам",
 	"tog-diffonly": "Не показывать содержание страницы под сравнением двух версий",
 	"tog-showhiddencats": "Показывать скрытые категории",
@@ -506,6 +504,7 @@
 	"createacct-benefit-body2": "{{PLURAL:$1|статья|статьи|статей}}",
 	"createacct-benefit-body3": "{{PLURAL:$1|участник|участника|участников}} за последнее время",
 	"badretype": "Введённые вами пароли не совпадают.",
+	"usernameinprogress": "Создание учётной записи для данного имени участника уже выполняется.\nПожалуйста, подождите.",
 	"userexists": "Введённое имя участника уже используется.\nПожалуйста, выберите другое имя.",
 	"loginerror": "Ошибка опознавания участника",
 	"createacct-error": "Ошибка создания учётной записи",
@@ -596,7 +595,7 @@
 	"passwordreset-emailtitle": "Сведения об учётной записи {{SITENAME}}",
 	"passwordreset-emailtext-ip": "Кто-то (возможно, вы, с IP-адреса $1) запросил сброс пароля к вашей учётной записи в проекте {{SITENAME}} ($4).\nС этим адресом электронной почты {{PLURAL:$3|1=связана следующая учётная запись|связаны следующие учётные записи}}:\n\n$2\n\n{{PLURAL:$3|1=Этот временный пароль будет|Эти временные пароли будут}} действовать {{PLURAL:$5|$5 день|$5 дня|$5 дней|1=один день}}.\nВы должны представиться системе и выбрать новый пароль. \nЕсли вы не делали этого запроса, или вспомнили свой исходный пароль и не желаете его менять, \nто можете проигнорировать это сообщение и продолжить использовать свой старый пароль.",
 	"passwordreset-emailtext-user": "Участник $1 из проекта {{SITENAME}} запросил сброс пароля для вашей учётной записи в проекте {{SITENAME}} ($4).\nС этим адресом электронной почты {{PLURAL:$3|1=связана следующая учётная запись|связаны следующие учётные записи}}:\n\n$2\n\n{{PLURAL:$3|1=Этот временный пароль будет|Эти временные пароли будут}} действовать {{PLURAL:$5|$5 день|$5 дней|$5 дня|1=один день}}.\nВы должны представиться системе и выбрать новый пароль.\nЕсли вы не делали этого запроса или вспомнили свой исходный пароль и не желаете его менять, \nто можете проигнорировать это сообщение и продолжить использовать свой старый пароль.",
-	"passwordreset-emailelement": "Имя участника: $1\nВременный пароль: $2",
+	"passwordreset-emailelement": "Имя участника: \n$1\n\nВременный пароль: \n$2",
 	"passwordreset-emailsent": "Отправлено электронное письмо с информацией о сбросе пароля.",
 	"passwordreset-emailsent-capture": "Отправлено электронное письмо с информацией о сбросе пароля, текст которого можно увидеть ниже.",
 	"passwordreset-emailerror-capture": "Было создано электронное письмо с информацией о сбросе пароля, текст которого можно увидеть ниже, однако его не удалось отправить {{GENDER:$2|участнику|участнице}} по следующей причине: $1",
@@ -690,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": "Ваш текст",
@@ -993,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|дня|дней}})",
@@ -1180,9 +1180,9 @@
 	"right-override-export-depth": "экспортирование страниц, включая связанные страницы с глубиной до 5",
 	"right-sendemail": "отправка электронной почты другим участникам",
 	"right-passwordreset": "просмотр электронных писем с изменением пароля",
-	"right-managechangetags": "Создавать и удалять [[Special:Tags|метки]] из базы данных",
-	"right-applychangetags": "Применить [[Special:Tags|tags]] наряду с Вашими изменениями",
-	"right-changetags": "Добавлять и удалять произвольные  [[Special:Tags|tags]] на отдельных изменениях и записях в журнале",
+	"right-managechangetags": "создание и удаление [[Special:Tags|меток]] из базы данных",
+	"right-applychangetags": "применение [[Special:Tags|меток]] вместе со своими правками",
+	"right-changetags": "добавление и удаление произвольных [[Special:Tags|меток]] на отдельных правках и записях в журнале",
 	"newuserlogpage": "Журнал регистрации участников",
 	"newuserlogpagetext": "Список недавно зарегистрировавшихся участников",
 	"rightslog": "Журнал прав участника",
@@ -1268,9 +1268,6 @@
 	"rcshowhidemine": "$1 свои правки",
 	"rcshowhidemine-show": "Показать",
 	"rcshowhidemine-hide": "Скрыть",
-	"rcshowhidecategorization": "$1 категоризацию страницы",
-	"rcshowhidecategorization-show": "Показать",
-	"rcshowhidecategorization-hide": "Скрыть",
 	"rclinks": "Показать последние $1 изменений за $2 дней<br />$3",
 	"diff": "разн.",
 	"hist": "история",
@@ -1295,10 +1292,6 @@
 	"recentchangeslinked-summary": "Это список недавних изменений в страницах, на которые ссылается указанная страница (или входящих в указанную категорию).\nСтраницы, входящие в [[Special:Watchlist|ваш список наблюдения]] '''выделены'''.",
 	"recentchangeslinked-page": "Название страницы:",
 	"recentchangeslinked-to": "Наоборот, показать изменения на страницах, которые ссылаются на указанную страницу",
-	"recentchanges-page-added-to-category": "[[:$1]] добавлена в категорию",
-	"recentchanges-page-added-to-category-bundled": "[[:$1]] и {{PLURAL:$2|одна страница|$2 страниц}} добавлены в категорию",
-	"recentchanges-page-removed-from-category": "[[:$1]] убрана из категории",
-	"recentchanges-page-removed-from-category-bundled": "[[:$1]] и {{PLURAL:$2|одна страница|$2 страниц}} убраны из категории",
 	"upload": "Загрузить файл",
 	"uploadbtn": "Загрузить файл",
 	"reuploaddesc": "Вернуться к форме загрузки",
@@ -1720,7 +1713,7 @@
 	"booksources-text": "На этой странице приведён список ссылок на сайты, где вы, возможно, найдёте дополнительную информацию о книге. Это интернет-магазины и системы поиска в библиотечных каталогах.",
 	"booksources-invalid-isbn": "Указанный номер ISBN, судя по всему, содержит ошибку. Пожалуйста, проверьте, что при переносе номера из первоисточника не возникло искажений.",
 	"specialloguserlabel": "Исполнитель:",
-	"speciallogtitlelabel": "Цель (название или участник):",
+	"speciallogtitlelabel": "Цель (название или {{ns:user}}:имя участника):",
 	"log": "Журналы",
 	"all-logs-page": "Все доступные журналы",
 	"alllogstext": "Общий список журналов сайта {{SITENAME}}.\nВы можете отфильтровать результаты по типу журнала, имени участника (учитывается регистр) или затронутой странице (также учитывается регистр).",
@@ -1808,7 +1801,6 @@
 	"emailuser": "Письмо участнику",
 	"emailuser-title-target": "Написание электронного письма {{GENDER:$1|участнику|участнице}}",
 	"emailuser-title-notarget": "Написание электронного письма участнику",
-	"emailpage": "Письмо участнику",
 	"emailpagetext": "С помощью данной формы можно отправить сообщение на адрес электронной почты {{GENDER:$1|этого участника|этой участницы}}.\nВ качестве обратного адреса будет указан тот адрес, который вы указали в [[Special:Preferences|своих настройках]], таким образом получатель будет иметь возможность ответить непосредственно вам.",
 	"defemailsubject": "{{SITENAME}} — Письмо от $1",
 	"usermaildisabled": "Электронная почта участника отключена",
@@ -1830,7 +1822,7 @@
 	"emailccsubject": "Копия вашего сообщения для $1: $2",
 	"emailsent": "Письмо отправлено",
 	"emailsenttext": "Ваше электронное сообщение отправлено.",
-	"emailuserfooter": "Это письмо было отправлено {{GENDER:$2|участнику|участнице}} $2 от {{GENDER:$1|участника|участницы}} $1 с помощью функции «{{int:emailpage}}» проекта {{SITENAME}}.",
+	"emailuserfooter": "Это письмо было отправлено {{GENDER:$2|участнику|участнице}} $2 от {{GENDER:$1|участника|участницы}} $1 с помощью функции «{{int:emailuser}}» проекта {{SITENAME}}.",
 	"usermessage-summary": "Оставить системное сообщение.",
 	"usermessage-editor": "Системная доставка",
 	"watchlist": "Список наблюдения",
@@ -3335,6 +3327,7 @@
 	"logentry-newusers-create2": "$1 {{GENDER:$2|создал|создала}} учётную запись $3",
 	"logentry-newusers-byemail": "$1 {{GENDER:$2|создал|создала}} учётную запись $3 и пароль был отправлен по электронной почте",
 	"logentry-newusers-autocreate": "Автоматически создана учётная запись {{GENDER:$2|участника|участницы}} $1",
+	"logentry-protect-move_prot": "$1 {{GENDER:$2|перенёс|перенесла}} настройки защиты с $4 на $3",
 	"logentry-rights-rights": "$1 {{GENDER:$2|изменил|изменила}} членство в группах для $3 с $4 на $5",
 	"logentry-rights-rights-legacy": "$1 {{GENDER:$2|изменил|изменила}} членство в группах для $3",
 	"logentry-rights-autopromote": "$1 был{{GENDER:$2||а}} автоматически переведен{{GENDER:$2||а}} из $4 в $5",
diff --git a/languages/i18n/rue.json b/languages/i18n/rue.json
index 8946049efc..68cd2e98a8 100644
--- a/languages/i18n/rue.json
+++ b/languages/i18n/rue.json
@@ -489,7 +489,7 @@
 	"passwordreset-emailtitle": "Детайлы конта на {{SITENAME}}",
 	"passwordreset-emailtext-ip": "Дахто (може Вы, з IP адресы $1) попросив о наставлїня нового гесла до вашого конта на {{grammar:6sg|{{SITENAME}}}} ($4). З тов адресов {{PLURAL:$3|є повязане слїдуюче конто|суть повязаны слїдуючі конта}}:\n\n$2\n\n{{PLURAL:$3|Тото дочасне гесло стане неплатным|Тоты дочасны гесла стануть неплатныма}} {{PLURAL:$5|за день|за $5 днї|за $5 днїв}}.\nТеперь бы сьте ся мали приголосити і зволити собі нове гесло. Кідь тоту просьбу послав хтось другый або сьте собі на своє старе гесло спомянули і не хочете го змінити, можете тото повідомлїня іґноровати і дале хосновати старе гесло.",
 	"passwordreset-emailtext-user": "{{gender:$1|Хоснователь|Хоснователька|Хоснователь}} $1 {{grammar:2sg|{{SITENAME}}}} {{gender:$1|попросив|попросила|попросив}} о наставлїня нового гесла до вашого\nконта на {{grammar:6sg|{{SITENAME}}}} ($4). З тов адресов {{PLURAL:$3|є повязане наступне конто|суть повязаны наступны конта}}:\n\n$2\n\n{{PLURAL:$3|Тото дочасне гесло кінчить|Тоты дочасны гесла кінчать}} {{PLURAL:$5|о єден день|о $5 днї|о $5 днїв}}.\nТеперь бы сьте ся мали приголосити і зволити собі нове гесло. Кідь тоту пожадавку \nпослав дахто другый або сьте собі на своє старе гесло спомянули і не хочете го\nзмінити, можете тото повідомлїня іґноровати і надале хосновати старе гесло.",
-	"passwordreset-emailelement": "Імя хоснователя: $1\nДочасне гесло: $2",
+	"passwordreset-emailelement": "Імя хоснователя: \n$1\n\nДочасне гесло: \n$2",
 	"passwordreset-emailsent": "Імейл з геслом быв посланый.",
 	"passwordreset-emailsent-capture": "Быв выґенерованый імейл з геслом, што є вказаный ниже.",
 	"passwordreset-emailerror-capture": "Быв выґенерованый імейл з геслом, котрый є указаный ниже, але ся го не вдало загнати {{GENDER:$2|хоснователёви|хосновательцї}}: $1",
@@ -1560,7 +1560,6 @@
 	"emailuser": "Послати імейл тому хоснователёви",
 	"emailuser-title-target": "Загнати імейл {{GENDER:$1|тому хоснователёви|тій хосновательцї}}",
 	"emailuser-title-notarget": "Загнати імейл хоснователёви",
-	"emailpage": "Пошлийте е-пошту",
 	"emailpagetext": "З ниже зображеным формуларём годно {{GENDER:$1|тому хоснователёви|тій хосновательцї}} загнати повідомлїня ел. поштов.\nАдреса ел. пошты, котру мате зазначену в [[Special:Preferences|наставлїня]],ся обявить як адреса одосылателя пошты, жебы вам адресат міг беспосереднё одповісти.",
 	"defemailsubject": "{{SITENAME}}: лист од \"$1\"",
 	"usermaildisabled": "Посыланя ел. пошты є выпнуте",
diff --git a/languages/i18n/sa.json b/languages/i18n/sa.json
index 1d1c81a43a..e9e4b4a65d 100644
--- a/languages/i18n/sa.json
+++ b/languages/i18n/sa.json
@@ -532,7 +532,7 @@
 	"passwordreset-emailtitle": "{{SITENAME}} इत्यत्र योजकविषये",
 	"passwordreset-emailtext-ip": "कोऽपि (कदाचित् भवान्/भवती, $1 अन्तर्जालसंविदः (from IP)) {{SITENAME}}($4) जालस्थानस्य  कृते कूटशब्दपरिवर्तनस्य विनतिम् अकरोत् । निम्न{{PLURAL:$3|योजकः|योजकाः}} अनेन वि-पत्रेण सह सल्लग्नः अस्ति/सल्लग्नाः सन्ति ।\n\n$2\n\n{{PLURAL:$3|एषः अल्पकालीनकूटशब्दः|एते अल्पकालीनकूटशब्दाः}} {{PLURAL:$5|चतुर्विंशतिघण्टासु|$5 दिनेषु}} निरस्तः भविष्यति/निरस्ताः भविष्यन्ति ।\nअधुना प्रवेशं सम्प्राप्य कूटशब्दः परिवर्तनीयः एव । \n\nनिम्नकारणानि यदि सन्ति, तर्हि एनं सन्देशम् अवगण्यताम् ।\n\n१ कोऽपि अन्यः अत्र विनतिम् अकरोत् । \n२ पूरातनः कूटशब्दः भवतः/भवत्याः स्मरणे अस्ति ।\n३ भवान्/भवती कूटशब्दं परिवर्तयितुं नेच्छिति ।",
 	"passwordreset-emailtext-user": "$1 योजकः {{SITENAME}}($4) जालस्थानस्य  कृते कूटशब्दपरिवर्तनस्य विनतिम् अकरोत् । निम्न{{PLURAL:$3|योजकः|योजकाः}} अनेन वि-पत्रेण सह सल्लग्नः अस्ति/सल्लग्नाः सन्ति ।\n\n$2\n\n{{PLURAL:$3|एषः अल्पकालीनकूटशब्दः|एते अल्पकालीनकूटशब्दाः}} {{PLURAL:$5|चतुर्विंशतिघण्टासु|$5 दिनेषु}} निरस्तः भविष्यति/निरस्ताः भविष्यन्ति ।\nअधुना प्रवेशं सम्प्राप्य कूटशब्दः परिवर्तनीयः एव । \n\nनिम्नकारणानि यदि सन्ति, तर्हि एनं सन्देशम् अवगण्यताम् ।\n\n१ कोऽपि अन्यः अत्र विज्ञप्तिम् अकरोत् । \n२ पूरातनः कूटशब्दः भवतः/भवत्याः स्मरणे अस्ति ।\n३ भवान्/भवती कूटशब्दं परिवर्तयितुं नेच्छिति ।",
-	"passwordreset-emailelement": "प्रयोक्तृनाम : $1\nअल्पकालीनकूटशब्दः : $2",
+	"passwordreset-emailelement": "प्रयोक्तृनाम : \n$1\n\nअल्पकालीनकूटशब्दः : \n$2",
 	"passwordreset-emailsent": "परिवर्तितकूटशब्दस्य वि-पत्रं प्रेषितम् अस्ति ।",
 	"passwordreset-emailsent-capture": "परिवर्तितकूटशब्दस्य वि-पत्रं प्रेषितम् अस्ति । तत् अधः द्रष्टुं शक्यते ।",
 	"passwordreset-emailerror-capture": "परिवर्तितकूटशब्दस्य वि-पत्रं निर्मितम् अस्ति । तत् अधः द्रष्टुं शक्यते । परन्तु {{GENDER:$2|योजकाय}} प्रेषणकाले तत् निरस्तम् अभवत् : $1",
@@ -1701,7 +1701,6 @@
 	"emailuser": "एतस्मै योजकाय वि-पत्रं प्रेष्यताम्",
 	"emailuser-title-target": "{{GENDER:$1|एतस्मै सदस्याय}} वि-पत्रं प्रैष्यताम्",
 	"emailuser-title-notarget": "ईपत्र योजकः",
-	"emailpage": "वि-पत्रोपयोक्ता",
 	"emailpagetext": "{{GENDER:$1|अस्मै}} योजकाय विद्युन्मानपत्रं प्रेषयितुम् अधो दत्तप्रपत्रम् उपयोक्तुं शक्नोति । \n[[Special:Preferences|your user preferences]] अत्र भवता विनिवेशितः वि-पत्रसङ्केतः सकाशात् इति स्थाने प्रतिभाति । अनेन स्वीकर्ता साक्षात् प्रत्युत्तरं दातुं प्रभविष्यति ।",
 	"defemailsubject": "{{SITENAME}}\"$1\" इति योजकात् विद्युन्मानपत्रम् ।",
 	"usermaildisabled": "योजकस्य विद्युन्मानपत्रं निष्क्रियम् ।",
@@ -1723,7 +1722,7 @@
 	"emailccsubject": "$1: $2 कृते अपि भवतः सन्देशस्य प्रकृतीः ।",
 	"emailsent": "वि-पत्रं प्रेषितम्",
 	"emailsenttext": "भवतः/भवत्याः वि-पत्रसन्देशः प्रेषितः",
-	"emailuserfooter": "एतद्वि-पत्रं {{SITENAME}} इत्यस्य योजपत्राचरव्यवस्थाद्वारा  $1 इत्यनेन $2 {{int:emailpage}} कृते प्रेषितम् ।",
+	"emailuserfooter": "एतद्वि-पत्रं {{SITENAME}} इत्यस्य योजपत्राचरव्यवस्थाद्वारा  $1 इत्यनेन $2 {{int:emailuser}} कृते प्रेषितम् ।",
 	"usermessage-summary": "तान्त्रिकसन्देशानां त्यागः ।",
 	"usermessage-editor": "तान्त्रिकसन्देशवाहकः ।",
 	"watchlist": "निरीक्षासूचिः",
diff --git a/languages/i18n/sah.json b/languages/i18n/sah.json
index 11efac441a..a99505aa22 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": "Бэлиэтэнии кэмигэр алҕас таҕыста",
@@ -522,7 +523,7 @@
 	"passwordreset-emailtitle": "{{SITENAME}} бырайыакка аатын туһунан",
 	"passwordreset-emailtext-ip": "Ким эрэ (баҕар эн буолуо, бу IP-ттан $1)  {{SITENAME}} ($4) бырайыакка киирии тылы уларытар туһунан ыйытык биэрбит.\nБу электрон аадырыһы кытта бу {{PLURAL:$3|аат ситимнээх|ааттар ситимнээхтэр}}:\n\n$2\n\nБу быстах кэмҥэ аналлаах {{PLURAL:$3|киирии тыл|кирии тыллар}} {{PLURAL:$5|биир күн үлэлиэҕэ|$5 күн үлэлиэхтэрэ}}.\nЭн тиһиликкэ ааккын этэн саҥа киирии тылы киллэриэхтээххин.\nӨскө бу ыйытыгы ыыппатах буоллаххына, эбэтэр урукку киирии тылгын өйдөөн кэлбит буоллаххына \nбу биллэриини ааххайыа суоххун сөп.\nОччоҕо урукку киирии тылыҥ оннунан хаалыа.",
 	"passwordreset-emailtext-user": "$1 диэн кыттааччы  {{SITENAME}} ($4) бырайыакка киирии тылгын уларытар туһунан ыйытык ыыппыт.\nБу электрон аадырыһы кытта бу {{PLURAL:$3|аат ситимнээх|ааттар ситимнээхтэр}}\n\n$2\n\nБу быстах кэмҥэ аналлаах {{PLURAL:$3|киирии тыл|кирии тыллар}} {{PLURAL:$5|биир күн үлэлиэҕэ|$5 күн үлэлиэхтэрэ}}.\nЭн тиһиликкэ ааккын этэн саҥа киирии тылы киллэриэхтээххин.\nӨскө бу ыйытыгы ыыппатах буоллаххына, эбэтэр урукку киирии тылгын өйдөөн кэлбит буоллаххына \nбу биллэриини ааххайыа суоххун сөп.\nОччоҕо урукку киирии тылыҥ оннунан хаалыа.",
-	"passwordreset-emailelement": "Кыттааччы: $1\nБыстах киирии тыл: $2",
+	"passwordreset-emailelement": "Кыттааччы: \n$1\n\nБыстах киирии тыл: \n$2",
 	"passwordreset-emailsent": "Киирии тылы уларытар туһунан сурук барда.",
 	"passwordreset-emailsent-capture": "Киирии тылы уларытар туһунан сурук аллара эмиэ көрдөрүлүннэ.",
 	"passwordreset-emailerror-capture": "Манна киирии тылы уларытар туһунан сурук көрдөрүлүннэ. Ол эрэн сурук бу төрүөттэн $2 кыттааччыга сатаан барбата: $1",
@@ -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 күн)",
@@ -1196,8 +1198,6 @@
 	"rcshowhidemine": "Мин уларытыыларбын $1",
 	"rcshowhidemine-show": "Көрдөр",
 	"rcshowhidemine-hide": "Кистээ",
-	"rcshowhidecategorization-show": "Көрдөр",
-	"rcshowhidecategorization-hide": "Кистээ",
 	"rclinks": "$2 күҥҥэ бүтэһик $1 уларытыыны көрдөр;<br />$3.",
 	"diff": "уратыта",
 	"hist": "устуоруйата",
@@ -1296,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 анаалыстанар кыаҕа суох.",
@@ -1720,7 +1722,6 @@
 	"emailuser": "Кыттааччыга сурук",
 	"emailuser-title-target": "Эл. суругу {{GENDER:$1|кыттааччыга}} суруйуу",
 	"emailuser-title-notarget": "Кыттааччыга e-mail сурук ыытыы",
-	"emailpage": "Кыттааччыга E-mail ыыт",
 	"emailpagetext": "Бу фуорма көмөтүнэн {{GENDER:$1|кыттааччыга}} сурук ыытыаххын сөп.\n\"Кимтэн\" диэҥҥэ эн [[Special:Preferences|туруорууларгар]] баар аадырыһыҥ киириэҕэ,\nонон суругу туппут киһи ол аадырыскар чопчу хардарар кыахтаныа.",
 	"defemailsubject": "{{SITENAME}} — $1 диэн киһиттэн сурук кэлбит",
 	"usermaildisabled": "Кыттааччы эл почтата арахса сылдьар",
diff --git a/languages/i18n/sat.json b/languages/i18n/sat.json
index f3d1606186..ce8737012c 100644
--- a/languages/i18n/sat.json
+++ b/languages/i18n/sat.json
@@ -383,7 +383,6 @@
 	"resetpass-submit-cancel": "Bạgi",
 	"resetpass-temp-password": "Nit lạgit uku nambar:",
 	"passwordreset": "Nãwãte oku nambar emme",
-	"passwordreset-legend": "Nãwãte oku nambar emme",
 	"passwordreset-disabled": "Noa wikire amaḱ uku nambar nãwãte em lạgit subita do bando gea.",
 	"passwordreset-username": "Beoharicaḱ ńutum:",
 	"passwordreset-domain": "Ḍomen:",
@@ -391,7 +390,7 @@
 	"passwordreset-capture-help": "Am do judi noa jacạy baksom lin lekhan, tobe nit lạgit́te em akan uku nambar são mit́ṭen e-mail ame uduḱama ar ona sãote beoharić ṭhen ona kuluḱa.",
 	"passwordreset-email": "E-mail ṭhikạna:",
 	"passwordreset-emailtitle": "{{SITENAME}} sayeṭre beoharićaḱ purạo thutiko",
-	"passwordreset-emailelement": "Beoharićaḱ ńutum: $1\nMit́ ghạṛi lạgit uku nambar: $2",
+	"passwordreset-emailelement": "Beoharićaḱ ńutum: \n$1\n\nMit́ ghạṛi lạgit uku nambar: \n$2",
 	"passwordreset-emailsent": "Mitṭen disạ ruaṛ e-mail do kulena.",
 	"passwordreset-emailsent-capture": "Mit́ṭen disạ ruaṛaḱ e-mail dokulena, oka do latarre ńeloḱ kana.",
 	"passwordreset-emailerror-capture": "Disạ ruạṛ oco lạgit́te mit́ṭen e-mail tear hoelena, oka do latarre udugoḱkana, menkhan $1 beoharić ṭhen  ṭhen baṅ kul hoe akana.",
@@ -713,7 +712,6 @@
 	"listgrouprights-addgroup-all": "Joto gaõtare ko soṅgekom",
 	"listgrouprights-removegroup-all": "Joto gaõtaren ko ocoḱgiḍikom",
 	"emailuser": "Nui beoharić e-mail emayme",
-	"emailpage": "E-mail beoharić",
 	"noemailtitle": "E-mail ṭhikạna do banuḱa",
 	"emailusername": "Beoharićaḱ ńutum:",
 	"emailusernamesubmit": "Em",
diff --git a/languages/i18n/sc.json b/languages/i18n/sc.json
index ee65cc480f..06b1506079 100644
--- a/languages/i18n/sc.json
+++ b/languages/i18n/sc.json
@@ -474,7 +474,6 @@
 	"resetpass-expired": "Sa password tua est iscadida. Pro piaghere inserta una password noa pro intrare.",
 	"resetpass-validity-soft": "Sa password password tua no est bàlida: $1\n\nPro piaghere issèbera una password noa como, o carca \"{{int:resetpass-submit-cancel}}\" pro lu fàghere prus a tardu.",
 	"passwordreset": "Reseta sa password",
-	"passwordreset-legend": "Reseta sa password",
 	"passwordreset-disabled": "Non si podent cambiare sas passwords in custa wiki.",
 	"passwordreset-emaildisabled": "Is funtzionalidades de email sunt istadas disabilitadas in custa wiki.",
 	"passwordreset-username": "Nùmene impitadore:",
@@ -482,7 +481,7 @@
 	"passwordreset-capture": "Ammustrare su cuntènnidu de sa email?",
 	"passwordreset-email": "Indiritzu email:",
 	"passwordreset-emailtitle": "Particulares de s'impitadore in {{SITENAME}}",
-	"passwordreset-emailelement": "Nùmene impitadore: $1\nPassword temporànea: $2",
+	"passwordreset-emailelement": "Nùmene impitadore: \n$1\n\nPassword temporànea: \n$2",
 	"changeemail": "Càmbia indiritzu email",
 	"changeemail-oldemail": "Indiritzu email atuale:",
 	"changeemail-newemail": "Indiritzu email nou:",
@@ -1003,7 +1002,6 @@
 	"nlinks": "$1 {{PLURAL:$1|ligòngiu|ligòngios}}",
 	"nmembers": "$1 {{PLURAL:$1|cumponente|cumponentes}}",
 	"nrevisions": "$1 {{PLURAL:$1|revisione|revisiones}}",
-	"nviews": "$1 {{PLURAL:$1|bisura|bisuras}}",
 	"lonelypages": "Pàginas burdas",
 	"uncategorizedpages": "Pàginas chentza categoria",
 	"uncategorizedcategories": "Categorias chentza categoria",
@@ -1072,7 +1070,6 @@
 	"mailnologintext": "Depes èsser [[Special:UserLogin|identificadu (login)]] e àere registradu un'indiritzu email vàlidu in is [[Special:Preferences|preferèntzias tuas]] pro imbiare email a àteros impitadores.",
 	"emailuser": "Imbia una email a custu impitadore",
 	"emailuser-title-notarget": "Ispedi una email a s'impitadore",
-	"emailpage": "Ispedi una email a s'impitadore",
 	"emailpagetext": "Imprea su mòdulu a suta pro ispedire una email a custu impitadore.\nS'indiritzu chi as insertadu in is [[Special:Preferences|preferèntzias impitadore tuas]] at a pàrrere comente su chi at ispedidu sa e-mail, pro fàghere sa manera chi su destinatàriu ti respundat deretu.",
 	"defemailsubject": "Missada dae \"$1\", impitadore de {{SITENAME}}",
 	"noemailtitle": "Perunu indiritzu e-mail",
diff --git a/languages/i18n/scn.json b/languages/i18n/scn.json
index ccae3bfff0..d300b74614 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,16 +335,16 @@
 	"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.",
-	"title-invalid-talk-namespace": "Lu tìtulu addumannatu pâ pàggina si rifirisci a na pàggina di discussioni ca nun esisti.",
+	"title-invalid-talk-namespace": "Lu tìtulu addumannatu pâ pàggina s'arrifirisci a na pàggina di discussioni ca nun esisti.",
 	"title-invalid-characters": "Lu tìtulu addumannatu pâ pàggina cunteni caràttiri nun vàlidi: \"$1\".",
-	"title-invalid-relative": "Lu tìtulu havi un caminu rilativu. Li tìtuli di pàggina rilativi (./, ../) nun sunnu boni, picchì spissu nun si ponnu arruvari pi' menzu dî browser di l'utenti.",
-	"title-invalid-magic-tilde": "Lu tìtulu addumannatu pâ pàggina cunteni na siguenza maggica di tildi nun vàlida(<nowiki>~~~</nowiki>).",
-	"title-invalid-too-long": "Lu tìtulu addumannatu pâ pàggina è troppu longu. Nun havi a' èssiri cchiu' longu di {{PLURAL:$1|byte}} sutta cudìfica UTF-8.",
-	"title-invalid-leading-colon": "Lu tìtulu addumannatu pâ pàggina cunteni nu signu di du punti ô principiu, chi' nun è vàlidu.",
+	"title-invalid-relative": "Lu tìtulu havi un caminu rilativu. Li tìtuli di pàggina rilativi (./, ../) nun sunnu boni, pirchì spissu nun si ponnu arrivari pi menzu dî browser di l'utenti.",
+	"title-invalid-magic-tilde": "Lu tìtulu addumannatu pâ pàggina cunteni na siguenza màggica di tildi nun vàlida(<nowiki>~~~</nowiki>).",
+	"title-invalid-too-long": "Lu tìtulu addumannatu pâ pàggina è troppu longu. Nun havi a èssiri cchiù longu di {{PLURAL:$1|byte}} sutta cudìfica UTF-8.",
+	"title-invalid-leading-colon": "Lu tìtulu addumannatu pâ pàggina cunteni nu signu di dui punti ô principiu, chi nun è vàlidu.",
 	"perfcached": "Li dati ca sèquinu sunnu stratti di na ''cache'' e putissiru nun èssiri aggiurnati. Ntâ ''cache'' {{PLURAL:$1|capi un risultatu|càpunu $1 risultati}} massimu.",
 	"perfcachedts": "Li dati ca sèquinu sunnu stratti di na ''cache'', e furu aggiurnati l'ultima vota ô $1. Ntâ ''cache'' {{PLURAL:$4|capi un risultatu|capunu $4 risultati}} massimu.",
 	"querypage-no-updates": "L'aggiurnamenti dâ pàggina sunnu timpuraniamenti suspisi. Li dati 'n chidda cuntinuti nun vèninu aggiurnati.",
@@ -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",
@@ -451,7 +452,7 @@
 	"wrongpassword": "La password chi' mittisti nun è giusta.\nPi' favuri prova n'àutra vota.",
 	"wrongpasswordempty": "La password chi' mittisti era vacanti.\nPi' favuri prova n'àutra vota.",
 	"passwordtooshort": "I password hannu a' èssiri longhi almenu {{PLURAL:$1|1 caràttiri|$1 caràttiri}}.",
-	"passwordtoolong": "Li password non pònnu èssiri cchiu' longhi di {{PLURAL:$1|1 caràttiri|$1 caràttiri}}.",
+	"passwordtoolong": "Li password nun ponnu èssiri cchiù longhi di {{PLURAL:$1|1 caràttiri|$1 caràttiri}}.",
 	"password-name-match": "La tò password havi a' èssiri diversa dû tò nomu utenti.",
 	"password-login-forbidden": "L'usu di stu nomu utenti e password fu' pruibbitu.",
 	"mailmypassword": "Azzera la password",
@@ -524,7 +525,7 @@
 	"passwordreset-emailtitle": "Dittagghî dû cuntu supra a' {{SITENAME}}",
 	"passwordreset-emailtext-ip": "Quarchidunu (prubbabilmenti tu, di l'innirizzu IP $1) fici dumanna pi' l'azziramentu dâ to password pi' {{SITENAME}} ($4). {{PLURAL:$3|U siguenti cuntu utenti è assuciatu|I siguenti cunti utenti su' assuciati}} cu' stu nnirizzu di posta elittrònica:\n\n$2\n\n{{PLURAL:$3|Sta password timpurania|Sti password timpuranii}} scàdunu tra {{PLURAL:$5|un jornu|$5 jorna}}.\nOra tu avissi a' tràsiri e scègghîri na password nova. Si' fu' quarchidun'autru a' fari sta richiesta e nun tu, o si' ti ricurdasti a to password origginali e nâ voi canciari cchiu', poi gnurari stu missaggiu e cuntinuari a' adupirari a to password vecchia.",
 	"passwordreset-emailtext-user": "L'utenti $1 supra a' {{SITENAME}} fici dumanna pi' l'azziramentu dâ to password pi' {{SITENAME}} ($4). {{PLURAL:$3|U siguenti cuntu utenti è assuciatu|I siguenti cunti utenti su' assuciati}} cu' stu nnirizzu di posta elittrònica:\n\n$2\n\n{{PLURAL:$3|Sta password timpurania|Sti password timpuranii}} scàdunu tra {{PLURAL:$5|un jornu|$5 jorna}}.\nOra tu avissi a' tràsiri e scègghîri na password nova. Si' fu' quarchidun'autru a' fari sta richiesta e nun tu, o si' ti ricurdasti a to password origginali e nâ voi canciari cchiu', poi gnurari stu missaggiu e cuntinuari a' adupirari a to password vecchia.",
-	"passwordreset-emailelement": "Nomu utenti: $1\nPassword timpurania: $2",
+	"passwordreset-emailelement": "Nomu utenti: \n$1\n\nPassword timpurania: \n$2",
 	"passwordreset-emailsent": "Nu missaggiu di posta elittrònica d'azziramentu dâ password fu' mannatu.",
 	"passwordreset-emailsent-capture": "Nu missaggiu di posta elittrònica d'azziramentu dâ password fu' mannatu, cû cuntinutu chi' si po' taliari ccassutta.",
 	"passwordreset-emailerror-capture": "Nu missaggiu di posta elittrònica d'azziramentu dâ password fu' cumpilatu, cû cuntinutu chi' si po' taliari ccassutta, però a so spidizzioni a' l'utenti {{GENDER:$2|user}} nun riniscìu: $1",
@@ -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:",
@@ -580,7 +581,7 @@
 	"missingcommentheader": "<strong>Accura:</strong> Nun havi statu spicificatu l'oggettu/ntistazzioni di stu cummentu. Primennu di novu \"{{int:savearticle}}\", lu canciamentu veni sarvatu senza avìrinni.",
 	"summary-preview": "Antiprima dû riassuntu:",
 	"subject-preview": "Antiprima di l'oggettu/ntistazzioni:",
-	"previewerrortext": "Mmattìu n'erruri nta l'ammustrari li to canciamenti.",
+	"previewerrortext": "Ammattìu n'erruri nta l'ammustrari li tò canciamenti.",
 	"blockedtitle": "L'utenti è bluccatu",
 	"blockedtext": "'''Stu nomu d'utenti o nnirizzu IP havi statu bluccatu.'''\n\nLu bloccu fu fattu di $1. Lu mutivu dû bloccu è: ''$2''.\n\n* Accuminzata dû bloccu: $8\n* Fini dû bloccu: $6\n* Ntirvallu dû bloccu: $7\n\nPoi cuntattari a $1 o a n'àutru [[{{MediaWiki:Grouppage-sysop}}|amministraturi]] pi discùtiri dû bloccu.\n\nNun poi usari la carattirìstica 'manna n'email a st'utenti' siddu nun è spicificatu nu nnirizzu email vàlidu nta li toi [[Special:Preferences|prifirenzi]] e siddu nun hai statu bluccatu di l'usari.\n\nLu tò nnirizzu IP attuali è $3, e lu nùmmiru ID dû bloccu è #$5.\n\nSpicìfica tutti li dittagghi pricidenti nta quarsiasi addumannata di chiarimenti.",
 	"autoblockedtext": "Lu tò nnirizzu IP hà statu bluccatu automaticamenti pirchì fu usatu di n'àutru utenti, chi fu bluccatu di $1.\nLu mutivu è chistu:\n\n:''$2''\n\n* Accuminzata dû bloccu: $8\n* Fini dû bloccu: $6\n* Ntirvallu dû bloccu: $7\n\nPoi cuntattari a $1 o a n'àutru [[{{MediaWiki:Grouppage-sysop}}|amministraturi]] pi discùtiri dû bloccu.\n\nNun poi usari la carattirìstica 'manna n'email a st'utenti' siddu nun è spicificatu nu nnirizzu email vàlidu ntra li tòi [[Special:Preferences|prifirenzi]] e siddu nun fusti bluccatu di l'usari.\n\nLu tò nnirizzu IP attuali è $3, e l'ID dû bloccu è $5.\nPi favuri nclùdilu nta tutti li dumanni chi fai.",
@@ -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:",
@@ -677,7 +678,7 @@
 	"content-model-javascript": "JavaScript",
 	"content-json-empty-object": "Oggettu vacanti",
 	"content-json-empty-array": "Vitturi vacanti",
-	"duplicate-args-warning": "<strong>Accura:</strong> [[:$1]] sta' chiamannu [[:$2]] cu' cchiu' ssai dûn valuri comu paràmitru \"$3\". Sarravi adupiratu sulu l'ùrtimu valuri spicificatu.",
+	"duplicate-args-warning": "<strong>Accura:</strong> [[:$1]] sta chiamannu [[:$2]] cu cchiossai dûn valuri comu paràmitru \"$3\". E' adupiratu sulu l'ùrtimu valuri spicificatu.",
 	"duplicate-args-category": "Pàggini chi' cuntènunu chiamati a' template cu' argumenti duplicati",
 	"duplicate-args-category-desc": "A pàggina cunteni chiamati a' template chi' adòpirunu argumenti duplicati, comu <code><nowiki>{{pippu|plutu=1|plutu=2}}</nowiki></code> o <code><nowiki>{{pippu|plutu|1=papirinu}}</nowiki></code>.",
 	"expensive-parserfunction-warning": "Accura: Sta pàggina cunteni troppi chiamati ê parser functions.\n\nAvissi a èssiri menu di $2, ô mumentu ci {{PLURAL:$1|nn'è $1|nni sunnu $1}}.",
@@ -753,7 +754,7 @@
 	"rev-showdeleted": "ammustra",
 	"revisiondelete": "Cancella o annulla la cancillazzioni di virsioni",
 	"revdelete-nooldid-title": "Virsioni oggettu nun vàlida",
-	"revdelete-nooldid-text": "O nun spicificasti nudda virsioni comu oggettu di sta funzioni, o la virsioni chi' spicificasti nun esisti, o puru stai pruvannu a' ammucciari la virsioni currenti.",
+	"revdelete-nooldid-text": "O nun spicificasti nudda virsioni comu oggettu di sta funzioni, o la virsioni chi spicificasti nun esisti, o puru stai pruvannu a ammucciari la virsioni currenti.",
 	"revdelete-no-file": "Lu file spicificatu nun esisti.",
 	"revdelete-show-file-confirm": "Si' sicuru chi' voi talìari na virsioni cancillata dû file \"<nowiki>$1</nowiki>\" dû $2 ê $3?",
 	"revdelete-show-file-submit": "Sì",
@@ -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",
@@ -845,7 +846,7 @@
 	"notextmatches": "Nudda currispunnenza ntô testu dî pàggini",
 	"prevn": "li pricidenti {{PLURAL:$1|$1}}",
 	"nextn": "li pròssimi {{PLURAL:$1|$1}}",
-	"prev-page": "pàggina arreti",
+	"prev-page": "pàggina pricidenti",
 	"next-page": "pàggina appressu",
 	"prevn-title": "{{PLURAL:$1|Risultatu pricidenti|$1 risultati pricedenti}}",
 	"nextn-title": "{{PLURAL:$1|Risultatu successivu|$1 risultata successivi}}",
@@ -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ù)",
@@ -901,10 +902,10 @@
 	"prefs-rc": "Ùrtimi canciamenti",
 	"prefs-watchlist": "Lista taliata",
 	"prefs-editwatchlist": "Cancia la lista taliata",
-	"prefs-editwatchlist-label": "Cancia li vuci dâ to lista taliata:",
-	"prefs-editwatchlist-edit": "Talìa e leva tìtuli dâ to lista taliata",
+	"prefs-editwatchlist-label": "Cancia li vuci dâ tò lista taliata:",
+	"prefs-editwatchlist-edit": "Talìa e leva tìtuli dâ tò lista taliata",
 	"prefs-editwatchlist-raw": "Cancia la lista taliata comu testu",
-	"prefs-editwatchlist-clear": "Svacanta la to lista taliata",
+	"prefs-editwatchlist-clear": "Svacanta la tò lista taliata",
 	"prefs-watchlist-days": "Nùmmiru di jorna a' ammustrari ntâ lista taliata:",
 	"prefs-watchlist-days-max": "Màssimu $1 {{PLURAL:$1|jornu|jorna}}",
 	"prefs-watchlist-edits": "Nùmmiru di canciamenti a' ammustrari ntâ lista taliata estinnuta:",
@@ -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",
@@ -1111,7 +1113,7 @@
 	"right-passwordreset": "Taliari li missaggi di posta elittrònica d'azziramentu dî password",
 	"right-managechangetags": "Criari e cancillari [[Special:Tags|etichetti]] dâ basi di dati",
 	"right-applychangetags": "Appizzari [[Special:Tags|etichetti]] ntê propî canciamenti",
-	"right-changetags": "Agghiùnciri e livari a' piaciri [[Special:Tags|etichetti]] dî virsioni e dî vuci di riggistru",
+	"right-changetags": "Agghiùnciri e livari a piaciri [[Special:Tags|etichetti]] dî virsioni e dî vuci di riggistru",
 	"newuserlogpage": "Riggistru di l'utenti novi",
 	"newuserlogpagetext": "Chistu è nu riggistru di li criazzioni di utenti novi.",
 	"rightslog": "Riggistru dî dritti di l'utenti",
@@ -1159,8 +1161,8 @@
 	"action-editmyprivateinfo": "canciari li to nfurmazzioni risirvati",
 	"action-editcontentmodel": "canciari lu mudellu di cuntinutu di na pàggina",
 	"action-managechangetags": "criari e cancillari etichetti dâ basi di dati",
-	"action-applychangetags": "appizzari etichetti ntê to canciamenti",
-	"action-changetags": "agghiùnciri e livari a' piaciri etichetti dî virsioni e dî vuci di riggistru",
+	"action-applychangetags": "appizzari etichetti ntê tò canciamenti",
+	"action-changetags": "agghiùnciri e livari a piaciri etichetti dî virsioni e dî vuci di riggistru",
 	"nchanges": "$1 {{PLURAL:$1|canciamentu|canciamenti}}",
 	"enhancedrc-since-last-visit": "$1 {{PLURAL:$1|di l'ùltima vìsita}}",
 	"enhancedrc-history": "crunuluggìa",
@@ -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î",
@@ -1286,19 +1288,19 @@
 	"uploaddisabledtext": "Li carricamenti dî file sunnu disattivati.",
 	"php-uploaddisabledtext": "Li carricamenti dî file sunnu disattivati ntô PHP.\nPi' favuri cuntrolla la mpustazzioni file_uploads.",
 	"uploadscripted": "Stu file cunteni còdici HTML o di script, ca putissi èssiri ntirpitratu erruniamenti d'un browser web.",
-	"upload-scripted-pi-callback": "Nun si ponnu carricari file ca cuntènunu l'istruzzioni di prucessu xml-stylesheet.",
-	"uploaded-script-svg": "Fu' truvatu n'elimentu prugrammàbbili \"$1\" ntô file SVG carricatu.",
-	"uploaded-hostile-svg": "Fu' truvatu còdici CSS risicusu nta l'elimentu style dû file SVG carricatu.",
-	"uploaded-event-handler-on-svg": "Nun è cunsintutu di mpustari l'attribbuti gistura di eventi <code>$1=\"$2\"</code> ntê file SVG.",
-	"uploaded-href-attribute-svg": "Nun sunnu cunsintuti l'attribbuti href <code>&lt;$1 $2=\"$3\"&gt;</code> cu na distinazzioni ca nun è lucali (ad esempiu http://, javascript:, etc) ntê file SVG.",
-	"uploaded-href-unsafe-target-svg": "Fu' truvatu n'href cu na distinazzioni risicusa <code>&lt;$1 $2=\"$3\"&gt;</code> ntô file SVG carricatu.",
-	"uploaded-animate-svg": "Fu' truvata n'etichetta \"animate\" ca purrìa canciari href, adupirannu l'attribbutu \"from\" <code>&lt;$1 $2=\"$3\"&gt;</code>, ntô file SVG carricatu.",
-	"uploaded-setting-event-handler-svg": "Lu mpustari l'attribbuti dî gistura di l'eventi veni bluccatu; fu' truvatu <code>&lt;$1 $2=\"$3\"&gt;</code> ntô file SVG carricatu.",
-	"uploaded-setting-href-svg": "L'adupirari l'etichetta \"set\" p'agghiùnciri n'attribbutu \"href\" a' l'elimentu ginituri veni bluccatu.",
-	"uploaded-wrong-setting-svg": "L'adupirari l'etichetta \"set\" p'agghiùnciri na distinazzioni rimota/data/script a n'attribbutu quali è jè, è bluccatu. Fu' truvatu <code>&lt;set to=\"$1\"&gt;</code> ntô file SVG carricatu.",
-	"uploaded-setting-handler-svg": "Lu còdici SVG ca mposta l'attribbutu \"handler\" a na distinazzioni rimota/data/script veni bluccatu. Fu' truvatu <code>$1=\"$2\"</code> ntô file SVG carricatu.",
-	"uploaded-remote-url-svg": "Lu còdici SVG ca mposta n'attribbutu style quali è jè versu di n'URL rimota veni bluccatu. Fu' truvatu <code>$1=\"$2\"</code> ntô file SVG carricatu.",
-	"uploaded-image-filter-svg": "Fu' truvatu nu filtru di mmàggini cu' URL <code>&lt;$1 $2=\"$3\"&gt;</code> ntô file SVG carricatu.",
+	"upload-scripted-pi-callback": "Nun si ponnu carricari file ca cuntèninu li struzzioni di prucessu xml-stylesheet.",
+	"uploaded-script-svg": "Fu attruvatu n'elimentu prugrammàbbili \"$1\" ntô file SVG carricatu.",
+	"uploaded-hostile-svg": "Fu attruvatu còdici CSS risicusu nta l'elimentu style dû file SVG carricatu.",
+	"uploaded-event-handler-on-svg": "Nun è cunzintutu di mpustari l'attribbuti gistura d'eventi <code>$1=\"$2\"</code> ntê file SVG.",
+	"uploaded-href-attribute-svg": "Nun sunnu cunzintuti l'attribbuti href <code>&lt;$1 $2=\"$3\"&gt;</code> cu na distinazzioni ca nun è lucali (p'esempiu http://, javascript:, etc) ntê file SVG.",
+	"uploaded-href-unsafe-target-svg": "Fu attruvatu n'href cu na distinazzioni risicusa <code>&lt;$1 $2=\"$3\"&gt;</code> ntô file SVG carricatu.",
+	"uploaded-animate-svg": "Fu attruvata n'etichetta \"animate\" ca purrìa canciari href, adupirannu l'attribbutu \"from\" <code>&lt;$1 $2=\"$3\"&gt;</code>, ntô file SVG carricatu.",
+	"uploaded-setting-event-handler-svg": "Lu mpustari l'attribbuti dî gistura di l'eventi veni bluccatu; fu attruvatu <code>&lt;$1 $2=\"$3\"&gt;</code> ntô file SVG carricatu.",
+	"uploaded-setting-href-svg": "L'adupirari l'etichetta \"set\" p'agghiùnciri n'attribbutu \"href\" a l'elimentu ginituri veni bluccatu.",
+	"uploaded-wrong-setting-svg": "L'adupirari l'etichetta \"set\" p'agghiùnciri na distinazzioni rimota/data/script a n'attribbutu qualegghiè, è bluccatu. Fu attruvatu <code>&lt;set to=\"$1\"&gt;</code> ntô file SVG carricatu.",
+	"uploaded-setting-handler-svg": "Lu còdici SVG ca mposta l'attribbutu \"handler\" a na distinazzioni rimota/data/script veni bluccatu. Fu attruvatu <code>$1=\"$2\"</code> ntô file SVG carricatu.",
+	"uploaded-remote-url-svg": "Lu còdici SVG ca mposta n'attribbutu style qualegghiè versu di n'URL rimota veni bluccatu. Fu attruvatu <code>$1=\"$2\"</code> ntô file SVG carricatu.",
+	"uploaded-image-filter-svg": "Fu attruvatu nu filtru di mmàggini cu URL <code>&lt;$1 $2=\"$3\"&gt;</code> ntô file SVG carricatu.",
 	"uploadscriptednamespace": "Stu file SVG cunteni nu namespace nun cunsintutu, \"$1\".",
 	"uploadinvalidxml": "L'XML ntô file carricatu nun potti èssiri analizzatu sintatticamenti.",
 	"uploadvirus": "Lu file cunteni un virus!\nDittagghî: $1",
@@ -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\".",
@@ -1409,7 +1424,7 @@
 	"listfiles-delete": "cancella",
 	"listfiles-summary": "Sta pàggina spiciali ammustra tutti li file carricati.",
 	"listfiles_search_for": "Ricerca dâ mmàggini di nomu:",
-	"listfiles-userdoesnotexist": "Nun cc'è riggistratu un cuntu a' nomu di l'utenti \"$1\".",
+	"listfiles-userdoesnotexist": "Nun c'è riggistratu un cuntu a nomu di l'utenti \"$1\".",
 	"imgfile": "file",
 	"listfiles": "Alencu dî file",
 	"listfiles_thumb": "Miniatura",
@@ -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",
@@ -1557,7 +1572,7 @@
 	"unusedimages": "File nun usati",
 	"wantedcategories": "Catigurìi addumannati",
 	"wantedpages": "Pàggini addumannati",
-	"wantedpages-summary": "Elencu dî pàggini ca nun esìstunu però hannu lu maggiuri nùmmiru di ligami versu d'iddi, lassannu stari li pàggini chi' comu ligami versu d'iddi hannu sulu rimanni. P'aviri n'elencu dî pàggini ca nun esìstunu però hannu rimanni versu d'iddi, talìa [[{{#special:BrokenRedirects}}|l'elencu dî rimanni rutti]].",
+	"wantedpages-summary": "Elencu dî pàggini ca nun esìstinu pirò hannu lu maiuri nùmmiru di ligami versu d'iddi, lassannu stari li pàggini chi comu ligami versu d'iddi hannu sulu rimanni. P'aviri n'elencu dî pàggini ca nun esìstinu pirò hannu rimanni versu d'iddi, talìa [[{{#special:BrokenRedirects}}|l'elencu dî rimanni rutti]].",
 	"wantedpages-badtitle": "Tìtulu nun vàlidu ntô gruppu di risultati: $1",
 	"wantedfiles": "File addumannati",
 	"wantedfiletext-cat": "Li file ccassutta su' richiamati però nun esìstunu. Ntâ lista cci ponnu èssiri macari li file chi' stannu nta dipòsiti esterni, cu' tuttu chi' esìstunu. Sti fausi pusitivi sarrannu <del>sbarrati</del>. Sparti, li pàggini chi' nclùdunu file chi' nun esìstunu su' elincati nta [[:$1]].",
@@ -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",
@@ -1712,7 +1727,6 @@
 	"emailuser": "Manna nu missaggiu di posta elittrònica a' st'utenti",
 	"emailuser-title-target": "Mannari nu missaggiu di posta elittrònica a' {{GENDER:$1|stu utenti|sta utenti}}",
 	"emailuser-title-notarget": "Mannari nu missaggiu di posta elittrònica a' n'utenti",
-	"emailpage": "Mannari nu missaggiu di posta elittrònica a' l'utenti",
 	"emailpagetext": "Poi adupirari lu mòdulu ccassutta pi' mannari nu missaggiu di posta elittrònica a' {{GENDER:$1|stu utenti|sta utenti}}.\nLu nnirizzu di posta elittrònica ca mittisti ntê [[Special:Preferences|prifirenzi dû to utenti]] và a' cumpàriri comu mittenti dû missaggiu, di manera ca lu distinatariu ti pò arrispùnniri dirittamenti.",
 	"defemailsubject": "Missaggiu di {{SITENAME}} di l'utenti \"$1\"",
 	"usermaildisabled": "Missaggi di posta elittrònica a' l'utenti disattivati",
@@ -1734,7 +1748,7 @@
 	"emailccsubject": "Copia dû missaggiu ca mannasti a' $1: $2",
 	"emailsent": "Missaggiu di posta elittrònica mannatu",
 	"emailsenttext": "Lu to missaggiu di posta elittrònica fu' mannatu.",
-	"emailuserfooter": "Stu missaggiu fu' mannatu di $1 a' $2 pi' menzu dâ funzioni \"{{int:emailpage}}\" supra a' {{SITENAME}}.",
+	"emailuserfooter": "Stu missaggiu fu mannatu di $1 a $2 pi menzu dâ funzioni \"{{int:emailuser}}\" supra a {{SITENAME}}.",
 	"usermessage-summary": "Lassatu nu missaggiu di sistema.",
 	"usermessage-editor": "Missaggeri di sistema",
 	"watchlist": "Lista taliata",
@@ -1744,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",
@@ -1825,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",
@@ -1857,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",
@@ -1896,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",
@@ -1931,7 +1945,7 @@
 	"namespace": "Namespace:",
 	"invert": "Inverti la silizzioni",
 	"tooltip-invert": "Scègghî sta casedda p'ammucciari li canciamenti chi' su' fatti a' pàggini dû namespace silizzunatu (e macari dû so namespace assuciatu, si' la casedda rilativa è scigghiuta)",
-	"tooltip-whatlinkshere-invert": "Signa sta casedda p'ammucciari li ligami chi' vènunu di pàggini dû namespace scigghiutu.",
+	"tooltip-whatlinkshere-invert": "Signa sta casedda p'ammucciari li ligami chi vèninu di pàggini dû namespace scigghiutu.",
 	"namespace_association": "Namespace assuciatu",
 	"tooltip-namespace_association": "Scègghî sta casedda pi' nclùdiri macari u namespace di discussioni o principali assuciatu ô namespace silizzunatu",
 	"blanknamespace": "(Principali)",
@@ -1960,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:",
@@ -1976,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",
@@ -2031,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",
@@ -2054,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",
@@ -2159,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.",
@@ -2210,9 +2224,9 @@
 	"import-interwiki-history": "Copia la ntera cronoluggìa di sta pàggina",
 	"import-interwiki-templates": "Includi tutti li template",
 	"import-interwiki-submit": "Mporta",
-	"import-mapping-default": "Importa ntê distinazzioni pridifinuti",
-	"import-mapping-namespace": "Importa nta nu namespace:",
-	"import-mapping-subpage": "Importa comu suttapàggini di sta pàggina:",
+	"import-mapping-default": "Mporta ntê distinazzioni pridifinuti",
+	"import-mapping-namespace": "Mporta nta nu namespace:",
+	"import-mapping-subpage": "Mporta comu suttapàggini di sta pàggina:",
 	"import-upload-filename": "Nomu file:",
 	"import-comment": "Oggettu:",
 	"importtext": "Pi favuri, esporta lu file dâ wiki surgenti adupirannu [[Special:Export|a funziunalità d'espurtazzioni]].\nSàrvalu supra a' lu tò computer e carrìcalu ccà.",
@@ -2239,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.",
@@ -2282,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",
@@ -2305,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",
@@ -2343,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",
@@ -2362,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}})",
@@ -2469,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",
@@ -2637,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à",
@@ -2823,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.",
@@ -2834,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]",
@@ -2882,7 +2896,7 @@
 	"lag-warn-high": "A càusa di nu ritardu eccissivu nta l'aggiurnamentu dô server di databbasi, li canciamenti appurtati {{PLURAL:$1|nta l'ùrtimu secundu|nta l'ùrtimi $1 secundi}} ponnu nun èssiri nta sta lista.",
 	"watchlistedit-normal-title": "Cancia pàggini taliati",
 	"watchlistedit-normal-legend": "Eliminazzioni di pàggini dâ lista dê pàggini taliati",
-	"watchlistedit-normal-explain": "Ccassutta cci sunnu li tìtuli dâ to lista taliata.\nPi' livàrinni unu, scegghî la casedda a' latu d'iddu, e clicca \"{{int:Watchlistedit-normal-submit}}\".\nPoi puru [[Special:EditWatchlist/raw|canciari la lista sutta forma di testu]].",
+	"watchlistedit-normal-explain": "Ccassutta ci sunnu li tìtuli dâ to lista taliata.\nPi livàrinni unu, scegghî la casedda a latu d'iddu, e clicca \"{{int:Watchlistedit-normal-submit}}\".\nPoi puru [[Special:EditWatchlist/raw|canciari la lista sutta forma di testu]].",
 	"watchlistedit-normal-submit": "Elìmina pàggini",
 	"watchlistedit-normal-done": "Dâ lista dê pàggini taliati hà{{PLURAL:$1|&nbsp;stata eliminata na pàggina|nnu stati eliminati $1 pàggini}}:",
 	"watchlistedit-raw-title": "Canciamentu dâ lista taliata sutta forma di testu",
@@ -2995,72 +3009,72 @@
 	"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>",
-	"tags": "Etichetti dî canciamenti validi",
-	"tag-filter": "Filtra pi' [[Special:Tags|etichetta]]",
+	"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 vàlidi",
+	"tag-filter": "Filtra pi [[Special:Tags|etichetta]]",
 	"tag-filter-submit": "Filtra",
 	"tag-list-wrapper": "([[Special:Tags|{{PLURAL:$1|Etichetta|Etichetti}}]]: $2)",
 	"tags-title": "Etichetti",
-	"tags-intro": "Sta pàggina elenca l'etichetti cu li quali lu software po' marcari nu canciamentu, e lu significatu ca hannu.",
+	"tags-intro": "Sta pàggina elenca l'etichetti cu li quali lu software pò marcari nu canciamentu, e lu significatu ca hannu.",
 	"tags-tag": "Nomu di l'etichetta",
 	"tags-display-header": "Aspettu nâ lista di canciamenti",
 	"tags-description-header": "Discrizzioni cumpleta dô significatu",
 	"tags-source-header": "Pruvinenza",
 	"tags-active-header": "Attivu?",
-	"tags-hitcount-header": "Canciamenti cu' etichetti",
+	"tags-hitcount-header": "Canciamenti cu etichetti",
 	"tags-actions-header": "Azzioni",
 	"tags-active-yes": "Sì",
 	"tags-active-no": "No",
-	"tags-source-extension": "Difinuta di n'estinsioni",
-	"tags-source-manual": "Appizzata a' manu di utenti e bot",
-	"tags-source-none": "Nun è cchiu' usata",
+	"tags-source-extension": "Difinuta di na stinzioni",
+	"tags-source-manual": "Appizzata a manu di utenti e bot",
+	"tags-source-none": "Nun è cchiù usata",
 	"tags-edit": "cancia",
 	"tags-delete": "cancella",
 	"tags-activate": "attiva",
 	"tags-deactivate": "disattiva",
 	"tags-hitcount": "$1 {{PLURAL:$1|canciamentu|canciamenti}}",
 	"tags-manage-no-permission": "Nun hai lu pirmissu di gistiri l'etichetti dî canciamenti.",
-	"tags-create-heading": "Crìa n'etichetta nova",
-	"tags-create-explanation": "Comu mpustazzioni pridifinuta, l'etichetti novi sunnu dispunìbbili a' èssiri adupirati di l'utenti e dî bot.",
+	"tags-create-heading": "Crea n'etichetta nova",
+	"tags-create-explanation": "Comu mpustazzioni pridifinuta, l'etichetti novi sunnu dispunìbbili a èssiri adupirati di l'utenti e dî bot.",
 	"tags-create-tag-name": "Nomu di l'etichetta:",
 	"tags-create-reason": "Mutivu:",
-	"tags-create-submit": "Crìa",
-	"tags-create-no-name": "Hai a' spicificari lu nomu di l'etichetta.",
-	"tags-create-invalid-chars": "Li nomi di l'etichetti nun pònnu cuntèniri vìrguli (<code>,</code>) o sbarri p'avanti (<code>/</code>).",
-	"tags-create-invalid-title-chars": "Li nomi di l'etichetti nun pònnu cuntèniri li caràttiri chi' nun si ponnu adupirari ntê tìtuli dî pàggini.",
+	"tags-create-submit": "Crea",
+	"tags-create-no-name": "Hai a spicificari lu nomu di l'etichetta.",
+	"tags-create-invalid-chars": "Li nomi di l'etichetti nun ponnu cuntèniri vìrguli (<code>,</code>) o sbarri p'avanti (<code>/</code>).",
+	"tags-create-invalid-title-chars": "Li nomi di l'etichetti nun ponnu cuntèniri li caràttiri chi nun si ponnu adupirari ntê tìtuli dî pàggini.",
 	"tags-create-already-exists": "L'etichetta \"$1\" già esisti.",
-	"tags-create-warnings-above": "{{PLURAL:$2|Mmattìu st'avvertimentu|Mmatteru st'avvertimenti}} ntô criari l'etichetta \"$1\":",
+	"tags-create-warnings-above": "{{PLURAL:$2|Ammattìu st'avvisu|Ammatteru st'avvisi}} ntô criari l'etichetta \"$1\":",
 	"tags-create-warnings-below": "Voi cuntinuari e criari l'etichetta?",
 	"tags-delete-title": "Cancillazzioni di n'etichetta",
 	"tags-delete-explanation-initial": "Stai cancillannu l'etichetta \"$1\" dâ basi di dati.",
-	"tags-delete-explanation-in-use": "Sarravi livata di {{PLURAL:$2|$2 virsioni o vuci di riggistru|tutti li $2 virsioni o vuci di riggistru}} unni è appizzata com'ad ora.",
-	"tags-delete-explanation-warning": "St'opirazzioni è <strong>irrivirsìbbili</strong> e <strong>nuddu la po' annullari</strong>, mancu l'amministratura dâ basi di dati. Hai a' èssiri sicuru chi' è chista l'etichetta chi' voi cancillari.",
-	"tags-delete-explanation-active": "<strong>L'etichetta \"$1\" ancora è attiva, e cuntinuiravi a' èssiri appizzata.</strong> Pi' fari finiri stu fattu, vai ntê banni unni st'etichetta è mpustata pi' èssiri appizzata, e disattìvila di ddani.",
+	"tags-delete-explanation-in-use": "Veni livata di {{PLURAL:$2|$2 virsioni o vuci di riggistru|tutti li $2 virsioni o vuci di riggistru}} unni è appizzata com'a ora.",
+	"tags-delete-explanation-warning": "St'opirazzioni nun è <strong>rivirsìbbili</strong> e <strong>nuddu la pò annullari</strong>, mancu l'amministratura dâ basi di dati. Hai a èssiri sicuru chi è chista l'etichetta chi voi cancillari.",
+	"tags-delete-explanation-active": "<strong>L'etichetta \"$1\" è ancora attiva, e cuntìnua a èssiri appizzata.</strong> Pi fari finiri stu fattu, vai ntê banni unni st'etichetta è mpustata p'èssiri appizzata, e disattìvala di ddà.",
 	"tags-delete-reason": "Mutivu:",
 	"tags-delete-submit": "Cancella difinitivamenti st'etichetta",
-	"tags-delete-not-allowed": "L'etichetti difinuti di n'estinsioni nun si ponnu cancillari, eccettu quannu l'estinsioni lu cunsenti esprissamenti.",
+	"tags-delete-not-allowed": "L'etichetti difinuti di na stinzioni nun si ponnu cancillari, eccettu quannu li stinzioni lu cunzenti espressamenti.",
 	"tags-delete-not-found": "L'etichetta \"$1\" nun esisti.",
-	"tags-delete-too-many-uses": "L'etichetta \"$1\" havi statu appizzata nta cchiu' ssai di $2 {{PLURAL:$2|virsioni}}, e pi' chistu mutivu nun si po' cancillari.",
-	"tags-delete-warnings-after-delete": "L'etichetta \"$1\" fu' cancillata bona, però {{PLURAL:$2|mmattìu st'avvirtimentu|mmatteru st'avvirtimenti}}:",
+	"tags-delete-too-many-uses": "L'etichetta \"$1\" fu appizzata nta cchiossai di $2 {{PLURAL:$2|virsioni}}, e pi stu mutivu nun si pò cancillari.",
+	"tags-delete-warnings-after-delete": "L'etichetta \"$1\" fu' cancillata bona, pirò {{PLURAL:$2|ammattìu st'avvisu|ammatteru st'avvisi}}:",
 	"tags-activate-title": "Attivazzioni di n'etichetta",
 	"tags-activate-question": "Stai attivannu l'etichetta \"$1\".",
 	"tags-activate-reason": "Mutivu:",
-	"tags-activate-not-allowed": "Nun si po' attivari l'etichetta \"$1\".",
+	"tags-activate-not-allowed": "Nun si pò attivari l'etichetta \"$1\".",
 	"tags-activate-not-found": "L'etichetta \"$1\" nun esisti.",
 	"tags-activate-submit": "Attiva",
 	"tags-deactivate-title": "Disattivazzioni di n'etichetta",
 	"tags-deactivate-question": "Stai disattivannu l'etichetta \"$1\".",
 	"tags-deactivate-reason": "Mutivu:",
-	"tags-deactivate-not-allowed": "Nun si po' disattivari l'etichetta \"$1\".",
+	"tags-deactivate-not-allowed": "Nun si pò disattivari l'etichetta \"$1\".",
 	"tags-deactivate-submit": "Disattiva",
-	"tags-apply-no-permission": "Nun hai lu pirmissu di appizzari etichetti ntê to canciamenti.",
-	"tags-apply-not-allowed-one": "Nun è cunsintutu di appizzari l'etichetta \"$1\" a' manu.",
-	"tags-apply-not-allowed-multi": "Nun è cunsintutu di appizzari {{PLURAL:$2|st'etichetta|st'etichetti}} a' manu: $1",
+	"tags-apply-no-permission": "Nun hai lu pirmissu d'appizzari etichetti ntê tò canciamenti.",
+	"tags-apply-not-allowed-one": "Nun è cunzintutu di appizzari l'etichetta \"$1\" a manu.",
+	"tags-apply-not-allowed-multi": "Nun è cunzintutu d'appizzari {{PLURAL:$2|st'etichetta|st'etichetti}} a manu: $1",
 	"tags-update-no-permission": "Nun hai lu pirmissu di agghiùnciri o livari l'etichetti di canciamentu dî sìnguli virsioni o vuci di riggistru.",
-	"tags-update-add-not-allowed-one": "Nun è cunsintutu di agghiùnciri l'etichetta \"$1\" a' manu.",
-	"tags-update-add-not-allowed-multi": "Nun è cunsintutu di agghiùnciri {{PLURAL:$2|st'etichetta|st'etichetti}} a' manu: $1",
-	"tags-update-remove-not-allowed-one": "Nun è cunsintutu di livari l'etichetta \"$1\".",
-	"tags-update-remove-not-allowed-multi": "Nun è cunsintutu di livari {{PLURAL:$2|st'etichetta|st'etichetti}} a' manu: $1",
+	"tags-update-add-not-allowed-one": "Nun è cunzintutu d'agghiùnciri l'etichetta \"$1\" a manu.",
+	"tags-update-add-not-allowed-multi": "Nun è cunzintutu d'agghiùnciri {{PLURAL:$2|st'etichetta|st'etichetti}} a manu: $1",
+	"tags-update-remove-not-allowed-one": "Nun è cunzintutu di livari l'etichetta \"$1\".",
+	"tags-update-remove-not-allowed-multi": "Nun è cunzintutu di livari {{PLURAL:$2|st'etichetta|st'etichetti}} a manu: $1",
 	"tags-edit-title": "Canciamentu di l'etichetti",
 	"tags-edit-manage-link": "Gistisci l'etichetti",
 	"tags-edit-revision-selected": "{{PLURAL:$1|Virsioni scigghiuta|Virsioni scigghiuti}} di [[:$2]]:",
@@ -3074,15 +3088,15 @@
 	"tags-edit-remove": "Leva st'etichetti:",
 	"tags-edit-remove-all-tags": "(leva tutti l'etichetti)",
 	"tags-edit-chosen-placeholder": "Scegghî quarchi etichetta",
-	"tags-edit-chosen-no-results": "Nun si truvàu nudda etichetta ca currispunni",
+	"tags-edit-chosen-no-results": "Nun si truvau nudda etichetta ca currispunni",
 	"tags-edit-reason": "Mutivu:",
-	"tags-edit-revision-submit": "Àpplica li canciamenti a' {{PLURAL:$1|sta virsioni|$1 virsioni}}",
-	"tags-edit-logentry-submit": "Àpplica li canciamenti a' {{PLURAL:$1|sta vuci di riggistru|$1 vuci di riggistru}}",
-	"tags-edit-success": "Li canciamenti furu applicati boni.",
+	"tags-edit-revision-submit": "Àpplica li canciamenti a {{PLURAL:$1|sta virsioni|$1 virsioni}}",
+	"tags-edit-logentry-submit": "Àpplica li canciamenti a {{PLURAL:$1|sta vuci di riggistru|$1 vuci di riggistru}}",
+	"tags-edit-success": "Li canciamenti foru applicati boni.",
 	"tags-edit-failure": "Nun si pòttiru applicari li canciamenti:\n$1",
 	"tags-edit-nooldid-title": "Virsioni oggettu nun vàlida",
 	"tags-edit-nooldid-text": "O nun spicificasti nudda virsioni comu oggettu di sta funzioni, o puru la virsioni spicificata nun esisti.",
-	"tags-edit-none-selected": "Pi' favuri scegghi ammenu una etichetta, di agghiùnciri o livari.",
+	"tags-edit-none-selected": "Pi favuri scegghi armenu n'etichetta, di agghiùnciri o livari.",
 	"comparepages": "Cunfrunta pàggini",
 	"compare-page1": "Pàggina 1",
 	"compare-page2": "Pàggina 2",
@@ -3097,7 +3111,7 @@
 	"dberr-info": "(Impussìbbili accèdiri â basi di dati: $1)",
 	"dberr-info-hidden": "(Impussìbbili accèdiri â basi di dati)",
 	"dberr-usegoogle": "Poi pruvari a circari supra Google ammentri.",
-	"dberr-outofdate": "Nota ca la so innicizzazioni dû nostru cuntinutu po' nun èssiri aggiurnata.",
+	"dberr-outofdate": "Nota ca la sò nnicizzazioni dû nostru cuntinutu pò nun èssiri aggiurnata.",
 	"dberr-cachederror": "Chista ca segui è na copia cache da pàggina richiesta, e putissi essiri nun aggiurnata.",
 	"htmlform-invalid-input": "Ci su prublema cu l'input nseritu",
 	"htmlform-select-badoption": "Lu valori spicificatu nun è n'opzioni valida.",
@@ -3116,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.",
@@ -3141,13 +3155,13 @@
 	"revdelete-uname-unhid": "nomu utenti ammustratu",
 	"revdelete-restricted": "misi ristrizzioni pi' l'amministratura",
 	"revdelete-unrestricted": "livati ristrizzioni pi' l'amministratura",
-	"logentry-block-block": "$1 {{GENDER:$2|bluccàu}} a' {{GENDER:$4|$3}} cûn tempu di scadenza di $5 $6",
-	"logentry-block-unblock": "$1 {{GENDER:$2|sbluccàu}} a' {{GENDER:$4|$3}}",
-	"logentry-block-reblock": "$1 {{GENDER:$2|canciàu}} li mpustazzioni dû bloccu di {{GENDER:$4|$3}} cûn tempu di scadenza di $5 $6",
-	"logentry-suppress-block": "$1 {{GENDER:$2|bluccàu}} a' {{GENDER:$4|$3}} cûn tempu di scadenza di $5 $6",
-	"logentry-suppress-reblock": "$1 {{GENDER:$2|canciàu}} li mpustazzioni dû bloccu di {{GENDER:$4|$3}} cûn tempu di scadenza di $5 $6",
-	"logentry-import-upload": "$1 {{GENDER:$2|impurtàu}} $3 pi' menzu dûn carricamentu di file",
-	"logentry-import-interwiki": "$1 {{GENDER:$2|impurtàu}} $3 di n'autra wiki",
+	"logentry-block-block": "$1 {{GENDER:$2|bluccau}} a {{GENDER:$4|$3}} cûn tempu di scadenza di $5 $6",
+	"logentry-block-unblock": "$1 {{GENDER:$2|sbluccau}} a {{GENDER:$4|$3}}",
+	"logentry-block-reblock": "$1 {{GENDER:$2|canciau}} li mpustazzioni dû bloccu di {{GENDER:$4|$3}} cûn tempu di scadenza di $5 $6",
+	"logentry-suppress-block": "$1 {{GENDER:$2|bluccau}} a {{GENDER:$4|$3}} cûn tempu di scadenza di $5 $6",
+	"logentry-suppress-reblock": "$1 {{GENDER:$2|canciau}} li mpustazzioni dû bloccu di {{GENDER:$4|$3}} cûn tempu di scadenza di $5 $6",
+	"logentry-import-upload": "$1 {{GENDER:$2|mpurtau}} $3 pi menzu dûn carricamentu di file",
+	"logentry-import-interwiki": "$1 {{GENDER:$2|mpurtau}} $3 di n'àutra wiki",
 	"logentry-merge-merge": "$1 {{GENDER:$2|juncìu}} $3 nta $4 (virsioni nfina ô $5)",
 	"logentry-move-move": "$1 {{GENDER:$2|spustau}} la pàggina $3 nti $4",
 	"logentry-move-move-noredirect": "$1 {{GENDER:$2|spustau}} a pàggina $3 nta $4 senza lassari nu rimannu",
@@ -3160,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",
@@ -3167,23 +3182,23 @@
 	"logentry-upload-overwrite": "$1 {{GENDER:$2|carricau}} na virsioni nova di $3",
 	"logentry-upload-revert": "$1 {{GENDER:$2|carricau}} $3",
 	"log-name-managetags": "Riggistru dâ gistioni di l'etichetti",
-	"log-description-managetags": "Sta pàggina elenca l'opirazzioni amministrativi chi' riguàrdunu l'[[Special:Tags|etichetti]]. Lu riggìstru cunteni sulu l'azzioni chi' furu fatti a' manu di n'amministraturi; l'etichetti ponnu puru èssiri criati e cancillati dû software dâ wiki senza lassari vuci nta stu riggistru.",
-	"logentry-managetags-create": "$1 {{GENDER:$2|criàu}} l'etichetta «$4»",
-	"logentry-managetags-delete": "$1 {{GENDER:$2|cancillàu}} l'etichetta \"$4\" (livata di $5 {{PLURAL:$5|virsioni o vuci di riggistru}})",
-	"logentry-managetags-activate": "$1 {{GENDER:$2|attivàu}} l'etichetta «$4» pi' l'usu di utenti e bot",
-	"logentry-managetags-deactivate": "$1 {{GENDER:$2|disattivàu}} l'etichetta \"$4\" pi' l'usu di l'utenti e dî bot",
+	"log-description-managetags": "Sta pàggina elenca l'opirazzioni amministrativi c'arriguàrdanu l'[[Special:Tags|etichetti]]. Lu riggistru cunteni sulu l'azzioni chi foru fatti a manu di n'amministraturi; l'etichetti ponnu puru èssiri criati e cancillati dû software dâ wiki senza lassari vuci nta stu riggistru.",
+	"logentry-managetags-create": "$1 {{GENDER:$2|criau}} l'etichetta «$4»",
+	"logentry-managetags-delete": "$1 {{GENDER:$2|cancillau}} l'etichetta \"$4\" (livata di $5 {{PLURAL:$5|virsioni o vuci di riggistru}})",
+	"logentry-managetags-activate": "$1 {{GENDER:$2|attivau}} l'etichetta «$4» pi l'usu di utenti e bot",
+	"logentry-managetags-deactivate": "$1 {{GENDER:$2|disattivau}} l'etichetta \"$4\" pi l'usu di l'utenti e dî bot",
 	"log-name-tag": "Riggistru di l'etichetti",
-	"log-description-tag": "Sta pàggina ammustra quannu l'utenti agghiunciunu o lèvunu [[Special:Tags|etichetti]] di sìnguli virsioni o vuci di riggistru. Stu riggistru nun rifirisci li variazzioni di l'etichetti chi' succèdunu ntô cuntestu di nu canciamentu, na cancillazzioni, o n'autra opirazzioni comu a' chisti.",
+	"log-description-tag": "Sta pàggina ammustra quannu l'utenti agghiùncinu o lèvanu [[Special:Tags|etichetti]] di sìnguli virsioni o vuci di riggistru. Stu riggistru nun arrifirisci li variazzioni di l'etichetti chi succèdinu ntô cuntestu di nu canciamentu, na cancillazzioni, o n'àutra opirazzioni comu a chisti.",
 	"logentry-tag-update-add-revision": "$1 {{GENDER:$2|agghiuncìu}} l'{{PLURAL:$7|etichetta|etichetti}} $6 â virsioni $4 dâ pàggina $3",
 	"logentry-tag-update-add-logentry": "$1 {{GENDER:$2|agghiuncìu}} {{PLURAL:$7|l'etichetta|l'etichetti}} $6 â vuci di riggistru $5 dâ pàggina $3",
-	"logentry-tag-update-remove-revision": "$1 {{GENDER:$2|livàu}} {{PLURAL:$9|l'etichetta|l'etichetti}} $8 dâ virsioni $4 dâ pàggina $3",
-	"logentry-tag-update-remove-logentry": "$1 {{GENDER:$2|livàu}} l'{{PLURAL:$9|etichetta|etichetti}} $8 dâ vuci di riggistru $5 dâ pàggina $3",
-	"logentry-tag-update-revision": "$1 {{GENDER:$2|canciàu}} l'etichetti dâ virsioni $4 dâ pàggina $3 ({{PLURAL:$7|nn'agghiuncìu}} $6; {{PLURAL:$9|nni livàu}} $8)",
-	"logentry-tag-update-logentry": "$1 {{GENDER:$2|aggiurnàu}} l'etichetti ntâ vuci di riggistru $5 dâ pàggina $3 ({{PLURAL:$7|nn'agghiuncìu}} $6; {{PLURAL:$9|nni livàu}} $8)",
+	"logentry-tag-update-remove-revision": "$1 {{GENDER:$2|livau}} {{PLURAL:$9|l'etichetta|l'etichetti}} $8 dâ virsioni $4 dâ pàggina $3",
+	"logentry-tag-update-remove-logentry": "$1 {{GENDER:$2|livau}} l'{{PLURAL:$9|etichetta|etichetti}} $8 dâ vuci di riggistru $5 dâ pàggina $3",
+	"logentry-tag-update-revision": "$1 {{GENDER:$2|canciau}} l'etichetti dâ virsioni $4 dâ pàggina $3 ({{PLURAL:$7|nn'agghiuncìu}} $6; {{PLURAL:$9|nni livau}} $8)",
+	"logentry-tag-update-logentry": "$1 {{GENDER:$2|aggiurnau}} l'etichetti ntâ vuci di riggistru $5 dâ pàggina $3 ({{PLURAL:$7|nn'agghiuncìu}} $6; {{PLURAL:$9|nni livau}} $8)",
 	"rightsnone": "(nuddu)",
 	"revdelete-summary": "riassuntu dô canciamentu",
 	"feedback-adding": "Agghiuncimentu dû cummentu â pàggina...",
-	"feedback-back": "Arreti",
+	"feedback-back": "N'arreri",
 	"feedback-bugcheck": "Bonu! Sulu cuntrolla chi' nun è unu dî [$1 bug già canusciuti].",
 	"feedback-bugnew": "Cuntrullai. Signala nu bug novu",
 	"feedback-bugornote": "Si' si' bonu a' discrìviri un prubblema tècnicu di manera dittagghiata, pi' favuri [$1 signala nu bug].\nSi' no, poi adupirari u mòdulu facilitatu ccassutta. U to cummentu sarravi agghiunciutu â pàggina \"[$3 $2]\", nsemmula ô to nomu utenti.",
@@ -3191,21 +3206,21 @@
 	"feedback-close": "Finutu",
 	"feedback-external-bug-report-button": "Signala nu prubblema tècnicu",
 	"feedback-dialog-title": "Lassa nu cummentu",
-	"feedback-dialog-intro": "Poi adupirari stu mòdulu facili ccassutta pi' lassari lu to cummentu. Stu cummentu sarravi agghiunciutu â pàggina «$1», nsemmula ô to nomu utenti.",
+	"feedback-dialog-intro": "Poi adupirari stu mòdulu facili ccassutta pi lassari lu tò cummentu. Stu cummentu è agghiunciutu â pàggina «$1», nzèmmula ô tò nomu utenti.",
 	"feedback-error-title": "Erruri",
 	"feedback-error1": "Erruri: Risultatu di l'API nun ricanusciutu",
 	"feedback-error2": "Erruri: A mudìfica nun riniscìu",
 	"feedback-error3": "Erruri: Nudda risposta di l'API",
-	"feedback-error4": "Erruri: Nun fu' pussìbbili pubblicari ntô tìtulu dû cummentu spicificatu",
+	"feedback-error4": "Erruri: Nun fu pussìbbili pubblicari ntô tìtulu dû cummentu spicificatu",
 	"feedback-message": "Missaggiu:",
 	"feedback-subject": "Oggettu:",
 	"feedback-submit": "Manna",
-	"feedback-terms": "Capisciu ca li nfurmazzioni dû me aggenti di l'utenti cuntènunu li virsioni pricisi dû me browser e dû me sistema opirativu, e ca sti nfurmazzioni sarrannu cunnivisi pubblicamenti a' latu dû me cummentu.",
-	"feedback-termsofuse": "Accunsentu a' lassari lu me cummentu in cuncurdanza cu' li Cunnizzioni d'Usu.",
+	"feedback-terms": "Capisciu ca li nfurmazzioni dû mè aggenti di l'utenti cuntèninu li virsioni pricisi dû mè browser e dû mè sistema opirativu, e ca sti nfurmazzioni sunnu cunnivisi pubblicamenti a latu dû mè cummentu.",
+	"feedback-termsofuse": "Accunzentu a lassari lu mè cummentu n cuncurdanza cu li Cunnizzioni d'Usu.",
 	"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",
@@ -3303,8 +3318,8 @@
 	"log-name-pagelang": "Riggistru dî canci di lingua",
 	"log-description-pagelang": "Chistu è nu riggistru dî canciamenti â lingua dî pàggini.",
 	"logentry-pagelang-pagelang": "$1 {{GENDER:$2|canciau}} a lingua dâ pàggina $3 di $4 a' $5.",
-	"default-skin-not-found": "Whoops! La peddi pridifinuta dâ to wiki, mpustata nta <code dir=\"ltr\">$wgDefaultSkin</code> comu <code>$1</code>, nun è dispunìbbili.\n\nA' quantu pari la to istallazzioni ncludi {{PLURAL:$4|la peddi|li peddi}} ccasutta. Talìa [https://www.mediawiki.org/wiki/Manual:Skin_configuration Manuali: Cunfigurazzioni dî peddi] p'istruzzioni supra a' comu {{PLURAL:$4|s'attìva|s'attìvunu e comu si scegghî chidda pridifinuta}}.\n\n$2\n\n; Si' hai istallatu MediaWiki ora ora:\n: E' prubbàbbili ca l'istallasti dû git, o direttamenti dû còdici surgenti nta quarchi' n'autra manera. Allura sta cosa è privista. Prova e istalla quarchi' peddi di [https://www.mediawiki.org/wiki/Category:All_skins l'archìviu dî peddi di mediawiki.org], a na manera di chisti:\n:* Scàrrica [https://www.mediawiki.org/wiki/Download lu prugramma d'istallazzioni in furmatu tar], ca cunteni tanti peddi ed estinsioni. Poi cupiari e ncuddari la cartella <code>skins/</code> di ddadintra.\n:* Scàrrica a' una a' una quarchi' peddi ntô furmatu tar di [https://www.mediawiki.org/wiki/Special:SkinDistributor mediawiki.org].\n:* [https://www.mediawiki.org/wiki/Download_from_Git#Using_Git_to_download_MediaWiki_skins Adòpira Git pi' scarricari peddi].\n: Lu fari accussi' nun avissi a' ntirfirìri cû to dipòsitu git si' si' nu sviluppaturi di MediaWiki.\n\n; Si' hai aggiurnatu MediaWiki ora ora:\n: MediaWiki virsioni 1.24 e succissivi nun attìvunu cchiu' di manera autumàtica li peddi istallati (talìa [https://www.mediawiki.org/wiki/Manual:Skin_autodiscovery Manüali: Scuperta autumatica dî peddi]). Poi cupiari e ncuddari {{PLURAL:$5|sta riga|sti righi}} nta <code>LocalSettings.php</code> p'attivari {{PLURAL:$5|la peddi ca è istallata pi' com'ora|tutti li peddi ca sunnu istallati pi' com'ora}}:\n\n<pre dir=\"ltr\">$3</pre>\n\n; Si' hai mudificatu <code>LocalSettings.php</code> ora ora:\n: Cuntrolla ca nun sbagghiasti a' scrìviri li nomi dî peddi.",
-	"default-skin-not-found-no-skins": "Whoops! La peddi pridifinuta dâ to wiki, mpustata nta <code dir=\"ltr\">$wgDefaultSkin</code> comu <code>$1</code>, nun è dispunìbbili.\n\nNun hai nudda peddi installata.\n\n; Si' hai installatu o puru aggiurnatu MediaWiki ora ora:\n: E' prubbàbbili chi' l'installasti dû git, o direttamenti dû còdici surgenti nta quarchi' autra manera. Allura sta cosa è privista. MediaWiki virsioni 1.24 e succissivi nun cuntènunu nudda peddi ntô dipòsitu principali. Prova e installa quarchi' peddi di [https://www.mediawiki.org/wiki/Category:All_skins l'archìviu dî peddi di mediawiki.org], a na manera di chisti:\n:* Scàrrica [https://www.mediawiki.org/wiki/Download u prugramma d'installazzioni in furmatu tar], chi' cunteni tanti peddi ed estinsioni. Poi cupiari e ncuddari a cartella <code>skins/</code> di ddadintra.\n:* Scàrrica a' una a' una quarchi' peddi in furmatu tar di [https://www.mediawiki.org/wiki/Special:SkinDistributor mediawiki.org].\n:* [https://www.mediawiki.org/wiki/Download_from_Git#Using_Git_to_download_MediaWiki_skins Adòpira Git pi' scarricari peddi].\n: Fari accussì' nun avissi a' ntirfirìri cû to dipòsitu git si' si' nu sviluppaturi di MediaWiki. Talìa [https://www.mediawiki.org/wiki/Manual:Skin_configuration Manüali: Cunfigurazzioni dî peddi] p'istruzzioni supra a' comu s'attìvunu i peddi e comu si scegghî chidda pridifinuta.",
+	"default-skin-not-found": "Whoops! La peddi pridifinuta dâ tò wiki, mpustata nta <code dir=\"ltr\">$wgDefaultSkin</code> comu <code>$1</code>, nun è dispunìbbili.\n\nA quantu pari la tò stallazzioni ncludi {{PLURAL:$4|la peddi|li peddi}} ccassutta. Talìa [https://www.mediawiki.org/wiki/Manual:Skin_configuration Manuali: Cunfigurazzioni dî peddi] pi struzzioni supra a comu {{PLURAL:$4|s'attiva|s'attìvanu e comu si scegghî chidda pridifinuta}}.\n\n$2\n\n; Si stallasti MediaWiki ora ora:\n: E' prubbàbbili ca la stallasti dû git, o direttamenti dû còdici surgenti nta quarchi n'àutra manera. Allura sta cosa è privista. Prova e stalla quarchi peddi di [https://www.mediawiki.org/wiki/Category:All_skins l'archiviu dî peddi di mediawiki.org], a na manera di chisti:\n:* Scàrrica [https://www.mediawiki.org/wiki/Download lu prugramma di stallazzioni n furmatu tar], ca cunteni tanti peddi e stinzioni. Poi cupiari e ncuddari la cartella <code>skins/</code> di ddà dintra.\n:* Scàrrica a una a una quarchi peddi ntô furmatu tar di [https://www.mediawiki.org/wiki/Special:SkinDistributor mediawiki.org].\n:* [https://www.mediawiki.org/wiki/Download_from_Git#Using_Git_to_download_MediaWiki_skins Adòpira Git pi scarricari peddi].\n: Lu fari accussì nun avissi a ntirfiriri cû tò dipòsitu git si sî nu sviluppaturi di MediaWiki.\n\n; Si aggiurnasti MediaWiki ora ora:\n: MediaWiki virsioni 1.24 e succissivi nun attìvanu cchiù di manera autumàtica li peddi stallati (talìa [https://www.mediawiki.org/wiki/Manual:Skin_autodiscovery Manuali: Scuperta autumàtica dî peddi]). Poi cupiari e ncuddari {{PLURAL:$5|sta riga|sti righi}} nta <code>LocalSettings.php</code> p'attivari {{PLURAL:$5|la peddi ch'è stallata pi com'ora|tutti li peddi ca sunnu stallati pi com'ora}}:\n\n<pre dir=\"ltr\">$3</pre>\n\n; Si canciasti <code>LocalSettings.php</code> ora ora:\n: Cuntrolla ca nun sbagghiasti a scrìviri li noma dî peddi.",
+	"default-skin-not-found-no-skins": "Whoops! La peddi pridifinuta dâ tò wiki, mpustata nta <code dir=\"ltr\">$wgDefaultSkin</code> comu <code>$1</code>, nun è dispunìbbili.\n\nNun hai nudda peddi nstallata.\n\n; Si nstallasti o puru aggiurnasti MediaWiki ora ora:\n: E' prubbàbbili chi lu nstallasti dû git, o direttamenti dû còdici surgenti nta quarchi àutra manera. Allura sta cosa è privista. MediaWiki virsioni 1.24 e succissivi nun cuntèninu nudda peddi ntô dipòsitu principali. Prova e nstalla quarchi peddi di [https://www.mediawiki.org/wiki/Category:All_skins l'archiviu dî peddi di mediawiki.org], a na manera di chisti:\n:* Scàrrica [https://www.mediawiki.org/wiki/Download lu prugramma di nstallazzioni n furmatu tar], chi cunteni tanti peddi e stinzioni. Poi cupiari e ncuddari la cartella <code>skins/</code> di ddà dintra.\n:* Scàrrica a una a una quarchi peddi n furmatu tar di [https://www.mediawiki.org/wiki/Special:SkinDistributor mediawiki.org].\n:* [https://www.mediawiki.org/wiki/Download_from_Git#Using_Git_to_download_MediaWiki_skins Adòpira Git pi scarricari peddi].\n: Fari accussì nun avissi a ntirfiriri cû tò dipòsitu git si sî nu sviluppaturi di MediaWiki. Talìa [https://www.mediawiki.org/wiki/Manual:Skin_configuration Manuali: Cunfigurazzioni dî peddi] pi struzzioni supra a comu s'attìvanu li peddi e comu si scegghî chidda pridifinuta.",
 	"default-skin-not-found-row-enabled": "* <code>$1</code> / $2 (attivata)",
 	"default-skin-not-found-row-disabled": "* <code>$1</code> / $2 ('''disattivata''')",
 	"mediastatistics": "Statìstichi supra ê file multimidiali",
@@ -3342,7 +3357,7 @@
 	"special-characters-group-greek": "Grecu",
 	"special-characters-group-cyrillic": "Cirillicu",
 	"special-characters-group-arabic": "Àrabbu",
-	"special-characters-group-arabicextended": "Àrabbu estinnutu",
+	"special-characters-group-arabicextended": "Àrabbu stinnutu",
 	"special-characters-group-persian": "Persianu",
 	"special-characters-group-hebrew": "Ebbreu",
 	"special-characters-group-bangla": "Bengalisi",
@@ -3357,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/sco.json b/languages/i18n/sco.json
index 37e3344218..3a5ad0a341 100644
--- a/languages/i18n/sco.json
+++ b/languages/i18n/sco.json
@@ -516,7 +516,7 @@
 	"passwordreset-emailtitle": "Accoont details oan {{SITENAME}}",
 	"passwordreset-emailtext-ip": "Somebodie (likely ye, fae IP address $1) requested ae reset o yer passwaird fer {{SITENAME}} ($4). The follaein uiser {{PLURAL:$3|accoont is|accoonts ar}}\nassociated wi this wab-mail address:\n\n$2\n\n{{PLURAL:$3|This temperie passwaird|Thir temperie passwairds}} will expire in {{PLURAL:$5|yin day|$5 days}}.\nYe shid log in n chuise ae new passwaird nou. Gif some ither bodie makit this request, or gif ye'v mynded yer oreeginal passwaird, n ye nae longer\nwish tae chynge it, ye can ignore this message n continue uisin yer auld passwaird.",
 	"passwordreset-emailtext-user": "Uiser $1 oan {{SITENAME}} requested ae reset o yer passwaird fer {{SITENAME}}\n($4). The follaein uiser {{PLURAL:$3|accoont is|accoonts ar}} associated wi this wab-mail address:\n\n$2\n\n{{PLURAL:$3|This temperie passwaird|Thir temperie passwairds}} will expire in {{PLURAL:$5|yin day|$5 days}}.\nYe shid log in n chuise ae new password nou. Gif some ither bodie haes makit this request, or gif ye'v mynded yer oreeginal passwaird, n ye nae langer wish tae chynge it, ye can ignore this message n continue uisin yer auld passwaird.",
-	"passwordreset-emailelement": "Uisername: $1\nTemperie passwaird: $2",
+	"passwordreset-emailelement": "Uisername: \n$1\n\nTemperie passwaird: \n$2",
 	"passwordreset-emailsent": "Ae passwaird reset wab-mail haes been sent.",
 	"passwordreset-emailsent-capture": "Ae passwaird reset wab-mail haas been sent, this is shawn ablow.",
 	"passwordreset-emailerror-capture": "Ae passwaird reset wab-mail wis generated, (this is shawn ablow), but sendin it til the {{GENDER:$2|uiser}} failed: $1",
@@ -1664,7 +1664,6 @@
 	"emailuser": "E-mail this uiser",
 	"emailuser-title-target": "Wab-mail this {{GENDER:$1|uiser}}",
 	"emailuser-title-notarget": "Wab-mail uiser",
-	"emailpage": "Wab-mail uiser",
 	"emailpagetext": "Ye can uise the form ablo tae send ae wab-mail message til this {{GENDER:$1|uiser}}.\nThe wab-mail address that ye entered in [[Special:Preferences|yer uiser preeferances]] will kith aes the \"Fae\" address o the wab-mail, sae that the receepient will be able tae replie directlie til ye.",
 	"defemailsubject": "{{SITENAME}} wab-mail fae uiser \"$1\"",
 	"usermaildisabled": "Uiser wab-mail disablit",
@@ -2201,7 +2200,7 @@
 	"tooltip-pt-logout": "Log oot",
 	"tooltip-pt-createaccount": "We encoorage ye tae creaute aen accoont n log in; houever, it's no strictllie nesisair",
 	"tooltip-ca-talk": "Discussion aneat the content page",
-	"tooltip-ca-edit": "Ye can eedit this page. Please uise the luikower button afore hainin",
+	"tooltip-ca-edit": "Eedit this page",
 	"tooltip-ca-addsection": "Stairt ae new section",
 	"tooltip-ca-viewsource": "This page is protectit.\nYe can see its soorce",
 	"tooltip-ca-history": "Bygane reveesions o this page",
@@ -2275,7 +2274,7 @@
 	"spam_reverting": "Revertin til the laist reveesion na containin links til $1",
 	"spam_blanking": "Aw reveesions contained links til $1, blankin",
 	"spam_deleting": "Aw reveesions contained links til $1, delytin",
-	"simpleantispam-label": "Anti-spam check.\nDiv <strong>NAW</strong> ful this in!",
+	"simpleantispam-label": "Anti-spam check.\nDae <strong>nae</strong> fill this in!",
 	"pageinfo-title": "Information fer \"$1\"",
 	"pageinfo-not-current": "Sairrie, it's na possible tae provide this information fer auld reveesions.",
 	"pageinfo-header-basic": "Baseec information",
diff --git a/languages/i18n/ses.json b/languages/i18n/ses.json
index e4a0b4eada..523b5de250 100644
--- a/languages/i18n/ses.json
+++ b/languages/i18n/ses.json
@@ -504,7 +504,7 @@
 	"passwordreset-emailtitle": "Kontu Å¡ilbawey {{SITENAME}} ga",
 	"passwordreset-emailtext-ip": "Boro foo (sanda war da, nda IP aderesu $1) ceeci ka war\n šenniufaloo barmay {{SITENAME}} ($4) se. Goykaa woo {{PLURAL:$3|kontoo ti}\n kaŋ ga hanga bataga aderesoo woo:\n\n $2\n\n{{PLURAL:$3|Šiiyan šennikufaloo woo|Šiiyan šennikufaley wey}}  ga buu {{PLURAL:$5|zaari foo|zaari}} ra.\nWar ga hima ka huru nda šennifulal taaga dam sohõ. Nda boro waani ka ceeci ka woo tee\n nda war honga war šennikufal žeenaa, nda war ši boona koyne\n ka šennikufal barmay,\n war ga hin ka šaawaroo woo murayy nda soobay ka goy nda war\n šennikufal žeenaa. \\",
 	"passwordreset-emailtext-user": "Goykaw $1 {{SITENAME}} wiri ka war sennikufaloo yeeti {{SITENAME}} se\n($4). Goykaa woo {{PLURAL:$3|kontoo ga|kontey ga}} marga nda nda bataga aderesoo woo:\n\n$2\n\n {{PLURAL:$3|Šiiyan šennikufaloo woo|Šiiyan šennikufaley wey}} ga buu {{PLURAL:$5|jirbi foo|jirbi $5}} ra.\nWar ga hima ka huru  nda šennikufal taaga suuba sohõ. Nda boro waani ka ceeci\n ka woo tee wala war ga honga wara šennikufal žeenaa nda war ši boona koyne\n k'a barma, war ga hin ka šaawaroo woo muray nda gaabandi ka goy nda war\n šennikufal žeenaa.",
-	"passwordreset-emailelement": "Goykaw maa: $1\nÅ iiyan Å¡ennikufal: $2",
+	"passwordreset-emailelement": "Goykaw maa: \n$1\n\nÅ iiyan Å¡ennikufal: \n$2",
 	"passwordreset-emailsent": "Å ennikufal yeetiyan bataga n' ka sanbandi war se.",
 	"passwordreset-emailsent-capture": "Šennikulal yeetiyan bataga n' ka sanbandi war se, kaŋ ga cebandi ne ganda.",
 	"passwordreset-emailerror-capture": "Šennikufal yeetiyan bataga n' ka teendi, kaŋ ga cebandi ne ganda, amm'a mana hin ka sanbandi {{GENDER:$2|goykaw}} do: $1",
@@ -1666,7 +1666,6 @@
 	"emailuser": "Hantum goykaa woo se",
 	"emailuser-title-target": "Hantum {GENDER:$1|user}} woo se",
 	"emailuser-title-notarget": "Bataga goykaw",
-	"emailpage": "Bataga goykaw",
 	"emailpagetext": "War ga hin ka ganda takaddaa zaa ka bataga sanba {{GENDER:$1|goykaw}} se.\nBataga aderesoo kaŋ war n'a dam [[Special:Preferences|your user preferences]] ra mma bangay sanda \"From\" bataga aderesu, adiši duukaa ga hin ka war zaabi nga boŋ se.",
 	"defemailsubject": "{{SITENAME}} bataga kan hun \"$1\" do",
 	"usermaildisabled": "Goykaw bataga Å¡i koy",
diff --git a/languages/i18n/sgs.json b/languages/i18n/sgs.json
index e39de39dba..dc7ac9a1b7 100644
--- a/languages/i18n/sgs.json
+++ b/languages/i18n/sgs.json
@@ -1127,7 +1127,6 @@
 	"emailuser": "Rašītė gruomata šėtam nauduotuojō",
 	"emailuser-title-target": "Rašītė gromata {{GENDER:$1|tam nauduotuojuo}}",
 	"emailuser-title-notarget": "Rašītė gromata",
-	"emailpage": "Siūstė el. gruomata nauduotuojui",
 	"defemailsubject": "{{SITENAME}} - gromata nug nauduotuojė $1",
 	"usermaildisabled": "El. paštos ėšjongts īr",
 	"noemailtitle": "Nier el. pašta adreso",
@@ -1145,7 +1144,7 @@
 	"emailccsubject": "Gruomatas kuopėjė nauduotuojō $1: $2",
 	"emailsent": "El. gruomata ėšsiōsta",
 	"emailsenttext": "Tamstas el. pašta žėnotė ėšsiōsta.",
-	"emailuserfooter": "Nauduotuos $1 nosiontė gromata nauduotuojuo $2 par \"{{int:emailpage}}\" rakonda svetainie {{SITENAME}}.",
+	"emailuserfooter": "Nauduotuos $1 nosiontė gromata nauduotuojuo $2 par \"{{int:emailuser}}\" rakonda svetainie {{SITENAME}}.",
 	"watchlist": "Keravuojamė poslapē",
 	"mywatchlist": "Keravuojamė poslapē",
 	"watchlistfor2": "Nauduotuojė $1 ($2)",
@@ -1748,11 +1747,11 @@
 	"specialpages-group-maintenance": "Sėstemas palaikīma pranešėmā",
 	"specialpages-group-other": "Kėtė specēlė̄jė poslapē",
 	"specialpages-group-login": "Prisėjongėms / Registracėjė",
-	"specialpages-group-changes": "Vielībiė̅ jė pakeitėmā ė regėstrā",
+	"specialpages-group-changes": "Vielībė̄jė pakeitėmā ė sārošā",
 	"specialpages-group-media": "Infuormacėjė aple failus ėr anū pakruovėms",
 	"specialpages-group-users": "Nauduotuojē ė teisės",
 	"specialpages-group-highuse": "Platē nauduojamė poslapē",
-	"specialpages-group-pages": "Poslapiu sarašas",
+	"specialpages-group-pages": "Poslapiu sārošos",
 	"specialpages-group-pagetools": "Poslapiu rakondā",
 	"specialpages-group-wiki": "Wiki doumenīs ė rakondā",
 	"specialpages-group-redirects": "Specēlė̄jė nusokėma poslapē",
diff --git a/languages/i18n/sh.json b/languages/i18n/sh.json
index 3ee09eb1c8..9623c238ed 100644
--- a/languages/i18n/sh.json
+++ b/languages/i18n/sh.json
@@ -495,7 +495,7 @@
 	"passwordreset-emailtitle": "Detalji računa na {{SITENAME}}",
 	"passwordreset-emailtext-ip": "Netko (vjerovatno Vi, s IP adrese $1) je zatražio resetiranje vaše lozinke/zaporke {{SITENAME}} ($4). Sljedeći {{PLURAL:$3|račun korisnika je|računi korisnika su}}\npovezani s ovom e-mail adresom:\n\n$2\n\n{{PLURAL:$3|Ova privremena lozinka|Ove privremene lozinke}} će isteći za {{PLURAL:$5|jedan dan|$5 dana}}.\nTrebate se prijaviti i odabrati novu lozinku. Ako je neko drugi napravio ovaj\nzahtjev, ili ako ste se sjetili Vaše početne lozinke, a ne želite je promijeniti, \nmožete zanemariti ovu poruku i nastaviti koristiti staru lozinku.",
 	"passwordreset-emailtext-user": "Korisnik $1 na {{SITENAME}} je zatražio resetiranje vaše lozinke/zaporke za {{SITENAME}}\n($4). Sljedeći {{PLURAL:$3|korisnički račun je|korisnički računi su}} povezani s ovom e-mail adresom:\n\n$2\n\n{{PLURAL:$3|Ova privremena lozinka|Ove privremene lozinke}} će isteći za {{PLURAL:$5|jedan dan|$5 dana}}.\nTrebate se prijaviti i odabrati novu lozinku. Ako je neko drugi napravio ovaj\nzahtjev, ili ako ste se sjetili Vaše originalne lozinke, a ne želite je više promijeniti, \nmožete zanemariti ovu poruku i nastaviti koristiti staru lozinku.",
-	"passwordreset-emailelement": "Korisničko ime: $1\nPrivremena šifra: $2",
+	"passwordreset-emailelement": "Korisničko ime: \n$1\n\nPrivremena šifra: \n$2",
 	"passwordreset-emailsent": "E-mail za resetiranje lozinke/zaporke je poslan.",
 	"passwordreset-emailsent-capture": "E-mail za resetiranje lozinke/zaporke je poslan (prikazan dolje).",
 	"passwordreset-emailerror-capture": "E-mail za resetiranje lozinke/zaporke, prikazan dolje, je poslan, ali slanje {{GENDER:$2|korisniku|korisnici|korisniku}} nije uspjelo: $1",
@@ -1593,7 +1593,6 @@
 	"emailuser": "Pošalji E-mail ovom korisniku",
 	"emailuser-title-target": "Slanje e-maila {{GENDER:$1|korisniku|korisnici|korisniku}}",
 	"emailuser-title-notarget": "Slanje e-maila korisniku",
-	"emailpage": "Pošalji e-mail ovom korisniku",
 	"emailpagetext": "Možete da koristite donji obrazac da pošaljete e-mail {{GENDER:$1|ovom korisniku|ovoj korisnici|ovom korisniku|}}.\nE-mail koju ste uneli u vašim [[Special:Preferences|postavkama]] će se prikazati u polju \"Od:\", tako da će primalac moći da vam odgovori direktno.",
 	"defemailsubject": "{{SITENAME}} e-mail od korisnika \"$1\"",
 	"usermaildisabled": "Korisnički e-mail onemogućen",
diff --git a/languages/i18n/si.json b/languages/i18n/si.json
index d317988339..b17e15ba7a 100644
--- a/languages/i18n/si.json
+++ b/languages/i18n/si.json
@@ -541,7 +541,7 @@
 	"passwordreset-emailtitle": "{{SITENAME}}යෙහි ගිණුම් තොරතුරු",
 	"passwordreset-emailtext-ip": "කවුරුන්හෝ (බොහෝවිට ඔබ, $1 අන්තර්ජාල ලිපිනය භාවිතයෙන්) {{SITENAME}} ($4) සඳහා ඔබගේ ගිණුම් විස්තර සිහිකැඳවීමක් ඉල්ලා ඇත.  පහත පරිශීලක {{PLURAL:$3|ගිණුම|ගිණුම්}}\nමෙම විද්‍යුත් තැපැල් ලිපිනය හා සමගින් ආශ්‍රය වෙයි.\n\n$2\n\n{{PLURAL:$3|මෙම තාවකාලික මුරපදය|මෙම තාවකාලික මුරපද}} {{PLURAL:$5|එක් දිනයක්|දින $5 ක්}} ගෙවුනු විට ඉකුත් වනු ඇත.\nඔබ දැන් ප්‍රවිෂ්ට වී නව මුරපදයක් තෝරාගත යුතුයි. වෙන යම් අයෙක් මෙම ඉල්ලීම කර ඇත්නම් හෝ, ඔබගේ මුල් මුරපදය ඔබගේ මතකයට පැමිණ ඇති නම් හා, එය වෙනස් කිරීමට ඔබ හට තවදුරටත් අවශ්‍ය නොවේ නම්, ඔබ විසින් මෙම පණිවුඩය නොසලකා හැර පැරණි මුරපදය තවදුරටත් පාවිච්චි කළ හැක.",
 	"passwordreset-emailtext-user": "{{SITENAME}} හි පරිශීලක $1,{{SITENAME}}($4)සඳහා මුරපදය යලි පිහිටුවීමට ඉල්ලා ඇත.\n\n$2\n\n{{PLURAL:$3|මෙම මුරපදය|මෙම මුරපද}}{{PLURAL:$5|එක් දිනකින්|දවස්$5කින්}}කල් ඉකුත් වනු ඇත.\nඔබ දැන් ඇතුළු වී නව මුරපදයක් තේරිය යුතුය.මෙම ඉල්ලීම වෙන කෙනෙකු විසින් හෝ ඔබට ඔබගේ මුල් මුරපදය මතක නම් හෝ ඔබ තව දුරටත් එය වෙනස් කිරීමට අදහස් නොකරයි නම් හෝ ඔබ මෙම පනිවිඩය නොසලකාහැර ඔබගේ පැරණි මුරපදය භාවිතා කරන්න.",
-	"passwordreset-emailelement": "පරිශීලක නාමය: $1\nතාවකාලික මුරපදය: $2",
+	"passwordreset-emailelement": "පරිශීලක නාමය: \n$1\n\nතාවකාලික මුරපදය: \n$2",
 	"passwordreset-emailsent": "මුර-පදය නැවත සකස් කිරීම පිළිබඳව විද්‍යුත් තැපෑලක් යවන ලදී.",
 	"passwordreset-emailsent-capture": "මුර-පදය වෙනස් කිරීම පිළිබඳව විද්‍යුත් තැපෑලක් යවන ලදී, එය පහත දැක්වේ.",
 	"passwordreset-emailerror-capture": "සිහිකැඳවුම් ඊ-තැපෑල ජනිත කරනු ලැබූ අතර, එය පහත දැක්වේ, නමුත් එය {{GENDER:$2|}}පරිශීලකයාට යැවීම අසාර්ථක වුනි: $1",
@@ -1715,7 +1715,6 @@
 	"emailuser": "මෙම පරිශීලක වෙත විද්‍යුත්-ලිපියක් යවන්න",
 	"emailuser-title-target": "මෙම {{GENDER:$1|පරිශීලක}} ඊ-තැපැල් කරන්න",
 	"emailuser-title-notarget": " පරිශීලකට විද්‍යුත්-ලිපියක් යවන්න",
-	"emailpage": " පරිශීලකට විද්‍යුත්-ලිපියක් යවන්න",
 	"emailpagetext": "මෙම {{GENDER:$1|පරිශීලකයා}} හට විද්‍යුත්-තැපෑල් පණිවුඩයක් යැවීම සඳහා මෙම ආකෘති පත්‍රය භාවිතා කිරීමට ඔබ හට හැක.\nලබන්නා විසින් සෘජු ලෙස ඔබ හට පිළිතුරු එවනු හැකි වන පරිදි, ඔබ විසින් [[Special:Preferences|ඔබගේ පරිශීලක අභිරුචියන්]] හි ඇතුළත් කල විද්‍යුත්-තැපැල් ලිපිනය,  විද්‍යුත්-තැපෑලෙහි \"වෙතින්\" ලිපිනයෙහි පෙන්නුම් කරනු ඇත.",
 	"defemailsubject": "{{SITENAME}} පරිශීලක \"$1\" වෙතින් විද්‍යුත්-තැපෑල",
 	"usermaildisabled": "ඔබගේ විද්‍යුත්-තැපෑල අක්‍රීය කොට ඇත",
@@ -1737,7 +1736,7 @@
 	"emailccsubject": "$1: $2 වෙත ඔබගේ පණිවුඩය පිටපත් කරන්න",
 	"emailsent": "විද්‍යුත්-තැපෑල යවන ලදි",
 	"emailsenttext": "ඔබගේ  විද්‍යුත්-තැපැල්  පණිවුඩය යවා ඇත.",
-	"emailuserfooter": "{{SITENAME}} හි \"{{int:emailpage}}\" ශ්‍රිතය අනුසාරයෙන් $1 විසින්  $2  වෙත  විද්‍යුත්-තැපෑලක් යවන ලදි.",
+	"emailuserfooter": "{{SITENAME}} හි \"{{int:emailuser}}\" ශ්‍රිතය අනුසාරයෙන් $1 විසින්  $2  වෙත  විද්‍යුත්-තැපෑලක් යවන ලදි.",
 	"usermessage-summary": "පද්ධති පණිවුඩයක් තබමි.",
 	"usermessage-editor": "පද්ධති පණිවුඩ කරු",
 	"watchlist": "මුරලැයිස්තුව",
diff --git a/languages/i18n/sk.json b/languages/i18n/sk.json
index 5a4c68805d..a3f4f5d5ae 100644
--- a/languages/i18n/sk.json
+++ b/languages/i18n/sk.json
@@ -533,7 +533,7 @@
 	"passwordreset-emailtitle": "Podrobnosti o účte na {{GRAMMAR:lokál|{{SITENAME}}}}",
 	"passwordreset-emailtext-ip": "Niekto (pravdepodobne vy z IP adresy $1) požiadal o obnovenie vášho hesla na {{GRAMMAR:genitív|{{SITENAME}}}} ($4). {{PLURAL:$3|Nasledujúci používateľský účet je spojený|Nasledujúce používateľské účty sú spojené}}\ns touto emailovou adresou:\n\n$2\n\n{{PLURAL:$3|Platnosť tohto dočasného hesla vyprší|Platnosť týchto dočasných hesiel vyprší}} o {{PLURAL:$5|jeden deň|$5 dni|$5 dní}}.\nMali by ste sa prihlásiť teraz a zvoliť nové heslo. Ak túto žiadosť podal niekto iný alebo\nak ste si spomenuli svoje pôvodné heslo a už ho chcete zmeniť, môžete túto správu\nignorovať a ďalej používať vaše staré heslo.",
 	"passwordreset-emailtext-user": "Používateľ $1 na {{GRAMMAR:genitív|{{SITENAME}}}} požiadal o obnovenie vášho hesla na na {{GRAMMAR:genitív|{{SITENAME}}}} ($4). {{PLURAL:$3|Nasledujúci používateľský účet je spojený|Nasledujúce používateľské účty sú spojené}}\ns touto emailovou adresou:\n\n$2\n\n{{PLURAL:$3|Platnosť tohto dočasného hesla vyprší|Platnosť týchto dočasných hesiel vyprší}} o {{PLURAL:$5|jeden deň|$5 dni|$5 dní}}.\nMali by ste sa prihlásiť teraz a zvoliť nové heslo. Ak túto žiadosť podal niekto iný alebo\nak ste si spomenuli svoje pôvodné heslo a už ho chcete zmeniť, môžete túto správu\nignorovať a ďalej používať vaše staré heslo.",
-	"passwordreset-emailelement": "Používateľské meno: $1\nDočasné heslo:$2",
+	"passwordreset-emailelement": "Používateľské meno: \n$1\n\nDočasné heslo:\n$2",
 	"passwordreset-emailsent": "Email s novým heslom bol odoslaný.",
 	"passwordreset-emailsent-capture": "Bol odoslaný email s novým heslom, ktorý je zobrazený nižšie.",
 	"passwordreset-emailerror-capture": "Bol odoslaný email s novým heslom, ktorý je zobrazený nižšie, ale nepodarilo sa ho odoslať {{GENDER:$2|používateľovi}}: $1",
@@ -1680,7 +1680,6 @@
 	"emailuser": "E-mail tomuto používateľovi",
 	"emailuser-title-target": "E-mail {{GENDER:$1|tomuto používateľovi|tejto používateľke}}",
 	"emailuser-title-notarget": "E-mail používateľovi",
-	"emailpage": "E-mail používateľovi",
 	"emailpagetext": "Pomocou nasledovného formulára môžete {{GENDER:$1|tomuto používateľovi|tejto používateľke}} poslať e-mailovú správu.\nMailová adresa, ktorú ste zadali vo svojich [[Special:Preferences|nastaveniach]] sa zobrazí ako adresa odosielateľa mailu, aby vám mohol príjemca priamo odpovedať.",
 	"defemailsubject": "email {{GRAMMAR:genitív|{{SITENAME}}}} od používateľa „$1“",
 	"usermaildisabled": "Používateľ má vypnuté používanie emailu",
diff --git a/languages/i18n/sl.json b/languages/i18n/sl.json
index bbf787402d..bae7b76eef 100644
--- a/languages/i18n/sl.json
+++ b/languages/i18n/sl.json
@@ -10,14 +10,14 @@
 			"Yerpo",
 			"아라",
 			"MaGa",
-			"Skalcaa"
+			"Skalcaa",
+			"Janezdrilc"
 		]
 	},
 	"tog-underline": "Podčrtavanje povezav:",
 	"tog-hideminor": "Skrij manjše popravke v zadnjih spremembah",
 	"tog-hidepatrolled": "Skrij pregledana urejanja v zadnjih spremembah",
 	"tog-newpageshidepatrolled": "Skrij pregledane strani iz seznama novih strani",
-	"tog-hidecategorization": "Skrij kategorizacijo strani",
 	"tog-extendwatchlist": "Razširi spisek nadzorov, da bo prikazoval vse spremembe, ne le najnovejše",
 	"tog-usenewrc": "Združi spremembe posamezne strani na zadnjih spremembah in spisku nadzorov",
 	"tog-numberheadings": "Samodejno številči poglavja",
@@ -47,7 +47,6 @@
 	"tog-watchlisthideliu": "Na spisku nadzorov skrij urejanja prijavljenih uporabnikov",
 	"tog-watchlisthideanons": "Na spisku nadzorov skrij urejanja anonimnih uporabnikov",
 	"tog-watchlisthidepatrolled": "Na spisku nadzorov skrij pregledana urejanja",
-	"tog-watchlisthidecategorization": "Skrij kategorizacijo strani",
 	"tog-ccmeonemails": "Pošlji mi kopijo e-pošt, ki jih pošljem drugim uporabnikom",
 	"tog-diffonly": "Pod primerjavo ne prikaži vsebine strani",
 	"tog-showhiddencats": "Prikaži skrite kategorije",
@@ -433,6 +432,7 @@
 	"createacct-benefit-body2": "{{PLURAL:$1|stran|strani}}",
 	"createacct-benefit-body3": "{{PLURAL:$1|nedavni sodelavec|nedavna sodelavca|nedavni sodelavci|nedavnih sodelavcev}}",
 	"badretype": "Gesli, ki ste ju vnesli, se ne ujemata.",
+	"usernameinprogress": "Ustvarjanje računa za to uporabniško ime je že v teku. Prosimo, počakajte.",
 	"userexists": "Uporabniško ime, ki ste ga vnesli, je že zasedeno.\nProsimo, izberite drugo.",
 	"loginerror": "Napaka ob prijavi",
 	"createacct-error": "Napaka pri ustvarjanju računa",
@@ -523,7 +523,7 @@
 	"passwordreset-emailtitle": "Podrobnosti računa na {{SITENAME}}",
 	"passwordreset-emailtext-ip": "Nekdo (verjetno vi, z IP-naslova $1) je zahteval ponastavitev vašega\ngesla na {{SITENAME}} ($4). S tem e-poštnim naslovom\n{{PLURAL:$3|je povezan naslednji uporabniški račun|sta povezana naslednja uporabniška računa|so povezani naslednji uporabniški računi}}:\n\n$2\n\n{{PLURAL:$3|Začasno geslo bo poteklo|Začasni gesli bosta potekli|Začasna gesla bodo potekla}} v {{PLURAL:$5|enem dnevu|$5 dneh}}.\nPrijavite se in izberite novo geslo. Če je zahtevo podal\nnekdo drug ali pa ste se spomnili svojega prvotnega gesla in ga več\nne želite spremeniti, lahko to sporočilo prezrete in nadaljujete z uporabo\nsvojega starega gesla.",
 	"passwordreset-emailtext-user": "Uporabnik $1 na strani {{SITENAME}} je zahteval ponastavitev vašega gesla na {{SITENAME}}\n($4). S tem e-poštnim naslovom {{PLURAL:$3|je povezan naslednji uporabniški račun|sta povezana naslednja uporabniška računa|so povezani naslednji uporabniški računi}}:\n\n$2\n\n{{PLURAL:$3|Začasno geslo bo poteklo|Začasni gesli bosta potekli|Začasna gesla bodo potekla}} v {{PLURAL:$5|enem dnevu|$5 dneh}}.\nPrijavite se in izberite novo geslo sedaj. Če je zahtevo podal\nnekdo drug ali pa ste se spomnili svojega prvotnega gesla in ga več\nne želite spremeniti, lahko to sporočilo prezrete in nadaljujete z uporabo\nsvojega starega gesla.",
-	"passwordreset-emailelement": "Uporabniško ime: $1\nZačasno geslo: $2",
+	"passwordreset-emailelement": "Uporabniško ime: \n$1\n\nZačasno geslo: \n$2",
 	"passwordreset-emailsent": "Poslali smo e-pošto za postavitev gesla.",
 	"passwordreset-emailsent-capture": "Poslali smo e-pošto za ponastavitev gesla, ki je prikazana spodaj.",
 	"passwordreset-emailerror-capture": "Ustvarili smo e-pošto za ponastavitev gesla, ki je prikazana spodaj, vendar pa pošiljanje {{GENDER:$2|uporabniku|uporabnici}} ni uspelo: $1",
@@ -922,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}}",
@@ -1197,9 +1198,6 @@
 	"rcshowhidemine": "$1 moja urejanja",
 	"rcshowhidemine-show": "Prikaži",
 	"rcshowhidemine-hide": "Skrij",
-	"rcshowhidecategorization": "$1 kategorizacijo strani",
-	"rcshowhidecategorization-show": "Prikaži",
-	"rcshowhidecategorization-hide": "Skrij",
 	"rclinks": "Prikaži zadnjih $1 sprememb v zadnjih $2 dneh<br />$3",
 	"diff": "prim",
 	"hist": "zgod",
@@ -1223,10 +1221,6 @@
 	"recentchangeslinked-summary": "To je seznam nedavnih sprememb strani povezanih na določeno stran (ali iz določene kategorije).\nStrani iz [[Special:Watchlist|vašega spiska nadzorov]] so '''odebeljene'''.",
 	"recentchangeslinked-page": "Naslov strani:",
 	"recentchangeslinked-to": "Prikaži spremembe na določeno stran povezanih strani",
-	"recentchanges-page-added-to-category": "[[:$1]] dodano v kategorijo",
-	"recentchanges-page-added-to-category-bundled": "[[:$1]] in $2 {{PLURAL:$2|stran dodana|strani dodani|strani dodane|strani dodanih}} v kategorijo",
-	"recentchanges-page-removed-from-category": "[[:$1]] odstranjeno iz kategorije",
-	"recentchanges-page-removed-from-category-bundled": "[[:$1]] in $2 {{PLURAL:$2|stran odstranjena|strani odstranjeni|strani odstranjene|strani odstranjenih}} iz kategorije",
 	"upload": "Naloži datoteko",
 	"uploadbtn": "Naloži datoteko",
 	"reuploaddesc": "Prekliči nalaganje in se vrni na obrazec za nalaganje",
@@ -1627,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.",
@@ -1647,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.",
@@ -1733,7 +1727,6 @@
 	"emailuser": "Pošlji uporabniku e-pismo",
 	"emailuser-title-target": "Pošlji {{GENDER:$1|uporabniku|uporabnici}} e-pošto",
 	"emailuser-title-notarget": "Pošlji uporabniku e-pismo",
-	"emailpage": "Pošlji uporabniku e-pismo",
 	"emailpagetext": "S spodnjim obrazcem lahko {{GENDER:$1|uporabniku|uporabnici}} pošljete e-poštno sporočilo.\nE-poštni naslov, ki ste ga vpisali v [[Special:Preferences|uporabniških nastavitvah]], bo v e-sporočilu naveden kot naslov »Od:«, tako da bo {{GENDER:$1|prejemnik lahko odgovoril|prejemnica lahko odgovorila}} neposredno vam.",
 	"defemailsubject": "Elektronska pošta {{GRAMMAR:rodilnik|{{SITENAME}}}} od uporabnika »$1«",
 	"usermaildisabled": "Uporabniška e-pošta je onemogočena",
@@ -1755,7 +1748,7 @@
 	"emailccsubject": "Kopija tvojega sporočila iz $1: $2",
 	"emailsent": "E-pismo je poslano!",
 	"emailsenttext": "E-pismo je poslano.",
-	"emailuserfooter": "To e-poštno sporočilo je bilo poslal(-a) $1 uporabniku $2 s funkcijo »{{int:emailpage}}« na {{GRAMMAR:dative|{{SITENAME}}}}.",
+	"emailuserfooter": "To e-poštno sporočilo je bilo poslal(-a) $1 uporabniku $2 s funkcijo »{{int:emailuser}}« na {{GRAMMAR:dative|{{SITENAME}}}}.",
 	"usermessage-summary": "Pusti sistemsko sporočilo.",
 	"usermessage-editor": "Sistemski sporočevalec",
 	"watchlist": "Spisek nadzorov",
@@ -2120,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]].",
@@ -2298,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",
@@ -2326,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",
@@ -3182,6 +3175,7 @@
 	"logentry-newusers-create2": "$1 je {{GENDER:$2|ustvaril|ustvarila|ustvaril(-a)}} uporabniški račun $3",
 	"logentry-newusers-byemail": "$1 je {{GENDER:$2|ustvaril|ustvarila|ustvaril(-a)}} uporabniški račun $3; geslo je bilo poslano po e-pošti",
 	"logentry-newusers-autocreate": "Račun $1 je bil samodejno {{GENDER:$2|ustvarjen}}",
+	"logentry-protect-move_prot": "$1 je {{GENDER:$2|prestavil|prestavila|prestavil(-a)}} nastavitve zaščite s strani $4 na $3",
 	"logentry-rights-rights": "$1 je {{GENDER:$2|spremenil|spremenila|spremenil(-a)}} uporabniške pravice uporabnika $3 z $4 na $5",
 	"logentry-rights-rights-legacy": "$1 je {{GENDER:$2|spremenil|spremenila|spremenil(-a)}} uporabniške pravice uporabnika $3",
 	"logentry-rights-autopromote": "$1 je {{GENDER:$2|bil samodejno povišan|bila samodejno povišana|bil(-a) samodejno povišan(-a)}} z $4 na $5",
diff --git a/languages/i18n/so.json b/languages/i18n/so.json
index 97f3641346..1e4efde230 100644
--- a/languages/i18n/so.json
+++ b/languages/i18n/so.json
@@ -405,12 +405,11 @@
 	"resetpass-temp-password": "Ereysir ku meel gaar ah:",
 	"passwordreset": "Bedel ereysirka",
 	"passwordreset-text-many": "{{PLURAL:$1|Gali mid ka mid ah macluumaadkaada asaasiga ah si erey sirtaada usoo ceshato.}}",
-	"passwordreset-legend": "Bedel ereysirka",
 	"passwordreset-username": "Magaca gudagalka",
 	"passwordreset-email": "Ciwaanka e-mailka",
 	"passwordreset-emailtext-ip": "(Qof laga yaabo in ee tahay adi, oo ka socdo ciwaanka IP'ka $1)  ayaa  codsaday xasuus faah faahin akoonkaada {{SITENAME}}\n($4). Isticmaaladaan soo socota {{PLURAL:$3|akoonkooda waxee|akoonkooda waxee}} la xiriiraan ciwaankaan e-mailka ah:\n\n$2\n\n{{PLURAL:$3|eraysirkaan kumeel gaarka ah|Eraysiryadaan kumeel gaarka ah}} waxay dhacaayaan {{PLURAL:$5|hal maalin|$5 maalmood}}.\nWaa in aad gudaha gashaa oo e-mail cusub doorataa hadda. Hadii ee qof kale codsigaan sameysay, ama hadii aad soo xasuusatay eraysirkaagii hore, oo aadna u baahneen in aad badashid, iska ilaaw fariintaan siina isticmaal eraysirkaagii duqi ahaa.",
 	"passwordreset-emailtext-user": "Isticmaale $1 ee {{SITENAME}} wuxuu codsaday xasuus faah faahin akoonkaada {{SITENAME}}\n($4). Isticmaaladaan soo socota {{PLURAL:$3|akoonkooda waxee|akoonkooda waxee}} la xiriiraan ciwaankaan e-mailka ah:\n\n$2\n\n{{PLURAL:$3|eraysirkaan kumeel gaarka ah|Eraysiryadaan kumeel gaarka ah}} waxay dhacaayaan {{PLURAL:$5|hal maalin|$5 maalmood}}.\nWaa in aad gudaha gashaa oo e-mail cusub doorataa hadda. Hadii ee qof kale codsigaan sameysay, ama hadii aad soo xasuusatay eraysirkaagii hore, oo aadna u baahneen in aad badashid, iska ilaaw fariintaan siina isticmaal eraysirkaagii duqi ahaa.",
-	"passwordreset-emailelement": "Magaca gudagalka: $1\nEreysirka kumeelgaarka ah: $2",
+	"passwordreset-emailelement": "Magaca gudagalka: \n$1\n\nEreysirka kumeelgaarka ah: \n$2",
 	"passwordreset-emailerror-capture": "E-mail xasuus ah ayaa la sameeyay, oo ka arki kartid hoosta,laakiin wuxuu ku guul dareestay in isticmaalaha loo diro: $1",
 	"changeemail": "Bedel ciwaanka E-mailka",
 	"changeemail-oldemail": "Ciwaanka e-mailka hadda jiro:",
@@ -838,7 +837,6 @@
 	"mailnologin": "Ma'jiro cinwaan wax lagu diro",
 	"mailnologintext": "Waa in aad [[Special:UserLogin|gudaha ku jirtaa]]\nkuna haysatid E-boosto sax ah [[Special:Preferences|dooqyadaada]],\nsi aad ugu dirto E-boosto isticmaalayaasha kale.",
 	"emailuser": "E-mail u dir isticmaalahaan",
-	"emailpage": "Isticmaalaha e-mailka",
 	"noemailtitle": "Malahan cinwaan E-mail",
 	"emailfrom": "Ka socoto:",
 	"emailto": "Ku:",
diff --git a/languages/i18n/sq.json b/languages/i18n/sq.json
index d26b0524eb..cb5de48cc7 100644
--- a/languages/i18n/sq.json
+++ b/languages/i18n/sq.json
@@ -27,11 +27,14 @@
 			"아라",
 			"Gertakapllani",
 			"OrvenBregu",
-			"Macofe"
+			"Macofe",
+			"Liridon",
+			"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.",
@@ -44,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ë",
@@ -94,7 +98,7 @@
 	"february": "shkurt",
 	"march": "mars",
 	"april": "prill",
-	"may_long": "Maj",
+	"may_long": "maj",
 	"june": "qershor",
 	"july": "korrik",
 	"august": "gusht",
@@ -118,7 +122,7 @@
 	"feb": "Shku",
 	"mar": "Mar",
 	"apr": "Pri",
-	"may": "maj",
+	"may": "Maj",
 	"jun": "Qer",
 	"jul": "Korr",
 	"aug": "Gush",
@@ -141,7 +145,7 @@
 	"pagecategories": "{{PLURAL:$1|Kategoria|Kategoritë}}",
 	"category_header": "Artikuj në kategorinë \"$1\"",
 	"subcategories": "Nën-kategori",
-	"category-media-header": "Skeda në kategori \"$1\"",
+	"category-media-header": "Skeda në kategorinë \"$1\"",
 	"category-empty": "''Kjo kategori aktualisht nuk përmban asnjë faqe apo media.''",
 	"hidden-categories": "{{PLURAL:$1|Kategori e fshehur|Kategori të fshehura}}",
 	"hidden-category-category": "Kategori të fshehura",
@@ -301,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",
@@ -331,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\".",
@@ -436,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",
@@ -529,7 +534,7 @@
 	"passwordreset-emailtitle": "Detajet e llogarisë në {{SITENAME}}",
 	"passwordreset-emailtext-ip": "Dikush (ndoshta ju, nga IP adresa $1) kërkoi një kujtesë për \ndetajet e llogarisë suaj {{SITENAME}} ($4).Përdoruesi në vijim {{PLURAL:$3|llogari është|llogaritë janë}} të lidhur me këtë postë elektronike:\n\n$2\n\n{{PLURAL:$3|Ky fjalëkalim i përkohshëm|Këto fjalëkalime të përkohshme}} do të përfundojë për {{PLURAL:$5|një ditë|$5 ditë}}.\n\nJu duhet të kyçeni dhe të zgjidhni një fjalëkalim të ri tani. Nëse dikush tjetër e ka bërë këtë kërkesës, ose në qoftë se ju mbani mend fjalëkalimin tuaj origjinal, dhe ju nuk dëshirojni të ndryshoni atë, ju mund të injoroni këtë mesazh dhe do të vazhdoni përdorimin e fjalëkalimit tuaj të vjetër.",
 	"passwordreset-emailtext-user": "Përdoruesi  $1 në {{SITENAME }} ka kërkuar një kujtesë për të dhënat e llogarisë suaj për {{SITENAME }} ($4). Përdoruesi në vijim {{PLURAL:$3 | llogaria është | llogaritë janë}} të lidhur me këtë postë elektronike: \n\n$2\n\n{{PLURAL:$3 | Ky fjalëkalim i përkohshëm | Këto fjalëkalime të përkohshme}} do të përfundojë në {{PLURAL:$5 | një ditë | $5 ditë}}.\nJu duhet të kyçeni dhe të zgjidhni një fjalëkalim të ri tani. Nëse dikush tjetër e ka bërë këtë kërkesës, ose në qoftë se ju mbani mend fjalëkalimin tuaj origjinal, dhe ju nuk dëshirojni të ndryshoni atë, ju mund të injoroni këtë mesazh dhe do të vazhdoni përdorimin e fjalëkalimit tuaj të vjetër.",
-	"passwordreset-emailelement": "Nofka: $1\nFjalëkalimi i përkohshëm: $2",
+	"passwordreset-emailelement": "Nofka: \n$1\n\nFjalëkalimi i përkohshëm: \n$2",
 	"passwordreset-emailsent": "Një email për rivendosjen e fjalëkalimit është dërguar.",
 	"passwordreset-emailsent-capture": "Një email për rivendosjen e fjalëkalimit është dërguar, i cili tregohet më poshtë.",
 	"passwordreset-emailerror-capture": "U dërgua një e-mail kujtesë, i cili tregohet më poshtë, por dërgesa për tek përdoruesi qe e pamundur: $1",
@@ -610,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.",
@@ -664,6 +669,7 @@
 	"invalid-content-data": "Të pavlefshme të dhënave e përmbajtjes",
 	"editwarning-warning": "Duke e lënë këtë faqe mund të shkaktojë ju për të humbur të gjitha ndryshimet që keni bërë ju.\nNëse ju jeni regjistruar, ju mund të çaktivizoni këtë paralajmërim në \"{{int:prefs-editing}}\" seksionin e preferencave tuaja.",
 	"content-model-text": "tekst i thejshtë",
+	"content-model-javascript": "JavaScript",
 	"expensive-parserfunction-warning": "Kujdes: Kjo faqe ka shumë kërkesa që kërkojnë analizë gramatikore të kushtueshme për sistemin.\n\nDuhet të ketë më pakë se $2, {{PLURAL:$2|kërkesë|kërkesa}}, kurse tani {{PLURAL:$1|është $1 kërkesë|janë $1 kërkesa}}.",
 	"expensive-parserfunction-category": "Faqe me shumë shprehje të kushtueshmë për analizë gramatikore",
 	"post-expand-template-inclusion-warning": "'''Kujdes''': Numri i shablloneve që perfshihen është shumë i madh.\nDisa shabllone nuk do të përfshihen.",
@@ -684,7 +690,7 @@
 	"currentrev": "Versioni i tanishëm",
 	"currentrev-asof": "Versioni momental që nga $1",
 	"revisionasof": "Versioni i $1",
-	"revision-info": "Versioni më $1 nga $2",
+	"revision-info": "Versioni i datës $1 nga {{GENDER:$6|$2}}$7",
 	"previousrevision": "← Version më i vjetër",
 	"nextrevision": "Version më i ri →",
 	"currentrevisionlink": "shikoni versionin e tanishëm",
@@ -696,8 +702,8 @@
 	"histlegend": "Legjenda: (tani) = ndryshimet me versionin e tanishëm,\n(fund) = ndryshimet me versionin e parardhshëm, V = redaktim i vogël",
 	"history-fieldset-title": "Shfleto historikun",
 	"history-show-deleted": "Vetëm versionet të grisur",
-	"histfirst": "Së pari",
-	"histlast": "Së fundmi",
+	"histfirst": "më të vjetër",
+	"histlast": "më të rinj",
 	"historysize": "({{PLURAL:$1|1 B|$1 B}})",
 	"historyempty": "(bosh)",
 	"history-feed-title": "Historiku i versioneve",
@@ -706,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.",
@@ -735,11 +741,11 @@
 	"revdelete-hide-image": "Fshih përmbajtjen skedës",
 	"revdelete-hide-name": "Fshihe veprimin dhe shënjestrën",
 	"revdelete-hide-comment": "fshih komentin e redaktimit",
-	"revdelete-hide-user": "Fshihe emrin/IP-në të redaktuesit",
+	"revdelete-hide-user": "Nofta e redaktuesit/Adresa IP",
 	"revdelete-hide-restricted": "Ndalo të dhëna nga administrues si dhe të tjerë",
 	"revdelete-radio-same": "(Mos ndryshoni)",
-	"revdelete-radio-set": "Po",
-	"revdelete-radio-unset": "Jo",
+	"revdelete-radio-set": "Fshehur",
+	"revdelete-radio-unset": "Dukshëm",
 	"revdelete-suppress": "Ndalo të dhëna nga administrues si dhe të tjerë",
 	"revdelete-unsuppress": "Hiq kufizimet nga versionet e restauruara",
 	"revdelete-log": "Arsyeja:",
@@ -758,7 +764,7 @@
 	"revdelete-no-change": "'''Kujdes:''' artikulli i datës $2, $1 e ka kërkesën e parametrit të dukshmërisë.",
 	"revdelete-concurrent-change": "Gabim gjatë modifikimit të artikullit të datës $2, $1: statusi i tij duket të jetë ndryshuar nga dikush tjetër kur ju po provonit ta modifikonit.\nJu lutemi kontrolloni regjistrat.",
 	"revdelete-only-restricted": "Gabim gjatë fshehjes së artikullit të datës $2, $1: ju nuk mund të fshihni artikuj nga pamja e administratorëve pa zgjedhur gjithashtu një nga opsionet e tjera të dukshmërisë.",
-	"revdelete-reason-dropdown": "* Arsye grisjeje e përbashkët\n** Shkelje të të drejtave të autorit\n** Informacion pa  kriter personal\n** Potencialisht informacion shfipës",
+	"revdelete-reason-dropdown": "* Arsye të zakonshme të grisjes\n** Shkelje të të drejtave të autorit\n** Komente ose të dhëna personale të papërshtatshme\n** Emër i papërshtatshëm i përdoruesit\n** Të dhëna potencialisht shpifëse",
 	"revdelete-otherreason": "Arsye tjetër/shtesë:",
 	"revdelete-reasonotherlist": "Arsye tjetër",
 	"revdelete-edit-reasonlist": "Arsye grisjeje për redaktimet",
@@ -796,6 +802,8 @@
 	"compareselectedversions": "Krahasoni versionet e zgjedhura",
 	"showhideselectedversions": "Shfaq/fshih versionet e zgjedhura",
 	"editundo": "zhbëje",
+	"diff-empty": "(Pa ndryshime)",
+	"diff-multi-sameuser": "({{PLURAL:$1|Një versioni i ndërmjetëm|$1 versione të ndërmjetme}} nga i njëjti përdorues nuk {{PLURAL:$1|është|janë}} paraqitur)",
 	"diff-multi-manyusers": "({{PLURAL:$1|Një versioni i ndërmjetshëm|$1 versione të ndërmjetshme}} nga më shumë se $2 {{PLURAL:$2|përdorues|përdorues}} i/të pashfaqur)",
 	"searchresults": "Rezultatet e kërkimit",
 	"searchresults-title": "Rezultatet e kërkimit për \"$1\"",
@@ -804,12 +812,14 @@
 	"notextmatches": "Nuk ka asnjë tekst faqeje që përputhet",
 	"prevn": "{{PLURAL:$1|$1}} më para",
 	"nextn": "{{PLURAL:$1|$1}} më pas",
+	"prev-page": "faqja paraardhëse",
+	"next-page": "faqja pasardhëse",
 	"prevn-title": "$1 i mëparshëm {{PLURAL:$1|rezultat|rezultate}}",
 	"nextn-title": "$1 në vazhdim {{PLURAL:$1|rezultat|rezultate}}",
 	"shown-title": "Trego $1 {{PLURAL:$1|rezultat|rezultate}} për faqe",
 	"viewprevnext": "Shikoni ($1 {{int:pipe-separator}} $2) ($3).",
 	"searchmenu-exists": "'''Në këtë wiki kjo faqe është emëruar \"[[:$1]]\"'''",
-	"searchmenu-new": "'''Hapë faqen \"[[:$1]]\" në këtë wiki!'''",
+	"searchmenu-new": "<strong>Krijo faqen \"[[:$1]]\" në këtë wiki!</strong> {{PLURAL:$2|0=|Shih gjithashtu faqen e gjetur në kërkimin tuaj.|Shih gjithashtu rezultatet e gjetura nga kërkimi.}}",
 	"searchprofile-articles": "Përmbajtja e faqeve",
 	"searchprofile-images": "Multimedia",
 	"searchprofile-everything": "Gjithçka",
@@ -822,6 +832,7 @@
 	"search-result-category-size": "{{PLURAL:$1|1 anëtar|$1 anëtarë}} ({{PLURAL:$2|1 nën-kategori|$2 nën-kategori}}, {{PLURAL:$3|1 skedë|$3 skeda}})",
 	"search-redirect": "(përcjellim $1)",
 	"search-section": "(seksioni $1)",
+	"search-category": "(kategoria $1)",
 	"search-suggest": "Mos kishit në mendje: $1",
 	"search-interwiki-caption": "Projekte simotra",
 	"search-interwiki-default": "$1 përfundime:",
@@ -830,6 +841,7 @@
 	"searchrelated": "të ngjashme",
 	"searchall": "të gjitha",
 	"showingresults": "Më poshtë tregohen {{PLURAL:$1|'''1''' përfundim|'''$1''' përfundime}} duke filluar nga #'''$2'''.",
+	"search-showingresults": "{{PLURAL:$4|Rezultati <strong>$1</strong> nga <strong>$3</strong>|Rezultatet <strong>$1 - $2</strong> nga <strong>$3</strong>}}",
 	"search-nonefound": "Nuk ka rezultate që përputhen me kërkesën.",
 	"powersearch-legend": "Kërkim i përparuar",
 	"powersearch-ns": "Kërkim në hapësira:",
@@ -849,6 +861,7 @@
 	"prefs-personal": "Përdoruesi",
 	"prefs-rc": "Ndryshime së fundmi",
 	"prefs-watchlist": "Lista mbikqyrëse",
+	"prefs-editwatchlist": "Redakto listën mbikqyrëse",
 	"prefs-watchlist-days": "Numri i ditëve të treguara tek lista mbikqyrëse:",
 	"prefs-watchlist-days-max": "Maksimumi $1 ditë",
 	"prefs-watchlist-edits": "Numri i redaktimeve të treguara tek lista mbikqyrëse e zgjeruar:",
@@ -890,7 +903,7 @@
 	"timezoneregion-indian": "Oqeani Indian",
 	"timezoneregion-pacific": "Oqeani Paqësor",
 	"allowemail": "Lejo përdoruesit të më dërgojnë email",
-	"prefs-searchoptions": "Mundësi kërkimi",
+	"prefs-searchoptions": "Kërko",
 	"prefs-namespaces": "Hapësirat",
 	"default": "parazgjedhje",
 	"prefs-files": "Figura",
@@ -900,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",
@@ -911,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",
-	"gender-male": "Mashkull",
-	"gender-female": "Femër",
-	"prefs-help-gender": "Sipas dëshirës: përdoret për adresim korrekt në relacion me gjininë nga software-i.\nKjo informatë është publike.",
+	"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": "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.",
@@ -927,6 +940,8 @@
 	"prefs-dateformat": "Data i formatit",
 	"prefs-timeoffset": "Kohë të kompensuar",
 	"prefs-advancedediting": "Opsionet e avancuar",
+	"prefs-editor": "redaktor",
+	"prefs-preview": "Parapamje",
 	"prefs-advancedrc": "Opsionet e avancuar",
 	"prefs-advancedrendering": "Opsionet e avancuar",
 	"prefs-advancedsearchoptions": "Opsionet e avancuar",
@@ -940,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",
@@ -1024,7 +1040,7 @@
 	"right-importupload": "Importo faqet nga një ngarkim skede",
 	"right-patrol": "Shëno redaktimin e tjerëve si të patrulluar",
 	"right-autopatrol": "A e vet redaktimet e shënuar automatikisht patrulluar",
-	"right-patrolmarks": "Shiko ndryshimet e fundit shënon patrullë",
+	"right-patrolmarks": "Shiko shënimet patrulluese tek ndryshimet e fundit",
 	"right-unwatchedpages": "Shiko listën e faqeve të pa vëzhguara",
 	"right-mergehistory": "Bashko historinë e faqeve",
 	"right-userrights": "Redakto të gjitha të drejtat e përdoruesit",
@@ -1073,23 +1089,36 @@
 	"action-siteadmin": "mbyll ose hap bazën e të dhënave",
 	"action-sendemail": "dërgo e-maile",
 	"nchanges": "$1 {{PLURAL:$1|ndryshim|ndryshime}}",
+	"enhancedrc-history": "historia",
 	"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-bot": "Ky editim është kryer nga një bot",
+	"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-legend-newpage": "$1 - faqe të re",
+	"recentchanges-label-plusminus": "Madhësia e faqes ndryshoi me këtë numër bajtësh",
+	"recentchanges-legend-heading": "'''Legjenda:'''",
+	"recentchanges-legend-newpage": "{{int:recentchanges-label-newpage}} (shiko gjithashtu [[Special:NewPages|listën e faqeve të reja]])",
 	"rcnotefrom": "Më poshtë janë ndryshime së fundmi nga <b>$2</b> (treguar deri në <b>$1</b>).",
 	"rclistfrom": "Tregon ndryshime së fundmi duke filluar nga $3 $2",
 	"rcshowhideminor": "$1 redaktimet e vogla",
+	"rcshowhideminor-show": "Shfaq",
+	"rcshowhideminor-hide": "Fshih",
 	"rcshowhidebots": "$1 robotët",
-	"rcshowhideliu": "$1 përdoruesit e regjistruar",
+	"rcshowhidebots-show": "Shfaq",
+	"rcshowhidebots-hide": "Fshih",
+	"rcshowhideliu": "$1 përdorues të regjistruar",
+	"rcshowhideliu-hide": "Fshih",
 	"rcshowhideanons": "$1 përdoruesit anonim",
+	"rcshowhideanons-show": "Shfaq",
+	"rcshowhideanons-hide": "Fshih",
 	"rcshowhidepatr": "$1 redaktime të patrulluara",
 	"rcshowhidemine": "$1 redaktimet e mia",
+	"rcshowhidemine-show": "Shfaq",
+	"rcshowhidemine-hide": "Fshih",
 	"rclinks": "Trego $1 ndryshime gjatë $2 ditëve<br />$3",
 	"diff": "ndrysh",
 	"hist": "hist",
@@ -1318,6 +1347,7 @@
 	"uploadnewversion-linktext": "Ngarkoni një version të ri për këtë skedë",
 	"shared-repo-from": "nga $1",
 	"shared-repo": "një magazinë e përbashkët",
+	"upload-disallowed-here": "Ju nuk mund mbishkruani këtë skedë.",
 	"filerevert": "Rikthe $1",
 	"filerevert-legend": "Rikthe skedën",
 	"filerevert-intro": "Po ktheni '''[[Media:$1|$1]]''' tek [versioni $4 i $3, $2].",
@@ -1353,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",
@@ -1369,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",
@@ -1385,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}}",
@@ -1422,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",
@@ -1444,8 +1486,10 @@
 	"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",
 	"booksources-text": "Më posht është një listë me lidhje të cilët shesin ose përdorin libra dhe munden të kenë informacione për librat që kërkoni ju:",
 	"booksources-invalid-isbn": "ISBN-ja e dhënë nuk duket të jetë e vlefshme; kontrolloni oër gabime gjatë kopjimit nga burimi origjinal.",
 	"specialloguserlabel": "Performuesi:",
@@ -1514,8 +1558,7 @@
 	"listgrouprights-removegroup-self-all": "Hiq të gjitha grupet nga llogaria",
 	"mailnologin": "S'ka adresë dërgimi",
 	"mailnologintext": "Duhet të keni [[Special:UserLogin|hyrë brenda]] dhe të keni një adresë të saktë në [[Special:Preferences|parapëlqimet]] tuaja për tu dërguar email përdoruesve të tjerë.",
-	"emailuser": "Email përdoruesit",
-	"emailpage": "Dërgo email përdoruesve",
+	"emailuser": "Email {{GENDER:{{PAGENAME}}|përdoruesit|përdorueses}}",
 	"emailpagetext": "Mund të përdorni formularin e mëposhtëm për të dërguar e-mail tek ky përdorues.\nAdresa e email-it që shkruat tek [[Special:Preferences|preferencat tuaja]] do të duket si \"Nga\" adresa e email-it, pra marrësi do të ketë mundësinë t'ju përgjigjet direkt.",
 	"defemailsubject": "{{SITENAME}} posta elektronike nga përdoruesi \"$1\"",
 	"usermaildisabled": "Email-i i përdoruesit çaktivizua",
@@ -1567,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",
@@ -1592,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.",
@@ -1609,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]]",
@@ -1646,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:",
@@ -1756,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",
@@ -1775,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",
@@ -1811,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",
@@ -1821,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",
@@ -1837,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.",
@@ -1859,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)",
@@ -2014,6 +2060,7 @@
 	"tooltip-pt-mycontris": "Lista e kontributeve tuaja",
 	"tooltip-pt-login": "Identifikimi nuk është i detyrueshëm, megjithatë ne jua rekomandojmë.",
 	"tooltip-pt-logout": "Dalje",
+	"tooltip-pt-createaccount": "Ju rekomandojmë të krijoni një llogari dhe të kyqeni; megjithatë,  nuk është e detyrueshme",
 	"tooltip-ca-talk": "Diskutim për përmbajtjen e faqes",
 	"tooltip-ca-edit": "Redakto këtë faqe",
 	"tooltip-ca-addsection": "Fillo një temë të re diskutimi.",
@@ -2042,7 +2089,7 @@
 	"tooltip-feed-rss": "Burimi ushqyes \"RSS\" për këtë faqe",
 	"tooltip-feed-atom": "Burimi ushqyes \"Atom\" për këtë faqe",
 	"tooltip-t-contributions": "Shiko listën e kontributeve për përdoruesin në fjalë",
-	"tooltip-t-emailuser": "Dërgoni një email përdoruesit",
+	"tooltip-t-emailuser": "Dërgoni një email {{GENDER:{{PAGENAME}}|përdoruesit|përdorueses}}",
 	"tooltip-t-upload": "Ngarko skeda",
 	"tooltip-t-specialpages": "Lista e të gjitha faqeve speciale.",
 	"tooltip-t-print": "Version i shtypshëm i kësaj faqeje",
@@ -2089,12 +2136,14 @@
 	"spam_reverting": "U kthye tek versioni i fundit që s'ka lidhje tek $1",
 	"spam_blanking": "U boshatis sepse të gjitha versionet kanë lidhje tek $1",
 	"spam_deleting": "Të gjitha inspektimet përmbanin lidhje në $1, duke fshirë",
-	"simpleantispam-label": "Kontroll anti-spam.\n'''MOS''' e plotësoni këtë!",
+	"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",
@@ -2125,7 +2174,7 @@
 	"file-info-size-pages": "$1 × $2 pixel, madhësia e dokumentit: $3 , MIME tipi: $4 , $5 {{PLURAL:$5| faqe | faqet}}",
 	"file-nohires": "Nuk ka rezolucion më të madh.",
 	"svg-long-desc": "skedë SVG, fillimisht $1 × $2 pixel, madhësia e skedës: $3",
-	"show-big-image": "Rezolucion i plotë",
+	"show-big-image": "Dokument origjinal",
 	"show-big-image-preview": "Madhësia e këtij shikimi: $1.",
 	"show-big-image-other": "{{PLURAL:$2|Rezolucion tjetër|Rezolucione të tjera}}: $1.",
 	"show-big-image-size": "$1 × $2 pixel",
@@ -2148,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.",
@@ -2335,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",
@@ -2544,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",
@@ -2566,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",
@@ -2579,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].",
@@ -2616,6 +2674,7 @@
 	"tags": "Etiketat e ndryshimeve të pavlefshme",
 	"tag-filter": "[[Special:Tags|Etiketa]] filter:",
 	"tag-filter-submit": "Filtër",
+	"tag-list-wrapper": "([[Special:Tags|{{PLURAL:$1|Etiketa|Etiketat}}]]: $2)",
 	"tags-title": "Etiketat",
 	"tags-intro": "Kjo faqe liston etiketat që softueri mund t'i shënojë me një redaktim, dhe kuptimin e tyre.",
 	"tags-tag": "Emri i etiketës",
@@ -2624,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",
@@ -2651,13 +2715,13 @@
 	"htmlform-selectorother-other": "Gjitha",
 	"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 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-delete": "$1 {{GENDER:$2|grisi}} 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",
@@ -2670,16 +2734,24 @@
 	"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-move-move": "$1 zhvendosi faqen $3 te $4",
+	"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-create": "$1 krijoi një llogari",
-	"logentry-newusers-create2": "$1 krijoi një llogari $3",
-	"logentry-newusers-autocreate": "Llogaria $1 u krijua automatikisht",
+	"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": "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",
 	"feedback-adding": "Duke shtuar përshtypjen te faqja...",
diff --git a/languages/i18n/sr-ec.json b/languages/i18n/sr-ec.json
index f25d51a854..ad9fd8e38e 100644
--- a/languages/i18n/sr-ec.json
+++ b/languages/i18n/sr-ec.json
@@ -34,7 +34,6 @@
 	"tog-hideminor": "Сакриј мање измене у списку скорашњих измена",
 	"tog-hidepatrolled": "Сакриј патролиране измене у списку скорашњих измена",
 	"tog-newpageshidepatrolled": "Сакриј патролиране странице са списка нових страница",
-	"tog-hidecategorization": "Сакриј категоризацију страница",
 	"tog-extendwatchlist": "Прошири списак надгледања за приказ свих измена, не само скорашњих",
 	"tog-usenewrc": "Промене у групи по страници у списку скорашњих измена и надгледаних страница",
 	"tog-numberheadings": "Аутоматски нумериши поднаслове",
@@ -64,7 +63,6 @@
 	"tog-watchlisthideliu": "Сакриј измене пријављених корисника са списка надгледања",
 	"tog-watchlisthideanons": "Сакриј измене анонимних корисника са списка надгледања",
 	"tog-watchlisthidepatrolled": "Сакриј патролиране измене са списка надгледања",
-	"tog-watchlisthidecategorization": "Сакриј категоризацију страница",
 	"tog-ccmeonemails": "Пошаљи ми копије е-порука које пошаљем другим корисницима",
 	"tog-diffonly": "Не приказуј садржај странице испод разлика",
 	"tog-showhiddencats": "Прикажи скривене категорије",
@@ -329,7 +327,7 @@
 	"databaseerror-query": "Упит: $1",
 	"databaseerror-function": "Функција: $1",
 	"databaseerror-error": "Грешка: $1",
-	"laggedslavemode": "'''Упозорење:''' страница је можда застарела.",
+	"laggedslavemode": "<strong>Упозорење:</strong> страница је можда застарела.",
 	"readonly": "База података је закључана",
 	"enterlockreason": "Унесите разлог за закључавање, укључујући и време откључавања",
 	"readonlytext": "База података је тренутно закључана, што значи да је није могуће мењати.\n\nРазлог: $1",
@@ -379,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 странице.",
@@ -397,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": "Корисничко име:",
@@ -454,6 +452,7 @@
 	"createacct-benefit-body2": "{{PLURAL:$1|страница|странице}}",
 	"createacct-benefit-body3": "{{PLURAL:$1|активни корисник|активних корисника}}",
 	"badretype": "Унете лозинке се не поклапају.",
+	"usernameinprogress": "Налог за ово корисничко име се већ прави, молимо сачекајте.",
 	"userexists": "Корисничко име је заузето. Изаберите друго.",
 	"loginerror": "Грешка при пријављивању",
 	"createacct-error": "Дошло је до грешке при отварању налога",
@@ -525,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": "Промену лозинке је спречио додатак.",
@@ -534,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": "Корисничко име:",
@@ -545,7 +544,7 @@
 	"passwordreset-emailtitle": "Детаљи налога на викију {{SITENAME}}",
 	"passwordreset-emailtext-ip": "Неко, вероватно Ви, са ИП адресе $1 је затражио нову лозинку на викију {{SITENAME}} ($4).\nСледећи {{PLURAL:$3|кориснички налог је повезан|кориснички налози су повезани}} с овом е-адресом:\n\n$2\n\n{{PLURAL:$3|Привремена лозинка истиче|Привремене лозинке истичу}} за {{PLURAL:$5|један дан|$5 дана}}.\nПријавите се и изаберите нову лозинку. Ако је неко други захтевао ову радњу или сте се сетили лозинке и не желите да је мењате, занемарите ову поруку и наставите користити стару лозинку.",
 	"passwordreset-emailtext-user": "{{GENDER:$1|Корисник је затражио|Корисница је затражила}} подсетник о подацима за пријаву на викију {{SITENAME}} ($4).\nСледећи {{PLURAL:$3|кориснички налог је повезан|кориснички налози су повезани}} с овом е-адресом:\n\n$2\n\n{{PLURAL:$3|Привремена лозинка истиче|Привремене лозинке истичу}} за {{PLURAL:$5|један дан|$5 дана}}.\nПријавите се и изаберите нову лозинку. Ако је неко други захтевао ову радњу или сте се сетили лозинке и не желите да је мењате, занемарите ову поруку.",
-	"passwordreset-emailelement": "Корисничко име: $1\nПривремена лозинка: $2",
+	"passwordreset-emailelement": "Корисничко име: \n$1\n\nПривремена лозинка: \n$2",
 	"passwordreset-emailsent": "Подсетник о лозинци је послат на вашу адресу.",
 	"passwordreset-emailsent-capture": "Послат је подсетник преко е-поште (приказан доле).",
 	"passwordreset-emailerror-capture": "Е-порука за ресетовање лозинке, приказана испод је послата, али слање {{GENDER:$2|кориснику|корисници}} није успело: $1",
@@ -631,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": "Овај преглед осликава како ће текст у текстуалном оквиру изгледати.",
@@ -792,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": "Сакриј податке од администратора и других корисника",
@@ -945,13 +944,14 @@
 	"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|дан|дана}}",
 	"recentchangescount": "Број измена за приказ:",
 	"prefs-help-recentchangescount": "Подразумева скорашње измене, историје страница и дневнике.",
-	"prefs-help-watchlist-token2": "Ово је тајни кључ за веб довод вашег списка надгледања.\nСвако ко зна овај кључ биће у могућности да види ваша надгледања стога немојте га одавати никоме.\nАко је потребно можете га [[Special:ResetTokens|ресетовати]].",
+	"prefs-help-watchlist-token2": "Ово је тајни кључ за веб-довод Вашег списка надгледања. \nСвако ко зна овај кључ биће у могућности да види Ваша надгледања; стога, кључ немојте одавати никоме. \nАко је потребно, кључ можете [[Special:ResetTokens|ресетовати]].",
 	"savedprefs": "Ваша подешавања су сачувана.",
 	"timezonelegend": "Временска зона:",
 	"localtime": "Локално време:",
@@ -990,7 +990,7 @@
 	"yourvariant": "Варијанта језика:",
 	"prefs-help-variant": "Жељена варијанта или правопис за приказ страница са садржајем овог викија.",
 	"yournick": "Нови потпис:",
-	"prefs-help-signature": "Коментаре на страницама за разговор потпишите са ''<nowiki>~~~~</nowiki>''. Ови знакови ће бити претворени у ваш потпис и тренутно време.",
+	"prefs-help-signature": "Коментаре на страницама за разговор потписујте са четири тилде: <nowiki>~~~~</nowiki>. Овај викитекст ће бити претворен у Ваш потпис и тренутно време.",
 	"badsig": "Потпис је неисправан.\nПроверите ознаке HTML.",
 	"badsiglength": "Ваш потпис је предугачак.\nНе сме бити дужи од $1 {{PLURAL:$1|знака|знака|знакова}}.",
 	"yourgender": "Како желите да се представите?",
@@ -1056,7 +1056,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}}:Аутоматски потврђени корисници",
@@ -1222,9 +1222,6 @@
 	"rcshowhidemine": "$1 моје измене",
 	"rcshowhidemine-show": "Прикажи",
 	"rcshowhidemine-hide": "Сакриј",
-	"rcshowhidecategorization": "$1 категоризацију страница",
-	"rcshowhidecategorization-show": "Прикажи",
-	"rcshowhidecategorization-hide": "Сакриј",
 	"rclinks": "Прикажи последњих $1 измена {{PLURAL:$2|претходни дан|у последња $2 дана|у последњих $2 дана}}<br />$3",
 	"diff": "разл",
 	"hist": "ист",
@@ -1250,10 +1247,6 @@
 	"recentchangeslinked-summary": "Ова посебна страница приказује списак последњих измена на страницама које су повезане (или чланови одређене категорије).\nСтранице с [[Special:Watchlist|вашег списка надгледања]] су '''подебљане'''.",
 	"recentchangeslinked-page": "Назив странице:",
 	"recentchangeslinked-to": "Прикажи измене страница које су повезане с датом страницом",
-	"recentchanges-page-added-to-category": "[[:$1]] је додата у категорију",
-	"recentchanges-page-added-to-category-bundled": "[[:$1]] и још {{PLURAL:$2|једна страница|$2 странице}} су додате у категорију",
-	"recentchanges-page-removed-from-category": "[[:$1]] је уклоњена из категорије",
-	"recentchanges-page-removed-from-category-bundled": "[[:$1]] и још {{PLURAL:$2|једна страница|$2 странице}} су уклоњене из категорије",
 	"upload": "Пошаљи датотеку",
 	"uploadbtn": "Пошаљи датотеку",
 	"reuploaddesc": "Назад на образац за отпремање",
@@ -1359,6 +1352,10 @@
 	"upload-copy-upload-invalid-domain": "Примерци отпремања нису доступни на овом домену.",
 	"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-filename": "Назив датотеке",
@@ -1665,6 +1662,7 @@
 	"logempty": "Нема пронађених ставки у историји.",
 	"log-title-wildcard": "Тражи наслове који почињу с овим текстом",
 	"showhideselectedlogentries": "Прикажи/сакриј изабране догађаје",
+	"log-edit-tags": "Уреди ознаке изабраних уноса у дневницима",
 	"allpages": "Све странице",
 	"nextpage": "Следећа страница ($1)",
 	"prevpage": "Претходна страница ($1)",
@@ -1739,7 +1737,6 @@
 	"emailuser": "Пошаљи е-поруку",
 	"emailuser-title-target": "Слање е-поруке {{GENDER:$1|кориснику|корисници|кориснику}}",
 	"emailuser-title-notarget": "Слање е-поруке кориснику",
-	"emailpage": "Слање е-порука",
 	"emailpagetext": "Можете да користите доњи образац да пошаљете е-поруку {{GENDER:$1|овом кориснику|овој корисници}}.\nЕ-адреса коју сте унели у вашим [[Special:Preferences|подешавањима]] ће се приказати у пољу „Од“, тако да ће прималац моћи да вам одговори директно.",
 	"defemailsubject": "{{SITENAME}} — Е-пошта од {{GENDER:$1|корисника|кориснице}} $1",
 	"usermaildisabled": "Корисничка е-пошта је онемогућена",
@@ -1761,7 +1758,7 @@
 	"emailccsubject": "Копија ваше поруке кориснику $1: $2",
 	"emailsent": "Порука је послата",
 	"emailsenttext": "Ваша е-порука је послата.",
-	"emailuserfooter": "Ову е-поруку је послао $1 кориснику $2 помоћу „{{int:emailpage}}“ с викија {{SITENAME}}.",
+	"emailuserfooter": "Ову е-поруку је послао $1 кориснику $2 помоћу „{{int:emailuser}}“ с викија {{SITENAME}}.",
 	"usermessage-summary": "Слање системске поруке.",
 	"usermessage-editor": "Уређивач системских порука",
 	"usermessage-template": "MediaWiki:UserMessage",
@@ -1772,8 +1769,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“ је уклоњена с вашег списка надгледања.",
@@ -1786,7 +1783,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": "Надгледање…",
@@ -1799,11 +1796,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",
@@ -1867,7 +1864,7 @@
 	"protectedarticle": "{{GENDER:|је заштитио|је заштитила}} „[[$1]]“",
 	"modifiedarticleprotection": "је променио степен заштите за „[[$1]]“",
 	"unprotectedarticle": "је скинуо заштиту са странице „[[$1]]“",
-	"movedarticleprotection": "{{GENDER:|је преместио|је преместила|је преместио}} поставке заштите са „[[$2]]“ на „[[$1]]“",
+	"movedarticleprotection": "је преместио поставке заштите са „[[$2]]“ на „[[$1]]“",
 	"protect-title": "Степен заштите за „$1“",
 	"protect-title-notallowed": "Преглед степена заштите за „$1“",
 	"prot_1movedto2": "је преместио [[$1]] на [[$2]]",
@@ -1886,7 +1883,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": "Допуштено само администраторима",
@@ -1912,7 +1909,7 @@
 	"pagesize": "(бајтови)",
 	"restriction-edit": "уређивање",
 	"restriction-move": "премештање",
-	"restriction-create": "стварање",
+	"restriction-create": "Прављење",
 	"restriction-upload": "слање",
 	"restriction-level-sysop": "потпуно заштићено",
 	"restriction-level-autoconfirmed": "полузаштићено",
@@ -1924,7 +1921,7 @@
 	"undeletepagetext": "{{PLURAL:$1|Следећа страница је обрисана, али је још у архиви и може бити враћена|Следеће $1 странице су обрисане, али су још у архиви и могу бити враћене|Следећих $1 страница је обрисано, али су још у архиви и могу бити враћене}}.\nАрхива се повремено чисти од оваквих страница.",
 	"undelete-fieldset-title": "Враћање измена",
 	"undeleteextrahelp": "Да бисте вратили целу историју странице, оставите све кућице неозначене и кликните на дугме '''''{{int:undeletebtn}}'''''.\nАко желите да вратите одређене измене, означите их и кликните на '''''{{int:undeletebtn}}'''''.",
-	"undeleterevisions": "$1 {{PLURAL:$1|измена је архивирана|измене су архивиране|измена је архивирано}}",
+	"undeleterevisions": "{{PLURAL:$1|Измена}} обрисано: $1",
 	"undeletehistory": "Ако вратите страницу, све ревизије ће бити враћене њеној историји.\nАко је у међувремену направљена нова страница с истим називом, враћене измене ће се појавити у њеној ранијој историји.",
 	"undeleterevdel": "Враћање неће бити извршено ако је резултат тога делимично брисање последње измене.\nУ таквим случајевима морате искључити или открити најновије обрисане измене.",
 	"undeletehistorynoadmin": "Ова страница је обрисана.\nРазлог за брисање се налази испод, заједно с детаљима о кориснику који је изменио ову страницу пре брисања.\nТекст обрисаних измена је доступан само администраторима.",
@@ -1936,9 +1933,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|историјат брисања]] за недавно обрисане странице.",
@@ -1975,7 +1972,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": "разговор",
@@ -2023,7 +2020,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": "Неисправна ИП адреса",
@@ -2059,7 +2056,7 @@
 	"blocklist-reason": "Разлог",
 	"ipblocklist-submit": "Претражи",
 	"ipblocklist-localblock": "Локално блокирање",
-	"ipblocklist-otherblocks": "{{PLURAL:$1|Друго блокирање|Друга блокирања}}",
+	"ipblocklist-otherblocks": "{{PLURAL:$1|Друга блокирања}}",
 	"infiniteblock": "трајно",
 	"expiringblock": "истиче $1 у $2",
 	"anononlyblock": "само анонимни",
@@ -2095,7 +2092,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, која може бити деблокирана.",
@@ -2163,7 +2160,7 @@
 	"movereason": "Разлог:",
 	"revertmove": "врати",
 	"delete_and_move": "Обриши и премести",
-	"delete_and_move_text": "== Потребно брисање ==\n\nОдредишна страница „[[:$1]]“ већ постоји. \nЖелите ли да је обришете да бисте ослободили место за преусмерење?",
+	"delete_and_move_text": "== Потребно брисање ==\n\nОдредишна страница „[[:$1]]“ већ постоји. \nЖелите ли да је обришете да бисте ослободили место за премештање?",
 	"delete_and_move_confirm": "Да, обриши страницу",
 	"delete_and_move_reason": "Обрисано да се ослободи место за премештање из „[[$1]]“",
 	"selfmove": "Изворни и одредишни наслови су истоветни;\nне могу да преместим страницу преко саме себе.",
@@ -2178,7 +2175,7 @@
 	"imagetypemismatch": "Екстензија нове датотеке се не поклапа с њеном врстом",
 	"imageinvalidfilename": "Циљани назив датотеке је неисправан",
 	"fix-double-redirects": "Ажурирајте сва преусмерења која воде до првобитног наслова",
-	"move-leave-redirect": "Направи преусмерење",
+	"move-leave-redirect": "Остави преусмерење",
 	"protectedpagemovewarning": "'''Упозорење:''' ова страница је заштићена, тако да само корисници с администраторским овлашћењима могу да је преместе.\nЗа више информација, последњи запис у дневнику измена је приказан испод:",
 	"semiprotectedpagemovewarning": "'''Напомена:''' ова страница је заштићена, тако да само регистровани корисници могу да је преместе.\nЗа више информација, последњи запис у дневнику измена је приказан испод:",
 	"move-over-sharedrepo": "== Датотека постоји ==\n[[:$1]] се налази на дељеном складишту. Ако преместите датотеку на овај наслов, то ће заменити дељену датотеку.",
@@ -2232,7 +2229,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Сачувајте је на рачунар и пошаљите овде.",
@@ -2429,10 +2428,11 @@
 	"markedaspatrollederrortext": "Морате изабрати измену да бисте је означили као патролирану.",
 	"markedaspatrollederror-noautopatrol": "Не можете да означите своје измене као патролиране.",
 	"markedaspatrollednotify": "Ова измена на страници „$1“ је означена као патролирана.",
-	"markedaspatrollederrornotify": "Означавање ове странице патролираном није успело.",
+	"markedaspatrollederrornotify": "Означавање ове измене патролираном није успело.",
 	"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",
@@ -2442,7 +2442,7 @@
 	"filedelete-archive-read-only": "Сервер не може да пише по складишној фасцикли ($1).",
 	"previousdiff": "← Старија измена",
 	"nextdiff": "Новија измена →",
-	"mediawarning": "'''Упозорење''': ова врста датотеке може садржати штетан код.\nАко га покренете, ваш рачунар може бити угрожен.",
+	"mediawarning": "<strong>Упозорење:</strong> ова врста датотеке може садржати штетан код.\nАко га покренете, Ваш рачунар може бити угрожен.",
 	"imagemaxsize": "Ограничење величине слике:<br />''(на страницама за опис датотека)''",
 	"thumbsize": "Величина минијатуре:",
 	"widthheight": "$1 × $2",
@@ -2994,7 +2994,7 @@
 	"watchlistedit-raw-done": "Ваш списак надгледања је ажуриран.",
 	"watchlistedit-raw-added": "{{PLURAL:$1|1=Додат је један наслов|Додата су $1 наслова|Додато је $1 наслова}}:",
 	"watchlistedit-raw-removed": "{{PLURAL:$1|1 наслов је уклоњен|Уклоњена су $1 наслова|Уклоњено је $1 наслова}}:",
-	"watchlistedit-clear-title": "Пражњење списак надгледања",
+	"watchlistedit-clear-title": "Пражњење списка надгледања",
 	"watchlistedit-clear-legend": "Испразни списак надгледања",
 	"watchlistedit-clear-explain": "Сви наслови ће бити уклоњени из вашег списка надгледања.",
 	"watchlistedit-clear-titles": "Наслови:",
@@ -3061,6 +3061,7 @@
 	"signature": "[[{{ns:user}}:$1|$2]] ([[{{ns:user_talk}}:$1|разговор]])",
 	"timezone-utc": "UTC",
 	"duplicate-defaultsort": "'''Упозорење:''' подразумевани кључ сврставања „$2“ мења некадашњи кључ „$1“.",
+	"duplicate-displaytitle": "<strong>Упозорење:</strong> наслов за приказ „$2“ замениће постојећи „$1“.",
 	"version": "Верзија",
 	"version-extensions": "Инсталирана проширења",
 	"version-skins": "Инсталиране теме",
@@ -3159,6 +3160,8 @@
 	"tags-actions-header": "Радње",
 	"tags-active-yes": "Да",
 	"tags-active-no": "Не",
+	"tags-source-extension": "Део екстензије",
+	"tags-source-manual": "Ручно је додају корисници и ботови",
 	"tags-source-none": "Ван употребе",
 	"tags-edit": "уреди",
 	"tags-delete": "обриши",
@@ -3167,6 +3170,7 @@
 	"tags-hitcount": "$1 {{PLURAL:$1|измена|измене|измена}}",
 	"tags-manage-no-permission": "Немате дозволу да мењате ознаке.",
 	"tags-create-heading": "Нова ознака",
+	"tags-create-explanation": "По подразумеваним подешавањима нове ознаке моћи ће да користе корисници и ботови.",
 	"tags-create-tag-name": "Назив ознаке:",
 	"tags-create-reason": "Разлог:",
 	"tags-create-submit": "Направи",
@@ -3175,6 +3179,7 @@
 	"tags-create-warnings-below": "Правите нову ознаку, желите ли да наставите?",
 	"tags-delete-title": "Брисање ознака",
 	"tags-delete-explanation-initial": "Бришете ознаку „$1“ из базе података.",
+	"tags-delete-explanation-warning": "Ова радња је <strong>неповратна</strong> и <strong>не може се поништити</strong>, чак ни администратори базе података је не могу поништити. Будите сигурни да је ово ознака коју желите обрисати.",
 	"tags-delete-reason": "Разлог:",
 	"tags-delete-submit": "Неповратно обриши ову ознаку",
 	"tags-delete-not-found": "Ознака „$1“ не постоји.",
@@ -3189,6 +3194,7 @@
 	"tags-deactivate-reason": "Разлог:",
 	"tags-deactivate-not-allowed": "Није могуће деактивирати ознаку „$1“.",
 	"tags-deactivate-submit": "Декативирај",
+	"tags-edit-title": "Уреди ознаке",
 	"tags-edit-existing-tags": "Постојеће ознаке:",
 	"tags-edit-new-tags": "Нове ознаке:",
 	"tags-edit-reason": "Разлог:",
@@ -3267,18 +3273,20 @@
 	"logentry-newusers-create2": "$1 је {{GENDER:$2|отворио|отворила}} кориснички налог $3",
 	"logentry-newusers-byemail": "$1 је {{GENDER:$2|отворио|отворила}} кориснички налог $3 и лозинка је послата на е-пошту",
 	"logentry-newusers-autocreate": "Кориснички налог $1 је аутоматски {{GENDER:$2|отворен}}",
+	"logentry-protect-move_prot": "$1 је {{GENDER:$2|преместио|преместила}} поставке заштите са $4 на $3",
 	"logentry-rights-rights": "$1 је {{GENDER:$2|променио|променила}} чланство групе за $3 из $4 у $5",
 	"logentry-rights-rights-legacy": "$1 је {{GENDER:$2|променио|променила}} чланство групе за $3",
 	"logentry-rights-autopromote": "$1 је аутоматски {{GENDER:$2|унапређен|унапређена}} из $4 у $5",
 	"logentry-upload-upload": "$1 је {{GENDER:$2|послао|послала}} $3",
 	"logentry-upload-overwrite": "$1 је {{GENDER:$2|послао|послала}} нову верзију $3",
 	"logentry-upload-revert": "$1 је {{GENDER:$2|послао|послала}} $3",
-	"log-name-managetags": "Дневник ознака",
+	"log-name-managetags": "Дневник уређивања ознака",
 	"log-description-managetags": "Овај дневник садржи списак измена у вези [[Special:Tags|ознака]]. Дневник садржи само радње извршене од стране администратора, уноси за ознаке направљене или обрисане од стране вики софтвера се не налазе у овом дневнику.",
 	"logentry-managetags-create": "$1 је {{GENDER:$2|направио|направила}} ознаку „$4“",
 	"logentry-managetags-delete": "$1 је {{GENDER:$2|обрисао|обрисала}} ознаку „$4“ (уклоњена је из $5 {{PLURAL:$5|измене или дневника|измена и/или дневника}})",
 	"logentry-managetags-activate": "$1 је {{GENDER:$2|активирао|активирала}} ознаку „$4“ за употребу од стране корисника и ботова",
 	"logentry-managetags-deactivate": "$1 је {{GENDER:$2|деактивирао|деактивирала}} ознаку „$4“ за употребу од стране корисника и ботова",
+	"log-name-tag": "Дневник ознака",
 	"rightsnone": "(нема)",
 	"revdelete-summary": "опис измене",
 	"feedback-adding": "Додајем повратну информацију на страницу…",
@@ -3405,6 +3413,7 @@
 	"special-characters-group-telugu": "телугу",
 	"special-characters-group-sinhala": "синхалски",
 	"special-characters-group-gujarati": "гуџарати",
+	"special-characters-group-devanagari": "деванагари",
 	"special-characters-group-thai": "тајландски",
 	"special-characters-group-lao": "лаоски",
 	"special-characters-group-khmer": "кмерски",
diff --git a/languages/i18n/sr-el.json b/languages/i18n/sr-el.json
index ab993c9604..1f02299e93 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:",
@@ -522,7 +522,7 @@
 	"passwordreset-emailtitle": "Detalji naloga na vikiju {{SITENAME}}",
 	"passwordreset-emailtext-ip": "Neko, verovatno Vi, sa IP adrese $1 je zatražio novu lozinku na vikiju {{SITENAME}} ($4).\nSledeći {{PLURAL:$3|korisnički nalog je povezan|korisnički nalozi su povezani}} s ovom e-adresom:\n\n$2\n\n{{PLURAL:$3|Privremena lozinka ističe|Privremene lozinke ističu}} za {{PLURAL:$5|jedan dan|$5 dana}}.\nPrijavite se i izaberite novu lozinku. Ako je neko drugi zahtevao ovu radnju ili ste se setili lozinke i ne želite da je menjate, zanemarite ovu poruku i nastavite koristiti staru lozinku.",
 	"passwordreset-emailtext-user": "{{GENDER:$1|Korisnik je zatražio|Korisnica je zatražila}} podsetnik o podacima za prijavu na vikiju {{SITENAME}} ($4).\nSledeći {{PLURAL:$3|korisnički nalog je povezan|korisnički nalozi su povezani}} s ovom e-adresom:\n\n$2\n\n{{PLURAL:$3|Privremena lozinka ističe|Privremene lozinke ističu}} za {{PLURAL:$5|jedan dan|$5 dana}}.\nPrijavite se i izaberite novu lozinku. Ako je neko drugi zahtevao ovu radnju ili ste se setili lozinke i ne želite da je menjate, zanemarite ovu poruku.",
-	"passwordreset-emailelement": "Korisničko ime: $1\nPrivremena lozinka: $2",
+	"passwordreset-emailelement": "Korisničko ime: \n$1\n\nPrivremena lozinka: \n$2",
 	"passwordreset-emailsent": "Podsetnik o lozinci je poslat na vašu adresu.",
 	"passwordreset-emailsent-capture": "Poslat je podsetnik preko e-pošte (prikazan dole).",
 	"passwordreset-emailerror-capture": "E-poruka za resetovanje lozinke, prikazana ispod je poslata, ali slanje {{GENDER:$2|korisniku|korisnici}} nije uspelo: $1",
@@ -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,13 +910,13 @@
 	"rows": "Redova:",
 	"columns": "Kolona",
 	"searchresultshead": "Pretraga",
-	"stub-threshold": "Prag za oblikovanje <a href=\"#\" class=\"stub\">veze kao klice</a> (u bajtovima):",
+	"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}}",
 	"recentchangescount": "Broj izmena za prikaz:",
 	"prefs-help-recentchangescount": "Podrazumeva skorašnje izmene, istorije stranica i dnevnike.",
-	"prefs-help-watchlist-token2": "Ovo je tajni ključ za veb dovod vašeg spiska nadgledanja.\nSvako ko zna ovaj ključ biće u mogućnosti da vidi vaša nadgledanja stoga nemojte ga odavati nikome.\nAko je potrebno možete ga [[Special:ResetTokens|resetovati]].",
+	"prefs-help-watchlist-token2": "Ovo je tajni ključ za veb-dovod Vašeg spiska nadgledanja. \nSvako ko zna ovaj ključ biće u mogućnosti da vidi Vaša nadgledanja; stoga, ključ nemojte odavati nikome. \nAko je potrebno, ključ možete [[Special:ResetTokens|resetovati]].",
 	"savedprefs": "Vaša podešavanja su sačuvana.",
 	"timezonelegend": "Vremenska zona:",
 	"localtime": "Lokalno vreme:",
@@ -955,7 +955,7 @@
 	"yourvariant": "Varijanta jezika:",
 	"prefs-help-variant": "Željena varijanta ili pravopis za prikaz stranica sa sadržajem ovog vikija.",
 	"yournick": "Novi potpis:",
-	"prefs-help-signature": "Komentare na stranicama za razgovor potpišite sa ''<nowiki>~~~~</nowiki>''. Ovi znakovi će biti pretvoreni u vaš potpis i trenutno vreme.",
+	"prefs-help-signature": "Komentare na stranicama za razgovor potpisujte sa četiri tilde: <nowiki>~~~~</nowiki>. Ovaj vikitekst će biti pretvoren u Vaš potpis i trenutno vreme.",
 	"badsig": "Potpis je neispravan.\nProverite oznake HTML.",
 	"badsiglength": "Vaš potpis je predugačak.\nNe sme biti duži od $1 {{PLURAL:$1|znaka|znaka|znakova}}.",
 	"yourgender": "Kako želite da se predstavite?",
@@ -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",
@@ -1678,7 +1678,6 @@
 	"emailuser": "Pošalji e-poruku",
 	"emailuser-title-target": "Slanje e-poruke {{GENDER:$1|korisniku|korisnici|korisniku}}",
 	"emailuser-title-notarget": "Slanje e-poruke korisniku",
-	"emailpage": "Slanje e-poruka",
 	"emailpagetext": "Možete da koristite donji obrazac da pošaljete e-poruku {{GENDER:$1|ovom korisniku|ovoj korisnici}}.\nE-adresa koju ste uneli u vašim [[Special:Preferences|podešavanjima]] će se prikazati u polju „Od“, tako da će primalac moći da vam odgovori direktno.",
 	"defemailsubject": "{{SITENAME}} — E-pošta od {{GENDER:$1|korisnika|korisnice}} $1",
 	"usermaildisabled": "Korisnička e-pošta je onemogućena",
@@ -1700,7 +1699,7 @@
 	"emailccsubject": "Kopija vaše poruke korisniku $1: $2",
 	"emailsent": "Poruka je poslata",
 	"emailsenttext": "Vaša e-poruka je poslata.",
-	"emailuserfooter": "Ovu e-poruku je poslao $1 korisniku $2 pomoću „{{int:emailpage}}“ s vikija {{SITENAME}}.",
+	"emailuserfooter": "Ovu e-poruku je poslao $1 korisniku $2 pomoću „{{int:emailuser}}“ s vikija {{SITENAME}}.",
 	"usermessage-summary": "Slanje sistemske poruke.",
 	"usermessage-editor": "Uređivač sistemskih poruka",
 	"usermessage-template": "MediaWiki:UserMessage",
@@ -1711,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.",
@@ -1725,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…",
@@ -1738,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",
@@ -1806,7 +1805,7 @@
 	"protectedarticle": "{{GENDER:|je zaštitio|je zaštitila}} „[[$1]]“",
 	"modifiedarticleprotection": "je promenio stepen zaštite za „[[$1]]“",
 	"unprotectedarticle": "je skinuo zaštitu sa stranice „[[$1]]“",
-	"movedarticleprotection": "{{GENDER:|je premestio|je premestila|je premestio}} postavke zaštite sa „[[$2]]“ na „[[$1]]“",
+	"movedarticleprotection": "je premestio postavke zaštite sa „[[$2]]“ na „[[$1]]“",
 	"protect-title": "Stepen zaštite za „$1“",
 	"protect-title-notallowed": "Pregled stepena zaštite za „$1“",
 	"prot_1movedto2": "je premestio [[$1]] na [[$2]]",
@@ -1825,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",
@@ -1851,7 +1850,7 @@
 	"pagesize": "(bajtovi)",
 	"restriction-edit": "uređivanje",
 	"restriction-move": "premeštanje",
-	"restriction-create": "stvaranje",
+	"restriction-create": "Pravljenje",
 	"restriction-upload": "slanje",
 	"restriction-level-sysop": "potpuno zaštićeno",
 	"restriction-level-autoconfirmed": "poluzaštićeno",
@@ -1875,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.",
@@ -1914,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",
@@ -1962,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",
@@ -1997,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",
@@ -2033,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.",
@@ -2101,7 +2100,7 @@
 	"movereason": "Razlog:",
 	"revertmove": "vrati",
 	"delete_and_move": "Obriši i premesti",
-	"delete_and_move_text": "== Potrebno brisanje ==\n\nOdredišna stranica „[[:$1]]“ već postoji. \nŽelite li da je obrišete da biste oslobodili mesto za preusmerenje?",
+	"delete_and_move_text": "== Potrebno brisanje ==\n\nOdredišna stranica „[[:$1]]“ već postoji. \nŽelite li da je obrišete da biste oslobodili mesto za premeštanje?",
 	"delete_and_move_confirm": "Da, obriši stranicu",
 	"delete_and_move_reason": "Obrisano da se oslobodi mesto za premeštanje iz „[[$1]]“",
 	"selfmove": "Izvorni i odredišni naslovi su istovetni;\nne mogu da premestim stranicu preko same sebe.",
@@ -2116,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.",
@@ -2366,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",
@@ -2379,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",
@@ -2931,7 +2930,7 @@
 	"watchlistedit-raw-done": "Vaš spisak nadgledanja je ažuriran.",
 	"watchlistedit-raw-added": "{{PLURAL:$1|1=Dodat je jedan naslov|Dodata su $1 naslova|Dodato je $1 naslova}}:",
 	"watchlistedit-raw-removed": "{{PLURAL:$1|1 naslov je uklonjen|Uklonjena su $1 naslova|Uklonjeno je $1 naslova}}:",
-	"watchlistedit-clear-title": "Pražnjenje spisak nadgledanja",
+	"watchlistedit-clear-title": "Pražnjenje spiska nadgledanja",
 	"watchlistedit-clear-legend": "Isprazni spisak nadgledanja",
 	"watchlistedit-clear-explain": "Svi naslovi će biti uklonjeni iz vašeg spiska nadgledanja.",
 	"watchlistedit-clear-titles": "Naslovi:",
@@ -3205,7 +3204,7 @@
 	"logentry-upload-upload": "$1 je {{GENDER:$2|poslao|poslala}} $3",
 	"logentry-upload-overwrite": "$1 je {{GENDER:$2|poslao|poslala}} novu verziju $3",
 	"logentry-upload-revert": "$1 je {{GENDER:$2|poslao|poslala}} $3",
-	"log-name-managetags": "Dnevnik oznaka",
+	"log-name-managetags": "Dnevnik uređivanja oznaka",
 	"log-description-managetags": "Ovaj dnevnik sadrži spisak izmena u vezi [[Special:Tags|oznaka]]. Dnevnik sadrži samo radnje izvršene od strane administratora, unosi za oznake napravljene ili obrisane od strane viki softvera se ne nalaze u ovom dnevniku.",
 	"logentry-managetags-create": "$1 je {{GENDER:$2|napravio|napravila}} oznaku „$4“",
 	"logentry-managetags-delete": "$1 je {{GENDER:$2|obrisao|obrisala}} oznaku „$4“ (uklonjena je iz $5 {{PLURAL:$5|izmene ili dnevnika|izmena i/ili dnevnika}})",
@@ -3336,6 +3335,7 @@
 	"special-characters-group-telugu": "telugu",
 	"special-characters-group-sinhala": "sinhalski",
 	"special-characters-group-gujarati": "Gudžarati",
+	"special-characters-group-devanagari": "devanagari",
 	"special-characters-group-thai": "tajlandski",
 	"special-characters-group-lao": "laoski",
 	"special-characters-group-khmer": "kmerski",
diff --git a/languages/i18n/stq.json b/languages/i18n/stq.json
index 79351277f5..b47950d6fa 100644
--- a/languages/i18n/stq.json
+++ b/languages/i18n/stq.json
@@ -403,7 +403,7 @@
 	"passwordreset-capture-help": "Wan du disse Kaste ankjuusest, wäd ju E-Mail-Ättergjucht mäd dät temporäre Paaswoud, die wiesed, as uk dän Benutser tousoand.",
 	"passwordreset-email": "E-Mail-Adresse:",
 	"passwordreset-emailtitle": "Benutserkontoinformatione ap {{SITENAME}}",
-	"passwordreset-emailelement": "↓Benutsernoome: $1\nTemporär Paaswoud: $2",
+	"passwordreset-emailelement": "↓Benutsernoome: \n$1\n\nTemporär Paaswoud: \n$2",
 	"passwordreset-emailsent": "↓Ne Ärinnerenge wuud uur E-Mail fersoand.",
 	"bold_sample": "Fatten Text",
 	"bold_tip": "Fatten Text",
@@ -1322,7 +1322,6 @@
 	"mailnologin": "Du bäst nit anmälded.",
 	"mailnologintext": "Du moast [[Special:UserLogin|anmälded weese]] un sälwen ne [[Special:Preferences|gultige E-Mail-Adrässe]] anroat hääbe, uum uur Benutsere ne E-Mail tou seenden.",
 	"emailuser": "Seende E-Mail an dissen Benutser",
-	"emailpage": "E-mail an Benutser",
 	"emailpagetext": "Du koast dän Benutser mäd dän unner stoundene Formular ne E-Mail seende.\nAs Ouseender wäd ju E-Mail-Adresse uut dien [[Special:Preferences|Ienstaalengen]] iendrain, deermäd die Benutser die oantwoudje kon.",
 	"defemailsubject": "{{SITENAME}}-E-Mail",
 	"usermaildisabled": "E-Mail-Ämfangst deaktivierd",
diff --git a/languages/i18n/su.json b/languages/i18n/su.json
index 94d56da446..e862faae83 100644
--- a/languages/i18n/su.json
+++ b/languages/i18n/su.json
@@ -520,7 +520,7 @@
 	"passwordreset-emailtitle": "Wincikan akun di {{SITENAME}}",
 	"passwordreset-emailtext-ip": "Aya (sigana anjeun, ti alamat IP $1) ménta nyetél ulang kecap sandi pikeun {{SITENAME}} ($4). {{PLURAL:$3|Akun}} di handap tumali jeung alamat ieu surélék:\n\n$2\n\n{{PLURAL:$3|Ieu sandi saheulaanan}} bakal kadaluwarsa dina témpo {{PLURAL:$5|sapoé|$5 poé}}.\nAnjeun kudu asup sarta milih sandi anyar ayeuna. Lamun teu rumasa nyieun ieu paménta, atawa lamun geus inget sandi aslina sarta moal dirobah, ieu surat teu kudu diwaro.",
 	"passwordreset-emailtext-user": "Pamaké $1 di {{SITENAME}} ménta nyetél ulang sandi anjeun di {{SITENAME}} ($4). {{PLURAL:$3|Akun}} di handap tumali jeung alamat surélék ieu:\n\n$2\n\n{{PLURAL:$3|Ieu sandi saheulaanan}} bakal kadaluwarsa dina témpo {{PLURAL:$5|sapoé|$5 poé}}.\nAnjeun kudu asup sarta milih sandi anyar ayeuna. Lamun henteu rumasa nyieun ieu pamundut atawa lamun geus inget sandi asli sarta moal ngarobah deui, ieu talatah teu kudu dipaliré.",
-	"passwordreset-emailelement": "Sandiasma: $1\nSandi saheulaanan: $2",
+	"passwordreset-emailelement": "Sandiasma: \n$1\n\nSandi saheulaanan: \n$2",
 	"passwordreset-emailsent": "Surélék pikeun nyetél ulang kecap sandi geus dikirim.",
 	"passwordreset-emailsent-capture": "Surélék pikeun nyetél ulang kecap sandi geus dikirim, sakumaha ditémbongkeun di handap.",
 	"passwordreset-emailerror-capture": "Surélék pikeun nyetél ulang kecap sandi geus dijieun, sakumaha ditémbongkeun di handap, tapi gagal ngirim ka {{GENDER:$2|pamaké}}: $1",
@@ -1494,7 +1494,6 @@
 	"mailnologin": "Euweuh alamat ngirim",
 	"mailnologintext": "Anjeun kudu '''[[Special:UserLogin|asup log]]''' sarta boga alamat surélék nu sah na [[Special:Preferences|préferénsi]] anjeun sangkan bisa nyurélékan pamaké séjén.",
 	"emailuser": "Surélékan pamaké ieu",
-	"emailpage": "Surélékan pamaké",
 	"emailpagetext": "Anjeun bisa maké formulir di handap pikeun ngirim surélék ka ieu pamaké.\nAlamat surélék nu diasupkeun kana [[Special:Preferences|préferénsi pamaké anjeun]] bakal katémbong salaku alamat \"Ti\" dina surélékna, sahingga nu dituju bisa males langsung.",
 	"defemailsubject": "Surélék {{SITENAME}} ti pamaké \"$1\"",
 	"usermaildisabled": "Surélék kontributor ditumpurkeun",
diff --git a/languages/i18n/sv.json b/languages/i18n/sv.json
index 2d8bd67200..ceeb3e3e4a 100644
--- a/languages/i18n/sv.json
+++ b/languages/i18n/sv.json
@@ -73,7 +73,6 @@
 	"tog-hideminor": "Dölj mindre redigeringar i senaste ändringar",
 	"tog-hidepatrolled": "Dölj patrullerade redigeringar i senaste ändringar",
 	"tog-newpageshidepatrolled": "Dölj patrullerade sidor i listan över nya sidor",
-	"tog-hidecategorization": "Dölj kategorisering av sidor",
 	"tog-extendwatchlist": "Utöka bevakningslistan till att visa alla ändringar, inte bara den senaste",
 	"tog-usenewrc": "Gruppera ändringar efter sida i senaste ändringar och bevakningslistan",
 	"tog-numberheadings": "Automatisk numrerade rubriker",
@@ -103,7 +102,6 @@
 	"tog-watchlisthideliu": "Visa inte redigeringar av inloggade användare i bevakningslistan",
 	"tog-watchlisthideanons": "Dölj redigeringar av anonyma användare i bevakningslistan",
 	"tog-watchlisthidepatrolled": "Dölj patrullerade redigeringar i bevakningslistan",
-	"tog-watchlisthidecategorization": "Dölj kategorisering av sidor",
 	"tog-ccmeonemails": "Skicka kopior till mig av e-post jag skickar till andra användare",
 	"tog-diffonly": "Visa inte sidinnehåll under diffar",
 	"tog-showhiddencats": "Visa dolda kategorier",
@@ -488,6 +486,7 @@
 	"createacct-benefit-body2": "{{PLURAL:$1|sida|sidor}}",
 	"createacct-benefit-body3": "{{PLURAL:$1|nylig|nyliga}} bidragsgivare",
 	"badretype": "De lösenord du uppgett överensstämmer inte med varandra.",
+	"usernameinprogress": "Kontoskapandet för detta användarnamn är redan i full gång.\nVänligen vänta.",
 	"userexists": "Det valda användarnamnet används redan.\nVar god välj ett annat namn.",
 	"loginerror": "Inloggningsproblem",
 	"createacct-error": "Fel när konto skulle skapas",
@@ -578,7 +577,7 @@
 	"passwordreset-emailtitle": "Kontouppgifter på {{SITENAME}}",
 	"passwordreset-emailtext-ip": "Någon (förmodligen du, från IP-adressen $1) begärde en återställning av ditt lösenord för {{SITENAME}} ($4). Följande användar{{PLURAL:$3|konto är förknippad|konton är förknippade}} med denna e-postadress:\n\n$2\n\n{{PLURAL:$3|Detta|Dessa}} tillfälliga lösenord kommer att gå ut om {{PLURAL:$5|en dag|$5 dagar}}.\nDu bör logga in och välja ett nytt lösenord nu. Om någon annan gjorde denna begäran, eller om du kommer ihåg ditt ursprungliga lösenord, och inte längre önskar ändra det, kan du ignorera detta meddelande och fortsätta använda ditt gamla lösenord.",
 	"passwordreset-emailtext-user": "Användaren $1 på {{SITENAME}} begärde en återställning av ditt lösenord för {{SITENAME}} ($4). Följande användar{{PLURAL:$3|konto är förknippad|konton är förknippade}} med denna e-postadress:\n\n$2\n\n{{PLURAL:$3|Detta|Dessa}} tillfälliga lösenord kommer att gå ut om {{PLURAL:$5|en dag|$5 dagar}}.\nDu bör logga in och välja ett nytt lösenord nu. Om någon annan gjorde denna begäran, eller om du kommer ihåg ditt ursprungliga lösenord, och inte längre önskar ändra det, kan du ignorera detta meddelande och fortsätta använda ditt gamla lösenord.",
-	"passwordreset-emailelement": "Användarnamn: $1\nTillfälligt lösenord: $2",
+	"passwordreset-emailelement": "Användarnamn: \n$1\n\nTillfälligt lösenord: \n$2",
 	"passwordreset-emailsent": "En lösenordsåterställning via e-post har skickats.",
 	"passwordreset-emailsent-capture": "En lösenordsåterställning via e-post har skickats, som visas nedan.",
 	"passwordreset-emailerror-capture": "En lösenordsåterställning via e-post har skapats, som visas nedan, men det gick inte att skicka den till {{GENDER:$2|användaren}}: $1",
@@ -978,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}}",
@@ -1253,9 +1253,6 @@
 	"rcshowhidemine": "$1 mina ändringar",
 	"rcshowhidemine-show": "Visa",
 	"rcshowhidemine-hide": "Dölj",
-	"rcshowhidecategorization": "$1 kategorisering av sidor",
-	"rcshowhidecategorization-show": "Visa",
-	"rcshowhidecategorization-hide": "Dölj",
 	"rclinks": "Visa senaste $1 ändringar under de senaste $2 dygnen<br />$3",
 	"diff": "skillnad",
 	"hist": "historik",
@@ -1279,10 +1276,6 @@
 	"recentchangeslinked-summary": "Detta är en lista över de senaste ändringarna på sidor som länkas till från en given sida (eller på sidor som hör till en viss kategori).\nSidor på [[Special:Watchlist|din bevakningslista]] är markerade med '''fetstil'''.",
 	"recentchangeslinked-page": "Sidnamn:",
 	"recentchangeslinked-to": "Visa ändringar på sidor med länkar till den givna sidan istället",
-	"recentchanges-page-added-to-category": "[[:$1]] lades till i kategorin",
-	"recentchanges-page-added-to-category-bundled": "[[:$1]] och {{PLURAL:$2|en sida|$2 sidor}} lades till i kategorin",
-	"recentchanges-page-removed-from-category": "[[:$1]] togs bort från kategorin",
-	"recentchanges-page-removed-from-category-bundled": "[[:$1]] och {{PLURAL:$2|en sida|$2 sidor}} togs bort från kategorin",
 	"upload": "Ladda upp fil",
 	"uploadbtn": "Ladda upp fil",
 	"reuploaddesc": "Avbryt uppladdningen och gå tillbaka till uppladdningsformuläret.",
@@ -1703,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).",
@@ -1789,7 +1782,6 @@
 	"emailuser": "Skicka e-post till den här användaren",
 	"emailuser-title-target": "Skicka e-post till denna {{GENDER:$1|användare}}",
 	"emailuser-title-notarget": "E-postanvändare",
-	"emailpage": "Skicka e-post till användare",
 	"emailpagetext": "Du kan använda formuläret nedan för att skicka e-post till den här {{GENDER:$1|användaren}}.\nDen e-postadress du har angivit i [[Special:Preferences|dina användarinställningar]] kommer att visas som \"Från\"-adress i meddelandet, så att mottagaren har möjlighet att svara direkt till dig.",
 	"defemailsubject": "{{SITENAME}} e-post från användare \"$1\"",
 	"usermaildisabled": "Användar-e-post avaktiverat",
@@ -1811,7 +1803,7 @@
 	"emailccsubject": "Kopia av ditt meddelande till $1: $2",
 	"emailsent": "E-post har nu skickats",
 	"emailsenttext": "Ditt e-postmeddelande har skickats",
-	"emailuserfooter": "Detta e-postmeddelande skickades av $1 till $2 med funktionen \"{{int:emailpage}}\" på {{SITENAME}}.",
+	"emailuserfooter": "Detta e-postmeddelande skickades av $1 till $2 med funktionen \"{{int:emailuser}}\" på {{SITENAME}}.",
 	"usermessage-summary": "Lämnar systemmeddelande.",
 	"usermessage-editor": "Systemmeddelare",
 	"watchlist": "Bevakningslista",
@@ -2382,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",
@@ -3246,6 +3238,7 @@
 	"logentry-newusers-create2": "Användarkonto $3 har {{GENDER:$2|skapats}} av $1",
 	"logentry-newusers-byemail": "Användarkontot $3 har {{GENDER:$2|skapats}} av $1 och lösenordet skickades via e-post",
 	"logentry-newusers-autocreate": "Användarkontot $1 {{GENDER:$2|skapades}} automatiskt",
+	"logentry-protect-move_prot": "$1 {{GENDER:$2|flyttade}} skyddsinställningarna från $4 till $3",
 	"logentry-rights-rights": "$1 {{GENDER:$2|ändrade}} gruppmedlemskapet för $3 från $4 till $5",
 	"logentry-rights-rights-legacy": "$1 {{GENDER:$2|ändrade}} gruppmedlemskapet för $3",
 	"logentry-rights-autopromote": "$1 {{GENDER:$2|befordrades}} automatiskt från $4 till $5",
diff --git a/languages/i18n/sw.json b/languages/i18n/sw.json
index b565ada87d..41744930a1 100644
--- a/languages/i18n/sw.json
+++ b/languages/i18n/sw.json
@@ -524,7 +524,7 @@
 	"passwordreset-emailtitle": "Maelezo ya akaunti kwenye {{SITENAME}}",
 	"passwordreset-emailtext-ip": "Kuna mtu (huenda ikawa ni wewe, kutoka anwani ya IP $1) aliyeomba neno la siri la akaunti yako liwekwe upya katika {{SITENAME}} ($4). {{PLURAL:$3|Akaunti inayofuata imeunganishwa|Akaunti zinazofuata zimeunganishwa}} na anwani ya barua pepe hii:\n\n$2\n\n{{PLURAL:$3|Neno la siri hili litakwisha|Maneno ya siri haya yatakwisha}} baada ya siku {{PLURAL:$5|$5}}.\nUnafaa kuingia sasa na uchague neno jipya la siri. Kama mtu mwingine ameomba hili, au ikiwa umekumbuka neno lako la siri na hutaki kulibadilisha tena, basi usijali ujumbe huu, na uendelee kutumia neno la siri lako la zamani.",
 	"passwordreset-emailtext-user": "Mtumiaji $1 kwenye {{SITENAME}} ameomba neno la siri la akaunti yako liwekwe upya katika {{SITENAME}} ($4). {{PLURAL:$3|Akaunti inayofuata imeunganishwa|Akaunti zinazofuata zimeunganishwa}} na anwani ya barua pepe hii:\n\n$2\n\n{{PLURAL:$3|Neno la siri hili litakwisha|Maneno ya siri haya yatakwisha}} baada ya siku {{PLURAL:$5|one day|$5 siku}}.\nTafadhali ingia sasa na uchague neno jipya la siri. Kama mtu mwingine ameomba hili, au ikiwa umekumbuka neno lako la siri na hutaki kulibadilisha tena, basi usijali ujumbe huu, na uendelee kutumia neno la siri lako la zamani.",
-	"passwordreset-emailelement": "Jina la mtumiaji: $1\nNeno la siri la muda: $2",
+	"passwordreset-emailelement": "Jina la mtumiaji: \n$1\n\nNeno la siri la muda: \n$2",
 	"passwordreset-emailsent": "Barua pepe ya ukumbusho wa neno la siri imetumwa.",
 	"passwordreset-emailsent-capture": "Barua pepe ya ukukumbusho wa neno la siri imetumwa, ambayo inaonekana hapo chini.",
 	"passwordreset-emailerror-capture": "Barua pepe ya ukukumbusho wa neno la siri imetengenezwa, ambayo inaonekana hapo chini, lakini kuituma kwa mtumiaji {{GENDER:$2|user}} kumeshindikana: $1",
@@ -1601,7 +1601,6 @@
 	"emailuser": "Mtumie mtumiaji huyu barua pepe",
 	"emailuser-title-target": "Tumia barua pepe {{GENDER:$1|user}}",
 	"emailuser-title-notarget": "Kumtumia mtumiaji barua pepe",
-	"emailpage": "Kumtumia mtumiaji barua pepe",
 	"emailpagetext": "Utumie fomu iliopo chini ili kutuma barua pepe kwa mtumiaji huyu.\nAnwani yako ya barua pepe ulioitaja katika [[Special:Preferences|mapendekezo yako]] itaandikwa kwenye sanduku la anwani \"Kutoka kwa\" katika barua pepe, ili mtu atakayeipokea aweze kukujibu moja kwa moja.",
 	"defemailsubject": "Barua pepe ya {{SITENAME}} iliyotumwa na mtumiaji \"$1\"",
 	"usermaildisabled": "Uwezo wa kutuma barua pepe kwa mtumiaji umesitishwa",
diff --git a/languages/i18n/szl.json b/languages/i18n/szl.json
index 0cffa90e14..1abc1c567a 100644
--- a/languages/i18n/szl.json
+++ b/languages/i18n/szl.json
@@ -488,7 +488,7 @@
 	"passwordreset-email": "E-brif:",
 	"passwordreset-emailtitle": "Kůnto na {{GRAMMAR:MS.lp|{{SITENAME}}}}",
 	"passwordreset-emailtext-ip": "Ftoś (cheba Ty, s IP $1)\npado, aże chce informacyji lo konta do {{GRAMMAR:MS.lp{{SITENAME}}}} ($4).\nZe tym ausdrukym sům powjůnzane kůnta:\n$2\n\n{{PLURAL:$3|Tymczasowygo hasła|Tymczasowych hasył}} możno użyć we {{PLURAL:$5|jedyn dźyń|$5 dńi}}.\n\nJak chćołżeś gynał to zrobjyć, to zaloguj śe terozki a podej swoje hasło.\n\nJak ftoś inkszy chćoł nowe hasło abo jak Ci śe przipůmńoło stare a ńy chcysz nowygo, to zignoruj to a używej starygo hasła.",
-	"passwordreset-emailelement": "Mjano sprowjorza: $1\nTymczasowe hasło: $2",
+	"passwordreset-emailelement": "Mjano sprowjorza: \n$1\n\nTymczasowe hasło: \n$2",
 	"passwordreset-emailsent": "E-brif posłany.",
 	"passwordreset-emailsent-capture": "E-brif posłony, kerego widać niżej.",
 	"passwordreset-emailerror-capture": "Ńy udoło śe posłać wjadomości lo {{GENDER:$2|używocza|używoczki}}: $1",
@@ -1308,7 +1308,6 @@
 	"mailnologin": "Brak adresu",
 	"mailnologintext": "Muśyš śe [[Special:UserLogin|zalůgować]] i mjeć wpisany aktualny adres e-brif w swojich [[Special:Preferences|preferyncyjach]], coby můc wysuać e-brif do inkšygo užytkowńika.",
 	"emailuser": "Poślij tymu używoczowi e-brif",
-	"emailpage": "Wyślij e-brif do užytkowńika",
 	"emailpagetext": "Możesz użyć půńiższygo formularza, coby wysłać wjadůmość e-brif do tygo użytkowńika.\nAdres e-brifa, kery zostoł bez Ćebje wkludzůny we [[Special:Preferences|Twojich sztalowańach]], pojawi śe we polu „Uod”, bez cůż uodbjorca bydźe můg Ći uodpedźeć.",
 	"defemailsubject": "{{SITENAME}} - e-brif uod używacza \"$1\"",
 	"usermaildisabled": "E-brif używacza ńy załůnczony",
diff --git a/languages/i18n/ta.json b/languages/i18n/ta.json
index a14238c9ba..ab74dad100 100644
--- a/languages/i18n/ta.json
+++ b/languages/i18n/ta.json
@@ -549,7 +549,7 @@
 	"passwordreset-emailtitle": "{{SITENAME}} ல் கணக்கு விவரங்கள்",
 	"passwordreset-emailtext-ip": "யாராவது (அநேகமாக நீங்கள், IP முகவரி   $1 ல் இருந்து ), நினைவுபடுத்தி கோரிய உங்கள் கணக்கு\n விவரங்கள் நினைவுபடுத்தி {{SITENAME}} ( $4 ).பின்வரும் பயனர்  {{PLURAL:$3|account is|accounts are}}\n இந்த மின்னஞ்சல் முகவரியுடன் இணைக்கப்பட்டுள்ளது.\n$2\n{{PLURAL:$3|This temporary password|These temporary passwords}} காலாவதி ஆக உள்ள நாட்கள் {{PLURAL:$5|one day|$5 days}}.\nநீங்கள் புதிய கடவுச்சொல்லை இப்போதே தேர்வு செய்து வேண்டும், அல்லது வேறு யாராவது இந்த கோரிக்கையை அனுப்பியிருந்தாலோ\nஅல்லது உங்கள் மூல கடவுச்சொல் நினைவில் இருந்தாலோ இதை மாற்ற வேண்டிய அவசியம் இல்லை,நீங்கள் இந்த தகவலை புறக்கணித்துவிட்டுஉங்கள் பழைய கடவுச்சொல்லையே பயன்படுத்திக்கொள்ளலாம்.",
 	"passwordreset-emailtext-user": "பயனர் $1 {{SITENAME}} லிருந்து கடவுச்சொல் மீட்டமையினை {{SITENAME}}\n($4) க்கு கோரியுள்ளார்.பின்வரும் பயனர்  {{PLURAL:$3|account is|accounts are}}\n இந்த மின்னஞ்சல் முகவரியுடன் இணைக்கப்பட்டுள்ளது.\n$2\n{{PLURAL:$3|This temporary password|These temporary passwords}} காலாவதி ஆக உள்ள நாட்கள் {{PLURAL:$5|one day|$5 days}}.\nநீங்கள் புதிய கடவுச்சொல்லை இப்போதே தேர்வு செய்ய வேண்டும், அல்லது வேறு யாராவது இந்த கோரிக்கையை அனுப்பியிருந்தாலோ\nஅல்லது உங்கள் மூல கடவுச்சொல் நினைவில் இருந்தாலோ இதை மாற்ற வேண்டிய அவசியம் இல்லை,நீங்கள் இந்த தகவலை புறக்கணித்துவிட்டுஉங்கள் பழைய கடவுச்சொல்லையே பயன்படுத்திக்கொள்ளலாம்.",
-	"passwordreset-emailelement": "பயனர் பெயர்:  $1\nதற்காலிகக் கடவுச்சொல்: $2",
+	"passwordreset-emailelement": "பயனர் பெயர்:  \n$1\n\nதற்காலிகக் கடவுச்சொல்: \n$2",
 	"passwordreset-emailsent": "கடவுச்சொல் மீட்டமைக்கும் மின்னஞ்சல் அனுப்பப்பட்டது.",
 	"passwordreset-emailsent-capture": "கீழே காண்பிக்கப்பட்டுள்ளது போல் கடவுச்சொல் மீட்டமைக்கும் மின்னஞ்சல் அனுப்பப்பட்டது.",
 	"passwordreset-emailerror-capture": "கடவுச்சொல் மீட்டமைக்கும் மின்னஞ்சல்  உருவாக்கப்பட்டுவிட்டது, அது கீழே காட்டப்பட்டுள்ளது, ஆனால் {{GENDER:$2|user}} அனுப்புவது தோல்வியடைந்தது:$1",
@@ -1198,7 +1198,7 @@
 	"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 தொடக்கம் செய்யப்பட்ட புதிய மாற்றங்களைக் காட்டவும்",
+	"rclistfrom": "$2, $3 தொடக்கம் செய்யப்பட்ட புதிய மாற்றங்களைக் காட்டவும்",
 	"rcshowhideminor": "சிறிய தொகுப்புகளை $1",
 	"rcshowhideminor-show": "காட்டு",
 	"rcshowhideminor-hide": "மறை",
@@ -1703,7 +1703,6 @@
 	"emailuser": "இப் பயனருக்கு மின்னஞ்சல் செய்",
 	"emailuser-title-target": "{{GENDER:$1|user}} என்ற பயனருக்கு மின்னஞ்சல் செய்",
 	"emailuser-title-notarget": "பயனருக்கு மின்னஞ்சல் செய்",
-	"emailpage": "மின்னஞ்சல் பயனர்",
 	"emailpagetext": "நீங்கள் கீழ்வரும் படிவத்தை உபயோகித்து {{GENDER:$1|பயனருக்கு}} மின்னஞ்சல் செய்யலாம்.\n[[Special:Preferences|என் விருப்பத்தேர்வுகளில்]] நீங்கள் கொடுத்துள்ள மின்னஞ்சல் முகவரி மின்னஞ்சலின் \"From\" முகவரியாகக் காட்சி தரும், இதனால் பெறுநர் உங்களுக்கு நேரடியாக பதில் எழுத முடியும்.",
 	"defemailsubject": "{{SITENAME}} மின்னஞ்சல் பயனர்  \"$1\"-இடமிருந்து.",
 	"usermaildisabled": "பயனரின் மின்னஞ்சல் செயலிழக்கச் செய்யப்பட்டுள்ளது",
@@ -1725,7 +1724,7 @@
 	"emailccsubject": "$1 பயனருக்கான உங்கள் மின்னஞ்சலின் நகல்: $2",
 	"emailsent": "மின்னஞ்சல் அனுப்பப்பட்டது",
 	"emailsenttext": "உங்கள் மின்னஞ்சல் செய்தி அனுப்பப்பட்டது.",
-	"emailuserfooter": "இந்த மின்னஞ்சல் $1ஆல்  $2க்கு   \"{{int:emailpage}}\" செயல்பாடு   மூலம் {{SITENAME}} லிருந்து அனுப்பப்பட்டது.",
+	"emailuserfooter": "இந்த மின்னஞ்சல் $1ஆல்  $2க்கு   \"{{int:emailuser}}\" செயல்பாடு   மூலம் {{SITENAME}} லிருந்து அனுப்பப்பட்டது.",
 	"usermessage-summary": "அமைப்பின் தகவலை விட்டுவிடுகிறது.",
 	"usermessage-editor": "அமைப்பு தூதன்(messenger).",
 	"watchlist": "கவனிப்புப் பட்டியல்",
diff --git a/languages/i18n/te.json b/languages/i18n/te.json
index eedd87ba58..886f757673 100644
--- a/languages/i18n/te.json
+++ b/languages/i18n/te.json
@@ -532,7 +532,7 @@
 	"passwordreset-emailtitle": "{{SITENAME}}లో ఖాతా వివరాలు",
 	"passwordreset-emailtext-ip": "ఎవరో (బహుశా మీరే, ఐపీ అడ్రసు $1 నుంచి)  {{SITENAME}} ($4) లో మీ సంకేతపదాన్ని మార్చమంటూ అడిగారు. కింది వాడుకరి {{PLURAL:$3|ఖాతా|ఖాతాలు}}\nఈ ఈమెయిలు చిరునామాతో అనుసంధింపబడి ఉన్నాయి:\n\n$2\n\n{{PLURAL:$3|ఈ సంకేతపదానికి|ఈ సంకేతపదాలకు}} {{PLURAL:$5|ఒక్కరోజులో|$5 రోజుల్లో}} కాలం చెల్లుతుంది.\nఇప్పుడు మీరు లాగినై కొత్త సంకేతపదాన్ని ఎంచుకోవాల్సి ఉంటుంది. ఈ అభ్యర్ధన చేసింది మరెవరైనా అయినా, లేక మీ అసలు సంకేతపదం మీకు గుర్తొచ్చి దాన్ని మార్చాల్సిన అవసరం లేదని అనుకున్నా, మీరీ సందేశాన్ని పట్టించుకోనక్కర్లేదు. పాత సంకేతపదాన్నే వాడుకోవచ్చు.",
 	"passwordreset-emailtext-user": "{{SITENAME}} లోని వాడుకరి $1, {{SITENAME}} ($4) లోని మీ సంకేతపదాన్ని మార్చమంటూ అడిగారు. కింది వాడుకరి {{PLURAL:$3|ఖాతా|ఖాతాలు}}\nఈ ఈమెయిలు అడ్రసుతో అనుసంధింపబడి ఉన్నాయి:\n\n$2\n\n{{PLURAL:$3|ఈ తాత్కాలిక సంకేతపదానికి|ఈ తాత్కాలిక సంకేతపదాలకు}} {{PLURAL:$5|ఒక్క రోజులో|$5 రోజుల్లో}} కాలం చెల్లుతుంది.\nఇప్పుడు మీరు లాగినై కొత్త సంకేతపదాన్ని ఎంచుకోవాల్సి ఉంటుంది. ఈ అభ్యర్ధన చేసింది మరెవరైనా అయినా, లేక మీ అసలు సంకేతపదం మీకు గుర్తొచ్చి దాన్ని మార్చాల్సిన అవసరం లేదని అనుకున్నా, మీరీ సందేశాన్ని పట్టించుకోనక్కర్లేదు. పాత సంకేతపదాన్నే వాడుకోవచ్చు.",
-	"passwordreset-emailelement": "వాడుకరిపేరు: $1\nతాత్కాలిక సంకేతపదం: $2",
+	"passwordreset-emailelement": "వాడుకరిపేరు: \n$1\n\nతాత్కాలిక సంకేతపదం: \n$2",
 	"passwordreset-emailsent": "సంకేతపదం మార్పు ఈమెయిలును పంపించాం.",
 	"passwordreset-emailsent-capture": "క్రింద చూపిన సంకేతపదం మార్పు ఈమెయిలును పంపించాం.",
 	"passwordreset-emailerror-capture": "కింద చూపిన సంకేతపదం మార్పు ఈమెయిలును తయారుచేసాం. కానీ దాన్ని {{GENDER:$2|వాడుకరికి}} పంపడం విఫలమైంది: $1",
@@ -1687,7 +1687,6 @@
 	"emailuser": "ఈ వాడుకరికి ఈ-మెయిలుని పంపించండి",
 	"emailuser-title-target": "ఈ {{GENDER:$1|వాడుకరికి}} ఈమెయిలు పంపించండి",
 	"emailuser-title-notarget": "వాడుకరికి ఈమెయిలు పంపించండి",
-	"emailpage": "వాడుకరికి ఈ-మెయిలుని పంపించు",
 	"emailpagetext": "ఈ {{GENDER:$1|వాడుకరికి}} ఈమెయిలు సందేశము పంపించుటకు క్రింది ఫారంను ఉపయోగించవచ్చు. [[Special:Preferences|మీ వాడుకరి అభిరుచుల]]లో మీరిచ్చిన ఈ-మెయిలు చిరునామా \"నుండి\" ఆ సందేశం వచ్చినట్లుగా ఉంటుంది, కనుక వేగుని అందుకునేవారు నేరుగా మీకు జవాబివ్వగలుగుతారు.",
 	"defemailsubject": "వాడుకరి \"$1\" నుండి {{SITENAME}} ఈ-మెయిలు",
 	"usermaildisabled": "వాడుకరి ఈమెయిలు అచేతనం చెయ్యబడింది",
diff --git a/languages/i18n/tg-cyrl.json b/languages/i18n/tg-cyrl.json
index fc2bdc3dbe..5fa4535762 100644
--- a/languages/i18n/tg-cyrl.json
+++ b/languages/i18n/tg-cyrl.json
@@ -457,7 +457,7 @@
 	"passwordreset-domain": "Домана:",
 	"passwordreset-email": "Нишонаи почтаи электронӣ:",
 	"passwordreset-emailtitle": "Мушаххасоти ҳисоб дар {{SITENAME}}",
-	"passwordreset-emailelement": "Номи корбарӣ: $1\nГузарвожаи муваққатӣ: $2",
+	"passwordreset-emailelement": "Номи корбарӣ: \n$1\n\nГузарвожаи муваққатӣ: \n$2",
 	"changeemail": "Тағийри нишонаи email",
 	"changeemail-oldemail": "Нишонаи почтаи кунунӣ:",
 	"changeemail-newemail": "Нишонаи почтаи нав:",
@@ -1237,7 +1237,6 @@
 	"mailnologintext": "Барои фиристодани почтаи электронӣ барои корбарони дигар бояд [[Special:UserLogin|ба систем ворид шавед]] ва нишонаи почтаи электронии мӯътабар дар [[Special:Preferences|тарҷиҳоти]] худ дошта бошед.",
 	"emailuser": "Фиристодани email ба ин корбар",
 	"emailuser-title-notarget": "Фиристодани пайём ба корбар",
-	"emailpage": "Почтаи электронӣ ба корбар",
 	"emailpagetext": "Агар ин корбар нишонаи почтаи электронии мӯътабаре дар тарҷиҳоти ворид карда бошад, форми зерин як пайғоме мефиристад.\nНишонаи почтаи электроние, ки шумо дар тарҷиҳоти корбариатон ворид кардаед, дар нишони фиристандаи нома \"From\" хоҳад омад, то ки гиранда тавонад ба шумо посух диҳад.",
 	"defemailsubject": "Пайёми {{SITENAME}} аз корбар \"$1\"",
 	"noemailtitle": "Нишонаи почтаи электронӣ мавҷуд нест",
diff --git a/languages/i18n/th.json b/languages/i18n/th.json
index f3a65a7093..b0ce154a9f 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": "การสร้างบัญชีผิดพลาด",
@@ -518,7 +519,7 @@
 	"passwordreset-emailtitle": "รายละเอียดบัญชีบน {{SITENAME}}",
 	"passwordreset-emailtext-ip": "บางคน (ซึ่งอาจเป็นคุณ จากเลขที่อยู่ไอพี $1) ขอตั้งรหัสผ่านของคุณใหม่บน{{SITENAME}} ($4) บัญชีผู้ใช้ดังกล่าวเกี่ยวข้องกับที่อยู่อีเมลนี้:\n\n$2\n\n{{PLURAL:$3|รหัสผ่านชั่วคราวนี้|รหัสผ่านชั่วคราวเหล่านี้}}จะหมดอายุใน $5 วัน\nตอนนี้คุณควรล็อกอินและเลือกรหัสผ่านใหม่ หากบุคคลอื่นขอตั้งรหัสผ่านใหม่นี้ หรือคุณจำรหัสผ่านเดิมของคุณได้แล้ว และคุณไม่ต้องการเปลี่ยนรหัสผ่านอีก คุณอาจละเลยข้อความนี้และใช้รหัสผ่านเดิมของคุณต่อไป",
 	"passwordreset-emailtext-user": "ผู้ใช้ $1 บน {{SITENAME}} ขอตั้งรหัสผ่านของคุณใหม่สำหรับ {{SITENAME}} ($4) {{PLURAL:$3||}}บัญชีผู้ใช้ดังกล่าวเกี่ยวข้องกับที่อยู่อีเมลนี้:\n\n$2\n\n{{PLURAL:$3|รหัสผ่านชั่วคราวนี้|รหัสผ่านชั่วคราวเหล่านี้}}จะหมดอายุใน $5 วัน\nตอนนี้คุณควรล็อกอินและเลือกรหัสผ่านใหม่ หากบุคคลอื่นขอตั้งรหัสผ่านใหม่นี้ หรือคุณจำรหัสผ่านเดิมของคุณได้แล้ว และคุณไม่ต้องการเปลี่ยนรหัสผ่านอีก คุณอาจละเลยข้อความนี้และใช้รหัสผ่านเดิมของคุณต่อไป",
-	"passwordreset-emailelement": "ชื่อผู้ใช้: $1\nรหัสผ่านชั่วคราว: $2",
+	"passwordreset-emailelement": "ชื่อผู้ใช้: \n$1\n\nรหัสผ่านชั่วคราว: \n$2",
 	"passwordreset-emailsent": "อีเมลตั้งรหัสผ่านใหม่ถูกส่งไปแล้ว",
 	"passwordreset-emailsent-capture": "อีเมลตั้งรหัสผ่านใหม่ถูกส่งไปแล้ว ซึ่งแสดงด้านล่าง",
 	"passwordreset-emailerror-capture": "อีเมลตั้งรหัสผ่านใหม่ถูกสร้างขึ้นแล้ว ซึ่งแสดงด้านล่าง แต่ไม่สามารถส่งไปยัง{{GENDER:$2|ผู้ใช้}}: $1",
@@ -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 วัน",
@@ -1176,8 +1179,6 @@
 	"rcshowhidemine": "$1การแก้ไขของฉัน",
 	"rcshowhidemine-show": "แสดง",
 	"rcshowhidemine-hide": "ซ่อน",
-	"rcshowhidecategorization-show": "แสดง",
-	"rcshowhidecategorization-hide": "ซ่อน",
 	"rclinks": "แสดงการปรับปรุงล่าสุด $1 รายการ ในช่วง $2 วันที่ผ่านมา<br />$3",
 	"diff": "ต่าง",
 	"hist": "ประวัติ",
@@ -1297,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\"",
@@ -1564,7 +1577,7 @@
 	"booksources-text": "ด้านล่างเป็นรายการการเชื่อมโยงไปยังเว็บไซต์อื่นที่ขายหนังสือใหม่และหนังสือใช้แล้ว และอาจมีสารสนเทศเพิ่มเติมเกี่ยวกับหนังสือที่คุณกำลังมองหา:",
 	"booksources-invalid-isbn": "รหัส ISBN ที่ให้ไว้ไม่ถูกต้อง กรุณาตรวจสอบจากต้นฉบับอีกครั้ง",
 	"specialloguserlabel": "ผู้ดำเนินการ:",
-	"speciallogtitlelabel": "เป้าหมาย (ชื่อเรื่องหรือผู้ใช้):",
+	"speciallogtitlelabel": "เป้าหมาย (ชื่อเรื่องหรือ {{ns:user}}:ชื่อผู้ใช้ สำหรับผู้ใช้):",
 	"log": "ปูม",
 	"all-logs-page": "ปูมสาธารณะทั้งหมด",
 	"alllogstext": "การแสดงผลรวมปูมที่มีทั้งหมดของ {{SITENAME}}\nคุณสามารถค้นหาให้ละเอียดขึ้นโดยเลือกประเภทปูม ชื่อผู้ใช้หรือหน้าที่ต้องการ (ไวต่ออักษรใหญ่เล็ก)",
@@ -1645,7 +1658,6 @@
 	"emailuser": "ส่งอีเมลหาผู้ใช้นี้",
 	"emailuser-title-target": "ส่งอีเมลหา{{GENDER:$1|ผู้ใช้}}",
 	"emailuser-title-notarget": "อีเมลผู้ใช้",
-	"emailpage": "อีเมลผู้ใช้",
 	"emailpagetext": "คุณสามารถใช้แบบด้านล่างส่งอีเมลหา{{GENDER:$1|ผู้ใช้}}นี้\nที่อยู่อีเมลที่คุณกรอกใน[[Special:Preferences|การตั้งค่าส่วนตัวของคุณ]]จะปรากฏเป็นที่อยู่ \"จาก\" ของอีเมล ซึ่งผู้รับสามารถตอบกลับคุณได้โดยตรง",
 	"defemailsubject": "อีเมล {{SITENAME}} จากผู้ใช้ \"$1\"",
 	"usermaildisabled": "ปิดใช้งานการส่งอีเมลหาผู้ใช้",
@@ -2205,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/tk.json b/languages/i18n/tk.json
index 9e88060a52..305e972068 100644
--- a/languages/i18n/tk.json
+++ b/languages/i18n/tk.json
@@ -381,7 +381,7 @@
 	"passwordreset": "Paroly nol et",
 	"passwordreset-username": "Ulanyjy ady:",
 	"passwordreset-domain": "Domen:",
-	"passwordreset-emailelement": "Ulanyjy ady: $1\nWagtlaýyn parol: $2",
+	"passwordreset-emailelement": "Ulanyjy ady: \n$1\n\nWagtlaýyn parol: \n$2",
 	"changeemail": "E-poçta adresini üýtget",
 	"changeemail-oldemail": "Häzirki e-poçta adresi:",
 	"changeemail-newemail": "Täze e-poçta adresi:",
@@ -1270,7 +1270,6 @@
 	"mailnologin": "Iberer ýaly adres ýok",
 	"mailnologintext": "Başga ulanyjylara e-poçta ibermek üçin [[Special:UserLogin|sessiýaňyz açyk bolmaly]] hem-de [[Special:Preferences|ileri tutmalarda]] dogry bir e-poçta adresiňiz bolmalydyr.",
 	"emailuser": "Bu ulanyja e-poçta iber",
-	"emailpage": "Ulanyja e-poçta iber",
 	"emailpagetext": "Bu ulanyja e-poçta habarlaşygy ibermek üçin aşakdaky formdan peýdalanyp bilersiňiz.\n[[Special:Preferences|Ulanyjy ileri tutmalaryňyzda]] görkezen e-poçta adresiňiz e-poçtanyň \"Kimden\" adresinde peýda bolar, şeýlelikde kabul ediji size gönüden-göni jogap berip biler.",
 	"defemailsubject": "{{SITENAME}} e-poçtasy",
 	"usermaildisabled": "Ulanyjy e-poçtasy ýapyk",
diff --git a/languages/i18n/tl.json b/languages/i18n/tl.json
index 5ae0a43025..f3cb69635c 100644
--- a/languages/i18n/tl.json
+++ b/languages/i18n/tl.json
@@ -504,7 +504,7 @@
 	"passwordreset-emailtitle": "Mga detalye ng account sa {{SITENAME}}",
 	"passwordreset-emailtext-ip": "Isang tao (marahil ay ikaw, mula sa IP address na $1) ang humiling ng isang paalala sa iyong mga detalye ng account para sa {{SITENAME}} ($4). Ang sumusunod na {{PLURAL:$3|account ng tagagamit ay|mga account ng tagagamit ay}} may kaugnayan sa email address na ito:\n\n$2\n\n{{PLURAL:$3|Ang pansamantalang password na ito|Ang mga pansamantalang password na ito}} ay mawawalan ng bisa sa loob ng {{PLURAL:$5|isang araw|$5 araw}}.\nDapat kang mag-login at pumili ng isang bagong password ngayon. Kung ibang tao ang gumawa ng kahilingang ito, o kung naalala mo na ang orihinal mong password, at hindi mo na nais palitan ito, maaari mong huwag nang pansinin ang mensaheng ito at magpatuloy sa paggamit ng luma mong password.",
 	"passwordreset-emailtext-user": "Ang tagagamit na si $1 sa {{SITENAME}} ay humiling ng isang paalala ng iyong mga akawnt ng detalye para sa {{SITENAME}}\n($4). Ang sumusunod na pangtagagamit na {{PLURAL:$3|akawnt ay|mga akawnt ay}} may kaugnayan sa tirahang ito ng e-liham:\n\n$2\n\n{{PLURAL:$3|Ang pansamantalang hudyat na ito|Ang pansamantalang mga hudyat na ito}} mawawalan ng bias sa loob ng {{PLURAL:$5|isang araw|$5 mga araw}}.\nDapat kang lumagda at pumili ng isang hudyat ngayon. Kung ibang tao ang gumawa ng kahilingang ito, o kung naalala mo na ang iyong orihinal na hudyat, at hindi mo na nais palitan pa ito, maaari mong huwag nang pansinin ang mensaheng ito at magpatuloy sa paggamit ng iyong lumang hudyat.",
-	"passwordreset-emailelement": "Pangalan ng tagagamit: $1\nPansamantalang password: $2",
+	"passwordreset-emailelement": "Pangalan ng tagagamit: \n$1\n\nPansamantalang password: \n$2",
 	"passwordreset-emailsent": "Naipadala na ang isang e-liham na pampaalala.",
 	"passwordreset-emailsent-capture": "Naipadala na ang isang e-liham na paalala, na ipinapakita sa ibaba.",
 	"passwordreset-emailerror-capture": "Nalikha na ang isang e-liham na paalala, na ipinapakita sa ibaba, subalit nabigo ang pagpapadala sa tagagamit: $1",
@@ -1545,7 +1545,6 @@
 	"emailuser": "Padalhan ng e-liham ang tagagamit",
 	"emailuser-title-target": "Padalhan ng elektronikong liham ang {{GENDER:$1|tagagamit}} na ito",
 	"emailuser-title-notarget": "Padalhan ng e-liham ang tagagamit",
-	"emailpage": "Magpadala ng e-liham sa tagagamit",
 	"emailpagetext": "Magagamit mo ang pormularyo sa ibaba para makapagpadala ng mensahe sa pamamagitan ng isang e-liham para sa tagagamit na ito.\nAng ipinasok mong direksiyong e-liham sa [[Special:Preferences|iyong mga kagustuhan ng tagagamit]] ay lilitaw bilang adres na \"Mula kay\" ng e-liham, para tuwirang makatugon sa iyo ang nakatanggap.",
 	"defemailsubject": "E-liham ng {{SITENAME}} mula sa tagagamit na si \"$1\"",
 	"usermaildisabled": "Hindi pinagana ang e-liham ng tagagamit",
diff --git a/languages/i18n/tr.json b/languages/i18n/tr.json
index 42f20774c4..fdf32263c6 100644
--- a/languages/i18n/tr.json
+++ b/languages/i18n/tr.json
@@ -76,7 +76,9 @@
 			"Ömer Berkay",
 			"Demircimehmed",
 			"Uğurkent",
-			"Kincki"
+			"Kincki",
+			"McAang",
+			"Captantrips"
 		]
 	},
 	"tog-underline": "Bağlantıların altını çiz:",
@@ -244,7 +246,7 @@
 	"print": "Yazdır",
 	"view": "Görüntüle",
 	"view-foreign": "$1 üzerinde gör",
-	"edit": "Düzenle",
+	"edit": "Değiştir",
 	"edit-local": "Yerel açıklamayı düzenle",
 	"create": "Oluştur",
 	"create-local": "Yerel açıklama ekle",
@@ -591,7 +593,7 @@
 	"passwordreset-emailtitle": "{{SITENAME}} hesap detayları",
 	"passwordreset-emailtext-ip": "Birisi, (muhtemelen siz, $1 IP adresinden) {{SITENAME}} ($4) için hesap bilgilerinizin \nhatırlatılmasını istedi. Aşağıdaki kullanıcı {{PLURAL:$3|hesabı|hesapları}} bu e-posta adresiyle ilişkili:\n\n$2\n\n{{PLURAL:$3|Bu geçici şifre|Bu geçici şifreler}} {{PLURAL:$5|bir gün|$5  gün}} geçerlidir.\nBu geçici parola ile giriş yapın ve yeni bir şifre seçin. Şifre değişimini siz istemediyseniz veya şifrenizi hatırladıysanız ve artık şifrenizi değiştirmek istemiyorsanız; bu iletiyi önemsemeyerek eski şifrenizi kullanmaya devam edebilirsiniz.",
 	"passwordreset-emailtext-user": "$1 adlı kullanıcı, {{SITENAME}} ($4) için hesap bilgilerinizin hatırlatılmasını istedi. Aşağıdaki kullanıcı {{PLURAL:$3|hesabı|hesapları}} bu e-posta adresiyle ilişkili:\n\n$2\n\n{{PLURAL:$3|Bu geçici şifre|Bu geçici şifreler}} {{PLURAL:$5|bir gün|$5  gün}} geçerlidir.\nBu geçici parola ile giriş yapın ve yeni bir şifre seçin. Bu talep bir başkasına aitse veya şifrenizi hatırladıysanız ve artık şifrenizi değiştirmek istemiyorsanız; bu iletiyi önemsemeyerek eski şifrenizi kullanmaya devam edebilirsiniz.",
-	"passwordreset-emailelement": "Kullanıcı adı: $1\nGeçici şifre: $2",
+	"passwordreset-emailelement": "Kullanıcı adı: \n$1\n\nGeçici şifre: \n$2",
 	"passwordreset-emailsent": "Parola sıfırlama e-postası gönderildi.",
 	"passwordreset-emailsent-capture": "Aşağıda gözüktüğü gibi bir parola sıfırlama e-postası gönderildi.",
 	"passwordreset-emailerror-capture": "Aşağıda gözüktüğü gibi bir parola sıfırlama e-postası oluşturuldu ancak {{GENDER:$2|kullanıcıya}} gönderme işlemi başarısız oldu: $1",
@@ -1266,8 +1268,6 @@
 	"rcshowhidemine": "Benim değişikliklerimi $1",
 	"rcshowhidemine-show": "göster",
 	"rcshowhidemine-hide": "gizle",
-	"rcshowhidecategorization-show": "Göster",
-	"rcshowhidecategorization-hide": "Gizle",
 	"rclinks": "Son $2 günde yapılan son $1 değişikliği göster;<br /> $3",
 	"diff": "fark",
 	"hist": "geçmiş",
@@ -1291,7 +1291,6 @@
 	"recentchangeslinked-summary": "Aşağıdaki liste, belirtilen sayfaya (ya da belirtilen kategorinin üyelerine) bağlantı veren sayfalarda yapılan son değişikliklerin listesidir.\n[[Special:Watchlist|İzleme listenizdeki]] sayfalar '''kalın''' olarak belirtilmiştir.",
 	"recentchangeslinked-page": "Sayfa adı:",
 	"recentchangeslinked-to": "Belirtilen sayfadan verilenler yerine, sayfaya verilen bağlantıları göster.",
-	"recentchanges-page-added-to-category": "[[:$1]] kategoriye eklendi",
 	"upload": "Dosya yükle",
 	"uploadbtn": "Dosya yükle",
 	"reuploaddesc": "Yükleme formuna geri dön.",
@@ -1397,7 +1396,14 @@
 	"upload-http-error": "Bir HTTP hatası oluştu: $1",
 	"upload-copy-upload-invalid-domain": "Kopya yüklemeler bu etki alanında mevcut değil.",
 	"upload-dialog-button-cancel": "Ä°ptal",
+	"upload-dialog-button-save": "Kaydet",
+	"upload-dialog-button-upload": "Yükle",
+	"upload-dialog-label-select-file": "Dosya seç",
+	"upload-dialog-label-infoform-title": "Ayrıntılar",
+	"upload-dialog-label-infoform-name": "Ad",
+	"upload-dialog-label-infoform-description": "Açıklama",
 	"upload-dialog-label-usage-title": "Kullanımı",
+	"upload-dialog-label-usage-filename": "Dosya adı",
 	"backend-fail-stream": "$1 dosyası okunamadı.",
 	"backend-fail-backup": "\"$1\" dosyası yedeklenemedi.",
 	"backend-fail-notexists": "$1 dosyası mevcut değil.",
@@ -1782,7 +1788,6 @@
 	"emailuser": "Bu kullanıcıya e-posta gönder",
 	"emailuser-title-target": "Bu {{GENDER:$1|kullanıcıya}} e-posta gönder",
 	"emailuser-title-notarget": "Kullanıcı e-posta",
-	"emailpage": "Kullanıcıya e-posta gönder",
 	"emailpagetext": "Bu {{GENDER:$1|kullanıcıya}} e-posta iletisi göndermek için aşağıdaki formu kullanabilirsiniz.\n[[Special:Preferences|Kullanıcı tercihlerinizde]] girdiğiniz e-posta adresiniz, e-postanın \"From (Kimden)\" adresinde görünecektir, bu yüzden alıcı size doğrudan yanıt verebilecektir.",
 	"defemailsubject": "\"$1\" kullanıcısından {{SITENAME}} e-postası",
 	"usermaildisabled": "Kullanıcı e-postası devre dışı",
@@ -1804,7 +1809,7 @@
 	"emailccsubject": "$1'e gönderdiğiniz mesajın kopyası: $2",
 	"emailsent": "E-posta gönderildi",
 	"emailsenttext": "E-postanız gönderildi.",
-	"emailuserfooter": "Bu e-posta $1 tarafından $2 kullanıcısına, {{SITENAME}} sitesindeki \"Kullanıcıya e-posta gönder\" (\"{{int:emailpage}}\") fonksiyonu ile gönderilmiştir.",
+	"emailuserfooter": "Bu e-posta $1 tarafından $2 kullanıcısına, {{SITENAME}} sitesindeki \"Kullanıcıya e-posta gönder\" (\"{{int:emailuser}}\") fonksiyonu ile gönderilmiştir.",
 	"usermessage-summary": "Sistem mesajı bırakın.",
 	"usermessage-editor": "Sistem habercisi",
 	"watchlist": "Ä°zleme listesi",
@@ -2344,7 +2349,7 @@
 	"tooltip-ca-watch": "Bu sayfayı izleme listenize ekleyin",
 	"tooltip-ca-unwatch": "Bu sayfayı izleme listenizden çıkarın",
 	"tooltip-search": "{{SITENAME}} içinde ara",
-	"tooltip-search-go": "Eğer varsa, tam bu addaki bir sayfaya git",
+	"tooltip-search-go": "Eğer varsa, aynı isimli sayfaya gidin",
 	"tooltip-search-fulltext": "Sayfalarda bu metni ara",
 	"tooltip-p-logo": "Ana sayfayı ziyaret edin",
 	"tooltip-n-mainpage": "Ana sayfaya git",
@@ -2368,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",
@@ -2408,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/tt-cyrl.json b/languages/i18n/tt-cyrl.json
index 99a6fd0313..9179c20d84 100644
--- a/languages/i18n/tt-cyrl.json
+++ b/languages/i18n/tt-cyrl.json
@@ -23,7 +23,8 @@
 			"아라",
 			"Derslek",
 			"Macofe",
-			"Selimcan"
+			"Selimcan",
+			"Исмаил Садуев"
 		]
 	},
 	"tog-underline": "Сылтамаларның астына сызу:",
@@ -164,7 +165,7 @@
 	"qbfind": "Эзләү",
 	"qbbrowse": "Карау",
 	"qbedit": "Үзгәртү",
-	"qbpageoptions": "Бу бит",
+	"qbpageoptions": "АгӀонан тодарш",
 	"qbmyoptions": "Битләрем",
 	"faq": "ЕБС",
 	"faqpage": "Project:ЕБС",
@@ -492,7 +493,7 @@
 	"passwordreset-emailtitle": "{{SITENAME}} хисап язмасы турында мәгълүматлар",
 	"passwordreset-emailtext-ip": "Кемдер (бәлки, сездер, $1 IP-адресыннан) {{SITENAME}} ($4) проектында сезнең серсүзне искә төшерүне сорады.\n{{PLURAL:$3|1=Түбәндәге хисап язмасы|Түбәндәге хисап язмалары}} бу электрон әрҗә адресы белән бәйле:\n\n$2\n\n{{PLURAL:$3|1=Бу вакытлы серсүз|Бу вакытлы серсүзләр}} {{PLURAL:$5|$5 көн}} дәвамында эшлиячәкләр.\nСез системага керергә һәм яңа серсүз сайларга тиешсез.\nӘгәр сез серсүз сорамаган булсагыз яки элеккеге серсүзегезне искә төшерсәгез \nһәм аны үзгәртергә теләмәсәгез, бу хатка җавап бирмәгез\nһәм элеккеге серсүзегезне кулланыгыз.",
 	"passwordreset-emailtext-user": "{{SITENAME}} проектыннан $1 кулланучысы {{SITENAME}} ($4) проектында сезнең серсүзне искә төшерүне сорады.\n{{PLURAL:$3|1=Түбәндәге хисап язмасы|Түбәндәге хисап язмалары}} бу электрон әрҗә адресы белән бәйле:\n\n$2\n\n{{PLURAL:$3|1=Бу вакытлы серсүз|Бу вакытлы серсүзләр}} {{PLURAL:$5|$5 көн}} дәвамында эшлиячәкләр.\nСез системага керергә һәм яңа серсүз сайларга тиешсез.\nӘгәр сез серсүз сорамаган булсагыз яки элеккеге серсүзегезне искә төшерсәгез \nһәм аны үзгәртергә теләмәсәгез, бу хатка җавап бирмәгез\nһәм элеккеге серсүзегезне кулланыгыз.",
-	"passwordreset-emailelement": "Кулланучы исеме: $1\nВакытлыча серсүз: $2",
+	"passwordreset-emailelement": "Кулланучы исеме: \n$1\n\nВакытлыча серсүз: \n$2",
 	"passwordreset-emailsent": "Электрон әрҗәгә искәртү җибәрелгән иде",
 	"passwordreset-emailsent-capture": "Җибәрелгән хат-искәртү түбәндә китерелә",
 	"passwordreset-emailerror-capture": "Түбәндә язылган хат-искәртү китерелгән, аны җибәрмәүнең сәбәбе:$1",
@@ -1207,7 +1208,6 @@
 	"emailuser": "Бу кулланучыга хат",
 	"emailuser-title-target": "{{GENDER:$1|Кулланучыга}} электрон хат язу",
 	"emailuser-title-notarget": "Кулланучыга хат җибәрү",
-	"emailpage": "Кулланучыга хат җибәрү",
 	"emailpagetext": "Әлеге форма ярдәмендә {{GENDER:$1|кулланучының}} электрон почта адресына хат җибәрергә мөмкин. Җибәрелгән адрес исемендә Сезнең [[Special:Preferences|көйләнмәләрдә]] күрсәтелгән адресыгыз күрсәтеләчәк, шуның ярдәмендә Сез ул кулланучы белән турыдан-туры сөйләшә аласыз.",
 	"defemailsubject": "{{SITENAME}}: хат",
 	"noemailtitle": "Электрон почта адресы юк",
diff --git a/languages/i18n/tyv.json b/languages/i18n/tyv.json
index 9c7671b725..4f12c93438 100644
--- a/languages/i18n/tyv.json
+++ b/languages/i18n/tyv.json
@@ -282,11 +282,10 @@
 	"resetpass-submit-cancel": "Соксаары",
 	"resetpass-temp-password": "Түр чажыт сөс:",
 	"passwordreset": "Чажыт сөстү дүжүрү",
-	"passwordreset-legend": "Чажыт атты дүжүр",
 	"passwordreset-username": "Aжыглакчының ады:",
 	"passwordreset-domain": "Домен:",
 	"passwordreset-email": "Э-чагааның адреси:",
-	"passwordreset-emailelement": "Ажыглакчы ады: $1\nТүр чажыт сөс: $2",
+	"passwordreset-emailelement": "Ажыглакчы ады: \n$1\n\nТүр чажыт сөс: \n$2",
 	"changeemail": "Э-чагааның адресин өскертири",
 	"changeemail-oldemail": "Амгы э-чагааның адреси:",
 	"changeemail-newemail": "Чаа э-чагааның адреси:",
@@ -637,7 +636,6 @@
 	"nlinks": "$1 {{PLURAL:$1|холбаа}}",
 	"nmembers": "$1 {{PLURAL:$1|кежигүн}}",
 	"nrevisions": "$1 {{PLURAL:$1|үндүрери}}",
-	"nviews": "$1 {{PLURAL:$1|көрүш}}",
 	"specialpage-empty": "Бо илеткелдиң түңнели чок.",
 	"lonelypages": "Чааскаан арыннар",
 	"uncategorizedpages": "Бөлүк эвес арыннар",
diff --git a/languages/i18n/ug-arab.json b/languages/i18n/ug-arab.json
index a24fa9287d..0342666a2b 100644
--- a/languages/i18n/ug-arab.json
+++ b/languages/i18n/ug-arab.json
@@ -490,7 +490,7 @@
 	"passwordreset-emailtitle": "{{SITENAME}} دىكى ھېسابات تەپسىلاتى",
 	"passwordreset-emailtext-ip": "باشقىلار (بەلكىم سىز، IP ئادرېسى $1) {{SITENAME}} ($4) دىكى پارولنى قايتا بېكىتىشنى ئىلتىماس قىلدى. تۆۋەندىكى ئىشلەتكۈچىنىڭ {{PLURAL:$3|ھېسابات|ھېسابات}}ى مۇشۇ ئېلخەتكە باغلانغان:\n\n$2\n\n{{PLURAL:$3|بۇ ۋاقىتلىق پارول|بۇ ۋاقىتلىق پارول}} {{PLURAL:$5|بىر كۈن|$5 كۈن}}دە ۋاقتى ئۆتىدۇ. ئەگەر بۇ مەشغۇلاتنى سىز ئىلتىماس قىلغان بولسىڭىز، دەرھال تىزىمغا كىرىپ يېڭى پارولدىن بىرنى تاللاڭ.\nسىز بەلگىلىگەن يېڭى پارول  {{PLURAL:$5|كۈن|$5 كۈن}}دە ۋاقتى توشىدۇ. ئەگەر باشقىلار ئىلتىماس قىلغان بولسا ياكى ئۆزىڭىز بەلگىلىگەن پارول ئېسىڭىزگە كېلىپ ئۇنى ئۆزگەرتمىسىڭىز، \nبۇ ئۇچۇرغا پەرۋا قىلماي ئۆزىڭىزنىڭ كونا پارولىنى ئىشلىتىۋېرىڭ.",
 	"passwordreset-emailtext-user": "{{SITENAME}} دىكى ئىشلەتكۈچى $1 بېكەت {{SITENAME}} ($4) دىكى پارولىڭىزنى قايتا بېكىتىشنى ئىلتىماس قىلدى .\nتۆۋەندىكى ئىشلەتكۈچىنىڭ {{PLURAL:$3|ھېسابات|ھېسابات}}($4)ى مۇشۇ ئېلخەتكە باغلانغان:\n\n$2\n\n{{PLURAL:$3|بۇ ۋاقىتلىق پارول|بۇ ۋاقىتلىق پارول}} {{PLURAL:$5|بىر كۈن|$5 كۈن}}دە ۋاقتى ئۆتىدۇ. ئەگەر بۇ مەشغۇلاتنى سىز ئىلتىماس قىلغان بولسىڭىز، دەرھال تىزىمغا كىرىپ يېڭى پارولدىن بىرنى تاللاڭ.\nسىز بەلگىلىگەن يېڭى پارول {{PLURAL:$5|كۈن|$5 كۈن}}دە ۋاقتى توشىدۇ. ئەگەر باشقىلار ئىلتىماس قىلغان بولسا ياكى ئۆزىڭىز بەلگىلىگەن پارول ئېسىڭىزگە كېلىپ ئۇنى ئۆزگەرتمىسىڭىز، \nبۇ ئۇچۇرغا پەرۋا قىلماي ئۆزىڭىزنىڭ كونا پارولىنى ئىشلىتىۋېرىڭ.",
-	"passwordreset-emailelement": "ئىشلەتكۈچى نامى: $1\nۋاقىتلىق پارول: $2",
+	"passwordreset-emailelement": "ئىشلەتكۈچى نامى: \n$1\n\nۋاقىتلىق پارول: \n$2",
 	"passwordreset-emailsent": "پارولنى قايتا بېكىتىش ئېلخېتى يوللاندى.",
 	"passwordreset-emailsent-capture": "پارولنى قايتا بېكىتىش ئېلخېتى يوللاندى، تۆۋەندە كۆرسىتىلىدۇ.",
 	"passwordreset-emailerror-capture": "ھاسىل قىلىنغان پارولنى قايتا بېكىتىش ئېلخېتى تۆۋەندە كۆرسىتىلگەندەك ئەمما ئۇنى {{GENDER:$2|ئىشلەتكۈچى}}گە يوللىيالمىدى: $1",
@@ -1541,7 +1541,6 @@
 	"emailuser": "بۇ ئىشلەتكۈچىگە ئېلخەت يوللا",
 	"emailuser-title-target": "بۇ {{ئىشلەتكۈچى|GENDER:$1}} گە ئېلخەت يوللا",
 	"emailuser-title-notarget": "ئېلخەت ئىشلەتكۈچى",
-	"emailpage": "بۇ ئىشلەتكۈچىگە ئېلخەت يوللا",
 	"emailpagetext": "سىز تۆۋەندىكى جەدۋەلنى ئىشلىتىپ، بۇ {{GENDER:$1|ئىشلەتكۈچى}} گە ئېلخەت يوللىيالايسىز.\n [[Special:Preferences|ئىشلەتكۈچى مايىللىقىڭىز]]دىكى ئېلخەت ئادرېسى  \"يوللىغۇچى\" ستونىدا كۆرۈنىدۇ، مۇشۇنداق بولغاندا شۇ ئىشلەتكۈچى سىزگە بىۋاسىتە جاۋاب قايتۇرالايدۇ.",
 	"defemailsubject": "{{SITENAME}}بېكەتتىكى \"$1\" ئىشلەتكۈچىنىڭ ئېلخەت",
 	"usermaildisabled": "ئىشلەتكۈچى ئېلخەت چەكلەنگەن",
diff --git a/languages/i18n/uk.json b/languages/i18n/uk.json
index a9a1f30d79..20f84ea5e3 100644
--- a/languages/i18n/uk.json
+++ b/languages/i18n/uk.json
@@ -69,7 +69,6 @@
 	"tog-hideminor": "Приховати незначні редагування у списку останніх змін",
 	"tog-hidepatrolled": "Приховувати патрульовані редагування у списку нових редагувань",
 	"tog-newpageshidepatrolled": "Приховувати патрульовані сторінки у списку нових сторінок",
-	"tog-hidecategorization": "Приховати категоризацію сторінок",
 	"tog-extendwatchlist": "Розгорнути список спостереження, щоб показати всі зміни, а не лише останні",
 	"tog-usenewrc": "Групувати редагування на сторінках останніх змін та списку спостереження",
 	"tog-numberheadings": "Автоматично нумерувати заголовки",
@@ -99,7 +98,6 @@
 	"tog-watchlisthideliu": "Приховати редагування зареєстрованих дописувачів у списку спостереження",
 	"tog-watchlisthideanons": "Приховати редагування анонімних користувачів у списку спостереження",
 	"tog-watchlisthidepatrolled": "Приховати відпатрульовані редагування у списку спостереження",
-	"tog-watchlisthidecategorization": "Приховати категоризацію сторінок",
 	"tog-ccmeonemails": "Надсилати мені копії листів, які я надсилаю іншим користувачам",
 	"tog-diffonly": "Не показувати вміст сторінки під різницею версій",
 	"tog-showhiddencats": "Показувати приховані категорії",
@@ -489,6 +487,7 @@
 	"createacct-benefit-body2": "{{PLURAL:$1|сторінка|сторінки|сторінок}}",
 	"createacct-benefit-body3": "{{PLURAL:$1|дописувач|дописувачі|дописувачів}} цього місяця",
 	"badretype": "Введені паролі не співпадають.",
+	"usernameinprogress": "Створення облікового запису для цього імені користувача уже виконується.\nБудь ласка, зачекайте.",
 	"userexists": "Введене ім'я користувача вже існує.\nБудь ласка оберіть інше ім'я.",
 	"loginerror": "Помилка при вході до системи",
 	"createacct-error": "Помилка створення облікового запису",
@@ -580,7 +579,7 @@
 	"passwordreset-emailtitle": "Деталі облікового запису на {{SITENAME}}",
 	"passwordreset-emailtext-ip": "Хтось (імовірно ви, з IP-адреси $1) попросив нагадати деталі вашого облікового запису для {{SITENAME}} ($4). З вашою електронною скринькою пов'язан{{PLURAL:$3|1=ий такий запис|і такі записи}}:\n\n$2\n\n{{PLURAL:$3|1=Цей тимчасовий пароль стане недійсним|Ці тимчасові паролі стануть недійсними}} через $5 {{PLURAL:$5|день|дні|днів}}.\nВи маєте ввійти в систему і вибрати новий пароль. Якщо ж цей запит зробив хтось інший або ви згадали свій старий пароль і не бажаєте його змінювати, можете ігнорувати це повідомлення та продовжувати використовувати старий пароль.",
 	"passwordreset-emailtext-user": "Користувач $1 з {{SITENAME}} попросив нагадати деталі вашого облікового запису для {{SITENAME}} ($4). З вашою електронною скринькою пов'язан{{PLURAL:$3|1=ий такий запис|і такі записи}}:\n\n$2\n\n{{PLURAL:$3|1=Цей тимчасовий пароль|Ці тимчасові паролі}} стануть нечинні через {{PLURAL:$5|день|$5 дні|$5 днів}}.\nВи маєте ввійти в систему і вибрати новий пароль. Якщо ж цей запит зробив хтось інший, або ви згадали свій старий пароль і не бажаєте його змінювати, можете просто ігнорувати це повідомлення та продовжувати використовувати старий пароль.",
-	"passwordreset-emailelement": "Ім'я користувача: $1\nТимчасовий пароль: $2",
+	"passwordreset-emailelement": "Ім'я користувача: \n$1\n\nТимчасовий пароль: \n$2",
 	"passwordreset-emailsent": "Електронний лист для відновлення пароля надісланий.",
 	"passwordreset-emailsent-capture": "Електронний лист скидання пароля було надіслано, як показано нижче.",
 	"passwordreset-emailerror-capture": "Електронний лист для відновлення пароля мав бути надісланий, як показано нижче, але його надсилання {{GENDER:$2|користувачеві|користувачці}} $1 не вдалося.",
@@ -1258,9 +1257,6 @@
 	"rcshowhidemine": "$1 мої редагування",
 	"rcshowhidemine-show": "показати",
 	"rcshowhidemine-hide": "приховати",
-	"rcshowhidecategorization": "$1 категоризацію сторінок",
-	"rcshowhidecategorization-show": "Показати",
-	"rcshowhidecategorization-hide": "Приховати",
 	"rclinks": "Показати останні $1 редагувань за $2 днів<br />$3",
 	"diff": "різн.",
 	"hist": "історія",
@@ -1286,16 +1282,12 @@
 	"recentchangeslinked-summary": "Це список нещодавніх змін на сторінках, на які посилається зазначена сторінка (або на сторінках, що містяться в цій категорії).\nСторінки з [[Special:Watchlist|вашого списку спостереження]] виділено '''жирним шрифтом'''.",
 	"recentchangeslinked-page": "Назва сторінки:",
 	"recentchangeslinked-to": "Показати зміни на сторінках, пов'язаних з даною",
-	"recentchanges-page-added-to-category": "[[:$1]] Додано до категорії",
-	"recentchanges-page-added-to-category-bundled": "[[:$1]] та ще {{PLURAL:$2|$2 сторінку|$2 сторінки|$2 сторінок|1=одну сторінку}} було додано до категорії",
-	"recentchanges-page-removed-from-category": "[[:$1]] було вилучено з категорії",
-	"recentchanges-page-removed-from-category-bundled": "[[:$1]] та ще {{PLURAL:$2|$2 сторінку|$2 сторінки|$2 сторінок|1=одну сторінку}} було вилучено з категорії",
 	"upload": "Завантажити файл",
 	"uploadbtn": "Завантажити файл",
 	"reuploaddesc": "Повернутися до форми завантаження",
 	"upload-tryagain": "Зберегти змінений опис файлу",
 	"uploadnologin": "Ви не ввійшли в систему",
-	"uploadnologintext": "Ви повинні $1, щоб завантажувати файли.",
+	"uploadnologintext": "Будь ласка, $1, щоб завантажувати файли.",
 	"upload_directory_missing": "Директорія для завантажень ($1) відсутня і не може бути створена веб-сервером.",
 	"upload_directory_read_only": "Веб-сервер не має прав запису в папку ($1), в якій планується зберігати завантажувані файли.",
 	"uploaderror": "Помилка завантаження файлу",
@@ -1800,7 +1792,6 @@
 	"emailuser": "Надіслати листа",
 	"emailuser-title-target": "Надіслати електронного листа {{GENDER:$1|користувачеві|користувачці}}",
 	"emailuser-title-notarget": "Надіслати електронного листа користувачеві",
-	"emailpage": "Лист користувачеві",
 	"emailpagetext": "Заповнивши наведену нижче форму, можна надіслати повідомлення {{GENDER:$1|цьому користувачу|цій користувачці}}.\nЕлектронна адреса, яку Ви зазначили у [[Special:Preferences|своїх налаштуваннях]], буде зазначена в полі «Від кого» листа, тому одержувач матиме можливість відповісти безпосередньо вам.",
 	"defemailsubject": "{{SITENAME}} — електронний лист від користувача «$1»",
 	"usermaildisabled": "Електронне листування між користувачами вимкнене",
@@ -1822,7 +1813,7 @@
 	"emailccsubject": "Копія вашого повідомлення до $1: $2",
 	"emailsent": "Електронне повідомлення надіслано",
 	"emailsenttext": "Ваше електронне повідомлення надіслано.",
-	"emailuserfooter": "Цей лист був надісланий користувачеві $2 від користувача $1 за допомогою функції «{{int:emailpage}}» проекту {{SITENAME}}.",
+	"emailuserfooter": "Цей лист був надісланий користувачеві $2 від користувача $1 за допомогою функції «{{int:emailuser}}» проекту {{SITENAME}}.",
 	"usermessage-summary": "Залишити системне повідомлення.",
 	"usermessage-editor": "Системний вісник",
 	"usermessage-template": "MediaWiki:UserMessage",
@@ -3388,6 +3379,7 @@
 	"logentry-newusers-create2": "$1 {{GENDER:$2|створив|створила}} обліковий запис {{GENDER:$4|користувача|користувачки}} $3",
 	"logentry-newusers-byemail": "Обліковий запис $3 {{GENDER:$2|користувача|користувачки}} створений {{GENDER:$4|користувачем|користувачкою}} $1 і пароль було надіслано електронною поштою",
 	"logentry-newusers-autocreate": "Обліковий запис $1 було {{GENDER:$2|створено}} автоматично",
+	"logentry-protect-move_prot": "$1 {{GENDER:$2|переніс|перенесла}} налаштування захисту із $4 до $3",
 	"logentry-rights-rights": "$1 {{GENDER:$2|змінив|змінила}} членство в групах для $3 із $4 на $5",
 	"logentry-rights-rights-legacy": "$1 {{GENDER:$2|змінив|змінила}} членство в групах для $3",
 	"logentry-rights-autopromote": "$1 було автоматично переведено із $4 в $5",
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..e835306e2b 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",
@@ -435,7 +435,7 @@
 	"passwordreset-domain": "Domen:",
 	"passwordreset-capture": "Xatni koʻrmoqchimisiz?",
 	"passwordreset-email": "Elektron pochta manzilingiz:",
-	"passwordreset-emailelement": "Foydalanuvchi ismi: $1\nVaqtinchalik maxfiy so'z: $2",
+	"passwordreset-emailelement": "Foydalanuvchi ismi: \n$1\n\nVaqtinchalik maxfiy so'z: \n$2",
 	"changeemail": "Elektron pochta manzilini oʻzgartirish",
 	"changeemail-oldemail": "Joriy elektron pochta manzili",
 	"changeemail-newemail": "Elektron pochtaning yangi manzili",
@@ -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 8f009cafcf..482b472a01 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",
@@ -182,8 +182,10 @@
 	"permalink": "Link parmanente",
 	"print": "Stanpa",
 	"view": "Varda",
+	"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",
@@ -236,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",
@@ -267,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à}}",
@@ -383,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",
@@ -447,6 +454,9 @@
 	"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.",
 	"user-mail-no-body": "Tentà de inviar na e-mail có un testo vodo o masa curto.",
@@ -477,7 +487,7 @@
 	"passwordreset-emailtitle": "Detaji de l'account so {{SITENAME}}",
 	"passwordreset-emailtext-ip": "Cualcheduni (probabilmente ti, co indiriso IP $1) ga richiesto l'invio de na nova password par l'aceso a {{SITENAME}} ($4). {{PLURAL:$3|L'utente asocià|I utenti asociadi}} a sto indiriso de posta ełetronega łi xe:\n\n$2\n\n{{PLURAL:$3|Sta password tenporanea ła scadarà|Ste password tenporanee łe scadarà}} dopo {{PLURAL:$5|un dì|$5 dì}}.\n\nSarìa mejo acedare e deçidare na nova password sùito. Se no te si stà ti a fare ła richiesta, o se te te ghe ricordà ła password originałe e no te vołi pi canbiarla, te połi ignorare sto mesajo e continuar doparare ła to password vecia.",
 	"passwordreset-emailtext-user": "El utente $1 da {{SITENAME}} (probabilmente ti steso) ga richiesto l'invio de na password nova par {{SITENAME}} ($4). {{PLURAL:$3|El profiło utente asocià|I profiłi utenti asociadi}} a sto indiriso de posta ełetronega łi xe:\n\n$2\n\n{{PLURAL:$3|Sta password tenporanea ła scadarà|Ste password tenporanee łe scadarà}} dopo {{PLURAL:$5|un dì|$5 dì}}.\n\nSarìa mejo acedare e deçidare na nova password sùito. Se no te si stà ti a fare ła richiesta, o se te te ghe ricordà ła password originałe e no te vołi pi canbiarla, te połi ignorare sto mesajo e continuar doparare ła to password vecia.",
-	"passwordreset-emailelement": "Nome utente: $1\nPassword tenporanea: $2",
+	"passwordreset-emailelement": "Nome utente: \n$1\n\nPassword tenporanea: \n$2",
 	"passwordreset-emailsent": "Xe stà invià na mail de reset password.",
 	"passwordreset-emailsent-capture": "Xe stà invià na mail de reset password: el contegù xe riportà cuà de seguito.",
 	"passwordreset-emailerror-capture": "Xe stà generà na mail de reset password, riportà cuà de seguito. L'invio a {{GENDER:$2|l'utente}} no xe riusido: $1",
@@ -516,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.",
@@ -639,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",
@@ -752,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",
@@ -766,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",
@@ -779,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:",
@@ -787,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:",
@@ -886,16 +899,18 @@
 	"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",
-	"userrights": "Gestion dei parmessi relativi ai utenti",
+	"userrights": "Gestion dei parmessi dei utenti",
 	"userrights-lookup-user": "Gestion de i gruppi utente",
 	"userrights-user-editname": "Inserir el nome utente:",
 	"editusergroup": "Modifica grupi utente",
@@ -1044,6 +1059,7 @@
 	"recentchanges-label-bot": "Sta modifica el la ga fata un bot",
 	"recentchanges-label-unpatrolled": "Sta modifica no la xe stà gnancora verificà",
 	"recentchanges-label-plusminus": "La dimension de la pagina la xe canbià de sto nùmaro de byte",
+	"recentchanges-legend-heading": "'''Legenda:'''",
 	"recentchanges-legend-newpage": "{{int:recentchanges-label-newpage}} (varda anca [[Special:NewPages|l'elenco de le pagine nove]])",
 	"rcnotefrom": "Qui di seguito sono elencate le modifiche da '''$2''' (fino a '''$1''').",
 	"rclistfrom": "Mostra i canbiamenti fati da ƚe $2 del $3",
@@ -1054,10 +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",
@@ -1177,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.",
@@ -1253,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",
@@ -1338,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",
@@ -1378,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}}",
@@ -1415,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",
@@ -1438,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",
@@ -1507,12 +1548,13 @@
 	"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",
 	"emailuser-title-target": "Scrivi na e-mail a {{GENDER:$1|sto|sta}} utente",
 	"emailuser-title-notarget": "Scrivi na e-mail a l'utente",
-	"emailpage": "Scrivi na e-mail a l'utente",
 	"emailpagetext": "Te podi usar el moduło chi soto par mandare na e-mail a sto {{GENDER:$1|utente}}.\nŁa e-mail che te ghè indicà inte łe [[Special:Preferences|to prefarense]] ła vegnarà fora inte'l canpo \"Da\" de la mail, cusì che'l destinatario el posa rispóndarte diretamente a ti.",
 	"defemailsubject": "Mesajo da {{SITENAME}} dal utente \"$1\"",
 	"usermaildisabled": "e-mail utente disabiłità",
@@ -1616,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]]\"",
@@ -1958,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",
@@ -2029,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",
@@ -2103,7 +2149,7 @@
 	"spam_reverting": "Ripristinà l'ultima version priva de colegamenti a $1",
 	"spam_blanking": "Pàxena svodà, tute łe version le contegneva cołegamenti a $1",
 	"spam_deleting": "Pàjina scansełà, tute łe version łe contegneva ligamenti a $1",
-	"simpleantispam-label": "Controlo anti spam.\n'''NO STA''' scrivar gnente qua de soto!",
+	"simpleantispam-label": "Controlo anti spam.\n<strong>No stà</strong> scrivar gnente qua drento!",
 	"pageinfo-title": "Informasion par \"$1\"",
 	"pageinfo-not-current": "Ne disipiaxe, ma xe inposibiłe fornir sta informasion par vecie version.",
 	"pageinfo-header-basic": "Informassion de base",
@@ -2116,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",
@@ -2606,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",
@@ -2640,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",
@@ -2660,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",
@@ -2678,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à",
@@ -2698,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",
@@ -2724,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",
@@ -2791,14 +2868,17 @@
 	"logentry-rights-rights": "$1 {{GENDER:$2|el|la}} ga canbià l'apartenensa de $3 dal grupo $4 al grupo $5",
 	"logentry-rights-rights-legacy": "$1 {{GENDER:$2|el|la}} ga canbià l'apartenensa a grupi de $3",
 	"logentry-rights-autopromote": "$1 {{GENDER:$2|el|la}} xe stà automategamente promoso/a da $4 a $5",
+	"logentry-upload-upload": "$1 {{GENDER:$2|el|la}} gà cargà $3",
 	"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",
@@ -2806,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.",
@@ -2858,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.):",
@@ -2869,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",
@@ -2892,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/vep.json b/languages/i18n/vep.json
index bc4dbc58e8..687433ab89 100644
--- a/languages/i18n/vep.json
+++ b/languages/i18n/vep.json
@@ -431,12 +431,11 @@
 	"resetpass-wrong-oldpass": "Vär pordaigaine vai nügüdläine peitsana.\nVoib olda, tö olet jo toižetanuded peitsanan vai pakinuded uden peitsanan.",
 	"resetpass-temp-password": "Pordaigaline peitsana:",
 	"passwordreset": "Peitsanan alustuz",
-	"passwordreset-legend": "Peitsanan alustuz",
 	"passwordreset-username": "Kävutajan nimi:",
 	"passwordreset-domain": "Domen",
 	"passwordreset-capture": "Ozutada-k loptud kirjeine?",
 	"passwordreset-email": "E-počtan adres:",
-	"passwordreset-emailelement": "Kävutajannimi: $1\nAigaline peitsana: $2",
+	"passwordreset-emailelement": "Kävutajannimi: \n$1\n\nAigaline peitsana: \n$2",
 	"passwordreset-emailsent": "Muštatai kirjeine uden peitsananke oigetihe e-počtadme.",
 	"changeemail": "Toižetada e-počtan adres",
 	"changeemail-no-info": "Miše kirjutada necil lehtpolel, teile pidab kirjutadas sistemha.",
@@ -1179,7 +1178,6 @@
 	"nlinks": "$1 {{PLURAL:$1|kosketuz|kosketust}}",
 	"nmembers": "$1 {{PLURAL:$1|ühtnii|ühtnijad}}",
 	"nrevisions": "$1 {{PLURAL:$1|versii|versijad}}",
-	"nviews": "$1 {{PLURAL:$1|kacund|kacundad}}",
 	"specialpage-empty": "Ecind ei ole andnu rezul'tatad.",
 	"lonelypages": "Üksjäižed lehtpoled",
 	"lonelypagestext": "Ozutadud lehtpolid ei kosketagoi toižed necen saitan lehtpoled; ozutadud lehtpoled mugažo ei olgoi mülütadud toižihe lehtpolihe.",
@@ -1291,7 +1289,6 @@
 	"listgrouprights-removegroup-self-all": "Sab heitta poiš kaik gruppad ičeze sistemkirjutandaspäi",
 	"mailnologin": "Ei ole adresan oigendamižen täht",
 	"emailuser": "Oigeta e-kirjeine necile kävutajale",
-	"emailpage": "Kirjeine kävutajale",
 	"defemailsubject": "$1-kävutajan počt {{SITENAME}}-saitalpäi",
 	"usermaildisabled": "Kävutajan e-počt ei ole kävutamižes",
 	"noemailtitle": "Ei ole e-počtan adresad",
diff --git a/languages/i18n/vi.json b/languages/i18n/vi.json
index 1a1cdbef14..bbe7617f5e 100644
--- a/languages/i18n/vi.json
+++ b/languages/i18n/vi.json
@@ -452,6 +452,7 @@
 	"createacct-benefit-body2": "{{PLURAL:$1}}trang nội dung",
 	"createacct-benefit-body3": "{{PLURAL:$1}}người đóng góp gần đây",
 	"badretype": "Hai mật khẩu không khớp.",
+	"usernameinprogress": "Đã tiến hành tạo tài khoản với tên người dùng này.\nXin vui lòng chờ đợi.",
 	"userexists": "Tên người dùng được nhập đã có người lấy.\nHãy chọn một tên khác.",
 	"loginerror": "Lỗi đăng nhập",
 	"createacct-error": "Lỗi mở tài khoản",
@@ -542,7 +543,7 @@
 	"passwordreset-emailtitle": "Thông tin tài khoản tại {{SITENAME}}",
 	"passwordreset-emailtext-ip": "Ai đó (có thể là bạn, từ địa chỉ IP $1) đã yêu cầu tái tạo mật khẩu của bạn \ntại {{SITENAME}} ($4). {{PLURAL:$3|Tài khoản|Các tài khoản}} dưới đây gắn liền \nvới địa chỉ thư điện tử này:\n\n$2\n\n{{PLURAL:$3|Mật khẩu|Các mật khẩu}} tạm này sẽ hết hạn trong vòng {{PLURAL:$5|một ngày|$5 ngày}}. Bạn nên đăng nhập\nngay bây giờ để chọn mật khẩu mới. Nếu bạn không phải là người yêu cầu\nhoặc đã nhớ lại mật khẩu hiện hành, và bạn không còn\nmuốn thay đổi nó, xin vui lòng bỏ qua thông điệp này và tiếp tục sử dụng\nmật khẩu cũ.",
 	"passwordreset-emailtext-user": "Thành viên $1 tại {{SITENAME}} đã yêu cầu tái tạo mật khẩu tại {{SITENAME}} \n($4). {{PLURAL:$3|Tài khoản|Các tài khoản}} dưới đây gắn liền với địa chỉ thư điện tử này:\n\n$2\n\n{{PLURAL:$3|Mật khẩu|Các mật khẩu}} tạm này sẽ hết hạn trong vòng {{PLURAL:$5|một ngày|$5 ngày}}. Bạn nên đăng nhập\nngay bây giờ để chọn mật khẩu mới. Nếu bạn không phải là người yêu cầu hoặc đã nhớ lại mật khẩu hiện hành, và bạn không còn\nmuốn thay đổi nó, xin vui lòng bỏ qua thông điệp này và tiếp tục sử dụng\nmật khẩu cũ.",
-	"passwordreset-emailelement": "Tên người dùng: $1\nMật khẩu tạm: $2",
+	"passwordreset-emailelement": "Tên người dùng: \n$1\n\nMật khẩu tạm: \n$2",
 	"passwordreset-emailsent": "Đã gửi thư điện tử để tái tạo mật khẩu.",
 	"passwordreset-emailsent-capture": "Thư điện tử để tái tạo mật khẩu đã được gửi, nội dung như sau.",
 	"passwordreset-emailerror-capture": "Chúng tôi đã tạo thư tái tạo mật khẩu dưới đây, nhưng không thể gửi đến {{GENDER:$2}}người dùng: $1",
@@ -941,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}})",
@@ -1349,6 +1351,19 @@
 	"upload-too-many-redirects": "URL có quá nhiều đổi hướng",
 	"upload-http-error": "Xảy ra lỗi HTTP: $1",
 	"upload-copy-upload-invalid-domain": "Không có sẵn các bản sao tải lên tại tên miền này.",
+	"upload-dialog-title": "Tải tập tin lên",
+	"upload-dialog-error": "Đã xuất hiện lỗi",
+	"upload-dialog-warning": "Đã xuất hiện cảnh báo",
+	"upload-dialog-button-cancel": "Hủy bỏ",
+	"upload-dialog-button-done": "Xong",
+	"upload-dialog-button-save": "LÆ°u",
+	"upload-dialog-button-upload": "Tải lên",
+	"upload-dialog-label-select-file": "Chọn tập tin",
+	"upload-dialog-label-infoform-title": "Chi tiết",
+	"upload-dialog-label-infoform-name": "Tên",
+	"upload-dialog-label-infoform-description": "Miêu tả",
+	"upload-dialog-label-usage-title": "Sử dụng",
+	"upload-dialog-label-usage-filename": "Tên tập tin",
 	"backend-fail-stream": "Không thể gửi luồng tập tin $1.",
 	"backend-fail-backup": "Không thể sao lưu tập tin $1.",
 	"backend-fail-notexists": "Tập tin $1 không tồn tại.",
@@ -1646,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).",
@@ -1732,7 +1747,6 @@
 	"emailuser": "Gửi thư cho người này",
 	"emailuser-title-target": "{{GENDER:$1}}Gửi thư cho người dùng này",
 	"emailuser-title-notarget": "Gửi thư cho người dùng",
-	"emailpage": "Gá»­i thÆ°",
 	"emailpagetext": "{{GENDER:$1}}Mẫu dưới đây sẽ gửi một bức thư điện tử tới người dùng này.\nĐịa chỉ thư điện tử mà bạn đã cung cấp trong [[Special:Preferences|tùy chọn cá nhân của mình]] sẽ xuất hiện trong phần địa chỉ “Người gửi” của bức thư, do đó người nhận sẽ có thể trả lời trực tiếp cho bạn.",
 	"defemailsubject": "Thư của người dùng \"$1\" tại {{SITENAME}}",
 	"usermaildisabled": "Chức năng gửi thư cho người dùng đã bị tắt.",
@@ -1916,7 +1930,7 @@
 	"undeletepagetext": "{{PLURAL:$1|Trang sau|$1 trang sau}} đã bị xóa nhưng vẫn nằm trong kho lưu trữ và có thể phục hồi được. Kho lưu trữ sẽ được xóa định kỳ.",
 	"undelete-fieldset-title": "Phục hồi phiên bản",
 	"undeleteextrahelp": "Để phục hồi toàn bộ lịch sử trang, hãy để trống các hộp kiểm và bấm nút '''''{{int:undeletebtn}}'''''.\nĐể thực hiện phục hồi có chọn lọc, hãy đánh dấu vào hộp kiểm của các phiên bản muốn phục hồi, rồi bấm nút '''''{{int:undeletebtn}}'''''.\nBấm nút '''''Tẩy trống''''' sẽ tẩy trống ô lý do và tất cả các hộp kiểm.",
-	"undeleterevisions": "$1 {{PLURAL:$1|bản|bản}} đã được lưu",
+	"undeleterevisions": "$1 phiên bản đã bị xóa",
 	"undeletehistory": "Nếu bạn phục hồi trang này, tất cả các phiên bản của nó cũng sẽ được phục hồi vào lịch sử của trang.\nNếu một trang mới có cùng tên đã được tạo ra kể từ khi xóa trang này, các phiên bản được khôi phục sẽ xuất hiện trong lịch sử trước.",
 	"undeleterevdel": "Việc phục hồi sẽ không được thực hiện nếu nó dẫn đến việc phiên bản trang hoặc tập tin trên cùng bị xóa mất một phần.\nTrong trường hợp đó, bạn phải bỏ đánh dấu hộp kiểm hoặc bỏ ẩn những phiên bản bị xóa mới nhất.",
 	"undeletehistorynoadmin": "Trang này đã bị xóa.\nLý do xóa trang được hiển thị dưới đây, cùng với thông tin về những người đã sửa đổi trang này trước khi bị xóa.\nChỉ có bảo quản viên mới xem được văn bản đầy đủ của những phiên bản trang bị xóa.",
@@ -2378,7 +2392,7 @@
 	"spam_reverting": "Lùi lại đến phiên bản cuối không chứa liên kết đến $1",
 	"spam_blanking": "Tất cả các phiên bản có liên kết đến $1; tẩy trống",
 	"spam_deleting": "Tất cả các phiên bản có liên kết đến $1; xóa",
-	"simpleantispam-label": "Hệ thông đang kiểm tra chống spam.\nXin '''ĐỪNG''' điền gì vào!",
+	"simpleantispam-label": "Hệ thông đang kiểm tra chống spam.\nXin <strong>đừng</strong> điền gì vào!",
 	"pageinfo-title": "Thông tin về “$1”",
 	"pageinfo-not-current": "Rất tiếc, không thể cung cấp các chi tiết này đối với các phiên bản cũ.",
 	"pageinfo-header-basic": "Thông tin cơ bản",
@@ -2940,16 +2954,19 @@
 	"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",
-	"bitrate-bits": "$1 bps",
-	"bitrate-kilobits": "$1 kbps",
-	"bitrate-megabits": "$1 Mbps",
-	"bitrate-gigabits": "$1 Gbps",
-	"bitrate-terabits": "$1 Tbps",
-	"bitrate-petabits": "$1 Pbps",
+	"size-pixel": "$1 điểm ảnh",
+	"size-kilopixel": "$1 kP",
+	"bitrate-bits": "$1 bit/s",
+	"bitrate-kilobits": "$1 kbit/s",
+	"bitrate-megabits": "$1 Mbit/s",
+	"bitrate-gigabits": "$1 Gbit/s",
+	"bitrate-terabits": "$1 Tbit/s",
+	"bitrate-petabits": "$1 Pbit/s",
 	"bitrate-exabits": "$1 Ebps",
-	"bitrate-zetabits": "$1 Zbps",
-	"bitrate-yottabits": "$1 Ybps",
+	"bitrate-zetabits": "$1 Zbit/s",
+	"bitrate-yottabits": "$1 Ybit/s",
 	"lag-warn-normal": "Những thay đổi trong vòng $1 {{PLURAL:||}}giây trở lại đây có thể chưa xuất hiện trong danh sách.",
 	"lag-warn-high": "Do độ trễ của máy chủ cơ sở dữ liệu, những thay đổi trong vòng $1 {{PLURAL:$1||}}giây trở lại đây có thể chưa xuất hiện trong danh sách.",
 	"watchlistedit-normal-title": "Sửa các trang tôi theo dõi",
@@ -3269,6 +3286,7 @@
 	"logentry-newusers-create2": "$1 {{GENDER:$2}}đã mở tài khoản người dùng $3",
 	"logentry-newusers-byemail": "$1 {{GENDER:$2}}đã mở tài khoản người dùng $3 và nhận mật khẩu qua thư điện tử",
 	"logentry-newusers-autocreate": "Tài khoản $1 {{GENDER:$2}}đã được mở tự động",
+	"logentry-protect-move_prot": "$1 {{GENDER:$2}}đã chuyển mức khóa từ $4 thành $3",
 	"logentry-rights-rights": "$1 {{GENDER:$2}}đã đổi các nhóm bao gồm $3 từ $4 đến $5",
 	"logentry-rights-rights-legacy": "{{GENDER:$2}}$1 đã đổi các nhóm bao gồm $3",
 	"logentry-rights-autopromote": "$1 {{GENDER:$2}}đã được tự động phong cấp từ $4 đến $5",
diff --git a/languages/i18n/war.json b/languages/i18n/war.json
index 6360add7bb..2f5afa2040 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:",
@@ -495,7 +496,7 @@
 	"passwordreset-email": "E-mail adres:",
 	"passwordreset-emailtitle": "Mga detalye han akawnt ha {{SITENAME}}",
 	"passwordreset-emailtext-ip": "Mayda gumaramit (bangin hi ikaw, tikang han IP adres nga $1) nga naghangyo hin reset han imo tigaman-pansulod han {{SITENAME}} ($4). An nasunod nga gumaramit {{PLURAL:$3|nga akawnt|nga mga akawnt}} nahanungod hini nga email nga adres: \n\n$2\n\n{{PLURAL:$3|Iní nga temporaryo nga tigaman-pansulod|Iní nga mga temporaryo nga tigaman-pansulod}} ma-waray bali hin {{PLURAL:$5|usa ka adlaw|$5 nga mga adlaw}}.\nAngay ka sumakob ngan pumílì hin bag-o nga tigaman-pansulod ha yanâ.  Kun mayda lain nga naghatag hini nga hangyo, o kun nahinumdoman mo an imo orihinal nga tigaman-pansulod, ngan nadírì ka na pagbalyo hiní, puyde mo pasagdan ini nga sumat ngan magpadayon hin paggamit han imo daan nga tigaman-pansulod.",
-	"passwordreset-emailelement": "Agnay han gumaramit: $1\nTemporaryo nga tigaman han pagsakob: $2",
+	"passwordreset-emailelement": "Agnay han gumaramit: \n$1\n\nTemporaryo nga tigaman han pagsakob: \n$2",
 	"passwordreset-emailsent": "Ginpadangat an password reset email.",
 	"passwordreset-emailsent-capture": "Ginpadangat an password reset email, nga ginpakita ha ubos.",
 	"passwordreset-emailerror-capture": "Ginhimo an password reset email, kun diin nakikita ha ubos, pero pakyas an pagpadara ha  {{GENDER:$2|gumaramit}}: $1",
@@ -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:",
@@ -1258,7 +1259,6 @@
 	"emailuser": "Ig-e-mail ini nga gumaramit",
 	"emailuser-title-target": "Ig-E-mail ini nga {{HENERO:$1|gumaramit}}",
 	"emailuser-title-notarget": "Gumaramit han e-mail",
-	"emailpage": "Gumaramit han e-mail",
 	"defemailsubject": "{{SITENAME}} e-mail tikang kan gumaramit na hi \"$1\"",
 	"usermaildisabled": "Waray ginpagana an e-mail han gumaramit",
 	"usermaildisabledtext": "Diri ka makakapadangat hin e-mail ha iba nga mga gumaramit ha dinhi nga wiki",
@@ -1629,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..ed6581e0a5 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,8 +297,14 @@
 	"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",
+	"createacct-yourpassword-ph": "Duggalal ab baatujàll",
 	"yourpasswordagain": "Bindaatal sa baatujàll",
+	"createacct-yourpasswordagain": "Dëggalal baatujàll bi",
+	"createacct-yourpasswordagain-ph": "Duggalaatal baatujàll bi",
 	"remembermypassword": "Denc sama yëgley dukkukaay ci bii joowukaay (lu ëpp nag $1 {{PLURAL:$1|day|days}})",
 	"yourdomainname": "Sa barab",
 	"externaldberror": "Njuumte judd na ci dàttub njoxe bi, walla day ni rekk amuloo sañ-sañu yeesal sa sàqum biti.",
@@ -308,7 +319,11 @@
 	"createaccount": "Sos am sàq",
 	"gotaccount": "Sos nga am sàq? '''$1'''.",
 	"gotaccountlink": "Dugg",
+	"createacct-email-ph": "Duggalal sa màkkaanu m-bataaxal",
 	"createaccountmail": "Jaare ko ci m-bataaxal",
+	"createacct-captcha": "Caytug kaaraange",
+	"createacct-imgcaptcha-ph": "Duggalal mbind  miy toftal mi ngay gis",
+	"createacct-submit": "Sos sa sàq",
 	"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 +362,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 +405,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 +428,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.",
@@ -426,6 +444,7 @@
 	"session_fail_preview_html": "'''Jéegalu ! manu noo denc say coppite ngir ñakkug ay njoxe ñeel sag dugg.'''\n\n''Segam ci bii dal dañ fee doxal HTML bu ñumm, ngir ay ngirtey kaaraange, wonendi gi du gisu.''\n\n'''Su tolof-tolof bi wéyee, man nga jéem a génn te duggaat .'''",
 	"token_suffix_mismatch": "'''Votre modification n’a pas été acceptée car votre navigateur a mal codé les caractères de ponctuation dans l’identifiant de modification.'''\nCe rejet est nécessaire pour empêcher la corruption du texte de la page.\nCe problème se produit parfois lorsque vous utilisez un serveur mandataire anonyme problématique basé sur le web.",
 	"editing": "Coppiteg $1",
+	"creating": "Moo ngi sos $1",
 	"editingsection": "Coppiteg $1 (xaaj)",
 	"editingcomment": "Coppiteg $1 (xaaj bu bees)",
 	"editconflict": "jàppanteb coppite ci: $1",
@@ -581,7 +600,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 +620,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 +630,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 +834,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 +843,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 +871,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 +932,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 +955,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 +969,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 +1035,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 +1144,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 +1207,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 +1285,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 +1316,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 +1468,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 +1521,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 +1535,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 +1553,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 +1590,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/wuu.json b/languages/i18n/wuu.json
index 5f06880b94..ae6928f548 100644
--- a/languages/i18n/wuu.json
+++ b/languages/i18n/wuu.json
@@ -19,7 +19,8 @@
 			"TheChampionMan1234",
 			"Fitoschido",
 			"Poiuyt",
-			"反共复国"
+			"反共复国",
+			"姑苏小恐龙"
 		]
 	},
 	"tog-underline": "鏈接下橫線：",
@@ -230,9 +231,11 @@
 	"jumptonavigation": "导航",
 	"jumptosearch": "搜寻",
 	"view-pool-error": "對弗住，服務器能界超載。\n望箇頁個人忒多哉。\n相勞爾等瑲起再試試相趒箇頁來。\n\n$1",
+	"generic-pool-error": "對弗住，服務器能界超載。\n望箇頁個人忒多哉。\n相勞爾等瑲起再試試相趒箇頁來。",
 	"pool-timeout": "等锁过时",
 	"pool-queuefull": "池队列满哉",
 	"pool-errorunknown": "弗识个错误",
+	"pool-servererror": "池计数器服务现在弗好用($1)",
 	"poolcounter-usage-error": "用法出错：$1",
 	"aboutsite": "有关{{SITENAME}}",
 	"aboutpage": "Project:关于",
@@ -259,6 +262,7 @@
 	"ok": "好",
 	"retrievedfrom": "取自“$1”",
 	"youhavenewmessages": "你侬有$1（$2）。",
+	"youhavenewmessagesfromusers": "侬有来自{{PLURAL:$3|其他用户|$3个用户}}的$1（$2）。",
 	"newmessageslinkplural": "{{PLURAL:$1|新消息|999=新消息}}",
 	"newmessagesdifflinkplural": "此垡̺{{PLURAL:$1|变化|999=变化}}",
 	"youhavenewmessagesmulti": "爾徠$1裏有新信息",
@@ -337,8 +341,15 @@
 	"no-null-revision": "\"$1\"页呒处建新个修改",
 	"badtitle": "坏标题",
 	"badtitletext": "所请求页面个标题是无效个、弗存在，跨语言或跨wiki链接个标题错误。渠作兴包含一只或多只弗好用拉标题里向字符。",
+	"title-invalid-empty": "请求个页面标题是空个，或着只包括名字空间个名称。",
+	"title-invalid-utf8": "请求个页面标题包括一只无效个UTF-8序列。",
+	"title-invalid-interwiki": "请求个页面标题包含跨wiki个链接，伊弗好用于标题。",
+	"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": "下向是缓存数据，呒数弗是最新个。 A maximum of {{PLURAL:$1|one result is|$1 results are}} available in the cache.",
 	"perfcachedts": "下头是缓存数据，阿末一趟更新辰光是$1。缓存里最多有{{PLURAL:$4|$4条结果}}。",
 	"querypage-no-updates": "当前禁止对此页面进行更新。箇搭个数据弗好立即刷新。",
@@ -347,10 +358,11 @@
 	"actionthrottled": "动作已压制",
 	"actionthrottledtext": "基于反垃圾链接个考量，限制垃拉短时间内多趟重复箇只操作。请过脱几分钟再试试看。",
 	"protectedpagetext": "箇页锁牢定，防编搭各许操作。",
-	"viewsourcetext": "侬可以查看搭仔复制箇只页面个源码：",
+	"viewsourcetext": "侬可以查看搭仔复制箇只页面个源码。",
 	"viewyourtext": "你侬好望也好畀'''你侬编个'''复制到箇页：",
 	"protectedinterface": "箇页为箇维基个软件提供界面文本，锁牢定防乱用。\n加改全部维基个译文，用[//translatewiki.net/ translatewiki.net]，MediaWiki软件个本地化计划。",
 	"editinginterface": "<strong>警告：</strong>侬来里编写个页面是畀软件用个界面文本。箇页变化会影响各许人个界面样子。",
+	"translateinterface": "要加入或着更改所有个wiki个翻译，请侬访问MediaWiki本地化项目个网站[//translatewiki.net/ translatewiki.net]。",
 	"cascadeprotected": "箇只页面拨保护拉许，因为箇只页面拨下底已经标注“级联保护”个{{PLURAL:$1|一只|多只}}被保护页面包含：\n$2",
 	"namespaceprotected": "侬无没编辑'''$1'''名字空间里向页面个权限。",
 	"customcssprotected": "箇CSS页你呒处编，箇页有各许用户个私人设置。",
@@ -427,6 +439,7 @@
 	"createacct-benefit-body2": "{{PLURAL:$1|页}}",
 	"createacct-benefit-body3": "此垡 {{PLURAL:$1|出力个人}}",
 	"badretype": "倷输入个密码搭倪个档案弗配。",
+	"usernameinprogress": "迭个用户名个账户创建已经勒了进行。请侬等一等。",
 	"userexists": "用戶名有人用哉。相勞爾揀別樣名字。",
 	"loginerror": "登录错误",
 	"createacct-error": "建账号出错",
@@ -474,10 +487,13 @@
 	"login-migrated-generic": "侬个账号已经畀移脱哉，并且侬个用户名来箇wiki弗再存在。",
 	"loginlanguagelabel": "语言：$1",
 	"suspicious-userlogout": "侬登出个要求已经拨回头脱，因为渠可能是由已损坏个浏览器或者缓存代理传送个。",
+	"createacct-another-realname-tip": "真实姓名是选填个项目。\n假使侬选择提供伊，伊会得用勒了贡献署名方面高头。",
 	"pt-login": "登录",
 	"pt-login-button": "登录",
 	"pt-createaccount": "建账号",
 	"pt-userlogout": "登出",
+	"user-mail-no-addy": "尝试发送邮件而弗附带电子邮件个地址。",
+	"user-mail-no-body": "试图发送空个或者主体短的一点也弗合理个电子邮件",
 	"changepassword": "改密码",
 	"resetpass_announce": "要完成登录，侬必须设定一只新密码。",
 	"resetpass_header": "更改密码",
@@ -491,6 +507,7 @@
 	"resetpass-submit-loggedin": "更改密码",
 	"resetpass-submit-cancel": "取消",
 	"resetpass-wrong-oldpass": "无效个临时或者现有密码。\n侬作兴已经成功拿密码改脱，或者已经请求一个新个临时密码。",
+	"resetpass-recycled": "请重置侬个密码是忒侬当前密码不同个密码。",
 	"resetpass-temp-password": "临时密码：",
 	"passwordreset": "重置密码",
 	"passwordreset-username": "用戶名",
@@ -1094,7 +1111,6 @@
 	"listgrouprights-members": "（成员列表）",
 	"emailuser": "发电子信畀箇个用户",
 	"emailuser-title-notarget": "郵箱用戶",
-	"emailpage": "郵箱用戶",
 	"emailfrom": "從",
 	"emailto": "發畀",
 	"emailsubject": "主題",
diff --git a/languages/i18n/xmf.json b/languages/i18n/xmf.json
index 11607af012..0a79897d0f 100644
--- a/languages/i18n/xmf.json
+++ b/languages/i18n/xmf.json
@@ -21,7 +21,6 @@
 	"tog-hideminor": "დოფული ციქა რედაქტირაფა ეკონია თირაფეფს",
 	"tog-hidepatrolled": "დოფულით პატრულირებულ რედაქტირაფეფი ასერდეიან თირაფეფს",
 	"tog-newpageshidepatrolled": "დოფულით პატრულირებულ ხასჷლეფი ახალ ხასჷლეფიშ ერკებულშე",
-	"tog-hidecategorization": "ხასჷლეფიშ კატეგოიზაციაშ ტყობინაფა",
 	"tog-extendwatchlist": "გოფაჩი ოთოჸუჯე ერკებული არძო თირაფეფიშ ოძირაფალო, ამარდეიან თირაფეფიშ მეკოროცხილო",
 	"tog-usenewrc": "ბოლო ცვლილებების და კონტროლის სიის ცვლილებების დაჯგუფება",
 	"tog-numberheadings": "ავტომატურო დონომერე დუდჯოხოეფი",
@@ -51,7 +50,6 @@
 	"tog-watchlisthideliu": "დამალეთ დარეგისტრირებულ მოხმარებელთა ცვლილებები ჩემი კონტროლის სიიდან",
 	"tog-watchlisthideanons": "დამალეთ ანონიმურ მომხმარებელთა შესწორებები ჩემი კონტროლის სიიდან",
 	"tog-watchlisthidepatrolled": "დამალეთ საკონტროლო სიიდან პატრულირებული რედაქტირებები",
-	"tog-watchlisthidecategorization": "ხასჷლეფიშ კატეგოიზაციაშ ტყობინაფა",
 	"tog-ccmeonemails": "გამომიგზავნე ელფოსტების ასლები, რომლებსაც მე სხვა მომხმარებლებს ვუგზავნი",
 	"tog-diffonly": "დამალე გვერდის შიგთავსი ცვლილების ქვევით",
 	"tog-showhiddencats": "ქაძირი ფულირი კატეგორიეფი",
@@ -523,7 +521,7 @@
 	"passwordreset-emailtitle": "ანგარიშის მონაცემები {{SITENAME}}-თვის",
 	"passwordreset-emailtext-ip": "ვიღაცამ (შესაძლოა თქვენ, ამ IP-მისამართიდან $1) მოითხოვა თქვენი \nპაროლის თავიდან დაყენება საიტისათვის {{SITENAME}} ($4).\n{{PLURAL:$3|შემდეგი ანგარიში მიბმულია|შემდეგი ანგარიშები მიბმულია}} ამ ელ.ფოსტის მისამართზე:\n\n$2\n\n{{PLURAL:$3|ეს დროებითი პაროლი|ეს დროებითი პაროლები}} იმოქმედებს {{PLURAL:$5|ერთი დღე|$5 დღე}}.\nთქვენ უნდა შეხვიდეთ სისტემაში და აირჩიოთ ახალი პაროლი.\nთუ თქვენ არ გაგიკეთებიათ აღნიშნული მოთხოვნა, ან გაიხსენეთ თქვენი პაროლი\nდა აღარ გსურთ მისი შეცვლა, მაშინ შეგიძლიათ იგნორირება გაუკეთოთ ამ შეტყობინებას\nდა გააგრძელოთ თქვენი ძველი პაროლის გამოყენება.",
 	"passwordreset-emailtext-user": "მომხმარებელმა $1 პროექტიდან {{SITENAME}} მოითხოვა თქვენი \nპაროლის თავიდან დაყენება საიტისათვის {{SITENAME}} ($4).\n{{PLURAL:$3|შემდეგი ანგარიში მიბმულია|შემდეგი ანგარიშები მიბმულია}} ამ ელ.ფოსტის მისამართზე:\n\n$2\n\n{{PLURAL:$3|ეს დროებითი პაროლი|ეს დროებითი პაროლები}} იმოქმედებს {{PLURAL:$5|ერთი დღე|$5 დღე}}.\nთქვენ უნდა შეხვიდეთ სისტემაში და აირჩიოთ ახალი პაროლი.\nთუ თქვენ არ გაგიკეთებიათ აღნიშნული მოთხოვნა, ან გაიხსენეთ თქვენი პაროლი\nდა აღარ გსურთ მისი შეცვლა, მაშინ შეგიძლიათ იგნორირება გაუკეთოთ ამ შეტყობინებას\nდა გააგრძელოთ თქვენი ძველი პაროლის გამოყენება.",
-	"passwordreset-emailelement": "მომხმარებლის სახელი: $1\nდროებითი პაროლი: $2",
+	"passwordreset-emailelement": "მომხმარებლის სახელი: \n$1\n\nდროებითი პაროლი: \n$2",
 	"passwordreset-emailsent": "პაროლის თავიდან დასაყენებელი ელ.ფოსტა გაიგზავნა.",
 	"passwordreset-emailsent-capture": "ქვემოთ ნაჩვენები პაროლის თავიდან დასაყენებელი წერილი გაიგზავნა.",
 	"passwordreset-emailerror-capture": "ქვემოთ მოცემულია შექმნილი პაროლის დასაყენებელი წერილი, რომლის გაგზავნაც {{GENDER:$2|მომხმარებელთან}} ვერ მოხერხდა: $1 გამო",
@@ -1157,9 +1155,6 @@
 	"rcshowhidemine": "ჩქიმ რედაქტირაფეფიშ $1",
 	"rcshowhidemine-show": "ძირაფა",
 	"rcshowhidemine-hide": "ტყობინაფა",
-	"rcshowhidecategorization": "$1 ხასჷლაშ კატეროტიზაცია",
-	"rcshowhidecategorization-show": "ძირაფა",
-	"rcshowhidecategorization-hide": "ტყობინაფა",
 	"rclinks": "ეკონია $2 დღას ღოლამირ ეკონია $1 თირაფეფიშ ძირაფა <br />$3",
 	"diff": "შხვანერობა",
 	"hist": "ისტ.",
@@ -1183,10 +1178,6 @@
 	"recentchangeslinked-summary": "თენა რე მეწურაფილი ხასჷლაწკჷმა (ვარა მეწურაფილი კატეგორიაშ მაკათურეფწკჷმა) მერსხუაფილი ხასჷლეფს ეკონია ბორჯის ღოლამირი თირაფეფიშ ერკებული. ხასჷლეფი [[Special:Watchlist|თქვანი კონტროლიშ ერკებულს]] გჷმორთილი რე '''ფსქელას'''.\"",
 	"recentchangeslinked-page": "ხასილაშ ჯოხო:",
 	"recentchangeslinked-to": "მანგიერო ქაძირე ათე ხასილაშა მერცხილ ხასილეფშა მიშაღალირ თირაფეფ",
-	"recentchanges-page-added-to-category": "[[:$1]] გეძინელჷ რე კატეგორიას",
-	"recentchanges-page-added-to-category-bundled": "[[:$1]] დო {{PLURAL:$2|ართ ხასჷლა|$2 ხასჷლა}} გეძინელ რე კატეგორიას",
-	"recentchanges-page-removed-from-category": "[[:$1]] ლასირი რე კატეგორიაშე",
-	"recentchanges-page-removed-from-category-bundled": "[[:$1]] დო {{PLURAL:$2|ართ ხასჷლა|$2 ხასჷლა}} ლასირი რე კატეგორიაშე",
 	"upload": "ფაილიშ ეხარგუა",
 	"uploadbtn": "ფაილიშ გეთება",
 	"reuploaddesc": "გააუქმეთ ატვირთვა და დაუბრუნდით ატვირთვის ფორმას",
diff --git a/languages/i18n/yi.json b/languages/i18n/yi.json
index 05e48b34c4..044793e62b 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 רעזולטאטן זענען}} פאראן אין זאפאס",
@@ -525,7 +528,7 @@
 	"passwordreset-emailtitle": "קאנטע פרטים אין {{SITENAME}}",
 	"passwordreset-emailtext-ip": "עמעצער (מסתמא איר, פון IP אדרעס $1) האט געבעטן צוריקצושטעלן אייער פאסווארט פאר {{SITENAME}} ($4). די פאלגנדע באניצער {{PLURAL:$3|קאנטע איז|קאנטעס זענען}}\nפארבונדן מיט דעם ע־פאסט אדרעס:\n\n$2\n\n{{PLURAL:$3|דאס פראוויזארישע פאסווארט|די פראוויזארישע פאסווערטער}} וועלן אויסגיין נאך {{PLURAL:$5|איין טאג|$5 טעג}}.\nאיר זאלט אריינלאגירן און קלויבן א נייע פאסווארט אצינד. טאמער א צווייטער האט געשיקט די בקשה,\nאדער ווען איר געדענקט יא אייער פריעריקע פאסווארט, און וויל עס נישט ענדערן,\n קענט איר איגנארירן דעם אנזאג און ניצן ווייטער דאס אלטע פאסווארט.",
 	"passwordreset-emailtext-user": "באניצער $1 אויף  {{SITENAME}} האט געבעטן צוריקצושטעלן אייער פאסווארט פאר {{SITENAME}} ($4).\nדי פאלגנדע באניצער {{PLURAL:$3|קאנטע איז|קאנטעס זענען}} פארבונדן מיט דעם ע־פאסט אדרעס:\n\n$2\n\n{{PLURAL:$3|דאס פראוויזארישע פאסווארט|די פראוויזארישע פאסווערטער}} וועלן אויסגיין נאך {{PLURAL:$5|איין טאג|$5 טעג}}.\nאיר זאלט אריינלאגירן און קלויבן א נייע פאסווארט אצינד. טאמער א צווייטער האט געשיקט די בקשה,\nאדער ווען איר געדענקט יא אייער פריעריקע פאסווארט, און וויל עס נישט ענדערן,\n קענט איר איגנארירן דעם אנזאג און ניצן ווייטער דאס אלטע פאסווארט.",
-	"passwordreset-emailelement": "באַניצער נאָמען: $1\nפראוויזארישער פּאַראָל: $2",
+	"passwordreset-emailelement": "באַניצער נאָמען: \n$1\n\nפראוויזארישער פּאַראָל: \n$2",
 	"passwordreset-emailsent": "מ'האט געשיקט א פאסווארט צוריקשטעלן ע-פּאָסט.",
 	"passwordreset-emailsent-capture": "מען האט געשיקט א פאסווארט צוריקשטעלן בליצבריוו, וואס ווערט געוויזן אונטן.",
 	"passwordreset-emailerror-capture": "מען האט געשאפן א פאסווארט צוריקשטעלן בליצבריוו, וואס ווערט געוויזן אונטן, אבער שיקן צום {{GENDER:$2|באניצער}}איז דורכגעפאלן: $1",
@@ -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מען קען פֿאַרשמעלרן די אויסוואל דורך אויסוויילן א סארט לאג, באַניצער נאמען אדער אנרירנדע בלעטער.",
@@ -1661,7 +1680,6 @@
 	"emailuser": "שיקן ע-פאסט צו דעם באַניצער",
 	"emailuser-title-target": "שיקן {{GENDER:$1|דעם באניצער|די באניצערין}} ע־פאסט",
 	"emailuser-title-notarget": "שיקן א באניצער ע־פאסט",
-	"emailpage": "שיקן ע-פאסט צו באַניצער",
 	"emailpagetext": "איר קענט ניצן די פֿארעם אונטן צו שיקן א בליצבריוו צו {{GENDER:$1|דעם דאזיגן באַניצער|דער דאזיגער באַניצערין}}.\nדער ע-פאסט אדרעס וואס איר האט אריינגעלייגט אין [[Special:Preferences| אייערע באַניצער פרעפערנעצן]] וועט זיך ווײַזן כאילו דאס איז געקומען פון דארטן, בכדי צו דערמעגלעכן א תשובה.",
 	"defemailsubject": "ע-פאסט פון באַניצער \"$1\" {{SITENAME}}",
 	"usermaildisabled": "באַניצער ע־פאסט אומאַקטיוויזירט",
@@ -1683,7 +1701,7 @@
 	"emailccsubject": "קאפיע פון אײַער מעלדונג צו $1: $2",
 	"emailsent": "ע-פאסט געשיקט",
 	"emailsenttext": "אײַער אי-בריוו איז געשיקט געווארן.",
-	"emailuserfooter": "דער בליצבריוו איז געשיקט געווארן דורך$1 צו $2 מיט דער  \"{{int:emailpage}}\" פֿונקציע בײַ {{SITENAME}}.",
+	"emailuserfooter": "דער בליצבריוו איז געשיקט געווארן דורך$1 צו $2 מיט דער  \"{{int:emailuser}}\" פֿונקציע בײַ {{SITENAME}}.",
 	"usermessage-summary": "איבערלאזן סיסטעם אָנזאָג",
 	"usermessage-editor": "סיסטעם שליח",
 	"usermessage-template": "MediaWiki:באניצער־מעלדונג",
@@ -2222,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/yo.json b/languages/i18n/yo.json
index 4f05a3c683..36384e486e 100644
--- a/languages/i18n/yo.json
+++ b/languages/i18n/yo.json
@@ -478,7 +478,7 @@
 	"passwordreset-emailtitle": "Àwọn ẹ̀kúnrẹ́rẹ́ àpamọ́ lórí {{SITENAME}}",
 	"passwordreset-emailtext-ip": "Ẹnìkan (bóyá ẹ̀yin ni, láti àdírẹ̀sì IP $1) tọrọ àtúntò ọ̀rọ̀ìpamọ́ yín fún {{SITENAME}} ($4). {{PLURAL:$3|Àkópamọ́|Àwọn àkópamọ́}} oníṣe ìsàlẹ̀ yìí ní ìbáṣe pọ̀ mọ́ àdírẹ̀sì e-mail yìí:\n\n$2\n\n{{PLURAL:$3|Ọ̀rọ̀ìpamọ́ onígbàdíẹ̀ yìí|Àwọn ọ̀rọ̀ìpamọ́ onígbàdíẹ̀ wọ̀nyí}} yíò dópin lẹ́yìn {{PLURAL:$5|ọjọ́ kan|ọjọ́ $5}}.\nẸ gbọ́dọ̀ lọ yan ọ̀rọ̀ìpamọ́ tuntun báyìí. Tóbá jẹ́ pé ẹ̀lòmíràn ló ṣe ìtọrọ yìí, tàbí tọ́bá jẹ́ pé ẹ ti rántí ọ̀rọ̀ìpamọ́ àtètèkọ́ṣe yín, tí ẹ kọ̀ sí fẹ́ yíipadà mọ́, ẹ lé ṣàìkàsí ìránṣẹ́ yìí, kí ẹ sì tẹ̀síwájú ní lo ọ̀rọ̀ìpamọ́ àtijọ́ yín.",
 	"passwordreset-emailtext-user": "Oníṣe $1 lórí {{SITENAME}} tọrọ àtúntò ọ̀rọ̀ìpamọ́ yín fùn {{SITENAME}} ($4). {{PLURAL:$3|Àkópamọ́|Àwọn àkópamọ́}} oníṣe ìsàlẹ̀ yìí ní ìbáṣe pọ̀ mọ́ àdírẹ̀sì e-mail yìí:\n\n$2\n\n{{PLURAL:$3|Ọ̀rọ̀ìpamọ́ onígbàdíẹ̀ yìí|Àwọn ọ̀rọ̀ìpamọ́ onígbàdíẹ̀ wọ̀nyí}} yíò dópin lẹ́yìn {{PLURAL:$5|ọjọ́ kan|ọjọ́ $5}}.\nẸ gbọ́dọ̀ lọ yan ọ̀rọ̀ìpamọ́ tuntun báyìí. Tóbá jẹ́ pé ẹ̀lòmíràn ló ṣe ìtọrọ yìí, tàbí tọ́bá jẹ́ pé ẹ ti rántí ọ̀rọ̀ìpamọ́ àtètèkọ́ṣe yín, tí ẹ kọ̀ sí fẹ́ yíipadà mọ́, ẹ lé ṣàìkàsí ìránṣẹ́ yìí, kí ẹ sì tẹ̀síwájú ní lo ọ̀rọ̀ìpamọ́ àtijọ́ yín.",
-	"passwordreset-emailelement": "Orúkọ oníṣe: $1\nỌ̀rọ̀ìpamọ́ ìgbàdíẹ̀: $2",
+	"passwordreset-emailelement": "Orúkọ oníṣe: \n$1\n\nỌ̀rọ̀ìpamọ́ ìgbàdíẹ̀: \n$2",
 	"passwordreset-emailsent": "E-mail àtúntò ọ̀rọ̀ìpamọ́ ti jẹ́ fífiránṣẹ́.",
 	"passwordreset-emailsent-capture": "E-mail àtúntò ọ̀rọ̀ìpamọ́ kan ti jẹ́ fífiránṣẹ́. Òhun nìyí nísàlẹ̀.",
 	"passwordreset-emailerror-capture": "E-mail ìyípadà ọ̀rọ̀ìpamọ́ jẹ́ dídá, òhun lóhàn nísàlẹ̀ yìí, sùgbọ́n ìfiránṣẹ́ rẹ̀ sí {{GENDER:$2|oníṣe}} náà kùnà: $1",
@@ -1500,7 +1500,6 @@
 	"emailuser": "Ẹ fi e-mail ránṣẹ́ sí oníṣe yìí",
 	"emailuser-title-target": "E-mail sí {{GENDER:$1|oníṣe}} yìí",
 	"emailuser-title-notarget": "E-mail sí oníṣe",
-	"emailpage": "E-mail sí oníṣe",
 	"emailpagetext": "Ẹ le lo fọ́ọ̀mù ìsàlẹ̀ yìí láti fi e-mail ránṣẹ́ sí {{GENDER:$1|oníṣe}} yìí.\nÀdírẹ́ẹ̀sì e-mail tí ẹ tìbọ sínú [[Special:Preferences|àwọn ìfẹ́ràn oníṣe yín]] yíò hàn bíi \"Láti\" àdírẹ́ẹ̀sì e-mail náà, kí agbaìránṣẹ́ ó le baà fi ìdáhùn ránṣẹ́ tààrà sí yín.",
 	"defemailsubject": "E-mail {{SITENAME}} látọwọ́ oníṣe \"$1\"",
 	"usermaildisabled": "Àdálẹ́kun e-mail oníṣe",
diff --git a/languages/i18n/yue.json b/languages/i18n/yue.json
index d4596b8b23..d5dc7adc11 100644
--- a/languages/i18n/yue.json
+++ b/languages/i18n/yue.json
@@ -364,8 +364,8 @@
 	"actionthrottled": "動作已壓制",
 	"actionthrottledtext": "基於反垃圾嘢嘅考量，你而家響呢段短時間之內限制咗去做呢一個動作，而你已經超過咗個上限。請響幾分鐘之後再試過。",
 	"protectedpagetext": "呢一版已經保護咗唔畀改或者做其他動作。",
-	"viewsourcetext": "你可以睇吓或者複製呢一頁嘅原始碼：",
-	"viewyourtext": "你可以睇同複製呢版入面<strong>由你改</strong>嘅原碼：",
+	"viewsourcetext": "你可以睇吓或者複製呢一頁嘅原始碼。",
+	"viewyourtext": "你可以睇同複製呢版入面<strong>由你改</strong>嘅原碼。",
 	"protectedinterface": "呢一頁提供軟件嘅介面文字，呢一頁已經保護咗以預防濫用。\n要加或者改所有維基站嘅翻譯，請去 [//translatewiki.net/ translatewiki.net]嘅  MediaWiki 本地化項目。",
 	"editinginterface": "'''警告'''：閣下而家編輯緊嘅係為爾隻軟件提供介面文字嘅版。\n改爾一版會自動改埋爾個維基嘅其他用戶用緊嘅介面嘅文字。",
 	"translateinterface": "要加或者改所有維基項目嘅翻譯，請去MediaWiki嘅本地化項目：[//translatewiki.net/ translatewiki.net]。",
@@ -535,7 +535,7 @@
 	"passwordreset-emailtitle": "{{SITENAME}}嘅戶口資料",
 	"passwordreset-emailtext-ip": "有人（可能係閣下自己，來自IP地址$1）請求更改閣下喺{{SITENAME}}（$4）嘅密碼。同爾個電子郵件有關聯嘅用戶包括：\n\n$2\n\n{{PLURAL:$3|爾個|爾啲}}臨時密碼會喺{{$5}}日之後失效。\n\n如果係閣下自己請求改密碼嘅，請馬上登錄{{SITENAME}}並且更改密碼。如果閣下諗返起自己個密碼，或者根本無申請過改密碼嘅話，請忽略爾條訊息，繼續用返舊密碼。",
 	"passwordreset-emailtext-user": "{{SITENAME}}用戶$1請求更改閣下喺{{SITENAME}}道嘅密碼$4。同爾個電子郵件有關聯嘅用戶包括：\n\n$2\n\n{{PLURAL:$3|爾個|爾啲}}臨時密碼會喺{{$5}}日之後失效。\n\n如果係閣下自己請求改密碼嘅，請馬上登錄{{SITENAME}}並且更改密碼。如果閣下諗返起自己個密碼，或者根本無申請過改密碼嘅話，請忽略爾條訊息，繼續用返舊密碼。",
-	"passwordreset-emailelement": "用戶名：$1\n臨時密碼：$2",
+	"passwordreset-emailelement": "用戶名：\n$1\n\n臨時密碼：\n$2",
 	"passwordreset-emailsent": "密碼重設電郵經已送出。",
 	"passwordreset-emailsent-capture": "密碼重設電郵經已送出，下面有顯示。",
 	"passwordreset-emailerror-capture": "密碼重設電郵經已送出，下面有顯示，但送畀{{GENDER:$2|user}}時失敗： $1",
@@ -1195,8 +1195,8 @@
 	"newpageletter": "N",
 	"boteditletter": "b",
 	"number_of_watching_users_pageview": "[$1位用戶監視]",
-	"rc_categories": "限定到分類（以\"|\"作分隔）",
-	"rc_categories_any": "任何",
+	"rc_categories": "限定到分類（以\"|\"作分隔）：",
+	"rc_categories_any": "任何揀咗嘅",
 	"rc-change-size-new": "改完後係$1位元組",
 	"newsectionsummary": "/* $1 */ 新小節",
 	"rc-enhanced-expand": "顯示細節",
@@ -1304,6 +1304,20 @@
 	"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-backup": "檔案 \"$1\" 唔備份得。",
 	"backend-fail-notexists": "檔案$1唔存在。",
 	"backend-fail-invalidpath": "\"$1\"係冇效嘅儲存命令",
@@ -1648,7 +1662,6 @@
 	"emailuser": "發電郵畀呢位用戶",
 	"emailuser-title-target": "電郵畀呢個{{GENDER:$1|用戶}}",
 	"emailuser-title-notarget": "發電郵畀用戶",
-	"emailpage": "發電郵畀用戶",
 	"emailpagetext": "你可以用下面嘅表去寄一封電郵畀呢位{{GENDER:$1|用戶}}。\n你喺[[Special:Preferences|你嘅用戶喜好設定]]入面填寫嘅電郵地址會出現喺呢封電郵「由」嘅地址度，方便收件人可以直接回覆你。",
 	"defemailsubject": "由用戶「$1」送嘅 {{SITENAME}} 電郵",
 	"usermaildisabled": "用戶電郵已停用",
@@ -1670,7 +1683,7 @@
 	"emailccsubject": "你畀$1: $2封信嘅副本",
 	"emailsent": "電郵已傳送",
 	"emailsenttext": "你嘅電郵信息已傳送。",
-	"emailuserfooter": "呢封電郵係由$1寄畀$2經{{SITENAME}}嘅「{{int:emailpage}}」功能發出嘅。",
+	"emailuserfooter": "呢封電郵係由$1寄畀$2經{{SITENAME}}嘅「{{int:emailuser}}」功能發出嘅。",
 	"usermessage-summary": "留低系統訊息。",
 	"usermessage-editor": "系統訊息",
 	"watchlist": "監視名單",
@@ -1680,10 +1693,10 @@
 	"watchlistanontext": "請先簽到去睇或者改響你監視清單度嘅項目。",
 	"watchnologin": "未登入",
 	"addwatch": "加到監視清單",
-	"addedwatchtext": "頁面「[[:$1]]」已加入到你嘅[[Special:Watchlist|監視清單]]度。\n呢個頁面以及佢個討論頁以後嘅修改都會列喺嗰度。",
+	"addedwatchtext": "「[[:$1]]」同佢個討論頁已加入到你嘅[[Special:Watchlist|監視清單]]度。",
 	"addedwatchtext-short": "「$1」呢一版已經加咗入監視清單。",
 	"removewatch": "響監視清單度拎走",
-	"removedwatchtext": "頁面「[[:$1]]」已經喺[[Special:Watchlist|你嘅監視清單]]度刪除。",
+	"removedwatchtext": "「[[:$1]]」同佢個討論頁已經喺[[Special:Watchlist|你嘅監視清單]]度刪除。",
 	"removedwatchtext-short": "「$1」呢一版已經由監視清單度拎走咗。",
 	"watch": "監視",
 	"watchthispage": "監視呢頁",
@@ -1828,7 +1841,7 @@
 	"undeletepagetext": "以下嘅$1個頁面已經刪除，但係重喺檔庫度可以恢復。檔案庫可能會定時清理。",
 	"undelete-fieldset-title": "恢復修訂",
 	"undeleteextrahelp": "要恢復成個頁面，唔好剔任何嘅核選盒，再撳<strong><em>{{int:undeletebtn}}</em></strong>。\n要恢復已經選擇咗嘅修訂，將要恢復代表有關修訂嘅核選盒剔上，再撳<strong><em>{{int:undeletebtn}}</em></strong>。",
-	"undeleterevisions": "$1個修訂都已經存檔",
+	"undeleterevisions": "$1個修訂都已經刪咗",
 	"undeletehistory": "如果你恢復呢個頁面，佢嘅所有修改歷史都會恢復返到嗰篇頁面嘅歷史度。如果喺佢刪除之後又新開咗同名嘅頁面，你恢復嘅修改歷史會顯示喺先前歷史度。",
 	"undeleterevdel": "如果響最新修訂度部份刪除，噉就反刪除唔到。如果遇到呢種情況，你一定要反選或者反隱藏最新刪除咗嘅修訂。",
 	"undeletehistorynoadmin": "呢版刪咗。原因喺下面有講，連同重有刪除之前編輯過呢頁嘅用戶嘅詳細資料。所刪除嘅版本嘅實際內容得管理員可以睇到。",
@@ -2839,8 +2852,14 @@
 	"tags-create-reason": "原因：",
 	"tags-create-submit": "開",
 	"tags-delete-reason": "原因：",
+	"tags-activate-title": "啟用標籤",
 	"tags-activate-reason": "原因：",
+	"tags-activate-submit": "啟用",
+	"tags-deactivate-title": "停用標籤",
 	"tags-deactivate-reason": "原因：",
+	"tags-deactivate-submit": "停用",
+	"tags-edit-existing-tags-none": "''冇''",
+	"tags-edit-reason": "原因：",
 	"comparepages": "比較版",
 	"compare-page1": "第1版",
 	"compare-page2": "第2版",
@@ -2882,6 +2901,8 @@
 	"feedback-cancel": "取消",
 	"feedback-close": "搞掂",
 	"feedback-error-title": "出錯",
+	"feedback-message": "信息:",
+	"feedback-subject": "主旨:",
 	"feedback-submit": "遞交",
 	"feedback-thanks-title": "多謝！",
 	"searchsuggest-search": "搵嘢",
diff --git a/languages/i18n/zh-hans.json b/languages/i18n/zh-hans.json
index 7a80c23ef0..51c8b483a0 100644
--- a/languages/i18n/zh-hans.json
+++ b/languages/i18n/zh-hans.json
@@ -85,20 +85,20 @@
 			"LNDDYL",
 			"Jiang123aa",
 			"Cdz",
-			"凡人丶"
+			"凡人丶",
+			"Nbdd0121"
 		]
 	},
 	"tog-underline": "链接下划线：",
 	"tog-hideminor": "隐藏最近更改中的小编辑",
 	"tog-hidepatrolled": "隐藏最近更改中的已巡查编辑",
 	"tog-newpageshidepatrolled": "隐藏新页面列表中的已巡查页面",
-	"tog-hidecategorization": "隐藏对页面的分类",
 	"tog-extendwatchlist": "扩展监视列表以显示所有更改，而不仅是最近的更改",
 	"tog-usenewrc": "按页面合并最近更改和监视列表中的更改",
-	"tog-numberheadings": "自动编号标题",
+	"tog-numberheadings": "自动将标题编号",
 	"tog-showtoolbar": "显示编辑工具栏",
 	"tog-editondblclick": "双击编辑页面",
-	"tog-editsectiononrightclick": "右击段落标题启用编辑段落",
+	"tog-editsectiononrightclick": "启用右击段落标题编辑段落",
 	"tog-watchcreations": "添加我创建的页面和我上传的文件至我的监视列表",
 	"tog-watchdefault": "添加我编辑的页面和文件至我的监视列表",
 	"tog-watchmoves": "添加我移动的页面和文件至我的监视列表",
@@ -122,7 +122,6 @@
 	"tog-watchlisthideliu": "隐藏监视列表中的登录用户的编辑",
 	"tog-watchlisthideanons": "隐藏监视列表中的匿名用户的编辑",
 	"tog-watchlisthidepatrolled": "隐藏监视列表中的已巡查编辑",
-	"tog-watchlisthidecategorization": "隐藏对页面的分类",
 	"tog-ccmeonemails": "把我给其他用户发送的电子邮件的副本发送给我",
 	"tog-diffonly": "不在差异下面显示页面内容",
 	"tog-showhiddencats": "显示隐藏分类",
@@ -369,7 +368,7 @@
 	"nstab-special": "特殊页面",
 	"nstab-project": "项目页面",
 	"nstab-image": "文件",
-	"nstab-mediawiki": "信息",
+	"nstab-mediawiki": "消息",
 	"nstab-template": "模板",
 	"nstab-help": "帮助页面",
 	"nstab-category": "分类",
@@ -509,6 +508,7 @@
 	"createacct-benefit-body2": "{{PLURAL:$1|页面}}",
 	"createacct-benefit-body3": "最近{{PLURAL:$1|贡献者}}",
 	"badretype": "您所输入的密码并不相同。",
+	"usernameinprogress": "此用户名的账户创建已在进行中。请等待。",
 	"userexists": "用户名已存在。请使用其他名称。",
 	"loginerror": "登录错误",
 	"createacct-error": "账户创建出错",
@@ -599,7 +599,7 @@
 	"passwordreset-emailtitle": "在 {{SITENAME}} 的帐户详细信息",
 	"passwordreset-emailtext-ip": "有人（可能是您，来自IP地址$1）请求重设{{SITENAME}}（$4）上相关账户的密码。以下$3个账户与该电子邮件地址关联：\n\n$2\n\n这个临时密码将会在{{PLURAL:$5|一天|$5天}}后过期。请立即登录并设置新的密码。如果请求是其他人发出的，或者您已回忆起您的旧密码并不再需要更改，您可以忽略本条消息并继续使用原密码。",
 	"passwordreset-emailtext-user": "用户$1请求重设{{SITENAME}}（$4）上您的账户的密码。{{PLURAL:$3|以下账户|此账户}}与该电子邮件地址关联：\n\n$2\n\n这个临时密码将会在{{PLURAL:$5|一天|$5天}}后过期。请立即登录并设置新的密码。如果请求是其他人发出的，或者您已回忆起您的旧密码并不再需要更改，您可以忽略本条消息并继续使用原密码。",
-	"passwordreset-emailelement": "用户名：$1\n临时密码：$2",
+	"passwordreset-emailelement": "用户名：\n$1\n\n临时密码：\n$2",
 	"passwordreset-emailsent": "密码重置邮件已发送。",
 	"passwordreset-emailsent-capture": "密码重设电子邮件已发送，并在下面显示。",
 	"passwordreset-emailerror-capture": "重置密码邮件已生成，但是无法向{{GENDER:$2|下列用户}} 发送：$1",
@@ -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天",
@@ -1273,9 +1274,6 @@
 	"rcshowhidemine": "$1我的编辑",
 	"rcshowhidemine-show": "显示",
 	"rcshowhidemine-hide": "隐藏",
-	"rcshowhidecategorization": "$1页面分类",
-	"rcshowhidecategorization-show": "显示",
-	"rcshowhidecategorization-hide": "隐藏",
 	"rclinks": "显示过去$2天的最后$1个更改<br />$3",
 	"diff": "差异",
 	"hist": "历史",
@@ -1299,10 +1297,6 @@
 	"recentchangeslinked-summary": "这是链接自指定页面（或至指定分类的成员）的页面的最近更改的列表。[[Special:Watchlist|你的监视列表]]中的页面以<strong>粗体</strong>显示。",
 	"recentchangeslinked-page": "页面名称：",
 	"recentchangeslinked-to": "显示链到所给出的页面",
-	"recentchanges-page-added-to-category": "[[:$1]]已添加至分类",
-	"recentchanges-page-added-to-category-bundled": "[[:$1]]及其他{{PLURAL:$2|$2个页面}}已添加至分类",
-	"recentchanges-page-removed-from-category": "[[:$1]]已从分类中移除",
-	"recentchanges-page-removed-from-category-bundled": "[[:$1]]及其他{{PLURAL:$2|$2个页面}}已从分类中移除",
 	"upload": "上传文件",
 	"uploadbtn": "上传文件",
 	"reuploaddesc": "取消上传，返回上传表格",
@@ -1725,7 +1719,7 @@
 	"booksources-text": "下面是销售新书和二手书的其他网站的链接的列表，也可能有关于你正在寻找的图书的更多信息：",
 	"booksources-invalid-isbn": "提供的ISBN号码并不正确，请检查原始复制来源号码是否有误。",
 	"specialloguserlabel": "执行者：",
-	"speciallogtitlelabel": "目标（标题或用户）：",
+	"speciallogtitlelabel": "目标（标题，或对于用户使用{{ns:user}}:用户名）：",
 	"log": "日志",
 	"all-logs-page": "所有公开日志",
 	"alllogstext": "所有{{SITENAME}}公开日志的联合展示。您可以通过选择日志类型、输入用户名（区分大小写）或相关页面（区分大小写）筛选日志条目。",
@@ -1811,7 +1805,6 @@
 	"emailuser": "电邮联系",
 	"emailuser-title-target": "电邮联系该{{GENDER:$1|用户}}",
 	"emailuser-title-notarget": "电邮联系",
-	"emailpage": "电邮联系",
 	"emailpagetext": "你可以使用下面的表格发送电子邮件信息至该{{GENDER:$1|用户}}。你在[[Special:Preferences|系统设置]]中输入的电子邮件地址将显示为邮件的“发件人”地址，所以该用户将可以直接回复你。",
 	"defemailsubject": "来自{{SITENAME}}用户“$1”的电子邮件",
 	"usermaildisabled": "用户电子邮件停用",
@@ -1833,7 +1826,7 @@
 	"emailccsubject": "您发送给$1的消息的副本：$2",
 	"emailsent": "电子邮件已发送",
 	"emailsenttext": "您的电子邮件已经发出。",
-	"emailuserfooter": "本电子邮件是通过{{SITENAME}}的“{{int:emailpage}}”功能被$1发送至$2的。",
+	"emailuserfooter": "本电子邮件是通过{{SITENAME}}的“{{int:emailuser}}”功能被$1发送至$2的。",
 	"usermessage-summary": "留下系统消息。",
 	"usermessage-editor": "系统信息编辑器",
 	"watchlist": "监视列表",
@@ -2201,7 +2194,7 @@
 	"lockedbyandtime": "（由 {{GENDER:$1|$1}} 于$2 $3执行）",
 	"move-page": "移动$1",
 	"move-page-legend": "移动页面",
-	"movepagetext": "您可以使用下面的表单来重命名一个页面，同时将其版本历史移动到新页面。同时老的条目将会被重定向到新条目。您可以自动地将重定向更新到原条目。如果您不选择这样做的话，请检查[[Special:DoubleRedirects|双重]]或[[Special:BrokenRedirects|损坏重定向]]链接。您有责任确保链接会被正确指向他们应该被指向的地方。\n\n注意：即使新条目已经有对应页面，此页面也'''不会'''被移动，除非新页面无任何编辑历史或是重定向页。这意味着您可在误操作后将页面移回原处，同时，您也无法覆盖现有页面。\n\n'''警告！'''对这样一个经常被访问的页面而言这可能是一个重大且唐突的更改；请在行动前先了解您的修改可能带来的一切后果。",
+	"movepagetext": "您可以使用下面的表单来重命名一个页面，同时将其版本历史移动到新页面。同时老的条目将会被重定向到新条目。您可以自动地将重定向更新到原条目。如果您不选择这样做的话，请检查[[Special:DoubleRedirects|双重]]或[[Special:BrokenRedirects|损坏重定向]]链接。您有责任确保链接会被正确指向他们应该被指向的地方。\n\n注意：即使新条目已经有对应页面，此页面也<strong>不会</strong>被移动，除非新页面无任何编辑历史或是重定向页。这意味着您可在误操作后将页面移回原处，同时，您也无法覆盖现有页面。\n\n<strong>警告！</strong>对这样一个经常被访问的页面而言这可能是一个重大且唐突的更改；请在行动前先了解您的修改可能带来的一切后果。",
 	"movepagetext-noredirectfixer": "用下面的表单来重命名一个页面，并将其版本历史同时移动到新页面。\n老的页面将成为新页面的重定向页。\n请检查[[Special:DoubleRedirects|双重重定向]]或[[Special:BrokenRedirects|损坏重定向]]链接。\n您应当负责确定所有链接依然会链到指定的页面。\n\n注意如果新页面已经有内容的话，页面将'''不会'''被移动，\n除非新页面无内容或是重定向页，而且没有版本历史。\n这意味着您再必要时可以在移动到新页面后再移回老的页面，\n同时您也无法覆盖现有页面。\n\n'''警告！'''\n对一个经常被访问的页面而言这可能是一个重大与唐突的更改；\n请在行动前先确定您了解其所可能带来的后果。",
 	"movepagetalktext": "有关的讨论页将被自动与该页面一起移动，'''除非''':\n*新页面已经有一个包含内容的讨论页，或者\n*您不勾选下面的复选框。\n\n在这些情况下，您在必要时必须手工移动或合并页面。",
 	"movearticle": "移动页面：",
@@ -2358,7 +2351,7 @@
 	"javascripttest-pagetext-frameworks": "请选择以下的框架之一：$1",
 	"javascripttest-pagetext-skins": "选择外观来运行测试：",
 	"javascripttest-qunit-intro": "请见mediawiki.org的[$1 测试说明文件]。",
-	"tooltip-pt-userpage": "你的用户页面",
+	"tooltip-pt-userpage": "您的用户页",
 	"tooltip-pt-anonuserpage": "你用于编辑的IP地址的用户页面",
 	"tooltip-pt-mytalk": "你的讨论页面",
 	"tooltip-pt-anontalk": "有关本IP地址的编辑的讨论",
@@ -2395,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": "上传文件",
@@ -2405,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": "查看系统消息",
@@ -3012,10 +3005,10 @@
 	"lag-warn-normal": "过去$1秒内的更改未必会在这个列表中显示。",
 	"lag-warn-high": "由于数据库的过度延迟，过去$1秒的更改未必会在这个列表中显示。",
 	"watchlistedit-normal-title": "编辑监视列表",
-	"watchlistedit-normal-legend": "删除监视列表中的标题",
-	"watchlistedit-normal-explain": "你的监视列表中的标题显示在下方。要删除标题，请勾选它前面选择框并单击“{{int:Watchlistedit-normal-submit}}”。你也可以[[Special:EditWatchlist/raw|编辑原始列表]]。",
-	"watchlistedit-normal-submit": "删除标题",
-	"watchlistedit-normal-done": "已从你的监视列表删除$1个标题：",
+	"watchlistedit-normal-legend": "从监视列表移除标题",
+	"watchlistedit-normal-explain": "您的监视列表中的标题显示在下方。要移除标题，请勾选它旁边的复选框，然后点击“{{int:Watchlistedit-normal-submit}}”。您也可以[[Special:EditWatchlist/raw|编辑原始列表]]。",
+	"watchlistedit-normal-submit": "移除标题",
+	"watchlistedit-normal-done": "已从您的监视列表移除{{PLURAL:$1|$1个}}标题：",
 	"watchlistedit-raw-title": "编辑原始监视列表",
 	"watchlistedit-raw-legend": "编辑原始监视列表",
 	"watchlistedit-raw-explain": "您的监视列表中的标题在下面显示，并可通过编辑此表以添加或移除标题；每行一个标题。当完成以后，点击“{{int:Watchlistedit-raw-submit}}”。您也可以[[Special:EditWatchlist|使用标准编辑器]]。",
@@ -3037,7 +3030,7 @@
 	"watchlisttools-edit": "查看并编辑监视列表",
 	"watchlisttools-raw": "编辑原始监视列表",
 	"signature": "[[{{ns:user}}:$1|$2]]（[[{{ns:user_talk}}:$1|讨论]]）",
-	"duplicate-defaultsort": "'''警告：'''默认排序关键词“$2”覆盖了之前的默认排序关键词“$1”。",
+	"duplicate-defaultsort": "<strong>警告：</strong>默认排序关键词“$2”覆盖了之前的默认排序关键词“$1”。",
 	"duplicate-displaytitle": "<strong>警告：</strong>显示的标题“$2”重写了此前显示的标题“$1”。",
 	"invalid-indicator-name": "<strong>错误：</strong>页面状态指示器的<code>name</code>属性必须不为空。",
 	"version": "版本",
@@ -3290,6 +3283,7 @@
 	"logentry-newusers-create2": "用户账户$3被$1{{GENDER:$2|创建}}",
 	"logentry-newusers-byemail": "$1创建用户$3，并且密码已通过电子邮件发送",
 	"logentry-newusers-autocreate": "用户账户$1被自动{{GENDER:$2|创建}}",
+	"logentry-protect-move_prot": "$1将保护设置从$4{{GENDER:$2|移动}}到了$3",
 	"logentry-rights-rights": "$1{{GENDER:$2|更改}}$3的用户组自$4至$5",
 	"logentry-rights-rights-legacy": "$1更改$3的用户组",
 	"logentry-rights-autopromote": "$1被自动地{{GENDER:$2|提升}}自$4至$5",
diff --git a/languages/i18n/zh-hant.json b/languages/i18n/zh-hant.json
index f5f6868f02..0dc979ccbf 100644
--- a/languages/i18n/zh-hant.json
+++ b/languages/i18n/zh-hant.json
@@ -86,7 +86,7 @@
 	"tog-enotifusertalkpages": "當我的對話頁面有變更時，傳送電子郵件通知我",
 	"tog-enotifminoredits": "當頁面與檔案有小修訂時，傳送電子郵件通知我",
 	"tog-enotifrevealaddr": "在通知郵件中顯示我的電子郵件地址",
-	"tog-shownumberswatching": "顯示正在監視的使用者數",
+	"tog-shownumberswatching": "顯示監視使用者數量",
 	"tog-oldsig": "現有簽名：",
 	"tog-fancysig": "將簽名視為 Wikitext 語言 (不自動產生連結)",
 	"tog-uselivepreview": "使用即時預覽",
@@ -97,7 +97,7 @@
 	"tog-watchlisthideliu": "隱藏監視清單中已登入使用者的編輯",
 	"tog-watchlisthideanons": "隱藏監視清單中匿名使用者的編輯",
 	"tog-watchlisthidepatrolled": "隱藏監視清單中已巡查的編輯",
-	"tog-ccmeonemails": "傳送郵件給他人時，也送一份副本到我的電子郵件信箱",
+	"tog-ccmeonemails": "我給他人寄出郵件時，也寄出一份副本到我的電子郵件信箱",
 	"tog-diffonly": "比對差異時下方不顯示頁面內容",
 	"tog-showhiddencats": "顯示隱藏分類",
 	"tog-norollbackdiff": "執行還原後略過差異比對",
@@ -111,13 +111,13 @@
 	"editfont-monospace": "等距字型",
 	"editfont-sansserif": "無襯線字型",
 	"editfont-serif": "襯線字型",
-	"sunday": "星期日",
-	"monday": "星期一",
-	"tuesday": "星期二",
-	"wednesday": "星期三",
-	"thursday": "星期四",
-	"friday": "星期五",
-	"saturday": "星期六",
+	"sunday": "週日",
+	"monday": "週一",
+	"tuesday": "週二",
+	"wednesday": "週三",
+	"thursday": "週四",
+	"friday": "週五",
+	"saturday": "週六",
 	"sun": "日",
 	"mon": "一",
 	"tue": "二",
@@ -227,7 +227,7 @@
 	"permalink": "靜態連結",
 	"print": "列印",
 	"view": "檢視",
-	"view-foreign": "用 $1 檢視",
+	"view-foreign": "在 $1 檢視",
 	"edit": "編輯",
 	"edit-local": "編輯本地說明",
 	"create": "建立",
@@ -265,7 +265,7 @@
 	"redirectedfrom": "(已重新導向自 $1)",
 	"redirectpagesub": "重新導向頁面",
 	"redirectto": "重新導向至：",
-	"lastmodifiedat": "此頁面最後修訂於 $1 $2。",
+	"lastmodifiedat": "此頁面最後修改於 $1 $2。",
 	"viewcount": "此頁面已被檢視過 $1 次。",
 	"protectedpage": "受保護頁面",
 	"jumpto": "前往：",
@@ -292,7 +292,7 @@
 	"mainpage-description": "首頁",
 	"policy-url": "Project:Policy",
 	"portal": "社群入口",
-	"portal-url": "Project:Community portal",
+	"portal-url": "Project:社群入口",
 	"privacy": "隱私政策",
 	"privacypage": "Project:隱私政策",
 	"badaccess": "權限錯誤",
@@ -328,10 +328,10 @@
 	"feedlinks": "訂閱：",
 	"feed-invalid": "無效的訂閱 Feed 類型。",
 	"feed-unavailable": "目前未提供 RSS 或 Atom",
-	"site-rss-feed": "$1 的 RSS feed",
-	"site-atom-feed": "$1 的 Atom feed",
-	"page-rss-feed": "訂閱 \"$1\" 的 RSS feed",
-	"page-atom-feed": "訂閱 \"$1\" 的 Atom feed",
+	"site-rss-feed": "$1 的 RSS 摘要",
+	"site-atom-feed": "$1 的 Atom 摘要",
+	"page-rss-feed": "\"$1\" 的 RSS 摘要",
+	"page-atom-feed": "\"$1\" 的 Atom 摘要",
 	"red-link-title": "$1 (頁面不存在)",
 	"sort-descending": "降冪排序",
 	"sort-ascending": "昇冪排序",
@@ -401,7 +401,7 @@
 	"actionthrottledtext": "您在短時間內執行此動作太多次，已超出系統上限，基於反濫用的考量，將限制您的動作。\n請稍後數分鐘後再試。",
 	"protectedpagetext": "此頁面已設為保護防止編輯或其他操作。",
 	"viewsourcetext": "您可以檢視並複製此頁面的原始碼。",
-	"viewyourtext": "您可以檢視並複製此頁面中<strong>您編輯</strong>的原始碼：",
+	"viewyourtext": "您可以檢視並複製此頁面中<strong>您編輯</strong>的原始碼。",
 	"protectedinterface": "本頁用來提供此 Wiki 軟體介面上的文字，並且已被設為保護以防止惡意修改。\n如欲增加或修改 Wiki 的翻譯，請至 [//translatewiki.net/ translatewiki.net] 上的 MediaWiki 在地化專案。",
 	"editinginterface": "<strong>警告：</strong>您正在編輯的頁面文字是用來作為軟體介面使用。\n更改此頁面將會影響其他使用者在此 Wiki 上看到的使用者介面。",
 	"translateinterface": "如欲修改 Wiki 的翻譯，請至 [//translatewiki.net/ translatewiki.net] 上的 MediaWiki 在地化專案。",
@@ -431,7 +431,7 @@
 	"userlogin-yourname": "使用者名稱",
 	"userlogin-yourname-ph": "輸入您的使用者名稱",
 	"createacct-another-username-ph": "輸入使用者名稱",
-	"yourpassword": "您的密碼：",
+	"yourpassword": "密碼：",
 	"userlogin-yourpassword": "密碼",
 	"userlogin-yourpassword-ph": "輸入您的密碼",
 	"createacct-yourpassword-ph": "輸入密碼",
@@ -481,6 +481,7 @@
 	"createacct-benefit-body2": "$1 頁",
 	"createacct-benefit-body3": " 位最近的{{PLURAL:$1|貢獻者}}",
 	"badretype": "兩次輸入的密碼並不相同。",
+	"usernameinprogress": "已正在進行此使用者名稱的帳號建立作業。\n請稍候。",
 	"userexists": "您所輸入的使用者名稱已存在，請另選一個名稱。",
 	"loginerror": "登入錯誤",
 	"createacct-error": "帳號建立錯誤",
@@ -571,7 +572,7 @@
 	"passwordreset-emailtitle": "於 {{SITENAME}} 的帳號詳細資訊",
 	"passwordreset-emailtext-ip": "不明人士 (可能是您自己，來自 IP 位址 $1) 要求重設在 {{SITENAME}} ($4) 的密碼，下列是與此電子郵件地址有關的使用者{{PLURAL:$3|帳號}}：\n\n$2\n\n{{PLURAL:$3|這個臨時密碼|這些臨時密碼}}將會在{{PLURAL:$5|一天|$5 天}}內到期，\n您應立即登入並更改新的密碼。如果不是您要求重設密碼，或您已想起密碼，並不準備修改，\n您可以忽略本訊息並且繼續使用您原本的密碼。",
 	"passwordreset-emailtext-user": "使用者 $1 要求重設在 {{SITENAME}} ($4) 的密碼，下列是與此電子郵件位址有關的使用者{{PLURAL:$3|帳號}}：\n\n$2\n\n{{PLURAL:$3|這個臨時密碼|這些臨時密碼}}將會在{{PLURAL:$5|一天|$5 天}}內到期，\n您應立即登入並更改新的密碼。如果不是您要求重設密碼，或您已想起密碼，並不準備修改，\n您可以忽略此訊息並且繼續使用您原本的密碼。",
-	"passwordreset-emailelement": "使用者名稱：$1\n臨時密碼：$2",
+	"passwordreset-emailelement": "使用者名稱：\n$1\n\n臨時密碼：\n$2",
 	"passwordreset-emailsent": "已寄出重設密碼的電子郵件。",
 	"passwordreset-emailsent-capture": "已寄出重設密碼的電子郵件，並於下方顯示。",
 	"passwordreset-emailerror-capture": "下列為重設密碼的電子郵件內容，傳送給{{GENDER:$2|使用者}}失敗：$1",
@@ -916,6 +917,7 @@
 	"search-category": "(分類 $1)",
 	"search-file-match": "(符合檔案內容)",
 	"search-suggest": "您指的是不是：$1",
+	"search-rewritten": "顯示 $1 的搜尋結果，改搜尋 $2。",
 	"search-interwiki-caption": "姐妹專案",
 	"search-interwiki-default": "來自 $1 的結果：",
 	"search-interwiki-more": "(更多)",
@@ -969,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|天}}",
@@ -1244,8 +1247,6 @@
 	"rcshowhidemine": "$1 我的編輯",
 	"rcshowhidemine-show": "顯示",
 	"rcshowhidemine-hide": "隱藏",
-	"rcshowhidecategorization-show": "顯示",
-	"rcshowhidecategorization-hide": "隱藏",
 	"rclinks": "顯示近期 $2 天內的 $1 次變更。<br />$3",
 	"diff": "差異",
 	"hist": "歷史",
@@ -1255,8 +1256,8 @@
 	"newpageletter": "新",
 	"boteditletter": "機",
 	"number_of_watching_users_pageview": "[$1 位正在監視的使用者]",
-	"rc_categories": "分類限制 (以 \"|\" 分隔)",
-	"rc_categories_any": "任意",
+	"rc_categories": "分類限制 (以 \"|\" 分隔)：",
+	"rc_categories_any": "任何選擇的",
 	"rc-change-size-new": "變更後為 $1 位元組",
 	"newsectionsummary": "/* $1 */ 新章節",
 	"rc-enhanced-expand": "顯示詳細資訊",
@@ -1380,6 +1381,7 @@
 	"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": "儲存",
@@ -1688,7 +1690,7 @@
 	"booksources-text": "下列清單包含其他銷售新書籍或二手書籍的網站連結，可會有你想尋找書籍的進一部資訊：",
 	"booksources-invalid-isbn": "您提供的 ISBN 不正確，請檢查複製的來源是否有誤。",
 	"specialloguserlabel": "執行者：",
-	"speciallogtitlelabel": "目標 (標題或使用者)：",
+	"speciallogtitlelabel": "目標 (標題或以 {{ns:user}}:使用者 表示使用者)：",
 	"log": "日誌",
 	"all-logs-page": "所有公開日誌",
 	"alllogstext": "合併顯示所有 {{SITENAME}} 中所有類型的日誌。\n您可以點選下拉式選單選擇日誌的類型，指定使用者名稱 (區分大小寫) 或影響的頁面 (區分大小寫)。",
@@ -1772,9 +1774,8 @@
 	"mailnologin": "沒有傳送位址",
 	"mailnologintext": "您必須先 [[Special:UserLogin|登入]]\n並在 [[Special:Preferences|偏好設定]]\n中設定一個有效的電子郵件地址才可以傳送郵件給其他使用者。",
 	"emailuser": "Email 聯絡此使用者",
-	"emailuser-title-target": "E-mail 聯絡此{{GENDER:$1|使用者}}",
-	"emailuser-title-notarget": "E-mail 聯絡使用者",
-	"emailpage": "E-mail 聯絡使用者",
+	"emailuser-title-target": "Email 聯絡此{{GENDER:$1|使用者}}",
+	"emailuser-title-notarget": "Email 聯絡使用者",
 	"emailpagetext": "您可以使用以下表格傳送電子郵件給這位 {{Gender:$1|使用者}}。\n您在 [[Special:Preferences|偏好設定]] 中所輸入的電子郵件地址將會作為郵件的 \"寄件人\"，因此該使用者可直接回覆您。",
 	"defemailsubject": "{{SITENAME}} 使用者 \"$1\" 寄來的電子郵件",
 	"usermaildisabled": "使用者電子郵件已停用",
@@ -1796,7 +1797,7 @@
 	"emailccsubject": "您寄給 $1 的訊息副本：$2",
 	"emailsent": "已寄出電子郵件",
 	"emailsenttext": "已寄出您的電子郵件訊息。",
-	"emailuserfooter": "這封電子郵件是由 $1 透過 {{SITENAME}} 的 \"{{int:emailpage}}\" 功能寄給 $2。",
+	"emailuserfooter": "這封電子郵件是由 $1 透過 {{SITENAME}} 的 \"{{int:emailuser}}\" 功能寄給 $2。",
 	"usermessage-summary": "留訊息至系統。",
 	"usermessage-editor": "系統訊息",
 	"watchlist": "監視清單",
@@ -1806,10 +1807,10 @@
 	"watchlistanontext": "請先登入以檢視或修改在監視清單的項目。",
 	"watchnologin": "尚未登入",
 	"addwatch": "新增至監視清單",
-	"addedwatchtext": "已於[[Special:Watchlist|您的監視清單]]新增頁面 \"[[:$1]]\"。\n未來對此頁面及其關聯的對話頁面的變更將會在此清單中列出。",
+	"addedwatchtext": "已於[[Special:Watchlist|您的監視清單]]新增頁面 \"[[:$1]]\" 及其討論頁面。\n未來對此頁面及其關聯的對話頁面的變更將會在此清單中列出。",
 	"addedwatchtext-short": "已於您的監視清單新增頁面 \"$1\"。",
 	"removewatch": "從監視清單中移除",
-	"removedwatchtext": "已於[[Special:Watchlist|您的監視清單]]移除頁面 \"[[:$1]]\"。",
+	"removedwatchtext": "已於[[Special:Watchlist|您的監視清單]]移除頁面 \"[[:$1]]\" 及其討論頁面。",
 	"removedwatchtext-short": "已於您的監視清單移除頁面 \"$1\"。",
 	"watch": "監視",
 	"watchthispage": "監視此頁面",
@@ -1959,7 +1960,7 @@
 	"undeletepagetext": "下列 {{PLURAL:$1|1 個頁面已刪除|$1 個頁面已刪除}}但尚在封存，仍可還原。\n封存的檔案可能會定時清理。",
 	"undelete-fieldset-title": "還原修訂",
 	"undeleteextrahelp": "若要還原所有的頁面歷史，請取消勾選所有核選方塊並點選 <strong><em>{{int:undeletebtn}}</em></strong>。\n若要還原指定的頁面歷史，請勾選要還原的修訂核選方塊並點選 <strong><em>{{int:undeletebtn}}</em></strong>。",
-	"undeleterevisions": "已封存 $1 個修訂",
+	"undeleterevisions": "已刪除 $1 個修訂",
 	"undeletehistory": "若您還原該頁面，所有的修訂歷史也會一併還原。\n若刪除之後已有使用相同名稱建立的新頁面，還原的修訂歷史會出現在此頁面之前的歷史中。",
 	"undeleterevdel": "若最新頁面或檔案修訂被部份刪除，將無法執行取消刪除的動作。\n這種情況您必須取選勾選或取消隱藏已刪除的最新修訂。",
 	"undeletehistorynoadmin": "已刪除此頁面。\n以下摘要顯示刪除原因與刪除前所有編輯過此頁面的使用者詳細資料。\n只有管理員可檢視實際被刪除的文字內容。",
@@ -2510,7 +2511,7 @@
 	"file-info-png-frames": "$1 畫格",
 	"file-no-thumb-animation": "<strong>注意：由於技術限制，此檔案縮圖無動畫效果。</strong>",
 	"file-no-thumb-animation-gif": "<strong>注意：由於技術限制，此類型高解析度 GIF 圖片無動畫效果。</strong>",
-	"newimages": "最新檔案圖庫",
+	"newimages": "新檔圖庫",
 	"imagelisttext": "以下為 <strong>$1</strong> 清單，$2 排序。",
 	"newimages-summary": "此特殊頁面中顯示最新上傳的檔案。",
 	"newimages-legend": "搜尋",
@@ -2532,16 +2533,16 @@
 	"hours-ago": "$1 小時前",
 	"minutes-ago": "$1 分鐘前",
 	"seconds-ago": "$1 秒鐘前",
-	"monday-at": "星期一於 $1",
-	"tuesday-at": "星期二於 $1",
-	"wednesday-at": "星期三於 $1",
-	"thursday-at": "星期四於 $1",
-	"friday-at": "星期五於 $1",
-	"saturday-at": "星期六於 $1",
-	"sunday-at": "星期日於 $1",
+	"monday-at": "週一在 $1",
+	"tuesday-at": "週二在 $1",
+	"wednesday-at": "週三在 $1",
+	"thursday-at": "週四在 $1",
+	"friday-at": "週五在 $1",
+	"saturday-at": "週六在 $1",
+	"sunday-at": "週日在 $1",
 	"yesterday-at": "昨天於 $1",
 	"bad_image_list": "請依照下列格式：\n\n僅清單項目有效 (以 * 開頭)。\n每一行的第一個連結必須是不良檔案的連結。\n同一行除第一個以外的連結會被作為例外清單，例如：檔案所在的頁面。",
-	"variantname-zh-hans": "‪中文(简体)",
+	"variantname-zh-hans": "‪简体中文",
 	"variantname-zh-hant": "‪繁體中文",
 	"variantname-zh-cn": "大陸簡體",
 	"variantname-zh-tw": "台灣正體",
@@ -2899,16 +2900,16 @@
 	"namespacesall": "全部",
 	"monthsall": "全部",
 	"confirmemail": "確認電子郵件地址",
-	"confirmemail_noemail": "您尚未在 [[Special:Preferences|偏好設定]] 中輸入一個有效的電子郵件地址。",
+	"confirmemail_noemail": "您尚未在您的[[Special:Preferences|偏好設定]]裡設定一個有效的電子郵件地址。",
 	"confirmemail_text": "{{SITENAME}} 要求您在使用郵件功能之前驗證您的電子郵件地址。\n點選以下按鈕可向您的電子郵件傳送一封確認郵件。該郵件包含有一行代碼連結；\n請在您的瀏覽器中載入此連結以確認您的電子郵件地址是有效的。",
 	"confirmemail_pending": "確認碼已透過電子郵件傳送給您，\n若您才剛建立好您的帳號，可能需要稍後幾分鐘才能收到。\n若沒有收到，請再重新申請一次確認碼。",
 	"confirmemail_send": "電子郵件確認碼",
 	"confirmemail_sent": "確認郵件已寄出。",
 	"confirmemail_oncreate": "確認碼已傳送至您的電子郵件地址。\n登入動作不需要使用此代碼，但開啟在 Wiki 中任何以電子郵件為基礎的功能會需要先提供此代碼。",
-	"confirmemail_sendfailed": "{{SITENAME}}無法傳送確認郵件，請檢查電子郵件地址是否包含非法字元。\n\n郵件傳送員回應: $1",
+	"confirmemail_sendfailed": "{{SITENAME}} 無法傳送您的確認郵件，請檢查電子郵件地址是否含有無效字元。\n\n寄件者傳回: $1",
 	"confirmemail_invalid": "無效的確認碼，該代碼可能已經過期。",
 	"confirmemail_needlogin": "請 $1 以確認您的電子郵件地址。",
-	"confirmemail_success": "您的電子郵件已經被確認。您現在可以 [[Special:UserLogin|登入]] 並使用此網站了。",
+	"confirmemail_success": "您的電子郵件已經被確認。您現在可以[[Special:UserLogin|登入]]並且享受此網站了。",
 	"confirmemail_loggedin": "已確認您的電子郵件地址。",
 	"confirmemail_subject": "{{SITENAME}} 電子郵件地址確認",
 	"confirmemail_body": "不明人士 (可能是您自己，來自 IP 位址 $1) 已在 {{SITENAME}} 註冊了一個帳號 \"$2\" 並使用了此電子郵件地址。\n\n請確認這個帳號是屬於您的，並使用瀏覽器開啟下方連結以開啟在 {{SITENAME}} 上的電子郵件功能：\n\n$3\n\n若您 *未* 註冊此帳號，\n請開啟下方連結取消電子郵件確認：\n\n$5\n\n此確認代碼會於 $4 過期。",
@@ -2995,14 +2996,14 @@
 	"version-extensions": "已安裝的擴充套件",
 	"version-skins": "已安裝的外觀",
 	"version-specialpages": "特殊頁面",
-	"version-parserhooks": "解析器連結 (Hook)",
+	"version-parserhooks": "剖析器鉤",
 	"version-variables": "變數",
 	"version-antispam": "垃圾訊息防止",
 	"version-other": "其他",
 	"version-mediahandlers": "媒體處理器",
-	"version-hooks": "連結 (Hooks)",
+	"version-hooks": "鉤",
 	"version-parser-extensiontags": "解析器擴充標籤",
-	"version-parser-function-hooks": "語法函數連結",
+	"version-parser-function-hooks": "剖析器函數鉤",
 	"version-hook-name": "鉤名",
 	"version-hook-subscribedby": "署名",
 	"version-version": "($1)",
@@ -3241,6 +3242,7 @@
 	"logentry-newusers-create2": "$1 {{GENDER:$2|已建立}}使用者帳號 $3",
 	"logentry-newusers-byemail": "$1 {{GENDER:$2|已建立}}使用者帳號 $3 並且以電子郵件通知密碼",
 	"logentry-newusers-autocreate": "已自動{{GENDER:$2|建立}}使用者帳號 $1",
+	"logentry-protect-move_prot": "$1 {{GENDER:$2|已移動}}保護設定從 $4 至 $3",
 	"logentry-rights-rights": "$1 {{GENDER:$2|已更改}} $3 的群組成員資格由 $4 成為 $5",
 	"logentry-rights-rights-legacy": "$1 {{GENDER:$2|已更改}} $3 的群組成員資格",
 	"logentry-rights-autopromote": "$1 已自動{{GENDER:$2|提升}}從 $4 成為 $5",
@@ -3438,6 +3440,7 @@
 	"special-characters-title-endash": "短破折號",
 	"special-characters-title-emdash": "長破折號",
 	"special-characters-title-minus": "減號",
+	"mw-widgets-dateinput-no-date": "未選擇日期",
 	"mw-widgets-titleinput-description-new-page": "頁面不存在",
 	"mw-widgets-titleinput-description-redirect": "重新導向至 $1"
 }
diff --git a/languages/i18n/zh-tw.json b/languages/i18n/zh-tw.json
index 74a454201b..bb5e9ab72f 100644
--- a/languages/i18n/zh-tw.json
+++ b/languages/i18n/zh-tw.json
@@ -245,7 +245,6 @@
     "prefs-personal": "使用者資料",
     "prefs-rc": "近期變動",
     "prefs-watchlist-days": "監視列表中顯示記錄的最長天數:",
-    "saveprefs": "保存偏好設定",
     "resetprefs": "重設參數",
     "searchresultshead": "搜尋結果設定",
     "recentchangesdays": "近期變動中的顯示日數:",
@@ -338,7 +337,6 @@
     "lonelypagestext": "以下頁面尚未被這個wiki中的其它頁面連結。",
     "uncategorizedimages": "待分類圖片",
     "unusedimages": "未使用圖片",
-    "popularpages": "熱門頁面",
     "mostimages": "最多連結圖片",
     "prefixindex": "所有頁面之前綴",
     "deadendpagestext": "以下頁面沒有連結到這個wiki中的其它頁面。",
@@ -415,7 +413,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/MessagesAdy.php b/languages/messages/MessagesAdy.php
new file mode 100644
index 0000000000..b421a48dc7
--- /dev/null
+++ b/languages/messages/MessagesAdy.php
@@ -0,0 +1,11 @@
+<?php
+/** Adyghe (адыгабзэ)
+ *
+ * To improve a translation please visit https://translatewiki.net
+ *
+ * @ingroup Language
+ * @file
+ * @comment falls back to Adyghe (Cyrillic)
+ */
+
+$fallback = 'ady-cyrl';
diff --git a/languages/messages/MessagesAdy_cyrl.php b/languages/messages/MessagesAdy_cyrl.php
new file mode 100644
index 0000000000..1a23937a62
--- /dev/null
+++ b/languages/messages/MessagesAdy_cyrl.php
@@ -0,0 +1,13 @@
+<?php
+/** Adyghe (адыгабзэ)
+ *
+ * To improve a translation please visit https://translatewiki.net
+ *
+ * @ingroup Language
+ * @file
+ *
+ */
+
+$namespaceNames = array(
+	NS_MEDIA            => 'Медиа',
+);
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/MessagesKhw.php b/languages/messages/MessagesKhw.php
index bcc832896a..b11e03e31b 100644
--- a/languages/messages/MessagesKhw.php
+++ b/languages/messages/MessagesKhw.php
@@ -6,6 +6,7 @@
  * @ingroup Language
  * @file
  *
+ * @author Rachitrali
  */
 
 $fallback = 'ur';
@@ -14,7 +15,19 @@ $rtl = true;
 $namespaceNames = array(
 	NS_MEDIA            => 'میڈیا',
 	NS_SPECIAL          => 'خاص',
-	NS_TALK             => 'مشقولگی',
-	NS_USER             => 'ممبار/یوزر',
+	NS_TALK             => 'تبادلۂ_خیال',
+	NS_USER             => 'صارف',
+	NS_USER_TALK        => 'تبادلۂ_خیال_صارف',
+	NS_PROJECT_TALK     => 'تبادلۂ_خیال_$1',
+	NS_FILE             => 'فائل',
+	NS_FILE_TALK        => 'تبادلۂ_خیال_فائل',
+	NS_MEDIAWIKI        => 'میڈیاویکی',
+	NS_MEDIAWIKI_TALK   => 'تبادلۂ_خیال_میڈیاویکی',
+	NS_TEMPLATE         => 'سانچہ',
+	NS_TEMPLATE_TALK    => 'تبادلۂ_خیال_سانچہ',
+	NS_HELP             => 'مدد',
+	NS_HELP_TALK        => 'تبادلۂ_خیال_مدد',
+	NS_CATEGORY         => 'زمرہ',
+	NS_CATEGORY_TALK    => 'تبادلۂ_خیال_زمرہ',
 );
 
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/MessagesLv.php b/languages/messages/MessagesLv.php
index 865ebb39e6..6408c4d937 100644
--- a/languages/messages/MessagesLv.php
+++ b/languages/messages/MessagesLv.php
@@ -38,8 +38,8 @@ $namespaceNames = array(
 	NS_MEDIA            => 'Media',
 	NS_SPECIAL          => 'Special',
 	NS_TALK             => 'Diskusija',
-	NS_USER             => 'Lietotājs',
-	NS_USER_TALK        => 'Lietotāja_diskusija',
+	NS_USER             => 'Dalībnieks',
+	NS_USER_TALK        => 'Dalībnieka_diskusija',
 	NS_PROJECT_TALK     => '{{grammar:ģenitīvs|$1}}_diskusija',
 	NS_FILE             => 'Attēls',
 	NS_FILE_TALK        => 'Attēla_diskusija',
@@ -52,5 +52,92 @@ $namespaceNames = array(
 	NS_CATEGORY         => 'Kategorija',
 	NS_CATEGORY_TALK    => 'Kategorijas_diskusija',
 );
+
+$namespaceAliases = array(
+	'Lietotājs' => NS_USER,
+	'Lietotāja_diskusija' => NS_USER_TALK,
+);
+
+$wgExtraGenderNamespaces = array(
+	NS_USER => array( 'male' => 'Dalībnieks', 'female' => 'Dalībniece' ),
+	NS_USER_TALK => array( 'male' => 'Dalībnieka_diskusija', 'female' => 'Dalībnieces_diskusija' )
+);
+
 $separatorTransformTable = array( ',' => "\xc2\xa0", '.' => ',' );
 
+/**
+ * A list of date format preference keys, which can be selected in user
+ * preferences. New preference keys can be added, provided they are supported
+ * by the language class's timeanddate(). Only the 5 keys listed below are
+ * supported by the wikitext converter (parser/DateFormatter.php).
+ *
+ * The special key "default" is an alias for either dmy or mdy depending on
+ * $wgAmericanDates
+ */
+$datePreferences = array(
+	'default',
+	'ydm',
+	'mdy',
+	'dmy',
+	'ymd',
+	'ISO 8601',
+);
+
+/**
+ * The date format to use for generated dates in the user interface.
+ * This may be one of the above date preferences, or the special value
+ * "dmy or mdy", which uses mdy if $wgAmericanDates is true, and dmy
+ * if $wgAmericanDates is false.
+ */
+$defaultDateFormat = 'ydm';
+
+/**
+ * Associative array mapping old numeric date formats, which may still be
+ * stored in user preferences, to the new string formats.
+ */
+$datePreferenceMigrationMap = array(
+	'default',
+	'mdy',
+	'dmy',
+	'ymd'
+);
+
+/**
+ * These are formats for dates generated by MediaWiki (as opposed to the wikitext
+ * DateFormatter). Documentation for the format string can be found in
+ * Language.php, search for sprintfDate.
+ *
+ * This array is automatically inherited by all subclasses. Individual keys can be
+ * overridden.
+ */
+$dateFormats = array(
+	'ydm time' => 'H.i',
+	'ydm date' => 'Y". gada" j. F',
+	'ydm monthonly' => 'Y". gada" F',
+	'ydm both' => 'Y". gada" j. F", plkst." H.i',
+	'ydm pretty' => 'j F',
+
+	'mdy time' => 'H:i',
+	'mdy date' => 'F j, Y',
+	'mdy monthonly' => 'F Y',
+	'mdy both' => 'H:i, F j, Y',
+	'mdy pretty' => 'F j',
+
+	'dmy time' => 'H:i',
+	'dmy date' => 'j F Y',
+	'dmy monthonly' => 'F Y',
+	'dmy both' => 'H:i, j F Y',
+	'dmy pretty' => 'j F',
+
+	'ymd time' => 'H:i',
+	'ymd date' => 'Y F j',
+	'ymd monthonly' => 'Y F',
+	'ymd both' => 'H:i, Y F j',
+	'ymd pretty' => 'F j',
+
+	'ISO 8601 time' => 'xnH:xni:xns',
+	'ISO 8601 date' => 'xnY-xnm-xnd',
+	'ISO 8601 monthonly' => 'xnY-xnm',
+	'ISO 8601 both' => 'xnY-xnm-xnd"T"xnH:xni:xns',
+	'ISO 8601 pretty' => 'xnm-xnd'
+);
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 9968066459..35bc37a810 100644
--- a/languages/messages/MessagesSa.php
+++ b/languages/messages/MessagesSa.php
@@ -46,19 +46,19 @@ $linkPrefixExtension = false;
 
 $namespaceNames = array(
 	NS_MEDIA            => 'माध्यमम्',
-	NS_SPECIAL          => 'विशेषम्',
+	NS_SPECIAL          => 'विशेषः',
 	NS_TALK             => 'सम्भाषणम्',
-	NS_USER             => 'योजकः',
-	NS_USER_TALK        => 'योजकसम्भाषणम्',
+	NS_USER             => 'सदस्यः',
+	NS_USER_TALK        => 'सदस्यसम्भाषणम्',
 	NS_PROJECT_TALK     => '$1सम्भाषणम्',
-	NS_FILE             => 'चित्रम्',
-	NS_FILE_TALK        => 'चित्रसम्भाषणम्',
-	NS_MEDIAWIKI        => 'मिडीयाविकी',
-	NS_MEDIAWIKI_TALK   => 'मिडियाविकीसम्भाषणम्',
+	NS_FILE             => 'सञ्चिका',
+	NS_FILE_TALK        => 'सञ्चिकासम्भाषणम्',
+	NS_MEDIAWIKI        => 'मीडियाविकि',
+	NS_MEDIAWIKI_TALK   => 'मीडियाविकिसम्भाषणम्',
 	NS_TEMPLATE         => 'फलकम्',
-	NS_TEMPLATE_TALK    => 'फलकस्य_सम्भाषणम्',
-	NS_HELP             => 'सहाय्यम्',
-	NS_HELP_TALK        => 'सहाय्यस्य_सम्भाषणम्',
+	NS_TEMPLATE_TALK    => 'फलकसम्भाषणम्',
+	NS_HELP             => 'साहाय्यम्',
+	NS_HELP_TALK        => 'साहाय्यसम्भाषणम्',
 	NS_CATEGORY         => 'वर्गः',
 	NS_CATEGORY_TALK    => 'वर्गसम्भाषणम्',
 );
@@ -66,19 +66,29 @@ $namespaceNames = array(
 $namespaceAliases = array(
 	'माध्यम'             => NS_MEDIA,
 	'विशेष'              => NS_SPECIAL,
+	'विशेषम्'            => NS_SPECIAL,
 	'संभाषणं'            => NS_TALK,
+	'योजकः'              => NS_USER,
 	'योजकसंभाषणं'        => NS_USER_TALK,
-	'$1संभाषणं'         => NS_PROJECT_TALK,
+	'योजकसम्भाषणम्'      => NS_USER_TALK,
+	'$1संभाषणं'          => NS_PROJECT_TALK,
 	'चित्रं'             => NS_FILE,
+	'चित्रम्'           => NS_FILE,
 	'चित्रसंभाषणं'       => NS_FILE_TALK,
-	'मिडियाविकीसंभाषणं' => NS_MEDIAWIKI_TALK,
+	'चित्रसम्भाषणम्'     => NS_FILE_TALK,
+	'मिडीयाविकी'         => NS_MEDIAWIKI,
+	'मिडियाविकीसंभाषणं'  => NS_MEDIAWIKI_TALK,
+	'मिडियाविकीसम्भाषणम्' => NS_MEDIAWIKI_TALK,
 	'बिंबधर'             => NS_TEMPLATE,
-	'बिंबधर_संभाषणं'      => NS_TEMPLATE_TALK,
+	'बिंबधर_संभाषणं'     => NS_TEMPLATE_TALK,
+	'फलकस्य_सम्भाषणम्'   => NS_TEMPLATE_TALK,
 	'सहाय्य'             => NS_HELP,
+	'सहाय्यम्'           => NS_HELP,
 	'सहाय्यसंभाषणं'      => NS_HELP_TALK,
+	'सहाय्यस्य_सम्भाषणम्' => NS_HELP_TALK,
 	'उपकारः'             => NS_HELP,
-	'उपकारसंभाषणं'        => NS_HELP_TALK,
-	'वर्गसंभाषणं'         => NS_CATEGORY_TALK,
+	'उपकारसंभाषणं'       => NS_HELP_TALK,
+	'वर्गसंभाषणं'        => NS_CATEGORY_TALK,
 );
 
 $specialPageAliases = array(
@@ -132,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/deleteBatch.php b/maintenance/deleteBatch.php
index 93507b3467..e6321e1ffb 100644
--- a/maintenance/deleteBatch.php
+++ b/maintenance/deleteBatch.php
@@ -97,7 +97,6 @@ class DeleteBatch extends Maintenance {
 			}
 
 			$this->output( $title->getPrefixedText() );
-			$dbw->begin( __METHOD__ );
 			if ( $title->getNamespace() == NS_FILE ) {
 				$img = wfFindFile( $title, array( 'ignoreRedirect' => true ) );
 				if ( $img && $img->isLocal() && !$img->delete( $reason ) ) {
@@ -106,8 +105,7 @@ class DeleteBatch extends Maintenance {
 			}
 			$page = WikiPage::factory( $title );
 			$error = '';
-			$success = $page->doDeleteArticle( $reason, false, 0, false, $error, $user );
-			$dbw->commit( __METHOD__ );
+			$success = $page->doDeleteArticle( $reason, false, 0, true, $error, $user );
 			if ( $success ) {
 				$this->output( " Deleted!\n" );
 			} else {
diff --git a/maintenance/deleteDefaultMessages.php b/maintenance/deleteDefaultMessages.php
index 5aeeb8e115..a1c0f616b0 100644
--- a/maintenance/deleteDefaultMessages.php
+++ b/maintenance/deleteDefaultMessages.php
@@ -76,10 +76,9 @@ class DeleteDefaultMessages extends Maintenance {
 			$dbw->ping();
 			$title = Title::makeTitle( $row->page_namespace, $row->page_title );
 			$page = WikiPage::factory( $title );
-			$dbw->begin( __METHOD__ );
 			$error = ''; // Passed by ref
-			$page->doDeleteArticle( 'No longer required', false, 0, false, $error, $user );
-			$dbw->commit( __METHOD__ );
+			// FIXME: Deletion failures should be reported, not silently ignored.
+			$page->doDeleteArticle( 'No longer required', false, 0, true, $error, $user );
 		}
 
 		$this->output( "done!\n", 'msg' );
diff --git a/maintenance/deleteEqualMessages.php b/maintenance/deleteEqualMessages.php
index dbe9698217..478e0d70c0 100644
--- a/maintenance/deleteEqualMessages.php
+++ b/maintenance/deleteEqualMessages.php
@@ -182,14 +182,20 @@ class DeleteEqualMessages extends Maintenance {
 			$this->output( "\n* [[$title]]" );
 			$page = WikiPage::factory( $title );
 			$error = ''; // Passed by ref
-			$page->doDeleteArticle( 'No longer required', false, 0, false, $error, $user );
+			$success = $page->doDeleteArticle( 'No longer required', false, 0, true, $error, $user );
+			if ( !$success ) {
+				$this->output( " (Failed!)" );
+			}
 			if ( $result['hasTalk'] && $doDeleteTalk ) {
 				$title = Title::makeTitle( NS_MEDIAWIKI_TALK, $result['title'] );
 				$this->output( "\n* [[$title]]" );
 				$page = WikiPage::factory( $title );
 				$error = ''; // Passed by ref
-				$page->doDeleteArticle( 'Orphaned talk page of no longer required message',
-					false, 0, false, $error, $user );
+				$success = $page->doDeleteArticle( 'Orphaned talk page of no longer required message',
+					false, 0, true, $error, $user );
+				if ( !$success ) {
+					$this->output( " (Failed!)" );
+				}
 			}
 		}
 		$this->output( "\n\ndone!\n" );
diff --git a/maintenance/dictionary/mediawiki.dic b/maintenance/dictionary/mediawiki.dic
index f19c64fa0d..8e4e5314ee 100644
--- a/maintenance/dictionary/mediawiki.dic
+++ b/maintenance/dictionary/mediawiki.dic
@@ -3001,9 +3001,6 @@ outreachwiki
 over
 overridable
 override
-oversight
-oversighted
-oversighter
 overwrite
 overwroteimage
 own
@@ -4244,8 +4241,6 @@ unmakesafe
 unmark
 unmerge
 unmodified
-unoversight
-unoversighted
 unpadded
 unpatrolled
 unpatrolledletter
diff --git a/maintenance/getConfiguration.php b/maintenance/getConfiguration.php
index d5f6834669..58382014f8 100644
--- a/maintenance/getConfiguration.php
+++ b/maintenance/getConfiguration.php
@@ -184,7 +184,7 @@ class GetConfiguration extends Maintenance {
 			}
 
 			return true;
-		} elseif ( is_scalar( $value ) ) {
+		} elseif ( is_scalar( $value ) || $value === null ) {
 			return true;
 		}
 
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 07e72bf85d..d142556a2c 100644
--- a/maintenance/jsduck/categories.json
+++ b/maintenance/jsduck/categories.json
@@ -31,7 +31,8 @@
 					"mw.user",
 					"mw.util",
 					"mw.plugin.*",
-					"mw.cookie"
+					"mw.cookie",
+					"mw.experiments"
 				]
 			},
 			{
@@ -40,7 +41,7 @@
 			},
 			{
 				"name": "API",
-				"classes": ["mw.Api*"]
+				"classes": ["mw.Api*", "mw.ForeignApi*"]
 			},
 			{
 				"name": "Language",
@@ -60,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/showJobs.php b/maintenance/showJobs.php
index a989aef9ad..25a096c048 100644
--- a/maintenance/showJobs.php
+++ b/maintenance/showJobs.php
@@ -34,42 +34,53 @@ require_once __DIR__ . '/Maintenance.php';
  * @ingroup Maintenance
  */
 class ShowJobs extends Maintenance {
+	protected static $stateMethods = array(
+		'unclaimed' => 'getAllQueuedJobs',
+		'delayed'   => 'getAllDelayedJobs',
+		'claimed'   => 'getAllAcquiredJobs',
+		'abandoned' => 'getAllAbandonedJobs',
+	);
+
 	public function __construct() {
 		parent::__construct();
 		$this->mDescription = "Show number of jobs waiting in master database";
 		$this->addOption( 'group', 'Show number of jobs per job type' );
-		$this->addOption( 'list',
-			'Show a list of all jobs in a machine-readable format, instead of statistics' );
+		$this->addOption( 'list', 'Show a list of all jobs instead of counts' );
 		$this->addOption( 'type', 'Only show/count jobs of a given type', false, true );
+		$this->addOption( 'status', 'Filter list by state (unclaimed,delayed,claimed,abandoned)' );
+		$this->addOption( 'limit', 'Limit of jobs listed' );
 	}
 
 	public function execute() {
-		$filterType = $this->getOption( 'type', '' );
+		$typeFilter = $this->getOption( 'type', '' );
+		$stateFilter = $this->getOption( 'status', '' );
+		$stateLimit = (float)$this->getOption( 'limit', INF );
+
 		$group = JobQueueGroup::singleton();
+
+		$filteredTypes = $typeFilter
+			? array( $typeFilter )
+			: $group->getQueueTypes();
+		$filteredStates = $stateFilter
+			? array_intersect_key( self::$stateMethods, array( $stateFilter => 1 ) )
+			: self::$stateMethods;
+
 		if ( $this->hasOption( 'list' ) ) {
-			foreach ( $group->getQueueTypes() as $type ) {
-				if ( $filterType != '' && $type != $filterType ) {
-					continue;
-				}
+			$count = 0;
+			foreach ( $filteredTypes as $type ) {
 				$queue = $group->get( $type );
-				foreach ( $queue->getAllQueuedJobs() as $job ) {
-					$this->output( $job->toString() . " status=unclaimed\n" );
-				}
-				foreach ( $queue->getAllDelayedJobs() as $job ) {
-					$this->output( $job->toString() . " status=delayed\n" );
-				}
-				foreach ( $queue->getAllAcquiredJobs() as $job ) {
-					$this->output( $job->toString() . " status=claimed\n" );
-				}
-				foreach ( $queue->getAllAbandonedJobs() as $job ) {
-					$this->output( $job->toString() . " status=abandoned\n" );
+				foreach ( $filteredStates as $state => $method ) {
+					foreach ( $queue->$method() as $job ) {
+						/** @var Job $job */
+						$this->output( $job->toString() . " status=$state\n" );
+						if ( ++$count >= $stateLimit ) {
+							return;
+						}
+					}
 				}
 			}
 		} elseif ( $this->hasOption( 'group' ) ) {
-			foreach ( $group->getQueueTypes() as $type ) {
-				if ( $filterType != '' && $type != $filterType ) {
-					continue;
-				}
+			foreach ( $filteredTypes as $type ) {
 				$queue = $group->get( $type );
 				$delayed = $queue->getDelayedCount();
 				$pending = $queue->getSize();
@@ -86,10 +97,7 @@ class ShowJobs extends Maintenance {
 			}
 		} else {
 			$count = 0;
-			foreach ( $group->getQueueTypes() as $type ) {
-				if ( $filterType != '' && $type != $filterType ) {
-					continue;
-				}
+			foreach ( $filteredTypes as $type ) {
 				$count += $group->get( $type )->getSize();
 			}
 			$this->output( "$count\n" );
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 d575c8d6db..07142a5511 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -827,7 +827,6 @@ return array(
 			'resources/lib/phpjs-sha1/sha1.js',
 			'resources/src/mediawiki/mediawiki.js',
 			'resources/src/mediawiki/mediawiki.errorLogger.js',
-			'resources/src/mediawiki/mediawiki.startUp.js',
 		),
 		'debugScripts' => 'resources/src/mediawiki/mediawiki.log.js',
 		'targets' => array( 'desktop', 'mobile' ),
@@ -848,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',
@@ -981,6 +986,20 @@ return array(
 			'oojs-ui',
 		),
 	),
+	'mediawiki.ForeignApi' => array(
+		'targets' => array( 'desktop', 'mobile' ),
+		'class' => 'ResourceLoaderForeignApiModule',
+		// Additional dependencies generated dynamically
+		'dependencies' => 'mediawiki.ForeignApi.core',
+	),
+	'mediawiki.ForeignApi.core' => array(
+		'scripts' => 'resources/src/mediawiki.api/mediawiki.ForeignApi.js',
+		'dependencies' => array(
+			'mediawiki.api',
+			'oojs',
+		),
+		'targets' => array( 'desktop', 'mobile' ),
+	),
 	'mediawiki.helplink' => array(
 		'position' => 'top',
 		'styles' => array(
@@ -1011,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',
@@ -1113,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(
@@ -1143,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' ),
 	),
@@ -1184,6 +1225,10 @@ return array(
 		'styles' => 'resources/src/mediawiki.toolbar/toolbar.less',
 		'position' => 'top',
 	),
+	'mediawiki.experiments' => array(
+		'scripts' => 'resources/src/mediawiki/mediawiki.experiments.js',
+		'targets' => array( 'desktop', 'mobile' ),
+	),
 
 	/* MediaWiki Action */
 
@@ -1322,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 */
 
@@ -1416,9 +1468,18 @@ return array(
 	'mediawiki.page.gallery' => array(
 		'scripts' => 'resources/src/mediawiki.page/mediawiki.page.gallery.js',
 		'dependencies' => array(
+			'mediawiki.page.gallery.styles',
 			'jquery.throttle-debounce',
 		)
 	),
+	'mediawiki.page.gallery.styles' => array(
+		'styles' => array(
+			'resources/src/mediawiki.page/mediawiki.page.gallery.print.css' => array( 'media' => 'print' ),
+			'resources/src/mediawiki.page/mediawiki.page.gallery.css',
+		),
+		'position' => 'top',
+		'targets' => array( 'desktop', 'mobile' ),
+	),
 	'mediawiki.page.ready' => array(
 		'scripts' => 'resources/src/mediawiki.page/mediawiki.page.ready.js',
 		'dependencies' => array(
@@ -1541,7 +1602,14 @@ return array(
 	),
 	'mediawiki.special.movePage' => array(
 		'scripts' => 'resources/src/mediawiki.special/mediawiki.special.movePage.js',
-		'dependencies' => 'jquery.byteLimit',
+		'dependencies' => array(
+			'jquery.byteLimit',
+			'mediawiki.widgets',
+		),
+	),
+	'mediawiki.special.movePage.styles' => array(
+		'styles' => 'resources/src/mediawiki.special/mediawiki.special.movePage.css',
+		'position' => 'top',
 	),
 	'mediawiki.special.pageLanguage' => array(
 		'scripts' => 'resources/src/mediawiki.special/mediawiki.special.pageLanguage.js',
@@ -1629,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(
@@ -1700,9 +1759,12 @@ return array(
 	'mediawiki.legacy.commonPrint' => array(
 		'position' => 'top',
 		'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',
@@ -1713,6 +1775,11 @@ return array(
 	'mediawiki.legacy.shared' => array(
 		'position' => 'top',
 		'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' )
 		),
 	),
@@ -1813,9 +1880,12 @@ return array(
 			'resources/src/mediawiki.widgets/mw.widgets.CalendarWidget.js',
 			'resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.js',
 			'resources/src/mediawiki.widgets/mw.widgets.NamespaceInputWidget.js',
+			'resources/src/mediawiki.widgets/mw.widgets.ComplexNamespaceInputWidget.js',
 			'resources/src/mediawiki.widgets/mw.widgets.TitleInputWidget.js',
+			'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(
@@ -1825,17 +1895,26 @@ return array(
 			),
 		),
 		'dependencies' => array(
+			'oojs-ui',
 			'mediawiki.widgets.styles',
-			'jquery.autoEllipsis',
+			// DateInputWidget
+			'moment',
+			// TitleInputWidget
 			'mediawiki.Title',
 			'mediawiki.api',
-			'moment',
-			'oojs-ui',
+			'jquery.byteLimit',
+			// TitleOptionWidget
+			'jquery.autoEllipsis',
 		),
 		'messages' => array(
+			// DateInputWidget
 			'mw-widgets-dateinput-no-date',
 			'mw-widgets-dateinput-placeholder-day',
 			'mw-widgets-dateinput-placeholder-month',
+			// NamespaceInputWidget
+			'blanknamespace',
+			'namespacesall',
+			// TitleInputWidget
 			'mw-widgets-titleinput-description-new-page',
 			'mw-widgets-titleinput-description-redirect',
 		),
@@ -1844,7 +1923,8 @@ return array(
 	'mediawiki.widgets.styles' => array(
 		'skinStyles' => array(
 			'default' => array(
-				'resources/src/mediawiki.widgets/mw.widgets.NamespaceInputWidget.base.css',
+				'resources/src/mediawiki.widgets/mw.widgets.ComplexNamespaceInputWidget.base.css',
+				'resources/src/mediawiki.widgets/mw.widgets.ComplexTitleInputWidget.base.css',
 			),
 		),
 		'position' => 'top',
diff --git a/resources/ResourcesOOUI.php b/resources/ResourcesOOUI.php
index 8c3d091008..ad905c66d4 100644
--- a/resources/ResourcesOOUI.php
+++ b/resources/ResourcesOOUI.php
@@ -114,8 +114,9 @@ return call_user_func( function () {
 
 		if ( substr( $name, 0, 5 ) === 'icons' ) {
 			$module['selectorWithoutVariant'] = '.oo-ui-icon-{name}, .mw-ui-icon-{name}:before';
-			$module['selectorWithVariant'] = '.oo-ui-image-{variant} .oo-ui-icon-{name},
+			$module['selectorWithVariant'] = '
 				.oo-ui-image-{variant}.oo-ui-icon-{name}, .mw-ui-icon-{name}-{variant}:before,
+				/* Hack for Flow, see T110051 */
 				.mw-ui-hovericon:hover .mw-ui-icon-{name}-{variant}-hover:before,
 				.mw-ui-hovericon.mw-ui-icon-{name}-{variant}-hover:hover:before';
 		}
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 216df703f3..11761c6cc2 100644
--- a/resources/lib/oojs-ui/i18n/ast.json
+++ b/resources/lib/oojs-ui/i18n/ast.json
@@ -18,6 +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-placeholder": "Nun se seleicionó nengún ficheru",
+	"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/ca.json b/resources/lib/oojs-ui/i18n/ca.json
index 35a550bfb1..33b0ce046b 100644
--- a/resources/lib/oojs-ui/i18n/ca.json
+++ b/resources/lib/oojs-ui/i18n/ca.json
@@ -28,5 +28,6 @@
 	"ooui-dialog-process-retry": "Torneu-ho a provar",
 	"ooui-dialog-process-continue": "Continua",
 	"ooui-selectfile-not-supported": "El tipus de fitxer no és compatible",
-	"ooui-selectfile-placeholder": "No s'ha seleccionat cap fitxer"
+	"ooui-selectfile-placeholder": "No s'ha seleccionat cap fitxer",
+	"ooui-selectfile-dragdrop-placeholder": "Deixeu-hi anar el fitxer (o feu clic a navega)"
 }
diff --git a/resources/lib/oojs-ui/i18n/de.json b/resources/lib/oojs-ui/i18n/de.json
index d5649b00bb..b48dfb5eb8 100644
--- a/resources/lib/oojs-ui/i18n/de.json
+++ b/resources/lib/oojs-ui/i18n/de.json
@@ -25,6 +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-placeholder": "Keine Datei ausgewählt",
+	"ooui-selectfile-dragdrop-placeholder": "Dateien hier ablegen"
 }
diff --git a/resources/lib/oojs-ui/i18n/el.json b/resources/lib/oojs-ui/i18n/el.json
index 27f19963e0..b3c48455dd 100644
--- a/resources/lib/oojs-ui/i18n/el.json
+++ b/resources/lib/oojs-ui/i18n/el.json
@@ -8,7 +8,8 @@
 			"Geraki",
 			"Glavkos",
 			"Nikosguard",
-			"Tifa93"
+			"Tifa93",
+			"Stam.nikos"
 		]
 	},
 	"ooui-outline-control-move-down": "Μετακίνηση στοιχείου προς τα κάτω",
@@ -24,5 +25,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/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 9812ec6b47..7cf2eb16ec 100644
--- a/resources/lib/oojs-ui/i18n/en.json
+++ b/resources/lib/oojs-ui/i18n/en.json
@@ -28,7 +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",
 	"ooui-semicolon-separator": "; "
 }
diff --git a/resources/lib/oojs-ui/i18n/es.json b/resources/lib/oojs-ui/i18n/es.json
index e5a8e45948..fa11a3625b 100644
--- a/resources/lib/oojs-ui/i18n/es.json
+++ b/resources/lib/oojs-ui/i18n/es.json
@@ -30,6 +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-placeholder": "Ningún archivo seleccionado",
+	"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 e86f11e3a9..59b7ccd9f6 100644
--- a/resources/lib/oojs-ui/i18n/et.json
+++ b/resources/lib/oojs-ui/i18n/et.json
@@ -18,6 +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-placeholder": "Faili ei ole valitud",
+	"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 537f6b82ef..92015a4f59 100644
--- a/resources/lib/oojs-ui/i18n/fr.json
+++ b/resources/lib/oojs-ui/i18n/fr.json
@@ -44,6 +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-placeholder": "Aucun fichier sélectionné",
+	"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 1283c532c3..4cb28399c5 100644
--- a/resources/lib/oojs-ui/i18n/gl.json
+++ b/resources/lib/oojs-ui/i18n/gl.json
@@ -19,6 +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-placeholder": "Non se seleccionou ningún ficheiro",
+	"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 de676651b4..650d67dde0 100644
--- a/resources/lib/oojs-ui/i18n/he.json
+++ b/resources/lib/oojs-ui/i18n/he.json
@@ -27,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/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 0a8bfac24d..e64889f493 100644
--- a/resources/lib/oojs-ui/i18n/km.json
+++ b/resources/lib/oojs-ui/i18n/km.json
@@ -16,5 +16,9 @@
 	"ooui-dialog-process-error": "មានបញ្ហាអ្វីមួយ",
 	"ooui-dialog-process-dismiss": "បិទ",
 	"ooui-dialog-process-retry": "ព្យាយាមម្ដងទៀត",
-	"ooui-dialog-process-continue": "បន្ត"
+	"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/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 79bb469b42..39bc670166 100644
--- a/resources/lib/oojs-ui/i18n/lb.json
+++ b/resources/lib/oojs-ui/i18n/lb.json
@@ -22,5 +22,7 @@
 	"ooui-dialog-process-dismiss": "Verwerfen",
 	"ooui-dialog-process-retry": "Nach eng Kéier probéieren",
 	"ooui-dialog-process-continue": "Virufueren",
-	"ooui-selectfile-placeholder": "Et ass kee Fichier erausgesicht"
+	"ooui-selectfile-button-select": "E Fichier eraussichen",
+	"ooui-selectfile-placeholder": "Et ass kee Fichier erausgesicht",
+	"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 4334efb79c..fbd22d0f43 100644
--- a/resources/lib/oojs-ui/i18n/lt.json
+++ b/resources/lib/oojs-ui/i18n/lt.json
@@ -19,6 +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-placeholder": "Nėra pasirinktų failų",
+	"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 53e5bf4401..46f37fe811 100644
--- a/resources/lib/oojs-ui/i18n/mk.json
+++ b/resources/lib/oojs-ui/i18n/mk.json
@@ -18,6 +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-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 81da6f507c..486e87f43f 100644
--- a/resources/lib/oojs-ui/i18n/pl.json
+++ b/resources/lib/oojs-ui/i18n/pl.json
@@ -16,7 +16,8 @@
 			"Jacenty359",
 			"Matik7",
 			"Gloria sah",
-			"Andrzej aa"
+			"Andrzej aa",
+			"The Polish"
 		]
 	},
 	"ooui-outline-control-move-down": "Przenieś niżej",
@@ -31,6 +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-placeholder": "Nie wybrano pliku",
+	"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 bef65ed873..cd9c0c25d4 100644
--- a/resources/lib/oojs-ui/i18n/qqq.json
+++ b/resources/lib/oojs-ui/i18n/qqq.json
@@ -32,7 +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-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 970a602616..69daa1806c 100644
--- a/resources/lib/oojs-ui/i18n/ro.json
+++ b/resources/lib/oojs-ui/i18n/ro.json
@@ -20,6 +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-placeholder": "Niciun fișier selectat",
+	"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/su.json b/resources/lib/oojs-ui/i18n/su.json
new file mode 100644
index 0000000000..a8cf762e4b
--- /dev/null
+++ b/resources/lib/oojs-ui/i18n/su.json
@@ -0,0 +1,21 @@
+{
+	"@metadata": {
+		"authors": [
+			"Kandar"
+		]
+	},
+	"ooui-outline-control-move-down": "Pindahkeun ka handap",
+	"ooui-outline-control-move-up": "Pindahkeun ka luhur",
+	"ooui-outline-control-remove": "Hapus",
+	"ooui-toolbar-more": "Lobaan",
+	"ooui-toolgroup-expand": "Lobaan",
+	"ooui-toolgroup-collapse": "Saeutikan",
+	"ooui-dialog-message-accept": "Heug",
+	"ooui-dialog-message-reject": "Bolay",
+	"ooui-dialog-process-error": "Aya nu teu bener",
+	"ooui-dialog-process-dismiss": "Tutup",
+	"ooui-dialog-process-retry": "Cobaan deui",
+	"ooui-dialog-process-continue": "Teruskeun",
+	"ooui-selectfile-not-supported": "Pamilihan berkas teu dirojong",
+	"ooui-selectfile-placeholder": "Taya berkas anu dipilih"
+}
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 9e0b97723b..a38afbfd61 100644
--- a/resources/lib/oojs-ui/i18n/uk.json
+++ b/resources/lib/oojs-ui/i18n/uk.json
@@ -16,7 +16,8 @@
 			"Tifinaghes",
 			"Ата",
 			"Piramidion",
-			"A1"
+			"A1",
+			"Dars"
 		]
 	},
 	"ooui-outline-control-move-down": "Перемістити елемент униз",
@@ -31,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/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 7247d938e0..9934d9d00c 100644
--- a/resources/lib/oojs-ui/i18n/zh-hans.json
+++ b/resources/lib/oojs-ui/i18n/zh-hans.json
@@ -16,21 +16,24 @@
 			"Yfdyh000",
 			"Zhangjintao",
 			"乌拉跨氪",
-			"Great Brightstar"
+			"Great Brightstar",
+			"Nbdd0121"
 		]
 	},
-	"ooui-outline-control-move-down": "项目下移",
-	"ooui-outline-control-move-up": "项目上移",
+	"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-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-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 832036225b..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.5
+ * 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-19T02:10:25Z
+ * 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-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-handle > .oo-ui-selectFileWidget-clearButton {
+.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,86 +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-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-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-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-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.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;
@@ -2863,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;
@@ -2879,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 085f744fad..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.5
+ * 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-19T02:10:17Z
+ * 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 41d06ff1ae..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.5
+ * 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-19T02:10:25Z
+ * Date: 2015-09-08T20:56:08Z
  */
 @-webkit-keyframes oo-ui-progressBarWidget-slide {
 	from {
@@ -149,10 +149,10 @@
 }
 .oo-ui-buttonElement-frameless.oo-ui-widget-enabled.oo-ui-flaggedElement-progressive > .oo-ui-buttonElement-button:hover > .oo-ui-labelElement-label,
 .oo-ui-buttonElement-frameless.oo-ui-widget-enabled.oo-ui-flaggedElement-progressive > .oo-ui-buttonElement-button:focus > .oo-ui-labelElement-label {
-	color: #347bff;
+	color: #2962cc;
 }
 .oo-ui-buttonElement-frameless.oo-ui-widget-enabled.oo-ui-flaggedElement-progressive > .oo-ui-buttonElement-button > .oo-ui-labelElement-label {
-	color: #777777;
+	color: #347bff;
 }
 .oo-ui-buttonElement-frameless.oo-ui-widget-enabled.oo-ui-flaggedElement-progressive.oo-ui-widget-enabled > .oo-ui-buttonElement-button:active > .oo-ui-labelElement-label,
 .oo-ui-buttonElement-frameless.oo-ui-widget-enabled.oo-ui-flaggedElement-progressive.oo-ui-widget-enabled.oo-ui-buttonElement-pressed > .oo-ui-buttonElement-button > .oo-ui-labelElement-label {
@@ -161,10 +161,10 @@
 }
 .oo-ui-buttonElement-frameless.oo-ui-widget-enabled.oo-ui-flaggedElement-constructive > .oo-ui-buttonElement-button:hover > .oo-ui-labelElement-label,
 .oo-ui-buttonElement-frameless.oo-ui-widget-enabled.oo-ui-flaggedElement-constructive > .oo-ui-buttonElement-button:focus > .oo-ui-labelElement-label {
-	color: #00af89;
+	color: #008064;
 }
 .oo-ui-buttonElement-frameless.oo-ui-widget-enabled.oo-ui-flaggedElement-constructive > .oo-ui-buttonElement-button > .oo-ui-labelElement-label {
-	color: #777777;
+	color: #00af89;
 }
 .oo-ui-buttonElement-frameless.oo-ui-widget-enabled.oo-ui-flaggedElement-constructive.oo-ui-widget-enabled > .oo-ui-buttonElement-button:active > .oo-ui-labelElement-label,
 .oo-ui-buttonElement-frameless.oo-ui-widget-enabled.oo-ui-flaggedElement-constructive.oo-ui-widget-enabled.oo-ui-buttonElement-pressed > .oo-ui-buttonElement-button > .oo-ui-labelElement-label {
@@ -173,10 +173,10 @@
 }
 .oo-ui-buttonElement-frameless.oo-ui-widget-enabled.oo-ui-flaggedElement-destructive > .oo-ui-buttonElement-button:hover > .oo-ui-labelElement-label,
 .oo-ui-buttonElement-frameless.oo-ui-widget-enabled.oo-ui-flaggedElement-destructive > .oo-ui-buttonElement-button:focus > .oo-ui-labelElement-label {
-	color: #d11d13;
+	color: #8c130d;
 }
 .oo-ui-buttonElement-frameless.oo-ui-widget-enabled.oo-ui-flaggedElement-destructive > .oo-ui-buttonElement-button > .oo-ui-labelElement-label {
-	color: #777777;
+	color: #d11d13;
 }
 .oo-ui-buttonElement-frameless.oo-ui-widget-enabled.oo-ui-flaggedElement-destructive.oo-ui-widget-enabled > .oo-ui-buttonElement-button:active > .oo-ui-labelElement-label,
 .oo-ui-buttonElement-frameless.oo-ui-widget-enabled.oo-ui-flaggedElement-destructive.oo-ui-widget-enabled.oo-ui-buttonElement-pressed > .oo-ui-buttonElement-button > .oo-ui-labelElement-label {
@@ -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;
@@ -1121,6 +1124,9 @@
 	background-image: -webkit-linear-gradient(transparent, transparent), /* @embed */ url("themes/mediawiki/images/icons/check.svg");
 	background-image:         linear-gradient(transparent, transparent), /* @embed */ url("themes/mediawiki/images/icons/check.svg");
 	background-image:      -o-linear-gradient(transparent, transparent), url("themes/mediawiki/images/icons/check.png");
+	background-size: contain;
+	background-position: center center;
+	background-repeat: no-repeat;
 }
 .oo-ui-menuToolGroup .oo-ui-tool.oo-ui-widget-enabled:hover {
 	background-color: #eeeeee;
@@ -1425,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 {
@@ -1468,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;
@@ -1618,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;
@@ -1687,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;
@@ -1793,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;
@@ -1933,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;
@@ -1955,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 {
@@ -2166,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;
@@ -2203,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-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 {
@@ -2222,87 +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-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-dropTarget {
+	line-height: 3.5em;
+	border: 1px dashed #cccccc;
+	padding: 0.5em 1em;
+	margin-bottom: 0.5em;
+	background: #ffffff;
+	text-align: center;
+	vertical-align: middle;
+}
+.oo-ui-selectFileWidget-supported.oo-ui-widget-enabled .oo-ui-selectFileWidget-dropTarget:hover {
+	background-color: #eeeeee;
 }
-.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-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-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;
@@ -3028,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;
@@ -3044,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 7d20dfbde1..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.5
+ * 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-19T02:10:17Z
+ * Date: 2015-09-08T20:55:55Z
  */
 /**
  * @class
diff --git a/resources/lib/oojs-ui/oojs-ui.js b/resources/lib/oojs-ui/oojs-ui.js
index 5344b1ed64..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.5
+ * 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-19T02:10:17Z
+ * Date: 2015-09-08T20:55:55Z
  */
 ( function ( OO ) {
 
@@ -64,10 +64,10 @@ OO.ui.generateElementId = function () {
  * Inspired from :focusable in jQueryUI v1.11.4 - 2015-04-14
  *
  * @param {jQuery} element Element to test
- * @return {Boolean} [description]
+ * @return {boolean}
  */
 OO.ui.isFocusableElement = function ( $element ) {
-	var node = $element[0],
+	var node = $element[ 0 ],
 		nodeName = node.nodeName.toLowerCase(),
 		// Check if the element have tabindex set
 		isInElementGroup = /^(input|select|textarea|button|object)$/.test( nodeName ),
@@ -279,10 +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',
+		// Label for the file selection widget's drop target
+		'ooui-selectfile-dragdrop-placeholder': 'Drop file here',
 		// Semicolon separator
 		'ooui-semicolon-separator': '; '
 	};
@@ -369,14 +373,14 @@ OO.ui.infuse = function ( idOrNode ) {
 			return true;
 		}
 
-		protocol = url.split( ':', 1 )[0] + ':';
+		protocol = url.split( ':', 1 )[ 0 ] + ':';
 		if ( !protocol.match( /^([A-za-z0-9\+\.\-])+:/ ) ) {
 			// Not a valid protocol, safe
 			return true;
 		}
 
 		// Safe if in the whitelist
-		return $.inArray( protocol, whitelist ) !== -1;
+		return whitelist.indexOf( protocol ) !== -1;
 	};
 
 } )();
@@ -1069,8 +1073,7 @@ OO.ui.Element = function OoUiElement( config ) {
 	this.$element = config.$element ||
 		$( document.createElement( this.getTagName() ) );
 	this.elementGroup = null;
-	this.debouncedUpdateThemeClassesHandler = this.debouncedUpdateThemeClasses.bind( this );
-	this.updateThemeClassesPending = false;
+	this.debouncedUpdateThemeClassesHandler = OO.ui.debounce( this.debouncedUpdateThemeClasses );
 
 	// Initialization
 	if ( Array.isArray( config.classes ) ) {
@@ -1171,7 +1174,7 @@ OO.ui.Element.static.unsafeInfuse = function ( idOrNode, domPromise ) {
 	if ( !$elem.length ) {
 		throw new Error( 'Widget not found: ' + id );
 	}
-	data = $elem.data( 'ooui-infused' ) || $elem[0].oouiInfused;
+	data = $elem.data( 'ooui-infused' ) || $elem[ 0 ].oouiInfused;
 	if ( data ) {
 		// cached!
 		if ( data === true ) {
@@ -1248,7 +1251,7 @@ OO.ui.Element.static.unsafeInfuse = function ( idOrNode, domPromise ) {
 		// This element is now gone from the DOM, but if anyone is holding a reference to it,
 		// let's allow them to OO.ui.infuse() it and do what they expect (T105828).
 		// Do not use jQuery.data(), as using it on detached nodes leaks memory in 1.x line by design.
-		$elem[0].oouiInfused = obj;
+		$elem[ 0 ].oouiInfused = obj;
 		top.resolve();
 	}
 	obj.$element.data( 'ooui-infused', obj );
@@ -1312,6 +1315,8 @@ OO.ui.Element.static.getDocument = function ( obj ) {
  */
 OO.ui.Element.static.getWindow = function ( obj ) {
 	var doc = this.getDocument( obj );
+	// Support: IE 8
+	// Standard Document.defaultView is IE9+
 	return doc.parentWindow || doc.defaultView;
 };
 
@@ -1427,9 +1432,13 @@ OO.ui.Element.static.getRelativePosition = function ( $element, $anchor ) {
  */
 OO.ui.Element.static.getBorders = function ( el ) {
 	var doc = el.ownerDocument,
+		// Support: IE 8
+		// Standard Document.defaultView is IE9+
 		win = doc.parentWindow || doc.defaultView,
 		style = win && win.getComputedStyle ?
 			win.getComputedStyle( el, null ) :
+			// Support: IE 8
+			// Standard getComputedStyle() is IE9+
 			el.currentStyle,
 		$el = $( el ),
 		top = parseFloat( style ? style.borderTopWidth : $el.css( 'borderTopWidth' ) ) || 0,
@@ -1455,6 +1464,8 @@ OO.ui.Element.static.getBorders = function ( el ) {
 OO.ui.Element.static.getDimensions = function ( el ) {
 	var $el, $win,
 		doc = el.ownerDocument || el.document,
+		// Support: IE 8
+		// Standard Document.defaultView is IE9+
 		win = doc.parentWindow || doc.defaultView;
 
 	if ( win === el || el === doc.documentElement ) {
@@ -1571,16 +1582,18 @@ OO.ui.Element.static.getClosestScrollableContainer = function ( el, dimension )
  * @param {Function} [config.complete] Function to call when scrolling completes
  */
 OO.ui.Element.static.scrollIntoView = function ( el, config ) {
+	var rel, anim, callback, sc, $sc, eld, scd, $win;
+
 	// Configuration initialization
 	config = config || {};
 
-	var rel, anim = {},
-		callback = typeof config.complete === 'function' && config.complete,
-		sc = this.getClosestScrollableContainer( el, config.direction ),
-		$sc = $( sc ),
-		eld = this.getDimensions( el ),
-		scd = this.getDimensions( sc ),
-		$win = $( this.getWindow( el ) );
+	anim = {};
+	callback = typeof config.complete === 'function' && config.complete;
+	sc = this.getClosestScrollableContainer( el, config.direction );
+	$sc = $( sc );
+	eld = this.getDimensions( el );
+	scd = this.getDimensions( sc );
+	$win = $( this.getWindow( el ) );
 
 	// Compute the distances between the edges of el and the edges of the scroll viewport
 	if ( $sc.is( 'html, body' ) ) {
@@ -1741,18 +1754,16 @@ OO.ui.Element.prototype.supports = function ( methods ) {
  *   guaranteeing that theme updates do not occur within an element's constructor
  */
 OO.ui.Element.prototype.updateThemeClasses = function () {
-	if ( !this.updateThemeClassesPending ) {
-		this.updateThemeClassesPending = true;
-		setTimeout( this.debouncedUpdateThemeClassesHandler );
-	}
+	this.debouncedUpdateThemeClassesHandler();
 };
 
 /**
  * @private
+ * @localdoc This method is called directly from the QUnit tests instead of #updateThemeClasses, to
+ *   make them synchronous.
  */
 OO.ui.Element.prototype.debouncedUpdateThemeClasses = function () {
 	OO.ui.theme.updateElementClasses( this );
-	this.updateThemeClassesPending = false;
 };
 
 /**
@@ -2709,7 +2720,7 @@ OO.ui.Dialog = function OoUiDialog( config ) {
 	this.actions = new OO.ui.ActionSet();
 	this.attachedActions = [];
 	this.currentAction = null;
-	this.onDocumentKeyDownHandler = this.onDocumentKeyDown.bind( this );
+	this.onDialogKeyDownHandler = this.onDialogKeyDown.bind( this );
 
 	// Events
 	this.actions.connect( this, {
@@ -2792,7 +2803,7 @@ OO.ui.Dialog.static.escapable = true;
  * @private
  * @param {jQuery.Event} e Key down event
  */
-OO.ui.Dialog.prototype.onDocumentKeyDown = function ( e ) {
+OO.ui.Dialog.prototype.onDialogKeyDown = function ( e ) {
 	if ( e.which === OO.ui.Keys.ESCAPE ) {
 		this.close();
 		e.preventDefault();
@@ -2889,7 +2900,7 @@ OO.ui.Dialog.prototype.getSetupProcess = function ( data ) {
 			this.actions.add( this.getActionWidgets( actions ) );
 
 			if ( this.constructor.static.escapable ) {
-				this.$document.on( 'keydown', this.onDocumentKeyDownHandler );
+				this.$element.on( 'keydown', this.onDialogKeyDownHandler );
 			}
 		}, this );
 };
@@ -2902,7 +2913,7 @@ OO.ui.Dialog.prototype.getTeardownProcess = function ( data ) {
 	return OO.ui.Dialog.parent.prototype.getTeardownProcess.call( this, data )
 		.first( function () {
 			if ( this.constructor.static.escapable ) {
-				this.$document.off( 'keydown', this.onDocumentKeyDownHandler );
+				this.$element.off( 'keydown', this.onDialogKeyDownHandler );
 			}
 
 			this.actions.clear();
@@ -2914,10 +2925,12 @@ OO.ui.Dialog.prototype.getTeardownProcess = function ( data ) {
  * @inheritdoc
  */
 OO.ui.Dialog.prototype.initialize = function () {
+	var titleId;
+
 	// Parent method
 	OO.ui.Dialog.parent.prototype.initialize.call( this );
 
-	var titleId = OO.ui.generateElementId();
+	titleId = OO.ui.generateElementId();
 
 	// Properties
 	this.title = new OO.ui.LabelWidget( {
@@ -3543,12 +3556,14 @@ OO.ui.WindowManager.prototype.clearWindows = function () {
  * @chainable
  */
 OO.ui.WindowManager.prototype.updateWindowSize = function ( win ) {
+	var isFullscreen;
+
 	// Bypass for non-current, and thus invisible, windows
 	if ( win !== this.currentWindow ) {
 		return;
 	}
 
-	var isFullscreen = win.getSize() === 'full';
+	isFullscreen = win.getSize() === 'full';
 
 	this.$element.toggleClass( 'oo-ui-windowManager-fullscreen', isFullscreen );
 	this.$element.toggleClass( 'oo-ui-windowManager-floating', !isFullscreen );
@@ -3567,14 +3582,14 @@ OO.ui.WindowManager.prototype.updateWindowSize = function ( win ) {
  * @chainable
  */
 OO.ui.WindowManager.prototype.toggleGlobalEvents = function ( on ) {
-	on = on === undefined ? !!this.globalEvents : !!on;
-
 	var scrollWidth, bodyMargin,
 		$body = $( this.getElementDocument().body ),
 		// We could have multiple window managers open so only modify
 		// the body css at the bottom of the stack
 		stackDepth = $body.data( 'windowManagerGlobalEvents' ) || 0 ;
 
+	on = on === undefined ? !!this.globalEvents : !!on;
+
 	if ( on ) {
 		if ( !this.globalEvents ) {
 			$( this.getElementWindow() ).on( {
@@ -4087,11 +4102,11 @@ OO.ui.ToolFactory.prototype.extract = function ( collection, used ) {
  * @constructor
  */
 OO.ui.ToolGroupFactory = function OoUiToolGroupFactory() {
+	var i, l, defaultClasses;
 	// Parent constructor
 	OO.Factory.call( this );
 
-	var i, l,
-		defaultClasses = this.constructor.static.getDefaultClasses();
+	defaultClasses = this.constructor.static.getDefaultClasses();
 
 	// Register default toolgroups
 	for ( i = 0, l = defaultClasses.length; i < l; i++ ) {
@@ -4160,9 +4175,17 @@ OO.ui.Theme.prototype.getElementClasses = function ( /* element */ ) {
  * @return {Object.<string,string[]>} Categorized class names with `on` and `off` lists
  */
 OO.ui.Theme.prototype.updateElementClasses = function ( element ) {
-	var classes = this.getElementClasses( element );
+	var $elements = $( [] ),
+		classes = this.getElementClasses( element );
+
+	if ( element.$icon ) {
+		$elements = $elements.add( element.$icon );
+	}
+	if ( element.$indicator ) {
+		$elements = $elements.add( element.$indicator );
+	}
 
-	element.$element
+	$elements
 		.removeClass( classes.off.join( ' ' ) )
 		.addClass( classes.on.join( ' ' ) );
 };
@@ -4277,7 +4300,8 @@ OO.ui.mixin.TabIndexedElement.prototype.updateTabIndex = function () {
 			// Do not index over disabled elements
 			this.$tabIndexed.attr( {
 				tabindex: this.isDisabled() ? -1 : this.tabIndex,
-				// ChromeVox and NVDA do not seem to inherit this from parent elements
+				// Support: ChromeVox and NVDA
+				// These do not seem to inherit aria-disabled from parent elements
 				'aria-disabled': this.isDisabled().toString()
 			} );
 		} else {
@@ -4320,7 +4344,6 @@ OO.ui.mixin.TabIndexedElement.prototype.getTabIndex = function () {
  * @cfg {jQuery} [$button] The button element created by the class.
  *  If this configuration is omitted, the button element will use a generated `<a>`.
  * @cfg {boolean} [framed=true] Render the button with a frame
- * @cfg {string} [accessKey] Button's access key
  */
 OO.ui.mixin.ButtonElement = function OoUiMixinButtonElement( config ) {
 	// Configuration initialization
@@ -4329,7 +4352,6 @@ OO.ui.mixin.ButtonElement = function OoUiMixinButtonElement( config ) {
 	// Properties
 	this.$button = null;
 	this.framed = null;
-	this.accessKey = null;
 	this.active = false;
 	this.onMouseUpHandler = this.onMouseUp.bind( this );
 	this.onMouseDownHandler = this.onMouseDown.bind( this );
@@ -4341,7 +4363,6 @@ OO.ui.mixin.ButtonElement = function OoUiMixinButtonElement( config ) {
 	// Initialization
 	this.$element.addClass( 'oo-ui-buttonElement' );
 	this.toggleFramed( config.framed === undefined || config.framed );
-	this.setAccessKey( config.accessKey );
 	this.setButtonElement( config.$button || $( '<a>' ) );
 };
 
@@ -4399,7 +4420,7 @@ OO.ui.mixin.ButtonElement.prototype.setButtonElement = function ( $button ) {
 
 	this.$button = $button
 		.addClass( 'oo-ui-buttonElement-button' )
-		.attr( { role: 'button', accesskey: this.accessKey } )
+		.attr( { role: 'button' } )
 		.on( {
 			mousedown: this.onMouseDownHandler,
 			keydown: this.onKeyDownHandler,
@@ -4532,29 +4553,6 @@ OO.ui.mixin.ButtonElement.prototype.toggleFramed = function ( framed ) {
 	return this;
 };
 
-/**
- * Set the button's access key.
- *
- * @param {string} accessKey Button's access key, use empty string to remove
- * @chainable
- */
-OO.ui.mixin.ButtonElement.prototype.setAccessKey = function ( accessKey ) {
-	accessKey = typeof accessKey === 'string' && accessKey.length ? accessKey : null;
-
-	if ( this.accessKey !== accessKey ) {
-		if ( this.$button ) {
-			if ( accessKey !== null ) {
-				this.$button.attr( 'accesskey', accessKey );
-			} else {
-				this.$button.removeAttr( 'accesskey' );
-			}
-		}
-		this.accessKey = accessKey;
-	}
-
-	return this;
-};
-
 /**
  * Set the button to its 'active' state.
  *
@@ -4716,7 +4714,7 @@ OO.ui.mixin.GroupElement.prototype.aggregate = function ( events ) {
 				item = this.items[ i ];
 				if ( item.connect && item.disconnect ) {
 					remove = {};
-					remove[ itemEvent ] = [ 'emit', this.aggregateItemEvents[itemEvent], item ];
+					remove[ itemEvent ] = [ 'emit', this.aggregateItemEvents[ itemEvent ], item ];
 					item.disconnect( this, remove );
 				}
 			}
@@ -4759,7 +4757,7 @@ OO.ui.mixin.GroupElement.prototype.addItems = function ( items, index ) {
 		item = items[ i ];
 
 		// Check if item exists then remove it first, effectively "moving" it
-		currentIndex = $.inArray( item, this.items );
+		currentIndex = this.items.indexOf( item );
 		if ( currentIndex >= 0 ) {
 			this.removeItems( [ item ] );
 			// Adjust index to compensate for removal
@@ -4808,7 +4806,7 @@ OO.ui.mixin.GroupElement.prototype.removeItems = function ( items ) {
 	// Remove specific items
 	for ( i = 0, len = items.length; i < len; i++ ) {
 		item = items[ i ];
-		index = $.inArray( item, this.items );
+		index = this.items.indexOf( item );
 		if ( index !== -1 ) {
 			if (
 				item.connect && item.disconnect &&
@@ -4932,13 +4930,13 @@ OO.ui.mixin.DraggableElement.prototype.onDragStart = function ( e ) {
 	// Define drop effect
 	dataTransfer.dropEffect = 'none';
 	dataTransfer.effectAllowed = 'move';
+	// Support: Firefox
 	// We must set up a dataTransfer data property or Firefox seems to
 	// ignore the fact the element is draggable.
 	try {
 		dataTransfer.setData( 'application-x/OOjs-UI-draggable', this.getIndex() );
 	} catch ( err ) {
-		// The above is only for firefox. No need to set a catch clause
-		// if it fails, move on.
+		// The above is only for Firefox. Move on if it fails.
 	}
 	// Add dragging class
 	this.$element.addClass( 'oo-ui-draggableElement-dragging' );
@@ -5046,8 +5044,8 @@ OO.ui.mixin.DraggableGroupElement = function OoUiMixinDraggableGroupElement( con
 		itemDragEnd: 'onItemDragEnd'
 	} );
 	this.$element.on( {
-		dragover: $.proxy( this.onDragOver, this ),
-		dragleave: $.proxy( this.onDragLeave, this )
+		dragover: this.onDragOver.bind( this ),
+		dragleave: this.onDragLeave.bind( this )
 	} );
 
 	// Initialize
@@ -5377,6 +5375,8 @@ OO.ui.mixin.IconElement.prototype.setIconElement = function ( $icon ) {
 	if ( this.iconTitle !== null ) {
 		this.$icon.attr( 'title', this.iconTitle );
 	}
+
+	this.updateThemeClasses();
 };
 
 /**
@@ -5546,6 +5546,8 @@ OO.ui.mixin.IndicatorElement.prototype.setIndicatorElement = function ( $indicat
 	if ( this.indicatorTitle !== null ) {
 		this.$indicator.attr( 'title', this.indicatorTitle );
 	}
+
+	this.updateThemeClasses();
 };
 
 /**
@@ -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();
 	}
 
@@ -6514,12 +6515,21 @@ OO.ui.mixin.TitledElement.prototype.getTitle = function () {
  * {@link OO.ui.mixin.ClippableElement#clip} to make sure it's still
  * clipping correctly.
  *
+ * The dimensions of #$clippableContainer will be compared to the boundaries of the
+ * nearest scrollable container. If #$clippableContainer is too tall and/or too wide,
+ * then #$clippable will be given a fixed reduced height and/or width and will be made
+ * scrollable. By default, #$clippable and #$clippableContainer are the same element,
+ * but you can build a static footer by setting #$clippableContainer to an element that contains
+ * #$clippable and the footer.
+ *
  * @abstract
  * @class
  *
  * @constructor
  * @param {Object} [config] Configuration options
- * @cfg {jQuery} [$clippable] Nodes to clip, assigned to #$clippable, omit to use #$element
+ * @cfg {jQuery} [$clippable] Node to clip, assigned to #$clippable, omit to use #$element
+ * @cfg {jQuery} [$clippableContainer] Node to keep visible, assigned to #$clippableContainer,
+ *   omit to use #$clippable
  */
 OO.ui.mixin.ClippableElement = function OoUiMixinClippableElement( config ) {
 	// Configuration initialization
@@ -6527,18 +6537,22 @@ OO.ui.mixin.ClippableElement = function OoUiMixinClippableElement( config ) {
 
 	// Properties
 	this.$clippable = null;
+	this.$clippableContainer = null;
 	this.clipping = false;
 	this.clippedHorizontally = false;
 	this.clippedVertically = false;
-	this.$clippableContainer = null;
+	this.$clippableScrollableContainer = null;
 	this.$clippableScroller = null;
 	this.$clippableWindow = null;
 	this.idealWidth = null;
 	this.idealHeight = null;
-	this.onClippableContainerScrollHandler = this.clip.bind( this );
+	this.onClippableScrollHandler = this.clip.bind( this );
 	this.onClippableWindowResizeHandler = this.clip.bind( this );
 
 	// Initialization
+	if ( config.$clippableContainer ) {
+		this.setClippableContainer( config.$clippableContainer );
+	}
 	this.setClippableElement( config.$clippable || this.$element );
 };
 
@@ -6562,6 +6576,23 @@ OO.ui.mixin.ClippableElement.prototype.setClippableElement = function ( $clippab
 	this.clip();
 };
 
+/**
+ * Set clippable container.
+ *
+ * This is the container that will be measured when deciding whether to clip. When clipping,
+ * #$clippable will be resized in order to keep the clippable container fully visible.
+ *
+ * If the clippable container is unset, #$clippable will be used.
+ *
+ * @param {jQuery|null} $clippableContainer Container to keep visible, or null to unset
+ */
+OO.ui.mixin.ClippableElement.prototype.setClippableContainer = function ( $clippableContainer ) {
+	this.$clippableContainer = $clippableContainer;
+	if ( this.$clippable ) {
+		this.clip();
+	}
+};
+
 /**
  * Toggle clipping.
  *
@@ -6576,13 +6607,13 @@ OO.ui.mixin.ClippableElement.prototype.toggleClipping = function ( clipping ) {
 	if ( this.clipping !== clipping ) {
 		this.clipping = clipping;
 		if ( clipping ) {
-			this.$clippableContainer = $( this.getClosestScrollableElementContainer() );
+			this.$clippableScrollableContainer = $( this.getClosestScrollableElementContainer() );
 			// If the clippable container is the root, we have to listen to scroll events and check
 			// jQuery.scrollTop on the window because of browser inconsistencies
-			this.$clippableScroller = this.$clippableContainer.is( 'html, body' ) ?
-				$( OO.ui.Element.static.getWindow( this.$clippableContainer ) ) :
-				this.$clippableContainer;
-			this.$clippableScroller.on( 'scroll', this.onClippableContainerScrollHandler );
+			this.$clippableScroller = this.$clippableScrollableContainer.is( 'html, body' ) ?
+				$( OO.ui.Element.static.getWindow( this.$clippableScrollableContainer ) ) :
+				this.$clippableScrollableContainer;
+			this.$clippableScroller.on( 'scroll', this.onClippableScrollHandler );
 			this.$clippableWindow = $( this.getElementWindow() )
 				.on( 'resize', this.onClippableWindowResizeHandler );
 			// Initial clip after visible
@@ -6591,8 +6622,8 @@ OO.ui.mixin.ClippableElement.prototype.toggleClipping = function ( clipping ) {
 			this.$clippable.css( { width: '', height: '', overflowX: '', overflowY: '' } );
 			OO.ui.Element.static.reconsiderScrollbars( this.$clippable[ 0 ] );
 
-			this.$clippableContainer = null;
-			this.$clippableScroller.off( 'scroll', this.onClippableContainerScrollHandler );
+			this.$clippableScrollableContainer = null;
+			this.$clippableScroller.off( 'scroll', this.onClippableScrollHandler );
 			this.$clippableScroller = null;
 			this.$clippableWindow.off( 'resize', this.onClippableWindowResizeHandler );
 			this.$clippableWindow = null;
@@ -6665,40 +6696,51 @@ OO.ui.mixin.ClippableElement.prototype.setIdealSize = function ( width, height )
  * @chainable
  */
 OO.ui.mixin.ClippableElement.prototype.clip = function () {
+	var $container, extraHeight, extraWidth, ccOffset,
+		$scrollableContainer, scOffset, scHeight, scWidth,
+		ccWidth, scrollerIsWindow, scrollTop, scrollLeft,
+		desiredWidth, desiredHeight, allotedWidth, allotedHeight,
+		naturalWidth, naturalHeight, clipWidth, clipHeight,
+		buffer = 7; // Chosen by fair dice roll
+
 	if ( !this.clipping ) {
-		// this.$clippableContainer and this.$clippableWindow are null, so the below will fail
+		// this.$clippableScrollableContainer and this.$clippableWindow are null, so the below will fail
 		return this;
 	}
 
-	var buffer = 7, // Chosen by fair dice roll
-		cOffset = this.$clippable.offset(),
-		$container = this.$clippableContainer.is( 'html, body' ) ?
-			this.$clippableWindow : this.$clippableContainer,
-		ccOffset = $container.offset() || { top: 0, left: 0 },
-		ccHeight = $container.innerHeight() - buffer,
-		ccWidth = $container.innerWidth() - buffer,
-		cWidth = this.$clippable.outerWidth() + buffer,
-		scrollerIsWindow = this.$clippableScroller[0] === this.$clippableWindow[0],
-		scrollTop = scrollerIsWindow ? this.$clippableScroller.scrollTop() : 0,
-		scrollLeft = scrollerIsWindow ? this.$clippableScroller.scrollLeft() : 0,
-		desiredWidth = cOffset.left < 0 ?
-			cWidth + cOffset.left :
-			( ccOffset.left + scrollLeft + ccWidth ) - cOffset.left,
-		desiredHeight = ( ccOffset.top + scrollTop + ccHeight ) - cOffset.top,
-		naturalWidth = this.$clippable.prop( 'scrollWidth' ),
-		naturalHeight = this.$clippable.prop( 'scrollHeight' ),
-		clipWidth = desiredWidth < naturalWidth,
-		clipHeight = desiredHeight < naturalHeight;
+	$container = this.$clippableContainer || this.$clippable;
+	extraHeight = $container.outerHeight() - this.$clippable.outerHeight();
+	extraWidth = $container.outerWidth() - this.$clippable.outerWidth();
+	ccOffset = $container.offset();
+	$scrollableContainer = this.$clippableScrollableContainer.is( 'html, body' ) ?
+		this.$clippableWindow : this.$clippableScrollableContainer;
+	scOffset = $scrollableContainer.offset() || { top: 0, left: 0 };
+	scHeight = $scrollableContainer.innerHeight() - buffer;
+	scWidth = $scrollableContainer.innerWidth() - buffer;
+	ccWidth = $container.outerWidth() + buffer;
+	scrollerIsWindow = this.$clippableScroller[ 0 ] === this.$clippableWindow[ 0 ];
+	scrollTop = scrollerIsWindow ? this.$clippableScroller.scrollTop() : 0;
+	scrollLeft = scrollerIsWindow ? this.$clippableScroller.scrollLeft() : 0;
+	desiredWidth = ccOffset.left < 0 ?
+		ccWidth + ccOffset.left :
+		( scOffset.left + scrollLeft + scWidth ) - ccOffset.left;
+	desiredHeight = ( scOffset.top + scrollTop + scHeight ) - ccOffset.top;
+	allotedWidth = desiredWidth - extraWidth;
+	allotedHeight = desiredHeight - extraHeight;
+	naturalWidth = this.$clippable.prop( 'scrollWidth' );
+	naturalHeight = this.$clippable.prop( 'scrollHeight' );
+	clipWidth = allotedWidth < naturalWidth;
+	clipHeight = allotedHeight < naturalHeight;
 
 	if ( clipWidth ) {
-		this.$clippable.css( { overflowX: 'scroll', width: desiredWidth } );
+		this.$clippable.css( { overflowX: 'scroll', width: Math.max( 0, allotedWidth ) } );
 	} else {
-		this.$clippable.css( { width: this.idealWidth || '', overflowX: '' } );
+		this.$clippable.css( { width: this.idealWidth ? this.idealWidth - extraWidth : '', overflowX: '' } );
 	}
 	if ( clipHeight ) {
-		this.$clippable.css( { overflowY: 'scroll', height: desiredHeight } );
+		this.$clippable.css( { overflowY: 'scroll', height: Math.max( 0, allotedHeight ) } );
 	} else {
-		this.$clippable.css( { height: this.idealHeight || '', overflowY: '' } );
+		this.$clippable.css( { height: this.idealHeight ? this.idealHeight - extraHeight : '', overflowY: '' } );
 	}
 
 	// If we stopped clipping in at least one of the dimensions
@@ -6712,6 +6754,113 @@ OO.ui.mixin.ClippableElement.prototype.clip = function () {
 	return this;
 };
 
+/**
+ * AccessKeyedElement is mixed into other classes to provide an `accesskey` attribute.
+ * Accesskeys allow an user to go to a specific element by using
+ * a shortcut combination of a browser specific keys + the key
+ * set to the field.
+ *
+ *     @example
+ *     // AccessKeyedElement provides an 'accesskey' attribute to the
+ *     // ButtonWidget class
+ *     var button = new OO.ui.ButtonWidget( {
+ *         label: 'Button with Accesskey',
+ *         accessKey: 'k'
+ *     } );
+ *     $( 'body' ).append( button.$element );
+ *
+ * @abstract
+ * @class
+ *
+ * @constructor
+ * @param {Object} [config] Configuration options
+ * @cfg {jQuery} [$accessKeyed] The element to which the `accesskey` attribute is applied.
+ *  If this config is omitted, the accesskey functionality is applied to $element, the
+ *  element created by the class.
+ * @cfg {string|Function} [accessKey] The key or a function that returns the key. If
+ *  this config is omitted, no accesskey will be added.
+ */
+OO.ui.mixin.AccessKeyedElement = function OoUiMixinAccessKeyedElement( config ) {
+	// Configuration initialization
+	config = config || {};
+
+	// Properties
+	this.$accessKeyed = null;
+	this.accessKey = null;
+
+	// Initialization
+	this.setAccessKey( config.accessKey || null );
+	this.setAccessKeyedElement( config.$accessKeyed || this.$element );
+};
+
+/* Setup */
+
+OO.initClass( OO.ui.mixin.AccessKeyedElement );
+
+/* Static Properties */
+
+/**
+ * The access key, a function that returns a key, or `null` for no accesskey.
+ *
+ * @static
+ * @inheritable
+ * @property {string|Function|null}
+ */
+OO.ui.mixin.AccessKeyedElement.static.accessKey = null;
+
+/* Methods */
+
+/**
+ * Set the accesskeyed element.
+ *
+ * This method is used to retarget a AccessKeyedElement mixin so that its functionality applies to the specified element.
+ * If an element is already set, the mixin's effect on that element is removed before the new element is set up.
+ *
+ * @param {jQuery} $accessKeyed Element that should use the 'accesskeyes' functionality
+ */
+OO.ui.mixin.AccessKeyedElement.prototype.setAccessKeyedElement = function ( $accessKeyed ) {
+	if ( this.$accessKeyed ) {
+		this.$accessKeyed.removeAttr( 'accesskey' );
+	}
+
+	this.$accessKeyed = $accessKeyed;
+	if ( this.accessKey ) {
+		this.$accessKeyed.attr( 'accesskey', this.accessKey );
+	}
+};
+
+/**
+ * Set accesskey.
+ *
+ * @param {string|Function|null} accesskey Key, a function that returns a key, or `null` for no accesskey
+ * @chainable
+ */
+OO.ui.mixin.AccessKeyedElement.prototype.setAccessKey = function ( accessKey ) {
+	accessKey = typeof accessKey === 'string' ? OO.ui.resolveMsg( accessKey ) : null;
+
+	if ( this.accessKey !== accessKey ) {
+		if ( this.$accessKeyed ) {
+			if ( accessKey !== null ) {
+				this.$accessKeyed.attr( 'accesskey', accessKey );
+			} else {
+				this.$accessKeyed.removeAttr( 'accesskey' );
+			}
+		}
+		this.accessKey = accessKey;
+	}
+
+	return this;
+};
+
+/**
+ * Get accesskey.
+ *
+ * @return {string} accessKey string
+ */
+OO.ui.mixin.AccessKeyedElement.prototype.getAccessKey = function () {
+	return this.accessKey;
+};
+
 /**
  * Tools, together with {@link OO.ui.ToolGroup toolgroups}, constitute {@link OO.ui.Toolbar toolbars}.
  * Each tool is configured with a static name, title, and icon and is customized with the command to carry
@@ -7410,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();
+	}
 };
 
 /**
@@ -8105,7 +8256,7 @@ OO.ui.MessageDialog.prototype.getReadyProcess = function ( data ) {
 				return action.getFlags().indexOf( 'primary' ) > -1;
 			} );
 			if ( actions.length > 0 ) {
-				actions[0].$button.focus();
+				actions[ 0 ].$button.focus();
 			}
 		}, this );
 };
@@ -8545,14 +8696,14 @@ OO.ui.ProcessDialog.prototype.showErrors = function ( errors ) {
 	}
 	this.$errorItems = $( items );
 	if ( recoverable ) {
-		abilities[this.currentAction] = true;
+		abilities[ this.currentAction ] = true;
 		// Copy the flags from the first matching action
 		actions = this.actions.get( { actions: this.currentAction } );
 		if ( actions.length ) {
-			this.retryButton.clearFlags().setFlags( actions[0].getFlags() );
+			this.retryButton.clearFlags().setFlags( actions[ 0 ].getFlags() );
 		}
 	} else {
-		abilities[this.currentAction] = false;
+		abilities[ this.currentAction ] = false;
 		this.actions.setAbilities( abilities );
 	}
 	if ( warning ) {
@@ -8631,6 +8782,8 @@ OO.ui.ProcessDialog.prototype.getTeardownProcess = function ( data ) {
  * @throws {Error} An error is thrown if no widget is specified
  */
 OO.ui.FieldLayout = function OoUiFieldLayout( fieldWidget, config ) {
+	var hasInputWidget, div, i;
+
 	// Allow passing positional parameters inside the config object
 	if ( OO.isPlainObject( fieldWidget ) && config === undefined ) {
 		config = fieldWidget;
@@ -8642,8 +8795,7 @@ OO.ui.FieldLayout = function OoUiFieldLayout( fieldWidget, config ) {
 		throw new Error( 'Widget not found' );
 	}
 
-	var hasInputWidget = fieldWidget.constructor.static.supportsSimpleLabel,
-		div, i;
+	hasInputWidget = fieldWidget.constructor.static.supportsSimpleLabel;
 
 	// Configuration initialization
 	config = $.extend( { align: 'left' }, config );
@@ -8705,10 +8857,10 @@ OO.ui.FieldLayout = function OoUiFieldLayout( fieldWidget, config ) {
 		.append( this.fieldWidget.$element );
 
 	for ( i = 0; i < this.notices.length; i++ ) {
-		this.$messages.append( this.makeMessage( 'notice', this.notices[i] ) );
+		this.$messages.append( this.makeMessage( 'notice', this.notices[ i ] ) );
 	}
 	for ( i = 0; i < this.errors.length; i++ ) {
-		this.$messages.append( this.makeMessage( 'error', this.errors[i] ) );
+		this.$messages.append( this.makeMessage( 'error', this.errors[ i ] ) );
 	}
 
 	this.setAlignment( config.align );
@@ -9484,7 +9636,7 @@ OO.ui.BookletLayout.prototype.focusFirstFocusable = function () {
 		}
 		// Find all potentially focusable elements in the item
 		// and check if they are focusable
-		items[i].$element
+		items[ i ].$element
 			.find( 'input, select, textarea, button, object' )
 			/* jshint loopfunc:true */
 			.each( checkAndFocus );
@@ -9555,7 +9707,7 @@ OO.ui.BookletLayout.prototype.toggleOutline = function ( show ) {
 OO.ui.BookletLayout.prototype.getClosestPage = function ( page ) {
 	var next, prev, level,
 		pages = this.stackLayout.getItems(),
-		index = $.inArray( page, pages );
+		index = pages.indexOf( page );
 
 	if ( index !== -1 ) {
 		next = pages[ index + 1 ];
@@ -9655,7 +9807,7 @@ OO.ui.BookletLayout.prototype.addPages = function ( pages, index ) {
 
 		if ( Object.prototype.hasOwnProperty.call( this.pages, name ) ) {
 			// Correct the insertion index
-			currentIndex = $.inArray( this.pages[ name ], stackLayoutPages );
+			currentIndex = stackLayoutPages.indexOf( this.pages[ name ] );
 			if ( currentIndex !== -1 && currentIndex + 1 < index ) {
 				index--;
 			}
@@ -10004,7 +10156,7 @@ OO.ui.IndexLayout.prototype.focusFirstFocusable = function () {
 		}
 		// Find all potentially focusable elements in the item
 		// and check if they are focusable
-		items[i].$element
+		items[ i ].$element
 			.find( 'input, select, textarea, button, object' )
 			.each( checkAndFocus );
 	}
@@ -10031,7 +10183,7 @@ OO.ui.IndexLayout.prototype.onTabSelectWidgetSelect = function ( item ) {
 OO.ui.IndexLayout.prototype.getClosestCard = function ( card ) {
 	var next, prev, level,
 		cards = this.stackLayout.getItems(),
-		index = $.inArray( card, cards );
+		index = cards.indexOf( card );
 
 	if ( index !== -1 ) {
 		next = cards[ index + 1 ];
@@ -10116,7 +10268,7 @@ OO.ui.IndexLayout.prototype.addCards = function ( cards, index ) {
 
 		if ( Object.prototype.hasOwnProperty.call( this.cards, name ) ) {
 			// Correct the insertion index
-			currentIndex = $.inArray( this.cards[ name ], stackLayoutCards );
+			currentIndex = stackLayoutCards.indexOf( this.cards[ name ] );
 			if ( currentIndex !== -1 && currentIndex + 1 < index ) {
 				index--;
 			}
@@ -10725,7 +10877,7 @@ OO.ui.StackLayout.prototype.removeItems = function ( items ) {
 	// Mixin method
 	OO.ui.mixin.GroupElement.prototype.removeItems.call( this, items );
 
-	if ( $.inArray( this.currentItem, items ) !== -1 ) {
+	if ( items.indexOf( this.currentItem ) !== -1 ) {
 		if ( this.items.length ) {
 			this.setItem( this.items[ 0 ] );
 		} else {
@@ -10765,7 +10917,7 @@ OO.ui.StackLayout.prototype.setItem = function ( item ) {
 	if ( item !== this.currentItem ) {
 		this.updateHiddenState( this.items, item );
 
-		if ( $.inArray( item, this.items ) !== -1 ) {
+		if ( this.items.indexOf( item ) !== -1 ) {
 			this.currentItem = item;
 			this.emit( 'set', item );
 		} else {
@@ -11335,8 +11487,9 @@ OO.ui.ListToolGroup.prototype.populate = function () {
 };
 
 OO.ui.ListToolGroup.prototype.getExpandCollapseTool = function () {
+	var ExpandCollapseTool;
 	if ( this.expandCollapseTool === undefined ) {
-		var ExpandCollapseTool = function () {
+		ExpandCollapseTool = function () {
 			ExpandCollapseTool.parent.apply( this, arguments );
 		};
 
@@ -11957,8 +12110,8 @@ OO.ui.OutlineControlsWidget.prototype.setAbilities = function ( abilities ) {
 	var ability;
 
 	for ( ability in this.abilities ) {
-		if ( abilities[ability] !== undefined ) {
-			this.abilities[ability] = !!abilities[ability];
+		if ( abilities[ ability ] !== undefined ) {
+			this.abilities[ ability ] = !!abilities[ ability ];
 		}
 	}
 
@@ -12153,6 +12306,7 @@ OO.mixinClass( OO.ui.ButtonGroupWidget, OO.ui.mixin.GroupElement );
  * @mixins OO.ui.mixin.TitledElement
  * @mixins OO.ui.mixin.FlaggedElement
  * @mixins OO.ui.mixin.TabIndexedElement
+ * @mixins OO.ui.mixin.AccessKeyedElement
  *
  * @constructor
  * @param {Object} [config] Configuration options
@@ -12175,6 +12329,7 @@ OO.ui.ButtonWidget = function OoUiButtonWidget( config ) {
 	OO.ui.mixin.TitledElement.call( this, $.extend( {}, config, { $titled: this.$button } ) );
 	OO.ui.mixin.FlaggedElement.call( this, config );
 	OO.ui.mixin.TabIndexedElement.call( this, $.extend( {}, config, { $tabIndexed: this.$button } ) );
+	OO.ui.mixin.AccessKeyedElement.call( this, $.extend( {}, config, { $accessKeyed: this.$button } ) );
 
 	// Properties
 	this.href = null;
@@ -12204,6 +12359,7 @@ OO.mixinClass( OO.ui.ButtonWidget, OO.ui.mixin.LabelElement );
 OO.mixinClass( OO.ui.ButtonWidget, OO.ui.mixin.TitledElement );
 OO.mixinClass( OO.ui.ButtonWidget, OO.ui.mixin.FlaggedElement );
 OO.mixinClass( OO.ui.ButtonWidget, OO.ui.mixin.TabIndexedElement );
+OO.mixinClass( OO.ui.ButtonWidget, OO.ui.mixin.AccessKeyedElement );
 
 /* Methods */
 
@@ -12908,8 +13064,8 @@ OO.ui.CapsuleMultiSelectWidget.prototype.setItemsFromData = function ( datas ) {
 
 		item = null;
 		for ( j = 0; j < items.length; j++ ) {
-			if ( items[j].data === data && items[j].label === label ) {
-				item = items[j];
+			if ( items[ j ].data === data && items[ j ].label === label ) {
+				item = items[ j ];
 				items.splice( j, 1 );
 				break;
 			}
@@ -12996,7 +13152,7 @@ OO.ui.CapsuleMultiSelectWidget.prototype.addItems = function ( items ) {
 	} else {
 		same = true;
 		for ( i = 0, l = oldItems.length; same && i < l; i++ ) {
-			same = same && this.items[i] === oldItems[i];
+			same = same && this.items[ i ] === oldItems[ i ];
 		}
 	}
 	if ( !same ) {
@@ -13020,7 +13176,7 @@ OO.ui.CapsuleMultiSelectWidget.prototype.removeItems = function ( items ) {
 	} else {
 		same = true;
 		for ( i = 0, l = oldItems.length; same && i < l; i++ ) {
-			same = same && this.items[i] === oldItems[i];
+			same = same && this.items[ i ] === oldItems[ i ];
 		}
 	}
 	if ( !same ) {
@@ -13100,7 +13256,7 @@ OO.ui.CapsuleMultiSelectWidget.prototype.onPopupFocusOut = function () {
 	setTimeout( function () {
 		if (
 			widget.isVisible() &&
-			!OO.ui.contains( widget.$element[0], document.activeElement, true ) &&
+			!OO.ui.contains( widget.$element[ 0 ], document.activeElement, true ) &&
 			( !widget.$autoCloseIgnore || !widget.$autoCloseIgnore.has( document.activeElement ).length )
 		) {
 			widget.toggle( false );
@@ -13247,7 +13403,7 @@ OO.ui.CapsuleMultiSelectWidget.prototype.setDisabled = function ( disabled ) {
 
 	if ( this.items ) {
 		for ( i = 0, len = this.items.length; i < len; i++ ) {
-			this.items[i].updateDisabled();
+			this.items[ i ].updateDisabled();
 		}
 	}
 
@@ -13544,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
@@ -13552,32 +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} [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;
 
+	// TODO: Remove in next release
+	if ( config && config.dragDropUI ) {
+		config.showDropTarget = true;
+	}
+
 	// Configuration initialization
 	config = $.extend( {
 		accept: null,
 		placeholder: OO.ui.msg( 'ooui-selectfile-placeholder' ),
 		notsupported: OO.ui.msg( 'ooui-selectfile-not-supported' ),
-		droppable: true
+		droppable: true,
+		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.$info = $( '<span>' );
+
+	// Properties
+	this.showDropTarget = config.showDropTarget;
 	this.isSupported = this.constructor.static.isSupported();
 	this.currentFile = null;
 	if ( Array.isArray( config.accept ) ) {
@@ -13589,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,
@@ -13597,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, {
@@ -13605,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 ),
@@ -13617,14 +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 ) {
-		this.$element.addClass( 'oo-ui-selectFileWidget-droppable' );
+		.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 )
+			} );
+		this.$element.prepend( this.$dropTarget );
 	}
 };
 
@@ -13635,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 */
 
@@ -13649,7 +13823,7 @@ OO.ui.SelectFileWidget.static.isSupported = function () {
 	var $input;
 	if ( OO.ui.SelectFileWidget.static.isSupportedCache === null ) {
 		$input = $( '<input type="file">' );
-		OO.ui.SelectFileWidget.static.isSupportedCache = $input[0].files !== undefined;
+		OO.ui.SelectFileWidget.static.isSupportedCache = $input[ 0 ].files !== undefined;
 	}
 	return OO.ui.SelectFileWidget.static.isSupportedCache;
 };
@@ -13700,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 ) {
@@ -13716,7 +13893,7 @@ OO.ui.SelectFileWidget.prototype.updateUI = function () {
 };
 
 /**
- * Add the input to the handle
+ * Add the input to the widget
  *
  * @private
  */
@@ -13739,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 ) {
+		mimeTest = this.accept[ i ];
+		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;
 			}
 		}
@@ -13779,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 );
@@ -13817,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
  *
@@ -13824,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();
@@ -13836,21 +14023,23 @@ OO.ui.SelectFileWidget.prototype.onDragEnterOrOver = function ( e ) {
 		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 && $.inArray( 'Files', dt.types ) ) {
-		// 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' );
-	} else {
-		this.$element.removeClass( 'oo-ui-selectFileWidget-canDrop' );
+
+	this.$element.toggleClass( 'oo-ui-selectFileWidget-canDrop', droppableFile );
+	if ( !droppableFile ) {
 		dt.dropEffect = 'none';
 	}
 
@@ -13885,11 +14074,9 @@ OO.ui.SelectFileWidget.prototype.onDrop = function ( e ) {
 		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 );
@@ -13901,10 +14088,13 @@ OO.ui.SelectFileWidget.prototype.onDrop = function ( e ) {
 /**
  * @inheritdoc
  */
-OO.ui.SelectFileWidget.prototype.setDisabled = function ( state ) {
-	OO.ui.SelectFileWidget.parent.prototype.setDisabled.call( this, state );
+OO.ui.SelectFileWidget.prototype.setDisabled = function ( disabled ) {
+	OO.ui.SelectFileWidget.parent.prototype.setDisabled.call( this, disabled );
+	if ( this.selectButton ) {
+		this.selectButton.setDisabled( disabled );
+	}
 	if ( this.clearButton ) {
-		this.clearButton.setDisabled( state );
+		this.clearButton.setDisabled( disabled );
 	}
 	return this;
 };
@@ -14030,11 +14220,14 @@ OO.ui.IndicatorWidget.static.tagName = 'span';
  * @extends OO.ui.Widget
  * @mixins OO.ui.mixin.FlaggedElement
  * @mixins OO.ui.mixin.TabIndexedElement
+ * @mixins OO.ui.mixin.TitledElement
+ * @mixins OO.ui.mixin.AccessKeyedElement
  *
  * @constructor
  * @param {Object} [config] Configuration options
  * @cfg {string} [name=''] The value of the input’s HTML `name` attribute.
  * @cfg {string} [value=''] The value of the input.
+ * @cfg {string} [accessKey=''] The access key of the input.
  * @cfg {Function} [inputFilter] The name of an input filter function. Input filters modify the value of an input
  *  before it is accepted.
  */
@@ -14053,6 +14246,8 @@ OO.ui.InputWidget = function OoUiInputWidget( config ) {
 	// Mixin constructors
 	OO.ui.mixin.FlaggedElement.call( this, config );
 	OO.ui.mixin.TabIndexedElement.call( this, $.extend( {}, config, { $tabIndexed: this.$input } ) );
+	OO.ui.mixin.TitledElement.call( this, $.extend( {}, config, { $titled: this.$input } ) );
+	OO.ui.mixin.AccessKeyedElement.call( this, $.extend( {}, config, { $accessKeyed: this.$input } ) );
 
 	// Events
 	this.$input.on( 'keydown mouseup cut paste change input select', this.onEdit.bind( this ) );
@@ -14066,6 +14261,7 @@ OO.ui.InputWidget = function OoUiInputWidget( config ) {
 		.addClass( 'oo-ui-inputWidget' )
 		.append( this.$input );
 	this.setValue( config.value );
+	this.setAccessKey( config.accessKey );
 };
 
 /* Setup */
@@ -14073,6 +14269,8 @@ OO.ui.InputWidget = function OoUiInputWidget( config ) {
 OO.inheritClass( OO.ui.InputWidget, OO.ui.Widget );
 OO.mixinClass( OO.ui.InputWidget, OO.ui.mixin.FlaggedElement );
 OO.mixinClass( OO.ui.InputWidget, OO.ui.mixin.TabIndexedElement );
+OO.mixinClass( OO.ui.InputWidget, OO.ui.mixin.TitledElement );
+OO.mixinClass( OO.ui.InputWidget, OO.ui.mixin.AccessKeyedElement );
 
 /* Static Properties */
 
@@ -14166,6 +14364,30 @@ OO.ui.InputWidget.prototype.setValue = function ( value ) {
 	return this;
 };
 
+/**
+ * Set the input's access key.
+ * FIXME: This is the same code as in OO.ui.mixin.ButtonElement, maybe find a better place for it?
+ *
+ * @param {string} accessKey Input's access key, use empty string to remove
+ * @chainable
+ */
+OO.ui.InputWidget.prototype.setAccessKey = function ( accessKey ) {
+	accessKey = typeof accessKey === 'string' && accessKey.length ? accessKey : null;
+
+	if ( this.accessKey !== accessKey ) {
+		if ( this.$input ) {
+			if ( accessKey !== null ) {
+				this.$input.attr( 'accesskey', accessKey );
+			} else {
+				this.$input.removeAttr( 'accesskey' );
+			}
+		}
+		this.accessKey = accessKey;
+	}
+
+	return this;
+};
+
 /**
  * Clean up incoming value.
  *
@@ -14558,13 +14780,14 @@ OO.ui.CheckboxInputWidget.prototype.restorePreInfuseState = function ( state ) {
  * @constructor
  * @param {Object} [config] Configuration options
  * @cfg {Object[]} [options=[]] Array of menu options in the format `{ data: …, label: … }`
+ * @cfg {Object} [dropdown] Configuration options for {@link OO.ui.DropdownWidget DropdownWidget}
  */
 OO.ui.DropdownInputWidget = function OoUiDropdownInputWidget( config ) {
 	// Configuration initialization
 	config = config || {};
 
 	// Properties (must be done before parent constructor which calls #setDisabled)
-	this.dropdownWidget = new OO.ui.DropdownWidget();
+	this.dropdownWidget = new OO.ui.DropdownWidget( config.dropdown );
 
 	// Parent constructor
 	OO.ui.DropdownInputWidget.parent.call( this, config );
@@ -15254,7 +15477,7 @@ OO.ui.TextInputWidget.prototype.installParentChangeDetector = function () {
 		}
 
 		// Find topmost node in the tree
-		topmostNode = this.$element[0];
+		topmostNode = this.$element[ 0 ];
 		while ( topmostNode.parentNode ) {
 			topmostNode = topmostNode.parentNode;
 		}
@@ -15288,7 +15511,7 @@ OO.ui.TextInputWidget.prototype.installParentChangeDetector = function () {
 		};
 
 		// Create a fake parent and observe it
-		fakeParentNode = $( '<div>' ).append( topmostNode )[0];
+		fakeParentNode = $( '<div>' ).append( topmostNode )[ 0 ];
 		mutationObserver.observe( fakeParentNode, { childList: true } );
 	} else {
 		// Using the DOMNodeInsertedIntoDocument event is much nicer and less magical, and works for
@@ -15402,6 +15625,23 @@ OO.ui.TextInputWidget.prototype.select = function () {
 	return this;
 };
 
+/**
+ * Focus the input and move the cursor to the end.
+ */
+OO.ui.TextInputWidget.prototype.moveCursorToEnd = function () {
+	var textRange,
+		element = this.$input[ 0 ];
+	this.focus();
+	if ( element.selectionStart !== undefined ) {
+		element.selectionStart = element.selectionEnd = element.value.length;
+	} else if ( element.createTextRange ) {
+		// IE 8 and below
+		textRange = element.createTextRange();
+		textRange.collapse( false );
+		textRange.select();
+	}
+};
+
 /**
  * Set the validation pattern.
  *
@@ -15457,8 +15697,10 @@ OO.ui.TextInputWidget.prototype.setValidityFlag = function ( isValid ) {
  * @return {jQuery.Promise} A promise that resolves to a boolean `true` if the value is valid.
  */
 OO.ui.TextInputWidget.prototype.isValid = function () {
+	var result;
+
 	if ( this.validate instanceof Function ) {
-		var result = this.validate( this.getValue() );
+		result = this.validate( this.getValue() );
 		if ( $.isFunction( result.promise ) ) {
 			return result.promise();
 		} else {
@@ -15574,6 +15816,7 @@ OO.ui.TextInputWidget.prototype.updateSearchIndicator = function () {
  * @chainable
  */
 OO.ui.TextInputWidget.prototype.positionLabel = function () {
+	var after, rtl, property;
 	// Clear old values
 	this.$input
 		// Clear old values if present
@@ -15589,9 +15832,9 @@ OO.ui.TextInputWidget.prototype.positionLabel = function () {
 		return;
 	}
 
-	var after = this.labelPosition === 'after',
-		rtl = this.$element.css( 'direction' ) === 'rtl',
-		property = after === rtl ? 'padding-left' : 'padding-right';
+	after = this.labelPosition === 'after';
+	rtl = this.$element.css( 'direction' ) === 'rtl';
+	property = after === rtl ? 'padding-left' : 'padding-right';
 
 	this.$input.css( property, this.$label.outerWidth( true ) );
 
@@ -16194,6 +16437,7 @@ OO.mixinClass( OO.ui.DecoratedOptionWidget, OO.ui.mixin.IndicatorElement );
  * @extends OO.ui.DecoratedOptionWidget
  * @mixins OO.ui.mixin.ButtonElement
  * @mixins OO.ui.mixin.TabIndexedElement
+ * @mixins OO.ui.mixin.TitledElement
  *
  * @constructor
  * @param {Object} [config] Configuration options
@@ -16207,6 +16451,7 @@ OO.ui.ButtonOptionWidget = function OoUiButtonOptionWidget( config ) {
 
 	// Mixin constructors
 	OO.ui.mixin.ButtonElement.call( this, config );
+	OO.ui.mixin.TitledElement.call( this, $.extend( {}, config, { $titled: this.$button } ) );
 	OO.ui.mixin.TabIndexedElement.call( this, $.extend( {}, config, {
 		$tabIndexed: this.$button,
 		tabIndex: -1
@@ -16222,6 +16467,7 @@ OO.ui.ButtonOptionWidget = function OoUiButtonOptionWidget( config ) {
 
 OO.inheritClass( OO.ui.ButtonOptionWidget, OO.ui.DecoratedOptionWidget );
 OO.mixinClass( OO.ui.ButtonOptionWidget, OO.ui.mixin.ButtonElement );
+OO.mixinClass( OO.ui.ButtonOptionWidget, OO.ui.mixin.TitledElement );
 OO.mixinClass( OO.ui.ButtonOptionWidget, OO.ui.mixin.TabIndexedElement );
 
 /* Static Properties */
@@ -16626,6 +16872,7 @@ OO.ui.TabOptionWidget.static.highlightable = false;
  *  [3]: https://www.mediawiki.org/wiki/OOjs_UI/Widgets/Popups#containerExample
  * @cfg {number} [containerPadding=10] Padding between the popup and its container, specified as a number of pixels.
  * @cfg {jQuery} [$content] Content to append to the popup's body
+ * @cfg {jQuery} [$footer] Content to append to the popup's footer
  * @cfg {boolean} [autoClose=false] Automatically close the popup when it loses focus.
  * @cfg {jQuery} [$autoCloseIgnore] Elements that will not close the popup when clicked.
  *  This config option is only relevant if #autoClose is set to `true`. See the [OOjs UI docs on MediaWiki][2]
@@ -16644,14 +16891,18 @@ OO.ui.PopupWidget = function OoUiPopupWidget( config ) {
 
 	// Properties (must be set before ClippableElement constructor call)
 	this.$body = $( '<div>' );
+	this.$popup = $( '<div>' );
 
 	// Mixin constructors
 	OO.ui.mixin.LabelElement.call( this, config );
-	OO.ui.mixin.ClippableElement.call( this, $.extend( {}, config, { $clippable: this.$body } ) );
+	OO.ui.mixin.ClippableElement.call( this, $.extend( {}, config, {
+		$clippable: this.$body,
+		$clippableContainer: this.$popup
+	} ) );
 
 	// Properties
-	this.$popup = $( '<div>' );
 	this.$head = $( '<div>' );
+	this.$footer = $( '<div>' );
 	this.$anchor = $( '<div>' );
 	// If undefined, will be computed lazily in updateDimensions()
 	this.$container = config.$container;
@@ -16677,12 +16928,16 @@ OO.ui.PopupWidget = function OoUiPopupWidget( config ) {
 	this.$head
 		.addClass( 'oo-ui-popupWidget-head' )
 		.append( this.$label, this.closeButton.$element );
+	this.$footer.addClass( 'oo-ui-popupWidget-footer' );
 	if ( !config.head ) {
 		this.$head.addClass( 'oo-ui-element-hidden' );
 	}
+	if ( !config.$footer ) {
+		this.$footer.addClass( 'oo-ui-element-hidden' );
+	}
 	this.$popup
 		.addClass( 'oo-ui-popupWidget-popup' )
-		.append( this.$head, this.$body );
+		.append( this.$head, this.$body, this.$footer );
 	this.$element
 		.addClass( 'oo-ui-popupWidget' )
 		.append( this.$popup, this.$anchor );
@@ -16690,6 +16945,9 @@ OO.ui.PopupWidget = function OoUiPopupWidget( config ) {
 	if ( config.$content instanceof jQuery ) {
 		this.$body.append( config.$content );
 	}
+	if ( config.$footer instanceof jQuery ) {
+		this.$footer.append( config.$footer );
+	}
 	if ( config.padded ) {
 		this.$body.addClass( 'oo-ui-popupWidget-body-padded' );
 	}
@@ -16821,9 +17079,10 @@ OO.ui.PopupWidget.prototype.hasAnchor = function () {
  * @inheritdoc
  */
 OO.ui.PopupWidget.prototype.toggle = function ( show ) {
+	var change;
 	show = show === undefined ? !this.isVisible() : !!show;
 
-	var change = show !== this.isVisible();
+	change = show !== this.isVisible();
 
 	// Parent method
 	OO.ui.PopupWidget.parent.prototype.toggle.call( this, show );
@@ -17778,7 +18037,7 @@ OO.ui.SelectWidget.prototype.getItemFromLabel = function ( label, prefix ) {
 		filter = this.getItemMatcher( label, true );
 
 	for ( i = 0; i < len; i++ ) {
-		item = this.items[i];
+		item = this.items[ i ];
 		if ( item instanceof OO.ui.OptionWidget && item.isSelectable() && filter( item ) ) {
 			return item;
 		}
@@ -17788,7 +18047,7 @@ OO.ui.SelectWidget.prototype.getItemFromLabel = function ( label, prefix ) {
 		found = null;
 		filter = this.getItemMatcher( label, false );
 		for ( i = 0; i < len; i++ ) {
-			item = this.items[i];
+			item = this.items[ i ];
 			if ( item instanceof OO.ui.OptionWidget && item.isSelectable() && filter( item ) ) {
 				if ( found ) {
 					return null;
@@ -17935,7 +18194,7 @@ OO.ui.SelectWidget.prototype.getRelativeSelectableItem = function ( item, direct
 	}
 
 	if ( item instanceof OO.ui.OptionWidget ) {
-		currentIndex = $.inArray( item, this.items );
+		currentIndex = this.items.indexOf( item );
 		nextIndex = ( currentIndex + increase + len ) % len;
 	} else {
 		// If no item is selected and moving forward, start at the beginning.
@@ -18305,7 +18564,7 @@ OO.ui.MenuSelectWidget.prototype.updateItemVisibility = function () {
 		filter = showAll ? null : this.getItemMatcher( this.$input.val() );
 
 	for ( i = 0; i < len; i++ ) {
-		item = this.items[i];
+		item = this.items[ i ];
 		if ( item instanceof OO.ui.OptionWidget ) {
 			item.toggle( showAll || filter( item ) );
 		}
@@ -18440,10 +18699,10 @@ OO.ui.MenuSelectWidget.prototype.clearItems = function () {
  * @inheritdoc
  */
 OO.ui.MenuSelectWidget.prototype.toggle = function ( visible ) {
-	visible = ( visible === undefined ? !this.visible : !!visible ) && !!this.items.length;
+	var i, len, change;
 
-	var i, len,
-		change = visible !== this.isVisible();
+	visible = ( visible === undefined ? !this.visible : !!visible ) && !!this.items.length;
+	change = visible !== this.isVisible();
 
 	// Parent method
 	OO.ui.MenuSelectWidget.parent.prototype.toggle.call( this, visible );
@@ -18543,9 +18802,10 @@ OO.ui.FloatingMenuSelectWidget.prototype.onWindowResize = function () {
  * @inheritdoc
  */
 OO.ui.FloatingMenuSelectWidget.prototype.toggle = function ( visible ) {
+	var change;
 	visible = visible === undefined ? !this.isVisible() : !!visible;
 
-	var change = visible !== this.isVisible();
+	change = visible !== this.isVisible();
 
 	if ( change && visible ) {
 		// Make sure the width is set before the parent method runs.
diff --git a/resources/lib/oojs-ui/themes/apex/icons-editing-advanced.json b/resources/lib/oojs-ui/themes/apex/icons-editing-advanced.json
index 8fdc5051f9..f7b38628bc 100644
--- a/resources/lib/oojs-ui/themes/apex/icons-editing-advanced.json
+++ b/resources/lib/oojs-ui/themes/apex/icons-editing-advanced.json
@@ -5,6 +5,10 @@
 		"alignCentre": { "file": "images/icons/align-center.svg" },
 		"alignLeft": { "file": "images/icons/align-float-left.svg" },
 		"alignRight": { "file": "images/icons/align-float-right.svg" },
+		"calendar": { "file": {
+			"ltr": "images/icons/calendar-ltr.svg",
+			"rtl": "images/icons/calendar-rtl.svg"
+		} },
 		"find": { "file": {
 			"ltr": "images/icons/find-ltr.svg",
 			"rtl": "images/icons/find-rtl.svg"
diff --git a/resources/lib/oojs-ui/themes/apex/icons.json b/resources/lib/oojs-ui/themes/apex/icons.json
index 2c5f858063..92791d66f6 100644
--- a/resources/lib/oojs-ui/themes/apex/icons.json
+++ b/resources/lib/oojs-ui/themes/apex/icons.json
@@ -2,12 +2,12 @@
 	"prefix": "oo-ui-icon",
 	"intro": "@import '../../../../src/styles/common';",
 	"images": {
-		"circle": { "file": "images/icons/circle.svg" },
 		"add": { "file": "images/icons/add.svg" },
 		"advanced": { "file": "images/icons/advanced.svg" },
-		"cancel": { "file": "images/icons/cancel.svg" },
 		"alert": { "file": "images/icons/alert.svg" },
+		"cancel": { "file": "images/icons/cancel.svg" },
 		"check": { "file": "images/icons/check.svg" },
+		"circle": { "file": "images/icons/circle.svg" },
 		"close": { "file": "images/icons/close.svg" },
 		"code": { "file": "images/icons/code.svg" },
 		"collapse": { "file": "images/icons/collapse.svg" },
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/calendar-ltr.png b/resources/lib/oojs-ui/themes/apex/images/icons/calendar-ltr.png
new file mode 100644
index 0000000000..8b3ed72fc0
Binary files /dev/null and b/resources/lib/oojs-ui/themes/apex/images/icons/calendar-ltr.png differ
diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/calendar-ltr.svg b/resources/lib/oojs-ui/themes/apex/images/icons/calendar-ltr.svg
new file mode 100644
index 0000000000..121180e045
--- /dev/null
+++ b/resources/lib/oojs-ui/themes/apex/images/icons/calendar-ltr.svg
@@ -0,0 +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="M4 5v10c0 1.7 1.3 3 3 3h14V8c0-1.7-1.3-3-3-3H4zm2 1c.552 0 1 .448 1 1s-.448 1-1 1-1-.448-1-1 .448-1 1-1zm4 0c.552 0 1 .448 1 1s-.448 1-1 1-1-.448-1-1 .448-1 1-1zm4 0c.552 0 1 .448 1 1s-.448 1-1 1-1-.448-1-1 .448-1 1-1zm4 0c.552 0 1 .448 1 1s-.448 1-1 1-1-.448-1-1 .448-1 1-1zM5 9h3v2H5V9zm4 0h3v2H9V9zm4 0h3v2h-3V9zm4 0h3v2h-3V9zM5 12h3v2H5v-2zm4 0h3v2H9v-2zm4 0h3v2h-3v-2zm4 0h3v2h-3v-2zM5 15h3v2H7c-1.195 0-2-.805-2-2zm4 0h3v2H9v-2zm4 0h3v2h-3v-2zm4 0h3v2h-3v-2z"/>
+</svg>
diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/calendar-rtl.png b/resources/lib/oojs-ui/themes/apex/images/icons/calendar-rtl.png
new file mode 100644
index 0000000000..8ec5023b97
Binary files /dev/null and b/resources/lib/oojs-ui/themes/apex/images/icons/calendar-rtl.png differ
diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/calendar-rtl.svg b/resources/lib/oojs-ui/themes/apex/images/icons/calendar-rtl.svg
new file mode 100644
index 0000000000..9b736bf28e
--- /dev/null
+++ b/resources/lib/oojs-ui/themes/apex/images/icons/calendar-rtl.svg
@@ -0,0 +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="M21 5v10c0 1.7-1.3 3-3 3H4V8c0-1.7 1.3-3 3-3h14zm-2 1c-.552 0-1 .448-1 1s.448 1 1 1 1-.448 1-1-.448-1-1-1zm-4 0c-.552 0-1 .448-1 1s.448 1 1 1 1-.448 1-1-.448-1-1-1zm-4 0c-.552 0-1 .448-1 1s.448 1 1 1 1-.448 1-1-.448-1-1-1zM7 6c-.552 0-1 .448-1 1s.448 1 1 1 1-.448 1-1-.448-1-1-1zm13 3h-3v2h3V9zm-4 0h-3v2h3V9zm-4 0H9v2h3V9zM8 9H5v2h3V9zm12 3h-3v2h3v-2zm-4 0h-3v2h3v-2zm-4 0H9v2h3v-2zm-4 0H5v2h3v-2zm12 3h-3v2h1c1.195 0 2-.805 2-2zm-4 0h-3v2h3v-2zm-4 0H9v2h3v-2zm-4 0H5v2h3v-2z"/>
+</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/icons-editing-advanced.json b/resources/lib/oojs-ui/themes/mediawiki/icons-editing-advanced.json
index 0e1a8a1040..ef368c23fc 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/icons-editing-advanced.json
+++ b/resources/lib/oojs-ui/themes/mediawiki/icons-editing-advanced.json
@@ -11,6 +11,10 @@
 		"alignCentre": { "file": "images/icons/align-center.svg" },
 		"alignLeft": { "file": "images/icons/align-float-left.svg" },
 		"alignRight": { "file": "images/icons/align-float-right.svg" },
+		"calendar": { "file": {
+			"ltr": "images/icons/calendar-ltr.svg",
+			"rtl": "images/icons/calendar-rtl.svg"
+		} },
 		"find": { "file": {
 			"ltr": "images/icons/find-ltr.svg",
 			"rtl": "images/icons/find-rtl.svg"
diff --git a/resources/lib/oojs-ui/themes/mediawiki/icons.json b/resources/lib/oojs-ui/themes/mediawiki/icons.json
index f351b5b697..a79b329539 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/icons.json
+++ b/resources/lib/oojs-ui/themes/mediawiki/icons.json
@@ -1,6 +1,6 @@
 {
 	"selectorWithoutVariant": ".oo-ui-icon-{name}",
-	"selectorWithVariant": ".oo-ui-image-{variant} .oo-ui-icon-{name}, .oo-ui-image-{variant}.oo-ui-icon-{name}",
+	"selectorWithVariant": ".oo-ui-image-{variant}.oo-ui-icon-{name}",
 	"intro": "@import '../../../../src/styles/common';",
 	"variants": {
 		"invert": {
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/calendar-ltr-invert.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/calendar-ltr-invert.png
new file mode 100644
index 0000000000..330a53d3ec
Binary files /dev/null and b/resources/lib/oojs-ui/themes/mediawiki/images/icons/calendar-ltr-invert.png differ
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/calendar-ltr-invert.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/calendar-ltr-invert.svg
new file mode 100644
index 0000000000..5eef30c024
--- /dev/null
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/calendar-ltr-invert.svg
@@ -0,0 +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="M4 5v10c0 1.7 1.3 3 3 3h14V8c0-1.7-1.3-3-3-3H4zm2 1c.552 0 1 .448 1 1s-.448 1-1 1-1-.448-1-1 .448-1 1-1zm4 0c.552 0 1 .448 1 1s-.448 1-1 1-1-.448-1-1 .448-1 1-1zm4 0c.552 0 1 .448 1 1s-.448 1-1 1-1-.448-1-1 .448-1 1-1zm4 0c.552 0 1 .448 1 1s-.448 1-1 1-1-.448-1-1 .448-1 1-1zM5 9h3v2H5V9zm4 0h3v2H9V9zm4 0h3v2h-3V9zm4 0h3v2h-3V9zM5 12h3v2H5v-2zm4 0h3v2H9v-2zm4 0h3v2h-3v-2zm4 0h3v2h-3v-2zM5 15h3v2H7c-1.195 0-2-.805-2-2zm4 0h3v2H9v-2zm4 0h3v2h-3v-2zm4 0h3v2h-3v-2z"/>
+</svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/calendar-ltr.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/calendar-ltr.png
new file mode 100644
index 0000000000..8b3ed72fc0
Binary files /dev/null and b/resources/lib/oojs-ui/themes/mediawiki/images/icons/calendar-ltr.png differ
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/calendar-ltr.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/calendar-ltr.svg
new file mode 100644
index 0000000000..121180e045
--- /dev/null
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/calendar-ltr.svg
@@ -0,0 +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="M4 5v10c0 1.7 1.3 3 3 3h14V8c0-1.7-1.3-3-3-3H4zm2 1c.552 0 1 .448 1 1s-.448 1-1 1-1-.448-1-1 .448-1 1-1zm4 0c.552 0 1 .448 1 1s-.448 1-1 1-1-.448-1-1 .448-1 1-1zm4 0c.552 0 1 .448 1 1s-.448 1-1 1-1-.448-1-1 .448-1 1-1zm4 0c.552 0 1 .448 1 1s-.448 1-1 1-1-.448-1-1 .448-1 1-1zM5 9h3v2H5V9zm4 0h3v2H9V9zm4 0h3v2h-3V9zm4 0h3v2h-3V9zM5 12h3v2H5v-2zm4 0h3v2H9v-2zm4 0h3v2h-3v-2zm4 0h3v2h-3v-2zM5 15h3v2H7c-1.195 0-2-.805-2-2zm4 0h3v2H9v-2zm4 0h3v2h-3v-2zm4 0h3v2h-3v-2z"/>
+</svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/calendar-rtl-invert.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/calendar-rtl-invert.png
new file mode 100644
index 0000000000..2f9c5baf0d
Binary files /dev/null and b/resources/lib/oojs-ui/themes/mediawiki/images/icons/calendar-rtl-invert.png differ
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/calendar-rtl-invert.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/calendar-rtl-invert.svg
new file mode 100644
index 0000000000..f7202a98d2
--- /dev/null
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/calendar-rtl-invert.svg
@@ -0,0 +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="M21 5v10c0 1.7-1.3 3-3 3H4V8c0-1.7 1.3-3 3-3h14zm-2 1c-.552 0-1 .448-1 1s.448 1 1 1 1-.448 1-1-.448-1-1-1zm-4 0c-.552 0-1 .448-1 1s.448 1 1 1 1-.448 1-1-.448-1-1-1zm-4 0c-.552 0-1 .448-1 1s.448 1 1 1 1-.448 1-1-.448-1-1-1zM7 6c-.552 0-1 .448-1 1s.448 1 1 1 1-.448 1-1-.448-1-1-1zm13 3h-3v2h3V9zm-4 0h-3v2h3V9zm-4 0H9v2h3V9zM8 9H5v2h3V9zm12 3h-3v2h3v-2zm-4 0h-3v2h3v-2zm-4 0H9v2h3v-2zm-4 0H5v2h3v-2zm12 3h-3v2h1c1.195 0 2-.805 2-2zm-4 0h-3v2h3v-2zm-4 0H9v2h3v-2zm-4 0H5v2h3v-2z"/>
+</svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/calendar-rtl.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/calendar-rtl.png
new file mode 100644
index 0000000000..8ec5023b97
Binary files /dev/null and b/resources/lib/oojs-ui/themes/mediawiki/images/icons/calendar-rtl.png differ
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/calendar-rtl.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/calendar-rtl.svg
new file mode 100644
index 0000000000..9b736bf28e
--- /dev/null
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/calendar-rtl.svg
@@ -0,0 +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="M21 5v10c0 1.7-1.3 3-3 3H4V8c0-1.7 1.3-3 3-3h14zm-2 1c-.552 0-1 .448-1 1s.448 1 1 1 1-.448 1-1-.448-1-1-1zm-4 0c-.552 0-1 .448-1 1s.448 1 1 1 1-.448 1-1-.448-1-1-1zm-4 0c-.552 0-1 .448-1 1s.448 1 1 1 1-.448 1-1-.448-1-1-1zM7 6c-.552 0-1 .448-1 1s.448 1 1 1 1-.448 1-1-.448-1-1-1zm13 3h-3v2h3V9zm-4 0h-3v2h3V9zm-4 0H9v2h3V9zM8 9H5v2h3V9zm12 3h-3v2h3v-2zm-4 0h-3v2h3v-2zm-4 0H9v2h3v-2zm-4 0H5v2h3v-2zm12 3h-3v2h1c1.195 0 2-.805 2-2zm-4 0h-3v2h3v-2zm-4 0H9v2h3v-2zm-4 0H5v2h3v-2z"/>
+</svg>
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/lib/oojs-ui/themes/mediawiki/indicators.json b/resources/lib/oojs-ui/themes/mediawiki/indicators.json
index 3d66337c67..5a8325855c 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/indicators.json
+++ b/resources/lib/oojs-ui/themes/mediawiki/indicators.json
@@ -1,6 +1,6 @@
 {
 	"selectorWithoutVariant": ".oo-ui-indicator-{name}",
-	"selectorWithVariant": ".oo-ui-image-{variant} .oo-ui-indicator-{name}, .oo-ui-image-{variant}.oo-ui-indicator-{name}",
+	"selectorWithVariant": ".oo-ui-image-{variant}.oo-ui-indicator-{name}",
 	"intro": "@import '../../../../src/styles/common';",
 	"variants": {
 		"invert": {
diff --git a/resources/lib/oojs/oojs.jquery.js b/resources/lib/oojs/oojs.jquery.js
index 6e7851a507..9395ecfe1f 100644
--- a/resources/lib/oojs/oojs.jquery.js
+++ b/resources/lib/oojs/oojs.jquery.js
@@ -1,12 +1,12 @@
 /*!
- * OOjs v1.1.8 optimised for jQuery
+ * OOjs v1.1.9 optimised for jQuery
  * https://www.mediawiki.org/wiki/OOjs
  *
  * Copyright 2011-2015 OOjs Team and other contributors.
  * Released under the MIT license
  * http://oojs.mit-license.org
  *
- * Date: 2015-07-23T19:16:00Z
+ * Date: 2015-08-25T21:35:29Z
  */
 ( function ( global ) {
 
@@ -22,7 +22,21 @@ var
 	oo = {},
 	// Optimisation: Local reference to Object.prototype.hasOwnProperty
 	hasOwn = oo.hasOwnProperty,
-	toString = oo.toString;
+	toString = oo.toString,
+	// Object.create() is impossible to fully polyfill, so don't require it
+	createObject = Object.create || ( function () {
+		// Reusable constructor function
+		function Empty() {}
+		return function ( prototype, properties ) {
+			var obj;
+			Empty.prototype = prototype;
+			obj = new Empty();
+			if ( properties && hasOwn.call( properties, 'constructor' ) ) {
+				obj.constructor = properties.constructor.value;
+			}
+			return obj;
+		};
+	} )();
 
 /* Class Methods */
 
@@ -88,7 +102,7 @@ oo.inheritClass = function ( targetFn, originFn ) {
 	// allows people to comply with their style guide.
 	targetFn['super'] = targetFn.parent = originFn;
 
-	targetFn.prototype = Object.create( originFn.prototype, {
+	targetFn.prototype = createObject( originFn.prototype, {
 		// Restore constructor property of targetFn
 		constructor: {
 			value: targetConstructor,
@@ -100,7 +114,7 @@ oo.inheritClass = function ( targetFn, originFn ) {
 
 	// Extend static properties - always initialize both sides
 	oo.initClass( originFn );
-	targetFn.static = Object.create( originFn.static );
+	targetFn.static = createObject( originFn.static );
 };
 
 /**
@@ -242,7 +256,7 @@ oo.setProp = function ( obj ) {
 oo.cloneObject = function ( origin ) {
 	var key, r;
 
-	r = Object.create( origin.constructor.prototype );
+	r = createObject( origin.constructor.prototype );
 
 	for ( key in origin ) {
 		if ( hasOwn.call( origin, key ) ) {
@@ -891,6 +905,8 @@ oo.Registry.prototype.lookup = function ( name ) {
 	}
 };
 
+/*global createObject */
+
 /**
  * @class OO.Factory
  * @extends OO.Registry
@@ -991,7 +1007,7 @@ oo.Factory.prototype.create = function ( name ) {
 	// the constructor's prototype (which also makes it an "instanceof" the constructor),
 	// then invoke the constructor with the object as context, and return it (ignoring
 	// the constructor's return value).
-	obj = Object.create( constructor.prototype );
+	obj = createObject( constructor.prototype );
 	constructor.apply( obj, args );
 	return obj;
 };
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 5551232a55..6203239066 100644
--- a/resources/src/jquery/jquery.byteLimit.js
+++ b/resources/src/jquery/jquery.byteLimit.js
@@ -10,17 +10,17 @@
 	 * "fobo", not "foba". Basically emulating the native maxlength by
 	 * reconstructing where the insertion occurred.
 	 *
-	 * @private
+	 * @static
 	 * @param {string} safeVal Known value that was previously returned by this
 	 * function, if none, pass empty string.
 	 * @param {string} newVal New value that may have to be trimmed down.
 	 * @param {number} byteLimit Number of bytes the value may be in size.
-	 * @param {Function} [fn] See jQuery.byteLimit.
+	 * @param {Function} [fn] See jQuery#byteLimit.
 	 * @return {Object}
 	 * @return {string} return.newVal
 	 * @return {boolean} return.trimmed
 	 */
-	function trimValForByteLength( safeVal, newVal, byteLimit, fn ) {
+	$.trimByteLength = function ( safeVal, newVal, byteLimit, fn ) {
 		var startMatches, endMatches, matchesLen, inpParts,
 			oldVal = safeVal;
 
@@ -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 );
 			}
 		}
 
@@ -92,7 +92,7 @@
 			newVal: newVal,
 			trimmed: true
 		};
-	}
+	};
 
 	var eventKeys = [
 		'keyup.byteLimit',
@@ -206,7 +206,7 @@
 			// See http://www.w3.org/TR/DOM-Level-3-Events/#events-keyboard-event-order for
 			// the order and characteristics of the key events.
 			$el.on( eventKeys, function () {
-				var res = trimValForByteLength(
+				var res = $.trimByteLength(
 					prevSafeVal,
 					this.value,
 					elLimit,
@@ -221,7 +221,7 @@
 					this.value = res.newVal;
 				}
 				// Always adjust prevSafeVal to reflect the input value. Not doing this could cause
-				// trimValForByteLength to compare the new value to an empty string instead of the
+				// trimByteLength to compare the new value to an empty string instead of the
 				// old value, resulting in trimming always from the end (bug 40850).
 				prevSafeVal = res.newVal;
 			} );
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.ForeignApi.js b/resources/src/mediawiki.api/mediawiki.ForeignApi.js
new file mode 100644
index 0000000000..b8cc059819
--- /dev/null
+++ b/resources/src/mediawiki.api/mediawiki.ForeignApi.js
@@ -0,0 +1,109 @@
+( function ( mw, $ ) {
+
+	/**
+	 * Create an object like mw.Api, but automatically handling everything required to communicate
+	 * with another MediaWiki wiki via cross-origin requests (CORS).
+	 *
+	 * The foreign wiki must be configured to accept requests from the current wiki. See
+	 * <https://www.mediawiki.org/wiki/Manual:$wgCrossSiteAJAXdomains> for details.
+	 *
+	 *     var api = new mw.ForeignApi( 'https://commons.wikimedia.org/w/api.php' );
+	 *     api.get( {
+	 *         action: 'query',
+	 *         meta: 'userinfo'
+	 *     } ).done( function ( data ) {
+	 *         console.log( data );
+	 *     } );
+	 *
+	 * To ensure that the user at the foreign wiki is logged in, pass the `assert: 'user'` parameter
+	 * to #get/#post (since MW 1.23): if they are not, the API request will fail. (Note that this
+	 * doesn't guarantee that it's the same user.)
+	 *
+	 * Authentication-related MediaWiki extensions may extend this class to ensure that the user
+	 * authenticated on the current wiki will be automatically authenticated on the foreign one. These
+	 * extension modules should be registered using the ResourceLoaderForeignApiModules hook. See
+	 * CentralAuth for a practical example. The general pattern to extend and override the name is:
+	 *
+	 *     function MyForeignApi() {};
+	 *     OO.inheritClass( MyForeignApi, mw.ForeignApi );
+	 *     mw.ForeignApi = MyForeignApi;
+	 *
+	 * @class mw.ForeignApi
+	 * @extends mw.Api
+	 * @since 1.26
+	 *
+	 * @constructor
+	 * @param {string|mw.Uri} url URL pointing to another wiki's `api.php` endpoint.
+	 * @param {Object} [options] See mw.Api.
+	 *
+	 * @author Bartosz Dziewoński
+	 * @author Jon Robson
+	 */
+	function CoreForeignApi( url, options ) {
+		if ( !url || $.isPlainObject( url ) ) {
+			throw new Error( 'mw.ForeignApi() requires a `url` parameter' );
+		}
+
+		this.apiUrl = String( url );
+
+		options = $.extend( /*deep=*/ true,
+			{
+				ajax: {
+					url: this.apiUrl,
+					xhrFields: {
+						withCredentials: true
+					}
+				},
+				parameters: {
+					// Add 'origin' query parameter to all requests.
+					origin: this.getOrigin()
+				}
+			},
+			options
+		);
+
+		// Call parent constructor
+		CoreForeignApi.parent.call( this, options );
+	}
+
+	OO.inheritClass( CoreForeignApi, mw.Api );
+
+	/**
+	 * Return the origin to use for API requests, in the required format (protocol, host and port, if
+	 * any).
+	 *
+	 * @protected
+	 * @return {string}
+	 */
+	CoreForeignApi.prototype.getOrigin = function () {
+		var origin = location.protocol + '//' + location.hostname;
+		if ( location.port ) {
+			origin += ':' + location.port;
+		}
+		return origin;
+	};
+
+	/**
+	 * @inheritdoc
+	 */
+	CoreForeignApi.prototype.ajax = function ( parameters, ajaxOptions ) {
+		var url, origin, newAjaxOptions;
+
+		// 'origin' query parameter must be part of the request URI, and not just POST request body
+		if ( ajaxOptions.type === 'POST' ) {
+			url = ( ajaxOptions && ajaxOptions.url ) || this.defaults.ajax.url;
+			origin = ( parameters && parameters.origin ) || this.defaults.parameters.origin;
+			url += ( url.indexOf( '?' ) !== -1 ? '&' : '?' ) +
+				'origin=' + encodeURIComponent( origin );
+			newAjaxOptions = $.extend( {}, ajaxOptions, { url: url } );
+		} else {
+			newAjaxOptions = ajaxOptions;
+		}
+
+		return CoreForeignApi.parent.prototype.ajax.call( this, parameters, newAjaxOptions );
+	};
+
+	// Expose
+	mw.ForeignApi = CoreForeignApi;
+
+}( mediaWiki, jQuery ) );
diff --git a/resources/src/mediawiki.api/mediawiki.api.edit.js b/resources/src/mediawiki.api/mediawiki.api.edit.js
index dbe45bf618..e43285ff11 100644
--- a/resources/src/mediawiki.api/mediawiki.api.edit.js
+++ b/resources/src/mediawiki.api/mediawiki.api.edit.js
@@ -11,10 +11,11 @@
 		 * cached token and start over.
 		 *
 		 * @param {Object} params API parameters
+		 * @param {Object} [ajaxOptions]
 		 * @return {jQuery.Promise} See #post
 		 */
-		postWithEditToken: function ( params ) {
-			return this.postWithToken( 'edit', params );
+		postWithEditToken: function ( params, ajaxOptions ) {
+			return this.postWithToken( 'edit', params, ajaxOptions );
 		},
 
 		/**
@@ -30,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 5e3a96225d..43b20b8b2e 100644
--- a/resources/src/mediawiki.api/mediawiki.api.js
+++ b/resources/src/mediawiki.api/mediawiki.api.js
@@ -49,7 +49,7 @@
 	 *         console.log( data );
 	 *     } );
 	 *
-	 * Multiple values for a parameter can be specified using an array (since MW 1.25):
+	 * Since MW 1.25, multiple values for a parameter can be specified using an array:
 	 *
 	 *     var api = new mw.Api();
 	 *     api.get( {
@@ -59,6 +59,9 @@
 	 *         console.log( data );
 	 *     } );
 	 *
+	 * Since MW 1.26, boolean values for a parameter can be specified directly. If the value is
+	 * `false` or `undefined`, the parameter will be omitted from the request, as required by the API.
+	 *
 	 * @constructor
 	 * @param {Object} [options] See #defaultOptions documentation above. Can also be overridden for
 	 *  each individual request by passing them to #get or #post (or directly #ajax) later on.
@@ -108,6 +111,27 @@
 			return this.ajax( parameters, ajaxOptions );
 		},
 
+		/**
+		 * Massage parameters from the nice format we accept into a format suitable for the API.
+		 *
+		 * @private
+		 * @param {Object} parameters (modified in-place)
+		 */
+		preprocessParameters: function ( parameters ) {
+			var key;
+			// 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( '|' );
+				}
+				// Boolean values are only false when not given at all
+				if ( parameters[ key ] === false || parameters[ key ] === undefined ) {
+					delete parameters[ key ];
+				}
+			}
+		},
+
 		/**
 		 * Perform the API call.
 		 *
@@ -130,11 +154,7 @@
 				delete parameters.token;
 			}
 
-			for ( key in parameters ) {
-				if ( $.isArray( parameters[key] ) ) {
-					parameters[key] = parameters[key].join( '|' );
-				}
-			}
+			this.preprocessParameters( parameters );
 
 			// If multipart/form-data has been requested and emulation is possible, emulate it
 			if (
@@ -146,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 ) {
@@ -275,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 64085e411e..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,37 +42,15 @@
 	/**
 	 * @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 );
 	}
 
-	/**
-	 * Parse response from an XHR to the server.
-	 * @private
-	 * @param {Event} e
-	 * @return {Object}
-	 */
-	function parseXHRResponse( e ) {
-		var response;
-
-		try {
-			response = $.parseJSON( e.target.responseText );
-		} catch ( error ) {
-			response = {
-				error: {
-					code: e.target.code,
-					info: e.target.responseText
-				}
-			};
-		}
-
-		return response;
-	}
-
 	/**
 	 * Process the result of the form submission, returned to an iframe.
 	 * This is the iframe's onload event.
@@ -81,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
@@ -111,25 +92,40 @@
 	$.extend( mw.Api.prototype, {
 		/**
 		 * Upload a file to MediaWiki.
-		 * @param {HTMLInputElement|File} file HTML input type=file element with a file already inside of it, or a File object.
+		 *
+		 * The file will be uploaded using AJAX and FormData, if the browser supports it, or via an
+		 * iframe if it doesn't.
+		 *
+		 * Caveats of iframe upload:
+		 * - The returned jQuery.Promise will not receive `progress` notifications during the upload
+		 * - It is incompatible with uploads to a foreign wiki using mw.ForeignApi
+		 * - You must pass a HTMLInputElement and not a File for it to be possible
+		 *
+		 * @param {HTMLInputElement|File} file HTML input type=file element with a file already inside
+		 *     of it, or a File object.
 		 * @param {Object} data Other upload options, see action=upload API docs for more
 		 * @return {jQuery.Promise}
 		 */
 		upload: function ( file, data ) {
-			var iframe, formData;
+			var isFileInput, canUseFormData;
+
+			isFileInput = file && file.nodeType === Node.ELEMENT_NODE;
+
+			if ( formDataAvailable() && isFileInput && file.files ) {
+				file = file.files[ 0 ];
+			}
 
 			if ( !file ) {
 				return $.Deferred().reject( 'No file' );
 			}
 
-			iframe = file.nodeType && file.nodeType === Node.ELEMENT_NODE;
-			formData = formDataAvailable() && file instanceof window.File;
+			canUseFormData = formDataAvailable() && file instanceof window.File;
 
-			if ( !iframe && !formData ) {
+			if ( !isFileInput && !canUseFormData ) {
 				return $.Deferred().reject( 'Unsupported argument type passed to mw.Api.upload' );
 			}
 
-			if ( formData ) {
+			if ( canUseFormData ) {
 				return this.uploadWithFormData( file, data );
 			}
 
@@ -143,20 +139,22 @@
 		 * APIs, and continues to work in browsers with those APIs.
 		 *
 		 * The rough sketch of how this method works is as follows:
-		 * * An iframe is loaded with no content.
-		 * * A form is submitted with the passed-in file input and some extras.
-		 * * The MediaWiki API receives that form data, and sends back a response.
-		 * * The response is sent to the iframe, because we set target=(iframe id)
-		 * * The response is parsed out of the iframe's document, and passed back
-		 *   through the promise.
+		 * 1. An iframe is loaded with no content.
+		 * 2. A form is submitted with the passed-in file input and some extras.
+		 * 3. The MediaWiki API receives that form data, and sends back a response.
+		 * 4. The response is sent to the iframe, because we set target=(iframe id)
+		 * 5. The response is parsed out of the iframe's document, and passed back
+		 *    through the promise.
+		 *
+		 * @private
 		 * @param {HTMLInputElement} file The file input with a file in it.
 		 * @param {Object} data Other upload options, see action=upload API docs for more
 		 * @return {jQuery.Promise}
 		 */
 		uploadWithIframe: function ( file, data ) {
-			var tokenPromise = $.Deferred(),
+			var key,
+				tokenPromise = $.Deferred(),
 				api = this,
-				filenameFound = false,
 				deferred = $.Deferred(),
 				nonce = getNonce(),
 				id = 'uploadframe-' + nonce,
@@ -164,13 +162,14 @@
 				iframe = getNewIframe( id ),
 				$iframe = $( iframe );
 
-			$form.addClass( 'mw-api-upload-form' );
+			for ( key in data ) {
+				if ( !fieldsAllowed[ key ] ) {
+					delete data[ key ];
+				}
+			}
 
-			$form.append(
-				getHiddenInput( 'action', 'upload' ),
-				getHiddenInput( 'format', 'json' ),
-				file
-			);
+			data = $.extend( {}, this.defaults.parameters, { action: 'upload' }, data );
+			$form.addClass( 'mw-api-upload-form' );
 
 			$form.css( 'display', 'none' )
 				.attr( {
@@ -211,16 +210,10 @@
 			file.name = 'file';
 
 			$.each( data, function ( key, val ) {
-				if ( key === 'filename' ) {
-					filenameFound = true;
-				}
-
-				if ( fieldsAllowed[key] === true ) {
-					$form.append( getHiddenInput( key, val ) );
-				}
+				$form.append( getHiddenInput( key, val ) );
 			} );
 
-			if ( !filenameFound && !data.stash ) {
+			if ( !data.filename && !data.stash ) {
 				return $.Deferred().reject( 'Filename not included in file data.' );
 			}
 
@@ -235,81 +228,69 @@
 
 			$( 'body' ).append( $form, $iframe );
 
+			deferred.always( function () {
+				$form.remove();
+				$iframe.remove();
+			} );
+
 			return deferred.promise();
 		},
 
 		/**
 		 * Uploads a file using the FormData API.
+		 *
+		 * @private
 		 * @param {File} file
-		 * @param {Object} data
+		 * @param {Object} data Other upload options, see action=upload API docs for more
+		 * @return {jQuery.Promise}
 		 */
 		uploadWithFormData: function ( file, data ) {
-			var xhr,
-				api = this,
-				formData = new FormData(),
-				deferred = $.Deferred(),
-				filenameFound = false;
+			var key,
+				deferred = $.Deferred();
 
-			formData.append( 'action', 'upload' );
-			formData.append( 'format', 'json' );
-
-			$.each( data, function ( key, val ) {
-				if ( key === 'filename' ) {
-					filenameFound = true;
+			for ( key in data ) {
+				if ( !fieldsAllowed[ key ] ) {
+					delete data[ key ];
 				}
+			}
 
-				if ( fieldsAllowed[key] === true ) {
-					formData.append( key, val );
-				}
-			} );
+			data = $.extend( {}, this.defaults.parameters, { action: 'upload' }, data );
+			data.file = file;
 
-			if ( !filenameFound && !data.stash ) {
+			if ( !data.filename && !data.stash ) {
 				return $.Deferred().reject( 'Filename not included in file data.' );
 			}
 
-			formData.append( 'file', file );
-
-			xhr = new XMLHttpRequest();
-
-			xhr.upload.addEventListener( 'progress', function ( e ) {
-				if ( e.lengthComputable ) {
-					deferred.notify( e.loaded / e.total );
-				}
-			}, false );
-
-			xhr.addEventListener( 'abort', function ( e ) {
-				deferred.reject( parseXHRResponse( e ) );
-			}, false );
-
-			xhr.addEventListener( 'load', function ( e ) {
-				var result = parseXHRResponse( e );
-
-				if ( result.error || result.warnings ) {
-					if ( result.error && result.error.code === 'badtoken' ) {
-						api.badToken( 'edit' );
+			// Use this.postWithEditToken() or this.post()
+			this[ this.needToken() ? 'postWithEditToken' : 'post' ]( data, {
+				// Use FormData (if we got here, we know that it's available)
+				contentType: 'multipart/form-data',
+				// Provide upload progress notifications
+				xhr: function () {
+					var xhr = $.ajaxSettings.xhr();
+					if ( xhr.upload ) {
+						// need to bind this event before we open the connection (see note at
+						// https://developer.mozilla.org/en-US/docs/DOM/XMLHttpRequest/Using_XMLHttpRequest#Monitoring_progress)
+						xhr.upload.addEventListener( 'progress', function ( ev ) {
+							if ( ev.lengthComputable ) {
+								deferred.notify( ev.loaded / ev.total );
+							}
+						} );
 					}
-
-					deferred.reject( result.error || result.warnings );
-				} else {
-					deferred.notify( 1 );
-					deferred.resolve( result );
+					return xhr;
 				}
-			}, false );
-
-			xhr.addEventListener( 'error', function ( e ) {
-				deferred.reject( parseXHRResponse( e ) );
-			}, false );
-
-			xhr.open( 'POST', this.defaults.ajax.url, true );
-
-			if ( this.needToken() ) {
-				this.getEditToken().then( function ( token ) {
-					formData.append( 'token', token );
-					xhr.send( formData );
+			} )
+				.done( function ( result ) {
+					if ( result.error || result.warnings ) {
+						deferred.reject( result.error || result.warnings );
+					} else {
+						deferred.notify( 1 );
+						deferred.resolve( result );
+					}
+				} )
+				.fail( function ( result ) {
+					deferred.reject( result );
 				} );
-			} else {
-				xhr.send( formData );
-			}
 
 			return deferred.promise();
 		},
@@ -320,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
@@ -328,6 +310,7 @@
 		 *             // the upload is complete, data holds the API response
 		 *         } );
 		 *     } );
+		 *
 		 * @param {File|HTMLInputElement} file
 		 * @param {Object} [data]
 		 * @return {jQuery.Promise}
@@ -354,7 +337,12 @@
 					return $.Deferred().reject( 'Filename not included in file data.' );
 				}
 
-				return api.postWithEditToken( data );
+				return api.postWithEditToken( data ).then( function ( result ) {
+					if ( result.upload && ( result.upload.error || result.upload.warnings ) ) {
+						return $.Deferred().reject( result.upload.error || result.upload.warnings ).promise();
+					}
+					return result;
+				} );
 			}
 
 			return this.upload( file, { stash: true, filename: data.filename } ).then( function ( result ) {
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 e35b1cfc03..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,
@@ -284,45 +280,6 @@ img.thumbborder {
 	border: 1px solid #dddddd;
 }
 
-/**
- * Galleries (see shared.css for more info)
- */
-li.gallerybox {
-	vertical-align: top;
-	display: inline-block;
-}
-
-ul.gallery, li.gallerybox {
-	zoom: 1;
-	*display: inline;
-}
-
-ul.gallery {
-	margin: 2px;
-	padding: 2px;
-	display: block;
-}
-
-li.gallerycaption {
-	font-weight: bold;
-	text-align: center;
-	display: block;
-	word-wrap: break-word;
-}
-
-li.gallerybox div.thumb {
-	text-align: center;
-	border: 1px solid #ccc;
-	margin: 2px;
-}
-
-div.gallerytext {
-	overflow: hidden;
-	font-size: 94%;
-	padding: 2px 4px;
-	word-wrap: break-word;
-}
-
 /**
  * Table rendering
  * As on shared.css but with white background.
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 7e171cffa3..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;
@@ -417,11 +324,6 @@ p.mw-upload-editlicenses {
 /* The auto-generated edit comments */
 .autocomment {
 	color: gray;
-	/* In RTL wikis, Latin heading sections can get jumbled with comments that
-	   begin with Latin letters or numbers */
-	unicode-bidi: -moz-isolate;
-	unicode-bidi: -webkit-isolate;
-	unicode-bidi: isolate;
 }
 
 #pagehistory .history-user {
@@ -453,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
@@ -497,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 {
@@ -677,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;
@@ -787,108 +651,6 @@ table.mw_metadata ul.metadata-langlist {
 	margin-left: 0;
 }
 
-/* Galleries */
-/* These display attributes look nonsensical, but are needed to support IE and FF2 */
-/* Don't forget to update commonPrint.css */
-li.gallerybox {
-	vertical-align: top;
-	display: -moz-inline-box;
-	display: inline-block;
-}
-
-ul.gallery,
-li.gallerybox {
-	zoom: 1;
-	*display: inline;
-}
-
-ul.gallery {
-	margin: 2px;
-	padding: 2px;
-	display: block;
-}
-
-li.gallerycaption {
-	font-weight: bold;
-	text-align: center;
-	display: block;
-	word-wrap: break-word;
-}
-
-li.gallerybox div.thumb {
-	text-align: center;
-	border: 1px solid #ccc;
-	background-color: #f9f9f9;
-	margin: 2px;
-}
-
-li.gallerybox div.thumb img {
-	display: block;
-	margin: 0 auto;
-}
-
-div.gallerytext {
-	overflow: hidden;
-	font-size: 94%;
-	padding: 2px 4px;
-	word-wrap: break-word;
-}
-
-/* new gallery stuff */
-ul.mw-gallery-nolines li.gallerybox div.thumb {
-	background-color: transparent;
-	border: none;
-}
-
-ul.mw-gallery-nolines li.gallerybox div.gallerytext {
-	text-align: center;
-}
-
-/* height constrained gallery */
-
-ul.mw-gallery-packed li.gallerybox div.thumb,
-ul.mw-gallery-packed-overlay li.gallerybox div.thumb,
-ul.mw-gallery-packed-hover li.gallerybox div.thumb {
-	background-color: transparent;
-	border: none;
-}
-
-ul.mw-gallery-packed li.gallerybox div.thumb img,
-ul.mw-gallery-packed-overlay li.gallerybox div.thumb img,
-ul.mw-gallery-packed-hover li.gallerybox div.thumb img {
-	margin: 0 auto;
-}
-
-ul.mw-gallery-packed-hover li.gallerybox,
-ul.mw-gallery-packed-overlay li.gallerybox {
-	position: relative;
-}
-
-ul.mw-gallery-packed-hover div.gallerytextwrapper {
-	overflow: hidden;
-	height: 0;
-}
-
-ul.mw-gallery-packed-hover li.gallerybox:hover div.gallerytextwrapper,
-ul.mw-gallery-packed-overlay li.gallerybox div.gallerytextwrapper,
-ul.mw-gallery-packed-hover li.gallerybox.mw-gallery-focused div.gallerytextwrapper {
-	position: absolute;
-	background: white;
-	background: rgba(255, 255, 255, 0.8);
-	padding: 5px 10px;
-	bottom: 0;
-	left: 0; /* Needed for IE */
-	height: auto;
-	font-weight: bold;
-	margin: 2px; /* correspond to style on div.thumb */
-}
-
-ul.mw-gallery-packed-hover,
-ul.mw-gallery-packed-overlay,
-ul.mw-gallery-packed {
-	text-align: center;
-}
-
 .mw-ajax-loader {
 	background-image: url(images/ajax-loader.gif);
 	background-position: center center;
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
new file mode 100644
index 0000000000..20deb2142e
--- /dev/null
+++ b/resources/src/mediawiki.page/mediawiki.page.gallery.css
@@ -0,0 +1,101 @@
+/* Galleries */
+/* These display attributes look nonsensical, but are needed to support IE and FF2 */
+/* Don't forget to update mediawiki.page.gallery.print.css */
+li.gallerybox {
+	vertical-align: top;
+	display: -moz-inline-box;
+	display: inline-block;
+}
+
+ul.gallery,
+li.gallerybox {
+	zoom: 1;
+	*display: inline;
+}
+
+ul.gallery {
+	margin: 2px;
+	padding: 2px;
+	display: block;
+}
+
+li.gallerycaption {
+	font-weight: bold;
+	text-align: center;
+	display: block;
+	word-wrap: break-word;
+}
+
+li.gallerybox div.thumb {
+	text-align: center;
+	border: 1px solid #ccc;
+	background-color: #f9f9f9;
+	margin: 2px;
+}
+
+li.gallerybox div.thumb img {
+	display: block;
+	margin: 0 auto;
+}
+
+div.gallerytext {
+	overflow: hidden;
+	font-size: 94%;
+	padding: 2px 4px;
+	word-wrap: break-word;
+}
+
+/* new gallery stuff */
+ul.mw-gallery-nolines li.gallerybox div.thumb {
+	background-color: transparent;
+	border: none;
+}
+
+ul.mw-gallery-nolines li.gallerybox div.gallerytext {
+	text-align: center;
+}
+
+/* height constrained gallery */
+
+ul.mw-gallery-packed li.gallerybox div.thumb,
+ul.mw-gallery-packed-overlay li.gallerybox div.thumb,
+ul.mw-gallery-packed-hover li.gallerybox div.thumb {
+	background-color: transparent;
+	border: none;
+}
+
+ul.mw-gallery-packed li.gallerybox div.thumb img,
+ul.mw-gallery-packed-overlay li.gallerybox div.thumb img,
+ul.mw-gallery-packed-hover li.gallerybox div.thumb img {
+	margin: 0 auto;
+}
+
+ul.mw-gallery-packed-hover li.gallerybox,
+ul.mw-gallery-packed-overlay li.gallerybox {
+	position: relative;
+}
+
+ul.mw-gallery-packed-hover div.gallerytextwrapper {
+	overflow: hidden;
+	height: 0;
+}
+
+ul.mw-gallery-packed-hover li.gallerybox:hover div.gallerytextwrapper,
+ul.mw-gallery-packed-overlay li.gallerybox div.gallerytextwrapper,
+ul.mw-gallery-packed-hover li.gallerybox.mw-gallery-focused div.gallerytextwrapper {
+	position: absolute;
+	background: white;
+	background: rgba(255, 255, 255, 0.8);
+	padding: 5px 10px;
+	bottom: 0;
+	left: 0; /* Needed for IE */
+	height: auto;
+	font-weight: bold;
+	margin: 2px; /* correspond to style on div.thumb */
+}
+
+ul.mw-gallery-packed-hover,
+ul.mw-gallery-packed-overlay,
+ul.mw-gallery-packed {
+	text-align: center;
+}
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.gallery.print.css b/resources/src/mediawiki.page/mediawiki.page.gallery.print.css
new file mode 100644
index 0000000000..0c14865e79
--- /dev/null
+++ b/resources/src/mediawiki.page/mediawiki.page.gallery.print.css
@@ -0,0 +1,35 @@
+li.gallerybox {
+	vertical-align: top;
+	display: inline-block;
+}
+
+ul.gallery, li.gallerybox {
+	zoom: 1;
+	*display: inline;
+}
+
+ul.gallery {
+	margin: 2px;
+	padding: 2px;
+	display: block;
+}
+
+li.gallerycaption {
+	font-weight: bold;
+	text-align: center;
+	display: block;
+	word-wrap: break-word;
+}
+
+li.gallerybox div.thumb {
+	text-align: center;
+	border: 1px solid #ccc;
+	margin: 2px;
+}
+
+div.gallerytext {
+	overflow: hidden;
+	font-size: 94%;
+	padding: 2px 4px;
+	word-wrap: break-word;
+}
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.movePage.css b/resources/src/mediawiki.special/mediawiki.special.movePage.css
new file mode 100644
index 0000000000..dd1c2aad05
--- /dev/null
+++ b/resources/src/mediawiki.special/mediawiki.special.movePage.css
@@ -0,0 +1,8 @@
+/*!
+ * Styles for Special:MovePage
+ */
+
+.movepage-wrapper {
+	width: 50em;
+	margin: 1em 0;
+}
diff --git a/resources/src/mediawiki.special/mediawiki.special.movePage.js b/resources/src/mediawiki.special/mediawiki.special.movePage.js
index 7e56050d86..6d88c51c5a 100644
--- a/resources/src/mediawiki.special/mediawiki.special.movePage.js
+++ b/resources/src/mediawiki.special/mediawiki.special.movePage.js
@@ -1,6 +1,7 @@
 /*!
  * JavaScript for Special:MovePage
  */
-jQuery( function ( $ ) {
-	$( '#wpReason, #wpNewTitleMain' ).byteLimit();
+jQuery( function () {
+	OO.ui.infuse( 'wpNewTitle' );
+	OO.ui.infuse( 'wpReason' ).$input.byteLimit();
 } );
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 ea1eb99260..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-small-spinner' ).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 4f41fad551..bf0e7014db 100644
--- a/resources/src/mediawiki.special/templates/thumbnail.html
+++ b/resources/src/mediawiki.special/templates/thumbnail.html
@@ -1,6 +1,5 @@
 <div id="mw-upload-thumbnail" class="thumb tright">
 	<div class="thumbinner">
-		<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..49acfefe4e 100644
--- a/resources/src/mediawiki.widgets/mw.widgets.CalendarWidget.js
+++ b/resources/src/mediawiki.widgets/mw.widgets.CalendarWidget.js
@@ -149,8 +149,9 @@
 	 * Update the calendar.
 	 *
 	 * @private
-	 * @param {string|null} [fade=null] Direction in which to fade out current calendar contents, 'previous',
-	 *     'next' or 'up'
+	 * @param {string|null} [fade=null] Direction in which to fade out current calendar contents,
+	 *     'previous', 'next', 'up' or 'down'; or 'auto', which has the same result as 'previous' or
+	 *     'next' depending on whether the current date is later or earlier than the previous.
 	 * @returns {string} Format
 	 */
 	mw.widgets.CalendarWidget.prototype.updateUI = function ( fade ) {
@@ -167,13 +168,25 @@
 			return;
 		}
 
+		if ( fade === 'auto' ) {
+			if ( !this.previousMoment ) {
+				fade = null;
+			} else if ( this.previousMoment.isBefore( this.moment, this.precision === 'month' ? 'month' : 'day' ) ) {
+				fade = 'next';
+			} else if ( this.previousMoment.isAfter( this.moment, this.precision === 'month' ? 'month' : 'day' ) ) {
+				fade = 'previous';
+			} else {
+				fade = null;
+			}
+		}
+
 		items = [];
 		if ( this.$oldBody ) {
 			this.$oldBody.remove();
 		}
 		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 +323,7 @@
 
 	/**
 	 * Handle click events on the "up" button, switching to less precise view.
+	 *
 	 * @private
 	 */
 	mw.widgets.CalendarWidget.prototype.onUpButtonClick = function () {
@@ -327,6 +341,7 @@
 
 	/**
 	 * Handle click events on the "previous" button, switching to previous pane.
+	 *
 	 * @private
 	 */
 	mw.widgets.CalendarWidget.prototype.onPrevButtonClick = function () {
@@ -346,6 +361,7 @@
 
 	/**
 	 * Handle click events on the "next" button, switching to next pane.
+	 *
 	 * @private
 	 */
 	mw.widgets.CalendarWidget.prototype.onNextButtonClick = function () {
@@ -367,11 +383,11 @@
 	 * 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 ) {
 		var
-			previousMoment = moment( this.moment ),
 			$target = $( e.target ),
 			layers = this.getDisplayLayers(),
 			currentLayer = layers.indexOf( this.displayLayer );
@@ -386,10 +402,7 @@
 		}
 		if ( currentLayer === 0 ) {
 			this.setDateFromMoment();
-			this.updateUI(
-				this.precision === 'day' && this.moment.isBefore( previousMoment, 'month' ) ? 'previous' :
-					this.precision === 'day' && this.moment.isAfter( previousMoment, 'month' ) ? 'next' : null
-			);
+			this.updateUI( 'auto' );
 		} else {
 			// One layer down
 			this.displayLayer = layers[ currentLayer - 1 ];
@@ -423,7 +436,7 @@
 	 * Reset the user interface of this widget to reflect selected date.
 	 */
 	mw.widgets.CalendarWidget.prototype.resetUI = function () {
-		this.moment = moment( this.getDate(), this.getDateFormat() );
+		this.moment = this.getDate() !== null ? moment( this.getDate(), this.getDateFormat() ) : moment();
 		this.displayLayer = this.getDisplayLayers()[ 0 ];
 		this.updateUI();
 	};
@@ -489,40 +502,37 @@
 			/*jshint +W024*/
 			nextDirectionKey = dir === 'ltr' ? OO.ui.Keys.RIGHT : OO.ui.Keys.LEFT,
 			prevDirectionKey = dir === 'ltr' ? OO.ui.Keys.LEFT : OO.ui.Keys.RIGHT,
-			updateInDirection = null;
+			changed = true;
 
 		if ( !this.isDisabled() ) {
 			switch ( e.which ) {
 			case prevDirectionKey:
 				this.moment.subtract( 1, this.precision === 'month' ? 'month' : 'day' );
-				updateInDirection = 'previous';
 				break;
 			case nextDirectionKey:
 				this.moment.add( 1, this.precision === 'month' ? 'month' : 'day' );
-				updateInDirection = 'next';
 				break;
 			case OO.ui.Keys.UP:
 				this.moment.subtract( 1, this.precision === 'month' ? 'month' : 'week' );
-				updateInDirection = 'previous';
 				break;
 			case OO.ui.Keys.DOWN:
 				this.moment.add( 1, this.precision === 'month' ? 'month' : 'week' );
-				updateInDirection = 'next';
 				break;
 			case OO.ui.Keys.PAGEUP:
 				this.moment.subtract( 1, this.precision === 'month' ? 'year' : 'month' );
-				updateInDirection = 'previous';
 				break;
 			case OO.ui.Keys.PAGEDOWN:
 				this.moment.add( 1, this.precision === 'month' ? 'year' : 'month' );
-				updateInDirection = 'next';
+				break;
+			default:
+				changed = false;
 				break;
 			}
 
-			if ( updateInDirection ) {
+			if ( changed ) {
 				this.displayLayer = this.getDisplayLayers()[ 0 ];
 				this.setDateFromMoment();
-				this.updateUI( updateInDirection );
+				this.updateUI( 'auto' );
 				return false;
 			}
 		}
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.ComplexNamespaceInputWidget.base.css b/resources/src/mediawiki.widgets/mw.widgets.ComplexNamespaceInputWidget.base.css
new file mode 100644
index 0000000000..b60883e997
--- /dev/null
+++ b/resources/src/mediawiki.widgets/mw.widgets.ComplexNamespaceInputWidget.base.css
@@ -0,0 +1,26 @@
+/*!
+ * MediaWiki Widgets - base ComplexNamespaceInputWidget styles.
+ *
+ * @copyright 2011-2015 MediaWiki Widgets Team and others; see AUTHORS.txt
+ * @license The MIT License (MIT); see LICENSE.txt
+ */
+
+.mw-widget-complexNamespaceInputWidget .mw-widget-namespaceInputWidget,
+.mw-widget-complexNamespaceInputWidget .oo-ui-fieldLayout {
+	display: inline-block;
+	margin-right: 1em;
+}
+
+/* TODO FieldLayout is not supposed to be used the way we use it here */
+.mw-widget-complexNamespaceInputWidget .oo-ui-fieldLayout {
+	vertical-align: middle;
+	margin-bottom: 0;
+}
+
+.mw-widget-complexNamespaceInputWidget .oo-ui-fieldLayout.oo-ui-fieldLayout-align-inline.oo-ui-labelElement > .oo-ui-fieldLayout-body > .oo-ui-labelElement-label {
+	padding-left: 0.5em;
+}
+
+.mw-widget-complexNamespaceInputWidget .mw-widget-namespaceInputWidget {
+	max-width: 20em;
+}
diff --git a/resources/src/mediawiki.widgets/mw.widgets.ComplexNamespaceInputWidget.js b/resources/src/mediawiki.widgets/mw.widgets.ComplexNamespaceInputWidget.js
new file mode 100644
index 0000000000..f67ed3de65
--- /dev/null
+++ b/resources/src/mediawiki.widgets/mw.widgets.ComplexNamespaceInputWidget.js
@@ -0,0 +1,118 @@
+/*!
+ * MediaWiki Widgets - ComplexNamespaceInputWidget class.
+ *
+ * @copyright 2011-2015 MediaWiki Widgets Team and others; see AUTHORS.txt
+ * @license The MIT License (MIT); see LICENSE.txt
+ */
+( function ( $, mw ) {
+
+	/**
+	 * Namespace input widget. Displays a dropdown box with the choice of available namespaces, plus
+	 * two checkboxes to include associated namespace or to invert selection.
+	 *
+	 * @class
+	 * @extends OO.ui.Widget
+	 *
+	 * @constructor
+	 * @param {Object} [config] Configuration options
+	 * @cfg {Object} namespace Configuration for the NamespaceInputWidget dropdown with list
+	 *     of namespaces
+	 * @cfg {string} namespace.includeAllValue If specified, add a "all namespaces"
+	 *     option to the dropdown, and use this as the input value for it
+	 * @cfg {Object} invert Configuration for the "invert selection" CheckboxInputWidget. If
+	 *     null, the checkbox will not be generated.
+	 * @cfg {Object} associated Configuration for the "include associated namespace"
+	 *     CheckboxInputWidget. If null, the checkbox will not be generated.
+	 * @cfg {Object} invertLabel Configuration for the FieldLayout with label wrapping the
+	 *     "invert selection" checkbox
+	 * @cfg {string} invertLabel.label Label text for the label
+	 * @cfg {Object} associatedLabel Configuration for the FieldLayout with label wrapping
+	 *     the "include associated namespace" checkbox
+	 * @cfg {string} associatedLabel.label Label text for the label
+	 */
+	mw.widgets.ComplexNamespaceInputWidget = function MwWidgetsComplexNamespaceInputWidget( config ) {
+		// Configuration initialization
+		config = $.extend(
+			{
+				// Config options for nested widgets
+				namespace: {},
+				invert: {},
+				invertLabel: {},
+				associated: {},
+				associatedLabel: {}
+			},
+			config
+		);
+
+		// Parent constructor
+		mw.widgets.ComplexNamespaceInputWidget.parent.call( this, config );
+
+		// Properties
+		this.config = config;
+
+		this.namespace = new mw.widgets.NamespaceInputWidget( config.namespace );
+		if ( config.associated !== null ) {
+			this.associated = new OO.ui.CheckboxInputWidget( $.extend(
+				{ value: '1' },
+				config.associated
+			) );
+			// TODO Should use a LabelWidget? But they don't work like HTML <label>s yet
+			this.associatedLabel = new OO.ui.FieldLayout(
+				this.associated,
+				$.extend(
+					{ align: 'inline' },
+					config.associatedLabel
+				)
+			);
+		}
+		if ( config.invert !== null ) {
+			this.invert = new OO.ui.CheckboxInputWidget( $.extend(
+				{ value: '1' },
+				config.invert
+			) );
+			// TODO Should use a LabelWidget? But they don't work like HTML <label>s yet
+			this.invertLabel = new OO.ui.FieldLayout(
+				this.invert,
+				$.extend(
+					{ align: 'inline' },
+					config.invertLabel
+				)
+			);
+		}
+
+		// Events
+		this.namespace.connect( this, { change: 'updateCheckboxesState' } );
+
+		// Initialization
+		this.$element
+			.addClass( 'mw-widget-complexNamespaceInputWidget' )
+			.append(
+				this.namespace.$element,
+				this.invert ? this.invertLabel.$element : '',
+				this.associated ? this.associatedLabel.$element : ''
+			);
+		this.updateCheckboxesState();
+	};
+
+	/* Setup */
+
+	OO.inheritClass( mw.widgets.ComplexNamespaceInputWidget, OO.ui.Widget );
+
+	/* Methods */
+
+	/**
+	 * Update the disabled state of checkboxes when the value of namespace dropdown changes.
+	 *
+	 * @private
+	 */
+	mw.widgets.ComplexNamespaceInputWidget.prototype.updateCheckboxesState = function () {
+		var disabled = this.namespace.getValue() === this.namespace.allValue;
+		if ( this.invert ) {
+			this.invert.setDisabled( disabled );
+		}
+		if ( this.associated ) {
+			this.associated.setDisabled( disabled );
+		}
+	};
+
+}( jQuery, mediaWiki ) );
diff --git a/resources/src/mediawiki.widgets/mw.widgets.ComplexTitleInputWidget.base.css b/resources/src/mediawiki.widgets/mw.widgets.ComplexTitleInputWidget.base.css
new file mode 100644
index 0000000000..73a50d8fec
--- /dev/null
+++ b/resources/src/mediawiki.widgets/mw.widgets.ComplexTitleInputWidget.base.css
@@ -0,0 +1,20 @@
+/*!
+ * MediaWiki Widgets - base ComplexTitleInputWidget styles.
+ *
+ * @copyright 2011-2015 MediaWiki Widgets Team and others; see AUTHORS.txt
+ * @license The MIT License (MIT); see LICENSE.txt
+ */
+
+.mw-widget-complexTitleInputWidget .mw-widget-namespaceInputWidget,
+.mw-widget-complexTitleInputWidget .mw-widget-titleInputWidget {
+	display: inline-block;
+}
+
+.mw-widget-complexTitleInputWidget .mw-widget-namespaceInputWidget {
+	max-width: 20em;
+	margin-right: 0.5em;
+}
+
+.mw-widget-complexTitleInputWidget .mw-widget-titleInputWidget {
+	max-width: 29.5em;
+}
diff --git a/resources/src/mediawiki.widgets/mw.widgets.ComplexTitleInputWidget.js b/resources/src/mediawiki.widgets/mw.widgets.ComplexTitleInputWidget.js
new file mode 100644
index 0000000000..0c6c15e475
--- /dev/null
+++ b/resources/src/mediawiki.widgets/mw.widgets.ComplexTitleInputWidget.js
@@ -0,0 +1,63 @@
+/*!
+ * MediaWiki Widgets - ComplexTitleInputWidget class.
+ *
+ * @copyright 2011-2015 MediaWiki Widgets Team and others; see AUTHORS.txt
+ * @license The MIT License (MIT); see LICENSE.txt
+ */
+( function ( $, mw ) {
+
+	/**
+	 * Like TitleInputWidget, but the namespace has to be input through a separate dropdown field.
+	 *
+	 * @class
+	 * @extends OO.ui.Widget
+	 *
+	 * @constructor
+	 * @param {Object} [config] Configuration options
+	 * @cfg {Object} namespace Configuration for the NamespaceInputWidget dropdown with list of
+	 *     namespaces
+	 * @cfg {Object} title Configuration for the TitleInputWidget text field
+	 */
+	mw.widgets.ComplexTitleInputWidget = function MwWidgetsComplexTitleInputWidget( config ) {
+		// Parent constructor
+		mw.widgets.ComplexTitleInputWidget.parent.call( this, config );
+
+		// Properties
+		this.namespace = new mw.widgets.NamespaceInputWidget( config.namespace );
+		this.title = new mw.widgets.TitleInputWidget( $.extend(
+			{},
+			config.title,
+			{
+				relative: true,
+				namespace: config.namespace.value || null
+			}
+		) );
+
+		// Events
+		this.namespace.connect( this, { change: 'updateTitleNamespace' } );
+
+		// Initialization
+		this.$element
+			.addClass( 'mw-widget-complexTitleInputWidget' )
+			.append(
+				this.namespace.$element,
+				this.title.$element
+			);
+		this.updateTitleNamespace();
+	};
+
+	/* Setup */
+
+	OO.inheritClass( mw.widgets.ComplexTitleInputWidget, OO.ui.Widget );
+
+	/* Methods */
+
+	/**
+	 * Update the namespace to use for search suggestions of the title when the value of namespace
+	 * dropdown changes.
+	 */
+	mw.widgets.ComplexTitleInputWidget.prototype.updateTitleNamespace = function () {
+		this.title.setNamespace( Number( this.namespace.getValue() ) );
+	};
+
+}( jQuery, mediaWiki ) );
diff --git a/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.js b/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.js
index 8d952e5a76..657d9c540a 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 );
@@ -294,6 +324,7 @@
 	 * @private
 	 */
 	mw.widgets.DateInputWidget.prototype.activate = function () {
+		this.calendar.resetUI();
 		this.$element.addClass( 'mw-widget-dateInputWidget-active' );
 		this.handle.toggle( false );
 		this.textInput.toggle( true );
@@ -433,12 +464,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 +493,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.NamespaceInputWidget.base.css b/resources/src/mediawiki.widgets/mw.widgets.NamespaceInputWidget.base.css
deleted file mode 100644
index 3ce92efb2b..0000000000
--- a/resources/src/mediawiki.widgets/mw.widgets.NamespaceInputWidget.base.css
+++ /dev/null
@@ -1,26 +0,0 @@
-/*!
- * MediaWiki Widgets - base NamespaceInputWidget styles.
- *
- * @copyright 2011-2015 MediaWiki Widgets Team and others; see AUTHORS.txt
- * @license The MIT License (MIT); see LICENSE.txt
- */
-
-.mw-widget-namespaceInputWidget .oo-ui-dropdownInputWidget,
-.mw-widget-namespaceInputWidget .oo-ui-fieldLayout {
-	display: inline-block;
-	margin-right: 1em;
-}
-
-/* FIXME FieldLayout is not supposed to be used the way we use it here */
-.mw-widget-namespaceInputWidget .oo-ui-fieldLayout {
-	vertical-align: middle;
-	margin-bottom: 0;
-}
-
-.mw-widget-namespaceInputWidget .oo-ui-fieldLayout.oo-ui-fieldLayout-align-inline.oo-ui-labelElement > .oo-ui-fieldLayout-body > .oo-ui-labelElement-label {
-	padding-left: 0.5em;
-}
-
-.mw-widget-namespaceInputWidget .oo-ui-dropdownInputWidget {
-	width: 20em;
-}
diff --git a/resources/src/mediawiki.widgets/mw.widgets.NamespaceInputWidget.js b/resources/src/mediawiki.widgets/mw.widgets.NamespaceInputWidget.js
index 05e6f27110..4f1b874991 100644
--- a/resources/src/mediawiki.widgets/mw.widgets.NamespaceInputWidget.js
+++ b/resources/src/mediawiki.widgets/mw.widgets.NamespaceInputWidget.js
@@ -7,62 +7,63 @@
 ( function ( $, mw ) {
 
 	/**
-	 * Creates a mw.widgets.NamespaceInputWidget object.
-	 *
-	 * This is not a complete implementation and is not intended for public usage. It only exists
-	 * because of HTMLForm shenanigans.
+	 * Namespace input widget. Displays a dropdown box with the choice of available namespaces.
 	 *
 	 * @class
-	 * @private
-	 * @extends OO.ui.Widget
+	 * @extends OO.ui.DropdownInputWidget
 	 *
 	 * @constructor
 	 * @param {Object} [config] Configuration options
-	 * @cfg {OO.ui.DropdownInputWidget} namespace Widget to include
-	 * @cfg {OO.ui.CheckboxInputWidget|null} invert Widget to include
-	 * @cfg {OO.ui.CheckboxInputWidget|null} associated Widget to include
-	 * @cfg {string|null} allValue Value for "all namespaces" option, if any
+	 * @cfg {string|null} [includeAllValue] Value for "all namespaces" option, if any
+	 * @cfg {number[]} [exclude] List of namespace numbers to exclude from the selector
 	 */
 	mw.widgets.NamespaceInputWidget = function MwWidgetsNamespaceInputWidget( config ) {
+		// Configuration initialization
+		config = $.extend( {}, config, { options: this.getNamespaceDropdownOptions( config ) } );
+
 		// Parent constructor
 		mw.widgets.NamespaceInputWidget.parent.call( this, config );
 
-		// Properties
-		this.namespace = config.namespace;
-		this.invert = config.invert;
-		this.associated = config.associated;
-		this.allValue = config.allValue;
-
-		// Events
-		this.namespace.connect( this, { change: 'updateCheckboxesState' } );
-
 		// Initialization
-		this.$element
-			.addClass( 'mw-widget-namespaceInputWidget' )
-			.append(
-				this.namespace.$element,
-				this.invert ? this.invert.$element : '',
-				this.associated ? this.associated.$element : ''
-			);
-		this.updateCheckboxesState();
+		this.$element.addClass( 'mw-widget-namespaceInputWidget' );
 	};
 
 	/* Setup */
 
-	OO.inheritClass( mw.widgets.NamespaceInputWidget, OO.ui.Widget );
+	OO.inheritClass( mw.widgets.NamespaceInputWidget, OO.ui.DropdownInputWidget );
 
 	/* Methods */
 
 	/**
-	 * Update the disabled state of checkboxes when the value of namespace dropdown changes.
+	 * @private
 	 */
-	mw.widgets.NamespaceInputWidget.prototype.updateCheckboxesState = function () {
-		if ( this.invert ) {
-			this.invert.getField().setDisabled( this.namespace.getValue() === this.allValue );
-		}
-		if ( this.associated ) {
-			this.associated.getField().setDisabled( this.namespace.getValue() === this.allValue );
+	mw.widgets.NamespaceInputWidget.prototype.getNamespaceDropdownOptions = function ( config ) {
+		var options,
+			exclude = config.exclude || [],
+			NS_MAIN = 0;
+
+		options = $.map( mw.config.get( 'wgFormattedNamespaces' ), function ( name, ns ) {
+			if ( ns < NS_MAIN || exclude.indexOf( Number( ns ) ) !== -1 ) {
+				return null; // skip
+			}
+			ns = String( ns );
+			if ( ns === String( NS_MAIN ) ) {
+				name = mw.message( 'blanknamespace' ).text();
+			}
+			return { data: ns, label: name };
+		} ).sort( function ( a, b ) {
+			// wgFormattedNamespaces is an object, and so technically doesn't have to be ordered
+			return a.data - b.data;
+		} );
+
+		if ( config.includeAllValue !== null && config.includeAllValue !== undefined ) {
+			options.unshift( {
+				data: config.includeAllValue,
+				label: mw.message( 'namespacesall' ).text()
+			} );
 		}
+
+		return options;
 	};
 
 }( jQuery, mediaWiki ) );
diff --git a/resources/src/mediawiki.widgets/mw.widgets.TitleInputWidget.js b/resources/src/mediawiki.widgets/mw.widgets.TitleInputWidget.js
index 66b009f3c5..d5a7abc68f 100644
--- a/resources/src/mediawiki.widgets/mw.widgets.TitleInputWidget.js
+++ b/resources/src/mediawiki.widgets/mw.widgets.TitleInputWidget.js
@@ -18,6 +18,7 @@
 	 * @cfg {number} [limit=10] Number of results to show
 	 * @cfg {number} [namespace] Namespace to prepend to queries
 	 * @cfg {boolean} [relative=true] If a namespace is set, return a title relative to it
+	 * @cfg {boolean} [suggestions=true] Display search suggestions
 	 * @cfg {boolean} [showRedirectTargets=true] Show the targets of redirects
 	 * @cfg {boolean} [showRedlink] Show red link to exact match if it doesn't exist
 	 * @cfg {boolean} [showImages] Show page images
@@ -28,7 +29,10 @@
 		var widget = this;
 
 		// Config initialization
-		config = config || {};
+		config = $.extend( {
+			maxLength: 255,
+			limit: 10
+		}, config );
 
 		// Parent constructor
 		mw.widgets.TitleInputWidget.parent.call( this, $.extend( {}, config, { autocomplete: false } ) );
@@ -37,9 +41,11 @@
 		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;
+		this.suggestions = config.suggestions !== undefined ? config.suggestions : true;
 		this.showRedirectTargets = config.showRedirectTargets !== false;
 		this.showRedlink = !!config.showRedlink;
 		this.showImages = !!config.showImages;
@@ -55,6 +61,7 @@
 		if ( this.showDescriptions ) {
 			this.lookupMenu.$element.addClass( 'mw-widget-titleInputWidget-menu-withDescriptions' );
 		}
+		this.setLookupsDisabled( !this.suggestions );
 
 		this.interwikiPrefixes = [];
 		this.interwikiPrefixesPromise = new mw.Api().get( {
@@ -75,6 +82,26 @@
 
 	/* Methods */
 
+	/**
+	 * Get the namespace to prepend to titles in suggestions, if any.
+	 *
+	 * @return {number|null} Namespace number
+	 */
+	mw.widgets.TitleInputWidget.prototype.getNamespace = function () {
+		return this.namespace;
+	};
+
+	/**
+	 * Set the namespace to prepend to titles in suggestions, if any.
+	 *
+	 * @param {number|null} namespace Namespace number
+	 */
+	mw.widgets.TitleInputWidget.prototype.setNamespace = function ( namespace ) {
+		this.namespace = namespace;
+		this.lookupCache = {};
+		this.closeLookupMenu();
+	};
+
 	/**
 	 * @inheritdoc
 	 */
@@ -82,7 +109,7 @@
 		this.closeLookupMenu();
 		this.setLookupsDisabled( true );
 		this.setValue( item.getData() );
-		this.setLookupsDisabled( false );
+		this.setLookupsDisabled( !this.suggestions );
 	};
 
 	/**
@@ -97,7 +124,7 @@
 		// Parent method
 		retval = mw.widgets.TitleInputWidget.parent.prototype.focus.apply( this, arguments );
 
-		this.setLookupsDisabled( false );
+		this.setLookupsDisabled( !this.suggestions );
 
 		return retval;
 	};
@@ -121,9 +148,9 @@
 					widget.interwikiPrefixes.indexOf( interwiki ) !== -1
 				) {
 					return $.Deferred().resolve( { query: {
-						pages: [{
+						pages: [ {
 							title: widget.value
-						}]
+						} ]
 					} } ).promise( promiseAbortObject );
 				} else {
 					params = {
@@ -186,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,
@@ -208,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 ] );
 			}
 		}
 
@@ -229,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' )
 			};
@@ -248,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;
@@ -279,18 +306,31 @@
 	};
 
 	/**
-	 * Get title object corresponding to #getValue
+	 * Get title object corresponding to given value, or #getValue if not given.
 	 *
+	 * @param {string} [value] Value to get a title for
 	 * @returns {mw.Title|null} Title object, or null if value is invalid
 	 */
-	mw.widgets.TitleInputWidget.prototype.getTitle = function () {
-		var title = this.getValue(),
+	mw.widgets.TitleInputWidget.prototype.getTitle = function ( value ) {
+		var title = value !== undefined ? value : this.getValue(),
 			// mw.Title doesn't handle null well
 			titleObj = mw.Title.newFromText( title, this.namespace !== null ? this.namespace : undefined );
 
 		return titleObj;
 	};
 
+	/**
+	 * @inheritdoc
+	 */
+	mw.widgets.TitleInputWidget.prototype.cleanUpValue = function ( value ) {
+		var widget = this;
+		value = mw.widgets.TitleInputWidget.parent.prototype.cleanUpValue.call( this, value );
+		return $.trimByteLength( this.value, value, this.maxLength, function ( value ) {
+			var title = widget.getTitle( value );
+			return title ? title.getMain() : value;
+		} ).newVal;
+	};
+
 	/**
 	 * @inheritdoc
 	 */
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..910a78f87b 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 );
 				}
 			}
@@ -480,11 +481,6 @@
 	 * @param {number} [defaultNamespace=NS_MAIN]
 	 *  If given, will used as default namespace for the given title.
 	 * @param {Object} [options] additional options
-	 * @param {string} [options.fileExtension='']
-	 *  If the title is about to be created for the Media or File namespace,
-	 *  ensures the resulting Title has the correct extension. Useful, for example
-	 *  on systems that predict the type by content-sniffing, not by file extension.
-	 *  If different from empty string, `forUploading` is assumed.
 	 * @param {boolean} [options.forUploading=true]
 	 *  Makes sure that a file is uploadable under the title returned.
 	 *  There are pages in the file namespace under which file upload is impossible.
@@ -492,7 +488,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' ) {
@@ -502,23 +498,16 @@
 
 		// merge options into defaults
 		options = $.extend( {
-			fileExtension: '',
 			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,16 +520,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 ];
 			}
 		}
 
 		if ( namespace === NS_MEDIA
-			|| ( ( options.forUploading || options.fileExtension ) && ( namespace === NS_FILE ) )
+			|| ( options.forUploading && ( namespace === NS_FILE ) )
 		) {
 
 			title = sanitize( title, [ 'generalRule', 'fileRule' ] );
@@ -555,18 +544,6 @@
 				// 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 );
-
-					// And add the desired file extension later
-					ext = options.fileExtension;
-				}
-
 				// Remove whitespace of the name part (that W/O extension)
 				title = $.trim( parts.join( '.' ) );
 
@@ -578,16 +555,8 @@
 				// Missing file extension
 				title = $.trim( parts.join( '.' ) );
 
-				if ( options.fileExtension ) {
-
-					// Cut, if too long and append the desired file extension
-					title = trimFileNameToByteLength( title, options.fileExtension );
-
-				} else {
-
-					// Name has no file extension and a fallback wasn't provided either
-					return null;
-				}
+				// Name has no file extension and a fallback wasn't provided either
+				return null;
 			}
 		} else {
 
@@ -614,13 +583,11 @@
 	 * @static
 	 * @param {string} uncleanName The unclean file name including file extension but
 	 *   without namespace
-	 * @param {string} [fileExtension] the desired file extension
 	 * @return {mw.Title|null} A valid Title object or null if the title is invalid
 	 */
-	Title.newFromFileName = function ( uncleanName, fileExtension ) {
+	Title.newFromFileName = function ( uncleanName ) {
 
 		return Title.newFromUserInput( 'File:' + uncleanName, {
-			fileExtension: fileExtension,
 			forUploading: true
 		} );
 	};
@@ -655,7 +622,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 +633,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 +657,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 +696,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 +782,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 3c10eeb2f7..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 ] );
@@ -337,7 +337,7 @@
 				return false;
 			}
 
-			dialog.upload.finishStashUpload().then( function () {
+			dialog.upload.finishStashUpload().always( function () {
 				var name;
 
 				if ( dialog.upload.getState() === mw.Upload.State.ERROR ) {
@@ -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 551aa9ddb8..79628de50d 100644
--- a/resources/src/mediawiki/mediawiki.Upload.js
+++ b/resources/src/mediawiki/mediawiki.Upload.js
@@ -44,10 +44,11 @@
 	 *     } );
 	 *
 	 * @constructor
-	 * @param {Object} apiconfig Passed to the constructor of mw.Api.
+	 * @param {Object|mw.Api} [apiconfig] A mw.Api object (or subclass), or configuration
+	 *     to pass to the constructor of mw.Api.
 	 */
 	function Upload( apiconfig ) {
-		this.api = new mw.Api( apiconfig );
+		this.api = ( apiconfig instanceof mw.Api ) ? apiconfig : new mw.Api( apiconfig );
 
 		this.watchlist = false;
 		this.text = '';
@@ -63,6 +64,7 @@
 
 	/**
 	 * Set the text of the file page, to be created on file upload.
+	 *
 	 * @param {string} text
 	 */
 	UP.setText = function ( text ) {
@@ -71,6 +73,7 @@
 
 	/**
 	 * Set the filename, to be finalized on upload.
+	 *
 	 * @param {string} filename
 	 */
 	UP.setFilename = function ( filename ) {
@@ -81,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 ) {
@@ -100,6 +105,7 @@
 
 	/**
 	 * Set whether the file should be watchlisted after upload.
+	 *
 	 * @param {boolean} watchlist
 	 */
 	UP.setWatchlist = function ( watchlist ) {
@@ -108,6 +114,7 @@
 
 	/**
 	 * Set the edit comment for the upload.
+	 *
 	 * @param {string} comment
 	 */
 	UP.setComment = function ( comment ) {
@@ -116,6 +123,7 @@
 
 	/**
 	 * Get the text of the file page, to be created on file upload.
+	 *
 	 * @return {string}
 	 */
 	UP.getText = function () {
@@ -124,6 +132,7 @@
 
 	/**
 	 * Get the filename, to be finalized on upload.
+	 *
 	 * @return {string}
 	 */
 	UP.getFilename = function () {
@@ -132,6 +141,7 @@
 
 	/**
 	 * Get the file being uploaded.
+	 *
 	 * @return {HTMLInputElement|File}
 	 */
 	UP.getFile = function () {
@@ -140,6 +150,7 @@
 
 	/**
 	 * Get the boolean for whether the file will be watchlisted after upload.
+	 *
 	 * @return {boolean}
 	 */
 	UP.getWatchlist = function () {
@@ -148,6 +159,7 @@
 
 	/**
 	 * Get the current value of the edit comment for the upload.
+	 *
 	 * @return {string}
 	 */
 	UP.getComment = function () {
@@ -156,6 +168,7 @@
 
 	/**
 	 * Gets the base filename from a path name.
+	 *
 	 * @param {string} path
 	 * @return {string}
 	 */
@@ -176,6 +189,7 @@
 
 	/**
 	 * Gets the state of the upload.
+	 *
 	 * @return {mw.Upload.State}
 	 */
 	UP.getState = function () {
@@ -186,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 () {
@@ -194,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;
@@ -225,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;
@@ -254,6 +271,7 @@
 
 	/**
 	 * Finish a stash upload.
+	 *
 	 * @return {jQuery.Promise}
 	 */
 	UP.finishStashUpload = function () {
@@ -267,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
new file mode 100644
index 0000000000..75b1f80de4
--- /dev/null
+++ b/resources/src/mediawiki/mediawiki.experiments.js
@@ -0,0 +1,110 @@
+/* jshint bitwise:false */
+( function ( mw, $ ) {
+
+	var CONTROL_BUCKET = 'control',
+		MAX_INT32_UNSIGNED = 4294967295;
+
+	/**
+	 * An implementation of Jenkins' one-at-a-time hash.
+	 *
+	 * @see http://en.wikipedia.org/wiki/Jenkins_hash_function
+	 *
+	 * @param {String} string String to hash
+	 * @return {Number} The hash as a 32-bit unsigned integer
+	 * @ignore
+	 *
+	 * @author Ori Livneh <ori@wikimedia.org>
+	 * @see http://jsbin.com/kejewi/4/watch?js,console
+	 */
+	function hashString( string ) {
+		var hash = 0,
+			i = string.length;
+
+		while ( i-- ) {
+			hash += string.charCodeAt( i );
+			hash += ( hash << 10 );
+			hash ^= ( hash >> 6 );
+		}
+		hash += ( hash << 3 );
+		hash ^= ( hash >> 11 );
+		hash += ( hash << 15 );
+
+		return hash >>> 0;
+	}
+
+	/**
+	 * Provides an API for bucketing users in experiments.
+	 *
+	 * @class mw.experiments
+	 * @singleton
+	 */
+	mw.experiments = {
+
+		/**
+		 * Gets the bucket for the experiment given the token.
+		 *
+		 * The name of the experiment and the token are hashed. The hash is converted
+		 * to a number which is then used to get a bucket.
+		 *
+		 * Consider the following experiment specification:
+		 *
+		 * ```
+		 * {
+		 *   name: 'My first experiment',
+		 *   enabled: true,
+		 *   buckets: {
+		 *     control: 0.5
+		 *     A: 0.25,
+		 *     B: 0.25
+		 *   }
+		 * }
+		 * ```
+		 *
+		 * The experiment has three buckets: control, A, and B. The user has a 50%
+		 * chance of being assigned to the control bucket, and a 25% chance of being
+		 * assigned to either the A or B buckets. If the experiment were disabled,
+		 * then the user would always be assigned to the control bucket.
+		 *
+		 * This function is based on the deprecated `mw.user.bucket` function.
+		 *
+		 * @param {Object} experiment
+		 * @param {String} experiment.name The name of the experiment
+		 * @param {Boolean} experiment.enabled Whether or not the experiment is
+		 *  enabled. If the experiment is disabled, then the user is always assigned
+		 *  to the control bucket
+		 * @param {Object} experiment.buckets A map of bucket name to probability
+		 *  that the user will be assigned to that bucket
+		 * @param {String} token A token that uniquely identifies the user for the
+		 *  duration of the experiment
+		 * @returns {String} The bucket
+		 */
+		getBucket: function ( experiment, token ) {
+			var buckets = experiment.buckets,
+				key,
+				range = 0,
+				hash,
+				max,
+				acc = 0;
+
+			if ( !experiment.enabled || $.isEmptyObject( experiment.buckets ) ) {
+				return CONTROL_BUCKET;
+			}
+
+			for ( key in buckets ) {
+				range += buckets[ key ];
+			}
+
+			hash = hashString( experiment.name + ':' + token );
+			max = ( hash / MAX_INT32_UNSIGNED ) * range;
+
+			for ( key in buckets ) {
+				acc += buckets[ key ];
+
+				if ( max <= acc ) {
+					return key;
+				}
+			}
+		}
+	};
+
+}( mediaWiki, jQuery ) );
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..a07a4031af 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 */
@@ -11,4 +9,8 @@
 	background-image: -webkit-linear-gradient(transparent, transparent), url(images/feed-icon.svg);
 	/* @embed */
 	background-image: linear-gradient(transparent, transparent), url(images/feed-icon.svg);
+	background-position: center left;
+	background-repeat: no-repeat;
+	background-size: 12px 12px;
+	padding-left: 16px;
 }
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.htmlform.ooui.css b/resources/src/mediawiki/mediawiki.htmlform.ooui.css
index 31d9854d73..309eb3493f 100644
--- a/resources/src/mediawiki/mediawiki.htmlform.ooui.css
+++ b/resources/src/mediawiki/mediawiki.htmlform.ooui.css
@@ -5,6 +5,16 @@
 	margin: 1em 0;
 }
 
+.oo-ui-fieldLayout.mw-htmlform-ooui-header-empty,
+.oo-ui-fieldLayout.mw-htmlform-ooui-header-empty .oo-ui-fieldLayout-body {
+	display: none;
+}
+
+.oo-ui-fieldLayout.mw-htmlform-ooui-header-errors {
+	/* Override 'display: none' from above */
+	display: block;
+}
+
 .mw-htmlform-ooui .mw-htmlform-submit-buttons {
 	margin-top: 1em;
 }
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 6548896093..5dd2acbd81 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;
 				}
 			};
 
@@ -711,28 +713,54 @@
 			/**
 			 * Mapping of registered modules.
 			 *
-			 * See #implement for exact details on support for script, style and messages.
+			 * See #implement and #execute for exact details on support for script, style and messages.
 			 *
 			 * Format:
 			 *
 			 *     {
 			 *         'moduleName': {
-			 *             // From startup mdoule
-			 *             'version': '################' (Hash)
+			 *             // From mw.loader.register()
+			 *             'version': '########' (hash)
 			 *             'dependencies': ['required.foo', 'bar.also', ...], (or) function () {}
 			 *             'group': 'somegroup', (or) null
 			 *             'source': 'local', (or) 'anotherwiki'
 			 *             'skip': 'return !!window.Example', (or) null
+			 *
+			 *             // Set from execute() or mw.loader.state()
 			 *             'state': 'registered', 'loaded', 'loading', 'ready', 'error', or 'missing'
 			 *
-			 *             // Added during implementation
+			 *             // Optionally added at run-time by mw.loader.implement()
 			 *             'skipped': true
-			 *             'script': ...
-			 *             'style': ...
-			 *             'messages': { 'key': 'value' }
+			 *             'script': closure, array of urls, or string
+			 *             'style': { ... } (see #execute)
+			 *             'messages': { 'key': 'value', ... }
 			 *         }
 			 *     }
 			 *
+			 * 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
 			 */
@@ -753,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!
@@ -793,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
@@ -909,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
@@ -917,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.
@@ -1015,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;
 					}
 				}
@@ -1033,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;
 					}
@@ -1055,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;
 								}
 							}
@@ -1074,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 ) ) {
@@ -1098,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
@@ -1128,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;
 			}
 
 			/**
@@ -1138,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 ) {
@@ -1193,7 +1235,7 @@
 								return;
 							}
 
-							addScript( arr[i], function () {
+							addScript( arr[ i ] ).always( function () {
 								nestedAddScript( arr, callback, i + 1 );
 							} );
 						};
@@ -1208,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
@@ -1219,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.
@@ -1284,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' ) {
@@ -1311,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
@@ -1322,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 ] );
 								}
 							}
 						}
@@ -1348,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 ) {
@@ -1370,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;
 						}
@@ -1394,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;
 			}
@@ -1402,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 ) {
@@ -1410,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
@@ -1428,10 +1467,7 @@
 					currReqBase
 				);
 				request = sortQuery( request );
-				// Support: IE6
-				// Append &* to satisfy load.php's WebRequest::checkUrlExtension test.
-				// This script isn't actually used in IE6, but MediaWiki enforces it in general.
-				addScript( sourceLoadScript + '?' + $.param( request ) + '&*' );
+				addScript( sourceLoadScript + '?' + $.param( request ) );
 			}
 
 			/**
@@ -1447,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;
 						} );
 					}
 				} );
@@ -1495,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';
 							}
 						}
 					}
@@ -1536,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 );
 						}
@@ -1556,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
@@ -1577,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 )
@@ -1601,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
@@ -1622,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
@@ -1652,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;
 					}
@@ -1665,7 +1701,7 @@
 						loadUrl = loadUrl.loadScript;
 					}
 
-					sources[id] = loadUrl;
+					sources[ id ] = loadUrl;
 
 					return true;
 				},
@@ -1696,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;
@@ -1713,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,
@@ -1723,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;
 					}
 				},
 
@@ -1755,10 +1791,10 @@
 				 * The reason css strings are not concatenated anymore is bug 31676. We now check
 				 * whether it's safe to extend the stylesheet.
 				 *
-				 * @param {Object} [msgs] List of key/value pairs to be added to mw#messages.
+				 * @param {Object} [messages] List of key/value pairs to be added to mw#messages.
 				 * @param {Object} [templates] List of key/value pairs to be added to mw#templates.
 				 */
-				implement: function ( module, script, style, msgs, templates ) {
+				implement: function ( module, script, style, messages, templates ) {
 					// Validate input
 					if ( typeof module !== 'string' ) {
 						throw new Error( 'module must be of type string, not ' + typeof module );
@@ -1769,8 +1805,8 @@
 					if ( style && !$.isPlainObject( style ) ) {
 						throw new Error( 'style must be of type object, not ' + typeof style );
 					}
-					if ( msgs && !$.isPlainObject( msgs ) ) {
-						throw new Error( 'msgs must be of type object, not a ' + typeof msgs );
+					if ( messages && !$.isPlainObject( messages ) ) {
+						throw new Error( 'messages must be of type object, not a ' + typeof messages );
 					}
 					if ( templates && !$.isPlainObject( templates ) ) {
 						throw new Error( 'templates must be of type object, not a ' + typeof templates );
@@ -1780,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 = msgs || {};
-					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 );
 						}
 					}
@@ -1866,9 +1902,10 @@
 					if ( typeof modules !== 'object' && typeof modules !== 'string' ) {
 						throw new Error( 'modules must be a string or an array, not a ' + typeof modules );
 					}
-					// Allow calling with an external url or single dependency as a string
+					// Allow calling with a url or single dependency as a string
 					if ( typeof modules === 'string' ) {
-						if ( /^(https?:)?\/\//.test( modules ) ) {
+						// "https://example.org/x.js", "http://example.org/x.js", "//example.org/x.js", "/x.js"
+						if ( /^(https?:)?\/?\//.test( modules ) ) {
 							if ( type === 'text/css' ) {
 								// Support: IE 7-8
 								// Use properties instead of attributes as IE throws security
@@ -1925,21 +1962,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;
 					}
 				},
 
@@ -1951,10 +1988,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;
 				},
 
 				/**
@@ -1965,10 +2002,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;
 				},
 
 				/**
@@ -2020,6 +2057,7 @@
 
 					/**
 					 * Construct a JSON-serializable object representing the content of the store.
+					 *
 					 * @return {Object} Module store contents.
 					 */
 					toJSON: function () {
@@ -2038,6 +2076,7 @@
 
 					/**
 					 * Get a key on which to vary the module cache.
+					 *
 					 * @return {string} String of concatenated vary conditions.
 					 */
 					getVary: function () {
@@ -2056,7 +2095,7 @@
 					 */
 					getModuleKey: function ( module ) {
 						return hasOwn.call( registry, module ) ?
-							( module + '@' + registry[module].version ) : null;
+							( module + '@' + registry[ module ].version ) : null;
 					},
 
 					/**
@@ -2128,7 +2167,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;
@@ -2176,8 +2215,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 ) {
@@ -2189,7 +2228,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();
 					},
 
@@ -2208,10 +2247,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 ];
 							}
 						}
 					},
@@ -2340,7 +2379,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;
@@ -2387,6 +2426,7 @@
 
 				/**
 				 * Wrapper object for raw HTML passed to mw.html.element().
+				 *
 				 * @class mw.html.Raw
 				 */
 				Raw: function ( value ) {
@@ -2395,6 +2435,7 @@
 
 				/**
 				 * Wrapper object for CDATA element contents passed to mw.html.element()
+				 *
 				 * @class mw.html.Cdata
 				 */
 				Cdata: function ( value ) {
@@ -2461,12 +2502,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
 					 */
@@ -2474,6 +2516,7 @@
 
 					/**
 					 * Unregister a hook handler
+					 *
 					 * @param {Function...} handler Function to unbind.
 					 * @chainable
 					 */
@@ -2481,6 +2524,7 @@
 
 					/**
 					 * Run a hook.
+					 *
 					 * @param {Mixed...} data
 					 * @chainable
 					 */
@@ -2535,10 +2579,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.startUp.js b/resources/src/mediawiki/mediawiki.startUp.js
deleted file mode 100644
index 028784c29b..0000000000
--- a/resources/src/mediawiki/mediawiki.startUp.js
+++ /dev/null
@@ -1,11 +0,0 @@
-/*!
- * Auto-register from pre-loaded startup scripts
- */
-( function ( $ ) {
-	'use strict';
-
-	if ( $.isFunction( window.startUp ) ) {
-		window.startUp();
-		window.startUp = undefined;
-	}
-}( jQuery ) );
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 3b79bd39d0..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
@@ -68,39 +65,49 @@ function isCompatible( ua ) {
 	);
 }
 
-/**
- * The $CODE and $VARS placeholders are substituted in ResourceLoaderStartUpModule.php.
- */
-function startUp() {
-	mw.config = new mw.Map( $VARS.wgLegacyJavaScriptGlobals );
+// Conditional script injection
+( function () {
+	if ( !isCompatible() ) {
+		// Undo class swapping in case of an unsupported browser.
+		// See OutputPage::getHeadScripts().
+		document.documentElement.className = document.documentElement.className
+			.replace( /(^|\s)client-js(\s|$)/, '$1client-nojs$2' );
+		return;
+	}
+
+	/**
+	 * The $CODE and $VARS placeholders are substituted in ResourceLoaderStartUpModule.php.
+	 */
+	function startUp() {
+		mw.config = new mw.Map( $VARS.wgLegacyJavaScriptGlobals );
 
-	$CODE.registrations();
+		$CODE.registrations();
 
-	mw.config.set( $VARS.configuration );
+		mw.config.set( $VARS.configuration );
 
-	// Must be after mw.config.set because these callbacks may use mw.loader which
-	// needs to have values 'skin', 'debug' etc. from mw.config.
-	window.RLQ = window.RLQ || [];
-	while ( RLQ.length ) {
-		RLQ.shift()();
+		// Must be after mw.config.set because these callbacks may use mw.loader which
+		// needs to have values 'skin', 'debug' etc. from mw.config.
+		window.RLQ = window.RLQ || [];
+		while ( RLQ.length ) {
+			RLQ.shift()();
+		}
+		window.RLQ = {
+			push: function ( fn ) {
+				fn();
+			}
+		};
 	}
-	window.RLQ = {
-		push: function ( fn ) {
-			fn();
+
+	var script = document.createElement( 'script' );
+	script.src = $VARS.baseModulesUri;
+	script.onload = script.onreadystatechange = function () {
+		if ( !script.readyState || /loaded|complete/.test( script.readyState ) ) {
+			// Clean up
+			script.onload = script.onreadystatechange = null;
+			script = null;
+			// Callback
+			startUp();
 		}
 	};
-}
-
-// Conditional script injection
-if ( isCompatible() ) {
-	( function () {
-		var script = document.createElement( 'script' );
-		script.src = $VARS.baseModulesUri;
-		document.getElementsByTagName( 'head' )[0].appendChild( script );
-	}() );
-} else {
-	// Undo class swapping in case of an unsupported browser.
-	// See OutputPage::getHeadScripts().
-	document.documentElement.className = document.documentElement.className
-		.replace( /(^|\s)client-js(\s|$)/, '$1client-nojs$2' );
-}
+	document.getElementsByTagName( 'head' )[ 0 ].appendChild( script );
+}() );
diff --git a/tests/browser/features/support/pages/main_page.rb b/tests/browser/features/support/pages/main_page.rb
index 6d76b01c4e..3092ab5cd2 100644
--- a/tests/browser/features/support/pages/main_page.rb
+++ b/tests/browser/features/support/pages/main_page.rb
@@ -3,16 +3,16 @@ class MainPage
 
   page_url ''
 
-  a(:edit_link, href: /action=edit/)
+  a(:edit_link, css: '#ca-edit a')
   li(:help_link, id: 'n-help')
   div(:page_content, id: 'content')
   li(:page_information_link, id: 't-info')
   li(:permanent_link_link, id: 't-permalink')
-  a(:printable_version_link, href: /printable=yes/)
+  a(:printable_version_link, css: '#t-print a')
   li(:random_page_link, id: 'n-randompage')
   li(:recent_changes_link, id: 'n-recentchanges')
   li(:related_changes_link, id: 't-recentchangeslinked')
   li(:special_pages_link, id: 't-specialpages')
-  a(:view_history_link, href: /action=history/)
+  a(:view_history_link, css: '#ca-history a')
   li(:what_links_here_link, id: 't-whatlinkshere')
 end
diff --git a/tests/browser/features/support/pages/preferences_appearance_page.rb b/tests/browser/features/support/pages/preferences_appearance_page.rb
index 83c3952f6b..1e5ffaa18f 100644
--- a/tests/browser/features/support/pages/preferences_appearance_page.rb
+++ b/tests/browser/features/support/pages/preferences_appearance_page.rb
@@ -27,7 +27,7 @@ class PreferencesAppearancePage
   radio_button(:monobook, id: 'mw-input-wpskin-monobook')
   radio_button(:no_preference_radio, id: 'mw-input-wpdate-default')
   text_field(:other_offset, id: 'mw-input-wptimecorrection-other')
-  a(:restore_default_link, href: /reset/)
+  a(:restore_default_link, id: 'mw-prefs-restoreprefs')
   select_list(:size_select, id: 'mw-input-wpimagesize')
   select_list(:threshold_select, id: 'mw-input-wpstubthreshold')
   select_list(:time_offset_select, id: 'mw-input-wptimecorrection')
diff --git a/tests/browser/features/support/pages/view_history_page.rb b/tests/browser/features/support/pages/view_history_page.rb
index bb9c58628a..ee4d757a05 100644
--- a/tests/browser/features/support/pages/view_history_page.rb
+++ b/tests/browser/features/support/pages/view_history_page.rb
@@ -1,6 +1,6 @@
 class ViewHistoryPage
   include PageObject
 
-  a(:view_history_link, href: /action=history/)
-  a(:old_version_link, href: /oldid=/)
+  a(:view_history_link, css: '#ca-history a')
+  a(:old_version_link, css: '#pagehistory a.mw-changeslist-date')
 end
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/parser/preprocess/All_system_messages.expected b/tests/parser/preprocess/All_system_messages.expected
index 3665e3c1e1..57223da6b0 100644
--- a/tests/parser/preprocess/All_system_messages.expected
+++ b/tests/parser/preprocess/All_system_messages.expected
@@ -1370,12 +1370,12 @@ Message
 &lt;/td&gt;&lt;td&gt;
 <template lineStart="1"><title>int:Emailmessage</title></template>
 &lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;
-[http://tl.wiktionary.org/w/wiki.phtml?title=MediaWiki:Emailpage&amp;action=edit emailpage]&lt;br&gt;
-[[MediaWiki_talk:Emailpage|Talk]]
+[http://tl.wiktionary.org/w/wiki.phtml?title=MediaWiki:Emailuser&amp;action=edit emailuser]&lt;br&gt;
+[[MediaWiki_talk:Emailuser|Talk]]
 &lt;/td&gt;&lt;td&gt;
 E-mail user
 &lt;/td&gt;&lt;td&gt;
-<template lineStart="1"><title>int:Emailpage</title></template>
+<template lineStart="1"><title>int:Emailuser</title></template>
 &lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;
 [http://tl.wiktionary.org/w/wiki.phtml?title=MediaWiki:Emailpagetext&amp;action=edit emailpagetext]&lt;br&gt;
 [[MediaWiki_talk:Emailpagetext|Talk]]
diff --git a/tests/parser/preprocess/All_system_messages.txt b/tests/parser/preprocess/All_system_messages.txt
index c619df7bc4..cdc223a9c7 100644
--- a/tests/parser/preprocess/All_system_messages.txt
+++ b/tests/parser/preprocess/All_system_messages.txt
@@ -1370,12 +1370,12 @@ Message
 </td><td>
 {{int:Emailmessage}}
 </td></tr><tr><td>
-[http://tl.wiktionary.org/w/wiki.phtml?title=MediaWiki:Emailpage&action=edit emailpage]<br>
-[[MediaWiki_talk:Emailpage|Talk]]
+[http://tl.wiktionary.org/w/wiki.phtml?title=MediaWiki:Emailuser&action=edit emailuser]<br>
+[[MediaWiki_talk:Emailuser|Talk]]
 </td><td>
 E-mail user
 </td><td>
-{{int:Emailpage}}
+{{int:Emailuser}}
 </td></tr><tr><td>
 [http://tl.wiktionary.org/w/wiki.phtml?title=MediaWiki:Emailpagetext&action=edit emailpagetext]<br>
 [[MediaWiki_talk:Emailpagetext|Talk]]
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/README b/tests/phpunit/README
index 0a32ba17e6..f555812de2 100644
--- a/tests/phpunit/README
+++ b/tests/phpunit/README
@@ -14,16 +14,13 @@ TO RETAIN YOUR DATA.
 
 == Installation ==
 
-If PHPUnit is not installed, follow the installation instructions in the
-PHPUnit Manual at:
-
-  http://www.phpunit.de/manual/current/en/installation.html
+If you used composer to install MediaWiki's dependencies PHPUnit will already be available, unless
+you explicitly specified the --no-dev flag during the install. In this case just run "composer update".
 
-- or -
-
-On Unix-like operating systems, run:
+Otherwise follow the installation instructions in the
+PHPUnit Manual at:
 
-  make install
+  https://phpunit.de/manual/current/en/installation.html
 
 
 == Running tests ==
@@ -47,7 +44,7 @@ On Windows-family operating systems, run the 'run-tests.bat' batch file.
 
 === Writing tests ===
 
-A guide to writing unit tests for MediaWiki can be found at:
+A guide to writing PHP unit tests for MediaWiki can be found at:
 
-	http://mediawiki.org/wiki/Unit_Testing
+	https://www.mediawiki.org/wiki/Manual:PHP_unit_testing
 
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/FauxRequestTest.php b/tests/phpunit/includes/FauxRequestTest.php
index eca5b395fb..07214b215c 100644
--- a/tests/phpunit/includes/FauxRequestTest.php
+++ b/tests/phpunit/includes/FauxRequestTest.php
@@ -20,4 +20,32 @@ class FauxRequestTest extends MediaWikiTestCase {
 			array( 'text/plain', 'text/html' )
 		);
 	}
+
+	/**
+	 * @covers FauxRequest::getAllHeaders
+	 */
+	public function testGetAllHeaders() {
+		$_SERVER['HTTP_TEST'] = 'Example';
+
+		$request = new FauxRequest();
+
+		$this->assertEquals(
+			array(),
+			$request->getAllHeaders()
+		);
+	}
+
+	/**
+	 * @covers FauxRequest::getHeader
+	 */
+	public function testGetHeader() {
+		$_SERVER['HTTP_TEST'] = 'Example';
+
+		$request = new FauxRequest();
+
+		$this->assertEquals(
+			false,
+			$request->getHeader( 'test' )
+		);
+	}
 }
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/GlobalFunctions/wfTimestampTest.php b/tests/phpunit/includes/GlobalFunctions/wfTimestampTest.php
index bea496c4f2..4ce51c6a27 100644
--- a/tests/phpunit/includes/GlobalFunctions/wfTimestampTest.php
+++ b/tests/phpunit/includes/GlobalFunctions/wfTimestampTest.php
@@ -21,6 +21,7 @@ class WfTimestampTest extends MediaWikiTestCase {
 			array( -30281104, TS_MW, '19690115123456', 'Negative TS_UNIX to TS_MW' ),
 			array( $t, TS_UNIX, 979562096, 'TS_UNIX to TS_UNIX' ),
 			array( $t, TS_DB, '2001-01-15 12:34:56', 'TS_UNIX to TS_DB' ),
+			array( $t + .01, TS_MW, '20010115123456', 'TS_UNIX float to TS_MW' ),
 
 			array( $t, TS_ISO_8601_BASIC, '20010115T123456Z', 'TS_ISO_8601_BASIC to TS_DB' ),
 
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 85c2220910..f0d905e599 100644
--- a/tests/phpunit/includes/OutputPageTest.php
+++ b/tests/phpunit/includes/OutputPageTest.php
@@ -142,20 +142,20 @@ class OutputPageTest extends MediaWikiTestCase {
 			array(
 				array( 'test.foo', ResourceLoaderModule::TYPE_SCRIPTS ),
 				"<script>window.RLQ = window.RLQ || []; window.RLQ.push( function () {\n"
-					. 'mw.loader.load("http://127.0.0.1:8080/w/load.php?debug=false\u0026lang=en\u0026modules=test.foo\u0026only=scripts\u0026skin=fallback\u0026*");'
+					. 'mw.loader.load("http://127.0.0.1:8080/w/load.php?debug=false\u0026lang=en\u0026modules=test.foo\u0026only=scripts\u0026skin=fallback");'
 					. "\n} );</script>"
 			),
 			array(
 				// Don't condition wrap raw modules (like the startup module)
 				array( 'test.raw', ResourceLoaderModule::TYPE_SCRIPTS ),
-				'<script async src="http://127.0.0.1:8080/w/load.php?debug=false&amp;lang=en&amp;modules=test.raw&amp;only=scripts&amp;skin=fallback&amp;*"></script>'
+				'<script async src="http://127.0.0.1:8080/w/load.php?debug=false&amp;lang=en&amp;modules=test.raw&amp;only=scripts&amp;skin=fallback"></script>'
 			),
 			// Load module styles only
 			// This also tests the order the modules are put into the url
 			array(
 				array( array( 'test.baz', 'test.foo', 'test.bar' ), ResourceLoaderModule::TYPE_STYLES ),
 
-				'<link rel=stylesheet href="http://127.0.0.1:8080/w/load.php?debug=false&amp;lang=en&amp;modules=test.bar%2Cbaz%2Cfoo&amp;only=styles&amp;skin=fallback&amp;*">'
+				'<link rel=stylesheet href="http://127.0.0.1:8080/w/load.php?debug=false&amp;lang=en&amp;modules=test.bar%2Cbaz%2Cfoo&amp;only=styles&amp;skin=fallback">'
 			),
 			// Load private module (only=scripts)
 			array(
@@ -180,16 +180,16 @@ class OutputPageTest extends MediaWikiTestCase {
 			// noscript group
 			array(
 				array( 'test.noscript', ResourceLoaderModule::TYPE_STYLES ),
-				'<noscript><link rel=stylesheet href="http://127.0.0.1:8080/w/load.php?debug=false&amp;lang=en&amp;modules=test.noscript&amp;only=styles&amp;skin=fallback&amp;*"></noscript>'
+				'<noscript><link rel=stylesheet href="http://127.0.0.1:8080/w/load.php?debug=false&amp;lang=en&amp;modules=test.noscript&amp;only=styles&amp;skin=fallback"></noscript>'
 			),
 			// Load two modules in separate groups
 			array(
 				array( array( 'test.group.foo', 'test.group.bar' ), ResourceLoaderModule::TYPE_COMBINED ),
 				"<script>window.RLQ = window.RLQ || []; window.RLQ.push( function () {\n"
-					. 'mw.loader.load("http://127.0.0.1:8080/w/load.php?debug=false\u0026lang=en\u0026modules=test.group.bar\u0026skin=fallback\u0026*");'
+					. 'mw.loader.load("http://127.0.0.1:8080/w/load.php?debug=false\u0026lang=en\u0026modules=test.group.bar\u0026skin=fallback");'
 					. "\n} );</script>\n"
 					. "<script>window.RLQ = window.RLQ || []; window.RLQ.push( function () {\n"
-					. 'mw.loader.load("http://127.0.0.1:8080/w/load.php?debug=false\u0026lang=en\u0026modules=test.group.foo\u0026skin=fallback\u0026*");'
+					. 'mw.loader.load("http://127.0.0.1:8080/w/load.php?debug=false\u0026lang=en\u0026modules=test.group.foo\u0026skin=fallback");'
 					. "\n} );</script>"
 			),
 		);
@@ -256,10 +256,89 @@ class OutputPageTest extends MediaWikiTestCase {
 			) ),
 		) );
 		$links = $method->invokeArgs( $out, $args );
-		// Strip comments to avoid variation due to wgDBname in WikiID and cache key
-		$actualHtml = preg_replace( '#/\*[^*]+\*/#', '', implode( "\n", $links['html'] ) );
+		$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/PrefixSearchTest.php b/tests/phpunit/includes/PrefixSearchTest.php
index d63541b7e3..afd10e9a04 100644
--- a/tests/phpunit/includes/PrefixSearchTest.php
+++ b/tests/phpunit/includes/PrefixSearchTest.php
@@ -6,6 +6,11 @@
 class PrefixSearchTest extends MediaWikiLangTestCase {
 
 	public function addDBData() {
+		if ( !$this->isWikitextNS( NS_MAIN ) ) {
+			// tests are skipped if NS_MAIN is not wikitext
+			return;
+		}
+
 		$this->insertPage( 'Sandbox' );
 		$this->insertPage( 'Bar' );
 		$this->insertPage( 'Example' );
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 f894f87b8c..2f31677e70 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' );
@@ -674,6 +706,10 @@ class ApiResultTest extends MediaWikiTestCase {
 				ApiResult::META_TYPE => 'BCkvp',
 				ApiResult::META_KVP_KEY_NAME => 'key',
 			),
+			'kvpmerge' => array( 'x' => 'a', 'y' => array( 'b' ), 'z' => array( 'c' => 'd' ),
+				ApiResult::META_TYPE => 'kvp',
+				ApiResult::META_KVP_MERGE => true,
+			),
 			'emptyDefault' => array( '_dummy' => 1 ),
 			'emptyAssoc' => array( '_dummy' => 1, ApiResult::META_TYPE => 'assoc' ),
 			'_dummy' => 1,
@@ -858,6 +894,13 @@ class ApiResultTest extends MediaWikiTestCase {
 						ApiResult::META_TYPE => 'assoc',
 						ApiResult::META_KVP_KEY_NAME => 'key',
 					),
+					'kvpmerge' => array(
+						'x' => 'a',
+						'y' => array( 'b', ApiResult::META_TYPE => 'array' ),
+						'z' => array( 'c' => 'd', ApiResult::META_TYPE => 'assoc' ),
+						ApiResult::META_TYPE => 'assoc',
+						ApiResult::META_KVP_MERGE => true,
+					),
 					'emptyDefault' => array( '_dummy' => 1, ApiResult::META_TYPE => 'array' ),
 					'emptyAssoc' => array( '_dummy' => 1, ApiResult::META_TYPE => 'assoc' ),
 					'_dummy' => 1,
@@ -889,6 +932,13 @@ class ApiResultTest extends MediaWikiTestCase {
 						ApiResult::META_TYPE => 'assoc',
 						ApiResult::META_KVP_KEY_NAME => 'key',
 					),
+					'kvpmerge' => (object)array(
+						'x' => 'a',
+						'y' => array( 'b', ApiResult::META_TYPE => 'array' ),
+						'z' => (object)array( 'c' => 'd', ApiResult::META_TYPE => 'assoc' ),
+						ApiResult::META_TYPE => 'assoc',
+						ApiResult::META_KVP_MERGE => true,
+					),
 					'emptyDefault' => array( '_dummy' => 1, ApiResult::META_TYPE => 'array' ),
 					'emptyAssoc' => (object)array( '_dummy' => 1, ApiResult::META_TYPE => 'assoc' ),
 					'_dummy' => 1,
@@ -920,6 +970,13 @@ class ApiResultTest extends MediaWikiTestCase {
 						ApiResult::META_TYPE => 'array',
 						ApiResult::META_KVP_KEY_NAME => 'key',
 					),
+					'kvpmerge' => array(
+						$kvp( 'name', 'x', 'value', 'a' ),
+						$kvp( 'name', 'y', 'value', array( 'b', ApiResult::META_TYPE => 'array' ) ),
+						array( 'name' => 'z', 'c' => 'd', ApiResult::META_TYPE => 'assoc', ApiResult::META_PRESERVE_KEYS => array( 'name' ) ),
+						ApiResult::META_TYPE => 'array',
+						ApiResult::META_KVP_MERGE => true,
+					),
 					'emptyDefault' => array( '_dummy' => 1, ApiResult::META_TYPE => 'array' ),
 					'emptyAssoc' => array( '_dummy' => 1, ApiResult::META_TYPE => 'assoc' ),
 					'_dummy' => 1,
@@ -951,6 +1008,13 @@ class ApiResultTest extends MediaWikiTestCase {
 						ApiResult::META_TYPE => 'array',
 						ApiResult::META_KVP_KEY_NAME => 'key',
 					),
+					'kvpmerge' => array(
+						$kvp( 'name', 'x', '*', 'a' ),
+						$kvp( 'name', 'y', '*', array( 'b', ApiResult::META_TYPE => 'array' ) ),
+						array( 'name' => 'z', 'c' => 'd', ApiResult::META_TYPE => 'assoc', ApiResult::META_PRESERVE_KEYS => array( 'name' ) ),
+						ApiResult::META_TYPE => 'array',
+						ApiResult::META_KVP_MERGE => true,
+					),
 					'emptyDefault' => array( '_dummy' => 1, ApiResult::META_TYPE => 'array' ),
 					'emptyAssoc' => array( '_dummy' => 1, ApiResult::META_TYPE => 'assoc' ),
 					'_dummy' => 1,
@@ -986,6 +1050,13 @@ class ApiResultTest extends MediaWikiTestCase {
 						ApiResult::META_TYPE => 'array',
 						ApiResult::META_KVP_KEY_NAME => 'key',
 					),
+					'kvpmerge' => array(
+						(object)$kvp( 'name', 'x', 'value', 'a' ),
+						(object)$kvp( 'name', 'y', 'value', array( 'b', ApiResult::META_TYPE => 'array' ) ),
+						(object)array( 'name' => 'z', 'c' => 'd', ApiResult::META_TYPE => 'assoc', ApiResult::META_PRESERVE_KEYS => array( 'name' ) ),
+						ApiResult::META_TYPE => 'array',
+						ApiResult::META_KVP_MERGE => true,
+					),
 					'emptyDefault' => array( '_dummy' => 1, ApiResult::META_TYPE => 'array' ),
 					'emptyAssoc' => (object)array( '_dummy' => 1, ApiResult::META_TYPE => 'assoc' ),
 					'_dummy' => 1,
@@ -1025,6 +1096,11 @@ class ApiResultTest extends MediaWikiTestCase {
 						(object)array( 'key' => 'x', 'value' => 'a' ),
 						(object)array( 'key' => 'y', 'value' => 'b' ),
 					),
+					'kvpmerge' => array(
+						(object)array( 'name' => 'x', 'value' => 'a' ),
+						(object)array( 'name' => 'y', 'value' => array( 'b' ) ),
+						(object)array( 'name' => 'z', 'c' => 'd' ),
+					),
 					'emptyDefault' => array(),
 					'emptyAssoc' => (object)array(),
 					'_dummy' => 1,
@@ -1245,17 +1321,6 @@ class ApiResultTest extends MediaWikiTestCase {
 			),
 			'*' => 'content',
 		), $result->getData() );
-		$result->setRawMode();
-		$this->assertSame( array(
-			'foo' => array(
-				'bar' => array(
-					'*' => 'content',
-				),
-			),
-			'*' => 'content',
-			'_element' => 'itn',
-			'_subelements' => array( 'sub' ),
-		), $result->getData() );
 
 		$arr = array();
 		ApiResult::setContent( $arr, 'value' );
diff --git a/tests/phpunit/includes/changes/EnhancedChangesListTest.php b/tests/phpunit/includes/changes/EnhancedChangesListTest.php
index 01e221f95a..a14a50d2cb 100644
--- a/tests/phpunit/includes/changes/EnhancedChangesListTest.php
+++ b/tests/phpunit/includes/changes/EnhancedChangesListTest.php
@@ -74,20 +74,6 @@ class EnhancedChangesListTest extends MediaWikiLangTestCase {
 		$this->assertEquals( '', $html );
 	}
 
-	public function testCategorizationLineFormatting() {
-		$html = $this->createCategorizationLine(
-			$this->getCategorizationChange( '20150629191735', 0, 0 )
-		);
-		$this->assertNotContains( '(diff | hist)', strip_tags( $html ) );
-	}
-
-	public function testCategorizationLineFormattingWithRevision() {
-		$html = $this->createCategorizationLine(
-			$this->getCategorizationChange( '20150629191735', 1025, 1024 )
-		);
-		$this->assertContains( '(diff | hist)', strip_tags( $html ) );
-	}
-
 	/**
 	 * @todo more tests for actual formatting, this is more of a smoke test
 	 */
@@ -129,24 +115,6 @@ class EnhancedChangesListTest extends MediaWikiLangTestCase {
 		return $recentChange;
 	}
 
-	/**
-	 * @return RecentChange
-	 */
-	private function getCategorizationChange( $timestamp, $thisId, $lastId ) {
-		$wikiPage = new WikiPage( Title::newFromText( 'Testpage' ) );
-		$wikiPage->doEditContent( new WikitextContent( 'Some random text' ), 'page created' );
-
-		$wikiPage = new WikiPage( Title::newFromText( 'Category:Foo' ) );
-		$wikiPage->doEditContent( new WikitextContent( 'Some random text' ), 'category page created' );
-
-		$user = $this->getTestUser();
-		$recentChange = $this->testRecentChangesHelper->makeCategorizationRecentChange(
-			$user, 'Category:Foo', $wikiPage->getId(), $thisId, $lastId, $timestamp
-		);
-
-		return $recentChange;
-	}
-
 	/**
 	 * @return User
 	 */
@@ -160,15 +128,4 @@ class EnhancedChangesListTest extends MediaWikiLangTestCase {
 		return $user;
 	}
 
-	private function createCategorizationLine( $recentChange ) {
-		$enhancedChangesList = $this->newEnhancedChangesList();
-		$cacheEntry = $this->testRecentChangesHelper->getCacheEntry( $recentChange );
-
-		$reflection = new \ReflectionClass( get_class( $enhancedChangesList ) );
-		$method = $reflection->getMethod( 'recentChangesBlockLine' );
-		$method->setAccessible( true );
-
-		return $method->invokeArgs( $enhancedChangesList, array( $cacheEntry ) );
-	}
-
 }
diff --git a/tests/phpunit/includes/changes/TestRecentChangesHelper.php b/tests/phpunit/includes/changes/TestRecentChangesHelper.php
index e59825a9f5..2506087bfa 100644
--- a/tests/phpunit/includes/changes/TestRecentChangesHelper.php
+++ b/tests/phpunit/includes/changes/TestRecentChangesHelper.php
@@ -97,36 +97,6 @@ class TestRecentChangesHelper {
 		return $change;
 	}
 
-	public function getCacheEntry( $recentChange ) {
-		$rcCacheFactory = new RCCacheEntryFactory(
-			new RequestContext(),
-			array( 'diff' => 'diff', 'cur' => 'cur', 'last' => 'last' )
-		);
-		return $rcCacheFactory->newFromRecentChange( $recentChange, false );
-	}
-
-	public function makeCategorizationRecentChange(
-		User $user, $titleText, $curid, $thisid, $lastid, $timestamp
-	) {
-
-		$attribs = array_merge(
-			$this->getDefaultAttributes( $titleText, $timestamp ),
-			array(
-				'rc_type' => RC_CATEGORIZE,
-				'rc_user' => $user->getId(),
-				'rc_user_text' => $user->getName(),
-				'rc_this_oldid' => $thisid,
-				'rc_last_oldid' => $lastid,
-				'rc_cur_id' => $curid,
-				'rc_comment' => '[[:Testpage]] added to category',
-				'rc_old_len' => 0,
-				'rc_new_len' => 0,
-			)
-		);
-
-		return $this->makeRecentChange( $attribs, 0, 0 );
-	}
-
 	private function getDefaultAttributes( $titleText, $timestamp ) {
 		return array(
 			'rc_id' => 545,
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 05c32a0463..6ee54d3380 100644
--- a/tests/phpunit/includes/debug/logger/monolog/LineFormatterTest.php
+++ b/tests/phpunit/includes/debug/logger/monolog/LineFormatterTest.php
@@ -28,6 +28,13 @@ use TestingAccessWrapper;
 
 class LineFormatterTest extends MediaWikiTestCase {
 
+	public function setUp() {
+		if ( !class_exists( 'Monolog\Formatter\LineFormatter' ) ) {
+			$this->markTestSkipped( 'This test requires monolog to be installed' );
+		}
+		parent::setUp();
+	}
+
 	/**
 	 * @covers LineFormatter::normalizeException
 	 */
@@ -41,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 );
 	}
 
 	/**
@@ -60,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/deferred/LinksUpdateTest.php b/tests/phpunit/includes/deferred/LinksUpdateTest.php
index efbfe6f6a9..02f6b2ab2d 100644
--- a/tests/phpunit/includes/deferred/LinksUpdateTest.php
+++ b/tests/phpunit/includes/deferred/LinksUpdateTest.php
@@ -19,8 +19,7 @@ class LinksUpdateTest extends MediaWikiTestCase {
 				'externallinks',
 				'imagelinks',
 				'templatelinks',
-				'iwlinks',
-				'recentchanges',
+				'iwlinks'
 			)
 		);
 	}
@@ -42,12 +41,6 @@ class LinksUpdateTest extends MediaWikiTestCase {
 		);
 	}
 
-	public function addDBData() {
-		$this->insertPage( 'Testing' );
-		$this->insertPage( 'Some_other_page' );
-		$this->insertPage( 'Template:TestingTemplate' );
-	}
-
 	protected function makeTitleAndParserOutput( $name, $id ) {
 		$t = Title::newFromText( $name );
 		$t->mArticleID = $id; # XXX: this is fugly
@@ -140,61 +133,6 @@ class LinksUpdateTest extends MediaWikiTestCase {
 		) );
 	}
 
-	public function testOnAddingAndRemovingCategory_recentChangesRowIsAdded() {
-		$this->setMwGlobals( 'wgCategoryCollation', 'uppercase' );
-
-		$title = Title::newFromText( 'Testing' );
-		$wikiPage = new WikiPage( $title );
-		$wikiPage->doEditContent( new WikitextContent( '[[Category:Foo]]' ), 'added category' );
-
-		$this->assertRecentChangeByCategorization(
-			$title,
-			$wikiPage->getParserOutput( new ParserOptions() ),
-			Title::newFromText( 'Category:Foo' ),
-			array( array( 'Foo', '[[:Testing]] added to category' ) )
-		);
-
-		$wikiPage->doEditContent( new WikitextContent( '[[Category:Bar]]' ), 'added category' );
-		$this->assertRecentChangeByCategorization(
-			$title,
-			$wikiPage->getParserOutput( new ParserOptions() ),
-			Title::newFromText( 'Category:Foo' ),
-			array(
-				array( 'Foo', '[[:Testing]] added to category' ),
-				array( 'Foo', '[[:Testing]] removed from category' ),
-			)
-		);
-
-		$this->assertRecentChangeByCategorization(
-			$title,
-			$wikiPage->getParserOutput( new ParserOptions() ),
-			Title::newFromText( 'Category:Bar' ),
-			array(
-				array( 'Bar', '[[:Testing]] added to category' ),
-			)
-		);
-	}
-
-	public function testOnAddingAndRemovingCategoryToTemplates_embeddingPagesAreIgnored() {
-		$this->setMwGlobals( 'wgCategoryCollation', 'uppercase' );
-
-		$templateTitle = Title::newFromText( 'Template:TestingTemplate' );
-		$templatePage = new WikiPage( $templateTitle );
-
-		$wikiPage = new WikiPage( Title::newFromText( 'Testing' ) );
-		$wikiPage->doEditContent( new WikitextContent( '{{TestingTemplate}}' ), 'added template' );
-		$otherWikiPage = new WikiPage( Title::newFromText( 'Some_other_page' ) );
-		$otherWikiPage->doEditContent( new WikitextContent( '{{TestingTemplate}}' ), 'added template' );
-		$templatePage->doEditContent( new WikitextContent( '[[Category:Foo]]' ), 'added category' );
-
-		$this->assertRecentChangeByCategorization(
-			$templateTitle,
-			$templatePage->getParserOutput( new ParserOptions() ),
-			Title::newFromText( 'Foo' ),
-			array( array( 'Foo', '[[:Template:TestingTemplate]] and 2 pages added to category' ) )
-		);
-	}
-
 	/**
 	 * @covers ParserOutput::addInterwikiLink
 	 */
@@ -325,26 +263,4 @@ class LinksUpdateTest extends MediaWikiTestCase {
 		$this->assertSelect( $table, $fields, $condition, $expectedRows );
 		return $update;
 	}
-
-	protected function assertRecentChangeByCategorization(
-		Title $pageTitle, ParserOutput $parserOutput, Title $categoryTitle, $expectedRows
-	) {
-		$update = new LinksUpdate( $pageTitle, $parserOutput );
-		$revision = Revision::newFromTitle( $pageTitle );
-		$update->setRevision( $revision );
-		$update->beginTransaction();
-		$update->doUpdate();
-		$update->commitTransaction();
-
-		$this->assertSelect(
-			'recentchanges',
-			'rc_title, rc_comment',
-			array(
-				'rc_type' => RC_CATEGORIZE,
-				'rc_namespace' => NS_CATEGORY,
-				'rc_title' => $categoryTitle->getDBkey()
-			),
-			$expectedRows
-		);
-	}
 }
diff --git a/tests/phpunit/includes/filerepo/MigrateFileRepoLayoutTest.php b/tests/phpunit/includes/filerepo/MigrateFileRepoLayoutTest.php
index 65db7e4963..551d3a7661 100644
--- a/tests/phpunit/includes/filerepo/MigrateFileRepoLayoutTest.php
+++ b/tests/phpunit/includes/filerepo/MigrateFileRepoLayoutTest.php
@@ -75,11 +75,11 @@ class MigrateFileRepoLayoutTest extends MediaWikiTestCase {
 	}
 
 	protected function tearDown() {
-    	foreach ( glob( $this->tmpPrefix . '*' ) as $directory ) {
-    		$this->deleteFilesRecursively( $directory );
-    	}
+		foreach ( glob( $this->tmpPrefix . '*' ) as $directory ) {
+			$this->deleteFilesRecursively( $directory );
+		}
 
-    	unlink( $this->tmpFilepath );
+		unlink( $this->tmpFilepath );
 
 		parent::tearDown();
 	}
diff --git a/tests/phpunit/includes/libs/CSSMinTest.php b/tests/phpunit/includes/libs/CSSMinTest.php
index 22ad6ce0f7..7841f30f48 100644
--- a/tests/phpunit/includes/libs/CSSMinTest.php
+++ b/tests/phpunit/includes/libs/CSSMinTest.php
@@ -102,12 +102,12 @@ class CSSMinTest extends MediaWikiTestCase {
 			array(
 				'Without trailing slash',
 				array( 'foo { prop: url(../bar.png); }', false, 'http://example.org/quux', false ),
-				'foo { prop: url(http://example.org/quux/../bar.png); }',
+				'foo { prop: url(http://example.org/bar.png); }',
 			),
 			array(
 				'With trailing slash on remote (bug 27052)',
 				array( 'foo { prop: url(../bar.png); }', false, 'http://example.org/quux/', false ),
-				'foo { prop: url(http://example.org/quux/../bar.png); }',
+				'foo { prop: url(http://example.org/bar.png); }',
 			),
 			array(
 				'Guard against stripping double slashes from query',
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/libs/IPSetTest.php b/tests/phpunit/includes/libs/IPSetTest.php
deleted file mode 100644
index 5bbacef42d..0000000000
--- a/tests/phpunit/includes/libs/IPSetTest.php
+++ /dev/null
@@ -1,252 +0,0 @@
-<?php
-
-/**
- * @group IPSet
- */
-class IPSetTest extends PHPUnit_Framework_TestCase {
-	/**
-	 * Provides test cases for IPSetTest::testIPSet
-	 *
-	 * Returns an array of test cases. Each case is an array of (description,
-	 * config, tests).  Description is just text output for failure messages,
-	 * config is an array constructor argument for IPSet, and the tests are
-	 * an array of IP => expected (boolean) result against the config dataset.
-	 */
-	public static function provideIPSets() {
-		return array(
-			array(
-				'old_list_subset',
-				array(
-					'208.80.152.162',
-					'10.64.0.123',
-					'10.64.0.124',
-					'10.64.0.125',
-					'10.64.0.126',
-					'10.64.0.127',
-					'10.64.0.128',
-					'10.64.0.129',
-					'10.64.32.104',
-					'10.64.32.105',
-					'10.64.32.106',
-					'10.64.32.107',
-					'91.198.174.45',
-					'91.198.174.46',
-					'91.198.174.47',
-					'91.198.174.57',
-					'2620:0:862:1:A6BA:DBFF:FE30:CFB3',
-					'91.198.174.58',
-					'2620:0:862:1:A6BA:DBFF:FE38:FFDA',
-					'208.80.152.16',
-					'208.80.152.17',
-					'208.80.152.18',
-					'208.80.152.19',
-					'91.198.174.102',
-					'91.198.174.103',
-					'91.198.174.104',
-					'91.198.174.105',
-					'91.198.174.106',
-					'91.198.174.107',
-					'91.198.174.81',
-					'2620:0:862:1:26B6:FDFF:FEF5:B2D4',
-					'91.198.174.82',
-					'2620:0:862:1:26B6:FDFF:FEF5:ABB4',
-					'10.20.0.113',
-					'2620:0:862:102:26B6:FDFF:FEF5:AD9C',
-					'10.20.0.114',
-					'2620:0:862:102:26B6:FDFF:FEF5:7C38',
-				),
-				array(
-					'0.0.0.0' => false,
-					'255.255.255.255' => false,
-					'10.64.0.122' => false,
-					'10.64.0.123' => true,
-					'10.64.0.124' => true,
-					'10.64.0.129' => true,
-					'10.64.0.130' => false,
-					'91.198.174.81' => true,
-					'91.198.174.80' => false,
-					'0::0' => false,
-					'ffff:ffff:ffff:ffff:FFFF:FFFF:FFFF:FFFF' => false,
-					'2001:db8::1234' => false,
-					'2620:0:862:1:26b6:fdff:fef5:abb3' => false,
-					'2620:0:862:1:26b6:fdff:fef5:abb4' => true,
-					'2620:0:862:1:26b6:fdff:fef5:abb5' => false,
-				),
-			),
-			array(
-				'new_cidr_set',
-				array(
-					'208.80.154.0/26',
-					'2620:0:861:1::/64',
-					'208.80.154.128/26',
-					'2620:0:861:2::/64',
-					'208.80.154.64/26',
-					'2620:0:861:3::/64',
-					'208.80.155.96/27',
-					'2620:0:861:4::/64',
-					'10.64.0.0/22',
-					'2620:0:861:101::/64',
-					'10.64.16.0/22',
-					'2620:0:861:102::/64',
-					'10.64.32.0/22',
-					'2620:0:861:103::/64',
-					'10.64.48.0/22',
-					'2620:0:861:107::/64',
-					'91.198.174.0/25',
-					'2620:0:862:1::/64',
-					'10.20.0.0/24',
-					'2620:0:862:102::/64',
-					'10.128.0.0/24',
-					'2620:0:863:101::/64',
-					'10.2.4.26',
-				),
-				array(
-					'0.0.0.0' => false,
-					'255.255.255.255' => false,
-					'10.2.4.25' => false,
-					'10.2.4.26' => true,
-					'10.2.4.27' => false,
-					'10.20.0.255' => true,
-					'10.128.0.0' => true,
-					'10.64.17.55' => true,
-					'10.64.20.0' => false,
-					'10.64.27.207' => false,
-					'10.64.31.255' => false,
-					'0::0' => false,
-					'ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff' => false,
-					'2001:DB8::1' => false,
-					'2620:0:861:106::45' => false,
-					'2620:0:862:103::' => false,
-					'2620:0:862:102:10:20:0:113' => true,
-				),
-			),
-			array(
-				'empty_set',
-				array(),
-				array(
-					'0.0.0.0' => false,
-					'255.255.255.255' => false,
-					'10.2.4.25' => false,
-					'10.2.4.26' => false,
-					'10.2.4.27' => false,
-					'10.20.0.255' => false,
-					'10.128.0.0' => false,
-					'10.64.17.55' => false,
-					'10.64.20.0' => false,
-					'10.64.27.207' => false,
-					'10.64.31.255' => false,
-					'0::0' => false,
-					'ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff' => false,
-					'2001:DB8::1' => false,
-					'2620:0:861:106::45' => false,
-					'2620:0:862:103::' => false,
-					'2620:0:862:102:10:20:0:113' => false,
-				),
-			),
-			array(
-				'edge_cases',
-				array(
-					'0.0.0.0',
-					'255.255.255.255',
-					'::',
-					'ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff',
-					'10.10.10.10/25', // host bits intentional
-				),
-				array(
-					'0.0.0.0' => true,
-					'255.255.255.255' => true,
-					'10.2.4.25' => false,
-					'10.2.4.26' => false,
-					'10.2.4.27' => false,
-					'10.20.0.255' => false,
-					'10.128.0.0' => false,
-					'10.64.17.55' => false,
-					'10.64.20.0' => false,
-					'10.64.27.207' => false,
-					'10.64.31.255' => false,
-					'0::0' => true,
-					'ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff' => true,
-					'2001:DB8::1' => false,
-					'2620:0:861:106::45' => false,
-					'2620:0:862:103::' => false,
-					'2620:0:862:102:10:20:0:113' => false,
-					'10.10.9.255' => false,
-					'10.10.10.0' => true,
-					'10.10.10.1' => true,
-					'10.10.10.10' => true,
-					'10.10.10.126' => true,
-					'10.10.10.127' => true,
-					'10.10.10.128' => false,
-					'10.10.10.177' => false,
-					'10.10.10.255' => false,
-					'10.10.11.0' => false,
-				),
-			),
-			array(
-				'exercise_optimizer',
-				array(
-					'ffff:ffff:ffff:ffff:ffff:ffff:ffff:0/112',
-					'ffff:ffff:ffff:ffff:ffff:ffff:fffe:0/112',
-					'ffff:ffff:ffff:ffff:ffff:ffff:fffd:0/112',
-					'ffff:ffff:ffff:ffff:ffff:ffff:fffc:0/112',
-					'ffff:ffff:ffff:ffff:ffff:ffff:fffb:0/112',
-					'ffff:ffff:ffff:ffff:ffff:ffff:fffa:0/112',
-					'ffff:ffff:ffff:ffff:ffff:ffff:fff9:8000/113',
-					'ffff:ffff:ffff:ffff:ffff:ffff:fff9:0/113',
-					'ffff:ffff:ffff:ffff:ffff:ffff:fff8:0/112',
-					'ffff:ffff:ffff:ffff:ffff:ffff:fff7:0/112',
-					'ffff:ffff:ffff:ffff:ffff:ffff:fff6:0/112',
-					'ffff:ffff:ffff:ffff:ffff:ffff:fff5:0/112',
-					'ffff:ffff:ffff:ffff:ffff:ffff:fff4:0/112',
-					'ffff:ffff:ffff:ffff:ffff:ffff:fff3:0/112',
-					'ffff:ffff:ffff:ffff:ffff:ffff:fff2:0/112',
-					'ffff:ffff:ffff:ffff:ffff:ffff:fff1:0/112',
-					'ffff:ffff:ffff:ffff:ffff:ffff:fff0:0/112',
-					'ffff:ffff:ffff:ffff:ffff:ffff:ffef:0/112',
-					'ffff:ffff:ffff:ffff:ffff:ffff:ffee:0/112',
-					'ffff:ffff:ffff:ffff:ffff:ffff:ffec:0/111',
-					'ffff:ffff:ffff:ffff:ffff:ffff:ffeb:0/112',
-					'ffff:ffff:ffff:ffff:ffff:ffff:ffea:0/112',
-					'ffff:ffff:ffff:ffff:ffff:ffff:ffe9:0/112',
-					'ffff:ffff:ffff:ffff:ffff:ffff:ffe8:0/112',
-					'ffff:ffff:ffff:ffff:ffff:ffff:ffe7:0/112',
-					'ffff:ffff:ffff:ffff:ffff:ffff:ffe6:0/112',
-					'ffff:ffff:ffff:ffff:ffff:ffff:ffe5:0/112',
-					'ffff:ffff:ffff:ffff:ffff:ffff:ffe4:0/112',
-					'ffff:ffff:ffff:ffff:ffff:ffff:ffe3:0/112',
-					'ffff:ffff:ffff:ffff:ffff:ffff:ffe2:0/112',
-					'ffff:ffff:ffff:ffff:ffff:ffff:ffe1:0/112',
-					'ffff:ffff:ffff:ffff:ffff:ffff:ffe0:0/110',
-					'ffff:ffff:ffff:ffff:ffff:ffff:ffc0:0/107',
-					'ffff:ffff:ffff:ffff:ffff:ffff:ffa0:0/107',
-				),
-				array(
-					'0.0.0.0' => false,
-					'255.255.255.255' => false,
-					'::' => false,
-					'ffff:ffff:ffff:ffff:ffff:ffff:ff9f:ffff' => false,
-					'ffff:ffff:ffff:ffff:ffff:ffff:ffa0:0' => true,
-					'ffff:ffff:ffff:ffff:ffff:ffff:ffc0:1234' => true,
-					'ffff:ffff:ffff:ffff:ffff:ffff:ffed:ffff' => true,
-					'ffff:ffff:ffff:ffff:ffff:ffff:fff4:4444' => true,
-					'ffff:ffff:ffff:ffff:ffff:ffff:fff9:8080' => true,
-					'ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff' => true,
-				),
-			),
-		);
-	}
-
-	/**
-	 * Validates IPSet loading and matching code
-	 *
-	 * @covers IPSet
-	 * @dataProvider provideIPSets
-	 */
-	public function testIPSet( $desc, array $cfg, array $tests ) {
-		$ipset = new IPSet( $cfg );
-		foreach ( $tests as $ip => $expected ) {
-			$result = $ipset->match( $ip );
-			$this->assertEquals( $expected, $result, "Incorrect match() result for $ip in dataset $desc" );
-		}
-	}
-}
diff --git a/tests/phpunit/includes/objectcache/BagOStuffTest.php b/tests/phpunit/includes/objectcache/BagOStuffTest.php
index fcc15d317b..b684006202 100644
--- a/tests/phpunit/includes/objectcache/BagOStuffTest.php
+++ b/tests/phpunit/includes/objectcache/BagOStuffTest.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * @author Matthias Mullie <mmullie@wikimedia.org>
+ * @group BagOStuff
  */
 class BagOStuffTest extends MediaWikiTestCase {
 	/** @var BagOStuff */
@@ -137,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 );
 	}
 
 	/**
@@ -169,5 +174,12 @@ class BagOStuffTest extends MediaWikiTestCase {
 
 		$value3 = $this->cache->getScopedLock( $key, 0 );
 		$this->assertType( 'ScopedCallback', $value3, 'Lock returned callback after release' );
+		unset( $value3 );
+
+		$value1 = $this->cache->getScopedLock( $key, 0, 5, 'reentry' );
+		$value2 = $this->cache->getScopedLock( $key, 0, 5, 'reentry' );
+
+		$this->assertType( 'ScopedCallback', $value1, 'First reentrant call returned lock' );
+		$this->assertType( 'ScopedCallback', $value1, 'Second reentrant call returned lock' );
 	}
 }
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/registration/ExtensionRegistryTest.php b/tests/phpunit/includes/registration/ExtensionRegistryTest.php
index b8b1b06922..201cbfcdf1 100644
--- a/tests/phpunit/includes/registration/ExtensionRegistryTest.php
+++ b/tests/phpunit/includes/registration/ExtensionRegistryTest.php
@@ -123,7 +123,7 @@ class ExtensionRegistryTest extends MediaWikiTestCase {
 				)
 			),
 			array(
-				'Global already set, 2d array with integer keys',
+				'Global already set, array with integer keys',
 				array(
 					'mwNamespacesFoo' => array(
 						100 => true,
@@ -139,7 +139,7 @@ class ExtensionRegistryTest extends MediaWikiTestCase {
 				),
 				array(
 					'mwNamespacesFoo' => array(
-						100 => false,
+						100 => true,
 						102 => false,
 						500 => true,
 					),
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/specials/SpecialSearchTest.php b/tests/phpunit/includes/specials/SpecialSearchTest.php
index 7e60fddec2..13c283816d 100644
--- a/tests/phpunit/includes/specials/SpecialSearchTest.php
+++ b/tests/phpunit/includes/specials/SpecialSearchTest.php
@@ -145,34 +145,25 @@ class SpecialSearchTest extends MediaWikiTestCase {
 	public function provideRewriteQueryWithSuggestion() {
 		return array(
 			array(
-				'With results and a suggestion does not run suggested query',
+				'With suggestion and no rewritten query shows did you mean',
 				'/Did you mean: <a[^>]+>first suggestion/',
-				array(
-					new SpecialSearchTestMockResultSet( 'first suggestion', array(
-						SearchResult::newFromTitle( Title::newMainPage() ),
-					) ),
-					new SpecialSearchTestMockResultSet( 'was never run', array() ),
-				),
+				new SpecialSearchTestMockResultSet( 'first suggestion', null, array(
+					SearchResult::newFromTitle( Title::newMainPage() ),
+				) ),
 			),
 
 			array(
-				'With no results and a suggestion responds with suggested query results',
+				'With rewritten query informs user of change',
 				'/Showing results for <a[^>]+>first suggestion/',
-				array(
-					new SpecialSearchTestMockResultSet( 'first suggestion', array() ),
-					new SpecialSearchTestMockResultSet( 'second suggestion', array(
-						SearchResult::newFromTitle( Title::newMainPage() ),
-					) ),
-				),
+				new SpecialSearchTestMockResultSet( 'asdf', 'first suggestion', array(
+					SearchResult::newFromTitle( Title::newMainPage() ),
+				) ),
 			),
 
 			array(
 				'When both queries have no results user gets no results',
 				'/There were no results matching the query/',
-				array(
-					new SpecialSearchTestMockResultSet( 'first suggestion', array() ),
-					new SpecialSearchTestMockResultSet( 'second suggestion', array() ),
-				),
+				new SpecialSearchTestMockResultSet( 'first suggestion', 'first suggestion', array() ),
 			),
 		);
 	}
@@ -180,8 +171,8 @@ class SpecialSearchTest extends MediaWikiTestCase {
 	/**
 	 * @dataProvider provideRewriteQueryWithSuggestion
 	 */
-	public function testRewriteQueryWithSuggestion( $message, $expectRegex, $fromResults ) {
-		$mockSearchEngine = $this->mockSearchEngine( $fromResults );
+	public function testRewriteQueryWithSuggestion( $message, $expectRegex, $results ) {
+		$mockSearchEngine = $this->mockSearchEngine( $results );
 		$search = $this->getMockBuilder( 'SpecialSearch' )
 			->setMethods( array( 'getSearchEngine' ) )
 			->getMock();
@@ -199,17 +190,14 @@ class SpecialSearchTest extends MediaWikiTestCase {
 		}
 	}
 
-	protected function mockSearchEngine( array $returnValues ) {
+	protected function mockSearchEngine( $results ) {
 		$mock = $this->getMockBuilder( 'SearchEngine' )
-			->setMethods( array( 'searchText' ) )
+			->setMethods( array( 'searchText', 'searchTitle' ) )
 			->getMock();
 
 		$mock->expects( $this->any() )
 			->method( 'searchText' )
-			->will( call_user_func_array(
-				array( $this, 'onConsecutiveCalls' ),
-				array_map( array( $this, 'returnValue' ), $returnValues )
-			) );
+			->will( $this->returnValue( $results ) );
 
 		return $mock;
 	}
@@ -219,9 +207,10 @@ class SpecialSearchTestMockResultSet extends SearchResultSet {
 	protected $results;
 	protected $suggestion;
 
-	public function __construct( $suggestion = null, array $results = array(), $containedSyntax = false) {
-		$this->results = $results;
+	public function __construct( $suggestion = null, $rewrittenQuery = null, array $results = array(), $containedSyntax = false) {
 		$this->suggestion = $suggestion;
+		$this->rewrittenQuery = $rewrittenQuery;
+		$this->results = $results;
 		$this->containedSyntax = $containedSyntax;
 	}
 
@@ -244,4 +233,16 @@ class SpecialSearchTestMockResultSet extends SearchResultSet {
 	public function getSuggestionSnippet() {
 		return $this->suggestion;
 	}
+
+	public function hasRewrittenQuery() {
+		return $this->rewrittenQuery !== null;
+	}
+
+	public function getQueryAfterRewrite() {
+		return $this->rewrittenQuery;
+	}
+
+	public function getQueryAfterRewriteSnippet() {
+		return htmlspecialchars( $this->rewrittenQuery );
+	}
 }
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/phpunit/languages/LanguageTest.php b/tests/phpunit/languages/LanguageTest.php
index ade8fc422a..4fca00237a 100644
--- a/tests/phpunit/languages/LanguageTest.php
+++ b/tests/phpunit/languages/LanguageTest.php
@@ -1030,7 +1030,7 @@ class LanguageTest extends LanguageClassesTestCase {
 		return array(
 			array(
 				0,
-				"0 B",
+				"0 bytes",
 				"Zero bytes"
 			),
 			array(
@@ -1046,7 +1046,7 @@ class LanguageTest extends LanguageClassesTestCase {
 			array(
 				1024 * 1024 * 1024,
 				"1 GB",
-				"1 gigabytes"
+				"1 gigabyte"
 			),
 			array(
 				pow( 1024, 4 ),
diff --git a/tests/phpunit/structure/ResourcesTest.php b/tests/phpunit/structure/ResourcesTest.php
index 2c92e305b6..69f452503d 100644
--- a/tests/phpunit/structure/ResourcesTest.php
+++ b/tests/phpunit/structure/ResourcesTest.php
@@ -276,6 +276,25 @@ class ResourcesTest extends MediaWikiTestCase {
 					( $file instanceof ResourceLoaderFilePath ? $file->getPath() : $file ),
 				);
 			}
+
+			// To populate missingLocalFileRefs. Not sure how sane this is inside this test...
+			$module->readStyleFiles(
+				$module->getStyleFiles( $data['context'] ),
+				$module->getFlip( $data['context'] ),
+				$data['context']
+			);
+
+			$property = $reflectedModule->getProperty( 'missingLocalFileRefs' );
+			$property->setAccessible( true );
+			$missingLocalFileRefs = $property->getValue( $module );
+
+			foreach ( $missingLocalFileRefs as $file ) {
+				$cases[] = array(
+					$file,
+					$moduleName,
+					$file,
+				);
+			}
 		}
 
 		return $cases;
diff --git a/tests/qunit/QUnitTestResources.php b/tests/qunit/QUnitTestResources.php
index bcfdead56e..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',
@@ -83,10 +85,12 @@ return array(
 			'tests/qunit/suites/resources/mediawiki.api/mediawiki.api.parse.test.js',
 			'tests/qunit/suites/resources/mediawiki.api/mediawiki.api.upload.test.js',
 			'tests/qunit/suites/resources/mediawiki.api/mediawiki.api.watch.test.js',
+			'tests/qunit/suites/resources/mediawiki.api/mediawiki.ForeignApi.test.js',
 			'tests/qunit/suites/resources/mediawiki.special/mediawiki.special.recentchanges.test.js',
 			'tests/qunit/suites/resources/mediawiki/mediawiki.language.test.js',
 			'tests/qunit/suites/resources/mediawiki/mediawiki.cldr.test.js',
 			'tests/qunit/suites/resources/mediawiki/mediawiki.cookie.test.js',
+			'tests/qunit/suites/resources/mediawiki/mediawiki.experiments.test.js',
 		),
 		'dependencies' => array(
 			'jquery.accessKeyLabel',
@@ -111,6 +115,9 @@ return array(
 			'mediawiki.api.parse',
 			'mediawiki.api.upload',
 			'mediawiki.api.watch',
+			'mediawiki.ForeignApi.core',
+			'mediawiki.ForeignUpload',
+			'mediawiki.ForeignStructuredUpload',
 			'mediawiki.jqueryMsg',
 			'mediawiki.messagePoster',
 			'mediawiki.RegExp',
@@ -125,6 +132,7 @@ return array(
 			'mediawiki.language',
 			'mediawiki.cldr',
 			'mediawiki.cookie',
+			'mediawiki.experiments',
 			'test.mediawiki.qunit.testrunner',
 		),
 	)
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.ForeignApi.test.js b/tests/qunit/suites/resources/mediawiki.api/mediawiki.ForeignApi.test.js
new file mode 100644
index 0000000000..9d0fdf54b0
--- /dev/null
+++ b/tests/qunit/suites/resources/mediawiki.api/mediawiki.ForeignApi.test.js
@@ -0,0 +1,39 @@
+( function ( mw ) {
+	QUnit.module( 'mediawiki.ForeignApi', QUnit.newMwEnvironment( {
+		setup: function () {
+			this.server = this.sandbox.useFakeServer();
+			this.server.respondImmediately = true;
+			this.clock = this.sandbox.useFakeTimers();
+		},
+		teardown: function () {
+			// https://github.com/jquery/jquery/issues/2453
+			this.clock.tick();
+		}
+	} ) );
+
+	QUnit.test( 'origin is included in GET requests', function ( assert ) {
+		QUnit.expect( 1 );
+		var api = new mw.ForeignApi( '//localhost:4242/w/api.php' );
+
+		this.server.respond( function ( request ) {
+			assert.ok( request.url.match( /origin=/ ), 'origin is included in GET requests' );
+			request.respond( 200, { 'Content-Type': 'application/json' }, '[]' );
+		} );
+
+		api.get( {} );
+	} );
+
+	QUnit.test( 'origin is included in POST requests', function ( assert ) {
+		QUnit.expect( 2 );
+		var api = new mw.ForeignApi( '//localhost:4242/w/api.php' );
+
+		this.server.respond( function ( request ) {
+			assert.ok( request.requestBody.match( /origin=/ ), 'origin is included in POST request body' );
+			assert.ok( request.url.match( /origin=/ ), 'origin is included in POST request URL, too' );
+			request.respond( 200, { 'Content-Type': 'application/json' }, '[]' );
+		} );
+
+		api.post( {} );
+	} );
+
+}( mediaWiki ) );
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 de7919828f..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 );
 	}
@@ -90,6 +90,19 @@
 		api.get( { test: [ 'foo', 'bar', 'baz' ] } );
 	} );
 
+	QUnit.test( 'Omitting false booleans', function ( assert ) {
+		QUnit.expect( 2 );
+		var api = new mw.Api();
+
+		this.server.respond( function ( request ) {
+			assert.ok( !request.url.match( /foo/ ), 'foo query parameter is not present' );
+			assert.ok( request.url.match( /bar=true/ ), 'bar query parameter is present with value true' );
+			request.respond( 200, { 'Content-Type': 'application/json' }, '[]' );
+		} );
+
+		api.get( { foo: false, bar: true } );
+	} );
+
 	QUnit.test( 'getToken() - cached', function ( assert ) {
 		QUnit.expect( 2 );
 		var api = new mw.Api();
@@ -255,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..641a5a5df3 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,28 +480,62 @@
 			];
 
 		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'
-					},
 					expected: 'DCS0001557854455.JPG',
 					description: 'Title in normal namespace without anything invalid but with "file extension"'
 				},
 				{
 					title: 'MediaWiki:Msg-awesome',
-					defaultNamespace: undefined,
 					expected: 'MediaWiki:Msg-awesome',
 					description: 'Full title (page in MediaWiki namespace) supplied as string'
 				},
@@ -517,11 +553,21 @@
 					},
 					expected: 'File:The/Mw/Sound.kml',
 					description: 'Page in File-namespace without explicit options'
+				},
+				{
+					title: 'File:Foo.JPEG',
+					expected: 'File:Foo.JPEG',
+					description: 'Page in File-namespace with non-canonical extension'
+				},
+				{
+					title: 'File:Foo.JPEG  ',
+					expected: 'File:Foo.JPEG',
+					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,15 +581,14 @@
 		}
 	} );
 
-	QUnit.test( 'newFromFileName', 62, function ( assert ) {
+	QUnit.test( 'newFromFileName', 54, function ( assert ) {
 		var title, i, thisCase, prefix,
 			cases = [
 				{
 					fileName: 'DCS0001557854455.JPG',
 					typeOfName: 'Standard camera output',
 					nameText: 'DCS0001557854455',
-					prefixedText: 'File:DCS0001557854455.JPG',
-					extensionDesired: 'jpg'
+					prefixedText: 'File:DCS0001557854455.JPG'
 				},
 				{
 					fileName: 'File:Sample.png',
@@ -555,8 +600,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',
-					extensionDesired: 'JPG'
+					prefixedText: 'File:Treppe 2222 Test upload.jpg'
 				},
 				{
 					fileName: 'I contain a \ttab.jpg',
@@ -612,20 +656,6 @@
 					nameText: 'Dot. dot',
 					prefixedText: 'File:Dot. dot. dot'
 				},
-				{
-					fileName: 'dot. dot ._dot',
-					typeOfName: 'File name with different file extension desired',
-					nameText: 'Dot. dot . dot',
-					prefixedText: 'File:Dot. dot . dot.png',
-					extensionDesired: 'png'
-				},
-				{
-					fileName: 'fileWOExt',
-					typeOfName: 'File W/O extension with extension desired',
-					nameText: 'FileWOExt',
-					prefixedText: 'File:FileWOExt.png',
-					extensionDesired: 'png'
-				},
 				{
 					fileName: '𠜎𠜱𠝹𠱓𠱸𠲖𠳏𠳕𠴕𠵼𠵿𠸎𠸏𠹷𠺝𠺢𠻗𠻹𠻺𠼭𠼮𠽌𠾴𠾼𠿪𡁜𡁯𡁵𡁶𡁻𡃁𡃉𡇙𢃇𢞵𢫕𢭃𢯊𢱑𢱕𢳂𠻹𠻺𠼭𠼮𠽌𠾴𠾼𠿪𡁜𡁯𡁵𡁶𡁻𡃁𡃉𡇙𢃇𢞵𢫕𢭃𢯊𢱑𢱕𢳂.png',
 					typeOfName: 'File name longer than 240 bytes',
@@ -643,8 +673,8 @@
 			];
 
 		for ( i = 0; i < cases.length; i++ ) {
-			thisCase = cases[i];
-			title = mw.Title.newFromFileName( thisCase.fileName, thisCase.extensionDesired );
+			thisCase = cases[ i ];
+			title = mw.Title.newFromFileName( thisCase.fileName );
 
 			if ( thisCase.nameText !== undefined ) {
 				prefix = '[' + thisCase.typeOfName + '] ';
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.experiments.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.experiments.test.js
new file mode 100644
index 0000000000..774b205371
--- /dev/null
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.experiments.test.js
@@ -0,0 +1,63 @@
+( function ( mw ) {
+
+	var getBucket = mw.experiments.getBucket;
+
+	function createExperiment() {
+		return {
+			name: 'experiment',
+			enabled: true,
+			buckets: {
+				control: 0.25,
+				A: 0.25,
+				B: 0.25,
+				C: 0.25
+			}
+		};
+	}
+
+	QUnit.module( 'mediawiki.experiments' );
+
+	QUnit.test( 'getBucket( experiment, token )', 4, function ( assert ) {
+		var experiment = createExperiment(),
+			token = '123457890';
+
+		assert.equal(
+			getBucket( experiment, token ),
+			getBucket( experiment, token ),
+			'It returns the same bucket for the same experiment-token pair.'
+		);
+
+		// --------
+		experiment = createExperiment();
+		experiment.buckets = {
+			A: 0.314159265359
+		};
+
+		assert.equal(
+			'A',
+			getBucket( experiment, token ),
+			'It returns the bucket if only one is defined.'
+		);
+
+		// --------
+		experiment = createExperiment();
+		experiment.enabled = false;
+
+		assert.equal(
+			'control',
+			getBucket( experiment, token ),
+			'It returns "control" if the experiment is disabled.'
+		);
+
+		// --------
+		experiment = createExperiment();
+		experiment.buckets = {};
+
+		assert.equal(
+			'control',
+			getBucket( experiment, token ),
+			'It returns "control" if the experiment doesn\'t have any buckets.'
+		);
+	} );
+
+}( mediaWiki ) );
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..111d85bd54 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()
@@ -903,7 +908,7 @@
 		// This bug was actually already fixed in 1.18 and later when discovered in 1.17.
 		// Test is for regressions!
 
-		// Forge an URL to the test callback script
+		// Forge a URL to the test callback script
 		var target = QUnit.fixurl(
 			mw.config.get( 'wgServer' ) + mw.config.get( 'wgScriptPath' ) + '/tests/qunit/data/qunitOkCall.js'
 		);
@@ -920,6 +925,45 @@
 		mw.loader.load( target );
 	} );
 
+	QUnit.asyncTest( 'mw.loader( "/absolute-path" )', 2, function ( assert ) {
+		// Forge a URL to the test callback script
+		var target = QUnit.fixurl(
+			mw.config.get( 'wgScriptPath' ) + '/tests/qunit/data/qunitOkCall.js'
+		);
+
+		// Confirm that mw.loader.load() works with absolute-paths (relative to current hostname)
+		assert.equal( target.slice( 0, 1 ), '/', 'URL is relative to document root' );
+
+		// Async!
+		// The target calls QUnit.start
+		mw.loader.load( target );
+	} );
+
+	QUnit.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 +1057,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 +1070,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 +1093,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 +1122,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 ) );
diff --git a/thumb.php b/thumb.php
index 25bca87954..d39d43bc46 100644
--- a/thumb.php
+++ b/thumb.php
@@ -190,6 +190,7 @@ function wfStreamThumb( array $params ) {
 				if ( $targetFile->exists() ) {
 					$newThumbName = $targetFile->thumbName( $params );
 					if ( $isOld ) {
+						/** @var array $bits */
 						$newThumbUrl = $targetFile->getArchiveThumbUrl(
 							$bits[0] . '!' . $targetFile->getName(), $newThumbName );
 					} else {
@@ -221,7 +222,7 @@ function wfStreamThumb( array $params ) {
 		wfThumbErrorText( 404, "The source file '$fileName' does not exist." );
 		return;
 	} elseif ( $img->getPath() === false ) {
-		wfThumbErrorText( 500, "The source file '$fileName' is not locally accessible." );
+		wfThumbErrorText( 400, "The source file '$fileName' is not locally accessible." );
 		return;
 	}
 
@@ -316,22 +317,25 @@ function wfStreamThumb( array $params ) {
 
 	$user = RequestContext::getMain()->getUser();
 	if ( !wfThumbIsStandard( $img, $params ) && $user->pingLimiter( 'renderfile-nonstandard' ) ) {
-		wfThumbError( 500, wfMessage( 'actionthrottledtext' )->parse() );
+		wfThumbError( 429, wfMessage( 'actionthrottledtext' )->parse() );
 		return;
 	} elseif ( $user->pingLimiter( 'renderfile' ) ) {
-		wfThumbError( 500, wfMessage( 'actionthrottledtext' )->parse() );
+		wfThumbError( 429, wfMessage( 'actionthrottledtext' )->parse() );
 		return;
 	}
 
 	list( $thumb, $errorMsg ) = wfGenerateThumbnail( $img, $params, $thumbName, $thumbPath );
 
-	/** @var MediaTransformOutput|bool $thumb */
+	/** @var MediaTransformOutput|MediaTransformError|bool $thumb */
 
 	// Check for thumbnail generation errors...
 	$msg = wfMessage( 'thumbnail_error' );
 	$errorCode = 500;
 	if ( !$thumb ) {
 		$errorMsg = $errorMsg ?: $msg->rawParams( 'File::transform() returned false' )->escaped();
+		if ( $errorMsg instanceof MessageSpecifier && $errorMsg->getKey() === 'thumbnail_image-failure-limit' ) {
+			$errorCode = 429;
+		}
 	} elseif ( $thumb->isError() ) {
 		$errorMsg = $thumb->getHtmlMsg();
 	} elseif ( !$thumb->hasFile() ) {
@@ -412,7 +416,7 @@ function wfGenerateThumbnail( File $file, array $params, $thumbName, $thumbPath
 				'fallback' => function () {
 					return wfMessage( 'generic-pool-error' )->parse();
 				},
-				'error' => function ( $status ) {
+				'error' => function ( Status $status ) {
 					return $status->getHTML();
 				}
 			)
@@ -427,6 +431,7 @@ function wfGenerateThumbnail( File $file, array $params, $thumbName, $thumbPath
 		// Tried to select a page on a non-paged file?
 	}
 
+	/** @noinspection PhpUnusedLocalVariableInspection */
 	$done = true; // no PHP fatal occured
 
 	if ( !$thumb || $thumb->isError() ) {
@@ -497,7 +502,7 @@ function wfExtractThumbRequestInfo( $thumbRel ) {
  */
 function wfExtractThumbParams( $file, $params ) {
 	if ( !isset( $params['thumbName'] ) ) {
-		throw new MWException( "No thumbnail name passed to wfExtractThumbParams" );
+		throw new InvalidArgumentException( "No thumbnail name passed to wfExtractThumbParams" );
 	}
 
 	$thumbname = $params['thumbName'];
@@ -536,7 +541,7 @@ function wfExtractThumbParams( $file, $params ) {
 
 	// As a last ditch fallback, use the traditional common parameters
 	if ( preg_match( '!^(page(\d*)-)*(\d*)px-[^/]*$!', $thumbname, $matches ) ) {
-		list( /* all */, $pagefull, $pagenum, $size ) = $matches;
+		list( /* all */, /* pagefull */, $pagenum, $size ) = $matches;
 		$params['width'] = $size;
 		if ( $pagenum ) {
 			$params['page'] = $pagenum;
@@ -551,11 +556,11 @@ function wfExtractThumbParams( $file, $params ) {
  * Output a thumbnail generation error message
  *
  * @param int $status
- * @param string $msg Plain text (will be html escaped)
+ * @param string $msgText Plain text (will be html escaped)
  * @return void
  */
 function wfThumbErrorText( $status, $msgText ) {
-	return wfThumbError( $status, htmlspecialchars( $msgText ) );
+	wfThumbError( $status, htmlspecialchars( $msgText ) );
 }
 
 /**
@@ -570,10 +575,8 @@ function wfThumbError( $status, $msgHtml ) {
 
 	header( 'Cache-Control: no-cache' );
 	header( 'Content-Type: text/html; charset=utf-8' );
-	if ( $status == 400 ) {
-		HttpStatus::header( 400 );
-	} elseif ( $status == 404 ) {
-		HttpStatus::header( 404 );
+	if ( $status == 400 || $status == 404 || $status == 429 ) {
+		HttpStatus::header( $status );
 	} elseif ( $status == 403 ) {
 		HttpStatus::header( 403 );
 		header( 'Vary: Cookie' );