From: Hashar <hashar@free.fr>
Date: Sat, 10 Nov 2012 16:44:44 +0000 (+0000)
Subject: Merge "(Bug 41352) Provide tests for edit conflicts."
X-Git-Tag: 1.31.0-rc.0~21672
X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dcompta/operations/modifier.php?a=commitdiff_plain;h=6670bf66dfa0a0ae6025c63e16094bb65a9ada38;hp=3dcf8c5284ba8012f75ac44e54d8647e47a24e35;p=lhc%2Fweb%2Fwiklou.git

Merge "(Bug 41352) Provide tests for edit conflicts."
---

diff --git a/.gitignore b/.gitignore
index 319f19640e..a47a454f77 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,7 @@ cscope.out
 ## NetBeans
 nbproject*
 project.index
+sublime-*
 
 # MediaWiki install & usage
 cache
@@ -30,6 +31,9 @@ AdminSettings.php
 LocalSettings.php
 StartProfiler.php
 
+# Building & testing
+node_modules/
+
 # Operating systems
 ## Mac OS X
 .DS_Store
diff --git a/.jshintignore b/.jshintignore
index 026eaaaf85..3869deb913 100644
--- a/.jshintignore
+++ b/.jshintignore
@@ -1,4 +1,6 @@
-# upstream libs
+# third-party libs
+extensions/
+node_modules/
 resources/jquery/jquery.appear.js
 resources/jquery/jquery.async.js
 resources/jquery/jquery.cycle.all.js
@@ -13,9 +15,13 @@ resources/jquery/jquery.mockjax.js
 resources/jquery/jquery.qunit.js
 resources/jquery/jquery.validate.js
 resources/jquery/jquery.xmldom.js
-resources/jquery.effects
-resources/jquery.tipsy
-resources/jquery.ui
-resources/mediawiki.libs
-tests/jasmine/lib/jasmine-1.0.1/jasmine-html.js
-tests/jasmine/lib/jasmine-1.0.1/jasmine.js
+resources/jquery.effects/
+resources/jquery.tipsy/
+resources/jquery.ui/
+resources/mediawiki.libs/
+
+# legacy scripts
+skins/common/
+
+# github.com/jshint/jshint/issues/729
+tests/qunit/suites/resources/mediawiki/mediawiki.jscompat.test.js
diff --git a/.jshintrc b/.jshintrc
index b86ceb5f0c..7fa138d44f 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -1,20 +1,25 @@
 {
 	"predef": [
 		"mediaWiki",
+		"jQuery",
 		"QUnit"
 	],
 
 	"bitwise": true,
+	"camelcase": true,
 	"curly": true,
 	"eqeqeq": true,
+	"forin": false,
 	"immed": true,
 	"latedef": true,
 	"newcap": true,
 	"noarg": true,
 	"noempty": true,
 	"nonew": true,
+	"quotmark": "single",
 	"regexp": false,
 	"undef": true,
+	"unused": true,
 	"strict": false,
 	"trailing": true,
 
@@ -23,7 +28,6 @@
 	"multistr": true,
 
 	"browser": true,
-	"jquery": true,
 
 	"nomen": true,
 	"onevar": true
diff --git a/CREDITS b/CREDITS
index 68c945c96f..6555b07ccb 100644
--- a/CREDITS
+++ b/CREDITS
@@ -2,6 +2,7 @@ MediaWiki 1.21 is a collaborative project released under the
 GNU General Public License v2. We would like to recognize the
 following names for their contribution to the product.
 
+<!-- Please notice that the following can be found parsed under Special:Version/Credits -->
 == Developers ==
 * Aaron Schulz
 * Alex Z.
@@ -44,6 +45,7 @@ following names for their contribution to the product.
 * Leon Weber
 * Leslie Hoare
 * Marco Schuster
+* Marius Hoch
 * Matěj Grabovský
 * Matt Johnston
 * Max Semenik
@@ -206,4 +208,4 @@ following names for their contribution to the product.
 * Meno25
 * Rotem Liss
 * Shinjiman
-* Translatewiki.net Translators https://translatewiki.net/wiki/Special:ListUsers/translator
+* [https://translatewiki.net/wiki/Special:ListUsers/translator Translatewiki.net Translators]
diff --git a/README.mediawiki b/README.mediawiki
new file mode 120000
index 0000000000..100b93820a
--- /dev/null
+++ b/README.mediawiki
@@ -0,0 +1 @@
+README
\ No newline at end of file
diff --git a/RELEASE-NOTES-1.20 b/RELEASE-NOTES-1.20
index 52c4e8685c..1a9296842a 100644
--- a/RELEASE-NOTES-1.20
+++ b/RELEASE-NOTES-1.20
@@ -5,10 +5,7 @@ setting since version 1.2.0. If you have it on, turn it '''off''' if you can.
 
 == MediaWiki 1.20 ==
 
-THIS IS NOT A RELEASE YET
-
-MediaWiki 1.20 is an alpha-quality branch and is not recommended for use in
-production.
+MediaWiki 1.20 is a stable release.
 
 === PHP 5.3 now required ===
 Since 1.20, the lowest supported version of PHP is now 5.3.2. Please
@@ -152,7 +149,32 @@ upgrade PHP if you have not done so prior to upgrading MediaWiki.
 * (bug 40448) mediawiki.legacy.mwsuggest has been replaced with a new module,
   mediawiki.searchSuggest, based on SimpleSeach from Extension:Vector.
 
+=== Known issues in 1.20.0 ===
+These are issues that we're targeting to be fixed in a later release
+in the 1.20 series.  Issues may be added or removed from this list as
+we see fit.  For now, it is comprised of those bugs on the 1.20.0
+milestone in Bugzilla.
+
+* (bug 35894): Reports of secret key generation "hanging" on windows
+    This is probably a bug that has been fixed in PHP.  If you run
+    into this, try upgrading your PHP.
+* (bug 38334): PHP Notice:  Undefined index: href in /www/w/skins/Vector.php on line 416
+    We think this is a problem in some extension.  If you see this,
+    try disabling your extensions and check out the logging patch on
+    this bug.  Or try this patch:
+    <https://gerrit.wikimedia.org/r/#/c/27937/1/skins/Vector.php>
+* (bug 39268): [Regression] Toolbar inserts in main textarea only (instead of the focussed textarea)
+    This should only be an issue if you are using the ProofreadPage
+    extension.
+* (bug 40641): Clicking "others" in Special:Version asks to download a file
+    If you encounter this, you can tell your webserver to serve the
+    CREDITS file with text/plain MIME type to fix it.
+
 === Bug fixes in 1.20 ===
+* (bug 40939): [Regression] InfoAction: Call to a member function getUserText() on a non-object
+* (bug 40780): searchsuggest-containing line ("containing...") doesn't include the entered text
+* (bug 37714): [Regression] Incomplete log entries
+* (bug 27202): API: Add timestamp sort to list=allimages
 * (bug 30245) Use the correct way to construct a log page title.
 * (bug 34237) Regenerate an empty user_token and save to the database
   when we try to set the user's cookies for login.
diff --git a/RELEASE-NOTES-1.21 b/RELEASE-NOTES-1.21
index 8eb6a7612f..b9b026cb37 100644
--- a/RELEASE-NOTES-1.21
+++ b/RELEASE-NOTES-1.21
@@ -34,6 +34,7 @@ production.
 * Added ApiQueryORM class to facilitate creation of query API modules based on
   tables that have a corresponding ORMTable class.
 * (bug 40876) Icon for PSD (Adobe Photoshop) file types.
+* (bug 40641) Implemented Special:Version/Credits with a list of contributors.
 
 === Bug fixes in 1.21 ===
 * (bug 40353) SpecialDoubleRedirect should support interwiki redirects.
@@ -48,6 +49,18 @@ production.
   compatibility. This also works with Squid in reverse-proxy mode. If you wish 
   to support Squid configured in forward-proxy mode, set 
   $wgSquidPurgeUseHostHeader to false.
+* (bug 37020) sql.php with readline eats semicolon
+* (bug 11748) Properly handle optionally-closed HTML tags when Tidy is
+  disabled, and don't wrap HTML-syntax definition lists in paragraphs.
+* (bug 41409) Diffs while editing an old revision should again diff against the
+  current revision.
+* (bug 41494) Honor $wgLogExceptionBacktrace when logging non-API exceptions
+  caught during API execution.
+* (bug 37963) Fixed loading process for user options
+* (bug 26995) Update filename field on Upload page after having sanitized it.
+* (bug 41793) Contribution links to users with 0 edits on Special:ListUsers didn't
+  show up red.
+* (bug 41899) A PHP notice no longer occurs when using the "rvcontinue" API parameter.
 
 === API changes in 1.21 ===
 * prop=revisions can now report the contentmodel and contentformat, see docs/contenthandler.txt
@@ -55,6 +68,7 @@ production.
   page content; See docs/contenthandler.txt for details.
 * (bug 35693) ApiQueryImageInfo now suppresses errors when unserializing metadata.
 * (bug 40111) Disable minor edit for page/section creation by API
+* (bug 41042) Revert change to action=parse&page=... behavior when the page does not exist.
 
 === Languages updated in 1.21 ===
 
diff --git a/docs/export-0.8.xsd b/docs/export-0.8.xsd
index a18c608e58..07b432a197 100644
--- a/docs/export-0.8.xsd
+++ b/docs/export-0.8.xsd
@@ -134,13 +134,13 @@
 
 	<simpleType name="ContentModelType">
 		<restriction base="string">
-			<pattern value="[a-zA-Z][-+./a-zA-Z0-9]*"/>
+			<pattern value="[a-zA-Z][-+./a-zA-Z0-9]*" />
 		</restriction>
 	</simpleType>
 
 	<simpleType name="ContentFormatType">
 		<restriction base="string">
-			<pattern value='[a-zA-Z][-+.a-zA-Z0-9]*\/[a-zA-Z][-+.a-zA-Z0-9]*'/>
+			<pattern value="[a-zA-Z][-+.a-zA-Z0-9]*/[a-zA-Z][-+.a-zA-Z0-9]*" />
 		</restriction>
 	</simpleType>
 
diff --git a/docs/export-demo.xml b/docs/export-demo.xml
index d198b93c8a..591f675c58 100644
--- a/docs/export-demo.xml
+++ b/docs/export-demo.xml
@@ -1,4 +1,4 @@
-<mediawiki xmlns="http://www.mediawiki.org/xml/export-0.7/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.mediawiki.org/xml/export-0.7/ http://www.mediawiki.org/xml/export-0.7.xsd" version="0.7" xml:lang="en">
+<mediawiki xmlns="http://www.mediawiki.org/xml/export-0.8/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.mediawiki.org/xml/export-0.8/ http://www.mediawiki.org/xml/export-0.8.xsd" version="0.8" xml:lang="en">
   
   <!-- Optional global configuration info -->
   <siteinfo>
@@ -79,8 +79,10 @@
       </contributor>
       <minor />
       <comment>I have just one thing to say!</comment>
-      <sha1>5x0ux8iwjrbmfzgv6pkketxgkcnpr7h</sha1>
       <text xml:space="preserve" bytes="25">A bunch of [[text]] here.</text>
+      <sha1>5x0ux8iwjrbmfzgv6pkketxgkcnpr7h</sha1>
+      <model>wikitext</model>
+      <format>text/x-wiki</format>
     </revision>
     
     <revision>
@@ -90,8 +92,10 @@
         <ip>10.0.0.2</ip>
       </contributor>
       <comment>new!</comment>
-      <sha1>etaxt3shcge6igz1biwy3d4um2pnle4</sha1>
       <text xml:space="preserve" bytes="24">An earlier [[revision]].</text>
+      <sha1>etaxt3shcge6igz1biwy3d4um2pnle4</sha1>
+      <model>wikitext</model>
+      <format>text/x-wiki</format>
     </revision>
   </page>
   
@@ -104,8 +108,10 @@
       <timestamp>2001-01-15T14:03:00Z</timestamp>
       <contributor><ip>10.0.0.2</ip></contributor>
       <comment>hey</comment>
-      <sha1>ml80vmyjlixdstnywwihx003exfzq9j</sha1>
       <text xml:space="preserve" bytes="47">WHYD YOU LOCK PAGE??!!! i was editing that jerk</text>
+      <sha1>ml80vmyjlixdstnywwihx003exfzq9j</sha1>
+      <model>wikitext</model>
+      <format>text/x-wiki</format>
     </revision>
   </page>
   
@@ -118,8 +124,10 @@
       <timestamp>2001-01-15T20:34:12Z</timestamp>
       <contributor><username>Foobar</username><id>42</id></contributor>
       <comment>My awesomeest image!</comment>
-      <sha1>mehom37npwkpzhaiwu3wyr0egalumki</sha1>
       <text xml:space="preserve" bytes="52">This is an awesome little imgae. I lurves it. {{PD}}</text>
+      <sha1>mehom37npwkpzhaiwu3wyr0egalumki</sha1>
+      <model>wikitext</model>
+      <format>text/x-wiki</format>
     </revision>
     <upload>
       <timestamp>2001-01-15T20:34:12Z</timestamp>
diff --git a/docs/hooks.txt b/docs/hooks.txt
index 998523f334..67b4580b75 100644
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -752,6 +752,16 @@ cointent model name, but no entry for that model exists in $wgContentHandlers.
 $modeName: the requested content model name
 &$handler: set this to a ContentHandler object, if desired.
 
+'ConvertContent': Called by AbstractContent::convert when a conversion to another
+content model is requested.
+$content: The Content object to be converted.
+$toModel: The ID of the content model to convert to.
+$lossy:   boolean indicating whether lossy conversion is allowed.
+&$result: Output parameter, in case the handler function wants to provide a
+converted Content object. Note that $result->getContentModel() must return $toModel.
+Handler functions that modify $result should generally return false to further
+attempts at conversion.
+
 'ContribsPager::getQueryInfo': Before the contributions query is about to run
 &$pager: Pager object for contributions
 &$queryInfo: The query for the contribs Pager
@@ -1831,6 +1841,21 @@ $result: The search result
 $terms: The search terms entered
 $page: The SpecialSearch object.
 
+'ShowSearchHit': Customize display of search hit.
+$searchPage: The SpecialSearch instance.
+$result: The SearchResult to show
+$terms: Search terms, for highlighting
+&$link: HTML of link to the matching page. May be modified.
+&$redirect: HTML of redirect info. May be modified.
+&$section: HTML of matching section. May be modified.
+&$extract: HTML of content extract. May be modified.
+&$score: HTML of score. May be modified.
+&$size: HTML of page size. May be modified.
+&$date: HTML of of page modification date. May be modified.
+&$related: HTML of additional info for the matching page. May be modified.
+&$html: May be set to the full HTML that should be used to represent the search hit. Must include
+the <li> ... </li> tags. Will only be used if the hook function returned false.
+
 'SiteNoticeBefore': Before the sitenotice/anonnotice is composed
 &$siteNotice: HTML returned as the sitenotice
 $skin: Skin object
@@ -2110,7 +2135,7 @@ $result: Boolean; whether MediaWiki currently thinks this is a CSS/JS page. Hook
 Allows overriding default behaviour for determining if a page exists.
 If $isKnown is kept as null, regular checks happen. If it's a boolean, this value is returned by the isKnown method.
 $title: Title object that is being checked
-$result: Boolean|null; whether MediaWiki currently thinks this page is known
+&$isKnown: Boolean|null; whether MediaWiki currently thinks this page is known
 
 'TitleIsMovable': Called when determining if it is possible to move a page.
 Note that this hook is not called for interwiki pages or pages in immovable namespaces: for these, isMovable() always returns false.
diff --git a/img_auth.php b/img_auth.php
index b3a34955de..b04974bf82 100644
--- a/img_auth.php
+++ b/img_auth.php
@@ -48,7 +48,7 @@ if ( isset( $_SERVER['MW_COMPILED'] ) ) {
 wfProfileIn( 'img_auth.php' );
 
 # Set action base paths so that WebRequest::getPathInfo()
-# recognizes the "X" as the 'title' in ../image_auth/X urls.
+# recognizes the "X" as the 'title' in ../img_auth.php/X urls.
 $wgArticlePath = false; # Don't let a "/*" article path clober our action path
 $wgActionPaths = array( "$wgUploadPath/" );
 
diff --git a/includes/Article.php b/includes/Article.php
index 0eb0c68b08..169dd03af3 100644
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -688,7 +688,7 @@ class Article extends Page {
 						$outputDone = true;
 					} else {
 						$content = $this->getContentObject();
-						$rt = $content->getRedirectChain();
+						$rt = $content ? $content->getRedirectChain() : null;
 						if ( $rt ) {
 							wfDebug( __METHOD__ . ": showing redirect=no page\n" );
 							# Viewing a redirect page (e.g. with parameter redirect=no)
@@ -704,9 +704,8 @@ class Article extends Page {
 					# Run the parse, protected by a pool counter
 					wfDebug( __METHOD__ . ": doing uncached parse\n" );
 
-					// @todo: shouldn't we be passing $this->getPage() to PoolWorkArticleView instead of plain $this?
-					$poolArticleView = new PoolWorkArticleView( $this, $parserOptions,
-						$this->getRevIdFetched(), $useParserCache, $this->getContentObject(), $this->getContext() );
+					$poolArticleView = new PoolWorkArticleView( $this->getPage(), $parserOptions,
+						$this->getRevIdFetched(), $useParserCache, $this->getContentObject() );
 
 					if ( !$poolArticleView->execute() ) {
 						$error = $poolArticleView->getError();
@@ -842,10 +841,14 @@ class Article extends Page {
 				'clearyourcache' );
 		}
 
-		// Give hooks a chance to customise the output
-		if ( ContentHandler::runLegacyHooks( 'ShowRawCssJs', array( $this->fetchContentObject(), $this->getTitle(), $outputPage ) ) ) {
-			$po = $this->mContentObject->getParserOutput( $this->getTitle() );
-			$outputPage->addHTML( $po->getText() );
+		$this->fetchContentObject();
+
+		if ( $this->mContentObject ) {
+			// Give hooks a chance to customise the output
+			if ( ContentHandler::runLegacyHooks( 'ShowRawCssJs', array( $this->mContentObject, $this->getTitle(), $outputPage ) ) ) {
+				$po = $this->mContentObject->getParserOutput( $this->getTitle() );
+				$outputPage->addHTML( $po->getText() );
+			}
 		}
 	}
 
diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index d98556ee34..dcaaf5a8d4 100644
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -254,7 +254,6 @@ $wgAutoloadLocalClasses = array(
 	'UnlistedSpecialPage' => 'includes/SpecialPage.php',
 	'UploadSourceAdapter' => 'includes/Import.php',
 	'UppercaseCollation' => 'includes/Collation.php',
-	'Uri' => 'includes/Uri.php',
 	'User' => 'includes/User.php',
 	'UserArray' => 'includes/UserArray.php',
 	'UserArrayFromResult' => 'includes/UserArray.php',
@@ -299,6 +298,7 @@ $wgAutoloadLocalClasses = array(
 	'JavaScriptContentHandler' => 'includes/content/JavaScriptContentHandler.php',
 	'JavaScriptContent' => 'includes/content/JavaScriptContent.php',
 	'MessageContent' => 'includes/content/MessageContent.php',
+	'MWContentSerializationException' => 'includes/content/ContentHandler.php',
 	'TextContentHandler' => 'includes/content/TextContentHandler.php',
 	'TextContent' => 'includes/content/TextContent.php',
 	'WikitextContentHandler' => 'includes/content/WikitextContentHandler.php',
@@ -446,11 +446,6 @@ $wgAutoloadLocalClasses = array(
 	'TitleDependency' => 'includes/cache/CacheDependency.php',
 	'TitleListDependency' => 'includes/cache/CacheDependency.php',
 
-	# includes/conf
-	'Conf' => 'includes/conf/Conf.php',
-	'DatabaseConf' => 'includes/conf/DatabaseConf.php',
-	'DefaultSettings' => 'includes/conf/DefaultSettings.php',
-
 	# includes/context
 	'ContextSource' => 'includes/context/ContextSource.php',
 	'DerivativeContext' => 'includes/context/DerivativeContext.php',
@@ -661,6 +656,7 @@ $wgAutoloadLocalClasses = array(
 	'EmaillingJob' => 'includes/job/jobs/EmaillingJob.php',
 	'EnotifNotifyJob' => 'includes/job/jobs/EnotifNotifyJob.php',
 	'HTMLCacheUpdateJob' => 'includes/job/jobs/HTMLCacheUpdateJob.php',
+	'NullJob' => 'includes/job/jobs/NullJob.php',
 	'RefreshLinksJob' => 'includes/job/jobs/RefreshLinksJob.php',
 	'RefreshLinksJob2' => 'includes/job/jobs/RefreshLinksJob.php',
 	'UploadFromUrlJob' => 'includes/job/jobs/UploadFromUrlJob.php',
@@ -702,6 +698,7 @@ $wgAutoloadLocalClasses = array(
 	'PatrolLog' => 'includes/logging/PatrolLog.php',
 	'PatrolLogFormatter' => 'includes/logging/LogFormatter.php',
 	'RCDatabaseLogEntry' => 'includes/logging/LogEntry.php',
+	'RightsLogFormatter' => 'includes/logging/LogFormatter.php',
 
 	# includes/media
 	'BitmapHandler' => 'includes/media/Bitmap.php',
@@ -1095,13 +1092,15 @@ $wgAutoloadLocalClasses = array(
 	'TestRecorder' => 'tests/testHelpers.inc',
 
 	# tests/phpunit
-	'DummyContentHandlerForTesting' => 'tests/phpunit/includes/ContentHandlerTest.php',
-	'DummyContentForTesting' => 'tests/phpunit/includes/ContentHandlerTest.php',
-	'JavascriptContentTest' => 'tests/phpunit/includes/JavascriptContentTest.php',
 	'RevisionStorageTest' => 'tests/phpunit/includes/RevisionStorageTest.php',
-	'TextContentTest' => 'tests/phpunit/includes/TextContentTest.php',
 	'WikiPageTest' => 'tests/phpunit/includes/WikiPageTest.php',
 
+	# tests/phpunit/content
+	'DummyContentHandlerForTesting' => 'tests/phpunit/includes/content/ContentHandlerTest.php',
+	'DummyContentForTesting' => 'tests/phpunit/includes/content/ContentHandlerTest.php',
+	'JavascriptContentTest' => 'tests/phpunit/includes/content/JavascriptContentTest.php',
+	'TextContentTest' => 'tests/phpunit/includes/content/TextContentTest.php',
+
 	# tests/phpunit/includes
 	'GenericArrayObjectTest' => 'tests/phpunit/includes/libs/GenericArrayObjectTest.php',
 
diff --git a/includes/Block.php b/includes/Block.php
index 86b4d13d36..e05b2acfa4 100644
--- a/includes/Block.php
+++ b/includes/Block.php
@@ -164,7 +164,7 @@ class Block {
 
 	/**
 	 * Check if two blocks are effectively equal.  Doesn't check irrelevant things like
-	 * the blocking user or the block timestamp, only things which affect the blocked user	 *
+	 * the blocking user or the block timestamp, only things which affect the blocked user
 	 *
 	 * @param $block Block
 	 *
@@ -536,10 +536,10 @@ class Block {
 			'ipb_expiry'           => $expiry,
 			'ipb_range_start'      => $this->getRangeStart(),
 			'ipb_range_end'        => $this->getRangeEnd(),
-			'ipb_deleted'	       => intval( $this->mHideName ), // typecast required for SQLite
+			'ipb_deleted'          => intval( $this->mHideName ), // typecast required for SQLite
 			'ipb_block_email'      => $this->prevents( 'sendemail' ),
 			'ipb_allow_usertalk'   => !$this->prevents( 'editownusertalk' ),
-			'ipb_parent_block_id'            => $this->mParentBlockId
+			'ipb_parent_block_id'  => $this->mParentBlockId
 		);
 
 		return $a;
diff --git a/includes/Category.php b/includes/Category.php
index ffd7bb8bda..6a5eac7b89 100644
--- a/includes/Category.php
+++ b/includes/Category.php
@@ -58,6 +58,9 @@ class Category {
 			# Already initialized
 			return true;
 		}
+
+		wfProfileIn( __METHOD__ );
+
 		$dbr = wfGetDB( DB_SLAVE );
 		$row = $dbr->selectRow(
 			'category',
@@ -66,6 +69,8 @@ class Category {
 			__METHOD__
 		);
 
+		wfProfileOut( __METHOD__ );
+
 		if ( !$row ) {
 			# Okay, there were no contents.  Nothing to initialize.
 			if ( $this->mTitle ) {
@@ -190,25 +195,37 @@ class Category {
 	}
 
 	/** @return mixed DB key name, or false on failure */
-	public function getName() { return $this->getX( 'mName' ); }
+	public function getName() {
+		return $this->getX( 'mName' );
+	}
 
 	/** @return mixed Category ID, or false on failure */
-	public function getID() { return $this->getX( 'mID' ); }
+	public function getID() {
+		return $this->getX( 'mID' );
+	}
 
 	/** @return mixed Total number of member pages, or false on failure */
-	public function getPageCount() { return $this->getX( 'mPages' ); }
+	public function getPageCount() {
+		return $this->getX( 'mPages' );
+	}
 
 	/** @return mixed Number of subcategories, or false on failure */
-	public function getSubcatCount() { return $this->getX( 'mSubcats' ); }
+	public function getSubcatCount() {
+		return $this->getX( 'mSubcats' );
+	}
 
 	/** @return mixed Number of member files, or false on failure */
-	public function getFileCount() { return $this->getX( 'mFiles' ); }
+	public function getFileCount() {
+		return $this->getX( 'mFiles' );
+	}
 
 	/**
 	 * @return Title|bool Title for this category, or false on failure.
 	 */
 	public function getTitle() {
-		if ( $this->mTitle ) return $this->mTitle;
+		if ( $this->mTitle ) {
+			return $this->mTitle;
+		}
 
 		if ( !$this->initialize() ) {
 			return false;
@@ -226,20 +243,22 @@ class Category {
 	 * @return TitleArray object for category members.
 	 */
 	public function getMembers( $limit = false, $offset = '' ) {
+		wfProfileIn( __METHOD__ );
+
 		$dbr = wfGetDB( DB_SLAVE );
 
 		$conds = array( 'cl_to' => $this->getName(), 'cl_from = page_id' );
 		$options = array( 'ORDER BY' => 'cl_sortkey' );
 
 		if ( $limit ) {
-			$options[ 'LIMIT' ] = $limit;
+			$options['LIMIT'] = $limit;
 		}
 
 		if ( $offset !== '' ) {
 			$conds[] = 'cl_sortkey > ' . $dbr->addQuotes( $offset );
 		}
 
-		return TitleArray::newFromResult(
+		$result = TitleArray::newFromResult(
 			$dbr->select(
 				array( 'page', 'categorylinks' ),
 				array( 'page_id', 'page_namespace', 'page_title', 'page_len',
@@ -249,6 +268,10 @@ class Category {
 				$options
 			)
 		);
+
+		wfProfileOut( __METHOD__ );
+
+		return $result;
 	}
 
 	/**
@@ -259,7 +282,7 @@ class Category {
 		if ( !$this->initialize() ) {
 			return false;
 		}
-		return $this-> { $key } ;
+		return $this->{$key};
 	}
 
 	/**
@@ -279,8 +302,10 @@ class Category {
 			}
 		}
 
+		wfProfileIn( __METHOD__ );
+
 		$dbw = wfGetDB( DB_MASTER );
-		$dbw->begin( __METHOD__  );
+		$dbw->begin( __METHOD__ );
 
 		# Insert the row if it doesn't exist yet (e.g., this is being run via
 		# update.php from a pre-1.16 schema).  TODO: This will cause lots and
@@ -303,8 +328,8 @@ class Category {
 		$result = $dbw->selectRow(
 			array( 'categorylinks', 'page' ),
 			array( 'pages' => 'COUNT(*)',
-				   'subcats' => "COUNT($cond1)",
-				   'files' => "COUNT($cond2)"
+				'subcats' => "COUNT($cond1)",
+				'files' => "COUNT($cond2)"
 			),
 			array( 'cl_to' => $this->mName, 'page_id = cl_from' ),
 			__METHOD__,
@@ -322,6 +347,8 @@ class Category {
 		);
 		$dbw->commit( __METHOD__ );
 
+		wfProfileOut( __METHOD__ );
+
 		# Now we should update our local counts.
 		$this->mPages   = $result->pages;
 		$this->mSubcats = $result->subcats;
diff --git a/includes/CategoryViewer.php b/includes/CategoryViewer.php
index 3d66b74a26..b59b4e1afe 100644
--- a/includes/CategoryViewer.php
+++ b/includes/CategoryViewer.php
@@ -173,7 +173,7 @@ class CategoryViewer extends ContextSource {
 
 	/**
 	 * Add a subcategory to the internal lists, using a title object
-	 * @deprecated since 1.17 kept for compatibility, please use addSubcategoryObject instead
+	 * @deprecated since 1.17 kept for compatibility, use addSubcategoryObject instead
 	 */
 	function addSubcategory( Title $title, $sortkey, $pageLength ) {
 		wfDeprecated( __METHOD__, '1.17' );
@@ -181,14 +181,14 @@ class CategoryViewer extends ContextSource {
 	}
 
 	/**
-	* Get the character to be used for sorting subcategories.
-	* If there's a link from Category:A to Category:B, the sortkey of the resulting
-	* entry in the categorylinks table is Category:A, not A, which it SHOULD be.
-	* Workaround: If sortkey == "Category:".$title, than use $title for sorting,
-	* else use sortkey...
-	*
-	* @param Title $title
-	* @param string $sortkey The human-readable sortkey (before transforming to icu or whatever).
+	 * Get the character to be used for sorting subcategories.
+	 * If there's a link from Category:A to Category:B, the sortkey of the resulting
+	 * entry in the categorylinks table is Category:A, not A, which it SHOULD be.
+	 * Workaround: If sortkey == "Category:".$title, than use $title for sorting,
+	 * else use sortkey...
+	 *
+	 * @param Title $title
+	 * @param string $sortkey The human-readable sortkey (before transforming to icu or whatever).
 	 * @return string
 	 */
 	function getSubcategorySortChar( $title, $sortkey ) {
@@ -259,15 +259,15 @@ class CategoryViewer extends ContextSource {
 
 	function finaliseCategoryState() {
 		if ( $this->flip['subcat'] ) {
-			$this->children            = array_reverse( $this->children );
+			$this->children = array_reverse( $this->children );
 			$this->children_start_char = array_reverse( $this->children_start_char );
 		}
 		if ( $this->flip['page'] ) {
-			$this->articles            = array_reverse( $this->articles );
+			$this->articles = array_reverse( $this->articles );
 			$this->articles_start_char = array_reverse( $this->articles_start_char );
 		}
 		if ( !$this->showGallery && $this->flip['file'] ) {
-			$this->imgsNoGallery            = array_reverse( $this->imgsNoGallery );
+			$this->imgsNoGallery = array_reverse( $this->imgsNoGallery );
 			$this->imgsNoGallery_start_char = array_reverse( $this->imgsNoGallery_start_char );
 		}
 	}
@@ -302,7 +302,7 @@ class CategoryViewer extends ContextSource {
 					'page_is_redirect', 'cl_sortkey', 'cat_id', 'cat_title',
 					'cat_subcats', 'cat_pages', 'cat_files',
 					'cl_sortkey_prefix', 'cl_collation' ),
-				array_merge( array( 'cl_to' => $this->title->getDBkey() ),  $extraConds ),
+				array_merge( array( 'cl_to' => $this->title->getDBkey() ), $extraConds ),
 				__METHOD__,
 				array(
 					'USE INDEX' => array( 'categorylinks' => 'cl_sortkey' ),
@@ -310,7 +310,7 @@ class CategoryViewer extends ContextSource {
 					'ORDER BY' => $this->flip[$type] ? 'cl_sortkey DESC' : 'cl_sortkey',
 				),
 				array(
-					'categorylinks'  => array( 'INNER JOIN', 'cl_from = page_id' ),
+					'categorylinks' => array( 'INNER JOIN', 'cl_from = page_id' ),
 					'category' => array( 'LEFT JOIN', 'cat_title = page_title AND page_namespace = ' . NS_CATEGORY )
 				)
 			);
@@ -469,7 +469,7 @@ class CategoryViewer extends ContextSource {
 	 */
 	function formatList( $articles, $articles_start_char, $cutoff = 6 ) {
 		$list = '';
-		if ( count ( $articles ) > $cutoff ) {
+		if ( count( $articles ) > $cutoff ) {
 			$list = self::columnList( $articles, $articles_start_char );
 		} elseif ( count( $articles ) > 0 ) {
 			// for short lists of articles in categories.
@@ -478,7 +478,7 @@ class CategoryViewer extends ContextSource {
 
 		$pageLang = $this->title->getPageLanguage();
 		$attribs = array( 'lang' => $pageLang->getCode(), 'dir' => $pageLang->getDir(),
-			'class' => 'mw-content-'.$pageLang->getDir() );
+			'class' => 'mw-content-' . $pageLang->getDir() );
 		$list = Html::rawElement( 'div', $attribs, $list );
 
 		return $list;
@@ -604,7 +604,7 @@ class CategoryViewer extends ContextSource {
 			);
 		}
 
-		return $this->msg('categoryviewer-pagedlinks')->rawParams($prevLink, $nextLink)->escaped();
+		return $this->msg( 'categoryviewer-pagedlinks' )->rawParams( $prevLink, $nextLink )->escaped();
 	}
 
 	/**
@@ -635,6 +635,7 @@ class CategoryViewer extends ContextSource {
 		return Title::makeTitle( $title->getNamespace(),
 			$title->getDBkey(), $fragment );
 	}
+
 	/**
 	 * What to do if the category table conflicts with the number of results
 	 * returned?  This function says what. Each type is considered independently
@@ -676,8 +677,9 @@ class CategoryViewer extends ContextSource {
 			$fromOrUntil = true;
 		}
 
-		if ( $dbcnt == $rescnt || ( ( $rescnt == $this->limit || $fromOrUntil )
-			&& $dbcnt > $rescnt ) ) {
+		if ( $dbcnt == $rescnt ||
+			( ( $rescnt == $this->limit || $fromOrUntil ) && $dbcnt > $rescnt )
+		) {
 			# Case 1: seems sane.
 			$totalcnt = $dbcnt;
 		} elseif ( $rescnt < $this->limit && !$fromOrUntil ) {
diff --git a/includes/Categoryfinder.php b/includes/Categoryfinder.php
index e2b6a0caa6..589950ff28 100644
--- a/includes/Categoryfinder.php
+++ b/includes/Categoryfinder.php
@@ -28,17 +28,17 @@
  *
  * Example use :
  * <code>
- * 	# Determines whether the article with the page_id 12345 is in both
- * 	# "Category 1" and "Category 2" or their subcategories, respectively
+ *     # Determines whether the article with the page_id 12345 is in both
+ *     # "Category 1" and "Category 2" or their subcategories, respectively
  *
- * 	$cf = new Categoryfinder;
- * 	$cf->seed(
- * 		array( 12345 ),
- * 		array( 'Category 1', 'Category 2' ),
- * 		'AND'
- * 	);
- * 	$a = $cf->run();
- * 	print implode( ',' , $a );
+ *     $cf = new Categoryfinder;
+ *     $cf->seed(
+ *         array( 12345 ),
+ *         array( 'Category 1', 'Category 2' ),
+ *         'AND'
+ *     );
+ *     $a = $cf->run();
+ *     print implode( ',' , $a );
  * </code>
  *
  */
@@ -135,7 +135,7 @@ class Categoryfinder {
 
 		# iterate through the parents
 		foreach ( $this->parents[$id] as $p ) {
-			$pname = $p->cl_to ;
+			$pname = $p->cl_to;
 
 			# Is this a condition?
 			if ( isset( $conds[$pname] ) ) {
@@ -172,6 +172,8 @@ class Categoryfinder {
 	 * Scans a "parent layer" of the articles/categories in $this->next
 	 */
 	function scan_next_layer() {
+		wfProfileIn( __METHOD__ );
+
 		# Find all parents of the article currently in $this->next
 		$layer = array();
 		$res = $this->dbr->select(
@@ -225,6 +227,7 @@ class Categoryfinder {
 		foreach ( $layer as $v ) {
 			$this->deadend[$v] = $v;
 		}
-	}
 
+		wfProfileOut( __METHOD__ );
+	}
 }
diff --git a/includes/ChangesList.php b/includes/ChangesList.php
index e7395c0261..6b7e99c4d4 100644
--- a/includes/ChangesList.php
+++ b/includes/ChangesList.php
@@ -514,12 +514,12 @@ class ChangesList extends ContextSource {
 			if ( $this->getUser()->isAllowed('rollback') && $rc->mAttribs['page_latest'] == $rc->mAttribs['rc_this_oldid'] )
 			{
 				$rev = new Revision( array(
+					'title'     => $page,
 					'id'        => $rc->mAttribs['rc_this_oldid'],
 					'user'      => $rc->mAttribs['rc_user'],
 					'user_text' => $rc->mAttribs['rc_user_text'],
 					'deleted'   => $rc->mAttribs['rc_deleted']
 				) );
-				$rev->setTitle( $page );
 				$s .= ' '.Linker::generateRollback( $rev, $this->getContext() );
 			}
 		}
diff --git a/includes/Cookie.php b/includes/Cookie.php
index 1b86f5da83..48216f0d87 100644
--- a/includes/Cookie.php
+++ b/includes/Cookie.php
@@ -194,7 +194,7 @@ class CookieJar {
 	private $cookie = array();
 
 	/**
-	 * Set a cookie in the cookie jar.	Make sure only one cookie per-name exists.
+	 * Set a cookie in the cookie jar. Make sure only one cookie per-name exists.
 	 * @see Cookie::set()
 	 */
 	public function setCookie ( $name, $value, $attr ) {
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index cea63e07a3..494b2a378b 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -361,7 +361,9 @@ $wgImgAuthPublicTest = true;
  *                          container  : backend container name the zone is in
  *                          directory  : root path within container for the zone
  *                          url        : base URL to the root of the zone
- *                          handlerUrl : base script handled URL to the root of the zone
+ *                          urlsByExt  : map of file extension types to base URLs
+ *                                       (useful for using a different cache for videos)
+ *                          handlerUrl : base script-handled URL to the root of the zone
  *                                       (see FileRepo::getZoneHandlerUrl() function)
  *                      Zones default to using "<repo name>-<zone name>" as the container name
  *                      and default to using the container root as the zone's root directory.
@@ -752,10 +754,14 @@ $wgMediaHandlers = array(
  * @since 1.21
  */
 $wgContentHandlers = array(
-	CONTENT_MODEL_WIKITEXT => 'WikitextContentHandler', // the usual case
-	CONTENT_MODEL_JAVASCRIPT => 'JavaScriptContentHandler', // dumb version, no syntax highlighting
-	CONTENT_MODEL_CSS => 'CssContentHandler', // dumb version, no syntax highlighting
-	CONTENT_MODEL_TEXT => 'TextContentHandler', // plain text, for use by extensions etc
+	// the usual case
+	CONTENT_MODEL_WIKITEXT => 'WikitextContentHandler',
+	// dumb version, no syntax highlighting
+	CONTENT_MODEL_JAVASCRIPT => 'JavaScriptContentHandler',
+	// dumb version, no syntax highlighting
+	CONTENT_MODEL_CSS => 'CssContentHandler',
+	// plain text, for use by extensions etc
+	CONTENT_MODEL_TEXT => 'TextContentHandler',
 );
 
 /**
@@ -1849,9 +1855,10 @@ $wgUseLocalMessageCache = false;
 $wgLocalMessageCacheSerialized = true;
 
 /**
- * Instead of caching everything, keep track which messages are requested and
- * load only most used messages. This only makes sense if there is lots of
- * interface messages customised in the wiki (like hundreds in many languages).
+ * Instead of caching everything, only cache those messages which have
+ * been customised in the site content language. This means that
+ * MediaWiki:Foo/ja is ignored if MediaWiki:Foo doesn't exist.
+ * This option is probably only useful for translatewiki.net.
  */
 $wgAdaptiveMessageCache = false;
 
@@ -2587,12 +2594,12 @@ $wgSiteNotice = '';
 /**
  * A subtitle to add to the tagline, for skins that have it/
  */
-$wgExtraSubtitle	= '';
+$wgExtraSubtitle = '';
 
 /**
  * If this is set, a "donate" link will appear in the sidebar. Set it to a URL.
  */
-$wgSiteSupportPage	= '';
+$wgSiteSupportPage = '';
 
 /**
  * Validate the overall output using tidy and refuse
@@ -2774,6 +2781,13 @@ $wgFooterIcons = array(
  */
 $wgUseCombinedLoginLink = false;
 
+/**
+ *  Appearance of user page and talk page labels in personal tools.
+ *  - true = combine links into a single label
+ *  - false = keep links in separate labels
+ */
+$wgVectorCombineUserTalk = false;
+
 /**
  * Search form look for Vector skin only.
  *  - true = use an icon search button
@@ -3730,7 +3744,7 @@ $wgAllowPrefChange = array();
 /**
  * This is to let user authenticate using https when they come from http.
  * Based on an idea by George Herbert on wikitech-l:
- * http://lists.wikimedia.org/pipermail/wikitech-l/2010-October/050065.html
+ * http://lists.wikimedia.org/pipermail/wikitech-l/2010-October/050039.html
  * @since 1.17
  */
 $wgSecureLogin = false;
@@ -5409,14 +5423,15 @@ $wgHooks = array();
  * can add to this to provide custom jobs
  */
 $wgJobClasses = array(
-	'refreshLinks' => 'RefreshLinksJob',
-	'refreshLinks2' => 'RefreshLinksJob2',
-	'htmlCacheUpdate' => 'HTMLCacheUpdateJob',
+	'refreshLinks'      => 'RefreshLinksJob',
+	'refreshLinks2'     => 'RefreshLinksJob2',
+	'htmlCacheUpdate'   => 'HTMLCacheUpdateJob',
 	'html_cache_update' => 'HTMLCacheUpdateJob', // backwards-compatible
-	'sendMail' => 'EmaillingJob',
-	'enotifNotify' => 'EnotifNotifyJob',
+	'sendMail'          => 'EmaillingJob',
+	'enotifNotify'      => 'EnotifNotifyJob',
 	'fixDoubleRedirect' => 'DoubleRedirectJob',
-	'uploadFromUrl' => 'UploadFromUrlJob',
+	'uploadFromUrl'     => 'UploadFromUrlJob',
+	'null'              => 'NullJob'
 );
 
 /**
@@ -5436,7 +5451,7 @@ $wgJobTypesExcludedFromDefaultQueue = array();
  * These settings should be global to all wikis.
  */
 $wgJobTypeConf = array(
-	'default' => array( 'class' => 'JobQueueDB' ),
+	'default' => array( 'class' => 'JobQueueDB', 'order' => 'random' ),
 );
 
 /**
@@ -5641,8 +5656,6 @@ $wgLogActions = array(
 	'protect/modify'     => 'modifiedarticleprotection',
 	'protect/unprotect'  => 'unprotectedarticle',
 	'protect/move_prot'  => 'movedarticleprotection',
-	'rights/rights'      => 'rightslogentry',
-	'rights/autopromote' => 'rightslogentry-autopromote',
 	'upload/upload'      => 'uploadedimage',
 	'upload/overwrite'   => 'overwroteimage',
 	'upload/revert'      => 'uploadedimage',
@@ -5660,16 +5673,18 @@ $wgLogActions = array(
  * @see LogFormatter
  */
 $wgLogActionsHandlers = array(
-	'move/move'         => 'MoveLogFormatter',
-	'move/move_redir'  => 'MoveLogFormatter',
-	'delete/delete'     => 'DeleteLogFormatter',
-	'delete/restore'    => 'DeleteLogFormatter',
-	'delete/revision'   => 'DeleteLogFormatter',
-	'delete/event'      => 'DeleteLogFormatter',
-	'suppress/revision' => 'DeleteLogFormatter',
-	'suppress/event'    => 'DeleteLogFormatter',
-	'suppress/delete'   => 'DeleteLogFormatter',
-	'patrol/patrol'     => 'PatrolLogFormatter',
+	'move/move'          => 'MoveLogFormatter',
+	'move/move_redir'    => 'MoveLogFormatter',
+	'delete/delete'      => 'DeleteLogFormatter',
+	'delete/restore'     => 'DeleteLogFormatter',
+	'delete/revision'    => 'DeleteLogFormatter',
+	'delete/event'       => 'DeleteLogFormatter',
+	'suppress/revision'  => 'DeleteLogFormatter',
+	'suppress/event'     => 'DeleteLogFormatter',
+	'suppress/delete'    => 'DeleteLogFormatter',
+	'patrol/patrol'      => 'PatrolLogFormatter',
+	'rights/rights'      => 'RightsLogFormatter',
+	'rights/autopromote' => 'RightsLogFormatter',
 );
 
 /**
diff --git a/includes/EditPage.php b/includes/EditPage.php
index 88afb66fe3..21a100f0aa 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -409,10 +409,13 @@ class EditPage {
 				wfProfileOut( __METHOD__ );
 				return;
 			}
-			if ( !$this->mTitle->getArticleID() )
+
+			if ( !$this->mTitle->getArticleID() ) {
 				wfRunHooks( 'EditFormPreloadText', array( &$this->textbox1, &$this->mTitle ) );
-			else
+			} else {
 				wfRunHooks( 'EditFormInitialText', array( $this ) );
+			}
+
 		}
 
 		$this->showEditForm();
@@ -606,8 +609,10 @@ class EditPage {
 				// modified by subclasses
 				wfProfileIn( get_class( $this ) . "::importContentFormData" );
 				$textbox1 = $this->importContentFormData( $request );
-				if ( isset( $textbox1 ) )
+				if ( isset( $textbox1 ) ) {
 					$this->textbox1 = $textbox1;
+				}
+
 				wfProfileOut( get_class( $this ) . "::importContentFormData" );
 			}
 
@@ -1057,7 +1062,7 @@ class EditPage {
 
 		$title = Title::newFromText( $preload );
 		# Check for existence to avoid getting MediaWiki:Noarticletext
-		if ( $title === null || !$title->exists() || !$title->userCan( 'read' ) ) {
+		if ( $title === null || !$title->exists() || !$title->userCan( 'read', $wgUser ) ) {
 			return $handler->makeEmptyContent();
 		}
 
@@ -1065,7 +1070,7 @@ class EditPage {
 		if ( $page->isRedirect() ) {
 			$title = $page->getRedirectTarget();
 			# Same as before
-			if ( $title === null || !$title->exists() || !$title->userCan( 'read' ) ) {
+			if ( $title === null || !$title->exists() || !$title->userCan( 'read', $wgUser ) ) {
 				return $handler->makeEmptyContent();
 			}
 			$page = WikiPage::factory( $title );
@@ -1347,7 +1352,7 @@ class EditPage {
 
 		if ( $new ) {
 			// Late check for create permission, just in case *PARANOIA*
-			if ( !$this->mTitle->userCan( 'create' ) ) {
+			if ( !$this->mTitle->userCan( 'create', $wgUser ) ) {
 				$status->fatal( 'nocreatetext' );
 				$status->value = self::AS_NO_CREATE_PERMISSION;
 				wfDebug( __METHOD__ . ": no create permission\n" );
@@ -1393,8 +1398,8 @@ class EditPage {
 					// passed.
 					if ( $this->summary === '' ) {
 						$cleanSectionTitle = $wgParser->stripSectionName( $this->sectiontitle );
-						$this->summary = wfMessage( 'newsectionsummary', $cleanSectionTitle )
-							->inContentLanguage()->text() ;
+						$this->summary = wfMessage( 'newsectionsummary' )
+							->rawParams( $cleanSectionTitle )->inContentLanguage()->text();
 					}
 				} elseif ( $this->summary !== '' ) {
 					// Insert the section title above the content.
@@ -1405,8 +1410,8 @@ class EditPage {
 
 					// Create a link to the new section from the edit summary.
 					$cleanSummary = $wgParser->stripSectionName( $this->summary );
-					$this->summary = wfMessage( 'newsectionsummary', $cleanSummary )
-						->inContentLanguage()->text();
+					$this->summary = wfMessage( 'newsectionsummary' )
+						->rawParams( $cleanSummary )->inContentLanguage()->text();
 				}
 			}
 
@@ -1468,16 +1473,14 @@ class EditPage {
 				$this->isConflict = true;
 				$content = $textbox_content; // do not try to merge here!
 			} elseif ( $this->isConflict ) {
-				$contentObj = $content;
 				# Attempt merge
-				if ( $this->mergeChangesInto( $content ) ) {
+				if ( $this->mergeChangesIntoContent( $content ) ) {
 					// Successful merge! Maybe we should tell the user the good news?
 					$this->isConflict = false;
-					$content = $this->toEditContent( $content );
 					wfDebug( __METHOD__ . ": Suppressing edit conflict, successful merge.\n" );
 				} else {
 					$this->section = '';
-					$this->textbox1 = ContentHandler::getContentText( $contentObj );
+					$this->textbox1 = ContentHandler::getContentText( $content );
 					wfDebug( __METHOD__ . ": Keeping edit conflict, failed merge.\n" );
 				}
 			}
@@ -1550,16 +1553,16 @@ class EditPage {
 					// passed.
 					if ( $this->summary === '' ) {
 						$cleanSectionTitle = $wgParser->stripSectionName( $this->sectiontitle );
-						$this->summary = wfMessage( 'newsectionsummary', $cleanSectionTitle )
-							->inContentLanguage()->text();
+						$this->summary = wfMessage( 'newsectionsummary' )
+							->rawParams( $cleanSectionTitle )->inContentLanguage()->text();
 					}
 				} elseif ( $this->summary !== '' ) {
 					$sectionanchor = $wgParser->guessLegacySectionNameFromWikiText( $this->summary );
 					# This is a new section, so create a link to the new section
 					# in the revision summary.
 					$cleanSummary = $wgParser->stripSectionName( $this->summary );
-					$this->summary = wfMessage( 'newsectionsummary', $cleanSummary )
-						->inContentLanguage()->text();
+					$this->summary = wfMessage( 'newsectionsummary' )
+						->rawParams( $cleanSummary )->inContentLanguage()->text();
 				}
 			} elseif ( $this->section != '' ) {
 				# Try to get a section anchor from the section source, redirect to edited section if header found
@@ -1661,37 +1664,15 @@ class EditPage {
 	function mergeChangesInto( &$editText ){
 		ContentHandler::deprecated( __METHOD__, "1.21" );
 
-		wfProfileIn( __METHOD__ );
+		$editContent = $this->toEditContent( $editText );
 
-		$db = wfGetDB( DB_MASTER );
+		$ok = $this->mergeChangesIntoContent( $editContent );
 
-		// This is the revision the editor started from
-		$baseRevision = $this->getBaseRevision();
-		if ( is_null( $baseRevision ) ) {
-			wfProfileOut( __METHOD__ );
-			return false;
-		}
-		$baseText = $baseRevision->getText();
-
-		// The current state, we want to merge updates into it
-		$currentRevision = Revision::loadFromTitle( $db, $this->mTitle );
-		if ( is_null( $currentRevision ) ) {
-			wfProfileOut( __METHOD__ );
-			return false;
-		}
-		$currentText = $currentRevision->getText();
-
-		$result = '';
-		$editText = $this->toEditText( $editText );
-
-		if ( wfMerge( $baseText, $editText, $currentText, $result ) ) {
-			$editText = $result;
-			wfProfileOut( __METHOD__ );
+		if ( $ok ) {
+			$editText = $this->toEditText( $editContent );
 			return true;
-		} else {
-			wfProfileOut( __METHOD__ );
-			return false;
 		}
+		return false;
 	}
 
 	/**
@@ -1940,7 +1921,7 @@ class EditPage {
 	 * an exception will be raised. Set $this->allowNonTextContent to true to allow editing of non-textual
 	 * content.
 	 *
-	 * @param Content|null|false|string $content
+	 * @param Content|null|bool|string $content
 	 * @return String the editable text form of the content.
 	 *
 	 * @throws MWException if $content is not an instance of TextContent and $this->allowNonTextContent is not true.
@@ -2266,7 +2247,7 @@ class EditPage {
 				if ( $revision ) {
 					// Let sysop know that this will make private content public if saved
 
-					if ( !$revision->userCan( Revision::DELETED_TEXT ) ) {
+					if ( !$revision->userCan( Revision::DELETED_TEXT, $wgUser ) ) {
 						$wgOut->wrapWikiMsg( "<div class='mw-warning plainlinks'>\n$1\n</div>\n", 'rev-deleted-text-permission' );
 					} elseif ( $revision->isDeleted( Revision::DELETED_TEXT ) ) {
 						$wgOut->wrapWikiMsg( "<div class='mw-warning plainlinks'>\n$1\n</div>\n", 'rev-deleted-text-view' );
@@ -2300,10 +2281,13 @@ class EditPage {
 					$wgOut->wrapWikiMsg( "<div class='error' id='mw-userinvalidcssjstitle'>\n$1\n</div>", array( 'userinvalidcssjstitle', $this->mTitle->getSkinFromCssJsSubpage() ) );
 				}
 				if ( $this->formtype !== 'preview' ) {
-					if ( $this->isCssSubpage )
+					if ( $this->isCssSubpage ) {
 						$wgOut->wrapWikiMsg( "<div id='mw-usercssyoucanpreview'>\n$1\n</div>", array( 'usercssyoucanpreview' ) );
-					if ( $this->isJsSubpage )
+					}
+
+					if ( $this->isJsSubpage ) {
 						$wgOut->wrapWikiMsg( "<div id='mw-userjsyoucanpreview'>\n$1\n</div>", array( 'userjsyoucanpreview' ) );
+					}
 				}
 			}
 		}
@@ -2434,14 +2418,16 @@ class EditPage {
 	 * @return String
 	 */
 	protected function getSummaryPreview( $isSubjectPreview, $summary = "" ) {
-		if ( !$summary || ( !$this->preview && !$this->diff ) )
+		if ( !$summary || ( !$this->preview && !$this->diff ) ) {
 			return "";
+		}
 
 		global $wgParser;
 
-		if ( $isSubjectPreview )
+		if ( $isSubjectPreview ) {
 			$summary = wfMessage( 'newsectionsummary', $wgParser->stripSectionName( $summary ) )
 				->inContentLanguage()->text();
+		}
 
 		$message = $isSubjectPreview ? 'subject-preview' : 'summary-preview';
 
@@ -2460,8 +2446,9 @@ class EditPage {
 
 HTML
 		);
-		if ( !$this->checkUnicodeCompliantBrowser() )
+		if ( !$this->checkUnicodeCompliantBrowser() ) {
 			$wgOut->addHTML( Html::hidden( 'safemode', '1' ) );
+		}
 	}
 
 	protected function showFormAfterText() {
@@ -2577,8 +2564,9 @@ HTML
 
 		$attribs = array( 'id' => 'wikiPreview', 'class' => implode( ' ', $classes ) );
 
-		if ( $this->formtype != 'preview' )
+		if ( $this->formtype != 'preview' ) {
 			$attribs['style'] = 'display: none;';
+		}
 
 		$wgOut->addHTML( Xml::openElement( 'div', $attribs ) );
 
@@ -2639,7 +2627,7 @@ HTML
 				$oldContent = null;
 			}
 		} else {
-			$oldContent = $this->getOriginalContent();
+			$oldContent = $this->getCurrentContent();
 		}
 
 		$textboxContent = $this->toEditContent( $this->textbox1 );
@@ -2883,10 +2871,13 @@ HTML
 		);
 		// Quick paranoid permission checks...
 		if ( is_object( $data ) ) {
-			if ( $data->log_deleted & LogPage::DELETED_USER )
+			if ( $data->log_deleted & LogPage::DELETED_USER ) {
 				$data->user_name = wfMessage( 'rev-deleted-user' )->escaped();
-			if ( $data->log_deleted & LogPage::DELETED_COMMENT )
+			}
+
+			if ( $data->log_deleted & LogPage::DELETED_COMMENT ) {
 				$data->log_comment = wfMessage( 'rev-deleted-comment' )->escaped();
+			}
 		}
 		return $data;
 	}
diff --git a/includes/Export.php b/includes/Export.php
index e2b01b5397..45a5366e1a 100644
--- a/includes/Export.php
+++ b/includes/Export.php
@@ -636,29 +636,29 @@ class XmlDumpWriter {
 
 		$out  = "    <revision>\n";
 		$out .= "      " . Xml::element( 'id', null, strval( $row->rev_id ) ) . "\n";
-		if( $row->rev_parent_id ) {
+		if( isset( $row->rev_parent_id ) && $row->rev_parent_id ) {
 			$out .= "      " . Xml::element( 'parentid', null, strval( $row->rev_parent_id ) ) . "\n";
 		}
 
 		$out .= $this->writeTimestamp( $row->rev_timestamp );
 
-		if ( $row->rev_deleted & Revision::DELETED_USER ) {
+		if ( isset( $row->rev_deleted ) && ( $row->rev_deleted & Revision::DELETED_USER ) ) {
 			$out .= "      " . Xml::element( 'contributor', array( 'deleted' => 'deleted' ) ) . "\n";
 		} else {
 			$out .= $this->writeContributor( $row->rev_user, $row->rev_user_text );
 		}
 
-		if ( $row->rev_minor_edit ) {
+		if ( isset( $row->rev_minor_edit ) && $row->rev_minor_edit ) {
 			$out .=  "      <minor/>\n";
 		}
-		if ( $row->rev_deleted & Revision::DELETED_COMMENT ) {
+		if ( isset( $row->rev_deleted ) && ( $row->rev_deleted & Revision::DELETED_COMMENT ) ) {
 			$out .= "      " . Xml::element( 'comment', array( 'deleted' => 'deleted' ) ) . "\n";
 		} elseif ( $row->rev_comment != '' ) {
 			$out .= "      " . Xml::elementClean( 'comment', array(), strval( $row->rev_comment ) ) . "\n";
 		}
 
 		$text = '';
-		if ( $row->rev_deleted & Revision::DELETED_TEXT ) {
+		if ( isset( $row->rev_deleted ) && ( $row->rev_deleted & Revision::DELETED_TEXT ) ) {
 			$out .= "      " . Xml::element( 'text', array( 'deleted' => 'deleted' ) ) . "\n";
 		} elseif ( isset( $row->old_text ) ) {
 			// Raw text from the database may have invalid chars
@@ -673,7 +673,7 @@ class XmlDumpWriter {
 				"" ) . "\n";
 		}
 
-		if ( $row->rev_sha1 && !( $row->rev_deleted & Revision::DELETED_TEXT ) ) {
+		if ( isset( $row->rev_sha1 ) && $row->rev_sha1 && !( $row->rev_deleted & Revision::DELETED_TEXT ) ) {
 			$out .= "      " . Xml::element('sha1', null, strval( $row->rev_sha1 ) ) . "\n";
 		} else {
 			$out .= "      <sha1/>\n";
diff --git a/includes/Html.php b/includes/Html.php
index 5be67ab6d9..01dca6f92c 100644
--- a/includes/Html.php
+++ b/includes/Html.php
@@ -48,7 +48,7 @@
  * @since 1.16
  */
 class Html {
-	# List of void elements from HTML5, section 8.1.2 as of 2011-08-12
+	// List of void elements from HTML5, section 8.1.2 as of 2011-08-12
 	private static $voidElements = array(
 		'area',
 		'base',
@@ -68,8 +68,8 @@ class Html {
 		'wbr',
 	);
 
-	# Boolean attributes, which may have the value omitted entirely.  Manually
-	# collected from the HTML5 spec as of 2011-08-12.
+	// Boolean attributes, which may have the value omitted entirely.  Manually
+	// collected from the HTML5 spec as of 2011-08-12.
 	private static $boolAttribs = array(
 		'async',
 		'autofocus',
@@ -97,7 +97,7 @@ class Html {
 		'selected',
 		'truespeed',
 		'typemustmatch',
-		# HTML5 Microdata
+		// HTML5 Microdata
 		'itemscope',
 	);
 
@@ -139,7 +139,7 @@ class Html {
 		$start = self::openElement( $element, $attribs );
 		if ( in_array( $element, self::$voidElements ) ) {
 			if ( $wgWellFormedXml ) {
-				# Silly XML.
+				// Silly XML.
 				return substr( $start, 0, -1 ) . ' />';
 			}
 			return $start;
@@ -160,8 +160,8 @@ class Html {
 	 */
 	public static function element( $element, $attribs = array(), $contents = '' ) {
 		return self::rawElement( $element, $attribs, strtr( $contents, array(
-			# There's no point in escaping quotes, >, etc. in the contents of
-			# elements.
+			// There's no point in escaping quotes, >, etc. in the contents of
+			// elements.
 			'&' => '&amp;',
 			'<' => '&lt;'
 		) ) );
@@ -179,19 +179,19 @@ class Html {
 	public static function openElement( $element, $attribs = array() ) {
 		global $wgHtml5, $wgWellFormedXml;
 		$attribs = (array)$attribs;
-		# This is not required in HTML5, but let's do it anyway, for
-		# consistency and better compression.
+		// This is not required in HTML5, but let's do it anyway, for
+		// consistency and better compression.
 		$element = strtolower( $element );
 
-		# In text/html, initial <html> and <head> tags can be omitted under
-		# pretty much any sane circumstances, if they have no attributes.  See:
-		# <http://www.whatwg.org/specs/web-apps/current-work/multipage/syntax.html#optional-tags>
+		// In text/html, initial <html> and <head> tags can be omitted under
+		// pretty much any sane circumstances, if they have no attributes.  See:
+		// <http://www.whatwg.org/specs/web-apps/current-work/multipage/syntax.html#optional-tags>
 		if ( !$wgWellFormedXml && !$attribs
 		&& in_array( $element, array( 'html', 'head' ) ) ) {
 			return '';
 		}
 
-		# Remove invalid input types
+		// Remove invalid input types
 		if ( $element == 'input' ) {
 			$validTypes = array(
 				'hidden',
@@ -206,7 +206,7 @@ class Html {
 				'button',
 			);
 
-			# Allow more input types in HTML5 mode
+			// Allow more input types in HTML5 mode
 			if( $wgHtml5 ) {
 				$validTypes = array_merge( $validTypes, array(
 					'datetime',
@@ -251,8 +251,8 @@ class Html {
 
 		$element = strtolower( $element );
 
-		# Reference:
-		# http://www.whatwg.org/specs/web-apps/current-work/multipage/syntax.html#optional-tags
+		// Reference:
+		// http://www.whatwg.org/specs/web-apps/current-work/multipage/syntax.html#optional-tags
 		if ( !$wgWellFormedXml && in_array( $element, array(
 			'html',
 			'head',
@@ -287,15 +287,15 @@ class Html {
 	 * @return array An array of attributes functionally identical to $attribs
 	 */
 	private static function dropDefaults( $element, $attribs ) {
-		# Don't bother doing anything if we aren't outputting HTML5; it's too
-		# much of a pain to maintain two sets of defaults.
+		// Don't bother doing anything if we aren't outputting HTML5; it's too
+		// much of a pain to maintain two sets of defaults.
 		global $wgHtml5;
 		if ( !$wgHtml5 ) {
 			return $attribs;
 		}
 
-		# Whenever altering this array, please provide a covering test case
-		# in HtmlTest::provideElementsWithAttributesHavingDefaultValues
+		// Whenever altering this array, please provide a covering test case
+		// in HtmlTest::provideElementsWithAttributesHavingDefaultValues
 		static $attribDefaults = array(
 			'area' => array( 'shape' => 'rect' ),
 			'button' => array(
@@ -320,8 +320,8 @@ class Html {
 			'keygen' => array( 'keytype' => 'rsa' ),
 			'link' => array( 'media' => 'all' ),
 			'menu' => array( 'type' => 'list' ),
-			# Note: the use of text/javascript here instead of other JavaScript
-			# MIME types follows the HTML5 spec.
+			// Note: the use of text/javascript here instead of other JavaScript
+			// MIME types follows the HTML5 spec.
 			'script' => array( 'type' => 'text/javascript' ),
 			'style' => array(
 				'media' => 'all',
@@ -340,7 +340,7 @@ class Html {
 				$value = strval( $value );
 			}
 
-			# Simple checks using $attribDefaults
+			// Simple checks using $attribDefaults
 			if ( isset( $attribDefaults[$element][$lcattrib] ) &&
 			$attribDefaults[$element][$lcattrib] == $value ) {
 				unset( $attribs[$attrib] );
@@ -351,7 +351,7 @@ class Html {
 			}
 		}
 
-		# More subtle checks
+		// More subtle checks
 		if ( $element === 'link' && isset( $attribs['type'] )
 		&& strval( $attribs['type'] ) == 'text/css' ) {
 			unset( $attribs['type'] );
@@ -383,12 +383,12 @@ class Html {
 			if ( in_array( 'multiple', $attribs )
 				|| ( isset( $attribs['multiple'] ) && $attribs['multiple'] !== false )
 			) {
-				# A multi-select
+				// A multi-select
 				if ( strval( $attribs['size'] ) == '4' ) {
 					unset( $attribs['size'] );
 				}
 			} else {
-				# Single select
+				// Single select
 				if ( strval( $attribs['size'] ) == '1' ) {
 					unset( $attribs['size'] );
 				}
@@ -447,29 +447,29 @@ class Html {
 				continue;
 			}
 
-			# For boolean attributes, support array( 'foo' ) instead of
-			# requiring array( 'foo' => 'meaningless' ).
+			// For boolean attributes, support array( 'foo' ) instead of
+			// requiring array( 'foo' => 'meaningless' ).
 			if ( is_int( $key )
 			&& in_array( strtolower( $value ), self::$boolAttribs ) ) {
 				$key = $value;
 			}
 
-			# Not technically required in HTML5, but required in XHTML 1.0,
-			# and we'd like consistency and better compression anyway.
+			// Not technically required in HTML5, but required in XHTML 1.0,
+			// and we'd like consistency and better compression anyway.
 			$key = strtolower( $key );
 
-			# Here we're blacklisting some HTML5-only attributes...
+			// Here we're blacklisting some HTML5-only attributes...
 			if ( !$wgHtml5 && in_array( $key, self::$HTMLFiveOnlyAttribs )
 			 ) {
 				continue;
 			}
 
-			# Bug 23769: Blacklist all form validation attributes for now.  Current
-			# (June 2010) WebKit has no UI, so the form just refuses to submit
-			# without telling the user why, which is much worse than failing
-			# server-side validation.  Opera is the only other implementation at
-			# this time, and has ugly UI, so just kill the feature entirely until
-			# we have at least one good implementation.
+			// Bug 23769: Blacklist all form validation attributes for now.  Current
+			// (June 2010) WebKit has no UI, so the form just refuses to submit
+			// without telling the user why, which is much worse than failing
+			// server-side validation.  Opera is the only other implementation at
+			// this time, and has ugly UI, so just kill the feature entirely until
+			// we have at least one good implementation.
 			if ( in_array( $key, array( 'max', 'min', 'pattern', 'required', 'step' ) ) ) {
 				continue;
 			}
@@ -485,7 +485,7 @@ class Html {
 				'rel',
 			);
 
-			# Specific features for attributes that allow a list of space-separated values
+			// Specific features for attributes that allow a list of space-separated values
 			if ( in_array( $key, $spaceSeparatedListAttributes ) ) {
 				// Apply some normalization and remove duplicates
 
@@ -522,14 +522,14 @@ class Html {
 				$value = implode( ' ', array_unique( $value ) );
 			}
 
-			# See the "Attributes" section in the HTML syntax part of HTML5,
-			# 9.1.2.3 as of 2009-08-10.  Most attributes can have quotation
-			# marks omitted, but not all.  (Although a literal " is not
-			# permitted, we don't check for that, since it will be escaped
-			# anyway.)
+			// See the "Attributes" section in the HTML syntax part of HTML5,
+			// 9.1.2.3 as of 2009-08-10.  Most attributes can have quotation
+			// marks omitted, but not all.  (Although a literal " is not
+			// permitted, we don't check for that, since it will be escaped
+			// anyway.)
 			#
-			# See also research done on further characters that need to be
-			# escaped: http://code.google.com/p/html5lib/issues/detail?id=93
+			// See also research done on further characters that need to be
+			// escaped: http://code.google.com/p/html5lib/issues/detail?id=93
 			$badChars = "\\x00- '=<>`/\x{00a0}\x{1680}\x{180e}\x{180F}\x{2000}\x{2001}"
 				. "\x{2002}\x{2003}\x{2004}\x{2005}\x{2006}\x{2007}\x{2008}\x{2009}"
 				. "\x{200A}\x{2028}\x{2029}\x{202F}\x{205F}\x{3000}";
@@ -541,9 +541,9 @@ class Html {
 			}
 
 			if ( in_array( $key, self::$boolAttribs ) ) {
-				# In XHTML 1.0 Transitional, the value needs to be equal to the
-				# key.  In HTML5, we can leave the value empty instead.  If we
-				# don't need well-formed XML, we can omit the = entirely.
+				// In XHTML 1.0 Transitional, the value needs to be equal to the
+				// key.  In HTML5, we can leave the value empty instead.  If we
+				// don't need well-formed XML, we can omit the = entirely.
 				if ( !$wgWellFormedXml ) {
 					$ret .= " $key";
 				} elseif ( $wgHtml5 ) {
@@ -552,16 +552,16 @@ class Html {
 					$ret .= " $key=\"$key\"";
 				}
 			} else {
-				# Apparently we need to entity-encode \n, \r, \t, although the
-				# spec doesn't mention that.  Since we're doing strtr() anyway,
-				# and we don't need <> escaped here, we may as well not call
-				# htmlspecialchars().
-				# @todo FIXME: Verify that we actually need to
-				# escape \n\r\t here, and explain why, exactly.
+				// Apparently we need to entity-encode \n, \r, \t, although the
+				// spec doesn't mention that.  Since we're doing strtr() anyway,
+				// and we don't need <> escaped here, we may as well not call
+				// htmlspecialchars().
+				// @todo FIXME: Verify that we actually need to
+				// escape \n\r\t here, and explain why, exactly.
 				#
-				# We could call Sanitizer::encodeAttribute() for this, but we
-				# don't because we're stubborn and like our marginal savings on
-				# byte size from not having to encode unnecessary quotes.
+				// We could call Sanitizer::encodeAttribute() for this, but we
+				// don't because we're stubborn and like our marginal savings on
+				// byte size from not having to encode unnecessary quotes.
 				$map = array(
 					'&' => '&amp;',
 					'"' => '&quot;',
@@ -570,9 +570,9 @@ class Html {
 					"\t" => '&#9;'
 				);
 				if ( $wgWellFormedXml ) {
-					# This is allowed per spec: <http://www.w3.org/TR/xml/#NT-AttValue>
-					# But reportedly it breaks some XML tools?
-					# @todo FIXME: Is this really true?
+					// This is allowed per spec: <http://www.w3.org/TR/xml/#NT-AttValue>
+					// But reportedly it breaks some XML tools?
+					// @todo FIXME: Is this really true?
 					$map['<'] = '&lt;';
 				}
 				$ret .= " $key=$quote" . strtr( $value, $map ) . $quote;
diff --git a/includes/HttpFunctions.php b/includes/HttpFunctions.php
index 32f77dcfab..e621f625ac 100644
--- a/includes/HttpFunctions.php
+++ b/includes/HttpFunctions.php
@@ -581,8 +581,8 @@ class MWHttpRequest {
 	}
 
 	/**
-	 * Sets a cookie.  Used before a request to set up any individual
-	 * cookies.	 Used internally after a request to parse the
+	 * Sets a cookie. Used before a request to set up any individual
+	 * cookies. Used internally after a request to parse the
 	 * Set-Cookie headers.
 	 * @see Cookie::set
 	 * @param $name
diff --git a/includes/Import.php b/includes/Import.php
index 71498ac72e..201746661b 100644
--- a/includes/Import.php
+++ b/includes/Import.php
@@ -1397,6 +1397,7 @@ class WikiRevision {
 		# @todo FIXME: Use original rev_id optionally (better for backups)
 		# Insert the row
 		$revision = new Revision( array(
+			'title'      => $this->title,
 			'page'       => $pageId,
 			'content_model'  => $this->getModel(),
 			'content_format' => $this->getFormat(),
diff --git a/includes/Linker.php b/includes/Linker.php
index b947f8f4e7..e5db232a51 100644
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -2136,7 +2136,7 @@ class Linker {
 	}
 
 	/**
-	 * @deprecated since 1.16 Use link()
+	 * @deprecated since 1.16 Use link(); warnings since 1.21
 	 *
 	 * Make a link for a title which may or may not be in the database. If you need to
 	 * call this lots of times, pre-fill the link cache with a LinkBatch, otherwise each
@@ -2153,7 +2153,7 @@ class Linker {
 	 * @return string
 	 */
 	static function makeLinkObj( $nt, $text = '', $query = '', $trail = '', $prefix = '' ) {
-		# wfDeprecated( __METHOD__, '1.16' ); // See r105985 and it's revert. Somewhere still used.
+		wfDeprecated( __METHOD__, '1.21' );
 
 		wfProfileIn( __METHOD__ );
 		$query = wfCgiToArray( $query );
@@ -2169,7 +2169,7 @@ class Linker {
 	}
 
 	/**
-	 * @deprecated since 1.16 Use link()
+	 * @deprecated since 1.16 Use link(); warnings since 1.21
 	 *
 	 * Make a link for a title which definitely exists. This is faster than makeLinkObj because
 	 * it doesn't have to do a database query. It's also valid for interwiki titles and special
@@ -2187,7 +2187,7 @@ class Linker {
 	static function makeKnownLinkObj(
 		$title, $text = '', $query = '', $trail = '', $prefix = '' , $aprops = '', $style = ''
 	) {
-		# wfDeprecated( __METHOD__, '1.16' ); // See r105985 and it's revert. Somewhere still used.
+		wfDeprecated( __METHOD__, '1.21' );
 
 		wfProfileIn( __METHOD__ );
 
diff --git a/includes/MagicWord.php b/includes/MagicWord.php
index 42791f57a5..6d2e1dca94 100644
--- a/includes/MagicWord.php
+++ b/includes/MagicWord.php
@@ -534,7 +534,7 @@ class MagicWord {
 	 *
 	 * @return string
 	 */
-	function getVariableRegex()	{
+	function getVariableRegex() {
 		if ( $this->mVariableRegex == '' ) {
 			$this->initRegex();
 		}
diff --git a/includes/Message.php b/includes/Message.php
index 2feaed2b71..5a4b810d1e 100644
--- a/includes/Message.php
+++ b/includes/Message.php
@@ -629,7 +629,8 @@ class Message {
 	 * @return string Wikitext parsed into HTML
 	 */
 	protected function parseText( $string ) {
-		return MessageCache::singleton()->parse( $string, $this->title, /*linestart*/true, $this->interface, $this->language )->getText();
+		$out = MessageCache::singleton()->parse( $string, $this->title, /*linestart*/true, $this->interface, $this->language );
+		return is_object( $out ) ? $out->getText() : $out;
 	}
 
 	/**
diff --git a/includes/MimeMagic.php b/includes/MimeMagic.php
index 88383d8f38..65a2a6fa79 100644
--- a/includes/MimeMagic.php
+++ b/includes/MimeMagic.php
@@ -433,7 +433,7 @@ class MimeMagic {
 		$ext = explode( ' ', $ext );
 
 		$extension = strtolower( $extension );
- 		return  in_array( $extension, $ext );
+		return  in_array( $extension, $ext );
 	}
 
 	/**
diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 3578568651..ff83f700ad 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -2982,7 +2982,7 @@ $templates
 		);
 		if ( $wgContLang->hasVariants() ) {
 			$vars['wgUserVariant'] = $wgContLang->getPreferredVariant();
- 		}
+		}
 		foreach ( $title->getRestrictionTypes() as $type ) {
 			$vars['wgRestriction' . ucfirst( $type )] = $title->getRestrictions( $type );
 		}
diff --git a/includes/RecentChange.php b/includes/RecentChange.php
index debec69faf..2bdcab4031 100644
--- a/includes/RecentChange.php
+++ b/includes/RecentChange.php
@@ -125,7 +125,7 @@ class RecentChange {
 	 */
 	public static function newFromConds( $conds, $fname = __METHOD__ ) {
 		$dbr = wfGetDB( DB_SLAVE );
-		$row = $dbr->selectRow( 'recentchanges', '*', $conds, $fname );
+		$row = $dbr->selectRow( 'recentchanges', self::selectFields(), $conds, $fname );
 		if ( $row !== false ) {
 			return self::newFromRow( $row );
 		} else {
@@ -133,6 +133,40 @@ class RecentChange {
 		}
 	}
 
+	/**
+	 * Return the list of recentchanges fields that should be selected to create
+	 * a new recentchanges object.
+	 * @return array
+	 */
+	public static function selectFields() {
+		return array(
+			'rc_id',
+			'rc_timestamp',
+			'rc_cur_time',
+			'rc_user',
+			'rc_user_text',
+			'rc_namespace',
+			'rc_title',
+			'rc_comment',
+			'rc_minor',
+			'rc_bot',
+			'rc_new',
+			'rc_cur_id',
+			'rc_this_oldid',
+			'rc_last_oldid',
+			'rc_type',
+			'rc_patrolled',
+			'rc_ip',
+			'rc_old_len',
+			'rc_new_len',
+			'rc_deleted',
+			'rc_logid',
+			'rc_log_type',
+			'rc_log_action',
+			'rc_params',
+		);
+	}
+
 	# Accessors
 
 	/**
@@ -154,7 +188,7 @@ class RecentChange {
 	 * @return Title
 	 */
 	public function &getTitle() {
-		if( $this->mTitle === false ) {
+		if ( $this->mTitle === false ) {
 			$this->mTitle = Title::makeTitle( $this->mAttribs['rc_namespace'], $this->mAttribs['rc_title'] );
 			# Make sure the correct page ID is process cached
 			$this->mTitle->resetArticleID( $this->mAttribs['rc_cur_id'] );
@@ -186,17 +220,17 @@ class RecentChange {
 		global $wgLocalInterwiki, $wgPutIPinRC, $wgUseEnotif, $wgShowUpdatedMarker, $wgContLang;
 
 		$dbw = wfGetDB( DB_MASTER );
-		if( !is_array($this->mExtra) ) {
+		if ( !is_array( $this->mExtra ) ) {
 			$this->mExtra = array();
 		}
 		$this->mExtra['lang'] = $wgLocalInterwiki;
 
-		if( !$wgPutIPinRC ) {
+		if ( !$wgPutIPinRC ) {
 			$this->mAttribs['rc_ip'] = '';
 		}
 
 		# If our database is strict about IP addresses, use NULL instead of an empty string
-		if( $dbw->strictIPs() and $this->mAttribs['rc_ip'] == '' ) {
+		if ( $dbw->strictIPs() and $this->mAttribs['rc_ip'] == '' ) {
 			unset( $this->mAttribs['rc_ip'] );
 		}
 
@@ -204,12 +238,12 @@ class RecentChange {
 		$this->mAttribs['rc_comment'] = $wgContLang->truncate( $this->mAttribs['rc_comment'], 255 );
 
 		# Fixup database timestamps
-		$this->mAttribs['rc_timestamp'] = $dbw->timestamp($this->mAttribs['rc_timestamp']);
-		$this->mAttribs['rc_cur_time'] = $dbw->timestamp($this->mAttribs['rc_cur_time']);
+		$this->mAttribs['rc_timestamp'] = $dbw->timestamp( $this->mAttribs['rc_timestamp'] );
+		$this->mAttribs['rc_cur_time'] = $dbw->timestamp( $this->mAttribs['rc_cur_time'] );
 		$this->mAttribs['rc_id'] = $dbw->nextSequenceValue( 'recentchanges_rc_id_seq' );
 
 		## If we are using foreign keys, an entry of 0 for the page_id will fail, so use NULL
-		if( $dbw->cascadingDeletes() and $this->mAttribs['rc_cur_id']==0 ) {
+		if ( $dbw->cascadingDeletes() and $this->mAttribs['rc_cur_id'] == 0 ) {
 			unset( $this->mAttribs['rc_cur_id'] );
 		}
 
@@ -228,11 +262,11 @@ class RecentChange {
 		}
 
 		# E-mail notifications
-		if( $wgUseEnotif || $wgShowUpdatedMarker ) {
+		if ( $wgUseEnotif || $wgShowUpdatedMarker ) {
 			$editor = $this->getPerformer();
 			$title = $this->getTitle();
 
-			if ( wfRunHooks( 'AbortEmailNotification', array($editor, $title) ) ) {
+			if ( wfRunHooks( 'AbortEmailNotification', array( $editor, $title ) ) ) {
 				# @todo FIXME: This would be better as an extension hook
 				$enotif = new EmailNotification();
 				$enotif->notifyOnPageChange( $editor, $title,
@@ -247,7 +281,7 @@ class RecentChange {
 	public function notifyRC2UDP() {
 		global $wgRC2UDPAddress, $wgRC2UDPOmitBots;
 		# Notify external application via UDP
-		if( $wgRC2UDPAddress && ( !$this->mAttribs['rc_bot'] || !$wgRC2UDPOmitBots ) ) {
+		if ( $wgRC2UDPAddress && ( !$this->mAttribs['rc_bot'] || !$wgRC2UDPOmitBots ) ) {
 			self::sendToUDP( $this->getIRCLine() );
 		}
 	}
@@ -268,12 +302,12 @@ class RecentChange {
 		$prefix = $prefix ? $prefix : $wgRC2UDPPrefix;
 		$port = $port ? $port : $wgRC2UDPPort;
 		# Notify external application via UDP
-		if( $address ) {
+		if ( $address ) {
 			$conn = socket_create( AF_INET, SOCK_DGRAM, SOL_UDP );
-			if( $conn ) {
+			if ( $conn ) {
 				$line = $prefix . $line;
 				wfDebug( __METHOD__ . ": sending UDP line: $line\n" );
-				socket_sendto( $conn, $line, strlen($line), 0, $address, $port );
+				socket_sendto( $conn, $line, strlen( $line ), 0, $address, $port );
 				socket_close( $conn );
 				return true;
 			} else {
@@ -304,9 +338,9 @@ class RecentChange {
 
 		$change = $change instanceof RecentChange
 			? $change
-			: RecentChange::newFromId($change);
+			: RecentChange::newFromId( $change );
 
-		if( !$change instanceof RecentChange ) {
+		if ( !$change instanceof RecentChange ) {
 			return null;
 		}
 		return $change->doMarkPatrolled( $wgUser, $auto );
@@ -325,32 +359,32 @@ class RecentChange {
 		$errors = array();
 		// If recentchanges patrol is disabled, only new pages
 		// can be patrolled
-		if( !$wgUseRCPatrol && ( !$wgUseNPPatrol || $this->getAttribute('rc_type') != RC_NEW ) ) {
-			$errors[] = array('rcpatroldisabled');
+		if ( !$wgUseRCPatrol && ( !$wgUseNPPatrol || $this->getAttribute( 'rc_type' ) != RC_NEW ) ) {
+			$errors[] = array( 'rcpatroldisabled' );
 		}
 		// Automatic patrol needs "autopatrol", ordinary patrol needs "patrol"
 		$right = $auto ? 'autopatrol' : 'patrol';
 		$errors = array_merge( $errors, $this->getTitle()->getUserPermissionsErrors( $right, $user ) );
-		if( !wfRunHooks('MarkPatrolled', array($this->getAttribute('rc_id'), &$user, false)) ) {
-			$errors[] = array('hookaborted');
+		if ( !wfRunHooks( 'MarkPatrolled', array( $this->getAttribute( 'rc_id' ), &$user, false ) ) ) {
+			$errors[] = array( 'hookaborted' );
 		}
 		// Users without the 'autopatrol' right can't patrol their
 		// own revisions
-		if( $user->getName() == $this->getAttribute('rc_user_text') && !$user->isAllowed('autopatrol') ) {
-			$errors[] = array('markedaspatrollederror-noautopatrol');
+		if ( $user->getName() == $this->getAttribute( 'rc_user_text' ) && !$user->isAllowed( 'autopatrol' ) ) {
+			$errors[] = array( 'markedaspatrollederror-noautopatrol' );
 		}
-		if( $errors ) {
+		if ( $errors ) {
 			return $errors;
 		}
 		// If the change was patrolled already, do nothing
-		if( $this->getAttribute('rc_patrolled') ) {
+		if ( $this->getAttribute( 'rc_patrolled' ) ) {
 			return array();
 		}
 		// Actually set the 'patrolled' flag in RC
 		$this->reallyMarkPatrolled();
 		// Log this patrol event
 		PatrolLog::record( $this, $auto, $user );
-		wfRunHooks( 'MarkPatrolledComplete', array($this->getAttribute('rc_id'), &$user, false) );
+		wfRunHooks( 'MarkPatrolledComplete', array( $this->getAttribute( 'rc_id' ), &$user, false ) );
 		return array();
 	}
 
@@ -366,7 +400,7 @@ class RecentChange {
 				'rc_patrolled' => 1
 			),
 			array(
-				'rc_id' => $this->getAttribute('rc_id')
+				'rc_id' => $this->getAttribute( 'rc_id' )
 			),
 			__METHOD__
 		);
@@ -392,7 +426,7 @@ class RecentChange {
 	 * @return RecentChange
 	 */
 	public static function notifyEdit( $timestamp, &$title, $minor, &$user, $comment, $oldId,
-		$lastTimestamp, $bot, $ip='', $oldSize=0, $newSize=0, $newId=0, $patrol=0 ) {
+		$lastTimestamp, $bot, $ip = '', $oldSize = 0, $newSize = 0, $newId = 0, $patrol = 0 ) {
 		$rc = new RecentChange;
 		$rc->mTitle = $title;
 		$rc->mPerformer = $user;
@@ -411,7 +445,7 @@ class RecentChange {
 			'rc_last_oldid' => $oldId,
 			'rc_bot'        => $bot ? 1 : 0,
 			'rc_ip'         => self::checkIPAddress( $ip ),
-			'rc_patrolled'  => intval($patrol),
+			'rc_patrolled'  => intval( $patrol ),
 			'rc_new'        => 0,  # obsolete
 			'rc_old_len'    => $oldSize,
 			'rc_new_len'    => $newSize,
@@ -450,7 +484,7 @@ class RecentChange {
 	 * @return RecentChange
 	 */
 	public static function notifyNew( $timestamp, &$title, $minor, &$user, $comment, $bot,
-		$ip='', $size=0, $newId=0, $patrol=0 ) {
+		$ip = '', $size = 0, $newId = 0, $patrol = 0 ) {
 		$rc = new RecentChange;
 		$rc->mTitle = $title;
 		$rc->mPerformer = $user;
@@ -469,7 +503,7 @@ class RecentChange {
 			'rc_last_oldid'     => 0,
 			'rc_bot'            => $bot ? 1 : 0,
 			'rc_ip'             => self::checkIPAddress( $ip ),
-			'rc_patrolled'      => intval($patrol),
+			'rc_patrolled'      => intval( $patrol ),
 			'rc_new'            => 1, # obsolete
 			'rc_old_len'        => 0,
 			'rc_new_len'        => $size,
@@ -506,11 +540,11 @@ class RecentChange {
 	 * @return bool
 	 */
 	public static function notifyLog( $timestamp, &$title, &$user, $actionComment, $ip, $type,
-		$action, $target, $logComment, $params, $newId=0, $actionCommentIRC='' )
+		$action, $target, $logComment, $params, $newId = 0, $actionCommentIRC = '' )
 	{
 		global $wgLogRestrictions;
 		# Don't add private logs to RC!
-		if( isset($wgLogRestrictions[$type]) && $wgLogRestrictions[$type] != '*' ) {
+		if ( isset( $wgLogRestrictions[$type] ) && $wgLogRestrictions[$type] != '*' ) {
 			return false;
 		}
 		$rc = self::newLogEntry( $timestamp, $title, $user, $actionComment, $ip, $type, $action,
@@ -535,7 +569,7 @@ class RecentChange {
 	 * @return RecentChange
 	 */
 	public static function newLogEntry( $timestamp, &$title, &$user, $actionComment, $ip,
-		$type, $action, $target, $logComment, $params, $newId=0, $actionCommentIRC='' ) {
+		$type, $action, $target, $logComment, $params, $newId = 0, $actionCommentIRC = '' ) {
 		global $wgRequest;
 
 		$rc = new RecentChange;
@@ -583,7 +617,7 @@ class RecentChange {
 	 */
 	public function loadFromRow( $row ) {
 		$this->mAttribs = get_object_vars( $row );
-		$this->mAttribs['rc_timestamp'] = wfTimestamp(TS_MW, $this->mAttribs['rc_timestamp']);
+		$this->mAttribs['rc_timestamp'] = wfTimestamp( TS_MW, $this->mAttribs['rc_timestamp'] );
 		$this->mAttribs['rc_deleted'] = $row->rc_deleted; // MUST be set
 	}
 
@@ -594,7 +628,7 @@ class RecentChange {
 	 */
 	public function loadFromCurRow( $row ) {
 		$this->mAttribs = array(
-			'rc_timestamp' => wfTimestamp(TS_MW, $row->rev_timestamp),
+			'rc_timestamp' => wfTimestamp( TS_MW, $row->rev_timestamp ),
 			'rc_cur_time' => $row->rev_timestamp,
 			'rc_user' => $row->rev_user,
 			'rc_user_text' => $row->rev_user_text,
@@ -604,19 +638,19 @@ class RecentChange {
 			'rc_minor' => $row->rev_minor_edit ? 1 : 0,
 			'rc_type' => $row->page_is_new ? RC_NEW : RC_EDIT,
 			'rc_cur_id' => $row->page_id,
-			'rc_this_oldid'	=> $row->rev_id,
-			'rc_last_oldid'	=> isset($row->rc_last_oldid) ? $row->rc_last_oldid : 0,
-			'rc_bot'	=> 0,
+			'rc_this_oldid' => $row->rev_id,
+			'rc_last_oldid' => isset( $row->rc_last_oldid ) ? $row->rc_last_oldid : 0,
+			'rc_bot' => 0,
 			'rc_ip' => '',
 			'rc_id' => $row->rc_id,
 			'rc_patrolled' => $row->rc_patrolled,
 			'rc_new' => $row->page_is_new, # obsolete
 			'rc_old_len' => $row->rc_old_len,
 			'rc_new_len' => $row->rc_new_len,
-			'rc_params' => isset($row->rc_params) ? $row->rc_params : '',
-			'rc_log_type' => isset($row->rc_log_type) ? $row->rc_log_type : null,
-			'rc_log_action' => isset($row->rc_log_action) ? $row->rc_log_action : null,
-			'rc_log_id' => isset($row->rc_log_id) ? $row->rc_log_id: 0,
+			'rc_params' => isset( $row->rc_params ) ? $row->rc_params : '',
+			'rc_log_type' => isset( $row->rc_log_type ) ? $row->rc_log_type : null,
+			'rc_log_action' => isset( $row->rc_log_action ) ? $row->rc_log_action : null,
+			'rc_logid' => isset( $row->rc_logid ) ? $row->rc_logid : 0,
 			'rc_deleted' => $row->rc_deleted // MUST be set
 		);
 	}
@@ -645,13 +679,13 @@ class RecentChange {
 	 * @return string
 	 */
 	public function diffLinkTrail( $forceCur ) {
-		if( $this->mAttribs['rc_type'] == RC_EDIT ) {
-			$trail = "curid=" . (int)($this->mAttribs['rc_cur_id']) .
-				"&oldid=" . (int)($this->mAttribs['rc_last_oldid']);
-			if( $forceCur ) {
+		if ( $this->mAttribs['rc_type'] == RC_EDIT ) {
+			$trail = "curid=" . (int)( $this->mAttribs['rc_cur_id'] ) .
+				"&oldid=" . (int)( $this->mAttribs['rc_last_oldid'] );
+			if ( $forceCur ) {
 				$trail .= '&diff=0' ;
 			} else {
-				$trail .= '&diff=' . (int)($this->mAttribs['rc_this_oldid']);
+				$trail .= '&diff=' . (int)( $this->mAttribs['rc_this_oldid'] );
 			}
 		} else {
 			$trail = '';
@@ -666,7 +700,7 @@ class RecentChange {
 		global $wgUseRCPatrol, $wgUseNPPatrol, $wgRC2UDPInterwikiPrefix, $wgLocalInterwiki,
 			$wgCanonicalServer, $wgScript;
 
-		if( $this->mAttribs['rc_type'] == RC_LOG ) {
+		if ( $this->mAttribs['rc_type'] == RC_LOG ) {
 			// Don't use SpecialPage::getTitleFor, backwards compatibility with
 			// IRC API which expects "Log".
 			$titleObj = Title::newFromText( 'Log/' . $this->mAttribs['rc_log_type'], NS_SPECIAL );
@@ -676,11 +710,11 @@ class RecentChange {
 		$title = $titleObj->getPrefixedText();
 		$title = self::cleanupForIRC( $title );
 
-		if( $this->mAttribs['rc_type'] == RC_LOG ) {
+		if ( $this->mAttribs['rc_type'] == RC_LOG ) {
 			$url = '';
 		} else {
 			$url = $wgCanonicalServer . $wgScript;
-			if( $this->mAttribs['rc_type'] == RC_NEW ) {
+			if ( $this->mAttribs['rc_type'] == RC_NEW ) {
 				$query = '?oldid=' . $this->mAttribs['rc_this_oldid'];
 			} else {
 				$query = '?diff=' . $this->mAttribs['rc_this_oldid'] . '&oldid=' . $this->mAttribs['rc_last_oldid'];
@@ -693,11 +727,11 @@ class RecentChange {
 			$url .= $query;
 		}
 
-		if( $this->mAttribs['rc_old_len'] !== null && $this->mAttribs['rc_new_len'] !== null ) {
+		if ( $this->mAttribs['rc_old_len'] !== null && $this->mAttribs['rc_new_len'] !== null ) {
 			$szdiff = $this->mAttribs['rc_new_len'] - $this->mAttribs['rc_old_len'];
-			if($szdiff < -500) {
+			if ( $szdiff < -500 ) {
 				$szdiff = "\002$szdiff\002";
-			} elseif($szdiff >= 0) {
+			} elseif ( $szdiff >= 0 ) {
 				$szdiff = '+' . $szdiff ;
 			}
 			// @todo i18n with parentheses in content language?
@@ -750,13 +784,13 @@ class RecentChange {
 	 * @return string
 	 */
 	public function getCharacterDifference( $old = 0, $new = 0 ) {
-		if( $old === 0 ) {
+		if ( $old === 0 ) {
 			$old = $this->mAttribs['rc_old_len'];
 		}
-		if( $new === 0 ) {
+		if ( $new === 0 ) {
 			$new = $this->mAttribs['rc_new_len'];
 		}
-		if( $old === null || $new === null ) {
+		if ( $old === null || $new === null ) {
 			return '';
 		}
 		return ChangesList::showCharacterDifference( $old, $new );
@@ -770,8 +804,9 @@ class RecentChange {
 			}
 		} else {
 			$ip = $wgRequest->getIP();
-			if( !$ip )
+			if ( !$ip ) {
 				$ip = '';
+			}
 		}
 		return $ip;
 	}
diff --git a/includes/Revision.php b/includes/Revision.php
index 984da69206..fd356e12c8 100644
--- a/includes/Revision.php
+++ b/includes/Revision.php
@@ -52,7 +52,7 @@ class Revision implements IDBAccessObject {
 	protected $mContentFormat;
 
 	/**
-	 * @var Content
+	 * @var Content|null|bool
 	 */
 	protected $mContent;
 
@@ -124,7 +124,7 @@ class Revision implements IDBAccessObject {
 	 * Returns null if no such revision can be found.
 	 *
 	 * $flags include:
-	 *      Revision::READ_LATEST  : Select the data from the master
+	 *      Revision::READ_LATEST  : Select the data from the master (since 1.20)
 	 *      Revision::READ_LOCKING : Select & lock the data from the master
 	 *
 	 * @param $revId Integer
@@ -178,6 +178,13 @@ class Revision implements IDBAccessObject {
 			unset( $attribs['content_format'] );
 		}
 
+		if ( !isset( $attribs['title'] )
+			&& isset( $row->ar_namespace )
+			&& isset( $row->ar_title ) ) {
+
+			$attribs['title'] = Title::makeTitle( $row->ar_namespace, $row->ar_title );
+		}
+
 		if ( isset( $row->ar_text ) && !$row->ar_text_id ) {
 			// Pre-1.5 ar_text row
 			$attribs['text'] = self::getRevisionText( $row, 'ar_' );
@@ -600,15 +607,19 @@ class Revision implements IDBAccessObject {
 				$this->mContent = $handler->unserializeContent( $this->mText );
 			}
 
-			// if we have a Title object, override mPage. Useful for testing and convenience.
-			if ( isset( $row['title'] ) ) {
-				$this->mTitle     = $row['title'];
-				$this->mPage      = $this->mTitle->getArticleID();
-			} else {
-				$this->mTitle     = null; // Load on demand if needed
+			// If we have a Title object, make sure it is consistent with mPage.
+			if ( $this->mTitle && $this->mTitle->exists() ) {
+				if ( $this->mPage === null ) {
+					// if the page ID wasn't known, set it now
+					$this->mPage = $this->mTitle->getArticleID();
+				} elseif ( $this->mTitle->getArticleID() !== $this->mPage ) {
+					// Got different page IDs. This may be legit (e.g. during undeletion),
+					// but it seems worth mentioning it in the log.
+					wfDebug( "Page ID " . $this->mPage . " mismatches the ID "
+							. $this->mTitle->getArticleID() . " provided by the Title object." );
+				}
 			}
 
-			// @todo: XXX: really? we are about to create a revision. it will usually then be the current one.
 			$this->mCurrent   = false;
 
 			// If we still have no length, see it we have the text to figure it out
@@ -971,27 +982,34 @@ class Revision implements IDBAccessObject {
 	}
 
 	/**
-	 * Gets the content object for the revision
+	 * Gets the content object for the revision (or null on failure).
+	 *
+	 * Note that for mutable Content objects, each call to this method will return a
+	 * fresh clone.
 	 *
 	 * @since 1.21
-	 * @return Content
+	 * @return Content|null the Revision's content, or null on failure.
 	 */
 	protected function getContentInternal() {
 		if( is_null( $this->mContent ) ) {
 			// Revision is immutable. Load on demand:
-
-			$handler = $this->getContentHandler();
-			$format = $this->getContentFormat();
-
 			if( is_null( $this->mText ) ) {
-				// Load text on demand:
 				$this->mText = $this->loadText();
 			}
 
-			$this->mContent = is_null( $this->mText ) ? null : $handler->unserializeContent( $this->mText, $format );
+			if ( $this->mText !== null && $this->mText !== false ) {
+				// Unserialize content
+				$handler = $this->getContentHandler();
+				$format = $this->getContentFormat();
+
+				$this->mContent = $handler->unserializeContent( $this->mText, $format );
+			} else {
+				$this->mContent = false; // negative caching!
+			}
 		}
 
-		return $this->mContent->copy(); // NOTE: copy() will return $this for immutable content objects
+		// NOTE: copy() will return $this for immutable content objects
+		return $this->mContent ? $this->mContent->copy() : null;
 	}
 
 	/**
@@ -1366,7 +1384,7 @@ class Revision implements IDBAccessObject {
 
 		$content = $this->getContent( Revision::RAW );
 
-		if ( !$content->isValid() ) {
+		if ( !$content || !$content->isValid() ) {
 			$t = $title->getPrefixedDBkey();
 
 			throw new MWException( "Content of $t is not valid! Content model is $model" );
@@ -1386,7 +1404,11 @@ class Revision implements IDBAccessObject {
 	 * Lazy-load the revision's text.
 	 * Currently hardcoded to the 'text' table storage engine.
 	 *
-	 * @return String
+<<<<<<< HEAD
+	 * @return String|boolean the revision text, or false on failure
+=======
+	 * @return String|bool the revision's text, or false on failure
+>>>>>>> (Bug 41244) Gracefully handle failure to load text blob.
 	 */
 	protected function loadText() {
 		wfProfileIn( __METHOD__ );
diff --git a/includes/Sanitizer.php b/includes/Sanitizer.php
index 8919f10ad6..5aa0545ba0 100644
--- a/includes/Sanitizer.php
+++ b/includes/Sanitizer.php
@@ -387,9 +387,9 @@ class Sanitizer {
 			$htmlsingleonly = array( # Elements that cannot have close tags
 				'br', 'hr'
 			);
-			$htmlnest = array( # Tags that can be nested--??
+			$htmlnest = array( # Tags that can be nested directly or indirectly
 				'table', 'tr', 'td', 'th', 'div', 'blockquote', 'ol', 'ul',
-				'dl', 'font', 'big', 'small', 'sub', 'sup', 'span'
+				'li', 'dl', 'dt', 'dd', 'font', 'big', 'small', 'sub', 'sup', 'span'
 			);
 			$tabletags = array( # Can only appear inside table, we will close them
 				'td', 'th', 'tr',
@@ -510,6 +510,10 @@ class Sanitizer {
 						} elseif ( isset( $htmlsingle[$t] ) ) {
 							# Hack to not close $htmlsingle tags
 							$brace = null;
+							# Still need to push this optionally-closed tag to
+							# the tag stack so that we can match end tags
+							# instead of marking them as bad.
+							array_push( $tagstack, $t );
 						} elseif ( isset( $tabletags[$t] )
 						&& in_array( $t, $tagstack ) ) {
 							// New table tag but forgot to close the previous one
@@ -912,7 +916,7 @@ class Sanitizer {
 		// Reject problematic keywords and control characters
 		if ( preg_match( '/[\000-\010\016-\037\177]/', $value ) ) {
 			return '/* invalid control char */';
-		} elseif ( preg_match( '! expression | filter\s*: | accelerator\s*: | url\s*\( | image\s*\( !ix', $value ) ) {
+		} elseif ( preg_match( '! expression | filter\s*: | accelerator\s*: | url\s*\( | image\s*\( | image-set\s*\( !ix', $value ) ) {
 			return '/* insecure input */';
 		}
 		return $value;
diff --git a/includes/Skin.php b/includes/Skin.php
index 24d48bc44c..4889863710 100644
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -73,7 +73,7 @@ abstract class Skin extends ContextSource {
 		return $wgValidSkinNames;
 	}
 
- 	/**
+	/**
 	 * Fetch the skinname messages for available skins.
 	 * @return array of strings
 	 */
@@ -1132,7 +1132,23 @@ abstract class Skin extends ContextSource {
 	}
 
 	/**
-	 * Build an array that represents the sidebar(s), the navigation bar among them
+	 * Build an array that represents the sidebar(s), the navigation bar among them.
+	 *
+	 * BaseTemplate::getSidebar can be used to simplify the format and id generation in new skins.
+	 *
+	 * The format of the returned array is array( heading => content, ... ), where:
+	 * - heading is the heading of a navigation portlet. It is either:
+	 *   - magic string to be handled by the skins ('SEARCH' / 'LANGUAGES' / 'TOOLBOX' / ...)
+	 *   - a message name (e.g. 'navigation'), the message should be HTML-escaped by the skin
+	 *   - plain text, which should be HTML-escaped by the skin
+	 * - content is the contents of the portlet. It is either:
+	 *   - HTML text (<ul><li>...</li>...</ul>)
+	 *   - array of link data in a format accepted by BaseTemplate::makeListItem()
+	 *   - (for a magic string as a key, any value)
+	 *
+	 * Note that extensions can control the sidebar contents using the SkinBuildSidebar hook
+	 * and can technically insert anything in here; skin creators are expected to handle
+	 * values described above.
 	 *
 	 * @return array
 	 */
diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index 5a32d47138..dcc37d75bc 100644
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -1177,11 +1177,6 @@ class SkinTemplate extends Skin {
 				);
 			}
 
-			$nav_urls['info'] = array(
-				'text' => $this->msg( 'pageinfo-toolboxlink' )->text(),
-				'href' => $out->getTitle()->getLocalURL( "action=info" )
-			);
-
 			// Use the copy of revision ID in case this undocumented, shady hook tries to mess with internals
 			wfRunHooks( 'SkinTemplateBuildNavUrlsNav_urlsAfterPermalink',
 				array( &$this, &$nav_urls, &$revid, &$revid ) );
@@ -1191,6 +1186,12 @@ class SkinTemplate extends Skin {
 			$nav_urls['whatlinkshere'] = array(
 				'href' => SpecialPage::getTitleFor( 'Whatlinkshere', $this->thispage )->getLocalUrl()
 			);
+
+			$nav_urls['info'] = array(
+				'text' => $this->msg( 'pageinfo-toolboxlink' )->text(),
+				'href' => $this->getTitle()->getLocalURL( "action=info" )
+			);
+
 			if ( $this->getTitle()->getArticleID() ) {
 				$nav_urls['recentchangeslinked'] = array(
 					'href' => SpecialPage::getTitleFor( 'Recentchangeslinked', $this->thispage )->getLocalUrl()
diff --git a/includes/SpecialPage.php b/includes/SpecialPage.php
index 9442869774..67aa2b33f4 100644
--- a/includes/SpecialPage.php
+++ b/includes/SpecialPage.php
@@ -513,6 +513,19 @@ class SpecialPage {
 		return false;
 	}
 
+	/**
+	 * Is this page cached?
+	 * Expensive pages are cached or disabled in miser mode.
+	 * Used by QueryPage and subclasses, moved here so that
+	 * Special:SpecialPages can safely call it for all special pages.
+	 *
+	 * @return Boolean
+	 * @since 1.21
+	 */
+	public function isCached() {
+		return false;
+	}
+
 	/**
 	 * Can be overridden by subclasses with more complicated permissions
 	 * schemes.
@@ -1017,14 +1030,12 @@ abstract class RedirectSpecialPage extends UnlistedSpecialPage {
 		if ( $redirect instanceof Title ) {
 			$url = $redirect->getFullUrl( $query );
 			$this->getOutput()->redirect( $url );
-			wfProfileOut( __METHOD__ );
 			return $redirect;
 		// Redirect to index.php with query parameters
 		} elseif ( $redirect === true ) {
 			global $wgScript;
 			$url = $wgScript . '?' . wfArrayToCGI( $query );
 			$this->getOutput()->redirect( $url );
-			wfProfileOut( __METHOD__ );
 			return $redirect;
 		} else {
 			$class = __CLASS__;
@@ -1209,7 +1220,7 @@ abstract class RedirectSpecialArticle extends RedirectSpecialPage {
 			'ctype', 'maxage', 'smaxage',
 		);
 
-		wfRunHooks( "RedirectSpecialArticleRedirectParams", array(&$redirectParams) );
+		wfRunHooks( "RedirectSpecialArticleRedirectParams", array( &$redirectParams ) );
 		$this->mAllowedRedirectParams = $redirectParams;
 	}
 }
diff --git a/includes/Title.php b/includes/Title.php
index b1569e2837..0f02dc7939 100644
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -1398,7 +1398,7 @@ class Title {
 	 *
 
 	 * @param $query string|array an optional query string,
-	 *   not used for interwiki	links. Can be specified as an associative array as well,
+	 *   not used for interwiki links. Can be specified as an associative array as well,
 	 *   e.g., array( 'action' => 'edit' ) (keys and values will be URL-escaped).
 	 *   Some query patterns will trigger various shorturl path replacements.
 	 * @param $query2 Mixed: An optional secondary query array. This one MUST
@@ -3816,6 +3816,7 @@ class Title {
 			$newid = $redirectArticle->insertOn( $dbw );
 			if ( $newid ) { // sanity
 				$redirectRevision = new Revision( array(
+					'title'   => $this, // for determining the default content model
 					'page'    => $newid,
 					'comment' => $comment,
 					'content'    => $redirectContent ) );
@@ -3980,7 +3981,7 @@ class Title {
 		$content = $rev->getContent();
 		# Does the redirect point to the source?
 		# Or is it a broken self-redirect, usually caused by namespace collisions?
-		$redirTitle = $content->getRedirectTarget();
+		$redirTitle = $content ? $content->getRedirectTarget() : null;
 
 		if ( $redirTitle ) {
 			if ( $redirTitle->getPrefixedDBkey() != $this->getPrefixedDBkey() &&
@@ -4474,7 +4475,7 @@ class Title {
 
 	/**
 	 * Update page_touched timestamps and send squid purge messages for
-	 * pages linking to this title.	May be sent to the job queue depending
+	 * pages linking to this title. May be sent to the job queue depending
 	 * on the number of links. Typically called on create and delete.
 	 */
 	public function touchLinks() {
@@ -4701,8 +4702,6 @@ class Title {
 		$contentHandler = ContentHandler::getForTitle( $this );
 		$pageLang = $contentHandler->getPageLanguage( $this );
 
-		// Hook at the end because we don't want to override the above stuff
-		wfRunHooks( 'PageContentLanguage', array( $this, &$pageLang, $wgLang ) );
 		return wfGetLangObj( $pageLang );
 	}
 
diff --git a/includes/User.php b/includes/User.php
index e210eba6cf..0aa613afca 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -1102,10 +1102,10 @@ class User {
 		}
 
 		if ( is_array( $data ) ) {
-			if ( is_array( $data['user_groups'] ) ) {
+			if ( isset( $data['user_groups'] ) && is_array( $data['user_groups'] ) ) {
 				$this->mGroups = $data['user_groups'];
 			}
-			if ( is_array( $data['user_properties'] ) ) {
+			if ( isset( $data['user_properties'] ) && is_array( $data['user_properties'] ) ) {
 				$this->loadOptions( $data['user_properties'] );
 			}
 		}
@@ -1169,13 +1169,17 @@ class User {
 				}
 				$newGroups = array_merge( $oldGroups, $toPromote ); // all groups
 
-				$log = new LogPage( 'rights', $wgAutopromoteOnceLogInRC /* in RC? */ );
-				$log->addEntry( 'autopromote',
-					$this->getUserPage(),
-					'', // no comment
-					// These group names are "list to texted"-ed in class LogPage.
-					array( implode( ', ', $oldGroups ), implode( ', ', $newGroups ) )
-				);
+				$logEntry = new ManualLogEntry( 'rights', 'autopromote' );
+				$logEntry->setPerformer( $this );
+				$logEntry->setTarget( $this->getUserPage() );
+				$logEntry->setParameters( array(
+					'4::oldgroups' => $oldGroups,
+					'5::newgroups' => $newGroups,
+				) );
+				$logid = $logEntry->insert();
+				if ( $wgAutopromoteOnceLogInRC ) {
+					$logEntry->publish( $logid );
+				}
 			}
 		}
 		return $toPromote;
@@ -1216,6 +1220,14 @@ class User {
 	public static function getDefaultOptions() {
 		global $wgNamespacesToBeSearchedDefault, $wgDefaultUserOptions, $wgContLang, $wgDefaultSkin;
 
+		static $defOpt = null;
+		if ( !defined( 'MW_PHPUNIT_TEST' ) && $defOpt !== null ) {
+			// Disabling this for the unit tests, as they rely on being able to change $wgContLang
+			// mid-request and see that change reflected in the return value of this function.
+			// Which is insane and would never happen during normal MW operation
+			return $defOpt;
+		}
+
 		$defOpt = $wgDefaultUserOptions;
 		# default language setting
 		$defOpt['variant'] = $wgContLang->getCode();
@@ -1225,12 +1237,6 @@ class User {
 		}
 		$defOpt['skin'] = $wgDefaultSkin;
 
-		// FIXME: Ideally we'd cache the results of this function so the hook is only run once,
-		// but that breaks the parser tests because they rely on being able to change $wgContLang
-		// mid-request and see that change reflected in the return value of this function.
-		// Which is insane and would never happen during normal MW operation, but is also not
-		// likely to get fixed unless and until we context-ify everything.
-		// See also https://www.mediawiki.org/wiki/Special:Code/MediaWiki/101488#c25275
 		wfRunHooks( 'UserGetDefaultOptions', array( &$defOpt ) );
 
 		return $defOpt;
@@ -2213,13 +2219,6 @@ class User {
 		global $wgHiddenPrefs;
 		$this->loadOptions();
 
-		if ( is_null( $this->mOptions ) ) {
-			if($defaultOverride != '') {
-				return $defaultOverride;
-			}
-			$this->mOptions = User::getDefaultOptions();
-		}
-
 		# We want 'disabled' preferences to always behave as the default value for
 		# users, even if they have set the option explicitly in their settings (ie they
 		# set it, and then it was disabled removing their ability to change it).  But
@@ -2295,15 +2294,11 @@ class User {
 	 * @param $val mixed New value to set
 	 */
 	public function setOption( $oname, $val ) {
-		$this->load();
 		$this->loadOptions();
 
 		// Explicitly NULL values should refer to defaults
 		if( is_null( $val ) ) {
-			$defaultOption = self::getDefaultOption( $oname );
-			if( !is_null( $defaultOption ) ) {
-				$val = $defaultOption;
-			}
+			$val = self::getDefaultOption( $oname );
 		}
 
 		$this->mOptions[$oname] = $val;
@@ -2362,7 +2357,7 @@ class User {
 			$this->mRights = self::getGroupPermissions( $this->getEffectiveGroups() );
 			wfRunHooks( 'UserGetRights', array( $this, &$this->mRights ) );
 			// Force reindexation of rights when a hook has unset one of them
-			$this->mRights = array_values( $this->mRights );
+			$this->mRights = array_values( array_unique( $this->mRights ) );
 		}
 		return $this->mRights;
 	}
@@ -2394,6 +2389,8 @@ class User {
 			) );
 			# Hook for additional groups
 			wfRunHooks( 'UserEffectiveGroups', array( &$this, &$this->mEffectiveGroups ) );
+			// Force reindexation of groups when a hook has unset one of them
+			$this->mEffectiveGroups = array_values( array_unique( $this->mEffectiveGroups ) );
 			wfProfileOut( __METHOD__ );
 		}
 		return $this->mEffectiveGroups;
@@ -2474,7 +2471,7 @@ class User {
 					$count = $this->initEditCount();
 				}
 				wfProfileOut( __METHOD__ );
-				$this->mEditCount = $count;
+				$this->mEditCount = intval( $count );
 			}
 			return $this->mEditCount;
 		} else {
@@ -3984,7 +3981,7 @@ class User {
 		// Pull from a slave to be less cruel to servers
 		// Accuracy isn't the point anyway here
 		$dbr = wfGetDB( DB_SLAVE );
-		$count = $dbr->selectField(
+		$count = (int) $dbr->selectField(
 			'revision',
 			'COUNT(rev_user)',
 			array( 'rev_user' => $this->getId() ),
diff --git a/includes/UserMailer.php b/includes/UserMailer.php
index 9830f69578..b9ce9e0574 100644
--- a/includes/UserMailer.php
+++ b/includes/UserMailer.php
@@ -273,7 +273,7 @@ class UserMailer {
 			}
 			wfRestoreWarnings();
 			return Status::newGood();
-		} else	{
+		} else {
 			#
 			# PHP mail()
 			#
diff --git a/includes/WebRequest.php b/includes/WebRequest.php
index aeac69420a..e251ac5bb5 100644
--- a/includes/WebRequest.php
+++ b/includes/WebRequest.php
@@ -382,7 +382,7 @@ class WebRequest {
 
 	/**
 	 * Unset an arbitrary value from our get/post data.
- 	 *
+	 *
 	 * @param $key String: key name to use
 	 * @return Mixed: old value if one was present, null otherwise
 	 */
diff --git a/includes/Wiki.php b/includes/Wiki.php
index 7a6b37d9fd..d4840cc22e 100644
--- a/includes/Wiki.php
+++ b/includes/Wiki.php
@@ -574,9 +574,6 @@ class MediaWiki {
 		// Execute a job from the queue
 		$this->doJobs();
 
-		// Log message usage, if $wgAdaptiveMessageCache is set to true
-		MessageCache::logMessages();
-
 		// Log profiling data, e.g. in the database or UDP
 		wfLogProfilingData();
 
diff --git a/includes/WikiPage.php b/includes/WikiPage.php
index c148a5f14d..a4bc6ee824 100644
--- a/includes/WikiPage.php
+++ b/includes/WikiPage.php
@@ -1237,8 +1237,8 @@ class WikiPage extends Page implements IDBAccessObject {
 		wfProfileIn( __METHOD__ );
 
 		$content = $revision->getContent();
-		$len = $content->getSize();
-		$rt = $content->getUltimateRedirectTarget();
+		$len = $content ? $content->getSize() : 0;
+		$rt = $content ? $content->getUltimateRedirectTarget() : null;
 
 		$conditions = array( 'page_id' => $this->getId() );
 
@@ -1469,11 +1469,6 @@ class WikiPage extends Page implements IDBAccessObject {
 			// Bug 30711: always use current version when adding a new section
 			if ( is_null( $edittime ) || $section == 'new' ) {
 				$oldContent = $this->getContent();
-				if ( ! $oldContent ) {
-					wfDebug( __METHOD__ . ": no page text\n" );
-					wfProfileOut( __METHOD__ );
-					return null;
-				}
 			} else {
 				$dbw = wfGetDB( DB_MASTER );
 				$rev = Revision::loadFromTimestamp( $dbw, $this->mTitle, $edittime );
@@ -1488,6 +1483,13 @@ class WikiPage extends Page implements IDBAccessObject {
 				$oldContent = $rev->getContent();
 			}
 
+			if ( ! $oldContent ) {
+				wfDebug( __METHOD__ . ": no page text\n" );
+				wfProfileOut( __METHOD__ );
+				return null;
+			}
+
+			//FIXME: $oldContent might be null?
 			$newContent = $oldContent->replaceSection( $section, $sectionContent, $sectionTitle );
 		}
 
@@ -1708,6 +1710,7 @@ class WikiPage extends Page implements IDBAccessObject {
 
 			$revision = new Revision( array(
 				'page'       => $this->getId(),
+				'title'      => $this->getTitle(), // for determining the default content model
 				'comment'    => $summary,
 				'minor_edit' => $isminor,
 				'text'       => $serialized,
@@ -1835,6 +1838,7 @@ class WikiPage extends Page implements IDBAccessObject {
 			# Save the revision text...
 			$revision = new Revision( array(
 				'page'       => $newid,
+				'title'      => $this->getTitle(), // for determining the default content model
 				'comment'    => $summary,
 				'minor_edit' => $isminor,
 				'text'       => $serialized,
@@ -1850,6 +1854,10 @@ class WikiPage extends Page implements IDBAccessObject {
 			# Bug 37225: use accessor to get the text as Revision may trim it
 			$content = $revision->getContent(); // sanity; get normalized version
 
+			if ( $content ) {
+				$newsize = $content->getSize();
+			}
+
 			# Update the page record with revision data
 			$this->updateRevisionOn( $dbw, $revision, 0 );
 
@@ -1862,7 +1870,7 @@ class WikiPage extends Page implements IDBAccessObject {
 					$this->mTitle->getUserPermissionsErrors( 'autopatrol', $user ) );
 				# Add RC row to the DB
 				$rc = RecentChange::notifyNew( $now, $this->mTitle, $isminor, $user, $summary, $bot,
-					'', $content->getSize(), $revisionId, $patrolled );
+					'', $newsize, $revisionId, $patrolled );
 
 				# Log auto-patrolled edits
 				if ( $patrolled ) {
@@ -1954,7 +1962,7 @@ class WikiPage extends Page implements IDBAccessObject {
 	 * @since 1.21
 	 */
 	public function prepareContentForEdit( Content $content, $revid = null, User $user = null, $serialization_format = null ) {
-		global $wgParser, $wgContLang, $wgUser;
+		global $wgContLang, $wgUser;
 		$user = is_null( $user ) ? $wgUser : $user;
 		//XXX: check $user->getId() here???
 
@@ -1975,23 +1983,21 @@ class WikiPage extends Page implements IDBAccessObject {
 		$edit = (object)array();
 		$edit->revid = $revid;
 
-		$edit->pstContent = $content->preSaveTransform( $this->mTitle, $user, $popts );
-		$edit->pst = $edit->pstContent->serialize( $serialization_format ); #XXX: do we need this??
-		$edit->format = $serialization_format;
+		$edit->pstContent = $content ? $content->preSaveTransform( $this->mTitle, $user, $popts ) : null;
 
+		$edit->format = $serialization_format;
 		$edit->popts = $this->makeParserOptions( 'canonical' );
-
-		$edit->output = $edit->pstContent->getParserOutput( $this->mTitle, $revid, $edit->popts );
+		$edit->output = $edit->pstContent ? $edit->pstContent->getParserOutput( $this->mTitle, $revid, $edit->popts ) : null;
 
 		$edit->newContent = $content;
 		$edit->oldContent = $this->getContent( Revision::RAW );
 
 		#NOTE: B/C for hooks! don't use these fields!
-		$edit->newText = ContentHandler::getContentText( $edit->newContent );
+		$edit->newText = $edit->newContent ? ContentHandler::getContentText( $edit->newContent ) : '';
 		$edit->oldText = $edit->oldContent ? ContentHandler::getContentText( $edit->oldContent ) : '';
+		$edit->pst = $edit->pstContent ? $edit->pstContent->serialize( $serialization_format ) : '';
 
 		$this->mPreparedEdit = $edit;
-
 		return $edit;
 	}
 
@@ -2036,8 +2042,10 @@ class WikiPage extends Page implements IDBAccessObject {
 		}
 
 		# Update the links tables and other secondary data
-		$updates = $content->getSecondaryDataUpdates( $this->getTitle(), null, true, $editInfo->output );
-		DataUpdate::runUpdates( $updates );
+		if ( $content ) {
+			$updates = $content->getSecondaryDataUpdates( $this->getTitle(), null, true, $editInfo->output );
+			DataUpdate::runUpdates( $updates );
+		}
 
 		wfRunHooks( 'ArticleEditUpdates', array( &$this, &$editInfo, $options['changed'] ) );
 
@@ -2109,7 +2117,7 @@ class WikiPage extends Page implements IDBAccessObject {
 
 		if ( $this->mTitle->getNamespace() == NS_MEDIAWIKI ) {
 			#XXX: could skip pseudo-messages like js/css here, based on content model.
-			$msgtext = $content->getWikitextForTransclusion();
+			$msgtext = $content ? $content->getWikitextForTransclusion() : null;
 			if ( $msgtext === false || $msgtext === null ) $msgtext = '';
 
 			MessageCache::singleton()->replace( $shortTitle, $msgtext );
@@ -2161,6 +2169,7 @@ class WikiPage extends Page implements IDBAccessObject {
 
 		$dbw = wfGetDB( DB_MASTER );
 		$revision = new Revision( array(
+			'title'      => $this->getTitle(), // for determining the default content model
 			'page'       => $this->getId(),
 			'text'       => $serialized,
 			'length'     => $content->getSize(),
diff --git a/includes/Xml.php b/includes/Xml.php
index 2f8ba0fe39..67f365848d 100644
--- a/includes/Xml.php
+++ b/includes/Xml.php
@@ -576,7 +576,8 @@ class Xml {
 	 */
 	public static function textarea( $name, $content, $cols = 40, $rows = 5, $attribs = array() ) {
 		return self::element( 'textarea',
-					array(	'name' => $name,
+					array(
+						'name' => $name,
 						'id' => $name,
 						'cols' => $cols,
 						'rows' => $rows
diff --git a/includes/ZhConversion.php b/includes/ZhConversion.php
index 0cbbad93e7..b1ccbe6315 100644
--- a/includes/ZhConversion.php
+++ b/includes/ZhConversion.php
@@ -9,36 +9,66 @@
  */
 
 $zh2Hant = array(
+'㐽' => '偑',
+'㑇' => '㑳',
+'㑈' => '倲',
+'㑔' => '㑯',
 '㑩' => '儸',
 '㓥' => '劏',
 '㔉' => '劚',
 '㖊' => '噚',
 '㖞' => '喎',
+'㘎' => '㘚',
+'㚯' => '㜄',
+'㛀' => '媰',
 '㛟' => '𡞵',
 '㛠' => '𡢃',
+'㛣' => '㜏',
+'㛤' => '孋',
 '㛿' => '𡠹',
 '㟆' => '㠏',
+'㟜' => '𡾱',
+'㤘' => '㥮',
+'㧏' => '掆',
+'㧐' => '㩳',
 '㧑' => '撝',
 '㧟' => '擓',
+'㧰' => '擽',
 '㨫' => '㩜',
+'㭎' => '棡',
+'㭏' => '椲',
+'㭣' => '𣙎',
+'㭤' => '樢',
+'㭴' => '樫',
 '㱩' => '殰',
 '㱮' => '殨',
 '㲿' => '瀇',
+'㳔' => '濧',
+'㳕' => '灡',
 'ã³ ' => 'æ¾¾',
+'㳡' => '濄',
+'㳢' => '𣾷',
+'㳽' => '瀰',
 '㶉' => '鸂',
 '㶶' => '燶',
 '㶽' => '煱',
 '㺍' => '獱',
+'㻅' => '璯',
 '㻏' => '𤫩',
 '㻘' => '𤪺',
+'䀥' => '䁻',
 '䁖' => '瞜',
+'䂵' => '碽',
 '䅉' => '稏',
+'䅪' => '𥢢',
 '䇲' => '筴',
+'䉤' => '籔',
 '䌶' => '䊷',
 '䌷' => '紬',
 '䌸' => '縳',
 '䌹' => '絅',
 '䌺' => '䋙',
+'䌻' => '䋚',
 '䌼' => '綐',
 '䌽' => '綵',
 '䌾' => '䋻',
@@ -48,24 +78,34 @@ $zh2Hant = array(
 '䓕' => '薳',
 '䗖' => '螮',
 '䘛' => '𧝞',
+'䘞' => '𧜗',
 '䙊' => '𧜵',
+'䙌' => '䙡',
 '䙓' => '襬',
 '䜣' => '訢',
 '䜥' => '𧩙',
-'䜧' => '譅',
+'䜧' => '䜀',
+'䜩' => '讌',
 '䝙' => '貙',
 '䞌' => '𧵳',
 '䞍' => '䝼',
+'䞎' => '𧶧',
 '䞐' => '賰',
+'䟢' => '躎',
+'䢀' => '𨊰',
+'䢁' => '𨊸',
 '䢂' => '𨋢',
 '䥺' => '釾',
 '䥽' => '鏺',
+'䥾' => '䥱',
 '䥿' => '𨯅',
 '䦀' => '𨦫',
 '䦁' => '𨧜',
+'䦂' => '䥇',
 '䦃' => '鐯',
 '䦅' => '鐥',
-'䩄' => '靦',
+'䦶' => '䦛',
+'䦷' => '䦟',
 '䭪' => '𩞯',
 '䯃' => '𩣑',
 '䯄' => '騧',
@@ -136,6 +176,7 @@ $zh2Hant = array(
 '伞' => '傘',
 '伟' => '偉',
 '传' => '傳',
+'伡' => '俥',
 '伣' => '俔',
 '伤' => '傷',
 '伥' => '倀',
@@ -217,6 +258,7 @@ $zh2Hant = array(
 '刭' => '剄',
 '刹' => '剎',
 '刽' => '劊',
+'刾' => '㓨',
 '刿' => '劌',
 '剀' => '剴',
 '剂' => '劑',
@@ -321,6 +363,8 @@ $zh2Hant = array(
 '啬' => '嗇',
 '啭' => '囀',
 '啮' => '嚙',
+'啯' => '嘓',
+'啰' => '囉',
 '啴' => '嘽',
 '啸' => '嘯',
 '喷' => '噴',
@@ -410,6 +454,7 @@ $zh2Hant = array(
 '婵' => '嬋',
 '婶' => '嬸',
 '媪' => '媼',
+'媭' => '嬃',
 '嫒' => '嬡',
 '嫔' => '嬪',
 '嫱' => '嬙',
@@ -513,7 +558,9 @@ $zh2Hant = array(
 '归' => '歸',
 '当' => '當',
 '录' => '錄',
+'彟' => '彠',
 '彦' => '彥',
+'彨' => '彲',
 'å½»' => 'å¾¹',
 '径' => '徑',
 '徕' => '徠',
@@ -648,6 +695,7 @@ $zh2Hant = array(
 '攒' => '攢',
 '敌' => '敵',
 '敛' => '斂',
+'敩' => '斆',
 '数' => '數',
 '斋' => '齋',
 '斓' => '斕',
@@ -719,6 +767,7 @@ $zh2Hant = array(
 '桧' => '檜',
 '桨' => '槳',
 '桩' => '樁',
+'桪' => '樳',
 '梦' => '夢',
 '梼' => '檮',
 '梾' => '棶',
@@ -727,9 +776,12 @@ $zh2Hant = array(
 '棁' => '梲',
 '棂' => '欞',
 '椁' => '槨',
+'椝' => '槼',
 '椟' => '櫝',
 '椠' => '槧',
+'椢' => '槶',
 '椤' => '欏',
+'椫' => '樿',
 '椭' => '橢',
 '楼' => '樓',
 '榄' => '欖',
@@ -783,6 +835,7 @@ $zh2Hant = array(
 '沥' => '瀝',
 '沦' => '淪',
 '沧' => '滄',
+'沨' => '渢',
 '沩' => '溈',
 '沪' => '滬',
 '泞' => '濘',
@@ -813,6 +866,7 @@ $zh2Hant = array(
 '浒' => '滸',
 '浓' => '濃',
 '浔' => '潯',
+'浕' => '濜',
 '涂' => '塗',
 '涛' => '濤',
 '涝' => '澇',
@@ -820,6 +874,7 @@ $zh2Hant = array(
 '涟' => '漣',
 '涠' => '潿',
 '涡' => '渦',
+'涢' => '溳',
 '涣' => '渙',
 '涤' => '滌',
 '润' => '潤',
@@ -833,7 +888,6 @@ $zh2Hant = array(
 '渐' => '漸',
 '渑' => '澠',
 '渔' => '漁',
-'渖' => '瀋',
 '渗' => '滲',
 '温' => '溫',
 '湾' => '灣',
@@ -841,6 +895,7 @@ $zh2Hant = array(
 '溃' => '潰',
 '溅' => '濺',
 '溆' => '漵',
+'溇' => '漊',
 '滗' => '潷',
 '滚' => '滾',
 '滞' => '滯',
@@ -861,6 +916,7 @@ $zh2Hant = array(
 '潍' => '濰',
 '潜' => '潛',
 '潴' => '瀦',
+'澛' => '瀂',
 '澜' => '瀾',
 '濑' => '瀨',
 '濒' => '瀕',
@@ -872,7 +928,6 @@ $zh2Hant = array(
 '灿' => '燦',
 '炀' => '煬',
 '炉' => '爐',
-'炖' => '燉',
 '炜' => '煒',
 '炝' => '熗',
 '点' => '點',
@@ -1014,12 +1069,13 @@ $zh2Hant = array(
 '硖' => '硤',
 '硗' => '磽',
 '硙' => '磑',
+'硚' => '礄',
 '确' => '確',
+'硵' => '磠',
 '硷' => '礆',
 '碍' => '礙',
 '碛' => '磧',
 '碜' => '磣',
-'碱' => '鹼',
 '礼' => '禮',
 '祃' => '禡',
 '祎' => '禕',
@@ -1081,6 +1137,7 @@ $zh2Hant = array(
 '篑' => '簣',
 '篓' => '簍',
 '篮' => '籃',
+'篯' => '籛',
 '篱' => '籬',
 '簖' => '籪',
 '籁' => '籟',
@@ -1256,6 +1313,8 @@ $zh2Hant = array(
 '羟' => '羥',
 '羡' => '羨',
 '翘' => '翹',
+'翙' => '翽',
+'翚' => '翬',
 '耢' => '耮',
 '耧' => '耬',
 '耸' => '聳',
@@ -1295,6 +1354,7 @@ $zh2Hant = array(
 '脶' => '腡',
 '脸' => '臉',
 '腊' => '臘',
+'腘' => '膕',
 '腭' => '齶',
 '腻' => '膩',
 '腼' => '靦',
@@ -1337,6 +1397,7 @@ $zh2Hant = array(
 '荚' => '莢',
 '荛' => '蕘',
 '荜' => '蓽',
+'荝' => '萴',
 '荞' => '蕎',
 '荟' => '薈',
 '荠' => '薺',
@@ -1405,6 +1466,7 @@ $zh2Hant = array(
 '蚀' => '蝕',
 '蚁' => '蟻',
 '蚂' => '螞',
+'蚃' => '蠁',
 '蚕' => '蠶',
 '蚬' => '蜆',
 '蛊' => '蠱',
@@ -1445,9 +1507,10 @@ $zh2Hant = array(
 '裢' => '褳',
 '裣' => '襝',
 '裤' => '褲',
-'裥' => '襇',
+'裥' => '襉',
 '褛' => '褸',
 '褴' => '襤',
+'襕' => '襴',
 '见' => '見',
 '观' => '觀',
 '觃' => '覎',
@@ -1469,6 +1532,7 @@ $zh2Hant = array(
 '触' => '觸',
 '觯' => '觶',
 '訚' => '誾',
+'詟' => '讋',
 '誉' => '譽',
 '誊' => '謄',
 '讠' => '訁',
@@ -2209,6 +2273,7 @@ $zh2Hant = array(
 '颠' => '顛',
 '颡' => '顙',
 '颢' => '顥',
+'颣' => '纇',
 '颤' => '顫',
 '颥' => '顬',
 '颦' => '顰',
@@ -2344,6 +2409,7 @@ $zh2Hant = array(
 '髋' => '髖',
 '髌' => '髕',
 '鬓' => '鬢',
+'鬶' => '鬹',
 '魇' => '魘',
 '魉' => '魎',
 '鱼' => '魚',
@@ -2404,7 +2470,6 @@ $zh2Hant = array(
 '鲳' => '鯧',
 '鲴' => '鯝',
 '鲵' => '鯢',
-'鲶' => '鯰',
 '鲷' => '鯛',
 '鲸' => '鯨',
 'é²¹' => 'é°º',
@@ -2570,9 +2635,144 @@ $zh2Hant = array(
 '龚' => '龔',
 '龛' => '龕',
 '龟' => '龜',
+'𠆲' => '儣',
+'𠆿' => '𠌥',
+'𠉂' => '㒓',
+'𠉗' => '𠏢',
+'𠚳' => '𠠎',
+'𠛅' => '剾',
+'𠛆' => '𠞆',
 '𠮶' => '嗰',
+'𠯟' => '哯',
+'𠯠' => '噅',
+'𠲥' => '𡅏',
+'𠴢' => '𡄔',
+'𠵸' => '𡄣',
+'𠵾' => '㗲',
+'𡋀' => '𡓾',
+'𡋗' => '𡑭',
 '𡒄' => '壈',
+'𡝠' => '㜷',
+'𡞱' => '㜢',
+'𡭜' => '𡮉',
+'𡭬' => '𡮣',
+'𡶴' => '嵼',
+'𢋈' => '㢝',
+'𢘝' => '𢣚',
+'𢘞' => '𢣭',
+'𢙓' => '懀',
+'𢛯' => '㦎',
+'𢫊' => '𢷮',
+'𢫞' => '𢶫',
+'𢫬' => '摋',
+'𢬦' => '𢹿',
+'𢭏' => '擣',
+'𢽾' => '斅',
+'𣆐' => '曥',
+'𣍨' => '𦢈',
+'𣍯' => '腪',
+'𣍰' => '脥',
+'𣎑' => '臗',
+'𣐤' => '欍',
+'𣑶' => '𣠲',
+'𣗋' => '欓',
+'𣘓' => '𣞻',
+'𣘴' => '檭',
+'𣘷' => '𣝕',
+'𣭤' => '𣯴',
+'𣶩' => '澅',
+'𣶫' => '𣿉',
+'𣸣' => '濆',
+'𣺼' => '灙',
+'𣺽' => '𤁣',
+'𣽷' => '瀃',
+'𤆡' => '熓',
+'𤇃' => '爄',
+'𤇄' => '熌',
+'𤈶' => '熉',
+'𤈷' => '㷿',
+'𤊀' => '𤒎',
+'𤋏' => '熡',
+'𤞤' => '玁',
+'𤠋' => '㺏',
+'𤦀' => '瓕',
+'𤳄' => '𤳸',
+'𤶧' => '𤸫',
+'𤽯' => '㿧',
+'𤾀' => '皟',
+'𥅘' => '𥌃',
+'𥅴' => '䀹',
+'𥆧' => '瞤',
+'𥇢' => '䁪',
+'𥐟' => '礒',
+'𥐯' => '𥖅',
+'𥐰' => '𥕥',
+'𥐻' => '碙',
+'𥧂' => '𥨐',
+'𥬀' => '䉙',
+'𥬞' => '籋',
+'𥬠' => '篘',
+'𥭉' => '𥵊',
+'𥮋' => '𥸠',
+'𥮜' => '䉲',
+'𥱔' => '𥵃',
+'𥹥' => '𥼽',
+'𥺅' => '䊭',
+'𥺇' => '𥽖',
+'𦈈' => '𥿊',
+'𦈉' => '緷',
+'𦈋' => '綇',
+'𦈌' => '綀',
+'𦈎' => '繟',
+'𦈏' => '緍',
+'𦈐' => '縺',
+'𦈑' => '緸',
+'𦈒' => '𦂅',
+'𦈓' => '䋿',
+'𦈔' => '縎',
+'𦈕' => '緰',
 '𦈖' => '䌈',
+'𦈗' => '𦃄',
+'𦈘' => '䌋',
+'𦈙' => '䌰',
+'𦈚' => '縬',
+'𦈛' => '繓',
+'𦈜' => '䌖',
+'𦈝' => '繏',
+'𦈞' => '䌟',
+'𦈟' => '䌝',
+'𦈠' => '䌥',
+'𦈡' => '繻',
+'𦛨' => '朥',
+'𦝼' => '膢',
+'𦟗' => '𦣎',
+'𦨩' => '𦪽',
+'𦰴' => '䕳',
+'𧉞' => '䗿',
+'𧒭' => '𧔥',
+'𧮪' => '詀',
+'𧳕' => '𧳟',
+'𧹑' => '䞈',
+'𧹓' => '𧶔',
+'𧹕' => '䝻',
+'𧹖' => '賟',
+'𧹗' => '贃',
+'𧿈' => '𨇁',
+'𨀱' => '𨄣',
+'𨁴' => '𨅍',
+'𨂺' => '𨈊',
+'𨄄' => '𨈌',
+'𨅫' => '𨇞',
+'𨅬' => '躝',
+'𨉗' => '軉',
+'𨐅' => '軗',
+'𨐆' => '𨊻',
+'𨐇' => '𨏠',
+'𨐈' => '輄',
+'𨐉' => '𨎮',
+'𨐊' => '𨏥',
+'𨑹' => '䢨',
+'𨤰' => '𨤻',
 '𨰾' => '鎷',
 '𨰿' => '釳',
 '𨱀' => '𨥛',
@@ -2581,6 +2781,7 @@ $zh2Hant = array(
 '𨱃' => '鈲',
 '𨱄' => '鈯',
 '𨱅' => '鉁',
+'𨱆' => '龯',
 '𨱇' => '銶',
 '𨱈' => '鋉',
 '𨱉' => '鍄',
@@ -2591,12 +2792,28 @@ $zh2Hant = array(
 '𨱎' => '鍮',
 '𨱏' => '鎝',
 '𨱐' => '𨫒',
+'𨱑' => '鐄',
 '𨱒' => '鏉',
 '𨱓' => '鐎',
 '𨱔' => '鐏',
 '𨱕' => '𨮂',
+'𨱖' => '䥩',
+'𨷿' => '䦳',
+'𨸀' => '𨳕',
+'𨸁' => '𨳑',
 '𨸂' => '閍',
 '𨸃' => '閐',
+'𨸄' => '䦘',
+'𨸅' => '𨴗',
+'𨸆' => '𨵩',
+'𨸇' => '𨵸',
+'𨸉' => '𨶀',
+'𨸊' => '𨶏',
+'𨸋' => '𨶲',
+'𨸌' => '𨶮',
+'𨸎' => '𨷲',
+'𨸘' => '𨽏',
+'𨸟' => '䧢',
 '𩏼' => '䪏',
 '𩏽' => '𩏪',
 '𩏾' => '𩎢',
@@ -2617,12 +2834,22 @@ $zh2Hant = array(
 '𩙮' => '䬘',
 '𩙯' => '䬝',
 '𩙰' => '𩙈',
+'𩟿' => '𩚛',
+'𩠀' => '𩚥',
+'𩠁' => '𩚵',
+'𩠂' => '𩛆',
+'𩠃' => '𩛩',
 '𩠅' => '𩟐',
 '𩠆' => '𩜦',
 '𩠇' => '䭀',
 '𩠈' => '䭃',
+'𩠉' => '𩜇',
+'𩠊' => '𩜵',
 '𩠋' => '𩝔',
 '𩠌' => '餸',
+'𩠎' => '𩞄',
+'𩠏' => '𩞦',
+'ð©  ' => 'ð© ´',
 '𩧦' => '𩡺',
 '𩧨' => '駎',
 '𩧩' => '𩤊',
@@ -2649,14 +2876,20 @@ $zh2Hant = array(
 '𩨄' => '騪',
 '𩨅' => '𩤸',
 '𩨆' => '𩤙',
+'𩨇' => '䮫',
 '𩨈' => '騟',
 '𩨉' => '𩤲',
 '𩨊' => '騚',
 '𩨋' => '𩥄',
 '𩨌' => '𩥑',
 '𩨍' => '𩥇',
+'𩨎' => '龭',
 '𩨏' => '䮳',
 '𩨐' => '𩧆',
+'𩬣' => '𩭙',
+'𩬤' => '𩰀',
+'𩯒' => '𩯳',
+'𩲒' => '𩳤',
 '𩽹' => '魥',
 '𩽺' => '𩵩',
 '𩽻' => '𩵹',
@@ -2666,6 +2899,7 @@ $zh2Hant = array(
 '𩽿' => '𩶰',
 '𩾀' => '鮕',
 '𩾁' => '鯄',
+'𩾂' => '䲖',
 '𩾃' => '鮸',
 '𩾄' => '𩷰',
 '𩾅' => '𩸃',
@@ -2699,6 +2933,8 @@ $zh2Hant = array(
 '𪎊' => '麨',
 '𪎋' => '䴴',
 '𪎌' => '麳',
+'𪎍' => '𪋿',
+'𪔭' => '𪔵',
 '𪚏' => '𪘀',
 '𪚐' => '𪘯',
 '𪞝' => '凙',
@@ -2715,7 +2951,7 @@ $zh2Hant = array(
 '𫌀' => '襀',
 '𫌨' => '覼',
 '𫍙' => '訑',
-'𫍟' => '𧦧',
+'𫍟' => '詑',
 '𫍢' => '譊',
 '𫍰' => '諰',
 '𫍲' => '謏',
@@ -2728,6 +2964,7 @@ $zh2Hant = array(
 '𫓧' => '鈇',
 '𫓩' => '鏦',
 '𫔎' => '鐍',
+'𫖸' => '願',
 '𫗠' => '餦',
 '𫗦' => '餔',
 '𫗧' => '餗',
@@ -3993,7 +4230,6 @@ $zh2Hant = array(
 '优游' => '優遊',
 '兀术' => '兀朮',
 '元凶' => '元兇',
-'充饥' => '充饑',
 '兆个' => '兆個',
 '兆余' => '兆餘',
 '凶刀' => '兇刀',
@@ -4144,7 +4380,6 @@ $zh2Hant = array(
 '出于' => '出於',
 '出游' => '出遊',
 '出丑' => '出醜',
-'出锤' => '出鎚',
 '分占' => '分佔',
 '分别致' => '分别致',
 '分半钟' => '分半鐘',
@@ -4393,6 +4628,7 @@ $zh2Hant = array(
 '古书云' => '古書云',
 '古書云' => '古書云',
 '古柯咸' => '古柯鹹',
+'古柯碱' => '古柯鹼',
 '古朴' => '古樸',
 '古语云' => '古語云',
 '古語云' => '古語云',
@@ -4534,7 +4770,7 @@ $zh2Hant = array(
 '吹干' => '吹乾',
 '吹发' => '吹髮',
 '吹胡' => '吹鬍',
-'吾为之范我驰驱' => '吾爲之範我馳驅',
+'吾爲之范我驰驱' => '吾爲之範我馳驅',
 '吕后' => '呂后',
 '呂后' => '呂后',
 '呆呆傻傻' => '呆呆傻傻',
@@ -4617,8 +4853,8 @@ $zh2Hant = array(
 '严于' => '嚴於',
 '严丝合缝' => '嚴絲合縫',
 '嚼谷' => '嚼穀',
-'囉囉苏苏' => '囉囉囌囌',
-'囉苏' => '囉囌',
+'啰啰苏苏' => '囉囉囌囌',
+'啰苏' => '囉囌',
 '嘱托' => '囑託',
 '四个' => '四個',
 '四出刊' => '四出刊',
@@ -4711,7 +4947,7 @@ $zh2Hant = array(
 '城里' => '城裡',
 '埔裡社撫墾局' => '埔裏社撫墾局',
 '埔裏社撫墾局' => '埔裏社撫墾局',
-'埔里社抚垦局' => '埔裏社撫墾局',
+'埔裏社抚垦局' => '埔裏社撫墾局',
 '基干' => '基幹',
 '基于' => '基於',
 '基准' => '基準',
@@ -4815,7 +5051,6 @@ $zh2Hant = array(
 '大赞' => '大讚',
 '大周折' => '大週摺',
 '大金发苔' => '大金髮苔',
-'大锤' => '大鎚',
 '大钟' => '大鐘',
 '大只' => '大隻',
 '大风后' => '大風後',
@@ -4836,6 +5071,7 @@ $zh2Hant = array(
 '天文钟' => '天文鐘',
 '天历' => '天曆',
 '天历史' => '天歷史',
+'天然碱' => '天然鹼',
 '天翻地覆' => '天翻地覆',
 '天覆地载' => '天覆地載',
 '太仆' => '太僕',
@@ -4885,7 +5121,6 @@ $zh2Hant = array(
 '好丑' => '好醜',
 '好斗' => '好鬥',
 '如果干' => '如果幹',
-'如饥似渴' => '如饑似渴',
 '妖后' => '妖后',
 '妙药' => '妙藥',
 '始于' => '始於',
@@ -5279,6 +5514,7 @@ $zh2Hant = array(
 '弘历史' => '弘歷史',
 '弱于' => '弱於',
 '弱水三千只取一瓢' => '弱水三千只取一瓢',
+'弱碱' => '弱鹼',
 '张三丰' => '張三丰',
 '張三丰' => '張三丰',
 '张勋' => '張勳',
@@ -5288,6 +5524,7 @@ $zh2Hant = array(
 '强奸' => '強姦',
 '强干' => '強幹',
 '强于' => '強於',
+'强碱' => '強鹼',
 '别口气' => '彆口氣',
 '别强' => '彆強',
 '别扭' => '彆扭',
@@ -5503,7 +5740,6 @@ $zh2Hant = array(
 '心脏' => '心臟',
 '心荡' => '心蕩',
 '心药' => '心藥',
-'心里面' => '心裏面',
 '心里' => '心裡',
 '心长发短' => '心長髮短',
 '心余' => '心餘',
@@ -5635,7 +5871,7 @@ $zh2Hant = array(
 '手表达' => '手表達',
 '手表露' => '手表露',
 '手表面' => '手表面',
-'手里剑' => '手裏劍',
+'手裏剑' => '手裏劍',
 '手里' => '手裡',
 '手表' => '手錶',
 '手松' => '手鬆',
@@ -5686,6 +5922,7 @@ $zh2Hant = array(
 '抗癌药' => '抗癌藥',
 '抗御' => '抗禦',
 '抗药' => '抗藥',
+'抗碱' => '抗鹼',
 '折向往' => '折向往',
 '折子戏' => '折子戲',
 '折戟沈河' => '折戟沈河',
@@ -5824,7 +6061,7 @@ $zh2Hant = array(
 '挂名' => '掛名',
 '挂帘' => '掛帘',
 '挂历' => '掛曆',
-'挂钩' => '掛鈎',
+'挂鈎' => '掛鈎',
 '挂钟' => '掛鐘',
 '采下' => '採下',
 '采伐' => '採伐',
@@ -6528,12 +6765,14 @@ $zh2Hant = array(
 '水里浊水溪' => '水里濁水溪',
 '水里鄉' => '水里鄉',
 '水里乡' => '水里鄉',
+'水碱' => '水鹼',
 '永历' => '永曆',
 '永历史' => '永歷史',
 '永志不忘' => '永誌不忘',
 '求知欲' => '求知慾',
 '求签' => '求籤',
 '求道于盲' => '求道於盲',
+'汗碱' => '汗鹼',
 '池里' => '池裡',
 '污蔑' => '污衊',
 '汲于' => '汲於',
@@ -6726,16 +6965,8 @@ $zh2Hant = array(
 '滃郁' => '滃鬱',
 '滑借' => '滑藉',
 '汇丰' => '滙豐',
-'卤味' => '滷味',
-'卤水' => '滷水',
-'卤汁' => '滷汁',
-'卤湖' => '滷湖',
-'卤肉' => '滷肉',
-'卤菜' => '滷菜',
-'卤蛋' => '滷蛋',
-'卤制' => '滷製',
-'卤鸡' => '滷雞',
-'卤面' => '滷麵',
+'滷制' => '滷製',
+'滷面' => '滷麵',
 '满拼自尽' => '滿拚自盡',
 '满满当当' => '滿滿當當',
 '满头洋发' => '滿頭洋髮',
@@ -6831,6 +7062,7 @@ $zh2Hant = array(
 '煎面' => '煎麵',
 '烟卷' => '煙捲',
 '烟斗丝' => '煙斗絲',
+'烟碱' => '煙鹼',
 '照占' => '照佔',
 '照入签' => '照入籤',
 '照准' => '照準',
@@ -6840,9 +7072,10 @@ $zh2Hant = array(
 '熊杰' => '熊杰',
 '荧郁' => '熒鬱',
 '熬药' => '熬藥',
-'炖药' => '燉藥',
+'燉药' => '燉藥',
 '燎发' => '燎髮',
 '烧干' => '燒乾',
+'烧碱' => '燒鹼',
 '燕几' => '燕几',
 '燕巢于幕' => '燕巢於幕',
 '燕燕于飞' => '燕燕于飛',
@@ -7015,7 +7248,7 @@ $zh2Hant = array(
 '发松' => '發鬆',
 '发面' => '發麵',
 '白干' => '白乾',
-'白兔擣药' => '白兔擣藥',
+'白兔𢭏药' => '白兔擣藥',
 '白干儿' => '白干兒',
 '白术' => '白朮',
 '白朴' => '白樸',
@@ -7149,6 +7382,7 @@ $zh2Hant = array(
 '石英钟表' => '石英鐘錶',
 '石莼' => '石蓴',
 '石钟乳' => '石鐘乳',
+'石碱' => '石鹼',
 '矽谷' => '矽谷',
 '研制' => '研製',
 '砰当' => '砰噹',
@@ -7159,6 +7393,7 @@ $zh2Hant = array(
 '朱红色' => '硃紅色',
 '朱色' => '硃色',
 '朱谕' => '硃諭',
+'硫化碱' => '硫化鹼',
 '硬干' => '硬幹',
 '确瘠' => '确瘠',
 '碑志' => '碑誌',
@@ -7267,7 +7502,6 @@ $zh2Hant = array(
 '积极参加' => '積极參加',
 '积淀' => '積澱',
 '积谷' => '積穀',
-'积谷防饥' => '積穀防饑',
 '积郁' => '積鬱',
 '稳占' => '穩佔',
 '稳扎' => '穩紮',
@@ -7404,6 +7638,7 @@ $zh2Hant = array(
 '纡郁' => '紆鬱',
 '纳征' => '納徵',
 '纯朴' => '純樸',
+'纯碱' => '純鹼',
 '纸扎' => '紙紮',
 '素朴' => '素樸',
 '素发' => '素髮',
@@ -7599,6 +7834,7 @@ $zh2Hant = array(
 '考试' => '考試',
 '而克制' => '而剋制',
 '耍斗' => '耍鬥',
+'耐碱' => '耐鹼',
 '耕佣' => '耕傭',
 '耕获' => '耕穫',
 '耳余' => '耳餘',
@@ -7732,6 +7968,7 @@ $zh2Hant = array(
 '花马吊嘴' => '花馬弔嘴',
 '花哄' => '花鬨',
 '苑里' => '苑裡',
+'苛性碱' => '苛性鹼',
 '若干' => '若干',
 '苦干' => '苦幹',
 '苦药' => '苦藥',
@@ -7762,7 +7999,7 @@ $zh2Hant = array(
 '草药' => '草藥',
 '荐居' => '荐居',
 '荐臻' => '荐臻',
-'荐饥' => '荐饑',
+'荐饑' => '荐饑',
 '荷花淀' => '荷花澱',
 '庄上' => '莊上',
 '庄主' => '莊主',
@@ -7796,6 +8033,7 @@ $zh2Hant = array(
 '菠萝干' => '菠蘿乾',
 '华严钟' => '華嚴鐘',
 '华发' => '華髮',
+'菸碱' => '菸鹼',
 '萬一只' => '萬一只',
 '万一只' => '萬一只',
 '万个' => '萬個',
@@ -7875,7 +8113,7 @@ $zh2Hant = array(
 '姜饼' => '薑餅',
 '姜黄' => '薑黃',
 '薙发' => '薙髮',
-'薝卜' => '薝蔔',
+'薝蔔' => '薝蔔',
 '苧悴' => '薴悴',
 '薴烯' => '薴烯',
 '苧烯' => '薴烯',
@@ -7962,8 +8200,7 @@ $zh2Hant = array(
 '蕴含着' => '蘊含著',
 '蕴涵着' => '蘊涵著',
 '苹果干' => '蘋果乾',
-'萝卜' => '蘿蔔',
-'萝卜干' => '蘿蔔乾',
+'萝蔔干' => '蘿蔔乾',
 '虎须' => '虎鬚',
 '虎斗' => '虎鬥',
 '号志' => '號誌',
@@ -7983,7 +8220,7 @@ $zh2Hant = array(
 '蛏干' => '蟶乾',
 '蚁后' => '蟻后',
 '蟻后' => '蟻后',
-'蠁干' => '蠁幹',
+'蚃干' => '蠁幹',
 '蛮干' => '蠻幹',
 '血拼' => '血拚',
 '血余' => '血餘',
@@ -8061,8 +8298,9 @@ $zh2Hant = array(
 '被发阳狂' => '被髮陽狂',
 '裁并' => '裁併',
 '裁制' => '裁製',
-'里手' => '裏手',
-'里海' => '裏海',
+'裏勾外连' => '裏勾外連',
+'裏手' => '裏手',
+'裏海' => '裏海',
 '补于' => '補於',
 '补药' => '補藥',
 '补血药' => '補血藥',
@@ -8379,7 +8617,6 @@ $zh2Hant = array(
 '资金占用' => '資金占用',
 '贾后' => '賈后',
 '賈后' => '賈后',
-'赈饥' => '賑饑',
 '赏赞' => '賞讚',
 '贤后' => '賢后',
 '賢后' => '賢后',
@@ -8655,6 +8892,7 @@ $zh2Hant = array(
 '酒醴曲蘖' => '酒醴麴櫱',
 '酒曲' => '酒麴',
 '酥松' => '酥鬆',
+'酸碱' => '酸鹼',
 '醇朴' => '醇樸',
 '醉于' => '醉於',
 '醋坛' => '醋罈',
@@ -8729,7 +8967,6 @@ $zh2Hant = array(
 '重复' => '重複',
 '重托' => '重託',
 '重游' => '重遊',
-'重锤' => '重鎚',
 '野姜' => '野薑',
 '野游' => '野遊',
 '厘出' => '釐出',
@@ -8756,10 +8993,10 @@ $zh2Hant = array(
 '金装玉里' => '金裝玉裡',
 '金表' => '金錶',
 '金钟' => '金鐘',
+'金鸡纳碱' => '金雞納鹼',
 '金马仑道' => '金馬崙道',
 '金发' => '金髮',
-'钉锤' => '釘鎚',
-'钩心斗角' => '鈎心鬥角',
+'鈎心斗角' => '鈎心鬥角',
 '银朱' => '銀硃',
 '银发' => '銀髮',
 '铜范' => '銅範',
@@ -8777,7 +9014,7 @@ $zh2Hant = array(
 '钱谷' => '錢穀',
 '钱范' => '錢範',
 '钱庄' => '錢莊',
-'锦绣花园' => '錦綉花園',
+'锦綉花园' => '錦綉花園',
 '锦绣' => '錦繡',
 '表停' => '錶停',
 '表冠' => '錶冠',
@@ -8814,9 +9051,6 @@ $zh2Hant = array(
 '锻炼出' => '鍛鍊出',
 '锲而不舍' => '鍥而不捨',
 '镰仓' => '鎌倉',
-'锤儿' => '鎚兒',
-'锤子' => '鎚子',
-'锤头' => '鎚頭',
 '锈病' => '鏽病',
 '锈菌' => '鏽菌',
 '锈蚀' => '鏽蝕',
@@ -8896,7 +9130,6 @@ $zh2Hant = array(
 '钟鼓' => '鐘鼓',
 '铁杆' => '鐵杆',
 '铁栏杆' => '鐵欄杆',
-'铁锤' => '鐵鎚',
 '铁锈' => '鐵鏽',
 '铁钟' => '鐵鐘',
 '铸钟' => '鑄鐘',
@@ -9298,13 +9531,8 @@ $zh2Hant = array(
 '喂鱼' => '餵魚',
 '喂鸭' => '餵鴨',
 '喂鹅' => '餵鵝',
-'饥寒' => '饑寒',
-'饥民' => '饑民',
-'饥渴' => '饑渴',
-'饥溺' => '饑溺',
-'饥荒' => '饑荒',
-'饥饱' => '饑飽',
-'饥馑' => '饑饉',
+'饑荒' => '饑荒',
+'饑馑' => '饑饉',
 '首当其冲' => '首當其衝',
 '首发' => '首發',
 '首只' => '首隻',
@@ -9581,7 +9809,7 @@ $zh2Hant = array(
 '鱼干' => '魚乾',
 '鱼松' => '魚鬆',
 '鲸须' => '鯨鬚',
-'鲇鱼' => '鯰魚',
+'鯰鱼' => '鯰魚',
 '鸠占鹊巢' => '鳩佔鵲巢',
 '凤凰于飞' => '鳳凰于飛',
 '凤梨干' => '鳳梨乾',
@@ -9624,9 +9852,22 @@ $zh2Hant = array(
 '咸鸭蛋' => '鹹鴨蛋',
 '咸卤' => '鹹鹵',
 '咸咸' => '鹹鹹',
+'碱化' => '鹼化',
+'碱土金属' => '鹼土金屬',
+'碱地' => '鹼地',
+'碱度' => '鹼度',
+'碱性' => '鹼性',
+'碱水' => '鹼水',
+'碱液' => '鹼液',
+'碱熔' => '鹼熔',
+'碱石灰' => '鹼石灰',
+'碱纤维素' => '鹼纖維素',
+'碱金属' => '鹼金屬',
+'碱类' => '鹼類',
 '盐打怎么咸' => '鹽打怎麼鹹',
-'盐卤' => '鹽滷',
 '盐余' => '鹽餘',
+'盐碱土' => '鹽鹼土',
+'盐碱滩' => '鹽鹼灘',
 '丽于' => '麗於',
 '曲尘' => '麴塵',
 '曲蘖' => '麴櫱',
@@ -9779,18 +10020,90 @@ $zh2Hant = array(
 );
 
 $zh2Hans = array(
+'㑯' => '㑔',
+'㑳' => '㑇',
+'㒓' => '𠉂',
+'㓨' => '刾',
+'㗲' => '𠵾',
+'㘚' => '㘎',
+'㜄' => '㚯',
+'㜏' => '㛣',
+'㜢' => '𡞱',
+'㜷' => '𡝠',
 '㞞' => '𪨊',
 '㠏' => '㟆',
+'㢝' => '𢋈',
+'㥮' => '㤘',
+'㦎' => '𢛯',
 '㩜' => '㨫',
+'㩳' => '㧐',
+'㷿' => '𤈷',
+'㺏' => '𤠋',
+'㿧' => '𤽯',
+'䀹' => '𥅴',
+'䁪' => '𥇢',
+'䁻' => '䀥',
+'䉙' => '𥬀',
 '䉬' => '𫂈',
+'䉲' => '𥮜',
+'䊭' => '𥺅',
 '䊷' => '䌶',
 '䋙' => '䌺',
+'䋚' => '䌻',
 '䋻' => '䌾',
+'䋿' => '𦈓',
+'䌈' => '𦈖',
+'䌋' => '𦈘',
+'䌖' => '𦈜',
+'䌝' => '𦈟',
+'䌟' => '𦈞',
+'䌥' => '𦈠',
+'䌰' => '𦈙',
+'䕳' => '𦰴',
+'䗿' => '𧉞',
+'䙡' => '䙌',
+'䜀' => '䜧',
+'䝻' => '𧹕',
 '䝼' => '䞍',
+'䞈' => '𧹑',
+'䢨' => '𨑹',
+'䥇' => '䦂',
+'䥩' => '𨱖',
+'䥱' => '䥾',
+'䦘' => '𨸄',
+'䦛' => '䦶',
+'䦟' => '䦷',
+'䦳' => '𨷿',
+'䧢' => '𨸟',
+'䪏' => '𩏼',
+'䪗' => '𩐀',
+'䪘' => '𩏿',
+'䫴' => '𩖗',
+'䬘' => '𩙮',
+'䬝' => '𩙯',
+'䬞' => '𩙧',
+'䭀' => '𩠇',
+'䭃' => '𩠈',
+'䭿' => '𩧭',
+'䮝' => '𩧰',
+'䮞' => '𩨁',
+'䮠' => '𩧿',
+'䮫' => '𩨇',
+'䮳' => '𩨏',
+'䮾' => '𩧪',
 '䯀' => '䯅',
 '䰾' => '鲃',
+'䱙' => '𩾈',
+'䱬' => '𩾊',
+'䱰' => '𩾋',
+'ä±·' => 'ä²£',
 '䱽' => '䲝',
 '䲁' => '鳚',
+'䲖' => '𩾂',
+'䲰' => '𪉂',
+'䴉' => '鹮',
+'䴬' => '𪎈',
+'䴴' => '𪎋',
 '丟' => '丢',
 '並' => '并',
 'ä¹¾' => 'å¹²',
@@ -9808,6 +10121,7 @@ $zh2Hans = array(
 '係' => '系',
 '俔' => '伣',
 'ä¿ ' => 'ä¾ ',
+'俥' => '伡',
 '倀' => '伥',
 '倆' => '俩',
 '倈' => '俫',
@@ -9816,7 +10130,9 @@ $zh2Hans = array(
 '們' => '们',
 '倖' => '幸',
 '倫' => '伦',
+'倲' => '㑈',
 '偉' => '伟',
+'偑' => '㐽',
 '側' => '侧',
 '偵' => '侦',
 '偽' => '伪',
@@ -9852,6 +10168,7 @@ $zh2Hans = array(
 '儕' => '侪',
 '儘' => '尽',
 '償' => '偿',
+'儣' => '𠆲',
 '優' => '优',
 '儲' => '储',
 '儷' => '俪',
@@ -9885,6 +10202,7 @@ $zh2Hans = array(
 '剴' => '剀',
 '創' => '创',
 '剷' => '铲',
+'剾' => '𠛅',
 '劃' => '划',
 '劇' => '剧',
 '劉' => '刘',
@@ -9915,7 +10233,6 @@ $zh2Hans = array(
 '卻' => '却',
 '卽' => '即',
 '厙' => '厍',
-'厠' => '厕',
 '厤' => '历',
 '厭' => '厌',
 '厲' => '厉',
@@ -9929,10 +10246,10 @@ $zh2Hans = array(
 '呂' => '吕',
 '咼' => '呙',
 '員' => '员',
+'哯' => '𠯟',
 '唄' => '呗',
 '唚' => '吣',
 '問' => '问',
-'啓' => '启',
 '啞' => '哑',
 '啟' => '启',
 '啢' => '唡',
@@ -9953,6 +10270,7 @@ $zh2Hans = array(
 '嗹' => '𪡏',
 '嘆' => '叹',
 '嘍' => '喽',
+'嘓' => '啯',
 '嘔' => '呕',
 '嘖' => '啧',
 '嘗' => '尝',
@@ -9965,6 +10283,7 @@ $zh2Hans = array(
 '嘸' => '呒',
 '嘽' => '啴',
 '噁' => '恶',
+'噅' => '𠯠',
 '噓' => '嘘',
 '噚' => '㖊',
 '噝' => '咝',
@@ -9995,6 +10314,7 @@ $zh2Hans = array(
 '囂' => '嚣',
 '囅' => '冁',
 '囈' => '呓',
+'囉' => '啰',
 '囌' => '苏',
 '囑' => '嘱',
 '囪' => '囱',
@@ -10032,7 +10352,6 @@ $zh2Hans = array(
 '墮' => '堕',
 '墰' => '坛',
 '墳' => '坟',
-'墻' => '墙',
 '墾' => '垦',
 '壇' => '坛',
 '壈' => '𡒄',
@@ -10059,7 +10378,6 @@ $zh2Hans = array(
 '奧' => '奥',
 '奩' => '奁',
 '奪' => '夺',
-'奬' => '奖',
 '奮' => '奋',
 '奼' => '姹',
 '妝' => '妆',
@@ -10071,13 +10389,14 @@ $zh2Hans = array(
 '婭' => '娅',
 '媧' => '娲',
 '媯' => '妫',
+'媰' => '㛀',
 '媼' => '媪',
 '媽' => '妈',
 '嫗' => '妪',
 '嫵' => '妩',
 '嫻' => '娴',
 '嫿' => '婳',
-'嬀' => '妫',
+'嬃' => '媭',
 '嬈' => '娆',
 '嬋' => '婵',
 '嬌' => '娇',
@@ -10087,6 +10406,7 @@ $zh2Hans = array(
 '嬪' => '嫔',
 '嬰' => '婴',
 '嬸' => '婶',
+'孋' => '㛤',
 '孌' => '娈',
 '孫' => '孙',
 'å­¸' => 'å­¦',
@@ -10128,6 +10448,7 @@ $zh2Hans = array(
 'å´¬' => 'å²½',
 '嵐' => '岚',
 '嵗' => '岁',
+'嵼' => '𡶴',
 '嶁' => '嵝',
 '嶄' => '崭',
 '嶇' => '岖',
@@ -10189,7 +10510,9 @@ $zh2Hans = array(
 '彎' => '弯',
 '彙' => '汇',
 '彞' => '彝',
+'彠' => '彟',
 '彥' => '彦',
+'彲' => '彨',
 '後' => '后',
 '徑' => '径',
 '從' => '从',
@@ -10220,7 +10543,6 @@ $zh2Hans = array(
 '慚' => '惭',
 '慟' => '恸',
 '慣' => '惯',
-'慤' => '悫',
 '慪' => '怄',
 '慫' => '怂',
 '慮' => '虑',
@@ -10239,6 +10561,7 @@ $zh2Hans = array(
 '憮' => '怃',
 '憲' => '宪',
 '憶' => '忆',
+'懀' => '𢙓',
 '懇' => '恳',
 '應' => '应',
 '懌' => '怿',
@@ -10274,6 +10597,7 @@ $zh2Hans = array(
 '捲' => '卷',
 '掃' => '扫',
 '掄' => '抡',
+'掆' => '㧏',
 '掗' => '挜',
 '掙' => '挣',
 '掛' => '挂',
@@ -10287,6 +10611,7 @@ $zh2Hans = array(
 '搗' => '捣',
 '搵' => '揾',
 '搶' => '抢',
+'摋' => '𢫬',
 '摑' => '掴',
 '摜' => '掼',
 '摟' => '搂',
@@ -10318,6 +10643,7 @@ $zh2Hans = array(
 '擔' => '担',
 '據' => '据',
 '擠' => '挤',
+'擣' => '𢭏',
 '擬' => '拟',
 '擯' => '摈',
 '擰' => '拧',
@@ -10328,6 +10654,7 @@ $zh2Hans = array(
 '擺' => '摆',
 '擻' => '擞',
 '擼' => '撸',
+'擽' => '㧰',
 '擾' => '扰',
 '攄' => '摅',
 '攆' => '撵',
@@ -10349,6 +10676,8 @@ $zh2Hans = array(
 '數' => '数',
 '斂' => '敛',
 '斃' => '毙',
+'斅' => '𢽾',
+'斆' => '敩',
 '斕' => '斓',
 '斬' => '斩',
 '斷' => '断',
@@ -10371,10 +10700,12 @@ $zh2Hans = array(
 '曏' => '向',
 '曖' => '暧',
 '曠' => '旷',
+'曥' => '𣆐',
 '曨' => '昽',
 '曬' => '晒',
 '書' => '书',
 '會' => '会',
+'朥' => '𦛨',
 '朧' => '胧',
 '朮' => '术',
 '東' => '东',
@@ -10391,10 +10722,12 @@ $zh2Hans = array(
 '棖' => '枨',
 '棗' => '枣',
 '棟' => '栋',
+'棡' => '㭎',
 '棧' => '栈',
 '棲' => '栖',
 '棶' => '梾',
 '椏' => '桠',
+'椲' => '㭏',
 '楊' => '杨',
 '楓' => '枫',
 '楨' => '桢',
@@ -10412,6 +10745,8 @@ $zh2Hans = array(
 '槧' => '椠',
 '槨' => '椁',
 '槳' => '桨',
+'槶' => '椢',
+'槼' => '椝',
 '樁' => '桩',
 '樂' => '乐',
 '樅' => '枞',
@@ -10419,10 +10754,14 @@ $zh2Hans = array(
 '樓' => '楼',
 '標' => '标',
 '樞' => '枢',
+'樢' => '㭤',
 '樣' => '样',
+'樫' => '㭴',
+'樳' => '桪',
 '樸' => '朴',
 '樹' => '树',
 '樺' => '桦',
+'樿' => '椫',
 '橈' => '桡',
 '橋' => '桥',
 '機' => '机',
@@ -10435,6 +10774,7 @@ $zh2Hans = array(
 '檟' => '槚',
 '檢' => '检',
 '檣' => '樯',
+'檭' => '𣘴',
 '檮' => '梼',
 '檯' => '台',
 '檳' => '槟',
@@ -10460,8 +10800,10 @@ $zh2Hans = array(
 '欄' => '栏',
 '欅' => '榉',
 '權' => '权',
+'欍' => '𣐤',
 '欏' => '椤',
 '欒' => '栾',
+'欓' => '𣗋',
 '欖' => '榄',
 '欞' => '棂',
 '欽' => '钦',
@@ -10484,7 +10826,6 @@ $zh2Hans = array(
 '殰' => '㱩',
 '殲' => '歼',
 '殺' => '杀',
-'殻' => '壳',
 '殼' => '壳',
 '毀' => '毁',
 '毆' => '殴',
@@ -10518,6 +10859,7 @@ $zh2Hans = array(
 '淺' => '浅',
 '渙' => '涣',
 '減' => '减',
+'渢' => '沨',
 '渦' => '涡',
 '測' => '测',
 '渾' => '浑',
@@ -10529,6 +10871,7 @@ $zh2Hans = array(
 '準' => '准',
 '溝' => '沟',
 '溫' => '温',
+'溳' => '涢',
 '滄' => '沧',
 '滅' => '灭',
 '滌' => '涤',
@@ -10537,12 +10880,12 @@ $zh2Hans = array(
 '滬' => '沪',
 '滯' => '滞',
 '滲' => '渗',
-'滷' => '卤',
 '滸' => '浒',
 '滻' => '浐',
 '滾' => '滚',
 '滿' => '满',
 '漁' => '渔',
+'漊' => '溇',
 '漚' => '沤',
 '漢' => '汉',
 '漣' => '涟',
@@ -10554,7 +10897,6 @@ $zh2Hans = array(
 '潁' => '颍',
 '潑' => '泼',
 '潔' => '洁',
-'潙' => '沩',
 '潛' => '潜',
 '潤' => '润',
 '潯' => '浔',
@@ -10562,6 +10904,7 @@ $zh2Hans = array(
 '潷' => '滗',
 '潿' => '涠',
 '澀' => '涩',
+'澅' => '𣶩',
 '澆' => '浇',
 '澇' => '涝',
 '澐' => '沄',
@@ -10575,16 +10918,22 @@ $zh2Hans = array(
 'æ¾¾' => 'ã³ ',
 '濁' => '浊',
 '濃' => '浓',
+'濄' => '㳡',
+'濆' => '𣸣',
 '濕' => '湿',
 '濘' => '泞',
+'濜' => '浕',
 '濟' => '济',
 '濤' => '涛',
+'濧' => '㳔',
 '濫' => '滥',
 '濰' => '潍',
 '濱' => '滨',
 '濺' => '溅',
 '濼' => '泺',
 '濾' => '滤',
+'瀂' => '澛',
+'瀃' => '𣽷',
 '瀅' => '滢',
 '瀆' => '渎',
 '瀇' => '㲿',
@@ -10607,8 +10956,10 @@ $zh2Hans = array(
 '灑' => '洒',
 '灕' => '漓',
 '灘' => '滩',
+'灙' => '𣺼',
 '灝' => '灏',
 '灠' => '漤',
+'灡' => '㳕',
 '灣' => '湾',
 '灤' => '滦',
 '灧' => '滟',
@@ -10626,14 +10977,17 @@ $zh2Hans = array(
 '煬' => '炀',
 '煱' => '㶽',
 '熅' => '煴',
+'熉' => '𤈶',
+'熌' => '𤇄',
 '熒' => '荧',
+'熓' => '𤆡',
 '熗' => '炝',
+'熡' => '𤋏',
 '熱' => '热',
 '熲' => '颎',
 '熾' => '炽',
 '燁' => '烨',
 '燈' => '灯',
-'燉' => '炖',
 '燒' => '烧',
 '燙' => '烫',
 '燜' => '焖',
@@ -10645,11 +10999,11 @@ $zh2Hans = array(
 '燶' => '㶶',
 '燼' => '烬',
 '燾' => '焘',
+'爄' => '𤇃',
 '爍' => '烁',
 '爐' => '炉',
 '爛' => '烂',
 '爭' => '争',
-'爲' => '为',
 '爺' => '爷',
 '爾' => '尔',
 '牆' => '墙',
@@ -10683,6 +11037,7 @@ $zh2Hans = array(
 '獻' => '献',
 '獼' => '猕',
 '玀' => '猡',
+'玁' => '𤞤',
 '現' => '现',
 '琺' => '珐',
 '琿' => '珲',
@@ -10698,16 +11053,17 @@ $zh2Hans = array(
 '璣' => '玑',
 '璦' => '瑷',
 '璫' => '珰',
+'璯' => '㻅',
 '環' => '环',
 '璽' => '玺',
 '瓊' => '琼',
 '瓏' => '珑',
 '瓔' => '璎',
+'瓕' => '𤦀',
 '瓚' => '瓒',
 '甌' => '瓯',
 '甕' => '瓮',
 '產' => '产',
-'産' => '产',
 '甦' => '苏',
 '甯' => '宁',
 '畝' => '亩',
@@ -10731,7 +11087,6 @@ $zh2Hans = array(
 '瘮' => '瘆',
 '瘲' => '疭',
 '瘺' => '瘘',
-'瘻' => '瘘',
 '療' => '疗',
 '癆' => '痨',
 '癇' => '痫',
@@ -10753,6 +11108,7 @@ $zh2Hans = array(
 '癲' => '癫',
 '發' => '发',
 '皚' => '皑',
+'皟' => '𤾀',
 '皰' => '疱',
 '皸' => '皲',
 '皺' => '皱',
@@ -10774,6 +11130,7 @@ $zh2Hans = array(
 '瞘' => '眍',
 '瞜' => '䁖',
 '瞞' => '瞒',
+'瞤' => '𥆧',
 '瞭' => '了',
 '瞶' => '瞆',
 '瞼' => '睑',
@@ -10787,19 +11144,24 @@ $zh2Hans = array(
 '硨' => '砗',
 '硯' => '砚',
 '碕' => '埼',
+'碙' => '𥐻',
 '碩' => '硕',
 '碭' => '砀',
 '碸' => '砜',
 '確' => '确',
 '碼' => '码',
+'碽' => '䂵',
 '磑' => '硙',
 '磚' => '砖',
+'磠' => '硵',
 '磣' => '碜',
 '磧' => '碛',
 '磯' => '矶',
 '磽' => '硗',
+'礄' => '硚',
 '礆' => '硷',
 '礎' => '础',
+'礒' => '𥐟',
 '礙' => '碍',
 '礦' => '矿',
 '礪' => '砺',
@@ -10846,9 +11208,7 @@ $zh2Hans = array(
 '竄' => '窜',
 '竅' => '窍',
 '竇' => '窦',
-'竈' => '灶',
 '竊' => '窃',
-'竪' => '竖',
 '競' => '竞',
 '筆' => '笔',
 '筍' => '笋',
@@ -10862,6 +11222,7 @@ $zh2Hans = array(
 '築' => '筑',
 '篋' => '箧',
 '篔' => '筼',
+'篘' => '𥬠',
 '篤' => '笃',
 '篩' => '筛',
 '篳' => '筚',
@@ -10876,8 +11237,11 @@ $zh2Hans = array(
 'ç°½' => 'ç­¾',
 '簾' => '帘',
 '籃' => '篮',
+'籋' => '𥬞',
 '籌' => '筹',
+'籔' => '䉤',
 '籙' => '箓',
+'籛' => '篯',
 '籜' => '箨',
 '籟' => '籁',
 '籠' => '笼',
@@ -10950,14 +11314,14 @@ $zh2Hans = array(
 '統' => '统',
 '絲' => '丝',
 '絳' => '绛',
-'絶' => '绝',
 '絹' => '绢',
 '絺' => '𫄨',
+'綀' => '𦈌',
 '綁' => '绑',
 '綃' => '绡',
 '綆' => '绠',
+'綇' => '𦈋',
 '綈' => '绨',
-'綉' => '绣',
 '綌' => '绤',
 '綏' => '绥',
 '綐' => '䌼',
@@ -10967,14 +11331,12 @@ $zh2Hans = array(
 '綠' => '绿',
 '綢' => '绸',
 '綣' => '绻',
-'綫' => '线',
 '綬' => '绶',
 '維' => '维',
 '綯' => '绹',
 '綰' => '绾',
 '綱' => '纲',
 '網' => '网',
-'綳' => '绷',
 '綴' => '缀',
 '綵' => '彩',
 '綸' => '纶',
@@ -10988,10 +11350,9 @@ $zh2Hans = array(
 '緇' => '缁',
 '緊' => '紧',
 '緋' => '绯',
-'緑' => '绿',
+'緍' => '𦈏',
 '緒' => '绪',
 '緓' => '绬',
-'緔' => '绱',
 '緗' => '缃',
 '緘' => '缄',
 '緙' => '缂',
@@ -11006,16 +11367,20 @@ $zh2Hans = array(
 '緩' => '缓',
 '緬' => '缅',
 '緯' => '纬',
+'緰' => '𦈕',
 '緱' => '缑',
 '緲' => '缈',
 '練' => '练',
 '緶' => '缏',
+'緷' => '𦈉',
+'緸' => '𦈑',
 '緹' => '缇',
 '緻' => '致',
 '縈' => '萦',
 '縉' => '缙',
 '縊' => '缢',
 '縋' => '缒',
+'縎' => '𦈔',
 '縐' => '绉',
 '縑' => '缣',
 '縕' => '缊',
@@ -11025,8 +11390,8 @@ $zh2Hans = array(
 '縞' => '缟',
 '縟' => '缛',
 '縣' => '县',
-'縧' => '绦',
 '縫' => '缝',
+'縬' => '𦈚',
 '縭' => '缡',
 '縮' => '缩',
 '縱' => '纵',
@@ -11037,34 +11402,39 @@ $zh2Hans = array(
 '縶' => '絷',
 '縷' => '缕',
 '縹' => '缥',
+'縺' => '𦈐',
 '總' => '总',
 '績' => '绩',
 '繃' => '绷',
 '繅' => '缫',
 '繆' => '缪',
+'繏' => '𦈝',
 '繐' => '穗',
 '繒' => '缯',
+'繓' => '𦈛',
 '織' => '织',
 '繕' => '缮',
 '繚' => '缭',
 '繞' => '绕',
+'繟' => '𦈎',
 '繡' => '绣',
 '繢' => '缋',
 '繩' => '绳',
 '繪' => '绘',
 '繫' => '系',
 '繭' => '茧',
-'ç¹®' => 'ç¼°',
 '繯' => '缳',
 'ç¹°' => 'ç¼²',
 'ç¹³' => 'ç¼´',
 '繸' => '䍁',
 '繹' => '绎',
+'繻' => '𦈡',
 '繼' => '继',
 '繽' => '缤',
 'ç¹¾' => 'ç¼±',
 '繿' => '䍀',
 '纁' => '𫄸',
+'纇' => '颣',
 '纈' => '缬',
 '纊' => '纩',
 '續' => '续',
@@ -11090,7 +11460,9 @@ $zh2Hans = array(
 '羨' => '羡',
 '義' => '义',
 '習' => '习',
+'翬' => '翚',
 '翹' => '翘',
+'翽' => '翙',
 '耬' => '耧',
 '耮' => '耢',
 '聖' => '圣',
@@ -11110,18 +11482,22 @@ $zh2Hans = array(
 '脈' => '脉',
 '脛' => '胫',
 '脣' => '唇',
+'脥' => '𣍰',
 '脫' => '脱',
 '脹' => '胀',
 '腎' => '肾',
 '腖' => '胨',
 '腡' => '脶',
 '腦' => '脑',
+'腪' => '𣍯',
 '腫' => '肿',
 '腳' => '脚',
 '腸' => '肠',
 '膃' => '腽',
+'膕' => '腘',
 '膚' => '肤',
 '膠' => '胶',
+'膢' => '𦝼',
 '膩' => '腻',
 '膽' => '胆',
 '膾' => '脍',
@@ -11129,6 +11505,7 @@ $zh2Hans = array(
 '臉' => '脸',
 '臍' => '脐',
 '臏' => '膑',
+'臗' => '𣎑',
 '臘' => '腊',
 '臚' => '胪',
 '臟' => '脏',
@@ -11161,14 +11538,13 @@ $zh2Hans = array(
 '萇' => '苌',
 '萊' => '莱',
 '萬' => '万',
+'萴' => '荝',
 '萵' => '莴',
 '葉' => '叶',
 '葒' => '荭',
 '葤' => '荮',
 '葦' => '苇',
-'葯' => '药',
 '葷' => '荤',
-'蒓' => '莼',
 '蒔' => '莳',
 '蒞' => '莅',
 '蒼' => '苍',
@@ -11178,7 +11554,6 @@ $zh2Hans = array(
 '蓯' => '苁',
 '蓴' => '莼',
 '蓽' => '荜',
-'蔔' => '卜',
 '蔘' => '参',
 '蔞' => '蒌',
 '蔣' => '蒋',
@@ -11215,7 +11590,6 @@ $zh2Hans = array(
 '藝' => '艺',
 '藥' => '药',
 '藪' => '薮',
-'藴' => '蕴',
 '藶' => '苈',
 '藹' => '蔼',
 '藺' => '蔺',
@@ -11259,6 +11633,7 @@ $zh2Hans = array(
 '蟲' => '虫',
 '蟶' => '蛏',
 '蟻' => '蚁',
+'蠁' => '蚃',
 '蠅' => '蝇',
 '蠆' => '虿',
 '蠍' => '蝎',
@@ -11270,17 +11645,14 @@ $zh2Hans = array(
 '蠱' => '蛊',
 '蠶' => '蚕',
 '蠻' => '蛮',
-'衆' => '众',
 '衊' => '蔑',
 '術' => '术',
 '衕' => '同',
 '衚' => '胡',
 '衛' => '卫',
 '衝' => '冲',
-'衹' => '只',
 '袞' => '衮',
 '裊' => '袅',
-'裏' => '里',
 '補' => '补',
 '裝' => '装',
 '裡' => '里',
@@ -11294,7 +11666,7 @@ $zh2Hans = array(
 '褻' => '亵',
 '襀' => '𫌀',
 '襆' => '幞',
-'襇' => '裥',
+'襉' => '裥',
 '襏' => '袯',
 '襖' => '袄',
 '襝' => '裣',
@@ -11304,6 +11676,7 @@ $zh2Hans = array(
 '襬' => '䙓',
 '襯' => '衬',
 '襲' => '袭',
+'襴' => '襕',
 '見' => '见',
 '覎' => '觃',
 '規' => '规',
@@ -11355,10 +11728,12 @@ $zh2Hans = array(
 '訶' => '诃',
 '診' => '诊',
 '註' => '注',
+'詀' => '𧮪',
 '詁' => '诂',
 '詆' => '诋',
 '詎' => '讵',
 '詐' => '诈',
+'詑' => '𫍟',
 '詒' => '诒',
 '詔' => '诏',
 '評' => '评',
@@ -11404,7 +11779,6 @@ $zh2Hans = array(
 '誦' => '诵',
 '誨' => '诲',
 '說' => '说',
-'説' => '说',
 '誰' => '谁',
 '課' => '课',
 '誶' => '谇',
@@ -11460,15 +11834,12 @@ $zh2Hans = array(
 '講' => '讲',
 '謝' => '谢',
 '謠' => '谣',
-'謡' => '谣',
 '謨' => '谟',
 '謫' => '谪',
 '謬' => '谬',
-'謭' => '谫',
 '謳' => '讴',
 '謹' => '谨',
 '謾' => '谩',
-'譅' => '䜧',
 '證' => '证',
 '譊' => '𫍢',
 '譎' => '谲',
@@ -11489,6 +11860,8 @@ $zh2Hans = array(
 'è­¾' => 'è°«',
 '讀' => '读',
 '變' => '变',
+'讋' => '詟',
+'讌' => '䜩',
 '讎' => '仇',
 '讒' => '谗',
 '讓' => '让',
@@ -11547,6 +11920,7 @@ $zh2Hans = array(
 '賚' => '赉',
 '賜' => '赐',
 '賞' => '赏',
+'賟' => '𧹖',
 '賠' => '赔',
 '賡' => '赓',
 'è³¢' => 'è´¤',
@@ -11555,7 +11929,6 @@ $zh2Hans = array(
 '賦' => '赋',
 '賧' => '赕',
 '質' => '质',
-'賫' => '赍',
 '賬' => '账',
 '賭' => '赌',
 '賰' => '䞐',
@@ -11566,12 +11939,12 @@ $zh2Hans = array(
 'è³¼' => 'è´­',
 '賽' => '赛',
 '賾' => '赜',
+'贃' => '𧹗',
 '贄' => '贽',
 '贅' => '赘',
 '贇' => '赟',
 '贈' => '赠',
 '贊' => '赞',
-'贋' => '赝',
 '贍' => '赡',
 '贏' => '赢',
 '贐' => '赆',
@@ -11580,7 +11953,6 @@ $zh2Hans = array(
 '贖' => '赎',
 '贗' => '赝',
 '贛' => '赣',
-'贜' => '赃',
 '赬' => '赪',
 '趕' => '赶',
 '趙' => '赵',
@@ -11600,16 +11972,19 @@ $zh2Hans = array(
 '躊' => '踌',
 '躋' => '跻',
 '躍' => '跃',
+'躎' => '䟢',
 '躑' => '踯',
 '躒' => '跞',
 '躓' => '踬',
 '躕' => '蹰',
 '躚' => '跹',
+'躝' => '𨅬',
 '躡' => '蹑',
 '躥' => '蹿',
 '躦' => '躜',
 '躪' => '躏',
 '軀' => '躯',
+'軉' => '𨉗',
 '車' => '车',
 '軋' => '轧',
 '軌' => '轨',
@@ -11618,6 +11993,7 @@ $zh2Hans = array(
 '軑' => '轪',
 '軒' => '轩',
 '軔' => '轫',
+'軗' => '𨐅',
 '軛' => '轭',
 '軟' => '软',
 '軤' => '轷',
@@ -11631,6 +12007,7 @@ $zh2Hans = array(
 '軼' => '轶',
 '軾' => '轼',
 '較' => '较',
+'輄' => '𨐈',
 '輅' => '辂',
 '輇' => '辁',
 '輈' => '辀',
@@ -11721,7 +12098,6 @@ $zh2Hans = array(
 '鄺' => '邝',
 '酇' => '酂',
 '酈' => '郦',
-'醖' => '酝',
 '醜' => '丑',
 '醞' => '酝',
 '醣' => '糖',
@@ -11747,10 +12123,12 @@ $zh2Hans = array(
 '釤' => '钐',
 '釧' => '钏',
 '釩' => '钒',
+'釳' => '𨰿',
 '釵' => '钗',
 '釷' => '钍',
 '釹' => '钕',
 '釺' => '钎',
+'釾' => '䥺',
 '鈀' => '钯',
 '鈁' => '钫',
 '鈃' => '钘',
@@ -11758,20 +12136,23 @@ $zh2Hans = array(
 '鈇' => '𫓧',
 '鈈' => '钚',
 '鈉' => '钠',
+'鈋' => '𨱂',
 '鈍' => '钝',
-'鈎' => '钩',
 '鈐' => '钤',
 '鈑' => '钣',
 '鈒' => '钑',
 '鈔' => '钞',
 '鈕' => '钮',
 '鈞' => '钧',
+'鈠' => '𨱁',
 '鈣' => '钙',
 '鈥' => '钬',
 '鈦' => '钛',
 '鈧' => '钪',
 '鈮' => '铌',
+'鈯' => '𨱄',
 '鈰' => '铈',
+'鈲' => '𨱃',
 '鈳' => '钶',
 '鈴' => '铃',
 '鈷' => '钴',
@@ -11782,6 +12163,7 @@ $zh2Hans = array(
 '鈾' => '铀',
 '鈿' => '钿',
 '鉀' => '钾',
+'鉁' => '𨱅',
 '鉅' => '钜',
 '鉈' => '铊',
 '鉉' => '铉',
@@ -11793,7 +12175,6 @@ $zh2Hans = array(
 '鉚' => '铆',
 '鉛' => '铅',
 '鉞' => '钺',
-'鉢' => '钵',
 '鉤' => '钩',
 '鉦' => '钲',
 '鉬' => '钼',
@@ -11825,14 +12206,15 @@ $zh2Hans = array(
 '銬' => '铐',
 '銱' => '铞',
 '銳' => '锐',
+'銶' => '𨱇',
 '銷' => '销',
-'銹' => '锈',
 '銻' => '锑',
 '銼' => '锉',
 '鋁' => '铝',
 '鋃' => '锒',
 '鋅' => '锌',
 '鋇' => '钡',
+'鋉' => '𨱈',
 '鋌' => '铤',
 '鋏' => '铗',
 '鋒' => '锋',
@@ -11846,7 +12228,6 @@ $zh2Hans = array(
 '鋨' => '锇',
 '鋩' => '铓',
 '鋪' => '铺',
-'鋭' => '锐',
 '鋮' => '铖',
 '鋯' => '锆',
 '鋰' => '锂',
@@ -11855,6 +12236,7 @@ $zh2Hans = array(
 '鋸' => '锯',
 '鋼' => '钢',
 '錁' => '锞',
+'錂' => '𨱋',
 '錄' => '录',
 '錆' => '锖',
 '錇' => '锫',
@@ -11877,13 +12259,12 @@ $zh2Hans = array(
 '錫' => '锡',
 '錮' => '锢',
 '錯' => '错',
-'録' => '录',
 '錳' => '锰',
 '錶' => '表',
 '錸' => '铼',
 '鍀' => '锝',
-'鍁' => '锨',
 '鍃' => '锪',
+'鍄' => '𨱉',
 '鍆' => '钔',
 '鍇' => '锴',
 '鍈' => '锳',
@@ -11899,6 +12280,7 @@ $zh2Hans = array(
 '鍥' => '锲',
 '鍩' => '锘',
 '鍬' => '锹',
+'鍮' => '𨱎',
 '鍰' => '锾',
 '鍵' => '键',
 '鍶' => '锶',
@@ -11912,7 +12294,6 @@ $zh2Hans = array(
 '鎔' => '镕',
 '鎖' => '锁',
 '鎘' => '镉',
-'鎚' => '锤',
 '鎛' => '镈',
 '鎝' => '𨱏',
 '鎡' => '镃',
@@ -11925,15 +12306,18 @@ $zh2Hans = array(
 '鎬' => '镐',
 '鎭' => '鎮',
 '鎮' => '镇',
+'鎯' => '𨱍',
 '鎰' => '镒',
 '鎲' => '镋',
 '鎳' => '镍',
 '鎵' => '镓',
-'鎸' => '镌',
+'鎷' => '𨰾',
 '鎿' => '镎',
 '鏃' => '镞',
+'鏆' => '𨱌',
 '鏇' => '镟',
 '鏈' => '链',
+'鏉' => '𨱒',
 '鏌' => '镆',
 '鏍' => '镙',
 '鏐' => '镠',
@@ -11954,23 +12338,28 @@ $zh2Hans = array(
 '鏵' => '铧',
 '鏷' => '镤',
 '鏹' => '镪',
+'鏺' => '䥽',
 '鏽' => '锈',
 '鐃' => '铙',
+'鐄' => '𨱑',
 '鐋' => '铴',
 '鐍' => '𫔎',
+'鐎' => '𨱓',
+'鐏' => '𨱔',
 '鐐' => '镣',
 '鐒' => '铹',
 '鐓' => '镦',
 '鐔' => '镡',
 '鐘' => '钟',
 '鐙' => '镫',
-'鐝' => '镢',
 '鐠' => '镨',
+'鐥' => '䦅',
 '鐦' => '锎',
 '鐧' => '锏',
 '鐨' => '镄',
 '鐫' => '镌',
 '鐮' => '镰',
+'鐯' => '䦃',
 '鐲' => '镯',
 '鐳' => '镭',
 '鐵' => '铁',
@@ -12010,8 +12399,10 @@ $zh2Hans = array(
 '閉' => '闭',
 '開' => '开',
 '閌' => '闶',
+'閍' => '𨸂',
 '閎' => '闳',
 '閏' => '闰',
+'閐' => '𨸃',
 '閑' => '闲',
 '閒' => '闲',
 '間' => '间',
@@ -12027,7 +12418,6 @@ $zh2Hans = array(
 '閬' => '阆',
 '閭' => '闾',
 '閱' => '阅',
-'閲' => '阅',
 '閶' => '阊',
 '閹' => '阉',
 '閻' => '阎',
@@ -12143,7 +12533,7 @@ $zh2Hans = array(
 '頸' => '颈',
 '頹' => '颓',
 '頻' => '频',
-'頽' => '颓',
+'顃' => '𩖖',
 '顆' => '颗',
 '題' => '题',
 '額' => '额',
@@ -12151,7 +12541,6 @@ $zh2Hans = array(
 '顏' => '颜',
 '顒' => '颙',
 '顓' => '颛',
-'顔' => '颜',
 '願' => '愿',
 '顙' => '颡',
 '顛' => '颠',
@@ -12170,13 +12559,16 @@ $zh2Hans = array(
 '颭' => '飐',
 '颮' => '飑',
 '颯' => '飒',
+'颰' => '𩙥',
 '颱' => '台',
 '颳' => '刮',
 '颶' => '飓',
+'颷' => '𩙪',
 '颸' => '飔',
 '颺' => '飏',
 '颻' => '飖',
 '颼' => '飕',
+'颾' => '𩙫',
 '飀' => '飗',
 '飄' => '飘',
 '飆' => '飙',
@@ -12227,6 +12619,7 @@ $zh2Hans = array(
 '餵' => '喂',
 '餶' => '馉',
 '餷' => '馇',
+'餸' => '𩠌',
 '餺' => '馎',
 '餼' => '饩',
 '餾' => '馏',
@@ -12239,7 +12632,6 @@ $zh2Hans = array(
 '饊' => '馓',
 '饋' => '馈',
 '饌' => '馔',
-'饑' => '饥',
 '饒' => '饶',
 '饗' => '飨',
 '饘' => '𫗴',
@@ -12255,6 +12647,7 @@ $zh2Hans = array(
 '馹' => '驲',
 '駁' => '驳',
 '駃' => '𫘝',
+'駎' => '𩧨',
 '駐' => '驻',
 '駑' => '驽',
 '駒' => '驹',
@@ -12262,14 +12655,17 @@ $zh2Hans = array(
 '駕' => '驾',
 '駘' => '骀',
 '駙' => '驸',
+'駚' => '𩧫',
 '駛' => '驶',
 '駝' => '驼',
 '駟' => '驷',
-'駡' => '骂',
 '駢' => '骈',
+'駧' => '𩧲',
+'駩' => '𩧴',
 '駭' => '骇',
 '駰' => '骃',
 '駱' => '骆',
+'駶' => '𩧺',
 '駸' => '骎',
 '駻' => '𫘣',
 '駿' => '骏',
@@ -12281,11 +12677,16 @@ $zh2Hans = array(
 '騍' => '骒',
 '騎' => '骑',
 '騏' => '骐',
+'騔' => '𩨀',
 '騖' => '骛',
 '騙' => '骗',
+'騚' => '𩨊',
+'騝' => '𩨃',
+'騟' => '𩨈',
 '騠' => '𫘨',
 '騤' => '骙',
 '騧' => '䯄',
+'騪' => '𩨄',
 '騫' => '骞',
 '騭' => '骘',
 '騮' => '骝',
@@ -12301,6 +12702,7 @@ $zh2Hans = array(
 '驄' => '骢',
 '驅' => '驱',
 '驊' => '骅',
+'驋' => '𩧯',
 '驌' => '骕',
 '驍' => '骁',
 '驏' => '骣',
@@ -12332,12 +12734,14 @@ $zh2Hans = array(
 '鬩' => '阋',
 '鬮' => '阄',
 '鬱' => '郁',
+'鬹' => '鬶',
 '魎' => '魉',
 '魘' => '魇',
 '魚' => '鱼',
 '魛' => '鱽',
 '魟' => '𫚉',
 'é­¢' => 'é±¾',
+'魥' => '𩽹',
 '魨' => '鲀',
 '魯' => '鲁',
 '魴' => '鲂',
@@ -12349,15 +12753,15 @@ $zh2Hans = array(
 '鮊' => '鲌',
 '鮋' => '鲉',
 '鮍' => '鲏',
-'鮎' => '鲇',
 '鮐' => '鲐',
 '鮑' => '鲍',
 '鮒' => '鲋',
 '鮓' => '鲊',
 '鮚' => '鲒',
 '鮜' => '鲘',
-'鮝' => '鲞',
 '鮞' => '鲕',
+'鮟' => '𩽾',
+'鮣' => '䲟',
 '鮦' => '鲖',
 '鮪' => '鲔',
 '鮫' => '鲛',
@@ -12366,9 +12770,11 @@ $zh2Hans = array(
 '鮰' => '𫚔',
 '鮳' => '鲓',
 '鮶' => '鲪',
+'鮸' => '𩾃',
 '鮺' => '鲝',
 '鯀' => '鲧',
 '鯁' => '鲠',
+'鯄' => '𩾁',
 '鯆' => '𫚙',
 '鯇' => '鲩',
 '鯉' => '鲤',
@@ -12387,19 +12793,21 @@ $zh2Hans = array(
 '鯨' => '鲸',
 '鯪' => '鲮',
 '鯫' => '鲰',
-'鯰' => '鲇',
+'鯱' => '𩾇',
 '鯴' => '鲺',
+'鯶' => '𩽼',
 '鯷' => '鳀',
 '鯽' => '鲫',
 '鯿' => '鳊',
 '鰁' => '鳈',
 '鰂' => '鲗',
 '鰃' => '鳂',
+'鰆' => '䲠',
 '鰈' => '鲽',
 '鰉' => '鳇',
+'鰌' => '䲡',
 '鰍' => '鳅',
 '鰏' => '鲾',
-'鰐' => '鳄',
 '鰒' => '鳆',
 '鰓' => '鳃',
 '鰜' => '鳒',
@@ -12408,6 +12816,7 @@ $zh2Hans = array(
 'é°£' => 'é²¥',
 '鰤' => '𫚕',
 '鰥' => '鳏',
+'é°§' => 'ä²¢',
 '鰨' => '鳎',
 '鰩' => '鳐',
 '鰭' => '鳍',
@@ -12424,6 +12833,7 @@ $zh2Hans = array(
 '鰾' => '鳔',
 '鱂' => '鳉',
 '鱅' => '鳙',
+'鱇' => '𩾌',
 '鱈' => '鳕',
 '鱉' => '鳖',
 '鱒' => '鳟',
@@ -12447,12 +12857,12 @@ $zh2Hans = array(
 '鳥' => '鸟',
 '鳧' => '凫',
 '鳩' => '鸠',
-'鳬' => '凫',
 '鳲' => '鸤',
 '鳳' => '凤',
 '鳴' => '鸣',
 '鳶' => '鸢',
 '鳷' => '𫛛',
+'鳼' => '𪉃',
 '鳾' => '䴓',
 '鴃' => '𫛞',
 '鴆' => '鸩',
@@ -12462,6 +12872,7 @@ $zh2Hans = array(
 '鴕' => '鸵',
 '鴗' => '𫁡',
 '鴛' => '鸳',
+'鴜' => '𪉈',
 '鴝' => '鸲',
 '鴞' => '鸮',
 '鴟' => '鸱',
@@ -12470,6 +12881,7 @@ $zh2Hans = array(
 '鴨' => '鸭',
 '鴯' => '鸸',
 '鴰' => '鸹',
+'鴲' => '𪉆',
 '鴴' => '鸻',
 '鴷' => '䴕',
 '鴻' => '鸿',
@@ -12481,6 +12893,7 @@ $zh2Hans = array(
 '鵑' => '鹃',
 '鵒' => '鹆',
 '鵓' => '鹁',
+'鵚' => '𪉍',
 '鵜' => '鹈',
 '鵝' => '鹅',
 '鵠' => '鹄',
@@ -12516,19 +12929,19 @@ $zh2Hans = array(
 '鶻' => '鹘',
 '鶼' => '鹣',
 '鶿' => '鹚',
-'鷀' => '鹚',
 '鷁' => '鹢',
 '鷂' => '鹞',
-'鷄' => '鸡',
 '鷈' => '䴘',
 '鷊' => '鹝',
 '鷓' => '鹧',
+'鷔' => '𪉑',
 '鷖' => '鹥',
 '鷗' => '鸥',
 '鷙' => '鸷',
 '鷚' => '鹨',
 '鷥' => '鸶',
 '鷦' => '鹪',
+'鷨' => '𪉊',
 '鷫' => '鹔',
 '鷯' => '鹩',
 '鷲' => '鹫',
@@ -12556,10 +12969,12 @@ $zh2Hans = array(
 '鹽' => '盐',
 '麗' => '丽',
 '麥' => '麦',
+'麨' => '𪎊',
 '麩' => '麸',
 '麪' => '面',
 '麫' => '面',
 '麯' => '曲',
+'麲' => '𪎉',
 '麴' => '曲',
 '麵' => '面',
 '麼' => '么',
@@ -12605,25 +13020,167 @@ $zh2Hans = array(
 '龔' => '龚',
 '龕' => '龛',
 '龜' => '龟',
+'龭' => '𩨎',
+'龯' => '𨱆',
+'𠌥' => '𠆿',
+'𠏢' => '𠉗',
+'𠞆' => '𠛆',
+'𠠎' => '𠚳',
+'𡄔' => '𠴢',
+'𡄣' => '𠵸',
+'𡅏' => '𠲥',
+'𡑭' => '𡋗',
+'𡓾' => '𡋀',
 '𡞵' => '㛟',
 '𡠹' => '㛿',
 '𡢃' => '㛠',
+'𡮉' => '𡭜',
+'𡮣' => '𡭬',
 '𡻕' => '岁',
+'𡾱' => '㟜',
+'𢣚' => '𢘝',
+'𢣭' => '𢘞',
+'𢶫' => '𢫞',
+'𢷮' => '𢫊',
+'𢹿' => '𢬦',
+'𣙎' => '㭣',
+'𣝕' => '𣘷',
+'𣞻' => '𣘓',
+'𣠲' => '𣑶',
+'𣯴' => '𣭤',
+'𣾷' => '㳢',
+'𣿉' => '𣶫',
+'𤁣' => '𣺽',
+'𤒎' => '𤊀',
 '𤪺' => '㻘',
 '𤫩' => '㻏',
+'𤳸' => '𤳄',
+'𤸫' => '𤶧',
+'𥌃' => '𥅘',
+'𥕥' => '𥐰',
+'𥖅' => '𥐯',
+'𥢢' => '䅪',
+'𥨐' => '𥧂',
+'𥵃' => '𥱔',
+'𥵊' => '𥭉',
+'𥸠' => '𥮋',
+'𥼽' => '𥹥',
+'𥽖' => '𥺇',
+'𥿊' => '𦈈',
+'𦂅' => '𦈒',
+'𦃄' => '𦈗',
+'𦢈' => '𣍨',
+'𦣎' => '𦟗',
+'𦪽' => '𦨩',
+'𧔥' => '𧒭',
+'𧜗' => '䘞',
 '𧜵' => '䙊',
 '𧝞' => '䘛',
-'𧦧' => '𫍟',
 '𧩙' => '䜥',
+'𧳟' => '𧳕',
 '𧵳' => '䞌',
+'𧶔' => '𧹓',
+'𧶧' => '䞎',
+'𨄣' => '𨀱',
+'𨅍' => '𨁴',
+'𨇁' => '𧿈',
+'𨇞' => '𨅫',
+'𨈊' => '𨂺',
+'𨈌' => '𨄄',
+'𨊰' => '䢀',
+'𨊸' => '䢁',
+'𨊻' => '𨐆',
 '𨋢' => '䢂',
+'𨎮' => '𨐉',
+'𨏠' => '𨐇',
+'𨏥' => '𨐊',
+'𨤻' => '𨤰',
+'𨥛' => '𨱀',
 '𨦫' => '䦀',
 '𨧜' => '䦁',
+'𨧱' => '𨱊',
+'𨫒' => '𨱐',
+'𨮂' => '𨱕',
 '𨯅' => '䥿',
+'𨳑' => '𨸁',
+'𨳕' => '𨸀',
+'𨴗' => '𨸅',
+'𨵩' => '𨸆',
+'𨵸' => '𨸇',
+'𨶀' => '𨸉',
+'𨶏' => '𨸊',
+'𨶮' => '𨸌',
+'𨶲' => '𨸋',
+'𨷲' => '𨸎',
+'𨽏' => '𨸘',
+'𩎢' => '𩏾',
+'𩏪' => '𩏽',
+'𩓣' => '𩖕',
+'𩗀' => '𩙦',
+'𩘀' => '𩙩',
+'𩘝' => '𩙭',
+'𩘹' => '𩙨',
+'𩘺' => '𩙬',
+'𩙈' => '𩙰',
+'𩚛' => '𩟿',
+'𩚥' => '𩠀',
+'𩚵' => '𩠁',
+'𩛆' => '𩠂',
+'𩛩' => '𩠃',
+'𩜇' => '𩠉',
+'𩜦' => '𩠆',
+'𩜵' => '𩠊',
+'𩝔' => '𩠋',
+'𩞄' => '𩠎',
+'𩞦' => '𩠏',
+'𩞯' => '䭪',
+'𩟐' => '𩠅',
+'ð© ´' => 'ð©  ',
+'𩡺' => '𩧦',
+'𩢡' => '𩧬',
+'𩢴' => '𩧵',
+'𩢸' => '𩧳',
+'𩢾' => '𩧮',
+'𩣏' => '𩧶',
 '𩣑' => '䯃',
 '𩣵' => '𩧻',
+'𩣺' => '𩧼',
+'𩤊' => '𩧩',
+'𩤙' => '𩨆',
+'𩤲' => '𩨉',
+'𩤸' => '𩨅',
+'𩥄' => '𩨋',
+'𩥇' => '𩨍',
+'𩥉' => '𩧱',
+'𩥑' => '𩨌',
+'𩧆' => '𩨐',
+'𩭙' => '𩬣',
+'𩯳' => '𩯒',
+'𩰀' => '𩬤',
+'𩳤' => '𩲒',
+'𩵩' => '𩽺',
+'𩵹' => '𩽻',
 '𩶘' => '䲞',
-'𫚒' => '軿',
+'𩶰' => '𩽿',
+'𩶱' => '𩽽',
+'𩷰' => '𩾄',
+'𩸃' => '𩾅',
+'𩸦' => '𩾆',
+'𩿪' => '𪉄',
+'𪀦' => '𪉅',
+'𪀾' => '𪉋',
+'𪁈' => '𪉉',
+'𪁖' => '𪉌',
+'𪂆' => '𪉎',
+'𪃍' => '𪉐',
+'𪃏' => '𪉏',
+'𪄆' => '𪉔',
+'𪄕' => '𪉒',
+'𪇳' => '𪉕',
+'𪋿' => '𪎍',
+'𪔵' => '𪔭',
+'𪘀' => '𪚏',
+'𪘯' => '𪚐',
 '《易乾' => '《易乾',
 '不著痕跡' => '不着痕迹',
 '不著邊際' => '不着边际',
@@ -12762,8 +13319,8 @@ $zh2Hans = array(
 '乾曜' => '乾曜',
 '乾构' => '乾构',
 '乾構' => '乾构',
-'乾枢' => '乾枢',
 '乾樞' => '乾枢',
+'乾枢' => '乾枢',
 '乾栋' => '乾栋',
 '乾棟' => '乾栋',
 '乾步' => '乾步',
@@ -13473,6 +14030,7 @@ $zh2Hans = array(
 '尋著稱' => '寻著称',
 '尋著者' => '寻著者',
 '尋著述' => '寻著述',
+'將軍抽俥' => '将军抽俥',
 '將軍抽車' => '将军抽車',
 '尼乾陀' => '尼乾陀',
 '展著' => '展着',
@@ -14790,6 +15348,8 @@ $zh2Hans = array(
 '繞著稱' => '绕著称',
 '繞著者' => '绕著者',
 '繞著述' => '绕著述',
+'綳著勁' => '绷着劲',
+'綳著臉' => '绷着脸',
 '編著' => '编著',
 '纏著' => '缠着',
 '纏著書' => '缠著书',
@@ -14918,7 +15478,9 @@ $zh2Hans = array(
 '著者' => '著者',
 '著身' => '著身',
 '著述' => '著述',
+'蒙汗葯' => '蒙汗药',
 '蒙著' => '蒙着',
+'蒙葯' => '蒙药',
 '蒙著書' => '蒙著书',
 '蒙著书' => '蒙著书',
 '蒙著作' => '蒙著作',
@@ -15512,7 +16074,6 @@ $zh2Hans = array(
 '鬱氏' => '鬱氏',
 '魏徵' => '魏徵',
 '魚乾乾' => '鱼干干',
-'鯰魚' => '鲶鱼',
 '麯崇裕' => '麯崇裕',
 '麴義' => '麴义',
 '麴义' => '麴义',
diff --git a/includes/actions/InfoAction.php b/includes/actions/InfoAction.php
index e986323bac..29c3d7e35a 100644
--- a/includes/actions/InfoAction.php
+++ b/includes/actions/InfoAction.php
@@ -234,6 +234,12 @@ class InfoAction extends FormlessAction {
 		// Page ID (number not localised, as it's a database ID)
 		$pageInfo['header-basic'][] = array( $this->msg( 'pageinfo-article-id' ), $id );
 
+		// Language in which the page content is (supposed to be) written
+		$pageLang = $title->getPageLanguage()->getCode();
+		$pageInfo['header-basic'][] = array( $this->msg( 'pageinfo-language' ),
+			Language::fetchLanguageName( $pageLang, $lang->getCode() )
+			. ' ' . $this->msg( 'parentheses', $pageLang ) );
+
 		// Search engine status
 		$pOutput = new ParserOutput();
 		if ( isset( $pageProperties['noindex'] ) ) {
diff --git a/includes/api/ApiEditPage.php b/includes/api/ApiEditPage.php
index ca62bc6930..4cb91bc9e8 100644
--- a/includes/api/ApiEditPage.php
+++ b/includes/api/ApiEditPage.php
@@ -246,6 +246,11 @@ class ApiEditPage extends ApiBase {
 			$requestArray['wpSectionTitle'] = $params['sectiontitle'];
 		}
 
+		// TODO: Pass along information from 'undoafter' as well
+		if ( $params['undo'] > 0 ) {
+			$requestArray['wpUndidRevision'] = $params['undo'];
+		}
+
 		// Watch out for basetimestamp == ''
 		// wfTimestamp() treats it as NOW, almost certainly causing an edit conflict
 		if ( !is_null( $params['basetimestamp'] ) && $params['basetimestamp'] != '' ) {
@@ -568,7 +573,7 @@ class ApiEditPage extends ApiBase {
 			'watch' => 'Add the page to your watchlist',
 			'unwatch' => 'Remove the page from your watchlist',
 			'watchlist' => 'Unconditionally add or remove the page from your watchlist, use preferences or do not change watch',
-			'md5' => array(	"The MD5 hash of the {$p}text parameter, or the {$p}prependtext and {$p}appendtext parameters concatenated.",
+			'md5' => array( "The MD5 hash of the {$p}text parameter, or the {$p}prependtext and {$p}appendtext parameters concatenated.",
 					'If set, the edit won\'t be done unless the hash is correct' ),
 			'prependtext' => "Add this text to the beginning of the page. Overrides {$p}text",
 			'appendtext' => array( "Add this text to the end of the page. Overrides {$p}text.",
diff --git a/includes/api/ApiMain.php b/includes/api/ApiMain.php
index 3aa51b7967..91b8cc834b 100644
--- a/includes/api/ApiMain.php
+++ b/includes/api/ApiMain.php
@@ -119,7 +119,7 @@ class ApiMain extends ApiBase {
 			'msg' => 'Use of the write API',
 			'params' => array()
 		),
-		'apihighlimits'	=> array(
+		'apihighlimits' => array(
 			'msg' => 'Use higher limits in API queries (Slow queries: $1 results; Fast queries: $2 results). The limits for slow queries also apply to multivalue parameters.',
 			'params' => array( ApiBase::LIMIT_SML2, ApiBase::LIMIT_BIG2 )
 		)
@@ -376,7 +376,12 @@ class ApiMain extends ApiBase {
 
 			// Log it
 			if ( !( $e instanceof UsageException ) ) {
-				wfDebugLog( 'exception', $e->getLogMessage() );
+				global $wgLogExceptionBacktrace;
+				if ( $wgLogExceptionBacktrace ) {
+					wfDebugLog( 'exception', $e->getLogMessage() . "\n" . $e->getTraceAsString() . "\n" );
+				} else {
+					wfDebugLog( 'exception', $e->getLogMessage() );
+				}
 			}
 
 			// Handle any kind of exception by outputing properly formatted error message.
diff --git a/includes/api/ApiParse.php b/includes/api/ApiParse.php
index fae8e690b0..12c20fb596 100644
--- a/includes/api/ApiParse.php
+++ b/includes/api/ApiParse.php
@@ -147,6 +147,9 @@ class ApiParse extends ApiBase {
 
 				$pageObj = $this->getTitleOrPageId( $pageParams, 'fromdb' );
 				$titleObj = $pageObj->getTitle();
+				if ( !$titleObj || !$titleObj->exists() ) {
+					$this->dieUsage( "The page you specified doesn't exist", 'missingtitle' );
+				}
 				$wgTitle = $titleObj;
 
 				if ( isset( $prop['revid'] ) ) {
@@ -630,7 +633,7 @@ class ApiParse extends ApiBase {
 			'uselang' => 'Which language to parse the request in',
 			'section' => 'Only retrieve the content of this section number',
 			'disablepp' => 'Disable the PP Report from the parser output',
-			'generatexml' => 'Generate XML parse tree',
+			'generatexml' => 'Generate XML parse tree (requires prop=wikitext)',
 			'contentformat' => 'Content serialization format used for the input text',
 			'contentmodel' => 'Content model of the new content',
 		);
diff --git a/includes/api/ApiQuery.php b/includes/api/ApiQuery.php
index dff7524d88..d24745cebb 100644
--- a/includes/api/ApiQuery.php
+++ b/includes/api/ApiQuery.php
@@ -545,7 +545,7 @@ class ApiQuery extends ApiBase {
 	 * @param  $pageSet ApiPageSet Pages to be exported
 	 * @param  $result ApiResult Result to output to
 	 */
-	private function doExport( $pageSet, $result )	{
+	private function doExport( $pageSet, $result ) {
 		$exportTitles = array();
 		$titles = $pageSet->getGoodTitles();
 		if ( count( $titles ) ) {
diff --git a/includes/api/ApiQueryAllUsers.php b/includes/api/ApiQueryAllUsers.php
index 7f50cbad2e..79f6469442 100644
--- a/includes/api/ApiQueryAllUsers.php
+++ b/includes/api/ApiQueryAllUsers.php
@@ -81,12 +81,18 @@ class ApiQueryAllUsers extends ApiQueryBase {
 				$db->buildLike( $this->getCanonicalUserName( $params['prefix'] ), $db->anyString() ) );
 		}
 
-		if ( !is_null( $params['rights'] ) ) {
+		if ( !is_null( $params['rights'] ) && count( $params['rights'] ) ) {
 			$groups = array();
 			foreach( $params['rights'] as $r ) {
 				$groups = array_merge( $groups, User::getGroupsWithPermission( $r ) );
 			}
 
+			// no group with the given right(s) exists, no need for a query
+			if( !count( $groups ) ) {
+				$this->getResult()->setIndexedTagName_internal( array( 'query', $this->getModuleName() ), '' );
+				return;
+			}
+
 			$groups = array_unique( $groups );
 
 			if ( is_null( $params['group'] ) ) {
diff --git a/includes/api/ApiQueryBlocks.php b/includes/api/ApiQueryBlocks.php
index 96b8696240..a8d4a7c327 100644
--- a/includes/api/ApiQueryBlocks.php
+++ b/includes/api/ApiQueryBlocks.php
@@ -301,7 +301,7 @@ class ApiQueryBlocks extends ApiQueryBase {
 			'dir' => $this->getDirectionDescription( $p ),
 			'ids' => 'List of block IDs to list (optional)',
 			'users' => 'List of users to search for (optional)',
-			'ip' => array(	'Get all blocks applying to this IP or CIDR range, including range blocks.',
+			'ip' => array( 'Get all blocks applying to this IP or CIDR range, including range blocks.',
 					'Cannot be used together with bkusers. CIDR ranges broader than /16 are not accepted' ),
 			'limit' => 'The maximum amount of blocks to list',
 			'prop' => array(
diff --git a/includes/api/ApiQueryInfo.php b/includes/api/ApiQueryInfo.php
index b617ed05d5..e5cea96421 100644
--- a/includes/api/ApiQueryInfo.php
+++ b/includes/api/ApiQueryInfo.php
@@ -394,7 +394,7 @@ class ApiQueryInfo extends ApiQueryBase {
 			}
 		}
 
-		if ( $this->fld_talkid && isset( $this->talkids[$ns][$dbkey] ) )	{
+		if ( $this->fld_talkid && isset( $this->talkids[$ns][$dbkey] ) ) {
 			$pageInfo['talkid'] = $this->talkids[$ns][$dbkey];
 		}
 
diff --git a/includes/api/ApiQueryRevisions.php b/includes/api/ApiQueryRevisions.php
index 881b79721b..ad40a6486a 100644
--- a/includes/api/ApiQueryRevisions.php
+++ b/includes/api/ApiQueryRevisions.php
@@ -261,7 +261,7 @@ class ApiQueryRevisions extends ApiQueryBase {
 			// rvstart and rvstartid when that is supplied.
 			if ( !is_null( $params['continue'] ) ) {
 				$params['startid'] = $params['continue'];
-				unset( $params['start'] );
+				$params['start'] = null;
 			}
 
 			// This code makes an assumption that sorting by rev_id and rev_timestamp produces
@@ -715,9 +715,10 @@ class ApiQueryRevisions extends ApiQueryBase {
 			'dir' => $this->getDirectionDescription( $p, ' (enum)' ),
 			'user' => 'Only include revisions made by user (enum)',
 			'excludeuser' => 'Exclude revisions made by user (enum)',
-			'expandtemplates' => 'Expand templates in revision content',
-			'generatexml' => 'Generate XML parse tree for revision content',
-			'parse' => 'Parse revision content. For performance reasons if this option is used, rvlimit is enforced to 1.',
+			'expandtemplates' => "Expand templates in revision content (requires {$p}prop=content)",
+			'generatexml' => "Generate XML parse tree for revision content (requires {$p}prop=content)",
+			'parse' => array( "Parse revision content (requires {$p}prop=content).",
+				'For performance reasons if this option is used, rvlimit is enforced to 1.' ),
 			'section' => 'Only retrieve the content of this section number',
 			'token' => 'Which tokens to obtain for each revision',
 			'continue' => 'When more results are available, use this to continue',
diff --git a/includes/api/ApiQueryUsers.php b/includes/api/ApiQueryUsers.php
index 1cf8e31cfa..591ace93e1 100644
--- a/includes/api/ApiQueryUsers.php
+++ b/includes/api/ApiQueryUsers.php
@@ -138,7 +138,7 @@ class ApiQueryUsers extends ApiQueryBase {
 				if ( !isset( $userGroups ) ) {
 					$user = User::newFromRow( $row );
 				} else {
-					if ( !is_array( $userGroups[$row->user_name] ) ) {
+					if ( !isset( $userGroups[$row->user_name] ) || !is_array( $userGroups[$row->user_name] ) ) {
 						$userGroups[$row->user_name] = array();
 					}
 					$user = User::newFromRow( $row, array( 'user_groups' => $userGroups[$row->user_name] ) );
diff --git a/includes/cache/MessageCache.php b/includes/cache/MessageCache.php
index e061101bc6..9bf743667d 100644
--- a/includes/cache/MessageCache.php
+++ b/includes/cache/MessageCache.php
@@ -59,26 +59,6 @@ class MessageCache {
 	/// Variable for tracking which variables are already loaded
 	protected $mLoadedLanguages = array();
 
-	/**
-	 * Used for automatic detection of most used messages.
-	 */
-	protected $mRequestedMessages = array();
-
-	/**
-	 * How long the message request counts are stored. Longer period gives
-	 * better sample, but also takes longer to adapt changes. The counts
-	 * are aggregrated per day, regardless of the value of this variable.
-	 */
-	protected static $mAdaptiveDataAge = 604800; // Is 7*24*3600
-
-	/**
-	 * Filter the tail of less used messages that are requested more seldom
-	 * than this factor times the number of request of most requested message.
-	 * These messages are not loaded in the default set, but are still cached
-	 * individually on demand with the normal cache expiry time.
-	 */
-	protected static $mAdaptiveInclusionThreshold = 0.05;
-
 	/**
 	 * Singleton instance
 	 *
@@ -404,19 +384,20 @@ class MessageCache {
 		);
 
 		$mostused = array();
-		if ( $wgAdaptiveMessageCache ) {
-			$mostused = $this->getMostUsedMessages();
-			if ( $code !== $wgLanguageCode ) {
-				foreach ( $mostused as $key => $value ) {
-					$mostused[$key] = "$value/$code";
-				}
+		if ( $wgAdaptiveMessageCache && $code !== $wgLanguageCode ) {
+			if ( !isset( $this->mCache[$wgLanguageCode] ) ) {
+				$this->load( $wgLanguageCode );
+			}
+			$mostused = array_keys( $this->mCache[$wgLanguageCode] );
+			foreach ( $mostused as $key => $value ) {
+				$mostused[$key] = "$value/$code";
 			}
 		}
 
 		if ( count( $mostused ) ) {
 			$conds['page_title'] = $mostused;
 		} elseif ( $code !== $wgLanguageCode ) {
-			$conds[] = 'page_title' . $dbr->buildLike( $dbr->anyString(), "/$code" );
+			$conds[] = 'page_title' . $dbr->buildLike( $dbr->anyString(), '/', $code );
 		} else {
 			# Effectively disallows use of '/' character in NS_MEDIAWIKI for uses
 			# other than language code.
@@ -459,12 +440,6 @@ class MessageCache {
 			$cache[$row->page_title] = $entry;
 		}
 
-		foreach ( $mostused as $key ) {
-			if ( !isset( $cache[$key] ) ) {
-				$cache[$key] = '!NONEXISTENT';
-			}
-		}
-
 		$cache['VERSION'] = MSG_CACHE_VERSION;
 		wfProfileOut( __METHOD__ );
 		return $cache;
@@ -646,13 +621,6 @@ class MessageCache {
 			$uckey = $wgContLang->ucfirst( $lckey );
 		}
 
-		/**
-		 * Record each message request, but only once per request.
-		 * This information is not used unless $wgAdaptiveMessageCache
-		 * is enabled.
-		 */
-		$this->mRequestedMessages[$uckey] = true;
-
 		# Try the MediaWiki namespace
 		if( !$this->mDisable && $useDB ) {
 			$title = $uckey;
@@ -719,8 +687,6 @@ class MessageCache {
 	 * @return string|bool False on failure
 	 */
 	function getMsgFromNamespace( $title, $code ) {
-		global $wgAdaptiveMessageCache;
-
 		$this->load( $code );
 		if ( isset( $this->mCache[$code][$title] ) ) {
 			$entry = $this->mCache[$code][$title];
@@ -739,15 +705,7 @@ class MessageCache {
 				return $message;
 			}
 
-			/**
-			 * If message cache is in normal mode, it is guaranteed
-			 * (except bugs) that there is always entry (or placeholder)
-			 * in the cache if message exists. Thus we can do minor
-			 * performance improvement and return false early.
-			 */
-			if ( !$wgAdaptiveMessageCache ) {
-				return false;
-			}
+			return false;
 		}
 
 		# Try the individual message cache
@@ -862,7 +820,7 @@ class MessageCache {
 	 * @param $linestart bool
 	 * @param $interface bool
 	 * @param $language
-	 * @return ParserOutput
+	 * @return ParserOutput|string
 	 */
 	public function parse( $text, $title = null, $linestart = true, $interface = false, $language = null  ) {
 		if ( $this->mInParser ) {
@@ -907,7 +865,7 @@ class MessageCache {
 	 */
 	function clear() {
 		$langs = Language::fetchLanguageNames( null, 'mw' );
-		foreach ( array_keys($langs) as $code ) {
+		foreach ( array_keys( $langs ) as $code ) {
 			# Global cache
 			$this->mMemc->delete( wfMemcKey( 'messages', $code ) );
 			# Invalidate all local caches
@@ -936,82 +894,6 @@ class MessageCache {
 		return array( $message, $lang );
 	}
 
-	public static function logMessages() {
-		wfProfileIn( __METHOD__ );
-		global $wgAdaptiveMessageCache;
-		if ( !$wgAdaptiveMessageCache || !self::$instance instanceof MessageCache ) {
-			wfProfileOut( __METHOD__ );
-			return;
-		}
-
-		$cachekey = wfMemckey( 'message-profiling' );
-		$cache = wfGetCache( CACHE_DB );
-		$data = $cache->get( $cachekey );
-
-		if ( !$data ) {
-			$data = array();
-		}
-
-		$age = self::$mAdaptiveDataAge;
-		$filterDate = substr( wfTimestamp( TS_MW, time() - $age ), 0, 8 );
-		foreach ( array_keys( $data ) as $key ) {
-			if ( $key < $filterDate ) {
-				unset( $data[$key] );
-			}
-		}
-
-		$index = substr( wfTimestampNow(), 0, 8 );
-		if ( !isset( $data[$index] ) ) {
-			$data[$index] = array();
-		}
-
-		foreach ( self::$instance->mRequestedMessages as $message => $_ ) {
-			if ( !isset( $data[$index][$message] ) ) {
-				$data[$index][$message] = 0;
-			}
-			$data[$index][$message]++;
-		}
-
-		$cache->set( $cachekey, $data );
-		wfProfileOut( __METHOD__ );
-	}
-
-	/**
-	 * @return array
-	 */
-	public function getMostUsedMessages() {
-		wfProfileIn( __METHOD__ );
-		$cachekey = wfMemcKey( 'message-profiling' );
-		$cache = wfGetCache( CACHE_DB );
-		$data = $cache->get( $cachekey );
-		if ( !$data ) {
-			wfProfileOut( __METHOD__ );
-			return array();
-		}
-
-		$list = array();
-
-		foreach( $data as $messages ) {
-			foreach( $messages as $message => $count ) {
-				$key = $message;
-				if ( !isset( $list[$key] ) ) {
-					$list[$key] = 0;
-				}
-				$list[$key] += $count;
-			}
-		}
-
-		$max = max( $list );
-		foreach ( $list as $message => $count ) {
-			if ( $count < intval( $max * self::$mAdaptiveInclusionThreshold ) ) {
-				unset( $list[$message] );
-			}
-		}
-
-		wfProfileOut( __METHOD__ );
-		return array_keys( $list );
-	}
-
 	/**
 	 * Get all message keys stored in the message cache for a given language.
 	 * If $code is the content language code, this will return all message keys
diff --git a/includes/conf/Conf.php b/includes/conf/Conf.php
deleted file mode 100644
index 22c621fe5a..0000000000
--- a/includes/conf/Conf.php
+++ /dev/null
@@ -1,202 +0,0 @@
-<?php
-/**
- * Base configuration class.
- *
- * Get some configuration variable:
- *   $mySetting = Conf::get( 'mySetting' );
- *
- * Copyright © 2011 Chad Horohoe <chadh@wikimedia.org>
- * http://www.mediawiki.org/
- *
- * 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
- * @defgroup Config Config
- */
-abstract class Conf {
-	/**
-	 * A special value to return when default config items do not exist. Use
-	 * this to differentiate from 'null' which may be a valid config value.
-	 *
-	 * Please don't ever make this a default (or accepted) value for your
-	 * configuration. It's liable to Break Something.
-	 */
-	const NO_SUCH_DEFAULT_CONFIG = 'mw-no-such-default-config';
-
-	/**
-	 * The Wiki ID (usually $wgDBname)
-	 * @var String
-	 */
-	private $wikiId;
-
-	/**
-	 * Singleton
-	 * @var Conf
-	 */
-	private static $__instance;
-
-	/**
-	 * Stores of the core defaults, extension defaults and wiki overrides
-	 *
-	 * @var array
-	 */
-	protected $defaults, $extensionDefaults, $values = array();
-
-	/**
-	 * Constructor. Children should call this if implementing.
-	 * @param $confConfig Array of config vars
-	 */
-	protected function __construct( $confConfig ) {
-		$this->wikiId = $confConfig['wikiId'];
-		$this->defaults = (array)(new DefaultSettings);
-		// @todo implement this:
-		// $this->initExtensionDefaults();
-		$this->initChangedSettings();
-		if( isset( $confConfig['exposeGlobals'] ) ) {
-			$this->exposeGlobals();
-		}
-	}
-
-	/**
-	 * Expose all config variables as globals for back-compat. Ewwww.
-	 */
-	private function exposeGlobals() {
-		$allVars = $this->defaults + $this->extensionDefaults + $this->values;
-		foreach( $allVars as $name => $value ) {
-			$var = 'wg' . ucfirst( $name );
-			$GLOBALS[$var] = $value;
-		}
-	}
-
-	/**
-	 * Load customized settings from whatever the data store is
-	 */
-	abstract protected function initChangedSettings();
-
-	/**
-	 * Apply a setting to the backend store
-	 * @param $name String Name of the setting
-	 * @param $value mixed Value to store
-	 */
-	abstract protected function writeSetting( $name, $value );
-
-	/**
-	 * Initialize a new child class based on a configuration array
-	 * @param $conf Array of configuration settings, see $wgConfiguration
-	 *   for details
-	 * @throws MWException
-	 * @return Conf
-	 */
-	private static function newFromSettings( $conf ) {
-		$class = ucfirst( $conf['type'] ) . 'Conf';
-		if( !class_exists( $class ) ) {
-			throw new MWException( '$wgConfiguration misconfigured with invalid "type"' );
-		}
-		return new $class( $conf );
-	}
-
-	/**
-	 * Get the singleton if we don't want a specific wiki
-	 * @param bool|string $wiki An id for a remote wiki
-	 * @throws MWException
-	 * @return Conf child
-	 */
-	public static function load( $wiki = false ) {
-		throw new MWException( "Not working yet, don't attempt to use this" );
-		if( !self::$__instance ) {
-			/**global $wgConfiguration;
-			self::$__instance = self::newFromSettings( $wgConfiguration );*/
-		}
-		if( $wiki && $wiki != self::$__instance->getWikiId() ) {
-			// Load configuration for a different wiki, not sure how
-			// we're gonna do this yet
-			return null;
-		}
-		return self::$__instance;
-	}
-
-	/**
-	 * Get a property from the configuration database, falling back
-	 * to DefaultSettings if undefined
-	 * @param $name String Name of setting to retrieve.
-	 * @param $wiki String An id for a remote wiki
-	 * @return mixed
-	 */
-	public static function get( $name, $wiki = false ) {
-		return self::load( $wiki )->retrieveSetting( $name );
-	}
-
-	/**
-	 * Actually get the setting, checking overrides, extensions, then core.
-	 *
-	 * @param $name String Name of setting to get
-	 * @return mixed
-	 */
-	public function retrieveSetting( $name ) {
-		// isset() is ok here, because the default is to return null anyway.
-		if( isset( $this->values[$name] ) ) {
-			return $this->values[$name];
-		} elseif( isset( $this->extensionDefaults[$name] ) ) {
-			return $this->extensionDefaults[$name];
-		} elseif( isset( $this->defaults[$name] ) ) {
-			return $this->defaults[$name];
-		} else {
-			wfDebug( __METHOD__ . " called for unknown configuration item '$name'\n" );
-			return null;
-		}
-	}
-
-	/**
-	 * Apply a setting to the configuration object.
-	 * @param $name String Name of the config item
-	 * @param $value mixed Any value to use for the key
-	 * @param $write bool Whether to write to the static copy (db, file, etc)
-	 */
-	public function applySetting( $name, $value, $write = false ) {
-		$this->values[$name] = $value;
-		if( $write && ( $value !== $this->getDefaultSetting( $name ) ) ) {
-			$this->writeSetting( $name, $value );
-		}
-	}
-
-	/**
-	 * Get the default for a given setting name. Check core and then extensions.
-	 * Will return NO_SUCH_DEFAULT_CONFIG if the config item does not exist.
-	 *
-	 * @param $name String Name of setting
-	 * @return mixed
-	 */
-	public function getDefaultSetting( $name ) {
-		// Use array_key_exists() here, to make sure we return a default
-		// that's really set to null.
-		if( array_key_exists( $name, $this->defaults ) ) {
-			return $this->defaults[$name];
-		} elseif( array_key_exists( $name, $this->extensionDefaults ) ) {
-			return $this->extensionDefaults[$name];
-		} else {
-			wfDebug( __METHOD__ . " called for unknown configuration item '$name'\n" );
-			return self::NO_SUCH_DEFAULT_CONFIG;
-		}
-	}
-
-	/**
-	 * What is the wiki ID for this site?
-	 * @return String
-	 */
-	public function getWikiId() {
-		return $this->wikiId;
-	}
-}
diff --git a/includes/conf/DatabaseConf.php b/includes/conf/DatabaseConf.php
deleted file mode 100644
index d8f644deec..0000000000
--- a/includes/conf/DatabaseConf.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/**
- * Database configuration class
- *
- * Copyright © 2011 Chad Horohoe <chadh@wikimedia.org>
- * http://www.mediawiki.org/
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- * http://www.gnu.org/copyleft/gpl.html
- *
- * @file
- * @ingroup Config
- */
-class DatabaseConf extends Conf {
-	/**
-	 * @see Conf::initChangedSettings()
-	 */
-	protected function initChangedSettings() {
-		$res = wfGetDB( DB_MASTER )->select( 'config', '*', array(), __METHOD__ );
-		foreach( $res as $row ) {
-			$this->values[$row->cf_name] = unserialize( $row->cf_value );
-		}
-	}
-
-	/**
-	 * @see Conf::writeSetting()
-	 *
-	 * @param $name
-	 * @param $value
-	 *
-	 * @return bool
-	 */
-	protected function writeSetting( $name, $value ) {
-		$dbw = wfGetDB( DB_MASTER );
-		$value = serialize( $value );
-		if( $dbw->selectRow( 'config', 'cf_name', array( 'cf_name' => $name ), __METHOD__ ) ) {
-			$dbw->update( 'config', array( 'cf_value' => $value ),
-				array( 'cf_name' => $name ), __METHOD__ );
-		} else {
-			$dbw->insert( 'config',
-				array( 'cf_name' => $name, 'cf_value' => $value ), __METHOD__ );
-		}
-		return (bool)$dbw->affectedRows();
-	}
-}
diff --git a/includes/conf/DefaultSettings.php b/includes/conf/DefaultSettings.php
deleted file mode 100644
index 4601f048a4..0000000000
--- a/includes/conf/DefaultSettings.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
- * Utility class for holding all of our default settings.
- *
- * Copyright © 2011 Chad Horohoe <chadh@wikimedia.org>
- * http://www.mediawiki.org/
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- * http://www.gnu.org/copyleft/gpl.html
- *
- * @file
- * @ingroup Config
- */
-final class DefaultSettings {
-	public $mySetting = 'defaultValue';
-}
diff --git a/includes/content/AbstractContent.php b/includes/content/AbstractContent.php
index 0a8bb9e997..386f55aee5 100644
--- a/includes/content/AbstractContent.php
+++ b/includes/content/AbstractContent.php
@@ -411,4 +411,30 @@ abstract class AbstractContent implements Content {
 	public function matchMagicWord( MagicWord $word ) {
 		return false;
 	}
+
+	/**
+	 * @see Content::convert()
+	 *
+	 * This base implementation calls the hook ConvertContent to enable custom conversions.
+	 * Subclasses may override this to implement conversion for "their" content model.
+	 *
+	 * @param String  $toModel the desired content model, use the CONTENT_MODEL_XXX flags.
+	 * @param String  $lossy flag, set to "lossy" to allow lossy conversion. If lossy conversion is
+	 * not allowed, full round-trip conversion is expected to work without losing information.
+	 *
+	 * @return Content|bool A content object with the content model $toModel, or false if
+	 * that conversion is not supported.
+	 */
+	public function convert( $toModel, $lossy = '' ) {
+		if ( $this->getModel() === $toModel ) {
+			//nothing to do, shorten out.
+			return $this;
+		}
+
+		$lossy = ( $lossy === 'lossy' ); // string flag, convert to boolean for convenience
+		$result = false;
+
+		wfRunHooks( 'ConvertContent', array( $this, $toModel, $lossy, &$result ) );
+		return $result;
+	}
 }
diff --git a/includes/content/Content.php b/includes/content/Content.php
index 66d720955d..35b51c346f 100644
--- a/includes/content/Content.php
+++ b/includes/content/Content.php
@@ -42,7 +42,7 @@ interface Content {
 	/**
 	 * @since 1.21
 	 *
-	 * @return string The wikitext to include when another page includes this
+	 * @return string|false The wikitext to include when another page includes this
 	 * content, or false if the content is not includable in a wikitext page.
 	 *
 	 * @todo allow native handling, bypassing wikitext representation, like
@@ -241,7 +241,6 @@ interface Content {
 	 */
 	public function isCountable( $hasLinks = null );
 
-
 	/**
 	 * Parse the Content object and generate a ParserOutput from the result.
 	 * $result->getText() can be used to obtain the generated HTML. If no HTML
@@ -262,7 +261,7 @@ interface Content {
 	public function getParserOutput( Title $title,
 		$revId = null,
 		ParserOptions $options = null, $generateHtml = true );
-	# TODO: make RenderOutput and RenderOptions base classes
+	// TODO: make RenderOutput and RenderOptions base classes
 
 	/**
 	 * Returns a list of DataUpdate objects for recording information about this
@@ -381,7 +380,7 @@ interface Content {
 	 *
 	 * @since 1.21
 	 *
-	 * @param $section Empty/null/false or a section number (0, 1, 2, T1, T2...), or "new"
+	 * @param $section null/false or a section number (0, 1, 2, T1, T2...), or "new"
 	 * @param $with Content: new content of the section
 	 * @param $sectionTitle String: new section's subject, only if $section is 'new'
 	 * @return string Complete article text, or null if error
@@ -396,10 +395,10 @@ interface Content {
 	 *
 	 * @param $title Title
 	 * @param $user User
-	 * @param $popts null|ParserOptions
+	 * @param $parserOptions null|ParserOptions
 	 * @return Content
 	 */
-	public function preSaveTransform( Title $title, User $user, ParserOptions $popts );
+	public function preSaveTransform( Title $title, User $user, ParserOptions $parserOptions );
 
 	/**
 	 * Returns a new WikitextContent object with the given section heading
@@ -420,10 +419,10 @@ interface Content {
 	 * @since 1.21
 	 *
 	 * @param $title Title
-	 * @param $popts null|ParserOptions
+	 * @param $parserOptions null|ParserOptions
 	 * @return Content
 	 */
-	public function preloadTransform( Title $title, ParserOptions $popts );
+	public function preloadTransform( Title $title, ParserOptions $parserOptions );
 
 	/**
 	 * Prepare Content for saving. Called before Content is saved by WikiPage::doEditContent() and in
@@ -482,9 +481,22 @@ interface Content {
 	 */
 	public function matchMagicWord( MagicWord $word );
 
-	# TODO: ImagePage and CategoryPage interfere with per-content action handlers
-	# TODO: nice&sane integration of GeSHi syntax highlighting
-	#   [11:59] <vvv> Hooks are ugly; make CodeHighlighter interface and a
-	#   config to set the class which handles syntax highlighting
-	#   [12:00] <vvv> And default it to a DummyHighlighter
+	/**
+	 * Converts this content object into another content object with the given content model,
+	 * if that is possible.
+	 *
+	 * @param String  $toModel the desired content model, use the CONTENT_MODEL_XXX flags.
+	 * @param String  $lossy flag, set to "lossy" to allow lossy conversion. If lossy conversion is
+	 * not allowed, full round-trip conversion is expected to work without losing information.
+	 *
+	 * @return Content|bool A content object with the content model $toModel, or false if
+	 * that conversion is not supported.
+	 */
+	public function convert( $toModel, $lossy = '' );
+
+		// TODO: ImagePage and CategoryPage interfere with per-content action handlers
+	// TODO: nice&sane integration of GeSHi syntax highlighting
+	//   [11:59] <vvv> Hooks are ugly; make CodeHighlighter interface and a
+	//   config to set the class which handles syntax highlighting
+	//   [12:00] <vvv> And default it to a DummyHighlighter
 }
diff --git a/includes/content/ContentHandler.php b/includes/content/ContentHandler.php
index 9c4c3afc94..b61dc34e4b 100644
--- a/includes/content/ContentHandler.php
+++ b/includes/content/ContentHandler.php
@@ -582,8 +582,6 @@ abstract class ContentHandler {
 		$rcid = 0, # FIXME: use everywhere!
 		$refreshCache = false, $unhide = false
 	) {
-		$this->checkModelID( $context->getTitle()->getContentModel() );
-
 		$diffEngineClass = $this->getDiffEngineClass();
 
 		return new $diffEngineClass( $context, $old, $new, $rcid, $refreshCache, $unhide );
@@ -607,15 +605,17 @@ abstract class ContentHandler {
 	 * @return Language the page's language
 	 */
 	public function getPageLanguage( Title $title, Content $content = null ) {
-		global $wgContLang;
+		global $wgContLang, $wgLang;
+		$pageLang = $wgContLang;
 
 		if ( $title->getNamespace() == NS_MEDIAWIKI ) {
 			// Parse mediawiki messages with correct target language
 			list( /* $unused */, $lang ) = MessageCache::singleton()->figureMessage( $title->getText() );
-			return wfGetLangObj( $lang );
+			$pageLang = wfGetLangObj( $lang );
 		}
 
-		return $wgContLang;
+		wfRunHooks( 'PageContentLanguage', array( $title, &$pageLang, $wgLang ) );
+		return wfGetLangObj( $pageLang );
 	}
 
 	/**
@@ -802,20 +802,21 @@ abstract class ContentHandler {
 		$content = $rev->getContent();
 		$blank = false;
 
-		$this->checkModelID( $content->getModel() );
-
 		// If the page is blank, use the text from the previous revision,
 		// which can only be blank if there's a move/import/protect dummy
 		// revision involved
-		if ( $content->getSize() == 0 ) {
+		if ( !$content || $content->isEmpty() ) {
 			$prev = $rev->getPrevious();
 
-			if ( $prev )	{
-				$content = $prev->getContent();
+			if ( $prev ) {
+				$rev = $prev;
+				$content = $rev->getContent();
 				$blank = true;
 			}
 		}
 
+		$this->checkModelID( $rev->getContentModel() );
+
 		// Find out if there was only one contributor
 		// Only scan the last 20 revisions
 		$res = $dbw->select( 'revision', 'rev_user_text',
@@ -871,7 +872,7 @@ abstract class ContentHandler {
 		}
 
 		// Max content length = max comment length - length of the comment (excl. $1)
-		$text = $content->getTextForSummary( 255 - ( strlen( $reason ) - 2 ) );
+		$text = $content ? $content->getTextForSummary( 255 - ( strlen( $reason ) - 2 ) ) : '';
 
 		// Now replace the '$1' placeholder
 		$reason = str_replace( '$1', $text, $reason );
diff --git a/includes/content/TextContent.php b/includes/content/TextContent.php
index 048ac396d3..872738b4fe 100644
--- a/includes/content/TextContent.php
+++ b/includes/content/TextContent.php
@@ -33,6 +33,9 @@ class TextContent extends AbstractContent {
 		parent::__construct( $model_id );
 
 		if ( $text === null || $text === false ) {
+			wfWarn( "TextContent constructed with \$text = " . var_export( $text, true ) . "! "
+					. "This may indicate an error in the caller's scope." );
+
 			$text = '';
 		}
 
@@ -112,12 +115,21 @@ class TextContent extends AbstractContent {
 	}
 
 	/**
-	 * Returns the text represented by this Content object, as a string.
+	 * Returns attempts to convert this content object to wikitext,
+	 * and then returns the text string. The conversion may be lossy.
 	 *
-	 * @return string: the raw text
+	 * @note: this allows any text-based content to be transcluded as if it was wikitext.
+	 *
+	 * @return string|false: the raw text, or null if the conversion failed
 	 */
 	public function getWikitextForTransclusion( ) {
-		return $this->getNativeData();
+		$wikitext = $this->convert( CONTENT_MODEL_WIKITEXT, 'lossy' );
+
+		if ( $wikitext ) {
+			return $wikitext->getNativeData();
+		} else {
+			return false;
+		}
 	}
 
 	/**
@@ -234,4 +246,35 @@ class TextContent extends AbstractContent {
 		# TODO: make Highlighter interface, use highlighter here, if available
 		return htmlspecialchars( $this->getNativeData() );
 	}
+
+	/**
+	 * @see Content::convert()
+	 *
+	 * This implementation provides lossless conversion between content models based
+	 * on TextContent.
+	 *
+	 * @param String  $toModel the desired content model, use the CONTENT_MODEL_XXX flags.
+	 * @param String  $lossy flag, set to "lossy" to allow lossy conversion. If lossy conversion is
+	 * not allowed, full round-trip conversion is expected to work without losing information.
+	 *
+	 * @return Content|bool A content object with the content model $toModel, or false if
+	 * that conversion is not supported.
+	 */
+	public function convert( $toModel, $lossy = '' ) {
+		$converted = parent::convert( $toModel, $lossy );
+
+		if ( $converted !== false ) {
+			return $converted;
+		}
+
+		$toHandler = ContentHandler::getForModelID( $toModel );
+
+		if ( $toHandler instanceof TextContentHandler ) {
+			//NOTE: ignore content serialization format - it's just text anyway.
+			$text = $this->getNativeData();
+			$converted = $toHandler->unserializeContent( $text );
+		}
+
+		return $converted;
+	}
 }
diff --git a/includes/context/RequestContext.php b/includes/context/RequestContext.php
index cd2bf556f8..e4de030c74 100644
--- a/includes/context/RequestContext.php
+++ b/includes/context/RequestContext.php
@@ -93,6 +93,8 @@ class RequestContext implements IContextSource {
 	 */
 	public function setTitle( Title $t ) {
 		$this->title = $t;
+		// Erase the WikiPage so a new one with the new title gets created.
+		$this->wikipage = null;
 	}
 
 	/**
@@ -138,6 +140,12 @@ class RequestContext implements IContextSource {
 	 * @param $p WikiPage object
 	 */
 	public function setWikiPage( WikiPage $p ) {
+		$contextTitle = $this->getTitle();
+		$pageTitle = $p->getTitle();
+		if ( !$contextTitle || !$pageTitle->equals( $contextTitle ) ) {
+			$this->setTitle( $pageTitle );
+		}
+		// Defer this to the end since setTitle sets it to null.
 		$this->wikipage = $p;
 	}
 
diff --git a/includes/db/Database.php b/includes/db/Database.php
index c9d2fda111..db050f2df5 100644
--- a/includes/db/Database.php
+++ b/includes/db/Database.php
@@ -290,6 +290,13 @@ abstract class DatabaseBase implements DatabaseType {
 		return $this->getServerVersion();
 	}
 
+	/**
+	 * @return string: command delimiter used by this database engine
+	 */
+	public function getDelimiter() {
+		return $this->delimiter;
+	}
+
 	/**
 	 * Boolean, controls output of large amounts of debug information.
 	 * @param $debug bool|null
diff --git a/includes/db/DatabaseSqlite.php b/includes/db/DatabaseSqlite.php
index 1125d4f37a..d30d984fcc 100644
--- a/includes/db/DatabaseSqlite.php
+++ b/includes/db/DatabaseSqlite.php
@@ -705,6 +705,14 @@ class DatabaseSqlite extends DatabaseBase {
 	function addQuotes( $s ) {
 		if ( $s instanceof Blob ) {
 			return "x'" . bin2hex( $s->fetch() ) . "'";
+		} else if ( strpos( $s, "\0" ) !== false ) {
+			// SQLite doesn't support \0 in strings, so use the hex representation as a workaround.
+			// This is a known limitation of SQLite's mprintf function which PDO should work around,
+			// but doesn't. I have reported this to php.net as bug #63419:
+			// https://bugs.php.net/bug.php?id=63419
+			// There was already a similar report for SQLite3::escapeString, bug #62361:
+			// https://bugs.php.net/bug.php?id=62361
+			return "x'" . bin2hex( $s ) . "'";
 		} else {
 			return $this->mConn->quote( $s );
 		}
diff --git a/includes/db/ORMRow.php b/includes/db/ORMRow.php
index fa25868d7a..affd65f99a 100644
--- a/includes/db/ORMRow.php
+++ b/includes/db/ORMRow.php
@@ -263,8 +263,10 @@ abstract class ORMRow implements IORMRow {
 				switch ( $type ) {
 					case 'array':
 						$value = (array)$value;
+						// fall-through!
 					case 'blob':
 						$value = serialize( $value );
+						// fall-through!
 				}
 
 				$values[$this->table->getPrefixedField( $name )] = $value;
@@ -347,7 +349,7 @@ abstract class ORMRow implements IORMRow {
 	 * @return boolean Success indicator
 	 */
 	protected function saveExisting( $functionName = null ) {
-		$dbw = wfGetDB( DB_MASTER );
+		$dbw = $this->table->getWriteDbConnection();
 
 		$success = $dbw->update(
 			$this->table->getName(),
@@ -356,6 +358,8 @@ abstract class ORMRow implements IORMRow {
 			is_null( $functionName ) ? __METHOD__ : $functionName
 		);
 
+		$this->table->releaseConnection( $dbw );
+
 		// DatabaseBase::update does not always return true for success as documented...
 		return $success !== false;
 	}
@@ -383,13 +387,13 @@ abstract class ORMRow implements IORMRow {
 	 * @return boolean Success indicator
 	 */
 	protected function insert( $functionName = null, array $options = null ) {
-		$dbw = wfGetDB( DB_MASTER );
+		$dbw = $this->table->getWriteDbConnection();
 
 		$success = $dbw->insert(
 			$this->table->getName(),
 			$this->getWriteValues(),
 			is_null( $functionName ) ? __METHOD__ : $functionName,
-			is_null( $options ) ? array( 'IGNORE' ) : $options
+			$options
 		);
 
 		// DatabaseBase::insert does not always return true for success as documented...
@@ -399,6 +403,8 @@ abstract class ORMRow implements IORMRow {
 			$this->setField( 'id', $dbw->insertId() );
 		}
 
+		$this->table->releaseConnection( $dbw );
+
 		return $success;
 	}
 
@@ -558,7 +564,7 @@ abstract class ORMRow implements IORMRow {
 		$absoluteAmount = abs( $amount );
 		$isNegative = $amount < 0;
 
-		$dbw = wfGetDB( DB_MASTER );
+		$dbw = $this->table->getWriteDbConnection();
 
 		$fullField = $this->table->getPrefixedField( $field );
 
@@ -573,6 +579,8 @@ abstract class ORMRow implements IORMRow {
 			$this->setField( $field, $this->getField( $field ) + $amount );
 		}
 
+		$this->table->releaseConnection( $dbw );
+
 		return $success;
 	}
 
diff --git a/includes/diff/DairikiDiff.php b/includes/diff/DairikiDiff.php
index 72eb5d3c2c..05e2cd2925 100644
--- a/includes/diff/DairikiDiff.php
+++ b/includes/diff/DairikiDiff.php
@@ -311,7 +311,7 @@ class _DiffEngine {
 	 * [XOFF, XLIM) and [YOFF, YLIM) into NCHUNKS approximately equally
 	 * sized segments.
 	 *
-	 * Returns (LCS, PTS).	LCS is the length of the LCS. PTS is an
+	 * Returns (LCS, PTS). LCS is the length of the LCS. PTS is an
 	 * array of NCHUNKS+1 (X, Y) indexes giving the diving points between
 	 * sub sequences.  The first sub-sequence is contained in [X0, X1),
 	 * [Y0, Y1), the second in [X1, X2), [Y1, Y2) and so on.  Note
diff --git a/includes/diff/DifferenceEngine.php b/includes/diff/DifferenceEngine.php
index f3dc5a3a00..0295f776d1 100644
--- a/includes/diff/DifferenceEngine.php
+++ b/includes/diff/DifferenceEngine.php
@@ -522,8 +522,10 @@ class DifferenceEngine extends ContextSource {
 				if ( ContentHandler::runLegacyHooks( 'ShowRawCssJs', array( $this->mNewContent, $this->mNewPage, $out ) ) ) {
 					// NOTE: deprecated hook, B/C only
 					// use the content object's own rendering
-					$po = $this->mNewRev->getContent()->getParserOutput( $this->mNewRev->getTitle(), $this->mNewRev->getId() );
-					$out->addHTML( $po->getText() );
+					$cnt = $this->mNewRev->getContent();
+					$po = $cnt ? $cnt->getParserOutput( $this->mNewRev->getTitle(), $this->mNewRev->getId() ) : null;
+					$txt = $po ? $po->getText() : '';
+					$out->addHTML( $txt );
 				}
 			} elseif( !wfRunHooks( 'ArticleContentViewCustom', array( $this->mNewContent, $this->mNewPage, $out ) ) ) {
 				// Handled by extension
@@ -545,7 +547,7 @@ class DifferenceEngine extends ContextSource {
 				$parserOutput = $this->getParserOutput( $wikiPage, $this->mNewRev );
 
 				# Also try to load it as a redirect
-				$rt = $this->mNewContent->getRedirectTarget();
+				$rt = $this->mNewContent ? $this->mNewContent->getRedirectTarget() : null;
 
 				if ( $rt ) {
 					$article = Article::newFromTitle( $this->mNewPage, $this->getContext() );
@@ -1169,13 +1171,13 @@ class DifferenceEngine extends ContextSource {
 		}
 		if ( $this->mOldRev ) {
 			$this->mOldContent = $this->mOldRev->getContent( Revision::FOR_THIS_USER, $this->getUser() );
-			if ( $this->mOldContent === false ) {
+			if ( $this->mOldContent === null ) {
 				return false;
 			}
 		}
 		if ( $this->mNewRev ) {
 			$this->mNewContent = $this->mNewRev->getContent( Revision::FOR_THIS_USER, $this->getUser() );
-			if ( $this->mNewContent === false ) {
+			if ( $this->mNewContent === null ) {
 				return false;
 			}
 		}
diff --git a/includes/filebackend/FSFileBackend.php b/includes/filebackend/FSFileBackend.php
index dd43f82921..3a03d4d12b 100644
--- a/includes/filebackend/FSFileBackend.php
+++ b/includes/filebackend/FSFileBackend.php
@@ -190,21 +190,9 @@ class FSFileBackend extends FileBackendStore {
 			return $status;
 		}
 
-		if ( file_exists( $dest ) ) {
-			if ( !empty( $params['overwrite'] ) ) {
-				$ok = unlink( $dest );
-				if ( !$ok ) {
-					$status->fatal( 'backend-fail-delete', $params['dst'] );
-					return $status;
-				}
-			} else {
-				$status->fatal( 'backend-fail-alreadyexists', $params['dst'] );
-				return $status;
-			}
-		}
-
 		if ( !empty( $params['async'] ) ) { // deferred
-			$cmd = implode( ' ', array( wfIsWindows() ? 'COPY' : 'cp',
+			$cmd = implode( ' ', array(
+				wfIsWindows() ? 'COPY /B /Y' : 'cp', // (binary, overwrite)
 				wfEscapeShellArg( $this->cleanPathSlashes( $params['src'] ) ),
 				wfEscapeShellArg( $this->cleanPathSlashes( $dest ) )
 			) );
@@ -255,21 +243,16 @@ class FSFileBackend extends FileBackendStore {
 			return $status;
 		}
 
-		if ( file_exists( $dest ) ) {
-			if ( !empty( $params['overwrite'] ) ) {
-				$ok = unlink( $dest );
-				if ( !$ok ) {
-					$status->fatal( 'backend-fail-delete', $params['dst'] );
-					return $status;
-				}
-			} else {
-				$status->fatal( 'backend-fail-alreadyexists', $params['dst'] );
-				return $status;
+		if ( !is_file( $source ) ) {
+			if ( empty( $params['ignoreMissingSource'] ) ) {
+				$status->fatal( 'backend-fail-copy', $params['src'] );
 			}
+			return $status; // do nothing; either OK or bad status
 		}
 
 		if ( !empty( $params['async'] ) ) { // deferred
-			$cmd = implode( ' ', array( wfIsWindows() ? 'COPY' : 'cp',
+			$cmd = implode( ' ', array(
+				wfIsWindows() ? 'COPY /B /Y' : 'cp', // (binary, overwrite)
 				wfEscapeShellArg( $this->cleanPathSlashes( $source ) ),
 				wfEscapeShellArg( $this->cleanPathSlashes( $dest ) )
 			) );
@@ -320,24 +303,16 @@ class FSFileBackend extends FileBackendStore {
 			return $status;
 		}
 
-		if ( file_exists( $dest ) ) {
-			if ( !empty( $params['overwrite'] ) ) {
-				// Windows does not support moving over existing files
-				if ( wfIsWindows() ) {
-					$ok = unlink( $dest );
-					if ( !$ok ) {
-						$status->fatal( 'backend-fail-delete', $params['dst'] );
-						return $status;
-					}
-				}
-			} else {
-				$status->fatal( 'backend-fail-alreadyexists', $params['dst'] );
-				return $status;
+		if ( !is_file( $source ) ) {
+			if ( empty( $params['ignoreMissingSource'] ) ) {
+				$status->fatal( 'backend-fail-move', $params['src'] );
 			}
+			return $status; // do nothing; either OK or bad status
 		}
 
 		if ( !empty( $params['async'] ) ) { // deferred
-			$cmd = implode( ' ', array( wfIsWindows() ? 'MOVE' : 'mv',
+			$cmd = implode( ' ', array(
+				wfIsWindows() ? 'MOVE /Y' : 'mv', // (overwrite)
 				wfEscapeShellArg( $this->cleanPathSlashes( $source ) ),
 				wfEscapeShellArg( $this->cleanPathSlashes( $dest ) )
 			) );
@@ -385,7 +360,8 @@ class FSFileBackend extends FileBackendStore {
 		}
 
 		if ( !empty( $params['async'] ) ) { // deferred
-			$cmd = implode( ' ', array( wfIsWindows() ? 'DEL' : 'unlink',
+			$cmd = implode( ' ', array(
+				wfIsWindows() ? 'DEL' : 'unlink',
 				wfEscapeShellArg( $this->cleanPathSlashes( $source ) )
 			) );
 			$status->value = new FSFileOpHandle( $this, $params, 'Copy', $cmd );
@@ -423,19 +399,6 @@ class FSFileBackend extends FileBackendStore {
 			return $status;
 		}
 
-		if ( file_exists( $dest ) ) {
-			if ( !empty( $params['overwrite'] ) ) {
-				$ok = unlink( $dest );
-				if ( !$ok ) {
-					$status->fatal( 'backend-fail-delete', $params['dst'] );
-					return $status;
-				}
-			} else {
-				$status->fatal( 'backend-fail-alreadyexists', $params['dst'] );
-				return $status;
-			}
-		}
-
 		if ( !empty( $params['async'] ) ) { // deferred
 			$tempFile = TempFSFile::factory( 'create_', 'tmp' );
 			if ( !$tempFile ) {
@@ -447,7 +410,8 @@ class FSFileBackend extends FileBackendStore {
 				$status->fatal( 'backend-fail-create', $params['dst'] );
 				return $status;
 			}
-			$cmd = implode( ' ', array( wfIsWindows() ? 'COPY' : 'cp',
+			$cmd = implode( ' ', array(
+				wfIsWindows() ? 'COPY /B /Y' : 'cp', // (binary, overwrite)
 				wfEscapeShellArg( $this->cleanPathSlashes( $tempFile->getPath() ) ),
 				wfEscapeShellArg( $this->cleanPathSlashes( $dest ) )
 			) );
diff --git a/includes/filebackend/FileBackend.php b/includes/filebackend/FileBackend.php
index 0ef4cd0131..b5e231540b 100644
--- a/includes/filebackend/FileBackend.php
+++ b/includes/filebackend/FileBackend.php
@@ -206,6 +206,7 @@ abstract class FileBackend {
 	 *         'dst'                 => <storage path>,
 	 *         'overwrite'           => <boolean>,
 	 *         'overwriteSame'       => <boolean>,
+	 *         'ignoreMissingSource' => <boolean>, # since 1.21
 	 *         'disposition'         => <Content-Disposition header value>
 	 *     )
 	 * @endcode
@@ -218,6 +219,7 @@ abstract class FileBackend {
 	 *         'dst'                 => <storage path>,
 	 *         'overwrite'           => <boolean>,
 	 *         'overwriteSame'       => <boolean>,
+	 *         'ignoreMissingSource' => <boolean>, # since 1.21
 	 *         'disposition'         => <Content-Disposition header value>
 	 *     )
 	 * @endcode
@@ -427,6 +429,7 @@ abstract class FileBackend {
 	 *         'op'                  => 'copy',
 	 *         'src'                 => <storage path>,
 	 *         'dst'                 => <storage path>,
+	 *         'ignoreMissingSource' => <boolean>, # since 1.21
 	 *         'disposition'         => <Content-Disposition header value>
 	 *     )
 	 * @endcode
@@ -436,6 +439,7 @@ abstract class FileBackend {
 	 *         'op'                  => 'move',
 	 *         'src'                 => <storage path>,
 	 *         'dst'                 => <storage path>,
+	 *         'ignoreMissingSource' => <boolean>, # since 1.21
 	 *         'disposition'         => <Content-Disposition header value>
 	 *     )
 	 * @endcode
@@ -900,6 +904,24 @@ abstract class FileBackend {
 	 */
 	abstract public function getLocalCopyMulti( array $params );
 
+	/**
+	 * Return an HTTP URL to a given file that requires no authentication to use.
+	 * The URL may be pre-authenticated (via some token in the URL) and temporary.
+	 * This will return null if the backend cannot make an HTTP URL for the file.
+	 *
+	 * This is useful for key/value stores when using scripts that seek around
+	 * large files and those scripts (and the backend) support HTTP Range headers.
+	 * Otherwise, one would need to use getLocalReference(), which involves loading
+	 * the entire file on to local disk.
+	 *
+	 * @param $params Array
+	 * $params include:
+	 *   - src : source storage path
+	 * @return string|null
+	 * @since 1.21
+	 */
+	abstract public function getFileHttpUrl( array $params );
+
 	/**
 	 * Check if a directory exists at a given storage path.
 	 * Backends using key/value stores will check if the path is a
diff --git a/includes/filebackend/FileBackendMultiWrite.php b/includes/filebackend/FileBackendMultiWrite.php
index 90292ee027..a443a3aadd 100644
--- a/includes/filebackend/FileBackendMultiWrite.php
+++ b/includes/filebackend/FileBackendMultiWrite.php
@@ -651,6 +651,15 @@ class FileBackendMultiWrite extends FileBackend {
 		return $tempFiles;
 	}
 
+	/**
+	 * @see FileBackend::getFileHttpUrl()
+	 * @return string|null
+	 */
+	public function getFileHttpUrl( array $params ) {
+		$realParams = $this->substOpPaths( $params, $this->backends[$this->masterIndex] );
+		return $this->backends[$this->masterIndex]->getFileHttpUrl( $realParams );
+	}
+
 	/**
 	 * @see FileBackend::directoryExists()
 	 * @param $params array
diff --git a/includes/filebackend/FileBackendStore.php b/includes/filebackend/FileBackendStore.php
index 5f562d2d8c..97e49a5a09 100644
--- a/includes/filebackend/FileBackendStore.php
+++ b/includes/filebackend/FileBackendStore.php
@@ -72,8 +72,9 @@ abstract class FileBackendStore extends FileBackend {
 	}
 
 	/**
-	 * Check if a file can be created at a given storage path.
-	 * FS backends should check if the parent directory exists and the file is writable.
+	 * Check if a file can be created or changed at a given storage path.
+	 * FS backends should check if the parent directory exists, files can be
+	 * written under it, and that any file already there is writable.
 	 * Backends using key/value stores should check if the container exists.
 	 *
 	 * @param $storagePath string
@@ -83,12 +84,12 @@ abstract class FileBackendStore extends FileBackend {
 
 	/**
 	 * Create a file in the backend with the given contents.
+	 * This will overwrite any file that exists at the destination.
 	 * Do not call this function from places outside FileBackend and FileOp.
 	 *
 	 * $params include:
 	 *   - content       : the raw file contents
 	 *   - dst           : destination storage path
-	 *   - overwrite     : overwrite any file that exists at the destination
 	 *   - disposition   : Content-Disposition header value for the destination
 	 *   - async         : Status will be returned immediately if supported.
 	 *                     If the status is OK, then its value field will be
@@ -106,9 +107,7 @@ abstract class FileBackendStore extends FileBackend {
 		} else {
 			$status = $this->doCreateInternal( $params );
 			$this->clearCache( array( $params['dst'] ) );
-			if ( !empty( $params['overwrite'] ) ) { // file possibly mutated
-				$this->deleteFileCache( $params['dst'] ); // persistent cache
-			}
+			$this->deleteFileCache( $params['dst'] ); // persistent cache
 		}
 		wfProfileOut( __METHOD__ . '-' . $this->name );
 		wfProfileOut( __METHOD__ );
@@ -122,12 +121,12 @@ abstract class FileBackendStore extends FileBackend {
 
 	/**
 	 * Store a file into the backend from a file on disk.
+	 * This will overwrite any file that exists at the destination.
 	 * Do not call this function from places outside FileBackend and FileOp.
 	 *
 	 * $params include:
 	 *   - src           : source path on disk
 	 *   - dst           : destination storage path
-	 *   - overwrite     : overwrite any file that exists at the destination
 	 *   - disposition   : Content-Disposition header value for the destination
 	 *   - async         : Status will be returned immediately if supported.
 	 *                     If the status is OK, then its value field will be
@@ -145,9 +144,7 @@ abstract class FileBackendStore extends FileBackend {
 		} else {
 			$status = $this->doStoreInternal( $params );
 			$this->clearCache( array( $params['dst'] ) );
-			if ( !empty( $params['overwrite'] ) ) { // file possibly mutated
-				$this->deleteFileCache( $params['dst'] ); // persistent cache
-			}
+			$this->deleteFileCache( $params['dst'] ); // persistent cache
 		}
 		wfProfileOut( __METHOD__ . '-' . $this->name );
 		wfProfileOut( __METHOD__ );
@@ -161,16 +158,17 @@ abstract class FileBackendStore extends FileBackend {
 
 	/**
 	 * Copy a file from one storage path to another in the backend.
+	 * This will overwrite any file that exists at the destination.
 	 * Do not call this function from places outside FileBackend and FileOp.
 	 *
 	 * $params include:
-	 *   - src           : source storage path
-	 *   - dst           : destination storage path
-	 *   - overwrite     : overwrite any file that exists at the destination
-	 *   - disposition   : Content-Disposition header value for the destination
-	 *   - async         : Status will be returned immediately if supported.
-	 *                     If the status is OK, then its value field will be
-	 *                     set to a FileBackendStoreOpHandle object.
+	 *   - src                 : source storage path
+	 *   - dst                 : destination storage path
+	 *   - ignoreMissingSource : do nothing if the source file does not exist
+	 *   - disposition         : Content-Disposition header value for the destination
+	 *   - async               : Status will be returned immediately if supported.
+	 *                           If the status is OK, then its value field will be
+	 *                           set to a FileBackendStoreOpHandle object.
 	 *
 	 * @param $params Array
 	 * @return Status
@@ -180,9 +178,7 @@ abstract class FileBackendStore extends FileBackend {
 		wfProfileIn( __METHOD__ . '-' . $this->name );
 		$status = $this->doCopyInternal( $params );
 		$this->clearCache( array( $params['dst'] ) );
-		if ( !empty( $params['overwrite'] ) ) { // file possibly mutated
-			$this->deleteFileCache( $params['dst'] ); // persistent cache
-		}
+		$this->deleteFileCache( $params['dst'] ); // persistent cache
 		wfProfileOut( __METHOD__ . '-' . $this->name );
 		wfProfileOut( __METHOD__ );
 		return $status;
@@ -225,16 +221,17 @@ abstract class FileBackendStore extends FileBackend {
 
 	/**
 	 * Move a file from one storage path to another in the backend.
+	 * This will overwrite any file that exists at the destination.
 	 * Do not call this function from places outside FileBackend and FileOp.
 	 *
 	 * $params include:
-	 *   - src           : source storage path
-	 *   - dst           : destination storage path
-	 *   - overwrite     : overwrite any file that exists at the destination
-	 *   - disposition   : Content-Disposition header value for the destination
-	 *   - async         : Status will be returned immediately if supported.
-	 *                     If the status is OK, then its value field will be
-	 *                     set to a FileBackendStoreOpHandle object.
+	 *   - src                 : source storage path
+	 *   - dst                 : destination storage path
+	 *   - ignoreMissingSource : do nothing if the source file does not exist
+	 *   - disposition         : Content-Disposition header value for the destination
+	 *   - async               : Status will be returned immediately if supported.
+	 *                           If the status is OK, then its value field will be
+	 *                           set to a FileBackendStoreOpHandle object.
 	 *
 	 * @param $params Array
 	 * @return Status
@@ -245,9 +242,7 @@ abstract class FileBackendStore extends FileBackend {
 		$status = $this->doMoveInternal( $params );
 		$this->clearCache( array( $params['src'], $params['dst'] ) );
 		$this->deleteFileCache( $params['src'] ); // persistent cache
-		if ( !empty( $params['overwrite'] ) ) { // file possibly mutated
-			$this->deleteFileCache( $params['dst'] ); // persistent cache
-		}
+		$this->deleteFileCache( $params['dst'] ); // persistent cache
 		wfProfileOut( __METHOD__ . '-' . $this->name );
 		wfProfileOut( __METHOD__ );
 		return $status;
@@ -809,6 +804,14 @@ abstract class FileBackendStore extends FileBackend {
 	 */
 	abstract protected function doGetLocalCopyMulti( array $params );
 
+	/**
+	 * @see FileBackend::getFileHttpUrl()
+	 * @return string|null
+	 */
+	public function getFileHttpUrl( array $params ) {
+		return null; // not supported
+	}
+
 	/**
 	 * @see FileBackend::streamFile()
 	 * @return Status
diff --git a/includes/filebackend/FileOp.php b/includes/filebackend/FileOp.php
index 7c43c48908..ff1b604337 100644
--- a/includes/filebackend/FileOp.php
+++ b/includes/filebackend/FileOp.php
@@ -45,6 +45,7 @@ abstract class FileOp {
 	protected $useLatest = true; // boolean
 	protected $batchId; // string
 
+	protected $doOperation = true; // boolean; operation is not a no-op
 	protected $sourceSha1; // string
 	protected $destSameAsSource; // boolean
 
@@ -65,19 +66,53 @@ abstract class FileOp {
 		list( $required, $optional ) = $this->allowedParams();
 		foreach ( $required as $name ) {
 			if ( isset( $params[$name] ) ) {
-				$this->params[$name] = $params[$name];
+				$this->params[$name] = self::normalizeAnyStoragePaths( $params[$name] );
 			} else {
 				throw new MWException( "File operation missing parameter '$name'." );
 			}
 		}
 		foreach ( $optional as $name ) {
 			if ( isset( $params[$name] ) ) {
-				$this->params[$name] = $params[$name];
+				$this->params[$name] = self::normalizeAnyStoragePaths( $params[$name] );
 			}
 		}
 		$this->params = $params;
 	}
 
+	/**
+	 * Normalize $item or anything in $item that is a valid storage path
+	 *
+	 * @param $item string|array
+	 * @return string|Array
+	 */
+	protected function normalizeAnyStoragePaths( $item ) {
+		if ( is_array( $item ) ) {
+			$res = array();
+			foreach ( $item as $k => $v ) {
+				$k = self::normalizeIfValidStoragePath( $k );
+				$v = self::normalizeIfValidStoragePath( $v );
+				$res[$k] = $v;
+			}
+			return $res;
+		} else {
+			return self::normalizeIfValidStoragePath( $item );
+		}
+	}
+
+	/**
+	 * Normalize a string if it is a valid storage path
+	 *
+	 * @param $path string
+	 * @return string
+	 */
+	protected static function normalizeIfValidStoragePath( $path ) {
+		if ( FileBackend::isStoragePath( $path ) ) {
+			$res = FileBackend::normalizeStoragePath( $path );
+			return ( $res !== null ) ? $res : $path;
+		}
+		return $path;
+	}
+
 	/**
 	 * Set the batch UUID this operation belongs to
 	 *
@@ -175,11 +210,14 @@ abstract class FileOp {
 	 * @return Array
 	 */
 	final public function getJournalEntries( array $oPredicates, array $nPredicates ) {
+		if ( !$this->doOperation ) {
+			return array(); // this is a no-op
+		}
 		$nullEntries = array();
 		$updateEntries = array();
 		$deleteEntries = array();
 		$pathsUsed = array_merge( $this->storagePathsRead(), $this->storagePathsChanged() );
-		foreach ( $pathsUsed as $path ) {
+		foreach ( array_unique( $pathsUsed ) as $path ) {
 			$nullEntries[] = array( // assertion for recovery
 				'op'      => 'null',
 				'path'    => $path,
@@ -205,7 +243,9 @@ abstract class FileOp {
 	}
 
 	/**
-	 * Check preconditions of the operation without writing anything
+	 * Check preconditions of the operation without writing anything.
+	 * This must update $predicates for each path that the op can change
+	 * except when a failing status object is returned.
 	 *
 	 * @param $predicates Array
 	 * @return Status
@@ -241,10 +281,14 @@ abstract class FileOp {
 			return Status::newFatal( 'fileop-fail-attempt-precheck' );
 		}
 		$this->state = self::STATE_ATTEMPTED;
-		$status = $this->doAttempt();
-		if ( !$status->isOK() ) {
-			$this->failed = true;
-			$this->logFailure( 'attempt' );
+		if ( $this->doOperation ) {
+			$status = $this->doAttempt();
+			if ( !$status->isOK() ) {
+				$this->failed = true;
+				$this->logFailure( 'attempt' );
+			}
+		} else { // no-op
+			$status = Status::newGood();
 		}
 		return $status;
 	}
@@ -292,15 +336,7 @@ abstract class FileOp {
 	 *
 	 * @return Array
 	 */
-	final public function storagePathsRead() {
-		return array_map( 'FileBackend::normalizeStoragePath', $this->doStoragePathsRead() );
-	}
-
-	/**
-	 * @see FileOp::storagePathsRead()
-	 * @return Array
-	 */
-	protected function doStoragePathsRead() {
+	public function storagePathsRead() {
 		return array();
 	}
 
@@ -309,15 +345,7 @@ abstract class FileOp {
 	 *
 	 * @return Array
 	 */
-	final public function storagePathsChanged() {
-		return array_map( 'FileBackend::normalizeStoragePath', $this->doStoragePathsChanged() );
-	}
-
-	/**
-	 * @see FileOp::storagePathsChanged()
-	 * @return Array
-	 */
-	protected function doStoragePathsChanged() {
+	public function storagePathsChanged() {
 		return array();
 	}
 
@@ -396,6 +424,8 @@ abstract class FileOp {
 	final protected function fileSha1( $source, array $predicates ) {
 		if ( isset( $predicates['sha1'][$source] ) ) {
 			return $predicates['sha1'][$source]; // previous op assures this
+		} elseif ( isset( $predicates['exists'][$source] ) && !$predicates['exists'][$source] ) {
+			return false; // previous op assures this
 		} else {
 			$params = array( 'src' => $source, 'latest' => $this->useLatest );
 			return $this->backend->getFileSha1Base36( $params );
@@ -458,7 +488,7 @@ class StoreFileOp extends FileOp {
 				$this->params['dst'], $this->backend->maxFileSizeInternal() );
 			$status->fatal( 'backend-fail-store', $this->params['src'], $this->params['dst'] );
 			return $status;
-		// Check if a file can be placed at the destination
+		// Check if a file can be placed/changed at the destination
 		} elseif ( !$this->backend->isPathUsableInternal( $this->params['dst'] ) ) {
 			$status->fatal( 'backend-fail-usable', $this->params['dst'] );
 			$status->fatal( 'backend-fail-store', $this->params['src'], $this->params['dst'] );
@@ -498,7 +528,7 @@ class StoreFileOp extends FileOp {
 		return $hash;
 	}
 
-	protected function doStoragePathsChanged() {
+	public function storagePathsChanged() {
 		return array( $this->params['dst'] );
 	}
 }
@@ -521,7 +551,7 @@ class CreateFileOp extends FileOp {
 				$this->params['dst'], $this->backend->maxFileSizeInternal() );
 			$status->fatal( 'backend-fail-create', $this->params['dst'] );
 			return $status;
-		// Check if a file can be placed at the destination
+		// Check if a file can be placed/changed at the destination
 		} elseif ( !$this->backend->isPathUsableInternal( $this->params['dst'] ) ) {
 			$status->fatal( 'backend-fail-usable', $this->params['dst'] );
 			$status->fatal( 'backend-fail-create', $this->params['dst'] );
@@ -558,7 +588,7 @@ class CreateFileOp extends FileOp {
 	/**
 	 * @return array
 	 */
-	protected function doStoragePathsChanged() {
+	public function storagePathsChanged() {
 		return array( $this->params['dst'] );
 	}
 }
@@ -573,7 +603,7 @@ class CopyFileOp extends FileOp {
 	 */
 	protected function allowedParams() {
 		return array( array( 'src', 'dst' ),
-			array( 'overwrite', 'overwriteSame', 'disposition' ) );
+			array( 'overwrite', 'overwriteSame', 'ignoreMissingSource', 'disposition' ) );
 	}
 
 	/**
@@ -584,9 +614,17 @@ class CopyFileOp extends FileOp {
 		$status = Status::newGood();
 		// Check if the source file exists
 		if ( !$this->fileExists( $this->params['src'], $predicates ) ) {
-			$status->fatal( 'backend-fail-notexists', $this->params['src'] );
-			return $status;
-		// Check if a file can be placed at the destination
+			if ( $this->getParam( 'ignoreMissingSource' ) ) {
+				$this->doOperation = false; // no-op
+				// Update file existence predicates (cache 404s)
+				$predicates['exists'][$this->params['src']] = false;
+				$predicates['sha1'][$this->params['src']] = false;
+				return $status; // nothing to do
+			} else {
+				$status->fatal( 'backend-fail-notexists', $this->params['src'] );
+				return $status;
+			}
+		// Check if a file can be placed/changed at the destination
 		} elseif ( !$this->backend->isPathUsableInternal( $this->params['dst'] ) ) {
 			$status->fatal( 'backend-fail-usable', $this->params['dst'] );
 			$status->fatal( 'backend-fail-copy', $this->params['src'], $this->params['dst'] );
@@ -619,14 +657,14 @@ class CopyFileOp extends FileOp {
 	/**
 	 * @return array
 	 */
-	protected function doStoragePathsRead() {
+	public function storagePathsRead() {
 		return array( $this->params['src'] );
 	}
 
 	/**
 	 * @return array
 	 */
-	protected function doStoragePathsChanged() {
+	public function storagePathsChanged() {
 		return array( $this->params['dst'] );
 	}
 }
@@ -641,7 +679,7 @@ class MoveFileOp extends FileOp {
 	 */
 	protected function allowedParams() {
 		return array( array( 'src', 'dst' ),
-			array( 'overwrite', 'overwriteSame', 'disposition' ) );
+			array( 'overwrite', 'overwriteSame', 'ignoreMissingSource', 'disposition' ) );
 	}
 
 	/**
@@ -652,9 +690,17 @@ class MoveFileOp extends FileOp {
 		$status = Status::newGood();
 		// Check if the source file exists
 		if ( !$this->fileExists( $this->params['src'], $predicates ) ) {
-			$status->fatal( 'backend-fail-notexists', $this->params['src'] );
-			return $status;
-		// Check if a file can be placed at the destination
+			if ( $this->getParam( 'ignoreMissingSource' ) ) {
+				$this->doOperation = false; // no-op
+				// Update file existence predicates (cache 404s)
+				$predicates['exists'][$this->params['src']] = false;
+				$predicates['sha1'][$this->params['src']] = false;
+				return $status; // nothing to do
+			} else {
+				$status->fatal( 'backend-fail-notexists', $this->params['src'] );
+				return $status;
+			}
+		// Check if a file can be placed/changed at the destination
 		} elseif ( !$this->backend->isPathUsableInternal( $this->params['dst'] ) ) {
 			$status->fatal( 'backend-fail-usable', $this->params['dst'] );
 			$status->fatal( 'backend-fail-move', $this->params['src'], $this->params['dst'] );
@@ -693,14 +739,14 @@ class MoveFileOp extends FileOp {
 	/**
 	 * @return array
 	 */
-	protected function doStoragePathsRead() {
+	public function storagePathsRead() {
 		return array( $this->params['src'] );
 	}
 
 	/**
 	 * @return array
 	 */
-	protected function doStoragePathsChanged() {
+	public function storagePathsChanged() {
 		return array( $this->params['src'], $this->params['dst'] );
 	}
 }
@@ -717,21 +763,29 @@ class DeleteFileOp extends FileOp {
 		return array( array( 'src' ), array( 'ignoreMissingSource' ) );
 	}
 
-	protected $needsDelete = true;
-
 	/**
-	 * @param array $predicates
+	 * @param $predicates array
 	 * @return Status
 	 */
 	protected function doPrecheck( array &$predicates ) {
 		$status = Status::newGood();
 		// Check if the source file exists
 		if ( !$this->fileExists( $this->params['src'], $predicates ) ) {
-			if ( !$this->getParam( 'ignoreMissingSource' ) ) {
+			if ( $this->getParam( 'ignoreMissingSource' ) ) {
+				$this->doOperation = false; // no-op
+				// Update file existence predicates (cache 404s)
+				$predicates['exists'][$this->params['src']] = false;
+				$predicates['sha1'][$this->params['src']] = false;
+				return $status; // nothing to do
+			} else {
 				$status->fatal( 'backend-fail-notexists', $this->params['src'] );
 				return $status;
 			}
-			$this->needsDelete = false;
+		// Check if a file can be placed/changed at the source
+		} elseif ( !$this->backend->isPathUsableInternal( $this->params['src'] ) ) {
+			$status->fatal( 'backend-fail-usable', $this->params['src'] );
+			$status->fatal( 'backend-fail-delete', $this->params['src'] );
+			return $status;
 		}
 		// Update file existence predicates
 		$predicates['exists'][$this->params['src']] = false;
@@ -743,17 +797,14 @@ class DeleteFileOp extends FileOp {
 	 * @return Status
 	 */
 	protected function doAttempt() {
-		if ( $this->needsDelete ) {
-			// Delete the source file
-			return $this->backend->deleteInternal( $this->setFlags( $this->params ) );
-		}
-		return Status::newGood();
+		// Delete the source file
+		return $this->backend->deleteInternal( $this->setFlags( $this->params ) );
 	}
 
 	/**
 	 * @return array
 	 */
-	protected function doStoragePathsChanged() {
+	public function storagePathsChanged() {
 		return array( $this->params['src'] );
 	}
 }
diff --git a/includes/filebackend/FileOpBatch.php b/includes/filebackend/FileOpBatch.php
index 335587255b..736393af86 100644
--- a/includes/filebackend/FileOpBatch.php
+++ b/includes/filebackend/FileOpBatch.php
@@ -136,48 +136,12 @@ class FileOpBatch {
 		}
 
 		// Attempt each operation (in parallel if allowed and possible)...
-		if ( count( $pPerformOps ) < count( $performOps ) ) {
-			self::runBatchParallel( $pPerformOps, $status );
-		} else {
-			self::runBatchSeries( $performOps, $status );
-		}
+		self::runParallelBatches( $pPerformOps, $status );
 
 		wfProfileOut( __METHOD__ );
 		return $status;
 	}
 
-	/**
-	 * Attempt a list of file operations in series.
-	 * This will abort remaining ops on failure.
-	 *
-	 * @param $performOps Array
-	 * @param $status Status
-	 * @return bool Success
-	 */
-	protected static function runBatchSeries( array $performOps, Status $status ) {
-		foreach ( $performOps as $index => $fileOp ) {
-			if ( $fileOp->failed() ) {
-				continue; // nothing to do
-			}
-			$subStatus = $fileOp->attempt();
-			$status->merge( $subStatus );
-			if ( $subStatus->isOK() ) {
-				$status->success[$index] = true;
-				++$status->successCount;
-			} else {
-				$status->success[$index] = false;
-				++$status->failCount;
-				// We can't continue (even with $ignoreErrors) as $predicates is wrong.
-				// Log the remaining ops as failed for recovery...
-				for ( $i = ($index + 1); $i < count( $performOps ); $i++ ) {
-					$performOps[$i]->logFailure( 'attempt_aborted' );
-				}
-				return false; // bail out
-			}
-		}
-		return true;
-	}
-
 	/**
 	 * Attempt a list of file operations sub-batches in series.
 	 *
@@ -190,8 +154,8 @@ class FileOpBatch {
 	 * @param $status Status
 	 * @return bool Success
 	 */
-	protected static function runBatchParallel( array $pPerformOps, Status $status ) {
-		$aborted = false;
+	protected static function runParallelBatches( array $pPerformOps, Status $status ) {
+		$aborted = false; // set to true on unexpected errors
 		foreach ( $pPerformOps as $performOpsBatch ) {
 			if ( $aborted ) { // check batch op abort flag...
 				// We can't continue (even with $ignoreErrors) as $predicates is wrong.
@@ -205,11 +169,16 @@ class FileOpBatch {
 			$opHandles = array();
 			// Get the backend; all sub-batch ops belong to a single backend
 			$backend = reset( $performOpsBatch )->getBackend();
-			// If attemptAsync() returns synchronously, it was either an
-			// error Status or the backend just doesn't support async ops.
+			// Get the operation handles or actually do it if there is just one.
+			// If attemptAsync() returns a Status, it was either due to an error
+			// or the backend does not support async ops and did it synchronously.
 			foreach ( $performOpsBatch as $i => $fileOp ) {
 				if ( !$fileOp->failed() ) { // failed => already has Status
-					$subStatus = $fileOp->attemptAsync();
+					// If the batch is just one operation, it's faster to avoid
+					// pipelining as that can involve creating new TCP connections.
+					$subStatus = ( count( $performOpsBatch ) > 1 )
+						? $fileOp->attemptAsync()
+						: $fileOp->attempt();
 					if ( $subStatus->value instanceof FileBackendStoreOpHandle ) {
 						$opHandles[$i] = $subStatus->value; // deferred
 					} else {
diff --git a/includes/filebackend/README b/includes/filebackend/README
index d42c6a3195..6ab5481048 100644
--- a/includes/filebackend/README
+++ b/includes/filebackend/README
@@ -11,9 +11,9 @@ MediaWiki is providing an interface known as FileBackend. Any MediaWiki
 interaction with stored files should thus use a FileBackend object.
 
 Different types of backing storage media are supported (ranging from local
-filesystem to distributed object stores). The types include:
+file system to distributed object stores). The types include:
 
-* FSFileBackend (used for mounted filesystems)
+* FSFileBackend (used for mounted file systems)
 * SwiftFileBackend (used for Swift or Ceph Rados+RGW object stores)
 * FileBackendMultiWrite (useful for transitioning from one backend to another)
 
@@ -24,10 +24,10 @@ __construct() inline documentation.
 \section setup Setup
 
 File backends are registered in LocalSettings.php via the global variable
-$wgFileBackends. To access one of those defined backend, one would use
+$wgFileBackends. To access one of those defined backends, one would use
 FileBackendStore::get( <name> ) which will bring back a FileBackend object
-handle. Such handles are reused for any subsequent get() call (singleton
-paradigm). The FileBackends objects are caching request calls such as file stats,
+handle. Such handles are reused for any subsequent get() call (via singleton).
+The FileBackends objects are caching request calls such as file stats,
 SHA1 requests or TCP connection handles.
 
 \par Note:
@@ -44,7 +44,7 @@ directories. See FileBackend.php for full documentation for each function.
 
 \subsection reading Reading
 
-The following operations are supported for reading from a backend:
+The following basic operations are supported for reading from a backend:
 
 On files:
 * state a file for basic information (timestamp, size)
@@ -61,18 +61,19 @@ On directories:
 
 \par Note:
 Backend handles should return directory listings as iterators, all though in some cases
-they may just be simple arrays (which can still be iterated over). Iterators allow for callers to
-traverse a large number of file listings without consuming excessive RAM in the process. Either the
-memory consumed is flatly bounded (if the iterator does paging) or it is proportional to the depth
-of the portion of the directory tree being traversed (if the iterator works via recursion).
+they may just be simple arrays (which can still be iterated over). Iterators allow for
+callers to traverse a large number of file listings without consuming excessive RAM in
+the process. Either the memory consumed is flatly bounded (if the iterator does paging)
+or it is proportional to the depth of the portion of the directory tree being traversed
+(if the iterator works via recursion).
 
 
 \subsection writing Writing
 
-The following operations are supported for writing or changing in the backend:
+The following basic operations are supported for writing or changing in the backend:
 
 On files:
-* store (copying a mounted filesystem file into storage)
+* store (copying a mounted file system file into storage)
 * create (creating a file within storage from a string)
 * copy (within storage)
 * move (within storage)
@@ -108,17 +109,17 @@ creating and purging generated thumbnails of original files for example.
 
 \section consistency Consistency
 
-Not all backing stores are sequentially consistent by default. Various FileBackend functions
-offer a "latest" option that can be passed in to assure (or try to assure) that the latest
-version of the file is read. Some backing stores are consistent by default, but callers should
-always assume that without this option, stale data may be read. This is actually true for stores
-that have eventual consistency.
+Not all backing stores are sequentially consistent by default. Various FileBackend
+functions offer a "latest" option that can be passed in to assure (or try to assure)
+that the latest version of the file is read. Some backing stores are consistent by
+default, but callers should always assume that without this option, stale data may
+be read. This is actually true for stores that have eventual consistency.
 
-Note that file listing functions have no "latest" flag, and thus some systems may return stale
-data. Thus callers should avoid assuming that listings contain changes made my the current client
-or any other client from a very short time ago. For example, creating a file under a directory
-and then immediately doing a file listing operation on that directory may result in a listing
-that does not include that file.
+Note that file listing functions have no "latest" flag, and thus some systems may
+return stale data. Thus callers should avoid assuming that listings contain changes
+made my the current client or any other client from a very short time ago. For example,
+creating a file under a directory and then immediately doing a file listing operation
+on that directory may result in a listing that does not include that file.
 
 
 \section locking Locking
@@ -133,13 +134,15 @@ Control (MVCC) to avoid this. However, locking can be important when:
 * One or more operations must be done without objects changing in the meantime.
 * It can also be useful when a file read is used to determine a file write or DB change.
   For example, doOperations() first checks that there will be no "file already exists"
-  or "file does not exist" type errors before attempted a given operation batch. This works
+  or "file does not exist" type errors before attempting an operation batch. This works
   by stating the files first, and is only safe if the files are locked in the meantime.
 
-When locking, callers also should use the latest available file data for reads.
-Also, one should always lock the file *before* reading it, not after. If stale data is used
-to determine a write, there will be some data corruption, even when reads of the original file
-finally start returning the updated data without using the "latest" option (eventual consistency).
+When locking, callers should use the latest available file data for reads.
+Also, one should always lock the file *before* reading it, not after. If stale data is
+used to determine a write, there will be some data corruption, even when reads of the
+original file finally start returning the updated data without needing the "latest"
+option (eventual consistency). The "scoped" lock functions are preferable since
+there is not the problem of forgetting to unlock due to early returns or exceptions.
 
 Since acquiring locks can fail, and lock managers can be non-blocking, callers should:
 * Acquire all required locks up font
@@ -147,32 +150,34 @@ Since acquiring locks can fail, and lock managers can be non-blocking, callers s
 * Possible retry acquiring certain locks
 
 MVCC is also a useful pattern to use on top of the backend interface, because operations
-are not atomic, even with doOperations(), so doing complex batch file changes or changing files
-and updating a database row can result in partially written "transactions". One should avoid
-changing files once they have been stored, except perhaps with ephemeral data that are tolerant
-of some inconsistency.
+are not atomic, even with doOperations(), so doing complex batch file changes or changing
+files and updating a database row can result in partially written "transactions". Thus one
+should avoid changing files once they have been stored, except perhaps with ephemeral data
+that are tolerant of some degree of inconsistency.
 
-Callers can use their own locking (e.g. SELECT FOR UPDATE) if it is more convenient, but note
-that all callers that change any of the files should then go through functions that acquire these
-locks. For example, if a caller just directly uses the file backend store() function, it will
-ignore any custom "FOR UPDATE" locks, which can cause problems.
+Callers can use their own locking (e.g. SELECT FOR UPDATE) if it is more convenient, but
+note that all callers that change any of the files should then go through functions that
+acquire these locks. For example, if a caller just directly uses the file backend store()
+function, it will ignore any custom "FOR UPDATE" locks, which can cause problems.
 
 \section objectstore Object stores
 
 Support for object stores (like Amazon S3/Swift) drive much of the API and design
 decisions of FileBackend, but using any POSIX compliant file systems works fine.
-The system essentially stores "files" in "containers". For a mounted file
-system as a backing store, these will just be "files" under "directories". For
-an object store as a backing store, the "files" will be "objects" stored in
-"containers".
+The system essentially stores "files" in "containers". For a mounted file system
+as a backing store, "files" will just be files under directories. For an object store
+as a backing store, the "files" will be objects stored in actual containers.
 
 
-\section file_obj_diffs File and Object store differences
+\section file_obj_diffs File system and Object store differences
 
-An advantage of objects stores is the reduced Round-Trip Times. This is
+An advantage of object stores is the reduced Round-Trip Times. This is
 achieved by avoiding the need to create each parent directory before placing a
-file somewhere. It gets worse the deeper the directory hierarchy is. For both
-object stores and file systems, using "/" in filenames will allow for the
+file somewhere. It gets worse the deeper the directory hierarchy is. Another
+advantage of object stores is that object listings tend to use databases, which
+scale better than the linked list directories that file sytems sometimes use.
+File systems like btrfs and xfs use tree structures, which scale better.
+For both object stores and file systems, using "/" in filenames will allow for the
 intuitive use of directory functions. For example, creating a file in Swift
 called "container/a/b/file1" will mean that:
 - a "directory listing" of "container/a" will contain "b",
@@ -182,7 +187,7 @@ This means that switching from an object store to a file system and vise versa
 using the FileBackend interface will generally be harmless. However, one must be
 aware of some important differences:
 
-* In a filesystem, you cannot have a file and a directory within the same path
+* In a file system, you cannot have a file and a directory within the same path
   whereas it is possible in an object stores. Calling code should avoid any layouts
   which allow files and directories at the same path.
 * Some file systems have file name length restrictions or overall path length
@@ -195,5 +200,9 @@ aware of some important differences:
   reduce latency. Making sure that the backend has pipelining (see the
   "parallelize" and "concurrency" settings) enabled can also mask latency in
   batch operation scenarios.
+* File systems may implement directories as linked-lists or other structures
+  with poor scalability, so calling code should use layouts that shard the data.
+  Instead of storing files like "container/file.txt", one can store files like
+  "container/<x>/<y>/file.txt". It is best if "sharding" optional or configurable.
 
 */
diff --git a/includes/filebackend/SwiftFileBackend.php b/includes/filebackend/SwiftFileBackend.php
index fed496afcf..48db9d3c3f 100644
--- a/includes/filebackend/SwiftFileBackend.php
+++ b/includes/filebackend/SwiftFileBackend.php
@@ -40,6 +40,7 @@ class SwiftFileBackend extends FileBackendStore {
 	/** @var CF_Authentication */
 	protected $auth; // Swift authentication handler
 	protected $authTTL; // integer seconds
+	protected $swiftTempUrlKey; // string; shared secret value for making temp urls
 	protected $swiftAnonUser; // string; username to handle unauthenticated requests
 	protected $swiftUseCDN; // boolean; whether CloudFiles CDN is enabled
 	protected $swiftCDNExpiry; // integer; how long to cache things in the CDN
@@ -66,6 +67,8 @@ class SwiftFileBackend extends FileBackendStore {
 	 *   - swiftUser          : Swift user used by MediaWiki (account:username)
 	 *   - swiftKey           : Swift authentication key for the above user
 	 *   - swiftAuthTTL       : Swift authentication TTL (seconds)
+	 *   - swiftTempUrlKey    : Swift "X-Account-Meta-Temp-URL-Key" value on the account.
+	 *                          Do not set this until it has been set in the backend.
 	 *   - swiftAnonUser      : Swift user used for end-user requests (account:username).
 	 *                          If set, then views of public containers are assumed to go
 	 *                          through this user. If not set, then public containers are
@@ -104,6 +107,9 @@ class SwiftFileBackend extends FileBackendStore {
 		$this->swiftAnonUser = isset( $config['swiftAnonUser'] )
 			? $config['swiftAnonUser']
 			: '';
+		$this->swiftTempUrlKey = isset( $config['swiftTempUrlKey'] )
+			? $config['swiftTempUrlKey']
+			: '';
 		$this->shardViaHashLevels = isset( $config['shardViaHashLevels'] )
 			? $config['shardViaHashLevels']
 			: '';
@@ -201,12 +207,6 @@ class SwiftFileBackend extends FileBackendStore {
 		// (a) Check the destination container and object
 		try {
 			$dContObj = $this->getContainer( $dstCont );
-			if ( empty( $params['overwrite'] ) &&
-				$this->fileExists( array( 'src' => $params['dst'], 'latest' => 1 ) ) )
-			{
-				$status->fatal( 'backend-fail-alreadyexists', $params['dst'] );
-				return $status;
-			}
 		} catch ( NoSuchContainerException $e ) {
 			$status->fatal( 'backend-fail-create', $params['dst'] );
 			return $status;
@@ -223,8 +223,7 @@ class SwiftFileBackend extends FileBackendStore {
 			// Create a fresh CF_Object with no fields preloaded.
 			// We don't want to preserve headers, metadata, and such.
 			$obj = new CF_Object( $dContObj, $dstRel, false, false ); // skip HEAD
-			// Note: metadata keys stored as [Upper case char][[Lower case char]...]
-			$obj->metadata = array( 'Sha1base36' => $sha1Hash );
+			$obj->setMetadataValues( array( 'Sha1base36' => $sha1Hash ) );
 			// Manually set the ETag (https://github.com/rackspace/php-cloudfiles/issues/59).
 			// The MD5 here will be checked within Swift against its own MD5.
 			$obj->set_etag( md5( $params['content'] ) );
@@ -240,14 +239,10 @@ class SwiftFileBackend extends FileBackendStore {
 			if ( !empty( $params['async'] ) ) { // deferred
 				$op = $obj->write_async( $params['content'] );
 				$status->value = new SwiftFileOpHandle( $this, $params, 'Create', $op );
-				if ( !empty( $params['overwrite'] ) ) { // file possibly mutated
-					$status->value->affectedObjects[] = $obj;
-				}
+				$status->value->affectedObjects[] = $obj;
 			} else { // actually write the object in Swift
 				$obj->write( $params['content'] );
-				if ( !empty( $params['overwrite'] ) ) { // file possibly mutated
-					$this->purgeCDNCache( array( $obj ) );
-				}
+				$this->purgeCDNCache( array( $obj ) );
 			}
 		} catch ( CDNNotEnabledException $e ) {
 			// CDN not enabled; nothing to see here
@@ -287,12 +282,6 @@ class SwiftFileBackend extends FileBackendStore {
 		// (a) Check the destination container and object
 		try {
 			$dContObj = $this->getContainer( $dstCont );
-			if ( empty( $params['overwrite'] ) &&
-				$this->fileExists( array( 'src' => $params['dst'], 'latest' => 1 ) ) )
-			{
-				$status->fatal( 'backend-fail-alreadyexists', $params['dst'] );
-				return $status;
-			}
 		} catch ( NoSuchContainerException $e ) {
 			$status->fatal( 'backend-fail-copy', $params['src'], $params['dst'] );
 			return $status;
@@ -314,8 +303,7 @@ class SwiftFileBackend extends FileBackendStore {
 			// Create a fresh CF_Object with no fields preloaded.
 			// We don't want to preserve headers, metadata, and such.
 			$obj = new CF_Object( $dContObj, $dstRel, false, false ); // skip HEAD
-			// Note: metadata keys stored as [Upper case char][[Lower case char]...]
-			$obj->metadata = array( 'Sha1base36' => $sha1Hash );
+			$obj->setMetadataValues( array( 'Sha1base36' => $sha1Hash ) );
 			// The MD5 here will be checked within Swift against its own MD5.
 			$obj->set_etag( md5_file( $params['src'] ) );
 			// Use the same content type as StreamFile for security
@@ -337,15 +325,11 @@ class SwiftFileBackend extends FileBackendStore {
 					$op = $obj->write_async( $fp, filesize( $params['src'] ), true );
 					$status->value = new SwiftFileOpHandle( $this, $params, 'Store', $op );
 					$status->value->resourcesToClose[] = $fp;
-					if ( !empty( $params['overwrite'] ) ) { // file possibly mutated
-						$status->value->affectedObjects[] = $obj;
-					}
+					$status->value->affectedObjects[] = $obj;
 				}
 			} else { // actually write the object in Swift
 				$obj->load_from_filename( $params['src'], true ); // calls $obj->write()
-				if ( !empty( $params['overwrite'] ) ) { // file possibly mutated
-					$this->purgeCDNCache( array( $obj ) );
-				}
+				$this->purgeCDNCache( array( $obj ) );
 			}
 		} catch ( CDNNotEnabledException $e ) {
 			// CDN not enabled; nothing to see here
@@ -396,12 +380,6 @@ class SwiftFileBackend extends FileBackendStore {
 		try {
 			$sContObj = $this->getContainer( $srcCont );
 			$dContObj = $this->getContainer( $dstCont );
-			if ( empty( $params['overwrite'] ) &&
-				$this->fileExists( array( 'src' => $params['dst'], 'latest' => 1 ) ) )
-			{
-				$status->fatal( 'backend-fail-alreadyexists', $params['dst'] );
-				return $status;
-			}
 		} catch ( NoSuchContainerException $e ) {
 			$status->fatal( 'backend-fail-copy', $params['src'], $params['dst'] );
 			return $status;
@@ -420,19 +398,17 @@ class SwiftFileBackend extends FileBackendStore {
 			if ( !empty( $params['async'] ) ) { // deferred
 				$op = $sContObj->copy_object_to_async( $srcRel, $dContObj, $dstRel, null, $hdrs );
 				$status->value = new SwiftFileOpHandle( $this, $params, 'Copy', $op );
-				if ( !empty( $params['overwrite'] ) ) { // file possibly mutated
-					$status->value->affectedObjects[] = $dstObj;
-				}
+				$status->value->affectedObjects[] = $dstObj;
 			} else { // actually write the object in Swift
 				$sContObj->copy_object_to( $srcRel, $dContObj, $dstRel, null, $hdrs );
-				if ( !empty( $params['overwrite'] ) ) { // file possibly mutated
-					$this->purgeCDNCache( array( $dstObj ) );
-				}
+				$this->purgeCDNCache( array( $dstObj ) );
 			}
 		} catch ( CDNNotEnabledException $e ) {
 			// CDN not enabled; nothing to see here
 		} catch ( NoSuchObjectException $e ) { // source object does not exist
-			$status->fatal( 'backend-fail-copy', $params['src'], $params['dst'] );
+			if ( empty( $params['ignoreMissingSource'] ) ) {
+				$status->fatal( 'backend-fail-copy', $params['src'], $params['dst'] );
+			}
 		} catch ( CloudFilesException $e ) { // some other exception?
 			$this->handleException( $e, $status, __METHOD__, $params );
 		}
@@ -474,12 +450,6 @@ class SwiftFileBackend extends FileBackendStore {
 		try {
 			$sContObj = $this->getContainer( $srcCont );
 			$dContObj = $this->getContainer( $dstCont );
-			if ( empty( $params['overwrite'] ) &&
-				$this->fileExists( array( 'src' => $params['dst'], 'latest' => 1 ) ) )
-			{
-				$status->fatal( 'backend-fail-alreadyexists', $params['dst'] );
-				return $status;
-			}
 		} catch ( NoSuchContainerException $e ) {
 			$status->fatal( 'backend-fail-move', $params['src'], $params['dst'] );
 			return $status;
@@ -500,20 +470,18 @@ class SwiftFileBackend extends FileBackendStore {
 				$op = $sContObj->move_object_to_async( $srcRel, $dContObj, $dstRel, null, $hdrs );
 				$status->value = new SwiftFileOpHandle( $this, $params, 'Move', $op );
 				$status->value->affectedObjects[] = $srcObj;
-				if ( !empty( $params['overwrite'] ) ) { // file possibly mutated
-					$status->value->affectedObjects[] = $dstObj;
-				}
+				$status->value->affectedObjects[] = $dstObj;
 			} else { // actually write the object in Swift
 				$sContObj->move_object_to( $srcRel, $dContObj, $dstRel, null, $hdrs );
 				$this->purgeCDNCache( array( $srcObj ) );
-				if ( !empty( $params['overwrite'] ) ) { // file possibly mutated
-					$this->purgeCDNCache( array( $dstObj ) );
-				}
+				$this->purgeCDNCache( array( $dstObj ) );
 			}
 		} catch ( CDNNotEnabledException $e ) {
 			// CDN not enabled; nothing to see here
 		} catch ( NoSuchObjectException $e ) { // source object does not exist
-			$status->fatal( 'backend-fail-move', $params['src'], $params['dst'] );
+			if ( empty( $params['ignoreMissingSource'] ) ) {
+				$status->fatal( 'backend-fail-move', $params['src'], $params['dst'] );
+			}
 		} catch ( CloudFilesException $e ) { // some other exception?
 			$this->handleException( $e, $status, __METHOD__, $params );
 		}
@@ -761,7 +729,7 @@ class SwiftFileBackend extends FileBackendStore {
 				// Convert dates like "Tue, 03 Jan 2012 22:01:04 GMT" to TS_MW
 				'mtime' => wfTimestamp( TS_MW, $srcObj->last_modified ),
 				'size'  => (int)$srcObj->content_length,
-				'sha1'  => $srcObj->metadata['Sha1base36']
+				'sha1'  => $srcObj->getMetadataValue( 'Sha1base36' )
 			);
 		} catch ( NoSuchContainerException $e ) {
 		} catch ( NoSuchObjectException $e ) {
@@ -782,7 +750,7 @@ class SwiftFileBackend extends FileBackendStore {
 	 * @throws Exception cloudfiles exceptions
 	 */
 	protected function addMissingMetadata( CF_Object $obj, $path ) {
-		if ( isset( $obj->metadata['Sha1base36'] ) ) {
+		if ( $obj->getMetadataValue( 'Sha1base36' ) !== null ) {
 			return true; // nothing to do
 		}
 		wfProfileIn( __METHOD__ );
@@ -794,14 +762,14 @@ class SwiftFileBackend extends FileBackendStore {
 			if ( $tmpFile ) {
 				$hash = $tmpFile->getSha1Base36();
 				if ( $hash !== false ) {
-					$obj->metadata['Sha1base36'] = $hash;
+					$obj->setMetadataValues( array( 'Sha1base36' => $hash ) );
 					$obj->sync_metadata(); // save to Swift
 					wfProfileOut( __METHOD__ );
 					return true; // success
 				}
 			}
 		}
-		$obj->metadata['Sha1base36'] = false;
+		$obj->setMetadataValues( array( 'Sha1base36' => false ) );
 		wfProfileOut( __METHOD__ );
 		return false; // failed
 	}
@@ -1157,6 +1125,28 @@ class SwiftFileBackend extends FileBackendStore {
 		return $tmpFiles;
 	}
 
+	/**
+	 * @see FileBackendStore::getFileHttpUrl()
+	 * @return string|null
+	 */
+	public function getFileHttpUrl( array $params ) {
+		if ( $this->swiftTempUrlKey != '' ) { // temp urls enabled
+			list( $srcCont, $srcRel ) = $this->resolveStoragePathReal( $params['src'] );
+			if ( $srcRel === null ) {
+				return null; // invalid path
+			}
+			try {
+				$sContObj = $this->getContainer( $srcCont );
+				$obj = new CF_Object( $sContObj, $srcRel, false, false ); // skip HEAD
+				return $obj->get_temp_url( $this->swiftTempUrlKey, 86400, "GET" );
+			} catch ( NoSuchContainerException $e ) {
+			} catch ( CloudFilesException $e ) { // some other exception?
+				$this->handleException( $e, null, __METHOD__, $params );
+			}
+		}
+		return null;
+	}
+
 	/**
 	 * @see FileBackendStore::directoriesAreVirtual()
 	 * @return bool
diff --git a/includes/filebackend/filejournal/DBFileJournal.php b/includes/filebackend/filejournal/DBFileJournal.php
index 34f3e53d50..44c6567b6a 100644
--- a/includes/filebackend/filejournal/DBFileJournal.php
+++ b/includes/filebackend/filejournal/DBFileJournal.php
@@ -75,6 +75,9 @@ class DBFileJournal extends FileJournal {
 
 		try {
 			$dbw->insert( 'filejournal', $data, __METHOD__ );
+			if ( mt_rand( 0, 99 ) == 0 ) {
+				$this->purgeOldLogs(); // occasionally delete old logs
+			}
 		} catch ( DBError $e ) {
 			$status->fatal( 'filejournal-fail-dbquery', $this->backend );
 			return $status;
diff --git a/includes/filebackend/filejournal/FileJournal.php b/includes/filebackend/filejournal/FileJournal.php
index 3bc0df74f5..d99384db1b 100644
--- a/includes/filebackend/filejournal/FileJournal.php
+++ b/includes/filebackend/filejournal/FileJournal.php
@@ -85,7 +85,7 @@ abstract class FileJournal {
 	/**
 	 * Log changes made by a batch file operation.
 	 * $entries is an array of log entries, each of which contains:
-	 *     op      : Basic operation name (create, store, copy, delete)
+	 *     op      : Basic operation name (create, update, delete)
 	 *     path    : The storage path of the file
 	 *     newSha1 : The final base 36 SHA-1 of the file
 	 * Note that 'false' should be used as the SHA-1 for non-existing files.
diff --git a/includes/filerepo/FileRepo.php b/includes/filerepo/FileRepo.php
index e8aa5a6335..651ee27127 100644
--- a/includes/filerepo/FileRepo.php
+++ b/includes/filerepo/FileRepo.php
@@ -127,6 +127,9 @@ class FileRepo {
 			if ( !isset( $this->zones[$zone]['directory'] ) ) {
 				$this->zones[$zone]['directory'] = '';
 			}
+			if ( !isset( $this->zones[$zone]['urlsByExt'] ) ) {
+				$this->zones[$zone]['urlsByExt'] = array();
+			}
 		}
 	}
 
@@ -196,14 +199,17 @@ class FileRepo {
 	/**
 	 * Get the URL corresponding to one of the four basic zones
 	 *
-	 * @param $zone String: one of: public, deleted, temp, thumb
+	 * @param $zone String One of: public, deleted, temp, thumb
+	 * @param $ext String|null Optional file extension
 	 * @return String or false
 	 */
-	public function getZoneUrl( $zone ) {
-		if ( isset( $this->zones[$zone]['url'] )
-			&& in_array( $zone, array( 'public', 'temp', 'thumb' ) ) )
-		{
-			return $this->zones[$zone]['url']; // custom URL
+	public function getZoneUrl( $zone, $ext = null ) {
+		if ( in_array( $zone, array( 'public', 'temp', 'thumb' ) ) ) { // standard public zones
+			if ( $ext !== null && isset( $this->zones[$zone]['urlsByExt'][$ext] ) ) {
+				return $this->zones[$zone]['urlsByExt'][$ext]; // custom URL for extension/zone
+			} elseif ( isset( $this->zones[$zone]['url'] ) ) {
+				return $this->zones[$zone]['url']; // custom URL for zone
+			}
 		}
 		switch ( $zone ) {
 			case 'public':
@@ -1094,47 +1100,42 @@ class FileRepo {
 				return $this->newFatal( 'directorycreateerror', $archiveDir );
 			}
 
-			// Archive destination file if it exists
-			if ( $backend->fileExists( array( 'src' => $dstPath ) ) ) {
-				// Check if the archive file exists
-				// This is a sanity check to avoid data loss. In UNIX, the rename primitive
-				// unlinks the destination file if it exists. DB-based synchronisation in
-				// publishBatch's caller should prevent races. In Windows there's no
-				// problem because the rename primitive fails if the destination exists.
-				if ( $backend->fileExists( array( 'src' => $archivePath ) ) ) {
-					$operations[] = array( 'op' => 'null' );
-					continue;
-				} else {
-					$operations[] = array(
-						'op'           => 'move',
-						'src'          => $dstPath,
-						'dst'          => $archivePath
-					);
-				}
-				$status->value[$i] = 'archived';
-			} else {
-				$status->value[$i] = 'new';
-			}
+			// Archive destination file if it exists.
+			// This will check if the archive file also exists and fail if does.
+			// This is a sanity check to avoid data loss. On Windows and Linux,
+			// copy() will overwrite, so the existence check is vulnerable to
+			// race conditions unless an functioning LockManager is used.
+			// LocalFile also uses SELECT FOR UPDATE for synchronization.
+			$operations[] = array(
+				'op'                  => 'copy',
+				'src'                 => $dstPath,
+				'dst'                 => $archivePath,
+				'ignoreMissingSource' => true
+			);
+
 			// Copy (or move) the source file to the destination
 			if ( FileBackend::isStoragePath( $srcPath ) ) {
 				if ( $flags & self::DELETE_SOURCE ) {
 					$operations[] = array(
 						'op'           => 'move',
 						'src'          => $srcPath,
-						'dst'          => $dstPath
+						'dst'          => $dstPath,
+						'overwrite'    => true // replace current
 					);
 				} else {
 					$operations[] = array(
 						'op'           => 'copy',
 						'src'          => $srcPath,
-						'dst'          => $dstPath
+						'dst'          => $dstPath,
+						'overwrite'    => true // replace current
 					);
 				}
 			} else { // FS source path
 				$operations[] = array(
 					'op'           => 'store',
 					'src'          => $srcPath,
-					'dst'          => $dstPath
+					'dst'          => $dstPath,
+					'overwrite'    => true // replace current
 				);
 				if ( $flags & self::DELETE_SOURCE ) {
 					$sourceFSFilesToDelete[] = $srcPath;
@@ -1143,8 +1144,17 @@ class FileRepo {
 		}
 
 		// Execute the operations for each triplet
-		$opts = array( 'force' => true );
-		$status->merge( $backend->doOperations( $operations, $opts ) );
+		$status->merge( $backend->doOperations( $operations ) );
+		// Find out which files were archived...
+		foreach ( $triplets as $i => $triplet ) {
+			list( $srcPath, $dstRel, $archiveRel ) = $triplet;
+			$archivePath = $this->getZonePath( 'public' ) . "/$archiveRel";
+			if ( $this->fileExists( $archivePath ) ) {
+				$status->value[$i] = 'archived';
+			} else {
+				$status->value[$i] = 'new';
+			}
+		}
 		// Cleanup for disk source files...
 		foreach ( $sourceFSFilesToDelete as $file ) {
 			wfSuppressWarnings();
diff --git a/includes/filerepo/file/ArchivedFile.php b/includes/filerepo/file/ArchivedFile.php
index 694623b627..e1a8547895 100644
--- a/includes/filerepo/file/ArchivedFile.php
+++ b/includes/filerepo/file/ArchivedFile.php
@@ -135,8 +135,9 @@ class ArchivedFile {
 		}
 
 		if( !$this->title || $this->title->getNamespace() == NS_FILE ) {
+			$this->dataLoaded = true; // set it here, to have also true on miss
 			$dbr = wfGetDB( DB_SLAVE );
-			$res = $dbr->select( 'filearchive',
+			$row = $dbr->selectRow( 'filearchive',
 				array(
 					'fa_id',
 					'fa_name',
@@ -159,20 +160,18 @@ class ArchivedFile {
 					'fa_sha1' ),
 				$conds,
 				__METHOD__,
-				array( 'ORDER BY' => 'fa_timestamp DESC' ) );
-			if ( $res == false || $dbr->numRows( $res ) == 0 ) {
-			// this revision does not exist?
+				array( 'ORDER BY' => 'fa_timestamp DESC')
+			);
+			if ( !$row ) {
+				// this revision does not exist?
 				return null;
 			}
-			$ret = $dbr->resultObject( $res );
-			$row = $ret->fetchObject();
 
 			// initialize fields for filestore image object
 			$this->loadFromRow( $row );
 		} else {
 			throw new MWException( 'This title does not correspond to an image page.' );
 		}
-		$this->dataLoaded = true;
 		$this->exists = true;
 
 		return true;
diff --git a/includes/filerepo/file/File.php b/includes/filerepo/file/File.php
index 557609d4b0..9a080ae04b 100644
--- a/includes/filerepo/file/File.php
+++ b/includes/filerepo/file/File.php
@@ -316,7 +316,8 @@ abstract class File {
 	public function getUrl() {
 		if ( !isset( $this->url ) ) {
 			$this->assertRepoDefined();
-			$this->url = $this->repo->getZoneUrl( 'public' ) . '/' . $this->getUrlRel();
+			$ext = $this->getExtension();
+			$this->url = $this->repo->getZoneUrl( 'public', $ext ) . '/' . $this->getUrlRel();
 		}
 		return $this->url;
 	}
@@ -1253,7 +1254,8 @@ abstract class File {
 	 */
 	function getArchiveUrl( $suffix = false ) {
 		$this->assertRepoDefined();
-		$path = $this->repo->getZoneUrl( 'public' ) . '/archive/' . $this->getHashPath();
+		$ext = $this->getExtension();
+		$path = $this->repo->getZoneUrl( 'public', $ext ) . '/archive/' . $this->getHashPath();
 		if ( $suffix === false ) {
 			$path = substr( $path, 0, -1 );
 		} else {
@@ -1272,7 +1274,8 @@ abstract class File {
 	 */
 	function getArchiveThumbUrl( $archiveName, $suffix = false ) {
 		$this->assertRepoDefined();
-		$path = $this->repo->getZoneUrl( 'thumb' ) . '/archive/' .
+		$ext = $this->getExtension();
+		$path = $this->repo->getZoneUrl( 'thumb', $ext ) . '/archive/' .
 			$this->getHashPath() . rawurlencode( $archiveName ) . "/";
 		if ( $suffix === false ) {
 			$path = substr( $path, 0, -1 );
@@ -1291,7 +1294,8 @@ abstract class File {
 	 */
 	function getThumbUrl( $suffix = false ) {
 		$this->assertRepoDefined();
-		$path = $this->repo->getZoneUrl( 'thumb' ) . '/' . $this->getUrlRel();
+		$ext = $this->getExtension();
+		$path = $this->repo->getZoneUrl( 'thumb', $ext ) . '/' . $this->getUrlRel();
 		if ( $suffix !== false ) {
 			$path .= '/' . rawurlencode( $suffix );
 		}
diff --git a/includes/filerepo/file/LocalFile.php b/includes/filerepo/file/LocalFile.php
index caa93a42c6..f0a3c15e35 100644
--- a/includes/filerepo/file/LocalFile.php
+++ b/includes/filerepo/file/LocalFile.php
@@ -814,7 +814,9 @@ class LocalFile extends File {
 		foreach ( $files as $file ) {
 			# Check that the base file name is part of the thumb name
 			# This is a basic sanity check to avoid erasing unrelated directories
-			if ( strpos( $file, $this->getName() ) !== false ) {
+			if ( strpos( $file, $this->getName() ) !== false
+				|| strpos( $file, "-thumbnail" ) !== false // "short" thumb name
+			) {
 				$purgeList[] = "{$dir}/{$file}";
 			}
 		}
@@ -1759,7 +1761,7 @@ class LocalFileDeleteBatch {
 					'fa_deleted_user'      => $encUserId,
 					'fa_deleted_timestamp' => $encTimestamp,
 					'fa_deleted_reason'    => $encReason,
-					'fa_deleted'		   => $this->suppress ? $bitfield : 0,
+					'fa_deleted'           => $this->suppress ? $bitfield : 0,
 
 					'fa_name'         => 'img_name',
 					'fa_archive_name' => 'NULL',
diff --git a/includes/installer/DatabaseInstaller.php b/includes/installer/DatabaseInstaller.php
index de59b2d65f..75ede239b3 100644
--- a/includes/installer/DatabaseInstaller.php
+++ b/includes/installer/DatabaseInstaller.php
@@ -269,14 +269,15 @@ abstract class DatabaseInstaller {
 
 		$ret = true;
 		ob_start( array( $this, 'outputHandler' ) );
+		$up = DatabaseUpdater::newForDB( $this->db );
 		try {
-			$up = DatabaseUpdater::newForDB( $this->db );
 			$up->doUpdates();
 		} catch ( MWException $e ) {
 			echo "\nAn error occurred:\n";
 			echo $e->getText();
 			$ret = false;
 		}
+		$up->purgeCache();
 		ob_end_flush();
 		return $ret;
 	}
diff --git a/includes/installer/DatabaseUpdater.php b/includes/installer/DatabaseUpdater.php
index 7223003180..740ead528d 100644
--- a/includes/installer/DatabaseUpdater.php
+++ b/includes/installer/DatabaseUpdater.php
@@ -292,8 +292,8 @@ abstract class DatabaseUpdater {
 	 *
 	 * @param $what Array: what updates to perform
 	 */
-	public function doUpdates( $what = array( 'core', 'extensions', 'purge', 'stats' ) ) {
-		global $wgLocalisationCacheConf, $wgVersion;
+	public function doUpdates( $what = array( 'core', 'extensions', 'stats' ) ) {
+		global $wgVersion;
 
 		$this->db->begin( __METHOD__ );
 		$what = array_flip( $what );
@@ -310,14 +310,6 @@ abstract class DatabaseUpdater {
 		if ( isset( $what['stats'] ) ) {
 			$this->checkStats();
 		}
-
-		if ( isset( $what['purge'] ) ) {
-			$this->purgeCache();
-
-			if ( $wgLocalisationCacheConf['manualRecache'] ) {
-				$this->rebuildLocalisationCache();
-			}
-		}
 		$this->db->commit( __METHOD__ );
 	}
 
@@ -617,11 +609,15 @@ abstract class DatabaseUpdater {
 	/**
 	 * Purge the objectcache table
 	 */
-	protected function purgeCache() {
+	public function purgeCache() {
+		global $wgLocalisationCacheConf;
 		# We can't guarantee that the user will be able to use TRUNCATE,
 		# but we know that DELETE is available to us
 		$this->output( "Purging caches..." );
 		$this->db->delete( 'objectcache', '*', __METHOD__ );
+		if ( $wgLocalisationCacheConf['manualRecache'] ) {
+			$this->rebuildLocalisationCache();
+		}
 		$this->output( "done.\n" );
 	}
 
diff --git a/includes/installer/Ibm_db2Updater.php b/includes/installer/Ibm_db2Updater.php
index 805ff0ff66..33bf69c69e 100644
--- a/includes/installer/Ibm_db2Updater.php
+++ b/includes/installer/Ibm_db2Updater.php
@@ -85,9 +85,6 @@ class Ibm_db2Updater extends DatabaseUpdater {
 			array( 'addField', 'revision',      'rev_sha1',         'patch-rev_sha1.sql' ),
 			array( 'addField', 'archive',       'ar_sha1',          'patch-ar_sha1.sql' ),
 
-			// 1.20
-			array( 'addTable', 'config',                            'patch-config.sql' ),
-
 			// 1.21
 			array( 'addField',	'revision',	'rev_content_format',		'patch-revision-rev_content_format.sql' ),
 			array( 'addField',	'revision',	'rev_content_model',		'patch-revision-rev_content_model.sql' ),
diff --git a/includes/installer/Installer.i18n.php b/includes/installer/Installer.i18n.php
index 80ecb1f690..32056e3055 100644
--- a/includes/installer/Installer.i18n.php
+++ b/includes/installer/Installer.i18n.php
@@ -832,7 +832,7 @@ U kan MediaWiki installeer.',
 	'config-env-bad' => 'Die omgewing is gekontroleer.
 U kan nie MediaWiki installeer nie.</span>',
 	'config-env-php' => 'PHP $1 is tans geïnstalleer.',
-	'config-no-db' => "Kon nie 'n geskikte databasisdrywer vind nie!",
+	'config-no-db' => "Kon nie 'n geskikte databasisdrywer vind nie!", # Fuzzy
 	'config-memory-raised' => 'PHP se <code>memory_limit</code> is $1, en is verhoog tot $2.',
 	'config-memory-bad' => "'''Waarskuwing:''' PHP se <code>memory_limit</code> is $1.
 Dit is waarskynlik te laag.
@@ -941,7 +941,7 @@ Die skep van tabelle word oorgeslaan.",
 	'config-install-interwiki-exists' => "'''Waarskuwing''': Die interwiki-tabel bevat reeds inskrywings.
 Die standaardlys word oorgeslaan.",
 	'config-install-stats' => 'Inisialiseer statistieke',
-	'config-install-keys' => 'Genereer geheime sleutel',
+	'config-install-keys' => 'Genereer geheime sleutel', # Fuzzy
 	'config-install-sysop' => "Skep 'n gebruiker vir die administrateur",
 	'config-install-subscribe-fail' => 'Kon nie vir MediaWiki-announce inskryf nie: $1',
 	'config-install-mainpage' => 'Skep die hoofblad met standaard inhoud',
@@ -956,7 +956,7 @@ Dit bevat al u instellings.
 U sal dit moet [$1 aflaai] en dit in die hoofgids van u wiki-installasie plaas; in dieselfde gids as index.php.
 '''Let wel''': As u dit nie nou doen nie, sal die gegenereerde konfigurasielêer nie later meer beskikbaar wees nadat u die installasie afgesluit het nie.
 
-As dit gedoen is, kan u '''[u $2 wiki besoek]'''.",
+As dit gedoen is, kan u '''[u $2 wiki besoek]'''.", # Fuzzy
 	'config-download-localsettings' => 'Laai LocalSettings.php af',
 	'config-help' => 'hulp',
 	'mainpagetext' => "'''MediaWiki is suksesvol geïnstalleer.'''",
@@ -983,7 +983,8 @@ $messages['aln'] = array(
 * [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce Njoftime rreth MediaWikit]',
 );
 
-/** Amharic (አማርኛ) */
+/** Amharic (አማርኛ)
+ */
 $messages['am'] = array(
 	'mainpagetext' => "'''MediaWiki በትክክል ማስገባቱ ተከናወነ።'''",
 	'mainpagedocfooter' => "ስለ ዊኪ ሶፍትዌር ጥቅም ለመረዳት፣ [//meta.wikimedia.org/wiki/Help:Contents User's Guide] ያንብቡ።
@@ -1029,7 +1030,7 @@ $messages['ang'] = array(
  */
 $messages['ar'] = array(
 	'config-desc' => 'مثبت لميدياويكي',
-	'config-title' => 'ميدياويكي 1$ التثبيت',
+	'config-title' => 'ميدياويكي 1$ التثبيت', # Fuzzy
 	'config-information' => 'معلومات',
 	'config-back' => '→ ارجع',
 	'config-continue' => 'استمر ←',
@@ -1087,7 +1088,8 @@ $messages['ary'] = array(
 * [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce Lista dyal l-modakaraṫ ĝla versyonaṫ jdad dyal MediaWiki]',
 );
 
-/** Egyptian Spoken Arabic (مصرى) */
+/** Egyptian Spoken Arabic (مصرى)
+ */
 $messages['arz'] = array(
 	'mainpagetext' => "''' ميدياويكى اتنزلت بنجاح.'''",
 	'mainpagedocfooter' => 'اسال [//meta.wikimedia.org/wiki/Help:Contents دليل اليوزر] للمعلومات حوالين استخدام برنامج الويكى.
@@ -1113,7 +1115,8 @@ $messages['as'] = array(
 * [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce MediaWiki release mailing list]",
 );
 
-/** Asturian (asturianu) */
+/** Asturian (asturianu)
+ */
 $messages['ast'] = array(
 	'mainpagetext' => "'''MediaWiki instalóse correchamente.'''",
 	'mainpagedocfooter' => "Visita la [//meta.wikimedia.org/wiki/Help:Contents Guía d'usuariu] pa saber cómo usar esti software wiki.
@@ -1125,7 +1128,8 @@ $messages['ast'] = array(
 * [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce Llista de corréu de les ediciones de MediaWiki]",
 );
 
-/** Kotava (Kotava) */
+/** Kotava (Kotava)
+ */
 $messages['avk'] = array(
 	'mainpagetext' => "'''MediaWiki inkeyen talpeyot.'''",
 );
@@ -1164,7 +1168,7 @@ $messages['az'] = array(
 * [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce MediaWiki e-poçt siyahısı]',
 );
 
-/** Bashkir (Башҡортса)
+/** Bashkir (башҡортса)
  * @author Haqmar
  */
 $messages['ba'] = array(
@@ -1191,7 +1195,8 @@ $messages['bar'] = array(
 * [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce Mailinglisten voh de neichen MediaWiki-Versionen]',
 );
 
-/** Southern Balochi (بلوچی مکرانی) */
+/** Southern Balochi (بلوچی مکرانی)
+ */
 $messages['bcc'] = array(
 	'mainpagetext' => "'''مدیا وی کی گون موفقیت نصب بوت.'''",
 	'mainpagedocfooter' => "مشورت کنیت گون  [//meta.wikimedia.org/wiki/Help:Contents User's Guide] په گشیترین اطلاعات په استفاده چه برنامه ویکی.
@@ -1202,7 +1207,8 @@ $messages['bcc'] = array(
 * [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce MediaWiki release mailing list]",
 );
 
-/** Bikol Central (Bikol Central) */
+/** Bikol Central (Bikol Central)
+ */
 $messages['bcl'] = array(
 	'mainpagetext' => "'''Instalado na an MediaWiki.'''",
 	'mainpagedocfooter' => "Konsultarón tabì an [//meta.wikimedia.org/wiki/Help:Contents User's Guide] para sa impormasyon sa paggamit nin progama kaining wiki.
@@ -1214,7 +1220,8 @@ $messages['bcl'] = array(
 * [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce MediaWiki release mailing list]",
 );
 
-/** Belarusian (беларуская) */
+/** Belarusian (беларуская)
+ */
 $messages['be'] = array(
 	'mainpagetext' => "'''MediaWiki паспяхова ўсталяваная.'''",
 	'mainpagedocfooter' => 'Гл. [//meta.wikimedia.org/wiki/Help:Contents Дапаможнік карыстальніка (англ.)] па далейшыя звесткі аб карыстанні вікі-праграмамі.
@@ -1226,7 +1233,7 @@ $messages['be'] = array(
 * [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce Ліставанне аб выпусках MediaWiki (англ.)]',
 );
 
-/** Belarusian (Taraškievica orthography) (‪беларуская (тарашкевіца)‬)
+/** Belarusian (Taraškievica orthography) (беларуская (тарашкевіца)‎)
  * @author EugeneZelenko
  * @author Jim-by
  * @author Wizardist
@@ -2398,7 +2405,7 @@ $messages['bn'] = array(
 	'config-license-none' => 'কোনো লাইসেন্স ফুটার নেই',
 	'config-license-cc-by-sa' => 'ক্রিয়েটিভ কমন্স অ্যাট্রিবিউশন শেয়ার অ্যালাইক',
 	'config-license-cc-by-nc-sa' => 'ক্রিয়েটিভ কমন্স অ্যাট্রিবিউশন নন-কমার্শিয়াল শেয়ার অ্যালাইক',
-	'config-license-cc-0' => 'ক্রিয়েটিভ কমন্স জিরো',
+	'config-license-cc-0' => 'ক্রিয়েটিভ কমন্স জিরো', # Fuzzy
 	'config-license-pd' => 'পাবলিক ডোমেইন',
 	'config-license-cc-choose' => 'একটি স্বনির্ধারিত ক্রিয়েটিভ কমন্স লাইসেন্ট নির্বাচন করুন',
 	'config-email-settings' => 'ই-মেইল সেটিংস',
@@ -2427,7 +2434,8 @@ $messages['bn'] = array(
 * [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce মিডিয়াউইকি রিলিজের মেইলিং লিস্ট]',
 );
 
-/** Bishnupria Manipuri (বিষ্ণুপ্রিয়া মণিপুরী) */
+/** Bishnupria Manipuri (বিষ্ণুপ্রিয়া মণিপুরী)
+ */
 $messages['bpy'] = array(
 	'mainpagetext' => "'''মিডিয়াউইকি হবাবালা ইয়া ইন্সটল ইল.'''",
 	'mainpagedocfooter' => 'উইকি সফটৱ্যার এহান আতানির বারে দরকার ইলে [//meta.wikimedia.org/wiki/Help:Contents আতাকুরার গাইড]হানর পাঙলাক নেগা।
@@ -2593,7 +2601,7 @@ Staliadur paouezet.",
 
 Ma rit gant un herberc'hiañ kenrannet, e tlefe ho herberc'hier bezañ pourchaset deoc'h un anv ostiz reizh en teulioù titouriñ.
 
-M'emaoc'h o staliañ ur servijer Windows ha ma rit gant MySQL, marteze ne'z aio ket en-dro \"localhost\" evel anv servijer. Ma ne dro ket, klaskit ober gant \"127.0.0.1\" da chomlec'h IP lechel.",
+M'emaoc'h o staliañ ur servijer Windows ha ma rit gant MySQL, marteze ne'z aio ket en-dro \"localhost\" evel anv servijer. Ma ne dro ket, klaskit ober gant \"127.0.0.1\" da chomlec'h IP lechel.", # Fuzzy
 	'config-db-host-oracle' => 'TNS an diaz roadennoù :',
 	'config-db-wiki-settings' => 'Anavezout ar wiki-mañ',
 	'config-db-name' => 'Anv an diaz roadennoù :',
@@ -2930,7 +2938,7 @@ $messages['ca'] = array(
 * [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce Llista de correu (''listserv'') per a anuncis del MediaWiki]",
 );
 
-/** Chechen (Нохчийн)
+/** Chechen (нохчийн)
  * @author Sasan700
  */
 $messages['ce'] = array(
@@ -2944,7 +2952,8 @@ $messages['ce'] = array(
 * [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce Хаам бохьуьйту араяларца башхонца керла MediaWiki].',
 );
 
-/** Cebuano (Cebuano) */
+/** Cebuano (Cebuano)
+ */
 $messages['ceb'] = array(
 	'mainpagetext' => "'''Malamposon ang pag-instalar sa MediaWiki.'''",
 	'mainpagedocfooter' => 'Konsultaha ang [//meta.wikimedia.org/wiki/Help:Contents Giya sa mga gumagamit] alang sa impormasyon unsaon paggamit niining wiki nga software.
@@ -2982,7 +2991,8 @@ $messages['cps'] = array(
 * [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce Lista sang mga ginapadal-an sang sulat sang MediaWiki]',
 );
 
-/** Crimean Turkish (Cyrillic script) (‪Къырымтатарджа (Кирилл)‬) */
+/** Crimean Turkish (Cyrillic script) (къырымтатарджа (Кирилл)‎)
+ */
 $messages['crh-cyrl'] = array(
 	'mainpagetext' => "'''MediaWiki мувафакъиетнен къурулды.'''",
 	'mainpagedocfooter' => "Бу викининъ ёл-ёругъыны [//meta.wikimedia.org/wiki/Help:Contents User's Guide къулланыджы къылавузындан] огренип оласынъыз.
@@ -2993,7 +3003,8 @@ $messages['crh-cyrl'] = array(
 * [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce MediaWiki-нинъ янъы версияларынынъ чыкъувындан хабер йиберюв].",
 );
 
-/** Crimean Turkish (Latin script) (‪Qırımtatarca (Latin)‬) */
+/** Crimean Turkish (Latin script) (qırımtatarca (Latin)‎)
+ */
 $messages['crh-latn'] = array(
 	'mainpagetext' => "'''MediaWiki muvafaqiyetnen quruldı.'''",
 	'mainpagedocfooter' => "Bu vikiniñ yol-yoruğını [//meta.wikimedia.org/wiki/Help:Contents User's Guide qullanıcı qılavuzından] ögrenip olasıñız.
@@ -3542,6 +3553,7 @@ $3
 Až to dokončíte, můžete '''[$2 vstoupit do své wiki]'''.",
 	'config-download-localsettings' => 'Stáhnout LocalSettings.php',
 	'config-help' => 'nápověda',
+	'config-nofile' => 'Soubor „$1“ nelze nalézt. Byl smazán?',
 	'mainpagetext' => "'''MediaWiki byla úspěšně nainstalována.'''",
 	'mainpagedocfooter' => '[//meta.wikimedia.org/wiki/Help:Contents Uživatelská příručka] vám napoví, jak MediaWiki používat.
 
@@ -3552,12 +3564,14 @@ Až to dokončíte, můžete '''[$2 vstoupit do své wiki]'''.",
 * [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce E-mailová konference oznámení MediaWiki]',
 );
 
-/** Kashubian (kaszëbsczi) */
+/** Kashubian (kaszëbsczi)
+ */
 $messages['csb'] = array(
 	'mainpagetext' => "'''MediaWiki òsta zainstalowónô.'''",
 );
 
-/** Chuvash (Чӑвашла) */
+/** Chuvash (Чӑвашла)
+ */
 $messages['cv'] = array(
 	'mainpagetext' => "'''«MediaWiki» вики-движока лартасси ăнăçлă вĕçленчĕ.'''",
 	'mainpagedocfooter' => 'Ку википе ĕçлеме пулăшакан информацине [//meta.wikimedia.org/wiki/%D0%9F%D0%BE%D0%BC%D0%BE%D1%89%D1%8C:%D0%A1%D0%BE%D0%B4%D0%B5%D1%80%D0%B6%D0%B0%D0%BD%D0%B8%D0%B5 усăç руководствинче] тупма пултаратăр.
@@ -4078,7 +4092,7 @@ Es muss daher mit den nächsten Seite weitergemacht werden.",
 Sofern Änderungen vorgenommen werden sollen, kann man auf „← Zurück“ klicken.',
 	'config-install-step-done' => 'erledigt',
 	'config-install-step-failed' => 'gescheitert',
-	'config-install-extensions' => 'Softwareerweiterungen',
+	'config-install-extensions' => 'Programmerweiterungen',
 	'config-install-database' => 'Datenbank wird eingerichtet',
 	'config-install-schema' => 'Datenschema wird erstellt',
 	'config-install-pg-schema-not-exist' => 'Das PostgesSQL-Datenschema ist nicht vorhanden',
@@ -4144,7 +4158,7 @@ Sobald alles erledigt wurde, kann auf das '''[$2 Wiki zugegriffen werden]'''. Wi
 * [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce Mailingliste neuer MediaWiki-Versionen]',
 );
 
-/** German (formal address) (‪Deutsch (Sie-Form)‬)
+/** German (formal address) (Deutsch (Sie-Form)‎)
  * @author MichaelFrey
  */
 $messages['de-formal'] = array(
@@ -4163,7 +4177,7 @@ $messages['de-formal'] = array(
 $messages['diq'] = array(
 	'config-your-language' => 'Zıwanê şıma:',
 	'config-wiki-language' => 'Wiki zıwan:',
-	'config-back' => '← Peyd',
+	'config-back' => '← Peyser',
 	'config-continue' => 'Dewam ke',
 	'config-page-language' => 'Zıwan',
 	'config-page-welcome' => 'Şıma xeyr ameyê MediaWiki!',
@@ -4204,6 +4218,7 @@ $messages['diq'] = array(
 	'config-license-cc-by' => 'Creative Commons Attribution',
 	'config-license-cc-by-nc-sa' => 'Creative Commons Attribution Non-Commercial Share Alike',
 	'config-license-pd' => 'Malê Şari',
+	'config-extensions' => 'Olekeni',
 	'mainpagetext' => "'''MediaWiki vıst ra ser, vıraziya.'''",
 	'mainpagedocfooter' => 'Seba gurenayış u eyarkerdışê Wiki-Softwarey [//meta.wikimedia.org/wiki/Help:Contents İdarê karberi] de mıracaet ke.
 
@@ -4214,7 +4229,8 @@ $messages['diq'] = array(
 * [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce MediaWiki ra lista serbest-dayışê postey]',
 );
 
-/** Lower Sorbian (dolnoserbski) */
+/** Lower Sorbian (dolnoserbski)
+ */
 $messages['dsb'] = array(
 	'mainpagetext' => "'''MediaWiki jo se wuspěšnje instalěrowało.'''",
 	'mainpagedocfooter' => "Pomoc pśi wužywanju softwary wiki namakajoš pód [//meta.wikimedia.org/wiki/Help:Contents User's Guide].
@@ -4239,7 +4255,8 @@ $messages['dtp'] = array(
 * [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce Lis pininsuratan pinolabus do ModiaWiki]',
 );
 
-/** Greek (Ελληνικά) */
+/** Greek (Ελληνικά)
+ */
 $messages['el'] = array(
 	'mainpagetext' => "'''To λογισμικό MediaWiki εγκαταστάθηκε με επιτυχία.'''",
 	'mainpagedocfooter' => 'Περισσότερες πληροφορίες σχετικά με τη χρήση και με τη ρύθμιση παραμέτρων θα βρείτε στους συνδέσμους: [//meta.wikimedia.org/wiki/MediaWiki_localisation Οδηγίες για τροποποίηση του περιβάλλοντος εργασίας] και [//meta.wikimedia.org/wiki/MediaWiki_User%27s_Guide Εγχειρίδιο χρήστη].',
@@ -4821,7 +4838,7 @@ Cuando lo haya hecho, usted puede '''[$2  entrar en su wiki]'''.",
 * [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce Lista de correo de anuncios de distribución de MediaWiki]',
 );
 
-/** Español (formal) (Español (formal))
+/** español (formal) (español (formal))
  * @author Dferg
  */
 $messages['es-formal'] = array(
@@ -4946,7 +4963,8 @@ $messages['eu'] = array(
 * [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce MediaWikiren argitalpenen posta zerrenda]',
 );
 
-/** Extremaduran (estremeñu) */
+/** Extremaduran (estremeñu)
+ */
 $messages['ext'] = array(
 	'mainpagetext' => "'''MeyaGüiqui s'á istalau satihatoriamenti.'''",
 	'mainpagedocfooter' => "Consurta la [//meta.wikimedia.org/wiki/Help:Contents User's Guide] pa sabel mas al tentu el huncionamientu el software güiqui.
@@ -4978,10 +4996,27 @@ $messages['fa'] = array(
 	'config-page-readme' => 'مرا بخوان',
 	'config-page-releasenotes' => 'یادداشت‌های انتشار',
 	'config-page-existingwiki' => 'ویکی موجود',
+	'config-restart' => 'بله ، آن دوباره راه اندازی کن',
+	'config-sidebar' => '* [//www.mediawiki.org صفحهٔ اصلی مدیاویکی]
+* [//www.mediawiki.org/wiki/Help:Contents راهنمای کاربر]
+* [//www.mediawiki.org/wiki/Manual:Contents راهنمای مدیر]
+* [//www.mediawiki.org/wiki/Manual:FAQ پرسش‌های رایج]
+----
+* <doclink href=Readme>مرا بخوان</doclink>
+* <doclink href=ReleaseNotes>یادداشت‌های انتشار</doclink>
+* <doclink href=Copying>نسخه برداری</doclink>
+* <doclink href=UpgradeDoc>ارتقا</doclink>',
+	'config-env-php' => 'پی‌اچ‌پی $1 نصب شده است.',
+	'config-env-php-toolow' => 'پی‌اچ‌پی $1 نصب شده است.
+در هر صورت، مدیاویکی نیاز به پی‌اچ‌پی نسخهٔ $2 یا بالاتر دارد.',
 	'config-db-type' => 'نوع پایگاه اطلاعات:',
 	'config-db-host' => 'میزبان پایگاه اطلاعات:',
 	'config-db-username' => 'نام کاربری پایگاه اطلاعات:',
 	'config-db-password' => 'کلمه عبور پایگاه اطلاعات:',
+	'config-header-mysql' => 'تنظیمات مای‌اس‌کیو‌ال',
+	'config-connection-error' => '$1.
+
+میزبان، نام کاربری و گذرواژه را بررسی کنید و دوباره امتحان کنید.',
 	'config-site-name' => 'نام ویکی:',
 	'config-site-name-blank' => 'نام تارنما را وارد کنید.',
 	'config-project-namespace' => 'فضای نام پروژه:',
@@ -4991,9 +5026,12 @@ $messages['fa'] = array(
 	'config-admin-email' => 'پست الکترونیکی شما:',
 	'config-profile-private' => 'ویکی خصوصی',
 	'config-license' => 'حق تکثیر و مجوز:',
+	'config-license-none' => 'بدون پاورقی مجوز',
+	'config-license-pd' => 'دامنه عمومی',
 	'config-license-cc-choose' => 'انتخاب یک مجوز سفارشی عوام خلاق',
 	'config-email-settings' => 'تنظیمات پست الکترونیکی',
 	'config-upload-enable' => 'فعال سازی بارگذاری پرونده',
+	'config-logo' => 'نشانی نامواره:',
 	'config-install-step-done' => 'انجام شد',
 	'config-install-step-failed' => 'ناموفق بود',
 	'config-help' => 'راهنما',
@@ -5078,7 +5116,7 @@ Et voi asentaa MediaWikiä.',
 	'config-env-php-toolow' => 'PHP $1 on asennettu.
 MediaWiki vaatii PHP:n version $2 tai uudemman.',
 	'config-no-db' => 'Sopivaa tietokanta-ajuria ei löytynyt! Sinun täytyy asentaa tietokanta-ajurit PHP:lle.
-Seuraavat tietokantatyypit ovat tuettuja: $1.',
+Seuraavat tietokantatyypit ovat tuettuja: $1.', # Fuzzy
 	'config-safe-mode' => "'''Varoitus:''' PHP:n [http://www.php.net/features.safe-mode safe mode] -tila on aktiivinen.
 Se voi aiheuttaa ongelmia erityisesti tiedostojen tallentamisen ja matemaattisten kaavojen kanssa.",
 	'config-pcre' => 'PCRE-tukimoduuli puuttuu.
@@ -5192,7 +5230,8 @@ Tarkista, että alla olevat taivutusmuodot ovat oikein. Jos eivät, tee tarvitta
 Taivutusmuodot: {{GRAMMAR:genitive|{{SITENAME}}}} (yön) – {{GRAMMAR:partitive|{{SITENAME}}}} (yötä) – {{GRAMMAR:elative|{{SITENAME}}}} (yöstä) – {{GRAMMAR:inessive|{{SITENAME}}}} (yössä) – {{GRAMMAR:illative|{{SITENAME}}}} (yöhön).",
 );
 
-/** Faroese (føroyskt) */
+/** Faroese (føroyskt)
+ */
 $messages['fo'] = array(
 	'mainpagetext' => "'''Innlegging av Wiki-ritbúnaði væleydnað.'''",
 );
@@ -5202,6 +5241,7 @@ $messages['fo'] = array(
  * @author Crochet.david
  * @author Gomoko
  * @author Grondin
+ * @author Guillom
  * @author Hashar
  * @author IAlex
  * @author Jean-Frédéric
@@ -5446,7 +5486,7 @@ Si vous ne voyez pas le système de base de données que vous essayez d'utiliser
 	'config-support-mysql' => '* $1 est le premier choix pour MediaWiki et est mieux pris en charge ([http://www.php.net/manual/en/mysql.installation.php how to compile PHP with MySQL support])',
 	'config-support-postgres' => "* $1 est un système de base de données populaire et ''open source'' qui peut être une alternative à MySQL ([http://www.php.net/manual/en/pgsql.installation.php how to compile PHP with PostgreSQL support]). Il peut contenir quelques bogues mineurs et n'est pas recommandé dans un environnement de production.",
 	'config-support-sqlite' => '* $1 est un système de base de données léger qui est bien supporté. ([http://www.php.net/manual/en/pdo.installation.php How to compile PHP with SQLite support], utilise PDO)',
-	'config-support-oracle' => '* $1 est un système commercial de gestion de base de données d’entreprise. ([Http://www.php.net/manual/en/oci8.installation.php Comment compiler PHP avec le support OCI8])',
+	'config-support-oracle' => '* $1 est un système commercial de gestion de base de données d’entreprise. ([http://www.php.net/manual/en/oci8.installation.php Comment compiler PHP avec le support OCI8])',
 	'config-support-ibm_db2' => "* $1 est une base de données d'entreprise commerciale.",
 	'config-header-mysql' => 'Paramètres de MySQL',
 	'config-header-postgres' => 'Paramètres de PostgreSQL',
@@ -5748,7 +5788,8 @@ Lorsque c'est fait, vous pouvez '''[$2 accéder à votre wiki]'''.",
 * [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce Liste de discussion sur les distributions de MediaWiki]',
 );
 
-/** Cajun French (français cadien) */
+/** Cajun French (français cadien)
+ */
 $messages['frc'] = array(
 	'mainpagetext' => "'''Vous avez bien installé MediaWiki.'''",
 	'mainpagedocfooter' => 'Lisez la [//meta.wikimedia.org/wiki/Help:Contents Guide des Useurs] pour apprendre à user le wiki software.
@@ -5935,12 +5976,14 @@ $messages['frr'] = array(
 * [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce Mailingliste neuer MediaWiki-Versionen]',
 );
 
-/** Friulian (furlan) */
+/** Friulian (furlan)
+ */
 $messages['fur'] = array(
 	'mainpagetext' => "'''MediaWiki e je stade instalade cun sucès.'''",
 );
 
-/** Western Frisian (Frysk) */
+/** Western Frisian (Frysk)
+ */
 $messages['fy'] = array(
 	'mainpagetext' => "'''MediaWiki-program goed ynstallearre.'''",
 	'mainpagedocfooter' => "Rieplachtsje de [//meta.wikimedia.org/wiki/Help:Ynhâldsopjefte hantlieding] foar ynformaasje oer it gebrûk fan 'e wikisoftware.
@@ -5965,7 +6008,8 @@ $messages['ga'] = array(
 agus an [//meta.wikimedia.org/wiki/MediaWiki_User%27s_Guide Lámhleabhar úsáideora] chun cabhair úsáide agus fíoraíochta a fháil.',
 );
 
-/** Gagauz (Gagauz) */
+/** Gagauz (Gagauz)
+ */
 $messages['gag'] = array(
 	'mainpagetext' => "'''MediaWiki başarılan kuruldu.'''",
 	'mainpagedocfooter' => "Vikilän iş uurunda bilgi almaa için [//meta.wikimedia.org/wiki/Help:Contents User's Guide] sayfasına bakınız
@@ -5977,7 +6021,8 @@ $messages['gag'] = array(
 * [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce MediaWiki release mailing list]",
 );
 
-/** Simplified Gan script (‪赣语（简体）‬) */
+/** Simplified Gan script (赣语（简体）‎)
+ */
 $messages['gan-hans'] = array(
 	'mainpagetext' => "'''安装正MediaWiki喽。'''",
 	'mainpagedocfooter' => '参看[//meta.wikimedia.org/wiki/Help:Contents 用户指南]里头会话到啷用wiki软件
@@ -5989,7 +6034,8 @@ $messages['gan-hans'] = array(
 * [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce MediaWiki 发布email清单]',
 );
 
-/** Traditional Gan script (‪贛語（繁體）‬) */
+/** Traditional Gan script (贛語（繁體）‎)
+ */
 $messages['gan-hant'] = array(
 	'mainpagetext' => "'''安裝正MediaWiki嘍。'''",
 	'mainpagedocfooter' => '參看[//meta.wikimedia.org/wiki/Help:Contents 用戶指南]裡頭會話到啷用wiki軟件
@@ -6640,7 +6686,7 @@ E <doclink href=Copying>Kopi vu dr GNU General Public-Lizänz</doclink> sott zä
 	'config-sidebar' => '* [//www.mediawiki.org MediaWiki Websyte vu MediaWiki]
 * [//www.mediawiki.org/wiki/Help:Contents Nutzeraaleitig zue MediaWiki]
 * [//www.mediawiki.org/wiki/Manual:Contents Adminischtratoreaaleitig zue MediaWiki]
-* [//www.mediawiki.org/wiki/Manual:FAQ Vilmol gstellti Froge zue MediaWiki]',
+* [//www.mediawiki.org/wiki/Manual:FAQ Vilmol gstellti Froge zue MediaWiki]', # Fuzzy
 	'config-env-good' => 'D Inschtallationsumgäbig isch prieft wore.
 Du chasch MediaWiki inschtalliere.',
 	'config-env-bad' => 'D Inschtallationsumgäbigisch prieft wore.
@@ -6652,7 +6698,7 @@ Du chasch MediaWiki nit inschtalliere.',
 Wänn Du ne Websyte mit ere große Bsuechrzahl bedrybsch, sottsch e weng ebis läse iber [//www.mediawiki.org/wiki/Unicode_normalization_considerations Unicode-Normalisierig (en)].",
 	'config-unicode-update-warning' => "'''Warnig:''' Di inschtalliert Version vum Unicode-Normalisierigswrapper verwändet e elteri Version vu dr Bibliothek vum [http://site.icu-project.org/ ICU-Projäkt].
 Du sottsch si [//www.mediawiki.org/wiki/Unicode_normalization_considerations aktualisiere], wänn Dor d Verwändig vu Unicode wichtig isch.",
-	'config-no-db' => 'S isch kei adäquate Datebanktryyber gfunde wore!',
+	'config-no-db' => 'S isch kei adäquate Datebanktryyber gfunde wore!', # Fuzzy
 	'config-no-fts3' => "'''Warnig:''' SQLite isch ohni s [//sqlite.org/fts3.html FTS3-Modul] kumpiliert wore, s stehn kei Suechfunktione z Verfiegig.",
 	'config-register-globals' => "'''Warnig: Dr Parameter <code>[http://php.net/register_globals register_globals]</code> vu PHP isch aktiviert.'''
 '''Är sott deaktiviert wäre, wänn des megli isch.'''
@@ -6708,12 +6754,14 @@ $messages['gu'] = array(
 * [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce મિડીયાવિકિ રીલીઝ મેઇલીંગ લીસ્ટ]',
 );
 
-/** Manx (Gaelg) */
+/** Manx (Gaelg)
+ */
 $messages['gv'] = array(
 	'mainpagetext' => "'''Ta MediaWiki currit stiagh nish.'''",
 );
 
-/** Hakka (Hak-kâ-fa) */
+/** Hakka (Hak-kâ-fa)
+ */
 $messages['hak'] = array(
 	'mainpagetext' => "'''Yí-kîn sṳ̀n-kûng ôn-chông MediaWiki.'''",
 	'mainpagedocfooter' => 'chhiáng fóng-mun [//meta.wikimedia.org/wiki/Help:Contents Yung-fu sú-chhak] yî-khi̍p sṳ́-yung chhṳ́ wiki ngiôn-khien ke sin-sit！
@@ -6725,7 +6773,8 @@ $messages['hak'] = array(
 * [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce MediaWiki fat-phu email chhîn-tân]',
 );
 
-/** Hawaiian (Hawai`i) */
+/** Hawaiian (Hawai`i)
+ */
 $messages['haw'] = array(
 	'mainpagetext' => "'''Ua pono ka ho‘ouka ‘ana o MediaWiki.'''",
 );
@@ -7274,7 +7323,8 @@ $3
 * [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce רשימת התפוצה על השקת גרסאות]',
 );
 
-/** Hindi (हिन्दी) */
+/** Hindi (हिन्दी)
+ */
 $messages['hi'] = array(
 	'mainpagetext' => "'''मीडियाविकिका इन्स्टॉलेशन पूरा हो गया हैं ।'''",
 	'mainpagedocfooter' => 'विकि सॉफ्टवेयरके इस्तेमाल के लिये [//meta.wikimedia.org/wiki/Help:Contents उपयोगकर्ता गाईड] देखें ।
@@ -7311,7 +7361,8 @@ $messages['hil'] = array(
 * [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce Lista sang mga ginapadal-an sang sulat kon may paguha-on nga MediaWiki]",
 );
 
-/** Croatian (hrvatski) */
+/** Croatian (hrvatski)
+ */
 $messages['hr'] = array(
 	'mainpagetext' => "'''Softver MediaWiki je uspješno instaliran.'''",
 	'mainpagedocfooter' => 'Pogledajte [//meta.wikimedia.org/wiki/MediaWiki_localisation dokumentaciju o prilagodbi sučelja]
@@ -7396,6 +7447,7 @@ Slědowace typy datoweje banki so podpěruja: $1.
 Jeli wužiwaš zhromadnje wužiwany serwer, proš swojeho poskićowarja, zo by přihódny ćěrjak datoweje banki instalował.
 Jeli sy PHP sam kompilował, konfiguruj jón znowa z aktiwizowanym programom datoweje banki, na přikład z pomocu <code>./configure --with-mysql</code>.
 Jeli sy PHP z Debianoweho abo Ubuntuoweho paketa instalował, dyrbiš tež modul php5-mysql instalować.',
+	'config-outdated-sqlite' => "'''Warnowanje''': maš SQLite $1, kotryž je starši hač minimalna trěbna wersija $2. SQLite njebudźe k dispoziciji stać.",
 	'config-no-fts3' => "'''Warnowanje''': SQLite je so bjez [//sqlite.org/fts3.html FTS3-modula] kompilował, pytanske funkcije njebudu k dispoziciji stać.",
 	'config-register-globals' => "'''Warnowanje: Funkcija <code>[http://php.net/register_globals register_globals]</code> PHP je zmóžnjena.'''
 '''Znjemóžń ju, jeli móžeš.'''
@@ -7408,10 +7460,15 @@ To móže problemy zawinować, předewšěm, jeli so datajowe nahraća a podpěr
 	'config-xml-bad' => 'XML-modul za PHP faluje.
 MediaWiki trjeba funkcije w tutym modulu a njebudźe w tutej konfiguraciji fungować.
 Jeli wužiwaš Mandrake, instaluj paket php-xml.',
+	'config-pcre' => 'Zda so, zo modul za PCRE-podpěru faluje.
+MediaWiki trjeba z Perl kompatibelne funkcije za regularne wurazy, zo by fungował.',
+	'config-pcre-no-utf8' => "'''Ćežki zmylk''': Zda so, zo PCRE-modul za PHP ma so bjez PCRE_UTF8-podpěry kompilować.
+MediaWiki trjeba UTF-8-podpěru, zo by korektnje fungował.",
 	'config-memory-raised' => 'PHP-parameter <code>memory_limit</code> je $1, je so na hódnotu $2 zwyšił.',
 	'config-memory-bad' => "'''Warnowanje:''' PHP-parameter <code>memory_limit</code> ma hódnotu $1,
 To je najskerje přeniske.
 Instalacija móhła so njeporadźić!",
+	'config-ctype' => "'''Ćežki zmylk''': PHP dyrbi so z podpěru za [http://www.php.net/manual/en/ctype.installation.php rozšěrjenje Ctype] kompilować.",
 	'config-xcache' => '[http://xcache.lighttpd.net/ XCache] je instalowany',
 	'config-apc' => '[http://www.php.net/apc APC] je instalowany',
 	'config-wincache' => '[http://www.iis.net/download/WinCacheForPhp WinCache] je instalowany',
@@ -7460,6 +7517,7 @@ Změń ju jenož, jeli su přeswědčiwe přičiny za to.',
 	'config-type-ibm_db2' => 'IBM DB2',
 	'config-support-mysql' => '* $1 je primarny cil za MediaWiki a podpěruje so najlěpje ([http://www.php.net/manual/en/mysql.installation.php Nawod ke kompilowanju  PHP z  MySQL-podpěru])',
 	'config-support-postgres' => '* $1 je popularny system datoweje banki zjawneho žórła jako alternatiwa k MySQL ([http://www.php.net/manual/en/pgsql.installation.php nawod za kompilowanje PHP z podpěru PostgreSQL]). Móhło hišće někotre zmylki eksistować, a njeporuča so jón w produktiwnej wokolinje wužiwać.',
+	'config-support-oracle' => '* $1 je komercielna předewzaćelska datowa banka. ([http://www.php.net/manual/en/oci8.installation.php Nawod za kompilowanje PHP z OCI8-podpěru])',
 	'config-support-ibm_db2' => '* $1 je komercielna předewzaćelska datowa banka.',
 	'config-header-mysql' => 'Nastajenja MySQL',
 	'config-header-postgres' => 'Nastajenja PostgreSQL',
@@ -7826,7 +7884,7 @@ Telepítés megszakítva.',
 
 Ha megosztott webtárhelyet használsz, a szolgáltató dokumentációjában megtalálható a helyes hosztnév.
 
-Ha Windows-alapú szerverre telepítesz, és MySQL-t használsz, a „localhost” nem biztos, hogy működni fog. Ha így van, próbáld meg a „127.0.0.1” helyi IP-cím használatát.',
+Ha Windows-alapú szerverre telepítesz, és MySQL-t használsz, a „localhost” nem biztos, hogy működni fog. Ha így van, próbáld meg a „127.0.0.1” helyi IP-cím használatát.', # Fuzzy
 	'config-db-host-oracle' => 'Adatbázis TNS:',
 	'config-db-wiki-settings' => 'A wiki azonosítása',
 	'config-db-name' => 'Adatbázisnév:',
@@ -8203,7 +8261,7 @@ Ha végeztél a fájl elhelyezésével, '''[$2 beléphetsz a wikibe]'''.",
 $messages['hu-formal'] = array(
 	'config-localsettings-upgrade' => "'''Figyelmeztetés''': már létezik a <code>LocalSettings.php</code> fájl.
 A szoftver frissíthető.
-Adja meg a <code>\$wgUpgradeKey</code>-ben található kulcsot a beviteli mezőben",
+Adja meg a <code>\$wgUpgradeKey</code>-ben található kulcsot a beviteli mezőben", # Fuzzy
 	'config-session-expired' => 'Úgy tűnik, hogy a munkamenetadatok lejártak.
 A munkamenetek élettartama a következőre van beállítva: $1.
 Az érték növelhető a php.ini <code>session.gc_maxlifetime</code> beállításának módosításával.
@@ -8218,7 +8276,7 @@ Ellenőrizze, hogy a php.ini-ben a <code>session.save_path</code> beállítás a
 Alapvető ellenőrzés, ami megmondja, hogy a környezet alkalmas-e a MediaWiki számára.
 Ha probléma merülne fel a telepítés során, meg kell adnia mások számára az alább megjelenő információkat.',
 	'config-unicode-pure-php-warning' => "'''Figyelmeztetés''': Az [http://pecl.php.net/intl intl PECL kiterjesztés] nem érhető el Unicode normalizáláshoz.
-Ha nagy látogatottságú oldalt üzemeltet, itt találhat információkat [//www.mediawiki.org/wiki/Unicode_normalization_considerations a témáról].",
+Ha nagy látogatottságú oldalt üzemeltet, itt találhat információkat [//www.mediawiki.org/wiki/Unicode_normalization_considerations a témáról].", # Fuzzy
 	'config-register-globals' => "'''Figyelmeztetés: A PHP <code>[http://php.net/register_globals register_globals]</code> beállítása engedélyezve van.'''
 '''Tiltsa le, ha van rá lehetősége.'''
 A MediaWiki működőképes a beállítás használata mellett, de a szerver biztonsági kockázatnak lesz kitéve.",
@@ -8227,7 +8285,7 @@ A bélyegképek készítése engedélyezve lesz, ha engedélyezi a feltöltések
 	'config-db-name-help' => 'Válassza ki a wikije azonosítására használt nevet.
 Nem tartalmazhat szóközt vagy kötőjelet.
 
-Ha megosztott webtárhelyet használ, a szolgáltatója vagy egy konkrét adatbázisnevet ad önnek használatra, vagy létrehozhat egyet a vezérlőpulton keresztül.',
+Ha megosztott webtárhelyet használ, a szolgáltatója vagy egy konkrét adatbázisnevet ad önnek használatra, vagy létrehozhat egyet a vezérlőpulton keresztül.', # Fuzzy
 	'config-db-install-help' => 'Adja meg a felhasználónevet és jelszót, amivel a telepítő csatlakozhat az adatbázishoz.',
 	'config-db-wiki-help' => 'Adja meg azt a felhasználónevet és jelszót, amivel a wiki fog csatlakozni az adatbázishoz működés közben.
 Ha a fiók nem létezik és a telepítést végző fiók rendelkezik megfelelő jogosultsággal, egy új fiók készül a megadott a névvel, azon minimális jogosultságkörrel, ami a wiki működéséhez szükséges.',
@@ -8238,7 +8296,7 @@ Ez sokkal hatékonyabb a MySQL UTF-8-módjától, és lehetővé teszi, hogy a t
 '''UTF-8-módban''' MySQL tudja, hogy milyen karakterkészlettel van kódolva az adat, megfelelően van megjelenítve és konvertálva, de
 nem használhatja a [//en.wikipedia.org/wiki/Mapping_of_Unicode_character_planes Basic Multilingual Plane] feletti karaktereket.",
 	'config-db-schema-help' => 'A fenti sémák általában megfelelőek.
-Csak akkor módosítson rajta, ha szükség van rá.',
+Csak akkor módosítson rajta, ha szükség van rá.', # Fuzzy
 	'config-sqlite-parent-unwritable-nogroup' => 'Nem lehet létrehozni az adatok tárolásához szükséges <code><nowiki>$1</nowiki></code> könyvtárat, mert a webszerver nem írhat a szülőkönyvtárba (<code><nowiki>$2</nowiki></code>).
 
 A telepítő nem tudta megállapíteni, hogy melyik felhasználói fiókon fut a webszerver.
@@ -8266,7 +8324,7 @@ Ez tartalmazza az összes beállítást.
 [$1 Le kell töltenie], és el kell helyeznie a MediaWiki telepítési könyvtárába (az a könyvtár, ahol az index.php van).
 '''Megjegyzés''': Ha ezt most nem teszi meg, és kilép, a generált fájl nem lesz elérhető a későbbiekben.
 
-Ha ezzel készen van, '''[$2 beléphet a wikibe]'''.",
+Ha ezzel készen van, '''[$2 beléphet a wikibe]'''.", # Fuzzy
 	'mainpagedocfooter' => "Ha segítségre van szüksége a wikiszoftver használatához, akkor keresse fel a [//meta.wikimedia.org/wiki/Help:Contents User's Guide] oldalt.
 
 == Alapok (angol nyelven) ==
@@ -8275,7 +8333,8 @@ Ha ezzel készen van, '''[$2 beléphet a wikibe]'''.",
 * [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce MediaWiki-kiadások levelezőlistája]",
 );
 
-/** Armenian (Հայերեն) */
+/** Armenian (Հայերեն)
+ */
 $messages['hy'] = array(
 	'mainpagetext' => "'''«MediaWiki» ծրագիրը հաջողությամբ տեղադրվեց։'''",
 	'mainpagedocfooter' => "Այցելեք [//meta.wikimedia.org/wiki/Help:Contents User's Guide]՝ վիքի ծրագրային ապահովման օգտագործման մասին տեղեկությունների համար։
@@ -8991,7 +9050,7 @@ Instalasi dibatalkan.',
 
 Jika Anda menggunakan inang web bersama, penyedia inang Anda harus memberikan nama inang yang benar di dokumentasi mereka.
 
-Jika Anda menginstal pada server Windows dan menggunakan MySQL, "localhost" mungkin tidak dapat digunakan sebagai nama server. Jika demikian, coba "127.0.0.1" untuk alamat IP lokal.',
+Jika Anda menginstal pada server Windows dan menggunakan MySQL, "localhost" mungkin tidak dapat digunakan sebagai nama server. Jika demikian, coba "127.0.0.1" untuk alamat IP lokal.', # Fuzzy
 	'config-db-host-oracle' => 'TNS basis data:',
 	'config-db-host-oracle-help' => 'Masukkan [http://download.oracle.com/docs/cd/B28359_01/network.111/b28317/tnsnames.htm Local Connect Name] yang sah; berkas tnsnames.ora harus dapat diakses oleh instalasi ini.<br />Jika Anda menggunakan pustaka klien 10g atau lebih baru, Anda juga dapat menggunakan metode penamaan [http://download.oracle.com/docs/cd/E11882_01/network.112/e10836/naming.htm Easy Connect].',
 	'config-db-wiki-settings' => 'Identifikasi wiki ini',
@@ -9324,7 +9383,7 @@ Mengabaikan daftar bawaan.",
 	'config-install-keys' => 'Membuat kunci rahasia',
 	'config-insecure-keys' => "'''Peringatan:''' {{PLURAL:$2|Suatu|Beberapa}} kunci aman ($1) yang dibuat selama instalasi {{PLURAL:$2|tidak|tidak}} benar-benar aman. Pertimbangkan untuk mengubah {{PLURAL:$2|kunci|kunci-kunci}} tersebut secara manual.",
 	'config-install-sysop' => 'Membuat akun pengguna pengurus',
-	'config-install-subscribe-fail' => 'Tidak dapat berlangganan mediawiki-announce',
+	'config-install-subscribe-fail' => 'Tidak dapat berlangganan mediawiki-announce', # Fuzzy
 	'config-install-mainpage' => 'Membuat halaman utama dengan konten bawaan',
 	'config-install-extension-tables' => 'Pembuatan tabel untuk ekstensi yang diaktifkan',
 	'config-install-mainpage-failed' => 'Tidak dapat membuat halaman utama: $1',
@@ -9355,7 +9414,8 @@ Setelah melakukannya, Anda dapat '''[$2 memasuki wiki Anda]'''.",
 * [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce Milis rilis MediaWiki]',
 );
 
-/** Interlingue (Interlingue) */
+/** Interlingue (Interlingue)
+ */
 $messages['ie'] = array(
 	'mainpagetext' => "'''Software del wiki installat con successe.'''",
 );
@@ -9375,7 +9435,8 @@ $messages['ig'] = array(
 * [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce wéfù ndétu nke ozi MediaWiki]",
 );
 
-/** Iloko (Ilokano) */
+/** Iloko (Ilokano)
+ */
 $messages['ilo'] = array(
 	'mainpagetext' => "'''Sibaballigi a nainstolar ti MediaWiki.'''",
 );
@@ -9393,7 +9454,8 @@ $messages['io'] = array(
 * [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce MediaWiki nova versioni posto-listo]",
 );
 
-/** Icelandic (íslenska) */
+/** Icelandic (íslenska)
+ */
 $messages['is'] = array(
 	'mainpagetext' => "'''Uppsetning á MediaWiki heppnaðist.'''",
 	'mainpagedocfooter' => 'Ráðfærðu þig við [//meta.wikimedia.org/wiki/Help:Contents Notandahandbókina] fyrir frekari upplýsingar um notkun wiki-hugbúnaðarins.
@@ -9409,6 +9471,7 @@ $messages['is'] = array(
  * @author Beta16
  * @author Darth Kule
  * @author F. Cosoleto
+ * @author Gianfranco
  * @author Karika
  */
 $messages['it'] = array(
@@ -9483,7 +9546,7 @@ MediaWiki necessita di questo modulo per funzinare, che fornisce funzioni per le
 	'config-memory-bad' => "''Attenzione:''' Il valore di <code>memory_limit</code> di PHP è $1.
 Probabilmente è troppo basso.
 L'installazione potrebbe non riuscire!",
-	'config-ctype' => "'''Errore''': PHP deve essere compilato con il supporto per la [http://www.php.net/manual/en/ctype.installation.php estensione Ctype].",
+	'config-ctype' => "'''Errore''': PHP deve essere compilato con il supporto per l'[http://www.php.net/manual/it/ctype.installation.php estensione Ctype].",
 	'config-xcache' => '[http://xcache.lighttpd.net/ XCache] è installato',
 	'config-apc' => '[http://www.php.net/apc APC] è installato',
 	'config-wincache' => '[http://www.iis.net/download/WinCacheForPhp WinCache] è installato',
@@ -9494,7 +9557,7 @@ La caching degli oggetti non è attivata.",
 Le miniature delle immagini saranno presenti se gli upload vengono abilitati.',
 	'config-gd' => 'Trovata la GD Graphics Library built-in.
 Le miniature delle immagini saranno presenti se gli upload vengono abilitati.',
-	'config-no-scaling' => 'La GD library o ImageMagick non sono state trovate.
+	'config-no-scaling' => 'Impossibile trovare GD library o ImageMagick.
 Le miniature delle immagini saranno disabilitate.',
 	'config-no-uri' => "'''Errore:''' Impossibile determinare l'URI attuale.
 Installazione interrotta.",
@@ -9502,10 +9565,14 @@ Installazione interrotta.",
 	'config-using-server' => 'Nome server in uso "<nowiki>$1</nowiki>".',
 	'config-using-uri' => 'URL del server in uso "<nowiki>$1$2</nowiki>".',
 	'config-db-type' => 'Tipo di database:',
+	'config-db-wiki-settings' => 'Identifica questo wiki',
 	'config-db-name' => 'Nome del database:',
+	'config-db-name-oracle' => 'Schema del database:',
+	'config-db-username' => 'Nome utente del database:',
 	'config-db-password-empty' => 'Inserire una password per il nuovo utente del database: $1.
 Anche se può essere possibile creare utenti senza password, questo non è sicuro.',
 	'config-db-install-help' => "Inserire il nome utente e la password che verranno usate per la connessione al database durante il processo d'installazione.",
+	'config-db-prefix' => 'Prefisso tabella del database:',
 	'config-db-charset' => 'Set di caratteri del database',
 	'config-charset-mysql5' => 'MySQL 4.1/5.0 UTF-8',
 	'config-charset-mysql4' => 'MySQL 4.0 con compatibilità UTF-8',
@@ -9523,15 +9590,18 @@ Da cambiare solamente se si è sicuri di averne bisogno.',
 	'config-header-oracle' => 'Impostazioni Oracle',
 	'config-header-ibm_db2' => 'Impostazioni IBM DB2',
 	'config-invalid-db-type' => 'Tipo di database non valido',
+	'config-db-web-account' => "Account del database per l'accesso web",
 	'config-db-web-create' => "Crea l'account se non esiste già",
 	'config-mysql-engine' => 'Storage engine:',
 	'config-mysql-innodb' => 'InnoDB',
 	'config-mysql-myisam' => 'MyISAM',
 	'config-mysql-charset' => 'Set di caratteri del database:',
+	'config-mysql-binary' => 'Binario',
 	'config-mysql-utf8' => 'UTF-8',
 	'config-ibm_db2-low-db-pagesize' => "Il database DB2 in uso ha una tablespace predefinita con un insufficiente pagesize, che dovrebbe essere '''32K''' o maggiore.",
 	'config-ns-generic' => 'Progetto',
 	'config-ns-site-name' => 'Stesso nome wiki: $1',
+	'config-ns-other-default' => 'MyWiki',
 	'config-admin-box' => 'Account amministratore',
 	'config-admin-name' => 'Tuo nome:',
 	'config-admin-password' => 'Password:',
@@ -9552,26 +9622,47 @@ Specificare un nome utente diverso.',
 Inserire un indirizzo email se si desidera effettuare l'iscrizione alla mailing list.",
 	'config-almost-done' => 'Hai quasi finito!
 Adesso puoi saltare la rimanente parte della configurazione e semplicemente installare la wiki.',
+	'config-optional-continue' => 'Fammi altre domande.',
+	'config-profile-wiki' => 'Wiki tradizionale',
+	'config-profile-no-anon' => 'Creazione utenza obbligatoria',
+	'config-profile-fishbowl' => 'Solo editori autorizzati',
+	'config-profile-private' => 'Wiki privata',
 	'config-license' => 'Copyright e licenza:',
+	'config-license-none' => 'Nessun piè di pagina per la licenza',
 	'config-license-cc-by-sa' => 'Creative Commons Attribuzione-Condividi allo stesso modo',
 	'config-license-cc-by' => 'Creative Commons Attribuzione',
 	'config-license-cc-by-nc-sa' => 'Creative Commons Attribuzione-Non commerciale-Condividi allo stesso modo',
 	'config-license-cc-0' => 'Creative Commons Zero (pubblico dominio)',
 	'config-license-gfdl' => 'GNU Free Documentation License 1.3 o versioni successive',
 	'config-license-pd' => 'Pubblico dominio',
+	'config-license-cc-choose' => 'Seleziona una delle licenze Creative Commons',
+	'config-license-help' => "Molti wiki pubblici rilasciano i loro contributi con una [http://freedomdefined.org/Definition licenza libera]. Questo aiuta a creare un senso di proprietà condivisa nella comunità e incoraggia a contribuire a lungo termine. Non è generalmente necessario per un wiki privato o aziendale.
+
+Se vuoi usare testi da Wikipedia, o desideri che Wikipedia possa essere in grado di accettare testi copiati dal tuo wiki, dovresti scegliere '''Creative Commons Attribution Share Alike'''.
+
+In precedenza Wikipedia ha utilizzato la GNU Free Documentation License. La GFDL è una licenza valida, ma è di difficile comprensione e complica il riutilizzo dei contenuti.",
 	'config-email-settings' => 'Impostazioni email',
+	'config-email-user' => 'Abilita invio email fra utenti',
 	'config-email-auth' => 'Abilita autenticazione via email',
+	'config-upload-enable' => 'Consentire il caricamento di file',
 	'config-upload-deleted' => 'Directory per i file cancellati:',
 	'config-logo' => 'URL del logo:',
+	'config-instantcommons' => 'Abilita Instant Commons',
 	'config-cc-again' => 'Seleziona di nuovo...',
 	'config-cc-not-chosen' => 'Scegliere quale licenza Creative Commons si desidera e cliccare su "procedi".',
 	'config-advanced-settings' => 'Configurazione avanzata',
+	'config-memcache-needservers' => 'È stato selezionato il tipo di caching Memcached, ma non è stato impostato alcun server.',
 	'config-memcache-badip' => 'È stato inserito un indirizzo IP non valido per Memcached: $1.',
 	'config-extensions' => 'Estensioni',
+	'config-install-step-done' => 'fatto',
+	'config-install-step-failed' => 'non riuscito',
+	'config-install-schema' => 'Creazione dello schema',
+	'config-install-user' => 'Creazione di utente del database',
 	'config-install-user-alreadyexists' => 'L\'utente "$1" è già presente',
 	'config-install-user-create-failed' => 'Creazione dell\'utente "$1" non riuscita: $2',
 	'config-install-user-missing' => 'L\'utente indicato "$1" non esiste.',
 	'config-install-tables-failed' => "'''Errore''': La creazione della tabella non è riuscita: $1",
+	'config-install-interwiki' => 'Riempimento della tabella interwiki predefinita',
 	'config-install-interwiki-list' => 'Impossibile leggere il file <code>interwiki.list</code>.',
 	'config-install-stats' => 'Inizializzazione delle statistiche',
 	'config-install-keys' => 'Generazione delle chiavi segrete',
@@ -10122,7 +10213,8 @@ $messages['jut'] = array(
 	'mainpagedocfooter' => "Se vores engelskspråĝede [//meta.wikimedia.org/wiki/MediaWiki_localisation dokumentåsje tilpasnenge'm åf æ brugergrænseflade] og [//meta.wikimedia.org/wiki/MediaWiki_User%27s_Guide æ brugervejlednenge] før åplysnenger åpsætnenge'm og anvendelse.",
 );
 
-/** Javanese (Basa Jawa) */
+/** Javanese (Basa Jawa)
+ */
 $messages['jv'] = array(
 	'mainpagetext' => "'''Prangkat empuk wiki wis suksès dipasang.'''",
 	'mainpagedocfooter' => "Mangga maca [//meta.wikimedia.org/wiki/Help:Contents User's Guide] kanggo katrangan luwih langkung prakara panggunan prangkat empuk wiki
@@ -10132,8 +10224,90 @@ $messages['jv'] = array(
 * [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce Milis rilis MediaWiki]",
 );
 
-/** Georgian (ქართული) */
+/** Georgian (ქართული)
+ * @author David1010
+ */
 $messages['ka'] = array(
+	'config-information' => 'ინფორმაცია',
+	'config-your-language' => 'თქვენი ენა:',
+	'config-wiki-language' => 'ვიკის ენა:',
+	'config-back' => '← უკან',
+	'config-continue' => 'გაგრძელება →',
+	'config-page-language' => 'ენა',
+	'config-page-welcome' => 'კეთილი იყოს თქვენი მობრძანება მედიავიკიში!',
+	'config-page-dbconnect' => 'მონაცემთა ბაზასთან დაკავშირება',
+	'config-page-dbsettings' => 'მონაცემთა ბაზის კონფიგურაცია',
+	'config-page-name' => 'სახელი',
+	'config-page-options' => 'პარამეტრები',
+	'config-page-install' => 'ინსტალაცია',
+	'config-page-complete' => 'დასრულებულია!',
+	'config-page-restart' => 'ინსტალაციის თავიდან დაწყება',
+	'config-page-readme' => 'წამიკითხე',
+	'config-page-copying' => 'ლიცენზია',
+	'config-page-upgradedoc' => 'განახლება',
+	'config-restart' => 'დიახ, თავიდან დაიწყეთ',
+	'config-sidebar' => '* [//www.mediawiki.org მედიავიკის ვებ-გვერდი]
+* [//www.mediawiki.org/wiki/Help:Contents/ka მომხმარებლების დახმარება]
+* [//www.mediawiki.org/wiki/Manual:Contents/ka ადმინისტრატორების დახმარება]
+* [//www.mediawiki.org/wiki/Manual:FAQ/ka FAQ]
+----
+* <doclink href=Readme>წამიკითხე</doclink>
+* <doclink href=ReleaseNotes>ინფორმაცია გამოშვებაზე</doclink>
+* <doclink href=Copying>ლიცენზია</doclink>
+* <doclink href=UpgradeDoc>განახლება</doclink>',
+	'config-db-type' => 'მონაცემთა ბაზის ტიპი:',
+	'config-db-host-oracle' => 'მონაცემთა ბაზის TNS:',
+	'config-db-name' => 'მონაცემთა ბაზის სახელი:',
+	'config-db-name-oracle' => 'მონაცემთა ბაზის სქემა:',
+	'config-db-username' => 'მონაცემთა ბაზის მომხმარებლის სახელი:',
+	'config-db-password' => 'მონაცემთა ბაზის პაროლი:',
+	'config-charset-mysql5-binary' => 'MySQL 4.1/5.0 ორობითი',
+	'config-charset-mysql5' => 'MySQL 4.1/5.0 UTF-8',
+	'config-db-port' => 'მონაცემთა ბაზის პორტი:',
+	'config-db-schema' => 'მედიავიკის სქემა:',
+	'config-header-mysql' => 'MySQL-ის პარამეტრები',
+	'config-header-postgres' => 'PostgreSQL-ის პარამეტრები',
+	'config-header-sqlite' => 'SQLite-ის პარამეტრები',
+	'config-header-oracle' => 'Oracle-ის პარამეტრები',
+	'config-header-ibm_db2' => 'IBM DB2-ის პარამეტრები',
+	'config-invalid-db-type' => 'არასწორი მონაცემთა ბაზის ტიპი',
+	'config-mysql-innodb' => 'InnoDB',
+	'config-mysql-myisam' => 'MyISAM',
+	'config-mysql-binary' => 'ორობითი',
+	'config-mysql-utf8' => 'UTF-8',
+	'config-site-name' => 'ვიკის სახელი:',
+	'config-site-name-blank' => 'შეიყვანეთ ვებ-გვერდის სახელი.',
+	'config-project-namespace' => 'პროექტის სახელთა სივრცე:',
+	'config-ns-generic' => 'პროექტი',
+	'config-ns-other' => 'სხვა (მიუთითეთ)',
+	'config-ns-other-default' => 'ჩემი ვიკი',
+	'config-admin-box' => 'ადმინისტრატორის ანგარიში',
+	'config-admin-name' => 'თქვენი სახელი:',
+	'config-admin-password' => 'პაროლი:',
+	'config-admin-password-confirm' => 'პაროლი ხელმეორედ:',
+	'config-admin-name-blank' => 'შეიყვანეთ ადმინისტრატორის მომხმარებლის სახელი.',
+	'config-admin-email' => 'ელ. ფოსტის მისამართი:',
+	'config-profile-wiki' => 'ტრადიციული ვიკი',
+	'config-profile-private' => 'დახურული ვიკი',
+	'config-license' => 'საავტორო უფლები და ლიცენზია:',
+	'config-license-cc-by-sa' => 'Creative Commons Attribution Share Alike',
+	'config-license-cc-by' => 'Creative Commons Attribution',
+	'config-license-cc-by-nc-sa' => 'Creative Commons Attribution Non-Commercial Share Alike',
+	'config-license-cc-0' => 'Creative Commons Zero (საზოგადოებრივი საკუთრება)',
+	'config-license-gfdl' => 'GNU Free Documentation License 1.3 ან უფრო გვიანი',
+	'config-license-pd' => 'საზოგადოებრივი საკუთრება',
+	'config-license-cc-choose' => 'აირჩიეთ Creative Commons-ის ლიცენზიიდან ერთ-ერთი',
+	'config-email-settings' => 'ელ. ფოსტის პარამეტრები',
+	'config-upload-settings' => 'სურათებისა და ფაილების ატვირთვა',
+	'config-upload-enable' => 'ფაილების ატვირთვის ჩართვა',
+	'config-logo' => 'ლოგოს URL:',
+	'config-cc-again' => 'აირჩიეთ კიდევ ერთხელ...',
+	'config-extensions' => 'გაფართოებები',
+	'config-install-step-done' => 'შესრულდა',
+	'config-install-step-failed' => 'ვერ მოხერხდა',
+	'config-install-tables' => 'ცხრილების შექმნა',
+	'config-download-localsettings' => 'LocalSettings.php-ის გადმოწერა',
+	'config-help' => 'დახმარება',
 	'mainpagetext' => "'''მედიავიკი წარმატებით ჩაიტვირთა.'''",
 	'mainpagedocfooter' => 'ვიკი პროგრამის გამოყენების ინფორმაციისთვის იხილეთ [//meta.wikimedia.org/wiki/Help:Contents მომხმარებლის მეგზური].
 
@@ -10144,7 +10318,8 @@ $messages['ka'] = array(
 * [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce მედიავიკის გამოცემის დაგზავნის სია]',
 );
 
-/** Kara-Kalpak (Qaraqalpaqsha) */
+/** Kara-Kalpak (Qaraqalpaqsha)
+ */
 $messages['kaa'] = array(
 	'mainpagetext' => "'''MediaWiki tabıslı ornatıldı.'''",
 	'mainpagedocfooter' => "Wiki bag'darlamasın qollanıw haqqındag'i mag'lıwmat usın [//meta.wikimedia.org/wiki/Help:Contents Paydalanıwshılar qollanbasınan] ken'es alın'.
@@ -10189,7 +10364,8 @@ $messages['kiu'] = array(
 * [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce MediaWiki ra lista serbest-daena postey]",
 );
 
-/** Kazakh (Arabic script) (‫قازاقشا (تٴوتە)‬) */
+/** Kazakh (Arabic script) (قازاقشا (تٴوتە)‏)
+ */
 $messages['kk-arab'] = array(
 	'mainpagetext' => "'''مەدىياۋىيكىي بۋماسى ٴساتتى ورناتىلدى.'''",
 	'mainpagedocfooter' => 'ۋىيكىي باعدارلامالىق جاساقتاماسىن قالاي قولداناتىن اقپاراتى ٴۇشىن [//meta.wikimedia.org/wiki/Help:Contents پايدالانۋشىلىق نۇسقاۋلارىنان] كەڭەس الىڭىز.
@@ -10200,7 +10376,8 @@ $messages['kk-arab'] = array(
 * [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce مەدىياۋىيكىي شىعۋ تۋرالى حات تاراتۋ ٴتىزىمى]',
 );
 
-/** Kazakh (Cyrillic script) (‪Қазақша (кирил)‬) */
+/** Kazakh (Cyrillic script) (қазақша (кирил)‎)
+ */
 $messages['kk-cyrl'] = array(
 	'mainpagetext' => "'''МедиаУики бумасы сәтті орнатылды.'''",
 	'mainpagedocfooter' => 'Уики бағдарламалық жасақтамасын қалай қолданатын ақпараты үшін [//meta.wikimedia.org/wiki/Help:Contents Пайдаланушылық нұсқауларынан] кеңес алыңыз.
@@ -10211,7 +10388,8 @@ $messages['kk-cyrl'] = array(
 * [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce МедиаУики шығу туралы хат тарату тізімі]',
 );
 
-/** Kazakh (Latin script) (‪Qazaqşa (latın)‬) */
+/** Kazakh (Latin script) (qazaqşa (latın)‎)
+ */
 $messages['kk-latn'] = array(
 	'mainpagetext' => "'''MedïaWïkï bwması sätti ornatıldı.'''",
 	'mainpagedocfooter' => 'Wïkï bağdarlamalıq jasaqtamasın qalaý qoldanatın aqparatı üşin [//meta.wikimedia.org/wiki/Help:Contents Paýdalanwşılıq nusqawlarınan] keñes alıñız.
@@ -10252,7 +10430,8 @@ $messages['km'] = array(
 * [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce បញ្ជី​ពិភាក្សា​ការផ្សព្វផ្សាយ​របស់​មេឌាវិគី]',
 );
 
-/** Kannada (ಕನ್ನಡ) */
+/** Kannada (ಕನ್ನಡ)
+ */
 $messages['kn'] = array(
 	'mainpagetext' => "'''ವಿಕಿ ತಂತ್ರಾಂಶವನ್ನು ಯಶಸ್ವಿಯಾಗಿ ಅನುಸ್ಥಾಪಿಸಲಾಯಿತು.'''",
 	'mainpagedocfooter' => 'ವಿಕಿ ತಂತ್ರಾಂಶವನ್ನು ಬಳಸುವ ಬಗ್ಗೆ ಮಾಹಿತಿಗೆ [//meta.wikimedia.org/wiki/Help:Contents ಬಳಕೆದಾರರಿಗೆ ನಿರ್ದೇಶನ ಪುಟ] ನೋಡಿ.
@@ -10273,7 +10452,7 @@ $messages['ko'] = array(
 	'config-title' => 'MediaWiki $1 설치',
 	'config-information' => '정보',
 	'config-localsettings-upgrade' => '<code>LocalSettings.php</code> 파일이 감지되었습니다.
-이 설치를 업그레이드하려면 아래 상자에 <code>$wgUpgradeKey</code>의 값을 입력해주세요.
+이 설치를 업그레이드하려면 아래 상자에 <code>$wgUpgradeKey</code>의 값을 입력하세요.
 LocalSettings.php에 찾으세요.',
 	'config-localsettings-cli-upgrade' => 'LocalSettings.php 파일이 감지되었습니다.
 이 설치를 업그레이드하려면 update.php를 대신 실행하세요',
@@ -10285,7 +10464,7 @@ LocalSettings.php에 찾으세요.',
 $1',
 	'config-localsettings-incomplete' => '기존 LocalSettings.php가 완전하지 않은 것 같습니다.
 $1 변수가 설정되어 있지 않습니다.
-이 변수가 설정되도록 LocalSettings.php를 변경하고 "계속"을 클릭하세요.',
+이 변수가 설정되도록 LocalSettings.php를 바꾸고 "계속"을 클릭하세요.',
 	'config-localsettings-connection-error' => 'LocalSettings.php 또는 AdminSettings.php에 지정한 설정을 사용하여 데이터베이스에 연결할 때 오류가 발생했습니다. 이러한 설정을 수정하고 다시 시도하세요.
 
 $1',
@@ -10303,12 +10482,12 @@ php.ini를 확인하고 <code>session.save_path</code>가 적절한 디렉토리
 	'config-back' => '← 뒤로',
 	'config-continue' => '계속 →',
 	'config-page-language' => '언어',
-	'config-page-welcome' => '미디어위키에 온 것을 환영합니다!',
+	'config-page-welcome' => '미디어위키에 오신 것을 환영합니다!',
 	'config-page-dbconnect' => '데이터베이스에 연결',
 	'config-page-upgrade' => '기존 설치 업그레이드',
 	'config-page-dbsettings' => '데이터베이스 설정',
 	'config-page-name' => '이름',
-	'config-page-options' => '옵션',
+	'config-page-options' => '설정',
 	'config-page-install' => '설치',
 	'config-page-complete' => '완료!',
 	'config-page-restart' => '설치 다시 시작',
@@ -10317,10 +10496,10 @@ php.ini를 확인하고 <code>session.save_path</code>가 적절한 디렉토리
 	'config-page-copying' => '전문',
 	'config-page-upgradedoc' => '업그레이드하기',
 	'config-page-existingwiki' => '기존 위키',
-	'config-help-restart' => '당신이 입력한 모든 저장된 데이터를 지우고 설치 과정을 다시 시작하겠습니까?',
-	'config-restart' => '예, 다시 시작합니다.',
+	'config-help-restart' => '입력한 모든 저장된 데이터를 지우고 설치 과정을 다시 시작하겠습니까?',
+	'config-restart' => '예, 다시 시작합니다',
 	'config-welcome' => '=== 사용 환경 검사 ===
-이 환경이 미디어위키 설치에 적합할 지 기본 검사를 실행합니다.
+이 환경이 미디어위키 설치에 적합한지 기본 검사를 실행합니다.
 설치 중 도움이 필요하다면 이 검사 결과를 함께 제공해주어야 합니다.',
 	'config-copyright' => "=== 저작권 및 이용 약관 ===
 
@@ -10358,7 +10537,7 @@ $1
 다음 데이터베이스 유형을 지원합니다 : $1.
 
 호스팅을 공유하고 있다면 적절한 데이터베이스 드라이버를 설치하도록 호스팅 제공 업체에 문의하세요.
-PHP를 직접 컴파일할 경우 데이터베이스 클라이언트를 사용하여 활성화하도록 다시 설정하세요. 예들 들어 <code>./configure --with-mysql</code>을 사용합니다.
+PHP를 직접 컴파일할 경우 데이터베이스 클라이언트를 사용하여 활성화하도록 다시 설정하세요. 예들 들어 <code>./configure --with-mysql</code>을 사용하세요.
 데비안이나 우분트 패키지에서 PHP를 설치했다면 php-mysql 모듈도 설치해야 합니다.',
 	'config-outdated-sqlite' => "'''경고''': SQLite 필요한 최소 $2 버전보다 낮은 $1(이)가 있습니다. SQLite는 사용할 수 없습니다.",
 	'config-no-fts3' => "'''경고''': SQLite는 [//sqlite.org/fts3.html FTS3 모듈] 없이 컴파일되어, 검색 기능은 백엔드에 사용할 수 없습니다.",
@@ -10378,7 +10557,7 @@ PHP를 직접 컴파일할 경우 데이터베이스 클라이언트를 사용
 이 옵션은 미디어위키에 끔찍한 버그를 일으킵니다.
 설치할 수 없습니다. 또는 미디어위키가 사용하지 않는 이 옵션을 비활성화하십시오.",
 	'config-safe-mode' => "'''경고:''' [http://www.php.net/features.safe-mode 안전 모드]이 활성합니다!
-이는 특히 파일을 올리거나 <code>math</code>를 지원하는 데 문제가 발생할 수 있습니다.",
+특히 파일을 올리거나 <code>math</code>를 지원하는 데 문제가 발생할 수 있습니다.",
 	'config-xml-bad' => 'PHP의 XML 모듈이 없습니다.
 미디어위키는 이 모듈의 기능이 필요하며 이 설정에서는 작동하지 않습니다.
 Mandrake를 실행하고 있다면 php-xml 패키지를 설치하세요.',
@@ -10388,7 +10567,7 @@ Mandrake를 실행하고 있다면 php-xml 패키지를 설치하세요.',
 미디어위키가 제대로 작동하려면 UTF-8 지원이 필요합니다.",
 	'config-memory-raised' => 'PHP의 <code>memory_limit</code>는 $1이며 $2(으)로 늘리세요.',
 	'config-memory-bad' => "'''경고:''' PHP의 <code>memory_limit</code>는 $1입니다.
-이는 아마도 너무 낮은 것 같습니다.
+아마도 너무 낮은 것 같습니다.
 설치가 실패할 수 있습니다!",
 	'config-ctype' => "'''치명''': PHP는 [http://www.php.net/manual/en/ctype.installation.php Ctype 확장 기능]에 대해 지원하여 컴파일해야 합니다.",
 	'config-xcache' => '[http://xcache.lighttpd.net/ XCache]가 설치되었습니다',
@@ -10411,7 +10590,7 @@ Mandrake를 실행하고 있다면 php-xml 패키지를 설치하세요.',
 	'config-using-server' => '"<nowiki>$1</nowiki>"(을)를 서버 이름으로 사용합니다.',
 	'config-using-uri' => '"<nowiki>$1$2</nowiki>"(을)를 서버 URL로 사용합니다.',
 	'config-uploads-not-safe' => "'''경고:''' 올리기에 대한 기본 디렉토리(<code>$1</code>)는 임의의 스크립트 실행에 취약합니다.
-미디어위키는 보안 위협에 대한 모든 올린 파일을 검사하지만, 이는 올리기를 활성화하기 전에 [//www.mediawiki.org/wiki/Manual:Security#Upload_security 이 보안 취약점을 해결할 것]을 매우 권장합니다.",
+미디어위키는 보안 위협에 대한 모든 올린 파일을 검사하지만, 올리기를 활성화하기 전에 [//www.mediawiki.org/wiki/Manual:Security#Upload_security 이 보안 취약점을 해결할 것]을 매우 권장합니다.",
 	'config-no-cli-uploads-check' => "'''경고:''' 올리기에 대한 기본 디렉토리(<code>$1</code>)는 CLI를 설치하는 동안 임의의 스크립트 실행에 대한 취약점에 대해 검사되지 않습니다.",
 	'config-brokenlibxml' => '시스템에 버그가 있는 PHP와 libxml2의 조합이 있으며 미디어위키나 다른 웹 어플리케이션에 숨겨진 데이터 손상을 일으킬 수 있습니다.
 PHP 5.2.9 이후와 libxml2 2.7.3 이후로 업그레이드하세요 ([//bugs.php.net/bug.php?id=45996 PHP에 제기한 버그]).
@@ -10424,7 +10603,7 @@ PHP 5.2.9 이후와 libxml2 2.7.3 이후로 업그레이드하세요 ([//bugs.ph
 	'config-db-host' => '데이터베이스 호스트:',
 	'config-db-host-help' => '데이터베이스 서버가 다른 서버에 있을 경우 여기에 호스트 이름이나 IP 주소를 입력하세요.
 
-웹 호스팅을 공유하여 사용하는 경우 호스팅 공급자는 당신에게 이들 설명서의 올바른 호스트 이름을 표기해야 합니다.
+공유된 웹 호스팅을 사용하는 경우 호스팅 공급자는 올바른 호스트 이름을 설명해야 합니다.
 
 윈도 서버에 설치하고 MySQL을 사용할 경우 "localhost"는 서버 이름으로 작동하지 않을 수 있습니다. 그렇지 않으면 로컬 IP 주소로 "127.0.0.1"를 시도하세요.
 
@@ -10434,9 +10613,9 @@ PostgreSQL을 사용할 경우 유닉스 소켓을 통해 연결되도록 입력
 	'config-db-wiki-settings' => '이 위키 식별',
 	'config-db-name' => '데이터베이스 이름:',
 	'config-db-name-help' => '위키를 식별하기 위한 이름을 선택하세요.
-이는 공백이 없어야 합니다.
+공백이 없어야 합니다.
 
-웹 호스팅을 공유해 사용하는 경우 호스팅 제공 업체도 당신에게 제어판을 통해 데이터베이스를 사용하거나 만들 수 있도록 특정 데이터베이스 이름을 제공합니다.',
+공유된 웹 호스팅 사용하는 경우 호스팅 제공 업체가 특정 데이터베이스 이름을 제공하거나 제어판에서 데이터베이스를 만들 수 있도록 합니다.',
 	'config-db-name-oracle' => '데이터베이스 스키마:',
 	'config-db-account-oracle-warn' => '데이터베이스 백엔드로 오라클을 설치하기 위해 지원하는 세 가지 시나리오가 있습니다:
 
@@ -10447,10 +10626,11 @@ PostgreSQL을 사용할 경우 유닉스 소켓을 통해 연결되도록 입력
 	'config-db-username' => '데이터베이스 사용자 이름:',
 	'config-db-password' => '데이터베이스 비밀번호:',
 	'config-db-password-empty' => '새 데이터베이스 사용자의 비밀번호를 입력하세요: $1.
-비밀번호 없이 사용자를 만들 수도 있지만 이는 안전하지 않습니다.',
+비밀번호 없이 사용자를 만들 수도 있지만 안전하지 않습니다.',
 	'config-db-install-username' => '설치 과정 중에 데이터베이스에 연결할 때 사용할 사용자 이름을 입력하세요.
-이는 미디어위키 계정의 사용자 이름이 아닌 데이터베이스에 대한 사용자 이름입니다.',
-	'config-db-install-password' => '설치 과정 중에 데이터베이스에 연결할 때 사용할 비밀번호을 입력하세요. 이는 미디어위키 계정의 비밀번호가 아닌 데이터베이스에 대한 비밀번호입니다.',
+미디어위키 계정의 사용자 이름이 아닌 데이터베이스에 대한 사용자 이름입니다.',
+	'config-db-install-password' => '설치 과정 중에 데이터베이스에 연결할 때 사용할 비밀번호을 입력하세요.
+미디어위키 계정의 비밀번호가 아닌 데이터베이스에 대한 비밀번호입니다.',
 	'config-db-install-help' => '설치 과정 중에 데이터베이스에 연결할 때 사용할 사용자 이름과 비밀번호를 입력하세요.',
 	'config-db-account-lock' => '정상적으로 작동하는 동안 같은 사용자 이름과 비밀번호를 사용함',
 	'config-db-wiki-account' => '정상적인 작동을 위한 사용자 계정',
@@ -10465,10 +10645,10 @@ PostgreSQL을 사용할 경우 유닉스 소켓을 통해 연결되도록 입력
 	'config-charset-mysql5-binary' => 'MySQL 4.1/5.0 바이너리',
 	'config-charset-mysql5' => 'MySQL 4.1/5.0 UTF-8',
 	'config-charset-mysql4' => 'MySQL 4.0 UTF-8 하위 호환성',
-	'config-charset-help' => "'''경고:''' MySQL 4.1에서 '''UTF-8 하위 호환성'''을 사용하고 나서 <code>mysqldump</code>로 데이터베이스에 백업한다면 이는 모든 ASCII가 아닌 문자를 파괴하고 손상한 백업을 되돌릴 수 없습니다!
+	'config-charset-help' => "'''경고:''' MySQL 4.1에서 '''UTF-8 하위 호환성'''을 사용하고 나서 <code>mysqldump</code>로 데이터베이스에 백업한다면 모든 ASCII가 아닌 문자를 파괴하고 손상한 백업을 되돌릴 수 없습니다!
 
 '''바이너리 모드'''에서는 미디어위키는 바이너리 필드의 데이터베이스에 UTF-8 텍스트를 저장합니다.
-이는 MySQL의 UTF-8 모드를 보다 더 효율적이고 유니코드 문자의 전체 범위를 사용할 수 있습니다.
+MySQL의 UTF-8 모드를 보다 더 효율적이고 유니코드 문자의 전체 범위를 사용할 수 있습니다.
 '''UTF-8 모드'''에서는 MySQL은 데이터를 설정하는 어떤 문자열인지를 알 것이며, 표현하고 적절하게 그것을 변환할 수 있지만
 [//en.wikipedia.org/wiki/Mapping_of_Unicode_character_planes 기본 다국어 범위] 상의 문자를 저장하지 못하게 될 수 있습니다.",
 	'config-mysql-old' => 'MySQL $1 이상이 필요하나 $2(이)가 있습니다.',
@@ -10484,8 +10664,8 @@ PostgreSQL을 사용할 경우 유닉스 소켓을 통해 연결되도록 입력
 
 PHP 파일이 있는 곳을 우리가 이를 맡길 수 없는 이유는 웹을 통해 접근할 수 없다는 것입니다.
 
-설치 마법사가 이과 함께 .htaccess 파일을 만들지만 거기서 실패하면 누군가는 원시 데이터베이스에 접근하는 데 실패합니다.
-이는 원시 사용자 데이터(이메일 주소, 암호 해시) 뿐만 아니라 삭제된 개정판과 위키의 다른 제한된 데이터를 포함합니다.
+설치 마법사가 이과 함께 .htaccess 파일을 만들지만 거기서 실패하면 누군가는 원본 데이터베이스에 접근하는 데 실패합니다.
+원시 사용자 데이터(이메일 주소, 암호 해시) 뿐만 아니라 삭제된 개정판과 위키의 다른 제한된 데이터를 포함합니다.
 
 <code>/var/lib/mediawiki/yourwiki</code>와 같이 모두 다른 곳에서 데이터베이스를 넣어보도록 하세요.',
 	'config-oracle-def-ts' => '기본 테이블공간:',
@@ -10496,7 +10676,7 @@ PHP 파일이 있는 곳을 우리가 이를 맡길 수 없는 이유는 웹을
 
 $1
 
-데이터베이스 시스템이 표시되지 않을 때 아래에 나열된 다음 지원을 활성화하려면 당신은 위의 링크된 지시에 따라 사용해볼 수도 있습니다.',
+데이터베이스 시스템이 표시되지 않을 때 아래에 나열된 다음 지원을 활성화하려면 위의 링크된 지시에 따라 설치해볼 수 있습니다.',
 	'config-support-mysql' => '* $1은 미디어위키의 기본 대상으로 가장 잘 지원합니다. ([http://www.php.net/manual/en/mysql.installation.php MySQL을 지원하여 PHP를 컴파일하는 방법])',
 	'config-support-postgres' => '* $1은 MySQL의 대안으로 인기있는 오픈 소스 데이터베이스 시스템입니다. ([http://www.php.net/manual/en/pgsql.installation.php PostgreSQL을 지원하여 PHP를 컴파일하는 방법]) 몇가지 사소한 해결하지 못한 버그가 있을 수 있으며, 이를 제작 환경에서 사용하지 않는 것이 좋습니다.',
 	'config-support-sqlite' => '* $1는 매우 잘 지원하는 가벼운 데이터베이스 시스템입니다. ([http://www.php.net/manual/en/pdo.installation.php SQLite를 지원하여 PHP를 컴파일하는 방법], PDO 사용)',
@@ -10527,7 +10707,7 @@ ASCII 글자 (a-z, A-Z), 숫자 (0-9), 밑줄 (_)과 하이픈 (-)만 사용하
 	'config-postgres-old' => 'PostgreSQL $1 이상이 필요하나 $2(이)가 있습니다.',
 	'config-sqlite-name-help' => '위키를 식별하기 위한 이름을 선택하세요.
 공백이나 하이픈을 사용하지 마십시오.
-이는 SQLite 데이터 파일 이름에 사용됩니다.',
+SQLite 데이터 파일 이름에 사용됩니다.',
 	'config-sqlite-parent-unwritable-group' => '<code><nowiki>$1</nowiki></code> 데이터 디렉토리를 만들 수 없으며 <code><nowiki>$2</nowiki></code> 상위 디렉토리에 웹 서버에 의해 쓸 수 없기 때문입니다.
 
 설치 마법사는 웹 서버로 실행중인 사용자를 결정할 수 없습니다.
@@ -10554,7 +10734,7 @@ chmod a+w $3</pre>',
 	'config-sqlite-connection-error' => '$1.
 
 호스트, 계정 이름과 비밀번호를 확인하고 다시 시도하세요.',
-	'config-sqlite-readonly' => '파일 <code>$1</code>은 쓰기가 불가능합니다.',
+	'config-sqlite-readonly' => '<code>$1</code> 파일은 쓰기가 불가능합니다.',
 	'config-sqlite-cant-create-db' => '<code>$1</code> 데이터베이스 파일을 만들 수 없습니다.',
 	'config-sqlite-fts3-downgrade' => 'PHP가 FTS3 지원이 없어졌습니다. 테이블을 다운그레이드하세요.',
 	'config-can-upgrade' => "이 데이터베이스에 미디어위키 테이블이 있습니다.
@@ -10581,9 +10761,9 @@ chmod a+w $3</pre>',
 	'config-mysql-innodb' => 'InnoDB',
 	'config-mysql-myisam' => 'MyISAM',
 	'config-mysql-myisam-dep' => "'''경고''': 미디어위키와 함께 사용하도록 권장하지 않는 MySQL에 대한 스토리지 엔진으로 MyISAM을 선택하였습니다. 이유는:
-* 이는 테이블이 잠겨있어 동시성을 거의 지원하지 않습니다
-* 이는 다른 엔진보다 손상이 더 자주 발생합니다.
-* 미디어위키 바탕 코드가 항상 정상적으로 MyISAM을 처리하지 않습니다.
+* 테이블이 잠겨있어 동시성을 거의 지원하지 않습니다
+* 다른 엔진보다 손상이 더 자주 발생합니다
+* 미디어위키 바탕 코드가 항상 정상적으로 MyISAM을 처리하지 않습니다
 
 MySQL 설치가 InnoDB를 지원한다면 그 선택 대신에 InnoDB를 선택할 것을 매우 권장합니다.
 MySQL 설치가 InnoDB를 지원하지 않는다면 아마도 업그레이드를 해야 할 수도 있습니다.",
@@ -10595,21 +10775,21 @@ MyISAM 데이터베이스는 InnoDB 데이터베이스보다 더 자주 손실
 	'config-mysql-binary' => '바이너리',
 	'config-mysql-utf8' => 'UTF-8',
 	'config-mysql-charset-help' => "'''바이너리 모드'''에서는 미디어위키는 바이너리 필드의 데이터베이스에 UTF-8 텍스트를 저장합니다.
-이는 MySQL의 UTF-8 모드를 보다 더 효율적이고 유니코드 문자의 전체 범위를 사용할 수 있습니다.
+MySQL의 UTF-8 모드를 보다 더 효율적이고 유니코드 문자의 전체 범위를 사용할 수 있습니다.
 '''UTF-8 모드'''에서는 MySQL은 데이터를 설정하는 어떤 문자열인지를 알 것이며, 표현하고 적절하게 그것을 변환할 수 있지만
 [//en.wikipedia.org/wiki/Mapping_of_Unicode_character_planes 기본 다국어 범위] 상의 문자를 저장하지 못하게 될 수 있습니다.",
-	'config-ibm_db2-low-db-pagesize' => "당신의 DB2 데이터베이스에 부족한 페이지 크기가 기본 테이블 공간에 있습니다. 페이지 크기는 '''32K''' 이상이어야 합니다.",
+	'config-ibm_db2-low-db-pagesize' => "DB2 데이터베이스에 부족한 페이지 크기가 기본 테이블 공간에 있습니다. 페이지 크기는 '''32K''' 이상이어야 합니다.",
 	'config-site-name' => '위키 이름:',
-	'config-site-name-help' => '이는 브라우저 제목 표시줄과 다른 여러 곳에 나타날 것입니다.',
+	'config-site-name-help' => '브라우저 제목 표시줄과 다른 여러 곳에 나타납니다.',
 	'config-site-name-blank' => '사이트 이름을 입력하세요.',
 	'config-project-namespace' => '프로젝트 이름공간:',
 	'config-ns-generic' => '프로젝트',
 	'config-ns-site-name' => '위키 이름과 같은 이름: $1',
 	'config-ns-other' => '기타 (지정)',
 	'config-ns-other-default' => '내위키',
-	'config-project-namespace-help' => '위키백과의 예를 따라서, 많은 위키는 "프로젝트 이름공간"에 그들의 콘텐츠 페이지에서 그들의 정책 페이지는 별도로 보관합니다.
+	'config-project-namespace-help' => '위키백과의 예를 따라서, 많은 위키는 "\'\'\'프로젝트 이름공간\'\'\'"에 그들의 콘텐츠 페이지에서 그들의 정책 페이지는 별도로 보관합니다.
 이 이름공간에 있는 모든 페이지의 제목은 여기서 지정할 수 있는 특정 접두어로 시작합니다.
-보통 이 접두어는 위키의 이름에서 파생되지만, 이는 "#" 또는 ":"와 같은 특수 문자를 포함할 수 없습니다.',
+보통 이 접두어는 위키의 이름에서 파생되지만, "#" 또는 ":"와 같은 특수 문자를 포함할 수 없습니다.',
 	'config-ns-invalid' => '특정 "<nowiki>$1</nowiki>" 이름공간이 잘못되었습니다.
 다른 프로젝트 이름공간을 지정하세요.',
 	'config-ns-conflict' => '특정 "<nowiki>$1</nowiki>" 이름공간이 기본 미디어위키 이름공간과 충돌합니다.
@@ -10619,7 +10799,7 @@ MyISAM 데이터베이스는 InnoDB 데이터베이스보다 더 자주 손실
 	'config-admin-password' => '비밀번호:',
 	'config-admin-password-confirm' => '비밀번호 확인:',
 	'config-admin-help' => '"홍길동"과 같이 여기에 원하는 사용자 이름을 입력하세요.
-이는 위키에 로그인하는 데 사용되는 이름입니다.',
+위키에 로그인하는 데 사용되는 이름입니다.',
 	'config-admin-name-blank' => '관리자의 사용자 이름을 입력하세요.',
 	'config-admin-name-invalid' => '특정 "<nowiki>$1</nowiki>" 사용자 이름이 잘못되었습니다.
 다른 사용자 이름을 지정하세요.',
@@ -10627,33 +10807,35 @@ MyISAM 데이터베이스는 InnoDB 데이터베이스보다 더 자주 손실
 	'config-admin-password-same' => '비밀번호는 사용자 이름과 같아서는 안 됩니다.',
 	'config-admin-password-mismatch' => '입력한 비밀번호 두 개가 일치하지 않습니다.',
 	'config-admin-email' => '이메일 주소:',
-	'config-admin-email-help' => '위키의 다른 사용자로부터 이메일을 전달받거나 비밀번호를 재설정하고 주시문서 목록에 대한 변경 알림을 받기 위해 여기에 이메일 주소를 입력하세요. 이 필드를 비워 둘 수 있습니다.',
+	'config-admin-email-help' => '위키의 다른 사용자로부터 이메일을 전달받거나 비밀번호를 재설정하고 주시문서 목록에 대한 바뀜 알림을 받기 위해 여기에 이메일 주소를 입력하세요. 이 필드를 비워 둘 수 있습니다.',
 	'config-admin-error-user' => '"<nowiki>$1</nowiki>" 이름의 관리자를 만드는 중 내부 오류가 발생했습니다.',
 	'config-admin-error-password' => '"<nowiki>$1</nowiki>" 관리자의 비밀번호를 설정하는 중 내부 오류가 발생했습니다: <pre>$2</pre>',
 	'config-admin-error-bademail' => '이메일 주소를 잘못 입력하였습니다.',
 	'config-subscribe' => '[https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce 배포 발표 메일링 리스트]에 가입합니다.',
-	'config-subscribe-help' => '이는 중요한 보안 알림을 포함한 배포 알림에 대해 사용되는 로우 볼륨 메일링 리스트입니다.
-당신이 이를 구독하고 나서 새 버전이 나올 때 미디어위키 설치를 업데이트해야합니다.',
+	'config-subscribe-help' => '중요한 보안 알림을 포함한 배포 알림에 대해 사용되는 로우 볼륨 메일링 리스트입니다.
+이 리스트를 구독하고 나서 새 버전이 나올 때 미디어위키 설치를 업데이트하십시오.',
 	'config-subscribe-noemail' => '이메일 주소를 제공하지 않고 배포 발표 메일링 리스트에 가입하려 합니다.
 메일링 리스트에 가입하고자 할 경우 이메일 주소를 제공하세요.',
-	'config-almost-done' => '거의 다 완료했습니다! 이제 남은 설정을 생략하고 지금 바로 위키를 설치할 수 있습니다.',
+	'config-almost-done' => '거의 다 완료했습니다!
+이제 남은 설정을 생략하고 지금 바로 위키를 설치할 수 있습니다.',
 	'config-optional-continue' => '더 많은 질문을 물어보세요.',
 	'config-optional-skip' => '지겨워요, 그냥 위키를 설치할래요.',
 	'config-profile' => '사용자 권한 프로필:',
 	'config-profile-wiki' => '평범한 위키',
-	'config-profile-no-anon' => '계정 생성 필요',
+	'config-profile-no-anon' => '계정 만들기 필요',
 	'config-profile-fishbowl' => '승인된 편집자만 이용 가능',
 	'config-profile-private' => '비공개 위키',
-	'config-profile-help' => "위키는 당신이 가능한 한 많은 사람들이 편집하도록 할 때 최고로 적합합니다.
-미디어위키에서는 최근 바뀜을 검토하고, 선하거나 악의적인 사용자에 의해 수행되는 모든 손실을 되돌리는 것이 쉽습니다.
+	'config-profile-help' => "위키는 많은 사람들이 가능한 한 해당 위키를 편집할 때 가장 뛰어난 역할을 합니다.
+미디어위키에서는 최근 바뀜을 검토하고, 선하거나 악의적인 사용자의 모든 손실을 되돌리는 것이 쉽습니다.
 
-그러나 많은 사람들이 미디어위키가 다양한 역할의 유용하지만, 때로는 그것이 위키 방식의 장점을 모두 설득하기 쉽지 않음을 발견했습니다.
+그러나 많은 사람들이 미디어위키가 다양한 역할로 유용하지만, 때로는 모든 사람에게 위키 방식의 장점을 모두 설득하기 쉽지 않을 지도 모릅니다.
 그래서 선택할 수 있습니다.
 
 '''{{int:config-profile-wiki}}'''는 로그인하지 않고도 누구나 편집할 수 있습니다.
-'''{{int:config-profile-no-anon}}'''는 추가적으로 필요한 책임을 제공하지만, 기존의 기여자를 망칠 수도 있습니다.
+'''{{int:config-profile-no-anon}}'''는 각 편집에 추가적으로 강한 책임성을 제공하지만, 부담 없는 기여를 저해할 수도 있습니다.
 
-'''{{int:config-profile-fishbowl}}''' 같은 경우는 승인된 사용자만 편집할 수 있지만, 대중은 역사를 포함하여 페이지를 볼 수 있습니다. '''{{int:config-profile-private}}'''는 승인된 사용자만 같은 그룹에서 편집할 수 있고 볼 수 있습니다.
+'''{{int:config-profile-fishbowl}}''' 같은 경우는 승인된 사용자만 편집할 수 있지만, 대중은 역사를 포함하여 페이지를 볼 수 있습니다.
+'''{{int:config-profile-private}}'''는 승인된 사용자만 같은 그룹에서 편집할 수 있고 볼 수 있습니다.
 
 더 복잡한 사용자 권한을 설정하여 설치한 후 사용할 수 있도록 하려면 [//www.mediawiki.org/wiki/Manual:User_rights 관련 매뉴얼 항목]을 참고하세요.",
 	'config-license' => '저작권 및 라이선스:',
@@ -10667,13 +10849,13 @@ MyISAM 데이터베이스는 InnoDB 데이터베이스보다 더 자주 손실
 	'config-license-cc-choose' => '다른 크리에이티브 커먼즈 라이선스 선택',
 	'config-license-help' => '많은 공개 위키는 모든 기여를 [http://freedomdefined.org/Definition 자유 라이선스] 하에 넣습니다.
 이럴 경우 커뮤니티 소유권의 이해를 할 수 있도록 하고 장기적인 기여를 장려합니다.
-이는 일반적으로 개인 또는 회사 위키에 대해서는 필요하지 않습니다.
+일반적으로 개인 또는 회사 위키에 대해서는 필요하지 않습니다.
 
 위키백과의 텍스트를 사용할 수 있도록 하고 위키백과가 위키에서 복사한 텍스트를 사용할 수 있도록 원한다면 크리에이티브 커먼즈 저작자표시-동일조건변경허락으로 선택해야 합니다.
 
 위키백과는 이전에 GNU 자유 문서 사용 허가서를 사용했습니다.
-GFDL은 유효한 라이선스이지만 이는 이해하기 어렵습니다.
-이는 GFDL 하에 라이선스 내용을 재사용하는 것도 어렵습니다.',
+GFDL은 유효한 라이선스이지만 이해하기 어렵습니다.
+GFDL 하에 라이선스 내용을 재사용하는 것도 어렵습니다.',
 	'config-email-settings' => '이메일 설정',
 	'config-enable-email' => '발신 이메일 활성화',
 	'config-enable-email-help' => '이메일을 작동하려면 [http://www.php.net/manual/en/mail.configuration.php PHP의 메일 설정]을 올바르게 설정해야 합니다.
@@ -10681,23 +10863,23 @@ GFDL은 유효한 라이선스이지만 이는 이해하기 어렵습니다.
 	'config-email-user' => '사용자와 사용자 간 이메일 활성화',
 	'config-email-user-help' => '환경 설정에서 활성화한 경우 모든 사용자가 이메일을 서로 보내도록 활성화합니다.',
 	'config-email-usertalk' => '사용자 토론 문서 알림 활성화',
-	'config-email-usertalk-help' => '환경 설정에서 활성화한 경우 사용자는 사용자 토론 문서의 변경 알림을 받도록 활성화합니다.',
+	'config-email-usertalk-help' => '환경 설정에서 활성화한 경우 사용자는 사용자 토론 문서의 바뀜 알림을 받도록 활성화합니다.',
 	'config-email-watchlist' => '주시문서 목록 알림 활성화',
 	'config-email-watchlist-help' => '환경 설정에서 활성화한 경우 사용자가 주시한 문서에 대한 알림을 받도록 활성화합니다.',
 	'config-email-auth' => '이메일 인증 활성화',
-	'config-email-auth-help' => "이 설정이 활성화되어 있으면 사용자는 이메일 주소를 설정하거나 변경할 때마다 그들에게 보낸 링크를 사용하여 이메일 주소를 확인해야 합니다.
-인증된 이메일 주소만 다른 사용자로부터의 이메일이나 변경 알림 이메일을 받을 수 있습니다.
+	'config-email-auth-help' => "이 설정이 활성화되어 있으면 사용자는 이메일 주소를 설정하거나 바꿀 때마다 그들에게 보낸 링크를 사용하여 이메일 주소를 확인해야 합니다.
+인증된 이메일 주소만 다른 사용자로부터의 이메일이나 바뀜 알림 이메일을 받을 수 있습니다.
 이메일 기능의 남용 가능성이 있기 때문에 이 옵션을 설정하는 것은 공개 위키에서 '''권장'''합니다.",
 	'config-email-sender' => '반송 이메일 주소',
 	'config-email-sender-help' => '발신한 이메일에 대한 반송 주소로 사용할 이메일 주소를 입력하세요.
-이는 반송할 때 보내는 주소입니다.
+반송할 때 보내는 주소입니다.
 대부분의 메일 서버는 적어도 도메인 이름 부분은 유효합니다.',
 	'config-upload-settings' => '그림과 파일 올리기',
 	'config-upload-enable' => '파일 올리기 활성화',
 	'config-upload-help' => '파일 올리기는 서버에 잠재적인 보안 위험에 쉽게 노출될 수 있습니다.
 자세한 내용은 매뉴얼의 [//www.mediawiki.org/wiki/Manual:Security 보안 문단]을 읽어보세요.
 
-파일 올리기를 활성화하려면 미디어위키의 루트 디렉토리에 있는 <code>images</code> 하위 디렉토리에서 웹 서버가 기록할 수 있도록 모드를 변경합니다.
+파일 올리기를 활성화하려면 미디어위키의 루트 디렉토리에 있는 <code>images</code> 하위 디렉토리에서 웹 서버가 기록할 수 있도록 모드를 바꿉니다.
 그 다음 이 옵션을 활성화합니다.',
 	'config-upload-deleted' => '삭제된 파일에 대한 디렉토리:',
 	'config-upload-deleted-help' => '삭제된 파일을 보관할 디렉토리를 선택하세요.
@@ -10736,11 +10918,11 @@ GFDL은 유효한 라이선스이지만 이는 이해하기 어렵습니다.
 	'config-extensions' => '확장 기능',
 	'config-extensions-help' => '위에 나열된 확장 기능이 <code>./extensions</code>에서 발견되었습니다.
 
-이들은 추가적인 설정이 필요할 수 있습니다만 지금 활성화시킬 수 있습니다.',
-	'config-install-alreadydone' => "'''경고:''' 당신은 이미 미디어위키를 설치하였고 다시 설치하려고 합니다.
+추가적인 설정이 필요할 수 있습니다만 지금 활성화시킬 수 있습니다.',
+	'config-install-alreadydone' => "'''경고:''' 이미 미디어위키를 설치했고 다시 설치하려고 합니다.
 다음 페이지에서 진행하세요.",
 	'config-install-begin' => '"{{int:config-continue}}"을 누르면 미디어위키의 설치를 시작합니다.
-그래도 변경하는 것을 원한다면 뒤로를 누릅니다.',
+그래도 바꾸는 것을 원한다면 뒤로를 누릅니다.',
 	'config-install-step-done' => '완료',
 	'config-install-step-failed' => '실패',
 	'config-install-extensions' => '확장 기능을 포함하는 중',
@@ -10766,15 +10948,15 @@ GFDL은 유효한 라이선스이지만 이는 이해하기 어렵습니다.
 이를 만드는 것을 원하면 아래의 "계정 만들기" 확인 상자를 클릭하세요.',
 	'config-install-tables' => '테이블을 만드는 중',
 	'config-install-tables-exist' => "'''경고''': 미디어위키 테이블이 이미 있는 것 같습니다.
-테이블 생성을 생략합니다.",
-	'config-install-tables-failed' => "'''오류''': 다음 오류와 함께 테이블 생성에 실패했습니다: $1",
+테이블 만들기를 생략합니다.",
+	'config-install-tables-failed' => "'''오류''': 다음 오류와 함께 테이블 만들기에 실패했습니다: $1",
 	'config-install-interwiki' => '기본 인터위키 테이블을 채우는 중',
 	'config-install-interwiki-list' => '<code>interwiki.list</code> 파일을 불러올 수 없습니다.',
 	'config-install-interwiki-exists' => "'''경고''': 인터위키 테이블이 이미 항목을 갖고 있는 것 같습니다.
 기본 목록으로 넘어갑니다.",
 	'config-install-stats' => '통계를 초기화하는 중',
 	'config-install-keys' => '보안 키를 만드는 중',
-	'config-insecure-keys' => "'''경고:''' 설치 중에 생성한 {{PLURAL:$2|보안 키}} ($1)를 설치하는 동안 완전히 안전하지 {{PLURAL:$2|않습니다}}. 직접 변경을 고려하세요.",
+	'config-insecure-keys' => "'''경고:''' 설치 중에 생성한 {{PLURAL:$2|보안 키}} ($1)를 설치하는 동안 완전히 안전하지 {{PLURAL:$2|않습니다}}. 직접 바꾸기를 고려하세요.",
 	'config-install-sysop' => '관리자 사용자 계정을 만드는 중',
 	'config-install-subscribe-fail' => '미디어위키 발표를 구독할 수 없습니다: $1',
 	'config-install-subscribe-notpossible' => 'cURL이 설치되지 않았고 allow_url_fopen를 사용할 수 없습니다.',
@@ -10785,9 +10967,9 @@ GFDL은 유효한 라이선스이지만 이는 이해하기 어렵습니다.
 미디어위키가 성공적으로 설치되었습니다.
 
 설치 마법사가 <code>LocalSettings.php</code> 파일을 만들었습니다.
-이는 모든 설정이 포함되어 있습니다.
+모든 설정이 포함되어 있습니다.
 
-이를 다운로드하여 위키 설치의 거점에 넣어야 합니다 (index.php와 같은 디렉토리). 다운로드가 자동으로 시작됩니다.
+파일을 다운로드하여 위키 설치의 거점에 넣어야 합니다. (index.php와 같은 디렉토리) 다운로드가 자동으로 시작됩니다.
 
 다운로드가 제공되지 않을 경우나 그것을 취소한 경우에는 아래의 링크를 클릭하여 다운로드를 다시 시작할 수 있습니다:
 
@@ -10798,7 +10980,7 @@ $3
 완료되었으면 '''[$2 위키에 들어갈 수 있습니다]'''.",
 	'config-download-localsettings' => 'LocalSettings.php 다운로드',
 	'config-help' => '도움말',
-	'config-nofile' => '파일 "$1"(을)를 찾을 수 없습니다. 이미 삭제되었나요?',
+	'config-nofile' => '"$1" 파일을 찾을 수 없습니다. 이미 삭제되었나요?',
 	'mainpagetext' => "'''미디어위키가 성공적으로 설치되었습니다.'''",
 	'mainpagedocfooter' => '[//meta.wikimedia.org/wiki/Help:Contents 이곳]에서 위키 프로그램에 대한 정보를 얻을 수 있습니다.
 
@@ -10809,7 +10991,7 @@ $3
 * [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce 미디어위키 발표 메일링 리스트]',
 );
 
-/** Karachay-Balkar (Къарачай-Малкъар)
+/** Karachay-Balkar (къарачай-малкъар)
  * @author Iltever
  */
 $messages['krc'] = array(
@@ -10858,13 +11040,13 @@ Dat kanns De verlängere, endämm dat De de <code lang="en">session.gc_maxlifeti
 Don dat Projramm för et Opsäze norr_ens aanschmiiße.',
 	'config-no-session' => 'De Daate för Ding Setzung sinn verschött jejange.
 Donn en dä Dattei <code>php.ini</code> nohloore, ov dä <code lang="en">session.save_path</code> op e zopaß Verzeijschneß zeisch.',
-	'config-your-language' => 'Ding Shprooch:',
+	'config-your-language' => 'Ding Schprooch:',
 	'config-your-language-help' => 'Donn heh di Shprooch ußsöhke, di dat Enshtallzjuhnsprojramm kalle sull.',
 	'config-wiki-language' => 'Dem Wiki sing Shprooch:',
 	'config-wiki-language-help' => 'Donn heh di Shprooch ußsöhke, di et Wiki shtandattmääßesch kalle sull.',
 	'config-back' => '← Retuur',
 	'config-continue' => 'Wigger →',
-	'config-page-language' => 'Shprooch',
+	'config-page-language' => 'Schprooch',
 	'config-page-welcome' => 'Wellkumme beim MediaWiki!',
 	'config-page-dbconnect' => 'Met dä Daatebangk Verbenge',
 	'config-page-upgrade' => 'En Inshtallzjuhn op der neuste Shtand bränge',
@@ -11383,7 +11565,7 @@ Dat es och all op Änglesch:
 * [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce MediaWiki release mailing list]',
 );
 
-/** Kurdish (Latin script) (‪Kurdî (latînî)‬)
+/** Kurdish (Latin script) (Kurdî (latînî)‎)
  * @author George Animal
  */
 $messages['ku-latn'] = array(
@@ -11394,6 +11576,7 @@ $messages['ku-latn'] = array(
 	'config-page-options' => 'Vebijêrk',
 	'config-ns-generic' => 'Proje',
 	'config-install-step-done' => 'çêbû',
+	'config-help' => 'alîkarî',
 	'mainpagetext' => "'''MediaWiki serketî hate çêkirin.'''",
 	'mainpagedocfooter' => 'Alîkarî ji bo bikaranîn û guherandin yê datayê Wîkî tu di bin [//meta.wikimedia.org/wiki/Help:Contents pirtûka alîkarîyê ji bikarhêneran] da dikarê bibînê.
 
@@ -11429,6 +11612,9 @@ $messages['lb'] = array(
 Dir fannt en am LocalSettings.php.",
 	'config-localsettings-key' => 'Aktualisatiounsschlëssel:',
 	'config-localsettings-badkey' => 'De Schlëssel deen Dir aginn hutt ass net korrekt',
+	'config-localsettings-incomplete' => 'De Fichier LocalSettings.php schéngt net komplett ze sinn.
+D\'Variabel $1 ass net definéiert.
+Ännert w.e.g. de Fichier LocalSettings.php esou datt déi Variabel definéiert ass a klickt op "Virufueren".',
 	'config-session-error' => 'Feeler beim Starte vun der Sessioun: $1',
 	'config-no-session' => "D'Donnéeë vun ärer Sessioun si verluergaangen!
 Kuckt Är php.ini no a vergewëssert Iech datt <code>session.save_path</code>  op adequate REpertoire agestallt ass.",
@@ -11529,6 +11715,7 @@ Wann et de Kont net gëtt, a wann den Installatiouns-Kont genuch Rechter huet, g
 	'config-header-ibm_db2' => 'IBM DB2-Astellungen',
 	'config-invalid-db-type' => 'Net valabelen Datebank-Typ',
 	'config-missing-db-name' => 'Dir musst en Numm fir de Wäert "Numm vun der Datebank" uginn',
+	'config-missing-db-host' => 'Dir musst e Wäert fir "Database host" uginn',
 	'config-missing-db-server-oracle' => 'Dir musst e Wäert fir "Datebank-TNS" uginn',
 	'config-db-sys-user-exists-oracle' => 'De Benotzerkont "$1" gëtt et schonn. SYSDBA kann nëmme benotzt gi fir en neie Benotzerkont opzemaachen.',
 	'config-postgres-old' => 'PostgreSQL $1 oder eng méi nei Versioun gëtt gebraucht, Dir hutt $2.',
@@ -11615,6 +11802,7 @@ Dir kënnt elo déi Astellungen déi nach iwwreg sinn iwwersprangen an d'Wiki el
 	'config-install-stats' => 'Initialisatioun vun de Statistiken',
 	'config-install-keys' => 'Generéiere vum Geheimschlëssel',
 	'config-install-sysop' => 'Administrateur Benotzerkont gëtt ugeluecht',
+	'config-install-extension-tables' => "D'Tabelle fir déi aktivéiert Erweiderunge ginn ugeluecht",
 	'config-install-mainpage-failed' => "D'Haaptsäit konnt net dragesat ginn: $1",
 	'config-download-localsettings' => 'LocalSettings.php eroflueden',
 	'config-help' => 'Hëllef',
@@ -11628,7 +11816,8 @@ Dir kënnt elo déi Astellungen déi nach iwwreg sinn iwwersprangen an d'Wiki el
 * [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce Mailinglëscht vun neie MediaWiki-Versiounen]",
 );
 
-/** Lingua Franca Nova (Lingua Franca Nova) */
+/** Lingua Franca Nova (Lingua Franca Nova)
+ */
 $messages['lfn'] = array(
 	'mainpagetext' => "'''MediaWiki es aora instalada.'''",
 	'mainpagedocfooter' => 'Atenda la [//meta.wikimedia.org/wiki/Help:Contents Gida per Usores] per informa supra la usa de la programa de vici.
@@ -11653,7 +11842,8 @@ $messages['lg'] = array(
 * [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce Wewandise ofunenga amawulire aga email ag'ebifa ku MediaWiki]",
 );
 
-/** Limburgish (Limburgs) */
+/** Limburgish (Limburgs)
+ */
 $messages['li'] = array(
 	'mainpagetext' => "'''MediaWiki software succesvol geïnsjtalleerd.'''",
 	'mainpagedocfooter' => "Raodpleeg de [//meta.wikimedia.org/wiki/NL_Help:Inhoudsopgave handjleiding] veur informatie euver 't gebroek van de wikisoftware.
@@ -11665,12 +11855,14 @@ $messages['li'] = array(
 * [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce MediaWiki mailinglies veur nuuj versies]",
 );
 
-/** Lao (ລາວ) */
+/** Lao (ລາວ)
+ */
 $messages['lo'] = array(
 	'mainpagetext' => "'''ຕິດຕັ້ງມີເດຍວິກິນີ້ສຳເລັດແລ້ວ.'''",
 );
 
-/** Lithuanian (lietuvių) */
+/** Lithuanian (lietuvių)
+ */
 $messages['lt'] = array(
 	'mainpagetext' => "'''MediaWiki sėkmingai įdiegta.'''",
 	'mainpagedocfooter' => 'Informacijos apie wiki programinės įrangos naudojimą, ieškokite [//meta.wikimedia.org/wiki/Help:Contents žinyne].
@@ -11709,7 +11901,8 @@ $messages['lv'] = array(
 * [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce Parakstīties uz paziņojumiem par jaunām MediaWiki versijām]',
 );
 
-/** Literary Chinese (文言) */
+/** Literary Chinese (文言)
+ */
 $messages['lzh'] = array(
 	'mainpagetext' => "'''共筆臺已立'''",
 	'mainpagedocfooter' => "欲識維基，見[//meta.wikimedia.org/wiki/Help:Contents User's Guide]
@@ -11747,7 +11940,8 @@ $messages['mai'] = array(
 * [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce MediaWiki release mailing list]",
 );
 
-/** Moksha (Мокшень) */
+/** Moksha (мокшень)
+ */
 $messages['mdf'] = array(
 	'mainpagetext' => "'''МедиаВикить арафтозь лац.'''",
 	'mainpagedocfooter' => 'Ванк [//meta.wikimedia.org/wiki/Help:Contents Ветямовал Тиинди] тяса ули кода содамс Вики програпнень эрявикснень колга.
@@ -11817,7 +12011,8 @@ $messages['mg'] = array(
 * [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce Resaka momba ny fizaràn'ny MediaWiki]",
 );
 
-/** Eastern Mari (Олык Марий) */
+/** Eastern Mari (олык марий)
+ */
 $messages['mhr'] = array(
 	'mainpagetext' => "'''MediaWiki сай шындыме.'''",
 );
@@ -12393,7 +12588,7 @@ $messages['ml'] = array(
 	'config-information' => 'വിവരങ്ങൾ',
 	'config-localsettings-upgrade' => "'''അറിയിപ്പ്''': ഒരു <code>LocalSettings.php</code> ഫയൽ കാണുന്നു.
 സോഫ്റ്റ്‌വേർ അപ്‌ഗ്രേഡ് ചെയ്യുക സാദ്ധ്യമാണ്.
-ദയവായി പെട്ടിയിൽ <code>\$wgUpgradeKey</code> എന്നതിന്റെ വില നൽകുക.",
+ദയവായി പെട്ടിയിൽ <code>\$wgUpgradeKey</code> എന്നതിന്റെ വില നൽകുക.", # Fuzzy
 	'config-localsettings-key' => 'അപ്‌ഗ്രേഡ് ചാവി:',
 	'config-localsettings-badkey' => 'താങ്കൾ നൽകിയ ചാവി തെറ്റാണ്',
 	'config-session-error' => 'സെഷൻ തുടങ്ങുന്നതിൽ പിഴവ്: $1',
@@ -12422,9 +12617,9 @@ $messages['ml'] = array(
 	'config-sidebar' => '* [//www.mediawiki.org മീഡിയവിക്കി പ്രധാനതാൾ]
 * [//www.mediawiki.org/wiki/Help:Contents ഉപയോക്തൃസഹായി]
 * [//www.mediawiki.org/wiki/Manual:Contents കാര്യനിർവഹണസഹായി]
-* [//www.mediawiki.org/wiki/Manual:FAQ പതിവുചോദ്യങ്ങൾ]',
+* [//www.mediawiki.org/wiki/Manual:FAQ പതിവുചോദ്യങ്ങൾ]', # Fuzzy
 	'config-env-php' => 'പി.എച്ച്.പി. $1 ഇൻസ്റ്റോൾ ചെയ്തിട്ടുണ്ട്.',
-	'config-no-db' => 'അനുയോജ്യമായ ഡേറ്റാബേസ് ഡ്രൈവർ കണ്ടെത്താനായില്ല!',
+	'config-no-db' => 'അനുയോജ്യമായ ഡേറ്റാബേസ് ഡ്രൈവർ കണ്ടെത്താനായില്ല!', # Fuzzy
 	'config-memory-raised' => 'പി.എച്ച്.പി.യുടെ <code>memory_limit</code> $1 ആണ്, $2 ആയി ഉയർത്തിയിരിക്കുന്നു.',
 	'config-memory-bad' => "'''മുന്നറിയിപ്പ്:''' പി.എച്ച്.പി.യുടെ <code>memory_limit</code> $1 ആണ്.
 ഇത് മിക്കവാറും വളരെ കുറവാണ്.
@@ -12506,7 +12701,7 @@ $1
 	'config-logo-help' => 'മീഡിയവിക്കിയിൽ സ്വതേയുള്ള ദൃശ്യരൂപത്തിൽ 135x160 പിക്സലുള്ള ലോഗോ മുകളിൽ ഇടത് മൂലയിൽ കാണാം.
 അനുയോജ്യമായ വലിപ്പമുള്ള ഒരു ചിത്രം അപ്‌ലോഡ് ചെയ്തിട്ട്, അതിന്റെ യൂ.ആർ.എൽ. ഇവിടെ നൽകുക.
 
-താങ്കൾക്ക് ലോഗോ ആവശ്യമില്ലെങ്കിൽ, ഈ പെട്ടി ശൂന്യമായിടുക.',
+താങ്കൾക്ക് ലോഗോ ആവശ്യമില്ലെങ്കിൽ, ഈ പെട്ടി ശൂന്യമായിടുക.', # Fuzzy
 	'config-cc-again' => 'ഒന്നുകൂടി എടുക്കൂ...',
 	'config-advanced-settings' => 'വിപുലീകൃത ക്രമീകരണങ്ങൾ',
 	'config-extensions' => 'അനുബന്ധങ്ങൾ',
@@ -12553,7 +12748,8 @@ $messages['mn'] = array(
 * [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce МедиаВикигийн мэдээний мэйл явуулах жагсаалт]',
 );
 
-/** Marathi (मराठी) */
+/** Marathi (मराठी)
+ */
 $messages['mr'] = array(
 	'mainpagetext' => "'''मीडियाविकीचे इन्स्टॉलेशन पूर्ण.'''",
 	'mainpagedocfooter' => 'विकी सॉफ्टवेअर वापरण्याकरिता [//meta.wikimedia.org/wiki/Help:Contents यूजर गाईड] पहा.
@@ -12656,7 +12852,7 @@ $messages['my'] = array(
 	'mainpagetext' => "'''မီဒီယာဝီကီကို အောင်မြင်စွာ သွင်းပြီးပါပြီ။'''",
 );
 
-/** Erzya (Эрзянь)
+/** Erzya (эрзянь)
  * @author Botuzhaleny-sodamo
  */
 $messages['myv'] = array(
@@ -12678,7 +12874,8 @@ $messages['mzn'] = array(
 	'config-help' => 'راهنما',
 );
 
-/** Nahuatl (Nāhuatl) */
+/** Nahuatl (Nāhuatl)
+ */
 $messages['nah'] = array(
 	'mainpagetext' => "'''MediaHuiqui cualli ōmotlahtlāli.'''",
 );
@@ -12696,7 +12893,7 @@ $messages['nan'] = array(
 * [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce MediaWiki的公布列單]',
 );
 
-/** Norwegian Bokmål (‪norsk (bokmål)‬)
+/** Norwegian Bokmål (norsk (bokmål)‎)
  * @author Event
  * @author Nghtwlkr
  */
@@ -12741,7 +12938,7 @@ Sjekk din php.ini og sørg for at <code>session.save_path</code> er satt til en
 	'config-page-dbsettings' => 'Databaseinnstillinger',
 	'config-page-name' => 'Navn',
 	'config-page-options' => 'Valg',
-	'config-page-install' => 'Innstaller',
+	'config-page-install' => 'Installer',
 	'config-page-complete' => 'Ferdig!',
 	'config-page-restart' => 'Start installasjonen på nytt',
 	'config-page-readme' => 'Les meg',
@@ -13090,7 +13287,7 @@ Mer komplekse konfigurasjoner av brukerrettigheter er tilgjengelig etter install
 	'config-license-cc-by-sa' => 'Creative Commons Navngivelse Del på samme vilkår',
 	'config-license-cc-by' => 'Creative Commons Attribution',
 	'config-license-cc-by-nc-sa' => 'Creative Commons Navngivelse Ikke-kommersiell Del på samme vilkår',
-	'config-license-cc-0' => 'Creative Commons Zero',
+	'config-license-cc-0' => 'Creative Commons Zero', # Fuzzy
 	'config-license-pd' => 'Offentlig rom',
 	'config-license-cc-choose' => 'Velg en egendefinert Creative Commons-lisens',
 	'config-email-settings' => 'E-postinnstillinger',
@@ -13125,7 +13322,7 @@ Ideelt burde ikke denne være tilgjengelig for nettet.',
 	'config-logo-help' => 'MediaWikis standarddrakt inkluderer plass til en 135x160 pikslers logo i øvre venstre hjørne.
 Last opp et bilde i passende størrelse og skriv inn nettadressen her.
 
-Hvis du ikke ønsker en logo, la denne boksen være tom.',
+Hvis du ikke ønsker en logo, la denne boksen være tom.', # Fuzzy
 	'config-instantcommons' => 'Aktiver Instant Commons',
 	'config-instantcommons-help' => '[//www.mediawiki.org/wiki/InstantCommons Instant Commons] er en funksjon som gjør det mulig for wikier å bruke bilder, lyder og andre media funnet på nettstedet [//commons.wikimedia.org/ Wikimedia Commons].
 For å gjøre dette krever MediaWiki tilgang til internett.
@@ -13157,7 +13354,8 @@ For mer informasjon om denne funksjonen, inklusive instruksjoner om hvordan man
 *[https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce MediaWiki e-postliste]',
 );
 
-/** Low German (Plattdüütsch) */
+/** Low German (Plattdüütsch)
+ */
 $messages['nds'] = array(
 	'mainpagetext' => "'''De MediaWiki-Software is mit Spood installeert worrn.'''",
 	'mainpagedocfooter' => 'Kiek de [//meta.wikimedia.org/wiki/MediaWiki_localisation Dokumentatschoon för dat Anpassen vun de Brukerböversiet]
@@ -13752,7 +13950,7 @@ Na het plaatsen van het bestand met instellingen kunt u '''[$2 uw wiki betreden]
 * [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce Mailinglijst voor aankondigingen van nieuwe versies]',
 );
 
-/** Norwegian Nynorsk (‪norsk (nynorsk)‬)
+/** Norwegian Nynorsk (norsk (nynorsk)‎)
  * @author Harald Khan
  * @author Nghtwlkr
  */
@@ -13785,9 +13983,9 @@ Installasjonen kan mislukkast!",
 	'config-header-oracle' => 'Oracle-innstillingar',
 	'config-invalid-db-type' => 'Ugyldig databasetype',
 	'config-invalid-db-name' => 'Ugyldig databasenamn «$1».
-Berre bruk ASCII-bokstavar (a-z, A-Z), tal (0-9) og undestrekar (_).',
+Berre bruk ASCII-bokstavar (a-z, A-Z), tal (0-9) og undestrekar (_).', # Fuzzy
 	'config-invalid-db-prefix' => 'Ugyldig databaseprefiks «$1».
-Berre bruk ASCII-bokstavar (a-z, A-Z), tal (0-9) og undestrekar (_).',
+Berre bruk ASCII-bokstavar (a-z, A-Z), tal (0-9) og undestrekar (_).', # Fuzzy
 	'config-invalid-schema' => 'Ugyldig skjema for MediaWiki «$1».
 Berre bruk ASCII-bokstavar (a-z, A-Z), tal (0-9) og undestrekar (_).',
 	'config-postgres-old' => 'PostgreSQL $1 eller seinare krevst, du har $2.',
@@ -13807,7 +14005,8 @@ $messages['no'] = array(
 	'mainpagetext' => "'''MediaWiki-programvaren er nå installert.'''",
 );
 
-/** Occitan (occitan) */
+/** Occitan (occitan)
+ */
 $messages['oc'] = array(
 	'mainpagetext' => "'''MediaWiki es estat installat amb succès.'''",
 	'mainpagedocfooter' => "Consultatz lo [//meta.wikimedia.org/wiki/Ajuda:Contengut Guida de l'utilizaire] per mai d'entresenhas sus l'utilizacion d'aqueste logicial.
@@ -13839,12 +14038,14 @@ $messages['os'] = array(
 	'mainpagetext' => "'''Вики-скрипт «MediaWiki» æнтыстджынæй æвæрд æрцыд.'''",
 );
 
-/** Punjabi (ਪੰਜਾਬੀ) */
+/** Punjabi (ਪੰਜਾਬੀ)
+ */
 $messages['pa'] = array(
 	'mainpagetext' => "'''ਮੀਡਿਆਵਿਕਿ ਠੀਕ ਤਰ੍ਹਾਂ ਇੰਸਟਾਲ ਹੋ ਗਿਆ ਹੈ।'''",
 );
 
-/** Pampanga (Kapampangan) */
+/** Pampanga (Kapampangan)
+ */
 $messages['pam'] = array(
 	'mainpagetext' => "'''Melaus ing pamipalyari ning MediaWiki.'''",
 	'mainpagedocfooter' => "Basan me ing [//meta.wikimedia.org/wiki/Help:Contents User's Guide] para king impormasiun keng pamangamit ning wiki software.
@@ -13855,7 +14056,8 @@ $messages['pam'] = array(
 * [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce MediaWiki release mailing list]",
 );
 
-/** Picard (Picard) */
+/** Picard (Picard)
+ */
 $messages['pcd'] = array(
 	'mainpagetext' => "'''MediaWiki o té instalé aveuc victoère.'''",
 );
@@ -14501,7 +14703,7 @@ It peule pa instalé MediaWiki.",
 S'a gestiss un sit a àut tràfich, a dovrìa lese cheicòs an sla [//www.mediawiki.org/wiki/Unicode_normalization_considerations normalisassion Unicode].",
 	'config-unicode-update-warning' => "'''Avis:''' La version instalà dlë spassiador ëd normalisassion Unicode a deuvra na version veja ëd la librarìa dël [http://site.icu-project.org/ proget ICU].
 A dovrìa fé n'[//www.mediawiki.org/wiki/Unicode_normalization_considerations agiornament] s'a l'é anteressà a dovré Unicode.",
-	'config-no-db' => 'Impossìbil tové un pilòta ëd base ëd dàit bon!',
+	'config-no-db' => 'Impossìbil tové un pilòta ëd base ëd dàit bon!', # Fuzzy
 	'config-no-fts3' => "'''Avis''': SQLite a l'é compilà sensa ël mòdul [//sqlite.org/fts3.html FTS3], le funsion d'arserca a saran pa disponìbij su cost motor.",
 	'config-register-globals' => "'''Avis: L'opsion <code>[http://php.net/register_globals register_globals]</code> ëd PHP a l'é abilità.'''
 '''Ch'a la disabìlita s'a peul.'''
@@ -14550,7 +14752,7 @@ Bele che MediaWiki a contròla j'aspet ëd sicurëssa ëd tùit j'archivi carià
 
 S'a deuvra n'ospitalità partagià, sò fornidor d'ospitalità a dovrìa deje ël nòm dl'ospitant giust ant soa documentassion.
 
-Se a anstala su un servent Windows e a deuvra MySQL, dovré \"localhost\" a podrìa funsioné nen com nòm dël servent. S'a marcia nen, ch'a preuva \"127.0.0.1\" com adrëssa IP local.",
+Se a anstala su un servent Windows e a deuvra MySQL, dovré \"localhost\" a podrìa funsioné nen com nòm dël servent. S'a marcia nen, ch'a preuva \"127.0.0.1\" com adrëssa IP local.", # Fuzzy
 	'config-db-host-oracle' => 'TNS dla base ëd dàit:',
 	'config-db-host-oracle-help' => "Anserì un [http://download.oracle.com/docs/cd/B28359_01/network.111/b28317/tnsnames.htm nòm ëd conession local] bon; n'archivi tnsnames.ora a dev esse visìbil da costa anstalassion..<br />S'a deuvra le librarìe cliente 10g o pi neuve a peul ëdcò dovré ël métod ëd nominassion [http://download.oracle.com/docs/cd/E11882_01/network.112/e10836/naming.htm Easy Connect].",
 	'config-db-wiki-settings' => 'Identìfica sta wiki',
@@ -14558,7 +14760,7 @@ Se a anstala su un servent Windows e a deuvra MySQL, dovré \"localhost\" a podr
 	'config-db-name-help' => "Ch'a serna un nòm ch'a identìfica soa wiki.
 A dovrìa conten-e gnun ëspassi o tratin.
 
-S'a deuvra n'ospitalità partagià, sò fornidor ëd l'ospitalità a-j darà un nòm ëd base ëd dàit specìfich da dovré, o a lassrà ch'a lo crea via un panel ëd contròl.",
+S'a deuvra n'ospitalità partagià, sò fornidor ëd l'ospitalità a-j darà un nòm ëd base ëd dàit specìfich da dovré, o a lassrà ch'a lo crea via un panel ëd contròl.", # Fuzzy
 	'config-db-name-oracle' => 'Schema dla base ëd dàit:',
 	'config-db-install-account' => "Cont d'utent për l'instalassion.",
 	'config-db-username' => "Nòm d'utent dla base ëd dàit:",
@@ -14572,7 +14774,7 @@ S'ël cont a esist pa, e ël cont d'instalassion a l'ha ij privilegi ch'a-i van,
 	'config-db-prefix-help' => "S'a l'ha dabzògn ëd partagé na base ëd dàit an tra vàire wiki, o tra MediaWiki e n'àutra aplicassion dl'aragnà, a peul serne ëd gionté un prefiss a tùit ij nòm ëd le tàule për evité ëd conflit.
 Ch'a deuvra ni dë spassi ni ëd tratin.
 
-Cost camp a l'é lassà normalment veuid.",
+Cost camp a l'é lassà normalment veuid.", # Fuzzy
 	'config-db-charset' => 'Ansema dij caràter dla base ëd dàit',
 	'config-charset-mysql5-binary' => 'MySQL 4.1/5.0 binari',
 	'config-charset-mysql5' => 'MySQL 4.1/5.0 UTF-8',
@@ -14586,7 +14788,7 @@ An '''manera UTF-8''', MySQL a arconòss an che ansema ëd caràter a son ij sò
 	'config-db-port' => 'Porta dla base ëd dàit:',
 	'config-db-schema' => 'Schema për MediaWiki',
 	'config-db-schema-help' => "Jë schema sì-dzora a son normalment giust.
-Ch'a-j cangia mach s'a sa ch'a n'ha da manca.",
+Ch'a-j cangia mach s'a sa ch'a n'ha da manca.", # Fuzzy
 	'config-sqlite-dir' => 'Dossié dij dat SQLite:',
 	'config-sqlite-dir-help' => "SQLite a memorisa tùit ij dat ant n'archivi ùnich.
 
@@ -14606,7 +14808,7 @@ $1
 
 S'a vëd pa listà sì-sota ël sistema ëd base ëd dàit ch'a preuva a dovré, antlora va andaré a j'istrussion dl'anliura sì-dzora për abilité ël manteniment.",
 	'config-support-mysql' => "* $1 e l'é l'obietiv primari për MediaWiki e a l'é mej mantnù ([http://www.php.net/manual/en/mysql.installation.php com compilé PHP con ël manteniment MySQL])",
-	'config-support-postgres' => "* $1 e l'é un sistema ëd base ëd dàit popolar a sorgiss duverta com alternativa a MySQL ([http://www.php.net/manual/en/pgsql.installation.php com compilé PHP con ël manteniment ëd PostgreSQL])",
+	'config-support-postgres' => "* $1 e l'é un sistema ëd base ëd dàit popolar a sorgiss duverta com alternativa a MySQL ([http://www.php.net/manual/en/pgsql.installation.php com compilé PHP con ël manteniment ëd PostgreSQL])", # Fuzzy
 	'config-support-sqlite' => "* $1 e l'é un sistema ëd base ëd dàit leger che a l'é motobin bin mantnù ([http://www.php.net/manual/en/pdo.installation.php com compilé PHP con ël manteniment ëd SQLite], a deuvra PDO)",
 	'config-support-oracle' => "* $1 a l'é na base ëd dàit comersial për j'amprèise. ([http://www.php.net/manual/en/oci8.installation.php Com compilé PHP con ël manteniment OCI8])",
 	'config-header-mysql' => 'Ampostassion MySQL',
@@ -14619,9 +14821,9 @@ S'a vëd pa listà sì-sota ël sistema ëd base ëd dàit ch'a preuva a dovré,
 	'config-invalid-db-server-oracle' => 'TNS ëd la base ëd dat pa bon "$1".
 Dovré mach dle litre ASCII (a-z, A-Z), nùmer (0-9), sotlignadure (_) e pontin (.).',
 	'config-invalid-db-name' => 'Nòm ëd la base ëd dàit pa bon "$1".
-Dovré mach litre ASCII (a-z, A-Z), nùmer (0-9) e sotlignadure (_).',
+Dovré mach litre ASCII (a-z, A-Z), nùmer (0-9) e sotlignadure (_).', # Fuzzy
 	'config-invalid-db-prefix' => 'Prefiss dla base ëd dàit pa bon "$1".
-Dovré mach litre ASCII (a-z, A-Z), nùmer (0-9) e sotlignadure (_).',
+Dovré mach litre ASCII (a-z, A-Z), nùmer (0-9) e sotlignadure (_).', # Fuzzy
 	'config-connection-error' => "$1.
 
 Controla l'ospitant, lë stranòm d'utent e la ciav sì-sota e prové torna.",
@@ -14715,7 +14917,7 @@ Specìfica un nòm utent diferent.',
 	'config-admin-password-same' => "La ciav a dev nen esse l'istessa ëd lë stranòm d'utent.",
 	'config-admin-password-mismatch' => "Le doe ciav che a l'ha scrivù a son diferente antra 'd lor.",
 	'config-admin-email' => 'Adrëssa ëd pòsta eletrònica:',
-	'config-admin-email-help' => "Ch'a anserissa ambelessì n'adrëssa ëd pòsta eletrònica për përmëtt-je d'arsèive ëd mëssagi da d'àutri utent an sla wiki, riamposté soa ciav, e esse anformà ëd camgiament a le pàgine ch'a ten sot-euj.",
+	'config-admin-email-help' => "Ch'a anserissa ambelessì n'adrëssa ëd pòsta eletrònica për përmëtt-je d'arsèive ëd mëssagi da d'àutri utent an sla wiki, riamposté soa ciav, e esse anformà ëd camgiament a le pàgine ch'a ten sot-euj.", # Fuzzy
 	'config-admin-error-user' => 'Eror antern an creand n\'aministrator con lë stranòm "<nowiki>$1</nowiki>".',
 	'config-admin-error-password' => 'Eror antern an ampostand na ciav për l\'admin "<nowiki>$1</nowiki>": <pre>$2</pre>',
 	'config-subscribe' => "Ch'a sot-scriva la [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce lista ëd discussion ëd j'anonsi ëd publicassion].",
@@ -14755,7 +14957,7 @@ A l'é generalment nen necessari për na wiki privà o d'asienda.
 S'a veul podèj dovré dij test da Wikipedia, e a veul che Wikipedia a aceta dij test copià da soa wiki, a dovrìa serne '''Creative Commons Attribution Share Alike'''.
 
 La GNU Free Documentation License a l'era la veja licensa dont sota a-i era Wikipedia.
-A l'é anco' na licensa bon-a, an tùit ij cas, sta licensa a l'ha chèich funsion ch'a rendo difìcij l'utilisassion e l'antërpretassion.",
+A l'é anco' na licensa bon-a, an tùit ij cas, sta licensa a l'ha chèich funsion ch'a rendo difìcij l'utilisassion e l'antërpretassion.", # Fuzzy
 	'config-email-settings' => 'Ampostassion ëd pòsta eletrònica',
 	'config-enable-email' => 'Abilité ij mëssagi ëd pòsta eletrònica an surtìa',
 	'config-enable-email-help' => "S'a veul che la pòsta eletrònica a marcia, j'[http://www.php.net/manual/en/mail.configuration.php ampostassion ëd pòsta eletrònica PHP] a devo esse configurà për da bin.
@@ -14788,7 +14990,7 @@ Idealment, sòn a dovrìa pa esse acessìbil an sl'aragnà.",
 	'config-logo-help' => "La pel dë stàndard ëd MediaWiki a comprend lë spassi për na marca ëd 135x160 pontin ant ël canton an àut a snista.
 Ch'a dëscaria na figura ëd la dimension aproprià, e ch'a anserissa l'anliura ambelessì.
 
-S'a veul gnun-e marche, ch'a lassa ës camp bianch.",
+S'a veul gnun-e marche, ch'a lassa ës camp bianch.", # Fuzzy
 	'config-instantcommons' => 'Abìlita Instant Commons',
 	'config-instantcommons-help' => "[//www.mediawiki.org/wiki/InstantCommons Instant Commons] a l'é na funsion ch'a përmët a le wiki ëd dovré dle figure, dij son e d'àutri mojen trovà an sël sit [//commons.wikimedia.org/ Wikimedia Commons].
 Për dovré sossì, MediaWiki a l'ha da manca dl'acess a la ragnà.
@@ -14807,7 +15009,7 @@ Ij sit da mesan a gròss a son motobin ancoragià a abilité sòn, e ij sit cit
 	'config-cache-memcached' => "Dovré Memcached (a ciama n'ampostassion e na configurassion adissionaj)",
 	'config-memcached-servers' => 'Servent Memcached:',
 	'config-memcached-help' => "Lista d'adrësse IP da dovré për Memcached.
-A dovrìa esse separà con dle vìrgole e specifiché la pòrta da dovré (për esempi: 127.0.0.1:11211, 192.168.1.25:11211).",
+A dovrìa esse separà con dle vìrgole e specifiché la pòrta da dovré (për esempi: 127.0.0.1:11211, 192.168.1.25:11211).", # Fuzzy
 	'config-extensions' => 'Estension',
 	'config-extensions-help' => "J'estension listà dì-sota a son ëstàite trovà ant sò dossié <code>./extensions</code>.
 
@@ -14830,7 +15032,7 @@ Sauté la creassion.",
 	'config-install-interwiki-list' => "As peul pa trovesse l'archivi <code>interwiki.list</code>.",
 	'config-install-interwiki-exists' => "'''Avis''': La tàula interwiki a smija ch'a l'abia già dj'element.
 Për stàndard, la lista a sarà sautà.",
-	'config-install-keys' => 'Generassion ëd la ciav segreta',
+	'config-install-keys' => 'Generassion ëd la ciav segreta', # Fuzzy
 	'config-install-sysop' => "Creassion dël cont ëd l'utent aministrator",
 	'config-install-done' => "'''Congratulassion!'''
 A l'ha instalà për da bin mediaWiki.
@@ -14841,7 +15043,7 @@ A conten tuta soa configurassion.
 A dovrà [$1 dëscarielo] e butelo ant la bas ëd l'instalassion ëd soa wiki (ël midem dossié d'index.php).
 '''Nòta''': S'a lo fa nen adess, cost archivi ëd configurassion generà a sarà pa disponìbil për chiel pi tard s'a chita l'instalassion sensa dëscarielo.
 
-Quand che a l'é stàit fàit, a peul '''[$2 intré an soa wiki]'''.",
+Quand che a l'é stàit fàit, a peul '''[$2 intré an soa wiki]'''.", # Fuzzy
 	'config-help' => 'agiut',
 	'mainpagetext' => "'''MediaWiki a l'é staita anstalà a la përfession.'''",
 	'mainpagedocfooter' => "Che a varda la [//meta.wikimedia.org/wiki/Help:Contents User's Guide] për avèj dj'anformassion ant sël coma dovré ël programa dla wiki.
@@ -14909,8 +15111,11 @@ $messages['ps'] = array(
 	'config-admin-password-confirm' => 'پټنوم يو ځل بيا:',
 	'config-admin-email' => 'برېښليک پته:',
 	'config-profile-wiki' => 'دوديزه ويکي',
+	'config-license-pd' => 'ټولګړی شپول',
 	'config-email-settings' => 'د برېښليک امستنې',
 	'config-install-step-done' => 'ترسره شو',
+	'config-install-tables' => 'لښتيالونه جوړول',
+	'config-help' => 'لارښود',
 	'mainpagetext' => "'''MediaWiki په برياليتوب سره نصب شو.'''",
 	'mainpagedocfooter' => 'د ويکي ساوترې د کارولو د  مالوماتو په اړه [//meta.wikimedia.org/wiki/Help:Contents د کارن لارښود] سره سلا وکړۍ.
 
@@ -15019,6 +15224,7 @@ Devia [//www.mediawiki.org/wiki/Unicode_normalization_considerations actualizá-
 Se usa alojamento partilhado, peça ao fornecedor do alojamento para instalar um controlador apropriado.
 Se foi você quem compilou o PHP, reconfigure-o com um cliente de base de dados activado; por exemplo, usando <code>./configure --with-mysql</code>.
 Se instalou o PHP a partir de um pacote Debian ou Ubuntu, então precisa de instalar também o módulo php5-mysql.",
+	'config-outdated-sqlite' => "'''Aviso''': Tem a versão $1 do SQLite, que é anterior à versão mínima necessária, a $2. O SQLite não estará disponível.",
 	'config-no-fts3' => "'''Aviso''': O SQLite foi compilado sem o módulo [//sqlite.org/fts3.html FTS3]; as funcionalidades de pesquisa não estarão disponíveis nesta instalação.",
 	'config-register-globals' => "'''Aviso: A opção <code>[http://php.net/register_globals register_globals]</code> do PHP está activada.'''
 '''Desactive-a, se puder.'''
@@ -15048,11 +15254,14 @@ O MediaWiki necessita do suporte UTF-8 para funcionar correctamente.",
 	'config-memory-bad' => "'''Aviso:''' A configuração <code>memory_limit</code> do PHP é $1.
 Isto é provavelmente demasiado baixo.
 A instalação poderá falhar!",
+	'config-ctype' => "'''Fatal''': O PHP tem de ser compilado com suporte para a [http://www.php.net/manual/en/ctype.installation.php extensão Ctype].",
 	'config-xcache' => '[http://xcache.lighttpd.net/ XCache] instalada',
 	'config-apc' => '[http://www.php.net/apc APC] instalada',
 	'config-wincache' => '[http://www.iis.net/download/WinCacheForPhp WinCache] instalada',
-	'config-no-cache' => "'''Aviso:''' Não foram encontrados [http://www.php.net/apc APC], [http://xcache.lighttpd.net/ XCache] nem [http://www.iis.net/download/WinCacheForPhp WinCache].
+	'config-no-cache' => "'''Aviso:''' Não foi possível encontrar: [http://www.php.net/apc APC], [http://xcache.lighttpd.net/ XCache], nem [http://www.iis.net/download/WinCacheForPhp WinCache].
 A cache de objectos não será activada.",
+	'config-mod-security' => "'''Aviso''': O seu servidor de internet tem o [http://modsecurity.org/ mod_security] ativado. Se este estiver mal configurado, pode causar problemas ao MediaWiki ou a outros programas, permitindo que os utilizadores publiquem conteúdos arbitrários.
+Consulte a [http://modsecurity.org/documentation/ mod_security documentação] ou peça apoio ao fornecedor do alojamento do seu servidor se encontrar erros aleatórios.",
 	'config-diff3-bad' => 'O GNU diff3 não foi encontrado.',
 	'config-imagemagick' => 'Foi encontrado o ImageMagick: <code>$1</code>.
 Se possibilitar uploads, a miniaturização de imagens será activada.',
@@ -15067,7 +15276,7 @@ A instalação foi abortada.",
 	'config-using-uri' => 'Será usada a URL do servidor "<nowiki>$1$2</nowiki>".',
 	'config-uploads-not-safe' => "'''Aviso:''' O directório por omissão para uploads <code>$1</code>, está vulnerável à execução arbitrária de scripts.
 Embora o MediaWiki verifique a existência de ameaças de segurança em todos os ficheiros enviados, é altamente recomendado que [//www.mediawiki.org/wiki/Manual:Security#Upload_security vede esta vulnerabilidade de segurança] antes de possibilitar uploads.",
-	'config-no-cli-uploads-check' => "'''Aviso:''' Durante a instalação da CLI (\"Call Level Interface\", a Interface ao Nível da Chamada de Execução), o directório por omissão para uploads, <code>\$1</code>, não é verificado para determinar se é vulnerável à execução de código arbitrário.",
+	'config-no-cli-uploads-check' => "'''Aviso:''' O directório por omissão para uploads, <code>\$1</code>, não é verificado para determinar se é vulnerável à execução de código arbitrário durante a instalação por CLI (\"Command-line Interface\").",
 	'config-brokenlibxml' => 'O seu sistema tem uma combinação de versões de PHP e libxml2 conhecida por ser problemática, podendo causar corrupção de dados no MediaWiki e outras aplicações da internet.
 Actualize para o PHP versão 5.2.9 ou posterior e libxml2 versão 2.7.3 ou posterior ([//bugs.php.net/bug.php?id=45996 incidência reportada no PHP]).
 Instalação interrompida.',
@@ -15079,9 +15288,11 @@ Instalação interrompida.',
 	'config-db-host' => 'Servidor da base de dados:',
 	'config-db-host-help' => 'Se a base de dados estiver num servidor separado, introduza aqui o nome ou o endereço IP desse servidor.
 
-Se estiver a usar um servidor partilhado, o fornecedor do alojamento deve ter-lhe fornecido o nome do servidor na documentação.
+Se estiver a usar um servidor partilhado, o fornecedor do alojamento deve fornecer o nome do servidor na documentação.
 
-Se está a fazer a instalação num servidor Windows com MySQL, usar como nome do servidor "localhost" poderá não funcionar. Se não funcionar, tente usar "127.0.0.1" como endereço IP local.',
+Se está a fazer a instalação num servidor Windows com MySQL, usar como nome do servidor "localhost" poderá não funcionar. Se não funcionar, tente usar "127.0.0.1" como endereço IP local.
+
+Se estiver a usar PostgreSQL, deixe este campo em branco para fazer a ligação através de um socket Unix.',
 	'config-db-host-oracle' => 'TNS (Transparent Network Substrate) da base de dados:',
 	'config-db-host-oracle-help' => 'Introduza um [http://download.oracle.com/docs/cd/B28359_01/network.111/b28317/tnsnames.htm Nome Local de Ligação] válido; tem de estar visível para esta instalação um ficheiro tnsnames.ora.<br />Se está a usar bibliotecas cliente versão 10g ou posterior, também pode usar o método [http://download.oracle.com/docs/cd/E11882_01/network.112/e10836/naming.htm Ligação Fácil] de atribuição do nome.',
 	'config-db-wiki-settings' => 'Identifique esta wiki',
@@ -15456,6 +15667,7 @@ $3
 Depois de terminar o passo anterior, pode '''[$2 entrar na wiki]'''.",
 	'config-download-localsettings' => 'Download do LocalSettings.php',
 	'config-help' => 'ajuda',
+	'config-nofile' => 'Não foi possível encontrar o ficheiro "$1". Terá sido apagado?',
 	'mainpagetext' => "'''MediaWiki instalado com sucesso.'''",
 	'mainpagedocfooter' => 'Consulte o [//meta.wikimedia.org/wiki/Help:Contents Guia de Utilizadores] para informações sobre o uso do software wiki.
 
@@ -15486,7 +15698,7 @@ Esta instalação deverá ser atualizada através do <code>update.php</code>',
 	'config-upgrade-key-missing' => 'Foi detectada uma instalação existente do MediaWiki.
 Para atualizar esta instalação, por favor, coloque a seguinte linha na parte inferior do seu LocalSettings.php:
 
-$ 1',
+$ 1', # Fuzzy
 	'config-session-error' => 'Erro ao iniciar a sessão: $1',
 	'config-session-expired' => 'Os seus dados de sessão parecem ter expirado.
 As sessões estão configuradas para uma duração de $1.
@@ -15532,7 +15744,7 @@ Em conjunto com este programa você deve ter recebido <doclink href=Copying>uma
 	'config-sidebar' => '* [//www.mediawiki.org/wiki/MediaWiki/pt Página principal do MediaWiki]
 * [//www.mediawiki.org/wiki/Help:Contents/pt Ajuda]
 * [//www.mediawiki.org/wiki/Manual:Contents/pt Manual técnico]
-* [//www.mediawiki.org/wiki/Manual:FAQ FAQ]',
+* [//www.mediawiki.org/wiki/Manual:FAQ FAQ]', # Fuzzy
 	'config-env-good' => 'O ambiente foi verificado.
 Você pode instalar o MediaWiki.',
 	'config-env-bad' => 'O ambiente foi verificado.
@@ -15541,8 +15753,8 @@ Você não pode instalar o MediaWiki.',
 	'config-unicode-using-utf8' => 'A usar o utf8_normalize.so, de Brian Viper, para a normalização Unicode.',
 	'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' => "'''Aviso''': A [http://pecl.php.net/intl extensão intl PECL] não está disponível para efetuar a normalização Unicode.
-Se o seu site tem um alto volume de tráfego, devia informar-se um pouco sobre a [//www.mediawiki.org/wiki/Unicode_normalization_considerations normalização Unicode].",
-	'config-no-db' => 'Não foi possível encontrar um driver de banco de dados adequado!',
+Se o seu site tem um alto volume de tráfego, devia informar-se um pouco sobre a [//www.mediawiki.org/wiki/Unicode_normalization_considerations normalização Unicode].", # Fuzzy
+	'config-no-db' => 'Não foi possível encontrar um driver de banco de dados adequado!', # Fuzzy
 	'config-no-fts3' => "' ' 'Aviso' ' ': O SQLite foi compilado sem o módulo [//sqlite.org/fts3.html FTS3]; as funcionalidades de pesquisa não estarão disponíveis nesta instalação.",
 	'config-register-globals' => "' ' 'Aviso: A opção <code>[http://php.net/register_globals register_globals]</code> do PHP está ativada.'''
 ' ' 'Desative-a, se puder.'''
@@ -15550,7 +15762,7 @@ O MediaWiki funcionará mesmo assim, mas o seu servidor ficará exposto a potenc
 	'config-logo-help' => 'O tema padrão do MediaWiki inclui espaço para um logotipo de 135x160 pixels no canto superior esquerdo.
 Faça o upload de uma imagem com estas dimensões e introduza aqui a URL dessa imagem.
 
-Se você não pretende usar um logotipo, deixe este campo em branco.',
+Se você não pretende usar um logotipo, deixe este campo em branco.', # Fuzzy
 	'mainpagetext' => "'''MediaWiki instalado com sucesso.'''",
 	'mainpagedocfooter' => 'Consulte o [//meta.wikimedia.org/wiki/Help:Contents Manual de Usuário] para informações de como usar o software wiki.
 
@@ -15561,7 +15773,8 @@ Se você não pretende usar um logotipo, deixe este campo em branco.',
 * [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce Lista de discussão com avisos de novas versões do MediaWiki]',
 );
 
-/** Quechua (Runa Simi) */
+/** Quechua (Runa Simi)
+ */
 $messages['qu'] = array(
 	'mainpagetext' => "'''MediaWiki nisqa llamp'u kaqqa aypaylla takyachisqañam.'''",
 	'mainpagedocfooter' => "Wiki llamp'u kaqmanta willasunaykipaqqa [//meta.wikimedia.org/wiki/Help:Contents Ruraqpaq yanapana] ''(User's Guide)'' sutiyuq p'anqata qhaway.
@@ -15573,7 +15786,8 @@ $messages['qu'] = array(
 * [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce MediaWiki release mailing list]",
 );
 
-/** Romagnol (Rumagnôl) */
+/** Romagnol (Rumagnôl)
+ */
 $messages['rgn'] = array(
 	'mainpagetext' => "'''L'instalaziòn d'MediaWiki l'è andêda ben'''",
 );
@@ -15620,8 +15834,18 @@ $messages['ro'] = array(
 	'config-header-sqlite' => 'Setări SQLite',
 	'config-header-oracle' => 'Setări Oracle',
 	'config-missing-db-name' => 'Trebuie să introduci o valoare pentru „Numele bazei de date”',
+	'config-mysql-engine' => 'Motor de stocare:',
+	'config-mysql-innodb' => 'InnoDB',
+	'config-mysql-myisam' => 'MyISAM',
+	'config-site-name-blank' => 'Introduceți un nume pentru sit.',
 	'config-ns-generic' => 'Proiect',
 	'config-admin-password' => 'Parolă:',
+	'config-optional-continue' => 'Adresează-mi mai multe întrebări.',
+	'config-optional-skip' => 'Sunt deja plictisit, doar instalează wikiul.',
+	'config-profile-wiki' => 'Wiki tradițional',
+	'config-profile-private' => 'Wiki privat',
+	'config-email-settings' => 'Setări pentru e-mail',
+	'config-install-step-done' => 'realizat',
 	'mainpagetext' => "'''Programul Wiki a fost instalat cu succes.'''",
 	'mainpagedocfooter' => 'Consultați [//meta.wikimedia.org/wiki/Help:Contents Ghidul utilizatorului (en)] pentru informații despre utilizarea software-ului wiki.
 
@@ -16225,7 +16449,8 @@ $messages['sa'] = array(
 	'mainpagetext' => 'मीडियाविकि तु सफलतया अन्तःस्थापितमस्ति',
 );
 
-/** Sakha (саха тыла) */
+/** Sakha (саха тыла)
+ */
 $messages['sah'] = array(
 	'mainpagetext' => "'''«MediaWiki» сөпкө туруорулунна.'''",
 	'mainpagedocfooter' => 'Биики программатын туһунан [//meta.wikimedia.org/wiki/Help:Contents справочникка] көрүөххүн сөп.
@@ -16244,7 +16469,8 @@ $messages['sc'] = array(
 	'mainpagetext' => "'''MediaWiki est stadu installadu in modu currègidu.'''",
 );
 
-/** Sicilian (sicilianu) */
+/** Sicilian (sicilianu)
+ */
 $messages['scn'] = array(
 	'mainpagetext' => "'''Nstallazzioni di MediaWiki cumplitata currettamenti.'''",
 	'mainpagedocfooter' => "Pi favuri taliari [//meta.wikimedia.org/wiki/Help:Contents Guida utenti] pi aiutu supra l'usu e la cunfigurazzioni di stu software wiki.
@@ -16255,7 +16481,8 @@ $messages['scn'] = array(
 * [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce Mailing list dî rilassi di MediaWiki]",
 );
 
-/** Scots (Scots) */
+/** Scots (Scots)
+ */
 $messages['sco'] = array(
 	'mainpagetext' => "'''MediaWiki haes been installit wi speed.'''",
 	'mainpagedocfooter' => "Aks the [//meta.wikimedia.org/wiki/Help:Contents Uiser's Manual] for speirins aboot using the wiki saftware.
@@ -16267,7 +16494,8 @@ $messages['sco'] = array(
 * [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce MediaWiki releese mailin leet]",
 );
 
-/** Sassaresu (Sassaresu) */
+/** Sassaresu (Sassaresu)
+ */
 $messages['sdc'] = array(
 	'mainpagetext' => "'''Isthallazioni di MediaWiki accabadda currentementi.'''",
 	'mainpagedocfooter' => "Cunsultha la [//meta.wikimedia.org/wiki/Aggiuddu:Summàriu Ghia utenti] pa maggiori infuimmazioni i l'usu di chisthu software wiki.
@@ -16280,7 +16508,8 @@ Li sighenti cullegamenti so in linga ingrese:
 * [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce Mailing list annùnzii MediaWiki]",
 );
 
-/** Cmique Itom (Cmique Itom) */
+/** Cmique Itom (Cmique Itom)
+ */
 $messages['sei'] = array(
 	'mainpagetext' => "'''MediaWiki coccebj installöx successua zo mii.'''",
 );
@@ -16374,8 +16603,17 @@ $messages['si'] = array(
 * [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce මීඩියාවිකි නිකුතුව තැපැල් ලැයිස්තුව]',
 );
 
-/** Slovak (slovenčina) */
+/** Slovak (slovenčina)
+ * @author Kusavica
+ */
 $messages['sk'] = array(
+	'config-your-language' => 'Váš jazyk:',
+	'config-wiki-language' => 'Wiki jazyk:',
+	'config-back' => '← Späť',
+	'config-continue' => 'Pokračovať →',
+	'config-page-language' => 'Jazyk',
+	'config-download-localsettings' => 'Stiahnuť LocalSettings.php',
+	'config-nofile' => 'Súbor "$1" sa nenašiel. Bol zmazaný?',
 	'mainpagetext' => "'''Softvér MediaWiki bol úspešne nainštalovaný.'''",
 	'mainpagedocfooter' => 'Informácie ako používať wiki softvér nájdete v [//meta.wikimedia.org/wiki/Help:Contents Používateľskej príručke].
 
@@ -16628,7 +16866,8 @@ $messages['so'] = array(
 * [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce MediaWiki release mailing list]",
 );
 
-/** Albanian (shqip) */
+/** Albanian (shqip)
+ */
 $messages['sq'] = array(
 	'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].
@@ -16639,12 +16878,39 @@ $messages['sq'] = array(
 * [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce Njoftime rreth MediaWiki-t]',
 );
 
-/** Serbian (Cyrillic script) (‪српски (ћирилица)‬)
+/** Serbian (Cyrillic script) (српски (ћирилица)‎)
  * @author Rancher
+ * @author Михајло Анђелковић
  */
 $messages['sr-ec'] = array(
+	'config-session-error' => 'Грешка при започињању сесије: $1',
+	'config-session-expired' => 'Ваши подаци о сесији су истекли.
+Сесије су подешене да трају $1.
+Њихов рок можете повећати постављањем <code>session.gc_maxlifetime</code> у php.ini.
+Поново покрените инсталацију.',
+	'config-no-session' => 'Ваши подаци о сесији су изгубљени!
+Проверите Ваш php.ini и обезбедите да је <code>session.save_path</code> постављен на одговарајући директоријум.',
+	'config-your-language' => 'Ваш језик:',
+	'config-your-language-help' => 'Изаберите језик који желите да користите током инсталације.',
+	'config-wiki-language' => 'Језик викија:',
+	'config-wiki-language-help' => 'Изаберите језик на ком ће бити садржај викија.',
+	'config-back' => '← Назад',
 	'config-continue' => 'Настави →',
 	'config-page-language' => 'Језик',
+	'config-page-welcome' => 'Добро дошли на МедијаВики!',
+	'config-page-dbconnect' => 'Повезивање са базом података',
+	'config-page-upgrade' => 'Надоградња постојеће инсталације',
+	'config-page-dbsettings' => 'Подешавања базе података',
+	'config-page-name' => 'Назив',
+	'config-page-options' => 'Поставке',
+	'config-page-install' => 'Инсталирај',
+	'config-page-complete' => 'Завршено!',
+	'config-page-restart' => 'Поновно покретање инсталације',
+	'config-page-copying' => 'Умножавање',
+	'config-page-upgradedoc' => 'Надоградња',
+	'config-page-existingwiki' => 'Постојећи вики',
+	'config-help-restart' => 'Желите ли да обришете све сачуване податке које сте унели и поново покренете инсталацију?',
+	'config-restart' => 'Да, покрени поново',
 	'config-type-mysql' => 'MySQL',
 	'config-type-postgres' => 'PostgreSQL',
 	'config-type-sqlite' => 'SQLite',
@@ -16658,10 +16924,37 @@ $messages['sr-ec'] = array(
 * [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce Дописна листа о издањима Медијавикија]',
 );
 
-/** Serbian (Latin script) (‪srpski (latinica)‬) */
+/** Serbian (Latin script) (srpski (latinica)‎)
+ */
 $messages['sr-el'] = array(
+	'config-session-error' => 'Greška pri započinjanju sesije: $1',
+	'config-session-expired' => 'Vaši podaci o sesiji su istekli.
+Sesije su podešene da traju $1.
+Njihov rok možete povećati postavljanjem <code>session.gc_maxlifetime</code> u php.ini.
+Ponovo pokrenite instalaciju.',
+	'config-no-session' => 'Vaši podaci o sesiji su izgubljeni!
+Proverite Vaš php.ini i obezbedite da je <code>session.save_path</code> postavljen na odgovarajući direktorijum.',
+	'config-your-language' => 'Vaš jezik:',
+	'config-your-language-help' => 'Izaberite jezik koji želite da koristite tokom instalacije.',
+	'config-wiki-language' => 'Jezik vikija:',
+	'config-wiki-language-help' => 'Izaberite jezik na kom će biti sadržaj vikija.',
+	'config-back' => '← Nazad',
 	'config-continue' => 'Nastavi →',
 	'config-page-language' => 'Jezik',
+	'config-page-welcome' => 'Dobro došli na MedijaViki!',
+	'config-page-dbconnect' => 'Povezivanje sa bazom podataka',
+	'config-page-upgrade' => 'Nadogradnja postojeće instalacije',
+	'config-page-dbsettings' => 'Podešavanja baze podataka',
+	'config-page-name' => 'Naziv',
+	'config-page-options' => 'Postavke',
+	'config-page-install' => 'Instaliraj',
+	'config-page-complete' => 'Završeno!',
+	'config-page-restart' => 'Ponovno pokretanje instalacije',
+	'config-page-copying' => 'Umnožavanje',
+	'config-page-upgradedoc' => 'Nadogradnja',
+	'config-page-existingwiki' => 'Postojeći viki',
+	'config-help-restart' => 'Želite li da obrišete sve sačuvane podatke koje ste uneli i ponovo pokrenete instalaciju?',
+	'config-restart' => 'Da, pokreni ponovo',
 	'config-type-mysql' => 'MySQL',
 	'config-type-postgres' => 'PostgreSQL',
 	'config-type-sqlite' => 'SQLite',
@@ -16675,7 +16968,8 @@ $messages['sr-el'] = array(
 * [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce Mejling lista o izdanjima MedijaVikija]',
 );
 
-/** Sranan Tongo (Sranantongo) */
+/** Sranan Tongo (Sranantongo)
+ */
 $messages['srn'] = array(
 	'mainpagetext' => "'''MediaWiki seti kon bun.'''",
 	'mainpagedocfooter' => 'Luku na ini a [//meta.wikimedia.org/wiki/Help:Yepi yepibuku] fu si fa fu kebrouki a wikisoftware.
@@ -16687,7 +16981,8 @@ $messages['srn'] = array(
 * [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce Boskopu grupu gi nyun meki]',
 );
 
-/** Swati (SiSwati) */
+/** Swati (SiSwati)
+ */
 $messages['ss'] = array(
 	'mainpagetext' => "'''i-MediaWiki seyifakeke ngalokuphelele.'''",
 );
@@ -16700,7 +16995,8 @@ $messages['stq'] = array(
 	'mainpagedocfooter' => 'Sjuch ju [//meta.wikimedia.org/wiki/MediaWiki_localization Dokumentation tou de Anpaasenge fon dän Benutseruurfläche] un dät [//meta.wikimedia.org/wiki/Help:Contents Benutserhondbouk] foar Hälpe tou ju Benutsenge un Konfiguration.',
 );
 
-/** Sundanese (Basa Sunda) */
+/** Sundanese (Basa Sunda)
+ */
 $messages['su'] = array(
 	'mainpagetext' => "'''''Software'' MediaWiki geus diinstal.'''",
 	'mainpagedocfooter' => "Mangga tingal ''[//meta.wikimedia.org/wiki/MediaWiki_localisation documentation on customizing the interface]'' jeung [//meta.wikimedia.org/wiki/MediaWiki_User%27s_Guide Tungtunan Pamaké] pikeun pitulung maké jeung konfigurasi.",
@@ -16961,7 +17257,8 @@ $messages['ta'] = array(
 * [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce மீடியாவிக்கி வெளியீடு மின்னஞ்சல் பட்டியல்]',
 );
 
-/** Tulu (ತುಳು) */
+/** Tulu (ತುಳು)
+ */
 $messages['tcy'] = array(
 	'mainpagetext' => "'''ಮೀಡಿಯವಿಕಿ ಯಶಸ್ವಿಯಾದ್ ಇನ್’ಸ್ಟಾಲ್ ಆಂಡ್.'''",
 	'mainpagedocfooter' => 'ವಿಕಿ ತಂತ್ರಾಂಶನ್ ಉಪಗೋಗ ಮನ್ಪುನ ಬಗ್ಗೆ ಮಾಹಿತಿಗ್ [//meta.wikimedia.org/wiki/Help:Contents ಸದಸ್ಯೆರ್ನ ನಿರ್ದೇಶನ ಪುಟ] ತೂಲೆ.
@@ -17010,6 +17307,7 @@ $messages['te'] = array(
 	'config-mysql-utf8' => 'UTF-8',
 	'config-site-name' => 'వికీ యొక్క పేరు:',
 	'config-ns-other' => 'ఇతర (ఇవ్వండి)',
+	'config-ns-other-default' => 'నావికీ',
 	'config-admin-name' => 'మీ పేరు:',
 	'config-admin-password' => 'సంకేతపదం:',
 	'config-admin-password-confirm' => 'సంకేతపదం మళ్ళీ:',
@@ -17022,6 +17320,7 @@ $messages['te'] = array(
 	'config-license-pd' => 'సార్వజనీనం',
 	'config-email-settings' => 'ఈ-మెయిల్ అమరికలు',
 	'config-upload-deleted' => 'తొలగించిన దస్త్రాల కొరకు సంచయం:',
+	'config-advanced-settings' => 'ఉన్నత స్వరూపణం',
 	'config-install-step-done' => 'పూర్తయింది',
 	'config-install-step-failed' => 'విఫలమైంది',
 	'config-help' => 'సహాయం',
@@ -17043,7 +17342,8 @@ $messages['tet'] = array(
 	'config-page-name' => 'Naran',
 );
 
-/** Tajik (Cyrillic script) (тоҷикӣ) */
+/** Tajik (Cyrillic script) (тоҷикӣ)
+ */
 $messages['tg-cyrl'] = array(
 	'mainpagetext' => "'''Нармафзори МедиаВики бо муваффақият насб шуд.'''",
 	'mainpagedocfooter' => 'Аз [//meta.wikimedia.org/wiki/Help:Contents Роҳнамои Корбарон] барои истифодаи нармафзори вики кӯмак бигиред.
@@ -17101,9 +17401,12 @@ $messages['tk'] = array(
  * @author Sky Harbor
  */
 $messages['tl'] = array(
-	'config-desc' => 'Ang instalador para sa MediaWiki',
+	'config-desc' => 'Ang tagapagluklok para sa MediaWiki',
 	'config-title' => 'Instalasyong $1 ng MediaWiki',
 	'config-information' => 'Kabatiran',
+	'config-localsettings-upgrade' => 'Napansin ang isang talaksang <code>LocalSettings.php</code>.
+Upang maitaas ang uri ng pagluluklok na ito, paki ipasok ang halaga ng <code>$wgUpgradeKey</code> sa loob ng kahong nasa ibaba.
+Matatagpuan mo ito sa loob ng LocalSettings.php.',
 	'config-localsettings-cli-upgrade' => 'Napansin ang isang talaksan ng LocalSettings.php.
 Upang isapanahon ang pagtatalagang ito, mangyaring patakbuhin sa halip ang update.php',
 	'config-localsettings-key' => 'Susi ng pagsasapanahon:',
@@ -17115,7 +17418,15 @@ $1',
 	'config-localsettings-incomplete' => 'Lumilitaw na hindi pa buo ang umiiral na LocalSettings.php.
 Ang pabagu-bagong $1 ay hindi nakatakda.
 Mangyaring baguhin ang  LocalSettings.php upang ang maitakda ang pagpapabagu-bagong ito, at pindutin ang "Magpatuloy".',
+	'config-localsettings-connection-error' => 'Isang kamalian ang nakatagpo noong kumakabit sa kalipunan ng dato na ginagamit ang tinukoy na mga katakdaan sa loob ng LocalSettings.php o
+AdminSettings.php. Paki kumpunihin ang mga katakdaang ito at subukang muli.
+
+$1',
 	'config-session-error' => 'Kamalian sa pagsisimula ng sesyon: $1',
+	'config-session-expired' => 'Tila nagwakas na ang inilaan sa iyong panahon ng dato.
+Ang inilaang mga panahon ay iniayos para sa isang panahon ng buhay na $1.
+Mapapataas mo ito sa pamamagitan ng pagtatakda ng <code>session.gc_maxlifetime</code> sa loob ng php.ini.
+Muling simulan ang proseso ng pagluluklok.',
 	'config-no-session' => 'Nawala ang iyong datos ng sesyon!
 Suriin ang iyong php.ini at tiyakin na ang <code>session.save_path</code> ay nakatakda sa angkop na direktoryo.',
 	'config-your-language' => 'Ang wika mo:',
@@ -17172,54 +17483,157 @@ Hindi mo mailuklok ang MediaWiki.',
 Subalit, nangangailangan ang MediaWiki ng PHP $2 o mas mataas pa.',
 	'config-unicode-using-utf8' => 'Ginagamit ang utf8_normalize.so ni Brion Vibber para sa pagpapanormal ng Unikodigo.',
 	'config-unicode-using-intl' => 'Ginagamit ang [http://pecl.php.net/intl intl dugtong na PECL] para sa pagsasanormal ng Unikodigo.',
+	'config-unicode-pure-php-warning' => "'''Babala''': Ang [http://pecl.php.net/intl dugtong ng internasyunal na PECL] ay hindi makukuha upang makapanghawak ng pagpapanormal ng Unikodigo, na babagsak na pabalik sa mabagal na pagsasakatuparan ng dalisay na PHP.
+Kapag nagpapatakbo ka ng isang pook na mataas ang trapiko, dapat kang bumasa ng kaunti hinggil sa [//www.mediawiki.org/wiki/Unicode_normalization_considerations pagpapanormal ng Unikodigo].",
+	'config-unicode-update-warning' => "'''Babala''': Ang nakaluklok na bersiyon ng pambalot ng pagpapanormal ng Unikodigo ay gumagamit ng isang mas matandang bersiyon ng aklatan ng [http://site.icu-project.org/ proyekto ng ICU].
+Dapat kang [//www.mediawiki.org/wiki/Unicode_normalization_considerations magtaas ng uri] kung may pag-aalala ka hinggil sa paggamit ng Unikodigo.",
 	'config-no-db' => 'Hindi matagpuan ang isang angkop na tagapagmaneho ng kalipunan ng datos! Kailangan mong magluklok ng isang tagapagmaneho ng kalipunan ng dato para sa PHP.
 Tinatangkilik ang sumusunod na mga uri ng kalipunan ng dato: $1.
 
 Kung ikaw ay nasa isang pinagsasaluhang pagpapasinaya, hilingin sa iyong tagapagbigay ng pagpapasinaya na iluklok ang isang angkop na tagapagmaneho ng kalipunan ng dato.
 Kung ikaw mismo ang nangalap ng PHP, muling isaayos ito na pinagagana ang isang kliyente ng kalipunan ng dato, halimbawa na ang paggamit ng <code>./configure --with-mysql</code>.
 Kung iniluklok mo ang PHP mula sa isang pakete ng Debian o Ubuntu, kung gayon kailangan mo ring magluklok ng modyul na php5-mysql.',
+	'config-outdated-sqlite' => "'''Babala''': mayroong kang $1 ng SQLite, na mas mababa kaysa sa pinaka mababang kailangang bersiyon na $2. Magiging hindi makukuha ang SQLite.",
+	'config-no-fts3' => "'''Warning''': Ang SQLite ay hindi itinala at tinipon na wala ang [//sqlite.org/fts3.html modulong FTS3], ang mga tampok na panghanap ay magiging hindi makukuha sa ibabaw ng panlikod na dulong ito.",
+	'config-register-globals' => "'''Babala: Ang mapipili na <code>[http://php.net/register_globals register_globals]</code> ng PHP ay pinagagana.'''
+'''Huwag paganahin kung kaya mo.'''
+Aandar ang MediaWiki, subalit ang tagapaghain mo ay nakalantad sa maaaring maganap na mga kahinaang pangkatiwasayan.",
+	'config-magic-quotes-runtime' => "'''Malubha: Masigla ang [http://www.php.net/manual/en/ref.info.php#ini.magic-quotes-runtime magic_quotes_runtime]!'''
+Ang piniling ito ay hindi mahuhulaan na pipinsala sa lahok na dato.
+Hindi mo maaaring iluklok o gamitin ang MediaWiki maliban na lamang kung hindi na gumagana ang pinili na ito.",
+	'config-magic-quotes-sybase' => "'''Malubha: Masigla ang [http://www.php.net/manual/en/ref.info.php#ini.magic-quotes-sybase magic_quotes_sybase]!'''
+Hindi mahuhulaan na sinisira ng napiling ito ang lahok na dato.
+Hindi mo maaaring iluklok o gamitin ang MediaWiki maliban na lamang kung hindi na pinagagana ang napiling ito.",
+	'config-mbstring' => "'''Malubha: Masigla ang [http://www.php.net/manual/en/ref.mbstring.php#mbstring.overload mbstring.func_overload]!'''
+Ang napiling ito ay nagdurulot ng mga kamalian at maaaring sumira nang hindi nahuhulaan ang dato.
+Hindi mo maaaring iluklok o gamitin ang MediaWiki maliban na lamang kung hindi na pinagagana ang napiling ito.",
+	'config-ze1' => "'''Malubha: Masigla ang [http://www.php.net/manual/en/ini.core.php zend.ze1_compatibility_mode]!'''
+Ang napiling ito ay nagsasanhi ng karima-rimarim na mga sira sa MediaWiki.
+Hindi mo maaaring iluklok o gamitin ang MediaWiki maliban na lamang kung hindi na pinagagana ang napiling ito.",
+	'config-safe-mode' => "'''Babala:''' Masigla ang [http://www.php.net/features.safe-mode safe mode] ng PHP.
+Maaari itong magdulot ng mga suliranin, partikular na kung gumagamit ng mga ikinargang paitaas na talaksan at ng suporta sa <code>math</code>.",
+	'config-xml-bad' => 'Nawawala ang modulong XML ng PHP.
+Nangangailangan ang MediaWiki ng mga tungkulin sa loob ng modulong ito at hindi aandar sa loob ng ganitong pagkakaayos.
+Kung pinapatakbo mo ang Mandrake, iluklok ang pakete ng php-xml.',
+	'config-pcre' => 'Tila nawawala ang modyul na pangsuporta ng PCRE.
+Nangangailangan ang MediaWiki ng nakaukol sa Perl na mga tungkulin ng karaniwang pagsasaad upang gumana.',
+	'config-pcre-no-utf8' => "'''Malubha''': Tila tinipon ang modyul na PCRE ng PHP na wala ang suporta ng PCRE_UTF8.
+Nangangailangan ang MediaWiki ng suporta ng UTF-8 upang maging tama ang pag-andar.",
 	'config-memory-raised' => 'Ang <code>hangganan_ng_alaala</code> ng PHP ay $1, itinaas sa $2.',
 	'config-memory-bad' => "'''Babala:''' Ang <code>hangganan_ng_alaala</code> ng PHP ay $1.
 Ito ay maaaring napakababa.
 Maaaring mabigo ang pagluluklok!",
+	'config-ctype' => "'''Maluba''': Dapat na tipunin ang PHP na mayroong suporta para sa [http://www.php.net/manual/en/ctype.installation.php dugtong Ctype].",
 	'config-xcache' => 'Ininstala na ang [http://xcache.lighttpd.net/ XCache]',
 	'config-apc' => 'Ininstala na ang [http://www.php.net/apc APC]',
 	'config-wincache' => 'Ininstala na ang [http://www.iis.net/download/WinCacheForPhp WinCache]',
 	'config-no-cache' => "'''Babala:''' Hindi mahanap ang [http://www.php.net/apc APC], [http://xcache.lighttpd.net/ XCache] o [http://www.iis.net/download/WinCacheForPhp WinCache].
 Hindi pinapagana ang pagbabaon ng mga bagay.",
+	'config-mod-security' => "'''Babala''': Ang tagapaghain mo ng sangkasaputan ay pinagana na mayroong [http://modsecurity.org/ mod_security]. Kung mali ang kaayusan, makapagdurulot ito ng mga suliranin para sa MediaWiki o ibang mga sopwer na nagpapahintulot sa mga tagagamit na magpaskil ng hindi makatwirang nilalaman.
+Sumangguni sa [http://modsecurity.org/documentation/ mod_security kasulatan] o makipag-ugnayan sa suporta ng iyong tagapagpasinaya kapag nakatagpo ng alin mang mga kamalian.",
 	'config-diff3-bad' => 'Hindi natagpuan ang GNU diff3.',
 	'config-imagemagick' => 'Natagpuan ang ImageMagick: <code>$1</code>.
+Papaganahin ang pagkakagyat ng larawan kapag pinagana mo ang mga pagkakargang paitaas.',
+	'config-gd' => 'Natagpuan ang pinasadyang nakapaloob na grapiks ng GD.
 Papaganahin ang pagkakagyat ng larawan kapag pinagana mo ang mga pagkakargang paitaas.',
 	'config-no-scaling' => 'Hindi matagpuan ang aklatang GD o ImageMagick.
 Hindi papaganahin ang pagkakagyat ng larawan.',
 	'config-no-uri' => "'''Kamalian:''' Hindi matukoy ang kasalukuyang URI.
 Pinigilan ang pag-iinstala.",
+	'config-no-cli-uri' => "'''Babala''': Walang tinukoy na --landas ng panitik, ginagamit ang likas na katakdaan: <code>$1</code>.",
+	'config-using-server' => 'Ginagamit ang pangalan ng tagapaghain na "<nowiki>$1</nowiki>".',
+	'config-using-uri' => 'Ginagamit ang URL ng tagapaghain na "<nowiki>$1$2</nowiki>".',
+	'config-uploads-not-safe' => "'''Babala:''' Ang iyong likas na nakatakdang direktoryo para sa paitaas na mga pagkakarga na <code>$1</code> ay may kahinaan laban sa pagsasagawa ng mga panitiki na hindi makatwiran. Bagaman sinisiyasat ng MediaWiki ang lahat ng paitaas na naikargang mga talaksan para sa mga panganib na pangkatiwasayan, mataas na iminumungkahi na [//www.mediawiki.org/wiki/Manual:Security#Upload_security isara ang kahinaang ito na pangkatiwasayan] bago paganahin ang paitaas na mga pagkakarga.",
+	'config-no-cli-uploads-check' => "'''Babala:''' Ang iyong likas na nakatakdang direktoryo para sa paitaas na mga pagkakarga (<code>$1</code>) ay hindi nasuri para sa kahinaan laban sa pagsasagawa ng panitik na hindi makatwiran habang iniluluklok ang Ugnayang Mukha ng Guhit ng Kaataasan o Command-Line Interface (CLI).",
+	'config-brokenlibxml' => "Ang sistema mo ay mayroong isang pagsasama ng mga bersiyon ng PHP at libxml2 na maaaring masurot at maaaring makapagsanhi ng pagkasira ng datong nakakubli sa loob ng MediaWiki at iba pang mga aplikasyon ng sangkasaputan.
+Magtaas ng uri upang maging PHP 5.2.9 o mas lalong huli at libxml2 2.7.3 o mas lalong huli ([//bugs.php.net/bug.php?id=45996 isinalansan ang surot o ''bug'' na mayroong PHP]). Binigo ang pagluluklok.",
+	'config-using531' => 'Hindi maaaring gamitin ang MediaWiki na kapiling ang PHP na $1 dahil sa isang surot na kinasasangkutan ng mga parametrong pangsangguni sa <code>__call()</code>. Magtaas ng uri upang maging PHP 5.3.2 o mas mataas, o magbaba ng uri upang maging PHP 5.3.0 upang malutas ito. Binigo ang pagluluklok.',
+	'config-suhosin-max-value-length' => 'Nakaluklok ang Suhosin at hinahanggahan ang haba ng parametro ng GET sa $1 mga byte. Ang sangkap na ResourceLoader ng MediaWiki ay gagana sa paligid ng hangganang ito, subalit pasasamain nito ang pagganap. Kung talagang maaari, dapat mong itakda ang suhosin.get.max_value_length upang maging 1024 o mas mataas sa loob ng php.ini, at itakda ang $wgResourceLoaderMaxQueryLength sa katulad na halaga sa loob ng LocalSettings.php.',
 	'config-db-type' => 'Uri ng kalipunan ng datos:',
 	'config-db-host' => 'Tagapagpasinaya ng kalipunan ng datos:',
+	'config-db-host-help' => 'Kung ang iyong tagapaghain ng kalipunan ng dato ay nasa ibabaw ng isang ibang tagapaghain, ipasok ang pangalan ng tagapagpasinaya o tirahan ng IP dito.
+
+Kung gumagamit ka ng pinagsasaluhang pagpapasinaya ng sangkasaputan, dapat ibigay sa iyo ng iyong tagapagbigay ng pagpapasinaya ang tamang pangalan ng tagapagpasinaya sa loob ng kanilang kasulatan.
+
+Kapag nagluluklok ka sa ibabaw ng isang tagapaghain ng Windows at gumagamit ng MySQL, maaaring hindi gumana ang paggamit ng "localhost" para sa pangalan ng tagapaghain. Kung hindi, subukan ang "127.0.0.1" para sa katutubong tirahan ng IP.
+
+Kapag gumagamit ka ng PostgreSQL, iwanang walang laman ang hanay na ito upang kumabit sa pamamagitan ng bokilya ng Unix.',
 	'config-db-host-oracle' => 'TNS ng kalipunan ng dato:',
+	'config-db-host-oracle-help' => 'Magpasok ng isang katanggap-tanggap na [http://download.oracle.com/docs/cd/B28359_01/network.111/b28317/tnsnames.htm Katutubong Pangalan ng Pagkabit]; dapat na nakikita ang isang talaksan ng tnsnames.ora sa pagluluklok na ito.<br />Kung gumagamit ka ng mga aklatan ng kliyente na 10g o mas bago, maaari mo ring gamitin ang pamamaraan ng pagpapangalan ng [http://download.oracle.com/docs/cd/E11882_01/network.112/e10836/naming.htm Maginhawang Pagkabit].',
 	'config-db-wiki-settings' => 'Kilalanin ang wiking ito',
 	'config-db-name' => 'Pangalan ng kalipunan ng dato:',
+	'config-db-name-help' => 'Pumili ng isang pangalan na pangkilala sa wiki mo.
+Hindi ito dapat maglaman ng mga patlang.
+
+Kung gumagamit ka ng pinagsasaluhang pagpapasinaya ng sangkasaputan, ang iyong tagapagbigay ng pagpapasinaya ay maaaring bigyan ka ng isang tiyak na pangalan ng kalipunan ng datong gagamitin o papayagan kang lumikha ng mga kalipunan ng dato sa pamamagitan ng isang entrepanyong pantaban.',
 	'config-db-name-oracle' => 'Balangkas ng kalipunan ng dato:',
+	'config-db-account-oracle-warn' => 'Mayroong tatlong tinatangkilik na tagpo para sa pagluluklok ng Oracle bilang panlikurang hulihan ng kalipunan ng dato:
+
+Kung nais mong lumikha ng akawnt ng kalipunan ng dato bilang bahagi ng proseso ng pagluluklok, paki magbigay ng isang akawnt na mayroong gampanin ng SYSDBA bilang akawnt ng kalipunan ng dato para sa pagluluklok at tukuyin ang ninanais na mga kredensiyal para sa akawnt ng pagpunta sa sangkasaputan, o di kaya ay maaaring kinakamay na lumikha ng akawnt ng pagpunta sa sangkasaputan at ibigay lamang ang akawnt na iyan (kung mayroong ito ng kinakailangang mga pahintulot upang malikha ang mga bagay na pampagpapanukala) o magbigay ng dalawang magkaibang mga akawnt, isang mayroong pribilehiyo ng paglikha at isang may pagbabawal para sa pagpunta sa sangkasaputan.
+
+Ang panitik sa paglikha ng isang akawnt na mayroon ng kinakailangang mga pribilehiyo ay matatagpuan sa loob ng direktoryong "maintenance/oracle/" ng pagluluklok na ito. Pakatandaan na ang paggamit ng isang akawnt na may pagbabawal ay hindi magpapagana isa lahat ng mga kakayahang pampananatili sa piling ng likas na nakatakdang akawnt.',
 	'config-db-install-account' => 'Akawnt ng tagagamit para sa pagluluklok',
 	'config-db-username' => 'Pangalang pangtagagamit ng kalipunan ng dato:',
 	'config-db-password' => 'Hudyat sa kalipunan ng dato:',
+	'config-db-password-empty' => 'Paki magpasok ng isang hudyat para sa bagong tagagamit ng kalipunan ng dato: $1.
+Habang maging maaari na makalikha ng mga tagagamit na walang mga hudyat, hindi ito ligtas.',
+	'config-db-install-username' => 'Ipasok ang pangalan ng tagagamit na gagamitin upang kumabit sa kalipunan ng dato habang isinasagawa ang pagluluklok.
+Hindi ito ang pangalan ng tagagamit ng akawnt ng MediaWiki; ito ang pangalan ng tagagamit para sa iyong kalipunan ng dato.',
+	'config-db-install-password' => 'Ipasok ang hudyat na gagamitin upang kumabit sa kalipunan ng dato habang isinasagawa ang pagluluklok.
+Hindi ito ang hudyat para sa akawnt ng MediaWiki; ito ang hudyat para sa iyong kalipunan ng dato.',
 	'config-db-install-help' => 'Ipasok ang pangalan ng tagagamit at hudyat na gagamitin upang umugnay sa kalipunan ng dato habang isinasagawa ang pagluluklok.',
 	'config-db-account-lock' => 'Gamitin ang gayun ding pangalan ng tagagamit at hudyat habang nasa normal na operasyon',
 	'config-db-wiki-account' => 'Akawnt ng tagagamit para sa pangkaraniwang pagpapaandar',
+	'config-db-wiki-help' => 'Ipasok ang pangalan ng tagagamit at hudyat na gagamitin upang kumabit sa kalipunan ng dato habang nasa karaniwang pagtakbo ng wiki.
+Kung hindi umiiral ang akawnt, at ang akawnt ng pagluluklok ay mayroong sapat na mga pribilehiyo, ang akawnt na ito ng tagagamit ay lilikhain na mayroong pinaka mababang mga pribilehiyo na kailangan upang mapatakbo ang wiki.',
 	'config-db-prefix' => 'Unlapi ng talahanayan ng kalipunan ng dato:',
+	'config-db-prefix-help' => 'Kung kailangan mong ibahagi ang isang kalipunan ng dato sa pagitan ng maramihang mga wiki, o sa pagitan ng MediaWiki at ibang aplikasyon ng kasaputan, maaaring piliin mo na magdagdag ng isang unlapi sa lahat ng mga pangalan ng talahanayan upang maiwasan ang mga salungatan.
+Huwag gumamit ng mga patlang.
+
+Ang hanay na ito ay karaniwang iniiwanang walang laman.',
 	'config-db-charset' => 'Pangkat ng panitik ng kalipunan ng dato',
 	'config-charset-mysql5-binary' => 'MySQL 4.1/5.0 binaryo',
 	'config-charset-mysql5' => 'MySQL 4.1/5.0 UTF-8',
 	'config-charset-mysql4' => 'MySQL 4.0 paurong-kabagay UTF-8',
+	'config-charset-help' => "'''Babala:''' Kapag ginamit mo ang '''backwards-compatible UTF-8''' o \"nauukol na pabalik na UTF-8\" sa MySQL 4.1+, at may kasunod na pagtatabi ng pansalong kopya ng kalipunan ng dato na mayroong <code>mysqldump</code>, maaaring wasakin nito ang lahat ng mga panitik na hindi ASCII, na hindi na mababawi pa ang mga pansalong kopya.
+
+Sa '''gawi na nakahalo sa dalawa (binaryo)''', itinatabi ng MediaWiki ang tekstong UTF-8 sa kalipunan ng dato sa loob ng mga kahanayang binaryo.
+Mas kapaki-pakinabang ito kaysa sa gawi na UTF-8 ng MySQL, at nagpapahintulot sa iyo na gamitin ang buong kasaklawan ng mga panitik na Unikodigo.
+Sa '''gawi ng UTF-8''', malalaman ng MySQL kung anong pangkat ng panitik ang kinapapalooban ng iyong dato, at may kaangkupang maihaharap at mapapalitan ito, ngunit hindi ka nito papayagan na mag-imbak ng mga panitik sa ibabaw ng [//en.wikipedia.org/wiki/Mapping_of_Unicode_character_planes Basic Multilingual Plane] o Saligang Patag na Kayas na Pangmaramihang Wika.",
 	'config-mysql-old' => 'Hindi kailangan ang MySQL na $1 o mas bago, mayroon kang $2.',
 	'config-db-port' => 'Daungan ng kalipunan ng dato:',
 	'config-db-schema' => 'Panukala para sa MediaWiki',
 	'config-db-schema-help' => 'Ang nasa itaas na panukala ay pangkaraniwang magiging maayos.
 Baguhin lamang ito kung alam mong kinakailangan.',
+	'config-pg-test-error' => "Hindi makakabit sa kalipunan ng dato na '''$1''': $2",
 	'config-sqlite-dir' => 'Direktoryo ng dato ng SQLite:',
+	'config-sqlite-dir-help' => "Iniimbak ng SQLite ang lahat ng dato sa loob ng isang nag-iisang talaksan.
+
+Ang ibibigay mong direktoryo ay dapat na maging masusulatan ng tagapaghain ng kasaputan habang nagluluklok.
+
+'''Hindi''' ito dapat na mapuntahan sa pamamagitan ng kasaputan, ito ang dahilan kung bakit hindi namin ito inilalagay sa kung nasaan ang iyong mga talaksan ng PHP.
+
+Ang tagapagluklok ay magsusulat ng isang talaksang <code>.htaccess</code> na kasama ito, subalit kapag nabigo iyon mayroong isang tao na maaaring makakuha ng pagka nakakapunta sa iyong hilaw na kalipunan ng dato.
+Kasama riyan ang hilaw na dato ng tagagamit (mga tirahan ng e-liham, pinaghalong mga hudyat) pati na ang nabura nang mga pagbabago at iba pang may pagbabawal na dato sa ibabaw ng wiki.
+
+Isaalang-alang ang paglalagay na magkakasama ang kalipunan ng dato sa ibang lugar, halimbawa na ang sa loob ng <code>/var/lib/mediawiki/yourwiki</code>.",
 	'config-oracle-def-ts' => 'Likas na nakatakdang puwang ng talahanayan:',
 	'config-oracle-temp-ts' => 'Pansamantalang puwang ng talahanayan:',
+	'config-type-mysql' => 'MySQL',
+	'config-type-postgres' => 'PostgreSQL',
+	'config-type-sqlite' => 'SQLite',
+	'config-type-oracle' => 'Oracle',
 	'config-type-ibm_db2' => 'DB2 ng IBM',
+	'config-support-info' => 'Sinusuportahan ng MediaWiki ang sumusunod na mga sistema ng kalipunan ng dato:
+
+$1
+
+Kung hindi mo makita ang sistema ng kalipunan ng dato na sinusubukan mong gamitin na nakatala sa ibaba, kung gayon ay sundi ang mga tagubilin na nakakawing sa itaas upang mapagana ang suporta,',
+	'config-support-mysql' => '* Ang $1 ay ang pangunahing puntirya para sa MediaWiki at ang pinaka sinusuportahan ([http://www.php.net/manual/en/mysql.installation.php paano magtipon ng PHP na mayroong suporta ng MySQL])',
+	'config-support-postgres' => '* Ang $1 ay isang bantog na sistema ng kalipunan ng dato na bukas ang pinagmulan na panghalili sa MySQL ([http://www.php.net/manual/en/pgsql.installation.php paano magtipon ng PHP na mayroong suporta ng PostgreSQL]). Maaaring mayroong ilang hindi pangunahing mga surot na natitira pa, at hindi iminumungkahi para gamitin sa loob ng isang kapaligiran ng produksiyon.',
+	'config-support-sqlite' => 'Ang $1 ay isang magaan ang timbang na sistema ng kalipunan ng dato na sinusuportahan nang napaka mainam. ([http://www.php.net/manual/en/pdo.installation.php Paano magtipon ng PHP na mayroong suporta ng SQLite], gumagamit ng PDO)',
+	'config-support-oracle' => '* Ang $1 ay isang kalipunan ng dato ng kasigasigang pangkalakal. ([http://www.php.net/manual/en/oci8.installation.php Paano magtipunan ng PHP na mayroong suporta ng OCI8])',
+	'config-support-ibm_db2' => '* Ang $1 ay isang kalipunan ng dato ng kasigasigang pangkalakal.',
 	'config-header-mysql' => 'Mga katakdaan ng MySQL',
 	'config-header-postgres' => 'Mga katakdaan ng PostgreSQL',
 	'config-header-sqlite' => 'Mga katakdaan ng SQLite',
@@ -17229,14 +17643,42 @@ Baguhin lamang ito kung alam mong kinakailangan.',
 	'config-missing-db-name' => 'Dapat kang magpasok ng isang halaga para sa "Pangalan ng kalipunan ng dato"',
 	'config-missing-db-host' => 'Dapat kang magpasok ng isang halaga para sa "Tagapagpasinaya ng kalipunan ng dato"',
 	'config-missing-db-server-oracle' => 'Dapat kang magpasok ng isang halaga para sa "TNS ng kalipunan ng dato"',
+	'config-invalid-db-server-oracle' => 'Hindi katanggap-tanggap na pangalan ng TNSng kalipunan ng dato na "$1".
+Gumamit lamang ng mga titik ng ASCII (a-z, A-Z), mga bilang (0-9), mga salungguhit (_) at mga tuldok (.).',
 	'config-invalid-db-name' => 'Hindi tanggap na pangalan ng kalipunan ng dato na "$1".
-Gumamit lamang ng mga titik ng ASCII (a-z, A-Z), mga bilang (0-9), mga salangguhit (_) at mga gitling (-).',
+Gumamit lamang ng mga titik ng ASCII (a-z, A-Z), mga bilang (0-9), mga salungguhit (_) at mga gitling (-).',
 	'config-invalid-db-prefix' => 'Hindi tanggap na unlapi ng kalipunan ng dato na "$1".
-Gamitin lamang ang mga titik na ASCII (a-z, A-Z), mga bilang (0-9), mga salangguhit (_) at mga gitling (-).',
+Gamitin lamang ang mga titik na ASCII (a-z, A-Z), mga bilang (0-9), mga salungguhit (_) at mga gitling (-).',
 	'config-connection-error' => '$1.
 
 Suriin ang punong-abala, pangalan ng tagagamit at hudyat na nasa ibaba at subukan ulit.',
+	'config-invalid-schema' => 'Hindi katanggap-tanggap na panukala para sa "$1" ng MediaWiki.
+Gumamit lamang ng mga titik ng ASCII (a-z, A-Z), mga bilang (0-9), at mga salungguhit (_).',
+	'config-db-sys-create-oracle' => 'Ang panluklok ay tumatangkilik lamang sa paggamit ng isang akawnt ng SYSDBA para sa paglikha ng isang bagong akawnt.',
+	'config-db-sys-user-exists-oracle' => 'Umiiral na ang akawnt ng tagagamit na "$1". Magagamit lamang ang SYSDBA para sa paglikha ng isang bagong akawnt!',
 	'config-postgres-old' => 'Kailangan ang PostgreSQL $1 o mas bago, mayroon kang $2.',
+	'config-sqlite-name-help' => 'Pumili ng isang pangalan na pangkilala na wiki mo.
+Huwag gumamit ng mga puwang o mga gitling.
+Gagamitin ito para sa pangalan ng talaksan ng dato ng SQLite.',
+	'config-sqlite-parent-unwritable-group' => 'Hindi malikha ang direktoryo ng dato na <code><nowiki>$1</nowiki></code>, sapagkat ang magulang na direktoryong <code><nowiki>$2</nowiki></code> ay hindi masulatan ng tagapaghain ng kasaputan.
+
+Napag-alaman ng tagapagluklok kung sinong tagagamit ang kinatatakbuhan ng iyong tagapaghain ng kasaputan.
+Gawing nasusulatan nito ang <code><nowiki>$3</nowiki></code> ng direktoryo upang makapagpatuloy.
+Ito ang gawin sa ibabaw ng isang sistema ng Unix/Linux:
+
+<pre>cd $2
+mkdir $3
+chgrp $4 $3
+chmod g+w $3</pre>',
+	'config-sqlite-parent-unwritable-nogroup' => 'Hindi malikha ang direktoryo ng dato na <code><nowiki>$1</nowiki></code>, sapagkat ang magulang na direktoryong <code><nowiki>$2</nowiki></code> ay hindi masulatan ng tagapaghain ng kasaputan.
+
+Hindi malaman ng tagapagluklok kung sinong tagagamit ang kinatatakbuhan ng iyong tagapaghain ng kasaputan.
+Gawing nasusulatan nito (at ng mga iba pa) ang <code><nowiki>$3</nowiki></code> ng direktoryo upang makapagpatuloy.
+Ito ang gawin sa ibabaw ng isang sistema ng Unix/Linux:
+
+<pre>cd $2
+mkdir $3
+chmod a+w $3</pre>',
 	'config-sqlite-mkdir-error' => 'Kamalian sa paglikha ng direktoryo ng datong "$1".
 Suriin ang kinalalagyan at subukang muli.',
 	'config-sqlite-dir-unwritable' => 'Hindi nagawang magsulat sa direktoryong "$1".
@@ -17247,6 +17689,14 @@ Surrin ang direktoryo ng dato at pangalan ng kalipunan ng datong nasa ibaba at s
 	'config-sqlite-readonly' => 'Ang talaksang <code>$1</code> ay hindi maisusulat.',
 	'config-sqlite-cant-create-db' => 'Hindi malikha ang talaksang <code>$1</code> ng kalipunan ng dato.',
 	'config-sqlite-fts3-downgrade' => 'Nawawala ang suportang FTS3 ng PHP, ibinababa ang uri ng mga talahanayan',
+	'config-can-upgrade' => "Mayroong mga talahanayan ng MediaWiki sa loob ng kalipunan ng datong ito.
+Upang maitaas ang uri ng mga ito upang maging MediaWiki na $1, pindutin ang '''Magpatuloy'''.",
+	'config-upgrade-done' => "Buo na ang pagtataas ng uri.
+
+Maaari mo na ngayong [$1 gamitin ang iyong wiki].
+
+Kung nais mong muling likhain ang iyong talaksang <code>LocalSettings.php</code>, lagitikin ang pindutang nasa ibaba.
+'''Hindi minumungkahi''' ito maliban na lamang kung nagkakaroon ka ng mga suliranin sa piling ng wiki mo.",
 	'config-upgrade-done-no-regenerate' => 'Buo na ang pagsasapanahon.
 
 Maaari ka na ngayong [$1 magsimula sa paggamit ng wiki mo].',
@@ -17257,12 +17707,30 @@ Maaari ka na ngayong [$1 magsimula sa paggamit ng wiki mo].',
 	'config-db-web-help' => 'Piliin ang pangalan ng tagagamit at hudyat na gagamitin ng tagapaghain ng web upang umugnay sa tagapaghain ng kalipunan ng dato, habang nasa pangkaraniwang pagtakbo ng wiki.',
 	'config-db-web-account-same' => 'Gamitin ang gayun din akawnt katulad ng sa pagluluklok',
 	'config-db-web-create' => 'Likhain ang akawnt kung hindi pa ito umiiral',
+	'config-db-web-no-create-privs' => 'Ang tinukoy mong akawnt na iluluklok ay walang sapat na mga pribilehiyo upang makalikha ng isang akawnt.
+Ang akawnt na tutukuyin mo rito ay umiiral na dapat.',
 	'config-mysql-engine' => 'Makinang imbakan:',
 	'config-mysql-innodb' => 'InnoDB',
 	'config-mysql-myisam' => 'MyISAM',
+	'config-mysql-myisam-dep' => "'''Babala''': Pinili mo ang MyISAM bilang makinang imbakan para sa MySQL, na hindi iminumungkahi para gamitin sa MediaWiki, sapagkat:
+* bahagya lamang itong sumusuporta ng pagkakasundu-sundo dahil sa pagkakandado ng talahanayan
+* mas malaki ang pagkakataon na kapitan ng sira kaysa sa ibang mga makina
+* ang himpilang kodigo ng MediaWiki ay hindi palaging humahawak ng MyISAM ayon sa nararapat
+
+Kung ang iyong nakaluklok na MySQL ay sumusuporta ng InnoDB, higit na iminumungkahi na piliin mo iyon sa halip.
+Kung ang iyong nakaluklok na MySQL ay hindi sumusuporta ng InnoDB, marahil ay panahon na para sa isang pagtataas ng uri.",
+	'config-mysql-engine-help' => "Ang '''InnoDB''' ay ang halos palaging pinaka mainam na mapipili, dahil mayroon itong mabuting suporta ng pagkakasundu-sundo.
+
+Maaaring mas mabilis ang '''MyISAM''' sa mga pagluluklok na pang-isahang tagagamit o mababasa lamang.
+May gawi ang mga kalipunan ng dato ng MyISAM na masira nang mas madalas kaysa sa mga kalipunan ng dato ng InnoDB.",
 	'config-mysql-charset' => 'Pangkat ng panitik ng kalipunan ng dato:',
 	'config-mysql-binary' => 'Binaryo',
 	'config-mysql-utf8' => 'UTF-8',
+	'config-mysql-charset-help' => "Sa '''gawi na binaryo''', iniimbak ng MediaWiki ang tekstong UTF-8 sa kalipunan ng dato sa loob ng mga hanay na binaryo.
+Mas kapaki-pakinabang ito kaysa sa gawi na UTF-8 ng MySQL, at nagpapahintulot sa iyo upang magamit ang buong kasaklawan ng mga panitik ng Unikodigo.
+
+Sa ''gawi na UTF-8''', malalaman ng MySQL kung sa anong pangkat ng panitik nakapaloob ang iyong dato, at angkop na makakapagharap at makapapagpalit nito, subalit hindi ka nito papayagan na mag-imbak ng mga panitik na nasa itaas ng [//en.wikipedia.org/wiki/Mapping_of_Unicode_character_planes Basic Multilingual Plane] o Saligang Tapyas na Pangmaramihang Wika.",
+	'config-ibm_db2-low-db-pagesize' => "Ang kalipunan mo ng dato na DB2 ay mayroong isang likas na nakatakdang puwang ng talahanayan na mayroong hindi sapat na sukat ng pahina. Ang sukat ng pahina ay dapat na maging '''32K''' o mas mataas.",
 	'config-site-name' => 'Pangalan ng wiki:',
 	'config-site-name-help' => "Lilitaw ito sa bareta ng pamagat ng pantingin-tingin at sa samu't saring ibang mga lugar.",
 	'config-site-name-blank' => 'Magpasok ng isang pangalan ng sityo.',
@@ -17271,10 +17739,19 @@ Maaari ka na ngayong [$1 magsimula sa paggamit ng wiki mo].',
 	'config-ns-site-name' => 'Katulad ng sa pangalan ng wiki: $1',
 	'config-ns-other' => 'Iba pa (tukuyin)',
 	'config-ns-other-default' => 'Wiki Ko',
+	'config-project-namespace-help' => 'Bilang pagsunod sa halimbawa ng Wikipedia, maraming mga wiki ang nagpapanatili ng kanilang mga pahina ng patakaran na nakahiwalay magmula sa kanilang mga pahina ng nilalaman, na nasa loob ng isang "\'\'\'puwang na pampangalan ng proyekto\'\'\'".
+Ang lahat ng mga pamagat ng pahina na nasa loob ng puwang ng pangalang ito ay nagsisimula na mayroong isang partikular na unlapi, na maaari mong tukuyin dito.
+Sa nakaugalian, ang unlaping ito ay hinango mula sa pangalan ng wiki, subalit hindi ito maaaring maglaman ng mga panitik ng palabantasan na katulad ng "#" o ":".',
+	'config-ns-invalid' => 'Ang tinukoy na puwang ng pangalan na "<nowiki>$1</nowiki>" ay hindi katanggap-tanggap.
+Tumukoy ng isang ibang puwang ng pangalan ng proyekto.',
+	'config-ns-conflict' => 'Ang tinukoy na puwang ng pangalan na "<nowiki>$1</nowiki>" ay sumasalungat sa isang likas na nakatakdang puwang ng pangalan ng MediaWiki.
+Tumukoy ng isang ibang puwang ng pangalan ng proyekto.',
 	'config-admin-box' => 'Akawnt ng tagapangasiwa',
 	'config-admin-name' => 'Pangalan mo:',
 	'config-admin-password' => 'Hudyat:',
 	'config-admin-password-confirm' => 'Hudyat uli:',
+	'config-admin-help' => 'Ipasok dito ang mas ninanais mong pangalan ng tagagamit, bilang halimbawa na ang "Joe Bloggs".
+Ito ang pangalang gagamitin mo upang lumagdang papasok sa wiki.',
 	'config-admin-name-blank' => 'Magpasok ng isang pangalan ng tagagamit na tagapangasiwa.',
 	'config-admin-name-invalid' => 'Ang tinukoy na pangalan ng tagagamit na "<nowiki>$1</nowiki>" ay hindi tanggap.
 Tumukoy ng ibang pangalan ng tagagamit.',
@@ -17282,10 +17759,13 @@ Tumukoy ng ibang pangalan ng tagagamit.',
 	'config-admin-password-same' => 'Ang hudyat ay hindi dapat na katulad ng pangalan ng tagagamit.',
 	'config-admin-password-mismatch' => 'Hindi magkatugma ang ipinasok mong dalawang mga hudyat.',
 	'config-admin-email' => 'Tirahan ng e-liham:',
+	'config-admin-email-help' => 'Magpasok dito ng isang tirahan ng e-liham upang mapahintulutan kang makatanggap ng e-liham mula sa iba pang mga tagagamit sa ibabaw ng wiki, itakdang muli ang hudyat mo, at mapabatiran ng mga pagbabago sa mga pahinang nasa ibabaw ng iyong tala ng mga binabantayan. Maiiwanan mo na walang laman ang hanay na ito.',
 	'config-admin-error-user' => 'Panloob na kamalian kapag nililikha ang isang tagapangasiwa na may pangalang "<nowiki>$1</nowiki>".',
 	'config-admin-error-password' => 'Panloob na kamalian kapag nagtatakda ng isang hudyat na para sa tagapangasiwang "<nowiki>$1</nowiki>": <pre>$2</pre>',
 	'config-admin-error-bademail' => 'Nagpasok ka ng isang hindi katanggap-tanggap na tirahan ng e-liham.',
 	'config-subscribe' => 'Tumanggap mula sa [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce talaan ng mga pinadadalhan ng mga nilalabas na mga pabatid].',
+	'config-subscribe-help' => 'Isang itong tala ng pagliliham na mababa ang dami na ginagamit para sa pagpapakawala ng mga pahayag, kabilang na ang mahahalagang mga pahayag na pangkatiwasayan. Dapat kang magpasipi nito at isapanahon ang iyong nakaluklok na MediaWiki kapag lumalabas ang bagong mga bersiyon.',
+	'config-subscribe-noemail' => 'Sinubukan mong magpasipi sa tala ng nililihaman ng pagpapakawala ng mga pahayag na hindi nagbibigay ng isang tirahan ng -eliham. Paki magbigay ng isang tirahan ng e-liham kung nais mong magpasipi sa listahan ng pagliliham.',
 	'config-almost-done' => 'Halos tapos ka na!
 Maaari mo ngayong laktawan ang natitira pang pag-aayos at iluklok na ang wiki ngayon.',
 	'config-optional-continue' => 'Magtanong sa akin ng marami pang mga tanong.',
@@ -17295,14 +17775,41 @@ Maaari mo ngayong laktawan ang natitira pang pag-aayos at iluklok na ang wiki ng
 	'config-profile-no-anon' => 'Kailangan ang paglikha ng akawnt',
 	'config-profile-fishbowl' => 'Pinahintulutang mga patnugot lamang',
 	'config-profile-private' => 'Pribadong wiki',
+	'config-profile-help' => "Pinaka mahusay ang pagtakbo ng mga Wiki kapag pinapahintulutan mo ang pinaka maraming mga tao na makapamatnugot ng mga ito hanggang sa maaari.
+Sa loob ng MediaWiki, maginhawang masusuring muli ang kamakailang mga pagbabago, at mapanauli sa dati ang anumang nasira na nagawa ng isang walang muwang o may masamang hangarin na mga tagagamit.
+
+Subalit, marami ang nakatagpo na nagagamit ang MediaWiki sa loob ng malawak na sari-saring mga gampanin, at kung minsan ay hindi madaling makumbinsi ang lahat ng mga tao hinggil sa kapakinabangan ng kaparaanan ng wiki.
+Kung kaya't nasa iyo ang pagpili.
+
+Ang isang '''{{int:config-profile-wiki}}''' ay nagpapahintulot sa sinuman upang makapagbago, na hindi kailangan ang paglagdang papasok.
+Ang isang wiki na mayroong '''{{int:config-profile-no-anon}}''' ay nagbibigay ng karagdagang pananagutan, subalit maaaring pumigil sa nagkataon lamang na mga tagapag-ambag.
+
+Ang tagpo na '''{{int:config-profile-fishbowl}}''' ay nagpapahintulot lamang sa pinayagang mga tagagamit na makatingin ng mga pahina, na kapiling ang pangkat na pinayagang  makapamatnugot.
+Ang isang '''{{int:config-profile-private}}''' ay nagpapahintulot lamang sa pinayagang mga tagagamit na makatingin ng mga pahina, na kapiling ang pangkat na pinayagang makapamatnugot.
+
+Ang mas masasalimuot na mga kaayusan ng mga karapatan ng tagagamit ay makukuha pagkaraan ng pagluluklok, tingnan ang [//www.mediawiki.org/wiki/Manual:User_rights may kaugnayang kinamay na lahok].",
 	'config-license' => 'Karapatang-ari at lisensiya:',
 	'config-license-none' => 'Walang talababa ng lisensiya',
 	'config-license-cc-by-sa' => 'Malikhaing Pangkaraniwang Pagtukoy Pamamahaging Magkatulad',
+	'config-license-cc-by' => 'Atribusyon ng Creative Commons',
 	'config-license-cc-by-nc-sa' => 'Malikhaing Pangkaraniwang Pagtukoy Hindi-Pangkalakal Pamamahaging Magkatulad',
+	'config-license-cc-0' => 'Sero na Creative Commons (Nasasakop ng Madla)',
+	'config-license-gfdl' => 'Lisensiyang 1.3 ng Malayang Dokumentasyon ng GNU o mas lalong huli',
 	'config-license-pd' => 'Nasasakupan ng Madla',
 	'config-license-cc-choose' => 'Pumili ng isang pasadyang Lisensiya ng Malikhaing mga Pangkaraniwan',
+	'config-license-help' => "Maraming mga pangmadlang wiki ang naglalagay ng lahat ng mga ambag sa ilalim ng [http://freedomdefined.org/Definition lisensiyang malaya]. 
+Nakakatulong ito sa paglikha ng isang diwa ng pagmamay-ari ng pamayanan at nakapanghihikayat ng ambag na pangmahabang panahon.
+Sa pangkalahatan, hindi kailangan ang isang wiking pribado o pangsamahan.
+
+Kung nais mong magamit ang teksto magmula sa Wikipedia, at nais mong makatanggap ang Wikipedia ng tekstong kinopya magmula sa wiki mo, dapat mong piliin ang '''Creative Commons Attribution Share Alike''' (Pagbanggit na Pinagsasaluhang Magkatulad ng Malikhaing Pangkaraniwan).
+
+Dating ginamit ng Wikipedia ang Lisensiya ng Kasulatang Malaya ng GNU (GNU Free Documentation License o GFDL).
+Isang katanggap-tanggap na lisensiya ang GFDL, subalit mahirap itong maunawaan.
+Mahirap din ang paggamit na muli ng nilalaman na nasa ilalim ng GFDL.",
 	'config-email-settings' => 'Mga katakdaan ng e-liham',
 	'config-enable-email' => 'Paganahin ang palabas na e-liham',
+	'config-enable-email-help' => 'Kung nais mong gumana ang e-liham, ang mga katakdaan ng liham ng [http://www.php.net/manual/en/mail.configuration.php PHP] ay kailangang maging wasto ang pagkakaayos.
+Kung ayaw mo nang anumang mga katampukan ng e-liham, maaari mong huwag paganahin ang mga ito rito.',
 	'config-email-user' => 'Paganahin ang tagagamit-sa-tagagamit na e-liham',
 	'config-email-user-help' => 'Payagan ang lahat ng mga tagagamit na magpadala ng e-liham sa bawat isa kapag pinagana nila ito sa kanilang mga nais.',
 	'config-email-usertalk' => 'Paganahin ang pabatid na pampahina ng usapan ng tagagamit',
@@ -17310,31 +17817,67 @@ Maaari mo ngayong laktawan ang natitira pang pag-aayos at iluklok na ang wiki ng
 	'config-email-watchlist' => 'Paganahin ang pabatid ng talaan ng bantayan',
 	'config-email-watchlist-help' => 'Payagan ang mga tagagamit na tumanggap ng mga pabatid tungkol sa kanilang binabantayang mga pahina kapag pinagana nila ito sa kanilang mga nais.',
 	'config-email-auth' => 'Paganahin ang pagpapatunay ng e-liham',
+	'config-email-auth-help' => "Kapag pinagagana ang mapipiling ito, dapat tiyakin ng mga tagagamit ang kanilang tirahan ng e-liham na ginagamit ang isang kawing na ipinadala sa kanila tuwing itinatakda o binabago nila ito.
+Tanging napatunayang mga tirahan ng e-liham lamang ang makakatanggap ng mga e-liham magmula sa ibang mga tagagamit o makakapagbago ng mga e-liham ng pagpapabatid.
+'''Iminumungkahi''' ang mapipiling katakdaan na ito para sa mga wiking pangmadla dahil sa maaaring mangyaring pagmamalabis ng mga katampukan ng e-liham.",
 	'config-email-sender' => 'Pabalik na tirahan ng e-liham:',
+	'config-email-sender-help' => 'Ipasok ang tirahan ng e-liham na gagamitin bilang tirahang pagsasaulian ng e-liham na papalabas.
+Dito ang kung saan ipapadala ang mga pagtalbog.
+Maraming mga tagapaghain ng liham ang nangangailangan ng kahit na bahagi lamang ng pangalan ng nasasakupan upang maging katanggap-tanggap.',
 	'config-upload-settings' => 'Mga pagkakarga ng mga larawan at talaksan',
 	'config-upload-enable' => 'Paganahin ang pagkakarga ng talaksan',
+	'config-upload-help' => 'Ang paitaas na mga pagkakarga ng mga talaksan ay maaaring makapaglantad ng iyong tagapaghain sa mga panganib na pangkatiwasayan.
+Para sa mas marami pang kabatiran, basahin ang [//www.mediawiki.org/wiki/Manual:Security seksiyon ng katiwasayan] sa loob ng gabay.
+
+Upang mapagana ang paitaas na mga pagkakarga ng talaksan, baguhin ang gawi roon sa subdirektoryo ng <code>mga imahe</code> sa ilalim ng ugat na direktoryo ng MediaWiki upang ang tagapaghain ng kasaputan ay makapagsulat dito.
+Pagkaraan ay paganahin ang pipiliing ito.',
 	'config-upload-deleted' => 'Direktoryo para sa binurang mga talaksan:',
 	'config-upload-deleted-help' => 'Pumili ng isang direktoryong pagsusupnayan ng naburang mga talaksan.
 Ideyal na dapat itong  hindi mapupuntahan mula sa web.',
 	'config-logo' => 'URL ng logo:',
+	'config-logo-help' => 'Ang likas na nakatakdang pabalat ng MediaWiki ay nagsasama ng puwang para sa isang logong 135x160 ang piksel na nasa itaas ng menu ng panggilid na bareta.
+Magkargang papaitaas ng isang imahe na mayroong naaangkop na sukat, at ipasok dito ang URL.
+
+Kung ayaw mo ng isang logo, iwanang walang laman ang kahong ito.',
 	'config-instantcommons' => 'Paganahin ang Mga Pangkaraniwang Biglaan',
+	'config-instantcommons-help' => 'Ang [//www.mediawiki.org/wiki/InstantCommons Instant Commons] ay isang tampok na nagpapahintulot sa mga wiki upang gumamit ng mga imahe, mga tunog at iba pang mga midyang matatagpuan sa pook ng [//commons.wikimedia.org/ Wikimedia Commons].
+Upang magawa ito, nangangailangan ang MediaWiki ng pagka nakakapunta sa Internet.
+
+Para sa mas marami pang kabatiran hinggil sa tampok na ito, kabilang na ang mga tagubilin sa kung paano ito itakda para sa mga wiki na bukod pa kaysa sa Wikimedia Commons, sumangguni sa [//mediawiki.org/wiki/Manual:$wgForeignFileRepos gabay].',
 	'config-cc-error' => 'Hindi nagbigay ng resulta ang pampili ng lisensiya ng Malikhaing Pangkaraniwan.
 Ipasok na kinakamay ang pangalan ng lisensiya.',
 	'config-cc-again' => 'Pumili uli...',
 	'config-cc-not-chosen' => 'Piliin kung anong lisensiya ng Malikhaing mga Pangkaraniwan ang nais mo at pindutin ang "magpatuloy".',
 	'config-advanced-settings' => 'Mas masulong na pagkakaayos',
 	'config-cache-options' => 'Mga katakdaan para sa pagtatago ng bagay:',
+	'config-cache-help' => 'Ang pagtatago ng bagay ay ginagamit upang mapainam ang tulin ng MediaWiki sa pamamagitan ng pagtatago ng madalas gamiting dato.
+Ang mga pook na bahagya hanggang malalaki ang sukat ay labis na hinihikayat na paganahin ito, at ang mga pook na maliliit ay makakakita rin ng mga kapakinabangan.',
+	'config-cache-none' => 'Walang pagtatago (tinanggal ang katungkulan, subalit maaaring maapektuhan ang tulin sa mas malalaking mga pook ng wiki)',
+	'config-cache-accel' => 'Pagtatago ng bagay ng PHP (APC, XCache o WinCache)',
+	'config-cache-memcached' => 'Gamitin ang Pagtatago sa Alaala (Memcached) (nangangailangan ng karagdagang kaayusan ng pagkakahanda at pagsasaayos)',
 	'config-memcached-servers' => 'Mga tagapaghaing itinago sa alaala:',
+	'config-memcached-help' => 'Listahan ng mga tirahan ng IP na gagamitin para sa Memcached o Itinagong Alaala.
+Dapat na tukuyin na isa sa bawat guhit at tukuyin ang daungang gagamitin. Bilang halimbawa:
+ 127.0.0.1:11211
+ 192.168.1.25:1234',
 	'config-memcache-needservers' => 'Pinili mo ang Memcached bilang uri mo ng taguan ngunit hindi tumukoy ng anumang mga tagapaghain.',
 	'config-memcache-badip' => 'Nagpasok ka ng isang hindi tanggap na tirahan ng IP para sa Memcached: $1.',
 	'config-memcache-noport' => 'Hindi ka tumukoy ng isang daungan na gagamitin para sa tagapaghain ng Memcached: $1.
 Kung hindi mo alam ang daungan, ang likas na nakatakda ay 11211.',
 	'config-memcache-badport' => 'Ang bilang ng daungan ng Memcached ay dapat na nasa pagitan ng $1 at $2.',
 	'config-extensions' => 'Mga dugtong',
+	'config-extensions-help' => 'Ang mga dugtong na nakalista sa ibabaw ay napansin sa loob ng iyong direktoryo ng <code>./extensions</code>.
+
+Maaaring mangailangan ang mga ito ng karagdagang kaayusan, subalit mapapagana mo ngayon ang mga ito',
+	'config-install-alreadydone' => "'''Babala:''' Tila nailuklok mo na ang MediaWiki at tinatangka mong iluklok ito ulit.
+Paki magpatuloy sa susunod na pahina.",
+	'config-install-begin' => 'Sa pamamagitan ng pagpindot sa "{{int:config-continue}}", sisimulan mo ang pagluluklok ng MediaWiki.
+Kung nais mo paring gumawa ng mga pagbabago, paki pindutin ang bumalik.',
 	'config-install-step-done' => 'nagawa na',
 	'config-install-step-failed' => 'nabigo',
 	'config-install-extensions' => 'Isinasama ang mga karugtong',
 	'config-install-database' => 'Inihahanda ang kalipunan ng dato',
+	'config-install-schema' => 'Nililikha ang panukala',
 	'config-install-pg-schema-not-exist' => 'Hindi umiiral ang panukala ng PostgreSQL.',
 	'config-install-pg-schema-failed' => 'Nabigo ang paglikha ng mga talahanayan.
 Tiyakin na ang tagagamit na "$1" ay maaaring makasulat sa balangkas na "$2".',
@@ -17342,11 +17885,17 @@ Tiyakin na ang tagagamit na "$1" ay maaaring makasulat sa balangkas na "$2".',
 	'config-install-pg-plpgsql' => 'Sumusuri ng wikang PL/pgSQL',
 	'config-pg-no-plpgsql' => 'Kailangan mong magtalaga ng wikang PL/pgSQL sa loob ng kalipunan ng datong $1',
 	'config-pg-no-create-privs' => 'Ang tinukoy mong akawnt para sa pagtatalaga ay walang sapat na mga pribilehiyo upang makalikha ng isang akawnt.',
+	'config-pg-not-in-role' => 'Umiiral na ang akawnt na tinukoy mo para sa tagagamit ng sangkasaputan.
+Ang tinukoy mong akawnt para sa pagluluklok ay hindi isang tagagamit na super at hindi isang kasapi sa gampanin ng tagagamit ng sangkasaputan, kung kaya\'t hindi nito nagawang makalikha ng mga bagay na pag-aari ng tagagamit ng sangkasaputan.
+
+Sa kasalukuyan, nangangailangan ang MediaWiki na ang mga talahanayan ay maging pag-aari ng tagagamit ng sangkasaputan. Paki tumukoy ng isa pang pangalan ng akawnt na pangsangkasaputan, o pindutin ang "bumalik" at tumukoy ng isang tagagamit na may kaangkupang pribilehiyo ng pagluluklok.',
 	'config-install-user' => 'Nililikha ang tagagamit ng kalipunan ng dato',
 	'config-install-user-alreadyexists' => 'Umiiral na ang tagagamit na "$1"',
 	'config-install-user-create-failed' => 'Nabigo ang paglikha ng tagagamit na "$1": $2',
 	'config-install-user-grant-failed' => 'Nabigo ang pagbibigay ng pahintulot sa tagagamit na "$1": $2',
 	'config-install-user-missing' => 'Hindi umiiral ang tinukoy na tagagamit na si "$1".',
+	'config-install-user-missing-create' => 'Hindi umiiral ang tinukoy na tagagamit na si "$1".
+Paki lagitikin ang nasa ibabang kahong natsetsekan na "likhain ang akawnt" kung nais mong likhain ito.',
 	'config-install-tables' => 'Nililikha ang mga talahanayan',
 	'config-install-tables-exist' => "'''Babala''': Tila umiiral na ang mga talahanayan ng MediaWiki.
 Nilalaktawan ang paglikha.",
@@ -17357,6 +17906,7 @@ Nilalaktawan ang paglikha.",
 Nilalaktawan ang likas na nakatakdang talaan.",
 	'config-install-stats' => 'Sinisimulan ang estadistika',
 	'config-install-keys' => 'Ginagawa ang lihim na mga susi',
+	'config-insecure-keys' => "'''Babala:''' Nalikha ang {{PLURAL:$2|A secure key|ligtas na mga susi}} ($1) habang ang pagluluklok {{PLURAL:$2|ay|ay}} hindi pa lubos na ligtas. Isaalang-alang ang kinakamay na pagbago {{PLURAL:$2|nito|ng mga ito}}.",
 	'config-install-sysop' => 'Nililikha ang akawnt ng tagagamit na tagapangasiwa',
 	'config-install-subscribe-fail' => 'Hindi nagawang magpasipi mula sa mediawiki-announce: $1',
 	'config-install-subscribe-notpossible' => 'Hindi nakalagak ang cURL at hindi makukuha ang allow_url_fopen',
@@ -17380,6 +17930,7 @@ $3
 Kapag nagawa na iyan, maaari ka nang '''[$2 pumasok sa wiki mo]'''.",
 	'config-download-localsettings' => 'Ikargang paibaba ang LocalSettings.php',
 	'config-help' => 'saklolo',
+	'config-nofile' => 'Hindi matagpuan ang talaksang "$1". Binura na ba ito?',
 	'mainpagetext' => "'''Matagumpay na ininstala ang MediaWiki.'''",
 	'mainpagedocfooter' => "Silipin ang [//meta.wikimedia.org/wiki/Help:Contents Patnubay sa Tagagamit] (''\"User's Guide\"'') para sa kaalaman sa paggamit ng wiking ''software''.
 
@@ -17390,7 +17941,15 @@ Kapag nagawa na iyan, maaari ka nang '''[$2 pumasok sa wiki mo]'''.",
 * [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce Tala ng mga pinadadalhan ng liham ng MediaWiki]",
 );
 
-/** Turkish (Türkçe) */
+/** толышә зывон (толышә зывон)
+ * @author Erdemaslancan
+ */
+$messages['tly'] = array(
+	'config-page-options' => 'Кукон',
+);
+
+/** Turkish (Türkçe)
+ */
 $messages['tr'] = array(
 	'mainpagetext' => "'''MediaWiki başarı ile kuruldu.'''",
 	'mainpagedocfooter' => 'Viki yazılımının kullanımı hakkında bilgi almak için [//meta.wikimedia.org/wiki/Help:Contents kullanıcı rehberine] bakınız.
@@ -17427,7 +17986,7 @@ $messages['tt-latn'] = array(
 * [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce MediaWiki'nıñ yaña versiäläre turında xäbärlär yazdırıp alu].",
 );
 
-/** Udmurt (Удмурт)
+/** Udmurt (удмурт)
  * @author Andrewboltachev
  */
 $messages['udm'] = array(
@@ -17497,7 +18056,7 @@ $1',
 	'config-sidebar' => '* [//www.mediawiki.org Сайт MediaWiki]
 * [//www.mediawiki.org/wiki/Help:Contents/uk Керівництво користувача]
 * [//www.mediawiki.org/wiki/Manual:Contents/uk Керівництво адміністратора]
-* [//www.mediawiki.org/wiki/Manual:FAQ/uk FAQ]',
+* [//www.mediawiki.org/wiki/Manual:FAQ/uk FAQ]', # Fuzzy
 	'config-env-good' => 'Перевірку середовища успішно завершено.
 Ви можете встановити MediaWiki.',
 	'config-env-bad' => 'Було проведено перевірку середовища. Ви не можете встановити MediaWiki.',
@@ -17587,7 +18146,8 @@ $messages['ur'] = array(
 	'mainpagetext' => "'''میڈیاوکی کو کامیابی سے چالو کردیا گیا ہے۔.'''",
 );
 
-/** Uzbek (Oʻzbekcha) */
+/** Uzbek (oʻzbekcha)
+ */
 $messages['uz'] = array(
 	'mainpagetext' => "'''MediaWiki muvaffaqiyatli o'rnatildi.'''",
 	'mainpagedocfooter' => "Wiki dasturini ishlatish haqida ma'lumot olish uchun  [//meta.wikimedia.org/wiki/Help:Contents Foydalanuvchi qo'llanmasi] sahifasiga murojaat qiling.
@@ -17615,7 +18175,7 @@ I seguenti cołegamenti i xé en łengua inglese:
 * [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce Mailing list anunsi MediaWiki]",
 );
 
-/** Veps (Vepsän kel’)
+/** Veps (vepsän kel’)
  * @author Игорь Бродский
  */
 $messages['vep'] = array(
@@ -17650,7 +18210,8 @@ $messages['vi'] = array(
 * [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce Danh sách gửi thư về việc phát hành MediaWiki]',
 );
 
-/** Volapük (Volapük) */
+/** Volapük (Volapük)
+ */
 $messages['vo'] = array(
 	'mainpagetext' => "'''El MediaWiki pestiton benosekiko.'''",
 	'mainpagedocfooter' => 'Konsultolös [//meta.wikimedia.org/wiki/Help:Contents Gebanageidian] ad tuvön nünis dö geb programema vükik.
@@ -17662,7 +18223,8 @@ $messages['vo'] = array(
 * [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce Potalised tefü fomams nulik ela MediaWiki]',
 );
 
-/** Võro (Võro) */
+/** Võro (Võro)
+ */
 $messages['vro'] = array(
 	'mainpagetext' => "'''MediaWiki tarkvara paika säet.'''",
 	'mainpagedocfooter' => 'Vikitarkvara pruukmisõ kotsilõ loeq mano:
@@ -17692,7 +18254,8 @@ $messages['war'] = array(
 * [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce MediaWiki release mailing list]",
 );
 
-/** Wolof (Wolof) */
+/** Wolof (Wolof)
+ */
 $messages['wo'] = array(
 	'mainpagetext' => "'''Campug MediaWiki gi sotti na . '''",
 	'mainpagedocfooter' => 'Saytul [//meta.wikimedia.org/wiki/Ndimbal:Ndefu Gindikaayu jëfandikukat bi] ngir yeneeni xibaar ci jëfandiku gu tëriin gi.
@@ -17717,7 +18280,7 @@ $messages['wuu'] = array(
 * [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce MediaWiki 发布邮件列表]',
 );
 
-/** Kalmyk (Хальмг)
+/** Kalmyk (хальмг)
  * @author Huuchin
  */
 $messages['xal'] = array(
@@ -17765,7 +18328,8 @@ $messages['yo'] = array(
 * [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce MediaWiki release mailing list]",
 );
 
-/** Cantonese (粵語) */
+/** Cantonese (粵語)
+ */
 $messages['yue'] = array(
 	'mainpagetext' => "'''MediaWiki已經裝好。'''",
 	'mainpagedocfooter' => '參閱[//meta.wikimedia.org/wiki/Help:Contents 用戶指引]（英），裏面有資料講點用wiki軟件。
@@ -17776,7 +18340,8 @@ $messages['yue'] = array(
 * [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce MediaWiki 發佈郵件名單]（英）',
 );
 
-/** Zeeuws (Zeêuws) */
+/** Zeeuws (Zeêuws)
+ */
 $messages['zea'] = array(
 	'mainpagetext' => "'''De installaotie van MediaWiki is geslaegd.'''",
 	'mainpagedocfooter' => "Raedpleeg de [//meta.wikimedia.org/wiki/ZEA_Ulpe:Inhoudsopgaeve andleidieng] voe informatie over 't gebruuk van de wikisoftware.
@@ -17788,12 +18353,13 @@ $messages['zea'] = array(
 * [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce Mailienglieste voe ankondigiengen van nieuwe versies]",
 );
 
-/** Simplified Chinese (‪中文（简体）‬)
+/** Simplified Chinese (中文（简体）‎)
  * @author Hydra
  * @author Hzy980512
  * @author Liangent
  * @author PhiLiP
  * @author Xiaomingyan
+ * @author Yfdyh000
  * @author 阿pp
  */
 $messages['zh-hans'] = array(
@@ -18221,6 +18787,7 @@ $3
 当本步骤完成后，您可以 '''[$2 进入您的wiki]'''。",
 	'config-download-localsettings' => '下载LocalSettings.php',
 	'config-help' => '帮助',
+	'config-nofile' => '找不到文件“$1”。它是否已被删除？',
 	'mainpagetext' => "'''已成功安装MediaWiki。'''",
 	'mainpagedocfooter' => '请查阅[//meta.wikimedia.org/wiki/Help:Contents 用户指南]以获取使用本wiki软件的信息！
 
@@ -18230,7 +18797,7 @@ $3
 * [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce MediaWiki发布邮件列表]',
 );
 
-/** Traditional Chinese (‪中文（繁體）‬)
+/** Traditional Chinese (中文（繁體）‎)
  * @author Hzy980512
  * @author Liangent
  * @author Mark85296341
@@ -18307,6 +18874,7 @@ $1',
 	'config-no-db' => '找不到合適的數據庫驅動！您需要為PHP安裝數據庫驅動。目前支持以下數據庫：$1。
 
 如果您正在使用共享主機，請向您的主機提供商申請安裝合適的數據庫驅動。如果您通過自行編譯安裝的PHP，請對其進行重新配置以啟用數據庫客戶端，例如使用<code>./configure --with-mysql</code>。如果您通過Debian或Ubuntu包安裝的PHP，您還需要安裝php5-mysql模塊。',
+	'config-outdated-sqlite' => "'''警告'''：您已安裝SQLite $1，但是它的版本低於最低要求版本$2。因此您無法選擇SQLite。",
 	'config-no-fts3' => "'''警告'''：已編譯的SQLite不包含[//sqlite.org/fts3.html FTS3模塊]，後台搜索功能將不可用。",
 	'config-register-globals' => "'''警告：PHP的<code>[http://php.net/register_globals register_globals]</code>選項被啟用。請盡量禁用該功能，'''雖然不會影響MediaWiki的運行，但您的服務器會被暴露給潛在的安全漏洞。",
 	'config-magic-quotes-runtime' => "'''致命錯誤：[http://www.php.net/manual/en/ref.info.php#ini.magic-quotes-runtime magic_quotes_runtime]被啟用！'''
@@ -18323,11 +18891,13 @@ $1',
 	'config-pcre-no-utf8' => "'''致命錯誤'''：PHP的PCRE模塊在編譯時可能沒有包含PCRE_UTF8支持。MediaWiki需要UTF-8支持才能正常工作。",
 	'config-memory-raised' => 'PHP的內存使用上限<code>memory_limit</code>為$1，自動提升到$2。',
 	'config-memory-bad' => "'''警告：'''PHP的內存使用上限<code>memory_limit</code>為$1。該設定可能過低，並導致安裝失敗！",
+	'config-ctype' => "'''毀滅性錯誤'''：PHP必須有[http://www.php.net/manual/en/ctype.installation.php Ctype 擴展]來支持編譯。",
 	'config-xcache' => '[http://xcache.lighttpd.net/ XCache]已安裝',
 	'config-apc' => '[http://www.php.net/apc APC]已安裝',
 	'config-wincache' => '[http://www.iis.net/download/WinCacheForPhp WinCache]已安裝',
 	'config-no-cache' => "'''警告：'''找不到[http://www.php.net/apc APC]、[http://xcache.lighttpd.net/ XCache]或[http://www.iis.net/download/WinCacheForPhp WinCache]，無法啟用對象緩存。
 Object caching is not enabled.",
+	'config-mod-security' => "'''警告'''：您的服務器已啟動[http://modsecurity.org/ mod_security]。若其配置錯誤, 會導致MediaWiki和其他軟件的錯誤並允許用戶任意發布內容。如果您遇到任何錯誤，請查閱[http://modsecurity.org/documentation/ mod_security文檔]或聯繫您的客服。",
 	'config-diff3-bad' => '找不到GNU diff3。',
 	'config-imagemagick' => '已找到ImageMagick：<code>$1</code>。如果你啟用了上傳功能，縮略圖功能也將被啟用。',
 	'config-gd' => '已找到內建的GD圖形庫。如果你啟用了上傳功能，縮略圖功能也將被啟用。',
@@ -18343,6 +18913,13 @@ Object caching is not enabled.",
 	'config-suhosin-max-value-length' => 'Suhosin已經安裝並將GET請求的參數長度限制在$1字節。MediaWiki的ResourceLoader部件可以在此限制下正常工作，但其性能會被降低。如果可能，請在php.ini中將suhosin.get.max_value_length設為1024或更高值，並在LocalSettings.php中將$wgResourceLoaderMaxQueryLength設為同一值。',
 	'config-db-type' => '資料庫類型：',
 	'config-db-host' => '資料庫主機：',
+	'config-db-host-help' => '如果您的數據庫在別的服務器上，請在這裡輸入它的域名或IP地址。
+
+如果您在使用共享網站套餐，您的網站商應該已在他們的控制面板中給您數據庫信息了。
+
+如果您在Windows中安裝並且使用MySQL，“localhost”可能無效。如果確實無效，請輸入“127.0.0.1”作為IP地址。
+
+如果您在使用PostgreSQL，並且要用Unix socket來連接，請留空。',
 	'config-db-host-oracle' => '資料庫的 TNS：',
 	'config-db-host-oracle-help' => '請輸入合法的[http://download.oracle.com/docs/cd/B28359_01/network.111/b28317/tnsnames.htm 本地連接名]，並確保tnsnames.ora文件對本安裝程序可見。<br />如果您使用的客戶端庫為10g或更新的版本，您還可以使用[http://download.oracle.com/docs/cd/E11882_01/network.112/e10836/naming.htm 簡單連接名方法]（easy connect naming method）。',
 	'config-db-wiki-settings' => '識別這個 Wiki',
diff --git a/includes/installer/MysqlUpdater.php b/includes/installer/MysqlUpdater.php
index 82de913618..3f1dad9f2e 100644
--- a/includes/installer/MysqlUpdater.php
+++ b/includes/installer/MysqlUpdater.php
@@ -209,7 +209,6 @@ class MysqlUpdater extends DatabaseUpdater {
 			array( 'modifyField', 'user_former_groups', 'ufg_group', 'patch-ufg_group-length-increase.sql' ),
 
 			// 1.20
-			array( 'addTable', 'config',                            'patch-config.sql' ),
 			array( 'addIndex', 'revision', 'page_user_timestamp', 'patch-revision-user-page-index.sql' ),
 			array( 'addField', 'ipblocks',      'ipb_parent_block_id',           'patch-ipb-parent-block-id.sql' ),
 			array( 'addIndex', 'ipblocks',      'ipb_parent_block_id',           'patch-ipb-parent-block-id-index.sql' ),
diff --git a/includes/installer/OracleUpdater.php b/includes/installer/OracleUpdater.php
index f946d59a96..5523470e1f 100644
--- a/includes/installer/OracleUpdater.php
+++ b/includes/installer/OracleUpdater.php
@@ -67,7 +67,6 @@ class OracleUpdater extends DatabaseUpdater {
 			array( 'modifyField', 'user_former_groups', 'ufg_group', 'patch-ufg_group-length-increase.sql' ),
 
 			//1.20
-			array( 'addTable', 'config', 'patch-config.sql' ),
 			array( 'addIndex', 'ipblocks', 'i05', 'patch-ipblocks_i05_index.sql' ),
 			array( 'addIndex', 'revision', 'i05', 'patch-revision_i05_index.sql' ),
 			array( 'dropField', 'category', 'cat_hidden', 'patch-cat_hidden.sql' ),
diff --git a/includes/installer/PostgresUpdater.php b/includes/installer/PostgresUpdater.php
index 2942c0b7f7..5a13d4211d 100644
--- a/includes/installer/PostgresUpdater.php
+++ b/includes/installer/PostgresUpdater.php
@@ -89,7 +89,6 @@ class PostgresUpdater extends DatabaseUpdater {
 			array( 'addTable', 'module_deps',       'patch-module_deps.sql' ),
 			array( 'addTable', 'uploadstash',       'patch-uploadstash.sql' ),
 			array( 'addTable', 'user_former_groups','patch-user_former_groups.sql' ),
-			array( 'addTable', 'config',            'patch-config.sql' ),
 			array( 'addTable', 'external_user',     'patch-external_user.sql' ),
 
 			# Needed before new field
@@ -155,6 +154,10 @@ class PostgresUpdater extends DatabaseUpdater {
 			array( 'addPgField', 'archive',       'ar_sha1',              "TEXT NOT NULL DEFAULT ''" ),
 			array( 'addPgField', 'uploadstash',   'us_chunk_inx',         "INTEGER NULL" ),
 			array( 'addPgField', 'job',           'job_timestamp',        "TIMESTAMPTZ" ),
+			array( 'addPgField', 'job',           'job_random',           "INTEGER NOT NULL DEFAULT 0" ),
+			array( 'addPgField', 'job',           'job_token',            "TEXT NOT NULL DEFAULT ''" ),
+			array( 'addPgField', 'job',           'job_token_timestamp',  "TIMESTAMPTZ" ),
+			array( 'addPgField', 'job',           'job_sha1',             "TEXT NOT NULL DEFAULT ''" ),
 
 			# type changes
 			array( 'changeField', 'archive',       'ar_deleted',      'smallint', '' ),
@@ -228,6 +231,8 @@ class PostgresUpdater extends DatabaseUpdater {
 			array( 'addPgIndex', 'logging',       'logging_page_id_time',   '(log_page,log_timestamp)' ),
 			array( 'addPgIndex', 'iwlinks',       'iwl_prefix_title_from',  '(iwl_prefix, iwl_title, iwl_from)' ),
 			array( 'addPgIndex', 'job',           'job_timestamp_idx',      '(job_timestamp)' ),
+			array( 'addPgIndex', 'job',           'job_sha1',               '(job_sha1)' ),
+			array( 'addPgIndex', 'job',           'job_cmd_token',          '(job_cmd, job_token, job_random)' ),
 			array( 'addPgIndex', 'filearchive',   'fa_sha1',                '(fa_sha1)' ),
 
 			array( 'checkIndex', 'pagelink_unique', array(
diff --git a/includes/installer/SqliteUpdater.php b/includes/installer/SqliteUpdater.php
index c3f7a81674..2fa3f31c76 100644
--- a/includes/installer/SqliteUpdater.php
+++ b/includes/installer/SqliteUpdater.php
@@ -88,7 +88,6 @@ class SqliteUpdater extends DatabaseUpdater {
 			array( 'modifyField', 'user_former_groups', 'ufg_group', 'patch-ug_group-length-increase.sql' ),
 
 			// 1.20
-			array( 'addTable', 'config',                            'patch-config.sql' ),
 			array( 'addIndex', 'revision', 'page_user_timestamp', 'patch-revision-user-page-index.sql' ),
 			array( 'addField', 'ipblocks', 'ipb_parent_block_id', 'patch-ipb-parent-block-id.sql' ),
 			array( 'addIndex', 'ipblocks', 'ipb_parent_block_id', 'patch-ipb-parent-block-id-index.sql' ),
diff --git a/includes/job/JobQueue.php b/includes/job/JobQueue.php
index 6409cffc41..21ef6d34e1 100644
--- a/includes/job/JobQueue.php
+++ b/includes/job/JobQueue.php
@@ -26,11 +26,12 @@
  * Class to handle enqueueing and running of background jobs
  *
  * @ingroup JobQueue
- * @since 1.20
+ * @since 1.21
  */
 abstract class JobQueue {
 	protected $wiki; // string; wiki ID
 	protected $type; // string; job type
+	protected $order; // string; job priority for pop()
 
 	const QoS_Atomic = 1; // integer; "all-or-nothing" job insertions
 
@@ -38,16 +39,23 @@ abstract class JobQueue {
 	 * @param $params array
 	 */
 	protected function __construct( array $params ) {
-		$this->wiki = $params['wiki'];
-		$this->type = $params['type'];
+		$this->wiki  = $params['wiki'];
+		$this->type  = $params['type'];
+		$this->order = isset( $params['order'] ) ? $params['order'] : 'random';
 	}
 
 	/**
 	 * Get a job queue object of the specified type.
 	 * $params includes:
-	 *     class : what job class to use (determines job type)
+	 *     class : What job class to use (determines job type)
 	 *     wiki  : wiki ID of the wiki the jobs are for (defaults to current wiki)
 	 *     type  : The name of the job types this queue handles
+	 *     order : Order that pop() selects jobs, either "timestamp" or "random".
+	 *             If "timestamp" is used, the queue will effectively be FIFO. Note that
+	 *             pop() will not be exactly FIFO, and even if it was, job completion would
+	 *             not appear to be exactly FIFO since jobs can take different times to finish.
+	 *             If "random" is used, pop() will pick jobs in random order. This might be
+	 *             useful for improving concurrency depending on the queue storage medium.
 	 *
 	 * @param $params array
 	 * @return JobQueue
@@ -80,7 +88,10 @@ abstract class JobQueue {
 	}
 
 	/**
-	 * @return bool Quickly check if the queue is empty
+	 * Quickly check if the queue is empty.
+	 * Queue classes should use caching if they are any slower without memcached.
+	 *
+	 * @return bool
 	 */
 	final public function isEmpty() {
 		wfProfileIn( __METHOD__ );
diff --git a/includes/job/JobQueueDB.php b/includes/job/JobQueueDB.php
index bea4a6f69a..223ef41fe8 100644
--- a/includes/job/JobQueueDB.php
+++ b/includes/job/JobQueueDB.php
@@ -25,10 +25,10 @@
  * Class to handle job queues stored in the DB
  *
  * @ingroup JobQueue
- * @since 1.20
+ * @since 1.21
  */
 class JobQueueDB extends JobQueue {
-	const CACHE_TTL      = 30; // integer; seconds
+	const CACHE_TTL      = 300; // integer; seconds
 	const MAX_JOB_RANDOM = 2147483647; // 2^31 - 1; used for job_random
 
 	/**
@@ -97,7 +97,7 @@ class JobQueueDB extends JobQueue {
 					$dbw->setFlag( $autoTrx ? DBO_TRX : 0 ); // restore automatic begin()
 				}
 
-				$wgMemc->set( $key, 'false', $ttl );
+				$wgMemc->set( $key, 'false', $ttl ); // queue is not empty
 			} );
 		}
 
@@ -111,48 +111,53 @@ class JobQueueDB extends JobQueue {
 	protected function doPop() {
 		global $wgMemc;
 
-		$uuid = wfRandomString( 32 ); // pop attempt
+		if ( $wgMemc->get( $this->getEmptinessCacheKey() ) === 'true' ) {
+			return false; // queue is empty
+		}
 
 		$dbw = $this->getMasterDB();
 		$dbw->commit( __METHOD__, 'flush' ); // flush existing transaction
 
+		$uuid = wfRandomString( 32 ); // pop attempt
 		$job = false; // job popped off
 		$autoTrx = $dbw->getFlag( DBO_TRX ); // automatic begin() enabled?
 		$dbw->clearFlag( DBO_TRX ); // make each query its own transaction
 		try {
 			do { // retry when our row is invalid or deleted as a duplicate
-				$row = false; // row claimed
-				$rand = mt_rand( 0, self::MAX_JOB_RANDOM ); // encourage concurrent UPDATEs
-				$gte  = (bool)mt_rand( 0, 1 ); // find rows with rand before/after $rand
-				// Try to reserve a DB row...
-				if ( $this->claim( $uuid, $rand, $gte ) || $this->claim( $uuid, $rand, !$gte ) ) {
-					// Fetch any row that we just reserved...
-					$row = $dbw->selectRow( 'job', '*',
-						array( 'job_cmd' => $this->type, 'job_token' => $uuid ), __METHOD__ );
-					// Check if another process deleted it as a duplicate
-					if ( !$row ) {
-						wfDebugLog( 'JobQueueDB', "Row deleted as duplicate by another process." );
-						continue; // try again
-					}
-					// Get the job object from the row...
-					$title = Title::makeTitleSafe( $row->job_namespace, $row->job_title );
-					if ( !$title ) {
-						$dbw->delete( 'job', array( 'job_id' => $row->job_id ), __METHOD__ );
-						wfDebugLog( 'JobQueueDB', "Row has invalid title '{$row->job_title}'." );
-						continue; // try again
+				// Try to reserve a row in the DB...
+				if ( $this->order === 'timestamp' ) { // oldest first
+					$row = $this->claimOldest( $uuid );
+				} else { // random first
+					$rand = mt_rand( 0, self::MAX_JOB_RANDOM ); // encourage concurrent UPDATEs
+					$gte  = (bool)mt_rand( 0, 1 ); // find rows with rand before/after $rand
+					$row  = $this->claimRandom( $uuid, $rand, $gte );
+					if ( !$row ) { // need to try the other direction
+						$row = $this->claimRandom( $uuid, $rand, !$gte );
 					}
-					$job = Job::factory( $row->job_cmd, $title,
-						self::extractBlob( $row->job_params ), $row->job_id );
-					// Delete any *other* duplicate jobs in the queue...
-					if ( $job->ignoreDuplicates() && strlen( $row->job_sha1 ) ) {
-						$dbw->delete( 'job',
-							array( 'job_sha1' => $row->job_sha1,
-								"job_id != {$dbw->addQuotes( $row->job_id )}" ),
-							__METHOD__
-						);
-					}
-				} else {
+				}
+				// Check if we found a row to reserve...
+				if ( !$row ) {
 					$wgMemc->set( $this->getEmptinessCacheKey(), 'true', self::CACHE_TTL );
+					break; // nothing to do
+				}
+				// Get the job object from the row...
+				$title = Title::makeTitleSafe( $row->job_namespace, $row->job_title );
+				if ( !$title ) {
+					$dbw->delete( 'job', array( 'job_id' => $row->job_id ), __METHOD__ );
+					wfIncrStats( 'job-pop' );
+					wfDebugLog( 'JobQueueDB', "Row has invalid title '{$row->job_title}'." );
+					continue; // try again
+				}
+				$job = Job::factory( $row->job_cmd, $title,
+					self::extractBlob( $row->job_params ), $row->job_id );
+				// Delete any *other* duplicate jobs in the queue...
+				if ( $job->ignoreDuplicates() && strlen( $row->job_sha1 ) ) {
+					$dbw->delete( 'job',
+						array( 'job_sha1' => $row->job_sha1,
+							"job_id != {$dbw->addQuotes( $row->job_id )}" ),
+						__METHOD__
+					);
+					wfIncrStats( 'job-pop', $dbw->affectedRows() );
 				}
 				break; // done
 			} while( true );
@@ -167,51 +172,105 @@ class JobQueueDB extends JobQueue {
 
 	/**
 	 * Reserve a row with a single UPDATE without holding row locks over RTTs...
+	 *
 	 * @param $uuid string 32 char hex string
 	 * @param $rand integer Random unsigned integer (31 bits)
 	 * @param $gte bool Search for job_random >= $random (otherwise job_random <= $random)
-	 * @return integer Number of affected rows
+	 * @return Row|false
 	 */
-	protected function claim( $uuid, $rand, $gte ) {
+	protected function claimRandom( $uuid, $rand, $gte ) {
 		$dbw  = $this->getMasterDB();
 		$dir  = $gte ? 'ASC' : 'DESC';
 		$ineq = $gte ? '>=' : '<=';
-		if ( $dbw->getType() === 'mysql' ) {
-			// Per http://bugs.mysql.com/bug.php?id=6980, we can't use subqueries on the
-			// same table being changed in an UPDATE query in MySQL (gives Error: 1093).
-			// Oracle and Postgre have no such limitation. However, MySQL offers an
-			// alternative here by supporting ORDER BY + LIMIT for UPDATE queries.
-			// The DB wrapper functions do not support this, so it's done manually.
-			$dbw->query( "UPDATE {$dbw->tableName( 'job' )}
-				SET
-					job_token = {$dbw->addQuotes( $uuid ) },
-					job_token_timestamp = {$dbw->addQuotes( $dbw->timestamp() )}
-				WHERE (
-					job_cmd = {$dbw->addQuotes( $this->type )}
-					AND job_token = {$dbw->addQuotes( '' )}
-					AND job_random {$ineq} {$dbw->addQuotes( $rand )}
-				) ORDER BY job_random {$dir} LIMIT 1",
-				__METHOD__
-			);
-		} else {
-			// Use a subquery to find the job, within an UPDATE to claim it.
-			// This uses as much of the DB wrapper functions as possible.
-			$dbw->update( 'job',
-				array( 'job_token' => $uuid, 'job_token_timestamp' => $dbw->timestamp() ),
-				array( 'job_id = (' .
-					$dbw->selectSQLText( 'job', 'job_id',
-						array(
-							'job_cmd'   => $this->type,
-							'job_token' => '',
-							"job_random {$ineq} {$dbw->addQuotes( $rand )}" ),
-						__METHOD__,
-						array( 'ORDER BY' => "job_random {$dir}", 'LIMIT' => 1 ) ) .
-					')'
-				),
-				__METHOD__
+
+		$row = false; // the row acquired
+		// This uses a replication safe method for acquiring jobs. One could use UPDATE+LIMIT
+		// instead, but that either uses ORDER BY (in which case it deadlocks in MySQL) or is
+		// not replication safe. Due to http://bugs.mysql.com/bug.php?id=6980, subqueries cannot
+		// be used here with MySQL.
+		do {
+			$row = $dbw->selectRow( 'job', '*', // find a random job
+				array(
+					'job_cmd'   => $this->type,
+					'job_token' => '',
+					"job_random {$ineq} {$dbw->addQuotes( $rand )}" ),
+				__METHOD__,
+				array( 'ORDER BY' => "job_random {$dir}" )
 			);
-		}
-		return $dbw->affectedRows();
+			if ( $row ) { // claim the job
+				$dbw->update( 'job', // update by PK
+					array( 'job_token' => $uuid, 'job_token_timestamp' => $dbw->timestamp() ),
+					array( 'job_cmd' => $this->type, 'job_id' => $row->job_id, 'job_token' => '' ),
+					__METHOD__
+				);
+				// This might get raced out by another runner when claiming the previously
+				// selected row. The use of job_random should minimize this problem, however.
+				if ( !$dbw->affectedRows() ) {
+					$row = false; // raced out
+				}
+			} else {
+				break; // nothing to do
+			}
+		} while ( !$row );
+
+		return $row;
+	}
+
+	/**
+	 * Reserve a row with a single UPDATE without holding row locks over RTTs...
+	 *
+	 * @param $uuid string 32 char hex string
+	 * @return Row|false
+	 */
+	protected function claimOldest( $uuid ) {
+		$dbw  = $this->getMasterDB();
+
+		$row = false; // the row acquired
+		do {
+			if ( $dbw->getType() === 'mysql' ) {
+				// Per http://bugs.mysql.com/bug.php?id=6980, we can't use subqueries on the
+				// same table being changed in an UPDATE query in MySQL (gives Error: 1093).
+				// Oracle and Postgre have no such limitation. However, MySQL offers an
+				// alternative here by supporting ORDER BY + LIMIT for UPDATE queries.
+				$dbw->query( "UPDATE {$dbw->tableName( 'job' )}
+					SET
+						job_token = {$dbw->addQuotes( $uuid ) },
+						job_token_timestamp = {$dbw->addQuotes( $dbw->timestamp() )}
+					WHERE (
+						job_cmd = {$dbw->addQuotes( $this->type )}
+						AND job_token = {$dbw->addQuotes( '' )}
+					) ORDER BY job_random ASC LIMIT 1",
+					__METHOD__
+				);
+			} else {
+				// Use a subquery to find the job, within an UPDATE to claim it.
+				// This uses as much of the DB wrapper functions as possible.
+				$dbw->update( 'job',
+					array( 'job_token' => $uuid, 'job_token_timestamp' => $dbw->timestamp() ),
+					array( 'job_id = (' .
+						$dbw->selectSQLText( 'job', 'job_id',
+							array( 'job_cmd' => $this->type, 'job_token' => '' ),
+							__METHOD__,
+							array( 'ORDER BY' => 'job_random ASC', 'LIMIT' => 1 ) ) .
+						')'
+					),
+					__METHOD__
+				);
+			}
+			// Fetch any row that we just reserved...
+			if ( $dbw->affectedRows() ) {
+				$row = $dbw->selectRow( 'job', '*',
+					array( 'job_cmd' => $this->type, 'job_token' => $uuid ), __METHOD__
+				);
+				if ( !$row ) { // raced out by duplicate job removal
+					wfDebugLog( 'JobQueueDB', "Row deleted as duplicate by another process." );
+				}
+			} else {
+				break; // nothing to do
+			}
+		} while ( !$row );
+
+		return $row;
 	}
 
 	/**
@@ -220,10 +279,7 @@ class JobQueueDB extends JobQueue {
 	 */
 	protected function doAck( Job $job ) {
 		$dbw = $this->getMasterDB();
-		if ( $dbw->trxLevel() ) {
-			wfWarn( "Attempted to ack a job in a transaction; committing first." );
-			$dbw->commit(); // push existing transaction
-		}
+		$dbw->commit( __METHOD__, 'flush' ); // flush existing transaction
 
 		$autoTrx = $dbw->getFlag( DBO_TRX ); // automatic begin() enabled?
 		$dbw->clearFlag( DBO_TRX ); // make each query its own transaction
@@ -274,12 +330,17 @@ class JobQueueDB extends JobQueue {
 			'job_params'    => self::makeBlob( $job->getParams() ),
 		);
 		// Additional job metadata
+		if ( $this->order === 'timestamp' ) { // oldest first
+			$random = time() - 1325376000; // seconds since "January 1, 2012"
+		} else { // random first
+			$random = mt_rand( 0, self::MAX_JOB_RANDOM );
+		}
 		$dbw = $this->getMasterDB();
 		$metaFields = array(
 			'job_id'        => $dbw->nextSequenceValue( 'job_job_id_seq' ),
 			'job_timestamp' => $dbw->timestamp(),
 			'job_sha1'      => wfBaseConvert( sha1( serialize( $descFields ) ), 16, 36, 32 ),
-			'job_random'    => mt_rand( 0, self::MAX_JOB_RANDOM )
+			'job_random'    => $random
 		);
 		return ( $descFields + $metaFields );
 	}
diff --git a/includes/job/JobQueueGroup.php b/includes/job/JobQueueGroup.php
index 69bcf011be..48f27469e5 100644
--- a/includes/job/JobQueueGroup.php
+++ b/includes/job/JobQueueGroup.php
@@ -25,7 +25,7 @@
  * Class to handle enqueueing of background jobs
  *
  * @ingroup JobQueue
- * @since 1.20
+ * @since 1.21
  */
 class JobQueueGroup {
 	/** @var Array */
@@ -62,18 +62,14 @@ class JobQueueGroup {
 	public function get( $type ) {
 		global $wgJobTypeConf;
 
-		$conf = false;
+		$conf = array( 'wiki' => $this->wiki, 'type' => $type );
 		if ( isset( $wgJobTypeConf[$type] ) ) {
-			$conf = $wgJobTypeConf[$type];
+			$conf = $conf + $wgJobTypeConf[$type];
 		} else {
-			$conf = $wgJobTypeConf['default'];
+			$conf = $conf + $wgJobTypeConf['default'];
 		}
 
-		return JobQueue::factory( array(
-			'class' => $conf['class'],
-			'wiki'  => $this->wiki,
-			'type'  => $type,
-		) );
+		return JobQueue::factory( $conf );
 	}
 
 	/**
@@ -157,4 +153,17 @@ class JobQueueGroup {
 
 		return array_diff( $this->getQueueTypes(), $wgJobTypesExcludedFromDefaultQueue );
 	}
+
+	/**
+	 * @return Array List of job types that have non-empty queues
+	 */
+	public function getQueuesWithJobs() {
+		$types = array();
+		foreach ( $this->getQueueTypes() as $type ) {
+			if ( !$this->get( $type )->isEmpty() ) {
+				$types[] = $type;
+			}
+		}
+		return $types;
+	}
 }
diff --git a/includes/job/jobs/DoubleRedirectJob.php b/includes/job/jobs/DoubleRedirectJob.php
index b1b96b62ab..ddd4fcca15 100644
--- a/includes/job/jobs/DoubleRedirectJob.php
+++ b/includes/job/jobs/DoubleRedirectJob.php
@@ -94,7 +94,7 @@ class DoubleRedirectJob extends Job {
 			return true;
 		}
 		$content = $targetRev->getContent();
-		$currentDest = $content->getRedirectTarget();
+		$currentDest = $content ? $content->getRedirectTarget() : null;
 		if ( !$currentDest || !$currentDest->equals( $this->redirTitle ) ) {
 			wfDebug( __METHOD__.": Redirect has changed since the job was queued\n" );
 			return true;
diff --git a/includes/job/jobs/NullJob.php b/includes/job/jobs/NullJob.php
new file mode 100644
index 0000000000..eef3bf7888
--- /dev/null
+++ b/includes/job/jobs/NullJob.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * Degenerate job that just replaces itself in the queue.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @ingroup Cache
+ */
+
+/**
+ * Degenerate job that just replace itself in the queue.
+ * Useful for lock contention and performance testing.
+ *
+ * @ingroup JobQueue
+ */
+class NullJob extends Job {
+	/**
+	 * @param $title Title (can be anything)
+	 * @param $params Array: job parameters (lives, usleep)
+	 * @param $id Integer: job id
+	 */
+	function __construct( $title, $params, $id = 0 ) {
+		parent::__construct( 'null', $title, $params, $id );
+		if ( !isset( $this->params['lives'] ) ) {
+			$this->params['lives'] = 1;
+		}
+		if ( !isset( $this->params['usleep'] ) ) {
+			$this->params['usleep'] = 0;
+		}
+	}
+
+	public function run() {
+		if ( $this->params['usleep'] > 0 ) {
+			usleep( $this->params['usleep'] );
+		}
+		if ( $this->params['lives'] > 1 ) {
+			$params = $this->params;
+			$params['lives']--;
+			$job = new self( $this->title, $params );
+			$job->insert();
+		}
+		return true;
+	}
+}
diff --git a/includes/job/jobs/RefreshLinksJob.php b/includes/job/jobs/RefreshLinksJob.php
index a29f29fe64..384244fbad 100644
--- a/includes/job/jobs/RefreshLinksJob.php
+++ b/includes/job/jobs/RefreshLinksJob.php
@@ -70,18 +70,17 @@ class RefreshLinksJob extends Job {
 	}
 
 	public static function runForTitleInternal( Title $title, Revision $revision, $fname ) {
-		global $wgContLang;
+		wfProfileIn( $fname );
+		$content = $revision->getContent( Revision::RAW );
 
-		wfProfileIn( $fname . '-parse' );
-		$options = ParserOptions::newFromUserAndLang( new User, $wgContLang );
-		$content = $revision->getContent();
-		$parserOutput = $content->getParserOutput( $title, $revision->getId(), $options, false );
-		wfProfileOut( $fname . '-parse' );
+		if ( !$content ) {
+			// if there is no content, pretend the content is empty
+			$content = $revision->getContentHandler()->makeEmptyContent();
+		}
 
-		wfProfileIn( $fname . '-update' );
-		$updates = $content->getSecondaryDataUpdates( $title, null, false, $parserOutput  );
+		$updates = $content->getSecondaryDataUpdates( $title, null, false );
 		DataUpdate::runUpdates( $updates );
-		wfProfileOut( $fname . '-update' );
+		wfProfileOut( $fname );
 	}
 }
 
diff --git a/includes/json/Services_JSON.php b/includes/json/Services_JSON.php
index 398ed6a28f..2566072dba 100644
--- a/includes/json/Services_JSON.php
+++ b/includes/json/Services_JSON.php
@@ -283,7 +283,7 @@ class Services_JSON
 		return $this->encode2($var);
 	}
 
-   	/**
+	/**
 	 * encodes an arbitrary variable into JSON format
 	 *
 	 * @param $var Mixed: any number, boolean, string, array, or object to be encoded.
diff --git a/includes/logging/LogFormatter.php b/includes/logging/LogFormatter.php
index 7d94a30bd4..8c1e294b3e 100644
--- a/includes/logging/LogFormatter.php
+++ b/includes/logging/LogFormatter.php
@@ -293,6 +293,28 @@ class LogFormatter {
 				}
 				break;
 
+			case 'rights':
+				if ( count( $parameters['4::oldgroups'] ) ) {
+					$oldgroups = implode( ', ', $parameters['4::oldgroups'] );
+				} else {
+					$oldgroups = wfMessage( 'rightsnone' )->inContentLanguage()->escaped();
+				}
+				if ( count( $parameters['5::newgroups'] ) ) {
+					$newgroups = implode( ', ', $parameters['5::newgroups'] );
+				} else {
+					$newgroups = wfMessage( 'rightsnone' )->inContentLanguage()->escaped();
+				}
+				switch( $entry->getSubtype() ) {
+					case 'rights':
+						$text = wfMessage( 'rightslogentry' )
+							->rawParams( $target, $oldgroups, $newgroups )->inContentLanguage()->escaped();
+						break;
+					case 'autopromote':
+						$text = wfMessage( 'rightslogentry-autopromote' )
+							->rawParams( $target, $oldgroups, $newgroups )->inContentLanguage()->escaped();
+						break;
+				}
+				break;
 
 			// case 'suppress' --private log -- aaron  (sign your messages so we know who to blame in a few years :-D)
 			// default:
@@ -1009,3 +1031,88 @@ class NewUsersLogFormatter extends LogFormatter {
 		return array();
 	}
 }
+
+/**
+ * This class formats rights log entries.
+ * @since 1.21
+ */
+class RightsLogFormatter extends LogFormatter {
+	protected function makePageLink( Title $title = null, $parameters = array() ) {
+		global $wgContLang, $wgUserrightsInterwikiDelimiter;
+
+		if ( !$this->plaintext ) {
+			$text = $wgContLang->ucfirst( $title->getText() );
+			$parts = explode( $wgUserrightsInterwikiDelimiter, $text, 2 );
+
+			if ( count( $parts ) === 2 ) {
+				$titleLink = WikiMap::foreignUserLink( $parts[1], $parts[0],
+					htmlspecialchars( $title->getPrefixedText() ) );
+
+				if ( $titleLink !== false ) {
+					return $titleLink;
+				}
+			}
+		}
+
+		return parent::makePageLink( $title, $parameters );
+	}
+
+	protected function getMessageKey() {
+		$key = parent::getMessageKey();
+		$params = $this->getMessageParameters();
+		if ( !isset( $params[3] ) && !isset( $params[4] ) ) {
+			$key .= '-legacy';
+		}
+		return $key;
+	}
+
+	protected function getMessageParameters() {
+		$params = parent::getMessageParameters();
+
+		// Really old entries
+		if ( !isset( $params[3] ) && !isset( $params[4] ) ) {
+			return $params;
+		}
+
+		$oldGroups = $params[3];
+		$newGroups = $params[4];
+
+		// Less old entries
+		if ( $oldGroups === '' ) {
+			$oldGroups = array();
+		} elseif ( is_string( $oldGroups ) ) {
+			$oldGroups = array_map( 'trim', explode( ',', $oldGroups ) );
+		}
+		if ( $newGroups === '' ) {
+			$newGroups = array();
+		} elseif ( is_string( $newGroups ) ) {
+			$newGroups = array_map( 'trim', explode( ',', $newGroups ) );
+		}
+
+		$userName = $this->entry->getTarget()->getText();
+		if ( !$this->plaintext && count( $oldGroups ) ) {
+			foreach ( $oldGroups as &$group ) {
+				$group = User::getGroupMember( $group, $userName );
+			}
+		}
+		if ( !$this->plaintext && count( $newGroups ) ) {
+			foreach ( $newGroups as &$group ) {
+				$group = User::getGroupMember( $group, $userName );
+			}
+		}
+
+		$lang = $this->context->getLanguage();
+		if ( count( $oldGroups ) ) {
+			$params[3] = $lang->listToText( $oldGroups );
+		} else {
+			$params[3] = $this->msg( 'rightsnone' )->text();
+		}
+		if ( count( $newGroups ) ) {
+			$params[4] = $lang->listToText( $newGroups );
+		} else {
+			$params[4] = $this->msg( 'rightsnone' )->text();
+		}
+
+		return $params;
+	}
+}
diff --git a/includes/logging/LogPage.php b/includes/logging/LogPage.php
index 90393ea8d6..07238a053a 100644
--- a/includes/logging/LogPage.php
+++ b/includes/logging/LogPage.php
@@ -253,29 +253,6 @@ class LogPage {
 			} else {
 				$titleLink = self::getTitleLink( $type, $langObjOrNull, $title, $params );
 
-				if( preg_match( '/^rights\/(rights|autopromote)/', $key ) ) {
-					$rightsnone = wfMessage( 'rightsnone' )->inLanguage( $langObj )->text();
-
-					if( $skin ) {
-						$username = $title->getText();
-						foreach ( $params as &$param ) {
-							$groupArray = array_map( 'trim', explode( ',', $param ) );
-							foreach( $groupArray as &$group ) {
-								$group = User::getGroupMember( $group, $username );
-							}
-							$param = $wgLang->listToText( $groupArray );
-						}
-					}
-
-					if( !isset( $params[0] ) || trim( $params[0] ) == '' ) {
-						$params[0] = $rightsnone;
-					}
-
-					if( !isset( $params[1] ) || trim( $params[1] ) == '' ) {
-						$params[1] = $rightsnone;
-					}
-				}
-
 				if( count( $params ) == 0 ) {
 					$rv = wfMessage( $wgLogActions[$key] )->rawParams( $titleLink )->inLanguage( $langObj )->escaped();
 				} else {
@@ -350,8 +327,6 @@ class LogPage {
 	 * @return String
 	 */
 	protected static function getTitleLink( $type, $lang, $title, &$params ) {
-		global $wgContLang, $wgUserrightsInterwikiDelimiter;
-
 		if( !$lang ) {
 			return $title->getPrefixedText();
 		}
@@ -388,20 +363,6 @@ class LogPage {
 						. Linker::userToolLinks( $id, $title->getText(), false, Linker::TOOL_LINKS_NOBLOCK );
 				}
 				break;
-			case 'rights':
-				$text = $wgContLang->ucfirst( $title->getText() );
-				$parts = explode( $wgUserrightsInterwikiDelimiter, $text, 2 );
-
-				if ( count( $parts ) == 2 ) {
-					$titleLink = WikiMap::foreignUserLink( $parts[1], $parts[0],
-						htmlspecialchars( $title->getPrefixedText() ) );
-
-					if ( $titleLink !== false ) {
-						break;
-					}
-				}
-				$titleLink = Linker::link( Title::makeTitle( NS_USER, $text ) );
-				break;
 			case 'merge':
 				$titleLink = Linker::link(
 					$title,
diff --git a/includes/media/SVG.php b/includes/media/SVG.php
index 75d474c0ab..53716df6b9 100644
--- a/includes/media/SVG.php
+++ b/includes/media/SVG.php
@@ -252,7 +252,7 @@ class SvgHandler extends ImageHandler {
 		try {
 			$metadata = SVGMetadataExtractor::getMetadata( $filename );
 		} catch( Exception $e ) {
- 			// Broken file?
+			// Broken file?
 			wfDebug( __METHOD__ . ': ' . $e->getMessage() . "\n" );
 			return '0';
 		}
diff --git a/includes/objectcache/MemcachedPeclBagOStuff.php b/includes/objectcache/MemcachedPeclBagOStuff.php
index 76886ebb18..7793710ede 100644
--- a/includes/objectcache/MemcachedPeclBagOStuff.php
+++ b/includes/objectcache/MemcachedPeclBagOStuff.php
@@ -107,8 +107,11 @@ class MemcachedPeclBagOStuff extends MemcachedBagOStuff {
 	 * @return Mixed
 	 */
 	public function get( $key ) {
+		wfProfileIn( __METHOD__ );
 		$this->debugLog( "get($key)" );
-		return $this->checkResult( $key, parent::get( $key ) );
+		$value = $this->checkResult( $key, parent::get( $key ) );
+		wfProfileOut( __METHOD__ );
+		return $value;
 	}
 
 	/**
@@ -224,9 +227,11 @@ class MemcachedPeclBagOStuff extends MemcachedBagOStuff {
 	 * @return Array
 	 */
 	public function getMulti( array $keys ) {
+		wfProfileIn( __METHOD__ );
 		$this->debugLog( 'getMulti(' . implode( ', ', $keys ) . ')' );
 		$callback = array( $this, 'encodeKey' );
 		$result = $this->client->getMulti( array_map( $callback, $keys ) );
+		wfProfileOut( __METHOD__ );
 		return $this->checkResult( false, $result );
 	}
 
diff --git a/includes/parser/LinkHolderArray.php b/includes/parser/LinkHolderArray.php
index 49160e8a71..9f1fff22de 100644
--- a/includes/parser/LinkHolderArray.php
+++ b/includes/parser/LinkHolderArray.php
@@ -43,7 +43,7 @@ class LinkHolderArray {
 		}
 	}
 
- 	/**
+	/**
 	 * Don't serialize the parent object, it is big, and not needed when it is
 	 * a parameter to mergeForeign(), which is the only application of
 	 * serializing at present.
diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index 8671665ffc..9dad1e5be9 100644
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -2377,10 +2377,10 @@ class Parser {
 				wfProfileIn( __METHOD__."-paragraph" );
 				# No prefix (not in list)--go to paragraph mode
 				# XXX: use a stack for nestable elements like span, table and div
-				$openmatch = preg_match('/(?:<table|<blockquote|<h1|<h2|<h3|<h4|<h5|<h6|<pre|<tr|<p|<ul|<ol|<li|<\\/tr|<\\/td|<\\/th)/iS', $t );
+				$openmatch = preg_match('/(?:<table|<blockquote|<h1|<h2|<h3|<h4|<h5|<h6|<pre|<tr|<p|<ul|<ol|<dl|<li|<\\/tr|<\\/td|<\\/th)/iS', $t );
 				$closematch = preg_match(
 					'/(?:<\\/table|<\\/blockquote|<\\/h1|<\\/h2|<\\/h3|<\\/h4|<\\/h5|<\\/h6|'.
-					'<td|<th|<\\/?div|<hr|<\\/pre|<\\/p|'.$this->mUniqPrefix.'-pre|<\\/li|<\\/ul|<\\/ol|<\\/?center)/iS', $t );
+					'<td|<th|<\\/?div|<hr|<\\/pre|<\\/p|'.$this->mUniqPrefix.'-pre|<\\/li|<\\/ul|<\\/ol|<\\/dl|<\\/?center)/iS', $t );
 				if ( $openmatch or $closematch ) {
 					$paragraphStack = false;
 					# TODO bug 5718: paragraph closed
@@ -3617,7 +3617,7 @@ class Parser {
 
 			if ( $rev ) {
 				$content = $rev->getContent();
-				$text = $content->getWikitextForTransclusion();
+				$text = $content ? $content->getWikitextForTransclusion() : null;
 
 				if ( $text === false || $text === null ) {
 					$text = false;
diff --git a/includes/parser/ParserOutput.php b/includes/parser/ParserOutput.php
index b6bcf63264..28d07f1479 100644
--- a/includes/parser/ParserOutput.php
+++ b/includes/parser/ParserOutput.php
@@ -346,7 +346,45 @@ class ParserOutput extends CacheTime {
 	}
 
 	/**
-	 * Set a property to be cached in the DB
+	 * Set a property to be stored in the page_props database table.
+	 *
+	 * page_props is a key value store indexed by the page ID. This allows
+	 * the parser to set a property on a page which can then be quickly
+	 * retrieved given the page ID or via a DB join when given the page
+	 * title.
+	 *
+	 * setProperty() is thus used to propagate properties from the parsed
+	 * page to request contexts other than a page view of the currently parsed
+	 * article.
+	 *
+	 * Some applications examples:
+	 *
+	 *   * To implement hidden categories, hiding pages from category listings
+	 *     by storing a property.
+	 *
+	 *   * Overriding the displayed article title.
+	 *   @see ParserOutput::setDisplayTitle()
+	 *
+	 *   * To implement image tagging, for example displaying an icon on an
+	 *     image thumbnail to indicate that it is listed for deletion on
+	 *     Wikimedia Commons.
+	 *     This is not actually implemented, yet but would be pretty cool.
+	 *
+	 * Do not use setProperty() to set a property which is only used in a
+	 * context where the ParserOutput object itself is already available, for
+	 * example a normal page view. There is no need to save such a property
+	 * in the database since it the text is already parsed. You can just hook
+	 * OutputPageParserOutput and get your data out of the ParserOutput object.
+	 *
+	 * If you are writing an extension where you want to set
+	 * a property in the parser which is used by an OutputPageParserOutput hook,
+	 * just use a custom variable within the ParserOutput object:
+	 *
+	 * @par Example:
+	 * @code
+	 *    $parser->getOutput()->my_ext_foo = '...';
+	 * @endcode
+	 *
 	 */
 	public function setProperty( $name, $value ) {
 		$this->mProperties[$name] = $value;
diff --git a/includes/parser/Preprocessor_DOM.php b/includes/parser/Preprocessor_DOM.php
index b2dd7db1a1..53f3febc27 100644
--- a/includes/parser/Preprocessor_DOM.php
+++ b/includes/parser/Preprocessor_DOM.php
@@ -797,8 +797,8 @@ class PPDStack {
  * @ingroup Parser
  */
 class PPDStackElement {
-	var $open,		        // Opening character (\n for heading)
-		$close,     	    // Matching closing character
+	var	$open,              // Opening character (\n for heading)
+		$close,             // Matching closing character
 		$count,             // Number of opening characters found (number of "=" for heading)
 		$parts,             // Array of PPDPart objects describing pipe-separated parts.
 		$lineStart;         // True if the open char appeared at the start of the input line. Not set for headings.
diff --git a/includes/resourceloader/ResourceLoader.php b/includes/resourceloader/ResourceLoader.php
index 670586383d..b4bd98cd8e 100644
--- a/includes/resourceloader/ResourceLoader.php
+++ b/includes/resourceloader/ResourceLoader.php
@@ -347,7 +347,7 @@ class ResourceLoader {
 		return array_keys( $this->moduleInfos );
 	}
 
- 	/**
+	/**
 	 * Get a list of test module names for one (or all) frameworks.
 	 * If the given framework id is unknkown, or if the in-object variable is not an array,
 	 * then it will return an empty array.
diff --git a/includes/resourceloader/ResourceLoaderWikiModule.php b/includes/resourceloader/ResourceLoaderWikiModule.php
index 28c3426c33..1e61a3e846 100644
--- a/includes/resourceloader/ResourceLoaderWikiModule.php
+++ b/includes/resourceloader/ResourceLoaderWikiModule.php
@@ -77,10 +77,16 @@ abstract class ResourceLoaderWikiModule extends ResourceLoaderModule {
 		}
 
 		$content = $revision->getContent( Revision::RAW );
+
+		if ( !$content ) {
+			wfDebug( __METHOD__ . "failed to load content of JS/CSS page!\n" );
+			return null;
+		}
+
 		$model = $content->getModel();
 
 		if ( $model !== CONTENT_MODEL_CSS && $model !== CONTENT_MODEL_JAVASCRIPT ) {
-			wfDebug( __METHOD__ . "bad content model #$model for JS/CSS page!\n" );
+			wfDebug( __METHOD__ . "bad content model $model for JS/CSS page!\n" );
 			return null;
 		}
 
diff --git a/includes/search/SearchEngine.php b/includes/search/SearchEngine.php
index f8f5fa59f6..ec542a612d 100644
--- a/includes/search/SearchEngine.php
+++ b/includes/search/SearchEngine.php
@@ -795,7 +795,7 @@ class SearchResult {
 				//TODO: if we could plug in some code that knows about special content models *and* about
 				//      special features of the search engine, the search could benefit.
 				$content = $this->mRevision->getContent();
-				$this->mText = $content->getTextForSearchIndex();
+				$this->mText = $content ? $content->getTextForSearchIndex() : '';
 			} else { // TODO: can we fetch raw wikitext for commons images?
 				$this->mText = '';
 			}
diff --git a/includes/site/MediaWikiSite.php b/includes/site/MediaWikiSite.php
index 716f14494a..0d5db11dc0 100644
--- a/includes/site/MediaWikiSite.php
+++ b/includes/site/MediaWikiSite.php
@@ -52,9 +52,8 @@ class MediaWikiSite extends SiteObject {
 	 * @note  : This actually makes an API request to the remote site, so beware that this function is slow and depends
 	 *          on an external service.
 	 *
-	 * @note  : If MW_PHPUNIT_TEST is defined or $egWBRemoteTitleNormalization is set to false, the call to the
-	 *          external site is skipped, and the title is normalized using the local normalization rules as
-	 *          implemented by the Title class.
+	 * @note  : If MW_PHPUNIT_TEST is defined, the call to the external site is skipped, and the title
+	 *          is normalized using the local normalization rules as implemented by the Title class.
 	 *
 	 * @see Site::normalizePageName
 	 *
@@ -66,7 +65,6 @@ class MediaWikiSite extends SiteObject {
 	 * @throws MWException
 	 */
 	public function normalizePageName( $pageName ) {
-		global $egWBRemoteTitleNormalization;
 
 		// Check if we have strings as arguments.
 		if ( !is_string( $pageName ) ) {
diff --git a/includes/site/SiteObject.php b/includes/site/SiteObject.php
index 6470c86e0d..0c6aeb39b8 100644
--- a/includes/site/SiteObject.php
+++ b/includes/site/SiteObject.php
@@ -157,10 +157,23 @@ class SiteObject extends ORMRow implements Site {
 		$path = $this->getLinkPath();
 
 		if ( $path === false ) {
-			return false;
+			return '';
+		}
+
+		$protocol = parse_url( $path, PHP_URL_SCHEME );
+
+		// Malformed URL
+		if ( $protocol === false ) {
+			throw new MWException( "failed to parse URL $path" );
+		}
+
+		// No schema
+		if ( $protocol === null ) {
+			// Used for protocol relative URLs
+			$protocol = '';
 		}
 
-		return parse_url( $path, PHP_URL_SCHEME );
+		return $protocol;
 	}
 
 	/**
diff --git a/includes/site/SitesTable.php b/includes/site/SitesTable.php
index a03c5989fe..bb12740d77 100644
--- a/includes/site/SitesTable.php
+++ b/includes/site/SitesTable.php
@@ -95,6 +95,7 @@ class SitesTable extends ORMTable {
 
 			'forward' => false,
 			'config' => array(),
+			'language' => 'en', // XXX: can we default to '' instead?
 		);
 	}
 
diff --git a/includes/specials/SpecialCachedPage.php b/includes/specials/SpecialCachedPage.php
index 949ac35145..ddd11ad03d 100644
--- a/includes/specials/SpecialCachedPage.php
+++ b/includes/specials/SpecialCachedPage.php
@@ -119,7 +119,7 @@ abstract class SpecialCachedPage extends SpecialPage implements ICacheHelper {
 	 *
 	 * @since 1.20
 	 *
-	 * @param function $computeFunction
+	 * @param callable $computeFunction
 	 * @param array|mixed $args
 	 * @param string|null $key
 	 *
@@ -137,7 +137,7 @@ abstract class SpecialCachedPage extends SpecialPage implements ICacheHelper {
 	 *
 	 * @since 1.20
 	 *
-	 * @param function $computeFunction
+	 * @param callable $computeFunction
 	 * @param array $args
 	 * @param string|null $key
 	 */
diff --git a/includes/specials/SpecialChangePassword.php b/includes/specials/SpecialChangePassword.php
index 41b3b2558f..54a277183b 100644
--- a/includes/specials/SpecialChangePassword.php
+++ b/includes/specials/SpecialChangePassword.php
@@ -27,6 +27,9 @@
  * @ingroup SpecialPage
  */
 class SpecialChangePassword extends UnlistedSpecialPage {
+
+	protected $mUserName, $mOldpass, $mNewpass, $mRetype, $mDomain;
+
 	public function __construct() {
 		parent::__construct( 'ChangePassword' );
 	}
@@ -105,6 +108,9 @@ class SpecialChangePassword extends UnlistedSpecialPage {
 		$this->getOutput()->redirect( $titleObj->getFullURL() );
 	}
 
+	/**
+	 * @param $msg string
+	 */
 	function error( $msg ) {
 		$this->getOutput()->addHTML( Xml::element('p', array( 'class' => 'error' ), $msg ) );
 	}
@@ -170,6 +176,10 @@ class SpecialChangePassword extends UnlistedSpecialPage {
 		);
 	}
 
+	/**
+	 * @param $fields array
+	 * @return string
+	 */
 	function pretty( $fields ) {
 		$out = '';
 		foreach ( $fields as $list ) {
@@ -234,7 +244,7 @@ class SpecialChangePassword extends UnlistedSpecialPage {
 		try {
 			$user->setPassword( $this->mNewpass );
 			wfRunHooks( 'PrefsPasswordAudit', array( $user, $newpass, 'success' ) );
-			$this->mNewpass = $this->mOldpass = $this->mRetypePass = '';
+			$this->mNewpass = $this->mOldpass = $this->mRetype = '';
 		} catch( PasswordError $e ) {
 			wfRunHooks( 'PrefsPasswordAudit', array( $user, $newpass, 'error' ) );
 			throw new PasswordError( $e->getMessage() );
diff --git a/includes/specials/SpecialDeletedContributions.php b/includes/specials/SpecialDeletedContributions.php
index c880b61759..bdeb7fef95 100644
--- a/includes/specials/SpecialDeletedContributions.php
+++ b/includes/specials/SpecialDeletedContributions.php
@@ -135,7 +135,10 @@ class DeletedContribsPager extends IndexPager {
 	function formatRow( $row ) {
 		wfProfileIn( __METHOD__ );
 
+		$page = Title::makeTitle( $row->ar_namespace, $row->ar_title );
+
 		$rev = new Revision( array(
+				'title'      => $page,
 				'id'         => $row->ar_rev_id,
 				'comment'    => $row->ar_comment,
 				'user'       => $row->ar_user,
@@ -145,8 +148,6 @@ class DeletedContribsPager extends IndexPager {
 				'deleted'    => $row->ar_deleted,
 				) );
 
-		$page = Title::makeTitle( $row->ar_namespace, $row->ar_title );
-
 		$undelete = SpecialPage::getTitleFor( 'Undelete' );
 
 		$logs = SpecialPage::getTitleFor( 'Log' );
@@ -260,7 +261,7 @@ class DeletedContributionsPage extends SpecialPage {
 	 * Special page "deleted user contributions".
 	 * Shows a list of the deleted contributions of a user.
 	 *
-	 * @param	$par	String: (optional) user name of the user for which to show the contributions
+	 * @param $par String: (optional) user name of the user for which to show the contributions
 	 */
 	function execute( $par ) {
 		global $wgQueryPageDefaultLimit;
diff --git a/includes/specials/SpecialEmailuser.php b/includes/specials/SpecialEmailuser.php
index 4d875e6ef9..9a42c0959e 100644
--- a/includes/specials/SpecialEmailuser.php
+++ b/includes/specials/SpecialEmailuser.php
@@ -139,7 +139,8 @@ class SpecialEmailUser extends UnlistedSpecialPage {
 		$this->mTargetObj = $ret;
 
 		$form = new HTMLForm( $this->getFormFields(), $this->getContext() );
-		$form->addPreText( $this->msg( 'emailpagetext' )->parse() );
+		// By now we are supposed to be sure that $this->mTarget is a user name
+		$form->addPreText( $this->msg( 'emailpagetext', $this->mTarget )->parse() );
 		$form->setSubmitTextMsg( 'emailsend' );
 		$form->setTitle( $this->getTitle() );
 		$form->setSubmitCallback( array( __CLASS__, 'uiSubmit' ) );
diff --git a/includes/specials/SpecialLinkSearch.php b/includes/specials/SpecialLinkSearch.php
index 0810ee777a..5de60769bd 100644
--- a/includes/specials/SpecialLinkSearch.php
+++ b/includes/specials/SpecialLinkSearch.php
@@ -103,7 +103,7 @@ class LinkSearchPage extends QueryPage {
 				)
 			);
 		}
-		$s .=	Xml::submitButton( $this->msg( 'linksearch-ok' )->text() ) .
+		$s .= Xml::submitButton( $this->msg( 'linksearch-ok' )->text() ) .
 			'</fieldset>' .
 			Xml::closeElement( 'form' );
 		$out->addHTML( $s );
diff --git a/includes/specials/SpecialListusers.php b/includes/specials/SpecialListusers.php
index 8b448281c5..ea598c3687 100644
--- a/includes/specials/SpecialListusers.php
+++ b/includes/specials/SpecialListusers.php
@@ -153,7 +153,7 @@ class UsersPager extends AlphabeticPager {
 		$userName = $row->user_name;
 
 		$ulinks = Linker::userLink( $row->user_id, $userName );
-		$ulinks .= Linker::userToolLinks( $row->user_id, $userName );
+		$ulinks .= Linker::userToolLinksRedContribs( $row->user_id, $userName, intval( $row->edits ) );
 
 		$lang = $this->getLanguage();
 
diff --git a/includes/specials/SpecialMergeHistory.php b/includes/specials/SpecialMergeHistory.php
index bc9a3d90f8..85e1d656cb 100644
--- a/includes/specials/SpecialMergeHistory.php
+++ b/includes/specials/SpecialMergeHistory.php
@@ -380,6 +380,7 @@ class SpecialMergeHistory extends SpecialPage {
 			if ( $redirectContent ) {
 				$redirectPage = WikiPage::factory( $targetTitle );
 				$redirectRevision = new Revision( array(
+					'title'   => $targetTitle,
 					'page'    => $this->mTargetID,
 					'comment' => $comment,
 					'content' => $redirectContent ) );
diff --git a/includes/specials/SpecialMovepage.php b/includes/specials/SpecialMovepage.php
index af3dbf3e44..ce2633fd19 100644
--- a/includes/specials/SpecialMovepage.php
+++ b/includes/specials/SpecialMovepage.php
@@ -464,8 +464,6 @@ class MovePageForm extends UnlistedSpecialPage {
 			DoubleRedirectJob::fixRedirects( 'move', $ot, $nt );
 		}
 
-		wfRunHooks( 'SpecialMovepageAfterMove', array( &$this, &$ot, &$nt ) );
-
 		$out = $this->getOutput();
 		$out->setPageTitle( $this->msg( 'pagemovedsub' ) );
 
@@ -484,6 +482,8 @@ class MovePageForm extends UnlistedSpecialPage {
 			$newLink )->params( $oldText, $newText )->parseAsBlock() );
 		$out->addWikiMsg( $msgName );
 
+		wfRunHooks( 'SpecialMovepageAfterMove', array( &$this, &$ot, &$nt ) );
+
 		# Now we move extra pages we've been asked to move: subpages and talk
 		# pages.  First, if the old page or the new page is a talk page, we
 		# can't move any talk pages: cancel that.
diff --git a/includes/specials/SpecialPasswordReset.php b/includes/specials/SpecialPasswordReset.php
index 97f0037eaf..d7cf693c25 100644
--- a/includes/specials/SpecialPasswordReset.php
+++ b/includes/specials/SpecialPasswordReset.php
@@ -255,7 +255,7 @@ class SpecialPasswordReset extends FormSpecialPage {
 
 		$title = $this->msg( 'passwordreset-emailtitle' );
 
-		$this->result = $firstUser->sendMail( $title->escaped(), $this->email->escaped() );
+		$this->result = $firstUser->sendMail( $title->escaped(), $this->email->text() );
 
 		// Blank the email if the user is not supposed to see it
 		if( !isset( $data['Capture'] ) || !$data['Capture'] ) {
diff --git a/includes/specials/SpecialRecentchanges.php b/includes/specials/SpecialRecentchanges.php
index 2bd8b0a96d..f542640252 100644
--- a/includes/specials/SpecialRecentchanges.php
+++ b/includes/specials/SpecialRecentchanges.php
@@ -382,7 +382,7 @@ class SpecialRecentChanges extends IncludableSpecialPage {
 		$invert = $opts['invert'];
 		$associated = $opts['associated'];
 
-		$fields = array( $dbr->tableName( 'recentchanges' ) . '.*' ); // all rc columns
+		$fields = RecentChange::selectFields();
 		// JOIN on watchlist for users
 		if ( $uid ) {
 			$tables[] = 'watchlist';
diff --git a/includes/specials/SpecialRecentchangeslinked.php b/includes/specials/SpecialRecentchangeslinked.php
index 40ebc2fe4f..4db89586f8 100644
--- a/includes/specials/SpecialRecentchangeslinked.php
+++ b/includes/specials/SpecialRecentchangeslinked.php
@@ -93,7 +93,7 @@ class SpecialRecentchangeslinked extends SpecialRecentChanges {
 		$dbkey = $title->getDBkey();
 
 		$tables = array( 'recentchanges' );
-		$select = array( $dbr->tableName( 'recentchanges' ) . '.*' );
+		$select = RecentChange::selectFields();
 		$join_conds = array();
 		$query_options = array();
 
diff --git a/includes/specials/SpecialSearch.php b/includes/specials/SpecialSearch.php
index 6c33bb8040..7c8ff84c4e 100644
--- a/includes/specials/SpecialSearch.php
+++ b/includes/specials/SpecialSearch.php
@@ -684,11 +684,21 @@ class SpecialSearch extends SpecialPage {
 			}
 		}
 
-		wfProfileOut( __METHOD__ );
-		return "<li><div class='mw-search-result-heading'>{$link} {$redirect} {$section}</div> {$extract}\n" .
-			"<div class='mw-search-result-data'>{$score}{$size} - {$date}{$related}</div>" .
-			"</li>\n";
+		$html = null;
+
+		if ( wfRunHooks( 'ShowSearchHit', array (
+			$this, $result, $terms,
+			&$link, &$redirect, &$section, &$extract,
+			&$score, &$size, &$date, &$related,
+			&$html
+		) ) ) {
+			$html = "<li><div class='mw-search-result-heading'>{$link} {$redirect} {$section}</div> {$extract}\n" .
+				"<div class='mw-search-result-data'>{$score}{$size} - {$date}{$related}</div>" .
+				"</li>\n";
+		}
 
+		wfProfileOut( __METHOD__ );
+		return $html;
 	}
 
 	/**
diff --git a/includes/specials/SpecialSpecialpages.php b/includes/specials/SpecialSpecialpages.php
index e973ddc89d..1e7c8bb565 100644
--- a/includes/specials/SpecialSpecialpages.php
+++ b/includes/specials/SpecialSpecialpages.php
@@ -66,7 +66,11 @@ class SpecialSpecialpages extends UnlistedSpecialPage {
 				if( !isset( $groups[$group] ) ) {
 					$groups[$group] = array();
 				}
-				$groups[$group][$page->getDescription()] = array( $page->getTitle(), $page->isRestricted(), $page->isExpensive() );
+				$groups[$group][$page->getDescription()] = array(
+					$page->getTitle(),
+					$page->isRestricted(),
+					$page->isCached()
+				);
 			}
 		}
 
@@ -88,15 +92,14 @@ class SpecialSpecialpages extends UnlistedSpecialPage {
 	}
 
 	private function outputPageList( $groups ) {
-		global $wgMiserMode;
 		$out = $this->getOutput();
 
 		$includesRestrictedPages = false;
 		$includesCachedPages = false;
 
 		foreach ( $groups as $group => $sortedPages ) {
-			$middle = ceil( count( $sortedPages )/2 );
 			$total = count( $sortedPages );
+			$middle = ceil( $total / 2 );
 			$count = 0;
 
 			$out->wrapWikiMsg( "<h2 class=\"mw-specialpagesgroup\" id=\"mw-specialpagesgroup-$group\">$1</h2>\n", "specialpages-group-$group" );
@@ -107,10 +110,10 @@ class SpecialSpecialpages extends UnlistedSpecialPage {
 				Html::openElement( 'ul' ) . "\n"
 			);
 			foreach( $sortedPages as $desc => $specialpage ) {
-				list( $title, $restricted, $expensive) = $specialpage;
+				list( $title, $restricted, $cached ) = $specialpage;
 
 				$pageClasses = array();
-				if ( $expensive && $wgMiserMode ){
+				if ( $cached ) {
 					$includesCachedPages = true;
 					$pageClasses[] = 'mw-specialpagecached';
 				}
diff --git a/includes/specials/SpecialUndelete.php b/includes/specials/SpecialUndelete.php
index 4c38a781ba..c0420e56c2 100644
--- a/includes/specials/SpecialUndelete.php
+++ b/includes/specials/SpecialUndelete.php
@@ -575,6 +575,9 @@ class PageArchive {
 					return Status::newFatal( "undeleterevdel" );
 				}
 			}
+
+			$newid  = false;
+			$pageId = $article->getId();
 		}
 
 		$revision = null;
@@ -593,6 +596,7 @@ class PageArchive {
 			// unless we are specifically removing all restrictions...
 			$revision = Revision::newFromArchiveRow( $row,
 				array(
+					'page' => $pageId,
 					'title' => $this->title,
 					'deleted' => $unsuppress ? 0 : $row->ar_deleted
 				) );
diff --git a/includes/specials/SpecialUpload.php b/includes/specials/SpecialUpload.php
index fd24af1a4e..73c7e2aefd 100644
--- a/includes/specials/SpecialUpload.php
+++ b/includes/specials/SpecialUpload.php
@@ -312,12 +312,12 @@ class SpecialUpload extends SpecialPage {
 		$this->showUploadForm( $form );
 	}
 	/**
-	 * Stashes the upload, shows the main form, but adds an "continue anyway button".
+	 * Stashes the upload, shows the main form, but adds a "continue anyway button".
 	 * Also checks whether there are actually warnings to display.
 	 *
 	 * @param $warnings Array
 	 * @return boolean true if warnings were displayed, false if there are no
-	 * 	warnings and the should continue processing like there was no warning
+	 *         warnings and it should continue processing
 	 */
 	protected function showUploadWarning( $warnings ) {
 		# If there are no warnings, or warnings we can ignore, return early.
@@ -336,6 +336,9 @@ class SpecialUpload extends SpecialPage {
 		$warningHtml = '<h2>' . $this->msg( 'uploadwarning' )->escaped() . "</h2>\n"
 			. '<ul class="warning">';
 		foreach( $warnings as $warning => $args ) {
+			if( $warning == 'badfilename' ) {
+				$this->mDesiredDestName = Title::makeTitle( NS_FILE, $args )->getText();
+			}
 			if( $warning == 'exists' ) {
 				$msg = "\t<li>" . self::getExistsWarning( $args ) . "</li>\n";
 			} elseif( $warning == 'duplicate' ) {
diff --git a/includes/specials/SpecialUserrights.php b/includes/specials/SpecialUserrights.php
index 56ae302013..121cc22373 100644
--- a/includes/specials/SpecialUserrights.php
+++ b/includes/specials/SpecialUserrights.php
@@ -245,16 +245,16 @@ class UserrightsPage extends SpecialPage {
 	 * Add a rights log entry for an action.
 	 */
 	function addLogEntry( $user, $oldGroups, $newGroups, $reason ) {
-		$log = new LogPage( 'rights' );
-
-		$log->addEntry( 'rights',
-			$user->getUserPage(),
-			$reason,
-			array(
-				$this->makeGroupNameListForLog( $oldGroups ),
-				$this->makeGroupNameListForLog( $newGroups )
-			)
-		);
+		$logEntry = new ManualLogEntry( 'rights', 'rights' );
+		$logEntry->setPerformer( $this->getUser() );
+		$logEntry->setTarget( $user->getUserPage() );
+		$logEntry->setComment( $reason );
+		$logEntry->setParameters( array(
+			'4::oldgroups' => $oldGroups,
+			'5::newgroups' => $newGroups,
+		) );
+		$logid = $logEntry->insert();
+		$logEntry->publish( $logid );
 	}
 
 	/**
@@ -355,7 +355,16 @@ class UserrightsPage extends SpecialPage {
 		}
 	}
 
+	/**
+	 * Make a list of group names to be stored as parameter for log entries
+	 *
+	 * @deprecated in 1.21; use LogFormatter instead.
+	 * @param $ids array
+	 * @return string
+	 */
 	function makeGroupNameListForLog( $ids ) {
+		wfDeprecated( __METHOD__, '1.21' );
+
 		if( empty( $ids ) ) {
 			return '';
 		} else {
@@ -410,27 +419,41 @@ class UserrightsPage extends SpecialPage {
 	 */
 	protected function showEditUserGroupsForm( $user, $groups ) {
 		$list = array();
+		$membersList = array();
 		foreach( $groups as $group ) {
 			$list[] = self::buildGroupLink( $group );
+			$membersList[] = self::buildGroupMemberLink( $group );
 		}
 
-		$autolist = array();
+		$autoList = array();
+		$autoMembersList = array();
 		if ( $user instanceof User ) {
 			foreach( Autopromote::getAutopromoteGroups( $user ) as $group ) {
-				$autolist[] = self::buildGroupLink( $group );
+				$autoList[] = self::buildGroupLink( $group );
+				$autoMembersList[] = self::buildGroupMemberLink( $group );
 			}
 		}
 
+		$language = $this->getLanguage();
+		$displayedList = $this->msg( 'userrights-groupsmember-type',
+			$language->listToText( $list ),
+			$language->listToText( $membersList )
+		)->plain();
+		$displayedAutolist = $this->msg( 'userrights-groupsmember-type',
+			$language->listToText( $autoList ),
+			$language->listToText( $autoMembersList )
+		)->plain();
+
 		$grouplist = '';
 		$count = count( $list );
-		if( $count > 0 ) {
+		if ( $count > 0 ) {
 			$grouplist = $this->msg( 'userrights-groupsmember', $count, $user->getName() )->parse();
-			$grouplist = '<p>' . $grouplist  . ' ' . $this->getLanguage()->listToText( $list ) . "</p>\n";
+			$grouplist = '<p>' . $grouplist  . ' ' . $displayedList . "</p>\n";
 		}
-		$count = count( $autolist );
-		if( $count > 0 ) {
+		$count = count( $autoList );
+		if ( $count > 0 ) {
 			$autogrouplistintro = $this->msg( 'userrights-groupsmember-auto', $count, $user->getName() )->parse();
-			$grouplist .= '<p>' . $autogrouplistintro  . ' ' . $this->getLanguage()->listToText( $autolist ) . "</p>\n";
+			$grouplist .= '<p>' . $autogrouplistintro  . ' ' . $displayedAutolist . "</p>\n";
 		}
 
 		$userToolLinks = Linker::userToolLinks(
@@ -480,10 +503,17 @@ class UserrightsPage extends SpecialPage {
 	 * @return string
 	 */
 	private static function buildGroupLink( $group ) {
-		static $cache = array();
-		if( !isset( $cache[$group] ) )
-			$cache[$group] = User::makeGroupLinkHtml( $group, htmlspecialchars( User::getGroupName( $group ) ) );
-		return $cache[$group];
+		return User::makeGroupLinkHtml( $group, User::getGroupName( $group ) );
+	}
+
+	/**
+	 * Format a link to a group member description page
+	 *
+	 * @param $group string
+	 * @return string
+	 */
+	private static function buildGroupMemberLink( $group ) {
+		return User::makeGroupLinkHtml( $group, User::getGroupMember( $group ) );
 	}
 
 	/**
@@ -535,7 +565,7 @@ class UserrightsPage extends SpecialPage {
 		}
 
 		# Build the HTML table
-		$ret .=	Xml::openElement( 'table', array( 'class' => 'mw-userrights-groups' ) ) .
+		$ret .= Xml::openElement( 'table', array( 'class' => 'mw-userrights-groups' ) ) .
 			"<tr>\n";
 		foreach( $columns as $name => $column ) {
 			if( $column === array() )
diff --git a/includes/specials/SpecialVersion.php b/includes/specials/SpecialVersion.php
index 4e5b6bf5a3..7ace5f8de9 100644
--- a/includes/specials/SpecialVersion.php
+++ b/includes/specials/SpecialVersion.php
@@ -48,29 +48,43 @@ class SpecialVersion extends SpecialPage {
 	 * main()
 	 */
 	public function execute( $par ) {
-		global $wgSpecialVersionShowHooks;
+		global $wgSpecialVersionShowHooks, $IP;
 
 		$this->setHeaders();
 		$this->outputHeader();
 		$out = $this->getOutput();
 		$out->allowClickjacking();
 
-		$text =
-			$this->getMediaWikiCredits() .
-			$this->softwareInformation() .
-			$this->getEntryPointInfo() .
-			$this->getExtensionCredits();
-		if ( $wgSpecialVersionShowHooks ) {
-			$text .= $this->getWgHooks();
-		}
+		if( $par !== 'Credits' ) {
+			$text =
+				$this->getMediaWikiCredits() .
+				$this->softwareInformation() .
+				$this->getEntryPointInfo() .
+				$this->getExtensionCredits();
+			if ( $wgSpecialVersionShowHooks ) {
+				$text .= $this->getWgHooks();
+			}
 
-		$out->addWikiText( $text );
-		$out->addHTML( $this->IPInfo() );
+			$out->addWikiText( $text );
+			$out->addHTML( $this->IPInfo() );
 
-		if ( $this->getRequest()->getVal( 'easteregg' ) ) {
-			if ( $this->showEasterEgg() ) {
-				// TODO: put something interesting here
+			if ( $this->getRequest()->getVal( 'easteregg' ) ) {
+				if ( $this->showEasterEgg() ) {
+					// TODO: put something interesting here
+				}
 			}
+		} else {
+			// Credits sub page
+
+			// Header
+			$out->addHTML( wfMessage( 'version-credits-summary' )->parseAsBlock() );
+
+			$wikiText = file_get_contents( $IP . '/CREDITS' );
+
+			// Take everything from the first section onwards, to remove the (not localized) header
+			$wikiText = substr( $wikiText, strpos( $wikiText, '==' ) );
+
+			$out->addWikiText( $wikiText );
 		}
 	}
 
@@ -108,10 +122,10 @@ class SpecialVersion extends SpecialPage {
 			'Alexandre Emsenhuber', 'Siebrand Mazeland', 'Chad Horohoe',
 			'Roan Kattouw', 'Trevor Parscal', 'Bryan Tong Minh', 'Sam Reed',
 			'Victor Vasiliev', 'Rotem Liss', 'Platonides', 'Antoine Musso',
-			'Timo Tijhof',
-			'[{{SERVER}}{{SCRIPTPATH}}/CREDITS ' .
+			'Timo Tijhof', 'Daniel Kinzler', 'Jeroen De Dauw',
+			'[[Special:Version/Credits|' .
 			wfMessage( 'version-poweredby-others' )->text() .
-			']'
+			']]'
 		);
 
 		return wfMessage( 'version-poweredby-credits', date( 'Y' ),
@@ -222,7 +236,7 @@ class SpecialVersion extends SpecialPage {
 	 * @return string wgVersion + a link to subversion revision of svn BASE
 	 */
 	private static function getVersionLinkedSvn() {
-		global $wgVersion, $IP;
+		global $IP;
 
 		$info = self::getSvnInfo( $IP );
 		if( !isset( $info['checkout-rev'] ) ) {
@@ -236,19 +250,29 @@ class SpecialVersion extends SpecialPage {
 		)->text();
 
 		if ( isset( $info['viewvc-url'] ) ) {
-			$version = "$wgVersion [{$info['viewvc-url']} $linkText]";
+			$version = "[{$info['viewvc-url']} $linkText]";
 		} else {
-			$version = "$wgVersion $linkText";
+			$version = $linkText;
 		}
 
-		return $version;
+		return self::getwgVersionLinked() . " $version";
+	}
+
+	/**
+	 * @return string
+	 */
+	private static function getwgVersionLinked() {
+		global $wgVersion;
+		$versionParts = array();
+		preg_match( "/^(\d+\.\d+)/", $wgVersion, $versionParts );
+		return "[https://www.mediawiki.org/wiki/MediaWiki_{$versionParts[1]} $wgVersion]";
 	}
 
 	/**
 	 * @return bool|string wgVersion + HEAD sha1 stripped to the first 7 chars. False on failure
 	 */
 	private static function getVersionLinkedGit() {
-		global $wgVersion, $IP;
+		global $IP;
 
 		$gitInfo = new GitInfo( $IP );
 		$headSHA1 = $gitInfo->getHeadSHA1();
@@ -261,7 +285,7 @@ class SpecialVersion extends SpecialPage {
 		if ( $viewerUrl !== false ) {
 			$shortSHA1 = "[$viewerUrl $shortSHA1]";
 		}
-		return "$wgVersion $shortSHA1";
+		return self::getwgVersionLinked() . " $shortSHA1";
 	}
 
 	/**
@@ -761,11 +785,23 @@ class SpecialVersion extends SpecialPage {
 			'version-entrypoints-load-php' => wfScript( 'load' ),
 		);
 
+		$language = $this->getLanguage();
+		$thAttribures = array(
+			'dir' => $language->getDir(),
+			'lang' => $language->getCode()
+		);
 		$out = Html::element( 'h2', array( 'id' => 'mw-version-entrypoints' ), $this->msg( 'version-entrypoints' )->text() ) .
-			Html::openElement( 'table', array( 'class' => 'wikitable plainlinks', 'id' => 'mw-version-entrypoints-table' ) ) .
+			Html::openElement( 'table',
+				array(
+					'class' => 'wikitable plainlinks',
+					'id' => 'mw-version-entrypoints-table',
+					'dir' => 'ltr',
+					'lang' => 'en'
+				)
+			) .
 			Html::openElement( 'tr' ) .
-			Html::element( 'th', array(), $this->msg( 'version-entrypoints-header-entrypoint' )->text() ) .
-			Html::element( 'th', array(), $this->msg( 'version-entrypoints-header-url' )->text() ) .
+			Html::element( 'th', $thAttribures, $this->msg( 'version-entrypoints-header-entrypoint' )->text() ) .
+			Html::element( 'th', $thAttribures, $this->msg( 'version-entrypoints-header-url' )->text() ) .
 			Html::closeElement( 'tr' );
 
 		foreach ( $entryPoints as $message => $value ) {
diff --git a/includes/specials/SpecialWatchlist.php b/includes/specials/SpecialWatchlist.php
index 5dfc1133ef..688e0a50cb 100644
--- a/includes/specials/SpecialWatchlist.php
+++ b/includes/specials/SpecialWatchlist.php
@@ -272,7 +272,7 @@ class SpecialWatchlist extends SpecialPage {
 		$form .= '<hr />';
 
 		$tables = array( 'recentchanges', 'watchlist' );
-		$fields = array( $dbr->tableName( 'recentchanges' ) . '.*' );
+		$fields = RecentChange::selectFields();
 		$join_conds = array(
 			'watchlist' => array(
 				'INNER JOIN',
diff --git a/includes/zhtable/Makefile.py b/includes/zhtable/Makefile.py
index fd603ce45f..1342066bda 100755
--- a/includes/zhtable/Makefile.py
+++ b/includes/zhtable/Makefile.py
@@ -30,10 +30,10 @@ def unichr3( *args ):
     return [unichr( int( i[2:7], 16 ) ) for i in args if i[2:7]]
 
 # DEFINE
-UNIHAN_VER = '5.2.0'
+UNIHAN_VER = '6.2.0'
 SF_MIRROR = 'dfn'
-SCIM_TABLES_VER = '0.5.10'
-SCIM_PINYIN_VER = '0.5.91'
+SCIM_TABLES_VER = '0.5.11'
+SCIM_PINYIN_VER = '0.5.92'
 LIBTABE_VER = '0.2.3'
 # END OF DEFINE
 
diff --git a/languages/Language.php b/languages/Language.php
index 89f8bb70ae..c4807a61d3 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -155,10 +155,6 @@ class Language {
 		'hijri-calendar-m10', 'hijri-calendar-m11', 'hijri-calendar-m12'
 	);
 
-	// For pretty timestamps
-	// Cutoff for specifying "weekday at XX:XX" format
-	protected $mWeekdayAtCutoff = 432000; // 5 days
-
 	/**
 	 * @since 1.20
 	 * @var array
@@ -1859,7 +1855,6 @@ class Language {
 	 * @param $usePrefs Mixed: if true, the user's preference is used
 	 *                         if false, the site/language default is used
 	 *                         if int/string, assumed to be a format.
-	 *                         if User object, assumed to be a User to get preference from
 	 * @return string
 	 */
 	function dateFormat( $usePrefs = true ) {
@@ -1871,8 +1866,6 @@ class Language {
 			} else {
 				$datePreference = (string)User::getDefaultOption( 'date' );
 			}
-		} elseif ( $usePrefs instanceof User ) {
-			$datePreference = $usePrefs->getDatePreference();
 		} else {
 			$datePreference = (string)$usePrefs;
 		}
@@ -1899,17 +1892,11 @@ class Language {
 				$df = self::$dataCache->getSubitem( $this->mCode, 'dateFormats', "$pref $type" );
 			} else {
 				$df = self::$dataCache->getSubitem( $this->mCode, 'dateFormats', "$pref $type" );
-
-				if ( $type === 'shortdate' && is_null( $df ) ) {
-					$df = $this->getDateFormatString( 'date', $pref );
-				}
-
 				if ( is_null( $df ) ) {
 					$pref = $this->getDefaultDateFormat();
 					$df = self::$dataCache->getSubitem( $this->mCode, 'dateFormats', "$pref $type" );
 				}
 			}
-
 			$this->dateFormatStrings[$type][$pref] = $df;
 		}
 		return $this->dateFormatStrings[$type][$pref];
@@ -2138,134 +2125,6 @@ class Language {
 		return $this->internalUserTimeAndDate( 'both', $ts, $user, $options );
 	}
 
-	/**
-	 * Formats a timestamp in a pretty, human-readable format.
-	 * Instead of "13:04, 16 July 2012", we have:
-	 * - Just now
-	 * - 35 minutes ago
-	 * - At 13:04
-	 * - Yesterday at 13:04
-	 * - Wednesday at 13:04
-	 * - July 16, 13:04
-	 * - July 16 2012 at 13:04
-	 *
-	 * @todo Port to JavaScript
-	 *
-	 * @param $ts Mixed: the time format which needs to be turned into a
-	 *            date('YmdHis') format with wfTimestamp(TS_MW,$ts)
-	 * @param $relativeTo Mixed: The timestamp to use as "now"
-	 * @param $user User: The user to format for (needed for timezone information)
-	 * @since 1.20
-	 * @return string Formatted timestamp
-	 */
-	public function prettyTimestamp( $timestamp, $relativeTo = false, $user ) {
-		// Parameter defaults
-		if ( $relativeTo === false ) {
-			$relativeTo = wfTimestampNow();
-		}
-
-		// Normalise input to UNIX time
-		$relativeTo = wfTimestamp( TS_UNIX, $relativeTo );
-		$timestamp = wfTimestamp( TS_UNIX, $timestamp );
-		$timeAgo = $relativeTo - $timestamp;
-
-		$adjustedRelativeTo = $this->userAdjust( wfTimestamp( TS_MW, $relativeTo ), $user->getOption('timecorrection') );
-		$adjustedRelativeTo = wfTimestamp( TS_UNIX, $adjustedRelativeTo );
-		$relativeToYear = gmdate( 'Y', $adjustedRelativeTo );
-
-		$adjustedTimestamp = $this->userAdjust( wfTimestamp( TS_MW, $timestamp ), $user->getOption('timecorrection') );
-		$adjustedTimestamp = wfTimestamp( TS_UNIX, $adjustedTimestamp );
-		$timestampYear = gmdate( 'Y', $adjustedTimestamp );
-
-		if ( $timeAgo < 0 ) {
-			throw new MWException( "Future timestamps not currently supported" );
-		} elseif ( $timeAgo < 30 ) {
-			return wfMessage( 'just-now' )
-				->inLanguage( $this )
-				->text();
-		} elseif ( $timeAgo < 5400 ) {
-			// Less than 90 minutes ago. Return number of hours, minutes or seconds ago.
-			return $this->formatRelativeTime( $timeAgo );
-		} elseif ( // Same day
-			intval( $adjustedRelativeTo / (24*60*60) ) ===
-			intval( $adjustedTimestamp / (24*60*60) )
-		) {
-			// Today at XX:XX
-			$time = $this->time( $adjustedTimestamp );
-			return wfMessage( 'today-at' )
-				->inLanguage( $this )
-				->params( $time )
-				->text();
-		} elseif ( // Previous day
-			intval( $adjustedRelativeTo / (24*60*60) ) ===
-			( intval( $adjustedTimestamp / (24*60*60) ) + 1 )
-		) {
-			// Yesterday at XX:XX
-			$time = $this->time( $adjustedTimestamp );
-
-			return wfMessage( 'yesterday-at' )
-				->inLanguage( $this )
-				->params( $time )
-				->text();
-		} elseif ( $timeAgo < ( $this->mWeekdayAtCutoff ) ) { // Less than 5 days ago
-			// Xday at XX:XX
-			return $this->formatPastWeekTimestamp( $adjustedTimestamp, $adjustedRelativeTo );
-		} elseif ( $relativeToYear == $timestampYear ) {
-			// XX XMonth
-			$df = $this->getDateFormatString( 'shortdate', $this->dateFormat( $user ) );
-			$mwTimestamp = wfTimestamp( TS_MW, $timestamp );
-			return $this->sprintfDate( $df, $mwTimestamp );
-		} else {
-			// Full timestamp
-			$mwTimestamp = wfTimestamp( TS_MW, $timestamp );
-			return $this->userDate( $mwTimestamp, $user );
-		}
-	}
-
-	/**
-	 * For pretty timestamps: Formats the "X {hours,minutes,seconds} ago" message.
-	 *
-	 * @param $timeAgo The number of seconds ago the event occurred
-	 * @return Formatted string
-	 */
-	protected function formatRelativeTime( $timeAgo ) {
-		$count = false;
-		if ( $timeAgo < 60 ) {
-			$unit = 'seconds';
-			$count = $timeAgo;
-		} elseif ( $timeAgo < 3600 ) {
-			$unit = 'minutes';
-			$count = intval( $timeAgo / 60 );
-		} else {
-			$unit = 'hours';
-			$count = intval( $timeAgo / 3600 );
-		}
-
-		return wfMessage( "{$unit}-ago" )->inLanguage( $this )->params( $count )->text();
-	}
-
-	/**
-	 * For pretty timestamps: Formats the timestamp for events that occurred
-	 * "in the last few days".
-	 * (cutoff is configurable by the member variable $mWeekdayAtCutoff)
-	 *
-	 * @param $eventTimestamp The timestamp of the event, adjusted to
-	 *  the user's local timezone, in UNIX format (# of seconds since epoch)
-	 * @param $relativeTo The timestamp to format relative to, adjusted to
-	 *  the user's local timezone, in UNIX format (# of seconds since epoch)
-	 * @return String: The date formatted in a human-friendly way.
-	 */
-	protected function formatPastWeekTimestamp( $adjustedTimestamp, $relativeTo ) {
-		$day = date( 'w', $adjustedTimestamp );
-		$weekday = self::$mWeekdayMsgs[$day];
-		$time = $this->time( $adjustedTimestamp );
-
-		return wfMessage( "$weekday-at" )
-			->inLanguage( $this )
-			->params( $time )
-			->text();
-	}
-
 	/**
 	 * @param $key string
 	 * @return array|null
diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php
index 601660591b..79783cc14f 100644
--- a/languages/LanguageConverter.php
+++ b/languages/LanguageConverter.php
@@ -824,9 +824,9 @@ class LanguageConverter {
 	/**
 	 * Guess if a text is written in a variant. This should be implemented in subclasses.
 	 *
-	 * @param string	$text the text to be checked
-	 * @param string	$variant language code of the variant to be checked for
-	 * @return bool	true if $text appears to be written in $variant, false if not
+	 * @param string $text the text to be checked
+	 * @param string $variant language code of the variant to be checked for
+	 * @return bool true if $text appears to be written in $variant, false if not
 	 *
 	 * @author Nikola Smolenski <smolensk@eunet.rs>
 	 * @since 1.19
@@ -1270,7 +1270,7 @@ class ConverterRule {
 				$bidtable[$v] = $to;
 			} elseif ( count( $u ) == 2 ) {
 				$from = trim( $u[0] );
-				$v	= trim( $u[1] );
+				$v = trim( $u[1] );
 				if ( array_key_exists( $v, $unidtable )
 					 && !is_array( $unidtable[$v] )
 					 && $to
diff --git a/languages/classes/LanguageEo.php b/languages/classes/LanguageEo.php
index 3c16248037..8f8432242b 100644
--- a/languages/classes/LanguageEo.php
+++ b/languages/classes/LanguageEo.php
@@ -63,7 +63,7 @@ class LanguageEo extends Language {
 		if ( strcasecmp( $in, 'x' ) == 0 && strcasecmp( $out, 'utf-8' ) == 0 ) {
 			return preg_replace_callback (
 				'/([cghjsu]x?)((?:xx)*)(?!x)/i',
-				array( $this, 'strrtxuCallback' ), $string	);
+				array( $this, 'strrtxuCallback' ), $string );
 		} elseif ( strcasecmp( $in, 'UTF-8' ) == 0 && strcasecmp( $out, 'x' ) == 0 ) {
 			# Double Xs only if they follow cxapelutaj literoj.
 			return preg_replace_callback(
diff --git a/languages/messages/MessagesAce.php b/languages/messages/MessagesAce.php
index a770906a85..58c285f66b 100644
--- a/languages/messages/MessagesAce.php
+++ b/languages/messages/MessagesAce.php
@@ -301,7 +301,6 @@ $messages = array(
 'qbbrowse' => 'Lop',
 'qbedit' => 'Andam',
 'qbpageoptions' => 'Ôn nyoe',
-'qbpageinfo' => 'Asoe ôn',
 'qbmyoptions' => 'Ôn lôn',
 'qbspecialpages' => 'Ôn kusuih',
 'faq' => 'FAQ',
diff --git a/languages/messages/MessagesAeb.php b/languages/messages/MessagesAeb.php
index 3aa6b1f8e9..f98b4bd20c 100644
--- a/languages/messages/MessagesAeb.php
+++ b/languages/messages/MessagesAeb.php
@@ -156,7 +156,6 @@ $messages = array(
 'qbbrowse' => 'ara',
 'qbedit' => 'modifi el page (baddelha)',
 'qbpageoptions' => 'هذه الصفحة',
-'qbpageinfo' => 'سياق النص',
 'qbmyoptions' => 'صفحاتي',
 'qbspecialpages' => 'الصفحات الخاصة',
 'faq' => 'الأسئلة الأكثر تكرارا',
diff --git a/languages/messages/MessagesAf.php b/languages/messages/MessagesAf.php
index cd22f4998b..3347bbae36 100644
--- a/languages/messages/MessagesAf.php
+++ b/languages/messages/MessagesAf.php
@@ -54,7 +54,6 @@ $magicWords = array(
 	'forcetoc'                  => array( '0', '__DWINGIO__', '__FORCETOC__' ),
 	'toc'                       => array( '0', '__IO__', '__TOC__' ),
 	'noeditsection'             => array( '0', '__GEENNUWEAFDELING__', '__NOEDITSECTION__' ),
-	'noheader'                  => array( '0', '__GEENOPSKRIF__', '__NOHEADER__' ),
 	'currentmonth'              => array( '1', 'HUIDIGEMAAND', 'CURRENTMONTH', 'CURRENTMONTH2' ),
 	'currentmonth1'             => array( '1', 'HUIDIGEMAAND1', 'CURRENTMONTH1' ),
 	'currentmonthname'          => array( '1', 'HUIDIGEMAANDNAAM', 'CURRENTMONTHNAME' ),
diff --git a/languages/messages/MessagesAln.php b/languages/messages/MessagesAln.php
index a94eac8142..e07da4fe09 100644
--- a/languages/messages/MessagesAln.php
+++ b/languages/messages/MessagesAln.php
@@ -211,7 +211,6 @@ $messages = array(
 'qbbrowse' => 'Shfleto',
 'qbedit' => 'Redakto',
 'qbpageoptions' => 'Kjo faqe',
-'qbpageinfo' => 'Konteksti',
 'qbmyoptions' => 'Faqet e mija',
 'qbspecialpages' => 'Faqet speciale',
 'faq' => 'Pyetjet e shpeshta',
diff --git a/languages/messages/MessagesAm.php b/languages/messages/MessagesAm.php
index 4228fe0a7b..3e59f1e59e 100644
--- a/languages/messages/MessagesAm.php
+++ b/languages/messages/MessagesAm.php
@@ -1835,6 +1835,16 @@ Please visit [//www.mediawiki.org/wiki/Localisation MediaWiki Localisation] and
 'spambot_username' => 'MediaWiki የስፓም ማፅዳት',
 'spam_reverting' => 'ወደ $1 የሚወስድ መያያዣ ወደሌለበት መጨረሻ ዕትም መለሰው',
 
+# Info page
+'pageinfo-firstuser' => 'የገጹ ፈጣሪ',
+'pageinfo-firsttime' => 'የተፈጠረበት ቀን',
+'pageinfo-lastuser' => 'የመጨረሻው አራሚ',
+'pageinfo-lasttime' => 'የመጨረሻው ዕትም ቀን',
+'pageinfo-edits' => 'ጠቅላላ የእርማት ቁጥር',
+'pageinfo-toolboxlink' => 'የዚህ ገጽ መረጃ',
+'pageinfo-contentpage-yes' => 'አዎ',
+'pageinfo-protect-cascading-yes' => 'አዎ',
+
 # Patrolling
 'markaspatrolleddiff' => 'የተሳለፈ ሆኖ ማመልከት',
 'markaspatrolledtext' => 'ይህን ገጽ የተመለከተ ሆኖ ለማሳለፍ',
diff --git a/languages/messages/MessagesAng.php b/languages/messages/MessagesAng.php
index 3b55cfb5e7..c4272ccfd4 100644
--- a/languages/messages/MessagesAng.php
+++ b/languages/messages/MessagesAng.php
@@ -173,7 +173,6 @@ $messages = array(
 'qbbrowse' => 'Onbirȝe',
 'qbedit' => 'Ādihte',
 'qbpageoptions' => 'Þēos sīde',
-'qbpageinfo' => 'Ȝeƿef',
 'qbmyoptions' => 'Mīna sīdan',
 'qbspecialpages' => 'Syndriȝa sīdan',
 'faq' => 'Oftost ascoda ascunȝa',
diff --git a/languages/messages/MessagesAr.php b/languages/messages/MessagesAr.php
index 0baa8ede88..543c10fbb8 100644
--- a/languages/messages/MessagesAr.php
+++ b/languages/messages/MessagesAr.php
@@ -194,7 +194,6 @@ $magicWords = array(
 	'forcetoc'                  => array( '0', '__لصق_فهرس__', '__FORCETOC__' ),
 	'toc'                       => array( '0', '__فهرس__', '__TOC__' ),
 	'noeditsection'             => array( '0', '__لاتحريرقسم__', '__NOEDITSECTION__' ),
-	'noheader'                  => array( '0', '__لاعنوان__', '__NOHEADER__' ),
 	'currentmonth'              => array( '1', 'شهر_حالي', 'شهر_حالي2', 'CURRENTMONTH', 'CURRENTMONTH2' ),
 	'currentmonth1'             => array( '1', 'شهر_حالي1', 'CURRENTMONTH1' ),
 	'currentmonthname'          => array( '1', 'اسم_الشهر_الحالي', 'CURRENTMONTHNAME' ),
@@ -421,7 +420,6 @@ $specialPageAliases = array(
 	'Recentchanges'             => array( 'أحدث_التغييرات' ),
 	'Recentchangeslinked'       => array( 'أحدث_التغييرات_الموصولة', 'تغييرات_مرتبطة' ),
 	'Revisiondelete'            => array( 'حذف_مراجعة' ),
-	'RevisionMove'              => array( 'نقل_مراجعة' ),
 	'Search'                    => array( 'بحث' ),
 	'Shortpages'                => array( 'صفحات_قصيرة' ),
 	'Specialpages'              => array( 'صفحات_خاصة' ),
@@ -732,7 +730,7 @@ $1',
 'youhavenewmessages' => 'توجد لديك $1 ($2).',
 'newmessageslink' => 'رسائل جديدة',
 'newmessagesdifflink' => 'آخر تغيير',
-'youhavenewmessagesfromusers' => 'لديك $1 من {{PLURAL:$3|مستخدم آخر|$3 مستخدمين}} ($2).',
+'youhavenewmessagesfromusers' => 'لديك $1 من {{PLURAL:$3||مستخدم واحد|مستخدمين اثنين|$3 مستخدمين|$3 مستخدماً|$3 مستخدم}} ($2).',
 'youhavenewmessagesmanyusers' => 'لديك $1 من مستخدمين كثر ($2).',
 'newmessageslinkplural' => '{{PLURAL:$1|رسالة جديدة|رسائل جديدة}}',
 'newmessagesdifflinkplural' => 'آخر {{PLURAL:$1|تغيير|تغييرات}}',
@@ -964,7 +962,7 @@ $2',
 'emailauthenticated' => 'تم تأكيد بريدك الإلكتروني في $2 الساعة $3.',
 'emailnotauthenticated' => 'لم يتم التحقق من بريدك الإلكتروني.
 لن يتم إرسال رسائل لأي من الميزات التالية.',
-'noemailprefs' => 'حدد عنوان بريد إلكتروني في تفضيلاتك لهذه الخصائص لتعمل.',
+'noemailprefs' => 'حدد عنوان بريد إلكتروني في تفضيلاتك لتفعيل هذه الخصائص.',
 'emailconfirmlink' => 'أكد عنوان بريدك الإلكتروني',
 'invalidemailaddress' => 'لا يمكن قبول عنوان البريد الإلكتروني حيث تبدو صيغته خاطئة.
 ضع عنوانا مضبوطا أو أفرغ هذا الحقل.',
@@ -1265,6 +1263,9 @@ $2
 'invalid-content-data' => 'بيانات المحتوى غير صالحة',
 'content-not-allowed-here' => '"$1" المحتوى غير مسموح على صفحة [[$2]]',
 
+# Content models
+'content-model-javascript' => 'جافاسكربت',
+
 # Parser/template warnings
 'expensive-parserfunction-warning' => "'''تحذير:''' هذه الصفحة تحتوي على استدعاءات دالة محلل كثيرة مكلفة.
 
@@ -1655,8 +1656,8 @@ $1",
 'email' => 'البريد الإلكتروني',
 'prefs-help-realname' => 'الاسم الحقيقي اختياري.
 لو اخترت أن توفره، فسيستخدم في الإشارة إلى عملك.',
-'prefs-help-email' => 'عنوان البريد الإلكتروني هو أمر اختياري، ولكن ستحتاج لإعادة تعيين كلمة المرور، إن نسيت كلمة المرور الخاصة بك.',
-'prefs-help-email-others' => 'يمكنك أيضا اختيار للسماح للآخرين الاتصال بك عن طريق صفحة المستخدم أو نقاش المستخدم الخاص بك دون الحاجة إلى الكشف عن الهوية الخاصة بك.',
+'prefs-help-email' => 'تحديد عنوان البريد الإلكتروني اختياري، ولكنه يلزم لإعادة تعيين كلمة المرور في حال نسيت كلمة المرور الخاصة بك.',
+'prefs-help-email-others' => 'يمكنك أيضا أن {{GENDER:$1|تسمح|تسمحي}} للآخرين الاتصال بك عن طريق وصلة في صفحة المستخدم أو نقاش المستخدم الخاصة بك. لا يكشف بريدك الإلكتروني عندما يراسلك أحد بهذه الطريقة، ولكن إذا راسلت أحداً سيرى بريدك الإلكتروني.',
 'prefs-help-email-required' => 'عنوان البريد الإلكتروني مطلوب.',
 'prefs-info' => 'المعلومات الأساسية',
 'prefs-i18n' => 'الترجمة',
@@ -2740,7 +2741,7 @@ $UNWATCHURL
 'undeletedrevisions-files' => 'أسترجعت {{PLURAL:$1||مراجعة واحدة|مراجعتان|$1 مراجعات|$1 مراجعة}}  و{{PLURAL:$2||ملف واحد|ملفان|$2 ملفات|$2 ملفًا|$2 ملف}}',
 'undeletedfiles' => 'أسترجع {{PLURAL:$1||ملف واحد|ملفان|$1 ملفات|$1 ملفًا|$1 ملف}}',
 'cannotundelete' => 'فشل الاسترجاع؛
-ربما قام شخص آخر باسترجاع الصفحة بالفعل.',
+$1',
 'undeletedpage' => "'''تم استرجاع $1'''
 
 راجع [[Special:Log/delete|سجل الحدف]] لمعاينة عمليات الحذف والاسترجاعات الحديثة.",
@@ -3329,6 +3330,7 @@ $1',
 'pageinfo-default-sort' => 'مفتاح الترتيب الافتراضي',
 'pageinfo-length' => 'حجم الصفحة (بالبايت)',
 'pageinfo-article-id' => 'معرف الصفحة (ID)',
+'pageinfo-language' => 'لغة محتوى الصفحة',
 'pageinfo-robot-policy' => 'الصفة في محرك البحث',
 'pageinfo-robot-index' => 'قابلة للفهرسة',
 'pageinfo-robot-noindex' => 'غير قابلة للفهرسة',
@@ -4388,7 +4390,7 @@ $5
 # Durations
 'duration-seconds' => '{{PLURAL:$1|أقل من ثانية|ثانية واحدة|ثانيتان|$1 ثوانٍ|$1 ثانية}}',
 'duration-minutes' => '{{PLURAL:$1|أقل من دقيقة|دقيقة واحدة|دقيقتان|$1 دقائق|$1 دقيقة}}',
-'duration-hours' => '({{PLURAL:$1||ساعة واحد|ساعتان|$1 ساعات|$1 ساعة}})',
+'duration-hours' => '({{PLURAL:$1||ساعة واحدة|ساعتان|$1 ساعات|$1 ساعة}})',
 'duration-days' => '{{PLURAL:$1||يوم واحد|يومان|$1 أيام|$1 يومًا|$1 يوم}}',
 'duration-weeks' => '{{PLURAL:$1||أسبوع واحد|أسبوعان|$1 أسابيع|$1 أسبوعًا|$1 أسبوع}}',
 'duration-years' => '{{PLURAL: $1||سنة واحدة|سنتان|$1 سنين|$1 سنة}}',
diff --git a/languages/messages/MessagesArc.php b/languages/messages/MessagesArc.php
index c5144ddc49..67d38abc76 100644
--- a/languages/messages/MessagesArc.php
+++ b/languages/messages/MessagesArc.php
@@ -46,16 +46,30 @@ $specialPageAliases = array(
 	'Activeusers'               => array( 'ܡܦܠܚܢ̈ܐ_ܙܪ̄ܝܙܐ' ),
 	'Allmessages'               => array( 'ܟܠ_ܐܓܪ̈ܬܐ' ),
 	'Allpages'                  => array( 'ܟܠ_ܦܐܬܬ̈ܐ' ),
+	'Ancientpages'              => array( 'ܦܐܬܬ̈ܐ_ܥܬܝܩܬ̈ܐ' ),
 	'Badtitle'                  => array( 'ܟܘܢܝܐ_ܠܐ_ܛܒܐ' ),
 	'Blankpage'                 => array( 'ܦܐܬܐ_ܣܦܝܩܬܐ' ),
+	'BrokenRedirects'           => array( 'ܨܘܝܒ̈ܐ_ܬܒܝܪ̈ܐ' ),
 	'Categories'                => array( 'ܣܕܪ̈ܐ' ),
+	'ChangeEmail'               => array( 'ܫܚܠܦ_ܒܝܠܕܪܐ_ܐܠܩܛܪܘܢܝܐ' ),
+	'ComparePages'              => array( 'ܦܚܘܡ_ܒܝܢܬ_ܦܐܬܬ̈ܐ' ),
+	'Confirmemail'              => array( 'ܫܪܪ_ܒܝܠܕܪܐ_ܐܠܩܛܪܘܢܝܐ' ),
 	'Contributions'             => array( 'ܫܘܬܦܘܝܬ̈ܐ' ),
 	'CreateAccount'             => array( 'ܒܪܝ_ܚܘܫܒܢܐ' ),
+	'Deadendpages'              => array( 'ܦܐܬܬ̈ܐ_ܥܡ_ܚܪܬܐ_ܡܝܬܬܐ' ),
 	'DeletedContributions'      => array( 'ܫܘܬܦܘܝܬ̈ܐ_ܫܝܦܬ̈ܐ' ),
+	'Disambiguations'           => array( 'ܬܘܚܡ̈ܐ_ܐܚܪ̈ܢܐ' ),
+	'DoubleRedirects'           => array( 'ܨܘܝܒ̈ܐ_ܥܦܝܦ̈ܐ' ),
+	'EditWatchlist'             => array( 'ܫܚܠܦ_ܪ̈ܗܝܬܐ' ),
+	'Emailuser'                 => array( 'ܫܕܪ_ܒܝܠܕܪܐ_ܐܠܩܛܪܘܢܝܐ_ܠܡܦܠܚܢܐ' ),
+	'Fewestrevisions'           => array( 'ܬܢܝܬ̈ܐ_ܒܨܝܪ_ܡܢ_ܟܠ' ),
 	'Filepath'                  => array( 'ܫܒܝܠܐ_ܕܦܐܬܐ' ),
 	'Log'                       => array( 'ܣܓܠܐ', 'ܣܓܠ̈ܐ' ),
 	'Lonelypages'               => array( 'ܦܐܬܬ̈ܐ_ܝܬܡܬ̈ܐ' ),
 	'Longpages'                 => array( 'ܦܐܬܬ̈ܐ_ܐܪ̈ܝܟܬܐ' ),
+	'Mostlinkedcategories'      => array( 'ܣܕܪ̈ܐ_ܐܣܝܪ̈ܐ_ܝܬܝܪ_ܡܢ_ܟܠ', 'ܣܕܪ̈ܐ_ܦܠܝܚ̈ܐ_ܝܬܝܪ_ܡܢ_ܟܠ' ),
+	'Mostlinkedtemplates'       => array( 'ܩܠܒ̈ܐ_ܐܣܝܪ̈ܐ_ܝܬܝܪ_ܡܢ_ܟܠ', 'ܩܠܒ̈ܐ_ܦܠܝܚ̈ܐ_ܝܬܝܪ_ܡܢ_ܟܠ' ),
+	'Mostrevisions'             => array( 'ܬܢܝܬ̈ܐ_ܝܬܝܪ_ܡܢ_ܟܠ' ),
 	'Movepage'                  => array( 'ܫܢܝ_ܦܐܬܐ' ),
 	'Mycontributions'           => array( 'ܫܘܬܦܘܝܬ̈ܝ' ),
 	'Mypage'                    => array( 'ܦܐܬܐ_ܕܝܠܝ' ),
@@ -64,6 +78,7 @@ $specialPageAliases = array(
 	'Newimages'                 => array( 'ܠܦܦ̈ܐ_ܚܕ̈ܬܐ', 'ܨܘܪ̈ܬܐ_ܚܕ̈ܬܬܐ' ),
 	'Newpages'                  => array( 'ܦܐܬܬ̈ܐ_ܚܕ̈ܬܬܐ' ),
 	'PermanentLink'             => array( 'ܐܣܘܪܐ_ܦܝܘܫܐ' ),
+	'Popularpages'              => array( 'ܦܐܬܬ̈ܐ_ܡܫܡܗ̈ܐ' ),
 	'Preferences'               => array( 'ܨܒܝܢܝܘܬ̈ܐ' ),
 	'Protectedpages'            => array( 'ܦܐܬܬ̈ܐ_ܢܛܝܪ̈ܬܐ' ),
 	'Protectedtitles'           => array( 'ܟܘܢܝ̈ܐ_ܢܛܝܪ̈ܐ' ),
@@ -71,8 +86,23 @@ $specialPageAliases = array(
 	'Search'                    => array( 'ܒܨܝܐ' ),
 	'Shortpages'                => array( 'ܦܐܬܬ̈ܐ_ܟܪ̈ܝܬܐ' ),
 	'Specialpages'              => array( 'ܦܐܬܬ̈ܐ_ܕ̈ܝܠܢܝܬܐ' ),
+	'Uncategorizedcategories'   => array( 'ܣܕܪ̈ܐ_ܠܐ_ܣܕܝܪ̈ܐ' ),
+	'Uncategorizedimages'       => array( 'ܠܦܦ̈ܐ_ܠܐ_ܣܕܝܪ̈ܐ', 'ܨܘܪ̈ܬܐ_ܠܐ_ܣܕܝܪ̈ܬܐ' ),
+	'Uncategorizedpages'        => array( 'ܦܐܬܬ̈ܐ_ܠܐ_ܣܕܝܪ̈ܬܐ' ),
+	'Uncategorizedtemplates'    => array( 'ܩܠܒ̈ܐ_ܠܐ_ܣܕܝܪ̈ܐ' ),
+	'Unusedcategories'          => array( 'ܣܕܪ̈ܐ_ܠܐ_ܦܠܝܚ̈ܐ' ),
+	'Unusedimages'              => array( 'ܠܦܦ̈ܐ_ܠܐ_ܦܠܝܚ̈ܐ', 'ܨܘܪ̈ܬܐ_ܠܐ_ܦܠܝܚܬ̈ܐ' ),
+	'Unusedtemplates'           => array( 'ܩܠܒ̈ܐ_ܠܐ_ܦܠܝܚ̈ܐ' ),
+	'Unwatchedpages'            => array( 'ܦܐܬܬ̈ܐ_ܠܐ_ܣܢܝܩܬ̈ܐ' ),
 	'Upload'                    => array( 'ܐܣܩ' ),
+	'Userlogin'                 => array( 'ܥܠܠܐ_ܕܡܦܠܚܢܐ' ),
+	'Userlogout'                => array( 'ܦܠܛܐ_ܕܡܦܠܚܢܐ' ),
+	'Userrights'                => array( 'ܙܕ̈ܩܐ_ܕܡܦܠܚܢܐ', 'ܥܒܘܕ_ܡܕܒܪܢܐ_ܕܛܟܣܐ', 'ܥܒܘܕ_ܒܘܛ' ),
 	'Version'                   => array( 'ܨܚܚܐ' ),
+	'Wantedcategories'          => array( 'ܣܕܪ̈ܐ_ܣܢܝܩ̈ܐ' ),
+	'Wantedfiles'               => array( 'ܠܦܦ̈ܐ_ܣܢܝܩ̈ܐ' ),
+	'Wantedpages'               => array( 'ܦܐܬܬ̈ܐ_ܣܢܝܩܬ̈ܐ', 'ܐܣܘܪ̈ܐ_ܬܒܝܪ̈ܐ' ),
+	'Wantedtemplates'           => array( 'ܩܠܒ̈ܐ_ܣܢܝܩ̈ܐ' ),
 	'Watchlist'                 => array( 'ܪ̈ܗܝܬܐ' ),
 	'Whatlinkshere'             => array( 'ܡܐ_ܐܣܪ_ܠܗܪܟܐ' ),
 );
@@ -423,6 +453,10 @@ $1',
 'loginsuccesstitle' => 'ܥܠܠܐ ܓܡܪ',
 'loginsuccess' => "'''ܗܫܐ ܥܠܝܠܐ ܐܢܬ ܒ{{SITENAME}} ܒܫܡ \"\$1\".'''",
 'nouserspecified' => 'ܘܠܐ ܠܟ ܕܬܚܡ ܫܡܐ ܕܡܦܠܚܢܐ',
+'wrongpassword' => 'ܡܠܬܐ ܕܥܠܠܐ ܠܐ ܬܪܝܨܬܐ ܐܥܠܬ.
+ܒܒܥܘ ܡܢܟ ܕܬܢܣܐ ܙܒܢ ܐܚܪܝܢ.',
+'wrongpasswordempty' => 'ܡܠܬܐ ܕܥܠܠܐ ܕܐܥܠܬ ܣܦܝܩܬܐ ܐܝܬܝܗ.
+ܒܒܥܘ ܡܢܟ ܕܬܢܣܐ ܙܒܢ ܐܚܪܝܢ.',
 'mailmypassword' => 'ܫܕܪ ܠܝ ܡܠܬܐ ܚܕܬܐ ܕܥܠܠܐ',
 'passwordremindertitle' => 'ܡܠܬܐ ܕܥܠܠܐ ܙܒܢܢܝܬܐ ܚܕܬܐ ܠ{{SITENAME}}',
 'noemail' => 'ܠܝܬ ܒܝܠܕܪܐ ܐܠܩܛܪܘܢܝܐ ܠܡܦܠܚܢܐ "$1".',
@@ -493,7 +527,7 @@ $1',
 'note' => "'''ܡܥܝܪܢܘܬܐ:'''",
 'previewnote' => "'''ܕܟܪ ܕܗܢܘ ܚܝܪܐ ܩܕܡܝܐ ܒܠܚܘܕ'''.
 ܫܘܚܠܦ̈ܐ ܕܝܠܟ ܠܐ ܐܬܠܒܟܘ ܥܕܡܐ ܠܗܫܐ!",
-'continue-editing' => 'ܐܓܡܪ ܠܫܘܚܠܦܐ',
+'continue-editing' => 'ܙܠ ܠܝܬܒܐ ܕܫܘܚܠܦܐ',
 'editing' => 'ܫܚܠܦܬܐ ܕ $1',
 'creating' => 'ܣܘܝܡܐ ܕ $1',
 'editingsection' => 'ܫܚܠܦܬܐ ܕ $1 (ܡܢܬܐ)',
@@ -597,7 +631,7 @@ $1',
 'showhideselectedversions' => 'ܚܘܝ/ܛܫܝ ܬܢܝܬ̈ܐ ܓܒܝܬ̈ܐ',
 'editundo' => 'ܠܐ ܬܥܒܕ',
 'diff-multi' => '({{PLURAL:$1|ܚܕܐ ܬܢܝܬܐ ܡܨܥܝܬܐ|$1 ܬܢܝܬ̈ܐ ܡܨܥܝܬ̈ܐ}} ܒܝܕ {{PLURAL:$2|ܚܕ ܡܦܠܚܢܐ ܠܐ ܓܠܝܚܬܐ|$2 ܡܦܠܚܢ̈ܐ ܠܐ ܓܠܝܚܬ̈ܐ}})',
-'diff-multi-manyusers' => '({{PLURAL:$1|One ܚܕܐ ܬܢܝܬܐ ܡܨܥܝܬܐ|$1 ܬܢܝܬ̈ܐ ܡܨܥܝܬ̈ܐ}} ܒܝܕ ܝܬܝܪ ܡܢ $2 {{PLURAL:$2|ܚܕ ܡܦܠܚܢܐ ܠܐ ܓܠܝܚܬܐ|ܡܦܠܚܢ̈ܐ ܠܐ ܓܠܝܚܬ̈ܐ}})',
+'diff-multi-manyusers' => '({{PLURAL:$1|ܚܕܐ ܬܢܝܬܐ ܡܨܥܝܬܐ ܠܐ ܓܠܝܚܬܐ|$1 ܬܢܝܬ̈ܐ ܡܨܥܝܬ̈ܐ ܠܐ ܓܠܝܚܬ̈ܐ}} ܒܝܕ ܝܬܝܪ ܡܢ $2 {{PLURAL:$2|ܚܕ ܡܦܠܚܢܐ|ܡܦܠܚܢ̈ܐ}})',
 
 # Search results
 'searchresults' => 'ܦܠܛ̈ܐ ܕܒܨܝܐ',
@@ -1035,7 +1069,7 @@ $1',
 'ancientpages' => 'ܦܐܬܬ̈ܐ ܥܬܝܩ ܡܢ ܟܠ',
 'move' => 'ܫܢܝ',
 'movethispage' => 'ܫܢܝ ܦܐܬܐ ܗܕܐ',
-'notargettitle' => 'ܠܐ ܢܘܦܐ',
+'notargettitle' => 'ܕܠܐ ܢܘܦܐ',
 'nopagetitle' => 'ܠܝܬ ܗܟܘܬ ܦܐܬܐ ܕܢܘܦܐ',
 'pager-newer-n' => '{{PLURAL:$1|1 1 ܚܕܬܐ|$1 ܚܕ̈ܬܐ}}',
 'pager-older-n' => '{{PLURAL:$1|ܥܬܝܩܐ 1|ܥܬܝܩ̈ܐ $1}}',
@@ -1063,7 +1097,7 @@ $1',
 'allpagesto' => 'ܚܘܝ ܦܐܬܬ̈ܐ ܕܫܠܡ ܥܡ:',
 'allarticles' => 'ܟܠ ܡܓܠ̈ܐ',
 'allinnamespace' => 'ܟܠ ܦܐܬܬ̈ܐ (ܚܩܠܐ ܕ $1)',
-'allnotinnamespace' => 'ܟܠ ܦܐܬܬ̈ܐ (ܠܐ ܒܚܩܠܐ ܕ $1)',
+'allnotinnamespace' => 'ܟܠ ܦܐܬܬ̈ܐ (ܕܠܝܬ ܒܚܩܠܐ ܕ $1)',
 'allpagesprev' => 'ܕܩܕܡ',
 'allpagesnext' => 'ܕܒܬܪ',
 'allpagessubmit' => 'ܙܠ',
@@ -1095,7 +1129,7 @@ $1',
 # Special:ListUsers
 'listusersfrom' => 'ܚܘܝ ܡܦܠܚܢ̈ܐ ܕܫܪܝܢ ܒ:',
 'listusers-submit' => 'ܚܘܝ',
-'listusers-noresult' => 'ܠܐ ܡܦܠܚܢܐ ܐܫܬܟܚ',
+'listusers-noresult' => 'ܠܐ ܐܫܬܟܚ ܡܦܠܚܢܐ ܚܕ.',
 'listusers-blocked' => '(ܚܪܝܡܐ)',
 
 # Special:ActiveUsers
@@ -1104,7 +1138,7 @@ $1',
 'activeusers-from' => 'ܚܘܝ ܡܦܠܚܢ̈ܐ ܕܫܪܐ ܥܡ:',
 'activeusers-hidebots' => 'ܛܫܝ ܒܘܬ̈ܐ (bots)',
 'activeusers-hidesysops' => 'ܛܫܝ ܡܕܒܪ̈ܢܐ',
-'activeusers-noresult' => 'ܠܐ ܡܦܠܚܢܐ ܐܫܬܟܚ.',
+'activeusers-noresult' => 'ܠܐ ܐܫܬܟܚ ܡܦܠܚܢ̈ܐ ܐܢܫ̈ܝܢ.',
 
 # Special:Log/newusers
 'newuserlogpage' => 'ܣܓܠܐ ܕܒܪܝܬܐ ܕܡܦܠܚܢܐ',
@@ -1171,7 +1205,7 @@ $1',
 
 # Displayed when you click the "watch" button and it is in the process of watching
 'watching' => 'ܪܗܝܐ...',
-'unwatching' => 'ܠܐ ܪܗܝܐ...',
+'unwatching' => 'ܠܚܝ ܪܗܝܐ...',
 
 'enotif_reset' => 'ܫܘܕܥ ܟܠ ܦܐܬܬ̈ܐ ܐܝܟ ܣܥܝܪ̈ܬܐ',
 'enotif_newpagetext' => 'ܗܕܐ ܗܝ ܦܐܬܐ ܚܕܬܐ',
@@ -1356,7 +1390,7 @@ $1',
 'blocklogentry' => 'ܚܪܡ [[$1]] ܠܡܬܚܐ ܕ $2 $3',
 'unblocklogentry' => 'ܫܩܠ ܚܪܡܐ ܡܢ $1',
 'block-log-flags-anononly' => 'ܡܦܠܚܢ̈ܐ ܠܐ ܝܕ̈ܝܥܐ ܒܠܚܘܕ',
-'block-log-flags-nocreate' => 'ܒܪܝܬܐ ܕܚܘܫܒ̈ܢܐ ܠܐ ܗܝ ܡܬܩܒܠܢܬܐ',
+'block-log-flags-nocreate' => 'ܒܪܝܬܐ ܕܚܘ̈ܫܒܢܐ ܠܐ ܐܝܬܝܗ ܡܬܩܒܠܢܐ',
 'block-log-flags-hiddenname' => 'ܫܡܐ ܕܡܦܠܚܢܐ ܛܘܫܝܐ',
 'ipb_already_blocked' => '"$1" ܡܚܪܡܐ ܗܘ ܡܢ ܟܕܘ',
 'ipb-needreblock' => '"$1" ܡܚܪܡܐ ܗܘ ܡܢ ܟܕܘ
@@ -1468,6 +1502,33 @@ Do you want to change the settings?',
 'anonusers' => '{{SITENAME}} {{PLURAL:$2|ܡܦܠܚܢܐ ܠܐ ܝܕܝܥܐ|ܡܦܠܚܢ̈ܐ ܠܐ ܝܕ̈ܝܥܐ}} $1',
 'creditspage' => 'ܙܕ̈ܩܐ ܕܦܐܬܐ',
 
+# Info page
+'pageinfo-title' => 'ܝܕ̈ܥܬܐ ܥܠ "$1"',
+'pageinfo-header-basic' => 'ܝܕ̈ܥܬܐ ܪ̈ܫܝܬܐ',
+'pageinfo-header-edits' => 'ܬܫܥܝܬܐ ܕܫܘܚܠܦ̈ܐ',
+'pageinfo-header-restrictions' => 'ܢܘܛܪܐ ܕܦܐܬܐ',
+'pageinfo-header-properties' => 'ܕ̈ܝܠܝܬܐ ܕܦܐܬܐ',
+'pageinfo-display-title' => 'ܚܘܘܝܐ ܕܟܘܢܝܐ',
+'pageinfo-default-sort' => 'ܩܠܝܕܐ ܕܛܘܟܣܐ ܡܬܚܫܒܢܝܐ',
+'pageinfo-length' => 'ܥܓܪܐ ܕܦܐܬܐ (ܒܒܐܝܛ)',
+'pageinfo-article-id' => 'ܗܝܝܘܬܐ ܕܦܐܬܐ',
+'pageinfo-robot-policy' => 'ܐܝܟܢܝܘܬܐ ܕܡܙܝܥܢܐ ܕܒܨܝܐ',
+'pageinfo-robot-index' => 'ܡܬܚܘܝܢܐ',
+'pageinfo-robot-noindex' => 'ܠܐ ܡܬܚܘܝܢܐ',
+'pageinfo-views' => 'ܡܢܝܢܐ ܕܚܙܝܬ̈ܐ',
+'pageinfo-watchers' => 'ܡܢܝܢܐ ܕܪ̈ܗܝܐ',
+'pageinfo-redirects-name' => 'ܨܘܝܒ̈ܐ ܠܦܐܬܐ ܗܕܐ',
+'pageinfo-subpages-name' => 'ܦܐܬܬ̈ܐ ܦܪ̈ܥܝܐ ܕܦܐܬܐ ܗܕܐ',
+'pageinfo-firstuser' => 'ܒܪܝܢܐ ܕܦܐܬܐ',
+'pageinfo-firsttime' => 'ܣܝܩܘܡܐ ܕܒܪܝܬܐ ܕܦܐܬܐ',
+'pageinfo-lastuser' => 'ܫܚܠܦܢܐ ܐܚܪܝܐ',
+'pageinfo-lasttime' => 'ܣܝܩܘܡܐ ܕܫܘܚܠܦܐ ܐܚܪܝܐ',
+'pageinfo-edits' => 'ܡܢܝܢܐ ܕܫܘܚܠܦ̈ܐ',
+'pageinfo-authors' => 'ܡܢܝܢܐ ܕܡܫܚܠܦܢ̈ܐ ܡܫܚܠܦ̈ܐ',
+'pageinfo-recent-edits' => 'ܡܢܝܢܐ ܕܫܘܚܠܦ̈ܐ ܐܚܪ̈ܝܐ (ܒ {{PLURAL:$1||ܚܕ ܝܘܡܐ|$1 ܝܘܡܬ̈ܐ}})',
+'pageinfo-recent-authors' => 'ܡܢܝܢܐ ܕܡܫܚܠܦܢ̈ܐ ܡܫܚܠܦ̈ܐ ܐܚܪ̈ܝܐ',
+'pageinfo-toolboxlink' => 'ܝܕ̈ܥܬܐ ܥܠ ܦܐܬܐ',
+
 # Image deletion
 'filedeleteerror-short' => 'ܦܘܕܐ ܒܫܝܦܐ ܕܠܦܦܐ: $1',
 'filedeleteerror-long' => 'ܦܘܕ̈ܐ ܐܫܟܚܬ ܟܕ ܫܝܦܐ ܠܦܦܐ:
diff --git a/languages/messages/MessagesArn.php b/languages/messages/MessagesArn.php
index fe36faed48..ab5b7845f7 100644
--- a/languages/messages/MessagesArn.php
+++ b/languages/messages/MessagesArn.php
@@ -110,7 +110,6 @@ $messages = array(
 'qbbrowse' => 'Kintun',
 'qbedit' => 'Pepikape',
 'qbpageoptions' => 'Tüfachi wülngiñ',
-'qbpageinfo' => 'Trokiñdungu',
 'qbmyoptions' => 'tañi nütramkawe',
 'qbspecialpages' => 'Kangelu',
 'faq' => 'Rumelfemkelu ramtun',
diff --git a/languages/messages/MessagesAry.php b/languages/messages/MessagesAry.php
index d10ed89d34..f90ff3fc62 100644
--- a/languages/messages/MessagesAry.php
+++ b/languages/messages/MessagesAry.php
@@ -163,7 +163,6 @@ $messages = array(
 'qbbrowse' => 'ṫsffeh',
 'qbedit' => 'Ĝedel',
 'qbpageoptions' => "Had 'ṣ-ṣefḫa",
-'qbpageinfo' => 'L-Meḍmon',
 'qbmyoptions' => "'Ṣ-Ṣefḫaṫ dyawli",
 'qbspecialpages' => 'Ṣefḫaṫ ĥaṣṣin',
 'faq' => 'asaila kaytaawdo bzaf',
diff --git a/languages/messages/MessagesArz.php b/languages/messages/MessagesArz.php
index e4d84854d6..022c04abb0 100644
--- a/languages/messages/MessagesArz.php
+++ b/languages/messages/MessagesArz.php
@@ -17,22 +17,6 @@
 
 $fallback = 'ar';
 
-// (bug 16469) Override Eastern Arabic numberals, use Western
-$digitTransformTable = array(
-	'0' => '0',
-	'1' => '1',
-	'2' => '2',
-	'3' => '3',
-	'4' => '4',
-	'5' => '5',
-	'6' => '6',
-	'7' => '7',
-	'8' => '8',
-	'9' => '9',
-	'.' => '.',
-	',' => ',',
-);
-
 $namespaceNames = array(
 	NS_MEDIA            => 'ميديا',
 	NS_SPECIAL          => 'خاص',
@@ -58,6 +42,98 @@ $namespaceAliases = array(
 	'نقاش_الصورة' => NS_FILE_TALK,
 );
 
+$specialPageAliases = array(
+	'Activeusers'               => array( 'يوزرات_نشطا' ),
+	'Allmessages'               => array( 'كل_الرسايل' ),
+	'Allpages'                  => array( 'كل_الصفح' ),
+	'Ancientpages'              => array( 'صفح_قديمه' ),
+	'Blankpage'                 => array( 'صفحه_فارضيه' ),
+	'Block'                     => array( 'بلوك', 'بلوك_IP', 'بلوك_يوزر' ),
+	'Blockme'                   => array( 'بلوك_لنفسى' ),
+	'Booksources'               => array( 'مصادر_كتاب' ),
+	'BrokenRedirects'           => array( 'تحويلات_مكسوره' ),
+	'Categories'                => array( 'تصانيف' ),
+	'ChangePassword'            => array( 'تغيير_الپاسوورد', 'ظبط_الپاسوورد' ),
+	'Confirmemail'              => array( 'تأكيد_الايميل' ),
+	'Contributions'             => array( 'مساهمات' ),
+	'CreateAccount'             => array( 'ابتدى_حساب' ),
+	'Deadendpages'              => array( 'صفح_نهايه_مسدوده' ),
+	'DeletedContributions'      => array( 'مساهمات_ممسوحه' ),
+	'Disambiguations'           => array( 'توضيحات' ),
+	'DoubleRedirects'           => array( 'تحويلات_دوبل' ),
+	'Emailuser'                 => array( 'ابعت_ايميل_لليوزر' ),
+	'Export'                    => array( 'تصدير' ),
+	'Fewestrevisions'           => array( 'اقل_مراجعات' ),
+	'FileDuplicateSearch'       => array( 'تدوير_فايل_متكرر' ),
+	'Filepath'                  => array( 'مسار_ملف' ),
+	'Import'                    => array( 'استوراد' ),
+	'Invalidateemail'           => array( 'تعطيل_الايميل' ),
+	'BlockList'                 => array( 'ليستة_البلوك', 'بيّن_البلوك', 'ليستة_بلوك_IP' ),
+	'LinkSearch'                => array( 'تدوير_اللينكات' ),
+	'Listadmins'                => array( 'عرض_الاداريين' ),
+	'Listbots'                  => array( 'عرض_البوتات' ),
+	'Listfiles'                 => array( 'عرض_الفايلات', 'ليستة_الفايلات', 'ليستة_الصور' ),
+	'Listgrouprights'           => array( 'عرض_حقوق_الجروپات' ),
+	'Listredirects'             => array( 'عرض_التحويلات' ),
+	'Listusers'                 => array( 'عرض_اليوزرات', 'ليستة_اليوزرات' ),
+	'Lockdb'                    => array( 'قفل_قب' ),
+	'Log'                       => array( 'سجل', 'سجلات' ),
+	'Lonelypages'               => array( 'صفح_وحدانيه', 'صفح_يتيمه' ),
+	'Longpages'                 => array( 'صفح_طويله' ),
+	'MergeHistory'              => array( 'دمج_التاريخ' ),
+	'MIMEsearch'                => array( 'تدوير_MIME' ),
+	'Mostcategories'            => array( 'اكتر_تصانيف' ),
+	'Mostimages'                => array( 'اكتر_فايلات_معمول_ليها_لينك', 'اكتر_فايلات', 'اكتر_صور' ),
+	'Mostlinked'                => array( 'اكتر_صفح_معمول_ليها_لينك' ),
+	'Mostlinkedcategories'      => array( 'اكتر_تصانيف_معمول_ليها_لينك', 'اكتر_تصانيف_مستعمله' ),
+	'Mostlinkedtemplates'       => array( 'اكتر_قوالب_معمول_ليها_لينك', 'اكتر_قوالب_مستعمله' ),
+	'Mostrevisions'             => array( 'اكتر_مراجعات' ),
+	'Movepage'                  => array( 'نقل_صفحه' ),
+	'Mycontributions'           => array( 'مساهماتى' ),
+	'Mypage'                    => array( 'صفحتى' ),
+	'Mytalk'                    => array( 'مناقشتى' ),
+	'Newimages'                 => array( 'فايلات_جديده', 'صور_جديده' ),
+	'Newpages'                  => array( 'صفح_جديده' ),
+	'Popularpages'              => array( 'صفح_مشهوره' ),
+	'Preferences'               => array( 'تفضيلات' ),
+	'Prefixindex'               => array( 'فهرس_بدايه' ),
+	'Protectedpages'            => array( 'صفح_محميه' ),
+	'Protectedtitles'           => array( 'عناوين_محميه' ),
+	'Randompage'                => array( 'عشوائى', 'صفحه_عشوائيه' ),
+	'Randomredirect'            => array( 'تحويله_عشوائيه' ),
+	'Recentchanges'             => array( 'اخر_تعديلات' ),
+	'Recentchangeslinked'       => array( 'اجدد_التغييرات_اللى_معمول_ليها_لينك', 'تغييرات_مرتبطه' ),
+	'Revisiondelete'            => array( 'مسح_نسخه' ),
+	'Search'                    => array( 'تدوير' ),
+	'Shortpages'                => array( 'صفح_قصيره' ),
+	'Specialpages'              => array( 'صفح_مخصوصه' ),
+	'Statistics'                => array( 'احصائيات' ),
+	'Tags'                      => array( 'وسوم' ),
+	'Unblock'                   => array( 'رفع_منع' ),
+	'Uncategorizedcategories'   => array( 'تصانيف_مش_متصنفه' ),
+	'Uncategorizedimages'       => array( 'فايلات_مش_متصنفه', 'صور_مش_متصنفه' ),
+	'Uncategorizedpages'        => array( 'صفح_مش_متصنفه' ),
+	'Uncategorizedtemplates'    => array( 'قوالب_مش_متصنفه' ),
+	'Undelete'                  => array( 'استرجاع' ),
+	'Unlockdb'                  => array( 'فتح_قب' ),
+	'Unusedcategories'          => array( 'تصانيف_مش_مستعمله' ),
+	'Unusedimages'              => array( 'فايلات_مش_مستعمله', 'صور_مش_مستعمله' ),
+	'Unusedtemplates'           => array( 'قوالب_مش_مستعمله' ),
+	'Unwatchedpages'            => array( 'صفح_مش_متراقبه' ),
+	'Upload'                    => array( 'رفع' ),
+	'Userlogin'                 => array( 'دخول_اليوزر' ),
+	'Userlogout'                => array( 'خروج_اليوزر' ),
+	'Userrights'                => array( 'حقوق_اليوزر', 'ترقية_سيسوپ', 'ترقية_بوت' ),
+	'Version'                   => array( 'نسخه' ),
+	'Wantedcategories'          => array( 'تصانيف_مطلوبه' ),
+	'Wantedfiles'               => array( 'فايلات_مطلوبه' ),
+	'Wantedpages'               => array( 'صفح_مطلوبه', 'لينكات_مكسوره' ),
+	'Wantedtemplates'           => array( 'قوالب_مطلوبه' ),
+	'Watchlist'                 => array( 'ليستة_المراقبه' ),
+	'Whatlinkshere'             => array( 'ايه_بيوصل_هنا' ),
+	'Withoutinterwiki'          => array( 'من-غير_interwiki' ),
+);
+
 $magicWords = array(
 	'redirect'                  => array( '0', '#تحويل', '#REDIRECT' ),
 	'notoc'                     => array( '0', '__لافهرس__', '__NOTOC__' ),
@@ -65,7 +141,6 @@ $magicWords = array(
 	'forcetoc'                  => array( '0', '__لصق_فهرس__', '__FORCETOC__' ),
 	'toc'                       => array( '0', '__فهرس__', '__TOC__' ),
 	'noeditsection'             => array( '0', '__لاتحريرقسم__', '__NOEDITSECTION__' ),
-	'noheader'                  => array( '0', '__لاعنوان__', '__NOHEADER__' ),
 	'currentmonth'              => array( '1', 'شهر_حالى', 'شهر_حالي2', 'شهر_حالي', 'CURRENTMONTH', 'CURRENTMONTH2' ),
 	'currentmonth1'             => array( '1', 'شهر_حالي1', 'CURRENTMONTH1' ),
 	'currentmonthname'          => array( '1', 'اسم_الشهر_الحالى', 'اسم_الشهر_الحالي', 'CURRENTMONTHNAME' ),
@@ -208,96 +283,20 @@ $magicWords = array(
 	'url_query'                 => array( '0', 'استعلام', 'QUERY' ),
 );
 
-$specialPageAliases = array(
-	'Activeusers'               => array( 'يوزرات_نشطا' ),
-	'Allmessages'               => array( 'كل_الرسايل' ),
-	'Allpages'                  => array( 'كل_الصفح' ),
-	'Ancientpages'              => array( 'صفح_قديمه' ),
-	'Blankpage'                 => array( 'صفحه_فارضيه' ),
-	'Block'                     => array( 'بلوك', 'بلوك_IP', 'بلوك_يوزر' ),
-	'Blockme'                   => array( 'بلوك_لنفسى' ),
-	'Booksources'               => array( 'مصادر_كتاب' ),
-	'BrokenRedirects'           => array( 'تحويلات_مكسوره' ),
-	'Categories'                => array( 'تصانيف' ),
-	'ChangePassword'            => array( 'تغيير_الپاسوورد', 'ظبط_الپاسوورد' ),
-	'Confirmemail'              => array( 'تأكيد_الايميل' ),
-	'Contributions'             => array( 'مساهمات' ),
-	'CreateAccount'             => array( 'ابتدى_حساب' ),
-	'Deadendpages'              => array( 'صفح_نهايه_مسدوده' ),
-	'DeletedContributions'      => array( 'مساهمات_ممسوحه' ),
-	'Disambiguations'           => array( 'توضيحات' ),
-	'DoubleRedirects'           => array( 'تحويلات_دوبل' ),
-	'Emailuser'                 => array( 'ابعت_ايميل_لليوزر' ),
-	'Export'                    => array( 'تصدير' ),
-	'Fewestrevisions'           => array( 'اقل_مراجعات' ),
-	'FileDuplicateSearch'       => array( 'تدوير_فايل_متكرر' ),
-	'Filepath'                  => array( 'مسار_ملف' ),
-	'Import'                    => array( 'استوراد' ),
-	'Invalidateemail'           => array( 'تعطيل_الايميل' ),
-	'BlockList'                 => array( 'ليستة_البلوك', 'بيّن_البلوك', 'ليستة_بلوك_IP' ),
-	'LinkSearch'                => array( 'تدوير_اللينكات' ),
-	'Listadmins'                => array( 'عرض_الاداريين' ),
-	'Listbots'                  => array( 'عرض_البوتات' ),
-	'Listfiles'                 => array( 'عرض_الفايلات', 'ليستة_الفايلات', 'ليستة_الصور' ),
-	'Listgrouprights'           => array( 'عرض_حقوق_الجروپات' ),
-	'Listredirects'             => array( 'عرض_التحويلات' ),
-	'Listusers'                 => array( 'عرض_اليوزرات', 'ليستة_اليوزرات' ),
-	'Lockdb'                    => array( 'قفل_قب' ),
-	'Log'                       => array( 'سجل', 'سجلات' ),
-	'Lonelypages'               => array( 'صفح_وحدانيه', 'صفح_يتيمه' ),
-	'Longpages'                 => array( 'صفح_طويله' ),
-	'MergeHistory'              => array( 'دمج_التاريخ' ),
-	'MIMEsearch'                => array( 'تدوير_MIME' ),
-	'Mostcategories'            => array( 'اكتر_تصانيف' ),
-	'Mostimages'                => array( 'اكتر_فايلات_معمول_ليها_لينك', 'اكتر_فايلات', 'اكتر_صور' ),
-	'Mostlinked'                => array( 'اكتر_صفح_معمول_ليها_لينك' ),
-	'Mostlinkedcategories'      => array( 'اكتر_تصانيف_معمول_ليها_لينك', 'اكتر_تصانيف_مستعمله' ),
-	'Mostlinkedtemplates'       => array( 'اكتر_قوالب_معمول_ليها_لينك', 'اكتر_قوالب_مستعمله' ),
-	'Mostrevisions'             => array( 'اكتر_مراجعات' ),
-	'Movepage'                  => array( 'نقل_صفحه' ),
-	'Mycontributions'           => array( 'مساهماتى' ),
-	'Mypage'                    => array( 'صفحتى' ),
-	'Mytalk'                    => array( 'مناقشتى' ),
-	'Newimages'                 => array( 'فايلات_جديده', 'صور_جديده' ),
-	'Newpages'                  => array( 'صفح_جديده' ),
-	'Popularpages'              => array( 'صفح_مشهوره' ),
-	'Preferences'               => array( 'تفضيلات' ),
-	'Prefixindex'               => array( 'فهرس_بدايه' ),
-	'Protectedpages'            => array( 'صفح_محميه' ),
-	'Protectedtitles'           => array( 'عناوين_محميه' ),
-	'Randompage'                => array( 'عشوائى', 'صفحه_عشوائيه' ),
-	'Randomredirect'            => array( 'تحويله_عشوائيه' ),
-	'Recentchanges'             => array( 'اخر_تعديلات' ),
-	'Recentchangeslinked'       => array( 'اجدد_التغييرات_اللى_معمول_ليها_لينك', 'تغييرات_مرتبطه' ),
-	'Revisiondelete'            => array( 'مسح_نسخه' ),
-	'Search'                    => array( 'تدوير' ),
-	'Shortpages'                => array( 'صفح_قصيره' ),
-	'Specialpages'              => array( 'صفح_مخصوصه' ),
-	'Statistics'                => array( 'احصائيات' ),
-	'Tags'                      => array( 'وسوم' ),
-	'Unblock'                   => array( 'رفع_منع' ),
-	'Uncategorizedcategories'   => array( 'تصانيف_مش_متصنفه' ),
-	'Uncategorizedimages'       => array( 'فايلات_مش_متصنفه', 'صور_مش_متصنفه' ),
-	'Uncategorizedpages'        => array( 'صفح_مش_متصنفه' ),
-	'Uncategorizedtemplates'    => array( 'قوالب_مش_متصنفه' ),
-	'Undelete'                  => array( 'استرجاع' ),
-	'Unlockdb'                  => array( 'فتح_قب' ),
-	'Unusedcategories'          => array( 'تصانيف_مش_مستعمله' ),
-	'Unusedimages'              => array( 'فايلات_مش_مستعمله', 'صور_مش_مستعمله' ),
-	'Unusedtemplates'           => array( 'قوالب_مش_مستعمله' ),
-	'Unwatchedpages'            => array( 'صفح_مش_متراقبه' ),
-	'Upload'                    => array( 'رفع' ),
-	'Userlogin'                 => array( 'دخول_اليوزر' ),
-	'Userlogout'                => array( 'خروج_اليوزر' ),
-	'Userrights'                => array( 'حقوق_اليوزر', 'ترقية_سيسوپ', 'ترقية_بوت' ),
-	'Version'                   => array( 'نسخه' ),
-	'Wantedcategories'          => array( 'تصانيف_مطلوبه' ),
-	'Wantedfiles'               => array( 'فايلات_مطلوبه' ),
-	'Wantedpages'               => array( 'صفح_مطلوبه', 'لينكات_مكسوره' ),
-	'Wantedtemplates'           => array( 'قوالب_مطلوبه' ),
-	'Watchlist'                 => array( 'ليستة_المراقبه' ),
-	'Whatlinkshere'             => array( 'ايه_بيوصل_هنا' ),
-	'Withoutinterwiki'          => array( 'من-غير_interwiki' ),
+// (bug 16469) Override Eastern Arabic numberals, use Western
+$digitTransformTable = array(
+	'0' => '0',
+	'1' => '1',
+	'2' => '2',
+	'3' => '3',
+	'4' => '4',
+	'5' => '5',
+	'6' => '6',
+	'7' => '7',
+	'8' => '8',
+	'9' => '9',
+	'.' => '.',
+	',' => ',',
 );
 
 $messages = array(
diff --git a/languages/messages/MessagesAs.php b/languages/messages/MessagesAs.php
index 0d00d74441..893508242b 100644
--- a/languages/messages/MessagesAs.php
+++ b/languages/messages/MessagesAs.php
@@ -86,7 +86,7 @@ $specialPageAliases = array(
 	'CreateAccount'             => array( 'সদস্যভুক্তি' ),
 	'DeletedContributions'      => array( 'বিলোপ_কৰা_বৰঙনিসমূহ' ),
 	'Disambiguations'           => array( 'দ্ব্যৰ্থতা_দূৰীকৰণসমূহ' ),
-	'DoubleRedirects'           => array( 'দ্বি_পুণঃনিৰ্দেশনাসমূহ' ),
+	'DoubleRedirects'           => array( 'দ্বি_পুনৰ্নিৰ্দেশনাসমূহ' ),
 	'EditWatchlist'             => array( 'লক্ষ্যতালিকা_সম্পাদনা_কৰক' ),
 	'Emailuser'                 => array( 'সদস্যলৈ_ই-মেইল_পঠিয়াওক' ),
 	'Export'                    => array( 'ৰপ্তানি' ),
@@ -102,14 +102,14 @@ $specialPageAliases = array(
 	'Listbots'                  => array( 'বটৰ_তালিকা' ),
 	'Listfiles'                 => array( 'চিত্ৰ-তালিকা' ),
 	'Listgrouprights'           => array( 'গোটৰ_অধিকাৰসমূহ' ),
-	'Listredirects'             => array( 'পুণঃনিৰ্দেশনাসমূহৰ_তালিকা' ),
+	'Listredirects'             => array( 'পুনৰ্নিৰ্দেশনাসমূহৰ_তালিকা' ),
 	'Listusers'                 => array( 'সদস্য-তালিকা' ),
 	'Lockdb'                    => array( 'তথ্যকোষ_বন্ধ_কৰক' ),
 	'Log'                       => array( 'অভিলেখ', 'অভিলেখসমূহ' ),
 	'Lonelypages'               => array( 'অকলশৰীয়া_পৃষ্ঠা' ),
 	'Longpages'                 => array( 'দীঘলীয়া_পৃষ্ঠাসমূহ' ),
 	'MergeHistory'              => array( 'একত্ৰীকৰণ_ইতিহাস' ),
-	'MIMEsearch'                => array( 'MIME_অনুসন্ধান' ),
+	'MIMEsearch'                => array( 'MIMEMIMEmmmgM_অনুসন্ধান' ),
 	'Movepage'                  => array( 'পৃষ্ঠা_স্থানান্তৰ' ),
 	'Mycontributions'           => array( 'মোৰ_বৰঙনি' ),
 	'Mypage'                    => array( 'মোৰ_পৃষ্ঠা' ),
@@ -124,11 +124,10 @@ $specialPageAliases = array(
 	'Protectedpages'            => array( 'সুৰক্ষিত_পৃষ্ঠাসমূহ' ),
 	'Protectedtitles'           => array( 'সুৰক্ষিত_শিৰোনামসমূহ' ),
 	'Randompage'                => array( 'আকস্মিক' ),
-	'Randomredirect'            => array( 'আকস্মিক_পুণঃনিৰ্দেশনা' ),
+	'Randomredirect'            => array( 'আকস্মিক_পুনৰ্নিৰ্দেশনা' ),
 	'Recentchanges'             => array( 'শেহতীয়া_সালসলনি' ),
 	'Recentchangeslinked'       => array( 'সম্পৰ্কিত_সালসলনিসমূহ' ),
 	'Revisiondelete'            => array( 'সংস্কৰণ_বিলোপ' ),
-	'RevisionMove'              => array( 'সংস্কৰণ_স্থানান্তৰ' ),
 	'Search'                    => array( 'সন্ধান' ),
 	'Shortpages'                => array( 'চমু_পৃষ্ঠা' ),
 	'Specialpages'              => array( 'বিশেষ_পৃষ্ঠাসমূহ' ),
@@ -339,7 +338,7 @@ $messages = array(
 'vector-action-protect' => 'সুৰক্ষিত কৰক',
 'vector-action-undelete' => 'পুনৰুদ্ধাৰ কৰক',
 'vector-action-unprotect' => 'সুৰক্ষা সলনি কৰক',
-'vector-simplesearch-preference' => 'উৎকৃষ্ট সন্ধানৰ পৰামৰ্শ সক্ৰিয় কৰক (ভেক্টৰ স্কিনৰ বাবেহে)',
+'vector-simplesearch-preference' => 'সৰল সন্ধান দণ্ডিকা সক্ৰিয় কৰক (ভেক্টৰ স্কিনৰ বাবেহে)',
 'vector-view-create' => 'সৃষ্টি কৰক',
 'vector-view-edit' => 'সম্পাদনা',
 'vector-view-history' => 'ইতিহাস চাওক',
@@ -445,6 +444,8 @@ $1',
 'youhavenewmessages' => 'আপোনাৰ কাৰণে $1 আছে। ($2)',
 'newmessageslink' => 'নতুন সংবাদ',
 'newmessagesdifflink' => 'শেহতীয়া সাল-সলনি',
+'youhavenewmessagesfromusers' => '{{PLURAL:$3|আন এজন সদস্য|$3 জন সদস্য}}ৰ পৰা আপোনালৈ $1 আহিছে ($2)।',
+'youhavenewmessagesmanyusers' => 'কেইবাজনো সদস্যৰ পৰা আপোনালৈ $1 আহিছে ($2)।',
 'newmessageslinkplural' => '{{PLURAL:$1|এটা নতুন বাৰ্তা|নতুন বাৰ্তা}}',
 'newmessagesdifflinkplural' => 'অন্তিম {{PLURAL:$1|সংশোধন}}',
 'youhavenewmessagesmulti' => '$1ত আপোনাৰ কাৰণে নতুন সংবাদ আছে',
@@ -498,12 +499,12 @@ $1',
 # General errors
 'error' => 'ভুল',
 'databaseerror' => 'তথ্যকোষৰ ভুল',
-'dberrortext' => 'Database query’ত ত্ৰুটি আছে।
+'dberrortext' => 'Database query syntaxত ত্ৰুটি হৈছে।
 ছফ্টৱেৰত থকা কোনো বাগৰ বাবে এনে হব পাৰে।
 অন্তিমবাৰ চেষ্টা কৰা ডাটাবেচ কুৱেৰীটো আছিল এনেধৰণৰ:
-<blockquote><tt>$1</tt></blockquote>
-"<tt>$2</tt>" ফাংচনৰ পৰা
-ডাটাবেচে প্ৰেৰণ কৰা ত্ৰুটি: "<tt>$3: $4</tt>".',
+<blockquote><code>$1</code></blockquote>
+"<code>$2</code>" ফাংচনৰ পৰা।
+ডাটাবেচে প্ৰেৰণ কৰা ত্ৰুটি: "<samp>$3: $4</samp>"।',
 'dberrortextcl' => 'এক ডাটাবেচ চিণ্টেক্স ত্ৰুটি ঘটিছে।
 অন্তিমবাৰ চেষ্টা কৰা ডাটাবেচ কুৱেৰীটো আছিল এনেধৰণৰ:
 "$1"
@@ -557,8 +558,11 @@ $1',
 'protectedpagetext' => 'এই পৃষ্ঠাটোৰ সম্পাদনা ৰোধ কৰিবলৈ সুৰক্ষিত কৰা হৈছে।',
 'viewsourcetext' => 'আপুনি এই পৃষ্ঠাটোৰ উৎস চাব আৰু নকল কৰিব পাৰে',
 'viewyourtext' => "আপুনি '''আপোনাৰ সম্পাদনাসমূহ'''ৰ উৎস চাব আৰু এই পৃষ্ঠালৈ নকল কৰিব পাৰে:",
-'protectedinterface' => 'এই পৃষ্ঠাই ৱিকি ছফ্টৱেৰৰ ইণ্টাৰফে’চ বাৰ্তা প্ৰদান কৰে, আৰু ইয়াক সুৰক্ষিত কৰি ৰখা হৈছে ।',
-'editinginterface' => "'''সাৱধানবাণী:''' আপুনি যিখন পৃষ্ঠা সম্পাদনা কৰিছে সেইখন ৱিকি ছফ্টৱেৰৰ ইণ্টাৰফে’চ বাৰ্তা দিবলৈ ব্যৱহাৰ হয় । এই পৃষ্ঠাৰ সাল-সলনিয়ে আন ব্যৱহাৰকাৰীৰ বাবে ইণ্টাৰফে’চত প্ৰভাৱ পেলাব । অনুবাদৰ বাবে অনুগ্ৰহ কৰি মিডিয়াৱিকি স্থানীয়কৰণ প্ৰকল্প [//translatewiki.net/wiki/Main_Page?setlang=bn translatewiki.net] ব্যৱহাৰ কৰক ।",
+'protectedinterface' => 'এই পৃষ্ঠাই ৱিকি ছফ্টৱেৰৰ ইণ্টাৰফে’চ বাৰ্তা প্ৰদান কৰে আৰু ইয়াক সুৰক্ষিত কৰি ৰখা হৈছে।
+সকলো ৱিকিৰ বাবে অনুবাদ যোগ কৰিবলৈ বা সলাবলৈ অনুগ্ৰহ কৰি মিডিয়াৱিকি স্থানীয়কৰণ প্ৰকল্প [//translatewiki.net/ translatewiki.net] ব্যৱহাৰ কৰক।',
+'editinginterface' => "'''সাৱধানবাণী:''' আপুনি যিখন পৃষ্ঠা সম্পাদনা কৰিছে সেইখন এই ছফ্টৱেৰৰ ইণ্টাৰফে’চ বাৰ্তা দিবলৈ ব্যৱহাৰ হয়।
+এই পৃষ্ঠাৰ সাল-সলনিয়ে আন ব্যৱহাৰকাৰীৰ বাবে ইণ্টাৰফে’চত প্ৰভাৱ পেলাব।
+সকলো ৱিকিৰ বাবে অনুবাদৰ বাবে অনুগ্ৰহ কৰি মিডিয়াৱিকি স্থানীয়কৰণ প্ৰকল্প [//translatewiki.net/ translatewiki.net] ব্যৱহাৰ কৰক ।",
 'sqlhidden' => '(নিহিত SQL query)',
 'cascadeprotected' => 'এই পৃষ্ঠাখন সম্পাদনাৰ পৰা সুৰক্ষিত কাৰণ এই {{PLURAL:$1|পৃষ্ঠা, যিখন|পৃষ্ঠা, যিবোৰ}} "প্ৰপাতাকাৰ" (cascading) বিকল্পৰ সহযোগত সুৰক্ষিত কৰা হৈছে: 
 $2',
@@ -594,6 +598,7 @@ $2',
 'remembermypassword' => 'মোৰ প্ৰৱেশ এই কম্পিউটাৰত মনত ৰাখিব (সৰ্বাধিক $1 {{PLURAL:$1|দিনলৈ|দিনলৈ}})',
 'securelogin-stick-https' => 'প্ৰৱেশ কৰা পাছত HTTPS-ৰ দ্বাৰা সংযোগ ৰাখক',
 'yourdomainname' => 'আপোনাৰ ডমেইন:',
+'password-change-forbidden' => 'আপুনি এই ৱিকিত গুপ্তশব্দ সলাব নোৱাৰে।',
 'externaldberror' => 'কোনো প্ৰামাণ্যকৰণ তথ্যকোষৰ ত্ৰুটি ঘটিছে নতুবা আপোনাৰ বৰ্হি-একাউণ্ট নৱীকৰণ কৰাৰ অনুমতি নাই ।',
 'login' => 'প্ৰৱেশ',
 'nav-login-createaccount' => 'প্ৰৱেশ/সদস্যভুক্তি',
@@ -836,9 +841,13 @@ $1ৰ দ্বাৰা এই অৱৰোধ কৰা হৈছে ।
 আপুনি আন পৃষ্ঠাত [[Special:Search/{{PAGENAME}}| এই শিৰোনামা অনুসন্ধান কৰিব পাৰে]],
 <span class="plainlinks">[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} সম্পৰ্কীয় অভিলেখ অনুসন্ধান কৰিব পাৰে],
 বা [{{fullurl:{{FULLPAGENAME}}|action=edit}} এই পৃষ্ঠা সম্পাদনা কৰিব পাৰে]</span>',
-'noarticletext-nopermission' => 'এই পৃষ্ঠাত বৰ্তমান কোনো পাঠ্য নাই ।
-আপুনি আন পৃষ্ঠাত [[Special:Search/{{PAGENAME}}| এই শিৰোনামা অনুসন্ধান কৰিব পাৰে]],
-বা <span class="plainlinks">[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} সম্পৰ্কীয় অভিলেখ অনুসন্ধান কৰিব পাৰে ।]</span>',
+'noarticletext-nopermission' => 'এই পৃষ্ঠাত বৰ্তমান কোনো পাঠ্য নাই।
+আপুনি আন পৃষ্ঠাত [[Special:Search/{{PAGENAME}}|এই শিৰোনামা অনুসন্ধান কৰিব পাৰে]],
+বা <span class="plainlinks">[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} সম্পৰ্কীয় অভিলেখ অনুসন্ধান কৰিব পাৰে]</span>, কিন্তু এই পৃষ্ঠা সৃষ্টি কৰিবলৈ আপোনাৰ অনুমতি নাই।',
+'missing-revision' => '"{{PAGENAME}}" নামৰ পৃষ্ঠাৰ #$1 সংশোধনৰ অস্তিত্ব নাই।
+
+সাধাৰণতে বিলোপ কৰা এখন পৃষ্ঠাৰ পুৰণা ইতিহাস লিংক অনুসৰণ কৰিলে এনে হয়।
+[{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} বিলোপন ল\'গ]ত অধিক তথ্য পাব।',
 'userpage-userdoesnotexist' => '"<nowiki>$1</nowiki>" নামৰ সদস্য একাউন্ট নিবন্ধিত নহয় ।
 অনুগ্ৰহ কৰি চাওক আপুনি এই পৃষ্ঠা সৃষ্টি/সম্পাদনা কৰিব বিচাৰিছে নেকি ।',
 'userpage-userdoesnotexist-view' => "সদস্য একাউন্ট ''$1'' পঞ্জীভূত নহয়",
@@ -848,7 +857,6 @@ $1ৰ দ্বাৰা এই অৱৰোধ কৰা হৈছে ।
 * '''Firefox / Safari: ''' ''Shift'' ধৰি ৰাখি ''Reload'' ক্লিক কৰক, নাইবা ''Ctrl-F5'' বা ''Ctrl-R'' টিপক (এপল মেকৰ বাবে ''⌘-R'')
 * '''Google Chrome:''' ''Ctrl-Shift-R'' টিপক (এপল মেকৰ বাবে ''⌘-Shift-R'' )
 * '''Internet Explorer:''' ''Ctrl'' ধৰি ৰাখি ''Refresh'' ক্লিক কৰক, অথবা ''Ctrl-F5'' টিপক
-* '''Konqueror: ''' ''Reload'' ক্লিক কৰক বা ''F5'' টিপক
 * '''Opera:''' ''Tools→Preferences'' ত গৈ কেচ্‌ মচি পেলাওক",
 'usercssyoucanpreview' => "'''পৰামৰ্শ:''' \"{{int:showpreview}}\" বুটাম ব্যৱহাৰ কৰি সাঁচি ৰখাৰ আগতে আপোনাৰ নতুন CSS পৰীক্ষা কৰক ।",
 'userjsyoucanpreview' => "'''পৰামৰ্শ:''' \"{{int:showpreview}}\" বুটাম ব্যৱহাৰ কৰি সাঁচি ৰখাৰ আগতে আপোনাৰ নতুন জাভালিপি পৰীক্ষা কৰক ।",
@@ -865,7 +873,7 @@ $1ৰ দ্বাৰা এই অৱৰোধ কৰা হৈছে ।
 'note' => "'''টোকা:'''",
 'previewnote' => "'''মনত ৰাখিব এয়া মাথোন প্ৰাক্‌দৰ্শনহে।'''
 আপোনাৰ সালসলনিসমূহ এতিয়াও সংৰক্ষণ কৰা হোৱা নাই!",
-'continue-editing' => 'সম্পাদনা জাৰী ৰাখক',
+'continue-editing' => 'সম্পাদনা ক্ষেত্ৰলৈ যাওক',
 'previewconflict' => 'এই প্ৰাকদৰ্শনে ওপৰৰ সম্পাদনা ক্ষেত্ৰৰ লেখা সাঁচি ৰাখিলে যেনেকুৱা দেখা যাব তেনেকুৱা দেখাইছে ।',
 'session_fail_preview' => "'''দুঃখিত! চেচন ডাটা হেৰাই যোৱাৰ কাৰণে আপোনাৰ সম্পাদনা কৃতকাৰ্য্য নহ'ল ।'''
 অনুগ্ৰহ কৰি পুনৰ চেষ্টা কৰক ।
@@ -951,6 +959,14 @@ $1ৰ দ্বাৰা এই অৱৰোধ কৰা হৈছে ।
 'edit-already-exists' => "নতুন পৃষ্ঠা সৃষ্টি কৰা নহ'ল ।
 পৃষ্ঠাখন ইতিমধ্যে আছেই ।",
 'defaultmessagetext' => 'সাধাৰণ বাৰ্তা পাঠ্য',
+'invalid-content-data' => 'অবৈধ সমল তথ্য',
+'content-not-allowed-here' => '[[$2]] পৃষ্ঠাত "$1" সমল অনুমোদিত নহয়',
+
+# Content models
+'content-model-wikitext' => 'ৱিকিপাঠ্য',
+'content-model-text' => 'সাধাৰণ পাঠ্য',
+'content-model-javascript' => 'জাভাস্ক্ৰীপ্ট',
+'content-model-css' => 'চি.এচ.এচ.',
 
 # Parser/template warnings
 'expensive-parserfunction-warning' => "'''সতৰ্কবাণী:''' এই পৃষ্ঠাখনত অধিক এক্সপেনচিভ পাৰ্চাৰ ফাংচন কল আছে ।
@@ -972,6 +988,7 @@ $1ৰ দ্বাৰা এই অৱৰোধ কৰা হৈছে ।
 'expansion-depth-exceeded-warning' => 'পৃষ্ঠাখনৰ বিস্তৃতি গভীৰতা বেছি হৈছে',
 'parser-unstrip-loop-warning' => 'আন্‌ষ্ট্ৰীপ লুপ চিনাক্ত কৰা হৈছে',
 'parser-unstrip-recursion-limit' => 'আন্‌ষ্ট্ৰিপ ৰিকাৰ্ছন সীমা অতিক্ৰম হৈছে ($1)',
+'converter-manual-rule-error' => 'মেনুৱেল ভাষা পৰিৱৰ্তন নিয়মত ত্ৰুটি পোৱা গৈছে',
 
 # "Undo" feature
 'undo-success' => 'এই সম্পাদনা পূৰ্ববৎ কৰিব পাৰি ।
@@ -1093,7 +1110,7 @@ $1",
 'revdel-restore' => 'দৃষ্টিপাত সালসলনি কৰক',
 'revdel-restore-deleted' => 'বাতিল কৰা সংশোধনসমূহ',
 'revdel-restore-visible' => 'দৃশ্যমান সংশোধনসমূহ',
-'pagehist' => 'পৃষ্ঠা ইতিহাস',
+'pagehist' => 'পৃষ্ঠাৰ ইতিহাস',
 'deletedhist' => 'বিলোপ কৰাৰ ইতিহাস',
 'revdelete-hide-current' => ' $2, $1 তাৰিখৰ এই আইটেমটো গোপন কৰাত সমস্যা হৈছে: এইটো বৰ্তমানৰ সংশোধনী ।
 এইটোক গোপন কৰিব পৰা নাযাব ।',
@@ -1107,8 +1124,9 @@ $1",
 অনুগ্ৰহ কৰি ল’গ পৰীক্ষা কৰক ।',
 'revdelete-only-restricted' => '$2, $1 তৰিখৰ আইটেমটো গোপন কৰাত সমস্যা হৈছে: আন প্ৰত্যক্ষতা বিকল্প বাছনি নকৰাকৈ আপুনি প্ৰশাসকৰ দৃষ্টিৰ পৰা আইটেমসমূহ নিবাৰণ কৰিব নোৱাৰে ।',
 'revdelete-reason-dropdown' => '*বিলোপৰ সাধাৰণ কাৰণসমূহ 
-** স্বত্বাধিকাৰ উলংঘন 
-** অনুপযুক্ত ব্যক্তিগত তথ্য 
+** কপিৰাইট উলংঘন 
+** অনুপযুক্ত মন্তব্য বা ব্যক্তিগত তথ্য 
+** অনুপযুক্ত সদস্যনাম
 ** সম্ভাব্য ক্ষতিকাৰক তথ্য',
 'revdelete-otherreason' => 'অন্য/অতিৰিক্ত কাৰণ:',
 'revdelete-reasonotherlist' => 'অন্য কাৰণ',
@@ -1198,7 +1216,7 @@ $1",
 'search-result-size' => '$1 ({{PLURAL:$2|1 শব্দ|$2 শব্দসমূহ}})',
 'search-result-category-size' => '{{PLURAL:$1|১ জন সদস্য|$1 জন সদস্য}} ({{PLURAL:$2|এটা উপশ্ৰেণী|$2 টা উপশ্ৰেণী}}, {{PLURAL:$3|এটা ফাইল|$3 টা ফাইল}})',
 'search-result-score' => 'যথাৰ্থতা: $1%',
-'search-redirect' => '(পুনৰ্নিদেশনা $1)',
+'search-redirect' => '(পুনৰ্নিৰ্দেশনা $1)',
 'search-section' => '(অনুচ্ছেদ $1)',
 'search-suggest' => 'আপুনি $1 বুজাব খুজিছে নেকি?',
 'search-interwiki-caption' => 'সহপ্ৰকল্পসমূহ',
@@ -1215,10 +1233,10 @@ $1",
 'nonefound' => "'''টোকা:''' ডিফ’ল্ট অনুযায়ী মাথোঁ কেইটামানহে নামস্থান অনুসন্ধান কৰা হয় ।
 আপোনাৰ অনুসন্ধানত ''all:'' ব্যবহাৰ কৰি সকলো সমল (কথা-বতৰা, শ্ৰেনী ইত্যদি) অনুসন্ধান কৰিব পাৰে, নতুবা আকাংক্ষিত নামস্থান প্ৰিফিক্স হিছাপে ব্যবহাৰ কৰিব পাৰে ।",
 'search-nonefound' => 'এই অনুসন্ধানৰ কোনো ফলাফল নাই ।',
-'powersearch' => 'অতিসন্ধান',
+'powersearch' => 'শক্তিশালী সন্ধান',
 'powersearch-legend' => 'শক্তিশালী সন্ধান',
 'powersearch-ns' => 'নামস্থানবোৰত সন্ধান:',
-'powersearch-redir' => 'পুননিৰ্দেশকৰ তালিকা',
+'powersearch-redir' => 'পুনৰ্নিৰ্দেশনাৰ তালিকা',
 'powersearch-field' => 'ৰ কাৰণে সন্ধান কৰক',
 'powersearch-togglelabel' => 'পৰীক্ষা কৰক:',
 'powersearch-toggleall' => 'সকলো',
@@ -1301,7 +1319,7 @@ $1",
 'timezoneregion-indian' => 'ভাৰত মহাসাগৰ',
 'timezoneregion-pacific' => 'প্ৰশান্ত মহাসাগৰ',
 'allowemail' => 'অন্য সদস্যৰ পৰা ই-মেইল সমৰ্থ কৰক',
-'prefs-searchoptions' => 'সন্ধান বিকল্পসমূহ',
+'prefs-searchoptions' => 'সন্ধান কৰক',
 'prefs-namespaces' => 'নামস্থান',
 'defaultns' => 'অন্যথা এই নামস্থান সমূহত অনুসন্ধান কৰিব:',
 'default' => 'অবিচল',
@@ -1724,7 +1742,7 @@ URL টোৰ বৈধতা বিচাৰ কৰি পুনৰ চেষ
 'backend-fail-internal' => 'ষ্ট\'ৰেজ বেক্‌এণ্ড "$1"ত এক অজ্ঞাত ত্ৰুটী ঘটিছে।',
 'backend-fail-contenttype' => '"$1"ত সাঁচি থ\'বলৈ ফাইলটোৰ সমল প্ৰকাৰ স্থিৰ কৰিব পৰা নগ\'ল।',
 'backend-fail-batchsize' => "$1টা ফাইল {{PLURAL:$1|কাৰ্যৰ|কাৰ্যৰ}} ষ্ট'ৰেজ বেকএ'ণ্ড দিয়া হৈছে; সীমা হৈছে $2টা {{PLURAL:$2|কাৰ্য|কাৰ্য}}।",
-'backend-fail-usable' => "অপৰ্যাপ্ত অনুমতি বা হেৰোৱা নিৰ্দেশিকা/সমলৰ বাবে $1 ফাইলটো লিখিব পৰা নগ'ল।",
+'backend-fail-usable' => 'অপৰ্যাপ্ত অনুমতি বা হেৰোৱা নিৰ্দেশিকা/সমলৰ বাবে "$1" ফাইলটো পঢ়িব বা লিখিব পৰা নগ\'ল।',
 
 # File journal errors
 'filejournal-fail-dbconnect' => 'ষ্ট\'ৰেজ বেকএ\'ণ্ড "$1"ৰ বাবে জাৰ্ণাল তথ্যকোষৰ লগত সংযোগ স্থাপন নহ\'ল।',
@@ -1860,6 +1878,7 @@ https://www.mediawiki.org/wiki/Manual:Image_Authorization চাওক।",
 'uploadnewversion-linktext' => "এই ফাইলতোৰ নতুন সংশোধন এটা আপল'ড কৰক",
 'shared-repo-from' => '$1 পৰা',
 'shared-repo' => 'এটা উমৈহতীয়া ভঁৰাল',
+'upload-disallowed-here' => 'আপুনি এই ফাইলটো  প্ৰতিস্থাপন কৰিব নোৱাৰে।',
 
 # File reversion
 'filerevert' => '$1 ক আগৰ অৱস্থালৈ ঘূৰাই আনক',
@@ -1941,9 +1960,9 @@ https://www.mediawiki.org/wiki/Manual:Image_Authorization চাওক।",
 
 'disambiguations' => 'দ্ব্যৰ্থতা-দূৰীকৰণ পৃষ্ঠাসমূহলৈ সংযোগ থকা পৃষ্ঠাসমূহ',
 'disambiguationspage' => 'সাঁচ:দ্ব্যৰ্থতা-দূৰীকৰণ',
-'disambiguations-text' => "তলৰ পৃষ্ঠাখনসমূহত '''দ্ব্যৰ্থতা দূৰীকৰণ পৃষ্ঠা'''ৰ লগত সংযোগ আছে ।
-ইয়ে উপযুক্ত পৃষ্ঠাৰ লগত সংযোগ কৰিব পাৰে ।
-[[MediaWiki:Disambiguationspage]]ৰ পৰা সংযোগ থকা কোনো সাঁচ ব্যৱহাৰ কৰিলে এখন পৃষ্ঠাক দ্ব্যৰ্থতা দূৰীকৰণ পৃষ্ঠা হিছাপে গণ্য কৰা হ’ব ।",
+'disambiguations-text' => "তলৰ পৃষ্ঠাখনসমূহত অন্ততঃ এটা হ'লেই '''দ্ব্যৰ্থতা দূৰীকৰণ পৃষ্ঠা'''ৰ সংযোগ আছে।
+তাৰ সলনি সেইবোৰত উপযুক্ত পৃষ্ঠাৰ লগত সংযোগ থাকিব পাৰে।
+[[MediaWiki:Disambiguationspage]]ৰ পৰা সংযোগ থকা কোনো সাঁচ ব্যৱহাৰ কৰিলে এখন পৃষ্ঠাক দ্ব্যৰ্থতা দূৰীকৰণ পৃষ্ঠা হিছাপে গণ্য কৰা হয়।",
 
 'doubleredirects' => 'দ্বি-পুনঃনিৰ্দেশিত',
 'doubleredirectstext' => 'আন পুনৰ্নিদেশনা পৃষ্ঠালৈ পুনৰ্নিৰ্দেশিত পৃষ্ঠাসমূহ এই তালিকাত দিয়া হৈছে ।
@@ -1969,6 +1988,7 @@ https://www.mediawiki.org/wiki/Manual:Image_Authorization চাওক।",
 # Miscellaneous special pages
 'nbytes' => '$1 {{PLURAL:$1|বাইট|বাইট}}',
 'ncategories' => '$1টা {{PLURAL:$1|শ্ৰেণী|শ্ৰেণী}}',
+'ninterwikis' => '$1 {{PLURAL:$1|ইণ্টাৰৱিকি|ইণ্টাৰৱিকিসমূহ}}',
 'nlinks' => '$1 {{PLURAL:$1|সংযোগ|সংযোগ}}',
 'nmembers' => '{{PLURAL:$1|সদস্য|$1 সদস্যবৃন্দ}}',
 'nrevisions' => '$1টা {{PLURAL:$1|সংশোধন|সংশোধন}}',
@@ -2018,7 +2038,7 @@ https://www.mediawiki.org/wiki/Manual:Image_Authorization চাওক।",
 'listusers-creationsort' => 'সৃষ্টিৰ তাৰিখমতে সজাওক',
 'usereditcount' => '$1 {{PLURAL:$1|টা সম্পাদনা|টা সম্পাদনা}}',
 'usercreated' => '$1 তাৰিখে $2 সময়ত {{GENDER:$3|য়ে সৃষ্টি কৰিছে}}',
-'newpages' => 'নতুন পৃষ্ঠা',
+'newpages' => 'নতুন পৃষ্ঠাসমূহ',
 'newpages-username' => 'সদস্যনাম:',
 'ancientpages' => 'আটাইতকৈ পুৰণি পৃষ্ঠাসমূহ',
 'move' => 'স্থানান্তৰ কৰক',
@@ -2292,6 +2312,7 @@ $UNWATCHURL
 'rollback_short' => 'পূৰ্ববৎ কৰক',
 'rollbacklink' => 'পূৰ্ববৎ কৰক',
 'rollbacklinkcount' => '$1 {{PLURAL:$1|সম্পাদনা|সম্পাদনাসমূহ}} পূৰ্বৱত কৰক',
+'rollbacklinkcount-morethan' => '$1 {{PLURAL:$1|সম্পাদনা|সম্পাদনাসমূহ}} পূৰ্বৱত কৰক',
 'rollbackfailed' => 'পূৰ্ববৎ ব্যৰ্থ',
 'cantrollback' => 'পূৰ্বৰ অৱস্থালৈ ঘূৰাই নিব নোৱাৰি;
 শেষৰ সম্পাদকজন এই পৃষ্ঠাৰ একমাত্ৰ লেখক ।',
@@ -2338,9 +2359,9 @@ $UNWATCHURL
 '''$1''' পৃষ্ঠাখনৰ সুৰক্ষা-স্তৰৰ গাঁথনি ইয়াত আছে:",
 'protect-cascadeon' => 'এই পৃষ্ঠাখন বৰ্তমান সুৰক্ষিত কাৰণ ই {{PLURAL:$1|খন পৃষ্ঠাৰ|খন পৃষ্ঠাৰ}} অন্তৰ্গত য’ত প্ৰপাতাকাৰ সুৰক্ষা সক্ৰিয় ।
 আপুনি এই পৃষ্ঠাৰ সুৰক্ষা স্তৰ সলাব পাৰে কিন্তু সি প্ৰপাতাকাৰ সুৰক্ষাত কোনো প্ৰভাৱ নেপেলায ।',
-'protect-default' => 'সকলো ব্যবহাৰকাৰীক অনুমতি দিয়ক',
+'protect-default' => 'সকলো ব্যৱহাৰকাৰীৰ বাবে',
 'protect-fallback' => '"$1" অনুমতি লাগিব',
-'protect-level-autoconfirmed' => 'নতুন বা নথিভুক্ত নোহোৱা সদস্যক বাৰণ কৰক',
+'protect-level-autoconfirmed' => 'নতুন বা অপঞ্জীভুক্ত সদস্যক অৱৰোধ',
 'protect-level-sysop' => 'কেৱল প্ৰশাসকবৃন্দৰ বাবে',
 'protect-summary-cascade' => 'প্ৰপাতাকাৰ/কেচ্‌কেডিং',
 'protect-expiring' => ' $1 (UTC) ত সময় শেষ হব',
@@ -2408,8 +2429,8 @@ $UNWATCHURL
 'undeletedrevisions' => '{{PLURAL:$1|১টা সংশোধন|$1টা সংশোধন}} পুনৰুদ্ধাৰ কৰা হৈছে',
 'undeletedrevisions-files' => '{{PLURAL:$1|১টা সংশোধন|$1 টা সংশোধন}} আৰু {{PLURAL:$2|১ খন নথি|$2 খন নথি}} পুনৰুদ্ধাৰ কৰা হ’ল',
 'undeletedfiles' => '{{PLURAL:$1|১খন নথি|$1 খন নথি}} পুনৰুদ্ধাৰ কৰা হ’ল',
-'cannotundelete' => 'অৱলুপ্তি বিফল হৈছে;
-আন কোনোবাই আগতেই ইয়াক বিলোপ কৰিছে ।',
+'cannotundelete' => 'বিলোপ বাতিলকৰণ বিফল হৈছে;
+$1',
 'undeletedpage' => "'''$1ক পুনৰুদ্ধাৰ কৰা হৈছে'''
 অনুগ্ৰহ কৰি শেহতীয়া অৱলুপ্তি আৰু পুনৰুদ্ধাৰৰ বাবে [[Special:Log/delete|অৱলুপ্তি অভিলেখ]] চাওক ।",
 'undelete-header' => 'শেহতীয়াকৈ বিলোপ কৰা পৃষ্ঠাসমূহৰ বাবে [[Special:Log/delete|অৱলুপ্তি ল’গ]] চাওক ।',
@@ -2798,6 +2819,7 @@ $1ৰ অৱৰোধৰ কাৰণ: "$2"',
 'import-interwiki-templates' => 'সকলো সাঁচ অন্তৰ্ভুক্ত কৰক',
 'import-interwiki-submit' => 'আমদানি',
 'import-interwiki-namespace' => 'গন্তব্য নামস্থান:',
+'import-interwiki-rootpage' => 'গন্তব্য মূল পৃষ্ঠা (বৈকল্পিক):',
 'import-upload-filename' => 'নথিৰ নাম:',
 'import-comment' => 'মন্তব্য:',
 'importtext' => "অনুগ্ৰহ কৰি [[Special:Export|ৰপ্তানি সুবিধা]] ব্যৱহাৰ কৰি উৎস ৱিকিৰ পৰা ফাইলটো ৰপ্তানি কৰক।
@@ -2834,6 +2856,9 @@ $1ৰ অৱৰোধৰ কাৰণ: "$2"',
 'import-error-interwiki' => '"$1" পৃষ্ঠাখন আমদানি কৰা নহ\'ল কাৰণ ইয়াৰ নামটো বাহিৰা সংযোগৰ (আন্তঃৱিকি) বাবে সংৰক্ষিত।',
 'import-error-special' => '"$1" পৃষ্ঠাখন আমদানি কৰা নহ\'ল কাৰণ ই পৃষ্ঠা অনুমোদন নকৰা এটা বিশেষ নামস্থানৰ অন্তৰ্গত।',
 'import-error-invalid' => '"$1" পৃষ্ঠাখন আমদানি কৰা নহ\'ল কাৰণ ইয়াৰ নামটো অবৈধ।',
+'import-options-wrong' => 'ভুল {{PLURAL:$2|বিকল্প|বিকল্পসমূহ}}: <nowiki>$1</nowiki>',
+'import-rootpage-invalid' => 'মূল পৃষ্ঠাৰ শিৰোনামা অবৈধ।',
+'import-rootpage-nosubpage' => 'মূল পৃষ্ঠাৰ "$1" নামস্থানে উপপৃষ্ঠা অনুমোদন নকৰে।',
 
 # Import log
 'importlogpage' => 'আমদানিৰ অভিলেখ',
@@ -2949,11 +2974,42 @@ $1ৰ অৱৰোধৰ কাৰণ: "$2"',
 
 # Info page
 'pageinfo-title' => '"$1" ৰ তথ্য',
-'pageinfo-header-edits' => 'সম্পাদনাসমূহ',
+'pageinfo-not-current' => "কেৱল সাম্প্ৰতিক সংশোধনৰ বাবে তথ্য দৃশ্যমান হ'ব পাৰে।",
+'pageinfo-header-basic' => 'প্ৰাথমিক তথ্য',
+'pageinfo-header-edits' => 'ইতিহাস সম্পাদনা কৰক',
+'pageinfo-header-restrictions' => 'পৃষ্ঠা সুৰক্ষা',
+'pageinfo-header-properties' => 'পৃষ্ঠাৰ  বৈশিষ্টসমূহ',
+'pageinfo-display-title' => 'শিৰোনাম প্ৰদৰ্শন কৰক',
+'pageinfo-default-sort' => 'ডিফল্ট চৰ্ট কী',
+'pageinfo-length' => 'পৃষ্ঠাৰ দৈৰ্ঘ্য (বাইটত)',
+'pageinfo-article-id' => 'পৃষ্ঠা ID',
+'pageinfo-robot-policy' => 'সন্ধান ইঞ্জিনৰ স্থিতি',
+'pageinfo-robot-index' => 'ইনডেক্স উপযোগী',
+'pageinfo-robot-noindex' => 'ইনডেক্সৰ অনুপযোগী',
 'pageinfo-views' => 'দৰ্শনৰ সংখ্যা',
-'pageinfo-watchers' => 'নিৰীক্ষকৰ সংখ্যা',
-'pageinfo-edits' => 'সম্পাদনাৰ সংখ্যা',
-'pageinfo-authors' => 'মুখ্য লেখকৰ সংখ্যা',
+'pageinfo-watchers' => 'পৃষ্ঠা নিৰীক্ষকৰ সংখ্যা',
+'pageinfo-redirects-name' => 'পৃষ্ঠালৈ থকা পুনৰ্নিৰ্দেশ',
+'pageinfo-subpages-name' => 'এই পৃষ্ঠাৰ উপপৃষ্ঠাসমূহ',
+'pageinfo-subpages-value' => '$1 ($2 {{PLURAL:$2|পুনৰ্নিৰ্দেশ|পুনৰ্নিৰ্দেশসমূহ}}; $3 {{PLURAL:$3|অপুনৰ্নিৰ্দেশ নাই|অপুনৰ্নিৰ্দেশসমূহ}})',
+'pageinfo-firstuser' => 'পৃষ্ঠাখনৰ সৃষ্টিকৰ্তা',
+'pageinfo-firsttime' => 'পৃষ্ঠা সৃষ্টিৰ তাৰিখ',
+'pageinfo-lastuser' => 'অন্তিম সম্পাদক',
+'pageinfo-lasttime' => 'অন্তিম সম্পাদনাৰ তাৰিখ',
+'pageinfo-edits' => 'মুঠ সম্পাদনাৰ সংখ্যা',
+'pageinfo-authors' => 'মুঠ স্বতন্ত্ৰ লেখকৰ সংখ্যা',
+'pageinfo-recent-edits' => 'শেহতীয়া সম্পাদনাসমূহৰ সংখ্যা (যোৱা $1 দিনত)',
+'pageinfo-recent-authors' => 'স্বতন্ত্ৰ সম্পাদকৰ শেহতীয়া সংখ্যা',
+'pageinfo-magic-words' => 'যাদুকৰী {{PLURAL:$1|শব্দ|শব্দবোৰ}} ($1)',
+'pageinfo-hidden-categories' => 'অদৃশ্য {{PLURAL:$1|শ্ৰেণী|শ্ৰেণীসমূহ}} ($1)',
+'pageinfo-templates' => 'সংযুক্ত {{PLURAL:$1|সাঁচ|সাঁচসমূহ}} ($1)',
+'pageinfo-toolboxlink' => 'পৃষ্ঠাখনৰ বিষয়ে তথ্য',
+'pageinfo-redirectsto' => 'পুনৰ্নিৰ্দেশ কৰা হৈছে',
+'pageinfo-redirectsto-info' => 'তথ্য',
+'pageinfo-contentpage' => 'সমল পৃষ্ঠাৰূপে গণনা কৰা হৈছে',
+'pageinfo-contentpage-yes' => 'হয়',
+'pageinfo-protect-cascading' => 'সুৰক্ষাসমূহ ইয়াৰ পৰা প্ৰপাতাকাৰ হৈছে',
+'pageinfo-protect-cascading-yes' => 'হয়',
+'pageinfo-protect-cascading-from' => 'সুৰক্ষাসমূহ প্ৰপাতাকাৰ হৈছে',
 
 # Patrolling
 'markaspatrolleddiff' => 'নিৰীক্ষিত বুলি চিহ্নিত কৰক',
@@ -2997,6 +3053,7 @@ $1',
 'file-info-size-pages' => '$1 × $2 পিক্সেলসমূহ, নথিপত্ৰৰ আকাৰ: $3, MIME ধৰণ: $4, $5 {{PLURAL:$5|page|pages}}',
 'file-nohires' => 'ইয়াতকৈ ডাঙৰকৈ দেখুৱাব নোৱাৰি ।',
 'svg-long-desc' => 'SVG ফাইল, সাধাৰণতঃ $1 × $2 পিক্সেল, ফাইল মাত্ৰা: $3',
+'svg-long-desc-animated' => 'এনিমেটেড SVG ফাইল, সাধাৰণতে $1 × $2 পিক্সেল, ফাইলৰ আকাৰ: $3',
 'show-big-image' => "সম্পূৰ্ণ ৰিজ'লিউশ্যন",
 'show-big-image-preview' => 'এই খচৰাৰ আকাৰ: $1.',
 'show-big-image-other' => "আন {{PLURAL:$2|ৰিজ'লিউশ্যন|ৰিজ'লিউশ্যনসমূহ}}: $1।",
@@ -3006,6 +3063,8 @@ $1',
 'file-info-png-looped' => 'লুপকৃত',
 'file-info-png-repeat' => "$1 {{PLURAL:$1|বাৰ|বাৰ}} চলোৱা হ'ল",
 'file-info-png-frames' => '$1 {{PLURAL:$1|ফ্ৰেম|ফ্ৰেম}}',
+'file-no-thumb-animation' => "'''টোকা: কাৰিকৰী অসুবিধাবশতঃ এই ফাইলৰ থাম্বনেইল এনিমেটেড নহ'ব।'''",
+'file-no-thumb-animation-gif' => "'''টোকা: কাৰিকৰী অসুবিধাবশতঃ উচ্চ ৰিজ'লিউচনৰ GIF চিত্ৰ যেনে এইখন এনিমেটেড নহ'ব।'''",
 
 # Special:NewFiles
 'newimages' => 'নতুন ফাইলৰ বিথীকা',
@@ -3526,6 +3585,7 @@ $5
 # Scary transclusion
 'scarytranscludedisabled' => '[আন্তঃৱিকি আন্তঃভুক্তি নিষ্ক্ৰিয় কৰা আছে]',
 'scarytranscludefailed' => '[$1ৰ বাবে সাঁচ অনা অসফল হৈছে]',
+'scarytranscludefailed-httpstatus' => '[$1ৰ বাবে সাঁচ অনা অসফল হৈছে: HTTP $2]',
 'scarytranscludetoolong' => '[URL অত্যাধিক দীঘল]',
 
 # Delete conflict
@@ -3677,7 +3737,7 @@ $5
 * <span class="mw-specialpagecached">কেশ্ব কৰা বিশেষ পৃষ্ঠাসমূহ (অপ্ৰচলিতও হ\'ব পাৰে)।</span>',
 'specialpages-group-maintenance' => 'তত্বাৱধানৰ কাৰ্যবিৱৰণীসমূহ',
 'specialpages-group-other' => 'অন্যান্য বিশেষ পৃষ্ঠাসমূহ',
-'specialpages-group-login' => 'প্ৰৱেশ/সদস্যভুক্তি',
+'specialpages-group-login' => 'প্ৰৱেশ/একাউণ্ট সৃষ্টি কৰক',
 'specialpages-group-changes' => 'সাম্প্ৰতিক সালসলনি আৰু অভিলেখসমূহ',
 'specialpages-group-media' => "মিডিয়া বিৱৰণী আৰু আপল'ডসমূহ",
 'specialpages-group-users' => 'সদস্যবৃন্দ আৰু অধিকাৰসমূহ',
@@ -3821,7 +3881,7 @@ $5
 'api-error-file-too-large' => 'আপুনি দাখিল কৰা ফাইলখন বৰ ডাঙৰ ।',
 'api-error-filename-tooshort' => 'ফাইলৰ নামটো অতি চুটি।',
 'api-error-filetype-banned' => 'এই ধৰণৰ ফাইল নিষিদ্ধ।',
-'api-error-filetype-banned-type' => '$1 {{PLURAL:$4|অনুমোদিত ফাইল প্ৰকাৰ নহয়|সমূহ অনুমোদিত ফাইল প্ৰকাৰ নহয়}} । {{PLURAL:$3|অনুমোদিত ফাইল প্ৰকাৰ হ’ল|অনুমোদিত ফাইল প্ৰকাৰসমূহ হ’ল}} $2 ।',
+'api-error-filetype-banned-type' => '$1 {{PLURAL:$4|অনুমোদিত ফাইল প্ৰকাৰ নহয়|সমূহ অনুমোদিত ফাইল প্ৰকাৰ নহয়}}। অনুমোদিত {{PLURAL:$3|ফাইল প্ৰকাৰ হ’ল|ফাইল প্ৰকাৰসমূহ হ’ল}} $2।',
 'api-error-filetype-missing' => 'ফাইল নামটোত এক্সটেন্‌ছন নাই।',
 'api-error-hookaborted' => 'আপুনি কৰিব বিচৰা সালসলনি এটা এক্সটেনচনৰ দ্বাৰা বাতিল কৰা হৈছে।',
 'api-error-http' => "আভ্যন্তৰীণ ত্ৰুটি: চাৰ্ভাৰৰ লগত সংযোগ স্থাপন নহ'ল।",
diff --git a/languages/messages/MessagesAst.php b/languages/messages/MessagesAst.php
index 63121c2a3a..801344e382 100644
--- a/languages/messages/MessagesAst.php
+++ b/languages/messages/MessagesAst.php
@@ -107,7 +107,7 @@ $messages = array(
 
 'underline-always' => 'Siempre',
 'underline-never' => 'Nunca',
-'underline-default' => 'Restolador por defeutu',
+'underline-default' => 'Predeterminao del aspeutu o del restolador',
 
 # Font style option in Special:Preferences
 'editfont-style' => "Estilu de fonte de l'área d'edición:",
@@ -192,8 +192,8 @@ $messages = array(
 'newwindow' => '(ábrese nuna ventana nueva)',
 'cancel' => 'Encaboxar',
 'moredotdotdot' => 'Más...',
-'mypage' => 'La mio páxina',
-'mytalk' => 'El mio alderique',
+'mypage' => 'Páxina',
+'mytalk' => 'Alderique',
 'anontalk' => 'Alderique pa esta IP',
 'navigation' => 'Navegación',
 'and' => '&#32;y',
@@ -778,7 +778,7 @@ Les páxines personalizaes .css y .js usen un títulu en minúscules, p. ex. {{n
 'note' => "'''Nota:'''",
 'previewnote' => "'''Alcuerdate de qu'esto ye sólo una vista previa.'''
 ¡Los cambios entá nun se guardaron!",
-'continue-editing' => 'Siguir editando',
+'continue-editing' => "Dir al área d'edición",
 'previewconflict' => "Esta vista previa amuesa'l testu del área d'edición d'arriba tal como apaecerá si escueyes guardar.",
 'session_fail_preview' => "'''¡Sentímoslo muncho! Nun se pudo procesar la to edición porque hebo una perda de datos de la sesión.
 Inténtalo otra vuelta. Si nun se t'arregla, intenta salir y volver a rexistrate.'''",
@@ -1154,7 +1154,7 @@ Se puen alcontrar más detalles nel [{{fullurl:{{#Special:Log}}/delete|page={{FU
 
 # Preferences page
 'preferences' => 'Preferencies',
-'mypreferences' => 'Les mios preferencies',
+'mypreferences' => 'Preferencies',
 'prefs-edits' => "Númberu d'ediciones:",
 'prefsnologin' => 'Non identificáu',
 'prefsnologintext' => 'Necesites tar <span class="plainlinks">[{{fullurl:{{#Special:UserLogin}}|returnto=$1}} identificáu]</span> pa camudar les preferencies d\'usuariu.',
@@ -1386,6 +1386,9 @@ Esta información sedrá pública.",
 'rightslogtext' => "Esti ye un rexistru de los cambeos de los perfiles d'usuariu.",
 'rightslogentry' => 'camudó la pertenencia de grupu del usuariu $1 dende $2 a $3',
 'rightslogentry-autopromote' => 'promocionó automáticamente de $2 a $3',
+'logentry-rights-rights' => '$1 camudó la pertenencia a grupos de $3 dende $4 a $5',
+'logentry-rights-rights-legacy' => '$1 camudó la pertenencia a grupos de $3',
+'logentry-rights-autopromote' => '$1 promocionó automáticamente de $4 a $5',
 'rightsnone' => '(nengún)',
 
 # Associated actions - in the sentence "You do not have permission to X"
@@ -2021,7 +2024,7 @@ Ver tamién les [[Special:WantedCategories|categoríes más buscaes]].",
 'linksearch-ok' => 'Guetar',
 'linksearch-text' => 'Se puen usar comodinos como "*.wikipedia.org".
 Necesita polo menos un dominiu de primer nivel, como "*.org".<br />
-Protocolos almitíos: <code>$1</code> (nun amiestes dengún d\'estos na to gueta).',
+Protocolos almitíos: <code>$1</code> (el predetermináu ye http:// si nun se conseña dengún protocolu).',
 'linksearch-line' => '$1 enllaciáu dende $2',
 'linksearch-error' => 'Los comodinos namái puen apaecer al entamu del nome del güéspede.',
 
@@ -2072,8 +2075,8 @@ pa poder unviar correos a otros usuarios.',
 '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 d'embaxo pa unviar un corréu electrónicu a esti usuariu.
-La 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.",
+'emailpagetext' => 'Pues usar el formulariu de más abaxo pa unviar un corréu electrónicu a {{GENDER:$1|esti usuariu|esta usuaria}}.
+La 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.',
 'usermailererror' => "L'operador de corréu devolvió un error:",
 'defemailsubject' => 'Corréu electrónicu del usuariu «$1» de {{SITENAME}}',
 'usermaildisabled' => 'Corréu del usuariu desactiváu',
@@ -2104,7 +2107,7 @@ La direición de corréu electrónicu qu'especificasti nes [[Special:Preferences
 
 # Watchlist
 'watchlist' => 'La mio páxina de vixilancia',
-'mywatchlist' => 'La mio llista de vixilancia',
+'mywatchlist' => 'Llista de vixilancia',
 'watchlistfor2' => 'Pa $1 $2',
 'nowatchlist' => 'La to llista de vixilancia ta vacia.',
 'watchlistanontext' => 'Por favor $1 pa ver o editar entraes na to llista de vixilancia.',
@@ -2366,7 +2369,7 @@ $1",
 # Contributions
 'contributions' => 'Collaboraciones del usuariu',
 'contributions-title' => "Contribuciones d'usuariu pa $1",
-'mycontris' => 'Les mios collaboraciones',
+'mycontris' => 'Collaboraciones',
 'contribsub2' => 'De $1 ($2)',
 'nocontribs' => "Nun s'atoparon cambeos que coincidan con esi criteriu.",
 'uctop' => '(actual)',
@@ -2407,7 +2410,7 @@ La cabera entrada del rexistru de bloqueos s'ufre darréu pa referencia:",
 'whatlinkshere-hideredirs' => '$1 redireiciones',
 'whatlinkshere-hidetrans' => '$1 tresclusiones',
 'whatlinkshere-hidelinks' => '$1 enllaces',
-'whatlinkshere-hideimages' => "$1 enllaces d'imaxe",
+'whatlinkshere-hideimages' => '$1 los enllaces al ficheru',
 'whatlinkshere-filters' => 'Peñeres',
 
 # Block/unblock
@@ -2901,7 +2904,7 @@ Probablemente tea causao por un enllaz a un sitiu esternu de la llista prieta.',
 
 # Info page
 'pageinfo-title' => 'Información sobro "$1"',
-'pageinfo-not-current' => 'Namái se pue amosar la información pa la revisión actual.',
+'pageinfo-not-current' => 'Sentimoslo, ye imposible dar esta información de les revisiones antigües.',
 'pageinfo-header-basic' => 'Información básica',
 'pageinfo-header-edits' => "Historial d'ediciones",
 'pageinfo-header-restrictions' => 'Proteición de páxina',
@@ -2910,6 +2913,7 @@ Probablemente tea causao por un enllaz a un sitiu esternu de la llista prieta.',
 'pageinfo-default-sort' => "Clave d'ordenación predeterminada",
 'pageinfo-length' => 'Llonxitú de la páxina (en bytes)',
 'pageinfo-article-id' => 'ID de la páxina',
+'pageinfo-language' => 'Llingua del conteníu de la páxina',
 'pageinfo-robot-policy' => 'Estáu del motor de gueta',
 'pageinfo-robot-index' => 'Pue ser índiz',
 'pageinfo-robot-noindex' => 'Nun pue ser índiz',
@@ -3635,6 +3639,7 @@ Tamién pues [[Special:EditWatchlist|usar l'editor estándar]].",
 'version-license' => 'Llicencia',
 'version-poweredby-credits' => "Esta wiki funciona con '''[//www.mediawiki.org/ MediaWiki]''', copyright © 2001-$1 $2.",
 'version-poweredby-others' => 'otros',
+'version-credits-summary' => 'Nos prestaría dar reconocimientu a les siguientes persones pola so contribución a [[Special:Version|MediaWiki]].',
 'version-license-info' => "MediaWiki ye software llibre; pues redistribuilu y/o camudalu baxo los términos de la Llicencia Pública Xeneral GNU tal como ta asoleyada pola Free Software Foundation; o la versión 2 de la Llicencia, o (como prefieras) cualesquier versión posterior.
 
 MediaWiki se distribúi col envís de que seya afayadiza, pero ENSIN GARANTÍA DALA; ensin siquiera garantía implícita de COMERCIALIDÁ o ADAUTACIÓN A UN DETERMINÁU PROPÓSITU. Llee la Llicencia Pública Xeneral GNU pa más detalles.
diff --git a/languages/messages/MessagesAz.php b/languages/messages/MessagesAz.php
index e240157a61..54603861f2 100644
--- a/languages/messages/MessagesAz.php
+++ b/languages/messages/MessagesAz.php
@@ -9,6 +9,7 @@
  *
  * @author Cekli829
  * @author Don Alessandro
+ * @author E THP
  * @author Emperyan
  * @author Erdemaslancan
  * @author Gulmammad
@@ -956,7 +957,7 @@ $1",
 
 # Preferences page
 'preferences' => 'Nizamlamalar',
-'mypreferences' => 'Nizamlamalarım',
+'mypreferences' => 'Nizamlamalar',
 'prefs-edits' => 'Redaktələrin sayı:',
 'prefsnologin' => 'Daxil olmamısınız',
 'prefsnologintext' => 'Nizamlamaları dəyişmək üçün <span class="plainlinks">[{{fullurl:{{#Special:UserLogin}}|returnto=$1}} daxil olmaq]</span> zəruridir.',
@@ -2552,7 +2553,7 @@ Variants for Chinese language
 'exif-objectname' => 'Qısa başlıq',
 'exif-specialinstructions' => 'Xüsusi instruksiyalar',
 'exif-headline' => 'Başlıq',
-'exif-credit' => 'Credit/Provider',
+'exif-credit' => 'Təmin edici',
 'exif-source' => 'Mənbə',
 'exif-editstatus' => 'Şəklin redaktə statusu',
 'exif-urgency' => 'Zərurilik',
diff --git a/languages/messages/MessagesBa.php b/languages/messages/MessagesBa.php
index 687d5cc085..c6fd49cbb2 100644
--- a/languages/messages/MessagesBa.php
+++ b/languages/messages/MessagesBa.php
@@ -24,7 +24,7 @@ $fallback = 'ru';
 
 $namespaceNames = array(
 	NS_MEDIA            => 'Медиа',
-	NS_SPECIAL          => 'Ярҙамсы',
+	NS_SPECIAL          => 'Махсус',
 	NS_TALK             => 'Фекерләшеү',
 	NS_USER             => 'Ҡатнашыусы',
 	NS_USER_TALK        => 'Ҡатнашыусы_менән_һөйләшеү',
@@ -42,6 +42,7 @@ $namespaceNames = array(
 );
 
 $namespaceAliases = array(
+	'Ярҙамсы'                     => NS_SPECIAL,
 	'Фекер_алышыу'                => NS_TALK,
 	'Ҡатнашыусы_м-н_фекер_алышыу' => NS_USER_TALK,
 	'$1_б-са_фекер_алышыу'        => NS_PROJECT_TALK,
@@ -56,6 +57,85 @@ $namespaceAliases = array(
 
 $specialPageAliases = array(
 	'Activeusers'               => array( 'ӘүҙемҠатнашыусылар', 'АктивҠатнашыусылар' ),
+	'Allmessages'               => array( 'Система_хәбәрҙәре' ),
+	'Allpages'                  => array( 'Барлыҡ_битәр' ),
+	'Blankpage'                 => array( 'Буш_бит' ),
+	'Block'                     => array( 'Блоклау' ),
+	'Blockme'                   => array( 'Мине_блокла' ),
+	'Booksources'               => array( 'Китап_сығанаҡтары' ),
+	'BrokenRedirects'           => array( 'Өҙөлгән_йүнәлтеүҙәр' ),
+	'Categories'                => array( 'Категориялар' ),
+	'ChangeEmail'               => array( 'Email-ды_алыштырыу' ),
+	'ChangePassword'            => array( 'Паролде_алыштырыу' ),
+	'ComparePages'              => array( 'Биттәрҙе_сағыштырыу' ),
+	'Confirmemail'              => array( 'Email-ды_раҫлау' ),
+	'Contributions'             => array( 'Өлөштәр' ),
+	'CreateAccount'             => array( 'Иҫәп_яҙыуы_яһау' ),
+	'Deadendpages'              => array( 'Көрсөк_биттәр' ),
+	'DeletedContributions'      => array( 'Юйылған_өлөш' ),
+	'Disambiguations'           => array( 'Күп_мәғәнәлелек' ),
+	'DoubleRedirects'           => array( 'Икеле_йүнәлтеүҙәр' ),
+	'EditWatchlist'             => array( 'Күҙәтеү_исемлеген_мөхәррирләү' ),
+	'Emailuser'                 => array( 'Ҡатнашыусыға_хат' ),
+	'Export'                    => array( 'Экспорт' ),
+	'FileDuplicateSearch'       => array( 'Файлдың_дубликаттарын_эҙләү' ),
+	'Filepath'                  => array( 'Файл_юлы' ),
+	'Import'                    => array( 'Импорт' ),
+	'BlockList'                 => array( 'Блоклауҙар_исемлеге' ),
+	'LinkSearch'                => array( 'Һылтанмалар_эҙләү' ),
+	'Listadmins'                => array( 'Хакимдар_исемлеге' ),
+	'Listbots'                  => array( 'Боттар_исемлеге' ),
+	'Listfiles'                 => array( 'Файлдар_исемлеге' ),
+	'Listgrouprights'           => array( 'Ҡатнашыусы_төркөмдәре_хоҡуҡтары' ),
+	'Listredirects'             => array( 'Йүнәлтеүҙәр_исемлеге' ),
+	'Listusers'                 => array( 'Ҡатнашыусылар_исемлеге' ),
+	'Log'                       => array( 'Журналдар' ),
+	'Lonelypages'               => array( 'Етем_биттәр' ),
+	'Longpages'                 => array( 'Оҙон_биттәр' ),
+	'MergeHistory'              => array( 'Тарихтарҙы_берләштереү' ),
+	'Mostimages'                => array( 'Йыш_ҡулланылған_файлдар' ),
+	'Movepage'                  => array( 'Бит_исемен_үҙгәртеү' ),
+	'Mycontributions'           => array( 'Өлөшөм' ),
+	'Mypage'                    => array( 'Битем' ),
+	'Mytalk'                    => array( 'Әңгәмә_битем' ),
+	'Myuploads'                 => array( 'Тейәүҙәрем' ),
+	'Newimages'                 => array( 'Яңы_файлдар' ),
+	'Newpages'                  => array( 'Яңы_биттәр' ),
+	'PasswordReset'             => array( 'Паролде_яңыртыу' ),
+	'PermanentLink'             => array( 'Даими_һылтанма' ),
+	'Popularpages'              => array( 'Популяр_биттәр' ),
+	'Preferences'               => array( 'Көйләүҙәр' ),
+	'Protectedpages'            => array( 'Һаҡланған_биттәр' ),
+	'Protectedtitles'           => array( 'Һаҡланған_исемдәр' ),
+	'Randompage'                => array( 'Осраҡлы_мәҡәлә' ),
+	'Recentchanges'             => array( 'Һуңғы_үҙгәртеүҙәр' ),
+	'Recentchangeslinked'       => array( 'Бәйле_үҙгәртеүҙәр' ),
+	'Revisiondelete'            => array( 'Төҙәтеүҙе_юйыу' ),
+	'Search'                    => array( 'Эҙләү' ),
+	'Shortpages'                => array( 'Ҡыҫҡа_биттәр' ),
+	'Specialpages'              => array( 'Махсус_биттәр' ),
+	'Tags'                      => array( 'Билдәләр' ),
+	'Unblock'                   => array( 'Блокты_сисеү' ),
+	'Uncategorizedcategories'   => array( 'Категорияланмаған_категориялар' ),
+	'Uncategorizedimages'       => array( 'Категорияланмаған_файлдар' ),
+	'Uncategorizedpages'        => array( 'Категорияланмаған_биттәр' ),
+	'Uncategorizedtemplates'    => array( 'Категорияланмаған_ҡалыптар' ),
+	'Undelete'                  => array( 'Тергеҙеү' ),
+	'Unusedcategories'          => array( 'Ҡулланылмаған_категориялар' ),
+	'Unusedimages'              => array( 'Ҡулланылмаған_файлдар' ),
+	'Unusedtemplates'           => array( 'Ҡулланылмаған_ҡалыптар' ),
+	'Upload'                    => array( 'Тейәү' ),
+	'UploadStash'               => array( 'Йәшерен_тейәү' ),
+	'Userlogin'                 => array( 'Танылыу' ),
+	'Userlogout'                => array( 'Ултырышты_тамамлау' ),
+	'Userrights'                => array( 'Хоҡуҡтарҙы_идаралау' ),
+	'Wantedcategories'          => array( 'Кәрәкле_категориялар' ),
+	'Wantedfiles'               => array( 'Кәрәкле_файлдар' ),
+	'Wantedpages'               => array( 'Кәрәкле_биттәр' ),
+	'Wantedtemplates'           => array( 'Кәрәкле_ҡалыптар' ),
+	'Watchlist'                 => array( 'Күҙәтеү_исемлеге' ),
+	'Whatlinkshere'             => array( 'Бында_һылтанмалар' ),
+	'Withoutinterwiki'          => array( 'Интервикиһыҙ' ),
 );
 
 // Remove Russian aliases
@@ -241,7 +321,7 @@ $messages = array(
 'history' => 'Тарих',
 'history_short' => 'Тарих',
 'updatedmarker' => 'һуңғы кереүемдән һуң яңыртылған',
-'printableversion' => 'Ҡағыҙға баҫыу өлгөһө',
+'printableversion' => 'Баҫтырыу өлгөһө',
 'permalink' => 'Даими һылтанма',
 'print' => 'Баҫыу',
 'view' => 'Ҡарау',
@@ -2816,6 +2896,7 @@ The wiki server cannot provide data in a format your client can read.',
 'pageinfo-watchers' => 'Күҙәтеүселәр һаны',
 'pageinfo-edits' => 'Төҙәтеү һаны',
 'pageinfo-authors' => 'Төрлө авторҙар һаны',
+'pageinfo-toolboxlink' => 'Бит мәғлүмәттәре',
 
 # Skin names
 'skinname-standard' => 'Классик',
@@ -3345,16 +3426,16 @@ $1',
 'confirmemail_loggedin' => 'Һеҙҙең электрон почта адресығыҙ раҫланды.',
 'confirmemail_error' => 'Электрон почта адресын раҫлаған ваҡытта хата килеп сыҡты.',
 'confirmemail_subject' => '{{SITENAME}} электрон почта адресын раҫлау',
-'confirmemail_body' => 'Кемдер, бәлки һеҙҙер, $1 IP адресынан 
-{{SITENAME}}  проектында ошо электрон почта адресы менән "$2" иҫәп яҙмаһын теркәгән.
+'confirmemail_body' => 'Кемдер, бәлки һеҙҙер, $1 IP адресынан {{SITENAME}} проектында 
+ошо электрон почта адресы менән "$2" иҫәп яҙмаһын теркәгән.
 
-Был иҫәп яҙмаһы ысынлап та һеҙҙеке икәнен раҫлау өсөн һәм
-{{SITENAME}} проектында элетрон почта мөмкинлектәрен тоҡандырыу өсөн, браузерығыҙҙа түбәндәге һылтанманы асығыҙ:
+Был иҫәп яҙмаһы ысынлап та һеҙҙеке икәнен раҫлау өсөн һәм {{SITENAME}} проектында электрон почта 
+мөмкинлектәрен тоҡандырыу өсөн, браузерығыҙҙа түбәндәге һылтанманы асығыҙ:
 
 $3
 
-Әгәр һеҙ иҫәп яҙмаһын *булдырмағанһығыҙ* икән,
-электрон почта адресын раҫлауҙы үтҡәрмәү өсөн т үбәндәге һылтанманы асығыҙ:
+Әгәр һеҙ иҫәп яҙмаһын *булдырмағанһығыҙ* икән, электрон почта 
+адресын раҫлауҙы үткәрмәү өсөн түбәндәге һылтанманы асығыҙ:
 
 $5
 
@@ -3363,12 +3444,12 @@ $5
 {{SITENAME}}  проектында "$2" иҫәп яҙмаһының электрон почта адресын ошо адресҡа үҙгәрткән.
 
 Был иҫәп яҙмаһы ысынлап та һеҙҙеке икәнен раҫлау өсөн һәм
-{{SITENAME}} проектында элетрон почта мөмкинлектәрен яңынан тоҡандырыу өсөн, браузерығыҙҙа түбәндәге һылтанманы асығыҙ:
+{{SITENAME}} проектында электрон почта мөмкинлектәрен яңынан тоҡандырыу өсөн, браузерығыҙҙа түбәндәге һылтанманы асығыҙ:
 
 $3
 
 Әгәр һеҙ иҫәп яҙмаһын *булдырмағанһығыҙ* икән,
-электрон почта адресын раҫлауҙы үтҡәрмәү өсөн т үбәндәге һылтанманы асығыҙ:
+электрон почта адресын раҫлауҙы үткәрмәү өсөн түбәндәге һылтанманы асығыҙ:
 
 $5
 
@@ -3377,12 +3458,12 @@ $5
 {{SITENAME}}  проектында "$2" иҫәп яҙмаһының электрон почта адресын ошо адрес итеп билдәләгән.
 
 Был иҫәп яҙмаһы ысынлап та һеҙҙеке икәнен раҫлау өсөн һәм
-{{SITENAME}} проектында элетрон почта мөмкинлектәрен яңынан тоҡандырыу өсөн, браузерығыҙҙа түбәндәге һылтанманы асығыҙ:
+{{SITENAME}} проектында электрон почта мөмкинлектәрен яңынан тоҡандырыу өсөн, браузерығыҙҙа түбәндәге һылтанманы асығыҙ:
 
 $3
 
 Әгәр иҫәп яҙмаһы һеҙҙеке *түгел* икән,
-электрон почта адресын раҫлауҙы үтҡәрмәү өсөн т үбәндәге һылтанманы асығыҙ:
+электрон почта адресын раҫлауҙы үткәрмәү өсөн түбәндәге һылтанманы асығыҙ:
 
 $5
 
diff --git a/languages/messages/MessagesBar.php b/languages/messages/MessagesBar.php
index 7aff876b43..fbe88c55fd 100644
--- a/languages/messages/MessagesBar.php
+++ b/languages/messages/MessagesBar.php
@@ -8,6 +8,7 @@
  * @file
  *
  * @author Als-Holder
+ * @author Bua333
  * @author Malafaya
  * @author Man77
  * @author Merlissimo
@@ -95,7 +96,7 @@ $messages = array(
 'fri' => 'Fr',
 'sat' => 'SÃ¥',
 'january' => 'Jänner',
-'february' => 'Feewer',
+'february' => 'Feba',
 'march' => 'März',
 'april' => 'Aprü',
 'may_long' => 'Mai',
@@ -103,8 +104,8 @@ $messages = array(
 'july' => 'Juli',
 'august' => 'August',
 'september' => 'September',
-'october' => 'Óktówer',
-'november' => 'Nóvember',
+'october' => 'Oktoba',
+'november' => 'Novemba',
 'december' => 'Dezember',
 'january-gen' => 'Jänner',
 'february-gen' => 'Feewer',
@@ -150,13 +151,13 @@ $messages = array(
 'noindex-category' => 'Néd-indizirde Seiten',
 'broken-file-category' => 'Seiten mid kaputte Daateilinks',
 
-'about' => 'Ywer',
+'about' => 'Iba',
 'article' => 'Artike',
 'newwindow' => '(werd in am neichen Fenster aufgmocht)',
 'cancel' => 'Obbrecher',
 'moredotdotdot' => 'Merer',
 'mypage' => 'Eigerne Seiten',
-'mytalk' => 'Eigerne Diskussión',
+'mytalk' => 'Mei Dischkurs',
 'anontalk' => 'Dischkrirseiten voh derer IP-Adress',
 'navigation' => 'Navigazión',
 'and' => '&#32;und',
@@ -166,7 +167,6 @@ $messages = array(
 'qbbrowse' => 'Blaadeln',
 'qbedit' => 'werkeln',
 'qbpageoptions' => 'Seitenopzionen',
-'qbpageinfo' => 'Seitendaaten',
 'qbmyoptions' => 'Meine Seiten',
 'qbspecialpages' => 'Speziaalseiten',
 'faq' => 'Heiffige Frong',
@@ -176,7 +176,7 @@ $messages = array(
 'vector-action-addsection' => 'Obschnit dazuafyng',
 'vector-action-delete' => 'Leschen',
 'vector-action-move' => 'Vaschiam',
-'vector-action-protect' => 'Schytzen',
+'vector-action-protect' => 'Schitzn',
 'vector-action-undelete' => 'Wiederherstön',
 'vector-action-unprotect' => 'freigeem',
 'vector-simplesearch-preference' => 'Daweiterte Suachvurschläg aktivirn (netter Vector)',
@@ -184,9 +184,9 @@ $messages = array(
 'vector-view-edit' => 'Werkeln',
 'vector-view-history' => 'Versiónsgschicht',
 'vector-view-view' => 'Leesen',
-'vector-view-viewsource' => 'Quötext åzong',
+'vector-view-viewsource' => 'Quejtext ozoagn',
 'actions' => 'Akziónen',
-'namespaces' => 'NÃ¥mensraim',
+'namespaces' => 'Namasramm',
 'variants' => 'Varianten',
 
 'errorpagetitle' => 'Feeler',
@@ -200,7 +200,7 @@ $messages = array(
 'history' => 'Versiónen',
 'history_short' => 'Versionen/Autorn',
 'updatedmarker' => '(gänderd)',
-'printableversion' => 'Versión zum Ausdrucken',
+'printableversion' => 'Druckversion',
 'permalink' => 'Permanenter Link',
 'print' => 'Drucken',
 'view' => 'Leesen',
@@ -219,12 +219,12 @@ $messages = array(
 'unprotectthispage' => 'Seitenschutz ändern',
 'newpage' => 'Neiche Seiten',
 'talkpage' => 'De Seiten bsprecher',
-'talkpagelinktext' => 'Diskussión',
+'talkpagelinktext' => 'Dischkrian',
 'specialpage' => 'Speziaalseiten',
 'personaltools' => 'Persénlichs Werkzeig',
 'postcomment' => 'Neicher Obschnit',
 'articlepage' => 'Seiteninhoid åzoang',
-'talk' => 'Diskussión',
+'talk' => 'Dischkrian',
 'views' => 'Åsichten',
 'toolbox' => 'Werkzeigkisten',
 'userpage' => 'Benutzerseiten',
@@ -254,7 +254,7 @@ $1",
 'pool-errorunknown' => 'Unbekånnter Feeler',
 
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
-'aboutsite' => 'Ywer {{SITENAME}}',
+'aboutsite' => 'Iba {{SITENAME}}',
 'aboutpage' => 'Project:Ywer',
 'copyright' => 'Da Inhoid is unter da $1 vafiagbor.',
 'copyrightpage' => '{{ns:project}}:Urheewerrechte',
@@ -265,7 +265,7 @@ $1",
 'edithelp' => 'Beorweitungshüfm',
 'edithelppage' => 'Help:Beorweitungshüfm',
 'helppage' => 'Help:Inhoidsvazeichnis',
-'mainpage' => 'Hauptseiten',
+'mainpage' => 'Hoamseitn',
 'mainpage-description' => 'Hauptseiten',
 'policy-url' => 'Project:Richtlinien',
 'portal' => 'Autornportal',
@@ -284,13 +284,13 @@ Schaug auf [[Special:Version|Versiónsseiten]]",
 'ok' => 'Passt',
 'retrievedfrom' => 'Voh „$1“',
 'youhavenewmessages' => 'Du host $1 ($2).',
-'newmessageslink' => 'neiche Noochrichten',
-'newmessagesdifflink' => 'neiche Noochrichten',
-'youhavenewmessagesmulti' => 'Du host neiche Noochrichten: $1',
-'editsection' => 'werkeln',
+'newmessageslink' => 'neiche Nochrichtn',
+'newmessagesdifflink' => 'Letzte Endarung',
+'youhavenewmessagesmulti' => 'Du host neiche Nochrichtn: $1',
+'editsection' => 'Werkln',
 'editold' => 'werkeln',
 'viewsourceold' => 'Quötext åzoang',
-'editlink' => 'werkeln',
+'editlink' => 'werkln',
 'viewsourcelink' => 'an Quötext åschauh',
 'editsectionhint' => 'Obschnit beorweiden: $1',
 'toc' => 'Inhoidsvazeichnis',
@@ -308,7 +308,7 @@ Schaug auf [[Special:Version|Versiónsseiten]]",
 'site-atom-feed' => 'Atom-Feed fyr $1',
 'page-rss-feed' => 'RSS-Feed fyr „$1“',
 'page-atom-feed' => 'Atom-Feed fyr „$1“',
-'red-link-title' => '$1 (dé Seiten gibts néd)',
+'red-link-title' => '$1 (de Seitn gibts ned)',
 'sort-descending' => 'Obsteigend sortiern',
 'sort-ascending' => 'Aufsteigend sortiern',
 
@@ -316,7 +316,7 @@ Schaug auf [[Special:Version|Versiónsseiten]]",
 'nstab-main' => 'Seiten',
 'nstab-user' => 'Benutzerseiten',
 'nstab-media' => 'Meedienseiten',
-'nstab-special' => 'Speziaalseiten',
+'nstab-special' => 'Spezialseitn',
 'nstab-project' => 'Projektseiten',
 'nstab-image' => 'Daatei',
 'nstab-mediawiki' => 'Systémnoochricht',
@@ -384,7 +384,7 @@ Méglicherweis iss schoh vohram åndern gléschd worn.',
 'wrong_wfQuery_params' => 'Foische Parameeter fyr wfQuery()<br />
 Funkzión: $1<br />
 Obfrog: $2',
-'viewsource' => 'an Quötext åschauh',
+'viewsource' => 'Quejtext ozoagn',
 'viewsource-title' => 'Quöntext voh da Seiten $1 auhschauh',
 'actionthrottled' => 'Akziónszoi limitird',
 'actionthrottledtext' => 'Im Råmen voh ner Anti-Spam-Moossnåm kå dé Akzión do in am kurzen Zeidobstånd netter begrenzd ausgfyrd wern. Dé Grenzen host ywerschritten.
@@ -432,7 +432,7 @@ Vagiss bittscheh néd, deine [[Special:Preferences|{{SITENAME}}-Eishtellungen]]
 'userlogin' => 'Åmöden / Kontó erstön',
 'userloginnocreate' => 'Åmöden',
 'logout' => 'Obmöden',
-'userlogout' => 'Obmöden',
+'userlogout' => 'Auslogga',
 'notloggedin' => 'Ned ågmödt',
 'nologin' => "Du host koah Benutzerkóntó? '''$1'''.",
 'nologinlink' => 'A neichs Benutzerkontó erstön',
@@ -575,8 +575,8 @@ Zur Informazion foigt da aktuöie Logbuachaitrog:",
 'nocreate-loggedin' => "Du host koah Berechtigung, neiche Seiten z' erstön.",
 'permissionserrors' => 'Berechtigungsfeeler',
 'permissionserrorstext' => 'Du bist néd berechtigt, dé Akzión auszfyrn.  {{PLURAL:$1|Grund|Grynd}}:',
-'permissionserrorstext-withaction' => "Du host de Berechtigung ned, dass d' $2.
-{{PLURAL:$1|Grund|Grynd}}:",
+'permissionserrorstext-withaction' => 'Du host koa Berechtigung ned, dass de $2.
+{{PLURAL:$1|Grund|Grind}}:',
 'recreate-moveddeleted-warn' => "'''Ówocht: Du dastöst a Seiten dé schoh friarer gléschd worn is.'''
 
 Bittscheh priaff genau, ób dé erneite Seitendastöung dé Richtlinien entsprichd.
@@ -702,7 +702,7 @@ Details stehen im [{{fullurl:{{#Special:Log}}/suppress|page={{FULLPAGENAMEE}}}}
 
 # Preferences page
 'preferences' => 'Eihstellungen',
-'mypreferences' => 'Eigerne Eihstellungen',
+'mypreferences' => 'Mei Preferenz',
 'changepassword' => 'Posswort ändern',
 'prefs-editing' => 'Beorweiten',
 'prefs-edit-boxsize' => 'Gress vom Beorweitungsfenster',
@@ -720,7 +720,7 @@ Details stehen im [{{fullurl:{{#Special:Log}}/suppress|page={{FULLPAGENAMEE}}}}
 'prefs-namespaces' => 'NÃ¥mensraim',
 'youremail' => 'E-Mail-Adress:',
 'username' => 'Benutzernåm:',
-'yourrealname' => 'Da echte NÃ¥m:',
+'yourrealname' => 'Biagalicha Nama:',
 'yourlanguage' => 'Sprooch vo da Benutzerowerflächen',
 'prefs-help-realname' => 'Opzionoi. Dodamid kå dai byrgerlicher Nåm daine Baiträg zuagordnet wern.',
 'prefs-help-email' => "Dé Ågob voh ner E-Mail-Adressen is ópziónoi, daméglicht ower d' Zuasendung vohram Ersotzposswort, sófern du deih Posswort vagessen host.",
@@ -761,7 +761,7 @@ Details stehen im [{{fullurl:{{#Special:Log}}/suppress|page={{FULLPAGENAMEE}}}}
 'rightslog' => 'Rechte-Logbiache',
 
 # Associated actions - in the sentence "You do not have permission to X"
-'action-edit' => 'an derer Seiten duast werkeln',
+'action-edit' => 'beorbadd de Seitn',
 'action-createpage' => "Seiten z' dastön",
 'action-autopatrol' => 'eigerne Beorweitungen ois kontroilird markirn',
 
@@ -810,7 +810,7 @@ Details stehen im [{{fullurl:{{#Special:Log}}/suppress|page={{FULLPAGENAMEE}}}}
 'recentchangeslinked-to' => 'Zoagt Änderrungen auf Seiten, dé do her valinken',
 
 # Upload
-'upload' => 'Aufféloon',
+'upload' => 'Affelodn',
 'uploadbtn' => 'Daatei aufféloon',
 'uploadnologin' => 'Néd ågmödt',
 'uploadnologintext' => 'Du muasst [[Special:UserLogin|ågmödt]] seih, wånn Du Daatein auffeloon wüst.',
@@ -1056,7 +1056,7 @@ Zuasätzlige Informaziónen ywer dé oahzelnen Rechtt kennan [[{{MediaWiki:Listg
 'listgrouprights-group' => 'Gruppm',
 'listgrouprights-rights' => 'Rechte',
 'listgrouprights-helppage' => 'Help:Gruppmrechte',
-'listgrouprights-members' => '(Mitgliaderlisten)',
+'listgrouprights-members' => '(Mitgliedalistn)',
 'listgrouprights-addgroup' => 'Benutzer zua {{PLURAL:$2|derer Gruppm|dé Gruppm}} dazuadoah: $1',
 'listgrouprights-removegroup' => 'Benutzer aus {{PLURAL:$2|derer Gruppm|dé Gruppm}} entferner: $1',
 'listgrouprights-addgroup-all' => 'Benutzer zua olle Gruppm dazuadoah',
@@ -1087,7 +1087,7 @@ Zuasätzlige Informaziónen ywer dé oahzelnen Rechtt kennan [[{{MediaWiki:Listg
 
 # Watchlist
 'watchlist' => 'Beówochtungslisten',
-'mywatchlist' => 'Beówochtungslisten',
+'mywatchlist' => 'Mei Beobochta',
 'watchlistfor2' => 'Voh $1 $2',
 'nowatchlist' => 'Es gibt koane Eihträg auf deiner Beówochtungslisten.',
 'watchlistanontext' => "Du muasst dé $1, um deih Beówchtungslisten z' seeng óder Eihträg borweiten z' kenner.",
@@ -1237,7 +1237,7 @@ Da aktuöje Text voh da gléschden Seiten is netter fyr Administraatorn zuagäng
 'undelete-show-file-submit' => 'Jo',
 
 # Namespace form on various pages
-'namespace' => 'NÃ¥mensraum:',
+'namespace' => 'Namasramm:',
 'invert' => 'Auswoi umdraan',
 'namespace_association' => 'Zuagordnéter Nåmensraum',
 'blanknamespace' => '(Seiten)',
@@ -1245,7 +1245,7 @@ Da aktuöje Text voh da gléschden Seiten is netter fyr Administraatorn zuagäng
 # Contributions
 'contributions' => 'Benutzerbeiträg',
 'contributions-title' => 'Benutzerbeiträg voh „$1“',
-'mycontris' => 'Eigerne Beitrég',
+'mycontris' => 'Meine Beidräg',
 'contribsub2' => 'Fyr $1 ($2)',
 'uctop' => '(aktuö)',
 'month' => 'und Monad',
@@ -1329,14 +1329,14 @@ Zur da Aufheewung vo da Sperrn schau unter da [[Special:BlockList|Listen vo olle
 'ipusubmit' => 'Freigem',
 'unblocked' => '[[User:$1|$1]] is freigem worn',
 'unblocked-id' => 'Sperr-ID $1 is fraigeem worn',
-'ipblocklist' => 'Gsperrde Benutzer',
+'ipblocklist' => 'Gsperrte Nutza',
 'ipblocklist-legend' => 'Suach noch am gsperrden Benytzer',
 'createaccountblock' => "'s erstön voh Benutzerkóntós is gsperrd",
 'emailblock' => 'E-Póst vaschicker is gsperrd',
 'blocklink' => 'sperrn',
 'unblocklink' => 'Freigeem',
 'change-blocklink' => 'Sperr ändern',
-'contribslink' => 'Beitrég',
+'contribslink' => 'Beidräg',
 'emaillink' => 'E-Póst schicker',
 'autoblocker' => 'Autómaatische Sperr, wei du a gmoahsaume IP-Adress mim [[User:$1|$1]] bnutzd. Grund voh da Benutzersperrn: „$2“.',
 'blocklogpage' => 'Benutzersperrlogbiaché',
@@ -1461,7 +1461,7 @@ Bsuach bittschee de Saiten [//www.mediawiki.org/wiki/Localisation MediaWiki-Loka
 'tooltip-feed-atom' => 'Atom-Feed vo derer Saiten',
 'tooltip-t-contributions' => "D' Listen voh d' Beiträg voh dém Benutzer åschauh",
 'tooltip-t-emailuser' => 'Dém Benutzer a E-Post schicken',
-'tooltip-t-upload' => 'Daatein aufféloon',
+'tooltip-t-upload' => 'Datein affelodn',
 'tooltip-t-specialpages' => 'Listen voh olle Speziaalseiten',
 'tooltip-t-print' => 'Druckåsicht voh derer Seiten',
 'tooltip-t-permalink' => 'Dauerhofter Link zua derer Seitenversión',
@@ -1649,7 +1649,7 @@ Bittscheh d' noraale Vurschau bnutzen.",
 'fileduplicatesearch-result-1' => 'Dé Daatei „$1“ hod koane identischen Duplikaate.',
 
 # Special:SpecialPages
-'specialpages' => 'Speziaalseiten',
+'specialpages' => 'Spezialseitn',
 'specialpages-note' => '----
 * Reguläre Speziaalseiten
 * <span class="mw-specialpagerestricted">Zuagrifsbschränkde Speziaalseiten</span>
diff --git a/languages/messages/MessagesBcc.php b/languages/messages/MessagesBcc.php
index f33e04fe85..94ae3bc2d4 100644
--- a/languages/messages/MessagesBcc.php
+++ b/languages/messages/MessagesBcc.php
@@ -16,7 +16,6 @@
 
 $fallback = 'fa';
 
-
 $namespaceNames = array(
 	NS_MEDIA            => 'مدیا',
 	NS_SPECIAL          => 'حاص',
diff --git a/languages/messages/MessagesBcl.php b/languages/messages/MessagesBcl.php
index a924935ed1..c328974c49 100644
--- a/languages/messages/MessagesBcl.php
+++ b/languages/messages/MessagesBcl.php
@@ -34,6 +34,11 @@ $namespaceNames = array(
 	NS_CATEGORY_TALK    => 'Olay_sa_kategorya',
 );
 
+$specialPageAliases = array(
+	'Search'                    => array( 'Hanapon' ),
+	'Upload'                    => array( 'Ikarga' ),
+);
+
 $magicWords = array(
 	'currentmonth'              => array( '1', 'BULANNGONYAN', 'CURRENTMONTH', 'CURRENTMONTH2' ),
 	'currentmonthname'          => array( '1', 'NGARANBULANNGONYAN', 'CURRENTMONTHNAME' ),
@@ -90,11 +95,6 @@ $magicWords = array(
 	'pagesize'                  => array( '1', 'PAHINASOKOL', 'PAGESIZE' ),
 );
 
-$specialPageAliases = array(
-	'Search'                    => array( 'Hanapon' ),
-	'Upload'                    => array( 'Ikarga' ),
-);
-
 $messages = array(
 # User preference toggles
 'tog-underline' => 'Linyahan an kilyawan:',
@@ -232,7 +232,7 @@ $messages = array(
 'cancel' => 'Kanselaron',
 'moredotdotdot' => 'Kadagdagan...',
 'mypage' => 'An sakóng pahina',
-'mytalk' => 'An sakóng olay',
+'mytalk' => 'Orolayan',
 'anontalk' => 'Olay para kaining IP address',
 'navigation' => 'Nabigasyon',
 'and' => '&#32;asin',
@@ -1173,7 +1173,7 @@ Prubaran na panigmitan an saimong kahaputan nin ''all:'' sa paghanap kan gabos n
 
 # Preferences page
 'preferences' => 'Mga kabòtan',
-'mypreferences' => 'Mga kabòtan ko',
+'mypreferences' => 'Mga Kamuyahan ko',
 'prefs-edits' => 'Bilang kan mga hirá:',
 'prefsnologin' => 'Dai nakalaog',
 'prefsnologintext' => 'Ika dapat na magin <span class="plainlinks">[{{fullurl:{{#Special:UserLogin}}|returnto=$1}} nakalaog na]</span> tanganing tuytuyon an mga kabotan nin paragamit.',
@@ -2105,7 +2105,7 @@ An e-surat na adres na saimong ilalaog sa [[Special:Preferences|saimong paragami
 
 # Watchlist
 'watchlist' => 'Pigbabantayan ko',
-'mywatchlist' => 'Babantáyan ko',
+'mywatchlist' => 'Bantay-listahan',
 'watchlistfor2' => 'Para ki $1 $2',
 'nowatchlist' => 'Mayo ka man na mga bagay saimong lista nin pigbabantayan.',
 'watchlistanontext' => 'Mag $1 tabi para mahiling o maghira nin mga bagay saimong lista nin mga pigbabantayan.',
@@ -2367,7 +2367,7 @@ $1",
 # Contributions
 'contributions' => 'Mga kontribusyon kan parágamit',
 'contributions-title' => 'Mga kontribusyon kan paragamit para sa $1',
-'mycontris' => 'Mga ambág ko',
+'mycontris' => 'Mga Kaarambagan',
 'contribsub2' => 'Para sa $1 ($2)',
 'nocontribs' => 'Mayong mga pagbabago na nahanap na kapadis sa ining mga criteria.',
 'uctop' => '(alituktok)',
@@ -2408,7 +2408,7 @@ An pinakahuring entrada sa talaan nin pagbara nakahaya sa ibaba bilang reperensi
 'whatlinkshere-hideredirs' => '$1 mga panukdong otro',
 'whatlinkshere-hidetrans' => '$1 kabaling-binalyuhan',
 'whatlinkshere-hidelinks' => '$1 mga kasugpon',
-'whatlinkshere-hideimages' => '$1 mga kasugpon kan imahe',
+'whatlinkshere-hideimages' => '$1 mga kasugpon nin mga sagunson',
 'whatlinkshere-filters' => 'Mga pansarà',
 
 # Block/unblock
diff --git a/languages/messages/MessagesBe.php b/languages/messages/MessagesBe.php
index ad64f055b3..518bf65418 100644
--- a/languages/messages/MessagesBe.php
+++ b/languages/messages/MessagesBe.php
@@ -25,25 +25,6 @@
  * @author לערי ריינהארט
  */
 
-$bookstoreList = array(
-	'OZ.by' => 'http://oz.by/search.phtml?what=books&isbn=$1',
-	'Amazon.com' => 'http://www.amazon.com/exec/obidos/ISBN=$1'
-);
-
-$datePreferences = array(
-	'default',
-	'dmy',
-	'ISO 8601',
-);
-
-$defaultDateFormat = 'dmy';
-
-$dateFormats = array(
-	'dmy time' => 'H:i',
-	'dmy date' => 'j xg Y',
-	'dmy both' => 'H:i, j xg Y',
-);
-
 $namespaceNames = array(
 	NS_MEDIA            => 'Мультымедыя',
 	NS_SPECIAL          => 'Адмысловае',
@@ -78,6 +59,25 @@ $magicWords = array(
 	'img_framed'                => array( '1', 'безрамкі', 'framed', 'enframed', 'frame' ),
 );
 
+$bookstoreList = array(
+	'OZ.by' => 'http://oz.by/search.phtml?what=books&isbn=$1',
+	'Amazon.com' => 'http://www.amazon.com/exec/obidos/ISBN=$1'
+);
+
+$datePreferences = array(
+	'default',
+	'dmy',
+	'ISO 8601',
+);
+
+$defaultDateFormat = 'dmy';
+
+$dateFormats = array(
+	'dmy time' => 'H:i',
+	'dmy date' => 'j xg Y',
+	'dmy both' => 'H:i, j xg Y',
+);
+
 # Per discussion on http://translatewiki.net/wiki/Thread:Support/Customization_of number format
 $separatorTransformTable = array(
 	',' => "\xc2\xa0", # nbsp
diff --git a/languages/messages/MessagesBe_tarask.php b/languages/messages/MessagesBe_tarask.php
index 75f0e684a0..9c6a8a35bb 100644
--- a/languages/messages/MessagesBe_tarask.php
+++ b/languages/messages/MessagesBe_tarask.php
@@ -19,23 +19,90 @@
  * @author Тест
  */
 
-$bookstoreList = array(
-	'OZ.by' => 'http://oz.by/search.phtml?what=books&isbn=$1',
-	'Amazon.com' => 'http://www.amazon.com/exec/obidos/ISBN=$1'
-);
+$fallback = 'be';
 
-$datePreferences = array(
-	'default',
-	'dmy',
-	'ISO 8601',
+$namespaceNames = array(
+	NS_MEDIA            => 'Мэдыя',
+	NS_SPECIAL          => 'Спэцыяльныя',
+	NS_TALK             => 'Абмеркаваньне',
+	NS_USER             => 'Удзельнік',
+	NS_USER_TALK        => 'Гутаркі_ўдзельніка',
+	NS_PROJECT_TALK     => 'Абмеркаваньне_{{GRAMMAR:родны|$1}}',
+	NS_FILE             => 'Файл',
+	NS_FILE_TALK        => 'Абмеркаваньне_файла',
+	NS_MEDIAWIKI        => 'MediaWiki',
+	NS_MEDIAWIKI_TALK   => 'Абмеркаваньне_MediaWiki',
+	NS_TEMPLATE         => 'Шаблён',
+	NS_TEMPLATE_TALK    => 'Абмеркаваньне_шаблёну',
+	NS_HELP             => 'Дапамога',
+	NS_HELP_TALK        => 'Абмеркаваньне_дапамогі',
+	NS_CATEGORY         => 'Катэгорыя',
+	NS_CATEGORY_TALK    => 'Абмеркаваньне_катэгорыі',
 );
 
-$defaultDateFormat = 'dmy';
+$namespaceAliases = array(
+	'Удзельніца' => NS_USER,
+	'Гутаркі ўдзельніцы' => NS_USER_TALK,
+	'Абмеркаваньне_$1' => NS_PROJECT_TALK,
+	'Выява' => NS_FILE,
+	'Абмеркаваньне выявы' => NS_FILE_TALK,
+);
 
-$dateFormats = array(
-	'dmy time' => 'H:i',
-	'dmy date' => 'j xg Y',
-	'dmy both' => 'H:i, j xg Y',
+$specialPageAliases = array(
+	'Allmessages'               => array( 'Сыстэмныя_паведамленьні' ),
+	'Allpages'                  => array( 'Усе_старонкі' ),
+	'Ancientpages'              => array( 'Найстарэйшыя_старонкі' ),
+	'Block'                     => array( 'Блякаваньне' ),
+	'BrokenRedirects'           => array( 'Некарэктныя_перанакіраваньні' ),
+	'Categories'                => array( 'Катэгорыі' ),
+	'ChangePassword'            => array( 'Зьмяніць_пароль', 'Ачысьціць_пароль' ),
+	'Contributions'             => array( 'Унёсак' ),
+	'CreateAccount'             => array( 'Стварыць_рахунак' ),
+	'Deadendpages'              => array( 'Тупіковыя_старонкі' ),
+	'DeletedContributions'      => array( 'Выдалены_ўнёсак' ),
+	'Disambiguations'           => array( 'Неадназначнасьці' ),
+	'DoubleRedirects'           => array( 'Двайныя_перанакіраваньні' ),
+	'Emailuser'                 => array( 'Даслаць_ліст' ),
+	'Export'                    => array( 'Экспарт' ),
+	'Filepath'                  => array( 'Шлях_да_файла' ),
+	'Import'                    => array( 'Імпарт' ),
+	'LinkSearch'                => array( 'Пошук_вонкавых_спасылак' ),
+	'Listadmins'                => array( 'Сьпіс_адміністратараў' ),
+	'Listbots'                  => array( 'Сьпіс_робатаў' ),
+	'Listfiles'                 => array( 'Сьпіс_файлаў' ),
+	'Listredirects'             => array( 'Сьпіс_перанакіраваньняў' ),
+	'Listusers'                 => array( 'Сьпіс_удзельнікаў' ),
+	'Log'                       => array( 'Журналы_падзеяў' ),
+	'Lonelypages'               => array( 'Старонкі-сіраціны' ),
+	'Longpages'                 => array( 'Доўгія_старонкі' ),
+	'MergeHistory'              => array( 'Гісторыя_аб\'яднаньняў' ),
+	'Mycontributions'           => array( 'Мой_унёсак' ),
+	'Mypage'                    => array( 'Мая_старонка' ),
+	'Mytalk'                    => array( 'Мае_размовы' ),
+	'Newimages'                 => array( 'Новыя_файлы' ),
+	'Newpages'                  => array( 'Новыя_старонкі' ),
+	'Popularpages'              => array( 'Папулярныя_старонкі' ),
+	'Protectedpages'            => array( 'Абароненыя_старонкі' ),
+	'Protectedtitles'           => array( 'Забароненыя_старонкі' ),
+	'Randompage'                => array( 'Выпадковая_старонка' ),
+	'Randomredirect'            => array( 'Выпадковае_перанакіраваньне' ),
+	'Recentchanges'             => array( 'Апошнія_зьмены' ),
+	'Search'                    => array( 'Пошук' ),
+	'Shortpages'                => array( 'Кароткія_старонкі' ),
+	'Specialpages'              => array( 'Спэцыяльныя_старонкі' ),
+	'Statistics'                => array( 'Статыстыка' ),
+	'Uncategorizedcategories'   => array( 'Некатэгарызаваныя_катэгорыі' ),
+	'Uncategorizedimages'       => array( 'Некатэгарызаваныя_файлы' ),
+	'Uncategorizedpages'        => array( 'Некатэгарызаваныя_старонкі' ),
+	'Uncategorizedtemplates'    => array( 'Некатэгарызаваныя_шаблёны' ),
+	'Upload'                    => array( 'Загрузка' ),
+	'Version'                   => array( 'Вэрсія' ),
+	'Wantedcategories'          => array( 'Запатрабаваныя_катэгорыі' ),
+	'Wantedfiles'               => array( 'Запатрабаваныя_файлы' ),
+	'Wantedpages'               => array( 'Запатрабаваныя_старонкі', 'Некарэктныя_спасылкі' ),
+	'Wantedtemplates'           => array( 'Запатрабаваныя_шаблёны' ),
+	'Watchlist'                 => array( 'Сьпіс_назіраньня' ),
+	'Whatlinkshere'             => array( 'Спасылкі_на_старонку' ),
 );
 
 $magicWords = array(
@@ -93,14 +160,14 @@ $magicWords = array(
 	'msg'                       => array( '0', 'ПАВЕДАМЛЕНЬНЕ:', 'MSG:' ),
 	'subst'                     => array( '0', 'ПАДСТАНОЎКА:', 'SUBST:' ),
 	'msgnw'                     => array( '0', 'ПАВЕДАМЛЕНЬНЕ_БЯЗЬ_ВІКІ:', 'MSGNW:' ),
-	'img_thumbnail'             => array( '1', 'значак', 'міні', 'thumbnail', 'thumb' ),
-	'img_manualthumb'           => array( '1', 'значак=$1', 'міні=$1', 'thumbnail=$1', 'thumb=$1' ),
+	'img_thumbnail'             => array( '1', 'значак', 'міні', 'мініяцюра', 'thumbnail', 'thumb' ),
+	'img_manualthumb'           => array( '1', 'значак=$1', 'міні=$1', 'мініяцюра=$1', 'thumbnail=$1', 'thumb=$1' ),
 	'img_right'                 => array( '1', 'справа', 'right' ),
-	'img_left'                  => array( '1', 'зьлева', 'left' ),
+	'img_left'                  => array( '1', 'зьлева', 'злева', 'left' ),
 	'img_none'                  => array( '1', 'няма', 'none' ),
 	'img_width'                 => array( '1', '$1пкс', '$1px' ),
-	'img_center'                => array( '1', 'цэнтар', 'center', 'centre' ),
-	'img_framed'                => array( '1', 'рамка', 'framed', 'enframed', 'frame' ),
+	'img_center'                => array( '1', 'цэнтар', 'цэнтр', 'center', 'centre' ),
+	'img_framed'                => array( '1', 'рамка', 'безрамкі', 'framed', 'enframed', 'frame' ),
 	'img_page'                  => array( '1', 'старонка=$1', 'старонка $1', 'page=$1', 'page $1' ),
 	'img_top'                   => array( '1', 'зьверху', 'top' ),
 	'img_middle'                => array( '1', 'пасярэдзіне', 'middle' ),
@@ -156,88 +223,23 @@ $magicWords = array(
 	'staticredirect'            => array( '1', '__СТАТЫЧНАЕ_ПЕРАНАКІРАВАНЬНЕ__', '__STATICREDIRECT__' ),
 );
 
-$namespaceNames = array(
-	NS_MEDIA            => 'Мэдыя',
-	NS_SPECIAL          => 'Спэцыяльныя',
-	NS_TALK             => 'Абмеркаваньне',
-	NS_USER             => 'Удзельнік',
-	NS_USER_TALK        => 'Гутаркі_ўдзельніка',
-	NS_PROJECT_TALK     => 'Абмеркаваньне_{{GRAMMAR:родны|$1}}',
-	NS_FILE             => 'Файл',
-	NS_FILE_TALK        => 'Абмеркаваньне_файла',
-	NS_MEDIAWIKI        => 'MediaWiki',
-	NS_MEDIAWIKI_TALK   => 'Абмеркаваньне_MediaWiki',
-	NS_TEMPLATE         => 'Шаблён',
-	NS_TEMPLATE_TALK    => 'Абмеркаваньне_шаблёну',
-	NS_HELP             => 'Дапамога',
-	NS_HELP_TALK        => 'Абмеркаваньне_дапамогі',
-	NS_CATEGORY         => 'Катэгорыя',
-	NS_CATEGORY_TALK    => 'Абмеркаваньне_катэгорыі',
+$bookstoreList = array(
+	'OZ.by' => 'http://oz.by/search.phtml?what=books&isbn=$1',
+	'Amazon.com' => 'http://www.amazon.com/exec/obidos/ISBN=$1'
 );
 
-$namespaceAliases = array(
-	'Удзельніца' => NS_USER,
-	'Гутаркі ўдзельніцы' => NS_USER_TALK,
-	'Абмеркаваньне_$1' => NS_PROJECT_TALK,
-	'Выява' => NS_FILE,
-	'Абмеркаваньне выявы' => NS_FILE_TALK,
+$datePreferences = array(
+	'default',
+	'dmy',
+	'ISO 8601',
 );
 
-$specialPageAliases = array(
-	'Allmessages'               => array( 'Сыстэмныя_паведамленьні' ),
-	'Allpages'                  => array( 'Усе_старонкі' ),
-	'Ancientpages'              => array( 'Найстарэйшыя_старонкі' ),
-	'Block'                     => array( 'Блякаваньне' ),
-	'BrokenRedirects'           => array( 'Некарэктныя_перанакіраваньні' ),
-	'Categories'                => array( 'Катэгорыі' ),
-	'ChangePassword'            => array( 'Зьмяніць_пароль', 'Ачысьціць_пароль' ),
-	'Contributions'             => array( 'Унёсак' ),
-	'CreateAccount'             => array( 'Стварыць_рахунак' ),
-	'Deadendpages'              => array( 'Тупіковыя_старонкі' ),
-	'DeletedContributions'      => array( 'Выдалены_ўнёсак' ),
-	'Disambiguations'           => array( 'Неадназначнасьці' ),
-	'DoubleRedirects'           => array( 'Двайныя_перанакіраваньні' ),
-	'Emailuser'                 => array( 'Даслаць_ліст' ),
-	'Export'                    => array( 'Экспарт' ),
-	'Filepath'                  => array( 'Шлях_да_файла' ),
-	'Import'                    => array( 'Імпарт' ),
-	'LinkSearch'                => array( 'Пошук_вонкавых_спасылак' ),
-	'Listadmins'                => array( 'Сьпіс_адміністратараў' ),
-	'Listbots'                  => array( 'Сьпіс_робатаў' ),
-	'Listfiles'                 => array( 'Сьпіс_файлаў' ),
-	'Listredirects'             => array( 'Сьпіс_перанакіраваньняў' ),
-	'Listusers'                 => array( 'Сьпіс_удзельнікаў' ),
-	'Log'                       => array( 'Журналы_падзеяў' ),
-	'Lonelypages'               => array( 'Старонкі-сіраціны' ),
-	'Longpages'                 => array( 'Доўгія_старонкі' ),
-	'MergeHistory'              => array( 'Гісторыя_аб\'яднаньняў' ),
-	'Mycontributions'           => array( 'Мой_унёсак' ),
-	'Mypage'                    => array( 'Мая_старонка' ),
-	'Mytalk'                    => array( 'Мае_размовы' ),
-	'Newimages'                 => array( 'Новыя_файлы' ),
-	'Newpages'                  => array( 'Новыя_старонкі' ),
-	'Popularpages'              => array( 'Папулярныя_старонкі' ),
-	'Protectedpages'            => array( 'Абароненыя_старонкі' ),
-	'Protectedtitles'           => array( 'Забароненыя_старонкі' ),
-	'Randompage'                => array( 'Выпадковая_старонка' ),
-	'Randomredirect'            => array( 'Выпадковае_перанакіраваньне' ),
-	'Recentchanges'             => array( 'Апошнія_зьмены' ),
-	'Search'                    => array( 'Пошук' ),
-	'Shortpages'                => array( 'Кароткія_старонкі' ),
-	'Specialpages'              => array( 'Спэцыяльныя_старонкі' ),
-	'Statistics'                => array( 'Статыстыка' ),
-	'Uncategorizedcategories'   => array( 'Некатэгарызаваныя_катэгорыі' ),
-	'Uncategorizedimages'       => array( 'Некатэгарызаваныя_файлы' ),
-	'Uncategorizedpages'        => array( 'Некатэгарызаваныя_старонкі' ),
-	'Uncategorizedtemplates'    => array( 'Некатэгарызаваныя_шаблёны' ),
-	'Upload'                    => array( 'Загрузка' ),
-	'Version'                   => array( 'Вэрсія' ),
-	'Wantedcategories'          => array( 'Запатрабаваныя_катэгорыі' ),
-	'Wantedfiles'               => array( 'Запатрабаваныя_файлы' ),
-	'Wantedpages'               => array( 'Запатрабаваныя_старонкі', 'Некарэктныя_спасылкі' ),
-	'Wantedtemplates'           => array( 'Запатрабаваныя_шаблёны' ),
-	'Watchlist'                 => array( 'Сьпіс_назіраньня' ),
-	'Whatlinkshere'             => array( 'Спасылкі_на_старонку' ),
+$defaultDateFormat = 'dmy';
+
+$dateFormats = array(
+	'dmy time' => 'H:i',
+	'dmy date' => 'j xg Y',
+	'dmy both' => 'H:i, j xg Y',
 );
 
 $separatorTransformTable = array(
@@ -303,7 +305,7 @@ $messages = array(
 
 'underline-always' => 'Заўсёды',
 'underline-never' => 'Ніколі',
-'underline-default' => 'Паводле браўзэра',
+'underline-default' => 'Паводле браўзэра або афармленьня',
 
 # Font style option in Special:Preferences
 'editfont-style' => 'Стыль шрыфту ў полі рэдагаваньня:',
@@ -388,8 +390,8 @@ $messages = array(
 'newwindow' => '(адкрываецца ў новым акне)',
 'cancel' => 'Скасаваць',
 'moredotdotdot' => 'Далей…',
-'mypage' => 'Мая старонка',
-'mytalk' => 'Мае гутаркі',
+'mypage' => 'Старонка',
+'mytalk' => 'Гутаркі',
 'anontalk' => 'Гутаркі для гэтага IP-адрасу',
 'navigation' => 'Навігацыя',
 'and' => '&#32;і',
@@ -941,7 +943,7 @@ $2
 'note' => "'''Заўвага: '''",
 'previewnote' => "'''Гэта толькі папярэдні прагляд.'''
 Вашыя зьмены яшчэ не былі захаваныя!",
-'continue-editing' => 'Працягнуць рэдагаваньне',
+'continue-editing' => 'Перайсьці да рэдагаваньня',
 'previewconflict' => 'Гэта папярэдні прагляд тэксту зь верхняга вакна рэдагаваньня, так ён будзе выглядаць, калі Вы вырашыце яго захаваць.',
 'session_fail_preview' => "'''Не атрымалася захаваць Вашую праўку праз тое, што былі страчаныя зьвесткі пра сэсію.
 Калі ласка, паспрабуйце яшчэ раз. Калі памылка ня зьнікне, паспрабуйце [[Special:UserLogout|выйсьці з сыстэмы]] і ўвайсьці ізноў.'''",
@@ -1552,6 +1554,9 @@ $1",
 'rightslogtext' => 'Гэта журнал зьменаў правоў удзельнікаў.',
 'rightslogentry' => 'зьменена прыналежнасьць $1 з групы $2 да $3',
 'rightslogentry-autopromote' => 'быў аўтаматычна падвышаны з $2 да $3',
+'logentry-rights-rights' => '$1 {{GENDER:$1|зьмяніў|зьмяніла}} прыналежнасьць $3 да групы з $4 на $5',
+'logentry-rights-rights-legacy' => '$1 {{GENDER:$1|зьмяніў|зьмяніла}} прыналежнасьць $3 да групаў',
+'logentry-rights-autopromote' => '$1 {{GENDER:$1|быў аўтаматычна пераведзены|была аўтаматычна пераведзеная}} з групы $4 ў $5',
 'rightsnone' => '(няма)',
 
 # Associated actions - in the sentence "You do not have permission to X"
@@ -2171,7 +2176,7 @@ $1',
 'linksearch-ok' => 'Шукаць',
 'linksearch-text' => 'Можна ўжываць сымбалі падстаноўкі, напрыклад, «*.wikipedia.org».<br />
 Неабходны дамэн першага ўзроўню, напрыклад, «*.org».<br />
-Пратаколы, якія падтрымліваюцца: <code>$1</code> (не дадавайце іх у Ваш пошук).',
+Пратаколы, якія падтрымліваюцца: <code>$1</code> (дапомна http://, калі пратакол не пазначаны).',
 'linksearch-line' => 'Спасылка на $1 з $2',
 'linksearch-error' => 'Сымбалі падстаноўкі могуць ужывацца толькі ў пачатку адрасоў.',
 
@@ -2217,11 +2222,11 @@ $1',
 'mailnologin' => 'Няма адрасу атрымальніка',
 'mailnologintext' => 'Вам неабходна [[Special:UserLogin|ўвайсьці ў сыстэму]] і мець пацьверджаны адрас электроннай пошты ў Вашых [[Special:Preferences|наладах]], каб дасылаць лісты іншым удзельнікам.',
 'emailuser' => 'Даслаць ліст',
-'emailuser-title-target' => 'Адправіць гэта па электроннай пошце  {{GENDER:$1|гэтаму ўдзельніку|гэтай удзельніцы}}',
+'emailuser-title-target' => 'Адправіць гэта па электроннай пошце {{GENDER:$1|гэтаму ўдзельніку|гэтай удзельніцы}}',
 'emailuser-title-notarget' => 'Даслаць ліст ўдзельніку ці ўдзельніцы па электроннай пошце',
 'emailpage' => 'Даслаць ліст ўдзельніку ці ўдзельніцы па электроннай пошце',
-'emailpagetext' => 'Вы можаце выкарыстоўваць форму ніжэй, каб даслаць гэтаму ўдзельніку ліст па электроннай пошце.
-Адрас электроннай пошты, які Вы пазначалі ў [[Special:Preferences|сваіх наладах]], будзе пазначаны ў полі ліста «Ад», і ўдзельнік зможа даслаць на гэты адрас адказ.',
+'emailpagetext' => 'Вы можаце выкарыстаць форму ніжэй, каб даслаць {{GENDER:$1|гэтаму ўдзельніку|гэтай удзельніцы}} ліст па электроннай пошце.
+Адрас электроннай пошты, які Вы пазначалі ў [[Special:Preferences|сваіх наладах]], будзе пазначаны ў полі ліста «Ад», і {{GENDER:$1|ўдзельнік|ўдзельніца}} зможа даслаць на гэты адрас адказ.',
 'usermailererror' => 'Пры адсыланьні пошты адбылася памылка:',
 'defemailsubject' => 'Ліст з {{GRAMMAR:родны|{{SITENAME}}}} ад {{GENDER:$1|удзельніка|удзельніцы}} «$1»',
 'usermaildisabled' => 'Электронная пошта ўдзельніка адключаная',
@@ -2516,7 +2521,7 @@ $1',
 # Contributions
 'contributions' => 'Унёсак',
 'contributions-title' => 'Унёсак {{GENDER:$1|удзельніка|удзельніцы}} $1',
-'mycontris' => 'Мой унёсак',
+'mycontris' => 'Унёсак',
 'contribsub2' => 'Для $1 ($2)',
 'nocontribs' => 'Ня знойдзена зьменаў, якія адпавядаюць гэтым крытэрыям.',
 'uctop' => ' (апошняя)',
@@ -3019,7 +3024,7 @@ $1',
 
 # Info page
 'pageinfo-title' => 'Інфармацыя пра «$1»',
-'pageinfo-not-current' => 'Інфармацыя паказываецца толькі для бягучай вэрсіі.',
+'pageinfo-not-current' => 'Даруйце, мы ня можам падаць гэтыя зьвесткі для старых вэрсіяў.',
 'pageinfo-header-basic' => 'Асноўныя зьвесткі',
 'pageinfo-header-edits' => 'Рэдагаваньні',
 'pageinfo-header-restrictions' => 'Абарона старонкі',
@@ -3028,6 +3033,7 @@ $1',
 'pageinfo-default-sort' => 'Перадвызначаны ключ сартаваньня',
 'pageinfo-length' => 'Памер старонкі (у байтах)',
 'pageinfo-article-id' => 'Ідэнтыфікатар старонкі',
+'pageinfo-language' => 'Мова зьместу старонкі',
 'pageinfo-robot-policy' => 'Індэксацыя пашукавікамі',
 'pageinfo-robot-index' => 'Індэксуецца',
 'pageinfo-robot-noindex' => 'Не індэксуецца',
@@ -3759,6 +3765,7 @@ $5
 'version-license' => 'Ліцэнзія',
 'version-poweredby-credits' => "{{SITENAME}} працуе на праграмным забесьпячэньні '''[//www.mediawiki.org/ MediaWiki]''', copyright © 2001-$1 $2.",
 'version-poweredby-others' => 'іншыя',
+'version-credits-summary' => 'Нам вельмі хацелася б адзначыць наступных асобаў, што зрабілі ўнёсак у [[Special:Version|MediaWiki]].',
 'version-license-info' => 'MediaWiki зьяўляецца вольным праграмным забесьпячэньнем, якое Вы можаце распаўсюджваць і/ці зьмяняць на ўмовах ліцэнзіі GNU General Public License вэрсіі 2 ці болей позьняй, апублікаванай Фундацыяй вольнага праграмнага забесьпячэньня (Free Software Foundation).
 
 MediaWiki распаўсюджваецца з надзеяй, што будзе карысным, але БЕЗ АНІЯКІХ ГАРАНТЫЯЎ, нават без меркаваных гарантыяў КАМЭРЦЫЙНАЙ КАШТОЎНАСЬЦІ ці ПРЫДАТНАСЬЦІ ДА ПЭЎНАЙ МЭТЫ. Глядзіце ліцэнзію GNU General Public License для болей падрабязных зьвестак.
diff --git a/languages/messages/MessagesBg.php b/languages/messages/MessagesBg.php
index f482ac3fea..eb69d432d5 100644
--- a/languages/messages/MessagesBg.php
+++ b/languages/messages/MessagesBg.php
@@ -48,98 +48,6 @@ $namespaceAliases = array(
 	'Картинка беседа' => NS_FILE_TALK,
 );
 
-
-$datePreferences = false;
-
-$bookstoreList = array(
-	'books.bg'   => 'http://www.books.bg/ISBN/$1',
-	'Пингвините' => 'http://www.pe-bg.com/?cid=3&search_q=$1&where=ISBN&x=0&y=0**',
-	'Бард'       => 'http://www.bard.bg/search/?q=$1'
-);
-
-$magicWords = array(
-	'redirect'                  => array( '0', '#пренасочване', '#виж', '#REDIRECT' ),
-	'notoc'                     => array( '0', '__БЕЗСЪДЪРЖАНИЕ__', '__NOTOC__' ),
-	'nogallery'                 => array( '0', '__БЕЗГАЛЕРИЯ__', '__NOGALLERY__' ),
-	'forcetoc'                  => array( '0', '__СЪССЪДЪРЖАНИЕ__', '__FORCETOC__' ),
-	'toc'                       => array( '0', '__СЪДЪРЖАНИЕ__', '__TOC__' ),
-	'noeditsection'             => array( '0', '__БЕЗ_РЕДАКТИРАНЕ_НА_РАЗДЕЛИ__', '__NOEDITSECTION__' ),
-	'currentmonth'              => array( '1', 'ТЕКУЩМЕСЕЦ', 'CURRENTMONTH', 'CURRENTMONTH2' ),
-	'currentmonth1'             => array( '1', 'ТЕКУЩМЕСЕЦ1', 'CURRENTMONTH1' ),
-	'currentmonthname'          => array( '1', 'ТЕКУЩМЕСЕЦИМЕ', 'CURRENTMONTHNAME' ),
-	'currentmonthnamegen'       => array( '1', 'ТЕКУЩМЕСЕЦИМЕРОД', 'CURRENTMONTHNAMEGEN' ),
-	'currentmonthabbrev'        => array( '1', 'ТЕКУЩМЕСЕЦСЪКР', 'CURRENTMONTHABBREV' ),
-	'currentday'                => array( '1', 'ТЕКУЩДЕН', 'CURRENTDAY' ),
-	'currentday2'               => array( '1', 'ТЕКУЩДЕН2', 'CURRENTDAY2' ),
-	'currentdayname'            => array( '1', 'ТЕКУЩДЕНИМЕ', 'CURRENTDAYNAME' ),
-	'currentyear'               => array( '1', 'ТЕКУЩАГОДИНА', 'CURRENTYEAR' ),
-	'currenttime'               => array( '1', 'ТЕКУЩОВРЕМЕ', 'CURRENTTIME' ),
-	'currenthour'               => array( '1', 'ТЕКУЩЧАС', 'CURRENTHOUR' ),
-	'numberofpages'             => array( '1', 'БРОЙСТРАНИЦИ', 'NUMBEROFPAGES' ),
-	'numberofarticles'          => array( '1', 'БРОЙСТАТИИ', 'NUMBEROFARTICLES' ),
-	'numberoffiles'             => array( '1', 'БРОЙФАЙЛОВЕ', 'NUMBEROFFILES' ),
-	'numberofusers'             => array( '1', 'БРОЙПОТРЕБИТЕЛИ', 'NUMBEROFUSERS' ),
-	'numberofactiveusers'       => array( '1', 'БРОЙАКТИВНИПОТРЕБИТЕЛИ', 'NUMBEROFACTIVEUSERS' ),
-	'numberofedits'             => array( '1', 'БРОЙРЕДАКЦИИ', 'NUMBEROFEDITS' ),
-	'numberofviews'             => array( '1', 'БРОЙПРЕГЛЕДИ', 'NUMBEROFVIEWS' ),
-	'pagename'                  => array( '1', 'СТРАНИЦА', 'PAGENAME' ),
-	'pagenamee'                 => array( '1', 'СТРАНИЦАИ', 'PAGENAMEE' ),
-	'namespace'                 => array( '1', 'ИМЕННОПРОСТРАНСТВО', 'NAMESPACE' ),
-	'namespacee'                => array( '1', 'ИМЕННОПРОСТРАНСТВОИ', 'NAMESPACEE' ),
-	'fullpagename'              => array( '1', 'ПЪЛНОИМЕ_СТРАНИЦА', 'FULLPAGENAME' ),
-	'fullpagenamee'             => array( '1', 'ПЪЛНОИМЕ_СТРАНИЦАИ', 'FULLPAGENAMEE' ),
-	'subpagename'               => array( '1', 'ИМЕ_ПОДСТРАНИЦА', 'SUBPAGENAME' ),
-	'subpagenamee'              => array( '1', 'ИМЕ_ПОДСТРАНИЦАИ', 'SUBPAGENAMEE' ),
-	'talkpagename'              => array( '1', 'ИМЕ_БЕСЕДА', 'TALKPAGENAME' ),
-	'talkpagenamee'             => array( '1', 'ИМЕ_БЕСЕДАИ', 'TALKPAGENAMEE' ),
-	'msg'                       => array( '0', 'СЪОБЩ:', 'MSG:' ),
-	'subst'                     => array( '0', 'ЗАМЕСТ:', 'SUBST:' ),
-	'msgnw'                     => array( '0', 'СЪОБЩБУ:', 'MSGNW:' ),
-	'img_thumbnail'             => array( '1', 'мини', 'thumbnail', 'thumb' ),
-	'img_manualthumb'           => array( '1', 'мини=$1', 'thumbnail=$1', 'thumb=$1' ),
-	'img_right'                 => array( '1', 'вдясно', 'дясно', 'д', 'right' ),
-	'img_left'                  => array( '1', 'вляво', 'ляво', 'л', 'left' ),
-	'img_none'                  => array( '1', 'н', 'none' ),
-	'img_width'                 => array( '1', '$1пкс', '$1п', '$1px' ),
-	'img_center'                => array( '1', 'център', 'центр', 'ц', 'center', 'centre' ),
-	'img_framed'                => array( '1', 'рамка', 'врамка', 'framed', 'enframed', 'frame' ),
-	'img_frameless'             => array( '1', 'безрамка', 'frameless' ),
-	'img_border'                => array( '1', 'ръб', 'контур', 'border' ),
-	'int'                       => array( '0', 'ВЪТР:', 'INT:' ),
-	'sitename'                  => array( '1', 'ИМЕНАСАЙТА', 'SITENAME' ),
-	'ns'                        => array( '0', 'ИП:', 'NS:' ),
-	'localurl'                  => array( '0', 'ЛОКАЛЕНАДРЕС:', 'LOCALURL:' ),
-	'localurle'                 => array( '0', 'ЛОКАЛЕНАДРЕСИ:', 'LOCALURLE:' ),
-	'server'                    => array( '0', 'СЪРВЪР', 'SERVER' ),
-	'servername'                => array( '0', 'ИМЕНАСЪРВЪРА', 'SERVERNAME' ),
-	'scriptpath'                => array( '0', 'ПЪТДОСКРИПТА', 'SCRIPTPATH' ),
-	'grammar'                   => array( '0', 'ГРАМАТИКА:', 'GRAMMAR:' ),
-	'gender'                    => array( '0', 'ПОЛ:', 'GENDER:' ),
-	'currentweek'               => array( '1', 'ТЕКУЩАСЕДМИЦА', 'CURRENTWEEK' ),
-	'currentdow'                => array( '1', 'ТЕКУЩ_ДЕН_ОТ_СЕДМИЦАТА', 'CURRENTDOW' ),
-	'revisionid'                => array( '1', 'ИД_НА_ВЕРСИЯТА', 'REVISIONID' ),
-	'revisionday'               => array( '1', 'ДЕН_НА_ВЕРСИЯТА', 'REVISIONDAY' ),
-	'revisionday2'              => array( '1', 'ДЕН_НА_ВЕРСИЯТА2', 'REVISIONDAY2' ),
-	'revisionmonth'             => array( '1', 'МЕСЕЦ_НА_ВЕРСИЯТА', 'REVISIONMONTH' ),
-	'revisionyear'              => array( '1', 'ГОДИНА_НА_ВЕРСИЯТА', 'REVISIONYEAR' ),
-	'plural'                    => array( '0', 'МН_ЧИСЛО:', 'PLURAL:' ),
-	'fullurl'                   => array( '0', 'ПЪЛЕН_АДРЕС:', 'FULLURL:' ),
-	'fullurle'                  => array( '0', 'ПЪЛЕН_АДРЕСИ:', 'FULLURLE:' ),
-	'lcfirst'                   => array( '0', 'МБПЪРВА:', 'LCFIRST:' ),
-	'ucfirst'                   => array( '0', 'ГБПЪРВА:', 'UCFIRST:' ),
-	'lc'                        => array( '0', 'МБ:', 'LC:' ),
-	'uc'                        => array( '0', 'ГБ:', 'UC:' ),
-	'raw'                       => array( '0', 'НЕОБРАБ:', 'RAW:' ),
-	'displaytitle'              => array( '1', 'ПОКАЗВ_ЗАГЛАВИЕ', 'DISPLAYTITLE' ),
-	'newsectionlink'            => array( '1', '__ВРЪЗКА_ЗА_НОВ_РАЗДЕЛ__', '__NEWSECTIONLINK__' ),
-	'language'                  => array( '0', '#ЕЗИК:', '#LANGUAGE:' ),
-	'numberofadmins'            => array( '1', 'БРОЙАДМИНИСТРАТОРИ', 'NUMBEROFADMINS' ),
-	'defaultsort'               => array( '1', 'СОРТКАТ:', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:' ),
-	'hiddencat'                 => array( '1', '__СКРИТАКАТЕГОРИЯ__', '__HIDDENCAT__' ),
-	'index'                     => array( '1', '__ИНДЕКСИРАНЕ__', '__INDEX__' ),
-	'noindex'                   => array( '1', '__БЕЗИНДЕКСИРАНЕ__', '__NOINDEX__' ),
-);
-
 $specialPageAliases = array(
 	'Activeusers'               => array( 'Активни_потребители' ),
 	'Allmessages'               => array( 'Системни_съобщения' ),
@@ -232,6 +140,97 @@ $specialPageAliases = array(
 	'Withoutinterwiki'          => array( 'Без_междууикита' ),
 );
 
+$magicWords = array(
+	'redirect'                  => array( '0', '#пренасочване', '#виж', '#REDIRECT' ),
+	'notoc'                     => array( '0', '__БЕЗСЪДЪРЖАНИЕ__', '__NOTOC__' ),
+	'nogallery'                 => array( '0', '__БЕЗГАЛЕРИЯ__', '__NOGALLERY__' ),
+	'forcetoc'                  => array( '0', '__СЪССЪДЪРЖАНИЕ__', '__FORCETOC__' ),
+	'toc'                       => array( '0', '__СЪДЪРЖАНИЕ__', '__TOC__' ),
+	'noeditsection'             => array( '0', '__БЕЗ_РЕДАКТИРАНЕ_НА_РАЗДЕЛИ__', '__NOEDITSECTION__' ),
+	'currentmonth'              => array( '1', 'ТЕКУЩМЕСЕЦ', 'CURRENTMONTH', 'CURRENTMONTH2' ),
+	'currentmonth1'             => array( '1', 'ТЕКУЩМЕСЕЦ1', 'CURRENTMONTH1' ),
+	'currentmonthname'          => array( '1', 'ТЕКУЩМЕСЕЦИМЕ', 'CURRENTMONTHNAME' ),
+	'currentmonthnamegen'       => array( '1', 'ТЕКУЩМЕСЕЦИМЕРОД', 'CURRENTMONTHNAMEGEN' ),
+	'currentmonthabbrev'        => array( '1', 'ТЕКУЩМЕСЕЦСЪКР', 'CURRENTMONTHABBREV' ),
+	'currentday'                => array( '1', 'ТЕКУЩДЕН', 'CURRENTDAY' ),
+	'currentday2'               => array( '1', 'ТЕКУЩДЕН2', 'CURRENTDAY2' ),
+	'currentdayname'            => array( '1', 'ТЕКУЩДЕНИМЕ', 'CURRENTDAYNAME' ),
+	'currentyear'               => array( '1', 'ТЕКУЩАГОДИНА', 'CURRENTYEAR' ),
+	'currenttime'               => array( '1', 'ТЕКУЩОВРЕМЕ', 'CURRENTTIME' ),
+	'currenthour'               => array( '1', 'ТЕКУЩЧАС', 'CURRENTHOUR' ),
+	'numberofpages'             => array( '1', 'БРОЙСТРАНИЦИ', 'NUMBEROFPAGES' ),
+	'numberofarticles'          => array( '1', 'БРОЙСТАТИИ', 'NUMBEROFARTICLES' ),
+	'numberoffiles'             => array( '1', 'БРОЙФАЙЛОВЕ', 'NUMBEROFFILES' ),
+	'numberofusers'             => array( '1', 'БРОЙПОТРЕБИТЕЛИ', 'NUMBEROFUSERS' ),
+	'numberofactiveusers'       => array( '1', 'БРОЙАКТИВНИПОТРЕБИТЕЛИ', 'NUMBEROFACTIVEUSERS' ),
+	'numberofedits'             => array( '1', 'БРОЙРЕДАКЦИИ', 'NUMBEROFEDITS' ),
+	'numberofviews'             => array( '1', 'БРОЙПРЕГЛЕДИ', 'NUMBEROFVIEWS' ),
+	'pagename'                  => array( '1', 'СТРАНИЦА', 'PAGENAME' ),
+	'pagenamee'                 => array( '1', 'СТРАНИЦАИ', 'PAGENAMEE' ),
+	'namespace'                 => array( '1', 'ИМЕННОПРОСТРАНСТВО', 'NAMESPACE' ),
+	'namespacee'                => array( '1', 'ИМЕННОПРОСТРАНСТВОИ', 'NAMESPACEE' ),
+	'fullpagename'              => array( '1', 'ПЪЛНОИМЕ_СТРАНИЦА', 'FULLPAGENAME' ),
+	'fullpagenamee'             => array( '1', 'ПЪЛНОИМЕ_СТРАНИЦАИ', 'FULLPAGENAMEE' ),
+	'subpagename'               => array( '1', 'ИМЕ_ПОДСТРАНИЦА', 'SUBPAGENAME' ),
+	'subpagenamee'              => array( '1', 'ИМЕ_ПОДСТРАНИЦАИ', 'SUBPAGENAMEE' ),
+	'talkpagename'              => array( '1', 'ИМЕ_БЕСЕДА', 'TALKPAGENAME' ),
+	'talkpagenamee'             => array( '1', 'ИМЕ_БЕСЕДАИ', 'TALKPAGENAMEE' ),
+	'msg'                       => array( '0', 'СЪОБЩ:', 'MSG:' ),
+	'subst'                     => array( '0', 'ЗАМЕСТ:', 'SUBST:' ),
+	'msgnw'                     => array( '0', 'СЪОБЩБУ:', 'MSGNW:' ),
+	'img_thumbnail'             => array( '1', 'мини', 'thumbnail', 'thumb' ),
+	'img_manualthumb'           => array( '1', 'мини=$1', 'thumbnail=$1', 'thumb=$1' ),
+	'img_right'                 => array( '1', 'вдясно', 'дясно', 'д', 'right' ),
+	'img_left'                  => array( '1', 'вляво', 'ляво', 'л', 'left' ),
+	'img_none'                  => array( '1', 'н', 'none' ),
+	'img_width'                 => array( '1', '$1пкс', '$1п', '$1px' ),
+	'img_center'                => array( '1', 'център', 'центр', 'ц', 'center', 'centre' ),
+	'img_framed'                => array( '1', 'рамка', 'врамка', 'framed', 'enframed', 'frame' ),
+	'img_frameless'             => array( '1', 'безрамка', 'frameless' ),
+	'img_border'                => array( '1', 'ръб', 'контур', 'border' ),
+	'int'                       => array( '0', 'ВЪТР:', 'INT:' ),
+	'sitename'                  => array( '1', 'ИМЕНАСАЙТА', 'SITENAME' ),
+	'ns'                        => array( '0', 'ИП:', 'NS:' ),
+	'localurl'                  => array( '0', 'ЛОКАЛЕНАДРЕС:', 'LOCALURL:' ),
+	'localurle'                 => array( '0', 'ЛОКАЛЕНАДРЕСИ:', 'LOCALURLE:' ),
+	'server'                    => array( '0', 'СЪРВЪР', 'SERVER' ),
+	'servername'                => array( '0', 'ИМЕНАСЪРВЪРА', 'SERVERNAME' ),
+	'scriptpath'                => array( '0', 'ПЪТДОСКРИПТА', 'SCRIPTPATH' ),
+	'grammar'                   => array( '0', 'ГРАМАТИКА:', 'GRAMMAR:' ),
+	'gender'                    => array( '0', 'ПОЛ:', 'GENDER:' ),
+	'currentweek'               => array( '1', 'ТЕКУЩАСЕДМИЦА', 'CURRENTWEEK' ),
+	'currentdow'                => array( '1', 'ТЕКУЩ_ДЕН_ОТ_СЕДМИЦАТА', 'CURRENTDOW' ),
+	'revisionid'                => array( '1', 'ИД_НА_ВЕРСИЯТА', 'REVISIONID' ),
+	'revisionday'               => array( '1', 'ДЕН_НА_ВЕРСИЯТА', 'REVISIONDAY' ),
+	'revisionday2'              => array( '1', 'ДЕН_НА_ВЕРСИЯТА2', 'REVISIONDAY2' ),
+	'revisionmonth'             => array( '1', 'МЕСЕЦ_НА_ВЕРСИЯТА', 'REVISIONMONTH' ),
+	'revisionyear'              => array( '1', 'ГОДИНА_НА_ВЕРСИЯТА', 'REVISIONYEAR' ),
+	'plural'                    => array( '0', 'МН_ЧИСЛО:', 'PLURAL:' ),
+	'fullurl'                   => array( '0', 'ПЪЛЕН_АДРЕС:', 'FULLURL:' ),
+	'fullurle'                  => array( '0', 'ПЪЛЕН_АДРЕСИ:', 'FULLURLE:' ),
+	'lcfirst'                   => array( '0', 'МБПЪРВА:', 'LCFIRST:' ),
+	'ucfirst'                   => array( '0', 'ГБПЪРВА:', 'UCFIRST:' ),
+	'lc'                        => array( '0', 'МБ:', 'LC:' ),
+	'uc'                        => array( '0', 'ГБ:', 'UC:' ),
+	'raw'                       => array( '0', 'НЕОБРАБ:', 'RAW:' ),
+	'displaytitle'              => array( '1', 'ПОКАЗВ_ЗАГЛАВИЕ', 'DISPLAYTITLE' ),
+	'newsectionlink'            => array( '1', '__ВРЪЗКА_ЗА_НОВ_РАЗДЕЛ__', '__NEWSECTIONLINK__' ),
+	'language'                  => array( '0', '#ЕЗИК:', '#LANGUAGE:' ),
+	'numberofadmins'            => array( '1', 'БРОЙАДМИНИСТРАТОРИ', 'NUMBEROFADMINS' ),
+	'defaultsort'               => array( '1', 'СОРТКАТ:', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:' ),
+	'hiddencat'                 => array( '1', '__СКРИТАКАТЕГОРИЯ__', '__HIDDENCAT__' ),
+	'index'                     => array( '1', '__ИНДЕКСИРАНЕ__', '__INDEX__' ),
+	'noindex'                   => array( '1', '__БЕЗИНДЕКСИРАНЕ__', '__NOINDEX__' ),
+);
+
+$datePreferences = false;
+
+$bookstoreList = array(
+	'books.bg'   => 'http://www.books.bg/ISBN/$1',
+	'Пингвините' => 'http://www.pe-bg.com/?cid=3&search_q=$1&where=ISBN&x=0&y=0**',
+	'Бард'       => 'http://www.bard.bg/search/?q=$1'
+);
+
 $linkTrail = '/^([a-zабвгдежзийклмнопрстуфхцчшщъыьэюя]+)(.*)$/sDu';
 
 $separatorTransformTable = array( ',' => "\xc2\xa0", '.' => ',' );
diff --git a/languages/messages/MessagesBh.php b/languages/messages/MessagesBh.php
index 4720033e8c..bd16422ae0 100644
--- a/languages/messages/MessagesBh.php
+++ b/languages/messages/MessagesBh.php
@@ -91,7 +91,6 @@ $messages = array(
 'qbbrowse' => 'ब्राउज',
 'qbedit' => 'सम्पादन',
 'qbpageoptions' => 'ई पन्ना',
-'qbpageinfo' => 'प्रसंग',
 'qbmyoptions' => 'हमार पन्ना',
 'qbspecialpages' => 'विशेष पन्ना',
 'faq' => 'साधारण सवाल',
diff --git a/languages/messages/MessagesBho.php b/languages/messages/MessagesBho.php
index 094e2ac84a..9c3612e3e3 100644
--- a/languages/messages/MessagesBho.php
+++ b/languages/messages/MessagesBho.php
@@ -126,7 +126,6 @@ $messages = array(
 'qbbrowse' => 'ब्राउज',
 'qbedit' => 'सम्पादन',
 'qbpageoptions' => 'ई पन्ना',
-'qbpageinfo' => 'प्रसंग',
 'qbmyoptions' => 'हमार पन्ना',
 'qbspecialpages' => 'विशेष पन्ना',
 'faq' => 'साधारण सवाल',
diff --git a/languages/messages/MessagesBjn.php b/languages/messages/MessagesBjn.php
index 6d72aae080..c4b7111546 100644
--- a/languages/messages/MessagesBjn.php
+++ b/languages/messages/MessagesBjn.php
@@ -114,7 +114,6 @@ $specialPageAliases = array(
 	'Recentchanges'             => array( 'Paubahan_pahanyarnya' ),
 	'Recentchangeslinked'       => array( 'Paubahan_tarait' ),
 	'Revisiondelete'            => array( 'Hapus_ralatan' ),
-	'RevisionMove'              => array( 'Ralatan_pamindahan' ),
 	'Search'                    => array( 'Panggagaian' ),
 	'Shortpages'                => array( 'Tungkaran_handap' ),
 	'Specialpages'              => array( 'Tungkaran_istimiwa' ),
diff --git a/languages/messages/MessagesBn.php b/languages/messages/MessagesBn.php
index c7c2654b24..b08cce1004 100644
--- a/languages/messages/MessagesBn.php
+++ b/languages/messages/MessagesBn.php
@@ -116,7 +116,7 @@ $messages = array(
 
 'underline-always' => 'সব সময়',
 'underline-never' => 'কখনো নয়',
-'underline-default' => 'ব্রাউজারে যেমনভাবে নির্দিষ্ট করা আছে',
+'underline-default' => 'স্কিন অথবা ব্রাউজারে যেমনভাবে নির্দিষ্ট করা আছে',
 
 # Font style option in Special:Preferences
 'editfont-style' => 'সম্পাদনা এলাকার ফন্ট স্টাইল:',
@@ -336,7 +336,7 @@ $1',
 'newmessagesdifflinkplural' => '$1 {{PLURAL:$1|পরিবর্তন|পরিবর্তনসমূহ}}',
 'youhavenewmessagesmulti' => 'আপনার $1টি নতুন বার্তা এসেছে',
 'editsection' => 'সম্পাদনা',
-'editold' => 'সম্পাদনা করুন',
+'editold' => 'সম্পাদনা',
 'viewsourceold' => 'উৎস দেখাও',
 'editlink' => 'সম্পাদনা',
 'viewsourcelink' => 'উৎস দেখুন',
@@ -487,7 +487,7 @@ $2',
 'yourdomainname' => 'আপনার ডোমেইন',
 'password-change-forbidden' => 'আপনি এই উইকিতে পাসওয়ার্ড পরিবর্তন করতে পারবেন না।',
 'externaldberror' => 'হয় কোন বহিঃস্থ যাচাইকরণ ডাটাবেজ ত্রুটি ঘটেছে অথবা আপনার বহিঃস্থ অ্যাকাউন্ট হালনাগাদ করার অনুমতি নেই।',
-'login' => 'প্রবেশ করুন',
+'login' => 'প্রবেশ',
 'nav-login-createaccount' => 'প্রবেশ/নতুন অ্যাকাউন্ট',
 'loginprompt' => '{{SITENAME}}-তে প্রবেশ করতে হলে আপনার ব্রাউজারের কুকি অবশ্যই সক্রিয় করতে হবে।',
 'userlogin' => 'প্রবেশ/নতুন অ্যাকাউন্ট',
@@ -496,7 +496,7 @@ $2',
 'userlogout' => 'প্রস্থান',
 'notloggedin' => 'আপনি সংযুক্ত নন',
 'nologin' => "আপনার কি উইকিপিডিয়াতে অ্যাকাউন্ট নেই? তাহলে '''$1'''।",
-'nologinlink' => 'নতুন অ্যাকাউন্ট খুলুন',
+'nologinlink' => 'অ্যাকাউন্ট তৈরি করুন',
 'createaccount' => 'নতুন অ্যাকাউন্ট খুলুন',
 'gotaccount' => "আপনার কি ইতিমধ্যে একটি অ্যাকাউন্ট তৈরি করা আছে? '''$1''' করুন।",
 'gotaccountlink' => 'প্রবেশ',
@@ -653,7 +653,7 @@ $2
 'hr_tip' => 'অনুভূমিক রেখা (সংযতভাবে ব্যবহার করুন)',
 
 # Edit pages
-'summary' => 'সম্পাদনা সারাংশ:',
+'summary' => 'সারাংশ:',
 'subject' => 'বিষয়/শিরোনাম:',
 'minoredit' => 'অনুল্লেখ্য',
 'watchthis' => 'এই পাতাটি নজরে রাখুন',
@@ -751,7 +751,7 @@ $1 নিষেধাজ্ঞা আরোপ করেছেন। নিষ
 'note' => "'''নোট:'''",
 'previewnote' => "'''খেয়াল করুন, এটি একটি প্রাকদর্শন মাত্র।'''
 আপনার পরিবর্তন এখনও সংরক্ষণ করা হয়নি!",
-'continue-editing' => 'সম্পাদনা চালিয়ে যান',
+'continue-editing' => 'সম্পাদনা করুন',
 'previewconflict' => 'এই প্রাকদর্শনটি সম্পাদনা ক্ষেত্রের উপরের অংশটির টেক্সট সংরক্ষণ করলে যেরকম দেখাবে, তা দেখাচ্ছে।',
 'session_fail_preview' => "'''দুঃখিত! সেশন ডাটা হারিয়ে যাওয়ার কারণে আপনার সম্পাদনাটি সংরক্ষণ করা সম্ভব হয়নি। দয়া করে লেখাটি আবার জমা দেয়ার চেষ্টা করুন। যদি এতেও কাজ না হয়, তবে অ্যাকাউন্ট থেকে বেরিয়ে গিয়ে আবার অ্যাকাউন্টে প্রবেশ করে চেষ্টা করুন।'''",
 'session_fail_preview_html' => "'''দুঃখিত! সেশন উপাত্ত হারিয়ে যাওয়ার কারণে আমরা আপনার সম্পাদনাটি প্রক্রিয়া করতে পারিনি।'''
@@ -1166,7 +1166,7 @@ $1",
 'prefs-help-recentchangescount' => 'এতে সাম্প্রতিক পরিবর্তনসমূহ, পাতার ইতিহাস এবং লগ অন্তর্ভুক্ত।',
 'prefs-help-watchlist-token' => 'এই ঘরটি একটি গোপন শব্দ চাবি দ্বারা পূরণ করলে আপনার নজর তালিকার জন্য একটি আরএসএস ফিড তৈরী হবে। যারা এই ঘরের চাবি জানবে তারা আপনার নজর তালিকা দেখতে পারবে, তাই একটি গোপন মান ব্যবহার করুন। এখানে এলোমেলোভাবে তৈরী একটি মান দেখানো হয়েছে যা আপনি ব্যবহার করতে পারেন: $1',
 'savedprefs' => 'আপনার পছন্দগুলো সংরক্ষণ করা হয়েছে।',
-'timezonelegend' => 'সময় বলয়:',
+'timezonelegend' => 'সময়স্থান:',
 'localtime' => 'স্থানীয় সময়:',
 'timezoneuseserverdefault' => 'উইকির পূর্বনির্ধারিত সময় ব্যবহার করো ($1)',
 'timezoneuseoffset' => 'অন্য (অফসেট নির্দিষ্ট করুন)',
@@ -1884,7 +1884,7 @@ Maybe you want to edit the description on its [$2 file description page] there.'
 'listusers-editsonly' => 'শুধুমাত্র এমন ব্যবহারকারীদের দেখাও যাদের অবদান আছে',
 'listusers-creationsort' => 'তৈরির তারিখ অনুসারে সাজাও',
 'usereditcount' => '$1 {{PLURAL:$1|সম্পাদনা|সম্পাদনা}}',
-'usercreated' => 'লিঙ্গ: $3 তৈরি হয়েছে $1 তারিখে, সময়: $2',
+'usercreated' => '{{GENDER:$3|তৈরি হয়েছে}} $1 তারিখ, সময়: $2',
 'newpages' => 'নতুন পাতাসমূহ',
 'newpages-username' => 'ব্যবহারকারী নাম:',
 'ancientpages' => 'পুরানো নিবন্ধ',
@@ -1970,7 +1970,7 @@ Maybe you want to edit the description on its [$2 file description page] there.'
 
 # Special:ListUsers
 'listusersfrom' => 'সেই সব ব্যবহারকারী দেখাও যাদের নাম এই অক্ষর দিয়ে শুরু:',
-'listusers-submit' => 'দেখানো হোক',
+'listusers-submit' => 'দেখাও',
 'listusers-noresult' => 'কোন ব্যবহারকারী খুঁজে পাওয়া যায়নি।',
 'listusers-blocked' => '(ব্লককৃত)',
 
@@ -2013,8 +2013,8 @@ Maybe you want to edit the description on its [$2 file description page] there.'
 'emailuser-title-target' => '{{GENDER:$1|ব্যবহারকারীকে}} ইমেইল পাঠান',
 'emailuser-title-notarget' => 'ব্যবহারকারীকে ই-মেইল করুন',
 'emailpage' => 'ব্যবহারকারীকে ই-মেইল করুন',
-'emailpagetext' => 'আপনি নিচের ফর্মটি ব্যবহার করে এই ব্যবহারকারীকে একটি ই-মেইল পাঠাতে পারেন।
-আপনি [[Special:Preferences|আপনার ব্যবহারকারী পছন্দে]] যে ই-মেইল ঠিকানাটি প্রবেশ করিয়েছেন সেটিকে ই-মেইলের প্রেরক হিসেবে দেখানো হবে, যেনো মেইলের প্রাপক আপনাকে উত্তর দিতে পারেন।',
+'emailpagetext' => "আপনি নিচের ফর্মটি ব্যবহার করে এই {{GENDER:$1|ব্যবহারকারীকে}} একটি ই-মেইল পাঠাতে পারেন।
+আপনি [[Special:Preferences|আপনার ব্যবহারকারী পছন্দে]] যে ই-মেইল ঠিকানাটি প্রবেশ করিয়েছেন সেটিকে ই-মেইলের ''প্রেরক'' হিসেবে দেখানো হবে, যেনো মেইলের প্রাপক আপনাকে উত্তর দিতে পারেন।",
 'usermailererror' => 'মেইল অবজেক্ট ত্রুটি পাঠিয়েছে:',
 'defemailsubject' => '{{SITENAME}} ব্যবহারকারী "$1" প্রেরিত ইমেইল',
 'usermaildisabled' => 'ব্যবহারকারী ই-মেইল নিস্ক্রিয়',
@@ -2273,7 +2273,8 @@ $UNWATCHURL
 'undeletedrevisions' => '{{PLURAL:$1|১টি সংশোধন|$1টি সংশোধন}} পুনরুদ্ধার করা হয়েছে',
 'undeletedrevisions-files' => '{{PLURAL:$1|১টি সংশোধন|$1টি সংশোধন}} এবং {{PLURAL:$2|১টি ফাইল|$2টি ফাইল}} পুনরুদ্ধার করা হয়েছে',
 'undeletedfiles' => '{{PLURAL:$1|১টি ফাইল|$1টি ফাইল}} পুনরুদ্ধার করা হয়েছে',
-'cannotundelete' => 'মুছে ফেলা বাতিল করা যায়নি; অন্য কেউ হয়ত আগেই পাতাটি মুছে ফেলা বাতিল করেছেন।',
+'cannotundelete' => 'মুছে ফেলা বাতিল করা যায়নি:
+$1',
 'undeletedpage' => "'''$1 পুনরুদ্ধার করা হয়েছে'''
 
 সাম্প্রতিক মুছে ফেলা ও পুনরুদ্ধারের ঘটনাগুলির জন্য [[Special:Log/delete|অবলুপ্তি লগ]] দেখুন।",
@@ -2328,7 +2329,7 @@ $1',
 তথ্যসূত্র হিসেবে সাম্প্রতিক বাধাদান লগের ভুক্তিটি নিচে দেওয়া হলো:',
 'sp-contributions-search' => 'অবদানসমূহের জন্য অনুসন্ধান',
 'sp-contributions-username' => 'আইপি (IP) ঠিকানা অথবা ব্যবহারকারীর নাম:',
-'sp-contributions-toponly' => 'শুধুমাত্র সেই সম্পাদনাগুলি দেখেও যেগুলো সাম্প্রতিক সংস্করণের অন্তর্ভুক্ত।',
+'sp-contributions-toponly' => 'শুধুমাত্র সেই সম্পাদনাগুলি দেখাও যেগুলো সাম্প্রতিক সংস্করণের অন্তর্ভুক্ত।',
 'sp-contributions-submit' => 'অনুসন্ধান',
 
 # What links here
@@ -2391,6 +2392,7 @@ $1',
 'blockipsuccesstext' => '[[Special:Contributions/$1|$1]] কে বাধা দেয়া হয়েছে।<br />
 বাধা দেয়া পুনর্বিবেচনা করতে হলে [[Special:BlockList|বাধা দেয়া তালিকা]] দেখুন।',
 'ipb-blockingself' => 'আপনি নিজেকেই বাধাপ্রদান করতে যাচ্ছেন! আপনি কী নিশ্চিত যে আপনি এটি-ই করতে চান?',
+'ipb-confirmhideuser' => '"hide user" ক্ষমতার মাধ্যমে আপনি একজন ব্যবহারকারীকে বাধা দিতে যাচ্ছেন। এর মাধ্যমে এই ব্যবহারকারীর নাম সকল লিস্ট এবং লগএন্ট্রি থেকে সরিয়ে ফেলা হবে। আপনি কি নিশ্চিতভাবে এটি করতে চান?',
 'ipb-edit-dropdown' => 'বাধাদানের কারণ সম্পাদনা করুন',
 'ipb-unblock-addr' => '$1-এর উপর থেকে বাধা তুলে নেওয়া হোক',
 'ipb-unblock' => 'ব্যবহারকারী বা আইপি ঠিকানার উপর থেকে বাধা তুলে নেওয়া হোক',
@@ -2439,6 +2441,7 @@ $1',
 'blocklog-showsuppresslog' => 'এই ব্যবহারকারীকে পূর্বেও বাধা প্রদান ও লুকানো হয়েছিলো।
 তথ্যসূত্র হিসেবে তাই পূর্বের অপসারণ লগটি নিচে প্রদর্শন করা হচ্ছে:',
 'blocklogentry' => '[[$1]]এর উপর $2 $3 মেয়াদের জন্য নিষেধাজ্ঞা আরোপিত হয়েছে।',
+'reblock-logentry' => '[[$1]] এর ব্লক সেটিং পরিবর্তন করা হয়েছে যেটি শেষ হবে $2 $3 সময়ে',
 'blocklogtext' => 'এটি ব্যবহারকারীদেরকে বাধা দানের বা বাধা তুলে নেওয়ার লগ।
 স্বয়ংক্রিয়ভাবে বাধাদানকৃত আইপি ঠিকানাগুলি এখানে তালিকাবদ্ধ করা হয়নি।
 বর্তমানে সক্রিয় নিষিদ্ধকরণ ও বাধাদানের তালিকার জন্য [[Special:BlockList| বাধাদান তালিকা]] দেখুন।',
@@ -2453,6 +2456,7 @@ $1',
 'range_block_disabled' => 'প্রশাসকের পক্ষে আইপি ঠিকানার শ্রেণী বাধাদানের ক্ষমতা নিষ্ক্রিয় আছে।',
 'ipb_expiry_invalid' => 'মেয়াদোত্তীর্ণকাল অবৈধ।',
 'ipb_expiry_temp' => 'লুকানো ব্যবহারকারীনাম বাধা চিরস্থায়ী হতে হবে।',
+'ipb_hide_invalid' => 'এই অ্যাকাউন্ট বাধা দেয়া সম্ভব নয়; হয়তো সম্পাদনার সংখ্যা অনেক বেশি।',
 'ipb_already_blocked' => '"$1" ইতিমধ্যে ব্লক',
 'ipb-needreblock' => '$1 পূর্বেই ব্লক রয়েছেন। আপনি কি সেটিংস পরিবর্তন করতে চান?',
 'ipb-otherblocks-header' => 'অন্যান্য {{PLURAL:$1|বাধাঁ|বাধাঁসমূহ}}',
@@ -2526,6 +2530,7 @@ $1',
 'pagemovedsub' => 'সরিয়ে নেওয়া হয়েছে',
 'movepage-moved' => '\'\'\'"$1"-কে "$2" শিরোনামে স্থানান্তর করা হয়েছে\'\'\'',
 'movepage-moved-redirect' => 'একটি পুনর্নির্দেশনা তৈরি হয়েছে।',
+'movepage-moved-noredirect' => 'রিডাইরেক্ট তৈরীতে বাধা দেয়া হয়েছে।',
 'articleexists' => 'হয় এই শিরোনামের একটি নিবন্ধ ইতোমধ্যে সৃষ্টি হযে গেছে, অথবা আপনি যে শিরোনামটি পছন্দ করেছেন তা গ্রহণযোগ্য নয়। দয়া করে অন্য একটি শিরোনাম দিয়ে চেষ্টা করুন।',
 'cantmove-titleprotected' => 'আপনি এই অবস্থানে পাতাটিকে স্থানান্তর করতে পারেন না, কারণ এই নতুন শিরোনামটি সৃষ্টি করা থেকে সুরক্ষিত।',
 'talkexists' => "'''পাতাটি সফলভাবে সরানো গেলেও আলোচনা পাতাটিকে সরানো যায়নি, কারণ নতুন শিরোনামের অধীনে ইতিমধ্যেই একটি আলোচনা পাতা বিদ্যমান। অনুগ্রহ নিজের হাতে এগুলিকে একত্র করুন।'''",
@@ -2566,6 +2571,10 @@ $1',
 আপনার সুবিধার্থে পাতাটির সাম্প্রতিক সংরক্ষণ লগের বিবরণ নিচে দেওয়া হলো।",
 'semiprotectedpagemovewarning' => "'''নোট:''' এই পাতাটির ব্যবহার নিয়ন্ত্রণ করা হয়েছে তাই নিবন্ধনকৃত ব্যবহারকারী এটি স্থানান্তর করতে পারবেন।
 আপনার সুবিধার্থে পাতাটির সাম্প্রতিক সংরক্ষণ লগের বিবরণ নিচে দেওয়া হলো:",
+'move-over-sharedrepo' => '== এই নামের ফাইল রয়েছে ==
+[[:$1]] নামের ফাইলটি শেয়ার্ড রিপোজিটরীতে রয়েছে। একই নামের একটি ফাইল এখানে স্থানান্তর করা হলে পূর্বের ফাইলটি প্রতিস্থাপিত হবে।',
+'file-exists-sharedrepo' => 'নির্ধিত নামের ফাইলটি পূর্বেই শেয়ার্ড রিপোজিরটীতে রয়েছে। 
+অনুগ্রহ করে অন্য কোনো নাম নির্বাচন করুন।',
 
 # Export
 'export' => 'পাতা রপ্তানি',
@@ -2579,7 +2588,7 @@ $1',
 'exportnohistory' => "----
 '''লক্ষ্য করুন:''' কর্মদক্ষতা-সম্পর্কিত কারণের জন্য এই ফর্মের মাধ্যমে কোন পাতার সমগ্র ইতিহাস রপ্তানি করা নিষ্ক্রিয় করা হয়েছে।",
 'exportlistauthors' => 'প্রতি পাতার অবদানকারীর একটি পূর্ণাঙ্গ তালিকা যুক্ত হবে',
-'export-submit' => 'রপ্তানি করা হোক',
+'export-submit' => 'রপ্তানি',
 'export-addcattext' => 'এই বিষয়শ্রেণী থেকে পাতা যোগ করা হোক:',
 'export-addcat' => 'যোগ',
 'export-addnstext' => 'নামস্থান থেকে পাতা যুক্ত করুন:',
@@ -2785,6 +2794,7 @@ $1',
 'pageinfo-default-sort' => 'ডিফল্ট সর্ট কি',
 'pageinfo-length' => 'পাতার দৈর্ঘ্য (বাইটে)',
 'pageinfo-article-id' => 'পাতার আইডি',
+'pageinfo-language' => 'পাতার তথ্যের ভাষা',
 'pageinfo-robot-policy' => 'সার্চ ইঞ্জিনের অবস্থা',
 'pageinfo-robot-index' => 'ইনডেক্স উপযোগী',
 'pageinfo-robot-noindex' => 'ইনডেক্সের অনুপযোগী',
@@ -2804,6 +2814,12 @@ $1',
 'pageinfo-magic-words' => 'ম্যাজিক {{PLURAL:$1|শব্দ|শব্দসমূহ}} ($1)',
 'pageinfo-hidden-categories' => 'লুকানো {{PLURAL:$1|বিষয়শ্রেণী|বিষয়শ্রেণীসমূহ}} ($1)',
 'pageinfo-templates' => 'সংযুক্ত {{PLURAL:$1|টেমপ্লেট|টেমপ্লেটসমূহ}} ($1)',
+'pageinfo-toolboxlink' => 'পাতার তথ্য',
+'pageinfo-redirectsto' => 'পুননির্দেশিত হয়েছে',
+'pageinfo-redirectsto-info' => 'তথ্য',
+'pageinfo-contentpage' => 'তথ্য পাতা হিসাবে বিবেচিত হয়েছে',
+'pageinfo-contentpage-yes' => 'হ্যাঁ',
+'pageinfo-protect-cascading-yes' => 'হ্যাঁ',
 
 # Patrolling
 'markaspatrolleddiff' => 'পরীক্ষিত বলে চিহ্নিত করুন',
@@ -3386,7 +3402,7 @@ $4-এ নিশ্চিতকরণ কোডটি মেয়াদোত
 'size-gigabytes' => '$1 গিগাবাইট',
 
 # Live preview
-'livepreview-loading' => 'লোডিং…',
+'livepreview-loading' => 'লোডিং...',
 'livepreview-ready' => 'লোডিং… প্রস্তুত!',
 'livepreview-failed' => 'তাৎক্ষণিক প্রাকদর্শন কাজ করছে না! সাধারণ প্রাকদর্শন চেষ্টা করুন।',
 'livepreview-error' => 'সংযোগ প্রদানে সম্ভব নয়: $1 "$2"। সাধারণ প্রাকদর্শন চেষ্টা করুণ।',
diff --git a/languages/messages/MessagesBo.php b/languages/messages/MessagesBo.php
index af935e9925..b9a145c08b 100644
--- a/languages/messages/MessagesBo.php
+++ b/languages/messages/MessagesBo.php
@@ -143,7 +143,6 @@ $messages = array(
 'qbfind' => 'འཚོལ་བ།',
 'qbedit' => 'རྩོམ་སྒྲིག',
 'qbpageoptions' => 'ཤོག་ངོས་འདི།',
-'qbpageinfo' => 'འབྲེལ་ཆགས།',
 'qbmyoptions' => 'ངའི་ཤོག་ངོས།',
 'qbspecialpages' => 'དམིཊ་བསལ་གྱི་བཟོ་བཅོས།',
 'faq' => 'རྒྱུན་ལྡན་དྲི་བ།',
diff --git a/languages/messages/MessagesBpy.php b/languages/messages/MessagesBpy.php
index 1cfff22378..d09c6793a4 100644
--- a/languages/messages/MessagesBpy.php
+++ b/languages/messages/MessagesBpy.php
@@ -13,19 +13,6 @@
 
 $fallback = 'bn';
 
-$digitTransformTable = array(
-	'0' => '০',
-	'1' => '১',
-	'2' => '২',
-	'3' => '৩',
-	'4' => '৪',
-	'5' => '৫',
-	'6' => '৬',
-	'7' => '৭',
-	'8' => '৮',
-	'9' => '৯'
-);
-
 $namespaceNames = array(
 	NS_MEDIA            => 'মিডিয়া',
 	NS_SPECIAL          => 'বিশেষ',
@@ -45,6 +32,19 @@ $namespaceNames = array(
 	NS_CATEGORY_TALK    => 'থাকর_য়্যারী',
 );
 
+$digitTransformTable = array(
+	'0' => '০',
+	'1' => '১',
+	'2' => '২',
+	'3' => '৩',
+	'4' => '৪',
+	'5' => '৫',
+	'6' => '৬',
+	'7' => '৭',
+	'8' => '৮',
+	'9' => '৯'
+);
+
 $messages = array(
 # User preference toggles
 'tog-underline' => 'লিঙ্কর তলে দুরগ দিক:',
@@ -190,7 +190,6 @@ $messages = array(
 'qbbrowse' => 'বুলিয়া চা',
 'qbedit' => 'পতানি',
 'qbpageoptions' => 'পাতা এহানর সারুক',
-'qbpageinfo' => 'পাতা এহানর পৌ',
 'qbmyoptions' => 'মর পছন',
 'qbspecialpages' => 'বিশেষ পাতাহানি',
 'faq' => 'আঙলাক',
diff --git a/languages/messages/MessagesBr.php b/languages/messages/MessagesBr.php
index 390c926c42..b9cb6da0af 100644
--- a/languages/messages/MessagesBr.php
+++ b/languages/messages/MessagesBr.php
@@ -227,7 +227,7 @@ $messages = array(
 
 'underline-always' => 'Atav',
 'underline-never' => 'Morse',
-'underline-default' => 'Diouzh ar merdeer',
+'underline-default' => 'Merdeer dre ziouer',
 
 # Font style option in Special:Preferences
 'editfont-style' => 'Stil font an takad skridaozañ :',
@@ -864,7 +864,7 @@ Dindan emañ merket moned diwezhañ marilh ar stankadennoù, d'ho kelaouiñ :",
 'note' => "'''Notenn :'''",
 'previewnote' => "'''Diwallit mat, n'eus ken ur rakweled eus an destenn-mañ.'''
 N'eo ket bet enrollet ho kemmoù evit c'hoazh !",
-'continue-editing' => "Kenderc'hel da gemmañ",
+'continue-editing' => "Mont d'an takad kemmañ",
 'previewconflict' => 'Gant ar rakweled e teu testenn ar bajenn war wel evel ma vo pa vo bet enrollet.',
 'session_fail_preview' => "'''Ho tigarez! N'eus ket bet tu da enrollañ ho kemmoù rak kollet eo bet roadennoù an dalc'h.'''
 Klaskit en-dro mar plij.
@@ -939,6 +939,15 @@ Diverket eo bet evit doare.',
 'edit-already-exists' => "N'eus ket bet gallet krouiñ ur bajenn nevez.
 Krouet e oa bet c'hoazh.",
 'defaultmessagetext' => 'Testenn dre ziouer',
+'content-failed-to-parse' => "C'hwitet eo dielfennadur endalc'had $2 evit ar patrom $1: $3",
+'invalid-content-data' => "n'eo ket mat roadennoù an endalc'had",
+'content-not-allowed-here' => 'N\'eo ket aotreet an endalc\'had "$1" er bajenn [[$2]]',
+
+# Content models
+'content-model-wikitext' => 'wikitestenn',
+'content-model-text' => 'testenn blaen',
+'content-model-javascript' => 'Javascript',
+'content-model-css' => 'CSS',
 
 # Parser/template warnings
 'expensive-parserfunction-warning' => "Diwallit : Re a c'halvoù koustus e-keñver an arc'hwelioù parser zo gant ar bajenn-mañ.
@@ -1844,7 +1853,7 @@ Marteze a-walc'h e fell deoc'h kemmañ an deskrivadur anezhi war ar [$2 bajenn d
 'uploadnewversion-linktext' => 'Kargañ ur stumm nevez eus ar restr-mañ',
 'shared-repo-from' => 'eus $1',
 'shared-repo' => 'ur sanailh rannet',
-'upload-disallowed-here' => "Siwazh, ne c'hallit ket erlec'hiañ ar skeudenn-mañ",
+'upload-disallowed-here' => "Ne c'hallit ket erlec'hiañ ar restr-mañ",
 
 # File reversion
 'filerevert' => 'Disteuler $1',
@@ -2082,7 +2091,7 @@ Gwelet ivez ar [[Special:WantedCategories|rummadoù goulennet a vank]].',
 'linksearch-ok' => 'Klask',
 'linksearch-text' => 'Gallout a reer implijout arouezennoù "joker" evel, da skouer, "*.wikipedia.org".
 Rekis eo dezho un domani a-us da nebeutañ evel, da skouer, "*.org".<br />
-Protokoloù skoret : <code>$1</code> (na lakait hini ebet eus ar re-se en ho klask)',
+Protokoloù skoret : <code>$1</code> (defaults to http:// na lakait hini ebet eus ar re-se en ho klask)',
 'linksearch-line' => '$1 gant ul liamm adal $2',
 'linksearch-error' => "N'hall an arouezennoù joker bezañ implijet nemet e deroù anv domani an ostiz.",
 
@@ -2464,7 +2473,7 @@ Dindan emañ merket enmont diwezhañ marilh ar stankadennoù, d'ho kelaouiñ :",
 'whatlinkshere-hideredirs' => '$1 adkas',
 'whatlinkshere-hidetrans' => '$1 treuzkluzadur',
 'whatlinkshere-hidelinks' => '$1 liamm',
-'whatlinkshere-hideimages' => '$1 liamm skeudennoù',
+'whatlinkshere-hideimages' => '$1 ar restroù liammet',
 'whatlinkshere-filters' => 'Siloù',
 
 # Block/unblock
@@ -2944,6 +2953,7 @@ Sur a-walc'h abalamour d'ul liamm enni a gas d'ul lec'hienn ziavaez berzet.",
 
 # Info page
 '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',
 'pageinfo-header-edits' => 'Kemmoù',
 'pageinfo-header-restrictions' => 'Gwarez ar bajenn',
@@ -2971,6 +2981,11 @@ Sur a-walc'h abalamour d'ul liamm enni a gas d'ul lec'hienn ziavaez berzet.",
 'pageinfo-magic-words' => '{{PLURAL:$1|Ger hud |Gerioù hud}} ($1)',
 'pageinfo-hidden-categories' => '{{PLURAL:$1|Rumm kuzh|Rummoù kuzh}} ($1)',
 'pageinfo-templates' => "{{PLURAL:$1|Patrom endalc'het|Patromoù endalc'het}} ($1)",
+'pageinfo-toolboxlink' => 'Titouroù ar bajenn',
+'pageinfo-redirectsto' => 'Adkas a ra da',
+'pageinfo-redirectsto-info' => 'Titouroù',
+'pageinfo-contentpage-yes' => 'Ya',
+'pageinfo-protect-cascading-yes' => 'Ya',
 
 # Skin names
 'skinname-standard' => 'Standard',
diff --git a/languages/messages/MessagesBs.php b/languages/messages/MessagesBs.php
index ff0a8a40ad..5c702723ba 100644
--- a/languages/messages/MessagesBs.php
+++ b/languages/messages/MessagesBs.php
@@ -115,7 +115,6 @@ $specialPageAliases = array(
 	'Recentchanges'             => array( 'NedavneIzmjene' ),
 	'Recentchangeslinked'       => array( 'PovezaneNedavneIzmjene' ),
 	'Revisiondelete'            => array( 'VratiBrisanje' ),
-	'RevisionMove'              => array( 'PremjestanjeRevizije' ),
 	'Search'                    => array( 'Pretraga' ),
 	'Shortpages'                => array( 'KratkeStranice' ),
 	'Specialpages'              => array( 'SpecijalneStranice' ),
@@ -153,7 +152,6 @@ $magicWords = array(
 	'forcetoc'                  => array( '0', '__FORSIRANISADRŽAJ__', '__FORCETOC__' ),
 	'toc'                       => array( '0', '__SADRŽAJ__', '__TOC__' ),
 	'noeditsection'             => array( '0', '__BEZ_IZMJENA__', '__BEZIZMJENA__', '__NOEDITSECTION__' ),
-	'noheader'                  => array( '0', '__BEZ_ZAGLAVLJA__', '__NOHEADER__' ),
 	'currentmonth'              => array( '1', 'TRENUTNIMJESEC', 'CURRENTMONTH', 'CURRENTMONTH2' ),
 	'currentmonth1'             => array( '1', 'TRENUTNIMJESEC1', 'CURRENTMONTH1' ),
 	'currentmonthname'          => array( '1', 'TRENUTNIMJESECIME', 'CURRENTMONTHNAME' ),
@@ -544,7 +542,9 @@ $1',
 'newmessageslink' => 'novih poruka',
 'newmessagesdifflink' => 'posljednja promjena',
 'youhavenewmessagesfromusers' => 'Imate $1 od {{PLURAL:$3|drugog korisnika|$3 korisnika}} ($2).',
+'youhavenewmessagesmanyusers' => 'Imate $1 od mnogo korisnika ($2).',
 'newmessageslinkplural' => '{{PLURAL:$1|novu poruku|nove poruke}}',
+'newmessagesdifflinkplural' => '{{PLURAL:$1|zadnja izmjena|zadnje izmjene}}',
 'youhavenewmessagesmulti' => 'Imate nove poruke na $1',
 'editsection' => 'uredi',
 'editsection-brackets' => '[$1]',
@@ -657,8 +657,8 @@ Pretraga: $2',
 'protectedinterface' => 'Ova stranica sadrži tekst korisničkog okruženja za softver na ovom wikiju i zaštićena je radi sprečavanja zloupotrebe.
 Da biste dodali ili izmjenili prijevode svih wikija, posjetite [//translatewiki.net/  translatewiki.net], projekat za lokalizaciju Mediawikija.',
 'editinginterface' => "'''Upozorenje:''' Mijenjate stranicu koja sadrži aktivan tekst programa.
-Promjene na ovoj stranici dovode i do promjena za druge korisnike.
-Za prijevode, molimo Vas koristite [//translatewiki.net/wiki/Main_Page?setlang=bs translatewiki.net], projekt prijevoda za MediaWiki.",
+Promjene na ovoj stranici dovode i do promjena za druge korisnike ovog wikija.
+Za dodavanje ili promjene prijevoda svih wikija, molimo Vas koristite [//translatewiki.net/ translatewiki.net], projekt prijevoda za MediaWiki.",
 'sqlhidden' => '(SQL pretraga sakrivena)',
 'cascadeprotected' => 'Uređivanje ove stranice je zabranjeno jer sadrži {{PLURAL:$1|stranicu zaštićenu|stranice zaštićene}} od uređivanja iz razloga:
 $2',
@@ -2362,6 +2362,8 @@ nastavite s oprezom.',
 'rollback' => 'Vrati izmjene',
 'rollback_short' => 'Vrati',
 'rollbacklink' => 'vrati',
+'rollbacklinkcount' => 'vrati $1 {{PLURAL:$1|izmjenu|izmjene|izmjena}}',
+'rollbacklinkcount-morethan' => 'vrati više od $1 {{PLURAL:$1|izmjene|izmjene|izmjena}}',
 'rollbackfailed' => 'Vraćanje nije uspjelo',
 'cantrollback' => 'Ne može se vratiti izmjena; posljednji 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 drugi je već izmjenio ili vratio članak.
@@ -3030,13 +3032,17 @@ Ovo je vjerovatno izazvao vezom ka vanjskoj nepoželjnoj stranici.',
 
 # Info page
 'pageinfo-title' => 'Informacije za "$1"',
+'pageinfo-header-basic' => 'Osnovne informacije',
 'pageinfo-header-edits' => 'Izmjene',
 'pageinfo-header-restrictions' => 'Zaštita stranice',
 'pageinfo-article-id' => 'ID stranice',
 'pageinfo-views' => 'Broj pogleda',
 'pageinfo-watchers' => 'Broj onih koji pregledaju',
-'pageinfo-edits' => 'Broj izmjena',
-'pageinfo-authors' => 'Broj različitih autora',
+'pageinfo-edits' => 'Ukupan broj izmjena',
+'pageinfo-authors' => 'Ukupan broj različitih autora',
+'pageinfo-redirectsto-info' => 'Informacije',
+'pageinfo-contentpage-yes' => 'Da',
+'pageinfo-protect-cascading-yes' => 'Da',
 
 # Skin names
 'skinname-standard' => 'Klasično',
diff --git a/languages/messages/MessagesBug.php b/languages/messages/MessagesBug.php
index c4003b0dd4..8a797d31aa 100644
--- a/languages/messages/MessagesBug.php
+++ b/languages/messages/MessagesBug.php
@@ -12,7 +12,7 @@
  * @author Zaidpjd (on bug.wikipedia.org)
  */
 
-$fallback = "id";
+$fallback = 'id';
 
 $messages = array(
 # Dates
diff --git a/languages/messages/MessagesCa.php b/languages/messages/MessagesCa.php
index 98010ff267..f19cb10981 100644
--- a/languages/messages/MessagesCa.php
+++ b/languages/messages/MessagesCa.php
@@ -37,12 +37,6 @@
  * @author לערי ריינהארט
  */
 
-$bookstoreList = array(
-	'Catàleg Col·lectiu de les Universitats de Catalunya' => 'http://ccuc.cbuc.es/cgi-bin/vtls.web.gateway?searchtype=control+numcard&searcharg=$1',
-	'Totselsllibres.com' => 'http://www.totselsllibres.com/tel/publi/busquedaAvanzadaLibros.do?ISBN=$1',
-	'inherit' => true,
-);
-
 $namespaceNames = array(
 	NS_MEDIA            => 'Media',
 	NS_SPECIAL          => 'Especial',
@@ -67,39 +61,6 @@ $namespaceAliases = array(
 	'Imatge_Discussió' => NS_FILE_TALK,
 );
 
-$separatorTransformTable = array( ',' => '.', '.' => ',' );
-
-$dateFormats = array(
-	'mdy time' => 'H:i',
-	'mdy date' => 'M j, Y',
-	'mdy both' => 'H:i, M j, Y',
-
-	'dmy time' => 'H:i',
-	'dmy date' => 'j M Y',
-	'dmy both' => 'H:i, j M Y',
-
-	'ymd time' => 'H:i',
-	'ymd date' => 'Y M j',
-	'ymd both' => 'H:i, Y M j',
-);
-
-$magicWords = array(
-	'numberofarticles'          => array( '1', 'NOMBRED\'ARTICLES', 'NUMBEROFARTICLES' ),
-	'numberoffiles'             => array( '1', 'NOMBRED\'ARXIUS', 'NUMBEROFFILES' ),
-	'numberofusers'             => array( '1', 'NOMBRED\'USUARIS', 'NUMBEROFUSERS' ),
-	'numberofedits'             => array( '1', 'NOMBRED\'EDICIONS', 'NUMBEROFEDITS' ),
-	'pagename'                  => array( '1', 'NOMDELAPLANA', 'PAGENAME' ),
-	'img_right'                 => array( '1', 'dreta', 'right' ),
-	'img_left'                  => array( '1', 'esquerra', 'left' ),
-	'img_border'                => array( '1', 'vora', 'border' ),
-	'img_link'                  => array( '1', 'enllaç=$1', 'link=$1' ),
-	'displaytitle'              => array( '1', 'TÍTOL', 'DISPLAYTITLE' ),
-	'language'                  => array( '0', '#IDIOMA:', '#LANGUAGE:' ),
-	'special'                   => array( '0', 'especial', 'special' ),
-	'defaultsort'               => array( '1', 'ORDENA:', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:' ),
-	'pagesize'                  => array( '1', 'MIDADELAPLANA', 'PAGESIZE' ),
-);
-
 $specialPageAliases = array(
 	'Activeusers'               => array( 'Usuaris_actius' ),
 	'Allmessages'               => array( 'Missatges', 'MediaWiki' ),
@@ -161,7 +122,6 @@ $specialPageAliases = array(
 	'Recentchanges'             => array( 'Canvis_recents' ),
 	'Recentchangeslinked'       => array( 'Seguiment' ),
 	'Revisiondelete'            => array( 'Esborra_versió' ),
-	'RevisionMove'              => array( 'Mou_versió' ),
 	'Search'                    => array( 'Cerca' ),
 	'Shortpages'                => array( 'Pàgines_curtes' ),
 	'Specialpages'              => array( 'Pàgines_especials' ),
@@ -191,6 +151,45 @@ $specialPageAliases = array(
 	'Withoutinterwiki'          => array( 'Sense_interwiki' ),
 );
 
+$magicWords = array(
+	'numberofarticles'          => array( '1', 'NOMBRED\'ARTICLES', 'NUMBEROFARTICLES' ),
+	'numberoffiles'             => array( '1', 'NOMBRED\'ARXIUS', 'NUMBEROFFILES' ),
+	'numberofusers'             => array( '1', 'NOMBRED\'USUARIS', 'NUMBEROFUSERS' ),
+	'numberofedits'             => array( '1', 'NOMBRED\'EDICIONS', 'NUMBEROFEDITS' ),
+	'pagename'                  => array( '1', 'NOMDELAPLANA', 'PAGENAME' ),
+	'img_right'                 => array( '1', 'dreta', 'right' ),
+	'img_left'                  => array( '1', 'esquerra', 'left' ),
+	'img_border'                => array( '1', 'vora', 'border' ),
+	'img_link'                  => array( '1', 'enllaç=$1', 'link=$1' ),
+	'displaytitle'              => array( '1', 'TÍTOL', 'DISPLAYTITLE' ),
+	'language'                  => array( '0', '#IDIOMA:', '#LANGUAGE:' ),
+	'special'                   => array( '0', 'especial', 'special' ),
+	'defaultsort'               => array( '1', 'ORDENA:', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:' ),
+	'pagesize'                  => array( '1', 'MIDADELAPLANA', 'PAGESIZE' ),
+);
+
+$separatorTransformTable = array( ',' => '.', '.' => ',' );
+
+$dateFormats = array(
+	'mdy time' => 'H:i',
+	'mdy date' => 'M j, Y',
+	'mdy both' => 'H:i, M j, Y',
+
+	'dmy time' => 'H:i',
+	'dmy date' => 'j M Y',
+	'dmy both' => 'H:i, j M Y',
+
+	'ymd time' => 'H:i',
+	'ymd date' => 'Y M j',
+	'ymd both' => 'H:i, Y M j',
+);
+
+$bookstoreList = array(
+	'Catàleg Col·lectiu de les Universitats de Catalunya' => 'http://ccuc.cbuc.es/cgi-bin/vtls.web.gateway?searchtype=control+numcard&searcharg=$1',
+	'Totselsllibres.com' => 'http://www.totselsllibres.com/tel/publi/busquedaAvanzadaLibros.do?ISBN=$1',
+	'inherit' => true,
+);
+
 $linkTrail = "/^((?:[a-zàèéíòóúç·ïü]|'(?!'))+)(.*)$/sDu";
 
 $messages = array(
@@ -243,7 +242,7 @@ $messages = array(
 
 'underline-always' => 'Sempre',
 'underline-never' => 'Mai',
-'underline-default' => 'Configuració per defecte del navegador',
+'underline-default' => 'Per defecte del navegador',
 
 # Font style option in Special:Preferences
 'editfont-style' => "Editeu l'estil de la lletra:",
@@ -375,7 +374,7 @@ $messages = array(
 'updatedmarker' => 'actualitzat des de la darrera visita',
 'printableversion' => 'Versió per a impressora',
 'permalink' => 'Enllaç permanent',
-'print' => "Envia aquesta pàgina a la cua d'impressió",
+'print' => 'Imprimir',
 'view' => 'Mostra',
 'edit' => 'Modifica',
 'create' => 'Crea',
@@ -725,12 +724,12 @@ Deveu haver canviat la vostra contrasenya o demanat una nova contrasenya tempora
 'passwordreset-capture-help' => "Si marqueu aquesta casella, el missatge de correu electrònic (amb la contrasenya temporal) es mostrarà al mateix moment que sigui enviat a l'usuari.",
 'passwordreset-email' => 'Adreça de correu electrònic:',
 'passwordreset-emailtitle' => 'Detalls del compte a {{SITENAME}}',
-'passwordreset-emailtext-ip' => "Algú (vós mateix segurament, des de l'adreça IP $1) ha demanat un recordatori dels detalls dels vostres comptes 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:
+'passwordreset-emailtext-ip' => "Algú (vós mateix segurament, des de l'adreça IP $1) ha demanat un recordatori dels detalls dels vostres comptes 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:
 
 $2
 
 {{PLURAL:$3|Aquesta contrasenya temporal caducarà|Aquestes contrasenyes temporals caducaran}} en {{PLURAL:$5|un dia|$5 dies}}.
-Hauríeu d'entrar {{PLURAL:$3|al compte per a fixar-hi una nova contrasenya|als comptes per a fixar-hi noves contrasenyes}} 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.",
+Haurí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 un recordatori dels detalls dels vostres comptes 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:
 
 $2
@@ -872,7 +871,7 @@ Per més detalls, la darrera entrada del registre es mostra a continuació:",
 'note' => "'''Nota:'''",
 'previewnote' => "'''Recorda que això és només una previsualització.'''
 Els vostres canvis encara no s'han desat!",
-'continue-editing' => "Continua l'edició",
+'continue-editing' => "Aneu a l'àrea d'edició",
 'previewconflict' => "Aquesta previsualització reflecteix, a l'àrea
 d'edició superior, el text tal i com apareixerà si trieu desar-lo.",
 'session_fail_preview' => "'''No s'ha pogut processar la vostra modificació a causa d'una pèrdua de dades de la sessió.
@@ -958,6 +957,7 @@ Ja existeix.",
 'content-not-allowed-here' => 'No és permés el contingut "$1" a la pàgina [[$2]]',
 
 # Content models
+'content-model-wikitext' => 'wikitext',
 'content-model-text' => 'text net',
 'content-model-javascript' => 'JavaScript',
 'content-model-css' => 'CSS',
@@ -1716,7 +1716,7 @@ $1',
 'backend-fail-internal' => "S'ha produït un error desconegut en el fitxer de rerefons d'emmagatzemament «$1».",
 'backend-fail-contenttype' => 'No es pot determinar el tipus de contingut del fitxer per emmagatzemar a «$1».',
 'backend-fail-batchsize' => "El rerefons d'emmagatzemament ha rebut un lot {{PLURAL:$1|d'$1 operació|de $1 operacions}} de fitxer; el límit és $2 {{PLURAL:$2|operació|operacions}}.",
-'backend-fail-usable' => "No s'ha pogut escriure el fitxer $1 a causa de permisos insuficients o perquè hi manquen directoris/contenidors.",
+'backend-fail-usable' => 'No s\'ha pogut llegir ni escriure el fitxer "$1" a causa de permisos insuficients o perquè hi manquen directoris/contenidors.',
 
 # File journal errors
 'filejournal-fail-dbconnect' => 'No es pot connectar amb la base de dades per emmagatzemar el backend "$1".',
@@ -1954,6 +1954,7 @@ Les entrades <del>ratllades</del> s\'han resolt.',
 # Miscellaneous special pages
 'nbytes' => '$1 {{PLURAL:$1|octet|octets}}',
 'ncategories' => '$1 {{PLURAL:$1|categoria|categories}}',
+'ninterwikis' => '$1 {{PLURAL:$1|interwiki|interwikis}}',
 'nlinks' => '$1 {{PLURAL:$1|enllaç|enllaços}}',
 'nmembers' => '$1 {{PLURAL:$1|membre|membres}}',
 'nrevisions' => '$1 {{PLURAL:$1|revisió|revisions}}',
@@ -2508,8 +2509,8 @@ quines pàgines en concret estan sent vandalitzades).",
 'ipb-confirm' => 'Confirma el blocatge',
 'badipaddress' => "L'adreça IP no té el format correcte.",
 'blockipsuccesssub' => "S'ha blocat amb èxit",
-'blockipsuccesstext' => "[[Special:Contributions/$1|$1]] ha estat {{GENDER:$1|bloquejat|bloquejada|bloquejat/da}}.<br />
-Vegeu la [[Special:BlockList|llista d'IP blocades]] per revisar els bloqueigs.",
+'blockipsuccesstext' => '[[Special:Contributions/$1|$1]] ha estat {{GENDER:$1|blocat|blocada}}.<br />
+Vegeu la [[Special:BlockList|llista de bloqueigs]] per revisar-los.',
 'ipb-blockingself' => 'Esteu a punt de blocar-vos a vós mateix! Esteu segurs de voler-ho fer?',
 'ipb-confirmhideuser' => "Esteu a punt de bloquejar un usuari que està marcat amb l'opció «amaga l'usuari». Això suprimirà el seu nom a totes les llistes i registres. Esteu segurs de voler-ho fer?",
 'ipb-edit-dropdown' => 'Edita les raons per a blocar',
@@ -2698,6 +2699,7 @@ La pàgina de destinació, «[[:$1]]», ja existeix. Voleu eliminar-la per a fer
 'immobile-target-namespace-iw' => "No es poden moure pàgines a l'enllaç interwiki",
 'immobile-source-page' => 'Aquesta pàgina no es pot moure.',
 'immobile-target-page' => 'No es pot moure cap a una destinació amb aquest títol.',
+'bad-target-model' => 'El destí desitjat utilitza un model de contingut diferent. No es pot convertir de $1 a $2.',
 'imagenocrossnamespace' => 'No es pot moure la imatge a un espai de noms on no li correspon',
 'nonfile-cannot-move-to-file' => 'No es pot moure la imatge a un espai de noms on no li correspon',
 'imagetypemismatch' => 'La nova extensió de fitxer no coincideix amb el seu tipus',
@@ -2933,7 +2935,7 @@ Això deu ser degut per un enllaç a un lloc extern inclòs a la llista negra.',
 
 # Info page
 'pageinfo-title' => 'Informació de «$1»',
-'pageinfo-not-current' => 'Només es pot visualitzar la informació per a la revisió actual.',
+'pageinfo-not-current' => 'Només es pot visualitzar la informació de la revisió actual.',
 'pageinfo-header-basic' => 'Informació bàsica',
 'pageinfo-header-edits' => "Historial d'edicions",
 'pageinfo-header-restrictions' => 'Protecció de pàgina',
@@ -2943,17 +2945,32 @@ Això deu ser degut per un enllaç a un lloc extern inclòs a la llista negra.',
 'pageinfo-length' => 'Mida de la pàgina (en bytes)',
 'pageinfo-article-id' => 'ID de la pàgina',
 'pageinfo-robot-policy' => 'Estat del motor de cerca',
+'pageinfo-robot-index' => 'Indexable',
+'pageinfo-robot-noindex' => 'No indexable',
 'pageinfo-views' => 'Número de visites',
 'pageinfo-watchers' => "Número d'usuaris que vigilen la pàgina",
+'pageinfo-redirects-name' => 'Redireccions a aquesta pàgina',
+'pageinfo-subpages-name' => "Subpàgines d'aquesta pàgina",
+'pageinfo-subpages-value' => '$1 ($2 {{PLURAL:$2|redirecció|redireccions}}; $3 {{PLURAL:$3|no redireció|no redireccions}})',
 'pageinfo-firstuser' => 'Creador de la pàgina',
 'pageinfo-firsttime' => 'Data de la creació de la pàgina',
 'pageinfo-lastuser' => 'Últim editor',
 'pageinfo-lasttime' => "Data de l'última edició",
 'pageinfo-edits' => "Número total d'edicions",
 'pageinfo-authors' => "Número total d'autors diferents",
+'pageinfo-recent-edits' => "Número d'edicions recents (en els darrers $1)",
+'pageinfo-recent-authors' => "Número recent d'autors diferents",
+'pageinfo-magic-words' => '{{PLURAL:$1|Paraula clau|Paraules clau}} ($1)',
+'pageinfo-hidden-categories' => '{{PLURAL:$1|Categoria oculta|Categories ocultes}} ($1)',
+'pageinfo-templates' => '{{PLURAL:$1|plantilla inclosa|plantilles incloses}} ($1)',
 'pageinfo-toolboxlink' => 'Informació de la pàgina',
+'pageinfo-redirectsto' => 'Redirigeix a',
+'pageinfo-redirectsto-info' => 'info',
+'pageinfo-contentpage' => 'Comptat com una pàgina de contingut',
 'pageinfo-contentpage-yes' => 'Sí',
+'pageinfo-protect-cascading' => "Proteccions en cascada des d'aquí",
 'pageinfo-protect-cascading-yes' => 'Sí',
+'pageinfo-protect-cascading-from' => 'Proteccions en cascada des de',
 
 # Skin names
 'skinname-standard' => 'Clàssic',
@@ -3002,6 +3019,7 @@ Si l'executeu, podeu comprometre la seguretat del vostre sistema.",
 'file-info-size-pages' => '$1 × $2 píxels, mida del fitxer: $3, tipus MIME: $4, $5 {{PLURAL:$5|pàgina|pàgines}}',
 'file-nohires' => 'No hi ha cap versió amb una resolució més gran.',
 'svg-long-desc' => 'fitxer SVG, nominalment $1 × $2 píxels, mida del fitxer: $3',
+'svg-long-desc-animated' => 'Fitxer SVG animat, nominalment $1 × $2 píxels, mida del fitxer: $3',
 'show-big-image' => 'Imatge en màxima resolució',
 'show-big-image-preview' => "Mida d'aquesta previsualització: $1.",
 'show-big-image-other' => '{{PLURAL:$2|Altra resolució|Altres resolucions}}: $1.',
@@ -3011,6 +3029,8 @@ Si l'executeu, podeu comprometre la seguretat del vostre sistema.",
 'file-info-png-looped' => 'embuclat',
 'file-info-png-repeat' => "s'ha reproduït $1 {{PLURAL:$1|vegada|vegades}}",
 'file-info-png-frames' => '$1 {{PLURAL:$1|fotograma|fotogrames}}',
+'file-no-thumb-animation' => "'''Nota: degut a limitacions tècniques no s'animaran les miniatures per aquest fitxer.'''",
+'file-no-thumb-animation-gif' => "''' Nota: degut a limitacions tècniques no s'animaran les miniatures d'alta resolució d'imatges GIF com aquesta.'''",
 
 # Special:NewFiles
 'newimages' => 'Galeria de nous fitxers',
diff --git a/languages/messages/MessagesCe.php b/languages/messages/MessagesCe.php
index 94a9203b38..239094d8f7 100644
--- a/languages/messages/MessagesCe.php
+++ b/languages/messages/MessagesCe.php
@@ -68,7 +68,6 @@ $magicWords = array(
 	'forcetoc'                  => array( '0', '__ТlЕДУЬЛЛУ_ЧУЛАЦАМБАР__', '__ТlЕДУЬЛ_ЧУЛ__', '__ОБЯЗАТЕЛЬНОЕ_ОГЛАВЛЕНИЕ__', '__ОБЯЗ_ОГЛ__', '__FORCETOC__' ),
 	'toc'                       => array( '0', '__ЧУЛАЦАМ__', '__ЧУЛ__', '__ОГЛАВЛЕНИЕ__', '__ОГЛ__', '__TOC__' ),
 	'noeditsection'             => array( '0', '__ЦАМЕГ_РЕДАККХА_АГlОН__', '__БЕЗ_РЕДАКТИРОВАНИЯ_РАЗДЕЛА__', '__NOEDITSECTION__' ),
-	'noheader'                  => array( '0', '__КОЬРТА_ЙОЦАШ__', '__БЕЗ_ЗАГОЛОВКА__', '__NOHEADER__' ),
 	'currentmonth'              => array( '1', 'КАРАРА_БУТТ', 'КАРАРА_БУТТ_2', 'ТЕКУЩИЙ_МЕСЯЦ', 'ТЕКУЩИЙ_МЕСЯЦ_2', 'CURRENTMONTH', 'CURRENTMONTH2' ),
 	'currentmonth1'             => array( '1', 'КАРАРА_БУТТ_1', 'ТЕКУЩИЙ_МЕСЯЦ_1', 'CURRENTMONTH1' ),
 	'currentmonthname'          => array( '1', 'КАРАРАЧУ_БЕТТА_ЦlЕ', 'НАЗВАНИЕ_ТЕКУЩЕГО_МЕСЯЦА', 'CURRENTMONTHNAME' ),
@@ -165,7 +164,7 @@ $magicWords = array(
 	'revisionmonth'             => array( '1', 'БЕТТА_БАШХО', 'МЕСЯЦ_ВЕРСИИ', 'REVISIONMONTH' ),
 	'revisionyear'              => array( '1', 'ШО_БАШХО', 'ГОД_ВЕРСИИ', 'REVISIONYEAR' ),
 	'revisiontimestamp'         => array( '1', 'КЪАСТАМ_ХЕНА_БАШХО', 'ОТМЕТКА_ВРЕМЕНИ_ВЕРСИИ', 'REVISIONTIMESTAMP' ),
-	'revisionuser'              => array( '1', 'ДЕКЪАШХОН_БАШХО', 'ВЕРСИЯ_УЧАСНИКА', 'REVISIONUSER' ),
+	'revisionuser'              => array( '1', 'ДЕКЪАШХОН_БАШХО', 'ВЕРСИЯ_УЧАСНИКА', 'ВЕРСИЯ_УЧАСТНИКА', 'REVISIONUSER' ),
 	'plural'                    => array( '0', 'ДУКХАЛЛИН_ТЕРАХЬ:', 'МНОЖЕСТВЕННОЕ_ЧИСЛО:', 'PLURAL:' ),
 	'fullurl'                   => array( '0', 'МАЙАРРА_МЕТТИГ:', 'ПОЛНЫЙ_АДРЕС:', 'FULLURL:' ),
 	'fullurle'                  => array( '0', 'МАЙАРРА_МЕТТИГ_2:', 'ПОЛНЫЙ_АДРЕС_2:', 'FULLURLE:' ),
@@ -355,7 +354,6 @@ $messages = array(
 'qbbrowse' => 'Хьажар',
 'qbedit' => 'Нисйé',
 'qbpageoptions' => 'Агlо нисйар',
-'qbpageinfo' => 'Агlонах болу бовзам',
 'qbmyoptions' => 'Хьан нисдарш',
 'qbspecialpages' => 'Леррина агlонаш',
 'faq' => 'СиХХ',
diff --git a/languages/messages/MessagesCeb.php b/languages/messages/MessagesCeb.php
index 62aaf29629..f54587102a 100644
--- a/languages/messages/MessagesCeb.php
+++ b/languages/messages/MessagesCeb.php
@@ -208,7 +208,6 @@ $messages = array(
 'qbbrowse' => 'Browse',
 'qbedit' => 'Usba',
 'qbpageoptions' => 'Kini nga panid',
-'qbpageinfo' => 'Konteksto',
 'qbmyoptions' => 'Akong mga panid',
 'qbspecialpages' => 'Mga espesyal nga panid',
 'faq' => 'FAQ',
diff --git a/languages/messages/MessagesCh.php b/languages/messages/MessagesCh.php
index f05a9e02c6..cfdfe0c0d7 100644
--- a/languages/messages/MessagesCh.php
+++ b/languages/messages/MessagesCh.php
@@ -146,7 +146,6 @@ $messages = array(
 'qbbrowse' => 'Atan',
 'qbedit' => 'Tulaika',
 'qbpageoptions' => 'Este na pahina',
-'qbpageinfo' => 'Kontekstu',
 'qbmyoptions' => 'PÃ¥hina-hu siha',
 'qbspecialpages' => 'Manespesiat na påhina',
 
diff --git a/languages/messages/MessagesCkb.php b/languages/messages/MessagesCkb.php
index 2e6cc66d87..2b54aba371 100644
--- a/languages/messages/MessagesCkb.php
+++ b/languages/messages/MessagesCkb.php
@@ -24,21 +24,6 @@ $fallback8bitEncoding = 'windows-1256';
 
 $rtl = true;
 
-$digitTransformTable = array(
-	'0' => 'Ù ', # &#x0660;
-	'1' => 'Ù¡', # &#x0661;
-	'2' => 'Ù¢', # &#x0662;
-	'3' => 'Ù£', # &#x0663;
-	'4' => 'Ù¤', # &#x0664;
-	'5' => 'Ù¥', # &#x0665;
-	'6' => 'Ù¦', # &#x0666;
-	'7' => 'Ù§', # &#x0667;
-	'8' => 'Ù¨', # &#x0668;
-	'9' => 'Ù©', # &#x0669;
-	'.' => 'Ù«', # &#x066b; wrong table ?
-	',' => 'Ù¬', # &#x066c;
-);
-
 $namespaceNames = array(
 	NS_MEDIA            => 'میدیا',
 	NS_SPECIAL          => 'تایبەت',
@@ -145,6 +130,21 @@ $magicWords = array(
 	'img_border'                => array( '1', 'سنوور', 'border' ),
 );
 
+$digitTransformTable = array(
+	'0' => 'Ù ', # &#x0660;
+	'1' => 'Ù¡', # &#x0661;
+	'2' => 'Ù¢', # &#x0662;
+	'3' => 'Ù£', # &#x0663;
+	'4' => 'Ù¤', # &#x0664;
+	'5' => 'Ù¥', # &#x0665;
+	'6' => 'Ù¦', # &#x0666;
+	'7' => 'Ù§', # &#x0667;
+	'8' => 'Ù¨', # &#x0668;
+	'9' => 'Ù©', # &#x0669;
+	'.' => 'Ù«', # &#x066b; wrong table ?
+	',' => 'Ù¬', # &#x066c;
+);
+
 $messages = array(
 # User preference toggles
 'tog-underline' => 'ھێڵ ھێنان بەژێر بەستەرەکان:',
@@ -412,7 +412,7 @@ $1',
 'youhavenewmessages' => '$1ت ھەیە ($2).',
 'newmessageslink' => 'پەیامی نوێ',
 'newmessagesdifflink' => 'دوایین گۆڕانکاری',
-'youhavenewmessagesfromusers' => '$1ت لە {{PLURAL:$3|بەکارھێنەرێکی تر| $3 بەکارھێنەر}} ھەیە ( $2 ).',
+'youhavenewmessagesfromusers' => '$1ت لە {{PLURAL:$3|بەکارھێنەرێکی تر| $3 بەکارھێنەر}} ھەیە ($2).',
 'youhavenewmessagesmanyusers' => '$1ت  لە ژمارەیەک بەکارھێنەر ھەیە ( $2 ).',
 'newmessageslinkplural' => '{{PLURAL:$1|پەیامێکی نوێ|پەیامی نوێ}}',
 'newmessagesdifflinkplural' => 'دوایین {{PLURAL:$1|گۆڕانکاری|گۆڕانکارییەکان}}',
@@ -789,7 +789,7 @@ $2
 'noarticletext' => 'ھەنووکە ھیچ دەقێک لەم پەڕەدا نییە.
 دەتوانی بۆ ئەم ناوە لە [[Special:Search/{{PAGENAME}}|پەڕەکانی تردا بگەڕێی]]، <span class="plainlinks">[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} لە لۆگەکاندا بگەڕێی]، یان [{{fullurl:{{FULLPAGENAME}}|action=edit}} ئەم پەڕە دەستکاری بکەیت]</span>.',
 'noarticletext-nopermission' => 'ھەنووکە ھیچ دەقێک لەم پەڕەیەدا نییە.
-دەتوانی بۆ ئەم ناوە لە [[Special:Search/{{PAGENAME}}|پەڕەکانی تردا بگەڕێی]] یان <span class="plainlinks">[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} لە لۆگە پەیوەندیدارەکاندا بگەڕێی]</span>.',
+دەتوانی لە پەڕەکانی تردا [[Special:Search/{{PAGENAME}}|بۆ ئەم ناوە بگەڕێی]]، یان <span class="plainlinks">[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} لە لۆگە پەیوەندیدارەکاندا بگەڕێی]</span>، بەڵام ناتوانی ئەم پەڕەیە دروست بکەی.',
 'userpage-userdoesnotexist' => 'هەژماری بەکارهێنەری "<nowiki>$1</nowiki>" تۆمار نەکراوە.<br />
 گەر دەتەوێ ئەم لاپەڕە درووست‌کەی یان دەستکاری بکەی تکایە تاقی‌بکەوە .',
 'userpage-userdoesnotexist-view' => 'ھەژماری بەکارھێنەریی «$1» تۆمار نەکراوە.',
@@ -1716,7 +1716,7 @@ $1',
 'unwatchedpages' => 'لاپەڕە چاودێری‌نەکراوەکان',
 
 # List redirects
-'listredirects' => 'لیستی ئاڕاستەکراوەکان',
+'listredirects' => 'پێرستی ڕەوانەکەرەکان',
 
 # Unused templates
 'unusedtemplates' => 'داڕێژە بەکارنەھێنراوەکان',
@@ -2091,6 +2091,7 @@ $UNWATCHURL
 'rollback_short' => 'گەڕاندنەوە',
 'rollbacklink' => 'گەڕاندنەوە',
 'rollbacklinkcount' => 'گەڕاندنەوەی $1 {{PLURAL:$1|دەستکاری}}',
+'rollbacklinkcount-morethan' => 'گەڕاندنەوەی زۆرتر لە $1 {{PLURAL:$1|دەستکاری}}',
 'rollbackfailed' => 'گەڕاندنەوە سەرکەوتوو نەبوو',
 'cantrollback' => 'دەستکاریەکان ناگەڕێندرێتەوە؛
 دوایین هاوبەش تەنها ڕێکخەری ئەم لاپەڕەیە.',
@@ -2701,7 +2702,7 @@ $1',
 'pageinfo-authors' => 'ژمارەی نووسەرە جیاوازەکان',
 'pageinfo-recent-edits' => 'ژمارەی دوایین دەستکارییەکان (لە $1ی ڕابردوودا)',
 'pageinfo-recent-authors' => 'ژمارەی دوایین نووسەرە جیاوازەکان',
-'pageinfo-templates' => 'داڕێژە {{PLURAL:$1|ی بەکارگیراو|بەکارگیراوەکان}} ($1)',
+'pageinfo-templates' => 'داڕێژە{{PLURAL:$1|ی بەکارگیراو| بەکارگیراوەکان}} ($1)',
 'pageinfo-toolboxlink' => 'زانیاریی پەڕە',
 
 # Skin names
diff --git a/languages/messages/MessagesCps.php b/languages/messages/MessagesCps.php
index 8f063a566f..8ccda6bacf 100644
--- a/languages/messages/MessagesCps.php
+++ b/languages/messages/MessagesCps.php
@@ -158,7 +158,6 @@ $messages = array(
 'qbbrowse' => 'Pangita-on',
 'qbedit' => 'Ilisan',
 'qbpageoptions' => 'Mini nga pahina',
-'qbpageinfo' => 'Konteksto',
 'qbmyoptions' => 'Akon mga pahina',
 'qbspecialpages' => 'Pinasahi nga mga pahina',
 'faq' => 'Mga perme napamangkot ("FAQ")',
diff --git a/languages/messages/MessagesCrh_cyrl.php b/languages/messages/MessagesCrh_cyrl.php
index 0c3f0170d9..dc2eb5bf64 100644
--- a/languages/messages/MessagesCrh_cyrl.php
+++ b/languages/messages/MessagesCrh_cyrl.php
@@ -17,10 +17,6 @@ $fallback = 'ru';
 
 $fallback8bitEncoding = 'windows-1251';
 
-$separatorTransformTable = array( ','     => '.', '.'     => ',' );
-
-$linkTrail = '/^([a-zâçğıñöşüа-яё“»]+)(.*)$/sDu';
-
 $namespaceNames = array(
 	NS_MEDIA            => 'Медиа',
 	NS_SPECIAL          => 'Махсус',
@@ -40,8 +36,8 @@ $namespaceNames = array(
 	NS_CATEGORY_TALK    => 'Категория_музакереси',
 );
 
-# Aliases to latin namespaces
 $namespaceAliases = array(
+	# Aliases of Latin (crh-latn) namespaces
 	"Media"                 => NS_MEDIA,
 	"Mahsus"                => NS_SPECIAL,
 	"Muzakere"              => NS_TALK,
@@ -105,6 +101,9 @@ $dateFormats = array(
     'ISO 8601 both' => 'xnY.xnm.xnd"T"xnH:xni:xns',
 );
 
+$separatorTransformTable = array( ','  => '.', '.' => ',' );
+$linkTrail = '/^([a-zâçğıñöşüа-яё“»]+)(.*)$/sDu';
+
 $messages = array(
 # User preference toggles
 'tog-underline' => 'Багълантыларнынъ тюбюни сызув:',
@@ -252,7 +251,6 @@ $messages = array(
 'qbbrowse' => 'Бакъып чыкъ',
 'qbedit' => 'Денъиштир',
 'qbpageoptions' => 'Бу саифе',
-'qbpageinfo' => 'Саифе акъкъында малюмат',
 'qbmyoptions' => 'Саифелерим',
 'qbspecialpages' => 'Махсус саифелер',
 'faq' => 'Сыкъ берильген суаллер',
diff --git a/languages/messages/MessagesCrh_latn.php b/languages/messages/MessagesCrh_latn.php
index 95bf43429d..766e0bab30 100644
--- a/languages/messages/MessagesCrh_latn.php
+++ b/languages/messages/MessagesCrh_latn.php
@@ -14,8 +14,6 @@
 
 $fallback8bitEncoding = 'windows-1254';
 
-$separatorTransformTable = array( ','     => '.', '.'     => ',' );
-
 $namespaceNames = array(
 	NS_MEDIA            => 'Media',
 	NS_SPECIAL          => 'Mahsus',
@@ -35,8 +33,8 @@ $namespaceNames = array(
 	NS_CATEGORY_TALK    => 'Kategoriya_muzakeresi',
 );
 
-# Aliases to cyril namespaces
 $namespaceAliases = array(
+	# Aliases to Cyrillic (crh-cyrl) namespaces
 	"Медиа"                  => NS_MEDIA,
 	"Махсус"                 => NS_SPECIAL,
 	"Музакере"               => NS_TALK,
@@ -57,7 +55,6 @@ $namespaceAliases = array(
 	'Категория_музакереси'   => NS_CATEGORY_TALK
 );
 
-
 $datePreferences = array(
     'default',
     'mdy',
@@ -98,6 +95,7 @@ $dateFormats = array(
     'ISO 8601 both' => 'xnY.xnm.xnd"T"xnH:xni:xns',
 );
 
+$separatorTransformTable = array( ',' => '.', '.' => ',' );
 $linkTrail = '/^([a-zâçğıñöşüа-яё“»]+)(.*)$/sDu';
 
 $messages = array(
@@ -247,7 +245,6 @@ $messages = array(
 'qbbrowse' => 'Baqıp çıq',
 'qbedit' => 'Deñiştir',
 'qbpageoptions' => 'Bu saife',
-'qbpageinfo' => 'Saife aqqında malümat',
 'qbmyoptions' => 'Saifelerim',
 'qbspecialpages' => 'Mahsus saifeler',
 'faq' => 'Sıq berilgen sualler',
diff --git a/languages/messages/MessagesCs.php b/languages/messages/MessagesCs.php
index 8ed6e83b24..813fe6f75e 100644
--- a/languages/messages/MessagesCs.php
+++ b/languages/messages/MessagesCs.php
@@ -70,72 +70,96 @@ $namespaceGenderAliases = array(
     NS_USER_TALK => array( 'male' => 'Diskuse_s_uživatelem', 'female' => 'Diskuse_s_uživatelkou' ),
 );
 
-/**
- * Date formats list for Special:Preferences
- * see $dateFormats for definitions
- */
-$datePreferences =  array(
-	'ČSN basic dt',
-	'ČSN padded dt',
-	'ČSN basic td',
-	'ČSN padded td',
-	'PČP dt',
-	'PČP td',
-	'ISO dt',
-);
-
-/**
- * Default date format to be used
- */
-$defaultDateFormat = 'ČSN basic dt';
-
-/**
- * Date formats definitions
- *
- * ČSN - Česká státní norma 01 6910 / Czech state norm 01 6910; numeral representation, basic = 1-12(31), padded = 01-12(31)
- * PČP - Pravidla českého pravopisu / The rules of Czech ortography (ISBN 80-200-0475-0); verbal representation
- * ISO - ISO 8601:2004 - Data elements and interchange formats -- Information interchange -- Representation of dates and times
- * dt - date, time order
- * td - time, date order
- */
-$dateFormats = array(
-	'ČSN basic dt time' => 'H:i',
-	'ČSN basic dt date' => 'j. n. Y',
-	'ČSN basic dt both' => 'j. n. Y, H:i',
-
-	'ČSN padded dt time' => 'H:i',
-	'ČSN padded dt date' => 'd.m.Y',
-	'ČSN padded dt both' => 'd.m.Y, H:i',
-
-	'ČSN basic td time' => 'H:i',
-	'ČSN basic td date' => 'j. n. Y',
-	'ČSN basic td both' => 'H:i, j. n. Y',
-
-	'ČSN padded td time' => 'H:i',
-	'ČSN padded td date' => 'd.m.Y',
-	'ČSN padded td both' => 'H:i, d.m.Y',
-
-	'PČP dt time' => 'H.i',
-	'PČP dt date' => 'j. xg Y',
-	'PČP dt both' => 'j. xg Y, H.i',
-
-	'PČP td time' => 'H.i',
-	'PČP td date' => 'j. xg Y',
-	'PČP td both' => 'H.i, j. xg Y',
-
-	'ISO dt time' => 'xnH:xni:xns',
-	'ISO dt date' => 'xnY-xnm-xnd',
-	'ISO dt both' => 'xnY-xnm-xnd"T"xnH:xni:xns',
-);
-
-/**
- * Default list of book sources
- * Hledání knihy podle ISBN
- */
-$bookstoreList = array(
-	'Národní knihovna'          => 'http://aleph.nkp.cz/F/?func=find-a&find_code=ISN&request=$1',
-	'Státní technická knihovna' => 'http://www.stk.cz/cgi-bin/dflex/CZE/STK/BROWSE?A=01&V=$1',
-	'inherit' => true,
+$specialPageAliases = array(
+	'Activeusers'               => array( 'Aktivní_uživatelé', 'Aktivni_uzivatele' ),
+	'Allmessages'               => array( 'Všechna_hlášení', 'Všechny_zprávy', 'Vsechna_hlaseni', 'Vsechny_zpravy' ),
+	'Allpages'                  => array( 'Všechny_stránky', 'Vsechny_stranky' ),
+	'Ancientpages'              => array( 'Nejstarší_stránky', 'Staré_stránky', 'Stare_stranky' ),
+	'Blankpage'                 => array( 'Prázdná_stránka' ),
+	'Block'                     => array( 'Blokování', 'Blokovani', 'Blokovat_uživatele', 'Blokovat_IP', 'Blokovat_uzivatele' ),
+	'Blockme'                   => array( 'Zablokuj_mě', 'Zablokuj_me' ),
+	'Booksources'               => array( 'Zdroje_knih' ),
+	'BrokenRedirects'           => array( 'Přerušená_přesměrování', 'Prerusena_presmerovani' ),
+	'Categories'                => array( 'Kategorie' ),
+	'ChangeEmail'               => array( 'Změna_emailu', 'Zmena_emailu' ),
+	'ChangePassword'            => array( 'Změna_hesla', 'Zmena_hesla', 'Resetovat_heslo' ),
+	'Confirmemail'              => array( 'Potvrdit_e-mail' ),
+	'Contributions'             => array( 'Příspěvky', 'Prispevky' ),
+	'CreateAccount'             => array( 'Vytvořit_účet', 'Vytvorit_ucet' ),
+	'Deadendpages'              => array( 'Slepé_stránky', 'Slepe_stranky' ),
+	'DeletedContributions'      => array( 'Smazané_příspěvky', 'Smazane_prispevky' ),
+	'Disambiguations'           => array( 'Rozcestníky', 'Rozcestniky' ),
+	'DoubleRedirects'           => array( 'Dvojitá_přesměrování', 'Dvojita_presmerovani' ),
+	'Emailuser'                 => array( 'E-mail' ),
+	'Export'                    => array( 'Exportovat_stránky' ),
+	'Fewestrevisions'           => array( 'Stránky_s_nejméně_editacemi', 'Stranky_s_nejmene_editacemi', 'Stránky_s_nejmenším_počtem_editací' ),
+	'FileDuplicateSearch'       => array( 'Hledání_duplicitních_souborů', 'Hledani_duplicitnich_souboru' ),
+	'Filepath'                  => array( 'Cesta_k_souboru' ),
+	'Import'                    => array( 'Importovat_stránky' ),
+	'Invalidateemail'           => array( 'Zneplatnit_e-mail', 'Zrušit_potvrzení_e-mailu' ),
+	'BlockList'                 => array( 'Blokovaní_uživatelé', 'Blokovani_uzivatele' ),
+	'LinkSearch'                => array( 'Hledání_odkazů', 'Hledani_odkazu' ),
+	'Listadmins'                => array( 'Seznam_správců', 'Seznam_spravcu' ),
+	'Listbots'                  => array( 'Seznam_botů', 'Seznam_botu' ),
+	'Listfiles'                 => array( 'Seznam_souborů', 'Seznam_souboru' ),
+	'Listgrouprights'           => array( 'Seznam_uživatelských_práv', 'Seznam_uzivatelskych_prav' ),
+	'Listredirects'             => array( 'Seznam_přesměrování', 'Seznam_presmerovani' ),
+	'Listusers'                 => array( 'Uživatelé', 'Uzivatele', 'Seznam_uživatelů', 'Seznam_uzivatelu' ),
+	'Lockdb'                    => array( 'Zamknout_databázi', 'Zamknout_databazi' ),
+	'Log'                       => array( 'Protokolovací_záznamy', 'Protokoly', 'Protokol', 'Protokolovaci_zaznamy' ),
+	'Lonelypages'               => array( 'Sirotčí_stránky', 'Sirotci_stranky' ),
+	'Longpages'                 => array( 'Nejdelší_stránky', 'Nejdelsi_stranky' ),
+	'MergeHistory'              => array( 'Sloučení_historie', 'Slouceni_historie', 'Sloučit_historii' ),
+	'MIMEsearch'                => array( 'Hledání_podle_MIME', 'Hledani_podle_MIME', 'Hledat_podle_MIME_typu' ),
+	'Mostcategories'            => array( 'Stránky_s_nejvíce_kategoriemi', 'Stranky_s_nejvice_kategoriemi', 'Stránky_s_nejvyšším_počtem_kategorií' ),
+	'Mostimages'                => array( 'Nejpoužívanější_soubory', 'Nejpouzivanejsi_soubory' ),
+	'Mostlinked'                => array( 'Nejodkazovanější_stránky', 'Nejodkazovanejsi_stranky' ),
+	'Mostlinkedcategories'      => array( 'Nejpoužívanější_kategorie', 'Nejpouzivanejsi_kategorie' ),
+	'Mostlinkedtemplates'       => array( 'Nejpoužívanější_šablony', 'Nejpouzivanejsi_sablony' ),
+	'Mostrevisions'             => array( 'Stránky_s_nejvíce_editacemi', 'Stranky_s_nejvice_editacemi', 'Stránky_s_nejvyšším_počtem_editací' ),
+	'Movepage'                  => array( 'Přesunout_stránku' ),
+	'Mycontributions'           => array( 'Mé_příspěvky', 'Me_prispevky' ),
+	'Mypage'                    => array( 'Moje_stránka', 'Moje_stranka' ),
+	'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' ),
+	'Randompage'                => array( 'Náhodná_stránka', 'Nahodna_stranka' ),
+	'Randomredirect'            => array( 'Náhodné_přesměrování', 'Nahodne_presmerovani' ),
+	'Recentchanges'             => array( 'Poslední_změny', 'Posledni_zmeny' ),
+	'Recentchangeslinked'       => array( 'Související_změny', 'Souvisejici_zmeny' ),
+	'Revisiondelete'            => array( 'Smazat_revizi' ),
+	'Search'                    => array( 'Hledání', 'Hledani' ),
+	'Shortpages'                => array( 'Nejkratší_stránky', 'Nejkratsi_stranky' ),
+	'Specialpages'              => array( 'Speciální_stránky', 'Specialni_stranky' ),
+	'Statistics'                => array( 'Statistika', 'Statistiky' ),
+	'Tags'                      => array( 'Značky', 'Znacky' ),
+	'Unblock'                   => array( 'Odblokování', 'Odblokovani' ),
+	'Uncategorizedcategories'   => array( 'Nekategorizované_kategorie', 'Nekategorizovane_kategorie' ),
+	'Uncategorizedimages'       => array( 'Nekategorizované_soubory', 'Nekategorizovane_soubory' ),
+	'Uncategorizedpages'        => array( 'Nekategorizované_stránky', 'Nekategorizovane_stranky' ),
+	'Uncategorizedtemplates'    => array( 'Nekategorizované_šablony', 'Nekategorizovane_sablony' ),
+	'Undelete'                  => array( 'Smazané_stránky', 'Smazane_stranky' ),
+	'Unlockdb'                  => array( 'Odemknout_databázi', 'Odemknout_databazi' ),
+	'Unusedcategories'          => array( 'Nepoužívané_kategorie', 'Nepouzivane_kategorie' ),
+	'Unusedimages'              => array( 'Nepoužívané_soubory', 'Nepouzivane_soubory' ),
+	'Unusedtemplates'           => array( 'Nepoužívané_šablony', 'Nepouzivane_sablony' ),
+	'Unwatchedpages'            => array( 'Nesledované_stránky' ),
+	'Upload'                    => array( 'Načíst_soubor', 'Nacist_soubor', 'Načíst_obrázek' ),
+	'Userlogin'                 => array( 'Přihlásit', 'Prihlasit' ),
+	'Userlogout'                => array( 'Odhlásit', 'Odhlasit' ),
+	'Userrights'                => array( 'Uživatelská_práva', 'Správa_uživatelů', 'Uzivatelska_prava' ),
+	'Version'                   => array( 'Verze' ),
+	'Wantedcategories'          => array( 'Chybějící_kategorie', 'Požadované_kategorie', 'Pozadovane_kategorie' ),
+	'Wantedfiles'               => array( 'Chybějící_soubory', 'Požadované_soubory', 'Pozadovane_soubory' ),
+	'Wantedpages'               => array( 'Chybějící_stránky', 'Požadované_stránky', 'Pozadovane_stranky' ),
+	'Wantedtemplates'           => array( 'Chybějící_šablony', 'Požadované_šablony', 'Pozadovane_sablony' ),
+	'Watchlist'                 => array( 'Sledované_stránky', 'Sledovane_stranky' ),
+	'Whatlinkshere'             => array( 'Co_odkazuje_na', 'Odkazuje_sem' ),
+	'Withoutinterwiki'          => array( 'Bez_interwiki', 'Stránky_bez_interwiki_odkazů' ),
 );
 
 $magicWords = array(
@@ -256,6 +280,74 @@ $magicWords = array(
 	'protectionlevel'           => array( '1', 'ÚROVEŇZAMČENÍ', 'PROTECTIONLEVEL' ),
 );
 
+/**
+ * Date formats list for Special:Preferences
+ * see $dateFormats for definitions
+ */
+$datePreferences =  array(
+	'ČSN basic dt',
+	'ČSN padded dt',
+	'ČSN basic td',
+	'ČSN padded td',
+	'PČP dt',
+	'PČP td',
+	'ISO dt',
+);
+
+/**
+ * Default date format to be used
+ */
+$defaultDateFormat = 'ČSN basic dt';
+
+/**
+ * Date formats definitions
+ *
+ * ČSN - Česká státní norma 01 6910 / Czech state norm 01 6910; numeral representation, basic = 1-12(31), padded = 01-12(31)
+ * PČP - Pravidla českého pravopisu / The rules of Czech ortography (ISBN 80-200-0475-0); verbal representation
+ * ISO - ISO 8601:2004 - Data elements and interchange formats -- Information interchange -- Representation of dates and times
+ * dt - date, time order
+ * td - time, date order
+ */
+$dateFormats = array(
+	'ČSN basic dt time' => 'H:i',
+	'ČSN basic dt date' => 'j. n. Y',
+	'ČSN basic dt both' => 'j. n. Y, H:i',
+
+	'ČSN padded dt time' => 'H:i',
+	'ČSN padded dt date' => 'd.m.Y',
+	'ČSN padded dt both' => 'd.m.Y, H:i',
+
+	'ČSN basic td time' => 'H:i',
+	'ČSN basic td date' => 'j. n. Y',
+	'ČSN basic td both' => 'H:i, j. n. Y',
+
+	'ČSN padded td time' => 'H:i',
+	'ČSN padded td date' => 'd.m.Y',
+	'ČSN padded td both' => 'H:i, d.m.Y',
+
+	'PČP dt time' => 'H.i',
+	'PČP dt date' => 'j. xg Y',
+	'PČP dt both' => 'j. xg Y, H.i',
+
+	'PČP td time' => 'H.i',
+	'PČP td date' => 'j. xg Y',
+	'PČP td both' => 'H.i, j. xg Y',
+
+	'ISO dt time' => 'xnH:xni:xns',
+	'ISO dt date' => 'xnY-xnm-xnd',
+	'ISO dt both' => 'xnY-xnm-xnd"T"xnH:xni:xns',
+);
+
+/**
+ * Default list of book sources
+ * Hledání knihy podle ISBN
+ */
+$bookstoreList = array(
+	'Národní knihovna'          => 'http://aleph.nkp.cz/F/?func=find-a&find_code=ISN&request=$1',
+	'Státní technická knihovna' => 'http://www.stk.cz/cgi-bin/dflex/CZE/STK/BROWSE?A=01&V=$1',
+	'inherit' => true,
+);
+
 /**
  * Regular expression matching the "link trail", e.g. "ed" in [[Toast]]ed, as
  * the first group, and the remainder of the string as the second group.
@@ -265,98 +357,6 @@ $linkTrail = '/^([a-záčďéěíňóřšťúůýž]+)(.*)$/sDu';
 
 $separatorTransformTable = array( ',' => "\xc2\xa0", '.' => ',' );
 
-$specialPageAliases = array(
-	'Activeusers'               => array( 'Aktivní_uživatelé', 'Aktivni_uzivatele' ),
-	'Allmessages'               => array( 'Všechna_hlášení', 'Všechny_zprávy', 'Vsechna_hlaseni', 'Vsechny_zpravy' ),
-	'Allpages'                  => array( 'Všechny_stránky', 'Vsechny_stranky' ),
-	'Ancientpages'              => array( 'Nejstarší_stránky', 'Staré_stránky', 'Stare_stranky' ),
-	'Blankpage'                 => array( 'Prázdná_stránka' ),
-	'Block'                     => array( 'Blokování', 'Blokovani', 'Blokovat_uživatele', 'Blokovat_IP', 'Blokovat_uzivatele' ),
-	'Blockme'                   => array( 'Zablokuj_mě', 'Zablokuj_me' ),
-	'Booksources'               => array( 'Zdroje_knih' ),
-	'BrokenRedirects'           => array( 'Přerušená_přesměrování', 'Prerusena_presmerovani' ),
-	'Categories'                => array( 'Kategorie' ),
-	'ChangeEmail'               => array( 'Změna_emailu', 'Zmena_emailu' ),
-	'ChangePassword'            => array( 'Změna_hesla', 'Zmena_hesla', 'Resetovat_heslo' ),
-	'Confirmemail'              => array( 'Potvrdit_e-mail' ),
-	'Contributions'             => array( 'Příspěvky', 'Prispevky' ),
-	'CreateAccount'             => array( 'Vytvořit_účet', 'Vytvorit_ucet' ),
-	'Deadendpages'              => array( 'Slepé_stránky', 'Slepe_stranky' ),
-	'DeletedContributions'      => array( 'Smazané_příspěvky', 'Smazane_prispevky' ),
-	'Disambiguations'           => array( 'Rozcestníky', 'Rozcestniky' ),
-	'DoubleRedirects'           => array( 'Dvojitá_přesměrování', 'Dvojita_presmerovani' ),
-	'Emailuser'                 => array( 'E-mail' ),
-	'Export'                    => array( 'Exportovat_stránky' ),
-	'Fewestrevisions'           => array( 'Stránky_s_nejméně_editacemi', 'Stranky_s_nejmene_editacemi', 'Stránky_s_nejmenším_počtem_editací' ),
-	'FileDuplicateSearch'       => array( 'Hledání_duplicitních_souborů', 'Hledani_duplicitnich_souboru' ),
-	'Filepath'                  => array( 'Cesta_k_souboru' ),
-	'Import'                    => array( 'Importovat_stránky' ),
-	'Invalidateemail'           => array( 'Zneplatnit_e-mail', 'Zrušit_potvrzení_e-mailu' ),
-	'BlockList'                 => array( 'Blokovaní_uživatelé', 'Blokovani_uzivatele' ),
-	'LinkSearch'                => array( 'Hledání_odkazů', 'Hledani_odkazu' ),
-	'Listadmins'                => array( 'Seznam_správců', 'Seznam_spravcu' ),
-	'Listbots'                  => array( 'Seznam_botů', 'Seznam_botu' ),
-	'Listfiles'                 => array( 'Seznam_souborů', 'Seznam_souboru' ),
-	'Listgrouprights'           => array( 'Seznam_uživatelských_práv', 'Seznam_uzivatelskych_prav' ),
-	'Listredirects'             => array( 'Seznam_přesměrování', 'Seznam_presmerovani' ),
-	'Listusers'                 => array( 'Uživatelé', 'Uzivatele', 'Seznam_uživatelů', 'Seznam_uzivatelu' ),
-	'Lockdb'                    => array( 'Zamknout_databázi', 'Zamknout_databazi' ),
-	'Log'                       => array( 'Protokolovací_záznamy', 'Protokoly', 'Protokol', 'Protokolovaci_zaznamy' ),
-	'Lonelypages'               => array( 'Sirotčí_stránky', 'Sirotci_stranky' ),
-	'Longpages'                 => array( 'Nejdelší_stránky', 'Nejdelsi_stranky' ),
-	'MergeHistory'              => array( 'Sloučení_historie', 'Slouceni_historie', 'Sloučit_historii' ),
-	'MIMEsearch'                => array( 'Hledání_podle_MIME', 'Hledani_podle_MIME', 'Hledat_podle_MIME_typu' ),
-	'Mostcategories'            => array( 'Stránky_s_nejvíce_kategoriemi', 'Stranky_s_nejvice_kategoriemi', 'Stránky_s_nejvyšším_počtem_kategorií' ),
-	'Mostimages'                => array( 'Nejpoužívanější_soubory', 'Nejpouzivanejsi_soubory' ),
-	'Mostlinked'                => array( 'Nejodkazovanější_stránky', 'Nejodkazovanejsi_stranky' ),
-	'Mostlinkedcategories'      => array( 'Nejpoužívanější_kategorie', 'Nejpouzivanejsi_kategorie' ),
-	'Mostlinkedtemplates'       => array( 'Nejpoužívanější_šablony', 'Nejpouzivanejsi_sablony' ),
-	'Mostrevisions'             => array( 'Stránky_s_nejvíce_editacemi', 'Stranky_s_nejvice_editacemi', 'Stránky_s_nejvyšším_počtem_editací' ),
-	'Movepage'                  => array( 'Přesunout_stránku' ),
-	'Mycontributions'           => array( 'Mé_příspěvky', 'Me_prispevky' ),
-	'Mypage'                    => array( 'Moje_stránka', 'Moje_stranka' ),
-	'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' ),
-	'Randompage'                => array( 'Náhodná_stránka', 'Nahodna_stranka' ),
-	'Randomredirect'            => array( 'Náhodné_přesměrování', 'Nahodne_presmerovani' ),
-	'Recentchanges'             => array( 'Poslední_změny', 'Posledni_zmeny' ),
-	'Recentchangeslinked'       => array( 'Související_změny', 'Souvisejici_zmeny' ),
-	'Revisiondelete'            => array( 'Smazat_revizi' ),
-	'Search'                    => array( 'Hledání', 'Hledani' ),
-	'Shortpages'                => array( 'Nejkratší_stránky', 'Nejkratsi_stranky' ),
-	'Specialpages'              => array( 'Speciální_stránky', 'Specialni_stranky' ),
-	'Statistics'                => array( 'Statistika', 'Statistiky' ),
-	'Tags'                      => array( 'Značky', 'Znacky' ),
-	'Unblock'                   => array( 'Odblokování', 'Odblokovani' ),
-	'Uncategorizedcategories'   => array( 'Nekategorizované_kategorie', 'Nekategorizovane_kategorie' ),
-	'Uncategorizedimages'       => array( 'Nekategorizované_soubory', 'Nekategorizovane_soubory' ),
-	'Uncategorizedpages'        => array( 'Nekategorizované_stránky', 'Nekategorizovane_stranky' ),
-	'Uncategorizedtemplates'    => array( 'Nekategorizované_šablony', 'Nekategorizovane_sablony' ),
-	'Undelete'                  => array( 'Smazané_stránky', 'Smazane_stranky' ),
-	'Unlockdb'                  => array( 'Odemknout_databázi', 'Odemknout_databazi' ),
-	'Unusedcategories'          => array( 'Nepoužívané_kategorie', 'Nepouzivane_kategorie' ),
-	'Unusedimages'              => array( 'Nepoužívané_soubory', 'Nepouzivane_soubory' ),
-	'Unusedtemplates'           => array( 'Nepoužívané_šablony', 'Nepouzivane_sablony' ),
-	'Unwatchedpages'            => array( 'Nesledované_stránky' ),
-	'Upload'                    => array( 'Načíst_soubor', 'Nacist_soubor', 'Načíst_obrázek' ),
-	'Userlogin'                 => array( 'Přihlásit', 'Prihlasit' ),
-	'Userlogout'                => array( 'Odhlásit', 'Odhlasit' ),
-	'Userrights'                => array( 'Uživatelská_práva', 'Správa_uživatelů', 'Uzivatelska_prava' ),
-	'Version'                   => array( 'Verze' ),
-	'Wantedcategories'          => array( 'Chybějící_kategorie', 'Požadované_kategorie', 'Pozadovane_kategorie' ),
-	'Wantedfiles'               => array( 'Chybějící_soubory', 'Požadované_soubory', 'Pozadovane_soubory' ),
-	'Wantedpages'               => array( 'Chybějící_stránky', 'Požadované_stránky', 'Pozadovane_stranky' ),
-	'Wantedtemplates'           => array( 'Chybějící_šablony', 'Požadované_šablony', 'Pozadovane_sablony' ),
-	'Watchlist'                 => array( 'Sledované_stránky', 'Sledovane_stranky' ),
-	'Whatlinkshere'             => array( 'Co_odkazuje_na', 'Odkazuje_sem' ),
-	'Withoutinterwiki'          => array( 'Bez_interwiki', 'Stránky_bez_interwiki_odkazů' ),
-);
-
 $messages = array(
 # User preference toggles
 'tog-underline' => 'Podtrhávat odkazy:',
@@ -407,7 +407,7 @@ $messages = array(
 
 'underline-always' => 'Vždy',
 'underline-never' => 'Nikdy',
-'underline-default' => 'Podle nastavení prohlížeče',
+'underline-default' => 'Podle nastavení prohlížeče nebo vzhledu',
 
 # Font style option in Special:Preferences
 'editfont-style' => 'Druh písma v editačním poli:',
@@ -492,8 +492,8 @@ $messages = array(
 'newwindow' => '(otevře se v novém okně)',
 'cancel' => 'Storno',
 'moredotdotdot' => 'Další…',
-'mypage' => 'Moje stránka',
-'mytalk' => 'Moje diskuse',
+'mypage' => 'Stránka',
+'mytalk' => 'Diskuse',
 'anontalk' => 'Diskuse k této IP adrese',
 'navigation' => 'Navigace',
 'and' => '&#32;a',
@@ -1041,7 +1041,7 @@ Zde je pro přehled zobrazen nejnovější záznam z knihy zablokování:',
 'note' => "'''Poznámka:'''&nbsp;",
 'previewnote' => "'''Pamatujte, že toto je pouze náhled.'''
 Změny zatím nebyly uloženy!",
-'continue-editing' => 'Pokračovat v editaci',
+'continue-editing' => 'Přejít k editačnímu poli',
 'previewconflict' => 'Tento náhled ukazuje text tak, jak bude vypadat po uložení stránky.',
 'session_fail_preview' => "'''Váš požadavek se nepodařilo zpracovat kvůli ztrátě dat z relace.
 Zkuste to prosím znovu.
@@ -1645,6 +1645,9 @@ Tuto operaci nelze vrátit zpět.',
 'rightslogtext' => 'Toto je záznam změn uživatelských práv.',
 'rightslogentry' => 'změnil pro $1 zařazení ve skupinách z $2 na $3',
 'rightslogentry-autopromote' => 'byl automaticky povýšen z $2 na $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',
 'rightsnone' => '(žádné)',
 
 # Associated actions - in the sentence "You do not have permission to X"
@@ -2265,7 +2268,7 @@ Podívejte se také na [[Special:WantedCategories|žádané kategorie]].',
 'linksearch-ok' => 'Hledat',
 'linksearch-text' => 'Lze používat zástupné znaky, např. „*.wikipedia.org“.
 Povinná je přinejmenším doména nejvyššího řádu, např. „*.org“.<br />
-Podporované protokoly: <code>$1</code> (nepřidávejte je do hledání).',
+Podporované protokoly: <code>$1</code> (pokud není protokol uveden, použije se http://).',
 'linksearch-line' => '$2 odkazuje na $1',
 'linksearch-error' => 'Zástupné znaky lze použít jen na začátku doménového jména.',
 
@@ -2315,7 +2318,7 @@ Podporované protokoly: <code>$1</code> (nepřidávejte je do hledání).',
 '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 tomuto uživateli poslat zprávu e-mailem.
+'emailpagetext' => 'Pomocí níže zobrazeného formuláře můžete {{GENDER:$1|tomuto uživateli|této uživatelce}} poslat zprávu e-mailem.
 E-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.',
 'usermailererror' => 'Chyba poštovního programu:',
 'defemailsubject' => 'E-mail z {{grammar:2sg|{{SITENAME}}}} od {{gender:$1|uživatele|uživatelky|uživatele}} „$1“',
@@ -2596,7 +2599,7 @@ $1',
 # Contributions
 'contributions' => 'Příspěvky uživatele',
 'contributions-title' => 'Příspěvky uživatele $1',
-'mycontris' => 'Mé příspěvky',
+'mycontris' => 'Příspěvky',
 'contribsub2' => '$1 ($2)',
 'nocontribs' => 'Nenalezeny žádné změny vyhovující kritériím.',
 'uctop' => ' (aktuální)',
@@ -3119,7 +3122,7 @@ Uložte jej na svůj disk a nahrajte ho sem.',
 
 # Info page
 'pageinfo-title' => 'Informace o stránce „$1“',
-'pageinfo-not-current' => 'Informace lze zobrazit jen pro aktuální verzi.',
+'pageinfo-not-current' => 'Informace bohužel nelze zobrazit pro starší verze.',
 'pageinfo-header-basic' => 'Základní údaje',
 'pageinfo-header-edits' => 'Historie editací',
 'pageinfo-header-restrictions' => 'Zámek stránky',
@@ -3128,6 +3131,7 @@ Uložte jej na svůj disk a nahrajte ho sem.',
 'pageinfo-default-sort' => 'Výchozí klíč řazení',
 'pageinfo-length' => 'Velikost stránky (v bajtech)',
 'pageinfo-article-id' => 'ID stránky',
+'pageinfo-language' => 'Jazyk obsahu stránky',
 'pageinfo-robot-policy' => 'Nastavení pro vyhledávače',
 'pageinfo-robot-index' => 'Indexovatelná',
 'pageinfo-robot-noindex' => 'Neindexovatelná',
@@ -3904,6 +3908,7 @@ Seznam editovaných stránek můžete také [[Special:EditWatchlist|editovat ve
 'version-license' => 'Licence',
 'version-poweredby-credits' => "Tato wiki běží na '''[//www.mediawiki.org/ MediaWiki]''', copyright © 2001–$1 $2.",
 'version-poweredby-others' => 'další',
+'version-credits-summary' => 'Následujícím lidem bychom rádi poděkovali za jejich příspěvky [[Special:Version|MediaWiki]].',
 'version-license-info' => 'MediaWiki je svobodný software; můžete jej šířit nebo modifikovat podle podmínek GNU General Public License, vydávané Free Software Foundation; buď verze 2 této licence anebo (podle vašeho uvážení) kterékoli pozdější verze.
 
 MediaWiki je distribuována v naději, že bude užitečná, avšak BEZ JAKÉKOLI ZÁRUKY; neposkytují se ani odvozené záruky PRODEJNOSTI anebo VHODNOSTI PRO URČITÝ ÚČEL. Podrobnosti se dočtete v textu GNU General Public License.
@@ -3915,6 +3920,8 @@ MediaWiki je distribuována v naději, že bude užitečná, avšak BEZ JAKÉKOL
 'version-entrypoints' => 'URL vstupních bodů',
 'version-entrypoints-header-entrypoint' => 'Vstupní bod',
 'version-entrypoints-header-url' => 'URL',
+'version-entrypoints-articlepath' => '[https://www.mediawiki.org/wiki/Manual:$wgArticlePath Cesta k článkům]',
+'version-entrypoints-scriptpath' => '[https://www.mediawiki.org/wiki/Manual:$wgScriptPath Cesta ke skriptům]',
 
 # Special:FilePath
 'filepath' => 'Cesta k souboru',
@@ -4043,8 +4050,8 @@ Obrázky se zobrazí v plném rozlišení, jiné typy souborů se otevřenou v p
 'logentry-move-move_redir-noredirect' => '$1 přesunul stránku $3 na $4 místo přesměrování bez založení přesměrování',
 'logentry-patrol-patrol' => '$1 označil revizi $4 stránky $3 jako prověřenou',
 'logentry-patrol-patrol-auto' => '$1 automaticky označil revizi $4 stránky $3 jako prověřenou',
-'logentry-newusers-newusers' => '$1 založil uživatelský účet',
-'logentry-newusers-create' => '$1 založil uživatelský účet',
+'logentry-newusers-newusers' => '$1 si založil uživatelský účet',
+'logentry-newusers-create' => '$1 si založil uživatelský účet',
 'logentry-newusers-create2' => '$1 založil uživatelský účet $3',
 'logentry-newusers-autocreate' => 'Automaticky byl založen účet $1',
 'newuserlog-byemail' => 'heslo zasláno e-mailem',
diff --git a/languages/messages/MessagesCsb.php b/languages/messages/MessagesCsb.php
index fc7eb7e1ec..ec61e0c49f 100644
--- a/languages/messages/MessagesCsb.php
+++ b/languages/messages/MessagesCsb.php
@@ -177,7 +177,6 @@ $messages = array(
 'qbbrowse' => 'Przezeranié',
 'qbedit' => 'Edicëjô',
 'qbpageoptions' => 'Òptacëje starnë',
-'qbpageinfo' => 'Ò starnie',
 'qbmyoptions' => 'Mòje òptacëje',
 'qbspecialpages' => 'Specjalné starnë',
 'faq' => 'FAQ',
diff --git a/languages/messages/MessagesCu.php b/languages/messages/MessagesCu.php
index abecafc50f..dc29b259b0 100644
--- a/languages/messages/MessagesCu.php
+++ b/languages/messages/MessagesCu.php
@@ -14,13 +14,6 @@
  * @author ОйЛ
  */
 
-$separatorTransformTable = array(
-	',' => ".",
-	'.' => ','
-);
-
-$linkPrefixExtension = true;
-
 $namespaceNames = array(
 	NS_MEDIA            => 'Срѣдьства',
 	NS_SPECIAL          => 'Нарочьна',
@@ -65,6 +58,13 @@ $magicWords = array(
 	'language'                  => array( '0', '#ѨꙀꙐКЪ:', '#LANGUAGE:' ),
 );
 
+$separatorTransformTable = array(
+	',' => ".",
+	'.' => ','
+);
+
+$linkPrefixExtension = true;
+
 $defaultDateFormat = 'mdy';
 
 $dateFormats = array(
@@ -734,6 +734,9 @@ $messages = array(
 'tooltip-ca-nstab-special' => 'си нарочьна страница ѥстъ · ѥѩжє иꙁмѣнꙗти нє можєши',
 'tooltip-watch' => 'си страницѧ блюдєниѥ',
 
+# Info page
+'pageinfo-toolboxlink' => 'страницѧ плирофорїꙗ',
+
 # Media information
 'file-info-size' => '$1 × $2 п҃ѯ · дѣла мѣра : $3 · MIME тѷпъ : $4',
 'svg-long-desc' => 'дѣло SVG · обꙑчьнъ обраꙁъ : $1 × $2 п҃ѯ · дѣла мѣра : $3',
diff --git a/languages/messages/MessagesCv.php b/languages/messages/MessagesCv.php
index 1efc8505a3..69ddcdef1a 100644
--- a/languages/messages/MessagesCv.php
+++ b/languages/messages/MessagesCv.php
@@ -16,8 +16,6 @@
 
 $fallback = 'ru';
 
-$linkPrefixExtension = true;
-
 $namespaceNames = array(
 	NS_MEDIA            => 'Медиа',
 	NS_SPECIAL          => 'Ятарлă',
@@ -40,6 +38,7 @@ $namespaceNames = array(
 // Remove Russian aliases
 $namespaceGenderAliases = array();
 
+$linkPrefixExtension = true;
 $linkTrail = '/^([a-zа-яĕçăӳ"»]+)(.*)$/sDu';
 
 $messages = array(
@@ -172,7 +171,6 @@ $messages = array(
 'qbbrowse' => 'Курăм',
 'qbedit' => 'Тӳрлет',
 'qbpageoptions' => 'Страница ĕнерлевĕсем',
-'qbpageinfo' => 'Страница çинчен',
 'qbmyoptions' => 'Сирĕн ĕнĕрлевсем',
 'qbspecialpages' => 'Ятарлӑ страницӑсем',
 'faq' => 'ЫйХу',
diff --git a/languages/messages/MessagesCy.php b/languages/messages/MessagesCy.php
index 93ab38bd91..8a37f5e951 100644
--- a/languages/messages/MessagesCy.php
+++ b/languages/messages/MessagesCy.php
@@ -37,17 +37,6 @@ $namespaceNames = array(
 	NS_CATEGORY_TALK    => 'Sgwrs_Categori',
 );
 
-
-$defaultDateFormat = 'dmy';
-
-$bookstoreList = array(
-	"AddALL" => "http://www.addall.com/New/Partner.cgi?query=$1&type=ISBN",
-	"PriceSCAN" => "http://www.pricescan.com/books/bookDetail.asp?isbn=$1",
-	"Barnes & Noble" => "http://search.barnesandnoble.com/bookSearch/isbnInquiry.asp?isbn=$1",
-	"Amazon.com" => "http://www.amazon.com/exec/obidos/ISBN=$1",
-	"Amazon.co.uk" => "http://www.amazon.co.uk/exec/obidos/ISBN=$1"
-);
-
 $magicWords = array(
 	'redirect'                  => array( '0', '#ail-cyfeirio', '#ailgyfeirio', '#REDIRECT' ),
 	'notoc'                     => array( '0', '__DIMTAFLENCYNNWYS__', '__DIMRHESTRGYNNWYS__', '__DIMRHG__', '__NOTOC__' ),
@@ -114,6 +103,16 @@ $magicWords = array(
 	'pagesize'                  => array( '1', 'MAINTTUD', 'PAGESIZE' ),
 );
 
+$defaultDateFormat = 'dmy';
+
+$bookstoreList = array(
+	"AddALL" => "http://www.addall.com/New/Partner.cgi?query=$1&type=ISBN",
+	"PriceSCAN" => "http://www.pricescan.com/books/bookDetail.asp?isbn=$1",
+	"Barnes & Noble" => "http://search.barnesandnoble.com/bookSearch/isbnInquiry.asp?isbn=$1",
+	"Amazon.com" => "http://www.amazon.com/exec/obidos/ISBN=$1",
+	"Amazon.co.uk" => "http://www.amazon.co.uk/exec/obidos/ISBN=$1"
+);
+
 $linkTrail = "/^([àáâèéêìíîïòóôûŵŷa-z]+)(.*)$/sDu";
 
 $messages = array(
@@ -165,7 +164,7 @@ $messages = array(
 
 'underline-always' => 'Bob amser',
 'underline-never' => 'Byth',
-'underline-default' => 'Rhagosodyn y porwr',
+'underline-default' => "Rhagosodyn y porwr neu'r wedd",
 
 # Font style option in Special:Preferences
 'editfont-style' => 'Arddull y ffont yn y blwch golygu:',
@@ -250,8 +249,8 @@ $messages = array(
 'newwindow' => '(yn agor mewn ffenest newydd)',
 'cancel' => 'Diddymu',
 'moredotdotdot' => 'Rhagor...',
-'mypage' => 'Fy nhudalen',
-'mytalk' => 'Fy sgwrs',
+'mypage' => 'Tudalen defnyddiwr',
+'mytalk' => 'Sgwrs',
 'anontalk' => 'Sgwrs ar gyfer y cyfeiriad IP hwn',
 'navigation' => 'Panel llywio',
 'and' => '&#32;a/ac',
@@ -869,6 +868,11 @@ Ymddengys iddi gael ei dileu.",
 Mae ar gael yn barod.',
 'defaultmessagetext' => 'Y testun rhagosodedig',
 
+# Content models
+'content-model-wikitext' => 'cystrawen wici',
+'content-model-javascript' => 'JavaScript',
+'content-model-css' => 'CSS',
+
 # Parser/template warnings
 'expensive-parserfunction-warning' => "'''Rhybudd:''' Mae gormod o alwadau ar ffwythiannau dosrannu sy'n dreth ar adnoddau yn y dudalen hon.
 
@@ -1153,7 +1157,7 @@ Cofiwch y gall mynegeion Google o gynnwys {{SITENAME}} fod ar ei hôl hi.",
 
 # Preferences page
 'preferences' => 'Dewisiadau',
-'mypreferences' => 'Fy newisiadau',
+'mypreferences' => 'Dewisiadau',
 'prefs-edits' => 'Nifer y golygiadau:',
 'prefsnologin' => 'Nid ydych wedi mewngofnodi',
 'prefsnologintext' => 'Rhaid i chi <span class="plainlinks">[{{fullurl:{{#Special:UserLogin}}|returnto=$1}} fewngofnodi]</span> er mwyn gosod eich dewisiadau defnyddiwr.',
@@ -2083,7 +2087,7 @@ Bydd y cyfeiriad e-bost a osodoch yn eich [[Special:Preferences|dewisiadau chith
 
 # Watchlist
 'watchlist' => 'Fy rhestr wylio',
-'mywatchlist' => 'Fy rhestr wylio',
+'mywatchlist' => 'Rhestr wylio',
 'watchlistfor2' => 'Yn ôl gofyn $1 $2',
 'nowatchlist' => "Mae eich rhestr wylio'n wag.",
 'watchlistanontext' => "Rhaid $1 er mwyn gweld neu ddiwygio'ch rhestr wylio.",
@@ -2342,7 +2346,7 @@ $1',
 # Contributions
 'contributions' => "Cyfraniadau'r defnyddiwr",
 'contributions-title' => "Cyfraniadau'r defnyddiwr am $1",
-'mycontris' => 'Fy nghyfraniadau',
+'mycontris' => 'Cyfraniadau',
 'contribsub2' => 'Dros $1 ($2)',
 'nocontribs' => "Heb ddod o hyd i newidiadau gyda'r meini prawf hyn.",
 'uctop' => '(cyfredol)',
@@ -2383,7 +2387,7 @@ Mae'r cofnod diweddaraf yn y lòg blocio i'w weld isod:",
 'whatlinkshere-hideredirs' => '$1 ailgyfeiriadau',
 'whatlinkshere-hidetrans' => '$1 cynhwysion',
 'whatlinkshere-hidelinks' => '$1 cysylltau',
-'whatlinkshere-hideimages' => '$1 cysylltau delweddau',
+'whatlinkshere-hideimages' => '$1 cysylltau ffeiliau',
 'whatlinkshere-filters' => 'Hidlau',
 
 # Block/unblock
@@ -2852,6 +2856,7 @@ Achos hyn yn fwy na thebyg yw presenoldeb cysylltiad i wefan ar y rhestr wahardd
 'pageinfo-default-sort' => 'Allwedd trefnu diofyn',
 'pageinfo-length' => 'Hyd y dudalen (beitiau)',
 'pageinfo-article-id' => 'ID y dudalen',
+'pageinfo-language' => 'Iaith cynnwys y dudalen',
 'pageinfo-robot-policy' => 'Statws i beiriannau chwilio',
 'pageinfo-views' => 'Nifer yr ymweliadau',
 'pageinfo-watchers' => 'Nifer gwylwyr y dudalen',
@@ -2865,6 +2870,7 @@ Achos hyn yn fwy na thebyg yw presenoldeb cysylltiad i wefan ar y rhestr wahardd
 'pageinfo-authors' => 'Cyfanswm yr awduron gwahanol',
 'pageinfo-magic-words' => '{{PLURAL:$1|Gair|Gair|Geiriau}} hud ($1)',
 'pageinfo-hidden-categories' => '{{PLURAL:$1|Categori|Categori|Categorïau}} cudd ($1)',
+'pageinfo-toolboxlink' => 'Gwybodaeth am y dudalen',
 
 # Skin names
 'skinname-standard' => 'Safonol',
diff --git a/languages/messages/MessagesDa.php b/languages/messages/MessagesDa.php
index 97a09b6efd..d47e4ededc 100644
--- a/languages/messages/MessagesDa.php
+++ b/languages/messages/MessagesDa.php
@@ -73,15 +73,6 @@ $namespaceAliases = array(
 	'Hjælp-diskussion'     => NS_HELP_TALK,
 );
 
-$bookstoreList = array(
-	"Bibliotek.dk" => "http://bibliotek.dk/vis.php?base=dfa&origin=kommando&field1=ccl&term1=is=$1&element=L&start=1&step=10",
-	"Bogguide.dk" => "http://www.bogguide.dk/find_boeger_bog.asp?ISBN=$1",
-	'inherit' => true,
-);
-
-$separatorTransformTable = array( ',' => '.', '.' => ',' );
-$linkTrail = '/^([a-zæøå]+)(.*)$/sDu';
-
 $specialPageAliases = array(
 	'Activeusers'               => array( 'Aktive_Brugere' ),
 	'Allmessages'               => array( 'MediaWiki-systemmeddelelser' ),
@@ -125,6 +116,7 @@ $specialPageAliases = array(
 	'MIMEsearch'                => array( 'MIME-type-søgning' ),
 	'Mostcategories'            => array( 'Sider_med_flest_kategorier' ),
 	'Mostimages'                => array( 'Mest_brugte_filer' ),
+	'Mostinterwikis'            => array( 'Flest_interwikilinks' ),
 	'Mostlinked'                => array( 'Sider_med_flest_henvisninger' ),
 	'Mostlinkedcategories'      => array( 'Kategorier_med_flest_sider' ),
 	'Mostlinkedtemplates'       => array( 'Hyppigst_brugte_skabeloner' ),
@@ -145,7 +137,6 @@ $specialPageAliases = array(
 	'Recentchanges'             => array( 'Seneste_ændringer' ),
 	'Recentchangeslinked'       => array( 'Relaterede_ændringer' ),
 	'Revisiondelete'            => array( 'Versionssletning' ),
-	'RevisionMove'              => array( 'Versionsflytning' ),
 	'Search'                    => array( 'Søgning' ),
 	'Shortpages'                => array( 'Korteste_sider' ),
 	'Specialpages'              => array( 'Specialsider' ),
@@ -186,6 +177,15 @@ $dateFormats = array(
 	'ymd both' => 'Y M j, H:i'
 );
 
+$bookstoreList = array(
+	"Bibliotek.dk" => "http://bibliotek.dk/vis.php?base=dfa&origin=kommando&field1=ccl&term1=is=$1&element=L&start=1&step=10",
+	"Bogguide.dk" => "http://www.bogguide.dk/find_boeger_bog.asp?ISBN=$1",
+	'inherit' => true,
+);
+
+$separatorTransformTable = array( ',' => '.', '.' => ',' );
+$linkTrail = '/^([a-zæøå]+)(.*)$/sDu';
+
 $messages = array(
 # User preference toggles
 'tog-underline' => 'Understreg henvisninger:',
@@ -236,7 +236,7 @@ $messages = array(
 
 'underline-always' => 'Altid',
 'underline-never' => 'Aldrig',
-'underline-default' => 'Brug browserens indstilling',
+'underline-default' => 'Brug browserens indstilling eller standarden for det valgte udseende',
 
 # Font style option in Special:Preferences
 'editfont-style' => 'Skriftstil ved redigering:',
@@ -761,7 +761,7 @@ Midlertidig adgangskode: $2',
 'extlink_sample' => 'http://www.example.com Titel på henvisning',
 'extlink_tip' => 'Ekstern henvisning (husk http:// præfiks)',
 'headline_sample' => 'Tekst til overskrift',
-'headline_tip' => 'Type 2 overskrift',
+'headline_tip' => 'Type 2-overskrift',
 'nowiki_sample' => 'Indsæt tekst her som ikke skal wikiformateres',
 'nowiki_tip' => 'Ignorer wikiformatering',
 'image_sample' => 'Eksempel.jpg',
@@ -875,7 +875,7 @@ Loggen over den seneste blokering ses nedenfor:',
 'note' => "'''Bemærk:'''",
 'previewnote' => "'''Husk at dette er kun en forhåndsvisning.'''
 Dine ændringer er endnu ikke blevet gemt!",
-'continue-editing' => 'Fortsæt med at redigere',
+'continue-editing' => 'GÃ¥ til redigeringsfeltet',
 'previewconflict' => 'Denne forhåndsvisning er resultatet af den redigérbare tekst ovenfor, sådan vil det komme til at se ud hvis du vælger at gemme teksten.',
 'session_fail_preview' => "'''Din ændring kunne ikke gemmes, da dine sessionsdata er gået tabt.
 Prøv venligst igen. Hvis problemet fortsætter, log af og log på igen.'''",
@@ -1475,6 +1475,9 @@ Hvis du vælger at oplyse dit navn, vil det blive brugt til at tilskrive dig dit
 'rightslogtext' => 'Dette er en log over ændringer i brugeres rettigheder.',
 'rightslogentry' => 'ændrede grupperettigheder for „$1“ fra „$2“ til „$3“.',
 'rightslogentry-autopromote' => 'blev automatisk forfremmet fra $2 til $3',
+'logentry-rights-rights' => '$1 ændrede gruppemedlemskabet for $3 fra $4 til $5',
+'logentry-rights-rights-legacy' => '$1 ændrede gruppemedlemskabet for $3',
+'logentry-rights-autopromote' => '$1 blev automatisk forfremmet fra $4 til $5',
 'rightsnone' => '(-)',
 
 # Associated actions - in the sentence "You do not have permission to X"
@@ -2084,7 +2087,7 @@ Se også [[Special:WantedCategories|ønskede kategorier]].',
 'linksearch-ok' => 'Søg',
 'linksearch-text' => 'Wildcards som "*.wikipedia.org" kan benyttes.
 Der skal som minimum angives et topniveau-domæne som f. eks. "*.org".<br />
-Understøttede protokoller: <code>$1</code> (tilføj ikke protokollerne til din søgning).',
+Understøttede protokoller: <code>$1</code> (bruger automatisk http:// hvis der ikke er angivet nogen protokol).',
 'linksearch-line' => '$2 linker til $1',
 'linksearch-error' => 'Wildcards må kun benyttes i starten af hostnavnet.',
 
@@ -2134,8 +2137,8 @@ Der findes muligvis [[{{MediaWiki:Listgrouprights-helppage}}|yderligere informat
 'emailuser-title-target' => 'Send email til denne {{GENDER:$1|bruger}}',
 'emailuser-title-notarget' => 'Send email til en bruger',
 'emailpage' => 'E-mail bruger',
-'emailpagetext' => 'Du kan bruge formularen nedenfor til at sende en e-mail til denne bruger.
-Den e-mail-adresse du har angivet i [[Special:Preferences|dine indstillinger]] vil dukke op i "fra"-feltet på e-mailen, så modtageren kan svare dig.',
+'emailpagetext' => 'Du kan bruge formularen nedenfor til at sende en e-mail til denne {{GENDER:$1|bruger}}.
+Den e-mail-adresse, du har angivet i [[Special:Preferences|dine indstillinger]], vil dukke op i "fra"-feltet på e-mailen, så modtageren kan svare dig.',
 'usermailererror' => 'E-mail-modulet returnerede en fejl:',
 'defemailsubject' => '{{SITENAME}}-email fra brugeren "$1"',
 'usermaildisabled' => 'Bruger-e-mail deaktiveret',
@@ -2460,7 +2463,7 @@ Den seneste post i blokeringsloggen vises nedenfor:',
 'whatlinkshere-hideredirs' => '$1 omdirigeringer',
 'whatlinkshere-hidetrans' => '$1 inkluderinger',
 'whatlinkshere-hidelinks' => '$1 henvisninger',
-'whatlinkshere-hideimages' => '$1 fillinks',
+'whatlinkshere-hideimages' => '$1 filhenvisninger',
 'whatlinkshere-filters' => 'Filtre',
 
 # Block/unblock
@@ -2913,7 +2916,7 @@ Dette skyldes sandsynligvis en henvisning til et sortlistet eksternt websted.',
 
 # Info page
 'pageinfo-title' => 'Information om "$1"',
-'pageinfo-not-current' => 'Oplysninger vises kun for den aktuelle version.',
+'pageinfo-not-current' => 'Beklager, det er umuligt at give denne information for gamle udgaver.',
 'pageinfo-header-basic' => 'Grundlæggende oplysninger',
 'pageinfo-header-edits' => 'Redigeringshistorik',
 'pageinfo-header-restrictions' => 'Sidebeskyttelse',
@@ -2922,6 +2925,7 @@ Dette skyldes sandsynligvis en henvisning til et sortlistet eksternt websted.',
 'pageinfo-default-sort' => 'Standardsorteringsnøgle',
 'pageinfo-length' => 'Sidelængde (i bytes)',
 'pageinfo-article-id' => 'Side-ID',
+'pageinfo-language' => 'Sprog for sideindholdet',
 'pageinfo-robot-policy' => 'Søgemaskinestatus',
 'pageinfo-robot-index' => 'Indekserbar',
 'pageinfo-robot-noindex' => 'Ikke indekserbar',
@@ -3633,6 +3637,7 @@ Du kan også [[Special:EditWatchlist|bruge standard editoren]].',
 'version-license' => 'Licens',
 'version-poweredby-credits' => "Denne wiki er drevet af '''[//www.mediawiki.org/ MediaWiki ]''', copyright © 2001-$1 $2.",
 'version-poweredby-others' => 'andre',
+'version-credits-summary' => 'Vi vil gerne anerkende følgende personer for deres bidrag til [[Special:Version|MediaWiki]].',
 'version-license-info' => 'MediaWiki er fri software; du kan redistribuere det og/eller ændre det under betingelserne i GNU General Public License som offentliggjort af Free Software Foundation; enten version 2 af licensen eller (efter eget valg) enhver senere version. 
 
 MediaWiki distribueres i håb om at det vil være nyttigt, men UDEN NOGEN GARANTI; uden selv de underforståede garantier SALGBARHED eller EGNETHED TIL ET BESTEMT FORMÅL. Se GNU General Public License for yderligere detaljer. 
diff --git a/languages/messages/MessagesDe.php b/languages/messages/MessagesDe.php
index 1738c709d0..7bd2d85107 100644
--- a/languages/messages/MessagesDe.php
+++ b/languages/messages/MessagesDe.php
@@ -71,8 +71,6 @@
  * @author ✓
  */
 
-$capitalizeAllNouns = true;
-
 $namespaceNames = array(
 	NS_MEDIA            => 'Medium',
 	NS_SPECIAL          => 'Spezial',
@@ -96,22 +94,12 @@ $namespaceAliases = array(
 	'Bild' => NS_FILE,
 	'Bild_Diskussion' => NS_FILE_TALK,
 );
+
 $namespaceGenderAliases = array(
 	NS_USER => array( 'male' => 'Benutzer', 'female' => 'Benutzerin' ),
 	NS_USER_TALK => array( 'male' => 'Benutzer_Diskussion', 'female' => 'Benutzerin_Diskussion' ),
 );
 
-$bookstoreList = array(
-	'abebooks.de' => 'http://www.abebooks.de/servlet/BookSearchPL?ph=2&isbn=$1',
-	'amazon.de' => 'http://www.amazon.de/gp/search/field-isbn=$1',
-	'buch.de' => 'http://www.buch.de/shop/home/suche/?sswg=BUCH&sq=$1',
-	'Karlsruher Virtueller Katalog (KVK)' => 'http://www.ubka.uni-karlsruhe.de/kvk.html?SB=$1',
-	'Lehmanns Fachbuchhandlung' => 'http://www.lob.de/cgi-bin/work/suche?flag=new&stich1=$1'
-);
-
-$separatorTransformTable = array( ',' => '.', '.' => ',' );
-$linkTrail = '/^([äöüßa-z]+)(.*)$/sDu';
-
 $specialPageAliases = array(
 	'Activeusers'               => array( 'Aktive_Benutzer' ),
 	'Allmessages'               => array( 'MediaWiki-Systemnachrichten', 'Systemnachrichten' ),
@@ -183,7 +171,6 @@ $specialPageAliases = array(
 	'Recentchanges'             => array( 'Letzte_Änderungen' ),
 	'Recentchangeslinked'       => array( 'Änderungen_an_verlinkten_Seiten' ),
 	'Revisiondelete'            => array( 'Versionslöschung' ),
-	'RevisionMove'              => array( 'Version_verschieben' ),
 	'Search'                    => array( 'Suche' ),
 	'Shortpages'                => array( 'Kürzeste_Seiten' ),
 	'Specialpages'              => array( 'Spezialseiten' ),
@@ -214,39 +201,6 @@ $specialPageAliases = array(
 	'Withoutinterwiki'          => array( 'Fehlende_Interwikis' ),
 );
 
-$datePreferences = array(
-	'default',
-	'dmyt',
-	'dmyts',
-	'dmy',
-	'ymd',
-	'ISO 8601'
-);
-
-$defaultDateFormat = 'dmy';
-
-$dateFormats = array(
-	'dmyt time' => 'H:i',
-	'dmyt date' => 'j. F Y',
-	'dmyt both' => 'j. M Y, H:i',
-
-	'dmyts time' => 'H:i:s',
-	'dmyts date' => 'j. F Y',
-	'dmyts both' => 'j. M Y, H:i:s',
-
-	'dmy time' => 'H:i',
-	'dmy date' => 'j. F Y',
-	'dmy both' => 'H:i, j. M Y',
-
-	'ymd time' => 'H:i',
-	'ymd date' => 'Y M j',
-	'ymd both' => 'H:i, Y M j',
-
-	'ISO 8601 time' => 'xnH:xni:xns',
-	'ISO 8601 date' => 'xnY-xnm-xnd',
-	'ISO 8601 both' => 'xnY-xnm-xnd"T"xnH:xni:xns'
-);
-
 $magicWords = array(
 	'redirect'                  => array( '0', '#WEITERLEITUNG', '#REDIRECT' ),
 	'notoc'                     => array( '0', '__KEIN_INHALTSVERZEICHNIS__', '__KEININHALTSVERZEICHNIS__', '__NOTOC__' ),
@@ -254,14 +208,13 @@ $magicWords = array(
 	'forcetoc'                  => array( '0', '__INHALTSVERZEICHNIS_ERZWINGEN__', '__FORCETOC__' ),
 	'toc'                       => array( '0', '__INHALTSVERZEICHNIS__', '__TOC__' ),
 	'noeditsection'             => array( '0', '__ABSCHNITTE_NICHT_BEARBEITEN__', '__NOEDITSECTION__' ),
-	'noheader'                  => array( '0', '__KEINKOPF__', '__KEIN_HEADER__', '__KEIN_KOPF__', '__KEINHEADER__', '__NOHEADER__' ),
 	'currentmonth'              => array( '1', 'JETZIGER_MONAT', 'JETZIGER_MONAT_2', 'CURRENTMONTH', 'CURRENTMONTH2' ),
 	'currentmonth1'             => array( '1', 'JETZIGER_MONAT_1', 'CURRENTMONTH1' ),
 	'currentmonthname'          => array( '1', 'JETZIGER_MONATSNAME', 'CURRENTMONTHNAME' ),
-	'currentmonthnamegen'       => array( '1', 'JETZIGER_MONATSNAME_GENITIV', 'CURRENTMONTHNAMEGEN' ),
+	'currentmonthnamegen'       => array( '1', 'JETZIGER_MONATSNAME_GENITIV', 'JETZIGER_MONATSNAME_GEN', 'CURRENTMONTHNAMEGEN' ),
 	'currentmonthabbrev'        => array( '1', 'JETZIGER_MONATSNAME_KURZ', 'CURRENTMONTHABBREV' ),
-	'currentday'                => array( '1', 'JETZIGER_KALENDERTAG', 'CURRENTDAY' ),
-	'currentday2'               => array( '1', 'JETZIGER_KALENDERTAG_2', 'CURRENTDAY2' ),
+	'currentday'                => array( '1', 'JETZIGER_KALENDERTAG', 'JETZIGER_TAG', 'CURRENTDAY' ),
+	'currentday2'               => array( '1', 'JETZIGER_KALENDERTAG_2', 'JETZIGER_TAG_2', 'CURRENTDAY2' ),
 	'currentdayname'            => array( '1', 'JETZIGER_WOCHENTAG', 'CURRENTDAYNAME' ),
 	'currentyear'               => array( '1', 'JETZIGES_JAHR', 'CURRENTYEAR' ),
 	'currenttime'               => array( '1', 'JETZIGE_UHRZEIT', 'CURRENTTIME' ),
@@ -269,10 +222,10 @@ $magicWords = array(
 	'localmonth'                => array( '1', 'LOKALER_MONAT', 'LOKALER_MONAT_2', 'LOCALMONTH', 'LOCALMONTH2' ),
 	'localmonth1'               => array( '1', 'LOKALER_MONAT_1', 'LOCALMONTH1' ),
 	'localmonthname'            => array( '1', 'LOKALER_MONATSNAME', 'LOCALMONTHNAME' ),
-	'localmonthnamegen'         => array( '1', 'LOKALER_MONATSNAME_GENITIV', 'LOCALMONTHNAMEGEN' ),
+	'localmonthnamegen'         => array( '1', 'LOKALER_MONATSNAME_GENITIV', 'LOKALER_MONATSNAME_GEN', 'LOCALMONTHNAMEGEN' ),
 	'localmonthabbrev'          => array( '1', 'LOKALER_MONATSNAME_KURZ', 'LOCALMONTHABBREV' ),
-	'localday'                  => array( '1', 'LOKALER_KALENDERTAG', 'LOCALDAY' ),
-	'localday2'                 => array( '1', 'LOKALER_KALENDERTAG_2', 'LOCALDAY2' ),
+	'localday'                  => array( '1', 'LOKALER_KALENDERTAG', 'LOKALER_TAG', 'LOCALDAY' ),
+	'localday2'                 => array( '1', 'LOKALER_KALENDERTAG_2', 'LOKALER_TAG_2', 'LOCALDAY2' ),
 	'localdayname'              => array( '1', 'LOKALER_WOCHENTAG', 'LOCALDAYNAME' ),
 	'localyear'                 => array( '1', 'LOKALES_JAHR', 'LOCALYEAR' ),
 	'localtime'                 => array( '1', 'LOKALE_UHRZEIT', 'LOCALTIME' ),
@@ -301,8 +254,8 @@ $magicWords = array(
 	'basepagenamee'             => array( '1', 'OBERSEITE_URL', 'BASEPAGENAMEE' ),
 	'talkpagename'              => array( '1', 'DISKUSSIONSSEITE', 'DISK', 'TALKPAGENAME' ),
 	'talkpagenamee'             => array( '1', 'DISKUSSIONSSEITE_URL', 'DISK_URL', 'TALKPAGENAMEE' ),
-	'subjectpagename'           => array( '1', 'HAUPTSEITE', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
-	'subjectpagenamee'          => array( '1', 'HAUPTSEITE_URL', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
+	'subjectpagename'           => array( '1', 'HAUPTSEITENNAME', 'VORDERSEITE', 'HAUPTSEITE', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
+	'subjectpagenamee'          => array( '1', 'HAUPTSEITENNAME_URL', 'VORDERSEITE_URL', 'HAUPTSEITE_URL', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
 	'subst'                     => array( '0', 'ERS:', 'SUBST:' ),
 	'safesubst'                 => array( '0', 'SICHER_ERS:', 'SICHERERS:', 'SAFESUBST:' ),
 	'img_thumbnail'             => array( '1', 'miniatur', 'mini', 'thumbnail', 'thumb' ),
@@ -314,7 +267,7 @@ $magicWords = array(
 	'img_framed'                => array( '1', 'gerahmt', 'framed', 'enframed', 'frame' ),
 	'img_frameless'             => array( '1', 'rahmenlos', 'frameless' ),
 	'img_page'                  => array( '1', 'seite=$1', 'seite_$1', 'page=$1', 'page $1' ),
-	'img_upright'               => array( '1', 'hochkant', 'hochkant=$1', 'hochkant $1', 'upright', 'upright=$1', 'upright $1' ),
+	'img_upright'               => array( '1', 'hochkant', 'hochkant=$1', 'hochkant_$1', 'upright', 'upright=$1', 'upright $1' ),
 	'img_border'                => array( '1', 'rand', 'border' ),
 	'img_baseline'              => array( '1', 'grundlinie', 'baseline' ),
 	'img_sub'                   => array( '1', 'tiefgestellt', 'tief', 'sub' ),
@@ -326,6 +279,7 @@ $magicWords = array(
 	'img_text_bottom'           => array( '1', 'text-unten', 'text-bottom' ),
 	'img_link'                  => array( '1', 'verweis=$1', 'link=$1' ),
 	'img_alt'                   => array( '1', 'alternativtext=$1', 'alt=$1' ),
+	'img_class'                 => array( '1', 'klasse=$1', 'class=$1' ),
 	'int'                       => array( '0', 'NACHRICHT:', 'INT:' ),
 	'sitename'                  => array( '1', 'PROJEKTNAME', 'SITENAME' ),
 	'ns'                        => array( '0', 'NR:', 'NS:' ),
@@ -340,18 +294,18 @@ $magicWords = array(
 	'gender'                    => array( '0', 'GESCHLECHT:', 'GENDER:' ),
 	'notitleconvert'            => array( '0', '__KEINE_TITELKONVERTIERUNG__', '__NOTITLECONVERT__', '__NOTC__' ),
 	'nocontentconvert'          => array( '0', '__KEINE_INHALTSKONVERTIERUNG__', '__NOCONTENTCONVERT__', '__NOCC__' ),
-	'currentweek'               => array( '1', 'JETZIGE_KALENDERWOCHE', 'CURRENTWEEK' ),
+	'currentweek'               => array( '1', 'JETZIGE_KALENDERWOCHE', 'JETZIGE_WOCHE', 'CURRENTWEEK' ),
 	'currentdow'                => array( '1', 'JETZIGER_WOCHENTAG_ZAHL', 'CURRENTDOW' ),
-	'localweek'                 => array( '1', 'LOKALE_KALENDERWOCHE', 'LOCALWEEK' ),
+	'localweek'                 => array( '1', 'LOKALE_KALENDERWOCHE', 'LOKALE_WOCHE', 'LOCALWEEK' ),
 	'localdow'                  => array( '1', 'LOKALER_WOCHENTAG_ZAHL', 'LOCALDOW' ),
-	'revisionid'                => array( '1', 'REVISIONSID', 'REVISIONID' ),
-	'revisionday'               => array( '1', 'REVISIONSTAG', 'REVISIONDAY' ),
-	'revisionday2'              => array( '1', 'REVISIONSTAG2', 'REVISIONDAY2' ),
-	'revisionmonth'             => array( '1', 'REVISIONSMONAT', 'REVISIONMONTH' ),
-	'revisionmonth1'            => array( '1', 'REVISIONSMONAT1', 'REVISIONMONTH1' ),
-	'revisionyear'              => array( '1', 'REVISIONSJAHR', 'REVISIONYEAR' ),
-	'revisiontimestamp'         => array( '1', 'REVISIONSZEITSTEMPEL', 'REVISIONTIMESTAMP' ),
-	'revisionuser'              => array( '1', 'REVISIONSBENUTZER', 'REVISIONUSER' ),
+	'revisionid'                => array( '1', 'REVISIONSID', 'VERSIONSID', 'REVISIONID' ),
+	'revisionday'               => array( '1', 'REVISIONSTAG', 'VERSIONSTAG', 'REVISIONDAY' ),
+	'revisionday2'              => array( '1', 'REVISIONSTAG2', 'VERSIONSTAG2', 'REVISIONDAY2' ),
+	'revisionmonth'             => array( '1', 'REVISIONSMONAT', 'VERSIONSMONAT', 'REVISIONMONTH' ),
+	'revisionmonth1'            => array( '1', 'REVISIONSMONAT1', 'VERSIONSMONAT1', 'REVISIONMONTH1' ),
+	'revisionyear'              => array( '1', 'REVISIONSJAHR', 'VERSIONSJAHR', 'REVISIONYEAR' ),
+	'revisiontimestamp'         => array( '1', 'REVISIONSZEITSTEMPEL', 'VERSIONSZEITSTEMPEL', 'REVISIONTIMESTAMP' ),
+	'revisionuser'              => array( '1', 'REVISIONSBENUTZER', 'VERSIONSBENUTZER', 'REVISIONUSER' ),
 	'fullurl'                   => array( '0', 'VOLLSTÄNDIGE_URL:', 'FULLURL:' ),
 	'fullurle'                  => array( '0', 'VOLLSTÄNDIGE_URL_C:', 'FULLURLE:' ),
 	'canonicalurl'              => array( '0', 'KANONISCHE_URL:', 'CANONICALURL:' ),
@@ -383,10 +337,10 @@ $magicWords = array(
 	'filepath'                  => array( '0', 'DATEIPFAD:', 'FILEPATH:' ),
 	'tag'                       => array( '0', 'erweiterung', 'tag' ),
 	'hiddencat'                 => array( '1', '__VERSTECKTE_KATEGORIE__', '__WARTUNGSKATEGORIE__', '__HIDDENCAT__' ),
-	'pagesincategory'           => array( '1', 'SEITEN_IN_KATEGORIE', 'SEITEN_KAT', 'PAGESINCATEGORY', 'PAGESINCAT' ),
+	'pagesincategory'           => array( '1', 'SEITEN_IN_KATEGORIE', 'SEITEN_KAT', 'SEITENINKAT', 'PAGESINCATEGORY', 'PAGESINCAT' ),
 	'pagesize'                  => array( '1', 'SEITENGRÖSSE', 'PAGESIZE' ),
-	'index'                     => array( '1', '__INDIZIEREN__', '__INDEX__' ),
-	'noindex'                   => array( '1', '__NICHT_INDIZIEREN__', '__NOINDEX__' ),
+	'index'                     => array( '1', '__INDEXIEREN__', '__INDIZIEREN__', '__INDEX__' ),
+	'noindex'                   => array( '1', '__NICHT_INDEXIEREN__', '__KEIN_INDEX__', '__NICHT_INDIZIEREN__', '__NOINDEX__' ),
 	'numberingroup'             => array( '1', 'BENUTZER_IN_GRUPPE', 'NUMBERINGROUP', 'NUMINGROUP' ),
 	'staticredirect'            => array( '1', '__PERMANENTE_WEITERLEITUNG__', '__STATICREDIRECT__' ),
 	'protectionlevel'           => array( '1', 'SCHUTZSTATUS', 'PROTECTIONLEVEL' ),
@@ -395,8 +349,57 @@ $magicWords = array(
 	'url_query'                 => array( '0', 'ABFRAGE', 'QUERY' ),
 	'defaultsort_noerror'       => array( '0', 'keinfehler', 'noerror' ),
 	'defaultsort_noreplace'     => array( '0', 'keineersetzung', 'noreplace' ),
+	'pagesincategory_all'       => array( '0', 'alle', 'all' ),
+	'pagesincategory_pages'     => array( '0', 'seiten', 'pages' ),
+	'pagesincategory_subcats'   => array( '0', 'unterkategorien', 'unterkats', 'subcats' ),
+	'pagesincategory_files'     => array( '0', 'dateien', 'files' ),
+);
+
+$datePreferences = array(
+	'default',
+	'dmyt',
+	'dmyts',
+	'dmy',
+	'ymd',
+	'ISO 8601'
+);
+
+$defaultDateFormat = 'dmy';
+
+$dateFormats = array(
+	'dmyt time' => 'H:i',
+	'dmyt date' => 'j. F Y',
+	'dmyt both' => 'j. M Y, H:i',
+
+	'dmyts time' => 'H:i:s',
+	'dmyts date' => 'j. F Y',
+	'dmyts both' => 'j. M Y, H:i:s',
+
+	'dmy time' => 'H:i',
+	'dmy date' => 'j. F Y',
+	'dmy both' => 'H:i, j. M Y',
+
+	'ymd time' => 'H:i',
+	'ymd date' => 'Y M j',
+	'ymd both' => 'H:i, Y M j',
+
+	'ISO 8601 time' => 'xnH:xni:xns',
+	'ISO 8601 date' => 'xnY-xnm-xnd',
+	'ISO 8601 both' => 'xnY-xnm-xnd"T"xnH:xni:xns'
 );
 
+$capitalizeAllNouns = true;
+$bookstoreList = array(
+	'abebooks.de' => 'http://www.abebooks.de/servlet/BookSearchPL?ph=2&isbn=$1',
+	'amazon.de' => 'http://www.amazon.de/gp/search/field-isbn=$1',
+	'buch.de' => 'http://www.buch.de/shop/home/suche/?sswg=BUCH&sq=$1',
+	'Karlsruher Virtueller Katalog (KVK)' => 'http://www.ubka.uni-karlsruhe.de/kvk.html?SB=$1',
+	'Lehmanns Fachbuchhandlung' => 'http://www.lob.de/cgi-bin/work/suche?flag=new&stich1=$1'
+);
+
+$separatorTransformTable = array( ',' => '.', '.' => ',' );
+$linkTrail = '/^([äöüßa-z]+)(.*)$/sDu';
+
 $imageFiles = array(
 	'button-bold'     => 'de/button_bold.png',
 	'button-italic'   => 'de/button_italic.png',
@@ -452,7 +455,7 @@ $messages = array(
 
 'underline-always' => 'immer',
 'underline-never' => 'nie',
-'underline-default' => 'abhängig von der Browsereinstellung',
+'underline-default' => 'abhängig von der Benutzeroberfläche oder Browsereinstellung',
 
 # Font style option in Special:Preferences
 'editfont-style' => 'Schriftart für den Text im Bearbeitungsfenster:',
@@ -538,7 +541,7 @@ $messages = array(
 'cancel' => 'Abbrechen',
 'moredotdotdot' => 'Mehr …',
 'mypage' => 'Eigene Seite',
-'mytalk' => 'Eigene Diskussion',
+'mytalk' => 'Diskussion',
 'anontalk' => 'Diskussionsseite dieser IP',
 'navigation' => 'Navigation',
 'and' => '&#32;und',
@@ -1056,8 +1059,8 @@ Sofern du fälschlicherweise hier bist, klicke auf die Schaltfläche '''Zurück'
 Du kannst sie <span class="plainlinks">[{{fullurl:{{FULLPAGENAME}}|action=edit}} bearbeiten]</span>,
 ihren Titel auf anderen Seiten [[Special:Search/{{PAGENAME}}|suchen]]
 oder die zugehörigen <span class="plainlinks">[{{fullurl:{{#special:Log}}|page={{FULLPAGENAMEE}}}} Logbücher betrachten]</span>.',
-'noarticletext-nopermission' => 'Diese Seite enthält momentan noch keinen Text.
-Du kannst ihren Titel auf anderen Seiten [[Special:Search/{{PAGENAME}}|suchen]] oder die zugehörigen <span class="plainlinks">[{{fullurl:{{#special:Log}}|page={{FULLPAGENAMEE}}}} Logbücher betrachten].</span> Du bist allerdings nicht berechtigt diese Seite zu erstellen.',
+'noarticletext-nopermission' => 'Diese Seite enthält momentan noch keinen Text, du bist auch nicht berechtigt diese Seite zu erstellen.
+Du kannst ihren Titel auf anderen Seiten [[Special:Search/{{PAGENAME}}|suchen]] oder die zugehörigen <span class="plainlinks">[{{fullurl:{{#special:Log}}|page={{FULLPAGENAMEE}}}} Logbücher betrachten].</span>',
 'missing-revision' => 'Die Version $1 der Seite namens „{{PAGENAME}}“ ist nicht vorhanden.
 
 Dieser Fehler wird normalerweise von einem veralteten Link zur Versionsgeschichte einer Seite verursacht, die zwischenzeitlich gelöscht wurde.
@@ -1086,7 +1089,7 @@ Zur Information folgt ein aktueller Auszug aus dem Benutzersperr-Logbuch:',
 'note' => "'''Hinweis:'''",
 'previewnote' => "'''Dies ist nur eine Vorschau.'''
 Die Seite wurde noch nicht gespeichert!",
-'continue-editing' => 'Weiter bearbeiten',
+'continue-editing' => 'Zum Bearbeitungsfeld gehen',
 'previewconflict' => 'Diese Vorschau gibt den Inhalt des oberen Textfeldes wieder. So wird die Seite aussehen, wenn du jetzt speicherst.',
 'session_fail_preview' => "'''Deine Bearbeitung konnte nicht gespeichert werden, da Sitzungsdaten verloren gegangen sind.
 Bitte versuche es erneut, indem du unter der folgenden Textvorschau nochmals auf „Seite speichern“ klickst.
@@ -1587,6 +1590,7 @@ Dies kann nicht mehr rückgängig gemacht werden.',
 'saveusergroups' => 'Gruppenzugehörigkeit ändern',
 'userrights-groupsmember' => 'Mitglied von:',
 'userrights-groupsmember-auto' => 'Automatisch Mitglied von:',
+'userrights-groupsmember-type' => '$2',
 'userrights-groups-help' => 'Du kannst die Gruppenzugehörigkeit {{GENDER:$1|dieses Benutzers|dieser Benutzerin}} ändern:
 * Ein markiertes Kästchen bedeutet, dass {{GENDER:$1|der Benutzer|die Benutzerin}} Mitglied dieser Gruppe ist.
 * Ein nichtmarkiertes Kästchen bedeutet, dass {{GENDER:$1|der Benutzer|die Benutzerin}} nicht Mitglied dieser Gruppe ist.
@@ -1690,6 +1694,9 @@ Dies kann nicht mehr rückgängig gemacht werden.',
 'rightslogtext' => 'Dies ist das Logbuch der Änderungen der Benutzerrechte.',
 'rightslogentry' => 'änderte die Benutzerrechte für „$1“ von „$2“ zu „$3“',
 'rightslogentry-autopromote' => 'wurde automatisch von „$2“ zu „$3“ zugeordnet',
+'logentry-rights-rights' => '$1 änderte die Gruppenzugehörigkeit für $3 von $4 zu $5',
+'logentry-rights-rights-legacy' => '$1 änderte die Gruppenzugehörigkeit für $3',
+'logentry-rights-autopromote' => '$1 wurde automatisch von $4 zu $5 zugeordnet',
 'rightsnone' => '(–)',
 
 # Associated actions - in the sentence "You do not have permission to X"
@@ -2313,7 +2320,7 @@ Siehe auch die Liste der [[Special:WantedCategories|gewünschten Kategorien]].',
 '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 />Unterstützte Protokolle: <code>$1</code> (Diese bitte nicht bei der Suchanfrage angeben.)',
+'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 />Unterstützte Protokolle: <code>$1</code> (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.',
 
@@ -2362,10 +2369,10 @@ Zusätzliche Informationen über einzelne Rechte können [[{{MediaWiki:Listgroup
 '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 dem Benutzer mit dem unten stehenden Formular eine E-Mail senden.
-Als Absender wird die E-Mail-Adresse aus deinen [[Special:Preferences|Einstellungen]] eingetragen, damit der Benutzer dir antworten kann.',
+'emailpagetext' => 'Du kannst {{GENDER:$1|dem Benutzer|der Benutzerin}} mit dem unten stehenden Formular eine E-Mail senden.
+Als Absender wird die E-Mail-Adresse aus deinen [[Special:Preferences|Einstellungen]] eingetragen, damit {{GENDER:$1|der Benutzer|die Benutzerin}} dir antworten kann.',
 'usermailererror' => 'Das E-Mail-Objekt gab einen Fehler zurück:',
-'defemailsubject' => '{{SITENAME}} - E-Mail von Benutzer „$1“',
+'defemailsubject' => '{{SITENAME}} – E-Mail von Benutzer „$1“',
 'usermaildisabled' => 'E-Mail-Empfang deaktiviert',
 'usermaildisabledtext' => 'Du kannst in diesem Wiki keine E-Mails an andere Benutzer senden',
 'noemailtitle' => 'Keine E-Mail-Adresse',
@@ -2644,7 +2651,7 @@ $1',
 # Contributions
 'contributions' => 'Benutzerbeiträge',
 'contributions-title' => 'Benutzerbeiträge von „$1“',
-'mycontris' => 'Eigene Beiträge',
+'mycontris' => 'Beiträge',
 'contribsub2' => 'Von $1 ($2)',
 'nocontribs' => 'Es wurden keine Benutzerbeiträge mit diesen Kriterien gefunden.',
 'uctop' => '(aktuell)',
@@ -3175,7 +3182,7 @@ Das liegt wahrscheinlich an einem Link auf eine externe Seite.',
 
 # Info page
 'pageinfo-title' => 'Informationen zu „$1“',
-'pageinfo-not-current' => 'Diese Informationen können nur für die aktuelle Version angezeigt werden.',
+'pageinfo-not-current' => 'Diese Information kann leider nicht für alte Versionen zur Verfügung gestellt werden.',
 'pageinfo-header-basic' => 'Basisinformationen',
 'pageinfo-header-edits' => 'Bearbeitungsgeschichte',
 'pageinfo-header-restrictions' => 'Seitenschutz',
@@ -3184,6 +3191,7 @@ Das liegt wahrscheinlich an einem Link auf eine externe Seite.',
 'pageinfo-default-sort' => 'Standardsortierkriterium',
 'pageinfo-length' => 'Seitenlänge (in Byte)',
 'pageinfo-article-id' => 'Seitenkennnummer',
+'pageinfo-language' => 'Seiteninhaltssprache',
 'pageinfo-robot-policy' => 'Suchmaschinenstatus',
 'pageinfo-robot-index' => 'Indizierbar',
 'pageinfo-robot-noindex' => 'Nicht indizierbar',
@@ -3199,8 +3207,8 @@ Das liegt wahrscheinlich an einem Link auf eine externe Seite.',
 'pageinfo-lasttime' => 'Datum der letzten Bearbeitung',
 'pageinfo-edits' => 'Gesamtzahl der Bearbeitungen',
 'pageinfo-authors' => 'Gesamtzahl unterschiedlicher Autoren',
-'pageinfo-recent-edits' => 'Anzahl der kürzlich erfolgten Bearbeitungen (innerhalb von $1)',
-'pageinfo-recent-authors' => 'Anzahl der unterschiedlichen Autoren',
+'pageinfo-recent-edits' => 'Anzahl der kürzlich erfolgten Bearbeitungen (innerhalb der letzten $1)',
+'pageinfo-recent-authors' => 'Anzahl unterschiedlicher Autoren',
 'pageinfo-magic-words' => '{{PLURAL:$1|Magisches Wort|Magische Wörter}} ($1)',
 'pageinfo-hidden-categories' => 'Versteckte {{PLURAL:$1|Kategorie|Kategorien}} ($1)',
 'pageinfo-templates' => 'Eingebundene {{PLURAL:$1|Vorlage|Vorlagen}} ($1)',
@@ -3923,6 +3931,7 @@ Du kannst auch die [[Special:EditWatchlist|Standardseite]] zum Bearbeiten benutz
 'version-license' => 'Lizenz',
 'version-poweredby-credits' => "Diese Website nutzt '''[//www.mediawiki.org/wiki/MediaWiki/de MediaWiki]''', Copyright © 2001–$1 $2.",
 'version-poweredby-others' => 'andere',
+'version-credits-summary' => 'Wir danken folgenden Personen für ihre Beiträge zu [[Special:Version|MediaWiki]].',
 'version-license-info' => "MediaWiki ist eine Freie Software, d. h. sie kann, gemäß 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.
 
 Die Software MediaWiki wird in der Hoffnung verteilt, dass sie 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.
@@ -4141,4 +4150,6 @@ Anderenfalls kannst du auch das untenstehende einfache Formular nutzen. Dein Kom
 'duration-centuries' => '$1 {{PLURAL:$1|Jahrhundert|Jahrhunderte}}',
 'duration-millennia' => '$1 {{PLURAL:$1|Jahrtausend|Jahrtausende}}',
 
+# Unknown messages
+'mytalk-parenthetical' => 'Diskussion',
 );
diff --git a/languages/messages/MessagesDiq.php b/languages/messages/MessagesDiq.php
index c7c0a593fc..f90d61c0fe 100644
--- a/languages/messages/MessagesDiq.php
+++ b/languages/messages/MessagesDiq.php
@@ -63,21 +63,21 @@ $specialPageAliases = array(
 	'ChangePassword'            => array( 'ParolaBıvurnê', 'ParolaResetke' ),
 	'ComparePages'              => array( 'PelaPêverke' ),
 	'Confirmemail'              => array( 'EpostayAraştke' ),
-	'Contributions'             => array( 'İştiraxi' ),
+	'Contributions'             => array( 'İştiraqi' ),
 	'CreateAccount'             => array( 'HesabVırazê' ),
-	'Deadendpages'              => array( 'PelaBêgıre' ),
-	'DeletedContributions'      => array( 'İştıraxêkeBesterneyayê' ),
+	'Deadendpages'              => array( 'PelaBıgirê' ),
+	'DeletedContributions'      => array( 'İştıraqêkeBesterneyayê' ),
 	'Disambiguations'           => array( 'ManeoBin' ),
 	'DoubleRedirects'           => array( 'DıletHeteneayış' ),
-	'EditWatchlist'             => array( 'ListeyaSeyriVurnayış' ),
+	'EditWatchlist'             => array( 'ListeyaTemaşiVurnayış' ),
 	'Emailuser'                 => array( 'EpostayaKarberi' ),
 	'Export'                    => array( 'Ateberde' ),
 	'Fewestrevisions'           => array( 'TewrtaynRevizyon' ),
 	'FileDuplicateSearch'       => array( 'KopyaydosyaCıgeyrayış', 'DıletdosyaCıgeyrayış' ),
 	'Filepath'                  => array( 'RayaDosya', 'HerunaDosya', 'CayêDosya' ),
 	'Import'                    => array( 'Azeredê', 'Atewrke' ),
-	'Invalidateemail'           => array( 'TesdiqêepostaBıterknê' ),
-	'BlockList'                 => array( 'ListeyêBLoki', 'IPBloki', 'Blokeyê_IP' ),
+	'Invalidateemail'           => array( 'EpostaAraştkerdışiBıterknê' ),
+	'BlockList'                 => array( 'ListeyêBloki', 'IPBloki', 'Blokeyê_IP' ),
 	'LinkSearch'                => array( 'GreCıgeyrayış' ),
 	'Listadmins'                => array( 'ListeyêXizmetkaran' ),
 	'Listbots'                  => array( 'ListeyêBotan' ),
@@ -97,15 +97,15 @@ $specialPageAliases = array(
 	'Mostlinkedcategories'      => array( 'KategoriyêkeCırêvêşiGreDeyayo' ),
 	'Mostlinkedtemplates'       => array( 'ŞablonêkeCırêvêşiGreDeyayo' ),
 	'Mostrevisions'             => array( 'TewrvêşiRevizyon' ),
-	'Movepage'                  => array( 'PelaAhuln' ),
-	'Mycontributions'           => array( 'İştırakeMe' ),
+	'Movepage'                  => array( 'PelaAhulne' ),
+	'Mycontributions'           => array( 'İştıraqeMe' ),
 	'Mypage'                    => array( 'PelaMe' ),
-	'Mytalk'                    => array( 'PersiyeME' ),
+	'Mytalk'                    => array( 'PersiyeMe' ),
 	'Myuploads'                 => array( 'BarkerdışeMe' ),
 	'Newimages'                 => array( 'DosyeyêNewey', 'ResimêNewey' ),
 	'Newpages'                  => array( 'PeleyeNewey' ),
-	'PasswordReset'             => array( 'ParolaReset' ),
-	'PermanentLink'             => array( 'DaimiGre' ),
+	'PasswordReset'             => array( 'ParolaResetkerdış' ),
+	'PermanentLink'             => array( 'GreyoDaimi' ),
 	'Popularpages'              => array( 'PeleyêPopuleri' ),
 	'Preferences'               => array( 'Tercihi' ),
 	'Prefixindex'               => array( 'SerVerole' ),
@@ -116,13 +116,12 @@ $specialPageAliases = array(
 	'Recentchanges'             => array( 'VurnayışêPeyêni' ),
 	'Recentchangeslinked'       => array( 'GreyêVurnayışêPeyêni' ),
 	'Revisiondelete'            => array( 'RevizyoniBesterne' ),
-	'RevisionMove'              => array( 'RewizyoniAhulne' ),
 	'Search'                    => array( 'Cıgeyre' ),
 	'Shortpages'                => array( 'PeleyêKılmi' ),
 	'Specialpages'              => array( 'PeleyXısusi' ),
 	'Statistics'                => array( 'Ä°statistiki' ),
 	'Tags'                      => array( 'Etiketi' ),
-	'Unblock'                   => array( 'Bloqiwedarne' ),
+	'Unblock'                   => array( 'BloqiWedarne' ),
 	'Uncategorizedcategories'   => array( 'KategoriyêkeKategorinêbiyê' ),
 	'Uncategorizedimages'       => array( 'DosyeyêkeKategorinêbiyê' ),
 	'Uncategorizedpages'        => array( 'PeleyêkeKategorinêbiyê' ),
@@ -155,7 +154,6 @@ $magicWords = array(
 	'forcetoc'                  => array( '0', '__ESTENZARURET__', '__FORCETOC__' ),
 	'toc'                       => array( '0', '__ESTEN__', '__TOC__' ),
 	'noeditsection'             => array( '0', '__TİMARKERDIŞÇINO__', '__NOEDITSECTION__' ),
-	'noheader'                  => array( '0', '__SERNAMEÇINO__', '__NOHEADER__' ),
 	'currentmonth'              => array( '1', 'AŞMİYANEWKİ', 'MEWCUDAŞMİ2', 'CURRENTMONTH', 'CURRENTMONTH2' ),
 	'currentmonth1'             => array( '1', 'AŞMİYANEWKİ1', 'CURRENTMONTH1' ),
 	'currentmonthname'          => array( '1', 'NAMEYAŞMDANEWKİ', 'CURRENTMONTHNAME' ),
@@ -307,42 +305,42 @@ $magicWords = array(
 
 $messages = array(
 # User preference toggles
-'tog-underline' => 'Bınê gırey de xete bance:',
+'tog-underline' => 'Bınê gırey de xete bıance:',
 'tog-justify' => 'Paragrafan eyar ke',
 'tog-hideminor' => 'Vurnayışanê şenıkan pela vurnayışanê peyênan de bınımne',
 'tog-hidepatrolled' => 'Vurnayışanê qontrolkerdeyan pela vurnayışê peyêni de bınımne',
 'tog-newpageshidepatrolled' => 'Pelanê qontrolkerdeyan lista pelanê neweyan de bınımne',
 'tog-extendwatchlist' => 'Lista seyrkerdışi hera bıke ke vurnayışi pêro bıasê, tenya tewr peyêni nê',
-'tog-usenewrc' => 'Vurnayışanê peyênanê herakerdeyan bıxebetne (JavaScript lazımo)',
+'tog-usenewrc' => 'Pele be vurnayışanê grube de vurnayışê peyêni u lista seyrkerdışi (JavaScript lazımo)',
 'tog-numberheadings' => 'Sernuşteyan be xo numre cı şane',
 'tog-showtoolbar' => 'Goceganê hacetanê vurnayışi bımocne (JavaScript lazımo)',
 'tog-editondblclick' => 'Pê dı rey tıknayış pele sero bıxebetiye (JavaScript lazımo)',
 'tog-editsection' => 'Vurnayışê qısımi be gıreyanê [bıvurne] ra feal ke',
 'tog-editsectiononrightclick' => 'Qısıman be tıknayışê serrêze ra ebe gocega raşte bıvurne (JavaScript lazımo)',
 'tog-showtoc' => 'Tabloyê tedeesteyan bımocne (de pelanê be hirê sernuşteyan ra vêşêri de)',
-'tog-rememberpassword' => 'Parola mı nê cıgeyraoği de bia xo viri (seba tewr zêde $1 {{PLURAL:$1|roce|rocan}}).',
+'tog-rememberpassword' => 'Parola mı nê cıgeyrayoği de bia xo viri (seba tewr zêde $1 {{PLURAL:$1|roce|rocan}}).',
 'tog-watchcreations' => 'Pelê ke mı afernayê u dosyeyê ke mı bar kerdê lista mına seyrkerdışi ke',
 'tog-watchdefault' => 'Pel u dosyeyê ke mı vurnayê lista mına seyrkerdışi ke',
 'tog-watchmoves' => 'Pel u dosyeyê ke mı kırıştê lista mına seyrkerdışi ke',
-'tog-watchdeletion' => 'Pel u dosyeyê ke mı seterıtê lista mına seyrkerdışi ke',
+'tog-watchdeletion' => 'Pel u dosyeyê ke mı esterıtê lista mına seyrkerdışi ke',
 'tog-minordefault' => "Vurnayışanê xo pêrune ''vurnayışo qıckek'' nışan bıde",
 'tog-previewontop' => 'Verqayti pela nuştışi ser de bımocne',
 'tog-previewonfirst' => 'Vurnayışo verên de verqayti tım bımocne',
-'tog-nocache' => 'Pelanê cıgeyraoği mia xo viri',
+'tog-nocache' => 'Pelanê cıgeyrayoği meya xo viri',
 'tog-enotifwatchlistpages' => 'Jû pele ya zi dosyaya ke lista mına seyrkerdışi de vurnayê mı rê e-poste bırışe',
 'tog-enotifusertalkpages' => 'Pela mına werênayışi ke vurnayê mı rê e-poste bırışe',
 'tog-enotifminoredits' => 'Vurnayışanê qıckekanê pelan u dosyeyan de zi mı rê e-poste bırışe',
 'tog-enotifrevealaddr' => 'Adresa e-posteyê mı posteyê xeberan de bımocne',
 'tog-shownumberswatching' => 'Amarê karberanê seyrkerdoğan bımocne',
-'tog-oldsig' => 'İmzaya şıma:',
-'tog-fancysig' => 'İmza rê mameley wikimeqaley bıke (bê gıreyo otomatik)',
+'tog-oldsig' => 'Ä°mzaya mewcude:',
+'tog-fancysig' => 'İmza rê mameleyê wikimeqaley bıke (bê gıreyo otomatik)',
 'tog-externaleditor' => 'Editorê teberi standard bıxebetne (tenya seba ekspertano, komputerê şıma de eyarê xısusiy lazımê. [//www.mediawiki.org/wiki/Manual:External_editors Melumato vêşêr.])',
 'tog-externaldiff' => 'Têverşanayışan pê programê teberi vıraze (tenya seba ekspertano, komputerê şıma de eyarê xısusiy lazımê. [//www.mediawiki.org/wiki/Manual:External_editors Melumato vêşêr.])',
-'tog-showjumplinks' => 'Gırey "şo"y feal ke',
+'tog-showjumplinks' => 'Gıreyê "şo"y aktif ke',
 'tog-uselivepreview' => 'Verqayto cınde bıxebetne (JavaScript lazımo) (hewna cerrebnayış dero)',
 'tog-forceeditsummary' => 'Mı ke xulasa kerde cı vira, hay be mı ser de',
 'tog-watchlisthideown' => 'Vurnayışanê mı lista mına seyrkerdışi de bınımne',
-'tog-watchlisthidebots' => 'Vurnayışanê bota liste da seyrkerdışi de bınımne',
+'tog-watchlisthidebots' => 'Lista seyrkerdışi ra vurnayışanê boti bınımne',
 'tog-watchlisthideminor' => 'Vurnayışanê qıckekan lista mına seyrkerdışi de bınımne',
 'tog-watchlisthideliu' => 'Lista seyrkerdışi ra vurnayışanê karberanê cıkewteyan bınımne',
 'tog-watchlisthideanons' => 'Lista seyrkerdışi ra vurnayışanê karberanê anoniman bınımne',
@@ -355,23 +353,23 @@ $messages = array(
 
 'underline-always' => 'Tım',
 'underline-never' => 'Qet',
-'underline-default' => 'Qerar cıgeyraoği dest dero',
+'underline-default' => 'Cild ya zi cıgeyrayoğo hesıbyaye',
 
 # Font style option in Special:Preferences
-'editfont-style' => 'Cayê vurnayışi de tipê nuştışi:',
-'editfont-default' => 'Qerar cıgeyraoği dest dero',
-'editfont-monospace' => 'Tipê nusteyê sabıtcagırewtoği',
+'editfont-style' => 'Cayê vurnayışi de terzê nuştışi:',
+'editfont-default' => 'Cıgeyrayoğo hesabiyaye',
+'editfont-monospace' => 'Terzê nusteyê sabıtcagırewtoği',
 'editfont-sansserif' => 'Babetê Sans-serifi',
-'editfont-serif' => 'Tipê nusteyê serifi',
+'editfont-serif' => 'Babetê serifi',
 
 # Dates
 'sunday' => 'Kırê',
-'monday' => 'Berarek',
-'tuesday' => 'Telete',
+'monday' => 'Dışeme',
+'tuesday' => 'Sêşeme',
 'wednesday' => 'Çeharşeme',
 'thursday' => 'Pancşeme',
 'friday' => 'Êne',
-'saturday' => 'Bahdê êni',
+'saturday' => 'Şeme',
 'sun' => 'Krê',
 'mon' => 'Dış',
 'tue' => 'Sêş',
@@ -381,8 +379,8 @@ $messages = array(
 'sat' => 'Şem',
 'january' => 'Çele',
 'february' => 'Şıbate',
-'march' => 'Mert',
-'april' => 'Lizan',
+'march' => 'Adar',
+'april' => 'Nisane',
 'may_long' => 'Gulane',
 'june' => 'Heziran',
 'july' => 'Temuze',
@@ -441,11 +439,11 @@ $messages = array(
 
 'about' => 'Heqa',
 'article' => 'Wesiqe',
-'newwindow' => '(zerreyê pençereyê newey de beno a)',
+'newwindow' => '(pençereyê newey de beno a)',
 'cancel' => 'Bıtexelne',
 'moredotdotdot' => 'Vêşi...',
-'mypage' => 'Pela mı',
-'mytalk' => 'Werênayışê mı',
+'mypage' => 'Per',
+'mytalk' => 'Werênayış',
 'anontalk' => 'Pela werênayışê nê IPy',
 'navigation' => 'Geyrayış',
 'and' => '&#32;u',
@@ -456,14 +454,14 @@ $messages = array(
 'qbedit' => 'Bıvurne',
 'qbpageoptions' => 'Ena pele',
 'qbmyoptions' => 'Pelê mı',
-'qbspecialpages' => 'Peley xısusi',
+'qbspecialpages' => 'Pelê xısusiy',
 'faq' => 'PZP (Persê ke zehf persiyenê)',
 'faqpage' => 'Project: PZP',
 
 # Vector skin
 'vector-action-addsection' => 'Mesel Vırazê',
 'vector-action-delete' => 'Besterne',
-'vector-action-move' => 'Bere',
+'vector-action-move' => 'Berê',
 'vector-action-protect' => 'Bıpawe',
 'vector-action-undelete' => 'Esterıtışi peyser bıgê',
 'vector-action-unprotect' => 'Starkerdışi bıvurne',
@@ -471,9 +469,9 @@ $messages = array(
 'vector-view-create' => 'Vıraze',
 'vector-view-edit' => 'Bıvurne',
 'vector-view-history' => 'Vurnayışê verêni',
-'vector-view-view' => 'Bıwanê',
+'vector-view-view' => 'Bıwane',
 'vector-view-viewsource' => 'Çımey bıvêne',
-'actions' => 'Kerdeni',
+'actions' => 'Kerdışi',
 'namespaces' => 'Cayê namey',
 'variants' => 'Varyanti',
 
@@ -509,7 +507,7 @@ $messages = array(
 'talkpage' => 'Ena pele sero werêne',
 'talkpagelinktext' => 'Mesac',
 'specialpage' => 'Pela xısusiye',
-'personaltools' => 'Haletê şexsi',
+'personaltools' => 'Hacetê şexsiy',
 'postcomment' => 'Qısımo newe',
 'articlepage' => 'Pela zerreki bıvêne',
 'talk' => 'Werênayış',
@@ -556,8 +554,8 @@ $1',
 'mainpage' => 'Pera Seri',
 'mainpage-description' => 'Pela Seri',
 'policy-url' => 'Project:Terzê hereketi',
-'portal' => 'Portalê şêlıgi',
-'portal-url' => 'Project:Portalê şêlıgi',
+'portal' => 'Portalê cemaeti',
+'portal-url' => 'Project:Portalê cemaeti',
 'privacy' => 'Madeyê dızdiye',
 'privacypage' => 'Project:Xısusiyetê nımtışi',
 
@@ -611,7 +609,7 @@ $1',
 'sort-ascending' => 'Ratnayışê Zeydnayışi',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
-'nstab-main' => 'Per',
+'nstab-main' => 'Pele',
 'nstab-user' => 'Pera Karberi',
 'nstab-media' => 'Pela Medya',
 'nstab-special' => 'Pela xısusiye',
@@ -703,7 +701,7 @@ $2',
 'namespaceprotected' => "No '''$1''' ca de icazetê şıma çino şıma pel rêz keri.",
 'customcssprotected' => 'Mısadeyê şıma çıniyo ke na pela CSSi bıvurnên, çıke na pela xısusiye eyaranê karberan muhtewa kena.',
 'customjsprotected' => 'Mısadeyê şıma çıniyo ke na pela Java Scripti bıvurnên, çıke na pela xısusiye eyaranê karberan muhtewa kena.',
-'ns-specialprotected' => 'Peley xısusi nênê vurnayış.',
+'ns-specialprotected' => 'Pelê xısusiy nênê vurnayış.',
 'titleprotected' => 'Eno [[User:$1|$1]] zerreyê ena peli nişeno vuriye.
 Sebeb: "\'\'$2\'\'".',
 'filereadonlyerror' => 'Dosyay vurnayışê "$1" nê abê no lakin depoy dosya da "$2" mod dê  salt wendi deyo.
@@ -731,24 +729,24 @@ Hesabê şıma biyo a.
 'yourname' => 'Namey karberi',
 'yourpassword' => 'Parola',
 'yourpasswordagain' => 'Parola reyna bınusne:',
-'remembermypassword' => 'Parola mı nê cıgeyraoği de biya xo viri (heta $1 {{PLURAL:$1|roc|roci}}).',
+'remembermypassword' => 'Parola mı nê cıgeyrayoği de bia xo viri (seba tewr zêde $1 {{PLURAL:$1|roce|rocan}})',
 'securelogin-stick-https' => "Dekewtış kerdışi dıma HTTPS'i dı grêdaye bıman",
 'yourdomainname' => 'Nameyê şıma yo meydani',
 'password-change-forbidden' => 'Şıma na wiki de nêşenê parola bıvurnê.',
 'externaldberror' => 'Ya database de xeta esta ya zi heqê şıma çino şıma no hesab bıvurni.',
-'login' => 'Ronıştış akerê',
+'login' => 'Cı kewe',
 'nav-login-createaccount' => 'Dekew de / hesab vıraze',
 'loginprompt' => "{{SITENAME}} dı ronıştış akerdışi rê ''çerezan'' aktiv kerdış icab keno.",
 'userlogin' => 'Cı kewe / hesab vıraze',
-'userloginnocreate' => 'Ronıştış akerê',
-'logout' => 'Veciyayış',
+'userloginnocreate' => 'Cı kewe',
+'logout' => 'Bıveciye',
 'userlogout' => 'Bıveciye',
 'notloggedin' => 'Hesab akerde niyo',
 'nologin' => "Hesabê şıma çıniyo? '''$1'''.",
 'nologinlink' => 'Yew hesab ake',
 'createaccount' => 'Hesab vıraze',
 'gotaccount' => "Hesabê şıma esto? '''$1'''.",
-'gotaccountlink' => 'Ronıştış akerê',
+'gotaccountlink' => 'Cı kewe',
 'userlogin-resetlink' => 'Melumatê cıkewtışi xo vira kerdê?',
 'createaccountmail' => 'mı rê e-mail sera parola bırışe',
 'createaccountreason' => 'Sebeb:',
@@ -896,7 +894,7 @@ Parola vêrdiye: $2',
 'image_sample' => 'Misal resim.jpg',
 'image_tip' => 'Dosyaya gumın',
 'media_sample' => 'misal.jpg',
-'media_tip' => 'Gırey dosya',
+'media_tip' => 'Gıreyê dosya',
 'sig_tip' => 'Ä°mza u wext',
 'hr_tip' => 'Çıxiza dimdayi (hend akar mefiye)',
 
@@ -999,7 +997,7 @@ Dosyanê be namey .css u .js'i de herfa werdiye bıgurêne, mesela herında {{ns
 'note' => "'''Not:'''",
 'previewnote' => "'''Xo vira mekerê ke ena yew verqayta.'''
 Vurnayışê şıma hona qeyd nêbiyo!",
-'continue-editing' => 'Vurnayışi rê dewam ke',
+'continue-editing' => 'Şo herunda vurnayışi',
 'previewconflict' => 'No seyrkerdışê verqaydi serê qutiyê nuşte tezim kerdış de yo, eke şıma qayile vurnayişê maddeyi seyino bıvini, no mocneno şıma.',
 'session_fail_preview' => 'Ma ef kere. Vindibiyayişê tayê datay ra a kerdışê hesabê şıma de ma vurnayişê şıma qayd nêkerd. Newe ra tesel (cereb) bıkere. Eke no qayde zi nêbo, [[Special:UserLogout|hesabê xo bıqefelne]] u newera a kere.',
 'session_fail_preview_html' => "'''Ma meluli! Sebayê vindbiyayişê datasistemi ma vurnayişê şıma nêeşkeni qaydker.'''
@@ -1011,7 +1009,7 @@ Vurnayışê şıma hona qeyd nêbiyo!",
 Vurnayişê şıma qey nêxerepyayişê peli tepeya geyra a.
 Eke şıma servisê proksi yo anonim şuxulneni sebebê ey noyo.'''",
 'edit_form_incomplete' => "'''Qandê form dê vurnayışa tay wastera ma nêreşti; Vurnayışê ke şıma kerdê nêalızyayê, çım ra ravyarnê u fına bıcerbnê.'''",
-'editing' => 'Pela "$1"\'i bıvurnê',
+'editing' => 'Şımayê kenê <font style="color:red">$1</font> bıvurnê',
 'creating' => "Pela $1'i vıraze",
 'editingsection' => 'Per da $1 de şımaye kenê ke leti bıvurnê',
 'editingcomment' => '$1 vuryeno (qısmo newe)',
@@ -1320,9 +1318,9 @@ Detayê besternayışi [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}
 'searchhelp-url' => 'Help:Tedeestey',
 'searchmenu-prefix' => '[[Special:PrefixIndex/$1|pê eno prefix ser pelan de bigêre]]',
 'searchprofile-articles' => 'Pelê tedeestey',
-'searchprofile-project' => 'Pelê yardım u projey',
+'searchprofile-project' => 'Pelê yardım u procey',
 'searchprofile-images' => 'Multimedya',
-'searchprofile-everything' => 'Hemnan',
+'searchprofile-everything' => 'Her çi',
 'searchprofile-advanced' => 'Raverşiyaye',
 'searchprofile-articles-tooltip' => '$1 de bigêre',
 'searchprofile-project-tooltip' => '$1 de bigêre',
@@ -1348,7 +1346,7 @@ Detayê besternayışi [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}
 'showingresultsheader' => "{{PLURAL:$5|Neticeyê '''$1''' of '''$3'''|Neticeyanê '''$1 - $2''' hetê '''$3'''}} qe '''$4'''",
 'nonefound' => "'''Teme''': Teyna tay namecayan cıgeyro beno.
 Pe verbendi ''all:'', vaceyê xo bıvurni ki contenti hemi cıgeyro (pelanê mınaqeşe, templatenan, ucb.) ya zi cıgeyro ser namecay ki tı wazeni.",
-'search-nonefound' => 'Zey cıgeyrayış de şıma netice nêvineya',
+'search-nonefound' => 'Zey perskerdışê şıma netice nêvêniya.',
 'powersearch' => 'Cıgeyrayışo hera',
 'powersearch-legend' => 'Cıgeyrayışo hera',
 'powersearch-ns' => 'Cayanê nameyan de cıgeyrayış:',
@@ -1371,7 +1369,7 @@ Pe verbendi ''all:'', vaceyê xo bıvurni ki contenti hemi cıgeyro (pelanê mı
 
 # Preferences page
 'preferences' => 'Tercihi',
-'mypreferences' => 'Tercihê mı',
+'mypreferences' => 'Tercihi',
 'prefs-edits' => 'Amarê vurnayışan:',
 'prefsnologin' => 'Şıma cıkewtış nêvıraşto',
 'prefsnologintext' => 'Şıma gani be <span class="plainlinks">[{{fullurl:{{#Special:UserLogin}}|returnto=$1}} cikewte]</span> ke tercihanê karberi xo eyar bıkerê.',
@@ -1397,7 +1395,7 @@ Pe verbendi ''all:'', vaceyê xo bıvurni ki contenti hemi cıgeyro (pelanê mı
 'prefs-setemail' => 'E-posta adresiyê xo saz kerê',
 'prefs-email' => 'Tercihê e-maili',
 'prefs-rendering' => 'Asayış',
-'saveprefs' => 'Star ke',
+'saveprefs' => 'Qeyd ke',
 'resetprefs' => 'Vurnayışê ke qeyd nêbiy, pak ke',
 'restoreprefs' => 'Sazanê hesıbyaya pêron newe dere barke',
 'prefs-editing' => 'Cay pela nustısi',
@@ -1407,7 +1405,7 @@ Pe verbendi ''all:'', vaceyê xo bıvurni ki contenti hemi cıgeyro (pelanê mı
 'searchresultshead' => 'Cı geyre',
 'resultsperpage' => 'Serê pele  amarê cıkewtoğan:',
 'stub-threshold' => 'Baraj ke <a href="#" class="stub">stub link</a> ho şekil dano (bîtî):',
-'stub-threshold-disabled' => 'Dezge ra vıcyaya',
+'stub-threshold-disabled' => 'Astengın',
 'recentchangesdays' => 'Rocê ke vurnayışanê peyênan de bıasê:',
 'recentchangesdays-max' => 'Tewr zaf $1 {{PLURAL:$1|roc|roci}}',
 'recentchangescount' => 'Amarê vurnayışê ke hesıbyaye deye bımocneyê:',
@@ -1423,13 +1421,13 @@ Etıya şıma rê yew kılito raştameo ke şıma şenê bıgurenê/bıxebetnê:
 'timezoneoffset' => 'Offset¹:',
 'servertime' => 'Wextê serveri:',
 'guesstimezone' => 'Browser ra pırr ke',
-'timezoneregion-africa' => 'Afriqa',
+'timezoneregion-africa' => 'Afrika',
 'timezoneregion-america' => 'Amerika',
 'timezoneregion-antarctica' => 'Antarktika',
 'timezoneregion-arctic' => 'Arktik',
 'timezoneregion-asia' => 'Asya',
 'timezoneregion-atlantic' => 'Okyanuso Atlantik',
-'timezoneregion-australia' => 'Evistiralya',
+'timezoneregion-australia' => 'Awıstralya',
 'timezoneregion-europe' => 'Ewropa',
 'timezoneregion-indian' => 'Okyanuso Hind',
 'timezoneregion-pacific' => 'Okyanuso Pasifik',
@@ -1437,7 +1435,7 @@ Etıya şıma rê yew kılito raştameo ke şıma şenê bıgurenê/bıxebetnê:
 'prefs-searchoptions' => 'Cı geyre',
 'prefs-namespaces' => 'Caê namey',
 'defaultns' => 'Eke heni, enê cayanê namey de cı geyre (sae ke):',
-'default' => 'hesıbyaye',
+'default' => 'qısur',
 'prefs-files' => 'Dosyey',
 'prefs-custom-css' => 'CSSê xasi',
 'prefs-custom-js' => 'JSê xasi',
@@ -1463,10 +1461,10 @@ Na game tepeya nêerziyena.',
 Etiketê HTMLî kontrol bike.',
 'badsiglength' => 'İmzayê şıma zaf dergo.
 $1 gani bınê no {{PLURAL:$1|karakter|karakter}} de bıbo.',
-'yourgender' => 'Neri makey:',
+'yourgender' => 'Cınsiyet:',
 'gender-unknown' => 'Cınsiyet nêvato',
-'gender-male' => 'cıwamêrd',
-'gender-female' => 'Cenıke',
+'gender-male' => 'Camêrd',
+'gender-female' => 'Cıniye',
 'prefs-help-gender' => 'keyfiyo: sofware qey adersê cinsiyet şuxulneno, no malumat umumiyo.',
 'email' => 'E-posta',
 'prefs-help-realname' => 'Nameyo raşt waştena şıma rê mendo.
@@ -1475,8 +1473,8 @@ Eka tu wazene ke nameyo raşt xo bide, ma nameyo raşt ti iştirakanê ti de moc
 'prefs-help-email-others' => 'Şıma şenê weçinê ke ê bini be yew gırey pela şımaya karberi ya zi pela werênayışi sera şıma de ebe e-poste irtıbat kewê.
 Kaberê bini ke şıma de kewti irtıbat, adresa e-postey şıma eşkera nêbena.',
 'prefs-help-email-required' => 'E-mail adrese mecburiya.',
-'prefs-info' => 'Seron zanayış',
-'prefs-i18n' => 'Şaryayış kerdış',
+'prefs-info' => 'Melumato bıngeh',
+'prefs-i18n' => 'Beynelmılelkerdış',
 'prefs-signature' => 'Ä°mza',
 'prefs-dateformat' => 'Formatê tarixi',
 'prefs-timeoffset' => 'Wext offset',
@@ -1497,7 +1495,7 @@ Kaberê bini ke şıma de kewti irtıbat, adresa e-postey şıma eşkera nêbena
 # User rights
 'userrights' => 'İdarey heqanê karberan',
 'userrights-lookup-user' => 'Grubanê karberi/karbere idare bıke',
-'userrights-user-editname' => 'Yew namey karberi bınusne',
+'userrights-user-editname' => 'Yew nameyê karberi cı kewe:',
 'editusergroup' => 'Grupanê karberi/karbere bıvurne (bıbedelne)',
 'editinguser' => "'''[[User:$1|$1]]''' keno weziyetê $2'i bıvurno",
 'userrights-editusergroup' => 'Grubanê karberi/karbere sero bıgureye (bıxebetiye)',
@@ -1542,7 +1540,7 @@ Kaberê bini ke şıma de kewti irtıbat, adresa e-postey şıma eşkera nêbena
 'grouppage-suppress' => '{{ns:project}}:Qontrol',
 
 # Rights
-'right-read' => 'Pelan bıwanê',
+'right-read' => 'Pelan bıwane',
 'right-edit' => 'Pele bıvurne',
 'right-createpage' => 'Pele vıraze (pelê ke ê werênayışi niyê)',
 'right-createtalk' => 'Pela werênayışi vıraze',
@@ -1608,6 +1606,9 @@ Kaberê bini ke şıma de kewti irtıbat, adresa e-postey şıma eşkera nêbena
 'rightslogtext' => 'Ena listeyê loganê ke heqqa karbaranî mucneno.',
 'rightslogentry' => 'eza biyayişê grupî $1 ra $2 rê $3î bivurne',
 'rightslogentry-autopromote' => '$2 otomatikmen gırdkerdışi ra kerd $3.',
+'logentry-rights-rights' => '$1 qandê $3 rê ezayina grube $4 ra $5 vuriye',
+'logentry-rights-rights-legacy' => '$1 qandê $3 rê ezayina grube vuriye',
+'logentry-rights-autopromote' => '$1 otomatikmen $4 ra terfi bi ra $5',
 'rightsnone' => '(çino)',
 
 # Associated actions - in the sentence "You do not have permission to X"
@@ -1641,7 +1642,7 @@ Kaberê bini ke şıma de kewti irtıbat, adresa e-postey şıma eşkera nêbena
 'action-patrol' => 'vurnayîşê karberanê binî nişan bike patrol biye',
 'action-autopatrol' => 'vurnayîşê xoye nişan bike ke belli biyo patrol biye',
 'action-unwatchedpages' => 'listeyê pelanê seyirnibiya bivîne',
-'action-mergehistory' => 'tarixê ena pele yew bike',
+'action-mergehistory' => 'tarixê ena pele yew ke',
 'action-userrights' => 'heqqa karberanê hemî bivurne',
 'action-userrights-interwiki' => 'heqqa karberanê ke wikiyê binî de hemî bivurne',
 'action-siteadmin' => 'database kilit bike ya zi a bike',
@@ -1650,23 +1651,23 @@ Kaberê bini ke şıma de kewti irtıbat, adresa e-postey şıma eşkera nêbena
 # Recent changes
 'nchanges' => '$1 {{PLURAL:$1|fın vurna|fıni vurna}}',
 'recentchanges' => 'Vurnayışê peyêni',
-'recentchanges-legend' => 'Tercihê vurnayışanê peniyan',
-'recentchanges-summary' => 'Ena pele de wiki sero vurnayışê peyêni teqib ke',
+'recentchanges-legend' => 'Tercihê vurnayışanê peyênan',
+'recentchanges-summary' => 'Ena pele de wiki sero vurnayışanê peyênan teqib ke.',
 'recentchanges-feed-description' => 'Ena feed dı vurnayişanê tewr peniyan teqip bık.',
 'recentchanges-label-newpage' => 'Enê vurnayışi pelaya newi vıraşt',
-'recentchanges-label-minor' => 'Eno vurnayışo do qickek o',
+'recentchanges-label-minor' => 'Eno yew vurnayışo qıckeko',
 'recentchanges-label-bot' => 'Yew boti xo het ra no vurnayış vıraşto',
-'recentchanges-label-unpatrolled' => 'Eno edît patrol nibiyo',
+'recentchanges-label-unpatrolled' => 'Eno vurnayış hewna dewriya nêbiyo',
 'rcnote' => "Bıni dı {{PLURAL:$1|'''1''' vurnayış|peyni de '''$1''' vurnayışi estê}} {{PLURAL:$2|roc|'''$2''' roci}}, hetana $5, $4.",
 'rcnotefrom' => "Cêr de '''$2''' ra nata vurnayışiyê asenê (tewr vêşi <b> '''$1'''</b> asenê).",
 'rclistfrom' => '$1 ra vurnayışanê neweyan bımocne',
-'rcshowhideminor' => 'Vurnayışanê werdiya $1',
-'rcshowhidebots' => 'Bota $1',
-'rcshowhideliu' => 'Karberanê qeydına $1',
+'rcshowhideminor' => 'Vurnayışanê werdiyan $1',
+'rcshowhidebots' => 'Botan $1',
+'rcshowhideliu' => 'Karberanê qeydınan $1',
 'rcshowhideanons' => 'Karberanê anoniman $1',
 'rcshowhidepatr' => '$1 vurnayışê ke dewriya geyrayê',
-'rcshowhidemine' => 'nuştışanê mı $1',
-'rclinks' => 'Peyni $2 rocan de vurnayışa $1  bımocne <br />$3',
+'rcshowhidemine' => 'Vurnayışanê mı $1',
+'rclinks' => 'Peyniya $2 rocan de $1 vurnayışan bımocne <br />$3',
 'diff' => 'ferq',
 'hist' => 'verên',
 'hide' => 'Bınımne',
@@ -2045,7 +2046,7 @@ listeya ke ha ver a têna na {{PLURAL:$1|dosyaya ewwili|dosyaya $1 ewwili}} mocn
 'unusedtemplateswlh' => 'linkanê binî',
 
 # Random page
-'randompage' => 'Peleya ke raştamê',
+'randompage' => 'Pela raştameyiye',
 'randompage-nopages' => 'Ena {{PLURAL:$2|cayêname|cayênameyî}} de enê pelan çin o: $1.',
 
 # Random redirect
@@ -2060,7 +2061,7 @@ listeya ke ha ver a têna na {{PLURAL:$1|dosyaya ewwili|dosyaya $1 ewwili}} mocn
 'statistics-header-users' => 'Îstatistiksê karberî',
 'statistics-header-hooks' => 'Îstatistiksê binî',
 'statistics-articles' => 'Pelanê tedesteyî',
-'statistics-pages' => 'Peri',
+'statistics-pages' => 'Peli',
 'statistics-pages-desc' => 'Pelanê hemî ke wîkî de estê, pelanê mineqeşeyî, redireksiyon ucb... dehil o.',
 'statistics-files' => 'Dosyayê bar biye',
 'statistics-edits' => 'Amarê vurnayîşî ke wextê {{SITENAME}} ronayîşî ra',
@@ -2153,7 +2154,7 @@ gıreyê her satıri de gıreyi; raş motışê yewın u dıyıni esto.
 'newpages' => 'Pelê newey',
 'newpages-username' => 'Nameyê karberi:',
 'ancientpages' => 'Wesiqeyê ke vurnayışê ciyê peyeni tewr kehani',
-'move' => 'Bere',
+'move' => 'Berdış',
 'movethispage' => 'Ena pele bere',
 'unusedimagestext' => 'Enê dosyey estê, feqet zerrey yew pele de wedardey niyê.
 Xo vira mekerê ke, sıteyê webiê bini şenê direkt ebe URLi yew dosya ra gırê bê, u wına şenê verba gurênayışo feal de tiya hewna lista bê.',
@@ -2228,8 +2229,9 @@ hem zi bıewnê [[Special:WantedCategories|kategori yê ke waziyeni]].',
 'linksearch-pat' => 'bıgêr motif:',
 'linksearch-ns' => 'Cayênameyî:',
 'linksearch-ok' => 'Cı geyre',
-'linksearch-text' => 'joker ê zey "*.wikipedia.org"i karneno.<br />
-qaydeyê destek biyayeyi: <code>$1</code>',
+'linksearch-text' => 'Jokeri ê zey "*.wikipedia.org"i benê ke bıgureniyê.
+Tewr senık yew sewiya serêna cayê tesiri lazıma, mesela "*.org".<br />
+Qeydeyê destegbiyayey: <code>$1</code> (qet yew qeydeyo hesabiyaye http:// ke name nêbiyo).',
 'linksearch-line' => '$1, $2 ra link biya',
 'linksearch-error' => 'jokeri têna nameyê makina ya serekini de aseni/eseni.',
 
@@ -2268,8 +2270,8 @@ qey heqê şexsi de [[{{MediaWiki:Listgrouprights-helppage}}|hema malumato ziyed
 'listgrouprights-removegroup' => '{{PLURAL:$2|Grube|Gruban}} bıvecê: $1',
 'listgrouprights-addgroup-all' => 'şıma hesabê xo re heme gruban eşkeni têare bıkeri',
 'listgrouprights-removegroup-all' => 'şıma hesabê xo ra heme gruban eşkeni veci',
-'listgrouprights-addgroup-self' => 'şıma hesabê xo re eşkeni {{PLURAL:$2|grub|gruban}} têare bıkerî: $1',
-'listgrouprights-removegroup-self' => 'şıma hesabê xo ra eşkeni {{PLURAL:$2|grub|gruban}} bıveci: $1',
+'listgrouprights-addgroup-self' => 'Hesabê xo rê {{PLURAL:$2|grube|gruban}} cı kerê: $1',
+'listgrouprights-removegroup-self' => 'Hesabê xo ra {{PLURAL:$2|grube|gruban}} bıvecê: $1',
 'listgrouprights-addgroup-self-all' => 'şıma eşkeni hesabê xo re heme gruban têare bıkerî',
 'listgrouprights-removegroup-self-all' => 'şıma hesabê xo ra eşkeni heme gruban bıveci',
 
@@ -2280,8 +2282,8 @@ qey heqê şexsi de [[{{MediaWiki:Listgrouprights-helppage}}|hema malumato ziyed
 'emailuser-title-target' => 'Na E-postaya {{GENDER:$1|karberi}}ya',
 'emailuser-title-notarget' => 'E-postaya karberi',
 'emailpage' => 'karberi re e-posta bırışê',
-'emailpagetext' => 'no/na karberi re e-posta erşawıtışi de şıma pê forma cêrıni eşkeni kar bıkerî.
-[[Special:Preferences|tercihanê şıma ye karberi]] de adresa e-posta ya ke şıma dayo, na adres qısmê adresa e-postayi de "From (kam ra)" asena, no sebebi ra gırewtox/e eşkeno/a direk cewab bıdo şıma.',
+'emailpagetext' => 'Şıma şenê nê formê cêrêni nê {{GENDER:$1|karber}}i rê e-poste rıştış de bıgurenê.
+[[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.',
 'usermailererror' => 'xizmetê e-postayi xeta da:',
 'defemailsubject' => '"$1" ra e-postay {{SITENAME}} amê',
 'usermaildisabled' => 'E-mailê karberani kafiliyeya',
@@ -2313,7 +2315,7 @@ qey heqê şexsi de [[{{MediaWiki:Listgrouprights-helppage}}|hema malumato ziyed
 
 # Watchlist
 'watchlist' => 'Lista mına seyrkerdışi',
-'mywatchlist' => 'Lista mına seyrkerdışi',
+'mywatchlist' => 'Lista seyr kerdışi',
 'watchlistfor2' => 'Qandê $1 ($2)',
 'nowatchlist' => 'listeya temaşa kerdıişê şıma de yew madde zi çina.',
 'watchlistanontext' => 'qey vurnayişê maddeya listeya temaşakerdişi $1.',
@@ -2410,7 +2412,7 @@ Qe qeydê wedarnayışi, $2 bevinin.',
 ** talebê nuştekari
 ** ihlalê heqê telifi
 ** Vandalizm',
-'delete-edit-reasonlist' => 'sebebê hewn a kerdışani bıvurn',
+'delete-edit-reasonlist' => 'Sebebê vurnayışan bıvurne',
 'delete-toobig' => 'no pel, pê $1 {{PLURAL:$1|tene vuriyayiş|tene vuriyayiş}}i wayirê yew tarixo kehen o.
 qey hewna nêşiyayişi wina pelani u {{SITENAME}}nêxerebnayişê keyepeli yew hed niyaya ro.',
 'delete-warning-toobig' => 'no pel wayirê tarixê vurnayiş ê derg o, $1 {{PLURAL:$1|revizyonê|revizyonê}} seri de.
@@ -2562,16 +2564,16 @@ $1',
 
 # Namespace form on various pages
 'namespace' => 'Cayê namey:',
-'invert' => 'Bê weçineni ê bina peyser biya',
+'invert' => 'Weçinıtışo peyserki',
 'tooltip-invert' => 'nameyo ke nışan biyo (u nameyo elekeyın zi nışanyyayo se) vurnayışan  zerrekan nımtışi re ena dore tesdiqi nışan kerê',
-'namespace_association' => 'Cayê nameyanê elaqadaran',
+'namespace_association' => 'Cayê nameyanê eleqedaran',
 'tooltip-namespace_association' => 'Herunda canemiya elekeyın nışan kerdışi sero qıse kerdışi yana zerre dekerdışi rê ena dora tesdiqi nışan kerê',
 'blanknamespace' => '(Ser)',
 
 # Contributions
 'contributions' => 'İştiraqê karberi',
 'contributions-title' => 'Dekerdenê karber de $1',
-'mycontris' => 'İştıraqê mı',
+'mycontris' => 'Cıkerdışi',
 'contribsub2' => 'Qandê $1 ($2)',
 'nocontribs' => 'Ena kriteriya de vurnayîş çini yo.',
 'uctop' => '(top)',
@@ -2599,7 +2601,7 @@ Cıkewtışo tewr peyêno ke bloke biyo, cêr seba referansi belikerdeyo:',
 # What links here
 'whatlinkshere' => 'Gıreyê pele',
 'whatlinkshere-title' => 'Per da "$1" rê perê ke gre danê',
-'whatlinkshere-page' => 'Per:',
+'whatlinkshere-page' => 'Pele:',
 'linkshere' => "Ena peleyan grey biya '''[[:$1]]''':",
 'nolinkshere' => "Per da '''[[:$1]]''' rê pera ke gıre dana çıniya.",
 'nolinkshere-ns' => "Ena cayê nameyî de yew pel zi '''[[:$1]]''' rê link nibeno.",
@@ -2612,7 +2614,7 @@ Cıkewtışo tewr peyêno ke bloke biyo, cêr seba referansi belikerdeyo:',
 'whatlinkshere-hideredirs' => 'Hetenayışê $1',
 'whatlinkshere-hidetrans' => 'Açarnayışê $1',
 'whatlinkshere-hidelinks' => 'Greyê $1',
-'whatlinkshere-hideimages' => 'Gireyê resımi $1',
+'whatlinkshere-hideimages' => 'Gıreyê dosya $1',
 'whatlinkshere-filters' => 'Avrêci',
 
 # Block/unblock
@@ -2694,7 +2696,7 @@ Cıkewtışo tewr peyêno ke bloke biyo, cêr seba referansi belikerdeyo:',
 'blocklink' => 'kılit ke',
 'unblocklink' => 'bloqi hewad',
 'change-blocklink' => 'kılit-kerdışi bıvurne',
-'contribslink' => 'dekerdeni',
+'contribslink' => 'iştıraqi',
 'emaillink' => 'e-poste bırışe',
 'autoblocker' => 'Şıma otomatikmen kılit biy, çıke adresa şımawa \'\'IP\'\'y terefê "[[User:$1|$1]]" gureniyena.
 Sebebê kılit-biyayışê $1\'i: "$2"o',
@@ -2893,7 +2895,7 @@ eke şıma qayili paşt bıdi mahalli kerdışê wikimedyayi, kerem kerê pelê
 'allmessages-filter-all' => 'Pêro',
 'allmessages-filter-modified' => 'Vurnaye',
 'allmessages-prefix' => 'pê prefiks filtre bıker',
-'allmessages-language' => 'Ziwan:',
+'allmessages-language' => 'Zıwan:',
 'allmessages-filter-submit' => 'Şo',
 
 # Thumbnails
@@ -2988,7 +2990,7 @@ dosyaya emaneti vindbiyo',
 'tooltip-pt-mycontris' => 'Listey iştıraqan',
 'tooltip-pt-login' => 'Mayê şıma ronıştış akerdışi rê dawet keme; labelê ronıştış mecburi niyo',
 'tooltip-pt-anonlogin' => 'Seba cıkewtışi şıma rê dewato; labelê, no zeruri niyo',
-'tooltip-pt-logout' => 'Bıveciyên',
+'tooltip-pt-logout' => 'Bıveciye',
 'tooltip-ca-talk' => 'Zerrey pela sero werênayış',
 'tooltip-ca-edit' => 'Tı şenay na pele bıvurnê.
 Kerem ke, qeydkerdış ra ver gocega verqayti bıxebetne.',
@@ -3590,15 +3592,16 @@ mw.loader.using( 'jquery.cookie', function() {
 
 # Info page
 'pageinfo-title' => 'Heq tê "$1"\'i',
-'pageinfo-not-current' => 'Melumat tenya qandê çımraviyarnayışê rocaney mocniyeno.',
+'pageinfo-not-current' => 'Qısur de mevêne, rewizyonanê verênan rê nê melumatan dayış mumkın niyo',
 'pageinfo-header-basic' => 'Seron zanayış',
-'pageinfo-header-edits' => 'Vurnayışi verêni',
-'pageinfo-header-restrictions' => 'Xısusiyetê pela',
-'pageinfo-header-properties' => 'Xısusiyetê pela',
-'pageinfo-display-title' => 'Asenge sernuşte',
+'pageinfo-header-edits' => 'Vurnayışê verêni',
+'pageinfo-header-restrictions' => 'Sıtarkerdışê pele',
+'pageinfo-header-properties' => 'Xısusiyetê pele',
+'pageinfo-display-title' => 'Sernuştey bımocne',
 'pageinfo-default-sort' => 'Hesıbyaye mırfeyo kılm',
 'pageinfo-length' => 'Derdeya pela (bayti heta)',
 'pageinfo-article-id' => 'Nımrey pela',
+'pageinfo-language' => 'Zıwanê zerreyê pele',
 'pageinfo-robot-policy' => 'Weziyetê motor de cıgeyrayışi',
 'pageinfo-robot-index' => 'Ä°Indeksbiyayen',
 'pageinfo-robot-noindex' => 'İndeksnêbiyayen',
@@ -3619,7 +3622,7 @@ mw.loader.using( 'jquery.cookie', function() {
 'pageinfo-magic-words' => '{{PLURAL:$1|Çekuya|Çekuyê}} ($1) sihırini',
 'pageinfo-hidden-categories' => '{{PLURAL:$1|Kategoriye|Kategoriyan}} ($1) bınımne',
 'pageinfo-templates' => '{{PLURAL:$1|Şablon|Şabloni}} ($1) açarneyayê',
-'pageinfo-toolboxlink' => 'Malumatê perer',
+'pageinfo-toolboxlink' => 'Melumatê pele',
 'pageinfo-redirectsto' => 'Beno hetê',
 'pageinfo-redirectsto-info' => 'melumat',
 'pageinfo-contentpage' => 'Zey jû pela zerreki hesebiyena',
@@ -4000,7 +4003,7 @@ $8',
 
 # EXIF attributes
 'exif-compression-1' => 'Nêdegusneyayo',
-'exif-compression-2' => 'CCITT Group 3 1-Dimensiyonel dergeya cı timarkerdışê cı bıwanê',
+'exif-compression-2' => 'CCITT Grube 3 1-ebadın kodkerdışê dergiya gurenayışê Huffmanio modifiyekerde',
 'exif-compression-3' => 'CCITT Group 3 fax kodkerdış',
 'exif-compression-4' => 'CCITT Group 4 fax kodkerdış',
 'exif-compression-5' => 'LZW',
@@ -4197,7 +4200,7 @@ $8',
 'exif-ycbcrpositioning-1' => 'Wertekerdış',
 'exif-ycbcrpositioning-2' => 'Wayırê-site',
 
-'exif-dc-contributor' => 'Dekerdeni',
+'exif-dc-contributor' => 'İştıraqkeri',
 'exif-dc-coverage' => 'Heruna yana wextin grotışa medya',
 'exif-dc-date' => 'Tarix(i)',
 'exif-dc-publisher' => 'Hesrekar',
@@ -4519,6 +4522,7 @@ Ti hem zi eşkeno [[Special:EditWatchlist|use the standard editor]].',
 'version-license' => 'Lisans',
 'version-poweredby-credits' => "Ena wiki, dezginda '''[//www.mediawiki.org/ MediaWiki]''' ya piya vıraziyaya, heqê telifi © 2001-$1 $2.",
 'version-poweredby-others' => 'Zewmi',
+'version-credits-summary' => 'Ma qayılime ke [[Special:Version|MediaWiki]] rê ke kami desteg dayo wa mayê vanime inan bışınasne.',
 'version-license-info' => "MediaWiki xoseri jew nuştereno; MediaWiki'yer, weqfê xoseri nuşteren GNU lisansiya merdumi şene ke vıla kerê, bıvurnê u timar kerê.
 
 Nuşterenê MediaWiki merdumi cı ra nahfat bivinê deye êyê mısade danê; feqet ke nêşeno BIROŞO yana XOSERİ VILA KERO qerantiya ney çına. bewni rê lisansta GNU'y.
@@ -4552,7 +4556,7 @@ Resımi be tam asayış mocniyayê, tipê dosyaê bini be programê cıyo elaqed
 'fileduplicatesearch-noresults' => 'Ebe namey "$1" ra dosya nêdiyayê.',
 
 # Special:SpecialPages
-'specialpages' => 'Peley xısusi',
+'specialpages' => 'Pelê xısusiy',
 'specialpages-note' => '----
 * Xısusi pelaya normal
 * <span class="mw-specialpagerestricted">Xısusi peleyê keı rê ray nê deyaya.</span>
@@ -4600,8 +4604,8 @@ satır ê ke pê ney # # destpêkenê zey mışore/mıjore muamele vineno.
 # Special:ComparePages
 'comparepages' => 'Pela miqeyese ke',
 'compare-selector' => 'Revizyonê pele miqayese bike',
-'compare-page1' => 'Pela 1',
-'compare-page2' => 'Pel 2',
+'compare-page1' => 'Pele 1',
+'compare-page2' => 'Pele 2',
 'compare-rev1' => 'Revizyonê 1i',
 'compare-rev2' => 'Revizyonê 2i',
 'compare-submit' => 'Miqayese',
@@ -4738,4 +4742,6 @@ Ena sita dı newke xırabiya teknik esta.',
 'duration-centuries' => '$1 {{PLURAL:$1|seserre|seserri}}',
 'duration-millennia' => '$1 {{PLURAL:$1|milenyum|milenyumi}}',
 
+# Unknown messages
+'mytalk-parenthetical' => 'behse',
 );
diff --git a/languages/messages/MessagesDsb.php b/languages/messages/MessagesDsb.php
index a30a6a0402..7fe50daacc 100644
--- a/languages/messages/MessagesDsb.php
+++ b/languages/messages/MessagesDsb.php
@@ -23,7 +23,6 @@
 
 $fallback = 'de';
 
-
 $namespaceNames = array(
 	NS_MEDIA            => 'Medija',
 	NS_SPECIAL          => 'Specialne',
@@ -53,20 +52,6 @@ $namespaceGenderAliases = array(
         NS_USER_TALK => array( 'male' => 'Diskusija_wužywarja', 'female' => 'Diskusija_wužywarki' ),
 );
 
-$datePreferences = array(
-	'default',
-	'dmy',
-	'ISO 8601',
-);
-
-$defaultDateFormat = 'dmy';
-
-$dateFormats = array(
-	'dmy time' => 'H:i',
-	'dmy date' => 'j. xg Y',
-	'dmy both' => 'j. xg Y, H:i',
-);
-
 $specialPageAliases = array(
 	'Activeusers'               => array( 'Aktiwne_wužywarje' ),
 	'Allmessages'               => array( 'Systemowe_powěsći' ),
@@ -158,6 +143,20 @@ $specialPageAliases = array(
 	'Withoutinterwiki'          => array( 'Interwikije_feluju' ),
 );
 
+$datePreferences = array(
+	'default',
+	'dmy',
+	'ISO 8601',
+);
+
+$defaultDateFormat = 'dmy';
+
+$dateFormats = array(
+	'dmy time' => 'H:i',
+	'dmy date' => 'j. xg Y',
+	'dmy both' => 'j. xg Y, H:i',
+);
+
 $messages = array(
 # User preference toggles
 'tog-underline' => 'Wótkaze pódšmarnuś:',
@@ -207,7 +206,7 @@ $messages = array(
 
 'underline-always' => 'pśecej',
 'underline-never' => 'žednje',
-'underline-default' => 'pó standarźe browsera',
+'underline-default' => 'Standard drastwy abo wobglědowaka',
 
 # Font style option in Special:Preferences
 'editfont-style' => 'Pismowy stil wobźěłowańskego póla:',
@@ -292,8 +291,8 @@ $messages = array(
 'newwindow' => '(se wótcynijo w nowem woknje)',
 'cancel' => 'Pśetergnuś',
 'moredotdotdot' => 'Wěcej…',
-'mypage' => 'Mój bok',
-'mytalk' => 'mója diskusija',
+'mypage' => 'Bok',
+'mytalk' => 'Diskusija',
 'anontalk' => 'Diskusija z toś teju IP',
 'navigation' => 'Nawigacija',
 'and' => '&#32;a',
@@ -826,7 +825,7 @@ Nejnowšy zapisk blokěrowańskego protokola pódawa se dołojce ako referenca:'
 'note' => "'''Pokazka:'''",
 'previewnote' => "'''Wobmysli, až to jo jano pśeglěd.'''
 Twóje změny hyšći njejsu składowane!",
-'continue-editing' => 'Dalej wobźěłaś',
+'continue-editing' => 'K wobźěłowańskemu póloju',
 'previewconflict' => 'Toś ten pśeglěd wótbłyšćujo tekst górjejcnego póla. Bok buźo tak wuglědaś, jolic jen něnto składujoš.',
 'session_fail_preview' => "'''Wódaj! Twójo wobźěłanje njejo se mógało składowaś, dokulaž su daty twójogo pósejźenja se zgubili. Pšosym wopytaj hyšći raz. Jolic až to pón pśecej hyšći njejźo, wopytaj se wótzjawiś a zasej pśizjawiś.'''",
 'session_fail_preview_html' => "'''Wódaj! Twójo wobźěłanje njejo se mógało składowaś, dokulaž su daty twójogo pósejźenja se zgubili.'''
@@ -1191,7 +1190,7 @@ Drobnostki móžoš w [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}
 
 # Preferences page
 'preferences' => 'Nastajenja',
-'mypreferences' => 'nastajenja',
+'mypreferences' => 'Nastajenja',
 'prefs-edits' => 'Licba wobźěłanjow:',
 'prefsnologin' => 'Njejsy pśizjawjony',
 'prefsnologintext' => 'Musyš se <span class="plainlinks">[{{fullurl:{{#Special:UserLogin}}|returnto=$1}} pśizjawiś]</span>, aby mógał swóje nastajenja změniś.',
@@ -1421,6 +1420,9 @@ Móžoš toś ten bok wužywaś, aby slědk stajił swóje nastajenja na standar
 'rightslogtext' => 'To jo protokol wužywarskich pšawow.',
 'rightslogentry' => 'Pśisłušnosć ku kupce jo se za „$1“ změniła wót „$2“ na „$3“.',
 'rightslogentry-autopromote' => 'jo se awtomatiski wót $2 do $3 změnił',
+'logentry-rights-rights' => '$1 jo kupkowe cłonkojstwo za $3 z $4 do $5 změnił',
+'logentry-rights-rights-legacy' => '$1 jo kupkowe cłonkojstwo za $3 změnił',
+'logentry-rights-autopromote' => '$1 jo se awtomatiski wót $4 do $5 pówušył',
 'rightsnone' => '(nic)',
 
 # Associated actions - in the sentence "You do not have permission to X"
@@ -2037,7 +2039,7 @@ Glědaj teke [[Special:WantedCategories|póžedane kategorije]].',
 'linksearch-ok' => 'Pytaś',
 'linksearch-text' => 'Jo móžno zastupne znamuška kaž "*.wikipedia.org" wužywaś. 
 Jo nanejmjenjej głowna domena trěbna, na pśikład "*.org"<br />
-Pódpěrane protokole: <code>$1</code> (pšosym njepódaj je w swójom pytanju).',
+Pódpěrane protokole: <code>$1</code> (standard jo http://, jolic žeden protokol njejo pódany).',
 'linksearch-line' => '$1 wótkazany z $2',
 'linksearch-error' => 'Zasupne znamješko daju se jano na zachopjeńku URL wužywaś.',
 
@@ -2085,7 +2087,7 @@ Pódpěrane protokole: <code>$1</code> (pšosym njepódaj je w swójom pytanju).
 '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 wužywarjeju e-mail pósłał.
+'emailpagetext' => 'Móžoš slědujucy formular wužywaś, aby toś tomu {{GENDER:$1|wužywarjeju}} e-mail pósłał.
 E-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ś.',
 'usermailererror' => 'E-mailowy objekt jo zmólku wrośił.',
 'defemailsubject' => '{{SITENAME}} - e-mail wót wužywarja "$1"',
@@ -2117,7 +2119,7 @@ E-mailowa adresa, kótaruž sy zapódał w [[Special:Preferences|swójich wužyw
 
 # Watchlist
 'watchlist' => 'Wobglědowańka',
-'mywatchlist' => 'wobglědowańka',
+'mywatchlist' => 'Wobglědowańka',
 'watchlistfor2' => 'Za wužywarja $1 $2',
 'nowatchlist' => 'Žedne zapise w twójej wobglědowańce.',
 'watchlistanontext' => 'Dejš $1, aby mógał swóju wobglědowańku wiźeś abo zapise w njej wobźěłaś.',
@@ -2366,7 +2368,7 @@ $1',
 # Contributions
 'contributions' => 'Wužywarske pśinoski',
 'contributions-title' => 'Wužywarske pśinoski wót $1',
-'mycontris' => 'móje pśinoski',
+'mycontris' => 'Pśinoski',
 'contribsub2' => 'Za $1 ($2)',
 'nocontribs' => 'Za toś te kriterije njejsu žedne změny se namakali.',
 'uctop' => '(aktualny)',
@@ -2860,7 +2862,7 @@ W zespominanju dajo se pśicyna pódaś.',
 
 # Info page
 'pageinfo-title' => 'Informacije za bok "$1"',
-'pageinfo-not-current' => 'Informacije daju se jano za aktualnu wersiju zwobrazniś.',
+'pageinfo-not-current' => 'Bóžko njedaju se toś te informacije za stare wersije pódaś.',
 'pageinfo-header-basic' => 'Zakładne informacije',
 'pageinfo-header-edits' => 'Historiju wobźěłaś',
 'pageinfo-header-restrictions' => 'Šćit boka',
@@ -2869,6 +2871,7 @@ W zespominanju dajo se pśicyna pódaś.',
 'pageinfo-default-sort' => 'Standardny sortěrowański kluc',
 'pageinfo-length' => 'Dłujkosć boka (w bajtach)',
 'pageinfo-article-id' => 'ID boka',
+'pageinfo-language' => 'Rěc bokowego wopśimjeśa',
 'pageinfo-robot-policy' => 'Status pytawy',
 'pageinfo-robot-index' => 'Indeksěrujobny',
 'pageinfo-robot-noindex' => 'Njeindeksěrujobny',
@@ -3587,6 +3590,7 @@ Móžoš teke [[Special:EditWatchlist|standardny wobźěłowański bok wužywaś
 'version-license' => 'Licenca',
 'version-poweredby-credits' => "Toś ten wiki spěchujo se wót '''[//www.mediawiki.org/ MediaWiki]''', copyright © 2001-$1 $2.",
 'version-poweredby-others' => 'druge',
+'version-credits-summary' => 'Źěkujomy se slědujucym wósobam za jich pśinoski k [[Special:Version|MediaWiki]]',
 'version-license-info' => 'MediaWiki jo licha softwara: móžoš ju pód wuměnjenjami licence GNU General Public License, wózjawjeneje wót załožby Free Software Foundation, rozdźěliś a/abo změniś: pak pód wersiju 2 licence pak pód někakeju pózdźejšeju wersiju.
 
 MediaWiki rozdźěla se w naźeji, až buźo wužitny, ale BŹEZ GARANTIJE: samo bźez wopśimjoneje garantije PŚEDAWAJOBNOSĆI abo PŚIGÓDNOSĆI ZA WĚSTY ZAMĚR. Glědaj GNU general Public License za dalšne drobnostki.
diff --git a/languages/messages/MessagesDtp.php b/languages/messages/MessagesDtp.php
index c184f3d6de..9508efcc8d 100644
--- a/languages/messages/MessagesDtp.php
+++ b/languages/messages/MessagesDtp.php
@@ -158,7 +158,6 @@ $messages = array(
 'qbbrowse' => 'Pogihum',
 'qbedit' => 'Idito',
 'qbpageoptions' => 'Bolikon diti',
-'qbpageinfo' => 'Pogiromutan',
 'qbmyoptions' => 'Bobolikonku ngawi',
 'qbspecialpages' => 'Bobolikon suaikowokon',
 'faq' => 'Ponguhatan Koinsoruan om Poninimbar',
diff --git a/languages/messages/MessagesEl.php b/languages/messages/MessagesEl.php
index 3c31517cc2..3525193c78 100644
--- a/languages/messages/MessagesEl.php
+++ b/languages/messages/MessagesEl.php
@@ -8,6 +8,7 @@
  * @file
  *
  * @author AK
+ * @author Aitolos
  * @author Assassingr
  * @author Azimout
  * @author Badseed
@@ -41,7 +42,7 @@
  */
 
 /**
-  * Translation by Pasok Internet Volunteers
+  * Initial translation by Pasok Internet Volunteers
   * http://forum.pasok.gr
   * version 1.0 (initial release)
   *
@@ -180,37 +181,6 @@ $specialPageAliases = array(
 	'Withoutinterwiki'          => array( 'ΧωρίςInterwiki' ),
 );
 
-$fallback8bitEncoding = 'iso-8859-7';
-$separatorTransformTable = array( ',' => '.', '.' => ',' );
-$linkTrail = '/^([a-zαβγδεζηθικλμνξοπρστυφχψωςΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡΣΤΥΦΧΨΩάέήίόύώϊϋΐΰΆΈΉΊΌΎΏΪΫ]+)(.*)$/sDu';
-
-
-$datePreferences = array(
-	'default',
-	'dmy',
-	'ISO 8601',
-);
-
-$defaultDateFormat = 'dmy';
-
-$datePreferenceMigrationMap = array(
-	'default',
-	'dmy',
-	'dmy',
-	'dmy'
-);
-
-$dateFormats = array(
-	'dmy time' => 'H:i',
-	'dmy date' => 'j xg Y',
-	'dmy both' => 'H:i, j xg Y',
-
-	'ISO 8601 time' => 'xnH:xni:xns',
-	'ISO 8601 date' => 'xnY-xnm-xnd',
-	'ISO 8601 both' => 'xnY-xnm-xnd"T"xnH:xni:xns',
-);
-
-
 $magicWords = array(
 	'redirect'                  => array( '0', '#ΑΝΑΚΑΤΕΥΘΥΝΣΗ', '#REDIRECT' ),
 	'notoc'                     => array( '0', '__ΧΩΡΙΣΠΠ__', '__NOTOC__' ),
@@ -218,7 +188,6 @@ $magicWords = array(
 	'forcetoc'                  => array( '0', '__ΜΕΠΠ__', '__FORCETOC__' ),
 	'toc'                       => array( '0', '__ΠΠ__', '__TOC__' ),
 	'noeditsection'             => array( '0', '__ΧΩΡΙΣΕΠΕΞΕΝΟΤ__', '__NOEDITSECTION__' ),
-	'noheader'                  => array( '0', '__ΧΩΡΙΣΚΕΦΑΛΙΔΑ__', '__NOHEADER__' ),
 	'currentmonth'              => array( '1', 'ΤΡΕΧΩΝΜΗΝΑΣ', 'CURRENTMONTH', 'CURRENTMONTH2' ),
 	'currentmonth1'             => array( '1', 'ΤΡΕΧΩΝΜΗΝΑΣ1', 'CURRENTMONTH1' ),
 	'currentmonthname'          => array( '1', 'ΤΡΕΧΩΝΜΗΝΑΣΟΝΟΜΑ', 'CURRENTMONTHNAME' ),
@@ -351,6 +320,35 @@ $magicWords = array(
 	'protectionlevel'           => array( '1', 'ΕΠΙΠΕΔΟΠΡΟΣΤΑΣΙΑΣ', 'PROTECTIONLEVEL' ),
 );
 
+$fallback8bitEncoding = 'iso-8859-7';
+$separatorTransformTable = array( ',' => '.', '.' => ',' );
+$linkTrail = '/^([a-zαβγδεζηθικλμνξοπρστυφχψωςΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡΣΤΥΦΧΨΩάέήίόύώϊϋΐΰΆΈΉΊΌΎΏΪΫ]+)(.*)$/sDu';
+
+$datePreferences = array(
+	'default',
+	'dmy',
+	'ISO 8601',
+);
+
+$defaultDateFormat = 'dmy';
+
+$datePreferenceMigrationMap = array(
+	'default',
+	'dmy',
+	'dmy',
+	'dmy'
+);
+
+$dateFormats = array(
+	'dmy time' => 'H:i',
+	'dmy date' => 'j xg Y',
+	'dmy both' => 'H:i, j xg Y',
+
+	'ISO 8601 time' => 'xnH:xni:xns',
+	'ISO 8601 date' => 'xnY-xnm-xnd',
+	'ISO 8601 both' => 'xnY-xnm-xnd"T"xnH:xni:xns',
+);
+
 $messages = array(
 # User preference toggles
 'tog-underline' => 'Υπογράμμιση συνδέσμων:',
@@ -531,7 +529,7 @@ $messages = array(
 'history_short' => 'Ιστορικό',
 'updatedmarker' => 'Ενημερωμένα από την τελευταία επίσκεψή μου',
 'printableversion' => 'Εκτυπώσιμη έκδοση',
-'permalink' => 'Μόνιμος σύνδεσμος',
+'permalink' => 'Σταθερός σύνδεσμος',
 'print' => 'Εκτύπωση',
 'view' => 'Προβολή',
 'edit' => 'Επεξεργασία',
@@ -556,7 +554,7 @@ $messages = array(
 'articlepage' => 'Εμφάνιση σελίδας κειμένου',
 'talk' => 'Συζήτηση',
 'views' => 'Εμφανίσεις',
-'toolbox' => 'Εργαλεία',
+'toolbox' => 'Εργαλειοθήκη',
 'userpage' => 'Εμφάνιση σελίδας χρήστη',
 'projectpage' => 'Εμφάνιση σελίδας βοήθειας',
 'imagepage' => 'Εμφάνιση σελίδας αρχείου',
@@ -1167,7 +1165,7 @@ $2
 Μπορεί να υπάρχουν λεπτομέρειες στο [{{fullurl:{{#Special:Log}}/suppress|page={{FULLPAGENAMEE}}}} αρχείο απόκρυψης].
 Μπορείτε ακόμα [$1 να δείτε την έκδοση] αν επιθυμείτε να συνεχίσετε.",
 'rev-deleted-text-view' => "Αυτή η αναθεώρηση της σελίδας έχει '''διαγραφεί'''.
-Μπορείτε να την δείτε, λεπτομέρειες μπορούν να βρεθούν στο [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} αρχείο καταγραφής διαγραφών].",
+Μπορείτε να την δείτε. Λεπτομέρειες μπορούν να βρεθούν στο [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} αρχείο καταγραφής διαγραφών].",
 'rev-suppressed-text-view' => "Αυτή η έκδοση της σελίδας έχει '''κατασταλλεί'''.
 Μπορείτε να τη δείτε. Λεπτομέρειες μπορούν να βρεθούν στο [{{fullurl:{{#Special:Log}}/suppress|page={{FULLPAGENAMEE}}}} αρχείο καταστολής].",
 'rev-deleted-no-diff' => "Δεν μπορείτε να δείτε αυτή τη διαφορά επειδή μια από τις αναθεωρήσεις έχει '''διαγραφεί'''.
@@ -2245,7 +2243,7 @@ $1',
 'emailuser-title-target' => 'Αποστολή e-mail {{GENDER:$1|στο|στη}} χρήστη',
 'emailuser-title-notarget' => 'Αποστολή e-mail σε χρήστη',
 'emailpage' => 'Αποστολή μηνύματος ηλεκτρονικού ταχυδρομείο στο χρήστη',
-'emailpagetext' => 'Συπληρώνοντας την παρακάτω φόρμα θα στείλετε ένα μήνυμα εφόσον έχετε δηλώσει μια έγκυρη διεύθυνση ηλεκτρονικού ταχυδρομείου στις [[Special:Preferences|προτιμήσεις χρήστη]]. Αυτή θα εμφανιστεί ως διεύθυνση αποστολέα του μηνύματος, ούτως ώστε ο παραλήπτης να μπορέσει να σας απαντήσει.',
+'emailpagetext' => 'Συμπληρώνοντας την παρακάτω φόρμα θα στείλετε ένα μήνυμα εφόσον έχετε δηλώσει μια έγκυρη διεύθυνση ηλεκτρονικού ταχυδρομείου στις [[Special:Preferences|προτιμήσεις χρήστη]]. Αυτή θα εμφανιστεί ως διεύθυνση αποστολέα του μηνύματος, ούτως ώστε ο παραλήπτης να μπορέσει να σας απαντήσει.',
 'usermailererror' => 'Σφάλμα ηλεκτρονικού ταχυδρομείου:',
 'defemailsubject' => '{{SITENAME}} e-mail από τον χρήστη "$1"',
 'usermaildisabled' => 'To e-mail χρήστη είναι απενεργοποιημένο',
@@ -2956,7 +2954,7 @@ $1',
 'tooltip-search-go' => 'Πήγαινε σε μια σελίδα με το ακριβές όνομα εάν υπάρχει',
 'tooltip-search-fulltext' => 'Αναζήτηση για αυτό το κείμενο',
 'tooltip-p-logo' => 'Αρχική σελίδα',
-'tooltip-n-mainpage' => 'Δείτε την Αρχική σελίδα',
+'tooltip-n-mainpage' => 'Δείτε την αρχική σελίδα',
 'tooltip-n-mainpage-description' => 'Επισκεφθείτε την κύρια σελίδα',
 'tooltip-n-portal' => 'Σχετικά με το Wiκi - πώς μπορείτε να βοηθήσετε, πού μπορείτε να απευθυνθείτε',
 'tooltip-n-currentevents' => 'Πληροφορίες για πρόσφατα γεγονότα',
@@ -3050,6 +3048,7 @@ $1',
 
 # Info page
 'pageinfo-title' => 'Πληροφορίες για "$1"',
+'pageinfo-not-current' => 'Μας συγχωρείτε, είναι αδύνατο να παράσχουμε αυτή την πληροφορία για παλιές αναθεωρήσεις.',
 'pageinfo-header-basic' => 'Βασικές πληροφορίες',
 'pageinfo-header-edits' => 'Ιστορικό επεξεργασίας',
 'pageinfo-header-restrictions' => 'Προστασία σελίδας',
@@ -3058,10 +3057,30 @@ $1',
 'pageinfo-default-sort' => 'Προεπιλεγμένο κλειδί ταξινόμησης',
 'pageinfo-length' => 'Μήκος σελίδας (σε bytes)',
 'pageinfo-article-id' => 'Αναγνωριστικό σελίδας',
+'pageinfo-language' => 'Γλώσσα σελίδας περιεχομένου',
+'pageinfo-robot-policy' => 'Στάτους μηχανής αναζήτησης',
 'pageinfo-views' => 'Αριθμός προβολών',
-'pageinfo-watchers' => 'Αριθμός παρατηρητών',
-'pageinfo-edits' => 'Αριθμός επεξεργασιών',
-'pageinfo-authors' => 'Αριθμός ξεχωριστών συγγραφέων',
+'pageinfo-watchers' => 'Αριθμός παρατηρητών σελίδας',
+'pageinfo-redirects-name' => 'Ανακατευθύνσεις σε αυτή τη σελίδα',
+'pageinfo-redirects-value' => '$1',
+'pageinfo-subpages-name' => 'Υποσελίδες αυτής της σελίδας',
+'pageinfo-firstuser' => 'Δημιουργός της σελίδας',
+'pageinfo-firsttime' => 'Ημερομηνία δημιουργίας της σελίδας',
+'pageinfo-lastuser' => 'Τελευταίος συντάκτης',
+'pageinfo-lasttime' => 'Ημερομηνία τελευταίας επεξεργασίας',
+'pageinfo-edits' => 'Συνολικός αριθμός επεξεργασιών',
+'pageinfo-authors' => 'Συνολικός αριθμός διαφορετικών συντακτών',
+'pageinfo-recent-edits' => 'Πρόσφατος αριθμός επεξεργασιών (σε διάστημα &1)',
+'pageinfo-recent-authors' => 'Πρόσφατος αριθμός μοναδικών συντακτών',
+'pageinfo-magic-words' => '{{PLURAL:$1|Μαγική λέξη|Μαγικές λέξεις}} ($1)',
+'pageinfo-hidden-categories' => '{{PLURAL:$1|Κρυφή κατηγορία|Κρυφές κατηγορίες}} ($1)',
+'pageinfo-templates' => 'Ενσωματωμένα {{PLURAL:$1|πρότυπο|πρότυπα}} ($1)',
+'pageinfo-toolboxlink' => 'Πληροφορίες σελίδας',
+'pageinfo-redirectsto' => 'Ανακατευθύνσεις σε',
+'pageinfo-redirectsto-info' => 'πληροφορίες',
+'pageinfo-contentpage' => 'Υπολογίζονται ως σελίδες περιεχομένου',
+'pageinfo-contentpage-yes' => 'Ναι',
+'pageinfo-protect-cascading-yes' => 'Ναι',
 
 # Skin names
 'skinname-standard' => 'Κλασσικό',
diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 7a480e8a43..ec3187216a 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -162,22 +162,18 @@ $dateFormats = array(
 	'mdy time' => 'H:i',
 	'mdy date' => 'F j, Y',
 	'mdy both' => 'H:i, F j, Y',
-	'mdy shortdate' => 'F j',
 
 	'dmy time' => 'H:i',
 	'dmy date' => 'j F Y',
 	'dmy both' => 'H:i, j F Y',
-	'dmy shortdate' => 'j F',
 
 	'ymd time' => 'H:i',
 	'ymd date' => 'Y F j',
 	'ymd both' => 'H:i, Y F j',
-	'ymd shortdate' => 'F j',
 
 	'ISO 8601 time' => 'xnH:xni:xns',
 	'ISO 8601 date' => 'xnY-xnm-xnd',
 	'ISO 8601 both' => 'xnY-xnm-xnd"T"xnH:xni:xns',
-	// 'ISO 8601 shortdate' => 'xnm-xnd', // This is just confusing
 );
 
 /**
@@ -687,7 +683,7 @@ XHTML id names.
 
 'underline-always'  => 'Always',
 'underline-never'   => 'Never',
-'underline-default' => 'Browser default',
+'underline-default' => 'Skin or browser default',
 
 # Font style option in Special:Preferences
 'editfont-style'     => 'Edit area font style:',
@@ -771,16 +767,17 @@ XHTML id names.
 
 'linkprefix' => '/^(.*?)([a-zA-Z\\x80-\\xff]+)$/sD', # only translate this message to other languages if you have to change it
 
-'about'         => 'About',
-'article'       => 'Content page',
-'newwindow'     => '(opens in new window)',
-'cancel'        => 'Cancel',
-'moredotdotdot' => 'More...',
-'mypage'        => 'My page',
-'mytalk'        => 'My talk',
-'anontalk'      => 'Talk for this IP address',
-'navigation'    => 'Navigation',
-'and'           => '&#32;and',
+'about'                => 'About',
+'article'              => 'Content page',
+'newwindow'            => '(opens in new window)',
+'cancel'               => 'Cancel',
+'moredotdotdot'        => 'More...',
+'mypage'               => 'Page',
+'mytalk'               => 'Talk',
+'mytalk-parenthetical' => 'talk',
+'anontalk'             => 'Talk for this IP address',
+'navigation'           => 'Navigation',
+'and'                  => '&#32;and',
 
 # Cologne Blue skin
 'qbfind'         => 'Find',
@@ -1396,7 +1393,7 @@ Custom .css and .js pages use a lowercase title, e.g. {{ns:user}}:Foo/vector.css
 'note'                             => "'''Note:'''",
 'previewnote'                      => "'''Remember that this is only a preview.'''
 Your changes have not yet been saved!",
-'continue-editing'                 => 'Continue editing',
+'continue-editing'                 => 'Go to editing area',
 'previewconflict'                  => 'This preview reflects the text in the upper text editing area as it will appear if you choose to save.',
 'session_fail_preview'             => "'''Sorry! We could not process your edit due to a loss of session data.'''
 Please try again.
@@ -1815,7 +1812,7 @@ Note that their indexes of {{SITENAME}} content may be out of date.',
 # Preferences page
 'preferences'                   => 'Preferences',
 'preferences-summary'           => '', # do not translate or duplicate this message to other languages
-'mypreferences'                 => 'My preferences',
+'mypreferences'                 => 'Preferences',
 'prefs-edits'                   => 'Number of edits:',
 'prefsnologin'                  => 'Not logged in',
 'prefsnologintext'              => 'You must be <span class="plainlinks">[{{fullurl:{{#Special:UserLogin}}|returnto=$1}} logged in]</span> to set user preferences.',
@@ -1951,6 +1948,7 @@ Your e-mail address is not revealed when other users contact you.',
 'saveusergroups'                 => 'Save user groups',
 'userrights-groupsmember'        => 'Member of:',
 'userrights-groupsmember-auto'   => 'Implicit member of:',
+'userrights-groupsmember-type'   => '$1', # only translate this message to other languages if you have to change it
 'userrights-groups-help'         => 'You may alter the groups this user is in:
 * A checked box means the user is in that group.
 * An unchecked box means the user is not in that group.
@@ -2051,11 +2049,14 @@ Your e-mail address is not revealed when other users contact you.',
 'right-passwordreset'         => 'View password reset e-mails',
 
 # User rights log
-'rightslog'                  => 'User rights log',
-'rightslogtext'              => 'This is a log of changes to user rights.',
-'rightslogentry'             => 'changed group membership for $1 from $2 to $3',
-'rightslogentry-autopromote' => 'was automatically promoted from $2 to $3',
-'rightsnone'                 => '(none)',
+'rightslog'                     => 'User rights log',
+'rightslogtext'                 => 'This is a log of changes to user rights.',
+'rightslogentry'                => 'changed group membership for $1 from $2 to $3',
+'rightslogentry-autopromote'    => 'was automatically promoted from $2 to $3',
+'logentry-rights-rights'        => '$1 changed group membership for $3 from $4 to $5',
+'logentry-rights-rights-legacy' => '$1 changed group membership for $3',
+'logentry-rights-autopromote'   => '$1 was automatically promoted from $4 to $5',
+'rightsnone'                    => '(none)',
 
 # Associated actions - in the sentence "You do not have permission to X"
 'action-read'                 => 'read this page',
@@ -2757,7 +2758,7 @@ Also see [[Special:WantedCategories|wanted categories]].',
 'linksearch-ok'      => 'Search',
 'linksearch-text'    => 'Wildcards such as "*.wikipedia.org" may be used.
 Needs at least a top-level domain, for example "*.org".<br />
-Supported protocols: <code>$1</code> (do not add any of these in your search).',
+Supported protocols: <code>$1</code> (defaults to http:// if no protocol is specified).',
 'linksearch-line'    => '$1 is linked from $2',
 'linksearch-error'   => 'Wildcards may appear only at the start of the hostname.',
 
@@ -2810,7 +2811,8 @@ There may be [[{{MediaWiki:Listgrouprights-helppage}}|additional information]] a
 'emailuser-title-notarget' => 'E-mail user',
 'emailuser-summary'        => '', # do not translate or duplicate this message to other languages
 'emailpage'                => 'E-mail user',
-'emailpagetext'            => 'You can use the form below to send an e-mail message to this user.
+// Dummy GENDER to prevent warnings at translatewiki
+'emailpagetext'            => 'You can use the form below to send an e-mail message to this {{GENDER:$1|user}}.
 The e-mail address you entered in [[Special:Preferences|your user preferences]] will appear as the "From" address of the e-mail, so the recipient will be able to reply directly to you.',
 'usermailererror'          => 'Mail object returned error:',
 'defemailsubject'          => '{{SITENAME}} e-mail from user "$1"',
@@ -2844,7 +2846,7 @@ The e-mail address you entered in [[Special:Preferences|your user preferences]]
 # Watchlist
 'watchlist'            => 'My watchlist',
 'watchlist-summary'    => '', # do not translate or duplicate this message to other languages
-'mywatchlist'          => 'My watchlist',
+'mywatchlist'          => 'Watchlist',
 'watchlistfor2'        => 'For $1 $2',
 'nowatchlist'          => 'You have no items on your watchlist.',
 'watchlistanontext'    => 'Please $1 to view or edit items on your watchlist.',
@@ -3114,7 +3116,7 @@ $1',
 'contributions'         => 'User contributions',
 'contributions-summary' => '', # do not translate or duplicate this message to other languages
 'contributions-title'   => 'User contributions for $1',
-'mycontris'             => 'My contributions',
+'mycontris'             => 'Contributions',
 'contribsub2'           => 'For $1 ($2)',
 'nocontribs'            => 'No changes were found matching these criteria.',
 'uctop'                 => '(top)',
@@ -3160,7 +3162,7 @@ The latest block log entry is provided below for reference:',
 'whatlinkshere-hideredirs' => '$1 redirects',
 'whatlinkshere-hidetrans'  => '$1 transclusions',
 'whatlinkshere-hidelinks'  => '$1 links',
-'whatlinkshere-hideimages' => '$1 image links',
+'whatlinkshere-hideimages' => '$1 file links',
 'whatlinkshere-filters'    => 'Filters',
 
 # Block/unblock
@@ -3746,7 +3748,7 @@ This is probably caused by a link to a blacklisted external site.',
 # Info page
 'pageinfo-header'              => '-', # do not translate or duplicate this message to other languages
 'pageinfo-title'               => 'Information for "$1"',
-'pageinfo-not-current'         => 'Information may only be displayed for the current revision.',
+'pageinfo-not-current'         => 'Sorry, it\'s impossible to provide this information for old revisions.',
 'pageinfo-header-basic'        => 'Basic information',
 'pageinfo-header-edits'        => 'Edit history',
 'pageinfo-header-restrictions' => 'Page protection',
@@ -3755,6 +3757,7 @@ This is probably caused by a link to a blacklisted external site.',
 'pageinfo-default-sort'        => 'Default sort key',
 'pageinfo-length'              => 'Page length (in bytes)',
 'pageinfo-article-id'          => 'Page ID',
+'pageinfo-language'            => 'Page content language',
 'pageinfo-robot-policy'        => 'Search engine status',
 'pageinfo-robot-index'         => 'Indexable',
 'pageinfo-robot-noindex'       => 'Not indexable',
@@ -3877,22 +3880,6 @@ By executing it, your system may be compromised.",
 'days'           => '{{PLURAL:$1|$1 day|$1 days}}',
 'ago'            => '$1 ago',
 
-'hours-ago'      => '$1 {{PLURAL:$1|hour|hours}} ago',
-'minutes-ago'    => '$1 {{PLURAL:$1|minute|minutes}} ago',
-'seconds-ago'    => '$1 {{PLURAL:$1|seconds|seconds}} ago',
-
-'monday-at'   => 'Monday at $1',
-'tuesday-at'   => 'Tuesday at $1',
-'wednesday-at'   => 'Wednesday at $1',
-'thursday-at'   => 'Thursday at $1',
-'friday-at'   => 'Friday at $1',
-'saturday-at'   => 'Saturday at $1',
-'sunday-at'   => 'Sunday at $1',
-
-'today-at'       => '$1',
-'yesterday-at'   => 'Yesterday at $1',
-'just-now'       => 'Just now',
-
 # Bad image list
 'bad_image_list' => 'The format is as follows:
 
@@ -4732,6 +4719,7 @@ You can also [[Special:EditWatchlist|use the standard editor]].',
 'version-license'                       => 'License',
 'version-poweredby-credits'             => "This wiki is powered by '''[//www.mediawiki.org/ MediaWiki]''', copyright © 2001-$1 $2.",
 'version-poweredby-others'              => 'others',
+'version-credits-summary'               => 'We would like to recognize the following persons for their contribution to [[Special:Version|MediaWiki]].',
 'version-license-info'                  => 'MediaWiki 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.
 
 MediaWiki 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.
diff --git a/languages/messages/MessagesEo.php b/languages/messages/MessagesEo.php
index ed973de318..7121523fe9 100644
--- a/languages/messages/MessagesEo.php
+++ b/languages/messages/MessagesEo.php
@@ -143,7 +143,6 @@ $specialPageAliases = array(
 	'Recentchanges'             => array( 'Lastaj_ŝanĝoj' ),
 	'Recentchangeslinked'       => array( 'Rilataj_ŝanĝoj' ),
 	'Revisiondelete'            => array( 'Forigi_revizion' ),
-	'RevisionMove'              => array( 'Movi_revizion' ),
 	'Search'                    => array( 'Serĉi' ),
 	'Shortpages'                => array( 'Mallongaj_paĝoj' ),
 	'Specialpages'              => array( 'Specialaj_paĝoj' ),
@@ -181,7 +180,6 @@ $magicWords = array(
 	'forcetoc'                  => array( '0', '__FI__', '__FORTUINDEKSON__', '__FT__', '__FORCETOC__' ),
 	'toc'                       => array( '0', '__I__', '__T__', '__INDEKSO__', '__TOC__' ),
 	'noeditsection'             => array( '0', '__SRS__', '__NES__', '__SENREDAKTISEKCIOJN__', '__SENREDAKTISEKCION__', '__NOEDITSECTION__' ),
-	'noheader'                  => array( '0', '__SENTITOLO__', '__NH__', '__ST__', '__NOHEADER__' ),
 	'currentmonth'              => array( '1', 'NUNAMONATO', 'NUNAMONATO2', 'CURRENTMONTH', 'CURRENTMONTH2' ),
 	'currentmonth1'             => array( '1', 'NUNAMONATO1', 'CURRENTMONTH1' ),
 	'currentmonthname'          => array( '1', 'NUNAMONATNOMO', 'NUNAMONATONOMO', 'NUNAMONATANOMO', 'CURRENTMONTHNAME' ),
@@ -360,7 +358,7 @@ $messages = array(
 
 'underline-always' => 'Ĉiam',
 'underline-never' => 'Neniam',
-'underline-default' => 'DefaÅ­lte laÅ­ foliumilo',
+'underline-default' => 'Pravaloro laÅ­ foliumilo',
 
 # Font style option in Special:Preferences
 'editfont-style' => 'Tipara stilo de redakta tekstujo',
@@ -468,7 +466,7 @@ $messages = array(
 'vector-action-protect' => 'Protekti',
 'vector-action-undelete' => 'Malforigi',
 'vector-action-unprotect' => 'Ŝanĝi protekadon',
-'vector-simplesearch-preference' => 'Ebligi plibonigitajn serĉajn sugestojn (nur Vektora etoso)',
+'vector-simplesearch-preference' => 'Ebligi simpligitan serĉan strion (nur Vektora etoso)',
 'vector-view-create' => 'Krei',
 'vector-view-edit' => 'Redakti',
 'vector-view-history' => 'Vidi historion',
@@ -694,8 +692,9 @@ Peto: $2',
 'protectedpagetext' => 'Tiu ĉi paĝo estas ŝlosita por malebligi redaktadon.',
 'viewsourcetext' => 'Vi povas rigardi kaj kopii la fonton de la paĝo:',
 'viewyourtext' => "Vi povas vidi kaj kopii la fonton de '''viaj redaktoj''' al ĉi tiu paĝo:",
-'protectedinterface' => 'Ĉi tiu paĝo provizas interfacan tekston por la softvaro, kaj estas ŝlosita por malabeligi misuzon.',
-'editinginterface' => "'''Atentu:''' Vi redaktas paĝon, kiu estas uzata kiel interfaca teksto por la rogramaro. Ŝanĝoj de ĉi tiu teksto povas ŝanĝi aspekton de la interfaco por aliaj uzantoj. Por tradukojn, bonvolu uzi [//translatewiki.net/wiki/Main_Page?setlang=eo translatewiki.net], la MediaWiki-projekton por lingvigaj versioj.",
+'protectedinterface' => 'Ĉi tiu paĝo provizas interfacan tekston por la softvaro, kaj estas ŝlosita por malebligi misuzon.
+Por aldoni aŭ ŝanĝi tradukojn por ĉiuj vikioj, bonvolu uzi [//translatewiki.net/ translatewiki.net], la projekto por provizi tradukojn por MediaWiki.',
+'editinginterface' => "'''Atentu:''' Vi redaktas paĝon, kiu estas uzata kiel interfaca teksto por la programaro. Ŝanĝoj de ĉi tiu teksto povas ŝanĝi aspekton de la interfaco por aliaj uzantoj sur ĉi tiu vikio. Por aldoni aŭ ŝanĝi tradukojn, bonvolu uzi [//translatewiki.net/ translatewiki.net], la MediaWiki-projekton por lingvigaj versioj.",
 'sqlhidden' => '(SQL serĉomendo kaŝita)',
 'cascadeprotected' => 'Ĉi tiu paĝo estas protektita kontraŭ redaktado, ĉar ĝi estas inkludita en la {{PLURAL:$1|sekvan paĝon, kiu|sekvajn paĝojn, kiuj}} estas {{PLURAL:$1|protektata|protektataj}} kun la "kaskada" opcio turnita sur:
 $2',
@@ -979,7 +978,7 @@ Vi povas [[Special:Search/{{PAGENAME}}|serĉi ĉi tiun paĝtitolon]] en aliaj pa
 aŭ [{{fullurl:{{FULLPAGENAME}}|action=edit}} redakti ĉi tiun paĝon]</span>.',
 'noarticletext-nopermission' => 'Estas neniom da teksto en ĉi tiu paĝo.
 Vi povas [[Special:Search/{{PAGENAME}}|serĉi ĉi tiun paĝan titolon]] en aliaj paĝoj,
-aŭ <span class="plainlinks">[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} serĉi la rilatajn protokolojn]</span>.',
+aŭ <span class="plainlinks">[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} serĉi la rilatajn protokolojn]</span>, sed vi ne rajtas krei ĉi tiun paĝon.',
 'missing-revision' => 'La revizio n-ro $1 de la paĝo nomata "{{PAGENAME}}" ne ekzistas.
 
 La kutima kaŭzo estas sekvi malaktualan historio-ligilon al paĝo forviŝita.
@@ -994,7 +993,7 @@ La lasta protokolero estas jene montrata por via referenco:',
 * '''Interreta Esplorilo''': Premu ''Stir'' klakante ''Refreŝu'', aŭ premu ''Stir-F5'' 
 * '''Opera:''' Nuligi la kaŝmemoro en ''Iloj → Preferoj''",
 'usercssyoucanpreview' => "'''Konsileto:''' Uzu la butonon \"AntaÅ­rigardi\" por provi vian novan CSS-kodon antaÅ­ konservado.",
-'userjsyoucanpreview' => "'''Konsileto:''' Uzu la butonon \"AntaÅ­rigard\" por provi vian novan JS-kodon antaÅ­ konservado.",
+'userjsyoucanpreview' => "'''Konsileto:''' Uzu la butonon \"{{int:showpreview}}\" por provi vian novan JS-kodon antaÅ­ konservado.",
 'usercsspreview' => "'''Notu ke vi nur antaÅ­vidas vian uzanto-CSS.
 Ĝi ne jam estis konservita!'''",
 'userjspreview' => "'''Memoru ke vi nun nur provas kaj antaŭrigardas vian uzantan javaskripton, ĝi ne estas jam konservita'''",
@@ -1007,7 +1006,7 @@ Rememoru ke individuaj .css-aj kaj .js-aj paĝoj uzas minusklan titolon, ekz. {{
 'note' => "'''Noto:'''",
 'previewnote' => "'''Memoru, ke ĉi tio estas nur antaŭrigardo.''' 
 Viaj ŝanĝoj ne ankoraŭ estas konservitaj!",
-'continue-editing' => 'Redaktu plu',
+'continue-editing' => 'Iru al redakta spaco',
 'previewconflict' => 'La jena antaÅ­rigardo montras la tekston el la supra tekstujo,
 kiel ĝi aperos se vi elektos konservi la paĝon.',
 'session_fail_preview' => "'''Ni ne povas procezi vian redakton pro perdo de seancaj datenoj.
@@ -1245,8 +1244,9 @@ Bonvolu kontroli la protokolojn.',
 'revdelete-only-restricted' => 'Eraro kaŝante la aĵon de $2, $1: Vi ne povas subpremi aĵojn de vido de administrantoj sen ankaŭ selektante unu el la aliaj subpremo-opcioj.',
 'revdelete-reason-dropdown' => '*Oftaj kialoj por forigado
 ** AÅ­torrajta neglekto
-** MaltaÅ­ga persona informo
-** Eventualaj malhonorigaj informoj',
+** MaltaÅ­ga komento aÅ­ persona informo
+** Nekonvena uzantnomo
+** Eventuale kalumnaj informoj',
 'revdelete-otherreason' => 'Alia/aldona kialo:',
 'revdelete-reasonotherlist' => 'Alia kialo',
 'revdelete-edit-reasonlist' => 'Redakti kialojn por forigo',
@@ -1440,7 +1440,7 @@ Jen hazarde generita valoro por via uzo: $1',
 'timezoneregion-indian' => 'Hinda Oceano',
 'timezoneregion-pacific' => 'Pacifiko',
 'allowemail' => 'Rajtigi retmesaĝojn de aliaj uzantoj',
-'prefs-searchoptions' => 'Serĉaj opcioj',
+'prefs-searchoptions' => 'Serĉu',
 'prefs-namespaces' => 'Nomspacoj',
 'defaultns' => 'Alimaniere, traserĉi la jenajn nomspacojn:',
 'default' => 'defaÅ­lte',
@@ -1851,7 +1851,7 @@ Se la problemo kontinuas, kontaku [[Special:ListUsers/sysop|sisteman administran
 'backend-fail-internal' => 'Nekonata eraro okazis en interna konservujo "$1".',
 'backend-fail-contenttype' => 'Ne eblis determini la enhavo-tipo de la dosiero por konservi ĉe "$1".',
 'backend-fail-batchsize' => 'Interna konservujo estis donita komandaron de $1 {{PLURAL:$1|dosiera operacio|dosieraj operacioj}}; la limo estas $2 {{PLURAL:$2|operacio|operacioj}}.',
-'backend-fail-usable' => 'Ne eblis skribi dosieron "$1" pro malsufiĉaj permesoj aŭ mankantaj dosierujoj.',
+'backend-fail-usable' => 'Ne eblis legi aŭ skribi dosieron "$1" pro malsufiĉaj permesoj aŭ mankantaj dosierujoj.',
 
 # File journal errors
 'filejournal-fail-dbconnect' => 'Ne eblis konekti la protokolan datumbazon por la ekstera konservujo "$1".',
@@ -1983,7 +1983,7 @@ Eble vi volas redakti la priskribon ĉe ties [$2 dosier-priskriba paĝo].',
 'uploadnewversion-linktext' => 'Alŝuti novan version de ĉi tiu dosiero',
 'shared-repo-from' => 'de $1',
 'shared-repo' => 'komuna dosierujo',
-'upload-disallowed-here' => 'Bedaŭrinde, vi ne povas superskribi ĉi tiun bildon.',
+'upload-disallowed-here' => 'Vi ne povas superskribi ĉi tiun bildon.',
 
 # File reversion
 'filerevert' => 'Restarigi $1',
@@ -2091,6 +2091,7 @@ Paĝo estas traktata kiel apartigilo se ĝi uzas ŝablonon kiu estas ligita de [
 # Miscellaneous special pages
 'nbytes' => '$1 {{PLURAL:$1|bitoko|bitokoj}}',
 'ncategories' => '{{PLURAL:$1|unu kategorio|$1 kategorioj}}',
+'ninterwikis' => '$1 {{PLURAL:$1|interlingva ligilo|interlingvaj ligiloj}}',
 'nlinks' => '$1 {{PLURAL:$1|ligilo|ligiloj}}',
 'nmembers' => '{{PLURAL:$1|unu membro|$1 membroj}}',
 'nrevisions' => '$1 {{PLURAL:$1|versio|versioj}}',
@@ -2119,6 +2120,7 @@ Paĝo estas traktata kiel apartigilo se ĝi uzas ŝablonon kiu estas ligita de [
 'mostlinkedtemplates' => 'Plej ligitaj ŝablonoj',
 'mostcategories' => 'Artikoloj kun la plej multaj kategorioj',
 'mostimages' => 'Plej ligitaj bildoj',
+'mostinterwikis' => 'Artikoloj kun la plej multaj interlingvaj ligiloj',
 'mostrevisions' => 'Artikoloj kun la plej multaj versioj',
 'prefixindex' => 'Ĉiuj paĝoj kun prefikso',
 'prefixindex-namespace' => 'Ĉiuj paĝoj kun prefikso ($1 nomspaco)',
@@ -2520,7 +2522,8 @@ Vi verŝajne havas malbonan ligilon, aŭ la revizio eble estis restarigita aŭ f
 'undeletedrevisions' => '{{PLURAL:$1|1 versio restarigita|$1 versioj restarigitaj}}',
 'undeletedrevisions-files' => '{{PLURAL:$1|1 versio|$1 versioj}} kaj {{PLURAL:$2|1 dosiero|$2 dosieroj}} restarigitaj',
 'undeletedfiles' => '{{PLURAL:$1|1 dosiero restarigita|$1 dosieroj restarigitaj}}',
-'cannotundelete' => 'Restarigo malsukcesis; iu eble restarigis la paĝon antaŭe.',
+'cannotundelete' => 'Restarigo malsukcesis: 
+$1',
 'undeletedpage' => "'''$1 estis restarigita'''
 
 Konsultu la [[Special:Log/delete|deletion log]] por protokolo pri la lastatempaj forigoj kaj restarigoj.",
@@ -3090,18 +3093,42 @@ Datoj de versioj kaj nomoj de redaktantoj estos preservitaj.
 
 # Info page
 'pageinfo-title' => 'Informoj por "$1"',
+'pageinfo-not-current' => 'Informoj povas esti montritaj nur por la nuna versio',
 'pageinfo-header-basic' => 'Baza informo',
 'pageinfo-header-edits' => 'Historio de redaktoj',
+'pageinfo-header-restrictions' => 'Protektado de la paĝo',
+'pageinfo-header-properties' => 'Ecoj de la paĝo',
+'pageinfo-display-title' => 'Montrita titolo',
+'pageinfo-default-sort' => 'Pravaloro de ordiga ŝlosilo',
+'pageinfo-length' => 'Paĝgrandeco (en bajtoj)',
 'pageinfo-article-id' => 'Paĝa identigo',
+'pageinfo-robot-policy' => 'Statuso de la serĉilo',
 'pageinfo-robot-index' => 'Indeksebla',
 'pageinfo-robot-noindex' => 'Ne indeksebla',
 'pageinfo-views' => 'Nombro de rigardoj',
 'pageinfo-watchers' => 'Nombro de paĝatentantoj',
-'pageinfo-lastuser' => 'Lasta redaktoro',
+'pageinfo-redirects-name' => 'Alidirektoj al ĉi tiu paĝo',
+'pageinfo-subpages-name' => 'Subpaĝoj de ĉi tiu paĝo',
+'pageinfo-subpages-value' => '$1 ($2 {{PLURAL:$2|alidirektilo|alidirektiloj}}; $3 {{PLURAL:$3|ne-alidirektilo|ne-alidirektiloj}})',
+'pageinfo-firstuser' => 'Kreinto de la paĝo',
+'pageinfo-firsttime' => 'Dato de paĝkreado',
+'pageinfo-lastuser' => 'Lasta redaktinto',
 'pageinfo-lasttime' => 'Dato de lasta redakto',
-'pageinfo-edits' => 'Tuta nombro de redaktoj',
-'pageinfo-authors' => 'Tuta nombro de malsamaj aÅ­toroj',
+'pageinfo-edits' => 'Suma nombro de redaktoj',
+'pageinfo-authors' => 'Suma nombro de malsamaj aÅ­toroj',
+'pageinfo-recent-edits' => 'Nombro da lastaj redaktoj (ene de lastaj $1)',
 'pageinfo-recent-authors' => 'Lasta nombro de malsamaj aÅ­toroj',
+'pageinfo-magic-words' => '{{PLURAL:$1|Magia vorto|Magiaj vortoj}} ($1)',
+'pageinfo-hidden-categories' => '{{PLURAL:$1|Kaŝita kategorio|Kaŝitaj kategorioj}} ($1)',
+'pageinfo-templates' => '{{PLURAL:$1|Inkluzivita ŝablono|Inkluzivitaj ŝablonoj}} ($1)',
+'pageinfo-toolboxlink' => 'Informoj pri la paĝo',
+'pageinfo-redirectsto' => 'Alidirektas al',
+'pageinfo-redirectsto-info' => 'Informo',
+'pageinfo-contentpage' => 'Kalkulita kiel entenopaĝo',
+'pageinfo-contentpage-yes' => 'Jes',
+'pageinfo-protect-cascading' => 'Protektado kaskade fontas el ĉi tie',
+'pageinfo-protect-cascading-yes' => 'Jes',
+'pageinfo-protect-cascading-from' => 'Protektado kaskade fontas el',
 
 # Skin names
 'skinname-standard' => 'Klasiko',
@@ -3155,6 +3182,7 @@ $1',
 'file-info-size-pages' => '$1 × $2 rastrumeroj, dosiera grandeco: $3, MIME-tipo: $4, $5 {{PLURAL:$5|paĝo|paĝoj}}',
 'file-nohires' => 'Nenia pli granda distingivo havebla.',
 'svg-long-desc' => 'SVG-dosiero, $1 × $2 rastrumeroj, grandeco de dosiero: $3',
+'svg-long-desc-animated' => 'Animata SVG-dosiero, $1 × $2 rastrumeroj, grandeco de dosiero: $3',
 'show-big-image' => 'Plena distingivo',
 'show-big-image-preview' => 'Grandeco de ĉi antaŭvido: $1.',
 'show-big-image-other' => '{{PLURAL:$2|Alia distingivo|Aliaj distingivoj}}: $1.',
@@ -3164,6 +3192,8 @@ $1',
 'file-info-png-looped' => 'ripetita',
 'file-info-png-repeat' => 'Ludis $1 fojo{{PLURAL:$1||j}}n',
 'file-info-png-frames' => '$1 kadro{{PLURAL:$1||j}}',
+'file-no-thumb-animation' => "'''Noto: Pro teĥnikaj limigoj antaŭvido de ĉi tiu dosiero ne estas animita.'''",
+'file-no-thumb-animation-gif' => "'''Noto: Pro teĥnikaj limigoj antaŭvido de altrezolucia GIF-dosiero kia ĉi tiu ne estas animita.'''",
 
 # Special:NewFiles
 'newimages' => 'Galerio de novaj dosieroj',
@@ -3196,7 +3226,7 @@ Sekvaj ligilo en la sama linio estas konsiderata kiel esceptoj (paĝoj kiel la b
 'metadata-help' => 'Ĉi tiu dosiero enhavas plian informon, verŝajne aldonitan de la cifereca fotilo aŭ skanilo uzita por krei aŭ skani ĝin. Se la dosiero estis modifita de sia originala stato, iuj detaloj eble ne konformos al efektiva stato de la modifita bildo.',
 'metadata-expand' => 'Montri etendajn detalojn',
 'metadata-collapse' => 'Kaŝi etendajn detalojn',
-'metadata-fields' => 'Metadatumaj kampoj de ĉi tiu mesaĝo estos inkluzivita en la paĝoj de bidloj kiam la metadatuma tabelo estas disfaldigita. 
+'metadata-fields' => 'Metadatumaj kampoj de ĉi tiu mesaĝo estos inkluzivitaj en la paĝoj de bildoj kiam la metadatuma tabelo estas disfaldita. 
 Aliaj estos kaŝitaj defaŭlte.
 * make
 * model
@@ -3678,6 +3708,7 @@ $5
 # Scary transclusion
 'scarytranscludedisabled' => '[Intervikia transinkluzivado estas malebligita.]',
 'scarytranscludefailed' => '[Akiro de ŝablono $1 malsukcesis.]',
+'scarytranscludefailed-httpstatus' => '[Malsukcesis akiri la ŝablonon $1 : HTTP  $2 ]',
 'scarytranscludetoolong' => '[URL-o estas tro longa]',
 
 # Delete conflict
diff --git a/languages/messages/MessagesEs.php b/languages/messages/MessagesEs.php
index a586007842..9b8ebd9fec 100644
--- a/languages/messages/MessagesEs.php
+++ b/languages/messages/MessagesEs.php
@@ -118,7 +118,6 @@ $namespaceGenderAliases = array(
 	NS_USER_TALK => array( 'male' => 'Usuario_Discusión', 'female' => 'Usuaria_Discusión' ),
 );
 
-
 $specialPageAliases = array(
 	'Activeusers'               => array( 'UsuariosActivos' ),
 	'Allmessages'               => array( 'TodosLosMensajes' ),
@@ -188,7 +187,6 @@ $specialPageAliases = array(
 	'Recentchanges'             => array( 'CambiosRecientes', 'Cambios_recientes' ),
 	'Recentchangeslinked'       => array( 'CambiosEnEnlazadas', 'Cambios_en_enlazadas' ),
 	'Revisiondelete'            => array( 'BorrarRevisión', 'Borrar_revisión' ),
-	'RevisionMove'              => array( 'MoverRevision' ),
 	'Search'                    => array( 'Buscar' ),
 	'Shortpages'                => array( 'PáginasCortas', 'Páginas_cortas' ),
 	'Specialpages'              => array( 'PáginasEspeciales', 'Páginas_especiales' ),
@@ -226,7 +224,6 @@ $magicWords = array(
 	'forcetoc'                  => array( '0', '__FORZAR_TDC__', '__FORZARTDC__', '__FORZARTOC__', '__FORCETOC__' ),
 	'toc'                       => array( '0', '__TDC__', '__TOC__' ),
 	'noeditsection'             => array( '0', '__NO_EDITAR_SECCIÓN__', '__NOEDITARSECCIÓN__', '__NOEDITARSECCION__', '__NOEDITSECTION__' ),
-	'noheader'                  => array( '0', '__SIN_TÍTULO__', '__SINTÍTULO__', '__NOTÍTULO__', '__NOTITULO__', '__NOHEADER__' ),
 	'currentmonth'              => array( '1', 'MESACTUAL', 'MESACTUAL2', 'CURRENTMONTH', 'CURRENTMONTH2' ),
 	'currentmonth1'             => array( '1', 'MESACTUAL1', 'CURRENTMONTH1' ),
 	'currentmonthname'          => array( '1', 'MESACTUALCOMPLETO', 'NOMBREMESACTUAL', 'CURRENTMONTHNAME' ),
@@ -322,8 +319,8 @@ $magicWords = array(
 	'raw'                       => array( '0', 'SINFORMATO', 'SINPUNTOS', 'RAW:' ),
 	'displaytitle'              => array( '1', 'MOSTRARTÍTULO', 'MOSTRARTITULO', 'DISPLAYTITLE' ),
 	'rawsuffix'                 => array( '1', 'SF', 'R' ),
-	'newsectionlink'            => array( '1', '__VINCULARANUEVASECCION__', 'VÍNCULARANUEVASECCIÓN__', '__NEWSECTIONLINK__' ),
-	'nonewsectionlink'          => array( '1', '__NOVINCULARANUEVASECCION__', 'NOVÍNCULARANUEVASECCIÓN__', '__NONEWSECTIONLINK__' ),
+	'newsectionlink'            => array( '1', '__VINCULARANUEVASECCION__', '__ENLACECREARSECCIÓN__', '__NEWSECTIONLINK__' ),
+	'nonewsectionlink'          => array( '1', '__NOVINCULARANUEVASECCION__', '__SINENLACECREARSECCIÓN__', '__NONEWSECTIONLINK__' ),
 	'currentversion'            => array( '1', 'VERSIONACTUAL', 'VERSIÓNACTUAL', 'CURRENTVERSION' ),
 	'urlencode'                 => array( '0', 'CODIFICARURL:', 'URLENCODE:' ),
 	'currenttimestamp'          => array( '1', 'MARCADEHORAACTUAL', 'CURRENTTIMESTAMP' ),
@@ -409,7 +406,7 @@ $messages = array(
 
 'underline-always' => 'Siempre',
 'underline-never' => 'Nunca',
-'underline-default' => 'Valor predeterminado del navegador',
+'underline-default' => 'Aspecto (skin) o navegador predeterminado',
 
 # Font style option in Special:Preferences
 'editfont-style' => 'Estilo de tipografía del área de edición:',
@@ -1044,7 +1041,7 @@ La última entrada del registro de bloqueos se proporciona debajo para mayor ref
 * '''Opera:''' vacía la caché en ''Herramientas → Preferencias''",
 'usercssyoucanpreview' => "'''Consejo:''' Usa el botón «{{int:showpreview}}» para probar el nuevo CSS antes de guardarlo.",
 'userjsyoucanpreview' => "'''Consejo:''' Usa el botón «{{int:showpreview}}» para probar el nuevo JS antes de guardarlo.",
-'usercsspreview' => "'''Recuerda que solo estás previsualizando tu CSS de usuario.'''
+'usercsspreview' => "'''Recuerda que sólo estás previsualizando tu CSS de usuario.'''
 '''¡Aún no se ha guardado!'''",
 'userjspreview' => "'''¡Recuerda que solo estás previsualizando tu JavaScript de usuario.'''
 '''¡Aún no se ha guardado!'''",
@@ -1052,12 +1049,12 @@ La última entrada del registro de bloqueos se proporciona debajo para mayor ref
 '''¡Aún no se ha guardado!'''",
 'sitejspreview' => "'''Recuerda que sólo estás previsualizando este código JavaScript.'''
 '''¡Aún no se ha guardado!'''",
-'userinvalidcssjstitle' => "'''Aviso:''' No existe la skin «$1». Recuerda que las páginas personalizadas ''.css'' y ''.js'' tienen un título en minúsculas. Por ejemplo, {{ns:user}}:Ejemplo/vector.css en vez de {{ns:user}}:Ejemplo/Vector.css.",
+'userinvalidcssjstitle' => "'''Aviso:''' No existe la piel «$1». Recuerda que las páginas personalizadas ''.css'' y ''.js'' tienen un título en minúsculas. Por ejemplo, {{ns:user}}:Ejemplo/vector.css en vez de {{ns:user}}:Ejemplo/Vector.css.",
 'updated' => '(Actualizado)',
 'note' => "'''Nota:'''",
-'previewnote' => "'''¡Recuerda que esto es solo una previsualización.'''
-¡Tus cambios aún no se ha guardado!",
-'continue-editing' => 'Continuar editando',
+'previewnote' => "'''Recuerda que esto es solo una previsualización.'''
+¡Tus cambios aún no se han guardado!",
+'continue-editing' => 'Ir al área de edición',
 'previewconflict' => 'Esta previsualización refleja el texto en el área de edición superior como aparecerá una vez guardados los cambios.',
 'session_fail_preview' => "'''Lo sentimos, no pudimos procesar la edición debido a una pérdida de los datos de sesión.'''
 Por favor, inténtalo de nuevo.
@@ -1196,8 +1193,8 @@ El motivo dado por $3 es ''$2''",
 'page_first' => 'primeras',
 'page_last' => 'últimas',
 'histlegend' => "Selección de diferencias: marca los selectores de las versiones a comparar y pulsa ''enter'' o el botón de abajo.<br />
-Leyenda: (act) = diferencias con la versión actual,
-(prev) = diferencias con la versión previa, M = edición menor",
+Leyenda: '''(act)''' = diferencias con la versión actual,
+'''(ant)''' = diferencias con la versión anterior, '''m''' = edición menor",
 'history-fieldset-title' => 'Buscar en el historial',
 'history-show-deleted' => 'Solo ediciones ocultadas',
 'histfirst' => 'Primeras',
@@ -1260,7 +1257,7 @@ Aún tiene la posibilidad de verla; puede ampliar los detalles en el [{{fullurl:
 'revdelete-text' => "Las revisiones borradas aún aparecerán en el historial de la página y en los registros, pero sus contenidos no serán accesibles al público.'''
 Otros administradores de {{SITENAME}} aún podrán acceder al contenido oculto y podrán deshacer el borrado a través de la misma interfaz, a menos que se establezcan restricciones adicionales.",
 'revdelete-confirm' => 'Por favor confirma que deseas realizar la operación, que entiendes las consecuencias y que estás ejecutando dicha acción acorde con [[{{MediaWiki:Policy-url}}|las políticas]].',
-'revdelete-suppress-text' => "La herramienta de supresión '''sólo''' debería usarse en los siguientes casos:
+'revdelete-suppress-text' => "La herramienta de supresión '''solo''' debería usarse en los siguientes casos:
 * Información potencialmente injuriosa o calumniante.
 * Información personal inapropiada, tal como:
 *: ''nombres, domicilios, números de teléfono, números de la seguridad social e información análoga.",
@@ -1666,6 +1663,9 @@ Tu dirección de correo no se revela cuando otros usuarios te contactan.',
 'rightslogtext' => 'Este es un registro de cambios en los permisos de usuarios.',
 'rightslogentry' => 'modificó los grupos a los que pertenece $1: de $2 a $3',
 'rightslogentry-autopromote' => 'fue promovido automáticamente desde $2 a $3',
+'logentry-rights-rights' => '$1 modificó la pertenencia a grupos para $3, de $4 a $5',
+'logentry-rights-rights-legacy' => '$1 ha cambiado la pertenencia a grupos de $3',
+'logentry-rights-autopromote' => '$1 fue promocionado automáticamente de $4 a $5',
 'rightsnone' => '(ninguno)',
 
 # Associated actions - in the sentence "You do not have permission to X"
@@ -2291,8 +2291,8 @@ Véase también las [[Special:WantedCategories|categorías requeridas]].',
 'linksearch-ns' => 'Espacio de nombre:',
 'linksearch-ok' => 'Buscar',
 'linksearch-text' => 'Se pueden usar caracteres comodín como "*.wikipedia.org".
-Es necesario, por lo menos, un dominio de nivel, por ejemplo "*.org".<br />
-Protocolos soportados: <code>$1</code> (no añada ninguno de estos en su búsqueda).',
+Es necesario, por lo menos, un dominio de alto nivel, por ejemplo "*.org".<br />
+Protocolos soportados: <code>$1</code> (si no se especifica ninguno, el protocolo por defecto es http://).',
 'linksearch-line' => '$1 enlazado desde $2',
 'linksearch-error' => 'Los comodines sólo pueden aparecer al principio del nombre de sitio.',
 
@@ -2341,8 +2341,8 @@ Puede haber información adicional sobre privilegios individuales en [[{{MediaWi
 'emailuser-title-target' => 'Enviar un correo electrónico a {{GENDER:$1|este usuario|esta usuaria}}',
 'emailuser-title-notarget' => 'Enviar un correo electrónico al usuario',
 'emailpage' => 'Correo electrónico a usuario',
-'emailpagetext' => 'Puedes usar el formulario de abajo para enviar un correo electrónico a este usuario.
-La dirección electrónica que indicaste en [[Special:Preferences|tus preferencias de usuario]] aparecerá en el remitente para que el destinatario pueda responderte.',
+'emailpagetext' => 'Puedes usar el formulario de abajo para enviar un correo electrónico a {{GENDER:$1|este usuario|esta usuaria}}.
+La 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.',
 'usermailererror' => 'El sistema de correo devolvió un error:',
 'defemailsubject' => 'Correo electrónico enviado por el usuario «$1» desde {{SITENAME}}',
 'usermaildisabled' => 'Correo electrónico del usuario deshabilitado',
@@ -2625,7 +2625,7 @@ $1',
 'blanknamespace' => '(Principal)',
 
 # Contributions
-'contributions' => 'Contribuciones del usuario',
+'contributions' => 'Contribuciones {{GENDER:{{BASEPAGENAME}}|del usuario|de la usuaria}}',
 'contributions-title' => 'Contribuciones {{GENDER:$1|del usuario|de la usuaria}} $1',
 'mycontris' => 'Contribuciones',
 'contribsub2' => '$1 ($2)',
@@ -2667,7 +2667,7 @@ A continuación se muestra la última entrada del registro de bloqueos para mayo
 'whatlinkshere-hideredirs' => '$1 redirecciones',
 'whatlinkshere-hidetrans' => '$1 inclusiones',
 'whatlinkshere-hidelinks' => '$1 enlaces',
-'whatlinkshere-hideimages' => '$1 enlaces a imágenes',
+'whatlinkshere-hideimages' => '$1 enlaces a archivos',
 'whatlinkshere-filters' => 'Filtros',
 
 # Block/unblock
@@ -3105,7 +3105,7 @@ Permite añadir una razón al resumen de edición.',
 'standard.css' => '/* Los estilos CSS colocados aquí se aplicarán para todos los usuarios que usen la piel Standard */',
 'nostalgia.css' => '/* Los estilos CSS colocados aquí se aplicarán para todos los usuarios que usen la piel Nostalgia */',
 'cologneblue.css' => '/* Los estilos CSS colocados aquí se aplicarán para todos los usuarios que usen la piel Cologne Blue */',
-'monobook.css' => '/* Los estilos CSS colocados aquí se aplicarán para todos los usuarios que usen la piel Monobook */',
+'monobook.css' => '/* Los estilos CSS colocados aquí se aplicarán para todos los usuarios que usen la piel MonoBook */',
 'myskin.css' => '/* Los estilos CSS colocados aquí se aplicarán para todos los usuarios que usen la piel MySkin */',
 'chick.css' => '/* Los estilos CSS colocados aquí se aplicarán para todos los usuarios que usen la piel Chick */',
 'simple.css' => '/* Los estilos CSS colocados aquí se aplicarán para todos los usuarios que usen la piel Simple */',
@@ -3162,7 +3162,7 @@ Esto podría estar causado por un enlace a un sitio externo incluido en la lista
 
 # Info page
 'pageinfo-title' => 'Información para «$1»',
-'pageinfo-not-current' => 'Únicamente se puede mostrar la información para la revisión actual.',
+'pageinfo-not-current' => 'Lo sentimos, no es posible mostrar esta información para las revisiones antiguas.',
 'pageinfo-header-basic' => 'Información básica',
 'pageinfo-header-edits' => 'Historial de ediciones',
 'pageinfo-header-restrictions' => 'Protección de página',
@@ -3171,6 +3171,7 @@ Esto podría estar causado por un enlace a un sitio externo incluido en la lista
 'pageinfo-default-sort' => 'Criterio de ordenación predeterminado',
 'pageinfo-length' => 'Longitud de la página (en bytes)',
 'pageinfo-article-id' => 'Identificador ID de la página',
+'pageinfo-language' => 'Idioma de la página',
 'pageinfo-robot-policy' => 'Estado del motor de búsqueda',
 'pageinfo-robot-index' => 'Indexable',
 'pageinfo-robot-noindex' => 'No indexable',
@@ -3893,6 +3894,7 @@ También puedes [[Special:EditWatchlist|usar el editor estándar]].',
 'version-license' => 'Licencia',
 'version-poweredby-credits' => "Este wiki funciona gracias a '''[//www.mediawiki.org/ MediaWiki]''', copyright © 2001-$1 $2.",
 'version-poweredby-others' => 'otros',
+'version-credits-summary' => 'Queremos reconocer a las siguientes personas por su contribución a [[Special:Version|MediaWiki]].',
 'version-license-info' => 'MediaWiki es software libre; puedes redistribuírlo y/o modificarlo bajo los términos de la Licencia General Pública GNU publicada por la Fundación del Software Libre; ya sea la versión 2 de la licencia, o (a tu elección) cualquier versión posterior.
 
 MediaWiki es distribuído con la esperanza de que será útil, pero SIN NINGUNA GARANTÍA; ni siquiera con la garantía implícita de COMERCIALIZACIÓN ó ADAPTACIÓN A UN PROPÓSITO PARTICULAR. Véase la Licencia Pública General GNU para mayores detalles.
diff --git a/languages/messages/MessagesEu.php b/languages/messages/MessagesEu.php
index 3c03893fa7..a490b8cabf 100644
--- a/languages/messages/MessagesEu.php
+++ b/languages/messages/MessagesEu.php
@@ -275,7 +275,7 @@ $messages = array(
 'faqpage' => 'Project:Maiz egindako galderak',
 
 # Vector skin
-'vector-action-addsection' => 'Mintzagaia gehitu',
+'vector-action-addsection' => 'Gehitu atala',
 'vector-action-delete' => 'Ezabatu',
 'vector-action-move' => 'Mugitu',
 'vector-action-protect' => 'Babestu',
diff --git a/languages/messages/MessagesFa.php b/languages/messages/MessagesFa.php
index 3f69561da7..5047cbb162 100644
--- a/languages/messages/MessagesFa.php
+++ b/languages/messages/MessagesFa.php
@@ -39,6 +39,9 @@
  * @author محک
  */
 
+$rtl = true;
+$fallback8bitEncoding = 'windows-1256';
+
 $namespaceNames = array(
 	NS_MEDIA            => 'مدیا',
 	NS_SPECIAL          => 'ویژه',
@@ -88,7 +91,7 @@ $specialPageAliases = array(
 	'DeletedContributions'      => array( 'مشارکت‌های_حذف_شده' ),
 	'Disambiguations'           => array( 'ابهام‌زدایی' ),
 	'DoubleRedirects'           => array( 'تغییرمسیرهای_دوتایی' ),
-	'EditWatchlist'             => array( 'ویرایش_پی‌گیری‌ها' ),
+	'EditWatchlist'             => array( 'ویرایش_فهرست_پی‌گیری‌ها' ),
 	'Emailuser'                 => array( 'نامه_به_کاربر' ),
 	'Export'                    => array( 'برون_بری_صفحه' ),
 	'Fewestrevisions'           => array( 'کمترین_نسخه' ),
@@ -135,7 +138,6 @@ $specialPageAliases = array(
 	'Recentchanges'             => array( 'تغییرات_اخیر' ),
 	'Recentchangeslinked'       => array( 'تغییرات_مرتبط' ),
 	'Revisiondelete'            => array( 'حذف_نسخه' ),
-	'RevisionMove'              => array( 'انتقال_نسخه' ),
 	'Search'                    => array( 'جستجو' ),
 	'Shortpages'                => array( 'صفحه‌های_کوتاه' ),
 	'Specialpages'              => array( 'صفحه‌های_ویژه' ),
@@ -167,102 +169,6 @@ $specialPageAliases = array(
 	'Withoutinterwiki'          => array( 'بدون_میان‌ویکی' ),
 );
 
-
-
-$digitTransformTable = array(
-	'0' => 'Û°', # &#x06f0;
-	'1' => 'Û±', # &#x06f1;
-	'2' => 'Û²', # &#x06f2;
-	'3' => 'Û³', # &#x06f3;
-	'4' => 'Û´', # &#x06f4;
-	'5' => 'Ûµ', # &#x06f5;
-	'6' => 'Û¶', # &#x06f6;
-	'7' => 'Û·', # &#x06f7;
-	'8' => 'Û¸', # &#x06f8;
-	'9' => 'Û¹', # &#x06f9;
-	'%' => 'Ùª', # &#x066a;
-	'.' => 'Ù«', # &#x066b; wrong table?
-	',' => 'Ù¬', # &#x066c;
-);
-
-$fallback8bitEncoding = 'windows-1256';
-
-$rtl = true;
-
-
-/**
- * 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 (DateFormatter.php).
- *
- * The special key "default" is an alias for either dmy or mdy depending on
- * $wgAmericanDates
- */
-$datePreferences = array(
-	'default',
-	'mdy',
-	'dmy',
-	'ymd',
-	'persian',
-	'hebrew',
-	'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 = 'dmy or mdy';
-
-/**
- * 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(
-    # Please be cautious not to delete the invisible RLM from the beginning of the strings.
-	'mdy time' => '‏H:i',
-	'mdy date' => '‏n/j/Y میلادی',
-	'mdy both' => '‏n/j/Y میلادی، ساعت H:i',
-
-	'dmy time' => '‏H:i',
-	'dmy date' => '‏j xg Y',
-	'dmy both' => '‏j xg Y، ساعت H:i',
-
-	'ymd time' => '‏H:i',
-	'ymd date' => '‏Y/n/j میلادی',
-	'ymd both' => '‏Y/n/j میلادی، ساعت H:i',
-
-	'persian time' => '‏H:i',
-	'persian date' => '‏xij xiF xiY',
-	'persian both' => '‏xij xiF xiY، ساعت H:i',
-
-	'hebrew time' => '‏H:i',
-	'hebrew date' => '‏xij xjF xjY',
-	'hebrew both' => '‏H:i, xij xjF xjY',
-
-	'ISO 8601 time' => 'xnH:xni:xns',
-	'ISO 8601 date' => 'xnY-xnm-xnd',
-	'ISO 8601 both' => 'xnY-xnm-xnd"T"xnH:xni:xns',
-);
-
 $magicWords = array(
 	'redirect'                  => array( '0', '#تغییر_مسیر', '#تغییرمسیر', '#REDIRECT' ),
 	'notoc'                     => array( '0', '__بی‌فهرست__', '__NOTOC__' ),
@@ -270,7 +176,6 @@ $magicWords = array(
 	'forcetoc'                  => array( '0', '__بافهرست__', '__FORCETOC__' ),
 	'toc'                       => array( '0', '__فهرست__', '__TOC__' ),
 	'noeditsection'             => array( '0', '__بی‌بخش__', '__NOEDITSECTION__' ),
-	'noheader'                  => array( '0', '__بی‌عنوان__', '__NOHEADER__' ),
 	'currentmonth'              => array( '1', 'ماه', 'ماه‌کنونی', 'ماه_کنونی', 'ماه‌کنونی۲', 'ماه_کنونی۲', 'CURRENTMONTH', 'CURRENTMONTH2' ),
 	'currentmonth1'             => array( '1', 'ماه۱', 'ماه‌کنونی۱', 'ماه_کنونی۱', 'CURRENTMONTH1' ),
 	'currentmonthname'          => array( '1', 'نام‌ماه', 'نام_ماه', 'نام‌ماه‌کنونی', 'نام_ماه_کنونی', 'CURRENTMONTHNAME' ),
@@ -418,6 +323,95 @@ $magicWords = array(
 	'defaultsort_noreplace'     => array( '0', 'جایگزین‌نکن', 'جایگزین_نکن', 'noreplace' ),
 );
 
+$digitTransformTable = array(
+	'0' => 'Û°', # &#x06f0;
+	'1' => 'Û±', # &#x06f1;
+	'2' => 'Û²', # &#x06f2;
+	'3' => 'Û³', # &#x06f3;
+	'4' => 'Û´', # &#x06f4;
+	'5' => 'Ûµ', # &#x06f5;
+	'6' => 'Û¶', # &#x06f6;
+	'7' => 'Û·', # &#x06f7;
+	'8' => 'Û¸', # &#x06f8;
+	'9' => 'Û¹', # &#x06f9;
+	'%' => 'Ùª', # &#x066a;
+	'.' => 'Ù«', # &#x066b; wrong table?
+	',' => 'Ù¬', # &#x066c;
+);
+
+/**
+ * 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 (DateFormatter.php).
+ *
+ * The special key "default" is an alias for either dmy or mdy depending on
+ * $wgAmericanDates
+ */
+$datePreferences = array(
+	'default',
+	'mdy',
+	'dmy',
+	'ymd',
+	'persian',
+	'hebrew',
+	'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 = 'dmy or mdy';
+
+/**
+ * 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(
+    # Please be cautious not to delete the invisible RLM from the beginning of the strings.
+	'mdy time' => '‏H:i',
+	'mdy date' => '‏n/j/Y میلادی',
+	'mdy both' => '‏n/j/Y میلادی، ساعت H:i',
+
+	'dmy time' => '‏H:i',
+	'dmy date' => '‏j xg Y',
+	'dmy both' => '‏j xg Y، ساعت H:i',
+
+	'ymd time' => '‏H:i',
+	'ymd date' => '‏Y/n/j میلادی',
+	'ymd both' => '‏Y/n/j میلادی، ساعت H:i',
+
+	'persian time' => '‏H:i',
+	'persian date' => '‏xij xiF xiY',
+	'persian both' => '‏xij xiF xiY، ساعت H:i',
+
+	'hebrew time' => '‏H:i',
+	'hebrew date' => '‏xij xjF xjY',
+	'hebrew both' => '‏H:i, xij xjF xjY',
+
+	'ISO 8601 time' => 'xnH:xni:xns',
+	'ISO 8601 date' => 'xnY-xnm-xnd',
+	'ISO 8601 both' => 'xnY-xnm-xnd"T"xnH:xni:xns',
+);
+
 # Harakat are intentionally not included in the linkTrail. Their addition should
 # take place after enough tests.
 $linkTrail = "/^([ابپتثجچحخدذرزژسشصضطظعغفقکگلمنوهیآأئؤة‌]+)(.*)$/sDu";
@@ -480,7 +474,7 @@ $messages = array(
 
 'underline-always' => 'همیشه',
 'underline-never' => 'هرگز',
-'underline-default' => 'پیش‌فرض مرورگر',
+'underline-default' => 'پوسته یا مرورگر پیش‌فرض',
 
 # Font style option in Special:Preferences
 'editfont-style' => 'سبک قلم جعبهٔ ویرایش:',
@@ -565,8 +559,8 @@ $messages = array(
 'newwindow' => '(در پنجرهٔ جدید باز می‌شود)',
 'cancel' => 'لغو',
 'moredotdotdot' => 'بیشتر...',
-'mypage' => 'صفحهٔ من',
-'mytalk' => 'بحث من',
+'mypage' => 'صفحه',
+'mytalk' => 'بحث',
 'anontalk' => 'بحث برای این آی‌پی',
 'navigation' => 'گشتن',
 'and' => '&#32;و',
@@ -696,10 +690,10 @@ $1',
 'youhavenewmessages' => '$1 دارید ($2).',
 'newmessageslink' => 'پیام‌های جدید',
 'newmessagesdifflink' => 'آخرین تغییر',
-'youhavenewmessagesfromusers' => 'شما از {{PLURAL:$3| کاربر دیگر| $3  کاربر}} $1 دارید ($2).',
+'youhavenewmessagesfromusers' => 'شما از {{PLURAL:$3|یک کاربر دیگر|$3  کاربر}} $1 دارید ($2).',
 'youhavenewmessagesmanyusers' => 'شما از تعدادی کاربر $1 دارید ($2).',
-'newmessageslinkplural' => '{{PLURAL:$1|پیام جدید|پیام جدید}}',
-'newmessagesdifflinkplural' => '{{formatnum:$1}} {{PLURAL:$1|تغییر|تغییرات}} اخیر',
+'newmessageslinkplural' => '{{PLURAL:$1|پیام جدید}}',
+'newmessagesdifflinkplural' => '{{formatnum:$1}} {{PLURAL:$1|تغییر|تغییر}} اخیر',
 'youhavenewmessagesmulti' => 'پیام‌های جدیدی در $1 دارید.',
 'editsection' => 'ویرایش',
 'editold' => 'ویرایش',
@@ -1120,13 +1114,13 @@ $2
 'userpage-userdoesnotexist-view' => 'حساب کاربری «$1» ثبت نشده‌است.',
 'blocked-notice-logextract' => 'دسترسی این کاربر در حال حاضر بسته است.
 آخرین مورد سیاهه قطع دسترسی در زیر آمده‌است:',
-'clearyourcache' => "''نکته:''' پس از ذخیره‌کردن ممکن است برای دیدن تغییرات نیاز باشد که حافظهٔ نهانی مرورگر خود را پاک کنید.
+'clearyourcache' => "'''نکته:''' پس از ذخیره‌کردن ممکن است برای دیدن تغییرات نیاز باشد که حافظهٔ نهانی مرورگر خود را پاک کنید.
 *'''فایرفاکس / سافاری:'''  کلید ''Shift'' را نگه دارید و روی دکمهٔ ''Reload'' کلیک کنید، یا کلید‌های ''Ctrl-F5'' یا ''Ctrl-R'' را با هم فشار دهید (در رایانه‌های اپل مکینتاش کلید‌های ''⌘-R'')
 *'''گوگل کروم:'''کلیدهای ''Ctrl+Shift+R'' را با هم فشار دهید. (در رایانه‌های اپل مکینتاش کلید‌های ''⌘-Shift-R'')
 *'''اینترنت اکسپلورر:''' کلید ''Ctrl'' را نگه‌دارید و روی دکمهٔ ''Refresh'' کلیک کنید، یا کلید‌های ''Ctrl-F5'' را با هم فشار دهید
 *'''اپرا:''' حافظهٔ نهانی مرورگر را از طریق منوی ''Tools &rarr; Preferences'' پاک کنید",
 'usercssyoucanpreview' => "'''نکته:''' پیش از ذخیره‌کردن فایل سی‌اس‌اس خود، با دکمهٔ '''{{int:showpreview}}''' آن را آزمایش کنید.",
-'userjsyoucanpreview' => "''نکته:''' پیش از ذخیره‌کردن فایل جاوااسکریپت خود، با دکمهٔ '''{{int:showpreview}}''' آن را آزمایش کنید.",
+'userjsyoucanpreview' => "'''نکته:''' پیش از ذخیره‌کردن فایل جاوااسکریپت خود، با دکمهٔ '''{{int:showpreview}}''' آن را آزمایش کنید.",
 'usercsspreview' => "'''فراموش مکنید که شما فقط دارید پیش‌نمایش سی‌اس‌اس کاربری‌تان را می‌بینید.'''
 '''این سی‌اس‌اس هنوز ذخیره نشده‌است!'''",
 'userjspreview' => "'''به یاد داشته باشید که شما فقط دارید جاوااسکریپت کاربری‌تان را امتحان می‌کنید/پیش‌نمایش آن را می‌بینید.'''
@@ -1141,7 +1135,7 @@ $2
 'note' => "'''نکته:'''",
 'previewnote' => "'''به یاد داشته باشید که این فقط پیش‌نمایش است.'''
 تغییرات شما هنوز ذخیره نشده‌است!",
-'continue-editing' => 'ادامهٔ ویرایش',
+'continue-editing' => 'رفتن به قسمت ویرایش',
 'previewconflict' => 'این پیش‌نمایش منعکس‌کنندهٔ متن ناحیهٔ ویرایش متن بالایی است، به شکلی که اگر متن را ذخیره کنید نمایش خواهد یافت.',
 'session_fail_preview' => "'''شرمنده! به علت از دست رفتن اطلاعات نشست کاربری نمی‌توانیم ویرایش شما را پردازش کنیم.'''
 لطفاً دوباره سعی کنید.
@@ -1525,7 +1519,7 @@ $1",
 
 # Preferences page
 'preferences' => 'ترجیحات',
-'mypreferences' => 'ترجیحات من',
+'mypreferences' => 'ترجیحات',
 'prefs-edits' => 'تعداد ویرایش‌ها:',
 'prefsnologin' => 'به سامانه وارد نشده‌اید',
 'prefsnologintext' => 'برای تنظیم ترجیحات کاربر باید <span class="plainlinks">[{{fullurl:{{#Special:UserLogin}}|returnto=$1}} به سامانه وارد شوید]</span>.',
@@ -1760,6 +1754,9 @@ $1",
 'rightslogtext' => 'این سیاههٔ تغییرات اختیارات کاربر است.',
 'rightslogentry' => 'عضویت $1 را از گروه $2 به $3 تغییر داد',
 'rightslogentry-autopromote' => 'به طور خودکار از $2 به $3 ارتقا یافت',
+'logentry-rights-rights' => '$1 عضویت $3 را از گروه $4 به $5 تغییر داد',
+'logentry-rights-rights-legacy' => '$1 گروه عضویت $3 را تغییر داد',
+'logentry-rights-autopromote' => '$1به طور خودکار از $4  به $5 ارتقا یافت',
 'rightsnone' => '(هیچ)',
 
 # Associated actions - in the sentence "You do not have permission to X"
@@ -2389,7 +2386,7 @@ https://www.mediawiki.org/wiki/Manual:Image_Authorization را ببینید.',
 'linksearch-ok' => 'جستجو',
 'linksearch-text' => 'نشانه‌هایی مانند «‎*.wikipedia.org» را می‌توان استفاده کرد.
 حداقل یک دامنه سطح بالا ، به عنوان مثال "*.org" نیاز دارد.<br />
-پروتکل‌های پشتیبانی‌شده: <code>$1</code> (هیچ یک از این موارد را در جستجوی خود نیافزایید)',
+پروتکل‌های پشتیبانی‌شده: <code>$1</code> (پیش‌فرض برای http:// در صورت مشخص نشدن پروتکل تنظیم شده‌است)',
 'linksearch-line' => '$1 از $2 پیوند دارد',
 'linksearch-error' => 'نشانه‌ها فقط در ابتدای نام میزبان اینترنتی می‌توانند استفاده شوند.',
 
@@ -2438,7 +2435,7 @@ https://www.mediawiki.org/wiki/Manual:Image_Authorization را ببینید.',
 'emailuser-title-target' => 'ایمیل این {{GENDER:$1| کاربر}}',
 'emailuser-title-notarget' => 'رایانامه به کاربر',
 'emailpage' => 'رایانامه به کاربر',
-'emailpagetext' => 'شما می‌توانید از فرم زیر برای ارسال یک رایانامه به این کاربر استفاده کنید.
+'emailpagetext' => 'شما می‌توانید از فرم زیر برای ارسال یک رایانامه به این {{GENDER:$1|کاربر}} استفاده کنید.
 نشانی رایانامه‌ای که در [[Special:Preferences|ترجیحات کاربریتان]] وارد کرده‌اید در نشانی فرستنده (From) نامه خواهد آمد، تا گیرنده بتواند پاسخ دهد.',
 'usermailererror' => 'رایانامه دچار خطا شد:',
 'defemailsubject' => 'رایانامه {{SITENAME}} از طرف کاربر «$1»',
@@ -2470,7 +2467,7 @@ https://www.mediawiki.org/wiki/Manual:Image_Authorization را ببینید.',
 
 # Watchlist
 'watchlist' => 'فهرست پی‌گیری‌های من',
-'mywatchlist' => 'پی‌گیری‌های من',
+'mywatchlist' => 'فهرست پی‌گیری‌ها',
 'watchlistfor2' => 'برای $1 $2',
 'nowatchlist' => 'در فهرست پی‌گیری‌های شما هیچ موردی نیست.',
 'watchlistanontext' => 'برای مشاهده و ویرایش فهرست پی‌گیری‌های خود از $1 استفاده کنید.',
@@ -2734,7 +2731,7 @@ $1',
 # Contributions
 'contributions' => 'مشارکت‌های کاربری',
 'contributions-title' => 'مشارکت‌های کاربری $1',
-'mycontris' => 'مشارکت‌های من',
+'mycontris' => 'مشارکت‌ها',
 'contribsub2' => 'برای $1 ($2)',
 'nocontribs' => 'هیچ تغییری با این مشخصات یافت نشد.',
 'uctop' => ' (بالا)',
@@ -2775,7 +2772,7 @@ $1',
 'whatlinkshere-hideredirs' => '$1 تغییرمسیر',
 'whatlinkshere-hidetrans' => '$1 تراگنجانش‌ها',
 'whatlinkshere-hidelinks' => '$1 پیوند',
-'whatlinkshere-hideimages' => '$1 پیوند به تصویر',
+'whatlinkshere-hideimages' => '$1 پیوندهای پرونده',
 'whatlinkshere-filters' => 'پالایه‌ها',
 
 # Block/unblock
@@ -3248,7 +3245,7 @@ $1',
 
 # Info page
 'pageinfo-title' => 'اطلاعات در مورد «$1»',
-'pageinfo-not-current' => 'اطلاعات ممکن است تنها برای نسخهٔ فعلی نمایش داده شود.',
+'pageinfo-not-current' => 'متاسفانه تهیه اطلاعات ویرایش‌های قدیمی غیرممکن است.',
 'pageinfo-header-basic' => 'اطلاعات اولیه',
 'pageinfo-header-edits' => 'ویرایش تاریخچه',
 'pageinfo-header-restrictions' => 'حفاظت از صفحه',
@@ -3257,6 +3254,7 @@ $1',
 'pageinfo-default-sort' => 'کلید مرتب‌سازی پیش‌فرض',
 'pageinfo-length' => 'حجم صفحه  (بایت)',
 'pageinfo-article-id' => 'شناسهٔ صفحه',
+'pageinfo-language' => 'زبان محتوای صفحه',
 'pageinfo-robot-policy' => 'وضعیت موتور جستجو',
 'pageinfo-robot-index' => 'فهرست‌پذیر',
 'pageinfo-robot-noindex' => 'عدم فهرست‌پذیری',
@@ -4041,6 +4039,7 @@ $5
 'version-license' => 'اجازه‌نامه',
 'version-poweredby-credits' => "این ویکی توسط '''[//www.mediawiki.org/ مدیاویکی]''' پشتیبانی می‌شود، کلیهٔ حقوق محفوظ است © 2001-$1 $2.",
 'version-poweredby-others' => 'دیگران',
+'version-credits-summary' => 'افراد زیر را به خاطر ویرایش‌هایش در [[Special:Version|مدیاویکی]] معرفی می‌نمائیم.',
 'version-license-info' => 'مدیاویکی نرم‌افزاری رایگان است؛ می‌توانید آن را تحت شرایط مجوز عمومی همگانی گنو که توسط بنیاد نرم‌افزار رایگان منتشر شده‌است، بازنشر کنید؛ یا نسخهٔ ۲ از این مجوز، یا (بنا به اختیار) نسخه‌های بعدی.
 
 مدیاویکی به این امید که مفید واقع شود منتشر شده‌است، ولی بدون هیچ‌گونه ضمانتی؛ بدون ضمانت ضمنی که تجاری یا برای کار خاصی مناسب باشد. برای اطلاعات بیشتر مجوز گنو جی‌پی‌ال را مشاهده کنید.
diff --git a/languages/messages/MessagesFi.php b/languages/messages/MessagesFi.php
index e2d265d8e1..53a88c60ab 100644
--- a/languages/messages/MessagesFi.php
+++ b/languages/messages/MessagesFi.php
@@ -38,8 +38,6 @@
  * @author לערי ריינהארט
  */
 
-$separatorTransformTable = array( ',' => "\xc2\xa0", '.' => ',' );
-
 $namespaceNames = array(
 	NS_MEDIA            => 'Media',
 	NS_SPECIAL          => 'Toiminnot',
@@ -64,43 +62,103 @@ $namespaceAliases = array(
 	'Keskustelu_kuvasta' => NS_FILE_TALK,
 );
 
-
-$datePreferences = array(
-	'default',
-	'fi normal',
-	'fi seconds',
-	'fi numeric',
-	'ISO 8601',
-);
-
-$defaultDateFormat = 'fi normal';
-
-$dateFormats = array(
-	'fi normal time' => 'H.i',
-	'fi normal date' => 'j. F"ta" Y',
-	'fi normal both' => 'j. F"ta" Y "kello" H.i',
-
-	'fi seconds time' => 'H:i:s',
-	'fi seconds date' => 'j. F"ta" Y',
-	'fi seconds both' => 'j. F"ta" Y "kello" H:i:s',
-
-	'fi numeric time' => 'H.i',
-	'fi numeric date' => 'j.n.Y',
-	'fi numeric both' => 'j.n.Y "kello" H.i',
-);
-
-$datePreferenceMigrationMap = array(
-	'default',
-	'fi normal',
-	'fi seconds',
-	'fi numeric',
-);
-
-$bookstoreList = array(
-	'Bookplus'                      => 'http://www.bookplus.fi/product.php?isbn=$1',
-	'Helsingin yliopiston kirjasto' => 'http://pandora.lib.hel.fi/cgi-bin/mhask/monihask.py?volname=&author=&keyword=&ident=$1&submit=Hae&engine_helka=ON',
-	'Pääkaupunkiseudun kirjastot'   => 'http://www.helmet.fi/search*fin/i?SEARCH=$1',
-	'Tampereen seudun kirjastot'    => 'http://kirjasto.tampere.fi/Piki?formid=fullt&typ0=6&dat0=$1'
+$specialPageAliases = array(
+	'Activeusers'               => array( 'Aktiiviset_käyttäjät' ),
+	'Allmessages'               => array( 'Järjestelmäviestit' ),
+	'Allpages'                  => array( 'Kaikki_sivut' ),
+	'Ancientpages'              => array( 'Kuolleet_sivut' ),
+	'Badtitle'                  => array( 'Kelpaamaton_otsikko' ),
+	'Blankpage'                 => array( 'Tyhjä_sivu' ),
+	'Block'                     => array( 'Estä' ),
+	'Blockme'                   => array( 'Estä_minut' ),
+	'Booksources'               => array( 'Kirjalähteet' ),
+	'BrokenRedirects'           => array( 'Virheelliset_ohjaukset', 'Virheelliset_uudelleenohjaukset' ),
+	'Categories'                => array( 'Luokat' ),
+	'ChangeEmail'               => array( 'Muuta_sähköpostiosoite' ),
+	'ChangePassword'            => array( 'Muuta_salasana', 'Alusta_salasana' ),
+	'ComparePages'              => array( 'Vertaa_sivuja' ),
+	'Confirmemail'              => array( 'Varmista_sähköpostiosoite' ),
+	'Contributions'             => array( 'Muokkaukset' ),
+	'CreateAccount'             => array( 'Luo_tunnus' ),
+	'Deadendpages'              => array( 'Linkittömät_sivut' ),
+	'DeletedContributions'      => array( 'Poistetut_muokkaukset' ),
+	'Disambiguations'           => array( 'Täsmennyssivut' ),
+	'DoubleRedirects'           => array( 'Kaksinkertaiset_ohjaukset', 'Kaksinkertaiset_uudelleenohjaukset' ),
+	'EditWatchlist'             => array( 'Muokkaa_tarkkailulistaa' ),
+	'Emailuser'                 => array( 'Lähetä_sähköpostia' ),
+	'Export'                    => array( 'Vie_sivuja' ),
+	'Fewestrevisions'           => array( 'Vähiten_muokatut_sivut' ),
+	'FileDuplicateSearch'       => array( 'Kaksoiskappaleiden_haku' ),
+	'Filepath'                  => array( 'Tiedostopolku' ),
+	'Import'                    => array( 'Tuo_sivuja' ),
+	'Invalidateemail'           => array( 'Hylkää_sähköpostiosoite' ),
+	'BlockList'                 => array( 'Muokkausestot' ),
+	'LinkSearch'                => array( 'Linkkihaku' ),
+	'Listadmins'                => array( 'Ylläpitäjät' ),
+	'Listbots'                  => array( 'Botit' ),
+	'Listfiles'                 => array( 'Tiedostoluettelo' ),
+	'Listgrouprights'           => array( 'Käyttäjäryhmien_oikeudet' ),
+	'Listredirects'             => array( 'Ohjaukset', 'Ohjaussivut', 'Uudelleenohjaukset' ),
+	'Listusers'                 => array( 'Käyttäjät' ),
+	'Lockdb'                    => array( 'Lukitse_tietokanta' ),
+	'Log'                       => array( 'Loki', 'Lokit' ),
+	'Lonelypages'               => array( 'Yksinäiset_sivut' ),
+	'Longpages'                 => array( 'Pitkät_sivut' ),
+	'MergeHistory'              => array( 'Liitä_muutoshistoria' ),
+	'MIMEsearch'                => array( 'MIME-haku' ),
+	'Mostcategories'            => array( 'Luokitelluimmat_sivut' ),
+	'Mostimages'                => array( 'Viitatuimmat_tiedostot' ),
+	'Mostlinked'                => array( 'Viitatuimmat_sivut' ),
+	'Mostlinkedcategories'      => array( 'Viitatuimmat_luokat' ),
+	'Mostlinkedtemplates'       => array( 'Viitatuimmat_mallineet' ),
+	'Mostrevisions'             => array( 'Muokatuimmat_sivut' ),
+	'Movepage'                  => array( 'Siirrä_sivu' ),
+	'Mycontributions'           => array( 'Omat_muokkaukset' ),
+	'Mypage'                    => array( 'Oma_sivu' ),
+	'Mytalk'                    => array( 'Oma_keskustelu' ),
+	'Myuploads'                 => array( 'Omat_tiedostot' ),
+	'Newimages'                 => array( 'Uudet_tiedostot', 'Uudet_kuvat' ),
+	'Newpages'                  => array( 'Uudet_sivut' ),
+	'PasswordReset'             => array( 'Unohtuneen_salasanan_vaihto' ),
+	'PermanentLink'             => array( 'Ikilinkki' ),
+	'Popularpages'              => array( 'Suositut_sivut' ),
+	'Preferences'               => array( 'Asetukset' ),
+	'Prefixindex'               => array( 'Etuliiteluettelo' ),
+	'Protectedpages'            => array( 'Suojatut_sivut' ),
+	'Protectedtitles'           => array( 'Suojatut_sivunimet' ),
+	'Randompage'                => array( 'Satunnainen_sivu' ),
+	'Randomredirect'            => array( 'Satunnainen_ohjaus', 'Satunnainen_uudelleenohjaus' ),
+	'Recentchanges'             => array( 'Tuoreet_muutokset' ),
+	'Recentchangeslinked'       => array( 'Linkitetyt_muutokset' ),
+	'Revisiondelete'            => array( 'Poista_muokkaus' ),
+	'Search'                    => array( 'Haku' ),
+	'Shortpages'                => array( 'Lyhyet_sivut' ),
+	'Specialpages'              => array( 'Toimintosivut' ),
+	'Statistics'                => array( 'Tilastot' ),
+	'Tags'                      => array( 'Merkinnät' ),
+	'Unblock'                   => array( 'Poista_esto' ),
+	'Uncategorizedcategories'   => array( 'Luokittelemattomat_luokat' ),
+	'Uncategorizedimages'       => array( 'Luokittelemattomat_tiedostot' ),
+	'Uncategorizedpages'        => array( 'Luokittelemattomat_sivut' ),
+	'Uncategorizedtemplates'    => array( 'Luokittelemattomat_mallineet' ),
+	'Undelete'                  => array( 'Palauta' ),
+	'Unlockdb'                  => array( 'Avaa_tietokanta' ),
+	'Unusedcategories'          => array( 'Käyttämättömät_luokat' ),
+	'Unusedimages'              => array( 'Käyttämättömät_tiedostot' ),
+	'Unusedtemplates'           => array( 'Käyttämättömät_mallineet' ),
+	'Unwatchedpages'            => array( 'Tarkkailemattomat_sivut' ),
+	'Upload'                    => array( 'Tallenna', 'Lisää_tiedosto' ),
+	'Userlogin'                 => array( 'Kirjaudu_sisään' ),
+	'Userlogout'                => array( 'Kirjaudu_ulos' ),
+	'Userrights'                => array( 'Käyttöoikeudet' ),
+	'Version'                   => array( 'Versio' ),
+	'Wantedcategories'          => array( 'Halutuimmat_luokat' ),
+	'Wantedfiles'               => array( 'Halutuimmat_tiedostot' ),
+	'Wantedpages'               => array( 'Halutuimmat_sivut' ),
+	'Wantedtemplates'           => array( 'Halutuimmat_mallineet' ),
+	'Watchlist'                 => array( 'Tarkkailulista' ),
+	'Whatlinkshere'             => array( 'Tänne_viittaavat_sivut' ),
+	'Withoutinterwiki'          => array( 'Kielilinkittömät_sivut' ),
 );
 
 $magicWords = array(
@@ -109,7 +167,6 @@ $magicWords = array(
 	'forcetoc'                  => array( '0', '__SISLUETTPAKOTUS__', '__FORCETOC__' ),
 	'toc'                       => array( '0', '__SISÄLLYSLUETTELO__', '__TOC__' ),
 	'noeditsection'             => array( '0', '__EIOSIOMUOKKAUSTA__', '__NOEDITSECTION__' ),
-	'noheader'                  => array( '0', '__EIOTSIKKOA__', '__NOHEADER__' ),
 	'currentmonth'              => array( '1', 'KULUVAKUU', 'CURRENTMONTH', 'CURRENTMONTH2' ),
 	'currentmonthname'          => array( '1', 'KULUVAKUUNIMI', 'CURRENTMONTHNAME' ),
 	'currentmonthnamegen'       => array( '1', 'KULUVAKUUNIMIGEN', 'CURRENTMONTHNAMEGEN' ),
@@ -210,104 +267,44 @@ $magicWords = array(
 	'protectionlevel'           => array( '1', 'SUOJAUSTASO', 'PROTECTIONLEVEL' ),
 );
 
-$specialPageAliases = array(
-	'Activeusers'               => array( 'Aktiiviset_käyttäjät' ),
-	'Allmessages'               => array( 'Järjestelmäviestit' ),
-	'Allpages'                  => array( 'Kaikki_sivut' ),
-	'Ancientpages'              => array( 'Kuolleet_sivut' ),
-	'Badtitle'                  => array( 'Kelpaamaton_otsikko' ),
-	'Blankpage'                 => array( 'Tyhjä_sivu' ),
-	'Block'                     => array( 'Estä' ),
-	'Blockme'                   => array( 'Estä_minut' ),
-	'Booksources'               => array( 'Kirjalähteet' ),
-	'BrokenRedirects'           => array( 'Virheelliset_ohjaukset', 'Virheelliset_uudelleenohjaukset' ),
-	'Categories'                => array( 'Luokat' ),
-	'ChangeEmail'               => array( 'Muuta_sähköpostiosoite' ),
-	'ChangePassword'            => array( 'Muuta_salasana', 'Alusta_salasana' ),
-	'ComparePages'              => array( 'Vertaa_sivuja' ),
-	'Confirmemail'              => array( 'Varmista_sähköpostiosoite' ),
-	'Contributions'             => array( 'Muokkaukset' ),
-	'CreateAccount'             => array( 'Luo_tunnus' ),
-	'Deadendpages'              => array( 'Linkittömät_sivut' ),
-	'DeletedContributions'      => array( 'Poistetut_muokkaukset' ),
-	'Disambiguations'           => array( 'Täsmennyssivut' ),
-	'DoubleRedirects'           => array( 'Kaksinkertaiset_ohjaukset', 'Kaksinkertaiset_uudelleenohjaukset' ),
-	'EditWatchlist'             => array( 'Muokkaa_tarkkailulistaa' ),
-	'Emailuser'                 => array( 'Lähetä_sähköpostia' ),
-	'Export'                    => array( 'Vie_sivuja' ),
-	'Fewestrevisions'           => array( 'Vähiten_muokatut_sivut' ),
-	'FileDuplicateSearch'       => array( 'Kaksoiskappaleiden_haku' ),
-	'Filepath'                  => array( 'Tiedostopolku' ),
-	'Import'                    => array( 'Tuo_sivuja' ),
-	'Invalidateemail'           => array( 'Hylkää_sähköpostiosoite' ),
-	'BlockList'                 => array( 'Muokkausestot' ),
-	'LinkSearch'                => array( 'Linkkihaku' ),
-	'Listadmins'                => array( 'Ylläpitäjät' ),
-	'Listbots'                  => array( 'Botit' ),
-	'Listfiles'                 => array( 'Tiedostoluettelo' ),
-	'Listgrouprights'           => array( 'Käyttäjäryhmien_oikeudet' ),
-	'Listredirects'             => array( 'Ohjaukset', 'Ohjaussivut', 'Uudelleenohjaukset' ),
-	'Listusers'                 => array( 'Käyttäjät' ),
-	'Lockdb'                    => array( 'Lukitse_tietokanta' ),
-	'Log'                       => array( 'Loki', 'Lokit' ),
-	'Lonelypages'               => array( 'Yksinäiset_sivut' ),
-	'Longpages'                 => array( 'Pitkät_sivut' ),
-	'MergeHistory'              => array( 'Liitä_muutoshistoria' ),
-	'MIMEsearch'                => array( 'MIME-haku' ),
-	'Mostcategories'            => array( 'Luokitelluimmat_sivut' ),
-	'Mostimages'                => array( 'Viitatuimmat_tiedostot' ),
-	'Mostlinked'                => array( 'Viitatuimmat_sivut' ),
-	'Mostlinkedcategories'      => array( 'Viitatuimmat_luokat' ),
-	'Mostlinkedtemplates'       => array( 'Viitatuimmat_mallineet' ),
-	'Mostrevisions'             => array( 'Muokatuimmat_sivut' ),
-	'Movepage'                  => array( 'Siirrä_sivu' ),
-	'Mycontributions'           => array( 'Omat_muokkaukset' ),
-	'Mypage'                    => array( 'Oma_sivu' ),
-	'Mytalk'                    => array( 'Oma_keskustelu' ),
-	'Myuploads'                 => array( 'Omat_tiedostot' ),
-	'Newimages'                 => array( 'Uudet_tiedostot', 'Uudet_kuvat' ),
-	'Newpages'                  => array( 'Uudet_sivut' ),
-	'PasswordReset'             => array( 'Unohtuneen_salasanan_vaihto' ),
-	'PermanentLink'             => array( 'Ikilinkki' ),
-	'Popularpages'              => array( 'Suositut_sivut' ),
-	'Preferences'               => array( 'Asetukset' ),
-	'Prefixindex'               => array( 'Etuliiteluettelo' ),
-	'Protectedpages'            => array( 'Suojatut_sivut' ),
-	'Protectedtitles'           => array( 'Suojatut_sivunimet' ),
-	'Randompage'                => array( 'Satunnainen_sivu' ),
-	'Randomredirect'            => array( 'Satunnainen_ohjaus', 'Satunnainen_uudelleenohjaus' ),
-	'Recentchanges'             => array( 'Tuoreet_muutokset' ),
-	'Recentchangeslinked'       => array( 'Linkitetyt_muutokset' ),
-	'Revisiondelete'            => array( 'Poista_muokkaus' ),
-	'RevisionMove'              => array( 'Versioiden_siirto' ),
-	'Search'                    => array( 'Haku' ),
-	'Shortpages'                => array( 'Lyhyet_sivut' ),
-	'Specialpages'              => array( 'Toimintosivut' ),
-	'Statistics'                => array( 'Tilastot' ),
-	'Tags'                      => array( 'Merkinnät' ),
-	'Unblock'                   => array( 'Poista_esto' ),
-	'Uncategorizedcategories'   => array( 'Luokittelemattomat_luokat' ),
-	'Uncategorizedimages'       => array( 'Luokittelemattomat_tiedostot' ),
-	'Uncategorizedpages'        => array( 'Luokittelemattomat_sivut' ),
-	'Uncategorizedtemplates'    => array( 'Luokittelemattomat_mallineet' ),
-	'Undelete'                  => array( 'Palauta' ),
-	'Unlockdb'                  => array( 'Avaa_tietokanta' ),
-	'Unusedcategories'          => array( 'Käyttämättömät_luokat' ),
-	'Unusedimages'              => array( 'Käyttämättömät_tiedostot' ),
-	'Unusedtemplates'           => array( 'Käyttämättömät_mallineet' ),
-	'Unwatchedpages'            => array( 'Tarkkailemattomat_sivut' ),
-	'Upload'                    => array( 'Tallenna', 'Lisää_tiedosto' ),
-	'Userlogin'                 => array( 'Kirjaudu_sisään' ),
-	'Userlogout'                => array( 'Kirjaudu_ulos' ),
-	'Userrights'                => array( 'Käyttöoikeudet' ),
-	'Version'                   => array( 'Versio' ),
-	'Wantedcategories'          => array( 'Halutuimmat_luokat' ),
-	'Wantedfiles'               => array( 'Halutuimmat_tiedostot' ),
-	'Wantedpages'               => array( 'Halutuimmat_sivut' ),
-	'Wantedtemplates'           => array( 'Halutuimmat_mallineet' ),
-	'Watchlist'                 => array( 'Tarkkailulista' ),
-	'Whatlinkshere'             => array( 'Tänne_viittaavat_sivut' ),
-	'Withoutinterwiki'          => array( 'Kielilinkittömät_sivut' ),
+$separatorTransformTable = array( ',' => "\xc2\xa0", '.' => ',' );
+
+$datePreferences = array(
+	'default',
+	'fi normal',
+	'fi seconds',
+	'fi numeric',
+	'ISO 8601',
+);
+
+$defaultDateFormat = 'fi normal';
+
+$dateFormats = array(
+	'fi normal time' => 'H.i',
+	'fi normal date' => 'j. F"ta" Y',
+	'fi normal both' => 'j. F"ta" Y "kello" H.i',
+
+	'fi seconds time' => 'H:i:s',
+	'fi seconds date' => 'j. F"ta" Y',
+	'fi seconds both' => 'j. F"ta" Y "kello" H:i:s',
+
+	'fi numeric time' => 'H.i',
+	'fi numeric date' => 'j.n.Y',
+	'fi numeric both' => 'j.n.Y "kello" H.i',
+);
+
+$datePreferenceMigrationMap = array(
+	'default',
+	'fi normal',
+	'fi seconds',
+	'fi numeric',
+);
+
+$bookstoreList = array(
+	'Bookplus'                      => 'http://www.bookplus.fi/product.php?isbn=$1',
+	'Helsingin yliopiston kirjasto' => 'http://pandora.lib.hel.fi/cgi-bin/mhask/monihask.py?volname=&author=&keyword=&ident=$1&submit=Hae&engine_helka=ON',
+	'Pääkaupunkiseudun kirjastot'   => 'http://www.helmet.fi/search*fin/i?SEARCH=$1',
+	'Tampereen seudun kirjastot'    => 'http://kirjasto.tampere.fi/Piki?formid=fullt&typ0=6&dat0=$1'
 );
 
 $linkTrail = '/^([a-zäö]+)(.*)$/sDu';
@@ -362,7 +359,7 @@ $messages = array(
 
 'underline-always' => 'Aina',
 'underline-never' => 'Ei koskaan',
-'underline-default' => 'Selaimen oletustapa',
+'underline-default' => 'Ulkoasun tai selaimen oletustapa',
 
 # Font style option in Special:Preferences
 'editfont-style' => 'Muokkauskentän kirjasintyyppi',
@@ -882,7 +879,7 @@ Väliaikainen salasana: $2',
 'image_sample' => 'Esimerkki.jpg',
 'image_tip' => 'Tallennettu tiedosto',
 'media_sample' => 'Esimerkki.ogg',
-'media_tip' => 'Mediatiedostolinkki',
+'media_tip' => 'Tiedostolinkki',
 'sig_tip' => 'Allekirjoitus aikamerkinnällä',
 'hr_tip' => 'Vaakasuora viiva',
 
@@ -957,9 +954,9 @@ Voit [[Special:Search/{{PAGENAME}}|etsiä sivun nimellä]] muilta sivuilta,
 tai [{{fullurl:{{FULLPAGENAME}}|action=edit}} muokata tätä sivua]</span>.',
 'noarticletext-nopermission' => 'Tällä hetkellä tällä sivulla ei ole tekstiä.
 Voit [[Special:Search/{{PAGENAME}}|etsiä sivun nimellä]] muilta sivuilta tai <span class="plainlinks">[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} hakea aiheeseen liittyviä lokeja]</span>, mutta sinulla ei ole oikeutta luoda tätä sivua.',
-'missing-revision' => 'Muutosta #$1 sivulla "{{PAGENAME}}" ei ole olemassa.
+'missing-revision' => 'Sivusta {{PAGENAME}} ei ole olemassa versiota $1.
 
-Tämä yleensä johtuu vanhentuneesta historialinkistä sivulle, joka on poistettu.
+Useimmiten tämä johtuu vanhentuneesta historialinkistä poistettuun sivuun.
 Lisätietoja löytyy [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} poistolokista].',
 'userpage-userdoesnotexist' => 'Käyttäjätunnusta <nowiki>$1</nowiki> ei ole rekisteröity. Varmista haluatko muokata tätä sivua.',
 'userpage-userdoesnotexist-view' => 'Käyttäjätunnusta ”$1” ei ole rekisteröity.',
@@ -983,7 +980,7 @@ Alla on viimeisin estolokin tapahtuma:',
 'note' => "'''Huomautus:'''",
 'previewnote' => "'''Tämä on vasta sivun esikatselu.'''
 Tekemiäsi muutoksia ei ole vielä tallennettu.",
-'continue-editing' => 'Jatka muokkaamista',
+'continue-editing' => 'Siirry muokkauskenttään',
 'previewconflict' => 'Tämä esikatselu näyttää miltä muokkausalueella oleva teksti näyttää tallennettuna.',
 'session_fail_preview' => "'''Muokkaustasi ei voitu tallentaa, koska istuntosi tiedot ovat kadonneet.''' Yritä uudelleen. Jos ongelma ei katoa, yritä [[Special:UserLogout|kirjautua ulos]] ja takaisin sisään.",
 'session_fail_preview_html' => "'''Muokkaustasi ei voitu tallentaa, koska istuntosi tiedot ovat kadonneet.'''
@@ -1050,9 +1047,12 @@ Se on ilmeisesti poistettu.',
 'edit-already-exists' => 'Uuden sivun luominen ei onnistunut.
 Se on jo olemassa.',
 'defaultmessagetext' => 'Viestin oletusteksti',
-'content-not-allowed-here' => '$1 ei ole sallittua sisältöä sivulla [[$2]]',
+'invalid-content-data' => 'Virheellinen sisältö',
+'content-not-allowed-here' => 'Sivun [[$2]] sisältö ei voi olla tyyppiä $1.',
 
 # Content models
+'content-model-wikitext' => 'wikiteksti',
+'content-model-text' => 'teksti',
 'content-model-javascript' => 'JavaScript',
 'content-model-css' => 'CSS',
 
@@ -1258,9 +1258,9 @@ Uuden ja vanhan sivun muutoksien pitää muodostaa jatkumo – ne eivät saa men
 'editundo' => 'kumoa',
 'diff-multi' => '(Näytettyjen versioiden välissä on {{PLURAL:$1|yksi muokkaus|$1 versiota, jotka ovat {{PLURAL:$2|yhden käyttäjän tekemiä|$2 eri käyttäjän tekemiä}}}}.)',
 'diff-multi-manyusers' => '(Versioiden välissä on {{PLURAL:$1|yksi muu muokkaus|$1 muuta muokkausta, jotka on tehnyt {{PLURAL:$2|yksi käyttäjä|yli $2 eri käyttäjää}}}}.)',
-'difference-missing-revision' => '{{PLURAL:$2|Yhtä versiota|$2 versiota}} tästä diffistä ($1) {{PLURAL:$2|ei|ei}} löytynyt.
+'difference-missing-revision' => '{{PLURAL:$2|Yhtä versiota|$2 versiota}} tästä vertailusta ($1) {{PLURAL:$2|ei}} löytynyt.
 
-Tämä johtuu yleensä seuraavasta vanhentuneeesta diffilinkistä sivulle, joka on poistettu.
+Useimmiten tämä johtuu vanhentuneesta vertailulinkistä poistettuun sivuun.
 Lisätietoja löytyy [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} poistolokista].',
 
 # Search results
@@ -1568,6 +1568,7 @@ Tässä satunnaisesti tuotettu arvo, jota voit käyttää: $1',
 'rightslogtext' => 'Tämä on loki käyttäjien käyttöoikeuksien muutoksista.',
 'rightslogentry' => 'muutti käyttäjän $1 oikeudet ryhmistä $2 ryhmiin $3',
 'rightslogentry-autopromote' => 'muutettiin automaattisesti ryhmistä $2 ryhmiin $3',
+'logentry-rights-rights' => '$1 muutti käyttäjän $3 oikeudet ryhmistä $4 ryhmiin $5',
 'rightsnone' => '(ei oikeuksia)',
 
 # Associated actions - in the sentence "You do not have permission to X"
@@ -2180,7 +2181,7 @@ Katso myös [[Special:WantedCategories|halutut luokat]].',
 'linksearch-ok' => 'Etsi',
 'linksearch-text' => 'Tähteä (*) voi käyttää jokerimerkkinä, esimerkiksi ”*.wikipedia.org”.
 Vähintään ylätason verkkotunnus, esimerkiksi "*.org", tarvitaan.<br />
-Tuetut protokollat: <code>$1</code> (älä lisää näitä hakuusi).',
+Tuetut protokollat: <code>$1</code> (oletuksena on <code>http://</code>, jos protokollaa ei määritetä).',
 'linksearch-line' => '$1 on linkitetty sivulta $2',
 'linksearch-error' => 'Jokerimerkkiä voi käyttää ainoastaan osoitteen alussa.',
 
@@ -2229,7 +2230,7 @@ Lisätietoa yksittäisistä käyttäjäoikeuksista saattaa löytyä [[{{MediaWik
 '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ä 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.',
+'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.',
 'usermailererror' => 'Postitus palautti virheen:',
 'defemailsubject' => 'Sähköpostia käyttäjältä $1 sivustolta {{SITENAME}}',
 'usermaildisabled' => 'Käyttäjien sähköposti poistettu käytöstä',
@@ -2285,7 +2286,7 @@ Lisätietoa yksittäisistä käyttäjäoikeuksista saattaa löytyä [[{{MediaWik
 'watchlistcontains' => 'Tarkkailulistallasi on {{PLURAL:$1|yksi sivu|$1 sivua}}.',
 'iteminvalidname' => 'Sivun $1 kanssa oli ongelmia! Sivun nimessä on vikaa.',
 'wlnote' => "Alla on {{PLURAL:$1|yksi muutos|'''$1''' muutosta}} viimeisen {{PLURAL:$2|tunnin|'''$2''' tunnin}} ajalta $3 kello $4 asti.",
-'wlshowlast' => 'Näytä viimeiset $1 tuntia tai $2 päivää$3',
+'wlshowlast' => 'Näytä viimeiset $1 tuntia tai $2 päivää, $3',
 'watchlist-options' => 'Tarkkailulistan asetukset',
 
 # Displayed when you click the "watch" button and it is in the process of watching
@@ -2759,6 +2760,7 @@ $1 {{PLURAL:$1|sivu|sivua}} siirrettiin.',
 'immobile-target-namespace-iw' => 'Kielilinkki ei ole kelvollinen kohde sivun siirrolle.',
 'immobile-source-page' => 'Tämä sivu ei ole siirrettävissä.',
 'immobile-target-page' => 'Kyseiselle kohdenimelle ei voi siirtää.',
+'bad-target-model' => 'Kohde käyttää eri sisältömallia. Sisällön muuttaminen muodosta $1 muotoon $2 ei ole mahdollista.',
 'imagenocrossnamespace' => 'Tiedostoja ei voi siirtää pois tiedostonimiavaruudesta.',
 'nonfile-cannot-move-to-file' => 'Sivuja ei voi siirtää tiedostonimiavaruuteen.',
 'imagetypemismatch' => 'Uusi tiedostopääte ei vastaa tiedoston tyyppiä',
@@ -2837,6 +2839,7 @@ Jos haluat muokata MediaWikin yleistä kotoistusta, käy [//www.mediawiki.org/wi
 'import-interwiki-templates' => 'Liitä kaikki mallineet',
 'import-interwiki-submit' => 'Tuo',
 'import-interwiki-namespace' => 'Kohdenimiavaruus:',
+'import-interwiki-rootpage' => 'Tuo annetun sivun alasivuiksi (valinnainen):',
 'import-upload-filename' => 'Tiedostonimi:',
 'import-comment' => 'Syy',
 'importtext' => 'Vie sivuja lähdewikistä käyttäen [[Special:Export|vientityökalua]].
@@ -2870,6 +2873,8 @@ Tallenna tiedot koneellesi ja tuo ne tällä sivulla.',
 'import-error-special' => 'Sivua $1 ei tuoda, koska se kuuluu nimitilaan, joka ei salli sivuja.',
 'import-error-invalid' => 'Sivua $1 ei tuoda, koska sen nimi ei kelpaa.',
 'import-options-wrong' => '{{PLURAL:$2|Väärä asetus|Väärät asetukset}}: <nowiki>$1</nowiki>',
+'import-rootpage-invalid' => 'Annettu sivun nimi ei kelpaa.',
+'import-rootpage-nosubpage' => 'Annetun sivun nimiavaruus $1 ei salli alasivuja.',
 
 # Import log
 'importlogpage' => 'Tuontiloki',
@@ -3018,6 +3023,7 @@ Tallenna tiedot koneellesi ja tuo ne tällä sivulla.',
 
 # Info page
 'pageinfo-title' => 'Tietoja sivusta $1',
+'pageinfo-not-current' => 'Tiedot voidaan näyttää vain sivun viimeisimmälle versiolle.',
 'pageinfo-header-basic' => 'Perustiedot',
 'pageinfo-header-edits' => 'Muutoshistoria',
 'pageinfo-header-restrictions' => 'Sivun suojaus',
@@ -3026,23 +3032,29 @@ Tallenna tiedot koneellesi ja tuo ne tällä sivulla.',
 'pageinfo-default-sort' => 'Oletuslajitteluavain',
 'pageinfo-length' => 'Sivun pituus (tavuina)',
 'pageinfo-article-id' => 'Sivun tunniste',
+'pageinfo-robot-policy' => 'Hakukonemerkinnät',
 'pageinfo-robot-index' => 'Indeksoitava',
 'pageinfo-robot-noindex' => 'Ei indeksoitava',
 'pageinfo-views' => 'Katselukertojen määrä',
 'pageinfo-watchers' => 'Sivun tarkkailijoiden lukumäärä',
 'pageinfo-redirects-name' => 'Sivulle johtavat ohjaukset',
 'pageinfo-subpages-name' => 'Sivun alasivut',
+'pageinfo-subpages-value' => '$1 ($2 {{PLURAL:$2|ohjaus|ohjausta}}; $3 {{PLURAL:$3|ei-ohjausta}})',
 'pageinfo-firstuser' => 'Sivun luonut',
 'pageinfo-firsttime' => 'Sivun luontipäivämäärä',
 'pageinfo-lastuser' => 'Viimeisin muokkaaja',
-'pageinfo-lasttime' => 'Viimeisimmän muokkausksen päivämäärä',
+'pageinfo-lasttime' => 'Viimeisin muokkauspäivämäärä',
 'pageinfo-edits' => 'Muokkausten kokonaismäärä',
 'pageinfo-authors' => 'Sivun eri muokkaajien kokonaismäärä',
+'pageinfo-recent-edits' => 'Tuoreita muutoksia ($1)',
+'pageinfo-recent-authors' => 'Tuoreita muokkaajia',
 'pageinfo-magic-words' => '{{PLURAL:$1|Taikasana|Taikasanat}} ($1)',
 'pageinfo-hidden-categories' => '{{PLURAL:$1|Piilotettu luokka|Piilotetut luokat}} ($1)',
 'pageinfo-templates' => '{{PLURAL:$1|Sisällytetty malline|Sisällytetyt mallineet}} ($1)',
 'pageinfo-toolboxlink' => 'Sivun tiedot',
+'pageinfo-redirectsto' => 'Ohjaus sivulle',
 'pageinfo-redirectsto-info' => 'tiedot',
+'pageinfo-contentpage' => 'Lasketaan sisältösivuksi',
 'pageinfo-contentpage-yes' => 'Kyllä',
 'pageinfo-protect-cascading-yes' => 'Kyllä',
 
@@ -3098,6 +3110,7 @@ Suorittamalla sen järjestelmäsi voi muuttua epäluotettavaksi.",
 'file-info-size-pages' => '$1 × $2 kuvapistettä, tiedoston koko $3, MIME-tyyppi $4, $5 {{PLURAL:$5|sivu|sivua}}',
 'file-nohires' => 'Tarkempaa kuvaa ei ole saatavilla.',
 'svg-long-desc' => 'SVG-tiedosto; oletustarkkuus $1 × $2 kuvapistettä; tiedostokoko $3',
+'svg-long-desc-animated' => 'Animoitu SVG-tiedosto; oletustarkkuus $1 × $2 kuvapistettä; tiedostokoko $3',
 'show-big-image' => 'Korkeatarkkuuksinen versio',
 'show-big-image-preview' => 'Tämän esikatselun koko: $1.',
 'show-big-image-other' => '{{PLURAL:$2|Muu resoluutio|Muut resoluutiot}}: $1.',
@@ -3551,7 +3564,7 @@ Kaikki muut linkit ovat poikkeuksia eli toisin sanoen sivuja, joissa tiedostoa s
 'edit-externally-help' => '(Katso [//www.mediawiki.org/wiki/Manual:External_editors ohjeet], jos haluat lisätietoja.)',
 
 # 'all' in various places, this might be different for inflected languages
-'watchlistall2' => ', koko historia',
+'watchlistall2' => 'koko historia',
 'namespacesall' => 'kaikki',
 'monthsall' => 'kaikki',
 'limitall' => 'kaikki',
diff --git a/languages/messages/MessagesFo.php b/languages/messages/MessagesFo.php
index 861873bee0..81a4c1507b 100644
--- a/languages/messages/MessagesFo.php
+++ b/languages/messages/MessagesFo.php
@@ -17,11 +17,6 @@
  * @author לערי ריינהארט
  */
 
-$bookstoreList = array(
-	'Bokasolan.fo' => 'http://www.bokasolan.fo/vleitari.asp?haattur=bok.alfa&Heiti=&Hovindur=&Forlag=&innbinding=Oell&bolkur=Allir&prisur=Allir&Aarstal=Oell&mal=Oell&status=Oell&ISBN=$1',
-	'inherit' => true,
-);
-
 $namespaceNames = array(
 	NS_MEDIA            => 'Miðil',
 	NS_SPECIAL          => 'Serstakt',
@@ -53,15 +48,6 @@ $namespaceAliases = array(
 	'Bólkur_kjak' => NS_CATEGORY_TALK,
 );
 
-
-$datePreferences = false;
-$defaultDateFormat = 'dmy';
-$dateFormats = array(
-	'dmy time' => 'H:i',
-	'dmy date' => 'j. M Y',
-	'dmy both' => 'j. M Y "kl." H:i',
-);
-
 $specialPageAliases = array(
 	'Allmessages'               => array( 'Øll kervisboð' ),
 	'Allpages'                  => array( 'Allar síður' ),
@@ -109,6 +95,19 @@ $specialPageAliases = array(
 	'Watchlist'                 => array( 'Mítt eftirlit' ),
 );
 
+$datePreferences = false;
+$defaultDateFormat = 'dmy';
+$dateFormats = array(
+	'dmy time' => 'H:i',
+	'dmy date' => 'j. M Y',
+	'dmy both' => 'j. M Y "kl." H:i',
+);
+
+$bookstoreList = array(
+	'Bokasolan.fo' => 'http://www.bokasolan.fo/vleitari.asp?haattur=bok.alfa&Heiti=&Hovindur=&Forlag=&innbinding=Oell&bolkur=Allir&prisur=Allir&Aarstal=Oell&mal=Oell&status=Oell&ISBN=$1',
+	'inherit' => true,
+);
+
 $linkTrail = '/^([áðíóúýæøa-z]+)(.*)$/sDu';
 
 $messages = array(
diff --git a/languages/messages/MessagesFr.php b/languages/messages/MessagesFr.php
index 9d2e693725..29651e865f 100644
--- a/languages/messages/MessagesFr.php
+++ b/languages/messages/MessagesFr.php
@@ -34,6 +34,7 @@
  * @author Grondin
  * @author Guillom
  * @author Hashar
+ * @author Hello71
  * @author Hercule
  * @author Houcinee1
  * @author Hégésippe Cormier
@@ -84,13 +85,6 @@
  * @author לערי ריינהארט
  */
 
-$bookstoreList = array(
-	'Amazon.fr'    => 'http://www.amazon.fr/exec/obidos/ISBN=$1',
-	'alapage.fr'   => 'http://www.alapage.com/mx/?tp=F&type=101&l_isbn=$1&donnee_appel=ALASQ&devise=&',
-	'fnac.com'     => 'http://www3.fnac.com/advanced/book.do?isbn=$1',
-	'chapitre.com' => 'http://www.chapitre.com/frame_rec.asp?isbn=$1',
-);
-
 $namespaceNames = array(
 	NS_MEDIA            => 'Média',
 	NS_SPECIAL          => 'Spécial',
@@ -120,20 +114,97 @@ $namespaceAliases = array(
 	'Discussion_Catégorie' => NS_CATEGORY_TALK
 );
 
-$linkTrail = '/^([a-zàâçéèêîôûäëïöüùÇÉÂÊÎÔÛÄËÏÖÜÀÈÙ]+)(.*)$/sDu';
-
-$dateFormats = array(
-	'mdy time' => 'H:i',
-	'mdy date' => 'F j, Y',
-	'mdy both' => 'F j, Y à H:i',
-
-	'dmy time' => 'H:i',
-	'dmy date' => 'j F Y',
-	'dmy both' => 'j F Y à H:i',
-
-	'ymd time' => 'H:i',
-	'ymd date' => 'Y F j',
-	'ymd both' => 'Y F j à H:i',
+$specialPageAliases = array(
+	'Activeusers'               => array( 'Utilisateurs_actifs', 'UtilisateursActifs' ),
+	'Allmessages'               => array( 'Messages_système', 'Messages_systeme', 'Messagessystème', 'Messagessysteme' ),
+	'Allpages'                  => array( 'Toutes_les_pages', 'ToutesLesPages' ),
+	'Ancientpages'              => array( 'Pages_anciennes', 'PagesAnciennes', 'Anciennes_pages', 'AnciennesPages' ),
+	'Badtitle'                  => array( 'MauvaisTitre', 'Mauvais_titre' ),
+	'Blankpage'                 => array( 'Page_blanche', 'PageBlanche' ),
+	'Block'                     => array( 'Bloquer', 'Blocage' ),
+	'Blockme'                   => array( 'Bloquez-moi', 'Bloquezmoi' ),
+	'Booksources'               => array( 'Ouvrages_de_référence', 'Ouvrages_de_reference', 'Ouvragesderéférence', 'Ouvragesdereference', 'Recherche_ISBN', 'Recherche_isbn', 'RechercheISBN', 'Rechercheisbn' ),
+	'BrokenRedirects'           => array( 'Redirections_cassées', 'RedirectionCassées', 'Redirections_cassees', 'RedirectionsCassees' ),
+	'Categories'                => array( 'Catégories' ),
+	'ChangePassword'            => array( 'Changement_du_mot_de_passe', 'ChangementDuMotDePasse' ),
+	'Confirmemail'              => array( 'Confirmer_l\'adresse_de_contact', 'Confirmer_le_courriel', 'ConfirmerLeCourriel' ),
+	'CreateAccount'             => array( 'Créer_un_compte', 'CréerUnCompte', 'CréerCompte' ),
+	'Deadendpages'              => array( 'Pages_en_impasse', 'PagesEnImpasse' ),
+	'DeletedContributions'      => array( 'Contributions_supprimées', 'ContributionsSupprimées', 'ContributionSupprimees' ),
+	'Disambiguations'           => array( 'Homonymies', 'Homonymie', 'Pages_d\'homonymie' ),
+	'DoubleRedirects'           => array( 'Doubles_redirections', 'DoublesRedirections', 'Redirections_doubles', 'RedirectionsDoubles' ),
+	'Emailuser'                 => array( 'Envoyer_un_courriel', 'EnvoyerUnCourriel', 'Courriel', 'Envoyer_un_e-mail', 'EnvoyerUnEMail', 'E-mail', 'EMail' ),
+	'Export'                    => array( 'Exporter', 'Exportation' ),
+	'Fewestrevisions'           => array( 'Pages_les_moins_modifiées', 'PagesLesMoinsModifiées', 'Pages_les_moins_modifiees', 'PagesLesMoinsModifiees', 'Les_moins_modifiés', 'LesMoinsModifiés', 'Les_moins_modifies', 'LesMoinsModifies' ),
+	'FileDuplicateSearch'       => array( 'Recherche_fichier_en_double', 'RechercheFichierEnDouble' ),
+	'Filepath'                  => array( 'Chemin_du_fichier', 'CheminDuFichier', 'CheminFichier' ),
+	'Import'                    => array( 'Importer', 'Importation' ),
+	'Invalidateemail'           => array( 'Invalider_le_courriel', 'Invalider_courriel', 'InvaliderCourriel' ),
+	'BlockList'                 => array( 'Liste_des_blocages', 'ListeDesBlocages', 'Blocages', 'Utilisateurs_bloqués', 'UtilisateursBloqués', 'Utilisateurs_bloques', 'UtilisateursBloques', 'IP_bloquées', 'IPBloquees', 'IPBloquées' ),
+	'LinkSearch'                => array( 'Recherche_de_lien', 'Recherche_de_liens' ),
+	'Listadmins'                => array( 'Liste_des_administrateurs', 'Listedesadministrateurs', 'Liste_des_admins', 'Listedesadmins', 'Liste_admins', 'Listeadmins' ),
+	'Listbots'                  => array( 'Liste_des_bots', 'ListedesBots' ),
+	'Listfiles'                 => array( 'Liste_des_fichiers', 'ListeDesFichiers', 'Liste_des_images', 'ListeDesImages' ),
+	'Listgrouprights'           => array( 'Liste_des_droits_de_groupe', 'ListeDesDroitsDeGroupes' ),
+	'Listredirects'             => array( 'Liste_des_redirections', 'Listedesredirections', 'Liste_des_redirects', 'Listedesredirects', 'Liste_redirections', 'Listeredirections', 'Liste_redirects', 'Listeredirects' ),
+	'Listusers'                 => array( 'Liste_des_utilisateurs', 'ListeDesUtilisateurs', 'Utilisateurs' ),
+	'Lockdb'                    => array( 'Verrouiller_la_base', 'Verrouillerlabase', 'Verrouiller_base', 'Verrouillerbase', 'Verrouiller_BD', 'VerrouillerBD', 'Verrouiller_bd', 'Verrouillerbd' ),
+	'Log'                       => array( 'Journal', 'Journaux' ),
+	'Lonelypages'               => array( 'Pages_orphelines', 'PagesOrphelines' ),
+	'Longpages'                 => array( 'Pages_longues', 'PagesLongues' ),
+	'MergeHistory'              => array( 'Fusionner_les_historiques', 'FusionnerHistoriques', 'Fusionner_l\'historique', 'Fusionnerlhistorique' ),
+	'MIMEsearch'                => array( 'Recherche_MIME', 'RechercheMIME', 'Recherche_mime', 'Recherchemime' ),
+	'Mostcategories'            => array( 'Pages_les_plus_catégorisées', 'PagesLesPlusCatégorisées', 'Pages_les_plus_categorisees', 'PagesLesPlusCategorisees', 'Les_plus_catégorisés', 'LesPlusCatégorisés', 'Les_plus_categorises', 'LesPlusCategorises' ),
+	'Mostimages'                => array( 'Fichiers_les_plus_liés', 'FichiersLesPlusLiés', 'Fichiers_les_plus_lies', 'FichiersLesPlusLies', 'Fichiers_les_plus_utilisés', 'FichiersLesPlusUtilisés', 'Fichiers_les_plus_utilises', 'FichiersLesPlusUtilises', 'Images_les_plus_liées', 'ImagesLesPlusLiées', 'Images_les_plus_liees', 'ImagesLesPlusLiees', 'Images_les_plus_utilisées', 'ImagesLesPlusUtilisées', 'Images_les_plus_utilisees', 'ImagesLesPlusUtilisees' ),
+	'Mostlinked'                => array( 'Pages_les_plus_liées', 'PagesLesPlusLiées', 'Pages_les_plus_liees', 'PagesLesPlusLiees', 'Les_plus_liées', 'LesPlusLiées', 'Les_plus_liees', 'LesPlusLiees' ),
+	'Mostlinkedcategories'      => array( 'Catégories_les_plus_liées', 'CatégoriesLesPlusLiées', 'Categories_les_plus_liees', 'CategoriesLesPlusLiees', 'Catégories_les_plus_utilisées', 'CatégoriesLesPlusUtilisées', 'Categories_les_plus_utilisees', 'CategoriesLesPlusUtilisees' ),
+	'Mostlinkedtemplates'       => array( 'Modèles_les_plus_liés', 'ModèlesLesPlusLiés', 'Modeles_les_plus_lies', 'ModelesLesPlusLies', 'Modèles_les_plus_utilisés', 'ModèlesLesPlusUtilisés', 'Modeles_les_plus_utilises', 'ModelesLesPlusUtilises' ),
+	'Mostrevisions'             => array( 'Pages_les_plus_modifiées', 'PagesLesPlusModifiées', 'Pages_les_plus_modifiees', 'PagesLesPlusModifiees', 'Les_plus_modifiés', 'LesPlusModifiés', 'Les_plus_modifies', 'LesPlusModifies' ),
+	'Movepage'                  => array( 'Renommer_une_page', 'Renommer', 'Renommage' ),
+	'Mycontributions'           => array( 'Mes_contributions', 'Mescontributions' ),
+	'Mypage'                    => array( 'Ma_page', 'Mapage' ),
+	'Mytalk'                    => array( 'Mes_discussions', 'Mesdiscussions' ),
+	'Newimages'                 => array( 'Nouveaux_fichiers', 'NouveauxFichiers', 'Nouvelles_images', 'NouvellesImages' ),
+	'Newpages'                  => array( 'Nouvelles_pages', 'NouvellesPages', 'Pages_récentes', 'PagesRécentes', 'Pages_recentes', 'PagesRecentes' ),
+	'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' ),
+	'Protectedtitles'           => array( 'Titres_protégés', 'TitresProtégés', 'Titres_proteges', 'TitresProteges' ),
+	'Randompage'                => array( 'Page_au_hasard', 'PageAuHasard', 'Au_hasard', 'AuHasard', 'Aléatoire', 'Aleatoire' ),
+	'Randomredirect'            => array( 'Redirection_au_hasard', 'Redirect_au_hasard', 'Redirectionauhasard', 'Redirectauhasard', 'Redirection_aléatoire', 'Redirect_aléatoire', 'Redirectionaléatoire', 'Redirectaléatoire', 'Redirection_aleatoire', 'Redirect_aleatoire', 'Redirectionaleatoire', 'Redirectaleatoire' ),
+	'Recentchanges'             => array( 'Modifications_récentes', 'Modifications_recentes', 'ModificationsRécentes', 'ModificationsRecentes' ),
+	'Recentchangeslinked'       => array( 'Suivi_des_liens', 'SuiviDesLiens' ),
+	'Revisiondelete'            => array( 'Versions_supprimées', 'Versions_supprimees', 'Versionsupprimées', 'Versionsupprimees' ),
+	'Search'                    => array( 'Recherche', 'Rechercher', 'Chercher' ),
+	'Shortpages'                => array( 'Pages_courtes', 'PagesCourtes' ),
+	'Specialpages'              => array( 'Pages_spéciales', 'PagesSpéciales', 'Pages_speciales', 'PagesSpeciales' ),
+	'Statistics'                => array( 'Statistiques', 'Stats' ),
+	'Tags'                      => array( 'Balises' ),
+	'Unblock'                   => array( 'Débloquer', 'Déblocage' ),
+	'Uncategorizedcategories'   => array( 'Catégories_non_catégorisées', 'CatégoriesNonCatégorisées', 'Categories_non_categorisees', 'CategoriesNonCategorisees', 'Catégories_sans_catégorie', 'CatégoriesSansCatégorie', 'Categories_sans_categorie', 'CategoriesSansCategorie' ),
+	'Uncategorizedimages'       => array( 'Fichiers_non_catégorisés', 'FichiersNonCatégorisés', 'Fichiers_non_categorises', 'FichiersNonCategorises', 'Fichiers_sans_catégorie', 'FichiersSansCatégorie', 'Fichiers_sans_categorie', 'FichiersSansCategorie', 'Images_non_catégorisées', 'ImagesNonCatégorisées', 'Images_non_categorisees', 'ImagesNonCategorisees', 'Images_sans_catégorie', 'ImagesSansCatégorie', 'Images_sans_categorie', 'ImagesSansCategorie' ),
+	'Uncategorizedpages'        => array( 'Pages_non_catégorisées', 'PagesNonCatégorisées', 'Pages_non_categorisees', 'PagesNonCategorisees', 'Pages_sans_catégorie', 'PagesSansCatégorie', 'Pages_sans_categorie', 'PagesSansCategorie' ),
+	'Uncategorizedtemplates'    => array( 'Modèles_non_catégorisés', 'ModèlesNonCatégorisés', 'Modeles_non_categorises', 'ModelesNonCategorises', 'Modèles_sans_catégorie', 'ModèlesSansCatégorie', 'Modeles_sans_catégorie', 'ModelesSansCatégorie' ),
+	'Undelete'                  => array( 'Restaurer', 'Restauration' ),
+	'Unlockdb'                  => array( 'Déverrouiller_la_base', 'Déverrouillerlabase', 'Deverrouiller_la_base', 'Deverrouillerlabase', 'Déverrouiller_base', 'Déverrouillerbase', 'Deverrouiller_base', 'Deverrouillerbase', 'Déverrouiller_BD', 'DéverrouillerBD', 'Deverrouiller_BD', 'DeverrouillerBD', 'Déverrouiller_bd', 'Déverrouillerbd', 'Deverrouiller_bd', 'Deverrouillerbd' ),
+	'Unusedcategories'          => array( 'Catégories_inutilisées', 'CatégoriesInutilisées', 'Categories_inutilisees', 'CategoriesInutilisees', 'Catégories_non_utilisées', 'CatégoriesNonUtilisées', 'Categories_non_utilisees', 'CategoriesNonUtilisees' ),
+	'Unusedimages'              => array( 'Fichiers_inutilisés', 'FichiersInutilisés', 'Fichiers_inutilises', 'FichiersInutilises', 'Fichiers_non_utilisés', 'FichiersNon_utilisés', 'Fichiers_non_utilises', 'FichiersNon_utilises', 'Images_inutilisées', 'ImagesInutilisées', 'Images_inutilisees', 'ImagesInutilisees', 'Images_non_utilisées', 'ImagesNonUtilisées', 'Images_non_utilisees', 'ImagesNonUtilisees' ),
+	'Unusedtemplates'           => array( 'Modèles_inutilisés', 'Modèlesinutilisés', 'Modeles_inutilises', 'Modelesinutilises', 'Modèles_non_utilisés', 'Modèlesnonutilisés', 'Modeles_non_utilises', 'Modelesnonutilises' ),
+	'Unwatchedpages'            => array( 'Pages_non_suivies', 'Pagesnonsuivies' ),
+	'Upload'                    => array( 'Téléverser', 'Televerser', 'Téléversement', 'Televersement', 'Téléchargement', 'Telechargement' ),
+	'Userlogin'                 => array( 'Connexion', 'Identification' ),
+	'Userlogout'                => array( 'Déconnexion', 'Deconnexion' ),
+	'Userrights'                => array( 'Permissions', 'Droits', 'Droits_des_utilisateurs' ),
+	'Wantedcategories'          => array( 'Catégories_demandées', 'CatégoriesDemandées', 'Categories_demandees', 'CategoriesDemandees' ),
+	'Wantedfiles'               => array( 'Fichiers_demandés', 'FichiersDemandés', 'Fichiers_demandes', 'FichiersDemandes' ),
+	'Wantedpages'               => array( 'Pages_demandées', 'PagesDemandées', 'Pages_demandees', 'PagesDemandees', 'Liens_brisés', 'LiensBrisés', 'Liens_brises', 'LiensBrises' ),
+	'Wantedtemplates'           => array( 'Modèles_demandés', 'ModèlesDemandés', 'Modeles_demandes', 'ModelesDemandes' ),
+	'Watchlist'                 => array( 'Liste_de_suivi', 'ListeDeSuivi', 'Suivi' ),
+	'Whatlinkshere'             => array( 'Pages_liées', 'PagesLiées', 'Pages_liees', 'PagesLiees' ),
+	'Withoutinterwiki'          => array( 'Sans_interwiki', 'Sansinterwiki', 'Sans_interwikis', 'Sansinterwikis' ),
 );
 
 $magicWords = array(
@@ -143,7 +214,6 @@ $magicWords = array(
 	'forcetoc'                  => array( '0', '__FORCERSOMMAIRE__', '__FORCERTDM__', '__FORCETOC__' ),
 	'toc'                       => array( '0', '__SOMMAIRE__', '__TDM__', '__TOC__' ),
 	'noeditsection'             => array( '0', '__SECTIONNONEDITABLE__', '__NOEDITSECTION__' ),
-	'noheader'                  => array( '0', '__AUCUNENTETE__', '__NOHEADER__' ),
 	'currentmonth'              => array( '1', 'MOISACTUEL', 'MOIS2ACTUEL', 'CURRENTMONTH', 'CURRENTMONTH2' ),
 	'currentmonth1'             => array( '1', 'MOIS1ACTUEL', 'CURRENTMONTH1' ),
 	'currentmonthname'          => array( '1', 'NOMMOISACTUEL', 'CURRENTMONTHNAME' ),
@@ -276,97 +346,27 @@ $magicWords = array(
 	'url_query'                 => array( '0', 'QUESTION', 'QUERY' ),
 );
 
-$specialPageAliases = array(
-	'Activeusers'               => array( 'Utilisateurs_actifs', 'UtilisateursActifs' ),
-	'Allmessages'               => array( 'Messages_système', 'Messages_systeme', 'Messagessystème', 'Messagessysteme' ),
-	'Allpages'                  => array( 'Toutes_les_pages', 'ToutesLesPages' ),
-	'Ancientpages'              => array( 'Pages_anciennes', 'PagesAnciennes', 'Anciennes_pages', 'AnciennesPages' ),
-	'Badtitle'                  => array( 'MauvaisTitre', 'Mauvais_titre' ),
-	'Blankpage'                 => array( 'Page_blanche', 'PageBlanche' ),
-	'Block'                     => array( 'Bloquer', 'Blocage' ),
-	'Blockme'                   => array( 'Bloquez-moi', 'Bloquezmoi' ),
-	'Booksources'               => array( 'Ouvrages_de_référence', 'Ouvrages_de_reference', 'Ouvragesderéférence', 'Ouvragesdereference', 'Recherche_ISBN', 'Recherche_isbn', 'RechercheISBN', 'Rechercheisbn' ),
-	'BrokenRedirects'           => array( 'Redirections_cassées', 'RedirectionCassées', 'Redirections_cassees', 'RedirectionsCassees' ),
-	'Categories'                => array( 'Catégories' ),
-	'ChangePassword'            => array( 'Changement_du_mot_de_passe', 'ChangementDuMotDePasse' ),
-	'Confirmemail'              => array( 'Confirmer_l\'adresse_de_contact', 'Confirmer_le_courriel', 'ConfirmerLeCourriel' ),
-	'CreateAccount'             => array( 'Créer_un_compte', 'CréerUnCompte', 'CréerCompte' ),
-	'Deadendpages'              => array( 'Pages_en_impasse', 'PagesEnImpasse' ),
-	'DeletedContributions'      => array( 'Contributions_supprimées', 'ContributionsSupprimées', 'ContributionSupprimees' ),
-	'Disambiguations'           => array( 'Homonymies', 'Homonymie', 'Pages_d\'homonymie' ),
-	'DoubleRedirects'           => array( 'Doubles_redirections', 'DoublesRedirections', 'Redirections_doubles', 'RedirectionsDoubles' ),
-	'Emailuser'                 => array( 'Envoyer_un_courriel', 'EnvoyerUnCourriel', 'Courriel', 'Envoyer_un_e-mail', 'EnvoyerUnEMail', 'E-mail', 'EMail' ),
-	'Export'                    => array( 'Exporter', 'Exportation' ),
-	'Fewestrevisions'           => array( 'Pages_les_moins_modifiées', 'PagesLesMoinsModifiées', 'Pages_les_moins_modifiees', 'PagesLesMoinsModifiees', 'Les_moins_modifiés', 'LesMoinsModifiés', 'Les_moins_modifies', 'LesMoinsModifies' ),
-	'FileDuplicateSearch'       => array( 'Recherche_fichier_en_double', 'RechercheFichierEnDouble' ),
-	'Filepath'                  => array( 'Chemin_du_fichier', 'CheminDuFichier', 'CheminFichier' ),
-	'Import'                    => array( 'Importer', 'Importation' ),
-	'Invalidateemail'           => array( 'Invalider_le_courriel', 'Invalider_courriel', 'InvaliderCourriel' ),
-	'BlockList'                 => array( 'Liste_des_blocages', 'ListeDesBlocages', 'Blocages', 'Utilisateurs_bloqués', 'UtilisateursBloqués', 'Utilisateurs_bloques', 'UtilisateursBloques', 'IP_bloquées', 'IPBloquees', 'IPBloquées' ),
-	'LinkSearch'                => array( 'Recherche_de_lien', 'Recherche_de_liens' ),
-	'Listadmins'                => array( 'Liste_des_administrateurs', 'Listedesadministrateurs', 'Liste_des_admins', 'Listedesadmins', 'Liste_admins', 'Listeadmins' ),
-	'Listbots'                  => array( 'Liste_des_bots', 'ListedesBots' ),
-	'Listfiles'                 => array( 'Liste_des_fichiers', 'ListeDesFichiers', 'Liste_des_images', 'ListeDesImages' ),
-	'Listgrouprights'           => array( 'Liste_des_droits_de_groupe', 'ListeDesDroitsDeGroupes' ),
-	'Listredirects'             => array( 'Liste_des_redirections', 'Listedesredirections', 'Liste_des_redirects', 'Listedesredirects', 'Liste_redirections', 'Listeredirections', 'Liste_redirects', 'Listeredirects' ),
-	'Listusers'                 => array( 'Liste_des_utilisateurs', 'ListeDesUtilisateurs', 'Utilisateurs' ),
-	'Lockdb'                    => array( 'Verrouiller_la_base', 'Verrouillerlabase', 'Verrouiller_base', 'Verrouillerbase', 'Verrouiller_BD', 'VerrouillerBD', 'Verrouiller_bd', 'Verrouillerbd' ),
-	'Log'                       => array( 'Journal', 'Journaux' ),
-	'Lonelypages'               => array( 'Pages_orphelines', 'PagesOrphelines' ),
-	'Longpages'                 => array( 'Pages_longues', 'PagesLongues' ),
-	'MergeHistory'              => array( 'Fusionner_les_historiques', 'FusionnerHistoriques', 'Fusionner_l\'historique', 'Fusionnerlhistorique' ),
-	'MIMEsearch'                => array( 'Recherche_MIME', 'RechercheMIME', 'Recherche_mime', 'Recherchemime' ),
-	'Mostcategories'            => array( 'Pages_les_plus_catégorisées', 'PagesLesPlusCatégorisées', 'Pages_les_plus_categorisees', 'PagesLesPlusCategorisees', 'Les_plus_catégorisés', 'LesPlusCatégorisés', 'Les_plus_categorises', 'LesPlusCategorises' ),
-	'Mostimages'                => array( 'Fichiers_les_plus_liés', 'FichiersLesPlusLiés', 'Fichiers_les_plus_lies', 'FichiersLesPlusLies', 'Fichiers_les_plus_utilisés', 'FichiersLesPlusUtilisés', 'Fichiers_les_plus_utilises', 'FichiersLesPlusUtilises', 'Images_les_plus_liées', 'ImagesLesPlusLiées', 'Images_les_plus_liees', 'ImagesLesPlusLiees', 'Images_les_plus_utilisées', 'ImagesLesPlusUtilisées', 'Images_les_plus_utilisees', 'ImagesLesPlusUtilisees' ),
-	'Mostlinked'                => array( 'Pages_les_plus_liées', 'PagesLesPlusLiées', 'Pages_les_plus_liees', 'PagesLesPlusLiees', 'Les_plus_liées', 'LesPlusLiées', 'Les_plus_liees', 'LesPlusLiees' ),
-	'Mostlinkedcategories'      => array( 'Catégories_les_plus_liées', 'CatégoriesLesPlusLiées', 'Categories_les_plus_liees', 'CategoriesLesPlusLiees', 'Catégories_les_plus_utilisées', 'CatégoriesLesPlusUtilisées', 'Categories_les_plus_utilisees', 'CategoriesLesPlusUtilisees' ),
-	'Mostlinkedtemplates'       => array( 'Modèles_les_plus_liés', 'ModèlesLesPlusLiés', 'Modeles_les_plus_lies', 'ModelesLesPlusLies', 'Modèles_les_plus_utilisés', 'ModèlesLesPlusUtilisés', 'Modeles_les_plus_utilises', 'ModelesLesPlusUtilises' ),
-	'Mostrevisions'             => array( 'Pages_les_plus_modifiées', 'PagesLesPlusModifiées', 'Pages_les_plus_modifiees', 'PagesLesPlusModifiees', 'Les_plus_modifiés', 'LesPlusModifiés', 'Les_plus_modifies', 'LesPlusModifies' ),
-	'Movepage'                  => array( 'Renommer_une_page', 'Renommer', 'Renommage' ),
-	'Mycontributions'           => array( 'Mes_contributions', 'Mescontributions' ),
-	'Mypage'                    => array( 'Ma_page', 'Mapage' ),
-	'Mytalk'                    => array( 'Mes_discussions', 'Mesdiscussions' ),
-	'Newimages'                 => array( 'Nouveaux_fichiers', 'NouveauxFichiers', 'Nouvelles_images', 'NouvellesImages' ),
-	'Newpages'                  => array( 'Nouvelles_pages', 'NouvellesPages', 'Pages_récentes', 'PagesRécentes', 'Pages_recentes', 'PagesRecentes' ),
-	'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' ),
-	'Protectedtitles'           => array( 'Titres_protégés', 'TitresProtégés', 'Titres_proteges', 'TitresProteges' ),
-	'Randompage'                => array( 'Page_au_hasard', 'PageAuHasard', 'Au_hasard', 'AuHasard', 'Aléatoire', 'Aleatoire' ),
-	'Randomredirect'            => array( 'Redirection_au_hasard', 'Redirect_au_hasard', 'Redirectionauhasard', 'Redirectauhasard', 'Redirection_aléatoire', 'Redirect_aléatoire', 'Redirectionaléatoire', 'Redirectaléatoire', 'Redirection_aleatoire', 'Redirect_aleatoire', 'Redirectionaleatoire', 'Redirectaleatoire' ),
-	'Recentchanges'             => array( 'Modifications_récentes', 'Modifications_recentes', 'ModificationsRécentes', 'ModificationsRecentes' ),
-	'Recentchangeslinked'       => array( 'Suivi_des_liens', 'SuiviDesLiens' ),
-	'Revisiondelete'            => array( 'Versions_supprimées', 'Versions_supprimees', 'Versionsupprimées', 'Versionsupprimees' ),
-	'Search'                    => array( 'Recherche', 'Rechercher', 'Chercher' ),
-	'Shortpages'                => array( 'Pages_courtes', 'PagesCourtes' ),
-	'Specialpages'              => array( 'Pages_spéciales', 'PagesSpéciales', 'Pages_speciales', 'PagesSpeciales' ),
-	'Statistics'                => array( 'Statistiques', 'Stats' ),
-	'Tags'                      => array( 'Balises' ),
-	'Unblock'                   => array( 'Débloquer', 'Déblocage' ),
-	'Uncategorizedcategories'   => array( 'Catégories_non_catégorisées', 'CatégoriesNonCatégorisées', 'Categories_non_categorisees', 'CategoriesNonCategorisees', 'Catégories_sans_catégorie', 'CatégoriesSansCatégorie', 'Categories_sans_categorie', 'CategoriesSansCategorie' ),
-	'Uncategorizedimages'       => array( 'Fichiers_non_catégorisés', 'FichiersNonCatégorisés', 'Fichiers_non_categorises', 'FichiersNonCategorises', 'Fichiers_sans_catégorie', 'FichiersSansCatégorie', 'Fichiers_sans_categorie', 'FichiersSansCategorie', 'Images_non_catégorisées', 'ImagesNonCatégorisées', 'Images_non_categorisees', 'ImagesNonCategorisees', 'Images_sans_catégorie', 'ImagesSansCatégorie', 'Images_sans_categorie', 'ImagesSansCategorie' ),
-	'Uncategorizedpages'        => array( 'Pages_non_catégorisées', 'PagesNonCatégorisées', 'Pages_non_categorisees', 'PagesNonCategorisees', 'Pages_sans_catégorie', 'PagesSansCatégorie', 'Pages_sans_categorie', 'PagesSansCategorie' ),
-	'Uncategorizedtemplates'    => array( 'Modèles_non_catégorisés', 'ModèlesNonCatégorisés', 'Modeles_non_categorises', 'ModelesNonCategorises', 'Modèles_sans_catégorie', 'ModèlesSansCatégorie', 'Modeles_sans_catégorie', 'ModelesSansCatégorie' ),
-	'Undelete'                  => array( 'Restaurer', 'Restauration' ),
-	'Unlockdb'                  => array( 'Déverrouiller_la_base', 'Déverrouillerlabase', 'Deverrouiller_la_base', 'Deverrouillerlabase', 'Déverrouiller_base', 'Déverrouillerbase', 'Deverrouiller_base', 'Deverrouillerbase', 'Déverrouiller_BD', 'DéverrouillerBD', 'Deverrouiller_BD', 'DeverrouillerBD', 'Déverrouiller_bd', 'Déverrouillerbd', 'Deverrouiller_bd', 'Deverrouillerbd' ),
-	'Unusedcategories'          => array( 'Catégories_inutilisées', 'CatégoriesInutilisées', 'Categories_inutilisees', 'CategoriesInutilisees', 'Catégories_non_utilisées', 'CatégoriesNonUtilisées', 'Categories_non_utilisees', 'CategoriesNonUtilisees' ),
-	'Unusedimages'              => array( 'Fichiers_inutilisés', 'FichiersInutilisés', 'Fichiers_inutilises', 'FichiersInutilises', 'Fichiers_non_utilisés', 'FichiersNon_utilisés', 'Fichiers_non_utilises', 'FichiersNon_utilises', 'Images_inutilisées', 'ImagesInutilisées', 'Images_inutilisees', 'ImagesInutilisees', 'Images_non_utilisées', 'ImagesNonUtilisées', 'Images_non_utilisees', 'ImagesNonUtilisees' ),
-	'Unusedtemplates'           => array( 'Modèles_inutilisés', 'Modèlesinutilisés', 'Modeles_inutilises', 'Modelesinutilises', 'Modèles_non_utilisés', 'Modèlesnonutilisés', 'Modeles_non_utilises', 'Modelesnonutilises' ),
-	'Unwatchedpages'            => array( 'Pages_non_suivies', 'Pagesnonsuivies' ),
-	'Upload'                    => array( 'Téléverser', 'Televerser', 'Téléversement', 'Televersement', 'Téléchargement', 'Telechargement' ),
-	'Userlogin'                 => array( 'Connexion', 'Identification' ),
-	'Userlogout'                => array( 'Déconnexion', 'Deconnexion' ),
-	'Userrights'                => array( 'Permissions', 'Droits', 'Droits_des_utilisateurs' ),
-	'Wantedcategories'          => array( 'Catégories_demandées', 'CatégoriesDemandées', 'Categories_demandees', 'CategoriesDemandees' ),
-	'Wantedfiles'               => array( 'Fichiers_demandés', 'FichiersDemandés', 'Fichiers_demandes', 'FichiersDemandes' ),
-	'Wantedpages'               => array( 'Pages_demandées', 'PagesDemandées', 'Pages_demandees', 'PagesDemandees', 'Liens_brisés', 'LiensBrisés', 'Liens_brises', 'LiensBrises' ),
-	'Wantedtemplates'           => array( 'Modèles_demandés', 'ModèlesDemandés', 'Modeles_demandes', 'ModelesDemandes' ),
-	'Watchlist'                 => array( 'Liste_de_suivi', 'ListeDeSuivi', 'Suivi' ),
-	'Whatlinkshere'             => array( 'Pages_liées', 'PagesLiées', 'Pages_liees', 'PagesLiees' ),
-	'Withoutinterwiki'          => array( 'Sans_interwiki', 'Sansinterwiki', 'Sans_interwikis', 'Sansinterwikis' ),
+$bookstoreList = array(
+	'Amazon.fr'    => 'http://www.amazon.fr/exec/obidos/ISBN=$1',
+	'alapage.fr'   => 'http://www.alapage.com/mx/?tp=F&type=101&l_isbn=$1&donnee_appel=ALASQ&devise=&',
+	'fnac.com'     => 'http://www3.fnac.com/advanced/book.do?isbn=$1',
+	'chapitre.com' => 'http://www.chapitre.com/frame_rec.asp?isbn=$1',
+);
+
+$linkTrail = '/^([a-zàâçéèêîôûäëïöüùÇÉÂÊÎÔÛÄËÏÖÜÀÈÙ]+)(.*)$/sDu';
+
+$dateFormats = array(
+	'mdy time' => 'H:i',
+	'mdy date' => 'F j, Y',
+	'mdy both' => 'F j, Y à H:i',
+
+	'dmy time' => 'H:i',
+	'dmy date' => 'j F Y',
+	'dmy both' => 'j F Y à H:i',
+
+	'ymd time' => 'H:i',
+	'ymd date' => 'Y F j',
+	'ymd both' => 'Y F j à H:i',
 );
 
 $separatorTransformTable = array( ',' => "\xc2\xa0", '.' => ',' );
@@ -378,7 +378,7 @@ $messages = array(
 'tog-hideminor' => 'Masquer les modifications mineures dans les modifications récentes',
 'tog-hidepatrolled' => 'Masquer les modifications surveillées dans les modifications récentes',
 'tog-newpageshidepatrolled' => 'Masquer les pages surveillées parmi les nouvelles pages',
-'tog-extendwatchlist' => 'Étendre la liste de suivi pour afficher toutes les modifications et non seulement les plus récentes',
+'tog-extendwatchlist' => 'Étendre la liste de suivi pour afficher toutes les modifications et pas uniquement les plus récentes',
 'tog-usenewrc' => 'Grouper les changements dans les modifications récentes et la liste de suivi (nécessite JavaScript)',
 'tog-numberheadings' => 'Numéroter automatiquement les titres de section',
 'tog-showtoolbar' => "Montrer la barre d'outils de modification (nécessite JavaScript)",
@@ -387,7 +387,7 @@ $messages = array(
 'tog-editsectiononrightclick' => 'Activer la modification de sections par clic droit sur leurs titres (nécessite JavaScript)',
 'tog-showtoc' => 'Afficher la table des matières (pour les pages ayant plus de 3 sections)',
 'tog-rememberpassword' => 'Se souvenir de mon identification avec ce navigateur (au maximum $1 {{PLURAL:$1|jour|jours}})',
-'tog-watchcreations' => 'Ajouter les pages que je crée et les fichiers que j’importe à ma liste de suivi',
+'tog-watchcreations' => "Ajouter les pages que je crée et les fichiers que j'importe à ma liste de suivi",
 'tog-watchdefault' => 'Ajouter les pages et les fichiers que je modifie à ma liste de suivi',
 'tog-watchmoves' => 'Ajouter les pages et les fichiers que je renomme à ma liste de suivi',
 'tog-watchdeletion' => 'Ajouter les pages et les fichiers que je supprime à ma liste de suivi',
@@ -395,33 +395,33 @@ $messages = array(
 'tog-previewontop' => 'Afficher la prévisualisation au-dessus de la zone de modification',
 'tog-previewonfirst' => 'Afficher la prévisualisation lors de la première modification',
 'tog-nocache' => 'Désactiver le cache des pages par le navigateur',
-'tog-enotifwatchlistpages' => 'M’avertir par courriel lorsqu’une page ou un fichier de ma liste de suivi est modifiée',
-'tog-enotifusertalkpages' => 'M’avertir par courriel si ma page de discussion est modifiée',
+'tog-enotifwatchlistpages' => "M'avertir par courriel lorsqu'une page ou un fichier de ma liste de suivi est modifiée",
+'tog-enotifusertalkpages' => "M'avertir par courriel si ma page de discussion est modifiée",
 'tog-enotifminoredits' => "M'avertir par courriel même en cas de modifications mineures des pages ou des fichiers",
 'tog-enotifrevealaddr' => 'Afficher mon adresse de courriel dans les courriels de notification',
-'tog-shownumberswatching' => 'Afficher le nombre d’utilisateurs qui suivent cette page',
+'tog-shownumberswatching' => "Afficher le nombre d'utilisateurs qui suivent cette page",
 'tog-oldsig' => 'Signature existante :',
 'tog-fancysig' => 'Traiter la signature comme du wikitexte (sans lien automatique)',
-'tog-externaleditor' => 'Utiliser par défaut un éditeur de texte externe (pour les utilisateurs avancés, nécessite des réglages spécifiques sur votre ordinateur, [//www.mediawiki.org/wiki/Manual:External_editors/fr plus d’informations]).',
-'tog-externaldiff' => 'Utiliser un comparateur externe par défaut (pour les utilisateurs avancés, nécessite des réglages sur votre ordinateur, [//www.mediawiki.org/wiki/Manual:External_editors/fr plus d’informations]).',
+'tog-externaleditor' => "Utiliser par défaut un éditeur de texte externe (pour les utilisateurs avancés, nécessite des réglages spécifiques sur votre ordinateur, [//www.mediawiki.org/wiki/Manual:External_editors/fr plus d'informations]).",
+'tog-externaldiff' => "Utiliser un comparateur externe par défaut (pour les utilisateurs avancés, nécessite des réglages sur votre ordinateur, [//www.mediawiki.org/wiki/Manual:External_editors/fr plus d'informations]).",
 'tog-showjumplinks' => 'Activer les liens « navigation » et « recherche » en haut de page',
-'tog-uselivepreview' => 'Utiliser l’aperçu rapide (nécessite JavaScript) (expérimental)',
-'tog-forceeditsummary' => 'M’avertir lorsque je n’ai pas spécifié de résumé de modification',
+'tog-uselivepreview' => "Utiliser l'aperçu rapide (nécessite JavaScript) (expérimental)",
+'tog-forceeditsummary' => "M'avertir lorsque je n'ai pas spécifié de résumé de modification",
 'tog-watchlisthideown' => 'Masquer mes propres modifications dans la liste de suivi',
 '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-watchlisthidepatrolled' => 'Masquer les modifications surveillées dans la liste de suivi',
-'tog-ccmeonemails' => 'M’envoyer une copie des courriels que j’envoie aux autres utilisateurs',
+'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-noconvertlink' => 'Désactiver la conversion des titres',
-'tog-norollbackdiff' => 'Ne pas afficher le diff lors d’une révocation',
+'tog-norollbackdiff' => "Ne pas afficher le diff lors d'une révocation",
 
 'underline-always' => 'Toujours',
 'underline-never' => 'Jamais',
-'underline-default' => 'Valeur par défaut du navigateur',
+'underline-default' => 'Valeur par défaut du navigateur ou du thème',
 
 # Font style option in Special:Preferences
 'editfont-style' => 'Style de police de la zone de modification :',
@@ -506,8 +506,8 @@ $messages = array(
 'newwindow' => '(ouvre une nouvelle fenêtre)',
 'cancel' => 'Annuler',
 'moredotdotdot' => 'Plus...',
-'mypage' => 'Ma page',
-'mytalk' => 'Page de discussion',
+'mypage' => 'Page',
+'mytalk' => 'Discussion',
 'anontalk' => 'Discussion avec cette adresse IP',
 'navigation' => 'Navigation',
 'and' => '&#32;et',
@@ -582,7 +582,7 @@ $messages = array(
 'imagepage' => 'Voir la page du fichier',
 'mediawikipage' => 'Voir la page du message',
 'templatepage' => 'Voir la page du modèle',
-'viewhelppage' => 'Voir la page d’aide',
+'viewhelppage' => "Voir la page d'aide",
 'categorypage' => 'Voir la page de catégorie',
 'viewtalkpage' => 'Page de discussion',
 'otherlanguages' => 'Autres langues',
@@ -594,12 +594,12 @@ $messages = array(
 'jumpto' => 'Aller à :',
 'jumptonavigation' => 'Navigation',
 'jumptosearch' => 'rechercher',
-'view-pool-error' => 'Désolé, les serveurs sont surchargés en ce moment.
-Trop d’utilisateurs cherchent à consulter cette page.
-Veuillez attendre un moment avant de retenter l’accès à cette page.
+'view-pool-error' => "Désolé, les serveurs sont surchargés en ce moment.
+Trop d'utilisateurs cherchent à consulter cette page.
+Veuillez attendre un moment avant de retenter l'accès à cette page.
 
-$1',
-'pool-timeout' => 'Délai dépassé durant l’attente du verrou',
+$1",
+'pool-timeout' => "Délai dépassé durant l'attente du verrou",
 'pool-queuefull' => 'La file de travail est pleine',
 'pool-errorunknown' => 'Erreur inconnue',
 
@@ -624,8 +624,8 @@ $1',
 'privacypage' => 'Project:Confidentialité',
 
 'badaccess' => 'Erreur de permission',
-'badaccess-group0' => 'Vous n’avez pas les droits suffisants pour réaliser l’action demandée.',
-'badaccess-groups' => 'L’action que vous essayez de réaliser n’est accessible qu’aux utilisateurs {{PLURAL:$2|du groupe|des groupes}} : $1.',
+'badaccess-group0' => "Vous n'avez pas les droits suffisants pour réaliser l'action demandée.",
+'badaccess-groups' => "L'action que vous essayez de réaliser n'est accessible qu'aux utilisateurs {{PLURAL:$2|du groupe|des groupes}} : $1.",
 
 'versionrequired' => 'Version $1 de MediaWiki nécessaire',
 'versionrequiredtext' => 'La version $1 de MediaWiki est nécessaire pour utiliser cette page. Consultez [[Special:Version|la page des versions]]',
@@ -635,7 +635,7 @@ $1',
 'youhavenewmessages' => 'Vous avez $1 ($2).',
 'newmessageslink' => 'de nouveaux messages',
 'newmessagesdifflink' => 'dernière modification',
-'youhavenewmessagesfromusers' => "Vous avez  $1  d'{{PLURAL:$3| un autre utilisateur|$3 autres utilisateurs}} ( $2 ).",
+'youhavenewmessagesfromusers' => "Vous avez $1 {{PLURAL:$3|d'un autre utilisateur|de $3 autres utilisateurs}} ($2).",
 'youhavenewmessagesmanyusers' => 'Vous avez $1 de nombreux utilisateurs ($2).',
 'newmessageslinkplural' => '{{PLURAL:$1|un message|nouveaux messages}}',
 'newmessagesdifflinkplural' => 'dernières modification{{PLURAL:$1||s}}',
@@ -679,63 +679,63 @@ $1',
 
 # Main script and global functions
 'nosuchaction' => 'Action inconnue',
-'nosuchactiontext' => 'L’action spécifiée dans l’URL est invalide.
-Vous avez peut-être mal entré l’URL ou suivi un lien erroné.
-Il peut également s’agir d’un bogue dans le logiciel utilisé par {{SITENAME}}.',
+'nosuchactiontext' => "L'action spécifiée dans l'URL est invalide.
+Vous avez peut-être mal entré l'URL ou suivi un lien erroné.
+Il peut également s'agir d'un bug dans le logiciel utilisé par {{SITENAME}}.",
 'nosuchspecialpage' => 'Page spéciale inexistante',
-'nospecialpagetext' => '<strong>Vous avez demandé une page spéciale qui n’existe pas.</strong>
+'nospecialpagetext' => "<strong>Vous avez demandé une page spéciale qui n'existe pas.</strong>
 
-Une liste des pages spéciales valides se trouve sur [[Special:SpecialPages|{{int:specialpages}}]].',
+Une liste des pages spéciales valides se trouve sur [[Special:SpecialPages|{{int:specialpages}}]].",
 
 # General errors
 'error' => 'Erreur',
 'databaseerror' => 'Erreur de la base de données',
-'dberrortext' => 'Une erreur de syntaxe de la requête dans la base de données est survenue.
-Ceci peut indiquer un bogue dans le logiciel.
+'dberrortext' => "Une erreur de syntaxe de la requête dans la base de données est survenue.
+Ceci peut indiquer un bug dans le logiciel.
 La dernière requête traitée par la base de données était :
 <blockquote><code>$1</code></blockquote>
 depuis la fonction « <code>$2</code> ».
-La base de données a renvoyé l’erreur « <samp>$3 : $4</samp> ».',
-'dberrortextcl' => 'Une requête dans la base de données comporte une erreur de syntaxe.
+La base de données a renvoyé l'erreur « <samp>$3 : $4</samp> ».",
+'dberrortextcl' => "Une requête dans la base de données comporte une erreur de syntaxe.
 La dernière requête émise était :
 « $1 »
 dans la fonction « $2 ».
-La base de données a renvoyé l’erreur « $3 : $4 ».',
+La base de données a renvoyé l'erreur « $3 : $4 ».",
 'laggedslavemode' => 'Attention, cette page peut ne pas contenir les toutes dernières modifications effectuées',
 'readonly' => 'Base de données verrouillée',
-'enterlockreason' => 'Indiquez la raison du verrouillage ainsi qu’une estimation de sa durée',
-'readonlytext' => 'Les ajouts et mises à jour de la base de données sont actuellement bloqués, probablement pour permettre la maintenance de la base, après quoi, tout rentrera dans l’ordre.
+'enterlockreason' => "Indiquez la raison du verrouillage ainsi qu'une estimation de sa durée",
+'readonlytext' => "Les ajouts et mises à jour de la base de données sont actuellement bloqués, probablement pour permettre la maintenance de la base, après quoi, tout rentrera dans l'ordre.
 
-L’administrateur ayant verrouillé la base de données a fourni l’explication suivante :<br />$1',
-'missing-article' => "La base de données n’a pas trouvé le texte d'une page qu’elle aurait dû trouver, intitulée « $1 » $2.
+L'administrateur ayant verrouillé la base de données a fourni l'explication suivante :<br />$1",
+'missing-article' => "La base de données n'a pas trouvé le texte d'une page qu'elle aurait dû trouver, intitulée « $1 » $2.
 
-Généralement, cela survient en suivant un lien vers un diff périmé ou vers l’historique d'une page supprimée.
+Généralement, cela survient en suivant un lien vers un diff périmé ou vers l'historique d'une page supprimée.
 
-Si ce n’est pas le cas, il peut s’agir d'un bogue dans le programme.
-Veuillez le signaler à un [[Special:ListUsers/sysop|administrateur]] sans oublier de lui indiquer l’URL du lien.",
+Si ce n'est pas le cas, il peut s'agir d'un bug dans le programme.
+Veuillez le signaler à un [[Special:ListUsers/sysop|administrateur]] sans oublier de lui indiquer l'URL du lien.",
 'missingarticle-rev' => '(numéro de version : $1)',
 'missingarticle-diff' => '(diff : $1, $2)',
 'readonly_lag' => 'La base de données a été automatiquement verrouillée pendant que les serveurs secondaires rattrapent leur retard sur le serveur principal.',
 'internalerror' => 'Erreur interne',
 'internalerror_info' => 'Erreur interne : $1',
-'fileappenderrorread' => 'Impossible de lire « $1 » lors de l’insertion',
-'fileappenderror' => 'Impossible d’ajouter « $1 » à « $2 ».',
+'fileappenderrorread' => "Impossible de lire « $1 » lors de l'insertion",
+'fileappenderror' => "Impossible d'ajouter « $1 » à « $2 ».",
 'filecopyerror' => 'Impossible de copier le fichier « $1 » vers « $2 ».',
 'filerenameerror' => 'Impossible de renommer le fichier « $1 » en « $2 ».',
 'filedeleteerror' => 'Impossible de supprimer le fichier « $1 ».',
 'directorycreateerror' => 'Impossible de créer le dossier « $1 ».',
 'filenotfound' => 'Impossible de trouver le fichier « $1 ».',
-'fileexistserror' => 'Impossible d’écrire le fichier « $1 » : le fichier existe.',
+'fileexistserror' => "Impossible d'écrire le fichier « $1 » : le fichier existe.",
 'unexpected' => 'Valeur inattendue : « $1 » = « $2 ».',
 'formerror' => 'Erreur : Impossible de soumettre le formulaire.',
 'badarticleerror' => 'Cette action ne peut pas être effectuée sur cette page.',
-'cannotdelete' => 'Impossible de supprimer la page ou le fichier « $1 ».
-La suppression a peut-être déjà été effectuée par quelqu’un d’autre.',
+'cannotdelete' => "Impossible de supprimer la page ou le fichier « $1 ».
+La suppression a peut-être déjà été effectuée par quelqu'un d'autre.",
 'cannotdelete-title' => 'Impossible de supprimer la page « $1 »',
 'delete-hook-aborted' => "Suppression annulée par une extension.
 Aucune explication n'a été fournie.",
 'badtitle' => 'Mauvais titre',
-'badtitletext' => 'Le titre de la page demandée est invalide, vide, ou il s’agit d’un titre inter-langue ou inter-projet mal lié. Il contient peut-être un ou plusieurs caractères qui ne peuvent pas être utilisés dans les titres.',
+'badtitletext' => "Le titre de la page demandée est invalide, vide, ou il s'agit d'un titre inter-langue ou inter-projet mal lié. Il contient peut-être un ou plusieurs caractères qui ne peuvent pas être utilisés dans les titres.",
 'perfcached' => 'Les données suivantes sont en cache et peuvent ne pas être à jour. Un maximum de {{PLURAL:$1|un résultat|$1 résultats}} est disponible dans le cache.',
 'perfcachedts' => 'Les données suivantes sont en cache et ont été mises à jour pour la dernière fois à $1. Un maximum de {{PLURAL:$4|un résultat|$4 résultats}} est disponible dans le cache.',
 'querypage-no-updates' => 'Les mises à jour pour cette page sont actuellement désactivées. Les données ci-dessous ne sont pas mises à jour.',
@@ -745,29 +745,29 @@ Requête : $2',
 'viewsource' => 'Voir le texte source',
 'viewsource-title' => 'Voir la source de $1',
 'actionthrottled' => 'Action limitée',
-'actionthrottledtext' => 'Pour lutter contre les pourriels, l’utilisation de cette action est limitée à un certain nombre de fois dans un laps de temps assez court. Il s’avère que vous avez dépassé cette limite.
-Essayez à nouveau dans quelques minutes.',
+'actionthrottledtext' => "Pour lutter contre le spam, l'utilisation de cette action est limitée à un certain nombre de fois dans un laps de temps assez court. Il s'avère que vous avez dépassé cette limite.
+Essayez à nouveau dans quelques minutes.",
 'protectedpagetext' => 'Cette page a été protégée pour empêcher sa modification.',
 'viewsourcetext' => 'Vous pouvez voir et copier le contenu de la page :',
 'viewyourtext' => "Vous pouvez voir et copier le contenu de '''vos modifications''' à cette page :",
-'protectedinterface' => 'Cette page fournit du texte d’interface pour le logiciel sur ce wiki, et est protégée pour éviter les abus.
-Pour ajouter ou modifier des traductions sur tous les wikis, veuillez utiliser [//translatewiki.net/ translatewiki.net], le projet de localisation de MediaWiki.',
-'editinginterface' => "'''Attention''': Vous êtes en train de modifier une page utilisée pour créer le texte de l’interface du logiciel. Les changements sur cette page se répercuteront dur l'apparence de l'interface utilisateur pour les autres utilisateurs de ce wiki.
-Pour ajouter ou modifier des traductions pour tous les wikis, veuillez utiliser [//translatewiki.net/ translatewiki.net], le projet d’internationalisation de MediaWiki.",
+'protectedinterface' => "Cette page fournit du texte d'interface pour le logiciel sur ce wiki, et est protégée pour éviter les abus.
+Pour ajouter ou modifier des traductions sur tous les wikis, veuillez utiliser [//translatewiki.net/ translatewiki.net], le projet de localisation de MediaWiki.",
+'editinginterface' => "'''Attention''': Vous êtes en train de modifier une page utilisée pour créer le texte de l'interface du logiciel. Les changements sur cette page se répercuteront dur l'apparence de l'interface utilisateur pour les autres utilisateurs de ce wiki.
+Pour ajouter ou modifier des traductions pour tous les wikis, veuillez utiliser [//translatewiki.net/ translatewiki.net], le projet d'internationalisation de MediaWiki.",
 'sqlhidden' => '(Requête SQL cachée)',
-'cascadeprotected' => 'Cette page est protégée car elle est incluse par {{PLURAL:$1|la page suivante, qui a été protégée|les pages suivantes, qui ont été protégées}} avec l’option « protection en cascade » activée :
-$2',
-'namespaceprotected' => "Vous n’avez pas la permission de modifier les pages de l’espace de noms « '''$1''' ».",
-'customcssprotected' => 'Vous n’avez pas la permission de modifier cette page de CSS, car elle contient les paramètres personnels d’un autre utilisateur.',
-'customjsprotected' => 'Vous n’avez pas la permission de modifier cette page de JavaScript, car elle contient les paramètres personnels d’un autre utilisateur.',
-'ns-specialprotected' => 'Les pages dans l’espace de noms « {{ns:special}} » ne peuvent pas être modifiées.',
+'cascadeprotected' => "Cette page est protégée car elle est incluse par {{PLURAL:$1|la page suivante, qui a été protégée|les pages suivantes, qui ont été protégées}} avec l'option « protection en cascade » activée :
+$2",
+'namespaceprotected' => "Vous n'avez pas la permission de modifier les pages de l'espace de noms « '''$1''' ».",
+'customcssprotected' => "Vous n'avez pas la permission de modifier cette page de CSS, car elle contient les paramètres personnels d'un autre utilisateur.",
+'customjsprotected' => "Vous n'avez pas la permission de modifier cette page de JavaScript, car elle contient les paramètres personnels d'un autre utilisateur.",
+'ns-specialprotected' => "Les pages dans l'espace de noms « {{ns:special}} » ne peuvent pas être modifiées.",
 'titleprotected' => "Ce titre a été protégé à la création par [[User:$1|$1]].
 Le motif avancé est « ''$2'' ».",
-'filereadonlyerror' => 'Impossible de modifier le fichier « $1 » parce que le répertoire de fichiers « $2 » est en lecture seule.
+'filereadonlyerror' => "Impossible de modifier le fichier « $1 » parce que le répertoire de fichiers « $2 » est en lecture seule.
 
-L’administrateur qui l’a verrouillé a fourni ce motif: « $3 ».',
-'invalidtitle-knownnamespace' => 'Titre invalide avec l’espace de noms « $2 » et l’intitulé « $3 »',
-'invalidtitle-unknownnamespace' => 'Titre invalide avec le numéro d’espace de noms $1 et l’intitulé « $2 » inconnus',
+L'administrateur qui l'a verrouillé a fourni ce motif: « $3 ».",
+'invalidtitle-knownnamespace' => "Titre invalide avec l'espace de noms « $2 » et l'intitulé « $3 »",
+'invalidtitle-unknownnamespace' => "Titre invalide avec le numéro d'espace de noms $1 et l'intitulé « $2 » inconnus",
 'exception-nologin' => 'Non connecté',
 'exception-nologin-text' => "Cette page ou cette action nécessite d'être connecté sur ce wiki.",
 
@@ -780,28 +780,28 @@ L’administrateur qui l’a verrouillé a fourni ce motif: « $3 ».',
 'logouttext' => "'''Vous êtes à présent déconnecté(e).'''
 
 Vous pouvez continuer à utiliser {{SITENAME}} de façon anonyme, <span class='plainlinks'>[$1 vous reconnecter]</span> sous le même nom ou un autre.
-Notez que certaines pages peuvent être encore affichées comme si vous étiez toujours connecté(e), jusqu’à ce que vous effaciez le cache de votre navigateur.",
-'welcomecreation' => '== Bienvenue, $1 ! ==
+Notez que certaines pages peuvent être encore affichées comme si vous étiez toujours connecté(e), jusqu'à ce que vous effaciez le cache de votre navigateur.",
+'welcomecreation' => "== Bienvenue, $1 ! ==
 
 Votre compte a été créé.
-N’oubliez pas de personnaliser vos [[Special:Preferences|préférences sur {{SITENAME}}]].',
-'yourname' => 'Nom d’utilisateur :',
+N'oubliez pas de personnaliser vos [[Special:Preferences|préférences sur {{SITENAME}}]].",
+'yourname' => "Nom d'utilisateur :",
 'yourpassword' => 'Mot de passe&nbsp;:',
 'yourpasswordagain' => 'Confirmez le mot de passe :',
 'remembermypassword' => 'Me reconnecter automatiquement aux prochaines visites avec ce navigateur (au maximum $1&nbsp;{{PLURAL:$1|jour|jours}})',
 'securelogin-stick-https' => 'Rester connecté en HTTPS après la connexion',
 'yourdomainname' => 'Votre domaine :',
 'password-change-forbidden' => 'Vous ne pouvez pas modifier les mots de passe sur ce wiki.',
-'externaldberror' => 'Une erreur s’est produite avec la base de données d’authentification externe, ou bien vous n’êtes pas autorisé{{GENDER:||e|(e)}} à mettre à jour votre compte externe.',
+'externaldberror' => "Une erreur s'est produite avec la base de données d'authentification externe, ou bien vous n'êtes pas autorisé{{GENDER:||e|(e)}} à mettre à jour votre compte externe.",
 'login' => 'Connexion',
 'nav-login-createaccount' => 'Créer un compte ou se connecter',
-'loginprompt' => "Vous devez activer les témoins (''cookies'') pour vous connecter à {{SITENAME}}.",
+'loginprompt' => 'Vous devez activer les cookies pour vous connecter à {{SITENAME}}.',
 'userlogin' => 'Créer un compte ou se connecter',
 'userloginnocreate' => 'Connexion',
 'logout' => 'Se déconnecter',
 'userlogout' => 'Déconnexion',
 'notloggedin' => 'Non connecté',
-'nologin' => 'Vous n’êtes pas encore inscrit ? $1.',
+'nologin' => "Vous n'êtes pas encore inscrit ? $1.",
 'nologinlink' => 'Créer un compte',
 'createaccount' => 'Créer un compte',
 'gotaccount' => "Vous avez déjà un compte ? '''$1'''.",
@@ -810,51 +810,51 @@ N’oubliez pas de personnaliser vos [[Special:Preferences|préférences sur {{S
 'createaccountmail' => 'par courriel',
 'createaccountreason' => 'Motif :',
 'badretype' => 'Les mots de passe que vous avez saisis ne correspondent pas.',
-'userexists' => 'Nom d’utilisateur entré déjà utilisé.
-Veuillez choisir un nom différent.',
+'userexists' => "Nom d'utilisateur entré déjà utilisé.
+Veuillez choisir un nom différent.",
 'loginerror' => 'Erreur de connexion',
 'createaccounterror' => 'Impossible de créer le compte : $1',
-'nocookiesnew' => "Le compte utilisateur a été créé, mais vous n’êtes pas connecté{{GENDER:||e|(e)}}. {{SITENAME}} utilise des témoins (''cookies'') pour la connexion mais vous les avez désactivés. Veuillez les activer et vous reconnecter avec le même nom et le même mot de passe.",
-'nocookieslogin' => "{{SITENAME}} utilise des témoins (''cookies'') pour la connexion mais vous les avez désactivés. Veuillez les activer et vous reconnecter.",
-'nocookiesfornew' => 'Le compte utilisateur n’a pas été créé, car nous n’avons pas pu identifier son origine.
-Vérifiez que vous avez activé les cookies, rechargez la page et réessayez.',
-'noname' => 'Vous n’avez pas saisi un nom d’utilisateur valide.',
+'nocookiesnew' => "Le compte utilisateur a été créé, mais vous n'êtes pas connecté{{GENDER:||e|(e)}}. {{SITENAME}} utilise des cookies pour la connexion mais vous les avez désactivés. Veuillez les activer et vous reconnecter avec le même nom et le même mot de passe.",
+'nocookieslogin' => '{{SITENAME}} utilise des cookies pour la connexion mais vous les avez désactivés. Veuillez les activer et vous reconnecter.',
+'nocookiesfornew' => "Le compte utilisateur n'a pas été créé, car nous n'avons pas pu identifier son origine.
+Vérifiez que vous avez activé les cookies, rechargez la page et réessayez.",
+'noname' => "Vous n'avez pas saisi un nom d'utilisateur valide.",
 'loginsuccesstitle' => 'Connexion réussie',
 'loginsuccess' => 'Vous êtes maintenant connecté{{GENDER:$1||e|(e)}} à {{SITENAME}} en tant que « $1 ».',
-'nosuchuser' => 'L’utilisateur « $1 » n’existe pas.
-Les noms d’utilisateurs sont sensibles à la casse.
-Vérifiez l’orthographe, ou [[Special:UserLogin/signup|créez un nouveau compte]].',
-'nosuchusershort' => 'Il n’y a pas de contributeur avec le nom « $1 ». Veuillez vérifier l’orthographe.',
-'nouserspecified' => 'Vous devez saisir un nom d’utilisateur.',
+'nosuchuser' => "L'utilisateur « $1 » n'existe pas.
+Les noms d'utilisateurs sont sensibles à la casse.
+Vérifiez l'orthographe, ou [[Special:UserLogin/signup|créez un nouveau compte]].",
+'nosuchusershort' => "Il n'y a pas de contributeur avec le nom « $1 ». Veuillez vérifier l'orthographe.",
+'nouserspecified' => "Vous devez saisir un nom d'utilisateur.",
 'login-userblocked' => 'Cet utilisateur est bloqué. Connexion non autorisée.',
 'wrongpassword' => 'Le mot de passe est incorrect. Veuillez essayer à nouveau.',
-'wrongpasswordempty' => 'Vous n’avez pas entré de mot de passe. Veuillez essayer à nouveau.',
+'wrongpasswordempty' => "Vous n'avez pas entré de mot de passe. Veuillez essayer à nouveau.",
 'passwordtooshort' => 'Votre mot de passe doit contenir au moins $1 caractère{{PLURAL:$1||s}}.',
-'password-name-match' => 'Votre mot de passe doit être différent de votre nom d’utilisateur.',
-'password-login-forbidden' => "L’utilisation de ce nom d'utilisateur et de ce mot de passe a été interdite.",
+'password-name-match' => "Votre mot de passe doit être différent de votre nom d'utilisateur.",
+'password-login-forbidden' => "L'utilisation de ce nom d'utilisateur et de ce mot de passe a été interdite.",
 'mailmypassword' => 'Recevoir un nouveau mot de passe par courriel',
 'passwordremindertitle' => 'Nouveau mot de passe temporaire pour {{SITENAME}}',
-'passwordremindertext' => 'Quelqu’un (probablement vous, ayant l’adresse IP $1) a demandé un nouveau mot de
+'passwordremindertext' => "Quelqu'un (probablement vous, ayant l'adresse IP $1) a demandé un nouveau mot de
 passe pour {{SITENAME}} ($4 ). Un mot de passe temporaire a été créé pour
-l’utilisateur « $2 » et est « $3 ». Si cela était votre intention, vous devrez
+l'utilisateur « $2 » et est « $3 ». Si cela était votre intention, vous devrez
 vous connecter et choisir un nouveau mot de passe.
 Votre mot de passe temporaire expirera dans $5 jour{{PLURAL:$5||s}}.
 
-Si vous n’êtes pas l’auteur de cette demande, ou si vous vous souvenez à présent
+Si vous n'êtes pas l'auteur de cette demande, ou si vous vous souvenez à présent
 de votre ancien mot de passe et que vous ne souhaitez plus en changer, vous
-pouvez ignorer ce message et continuer à utiliser votre ancien mot de passe.',
-'noemail' => "Aucune adresse de courriel n’a été enregistrée pour l'utilisateur « $1 ».",
+pouvez ignorer ce message et continuer à utiliser votre ancien mot de passe.",
+'noemail' => "Aucune adresse de courriel n'a été enregistrée pour l'utilisateur « $1 ».",
 'noemailcreate' => 'Vous devez fournir une adresse de courriel valide',
 'passwordsent' => "Un nouveau mot de passe a été envoyé à l'adresse de courriel de l'utilisateur « $1 ». Veuillez vous reconnecter après l'avoir reçu.",
 'blocked-mailpassword' => 'Votre adresse IP est bloquée en écriture, la fonction de rappel du mot de passe est donc désactivée pour éviter les abus.',
-'eauthentsent' => 'Un courriel de confirmation a été envoyé à l’adresse indiquée.
-Avant qu’un autre courriel ne soit envoyé à ce compte, vous devrez suivre les instructions du courriel et confirmer que le compte est bien le vôtre.',
-'throttled-mailpassword' => 'Un courriel de rappel de votre mot de passe a déjà été envoyé durant {{PLURAL:$1|la dernière heure|les $1 dernières heures}}. Afin d’éviter les abus, un seul courriel de rappel sera envoyé par {{PLURAL:$1|heure|intervalle de $1 heures}}.',
-'mailerror' => 'Erreur lors de l’envoi du courriel : $1',
-'acct_creation_throttle_hit' => 'Quelqu’un utilisant votre adresse IP a créé {{PLURAL:$1|un compte|$1 comptes}} au cours des dernières 24 heures, ce qui constitue la limite autorisée dans cet intervalle de temps.
-Par conséquent, la création de compte a été temporairement désactivée pour cette adresse IP.',
+'eauthentsent' => "Un courriel de confirmation a été envoyé à l'adresse indiquée.
+Avant qu'un autre courriel ne soit envoyé à ce compte, vous devrez suivre les instructions du courriel et confirmer que le compte est bien le vôtre.",
+'throttled-mailpassword' => "Un courriel de rappel de votre mot de passe a déjà été envoyé durant {{PLURAL:$1|la dernière heure|les $1 dernières heures}}. Afin d'éviter les abus, un seul courriel de rappel sera envoyé par {{PLURAL:$1|heure|intervalle de $1 heures}}.",
+'mailerror' => "Erreur lors de l'envoi du courriel : $1",
+'acct_creation_throttle_hit' => "Quelqu'un utilisant votre adresse IP a créé {{PLURAL:$1|un compte|$1 comptes}} au cours des dernières 24 heures, ce qui constitue la limite autorisée dans cet intervalle de temps.
+Par conséquent, la création de compte a été temporairement désactivée pour cette adresse IP.",
 'emailauthenticated' => 'Votre adresse de courriel a été authentifiée le $2 à $3.',
-'emailnotauthenticated' => 'Votre adresse de courriel n’est <strong>pas encore authentifiée</strong>. Aucun courriel ne sera envoyé pour chacune des fonctions suivantes.',
+'emailnotauthenticated' => "Votre adresse de courriel n'est <strong>pas encore authentifiée</strong>. Aucun courriel ne sera envoyé pour chacune des fonctions suivantes.",
 'noemailprefs' => 'Indiquez une adresse de courriel dans vos préférences pour utiliser ces fonctions.',
 'emailconfirmlink' => 'Confirmez votre adresse de courriel',
 'invalidemailaddress' => 'Cette adresse courriel ne peut pas être acceptée car elle semble avoir un format incorrect.
@@ -863,25 +863,25 @@ Entrez une adresse bien formatée ou laissez ce champ vide.',
 'emaildisabled' => 'Ce site ne peut pas envoyer de courriels.',
 'accountcreated' => 'Compte créé',
 'accountcreatedtext' => 'Le compte utilisateur pour $1 a été créé.',
-'createaccount-title' => 'Création d’un compte pour {{SITENAME}}',
-'createaccount-text' => 'Quelqu’un a créé un compte pour votre adresse de courriel sur {{SITENAME}} ($4) intitulé « $2 », avec le mot de passe « $3 ».
+'createaccount-title' => "Création d'un compte pour {{SITENAME}}",
+'createaccount-text' => "Quelqu'un a créé un compte pour votre adresse de courriel sur {{SITENAME}} ($4) intitulé « $2 », avec le mot de passe « $3 ».
 Vous devriez ouvrir une session et modifier dès à présent votre mot de passe.
 
-Ignorez ce message si ce compte a été créé par erreur.',
-'usernamehasherror' => 'Le nom d’utilisateur ne peut pas contenir des caractères de hachage',
-'login-throttled' => 'Vous avez tenté un trop grand nombre de connexions dernièrement.
-Veuillez attendre avant d’essayer à nouveau.',
+Ignorez ce message si ce compte a été créé par erreur.",
+'usernamehasherror' => "Le nom d'utilisateur ne peut pas contenir des caractères de hachage",
+'login-throttled' => "Vous avez tenté un trop grand nombre de connexions dernièrement.
+Veuillez attendre avant d'essayer à nouveau.",
 'login-abort-generic' => 'Votre tentative de connexion a échoué',
 'loginlanguagelabel' => 'Langue : $1',
-'suspicious-userlogout' => 'Votre demande de déconnexion a été refusée car il semble qu’elle a été envoyée par un navigateur cassé ou la mise en cache d’un proxy.',
+'suspicious-userlogout' => "Votre demande de déconnexion a été refusée car il semble qu'elle a été envoyée par un navigateur cassé ou la mise en cache d'un proxy.",
 
 # E-mail sending
 'php-mail-error-unknown' => 'Erreur inconnue dans la fonction mail() de PHP.',
-'user-mail-no-addy' => 'Tenté d’envoyer un courriel sans adresse de courriel',
+'user-mail-no-addy' => "Tenté d'envoyer un courriel sans adresse de courriel",
 
 # Change password dialog
 'resetpass' => 'Changer de mot de passe',
-'resetpass_announce' => 'Vous vous êtes enregistré{{GENDER:||e|(e)}} avec un mot de passe temporaire envoyé par courriel. Pour terminer l’enregistrement, vous devez entrer un nouveau mot de passe ici :',
+'resetpass_announce' => "Vous vous êtes enregistré{{GENDER:||e|(e)}} avec un mot de passe temporaire envoyé par courriel. Pour terminer l'enregistrement, vous devez entrer un nouveau mot de passe ici :",
 'resetpass_text' => '<!-- Ajoutez le texte ici -->',
 'resetpass_header' => 'Changer le mot de passe du compte',
 'oldpassword' => 'Ancien mot de passe :',
@@ -903,37 +903,37 @@ Vous avez peut-être déjà changé votre mot de passe ou demandé un nouveau mo
 'passwordreset-legend' => 'Remise à zéro du mot de passe',
 'passwordreset-disabled' => 'La réinitialisation des mots de passe a été désactivée sur ce wiki.',
 'passwordreset-pretext' => '{{PLURAL:$1||Entrez un élément de données ci-dessous}}',
-'passwordreset-username' => 'Nom d’utilisateur :',
+'passwordreset-username' => "Nom d'utilisateur :",
 'passwordreset-domain' => 'Domaine :',
 'passwordreset-capture' => 'Voir le courriel résultant?',
-'passwordreset-capture-help' => 'Si vous cochez cette case, le courriel (avec le mot de passe temporaire) vous sera affiché en même temps qu’il sera envoyé à l’utilisateur.',
+'passwordreset-capture-help' => "Si vous cochez cette case, le courriel (avec le mot de passe temporaire) vous sera affiché en même temps qu'il sera envoyé à l'utilisateur.",
 'passwordreset-email' => 'Adresse de courriel :',
 'passwordreset-emailtitle' => 'Détails du compte sur {{SITENAME}}',
-'passwordreset-emailtext-ip' => 'Quelqu’un (probablement vous, depuis l’adresse IP $1) a demandé un rappel des informations de votre compte pour {{SITENAME}} ($4). {{PLURAL:$3|Le compte utilisateur suivant est associé|Les comptes utilisateurs suivants sont associés}} à cette adresse de courriel :
+'passwordreset-emailtext-ip' => "Quelqu'un (probablement vous, depuis l'adresse IP $1) a demandé un rappel des informations de votre compte pour {{SITENAME}} ($4). {{PLURAL:$3|Le compte utilisateur suivant est associé|Les comptes utilisateurs suivants sont associés}} à cette adresse de courriel :
 
 $2
 
-{{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 vous êtes souvenu de 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 rappel des informations de votre compte pour {{SITENAME}} ($4). {{PLURAL:$3|Le compte utilisateur suivant est associé|Les comptes utilisateurs suivants sont associés}} à cette adresse de courriel :
+{{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 vous êtes souvenu de 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 rappel des informations de votre compte pour {{SITENAME}} ($4). {{PLURAL:$3|Le compte utilisateur suivant est associé|Les comptes utilisateurs suivants sont associés}} à cette adresse de courriel :
 
 $2
 
-{{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 vous êtes souvenu de 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
-Mot de passe temporaire : $2',
+{{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 vous êtes souvenu de 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
+Mot de passe temporaire : $2",
 'passwordreset-emailsent' => 'Un courriel de rappel a été envoyé.',
 'passwordreset-emailsent-capture' => 'Un courriel de rappel a été envoyé, qui est affiché ci-dessous.',
-'passwordreset-emailerror-capture' => 'Un courriel de rappel a été généré, qui est affiché ci-dessous, mais l’envoi à l’utilisateur a échoué : $1',
+'passwordreset-emailerror-capture' => "Un courriel de rappel a été généré, qui est affiché ci-dessous, mais l'envoi à l'utilisateur a échoué : $1",
 
 # Special:ChangeEmail
-'changeemail' => 'Changer l’adresse de courriel',
-'changeemail-header' => 'Changer l’adresse de courriel du compte',
+'changeemail' => "Changer l'adresse de courriel",
+'changeemail-header' => "Changer l'adresse de courriel du compte",
 'changeemail-text' => 'Remplissez ce formulaire pour changer votre adresse de courriel. Vous devrez entrer votre mot de passe pour confirmer ce changement.',
 'changeemail-no-info' => 'Vous devez être connecté pour pouvoir accéder directement à cette page.',
 'changeemail-oldemail' => 'Adresse de courriel actuelle :',
 'changeemail-newemail' => 'Nouvelle adresse de courriel :',
 'changeemail-none' => '(aucune)',
-'changeemail-submit' => 'Changer l’adresse de courriel',
+'changeemail-submit' => "Changer l'adresse de courriel",
 'changeemail-cancel' => 'Annuler',
 
 # Edit page toolbar
@@ -944,7 +944,7 @@ Mot de passe temporaire : $2',
 'link_sample' => 'Titre du lien',
 'link_tip' => 'Lien interne',
 'extlink_sample' => 'http://www.example.com titre du lien',
-'extlink_tip' => 'Lien externe (n’oubliez pas le préfixe http://)',
+'extlink_tip' => "Lien externe (n'oubliez pas le préfixe http://)",
 'headline_sample' => 'Texte du titre',
 'headline_tip' => 'Sous-titre niveau 2',
 'nowiki_sample' => 'Entrez le texte non formaté ici',
@@ -966,12 +966,12 @@ Mot de passe temporaire : $2',
 'showpreview' => 'Prévisualiser',
 'showlivepreview' => 'Aperçu rapide',
 'showdiff' => 'Modifications en cours',
-'anoneditwarning' => "'''Attention :''' vous n’êtes pas identifié(e). Votre adresse IP sera enregistrée dans l’historique de cette page.",
-'anonpreviewwarning' => "''Vous n’êtes pas identifié. Sauvegarder enregistrera votre adresse IP dans l’historique des modifications de la page.''",
-'missingsummary' => "'''Rappel :''' vous n’avez pas encore fourni le résumé de votre modification.
+'anoneditwarning' => "'''Attention :''' vous n'êtes pas identifié(e). Votre adresse IP sera enregistrée dans l'historique de cette page.",
+'anonpreviewwarning' => "''Vous n'êtes pas identifié. Sauvegarder enregistrera votre adresse IP dans l'historique des modifications de la page.''",
+'missingsummary' => "'''Rappel :''' vous n'avez pas encore fourni le résumé de votre modification.
 Si vous cliquez de nouveau sur le bouton « {{int:savearticle}} », la publication sera faite sans nouvel avertissement.",
 'missingcommenttext' => 'Veuillez entrer un commentaire ci-dessous.',
-'missingcommentheader' => "'''Rappel :''' vous n’avez pas fourni de sujet ou de titre à ce commentaire.
+'missingcommentheader' => "'''Rappel :''' vous n'avez pas fourni de sujet ou de titre à ce commentaire.
 Si vous cliquez de nouveau sur « {{int:Savearticle}} », votre modification sera enregistrée sans titre.",
 'summary-preview' => 'Aperçu du résumé :',
 'subject-preview' => 'Prévisualisation du sujet/titre :',
@@ -986,7 +986,7 @@ La raison invoquée est la suivante : ''$2''.
 * Compte bloqué : $7.
 
 Vous pouvez contacter $1 ou un autre [[{{MediaWiki:Grouppage-sysop}}|administrateur]] pour en discuter.
-Vous 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 cette fonctionnalité n’a pas été bloquée.
+Vous 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 cette fonctionnalité n'a pas été bloquée.
 Votre adresse IP actuelle est $3 et votre identifiant de blocage est $5.
 Veuillez 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.
@@ -998,9 +998,9 @@ La raison invoquée est :
 * Expiration du blocage : $6
 * Compte bloqué : $7
 
-Vous pouvez contacter $1 ou l’un des autres [[{{MediaWiki:Grouppage-sysop}}|administrateurs]] pour discuter de ce blocage.
+Vous pouvez contacter $1 ou l'un des autres [[{{MediaWiki:Grouppage-sysop}}|administrateurs]] pour discuter de ce blocage.
 
-Notez 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 la fonctionnalité n’a pas été désactivée.
+Notez 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 la fonctionnalité n'a pas été désactivée.
 
 Votre adresse IP actuelle est $3, et le numéro de blocage est $5.
 Veuillez préciser ces indications dans toutes les requêtes que vous ferez.",
@@ -1009,100 +1009,100 @@ Veuillez préciser ces indications dans toutes les requêtes que vous ferez.",
 'confirmedittext' => 'Vous devez confirmer votre adresse de courriel avant de modifier les pages.
 Veuillez entrer et valider votre adresse de courriel dans vos [[Special:Preferences|préférences]].',
 'nosuchsectiontitle' => 'Impossible de trouver la section',
-'nosuchsectiontext' => 'Vous avez essayé de modifier une section qui n’existe pas.
-Elle a peut-être été déplacée ou supprimée depuis que vous avez lu cette page.',
+'nosuchsectiontext' => "Vous avez essayé de modifier une section qui n'existe pas.
+Elle a peut-être été déplacée ou supprimée depuis que vous avez lu cette page.",
 'loginreqtitle' => 'Connexion nécessaire',
 'loginreqlink' => 'connecter',
 'loginreqpagetext' => 'Vous devez vous $1 pour voir les autres pages.',
 'accmailtitle' => 'Mot de passe envoyé.',
 'accmailtext' => "Un mot de passe généré aléatoirement pour [[User talk:$1|$1]] a été envoyé à $2.
-Le mot de passe pour ce nouveau compte peut être changé sur la page ''[[Special:ChangePassword|de changement de mot de passe]]'' après s’être connecté.",
+Le mot de passe pour ce nouveau compte peut être changé sur la page ''[[Special:ChangePassword|de changement de mot de passe]]'' après s'être connecté.",
 'newarticle' => '(Nouveau)',
-'newarticletext' => "Vous avez suivi un lien vers une page qui n’existe pas encore ou qui a été [{{fullurl:Special:Log|type=delete&page={{FULLPAGENAMEE}}}} effacée].
-Pour créer cette page, entrez votre texte dans la boîte ci-dessous (vous pouvez consulter [[{{MediaWiki:Helppage}}|la page d’aide]] pour plus d’informations).
+'newarticletext' => "Vous avez suivi un lien vers une page qui n'existe pas encore ou qui a été [{{fullurl:Special:Log|type=delete&page={{FULLPAGENAMEE}}}} effacée].
+Pour créer cette page, entrez votre texte dans la boîte ci-dessous (vous pouvez consulter [[{{MediaWiki:Helppage}}|la page d'aide]] pour plus d'informations).
 Si vous êtes arrivé{{GENDER:||e|(e)}} ici par erreur, cliquez sur le bouton '''retour''' de votre navigateur.",
-'anontalkpagetext' => "---- ''Vous êtes sur la page de discussion d’un utilisateur anonyme qui n’a pas encore créé de compte ou qui n’en utilise pas. Pour cette raison, nous devons utiliser son adresse IP pour l’identifier. Une adresse IP peut être partagée par plusieurs utilisateurs. Si vous êtes un{{GENDER:||e|}} utilisat{{GENDER:|eur|rice|eur}} anonyme et si vous constatez que des commentaires qui ne vous concernent pas vous ont été adressés, vous pouvez [[Special:UserLogin/signup|créer un compte]] ou [[Special:UserLogin|vous connecter]] afin d’éviter toute confusion future avec d’autres contributeurs anonymes.''",
-'noarticletext' => 'Il n’y a pour l’instant aucun texte sur cette page.
+'anontalkpagetext' => "---- ''Vous êtes sur la page de discussion d'un utilisateur anonyme qui n'a pas encore créé de compte ou qui n'en utilise pas. Pour cette raison, nous devons utiliser son adresse IP pour l'identifier. Une adresse IP peut être partagée par plusieurs utilisateurs. Si vous êtes un{{GENDER:||e|}} utilisat{{GENDER:|eur|rice|eur}} anonyme et si vous constatez que des commentaires qui ne vous concernent pas vous ont été adressés, vous pouvez [[Special:UserLogin/signup|créer un compte]] ou [[Special:UserLogin|vous connecter]] afin d'éviter toute confusion future avec d'autres contributeurs anonymes.''",
+'noarticletext' => 'Il n\'y a pour l\'instant aucun texte sur cette page.
 Vous pouvez [[Special:Search/{{PAGENAME}}|lancer une recherche sur ce titre]] dans les autres pages,
 <span class="plainlinks">[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} rechercher dans les opérations liées]
 ou [{{fullurl:{{FULLPAGENAME}}|action=edit}} créer cette page]</span>.',
-'noarticletext-nopermission' => 'Il n’y a pour l’instant aucun texte sur cette page.
+'noarticletext-nopermission' => 'Il n\'y a pour l\'instant aucun texte sur cette page.
 Vous pouvez [[Special:Search/{{PAGENAME}}|faire une recherche sur ce titre]] dans les autres pages,
 ou <span class="plainlinks">[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} rechercher dans les journaux associés]</span>.',
 'missing-revision' => "La révision n° $1 de la page intitulée « {{PAGENAME}} » n'existe pas.
 
 Cela survient en général en suivant un lien historique obsolète vers une page qui a été supprimée.
 Vous pouvez trouver plus de détails dans le [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} journal des suppressions].",
-'userpage-userdoesnotexist' => 'Le compte utilisateur « <nowiki>$1</nowiki> » n’est pas enregistré. Veuillez vérifier que vous voulez créer cette page.',
-'userpage-userdoesnotexist-view' => 'Le compte utilisateur « $1 » n’est pas enregistré.',
-'blocked-notice-logextract' => 'Cet utilisateur est actuellement bloqué.
-La dernière entrée du registre des blocages est indiquée ci-dessous à titre d’information :',
+'userpage-userdoesnotexist' => "Le compte utilisateur « <nowiki>$1</nowiki> » n'est pas enregistré. Veuillez vérifier que vous voulez créer cette page.",
+'userpage-userdoesnotexist-view' => "Le compte utilisateur « $1 » n'est pas enregistré.",
+'blocked-notice-logextract' => "Cet utilisateur est actuellement bloqué.
+La dernière entrée du registre des blocages est indiquée ci-dessous à titre d'information :",
 'clearyourcache' => "'''Note :''' après avoir enregistré vos préférences, vous devrez forcer le rechargement complet du cache de votre navigateur pour voir les changements.
 * '''Firefox / Safari :''' Maintenez la touche ''Maj'' (''Shift'') en cliquant sur le bouton ''Actualiser'' ou pressez ''Ctrl-F5'' ou ''Ctrl-R'' (''⌘-R'' sur un Mac) ;
 * '''Google Chrome :''' Appuyez sur ''Ctrl-Maj-R'' (''⌘-Shift-R'' sur un Mac) ;
 * '''Internet Explorer :''' Maintenez la touche ''Ctrl'' en cliquant sur le bouton ''Actualiser'' ou pressez ''Ctrl-F5'' ;
 * '''Opera :''' Videz le cache dans ''Outils → Préférences''.",
-'usercssyoucanpreview' => "'''Astuce :''' utilisez le bouton « {{int:showpreview}} » pour tester votre nouvelle feuille CSS avant de l’enregistrer.",
-'userjsyoucanpreview' => "'''Astuce :''' utilisez le bouton « {{int:showpreview}} » pour tester votre nouvelle feuille JavaScript avant de l’enregistrer.",
-'usercsspreview' => "'''Rappelez-vous que vous n’êtes qu’en train de prévisualiser votre propre feuille CSS.'''
-'''Elle n’a pas encore été enregistrée !'''",
-'userjspreview' => "'''Rappelez-vous que vous êtes en train de visualiser ou de tester votre code JavaScript et qu’il n’a pas encore été enregistré !'''",
+'usercssyoucanpreview' => "'''Astuce :''' utilisez le bouton « {{int:showpreview}} » pour tester votre nouvelle feuille CSS avant de l'enregistrer.",
+'userjsyoucanpreview' => "'''Astuce :''' utilisez le bouton « {{int:showpreview}} » pour tester votre nouvelle feuille JavaScript avant de l'enregistrer.",
+'usercsspreview' => "'''Rappelez-vous que vous n'êtes qu'en train de prévisualiser votre propre feuille CSS.'''
+'''Elle n'a pas encore été enregistrée !'''",
+'userjspreview' => "'''Rappelez-vous que vous êtes en train de visualiser ou de tester votre code JavaScript et qu'il n'a pas encore été enregistré !'''",
 'sitecsspreview' => "'''Souvenez-vous que vous êtes seulement en train de prévisualiser cette feuille de style.'''
-'''Elle n’a pas encore été enregistrée !'''",
+'''Elle n'a pas encore été enregistrée !'''",
 'sitejspreview' => "'''Souvenez-vous que vous êtes seulement en train de prévisualiser ce code JavaScript.'''
-'''Il n’a pas encore été enregistré !'''",
-'userinvalidcssjstitle' => "'''Attention :''' il n’existe pas d’habillage « $1 ». Rappelez-vous que les pages personnelles avec extensions .css et .js utilisent des titres en minuscules, par exemple {{ns:user}}:Foo/vector.css et non {{ns:user}}:Foo/Vector.css.",
+'''Il n'a pas encore été enregistré !'''",
+'userinvalidcssjstitle' => "'''Attention :''' il n'existe pas d'habillage « $1 ». Rappelez-vous que les pages personnelles avec extensions .css et .js utilisent des titres en minuscules, par exemple {{ns:user}}:Foo/vector.css et non {{ns:user}}:Foo/Vector.css.",
 'updated' => '(Mis à jour)',
 'note' => "'''Note :'''",
-'previewnote' => "'''Rappelez-vous que ce n’est qu’une prévisualisation.'''
-Vos modifications n’ont pas encore été enregistrées !",
-'continue-editing' => 'Continuer la modification',
-'previewconflict' => 'Cette prévisualisation montre le texte de la boîte supérieure de modification tel qu’il apparaîtra si vous choisissez de le publier.',
-'session_fail_preview' => "'''Nous ne pouvons enregistrer votre modification à cause d’une perte d’informations concernant votre session.'''
+'previewnote' => "'''Rappelez-vous que ce n'est qu'une prévisualisation.'''
+Vos modifications n'ont pas encore été enregistrées !",
+'continue-editing' => 'Aller à la zone de modification',
+'previewconflict' => "Cette prévisualisation montre le texte de la boîte supérieure de modification tel qu'il apparaîtra si vous choisissez de le publier.",
+'session_fail_preview' => "'''Nous ne pouvons enregistrer votre modification à cause d'une perte d'informations concernant votre session.'''
 Veuillez réessayer.
 Si cela échoue de nouveau, essayez en vous [[Special:UserLogout|déconnectant]], puis en vous reconnectant.",
-'session_fail_preview_html' => "'''Nous ne pouvons enregistrer votre modification à cause d’une perte d’informations concernant votre session.'''
+'session_fail_preview_html' => "'''Nous ne pouvons enregistrer votre modification à cause d'une perte d'informations concernant votre session.'''
 
 ''Parce que {{SITENAME}} a activé le HTML brut, la prévisualisation a été masquée afin de prévenir les attaques par JavaScript.''
 
 '''Si la tentative de modification était légitime, veuillez réessayer.'''
 Si cela échoue de nouveau, [[Special:UserLogout|déconnectez-vous]], puis reconnectez-vous.",
-'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.'''
+'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.'''
 Ce rejet est nécessaire pour empêcher la corruption du texte de la page.
 Ce problème se produit parfois lorsque vous utilisez un serveur mandataire anonyme problématique basé sur le web.",
-'edit_form_incomplete' => "'''Certaines parties du formulaire de modification n’ont pas atteint le serveur, vérifiez que vos modifications sont intactes et essayez à nouveau.'''",
+'edit_form_incomplete' => "'''Certaines parties du formulaire de modification n'ont pas atteint le serveur, vérifiez que vos modifications sont intactes et essayez à nouveau.'''",
 'editing' => 'Modification de $1',
 'creating' => 'Création de $1',
 'editingsection' => 'Modification de $1 (section)',
 'editingcomment' => 'Modification de $1 (nouvelle section)',
 'editconflict' => 'Conflit de modification : $1',
 'explainconflict' => "Cette page a été changée après que vous ayez commencé à la modifier.
-La zone de modification supérieure contient le texte tel qu’il est actuellement enregistré dans la base de données.
+La zone de modification supérieure contient le texte tel qu'il est actuellement enregistré dans la base de données.
 Vos modifications apparaissent dans la zone de modification inférieure.
 Vous allez devoir fusionner vos modifications dans le texte existant.
 '''Seul''' le texte de la zone supérieure sera sauvegardé si vous cliquez sur « {{int:savearticle}} ».",
 'yourtext' => 'Votre texte',
 'storedversion' => 'La version enregistrée',
-'nonunicodebrowser' => "'''Attention : Votre navigateur ne supporte pas l’Unicode.'''
+'nonunicodebrowser' => "'''Attention : Votre navigateur ne supporte pas l'Unicode.'''
 Une solution de rechange a été trouvée pour vous permettre de modifier en toute sûreté une page : les caractères non-ASCII apparaîtront dans votre boîte de modification en tant que codes hexadécimaux. Vous devriez utiliser un navigateur plus récent.",
 'editingold' => "'''Attention : vous êtes en train de modifier une ancienne version de cette page.
 Si vous la publiez, toutes les modifications effectuées depuis cette version seront perdues.'''",
 'yourdiff' => 'Différences',
 'copyrightwarning' => "Toutes les contributions à {{SITENAME}} sont considérées comme publiées sous les termes de la $2 (voir $1 pour plus de détails). Si vous ne désirez pas que vos écrits soient modifiés et distribués à volonté, merci de ne pas les soumettre ici.<br />
-Vous nous promettez aussi que vous avez écrit ceci vous-même, ou que vous l’avez copié d’une source provenant du domaine public, ou d’une ressource libre. '''N’UTILISEZ PAS DE TRAVAUX SOUS DROIT D’AUTEUR SANS AUTORISATION EXPRESSE !'''",
-'copyrightwarning2' => "Toutes les contributions à {{SITENAME}} peuvent être modifiées ou supprimées par d’autres utilisateurs. Si vous ne désirez pas que vos écrits soient modifiés et distribués à volonté, merci de ne pas les soumettre ici.<br />
-Vous nous promettez aussi que vous avez écrit ceci vous-même, ou que vous l’avez copié d’une source provenant du domaine public, ou d’une ressource libre. (voir $1 pour plus de détails).
-'''N’UTILISEZ PAS DE TRAVAUX SOUS DROIT D’AUTEUR SANS AUTORISATION EXPRESSE !'''",
+Vous nous promettez aussi que vous avez écrit ceci vous-même, ou que vous l'avez copié d'une source provenant du domaine public, ou d'une ressource libre. '''N'UTILISEZ PAS DE TRAVAUX SOUS DROIT D'AUTEUR SANS AUTORISATION EXPRESSE !'''",
+'copyrightwarning2' => "Toutes les contributions à {{SITENAME}} peuvent être modifiées ou supprimées par d'autres utilisateurs. Si vous ne désirez pas que vos écrits soient modifiés et distribués à volonté, merci de ne pas les soumettre ici.<br />
+Vous nous promettez aussi que vous avez écrit ceci vous-même, ou que vous l'avez copié d'une source provenant du domaine public, ou d'une ressource libre. (voir $1 pour plus de détails).
+'''N'UTILISEZ PAS DE TRAVAUX SOUS DROIT D'AUTEUR SANS AUTORISATION EXPRESSE !'''",
 'longpageerror' => "'''Erreur: Le texte que vous avez soumis fait {{PLURAL:$1|un Kio|$1 Kio}}, ce qui dépasse la limite fixée à {{PLURAL:$2|un Kio|$2 Kio}}.'''
 Il ne peut pas être sauvegardé.",
-'readonlywarning' => "'''AVERTISSEMENT : la base de données a été verrouillée pour des opérations de maintenance. Vous ne pouvez donc pas publier vos modifications pour l’instant.'''
+'readonlywarning' => "'''AVERTISSEMENT : la base de données a été verrouillée pour des opérations de maintenance. Vous ne pouvez donc pas publier vos modifications pour l'instant.'''
 Vous pouvez copier le texte dans un fichier texte et le conserver pour plus tard.
 
-L’administrateur ayant verrouillé la base de données a donné l’explication suivante : $1",
-'protectedpagewarning' => "'''AVERTISSEMENT : cette page est protégée. Seuls les utilisateurs ayant le statut d’administrateur peuvent la modifier.'''<br />
+L'administrateur ayant verrouillé la base de données a donné l'explication suivante : $1",
+'protectedpagewarning' => "'''AVERTISSEMENT : cette page est protégée. Seuls les utilisateurs ayant le statut d'administrateur peuvent la modifier.'''<br />
 La dernière entrée du journal est affichée ci-dessous pour référence :",
 'semiprotectedpagewarning' => "'''Note :''' Cette page a été protégée de telle façon que seuls les contributeurs enregistrés puissent la modifier. La dernière entrée du journal est affichée ci-dessous pour référence :",
-'cascadeprotectedwarning' => "'''ATTENTION :''' Cette page a été protégée de manière à ce que seuls les administrateurs puissent l’éditer. Cette protection est héritée par son inclusion par {{PLURAL:$1|la page protégée suivante, qui a|les pages protégées suivantes, qui ont}} la « protection en cascade » activée :",
+'cascadeprotectedwarning' => "'''ATTENTION :''' Cette page a été protégée de manière à ce que seuls les administrateurs puissent l'éditer. Cette protection est héritée par son inclusion par {{PLURAL:$1|la page protégée suivante, qui a|les pages protégées suivantes, qui ont}} la « protection en cascade » activée :",
 'titleprotectedwarning' => "'''ATTENTION : Cette page a été protégée de telle manière que des [[Special:ListGroupRights|droits spécifiques]] sont requis pour pouvoir la créer.''' La dernière entrée du journal est affichée ci-dessous pour référence :",
 'templatesused' => '{{PLURAL:$1|Modèle utilisé|Modèles utilisés}} par cette page :',
 'templatesusedpreview' => '{{PLURAL:$1|Modèle utilisé|Modèles utilisés}} dans cette prévisualisation :',
@@ -1114,25 +1114,25 @@ La dernière entrée du journal est affichée ci-dessous pour référence :",
 'nocreatetitle' => 'Création de page limitée',
 'nocreatetext' => '{{SITENAME}} a restreint la possibilité de créer de nouvelles pages.
 Vous pouvez revenir en arrière et modifier une page existante, ou bien [[Special:UserLogin|vous connecter ou créer un compte]].',
-'nocreate-loggedin' => 'Vous n’avez pas la permission de créer de nouvelles pages.',
+'nocreate-loggedin' => "Vous n'avez pas la permission de créer de nouvelles pages.",
 'sectioneditnotsupported-title' => 'Modification de section non prise en charge',
-'sectioneditnotsupported-text' => 'La modification d’une section n’est pas prise en charge pour cette page.',
+'sectioneditnotsupported-text' => "La modification d'une section n'est pas prise en charge pour cette page.",
 'permissionserrors' => 'Erreur de permissions',
-'permissionserrorstext' => 'Vous n’avez pas la permission d’effectuer l’opération demandée pour {{PLURAL:$1|la raison suivante|les raisons suivantes}} :',
-'permissionserrorstext-withaction' => 'Vous n’êtes pas autorisé{{GENDER:||e|(e)}} à $2, pour {{PLURAL:$1|la raison suivante|les raisons suivantes}} :',
+'permissionserrorstext' => "Vous n'avez pas la permission d'effectuer l'opération demandée pour {{PLURAL:$1|la raison suivante|les raisons suivantes}} :",
+'permissionserrorstext-withaction' => "Vous n'êtes pas autorisé{{GENDER:||e|(e)}} à $2, pour {{PLURAL:$1|la raison suivante|les raisons suivantes}} :",
 'recreate-moveddeleted-warn' => "'''Attention : vous êtes en train de recréer une page qui a été précédemment supprimée.'''
 
-Assurez-vous qu’il est pertinent de poursuivre les modifications sur cette page. Le journal des suppressions et des déplacements est affiché ci-dessous :",
+Assurez-vous qu'il est pertinent de poursuivre les modifications sur cette page. Le journal des suppressions et des déplacements est affiché ci-dessous :",
 'moveddeleted-notice' => 'Cette page a été supprimée. Le journal des suppressions et des déplacements est affiché ci-dessous pour référence.',
 'log-fulllog' => 'Voir le journal complet',
 'edit-hook-aborted' => 'Échec de la modification par une extension.
 Cause inconnue',
-'edit-gone-missing' => 'N’a pas pu mettre à jour la page.
-Il semble qu’elle ait été supprimée.',
+'edit-gone-missing' => "N'a pas pu mettre à jour la page.
+Il semble qu'elle ait été supprimée.",
 'edit-conflict' => 'Conflit de modification.',
-'edit-no-change' => 'Votre modification a été ignorée car aucun changement n’a été fait au texte.',
-'edit-already-exists' => 'La nouvelle page n’a pas pu être créée.
-Elle existe déjà.',
+'edit-no-change' => "Votre modification a été ignorée car aucun changement n'a été fait au texte.",
+'edit-already-exists' => "La nouvelle page n'a pas pu être créée.
+Elle existe déjà.",
 'defaultmessagetext' => 'Message par défaut',
 'content-failed-to-parse' => "Échec de l'analyse du contenu de $2 pour le modèle $1: $3",
 'invalid-content-data' => 'Données du contenu non valides',
@@ -1145,13 +1145,13 @@ Elle existe déjà.',
 'content-model-css' => 'CSS',
 
 # Parser/template warnings
-'expensive-parserfunction-warning' => 'Attention : cette page contient de trop nombreux appels à des fonctions coûteuses de l’analyseur syntaxique.
+'expensive-parserfunction-warning' => "Attention : cette page contient de trop nombreux appels à des fonctions coûteuses de l'analyseur syntaxique.
 
-Il devrait y avoir moins de $2 appel{{PLURAL:$2||s}}, alors qu’il y en a maintenant $1.',
-'expensive-parserfunction-category' => 'Pages avec trop d’appels dispendieux de fonctions de l’analyseur syntaxique',
-'post-expand-template-inclusion-warning' => 'Attention : Cette page contient trop d’inclusions de modèles. Certaines inclusions ne seront pas effectuées.',
-'post-expand-template-inclusion-category' => 'Pages contenant trop d’inclusions de modèles',
-'post-expand-template-argument-warning' => 'Attention : Cette page contient au moins un paramètre de modèle dont l’inclusion est rendue impossible. Après extension, celui-ci aurait produit un résultat trop long, il n’a donc pas été inclus.',
+Il devrait y avoir moins de $2 appel{{PLURAL:$2||s}}, alors qu'il y en a maintenant $1.",
+'expensive-parserfunction-category' => "Pages avec trop d'appels dispendieux de fonctions de l'analyseur syntaxique",
+'post-expand-template-inclusion-warning' => "Attention : Cette page contient trop d'inclusions de modèles. Certaines inclusions ne seront pas effectuées.",
+'post-expand-template-inclusion-category' => "Pages contenant trop d'inclusions de modèles",
+'post-expand-template-argument-warning' => "Attention : Cette page contient au moins un paramètre de modèle dont l'inclusion est rendue impossible. Après extension, celui-ci aurait produit un résultat trop long, il n'a donc pas été inclus.",
 'post-expand-template-argument-category' => 'Pages contenant des paramètres de modèle non évalués',
 'parser-template-loop-warning' => 'Modèle en boucle détecté : [[$1]]',
 'parser-template-recursion-depth-warning' => 'Limite de profondeur des appels de modèles dépassée ($1)',
@@ -1165,9 +1165,9 @@ Il devrait y avoir moins de $2 appel{{PLURAL:$2||s}}, alors qu’il y en a maint
 'converter-manual-rule-error' => 'Erreur détectée dans la règle manuelle de conversion de langue',
 
 # "Undo" feature
-'undo-success' => 'Cette modification va être défaite. Veuillez vérifier les modifications ci-dessous, puis publier si c’est bien ce que vous voulez faire.',
+'undo-success' => "Cette modification va être défaite. Veuillez vérifier les modifications ci-dessous, puis publier si c'est bien ce que vous voulez faire.",
 'undo-failure' => 'Cette modification ne peut pas être défaite : cela entrerait en conflit avec les modifications intermédiaires.',
-'undo-norev' => 'La modification n’a pas pu être défaite parce qu’elle est inexistante ou qu’elle a été supprimée.',
+'undo-norev' => "La modification n'a pas pu être défaite parce qu'elle est inexistante ou qu'elle a été supprimée.",
 'undo-summary' => 'Annulation des modifications $1 de [[Special:Contributions/$2|$2]] ([[User talk:$2|discussion]])',
 
 # Account creation failure
@@ -1178,7 +1178,7 @@ La raison donnée était ''$2''.",
 
 # History pages
 'viewpagelogs' => 'Voir les opérations sur cette page',
-'nohistory' => 'Il n’existe pas d’historique pour cette page.',
+'nohistory' => "Il n'existe pas d'historique pour cette page.",
 'currentrev' => 'Version actuelle',
 'currentrev-asof' => 'Version actuelle en date du $1',
 'revisionasof' => 'Version du $1',
@@ -1203,15 +1203,15 @@ La raison donnée était ''$2''.",
 'history-feed-title' => 'Historique des versions',
 'history-feed-description' => 'Historique pour cette page sur le wiki',
 'history-feed-item-nocomment' => '$1 le $2',
-'history-feed-empty' => 'La page demandée n’existe pas.
+'history-feed-empty' => "La page demandée n'existe pas.
 Elle a peut-être été effacée ou renommée.
-Essayez de [[Special:Search|rechercher sur le wiki]] pour trouver des pages en rapport.',
+Essayez de [[Special:Search|rechercher sur le wiki]] pour trouver des pages en rapport.",
 
 # Revision deletion
-'rev-deleted-comment' => '(résumé d’édition enlevé)',
-'rev-deleted-user' => '(nom d’utilisateur supprimé)',
+'rev-deleted-comment' => "(résumé d'édition enlevé)",
+'rev-deleted-user' => "(nom d'utilisateur supprimé)",
 'rev-deleted-event' => '(entrée supprimée)',
-'rev-deleted-user-contribs' => '[nom d’utilisateur ou adresse IP supprimée - modification cachée sur les contributions]',
+'rev-deleted-user-contribs' => "[nom d'utilisateur ou adresse IP supprimée - modification cachée sur les contributions]",
 'rev-deleted-text-permission' => "Cette version de la page a été '''effacée'''.
 Des détails sont disponibles dans le [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} journal des effacements].",
 'rev-deleted-text-unhide' => "Cette version de la page a été '''effacée'''.
@@ -1224,7 +1224,7 @@ Vous pouvez toujours [$1 voir cette version] si vous le voulez.",
 Vous pouvez la visualiser ; des détails sont disponibles dans le [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} journal des effacements].",
 'rev-suppressed-text-view' => "Cette version de la page a été '''supprimée'''.
 Vous pouvez la visualiser ; des détails sont disponibles dans le [{{fullurl:{{#Special:Log}}/suppress|page={{FULLPAGENAMEE}}}} journal des suppressions].",
-'rev-deleted-no-diff' => "Vous ne pouvez pas voir ce diff parce qu’une des versions a été '''effacée'''.
+'rev-deleted-no-diff' => "Vous ne pouvez pas voir ce diff parce qu'une des versions a été '''effacée'''.
 Des détails sont disponibles dans le [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} journal des effacements].",
 'rev-suppressed-no-diff' => "Vous ne pouvez pas voir cette différence car une des révisions a été '''supprimée'''.",
 'rev-deleted-unhide-diff' => "Une des révisions de cette différence a été '''effacée'''.
@@ -1657,6 +1657,9 @@ Elle ne doit pas dépasser $1 caractère{{PLURAL:$1||s}}.',
 'rightslogtext' => 'Voici l’historique des modifications des droits des utilisateurs.',
 'rightslogentry' => "a modifié les droits de l'utilisateur « $1 » de $2 à $3",
 'rightslogentry-autopromote' => 'a été automatiquement promu de $2 à $3',
+'logentry-rights-rights' => "$1 a modifié l'appartenance au groupe pour $3 de $4 à $5",
+'logentry-rights-rights-legacy' => "$1 a modifié l'appartenance au groupe pour $3",
+'logentry-rights-autopromote' => '$1 a été promu automatiquement de $4 à $5',
 'rightsnone' => '(aucun)',
 
 # Associated actions - in the sentence "You do not have permission to X"
@@ -2179,8 +2182,8 @@ Les entrées <del>barrées</del> ont été résolues.',
 'wantedpages' => 'Pages les plus demandées',
 'wantedpages-badtitle' => 'Titre invalide dans les résultats : $1',
 'wantedfiles' => 'Fichiers les plus demandés',
-'wantedfiletext-cat' => "Les fichiers suivants sont utilisés, mais il n'existent pas. Les fichiers de dépôts à distance peuvent être listés malgré qu'ils existent. Tout ces faux positifs seront <del>barrés</del>. En outre, les pages qui intègrent des fichiers qui n'existent pas sont répertoriés dans [[:$1]].",
-'wantedfiletext-nocat' => "Les fichiers suivants sont utilisés, mais n'existent pas. Les fichiers de dépôts à distance peuvent être listés malgré qu'ils existent. Tout ces faux positifs seront <del>barrés</del>.",
+'wantedfiletext-cat' => 'Les fichiers suivants sont utilisés, mais n’existent pas. Les fichiers d’autres dépôts peuvent être listés malgré qu’ils existent. Tous ces faux positifs seront <del>barrés</del>. En outre, les pages qui intègrent des fichiers qui n’existent pas sont répertoriées dans [[:$1]].',
+'wantedfiletext-nocat' => 'Les fichiers suivants sont utilisés, mais n’existent pas. Les fichiers d’autres dépôts peuvent être listés malgré qu’ils existent. Tous ces faux positifs seront <del>barrés</del>.',
 'wantedtemplates' => 'Modèles demandés',
 'mostlinked' => 'Pages les plus liées',
 'mostlinkedcategories' => 'Catégories les plus utilisées',
@@ -2286,9 +2289,9 @@ Voyez aussi [[Special:WantedCategories|les catégories demandées]].',
 'linksearch-pat' => 'Expression recherchée :',
 'linksearch-ns' => 'Espace de noms :',
 'linksearch-ok' => 'Rechercher',
-'linksearch-text' => 'Des caractères jokers comme « *.wikipedia.org » peuvent être utilisés.
+'linksearch-text' => "Des caractères jokers comme « *.wikipedia.org » peuvent être utilisés.
 Ils nécessitent au moins un domaine de niveau supérieur, par exemple « *.org ».<br />
-Protocoles reconnus : <code>$1</code> (n’ajoutez aucun de ceux-ci dans votre recherche).',
+Protocoles reconnus : <code>$1</code> (http:// par défaut si aucun protocole n'est indiqué).",
 'linksearch-line' => '$1 est lié depuis $2',
 'linksearch-error' => 'Les caractères jokers ne peuvent être utilisés qu’au début du nom de domaine de l’hôte.',
 
@@ -2337,7 +2340,7 @@ Des [[{{MediaWiki:Listgrouprights-helppage}}|informations additionnelles]] peuve
 '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 à cet utilisateur.
+'emailpagetext' => 'Vous pouvez utiliser le formulaire ci-dessous pour envoyer un courriel à {{GENDER:$1|cet utilisateur|cette utilisatrice}}.
 L’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.',
 'usermailererror' => 'Erreur dans l’objet du courriel :',
 'defemailsubject' => "{{SITENAME}} Courriel de l'utilisateur « $1 »",
@@ -2677,11 +2680,11 @@ La dernière entrée du journal des blocages est indiquée ci-dessous à titre d
 
 # Block/unblock
 'autoblockid' => 'Blocage automatique #$1',
-'block' => "Bloquer l'utilisateur",
+'block' => 'Bloquer l’utilisateur',
 'unblock' => "Débloquer l'utilisateur",
-'blockip' => "Bloquer l'utilisateur",
-'blockip-title' => "Bloquer l'utilisateur",
-'blockip-legend' => "Bloquer l'utilisateur",
+'blockip' => 'Bloquer l’utilisateur',
+'blockip-title' => 'Bloquer l’utilisateur',
+'blockip-legend' => 'Bloquer l’utilisateur',
 'blockiptext' => 'Utilisez le formulaire ci-dessous pour bloquer l’accès aux modifications faites à partir d’une adresse IP spécifique ou d’un nom d’utilisateur.
 Une telle mesure ne devrait être prise que pour prévenir le vandalisme et en accord avec les [[{{MediaWiki:Policy-url}}|règles internes]].
 Donnez ci-dessous un motif précis (par exemple en citant les pages qui ont été vandalisées).',
@@ -3146,7 +3149,7 @@ Permet de rétablir la version précédente et d’ajouter un motif dans la boî
 # Attribution
 'anonymous' => '{{PLURAL:$1|Utilisateur non enregistré|Utilisateurs non enregistrés}} sur {{SITENAME}}',
 'siteuser' => "{{GENDER:$2|l'utilisateur|l'utilisatrice|l'utilisateur}} $1 de {{SITENAME}}",
-'anonuser' => "l'utilisateur anonyme $1 de {{SITENAME}}",
+'anonuser' => 'l’utilisateur anonyme $1 de {{SITENAME}}',
 'lastmodifiedatby' => 'Cette page a été modifiée pour la dernière fois le $1 à $2 par $3.',
 'othercontribs' => 'Basé sur le travail de $1.',
 'others' => 'autres',
@@ -3166,7 +3169,7 @@ Permet de rétablir la version précédente et d’ajouter un motif dans la boî
 
 # Info page
 'pageinfo-title' => 'Informations pour « $1 »',
-'pageinfo-not-current' => 'Les informations peuvent uniquement être affichées pour la révision en cours.',
+'pageinfo-not-current' => 'Désolé, impossible de fournir cette information pour les anciennes révisions.',
 'pageinfo-header-basic' => 'Informations de base',
 'pageinfo-header-edits' => 'Historique des modifications',
 'pageinfo-header-restrictions' => 'Protection de la page',
@@ -3175,6 +3178,7 @@ Permet de rétablir la version précédente et d’ajouter un motif dans la boî
 'pageinfo-default-sort' => 'Clé de tri par défaut',
 'pageinfo-length' => 'Taille de la page (en octets)',
 'pageinfo-article-id' => 'Numéro de la page',
+'pageinfo-language' => 'Langue du contenu de la page',
 'pageinfo-robot-policy' => 'Statut de moteur de recherche',
 'pageinfo-robot-index' => 'Indexable',
 'pageinfo-robot-noindex' => 'Non indexable',
@@ -3195,6 +3199,13 @@ Permet de rétablir la version précédente et d’ajouter un motif dans la boî
 'pageinfo-hidden-categories' => '{{PLURAL:$1|Catégorie cachée|Catégories cachées}} ($1)',
 'pageinfo-templates' => '{{PLURAL:$1|Modèle inclu|Modèles inclus}} ($1)',
 'pageinfo-toolboxlink' => 'Information sur la page',
+'pageinfo-redirectsto' => 'Rediriger vers',
+'pageinfo-redirectsto-info' => 'info',
+'pageinfo-contentpage' => 'Compté comme page de contenu',
+'pageinfo-contentpage-yes' => 'Oui',
+'pageinfo-protect-cascading' => "Les protections sont déduites d'ici",
+'pageinfo-protect-cascading-yes' => 'Oui',
+'pageinfo-protect-cascading-from' => 'Les protections sont déduites depuis',
 
 # Skin names
 'skinname-standard' => 'Standard',
@@ -3960,18 +3971,19 @@ Vous pouvez aussi [[Special:EditWatchlist|utiliser l’éditeur normal]].',
 'version-license' => 'Licence',
 'version-poweredby-credits' => "Ce wiki fonctionne grâce à '''[//www.mediawiki.org/ MediaWiki]''', copyright © 2001-$1 $2.",
 'version-poweredby-others' => 'autres',
-'version-license-info' => "MediaWiki est un logiciel libre, vous pouvez le redistribuer et / ou le modifier selon les termes de la Licence Publique Générale GNU telle que publiée par la Free Software Foundation ; soit la version 2 de la Licence, ou (à votre choix) toute version ultérieure.
+'version-credits-summary' => 'Nous tenons à remercier les personnes suivantes pour leur contribution à  [[Special:Version|MediaWiki]].',
+'version-license-info' => 'MediaWiki est un logiciel libre, vous pouvez le redistribuer ou le modifier selon les termes de la Licence Publique Générale GNU telle que publiée par la Free Software Foundation ; soit la version 2 de la Licence, ou (à votre choix) toute version ultérieure.
 
-MediaWiki est distribué dans l'espoir qu'il sera utile, mais SANS AUCUNE GARANTIE, sans même la garantie implicite de COMMERCIALISATION ou D'ADAPTATION A UN USAGE PARTICULIER. Voir la Licence Publique Générale GNU pour plus de détails.
+MediaWiki est distribué dans l’espoir qu’il sera utile, mais SANS AUCUNE GARANTIE, sans même la garantie implicite de COMMERCIALISATION ou D’ADAPTATION À UN USAGE PARTICULIER. Voir la Licence Publique Générale GNU pour plus de détails.
 
-Vous devriez avoir reçu [{{SERVER}}{{SCRIPTPATH}}/COPYING une copie de la Licence Publique Générale GNU] avec ce programme, sinon, écrivez à la Free Software Foundation, Inc, 51, rue Franklin, cinquième étage, Boston, MA 02110-1301, États-Unis ou [//www.gnu.org/licenses/old-licenses/gpl-2.0.html lisez-la en ligne].",
+Vous devriez avoir reçu [{{SERVER}}{{SCRIPTPATH}}/COPYING une copie de la Licence Publique Générale GNU] avec ce programme, sinon, écrivez à la Free Software Foundation, Inc., 51, rue Franklin, cinquième étage, Boston, MA 02110-1301, États-Unis ou [//www.gnu.org/licenses/old-licenses/gpl-2.0.html lisez-la en ligne].',
 'version-software' => 'Logiciels installés',
 'version-software-product' => 'Produit',
 'version-software-version' => 'Version',
 'version-entrypoints' => 'URL des points d’entrée',
-'version-entrypoints-header-entrypoint' => "Point d'entrée",
+'version-entrypoints-header-entrypoint' => 'Point d’entrée',
 'version-entrypoints-header-url' => 'URL',
-'version-entrypoints-articlepath' => '[https://www.mediawiki.org/wiki/Manual:$wgArticlePath Chemin d\'article]',
+'version-entrypoints-articlepath' => '[https://www.mediawiki.org/wiki/Manual:$wgArticlePath Chemin d’article]',
 'version-entrypoints-scriptpath' => '[https://www.mediawiki.org/wiki/Manual:$wgScriptPath Chemin de script]',
 
 # Special:FilePath
diff --git a/languages/messages/MessagesFrp.php b/languages/messages/MessagesFrp.php
index e58b27acbc..b3e439b436 100644
--- a/languages/messages/MessagesFrp.php
+++ b/languages/messages/MessagesFrp.php
@@ -151,7 +151,6 @@ $magicWords = array(
 	'forcetoc'                  => array( '0', '__FORCIÉR_LO_SOMÈRO__', '__FORCIÉR_LA_TRÂBLA__', '__FORCERSOMMAIRE__', '__FORCERTDM__', '__FORCETOC__' ),
 	'toc'                       => array( '0', '__SOMÈRO__', '__TRÂBLA__', '__SOMMAIRE__', '__TDM__', '__TOC__' ),
 	'noeditsection'             => array( '0', '__SÈCCION_QUE_PÔT_PAS_ÉTRE_CHANGIÊ__', '__SECTIONNONEDITABLE__', '__NOEDITSECTION__' ),
-	'noheader'                  => array( '0', '__NION_EN_TÉTA__', '__AUCUNENTETE__', '__NOHEADER__' ),
 	'currentmonth'              => array( '1', 'MÊS_D_ORA', 'MÊS_D_ORA_2', 'MOISACTUEL', 'MOIS2ACTUEL', 'CURRENTMONTH', 'CURRENTMONTH2' ),
 	'currentmonth1'             => array( '1', 'MÊS_D_ORA_1', 'MOIS1ACTUEL', 'CURRENTMONTH1' ),
 	'currentmonthname'          => array( '1', 'NOM_DU_MÊS_D_ORA', 'NOMMOISACTUEL', 'CURRENTMONTHNAME' ),
diff --git a/languages/messages/MessagesFur.php b/languages/messages/MessagesFur.php
index 5841167428..7890a9f191 100644
--- a/languages/messages/MessagesFur.php
+++ b/languages/messages/MessagesFur.php
@@ -239,7 +239,6 @@ $messages = array(
 'qbbrowse' => 'Sgarfe',
 'qbedit' => 'Cambie',
 'qbpageoptions' => 'Cheste pagjine',
-'qbpageinfo' => 'Contest',
 'qbmyoptions' => 'Mês pagjinis',
 'qbspecialpages' => 'Pagjinis speciâls',
 'faq' => 'Domandis plui frecuentis',
diff --git a/languages/messages/MessagesFy.php b/languages/messages/MessagesFy.php
index 71b79b4b77..142a056e9f 100644
--- a/languages/messages/MessagesFy.php
+++ b/languages/messages/MessagesFy.php
@@ -281,7 +281,6 @@ $messages = array(
 'qbbrowse' => 'Blêdzje',
 'qbedit' => 'Bewurkje',
 'qbpageoptions' => 'Side-opsjes',
-'qbpageinfo' => 'Side-ynfo',
 'qbmyoptions' => 'Myn Opsjes',
 'qbspecialpages' => 'Bysûndere siden',
 'faq' => 'FAQ (faak stelde fragen)',
diff --git a/languages/messages/MessagesGa.php b/languages/messages/MessagesGa.php
index cee9a1e280..bd2c90254c 100644
--- a/languages/messages/MessagesGa.php
+++ b/languages/messages/MessagesGa.php
@@ -237,7 +237,6 @@ $messages = array(
 'qbbrowse' => 'Brabhsáil',
 'qbedit' => 'Cuir in eagar',
 'qbpageoptions' => 'An leathanach seo',
-'qbpageinfo' => 'Comhthéacs',
 'qbmyoptions' => 'Mo chuid leathanaigh',
 'qbspecialpages' => 'Leathanaigh speisialta',
 'faq' => 'Ceisteanna Coiteanta',
diff --git a/languages/messages/MessagesGag.php b/languages/messages/MessagesGag.php
index 55020872f0..6b053c6e79 100644
--- a/languages/messages/MessagesGag.php
+++ b/languages/messages/MessagesGag.php
@@ -218,7 +218,6 @@ $messages = array(
 'qbbrowse' => 'Taramaa',
 'qbedit' => 'Diiştir',
 'qbpageoptions' => 'Bu sayfa',
-'qbpageinfo' => 'Kontekst',
 'qbmyoptions' => 'Sayfalarım',
 'qbspecialpages' => 'Maasus sayfalar',
 'faq' => 'SSS',
diff --git a/languages/messages/MessagesGd.php b/languages/messages/MessagesGd.php
index 4be696f658..62d11e8532 100644
--- a/languages/messages/MessagesGd.php
+++ b/languages/messages/MessagesGd.php
@@ -179,7 +179,6 @@ $messages = array(
 'qbbrowse' => 'Brabhsaich',
 'qbedit' => 'Deasaich',
 'qbpageoptions' => 'An duilleag seo',
-'qbpageinfo' => 'Co-theacs',
 'qbmyoptions' => 'Na duilleagan agam',
 'qbspecialpages' => 'Duilleagan sònraichte',
 'faq' => 'CÀBHA',
diff --git a/languages/messages/MessagesGl.php b/languages/messages/MessagesGl.php
index 603324d3d8..033c408550 100644
--- a/languages/messages/MessagesGl.php
+++ b/languages/messages/MessagesGl.php
@@ -61,7 +61,7 @@ $defaultDateFormat = 'dmy';
 $dateFormats = array(
 	'dmy time' => 'H:i',
 	'dmy date' => 'j \d\e F \d\e Y',
-	'dmy both' => 'H:i\,\ j \d\e F \d\e Y',
+	'dmy both' => 'j \d\e F \d\e Y "ás" H:i',
 );
 
 $specialPageAliases = array(
@@ -133,7 +133,6 @@ $specialPageAliases = array(
 	'Recentchanges'             => array( 'Cambios_recentes' ),
 	'Recentchangeslinked'       => array( 'Cambios_relacionados' ),
 	'Revisiondelete'            => array( 'Revisións_borradas' ),
-	'RevisionMove'              => array( 'Traslado_de_revisión' ),
 	'Search'                    => array( 'Procurar' ),
 	'Shortpages'                => array( 'Páxinas_curtas' ),
 	'Specialpages'              => array( 'Páxinas_especiais' ),
@@ -171,7 +170,6 @@ $magicWords = array(
 	'forcetoc'                  => array( '0', '__FORZAROÍNDICE__', '__FORCARTDC__', '__FORCARSUMARIO__', '__FORÇARTDC__', '__FORÇARSUMÁRIO__', '__FORCETOC__' ),
 	'toc'                       => array( '0', '__ÍNDICE__', '__TDC__', '__SUMÁRIO__', '__SUMARIO__', '__TOC__' ),
 	'noeditsection'             => array( '0', '__SECCIÓNSNONEDITABLES__', '__NÃOEDITARSEÇÃO__', '__SEMEDITARSEÇÃO__', '__NAOEDITARSECAO__', '__SEMEDITARSECAO__', '__NOEDITSECTION__' ),
-	'noheader'                  => array( '0', '___SENCABECEIRA__', '__SEMCABECALHO__', '__SEMCABEÇALHO__', '__SEMTITULO__', '__SEMTÍTULO__', '__NOHEADER__' ),
 	'currentmonth'              => array( '1', 'MESACTUAL', 'MESATUAL', 'MESATUAL2', 'CURRENTMONTH', 'CURRENTMONTH2' ),
 	'currentmonth1'             => array( '1', 'MESACTUAL1', 'MESATUAL1', 'CURRENTMONTH1' ),
 	'currentmonthname'          => array( '1', 'NOMEDOMESACTUAL', 'NOMEDOMESATUAL', 'CURRENTMONTHNAME' ),
@@ -273,7 +271,7 @@ $messages = array(
 
 'underline-always' => 'Sempre',
 'underline-never' => 'Nunca',
-'underline-default' => 'Opción do propio navegador',
+'underline-default' => 'Opción predeterminada da aparencia ou do navegador',
 
 # Font style option in Special:Preferences
 'editfont-style' => 'Tipo de letra da caixa de edición:',
@@ -358,8 +356,8 @@ $messages = array(
 'newwindow' => '(abre unha ventá nova)',
 'cancel' => 'Cancelar',
 'moredotdotdot' => 'Máis...',
-'mypage' => 'A miña páxina',
-'mytalk' => 'A miña conversa',
+'mypage' => 'Páxina',
+'mytalk' => 'Conversa',
 'anontalk' => 'Conversa con este enderezo IP',
 'navigation' => 'Navegación',
 'and' => '&#32;e',
@@ -930,7 +928,7 @@ Lembre que as páxinas .css e .js personalizadas utilizan un título en minúscu
 'updated' => '(Actualizado)',
 'note' => "'''Nota:'''",
 'previewnote' => "'''Lembre que esta é só unha vista previa e que aínda non gardou os seus cambios!'''",
-'continue-editing' => 'Continuar editando',
+'continue-editing' => 'Ir ata a caixa de edición',
 'previewconflict' => 'Esta vista previa mostra o texto na área superior tal e como aparecerá se escolle gardar.',
 'session_fail_preview' => "'''O sistema non pode procesar a súa edición porque se perderon os datos de inicio da sesión.
 Por favor, inténteo de novo.
@@ -1313,7 +1311,7 @@ Note que os seus índices do contido de {{SITENAME}} poden estar desactualizados
 
 # Preferences page
 'preferences' => 'Preferencias',
-'mypreferences' => 'As miñas preferencias',
+'mypreferences' => 'Preferencias',
 'prefs-edits' => 'Número de edicións:',
 'prefsnologin' => 'Non accedeu ao sistema',
 'prefsnologintext' => 'Debe <span class="plainlinks">[{{fullurl:{{#Special:UserLogin}}|returnto=$1}} acceder ao sistema]</span> para modificar as preferencias de usuario.',
@@ -1542,8 +1540,11 @@ Ha de ter menos {{PLURAL:$1|dun carácter|de $1 caracteres}}.',
 # User rights log
 'rightslog' => 'Rexistro de dereitos de usuario',
 'rightslogtext' => 'Este é un rexistro dos cambios nos permisos de usuario.',
-'rightslogentry' => 'cambiou o grupo ao que pertence "$1" de $2 a $3',
+'rightslogentry' => 'cambiou o grupo ao que pertence $1 de $2 a $3',
 'rightslogentry-autopromote' => 'foi promovido automaticamente de $2 a $3',
+'logentry-rights-rights' => '$1 cambiou o grupo ao que pertence $3 de $4 a $5',
+'logentry-rights-rights-legacy' => '$1 cambiou o grupo ao que pertence $3',
+'logentry-rights-autopromote' => '$1 foi promovido automaticamente de $4 a $5',
 'rightsnone' => '(ningún)',
 
 # Associated actions - in the sentence "You do not have permission to X"
@@ -1595,7 +1596,7 @@ Ha de ter menos {{PLURAL:$1|dun carácter|de $1 caracteres}}.',
 'recentchanges-label-unpatrolled' => 'Esta edición aínda non foi comprobada',
 'rcnote' => "A continuación {{PLURAL:$1|móstrase '''1''' cambio|móstranse os últimos '''$1''' cambios}} {{PLURAL:$2|no último día|nos últimos '''$2''' días}} ata o $4 ás $5.",
 'rcnotefrom' => "A continuación móstranse os cambios feitos desde o '''$3''' ás '''$4''' (móstranse '''$1''' como máximo).",
-'rclistfrom' => 'Mostrar os cambios novos desde as $1',
+'rclistfrom' => 'Mostrar os cambios novos desde o $1',
 'rcshowhideminor' => '$1 as edicións pequenas',
 'rcshowhidebots' => '$1 os bots',
 'rcshowhideliu' => '$1 os usuarios rexistrados',
@@ -2181,7 +2182,7 @@ Olle tamén as [[Special:WantedCategories|categorías requiridas]].',
 'linksearch-ok' => 'Procurar',
 'linksearch-text' => 'Pódense usar caracteres comodín como "*.wikipedia.org".
 Cómpre, polo menos, un dominio de nivel superior, por exemplo "*.org".<br />
-Protocolos soportados: <code>$1</code> (non engada ningún destes na súa procura).',
+Protocolos soportados: <code>$1</code> (úsase http:// como predeterminado se non se especifica ningún protocolo).',
 'linksearch-line' => '$1 está ligado desde a páxina "$2"',
 'linksearch-error' => 'Os caracteres comodín só poden aparecer ao principio do nome do servidor.',
 
@@ -2230,8 +2231,8 @@ Se quere máis información acerca dos dereitos individuais, pode atopala [[{{Me
 '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 formulario de embaixo para enviar unha mensaxe de correo electrónico a este usuario.
-O correo electrónico que inseriu [[Special:Preferences|nas súas preferencias]] aparecerá no campo "De:" do correo, polo que o receptor da mensaxe poderalle responder.',
+'emailpagetext' => 'Pode usar o seguinte formulario para enviar unha mensaxe de correo electrónico a {{GENDER:$1|este usuario|esta usuaria}}.
+O 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.',
 'usermailererror' => 'O obxecto enviado deu unha mensaxe de erro:',
 'defemailsubject' => 'Correo electrónico do usuario $1 de {{SITENAME}}',
 'usermaildisabled' => 'O correo electrónico do usuario está desactivado',
@@ -2262,7 +2263,7 @@ O correo electrónico que inseriu [[Special:Preferences|nas súas preferencias]]
 
 # Watchlist
 'watchlist' => 'A miña lista de vixilancia',
-'mywatchlist' => 'A miña lista de vixilancia',
+'mywatchlist' => 'Lista de vixilancia',
 'watchlistfor2' => 'De $1 $2',
 'nowatchlist' => 'Non ten elementos na súa lista de vixilancia.',
 'watchlistanontext' => 'Faga o favor de $1 ao sistema para ver ou editar os elementos da súa lista de vixilancia.',
@@ -2526,7 +2527,7 @@ $1',
 # Contributions
 'contributions' => 'Contribucións {{GENDER:{{BASEPAGENAME}}|do usuario|da usuaria}}',
 'contributions-title' => 'Contribucións de $1',
-'mycontris' => 'As miñas contribucións',
+'mycontris' => 'Contribucións',
 'contribsub2' => 'De $1 ($2)',
 'nocontribs' => 'Non se deron atopado cambios con eses criterios.',
 'uctop' => '(última revisión)',
@@ -2566,7 +2567,7 @@ Velaquí está a última entrada do rexistro de bloqueos, por se quere consultal
 'whatlinkshere-hideredirs' => '$1 as redireccións',
 'whatlinkshere-hidetrans' => '$1 as inclusións',
 'whatlinkshere-hidelinks' => '$1 as ligazóns',
-'whatlinkshere-hideimages' => '$1 as ligazóns á imaxe',
+'whatlinkshere-hideimages' => '$1 as ligazóns ao ficheiro',
 'whatlinkshere-filters' => 'Filtros',
 
 # Block/unblock
@@ -3024,7 +3025,7 @@ Pode ver o código fonte.',
 'nostalgia.js' => '/* Calquera JavaScript que haxa aquí será cargado para os usuarios que usen a aparencia Morriña */',
 'cologneblue.js' => '/* Calquera JavaScript que haxa aquí será cargado para os usuarios que usen a aparencia Azul colonial */',
 'monobook.js' => '/* Calquera JavaScript que haxa aquí será cargado para os usuarios que usen a aparencia MonoBook */',
-'myskin.js' => '/* Calquera JavaScript que haxa aquí será cargado para os usuarios que usen a aparencia A miña aparencia */',
+'myskin.js' => '/* O JavaScript que se coloque aquí afectará a quen use a aparencia A miña aparencia */',
 'chick.js' => '/* Calquera JavaScript que haxa aquí será cargado para os usuarios que usen a aparencia Parrulo */',
 'simple.js' => '/* Calquera JavaScript que haxa aquí será cargado para os usuarios que usen a aparencia Sinxela */',
 'modern.js' => '/* Calquera JavaScript que haxa aquí será cargado para os usuarios que usen a aparencia Moderna */',
@@ -3061,7 +3062,7 @@ Isto, probabelmente, se debe a unha ligazón cara a un sitio externo que está n
 
 # Info page
 'pageinfo-title' => 'Información sobre "$1"',
-'pageinfo-not-current' => 'Unicamente se pode mostrar a información sobre a revisión actual.',
+'pageinfo-not-current' => 'Sentímolo, non é posible achegar esa información sobre as revisións vellas.',
 'pageinfo-header-basic' => 'Información básica',
 'pageinfo-header-edits' => 'Historial de edicións',
 'pageinfo-header-restrictions' => 'Protección da páxina',
@@ -3070,6 +3071,7 @@ Isto, probabelmente, se debe a unha ligazón cara a un sitio externo que está n
 'pageinfo-default-sort' => 'Clave de ordenación por defecto',
 'pageinfo-length' => 'Lonxitude da páxina (en bytes)',
 'pageinfo-article-id' => 'ID da páxina',
+'pageinfo-language' => 'Lingua do contido da páxina',
 'pageinfo-robot-policy' => 'Estado do motor de procuras',
 'pageinfo-robot-index' => 'Indexable',
 'pageinfo-robot-noindex' => 'Non indexable',
@@ -3176,7 +3178,7 @@ O seu sistema pode quedar comprometido se o executa.",
 'sp-newimages-showfrom' => 'Mostrar os novos ficheiros comezando polo $1 ás $2',
 
 # Video information, used by Language::formatTimePeriod() to format lengths in the above messages
-'minutes-abbrev' => '$1min',
+'minutes-abbrev' => '$1 min',
 'seconds' => '{{PLURAL:$1|$1 segundo|$1 segundos}}',
 'minutes' => '{{PLURAL:$1|$1 minuto|$1 minutos}}',
 'hours' => '{{PLURAL:$1|$1 hora|$1 horas}}',
@@ -3798,6 +3800,7 @@ Tamén pode [[Special:EditWatchlist|empregar o editor normal]].',
 'version-license' => 'Licenza',
 'version-poweredby-credits' => "Este wiki está desenvolvido por '''[//www.mediawiki.org/wiki/MediaWiki/gl MediaWiki]''', dereitos de autor © 2001-$1 $2.",
 'version-poweredby-others' => 'outros',
+'version-credits-summary' => 'Queremos recoñecer as seguintes persoas polas súas achegas a [[Special:Version|MediaWiki]].',
 'version-license-info' => 'MediaWiki é software libre; pode redistribuílo e/ou modificalo segundo os termos da licenza pública xeral GNU publicada pola Free Software Foundation; versión 2 ou (na súa escolla) calquera outra posterior.
 
 MediaWiki distribúese coa esperanza de que poida ser útil, pero SEN GARANTÍA NINGUNHA; nin sequera a garantía implícita de COMERCIALIZACIÓN ou ADECUACIÓN A UNHA FINALIDADE ESPECÍFICA. Olle a licenza pública xeral GNU para obter máis detalles.
diff --git a/languages/messages/MessagesGsw.php b/languages/messages/MessagesGsw.php
index 7048d38643..e046694719 100644
--- a/languages/messages/MessagesGsw.php
+++ b/languages/messages/MessagesGsw.php
@@ -96,7 +96,6 @@ $specialPageAliases = array(
 	'Recentchanges'             => array( 'Letschti_Änderige' ),
 	'Recentchangeslinked'       => array( 'Änderige_an_verlinkte_Syte' ),
 	'Revisiondelete'            => array( 'Versionsleschig' ),
-	'RevisionMove'              => array( 'Version_verschiebe' ),
 	'Search'                    => array( 'Suech' ),
 	'Shortpages'                => array( 'Churzi_Syte' ),
 	'Specialpages'              => array( 'Spezialsyte' ),
@@ -182,7 +181,7 @@ $messages = array(
 
 'underline-always' => 'immer',
 'underline-never' => 'nie',
-'underline-default' => 'Browser-Vorystellig',
+'underline-default' => 'Voryystellig vu dr Benutzeroberfleichi oder em Brwoser',
 
 # Font style option in Special:Preferences
 'editfont-style' => 'Schriftfamilie fir dr Text im Bearbeitigsfänschter:',
@@ -267,8 +266,8 @@ $messages = array(
 'newwindow' => '(imene nöie Fänschter)',
 'cancel' => 'Abbräche',
 'moredotdotdot' => 'Meh …',
-'mypage' => 'Myyni Syte',
-'mytalk' => 'Myyni Diskussionsyte',
+'mypage' => 'Syte',
+'mytalk' => 'Diskussionsyte',
 'anontalk' => 'Diskussionssyste vo sellere IP',
 'navigation' => 'Navigation',
 'and' => '&#32;un',
@@ -816,7 +815,7 @@ As Information chunnt do ne aktuälle Uuszug us em Benutzersperr-Logbuech:',
 'note' => "'''Obacht: '''",
 'previewnote' => "'''Das isch numen e Vorschau und nonig gspycheret!'''
 Die Syte isch nonig gspycheret wore!",
-'continue-editing' => 'Wyter bearbeite',
+'continue-editing' => 'Zum Bearbeitigsfäld',
 'previewconflict' => 'Die Vorschau zeigt dr Inhalt vum obere Täxtfäld. Eso siht dr Artikel us, wän Du jetz uf Spychere drucksch.',
 'session_fail_preview' => "'''Dyyni Bearbeitig het nid chenne gspycheret wäre, wel Sitzigsdate verlore gange sin.
 Bitte versuech s nomol. Derzue drucksch unter däre Täxtvorschau nomol uf „Syte spychere“.
@@ -1186,7 +1185,7 @@ Einzelheite chasch im [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}
 
 # Preferences page
 'preferences' => 'Yystellige',
-'mypreferences' => 'Ystellige',
+'mypreferences' => 'Yystellige',
 'prefs-edits' => 'Aazahl vu dr Bearbeitige:',
 'prefsnologin' => 'Nid aagmäldet',
 'prefsnologintext' => 'Du muesch <span class="plainlinks">[{{fullurl:{{#Special:UserLogin}}|returnto=$1}} aagmäldet]</span> sy, für Benutzerystellige chönne z ändere',
@@ -1415,6 +1414,9 @@ Des cha nimmi ruckgängig gmacht wäre.',
 'rightslogtext' => 'Des ischs Logbuech vun de Änderunge on Bnutzerrechte.',
 'rightslogentry' => 'het d Benutzerrächt fir „$1“ vu „$2“ uf „$3“ gänderet',
 'rightslogentry-autopromote' => 'd Zueornig zue dr Benutzergruppe isch automatisch vu $2 in $3 gänderet wore',
+'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',
 'rightsnone' => '(keini)',
 
 # Associated actions - in the sentence "You do not have permission to X"
@@ -1788,7 +1790,7 @@ Villicht witt d Bschryybig uf dr dertige [$2 Dateibschryybigssyte] bearbeite.',
 'uploadnewversion-linktext' => 'E nöui Version vo dere Datei ufelade',
 'shared-repo-from' => 'vu $1',
 'shared-repo' => 'eme gmeinsame Repositorium',
-'upload-disallowed-here' => 'Leider chasch des Bild nit iberschryybe.',
+'upload-disallowed-here' => 'Du chasch die Datei nit iberschryybe.',
 
 # File reversion
 'filerevert' => 'Zrucksetze vu „$1“',
@@ -2023,7 +2025,7 @@ Lueg au d Lischt vu dr [[Special:WantedCategories|gwinschte Kategorie]].',
 'linksearch-pat' => 'Suechmuschter:',
 'linksearch-ns' => 'Namensruum:',
 'linksearch-ok' => 'Sueche',
-'linksearch-text' => 'Die Spezialsyte macht d Suechi no Syte megli, wu s bstimmti Weblink din het. Doderby chenne Platzhalter wie zem Byschpel <code>*.byschpel.de</code> brucht wäre. S mueß zmindecht ei Top-Level-Domain, z. B. „*.org“. aagee wäre. <br />Unterstitzti Protokoll: <code>$1</code> (Die bitte nit bi dr Suechaafrog aagee.)',
+'linksearch-text' => 'Die Spezialsyte macht d Suechi no Syte megli, wu s bstimmti Weblink din het. Doderby chenne Platzhalter wie zem Byschpel <code>*.byschpel.de</code> brucht wäre. S mueß zmindecht ei Top-Level-Domain, z. B. „*.org“. aagee wäre. <br />Unterstitzti Protokoll: <code>$1</code> (Standard isch http, wänn kei Protokoll aagee isch).',
 'linksearch-line' => '$1 isch vo $2 verknüpft',
 'linksearch-error' => 'Platzhalter chönne numme am Aafang verwändet werre.',
 
@@ -2072,8 +2074,8 @@ Zuesätzligi Informatione iber einzelni Rächt git s [[{{MediaWiki:Listgrouprigh
 '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 im Benutzer mit däm Formular e E-Mail schicke.
-As Absender wird d E-Mail-Adräss us Dyyne [[Special:Preferences|Yystellige]] yytrait, ass dr Benutzer Dir cha Antwort gee.',
+'emailpagetext' => 'Du chasch {{GENDER:$1|em Benutzer|dr Benutzeri}} mit däm Formular e E-Mail schicke.
+As Absender wird d E-Mail-Adräss us Dyyne [[Special:Preferences|Yystellige]] yytrait, ass {{GENDER:$1|dr Benutzer|d Benutzeri}} Dir cha Antwort gee.',
 'usermailererror' => 'S Mail-Objekt het e Fähler zruckgee:',
 'defemailsubject' => '{{SITENAME}}-E-Mail vum Benutzer „$1“',
 'usermaildisabled' => 'Benutzer-E-Mail abgstellt',
@@ -2397,7 +2399,7 @@ Do chunnt dr aktuäll Yytrag us em Benutzersperr-Logbuech:',
 'whatlinkshere-hideredirs' => 'Wyterleitige $1',
 'whatlinkshere-hidetrans' => 'Vorlageyybindige $1',
 'whatlinkshere-hidelinks' => 'Links $1',
-'whatlinkshere-hideimages' => 'Dateigleicher $1',
+'whatlinkshere-hideimages' => 'Dateilink $1',
 'whatlinkshere-filters' => 'Filter',
 
 # Block/unblock
@@ -2833,6 +2835,7 @@ Die uf em lokale Rächner spychere un derno do uffelade.',
 
 # Info page
 'pageinfo-title' => 'Informatione zue „$1“',
+'pageinfo-not-current' => 'Die Informatione chenne leider nit fir alti Versionen aazeigt wäre.',
 'pageinfo-header-basic' => 'Basisinformatione',
 'pageinfo-header-edits' => 'Bearbeitige',
 'pageinfo-header-restrictions' => 'Syteschutz',
@@ -2841,6 +2844,7 @@ Die uf em lokale Rächner spychere un derno do uffelade.',
 'pageinfo-default-sort' => 'Standardsortierkriterium',
 'pageinfo-length' => 'Sytelengi (in Byte)',
 'pageinfo-article-id' => 'Syten-ID',
+'pageinfo-language' => 'Syteninhaltssproch',
 'pageinfo-robot-policy' => 'Suechmaschinestatus',
 'pageinfo-robot-index' => 'Indizierbar',
 'pageinfo-robot-noindex' => 'Nit indizierbar',
@@ -2861,6 +2865,13 @@ Die uf em lokale Rächner spychere un derno do uffelade.',
 'pageinfo-hidden-categories' => 'Versteckti {{PLURAL:$1|Kategori|Kategorie}} ($1)',
 'pageinfo-templates' => 'Yybundeni {{PLURAL:$1|Vorlag|Vorlage}} ($1)',
 'pageinfo-toolboxlink' => 'Informatione zue dr Syte',
+'pageinfo-redirectsto' => 'Weiterleitung nach',
+'pageinfo-redirectsto-info' => 'Information',
+'pageinfo-contentpage' => 'Zellt as Inhaltssyte',
+'pageinfo-contentpage-yes' => 'Jo',
+'pageinfo-protect-cascading' => 'Syte mit Kaskadeschutz vu do',
+'pageinfo-protect-cascading-yes' => 'Jo',
+'pageinfo-protect-cascading-from' => 'Syte mit Kaskadeschutz vu',
 
 # Patrolling
 'markaspatrolleddiff' => 'Als patrulyrt markyre',
@@ -3538,6 +3549,7 @@ Du chasch au d [[Special:EditWatchlist|Standard-Bearbeitigssyte]] bruuche.',
 'version-license' => 'Lizänz',
 'version-poweredby-credits' => "Die Websyte nutzt '''[//www.mediawiki.org/wiki/MediaWiki/de MediaWiki]''', Copyright © 2001–$1 $2.",
 'version-poweredby-others' => 'anderi',
+'version-credits-summary' => 'Mir danke däne Lyt fir ihri Bytreg zue [[Special:Version|MediaWiki]].',
 'version-license-info' => 'MediaWiki isch e freji Software, d. h. s cha, no dr Bedingige vu dr GNU General Public-Lizänz, wu vu dr Free Software Foundation vereffentligt woren isch, wyterverteilt un/oder modifiziert wäre. Doderbyy cha d Version 2, oder no eigenem Ermässe, jedi nejeri Version vu dr Lizänz brucht wäre.
 
 Des Programm wird in dr Hoffnig verteilt, ass es nitzli isch, aber OHNI JEDI GARANTI un sogar ohni di impliziert Garanti vun ere MÄRTGÄNGIGKEIT oder EIGNIG FIR E BSTIMMTE ZWÄCK. Doderzue git meh Hiiwys in dr GNU General Public-Lizänz.
diff --git a/languages/messages/MessagesGv.php b/languages/messages/MessagesGv.php
index bbdab3864b..ab4d5805f0 100644
--- a/languages/messages/MessagesGv.php
+++ b/languages/messages/MessagesGv.php
@@ -164,7 +164,6 @@ $messages = array(
 'qbbrowse' => 'Ronsee',
 'qbedit' => 'Reagh',
 'qbpageoptions' => 'Yn duillag shoh',
-'qbpageinfo' => 'Co-hecks',
 'qbmyoptions' => 'My ghuillagyn',
 'qbspecialpages' => 'Duillagyn er lheh',
 'faq' => 'FC',
diff --git a/languages/messages/MessagesHaw.php b/languages/messages/MessagesHaw.php
index d086a2de3d..c86e2ba188 100644
--- a/languages/messages/MessagesHaw.php
+++ b/languages/messages/MessagesHaw.php
@@ -192,7 +192,6 @@ $messages = array(
 'qbfind' => 'Loa‘a',
 'qbedit' => 'E ho‘ololi',
 'qbpageoptions' => 'Kēia ‘ao‘ao',
-'qbpageinfo' => 'Pō‘aiapili',
 'qbmyoptions' => 'Ka‘u mau ‘ao‘ao',
 'qbspecialpages' => 'Nā ‘ao‘ao kūikawā',
 
diff --git a/languages/messages/MessagesHe.php b/languages/messages/MessagesHe.php
index c6371bfe25..6c513e1791 100644
--- a/languages/messages/MessagesHe.php
+++ b/languages/messages/MessagesHe.php
@@ -28,43 +28,133 @@ $rtl = true;
 $linkTrail = '/^([a-zא-ת]+)(.*)$/sDu';
 $fallback8bitEncoding = 'windows-1255';
 
-
-$datePreferences = array(
-	'default',
-	'mdy',
-	'dmy',
-	'ymd',
-	'hebrew',
-	'ISO 8601',
+$namespaceNames = array(
+	NS_MEDIA            => 'מדיה',
+	NS_SPECIAL          => 'מיוחד',
+	NS_MAIN             => '',
+	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    => 'שיחת_קטגוריה',
 );
-
-$dateFormats = array(
-	'mdy time' => 'H:i',
-	'mdy date' => 'xg j, Y',
-	'mdy both' => 'H:i, xg j, Y',
-
-	'dmy time' => 'H:i',
-	'dmy date' => 'j xg Y',
-	'dmy both' => 'H:i, j xg Y',
-
-	'ymd time' => 'H:i',
-	'ymd date' => 'Y xg j',
-	'ymd both' => 'H:i, Y xg j',
-
-	'hebrew time' => 'H:i',
-	'hebrew date' => 'xhxjj xjx xhxjY',
-	'hebrew both' => 'H:i, xhxjj xjx xhxjY',
-
-	'ISO 8601 time' => 'xnH:xni:xns',
-	'ISO 8601 date' => 'xnY-xnm-xnd',
-	'ISO 8601 both' => 'xnY-xnm-xnd"T"xnH:xni:xns',
+$namespaceAliases = array(
+	'תמונה'      => NS_FILE,
+	'שיחת_תמונה' => NS_FILE_TALK,
+);
+$namespaceGenderAliases = array(
+	NS_USER      => array( 'male' => 'משתמש', 'female' => 'משתמשת' ),
+	NS_USER_TALK => array( 'male' => 'שיחת_משתמש', 'female' => 'שיחת_משתמשת' ),
 );
 
-$bookstoreList = array(
-	'מיתוס'          => 'http://www.mitos.co.il/',
-	'iBooks'         => 'http://www.ibooks.co.il/',
-	'Barnes & Noble' => 'http://search.barnesandnoble.com/bookSearch/isbnInquiry.asp?isbn=$1',
-	'Amazon.com'     => 'http://www.amazon.com/exec/obidos/ISBN=$1'
+$specialPageAliases = array(
+	'Activeusers'               => array( 'משתמשים_פעילים' ),
+	'Allmessages'               => array( 'הודעות_המערכת' ),
+	'Allpages'                  => array( 'כל_הדפים' ),
+	'Ancientpages'              => array( 'דפים_מוזנחים' ),
+	'Badtitle'                  => array( 'כותרת_שגויה' ),
+	'Blankpage'                 => array( 'דף_ריק' ),
+	'Block'                     => array( 'חסימה', 'חסימת_כתובת', 'חסימת_משתמש' ),
+	'Blockme'                   => array( 'חסום_אותי' ),
+	'Booksources'               => array( 'משאבי_ספרות', 'משאבי_ספרות_חיצוניים' ),
+	'BrokenRedirects'           => array( 'הפניות_לא_תקינות', 'הפניות_שבורות' ),
+	'Categories'                => array( 'קטגוריות', 'רשימת_קטגוריות' ),
+	'ChangeEmail'               => array( 'שינוי_דואר_אלקטרוני', 'שינוי_דואל' ),
+	'ChangePassword'            => array( 'שינוי_סיסמה' ),
+	'ComparePages'              => array( 'השוואת_דפים' ),
+	'Confirmemail'              => array( 'אימות_כתובת_דואר' ),
+	'Contributions'             => array( 'תרומות', 'תרומות_המשתמש' ),
+	'CreateAccount'             => array( 'הרשמה_לחשבון' ),
+	'Deadendpages'              => array( 'דפים_ללא_קישורים' ),
+	'DeletedContributions'      => array( 'תרומות_מחוקות' ),
+	'Disambiguations'           => array( 'פירושונים', 'דפי_פירושונים' ),
+	'DoubleRedirects'           => array( 'הפניות_כפולות' ),
+	'EditWatchlist'             => array( 'עריכת_רשימת_המעקב' ),
+	'Emailuser'                 => array( 'שליחת_דואר_למשתמש' ),
+	'Export'                    => array( 'ייצוא', 'ייצוא_דפים' ),
+	'Fewestrevisions'           => array( 'הגרסאות_המעטות_ביותר', 'הדפים_בעלי_מספר_העריכות_הנמוך_ביותר' ),
+	'FileDuplicateSearch'       => array( 'חיפוש_קבצים_כפולים' ),
+	'Filepath'                  => array( 'נתיב_לקובץ' ),
+	'Import'                    => array( 'ייבוא', 'ייבוא_דפים' ),
+	'Invalidateemail'           => array( 'ביטול_דואר' ),
+	'JavaScriptTest'            => array( 'בדיקת_JavaScript' ),
+	'BlockList'                 => array( 'רשימת_חסומים', 'רשימת_משתמשים_חסומים', 'משתמשים_חסומים' ),
+	'LinkSearch'                => array( 'חיפוש_קישורים_חיצוניים' ),
+	'Listadmins'                => array( 'רשימת_מפעילים' ),
+	'Listbots'                  => array( 'רשימת_בוטים' ),
+	'Listfiles'                 => array( 'רשימת_קבצים', 'רשימת_תמונות', 'קבצים', 'תמונות' ),
+	'Listgrouprights'           => array( 'רשימת_הרשאות_לקבוצה' ),
+	'Listredirects'             => array( 'רשימת_הפניות', 'הפניות' ),
+	'Listusers'                 => array( 'רשימת_משתמשים', 'משתמשים' ),
+	'Lockdb'                    => array( 'נעילת_בסיס_הנתונים' ),
+	'Log'                       => array( 'יומנים' ),
+	'Lonelypages'               => array( 'דפים_יתומים' ),
+	'Longpages'                 => array( 'דפים_ארוכים' ),
+	'MergeHistory'              => array( 'מיזוג_גרסאות' ),
+	'MIMEsearch'                => array( 'חיפוש_MIME' ),
+	'Mostcategories'            => array( 'הקטגוריות_הרבות_ביותר', 'הדפים_מרובי-הקטגוריות_ביותר' ),
+	'Mostimages'                => array( 'הקבצים_המקושרים_ביותר', 'התמונות_המקושרות_ביותר' ),
+	'Mostlinked'                => array( 'הדפים_המקושרים_ביותר', 'המקושרים_ביותר' ),
+	'Mostlinkedcategories'      => array( 'הקטגוריות_המקושרות_ביותר' ),
+	'Mostlinkedtemplates'       => array( 'התבניות_המקושרות_ביותר' ),
+	'Mostrevisions'             => array( 'הגרסאות_הרבות_ביותר', 'הדפים_בעלי_מספר_העריכות_הגבוה_ביותר' ),
+	'Movepage'                  => array( 'העברת_דף', 'העברה' ),
+	'Mycontributions'           => array( 'התרומות_שלי' ),
+	'Mypage'                    => array( 'הדף_שלי', 'דף_המשתמש_שלי' ),
+	'Mytalk'                    => array( 'השיחה_שלי', 'דף_השיחה_שלי' ),
+	'Myuploads'                 => array( 'ההעלאות_שלי' ),
+	'Newimages'                 => array( 'קבצים_חדשים', 'תמונות_חדשות', 'גלריית_קבצים_חדשים', 'גלריית_תמונות_חדשות' ),
+	'Newpages'                  => array( 'דפים_חדשים' ),
+	'PasswordReset'             => array( 'איפוס_סיסמה' ),
+	'PermanentLink'             => array( 'קישור_קבוע' ),
+	'Popularpages'              => array( 'הדפים_הנצפים_ביותר', 'דפים_פופולריים' ),
+	'Preferences'               => array( 'העדפות', 'ההעדפות_שלי' ),
+	'Prefixindex'               => array( 'דפים_המתחילים_ב' ),
+	'Protectedpages'            => array( 'דפים_מוגנים' ),
+	'Protectedtitles'           => array( 'כותרות_מוגנות' ),
+	'Randompage'                => array( 'אקראי', 'דף_אקראי' ),
+	'Randomredirect'            => array( 'הפניה_אקראית' ),
+	'Recentchanges'             => array( 'שינויים_אחרונים' ),
+	'Recentchangeslinked'       => array( 'שינויים_בדפים_המקושרים' ),
+	'Revisiondelete'            => array( 'מחיקת_ושחזור_גרסאות' ),
+	'Search'                    => array( 'חיפוש' ),
+	'Shortpages'                => array( 'דפים_קצרים' ),
+	'Specialpages'              => array( 'דפים_מיוחדים' ),
+	'Statistics'                => array( 'סטטיסטיקות' ),
+	'Tags'                      => array( 'תגיות' ),
+	'Unblock'                   => array( 'שחרור_חסימה' ),
+	'Uncategorizedcategories'   => array( 'קטגוריות_חסרות_קטגוריה' ),
+	'Uncategorizedimages'       => array( 'קבצים_חסרי_קטגוריה', 'תמונות_חסרות_קטגוריה' ),
+	'Uncategorizedpages'        => array( 'דפים_חסרי_קטגוריה' ),
+	'Uncategorizedtemplates'    => array( 'תבניות_חסרות_קטגוריות' ),
+	'Undelete'                  => array( 'צפייה_בדפים_מחוקים' ),
+	'Unlockdb'                  => array( 'שחרור_בסיס_הנתונים' ),
+	'Unusedcategories'          => array( 'קטגוריות_שאינן_בשימוש' ),
+	'Unusedimages'              => array( 'קבצים_שאינם_בשימוש', 'תמונות_שאינן_בשימוש' ),
+	'Unusedtemplates'           => array( 'תבניות_שאינן_בשימוש' ),
+	'Unwatchedpages'            => array( 'דפים_שאינם_במעקב' ),
+	'Upload'                    => array( 'העלאה', 'העלאת_קובץ_לשרת' ),
+	'UploadStash'               => array( 'מאגר_העלאות' ),
+	'Userlogin'                 => array( 'כניסה_לחשבון', 'כניסה', 'כניסה_/_הרשמה_לחשבון' ),
+	'Userlogout'                => array( 'יציאה_מהחשבון', 'יציאה' ),
+	'Userrights'                => array( 'ניהול_הרשאות_משתמש', 'הפיכת_משתמש_למפעיל_מערכת', 'הענקת_או_ביטול_הרשאת_בוט' ),
+	'Version'                   => array( 'גרסה', 'גרסת_התוכנה' ),
+	'Wantedcategories'          => array( 'קטגוריות_מבוקשות' ),
+	'Wantedfiles'               => array( 'קבצים_מבוקשים' ),
+	'Wantedpages'               => array( 'דפים_מבוקשים' ),
+	'Wantedtemplates'           => array( 'תבניות_מבוקשות' ),
+	'Watchlist'                 => array( 'רשימת_המעקב', 'רשימת_מעקב', 'רשימת_המעקב_שלי' ),
+	'Whatlinkshere'             => array( 'דפים_המקושרים_לכאן' ),
+	'Withoutinterwiki'          => array( 'דפים_ללא_קישורי_שפה' ),
 );
 
 $magicWords = array(
@@ -74,7 +164,6 @@ $magicWords = array(
 	'forcetoc'                  => array( '0', '__חייב_תוכן_עניינים__', '__חייב_תוכן__', '__FORCETOC__' ),
 	'toc'                       => array( '0', '__תוכן_עניינים__', '__תוכן__', '__TOC__' ),
 	'noeditsection'             => array( '0', '__ללא_עריכה__', '__NOEDITSECTION__' ),
-	'noheader'                  => array( '0', '__ללא_כותרת__', '__NOHEADER__' ),
 	'currentmonth'              => array( '1', 'חודש נוכחי', 'חודש נוכחי 2', 'CURRENTMONTH', 'CURRENTMONTH2' ),
 	'currentmonth1'             => array( '1', 'חודש נוכחי 1', 'CURRENTMONTH1' ),
 	'currentmonthname'          => array( '1', 'שם חודש נוכחי', 'CURRENTMONTHNAME' ),
@@ -222,134 +311,42 @@ $magicWords = array(
 	'defaultsort_noreplace'     => array( '0', 'ללא החלפה', 'noreplace' ),
 );
 
-$specialPageAliases = array(
-	'Activeusers'               => array( 'משתמשים_פעילים' ),
-	'Allmessages'               => array( 'הודעות_המערכת' ),
-	'Allpages'                  => array( 'כל_הדפים' ),
-	'Ancientpages'              => array( 'דפים_מוזנחים' ),
-	'Badtitle'                  => array( 'כותרת_שגויה' ),
-	'Blankpage'                 => array( 'דף_ריק' ),
-	'Block'                     => array( 'חסימה', 'חסימת_כתובת', 'חסימת_משתמש' ),
-	'Blockme'                   => array( 'חסום_אותי' ),
-	'Booksources'               => array( 'משאבי_ספרות', 'משאבי_ספרות_חיצוניים' ),
-	'BrokenRedirects'           => array( 'הפניות_לא_תקינות', 'הפניות_שבורות' ),
-	'Categories'                => array( 'קטגוריות', 'רשימת_קטגוריות' ),
-	'ChangeEmail'               => array( 'שינוי_דואר_אלקטרוני', 'שינוי_דואל' ),
-	'ChangePassword'            => array( 'שינוי_סיסמה' ),
-	'ComparePages'              => array( 'השוואת_דפים' ),
-	'Confirmemail'              => array( 'אימות_כתובת_דואר' ),
-	'Contributions'             => array( 'תרומות', 'תרומות_המשתמש' ),
-	'CreateAccount'             => array( 'הרשמה_לחשבון' ),
-	'Deadendpages'              => array( 'דפים_ללא_קישורים' ),
-	'DeletedContributions'      => array( 'תרומות_מחוקות' ),
-	'Disambiguations'           => array( 'פירושונים', 'דפי_פירושונים' ),
-	'DoubleRedirects'           => array( 'הפניות_כפולות' ),
-	'EditWatchlist'             => array( 'עריכת_רשימת_המעקב' ),
-	'Emailuser'                 => array( 'שליחת_דואר_למשתמש' ),
-	'Export'                    => array( 'ייצוא', 'ייצוא_דפים' ),
-	'Fewestrevisions'           => array( 'הגרסאות_המעטות_ביותר', 'הדפים_בעלי_מספר_העריכות_הנמוך_ביותר' ),
-	'FileDuplicateSearch'       => array( 'חיפוש_קבצים_כפולים' ),
-	'Filepath'                  => array( 'נתיב_לקובץ' ),
-	'Import'                    => array( 'ייבוא', 'ייבוא_דפים' ),
-	'Invalidateemail'           => array( 'ביטול_דואר' ),
-	'JavaScriptTest'            => array( 'בדיקת_JavaScript' ),
-	'BlockList'                 => array( 'רשימת_חסומים', 'רשימת_משתמשים_חסומים', 'משתמשים_חסומים' ),
-	'LinkSearch'                => array( 'חיפוש_קישורים_חיצוניים' ),
-	'Listadmins'                => array( 'רשימת_מפעילים' ),
-	'Listbots'                  => array( 'רשימת_בוטים' ),
-	'Listfiles'                 => array( 'רשימת_קבצים', 'רשימת_תמונות', 'קבצים', 'תמונות' ),
-	'Listgrouprights'           => array( 'רשימת_הרשאות_לקבוצה' ),
-	'Listredirects'             => array( 'רשימת_הפניות', 'הפניות' ),
-	'Listusers'                 => array( 'רשימת_משתמשים', 'משתמשים' ),
-	'Lockdb'                    => array( 'נעילת_בסיס_הנתונים' ),
-	'Log'                       => array( 'יומנים' ),
-	'Lonelypages'               => array( 'דפים_יתומים' ),
-	'Longpages'                 => array( 'דפים_ארוכים' ),
-	'MergeHistory'              => array( 'מיזוג_גרסאות' ),
-	'MIMEsearch'                => array( 'חיפוש_MIME' ),
-	'Mostcategories'            => array( 'הקטגוריות_הרבות_ביותר', 'הדפים_מרובי-הקטגוריות_ביותר' ),
-	'Mostimages'                => array( 'הקבצים_המקושרים_ביותר', 'התמונות_המקושרות_ביותר' ),
-	'Mostlinked'                => array( 'הדפים_המקושרים_ביותר', 'המקושרים_ביותר' ),
-	'Mostlinkedcategories'      => array( 'הקטגוריות_המקושרות_ביותר' ),
-	'Mostlinkedtemplates'       => array( 'התבניות_המקושרות_ביותר' ),
-	'Mostrevisions'             => array( 'הגרסאות_הרבות_ביותר', 'הדפים_בעלי_מספר_העריכות_הגבוה_ביותר' ),
-	'Movepage'                  => array( 'העברת_דף', 'העברה' ),
-	'Mycontributions'           => array( 'התרומות_שלי' ),
-	'Mypage'                    => array( 'הדף_שלי', 'דף_המשתמש_שלי' ),
-	'Mytalk'                    => array( 'השיחה_שלי', 'דף_השיחה_שלי' ),
-	'Myuploads'                 => array( 'ההעלאות_שלי' ),
-	'Newimages'                 => array( 'קבצים_חדשים', 'תמונות_חדשות', 'גלריית_קבצים_חדשים', 'גלריית_תמונות_חדשות' ),
-	'Newpages'                  => array( 'דפים_חדשים' ),
-	'PasswordReset'             => array( 'איפוס_סיסמה' ),
-	'PermanentLink'             => array( 'קישור_קבוע' ),
-	'Popularpages'              => array( 'הדפים_הנצפים_ביותר', 'דפים_פופולריים' ),
-	'Preferences'               => array( 'העדפות', 'ההעדפות_שלי' ),
-	'Prefixindex'               => array( 'דפים_המתחילים_ב' ),
-	'Protectedpages'            => array( 'דפים_מוגנים' ),
-	'Protectedtitles'           => array( 'כותרות_מוגנות' ),
-	'Randompage'                => array( 'אקראי', 'דף_אקראי' ),
-	'Randomredirect'            => array( 'הפניה_אקראית' ),
-	'Recentchanges'             => array( 'שינויים_אחרונים' ),
-	'Recentchangeslinked'       => array( 'שינויים_בדפים_המקושרים' ),
-	'Revisiondelete'            => array( 'מחיקת_ושחזור_גרסאות' ),
-	'RevisionMove'              => array( 'העברת_גרסאות' ),
-	'Search'                    => array( 'חיפוש' ),
-	'Shortpages'                => array( 'דפים_קצרים' ),
-	'Specialpages'              => array( 'דפים_מיוחדים' ),
-	'Statistics'                => array( 'סטטיסטיקות' ),
-	'Tags'                      => array( 'תגיות' ),
-	'Unblock'                   => array( 'שחרור_חסימה' ),
-	'Uncategorizedcategories'   => array( 'קטגוריות_חסרות_קטגוריה' ),
-	'Uncategorizedimages'       => array( 'קבצים_חסרי_קטגוריה', 'תמונות_חסרות_קטגוריה' ),
-	'Uncategorizedpages'        => array( 'דפים_חסרי_קטגוריה' ),
-	'Uncategorizedtemplates'    => array( 'תבניות_חסרות_קטגוריות' ),
-	'Undelete'                  => array( 'צפייה_בדפים_מחוקים' ),
-	'Unlockdb'                  => array( 'שחרור_בסיס_הנתונים' ),
-	'Unusedcategories'          => array( 'קטגוריות_שאינן_בשימוש' ),
-	'Unusedimages'              => array( 'קבצים_שאינם_בשימוש', 'תמונות_שאינן_בשימוש' ),
-	'Unusedtemplates'           => array( 'תבניות_שאינן_בשימוש' ),
-	'Unwatchedpages'            => array( 'דפים_שאינם_במעקב' ),
-	'Upload'                    => array( 'העלאה', 'העלאת_קובץ_לשרת' ),
-	'UploadStash'               => array( 'מאגר_העלאות' ),
-	'Userlogin'                 => array( 'כניסה_לחשבון', 'כניסה', 'כניסה_/_הרשמה_לחשבון' ),
-	'Userlogout'                => array( 'יציאה_מהחשבון', 'יציאה' ),
-	'Userrights'                => array( 'ניהול_הרשאות_משתמש', 'הפיכת_משתמש_למפעיל_מערכת', 'הענקת_או_ביטול_הרשאת_בוט' ),
-	'Version'                   => array( 'גרסה', 'גרסת_התוכנה' ),
-	'Wantedcategories'          => array( 'קטגוריות_מבוקשות' ),
-	'Wantedfiles'               => array( 'קבצים_מבוקשים' ),
-	'Wantedpages'               => array( 'דפים_מבוקשים' ),
-	'Wantedtemplates'           => array( 'תבניות_מבוקשות' ),
-	'Watchlist'                 => array( 'רשימת_המעקב', 'רשימת_מעקב', 'רשימת_המעקב_שלי' ),
-	'Whatlinkshere'             => array( 'דפים_המקושרים_לכאן' ),
-	'Withoutinterwiki'          => array( 'דפים_ללא_קישורי_שפה' ),
+$datePreferences = array(
+	'default',
+	'mdy',
+	'dmy',
+	'ymd',
+	'hebrew',
+	'ISO 8601',
 );
 
-$namespaceNames = array(
-	NS_MEDIA            => 'מדיה',
-	NS_SPECIAL          => 'מיוחד',
-	NS_MAIN             => '',
-	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    => 'שיחת_קטגוריה',
-);
-$namespaceAliases = array(
-	'תמונה'      => NS_FILE,
-	'שיחת_תמונה' => NS_FILE_TALK,
+$dateFormats = array(
+	'mdy time' => 'H:i',
+	'mdy date' => 'xg j, Y',
+	'mdy both' => 'H:i, xg j, Y',
+
+	'dmy time' => 'H:i',
+	'dmy date' => 'j xg Y',
+	'dmy both' => 'H:i, j xg Y',
+
+	'ymd time' => 'H:i',
+	'ymd date' => 'Y xg j',
+	'ymd both' => 'H:i, Y xg j',
+
+	'hebrew time' => 'H:i',
+	'hebrew date' => 'xhxjj xjx xhxjY',
+	'hebrew both' => 'H:i, xhxjj xjx xhxjY',
+
+	'ISO 8601 time' => 'xnH:xni:xns',
+	'ISO 8601 date' => 'xnY-xnm-xnd',
+	'ISO 8601 both' => 'xnY-xnm-xnd"T"xnH:xni:xns',
 );
-$namespaceGenderAliases = array(
-	NS_USER      => array( 'male' => 'משתמש', 'female' => 'משתמשת' ),
-	NS_USER_TALK => array( 'male' => 'שיחת_משתמש', 'female' => 'שיחת_משתמשת' ),
+
+$bookstoreList = array(
+	'מיתוס'          => 'http://www.mitos.co.il/',
+	'iBooks'         => 'http://www.ibooks.co.il/',
+	'Barnes & Noble' => 'http://search.barnesandnoble.com/bookSearch/isbnInquiry.asp?isbn=$1',
+	'Amazon.com'     => 'http://www.amazon.com/exec/obidos/ISBN=$1'
 );
 
 $messages = array(
@@ -402,7 +399,7 @@ $messages = array(
 
 'underline-always' => 'תמיד',
 'underline-never' => 'לעולם לא',
-'underline-default' => 'ברירת מחדל של הדפדפן',
+'underline-default' => 'ברירת מחדל של העיצוב או של הדפדפן',
 
 # Font style option in Special:Preferences
 'editfont-style' => 'הגופן בתיבת העריכה:',
@@ -487,8 +484,8 @@ $messages = array(
 'newwindow' => '(נפתח בחלון חדש)',
 'cancel' => 'ביטול / יציאה',
 'moredotdotdot' => 'עוד…',
-'mypage' => 'הדף שלי',
-'mytalk' => 'דף השיחה שלי',
+'mypage' => 'דף משתמש',
+'mytalk' => 'שיחה',
 'anontalk' => 'השיחה עבור IP זה',
 'navigation' => 'ניווט',
 'and' => '&#32;וגם',
@@ -1057,7 +1054,7 @@ $2
 'note' => "'''הערה:'''",
 'previewnote' => "'''זכרו שזו רק תצוגה מקדימה.'''
 השינויים שלכם טרם נשמרו!",
-'continue-editing' => 'להמשך העריכה',
+'continue-editing' => 'מעבר לאזור העריכה',
 'previewconflict' => 'תצוגה מקדימה זו מציגה כיצד ייראה הטקסט בחלון העריכה העליון, אם תבחרו לשמור אותו.',
 'session_fail_preview' => "'''לא ניתן לבצע את עריכתכם עקב אובדן מידע הכניסה.'''
 אנא נסו שוב.
@@ -1433,7 +1430,7 @@ $1",
 
 # Preferences page
 'preferences' => 'העדפות',
-'mypreferences' => 'ההעדפות שלי',
+'mypreferences' => 'העדפות',
 'prefs-edits' => 'מספר עריכות:',
 'prefsnologin' => 'לא נכנסת לחשבון',
 'prefsnologintext' => 'עליכם <span class="plainlinks">[{{fullurl:{{#Special:UserLogin}}|returnto=$1}} להיכנס לחשבון]</span> כדי לשנות העדפות משתמש.',
@@ -1667,6 +1664,9 @@ $1",
 'rightslogtext' => 'זהו יומן השינויים בתפקידי המשתמשים.',
 'rightslogentry' => 'שינה את ההרשאות של $1 מ$2 ל$3',
 'rightslogentry-autopromote' => 'קודם אוטומטית מ$2 ל$3',
+'logentry-rights-rights' => '$1 שינה את ההרשאות של $3 מ$4 ל$5',
+'logentry-rights-rights-legacy' => '$1 שינה את ההרשאות של $3',
+'logentry-rights-autopromote' => '$1 קודם אוטומטית מ$4 ל$5',
 'rightsnone' => '(כלום)',
 
 # Associated actions - in the sentence "You do not have permission to X"
@@ -2300,7 +2300,7 @@ $1',
 'linksearch-ok' => 'חיפוש',
 'linksearch-text' => 'ניתן להשתמש בתווים כלליים, לדוגמה <span dir="ltr">"*.wikipedia.org"</span>.
 נדרשת לפחות סיומת אינטרנט (TLD), למשל <span dir="ltr">"*.org"</span>.<br />
-פרוטוקולים נתמכים: <code dir="ltr">$1</code> (אין להוסיף אותם בחיפוש).',
+פרוטוקולים נתמכים: <code dir="ltr">$1</code> (ברירת המחדל היא <span dir="ltr">http://</span> אם לא צוין פרוטוקול).',
 'linksearch-line' => '$1 מקושר מהדף $2',
 'linksearch-error' => 'תווים כלליים יכולים להופיע רק בתחילת שם השרת.',
 
@@ -2349,7 +2349,7 @@ $1',
 'emailuser-title-target' => 'שליחת דוא"ל {{GENDER:$1|למשתמש זה|למשתמשת זו}}',
 'emailuser-title-notarget' => 'שליחת דוא"ל למשתמש',
 'emailpage' => 'שליחת דואר למשתמש',
-'emailpagetext' => 'ניתן להשתמש בטופס כדי לשלוח הודעת דואר אלקטרוני למשתמש זה.
+'emailpagetext' => 'ניתן להשתמש בטופס כדי לשלוח הודעת דואר אלקטרוני {{GENDER:$1|למשתמש זה|למשתמשת זו}}.
 כתובת הדואר האלקטרוני שכתבתם ב[[Special:Preferences|העדפות המשתמש שלכם]] תופיע ככתובת שההודעה נשלחה ממנה, כדי לאפשר תגובה ישירה.',
 'usermailererror' => 'אובייקט הדואר החזיר שגיאה:',
 'defemailsubject' => 'דוא"ל מ{{grammar:תחילית|{{SITENAME}}}} מהמשתמש "$1"',
@@ -2381,7 +2381,7 @@ $1',
 
 # Watchlist
 'watchlist' => 'רשימת המעקב שלי',
-'mywatchlist' => 'רשימת המעקב שלי',
+'mywatchlist' => 'רשימת מעקב',
 'watchlistfor2' => 'עבור $1 $2',
 'nowatchlist' => 'אין דפים ברשימת המעקב.',
 'watchlistanontext' => 'עליכם $1 כדי לצפות או לערוך פריטים ברשימת המעקב.',
@@ -2637,7 +2637,7 @@ $1',
 # Contributions
 'contributions' => 'תרומות המשתמש',
 'contributions-title' => 'תרומות של המשתמש $1',
-'mycontris' => 'התרומות שלי',
+'mycontris' => 'תרומות',
 'contribsub2' => 'עבור $1 ($2)',
 'nocontribs' => 'לא נמצאו שינויים המתאימים לקריטריונים אלו.',
 'uctop' => '(אחרון)',
@@ -3119,7 +3119,7 @@ $1',
 'standard.css' => '/* הסגנונות הנכתבים כאן ישפיעו על העיצוב Standard בלבד */',
 'nostalgia.css' => '/* הסגנונות הנכתבים כאן ישפיעו על העיצוב Nostalgia בלבד */',
 'cologneblue.css' => '/* הסגנונות הנכתבים כאן ישפיעו על העיצוב CologneBlue בלבד */',
-'monobook.css' => '/* הסגנונות הנכתבים כאן ישפיעו על העיצוב Monobook בלבד */',
+'monobook.css' => '/* הסגנונות הנכתבים כאן ישפיעו על העיצוב MonoBook בלבד */',
 'myskin.css' => '/* הסגנונות הנכתבים כאן ישפיעו על העיצוב MySkin בלבד */',
 'chick.css' => '/* הסגנונות הנכתבים כאן ישפיעו על העיצוב Chick בלבד */',
 'simple.css' => '/* הסגנונות הנכתבים כאן ישפיעו על העיצוב Simple בלבד */',
@@ -3176,7 +3176,7 @@ $1',
 
 # Info page
 'pageinfo-title' => 'מידע על "$1"',
-'pageinfo-not-current' => 'המידע יכול להיות מוצג רק עבור הגרסה הנוכחית.',
+'pageinfo-not-current' => 'מצטערים, לא ניתן להציג את המידע הזה לגרסאות ישנות.',
 'pageinfo-header-basic' => 'מידע בסיסי',
 'pageinfo-header-edits' => 'היסטוריית עריכות',
 'pageinfo-header-restrictions' => 'הגנה על הדף',
@@ -3185,6 +3185,7 @@ $1',
 'pageinfo-default-sort' => 'מפתח המיון הרגיל',
 'pageinfo-length' => 'אורך הדף (בבתים)',
 'pageinfo-article-id' => 'מזהה הדף',
+'pageinfo-language' => 'שפת התוכן של הדף',
 'pageinfo-robot-policy' => 'מצב מנוע חיפוש',
 'pageinfo-robot-index' => 'יכול להיאסף למפתחות חיפוש',
 'pageinfo-robot-noindex' => 'לא יכול להיאסף למפתחות חיפוש',
@@ -3968,6 +3969,7 @@ $5
 'version-license' => 'רישיון',
 'version-poweredby-credits' => "אתר הוויקי הזה מופעל על ידי '''[//www.mediawiki.org/ מדיה־ויקי]''', © 2001–$1 $2.",
 'version-poweredby-others' => 'אחרים',
+'version-credits-summary' => 'אנו רוצים להודות לאנשים הבאים על תרומתם ל[[Special:Version|מדיה־ויקי]].',
 'version-license-info' => "מדיה־ויקי היא תוכנה חופשית; באפשרותכם להפיץ אותה מחדש ו/או לשנות אותה לפי תנאי הרישיון הציבורי הכללי של גנו המפורסם על ידי המוסד לתוכנה חופשית: גרסה 2 של רישיון זה, או (לפי בחירתכם) כל גרסה מאוחרת יותר.
 
 מדיה־ויקי מופצת בתקווה שהיא תהיה שימושית, אך '''ללא כל הבטחה לאחריות'''; אפילו לא אחריות משתמעת של '''יכולת להיסחר''' או '''התאמה למטרה מסוימת'''. ראו את הרישיון הציבורי הכללי של גנו לפרטים נוספים.
@@ -4184,4 +4186,6 @@ $5
 'duration-centuries' => '{{PLURAL:$1|מאה שנה|מאתיים שנה|$1 מאות שנים}}',
 'duration-millennia' => '{{PLURAL:$1|אלף שנה|אלפיים שנה|$1 אלפי שנים}}',
 
+# Unknown messages
+'mytalk-parenthetical' => 'שיחה',
 );
diff --git a/languages/messages/MessagesHil.php b/languages/messages/MessagesHil.php
index 983d30b72c..7c57a24e6c 100644
--- a/languages/messages/MessagesHil.php
+++ b/languages/messages/MessagesHil.php
@@ -161,7 +161,6 @@ $messages = array(
 'qbbrowse' => 'Magbasa-basa',
 'qbedit' => 'Ilisan',
 'qbpageoptions' => 'Ining panid',
-'qbpageinfo' => 'Kahulugan/Konteksto',
 'qbmyoptions' => 'Akon mga panid',
 'qbspecialpages' => 'Pinasahi nga mga panid',
 'faq' => 'Mga masami pamangkoton',
diff --git a/languages/messages/MessagesHr.php b/languages/messages/MessagesHr.php
index 91fe9f87dd..8b114e4308 100644
--- a/languages/messages/MessagesHr.php
+++ b/languages/messages/MessagesHr.php
@@ -157,7 +157,6 @@ $magicWords = array(
 	'forcetoc'                  => array( '0', '__UKLJUČISADRŽAJ__', '__FORCETOC__' ),
 	'toc'                       => array( '0', '__SADRŽAJ__', '__TOC__' ),
 	'noeditsection'             => array( '0', '__BEZUREĐIVANJAODLOMAKA__', '__NOEDITSECTION__' ),
-	'noheader'                  => array( '0', '__BEZZAGLAVLJA__', '__NOHEADER__' ),
 	'currentmonth'              => array( '1', 'TRENUTAČNIMJESEC', 'CURRENTMONTH', 'CURRENTMONTH2' ),
 	'currentmonth1'             => array( '1', 'TRENUTAČNIMJESEC1', 'CURRENTMONTH1' ),
 	'currentmonthname'          => array( '1', 'TRENUTAČNIMJESECIME', 'CURRENTMONTHNAME' ),
diff --git a/languages/messages/MessagesHsb.php b/languages/messages/MessagesHsb.php
index a4a648e803..4b971f4847 100644
--- a/languages/messages/MessagesHsb.php
+++ b/languages/messages/MessagesHsb.php
@@ -201,7 +201,7 @@ $messages = array(
 
 'underline-always' => 'Přeco',
 'underline-never' => 'Ženje',
-'underline-default' => 'Standard wobhladowaka',
+'underline-default' => 'Standard drasty abo wobhladowaka',
 
 # Font style option in Special:Preferences
 'editfont-style' => 'Pismowy stil wobdźěłowanskeho pola:',
@@ -286,8 +286,8 @@ $messages = array(
 'newwindow' => '(wočinja so w nowym woknje)',
 'cancel' => 'Přetorhnyć',
 'moredotdotdot' => 'Wjace…',
-'mypage' => 'Moja strona',
-'mytalk' => 'moja diskusija',
+'mypage' => 'Strona',
+'mytalk' => 'Diskusija',
 'anontalk' => 'Diskusijna strona tuteje IP.adresy',
 'navigation' => 'Nawigacija',
 'and' => '&#32;a',
@@ -817,7 +817,7 @@ Podrobnosće móžeš w  [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE
 'note' => "'''Kedźbu:'''",
 'previewnote' => "'''Wobmysl, zo to je jenož přehlad.'''
 Twoje změny hišće njejsu składowane!",
-'continue-editing' => 'Dale wobdźěłać',
+'continue-editing' => 'K wobdźěłowanskemu polu',
 'previewconflict' => 'Tutón přehlad zwobraznja tekst w hornim tekstowym polu,  kaž so zjewi, jeli jón składuješ.',
 'session_fail_preview' => "'''Njemóžachmy twoju změnu předźěłać, dokelž su so posedźenske daty zhubili.'''
 Spytaj prošu hišće raz.
@@ -1189,7 +1189,7 @@ Spytaj swoje naprašowanje z prefiksom ''all:'' wužiwać, zo by wšón wobsah (
 
 # Preferences page
 'preferences' => 'Nastajenja',
-'mypreferences' => 'nastajenja',
+'mypreferences' => 'Nastajenja',
 'prefs-edits' => 'Ličba změnow:',
 'prefsnologin' => 'Njepřizjewjeny',
 'prefsnologintext' => 'Dyrbiš <span class="plainlinks">[{{fullurl:{{#Special:UserLogin}}|returnto=$1}} přizjewjeny]</span>  być, zo by móhł nastajenja postajić.',
@@ -1420,6 +1420,9 @@ Smě mjenje hač $1 {{PLURAL:$1|znamješko|znamješce|znamješka|znamješkow}} d
 'rightslogtext' => 'To je protokol změnow wužiwarskich prawow.',
 'rightslogentry' => 'změni skupinske čłonstwo za $1 z $2 do $3',
 'rightslogentry-autopromote' => 'je so awtomatisce wot $2 do $3 změnił',
+'logentry-rights-rights' => '$1 změni skupinske čłonstwo za $3 z $4 do $5',
+'logentry-rights-rights-legacy' => '$1 změni skupinske čłonstwo za $3',
+'logentry-rights-autopromote' => '$1 powyši so awtomatisce wot $4 do $5',
 'rightsnone' => '(ničo)',
 
 # Associated actions - in the sentence "You do not have permission to X"
@@ -2037,7 +2040,7 @@ Hlej tež [[Special:WantedCategories|požadane kategorije]].',
 'linksearch-ok' => 'Pytać',
 'linksearch-text' => 'Zastupniske znamješka kaž "*.wikipedia.org" móža so wužiwać.
 Znajmjeńša hłowna domena je trěbna, na přikład "*.org".<br />
-Podpěrowane protokole: <code>$1</code> (prošu njepodaj je w swojim pytanje).',
+Podpěrowane protokole: <code>$1</code> (standard je http://, jeli žadyn protokol njeje podaty).',
 'linksearch-line' => '$1 je z $2 wotkazany.',
 'linksearch-error' => 'Zastupniske znamjenja dadźa so jenož na spočatku URL wužiwać.',
 
@@ -2085,7 +2088,7 @@ Podpěrowane protokole: <code>$1</code> (prošu njepodaj je w swojim pytanje).',
 '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 wužiwarjej e-mejlku pósłał.
+'emailpagetext' => 'Móžeš slědowacy formular wužiwać, zo by tutomu {{GENDER:$1|wužiwarjej}} e-mejlku pósłał.
 E-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ć.',
 'usermailererror' => 'E-mejlowy objekt je zmylk wróćił:',
 'defemailsubject' => '{{SITENAME}} - e-mejlka wot wužiwarja "$1"',
@@ -2117,7 +2120,7 @@ E-mejlowa adresa, kotruž sy w [[Special:Preferences|swojich wužiwarskich nasta
 
 # Watchlist
 'watchlist' => 'wobkedźbowanki',
-'mywatchlist' => 'wobkedźbowanki',
+'mywatchlist' => 'Wobkedźbowanki',
 'watchlistfor2' => 'Za wužiwarja $1 $2',
 'nowatchlist' => 'Nimaš žane strony w swojich wobkedźbowankach.',
 'watchlistanontext' => 'Dyrbiš so $1, zo by swoje wobkedźbowanki wobhladać abo wobdźěłać móhł.',
@@ -2369,7 +2372,7 @@ $1',
 # Contributions
 'contributions' => 'Přinoški wužiwarja',
 'contributions-title' => 'Wužiwarske přinoški wot „$1“',
-'mycontris' => 'moje přinoški',
+'mycontris' => 'Přinoški',
 'contribsub2' => 'za wužiwarja $1 ($2)',
 'nocontribs' => 'Žane změny, kotrež podatym kriterijam wotpowěduja.',
 'uctop' => '(aktualnje)',
@@ -2409,7 +2412,7 @@ Najnowši zapisk w protokolu blokowanjow so deleka jako referenca podawa:',
 'whatlinkshere-hideredirs' => 'Daleposrědkowanja $1',
 'whatlinkshere-hidetrans' => 'Zapřijeća $1',
 'whatlinkshere-hidelinks' => 'Wotkazy $1',
-'whatlinkshere-hideimages' => 'wobrazowe wotkazy $1',
+'whatlinkshere-hideimages' => 'Datajowe wotkazy $1',
 'whatlinkshere-filters' => 'Filtry',
 
 # Block/unblock
@@ -2855,7 +2858,7 @@ W poslednim padźe móžeš tež wotkaz wužiwać, na př. „[[{{#Special:Expor
 
 # Info page
 'pageinfo-title' => 'Informacije za stronu "$1"',
-'pageinfo-not-current' => 'Informacije hodźa so jenož za aktualnu wersiju zwobraznić.',
+'pageinfo-not-current' => 'Bohužel njedadźa so tute informacije za stare wersije podać.',
 'pageinfo-header-basic' => 'Zakładne informacije',
 'pageinfo-header-edits' => 'Stawizny wobdźěłać',
 'pageinfo-header-restrictions' => 'Å kit strony',
@@ -2864,6 +2867,7 @@ W poslednim padźe móžeš tež wotkaz wužiwać, na př. „[[{{#Special:Expor
 'pageinfo-default-sort' => 'Standardny sortěrowanski kluč',
 'pageinfo-length' => 'Dołhosć strony (w bajtach)',
 'pageinfo-article-id' => 'ID strony',
+'pageinfo-language' => 'Rěč wobsaha strony',
 'pageinfo-robot-policy' => 'Status pytawy',
 'pageinfo-robot-index' => 'Indeksujomny',
 'pageinfo-robot-noindex' => 'Njeindeksujomny',
@@ -3576,6 +3580,7 @@ Móžeš tež [[Special:EditWatchlist|standardnu wobdźěłowansku stronu]] wuž
 'version-license' => 'Licenca',
 'version-poweredby-credits' => "Tutón wiki so wot  '''[//www.mediawiki.org/ MediaWiki]''', copyright © 2001-$1 $2 podpěruje.",
 'version-poweredby-others' => 'druzy',
+'version-credits-summary' => 'Dźakujemy so slědowacym wosobam za jich přinoški k [[Special:Version|MediaWiki]]',
 'version-license-info' => 'MediaWiki je swobodna softwara: móžeš ju pod wuměnjenjemi licency GNU General Public License, wozjewjeneje wot załožby Free Software Foundation, rozdźělić a/abo změnić: pak pod wersiju 2 licency pak pod někajkej pozdźišej wersiju.
 
 MediaWiki so w nadźiji rozdźěla, zo budźe wužitny, ale BJEZ GARANTIJU: samo bjez wobsahowaneje garantije PŘEDAWAJOMNOSĆE abo PŘIHÓDNOSĆE ZA WĚSTY ZAMĚR. Hlej GNU general Public License za dalše podrobnosće.
diff --git a/languages/messages/MessagesHt.php b/languages/messages/MessagesHt.php
index 65845fedc2..43becc4d05 100644
--- a/languages/messages/MessagesHt.php
+++ b/languages/messages/MessagesHt.php
@@ -107,7 +107,6 @@ $specialPageAliases = array(
 	'Recentchanges'             => array( 'ChanjmanResan' ),
 	'Recentchangeslinked'       => array( 'LyenChanjmanResan', 'ChanjmanAk' ),
 	'Revisiondelete'            => array( 'RevizyonSiprime' ),
-	'RevisionMove'              => array( 'DeplaseRevizyon' ),
 	'Search'                    => array( 'Chache', 'Fouye' ),
 	'Shortpages'                => array( 'PajKout' ),
 	'Specialpages'              => array( 'PajEspesyal' ),
@@ -285,7 +284,6 @@ $messages = array(
 'qbbrowse' => 'Bouske',
 'qbedit' => 'Modifye',
 'qbpageoptions' => 'Paj sa a',
-'qbpageinfo' => 'Kontèks',
 'qbmyoptions' => 'Paj mwen yo',
 'qbspecialpages' => 'Paj espesyal',
 'faq' => 'FAQ',
diff --git a/languages/messages/MessagesHu.php b/languages/messages/MessagesHu.php
index f04aae4947..739ca1a9f1 100644
--- a/languages/messages/MessagesHu.php
+++ b/languages/messages/MessagesHu.php
@@ -136,7 +136,6 @@ $specialPageAliases = array(
 	'Recentchanges'             => array( 'Friss_változtatások' ),
 	'Recentchangeslinked'       => array( 'Kapcsolódó_változtatások' ),
 	'Revisiondelete'            => array( 'Változat_törlése' ),
-	'RevisionMove'              => array( 'Változat_áthelyezése' ),
 	'Search'                    => array( 'Keresés' ),
 	'Shortpages'                => array( 'Rövid_lapok' ),
 	'Specialpages'              => array( 'Speciális_lapok' ),
@@ -360,7 +359,7 @@ $messages = array(
 
 'underline-always' => 'mindig',
 'underline-never' => 'soha',
-'underline-default' => 'a böngésző alapértelmezése szerint',
+'underline-default' => 'Felület és böngésző alapértelmezése szerint',
 
 # Font style option in Special:Preferences
 'editfont-style' => 'A szerkesztőterület betűtípusa:',
@@ -1951,6 +1950,7 @@ A [$2 fájl ottani leírólapjának] másolata alább látható.',
 'shared-repo-from' => 'a(z) $1 megosztott tárhelyről',
 'shared-repo' => 'megosztott tárhely',
 'filepage.css' => '/* Az itt elhelyezett CSS a fájl leíró lapra kerül beillesztésre, a külföldi nyelvű kliens wikikbe is*/',
+'upload-disallowed-here' => 'Ezt a fájlt nem lehet felülírni.',
 
 # File reversion
 'filerevert' => '$1 visszaállítása',
@@ -2233,9 +2233,11 @@ Az egyes csoportokról további információt [[{{MediaWiki:Listgrouprights-help
 'mailnologin' => 'Nincs feladó',
 'mailnologintext' => 'Ahhoz hogy másoknak e-mailt küldhess, [[Special:UserLogin|be kell jelentkezned]] és meg kell adnod egy érvényes e-mail címet a [[Special:Preferences|beállításaidban]].',
 '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' => 'A szerkesztő e-mail-címére ezen űrlap kitöltésével üzenetet tudsz küldeni.
-Feladóként a [[Special:Preferences|beállításaid]]nál megadott e-mail-címed fog szerepelni, így a címzett közvetlenül neked tud majd válaszolni.',
+Feladóként a [[Special:Preferences|beállításaid]]nál megadott e-mail-címed fog szerepelni, így a címzett közvetlenül tud majd válaszolni neked.',
 'usermailererror' => 'A levélküldő objektum hibával tért vissza:',
 'defemailsubject' => '{{SITENAME}} e-mail a következő felhasználótól: „$1”',
 'usermaildisabled' => 'Email fogadás letiltva',
@@ -2912,6 +2914,7 @@ Mentsd el a számítógépedre, majd töltsd fel ide.',
 'import-error-invalid' => '„$1” lap nem került importálásra, mert a neve nem érvényes.',
 'import-options-wrong' => 'Rossz {{PLURAL:$2|opció|opciók}}: <nowiki>$1</nowiki>',
 'import-rootpage-invalid' => 'A megadott gyökér oldal címe érvénytelen.',
+'import-rootpage-nosubpage' => 'A(z) "$1" névtér nem engedi meg aloldalak használatát.',
 
 # Import log
 'importlogpage' => 'Importnapló',
diff --git a/languages/messages/MessagesHy.php b/languages/messages/MessagesHy.php
index fdda6bea17..a082bc6e28 100644
--- a/languages/messages/MessagesHy.php
+++ b/languages/messages/MessagesHy.php
@@ -649,9 +649,13 @@ $1',
 'cascadeprotected' => 'Այս էջը պաշտպանված է խմբագրումից, քանի որ ընդգրկված է հետևյալ {{PLURAL:$1|էջի|էջերի}} տեքստում, {{PLURAL:$1|որը|որոնք}} պաշտպանվել {{PLURAL:$1|է|են}} կասկադային հնարավորությամբ.
 $2',
 'namespaceprotected' => 'Դուք չունեք «$1» անվանատարածքի էջերի խմբագրման իրավունք։',
+'customcssprotected' => 'Դուք չեք կարող խմբագրել այս CSS էջը, քանի որ այն պարունակում է այլ մասնակցի անձնական նախընտրանքներ։',
+'customjsprotected' => 'Դուք չեք կարող խմբագրել այս ՋավաՍկրիպտ էջը, քանի որ այն պարունակում է այլ մասնակցի անձնական նախընտրանքներ։',
 'ns-specialprotected' => '«{{ns:special}}» անվանատարածքի էջերը չեն կարող խմբագրվել։',
 'titleprotected' => "Այս անվանմամբ էջի ստեղծումը արգելվել է [[User:$1|$1]] մասնակցի կողմից։
 Տրված պատճառն է՝ ''$2''։",
+'exception-nologin' => 'Չեք մտել համակարգ',
+'exception-nologin-text' => 'Այս էջը դիտելու կամ գործողություն կատարելու համար դուք պետք է մուտք գործեք այս վիքի։',
 
 # Virus scanner
 'virus-badscanner' => "Սխալ կարգավորւմ։ Անծանոթ վիրուսների զննիչ. ''$1''",
@@ -670,6 +674,7 @@ $2',
 'yourpasswordagain' => 'Կրկնեք գաղտնաբառը.',
 'remembermypassword' => 'Հիշել իմ մուտքագրված տվյալները այս համակարգչում ($1 {{PLURAL:$1|օրից|օրից}} ոչ ավել ժամկետով)',
 'yourdomainname' => 'Ձեր դոմենը.',
+'password-change-forbidden' => 'Այս վիքիում չեք կարող փոխել գաղտնաբառ։',
 'externaldberror' => 'Տեղի է ունեցել վավերացման արտաքին տվյալների բազայի սխալ, կամ դուք չունեք բավարար իրավունքներ ձեր արտաքին հաշվի փոփոխման համար։',
 'login' => 'Մտնել',
 'nav-login-createaccount' => 'Մտնել / Գրանցվել',
@@ -693,6 +698,8 @@ $2',
 'createaccounterror' => 'Չհաջողվեց ստեղծել մասնակցային հաշիվ. $1',
 'nocookiesnew' => 'Մասնակցային հաշիվը ստեղծված է, սակայն մուտքը համակարգ չհաջողվեց։ {{SITENAME}} կայքը օգտագործում է «քուքիներ» մասնակիցների վավերացման համար։ Ձեր մոտ «քուքիները» արգելված են։ Խնդրում ենք թույլատրել սրանք, ապա մտնել համակարգ ձեր նոր մասնակցի անունով և գաղտնաբառով։',
 'nocookieslogin' => '{{SITENAME}} կայքը օգտագործում է «քուքիներ» մասնակիցների վավերացման համար։ Ձեր մոտ «քուքիները» արգելված են։ Խնդրում ենք թույլատրել սրանք և փորձել կրկին։',
+'nocookiesfornew' => 'Մասնակցային հաշիվը չհաջողվեց ստեղծվել, քանի որ հնարավոր չեր վավերացնել աղբյուրը։
+Ստուգեք, որ ձեզ մոտ թույլատրված են քուկիները, վերբեռնեք էջը և փորձեք կրկին։',
 'noname' => 'Դուք չեք նշել թույլատրելի մասնակցային անուն։',
 'loginsuccesstitle' => 'Բարեհաջող մուտք',
 'loginsuccess' => "'''Դուք մուտք գործեցիք {{SITENAME}}, որպես \"\$1\"։'''",
@@ -729,6 +736,7 @@ $2',
 'noemailprefs' => 'Այս հնարավորության գործածման համար անհրաժեշտ է նշել էլ-փոստի հասցե։',
 'emailconfirmlink' => 'Վավերացնել ձեր էլ-փոստի հասցեն',
 'invalidemailaddress' => 'Նշված էլ-փոստի հասցեն անընդունելի է, քանի որ այն ունի անթույլատրելի ֆորմատ։ Խնդրում ենք նշել ճշմարիտ հասցե կամ այս դաշտը թողնել դատարկ։',
+'emaildisabled' => 'Այս կայքը չի կարող ուղարկել էլ․ նամակներ։',
 'accountcreated' => 'Հաշիվը ստեղծված է',
 'accountcreatedtext' => '$1 մասնակցի հաշիվը ստեղծված է։',
 'createaccount-title' => '{{SITENAME}}. մասնակցային հաշվի ստեղծում',
@@ -742,6 +750,7 @@ $2',
 
 # E-mail sending
 'php-mail-error-unknown' => 'Անհայտ սխալ PHP-ի mail() ֆունկցիայում',
+'user-mail-no-addy' => 'Փորձվեց ուղարկել էլ․ նամակ առանց էլ․ հասցեի։',
 
 # Change password dialog
 'resetpass' => 'Փոխել գաղտնաբառը',
@@ -766,9 +775,16 @@ $2',
 'passwordreset-username' => 'Մասնակցի անուն.',
 'passwordreset-emailelement' => 'Մասնակցային անուն. $1
 Ժամանակավոր գաղտնաբառ. $2',
+'passwordreset-emailsent' => 'Ուղարկվեց հիշեցնող էլ․ նամակ։',
+'passwordreset-emailsent-capture' => 'Ուղարկվեց հիշեցնող էլ․ նամակ։ Այն ներկայացված է ստորև։',
+'passwordreset-emailerror-capture' => 'Ուղարկվեց հիշեցնող էլ․ նամակ։ Այն ներկայացված է ստորև։ Սակայն մասնակցին ուղարկելը չհաջողվեց․',
 
 # Special:ChangeEmail
 'changeemail' => 'Փոխել էլ. հասցեն',
+'changeemail-header' => 'Փոխել հաշվի էլ․ հասցեն',
+'changeemail-oldemail' => 'Ներկա էլ․ հասցե․',
+'changeemail-newemail' => 'Նոր էլ․ հասցե․',
+'changeemail-none' => '(Õ¸Õ¹ Õ´Õ«)',
 'changeemail-submit' => 'Խմբագրել էլ․ հասցեն',
 'changeemail-cancel' => 'Չեղարկել',
 
@@ -853,7 +869,10 @@ $2',
 
 Համակարգ մուտք գործելուն պես կարող եք ''[[Special:ChangePassword|փոխել գաղտնաբառը]]''։",
 'newarticle' => '(Նոր)',
-'newarticletext' => "Դուք հղվել եք դեռևս գոյություն չունեցող էջի։ Էջը ստեղծելու համար սկսեք տեքստի մուտքագրումը ներքևի արկղում (այցելեք [[{{MediaWiki:Helppage}}|օգնության էջը]]՝ մանրամասն տեղեկությունների համար)։ Եթե դուք սխալմամբ եք այստեղ հայտնվել, ապա մատնահարեք ձեր զննարկիչի '''back''' կոճակը։",
+'newarticletext' => "Դուք հղվել եք դեռևս գոյություն չունեցող էջի։ 
+Նոր էջ ստեղծելու համար ներքևում գտնվող խմբագրման դաշտում ավելացրեք ձեր տեքստը, այնուհետև սեղմեք '''Հիշել էջը''' (այցելեք [[{{MediaWiki:Helppage}}|օգնության էջը]]՝ մանրամասն տեղեկությունների համար)։ 
+
+Եթե դուք սխալմամբ եք այստեղ հայտնվել, ապա սեղմեք ձեր զննարկիչի '''հետ''' (back) կոճակը։",
 'anontalkpagetext' => "{| style=\"background-repeat:no-repeat; background-position:800px -20px; margin:0.5em 0 0.5em 0; clear:both;\" width=100% class=toccolours
 |- 
 | <span class=\"plainlinksneverexpand\">''Այս քննարկման էջը պատկանում է չգրանցված կամ համակարգ չմտած մասնակցի, ով խմբագրում կատարելիս օգտվել է {{BASEPAGENAME}} ԱյՓի հասցեից։''
@@ -1672,13 +1691,19 @@ Also see [[Special:WantedCategories|wanted categories]].',
 'mailnologin' => 'Ուղարկման հասցե չկա',
 'mailnologintext' => 'Անհրաժեշտ է [[Special:UserLogin|մտնել համակարգ]] և ունենալ գործող էլ-փոստի հասցե ձեր [[Special:Preferences|նախընտրություններում]]՝ ուրիշ մասնակիցներին էլեկտրոնային նամակներ ուղարկելու համար։',
 'emailuser' => 'էլ-նամակ ուղարկել այս մասնակցին',
+'emailuser-title-target' => 'Ուղարկել էլ․ նամակ {{GENDER:$1|մասնակցին}}',
+'emailuser-title-notarget' => 'Ուղարկել էլ․ նամակ',
 'emailpage' => 'Էլ-նամակ ուղարկել մասնակցին',
-'emailpagetext' => 'Եթե այս մասնակիցը նշել է գործող էլ-փոստի հասցե իր նախընտրություններում, ապա ստորև բերված ձևով հնարավոր է ուղարկել նրան էլ-նամակ։
-Այն էլ-հասցեն, որը դուք նշել եք ձեր նախընտրություններում, կերևա «Ումից» դաշտում, ուստի ստացողը հնարավորություն կունենա պատասխանել։',
+'emailpagetext' => 'Դուք կարող եք օգտագործել ներքևի ձևը այս {{GENDER:$1|մասնակցին}} էլ-նամաակ ուղարկելու համար։
+
+Ձեր նախընտրանքներում նշված էլ-հասցեն կերևա «Ումից» դաշտում և ստացողը կարող է անմիջապես պատասխանել ձեզ։',
 'usermailererror' => 'Նամակն ուղարկելիս սխալ է վերադարձվել.',
-'defemailsubject' => '{{SITENAME}} e-mail',
+'defemailsubject' => '{{SITENAME}} Õ§Õ¬-Õ¶Õ¡Õ´Õ¡Õ¯',
+'usermaildisabled' => 'Էլ․ նամակ ուղարկելը թույլատրված չէ։',
+'usermaildisabledtext' => 'Այս վիքիում չեք կարղ էլ․ նամակ ուղարկել այլ մասնակիցների',
 'noemailtitle' => 'Չկա էլ-փոստի հասցե',
 'noemailtext' => 'Այս մասնակիցը չի նշել էլ-փոստի հասցե կամ նախընտրել է չստանալ էլ-նամակներ այլ մասնակիցներից։',
+'email-legend' => 'Ուղարկել էլ․ նամակ {{SITENAME}}յի այլ մասնակցի',
 'emailfrom' => 'Ումից.',
 'emailto' => 'Ում.',
 'emailsubject' => 'Ô¹Õ¥Õ´Õ¡.',
@@ -1901,10 +1926,12 @@ $NEWPAGE
 'undelete-bad-store-key' => 'Չհաջողվեց վերականգնել նիշքի $1 ժամդրոշմով տարբերակը. նիշքը բացակայում էր ջնջումից առաջ։',
 'undelete-cleanup-error' => 'Տեղի ունեցավ սխալ չօգտագործվող արխիվացված «$1» նիշքը ջնջելիս։',
 'undelete-missing-filearchive' => 'Չհաջողվեց վերականգնել $1 արխիվային իդենտիֆիկատորով նիշքը, քանի որ այն բացակայում է տվյալների բազայից։ Հնարավոր է այն արդեն վերականգնվել է։',
+'undelete-error' => 'Սխալ էջը վերականգնելիս։',
 'undelete-error-short' => 'Նայլի վերականգնման սխալ. $1',
 'undelete-error-long' => 'Տեղի են ունեցել սխալներ նիշքը վերականգնելու ընթացքում.
 
 $1',
+'undelete-show-file-submit' => 'Ô±ÕµÕ¸',
 
 # Namespace form on various pages
 'namespace' => 'Անվանատարածք.',
@@ -1931,6 +1958,10 @@ $1',
 'sp-contributions-logs' => 'տեղեկամատյաններ',
 'sp-contributions-talk' => 'քննարկում',
 'sp-contributions-userrights' => 'մասնակիցների իրավունքների կառավարում',
+'sp-contributions-blocked-notice' => 'Այս մասնակիցը ներկա պահին արգելափակված է։
+Ստորև ներկայացված է արգելափակման տեղեկամատյանի վերջին գրառումը.',
+'sp-contributions-blocked-notice-anon' => 'Այս IP հասցեն ներկա պահին արգելափակված է։
+Ստորև ներկայացված է արգելափակման տեղեկամատյանի վերջին գրառումը.',
 'sp-contributions-search' => 'Որոնել ներդրումները',
 'sp-contributions-username' => 'IP-հասե կամ մասնակցի անուն.',
 'sp-contributions-toponly' => 'Ցույց տալ միայն այն խմբագրումները, որոնք վերջին փոփոխություն են',
@@ -1952,10 +1983,15 @@ $1',
 'whatlinkshere-hideredirs' => '$1 վերահղում',
 'whatlinkshere-hidetrans' => '$1 ներառումները',
 'whatlinkshere-hidelinks' => '$1 հղում',
+'whatlinkshere-hideimages' => '$1 նիշքային հղումներ',
 'whatlinkshere-filters' => 'Զտիչներ',
 
 # Block/unblock
+'autoblockid' => 'Ավտոմատ արգելափակում #$1',
+'block' => 'Արգելափակել մասնակցին',
+'unblock' => 'Արգելափակումից հանել',
 'blockip' => 'Մասնակցի արգելափակում',
+'blockip-title' => 'Արգելափակել մասնակցին',
 'blockip-legend' => 'Մասնակցի արգելափակում',
 'blockiptext' => 'Օգտագործեք ստորև բերված ձևը որոշակի IP-հասցեից կամ մասնակցի անունից գրելու հնարավորությունը արգելափակելու համար։
 Նման բան հարկավոր է անել միայն վանդալության կանխարգելման նպատակով և համաձայն [[{{MediaWiki:Policy-url}}|կանոնակարգի]]։
@@ -1995,6 +2031,7 @@ $1',
 'ipusubmit' => 'Հանել արգելափակումը',
 'unblocked' => '[[User:$1|$1]] մասնակիցը անարգելված է։',
 'unblocked-id' => '$1 արգելափակումը հանված է',
+'blocklist' => 'Արգելափակված մասնակիցներ։',
 'ipblocklist' => 'Արգելափակված IP-հասցեները և մասնակիցները',
 'ipblocklist-legend' => 'Արգելափակված մասնակցի որոնում',
 'ipblocklist-submit' => 'Որոնել',
@@ -2086,6 +2123,7 @@ $1',
 'pagemovedsub' => 'Էջը վերանվանվեց',
 'movepage-moved' => "'''«$1» էջը վերանվանվել է «$2»'''",
 'movepage-moved-redirect' => 'Ստեղծվել է վերահղում։',
+'movepage-moved-noredirect' => 'Վերահղման ստեղծում թույլ չի տրվել',
 'articleexists' => 'Այդ անվանմամբ էջ արդեն գոյություն ունի կամ ձեր ընտրած անվանումը անթույլատրելի է։
 Խնդրում ենք ընտրել այլ անվանում։',
 'talkexists' => "'''Էջը հաջողությամբ տեղափոխվեց, սակայն կցված քննարկման էջը հնարավոր չէր տեղափոխել, քանի որ նոր անվանմամբ էջ արդեն գոյություն ուներ։ Խնդրում ենք միաձուլել դրանք ձեռքով։'''",
@@ -2274,6 +2312,7 @@ Please visit [//www.mediawiki.org/wiki/Localisation MediaWiki Localisation] and
 'pageinfo-watchers' => 'Դիտողների քանակ',
 'pageinfo-edits' => 'Խմբագրումների քանակ',
 'pageinfo-authors' => 'Տարբեր հեղինակների քանակ',
+'pageinfo-toolboxlink' => 'Էջի մասին տեղեկություն',
 
 # Skin names
 'skinname-standard' => 'Ô´Õ¡Õ½Õ¡Õ¯Õ¡Õ¶',
@@ -2542,6 +2581,7 @@ $3
 # Special:ComparePages
 'compare-page1' => 'Ô·Õ» 1',
 'compare-page2' => 'Ô·Õ» 2',
+'compare-submit' => 'Համեմատել',
 
 # Database error messages
 'dberr-header' => 'Այս վիքիում խնդիրներ են առաջացել',
@@ -2570,6 +2610,12 @@ $3
 'logentry-newusers-newusers' => '$1 մասնակիցը ստեղծեց նոր հաշիվ',
 'logentry-newusers-create' => '$1 մասնակիցը ստեղծեց նոր հաշիվ',
 'logentry-newusers-create2' => '$1 Ստեղծեց նոր հաշիվ $3',
+'newuserlog-byemail' => 'Գաղտնաբառն ուղարկված է էլ․ փոստով',
+
+# Feedback
+'feedback-subject' => 'Ô¹Õ¥Õ´Õ¡.',
+'feedback-message' => 'Հաղորդագրություն․',
+'feedback-close' => 'Արված է',
 
 # Search suggestions
 'searchsuggest-search' => 'Որոնել',
diff --git a/languages/messages/MessagesIa.php b/languages/messages/MessagesIa.php
index 0926a6209d..d1d7ed2c0e 100644
--- a/languages/messages/MessagesIa.php
+++ b/languages/messages/MessagesIa.php
@@ -12,6 +12,7 @@
  * @author Malafaya
  * @author McDutchie
  * @author Reedy
+ * @author Yfdyh000
  * @author לערי ריינהארט
  */
 
@@ -110,7 +111,6 @@ $specialPageAliases = array(
 	'Recentchanges'             => array( 'Modificationes_recente' ),
 	'Recentchangeslinked'       => array( 'Modificationes_recente_ligate', 'Modificationes_connexe' ),
 	'Revisiondelete'            => array( 'Deletion_de_versiones' ),
-	'RevisionMove'              => array( 'Displaciar_versiones' ),
 	'Search'                    => array( 'Recerca' ),
 	'Shortpages'                => array( 'Paginas_curte' ),
 	'Specialpages'              => array( 'Paginas_special' ),
@@ -191,7 +191,7 @@ $messages = array(
 
 'underline-always' => 'Sempre',
 'underline-never' => 'Nunquam',
-'underline-default' => 'Secundo le configuration del navigator',
+'underline-default' => 'Como definite per tu navigator o apparentia',
 
 # Font style option in Special:Preferences
 'editfont-style' => 'Stilo de litteras del area de modification:',
@@ -856,7 +856,7 @@ Memora que le paginas .css and .js personalisate usa un titulo in minusculas, p.
 'note' => "'''Nota:'''",
 'previewnote' => "'''Isto es solmente un previsualisation.'''
 Le modificationes non ha ancora essite publicate!",
-'continue-editing' => 'Continuar a modificar',
+'continue-editing' => 'Saltar al quadro de modification',
 'previewconflict' => 'Iste previsualisation reflecte le apparentia final del texto in le area de modification superior
 si tu opta pro publicar lo.',
 'session_fail_preview' => "'''Nos non poteva processar tu modification proque nos perdeva le datos del session.
@@ -1476,6 +1476,9 @@ Si tu opta pro dar lo, isto essera usate pro dar te attribution pro tu contribut
 'rightslogtext' => 'Isto es un registro de cambios in derectos de usator.',
 'rightslogentry' => 'cambiava le gruppos del quales $1 es membro de $2 a $3',
 'rightslogentry-autopromote' => 'ha essite automaticamente promovite de $2 a $3',
+'logentry-rights-rights' => '$1 cambiava le appertinentia a gruppos pro $3 de $4 a $5',
+'logentry-rights-rights-legacy' => '$1 cambiava le appertinentia a gruppos pro $3',
+'logentry-rights-autopromote' => '$1 ha essite automaticamente promovite de $4 a $5',
 'rightsnone' => '(nulle)',
 
 # Associated actions - in the sentence "You do not have permission to X"
@@ -1955,7 +1958,8 @@ Memora verificar que non existe altere ligamines al patronos ante que tu los del
 'statistics-mostpopular' => 'Le paginas plus visitate',
 
 'disambiguations' => 'Paginas con ligamines a paginas de disambiguation',
-'disambiguationspage' => 'Template:Disambiguation',
+'disambiguationspage' => 'Template:Disambig
+Template:Disambiguation',
 'disambiguations-text' => "Le sequente paginas contine al minus un ligamine a un '''pagina de disambiguation'''.
 Istes debe forsan ligar directemente al articulo sur le thema in question.<br />
 Un pagina se tracta como pagina de disambiguation si illo usa un patrono que es ligate ab [[MediaWiki:Disambiguationspage]].",
@@ -2165,9 +2169,9 @@ pro inviar e-mail a altere usatores.',
 '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 infra es pro inviar un message de e-mail a iste usator.
-Le adresse de e-mail que tu indicava in [[Special:Preferences|tu preferentias de usator]] apparera
-como le adresse del expeditor del e-mail, de modo que le destinatario pote responder directemente a te.',
+'emailpagetext' => 'Le formulario sequente es pro inviar un message de e-mail a iste {{GENDER:$1|usator}}.
+Le adresse de e-mail que tu specificava in [[Special:Preferences|tu preferentias de usator]] apparera
+como le adresse del expeditor, de sorta que le destinatario potera responder te directemente.',
 'usermailererror' => 'Le objecto de e-mail retornava le error:',
 'defemailsubject' => 'E-mail del usator "$1" de {{SITENAME}}',
 'usermaildisabled' => 'E-mail a usatores disactivate',
@@ -3007,7 +3011,7 @@ Le causa es probabilemente un ligamine verso un sito externe que es presente in
 
 # Info page
 'pageinfo-title' => 'Informationes pro "$1"',
-'pageinfo-not-current' => 'Information pote esser monstrate solmente pro le version actual.',
+'pageinfo-not-current' => 'Regrettabilemente, il es impossibile fornir iste information pro versiones ancian.',
 'pageinfo-header-basic' => 'Information de base',
 'pageinfo-header-edits' => 'Historia de modificationes',
 'pageinfo-header-restrictions' => 'Protection del pagina',
@@ -3016,6 +3020,7 @@ Le causa es probabilemente un ligamine verso un sito externe que es presente in
 'pageinfo-default-sort' => 'Clave de ordination predefinite',
 'pageinfo-length' => 'Dimension del pagina (in bytes)',
 'pageinfo-article-id' => 'ID del pagina',
+'pageinfo-language' => 'Lingua del contento del pagina',
 'pageinfo-robot-policy' => 'Stato del motor de recerca',
 'pageinfo-robot-index' => 'Indexabile',
 'pageinfo-robot-noindex' => 'Non indexabile',
@@ -3739,6 +3744,7 @@ Tu pote etiam [[Special:EditWatchlist|usar le editor standard]].',
 'version-license' => 'Licentia',
 'version-poweredby-credits' => "Iste wiki es actionate per '''[//www.mediawiki.org/ MediaWiki]''', copyright © 2001-$1 $2.",
 'version-poweredby-others' => 'alteres',
+'version-credits-summary' => 'Nos vole recognoscer le sequente personas pro lor contribution a [[Special:Version|MediaWiki]].',
 'version-license-info' => 'MediaWiki es software libere; vos pote redistribuer lo e/o modificar lo sub le conditiones del Licentia Public General de GNU publicate per le Free Software Foundation; version 2 del Licentia, o (a vostre option) qualcunque version posterior.
 
 Iste programma es distribuite in le sperantia que illo sia utile, ma SIN GARANTIA; sin mesmo le implicite garantia de COMMERCIALISATION o APTITUDE PRO UN PROPOSITO PARTICULAR. Vide le Licentia Public General de GNU pro plus detalios.
diff --git a/languages/messages/MessagesId.php b/languages/messages/MessagesId.php
index 2766fda4a5..3c46067d03 100644
--- a/languages/messages/MessagesId.php
+++ b/languages/messages/MessagesId.php
@@ -80,7 +80,6 @@ $magicWords = array(
 	'forcetoc'                  => array( '0', '__PAKSADAFTARISI__', '__PAKSADASI__', '__FORCETOC__' ),
 	'toc'                       => array( '0', '__DAFTARISI__', '__DASI__', '__TOC__' ),
 	'noeditsection'             => array( '0', '__TANPASUNTINGANBAGIAN__', '__NIRSUBA__', '__NOEDITSECTION__' ),
-	'noheader'                  => array( '0', '__TANPAKEPALA__', '__NIRLA__', '__NOHEADER__' ),
 	'currentmonth'              => array( '1', 'BULANKINI', 'BULANKINI2', 'BUKIN', 'BUKIN2', 'CURRENTMONTH', 'CURRENTMONTH2' ),
 	'currentmonth1'             => array( '1', 'BULANKINI1', 'BUKIN1', 'CURRENTMONTH1' ),
 	'currentmonthname'          => array( '1', 'NAMABULANKINI', 'NAMBUKIN', 'CURRENTMONTHNAME' ),
@@ -283,7 +282,6 @@ $specialPageAliases = array(
 	'Recentchanges'             => array( 'Perubahan_terbaru', 'PerubahanTerbaru', 'RC', 'PT' ),
 	'Recentchangeslinked'       => array( 'Perubahan_terkait', 'PerubahanTerkait' ),
 	'Revisiondelete'            => array( 'Hapus_revisi', 'HapusRevisi' ),
-	'RevisionMove'              => array( 'Revisi_pemindahan', 'RevisiPemindahan' ),
 	'Search'                    => array( 'Pencarian', 'Cari' ),
 	'Shortpages'                => array( 'Halaman_pendek', 'HalamanPendek' ),
 	'Specialpages'              => array( 'Halaman_istimewa', 'HalamanIstimewa' ),
@@ -984,8 +982,8 @@ Alamat IP seperti ini mungkin dipakai bersama oleh beberapa pengguna yang berbed
 Jika Anda adalah seorang pengguna anonim dan merasa mendapatkan komentar-komentar yang tidak relevan yang ditujukan langsung kepada Anda, silakan [[Special:UserLogin/signup|membuat akun]] atau [[Special:UserLogin|masuk log]] untuk menghindari kerancuan dengan pengguna anonim lainnya di lain waktu.''",
 'noarticletext' => 'Saat ini tidak ada teks di halaman ini.
 Anda dapat [[Special:Search/{{PAGENAME}}|melakukan pencarian untuk judul halaman ini]] di halaman-halaman lain, <span class="plainlinks">[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} mencari log terkait], atau [{{fullurl:{{FULLPAGENAME}}|action=edit}} menyunting halaman ini]</span>.',
-'noarticletext-nopermission' => 'Saat ini tidak ada teks di halaman ini.
-Anda dapat [[Special:Search/{{PAGENAME}}|melakukan pencarian untuk judul halaman ini]] di halaman-halaman lain, <span class="plainlinks">[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} mencari log terkait], atau [{{fullurl:{{FULLPAGENAME}}|action=edit}} menyunting halaman ini]</span>.',
+'noarticletext-nopermission' => '!Saat ini tidak ada teks di halaman ini.
+Anda dapat [[Special:Search/{{PAGENAME}}|melakukan pencarian untuk judul halaman ini]] di halaman-halaman lain, atau <span class="plainlinks">[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} mencari log terkait]</span>, tapi anda tidak memiliki izin untuk membuat halaman ini',
 'missing-revision' => 'Revisi #$1 halaman berjudul "{{PAGENAME}}" tidak eksks.
 
 Hal ini biasanya disebabkan oleh tautan versi terdahulu menuju halaman yang sudah dihapus.
diff --git a/languages/messages/MessagesIe.php b/languages/messages/MessagesIe.php
index 91bc84ad98..c6b00c10d8 100644
--- a/languages/messages/MessagesIe.php
+++ b/languages/messages/MessagesIe.php
@@ -102,7 +102,6 @@ $specialPageAliases = array(
 	'Recentchanges'             => array( 'Nov_changes' ),
 	'Recentchangeslinked'       => array( 'Changes_referet', 'Changes_relatet' ),
 	'Revisiondelete'            => array( 'Deleter_revision' ),
-	'RevisionMove'              => array( 'Mover_revision' ),
 	'Search'                    => array( 'Serchar' ),
 	'Shortpages'                => array( 'Págines_curt' ),
 	'Specialpages'              => array( 'Págines_special' ),
@@ -263,7 +262,6 @@ $messages = array(
 'qbfind' => 'Constatar',
 'qbedit' => 'Redacter',
 'qbpageoptions' => 'Págine de optiones',
-'qbpageinfo' => 'Págine de information',
 'qbmyoptions' => 'Mi optiones',
 'qbspecialpages' => 'Págines special',
 'faq' => 'FAQ',
diff --git a/languages/messages/MessagesIg.php b/languages/messages/MessagesIg.php
index b1a8e09c47..e223ec9271 100644
--- a/languages/messages/MessagesIg.php
+++ b/languages/messages/MessagesIg.php
@@ -218,7 +218,6 @@ $messages = array(
 'qbbrowse' => 'Garia',
 'qbedit' => 'Mèzi',
 'qbpageoptions' => 'Ihü nka',
-'qbpageinfo' => 'Abwátà nka',
 'qbmyoptions' => 'Ihüm',
 'qbspecialpages' => 'Ihü mkpà',
 'faq' => 'FAQ',
diff --git a/languages/messages/MessagesInh.php b/languages/messages/MessagesInh.php
index 395b33ce60..f7ce2a7c05 100644
--- a/languages/messages/MessagesInh.php
+++ b/languages/messages/MessagesInh.php
@@ -155,7 +155,6 @@ $messages = array(
 'qbbrowse' => 'БӀаргтасса',
 'qbedit' => 'Хувца',
 'qbpageoptions' => 'ОагӀува оттамаш',
-'qbpageinfo' => 'ОагӀува тохкам',
 'qbmyoptions' => 'Са оттамаш',
 'qbspecialpages' => 'ГӀулакхий оагӀувнаш',
 'faq' => 'Каст-каста хаттараш',
diff --git a/languages/messages/MessagesIo.php b/languages/messages/MessagesIo.php
index ca0f05860a..7bb15f3b19 100644
--- a/languages/messages/MessagesIo.php
+++ b/languages/messages/MessagesIo.php
@@ -234,7 +234,6 @@ $messages = array(
 'qbfind' => 'Trovez',
 'qbedit' => 'Redaktar',
 'qbpageoptions' => 'Ica pagino',
-'qbpageinfo' => 'Kuntexto',
 'qbmyoptions' => 'Mea pagini',
 'qbspecialpages' => 'Specala pagini',
 
diff --git a/languages/messages/MessagesIs.php b/languages/messages/MessagesIs.php
index 3544abcee2..40ac42d206 100644
--- a/languages/messages/MessagesIs.php
+++ b/languages/messages/MessagesIs.php
@@ -1185,7 +1185,7 @@ Sjáðu til þess að þessi breyting sameini breytingarskrárnar samfellt.',
 'shown-title' => 'Sýna $1 {{PLURAL:$1|niðurstöðu|niðurstöður}} á hverri síðu',
 'viewprevnext' => 'Skoða ($1 {{int:pipe-separator}} $2) ($3).',
 'searchmenu-legend' => 'Leitarvalmöguleikar',
-'searchmenu-exists' => "'''Það er síða að nafni „[[$1]]“ á þessum wiki'''",
+'searchmenu-exists' => "'''Það er síða að nafni „[[:$1]]“ á þessum wiki'''",
 'searchmenu-new' => "'''Skapaðu síðuna \"[[:\$1]]\" á þessum wiki!'''",
 'searchhelp-url' => 'Help:Efnisyfirlit',
 'searchmenu-prefix' => '[[Special:PrefixIndex/$1|Leita að síðum með þessu forskeyti]]',
diff --git a/languages/messages/MessagesIt.php b/languages/messages/MessagesIt.php
index 5eaedf2809..769c25f694 100644
--- a/languages/messages/MessagesIt.php
+++ b/languages/messages/MessagesIt.php
@@ -316,7 +316,7 @@ $messages = array(
 
 'underline-always' => 'Sempre',
 'underline-never' => 'Mai',
-'underline-default' => 'Mantieni le impostazioni del browser',
+'underline-default' => 'Mantieni le impostazioni del browser o della skin',
 
 # Font style option in Special:Preferences
 'editfont-style' => 'Stile del carattere nella casella di modifica:',
@@ -401,8 +401,8 @@ $messages = array(
 'newwindow' => '(si apre in una nuova finestra)',
 'cancel' => 'Annulla',
 'moredotdotdot' => 'Altro...',
-'mypage' => 'La mia pagina',
-'mytalk' => 'mie discussioni',
+'mypage' => 'Pagina',
+'mytalk' => 'discussioni',
 'anontalk' => 'Discussioni per questo IP',
 'navigation' => 'Navigazione',
 'and' => '&#32;e',
@@ -941,7 +941,7 @@ L'ultimo elemento del registro dei blocchi è riportato di seguito per informazi
 'note' => "'''Nota:'''",
 'previewnote' => "'''Ricorda che questa è solo un'anteprima.'''
 Le tue modifiche NON sono ancora state salvate!",
-'continue-editing' => 'Continua a modificare',
+'continue-editing' => "Vai all'area di modifica",
 'previewconflict' => 'L\'anteprima corrisponde al testo presente nella casella di modifica superiore e rappresenta la pagina come apparirà se si sceglie di premere "Salva la pagina" in questo momento.',
 'session_fail_preview' => "'''Non è stato possibile elaborare la modifica perché sono andati persi i dati relativi alla sessione.
 Riprovare.
@@ -1538,6 +1538,9 @@ Il tuo indirizzo non viene rivelato quando gli altri utenti ti contattano.',
 'rightslogtext' => 'Di seguito sono elencate le modifiche ai diritti assegnati agli utenti.',
 'rightslogentry' => "ha modificato l'appartenenza di $1 dal gruppo $2 al gruppo $3",
 'rightslogentry-autopromote' => 'è stato/a automaticamente promosso/a da $2 a $3',
+'logentry-rights-rights' => "$1 ha modificato l'appartenenza di $3 dal gruppo $4 al gruppo $5",
+'logentry-rights-rights-legacy' => "$1 ha modificato l'appartenenza a gruppi di $3",
+'logentry-rights-autopromote' => '$1 è stato/a automaticamente promosso/a da $4 a $5',
 'rightsnone' => '(nessuno)',
 
 # Associated actions - in the sentence "You do not have permission to X"
@@ -2153,7 +2156,7 @@ Vedi anche le [[Special:WantedCategories|categorie richieste]].',
 'linksearch-ok' => 'Cerca',
 'linksearch-text' => 'È possibile fare uso di metacaratteri, ad esempio "*.wikipedia.org".<br />
 È necessario almeno un dominio di primo livello, ad esempio "*.org".<br />
-Protocolli supportati: <code>$1</code> (non aggiungere nessuno di questi nella tua ricerca).',
+Protocolli supportati: <code>$1</code> (predefinito http:// se nessun protocollo è specificato).',
 'linksearch-line' => '$1 presente nella pagina $2',
 'linksearch-error' => "I metacaratteri possono essere usati solo all'inizio dell'indirizzo.",
 
@@ -2202,7 +2205,7 @@ Potrebbero esserci [[{{MediaWiki:Listgrouprights-helppage}}|ulteriori informazio
 'emailuser-title-target' => 'Invia una e-mail a questo {{GENDER:$1|utente}}',
 'emailuser-title-notarget' => 'Invia una e-mail a un utente',
 'emailpage' => "Invia un messaggio e-mail all'utente",
-'emailpagetext' => 'Usare il modulo sottostante per inviare un messaggio e-mail all\'utente indicato. L\'indirizzo specificato nelle [[Special:Preferences|preferenze]] del mittente apparirà nel campo "Da:" del messaggio per consentire al destinatario di rispondere direttamente.',
+'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.',
 'usermailererror' => "L'oggetto mail ha restituito l'errore:",
 'defemailsubject' => 'Messaggio da {{SITENAME}} dall\'utente "$1"',
 'usermaildisabled' => 'e-mail utente disabilitata',
@@ -2484,7 +2487,7 @@ $1',
 # Contributions
 'contributions' => 'Contributi utente',
 'contributions-title' => 'Contributi di $1',
-'mycontris' => 'miei contributi',
+'mycontris' => 'contributi',
 'contribsub2' => 'Per $1 ($2)',
 'nocontribs' => 'Non sono state trovate modifiche che soddisfino i criteri di ricerca.',
 'uctop' => '(ultima per la pagina)',
@@ -2523,7 +2526,7 @@ $1',
 'whatlinkshere-hideredirs' => '$1 redirect',
 'whatlinkshere-hidetrans' => '$1 inclusioni',
 'whatlinkshere-hidelinks' => '$1 link',
-'whatlinkshere-hideimages' => '$1 link da immagini',
+'whatlinkshere-hideimages' => '$1 link da file',
 'whatlinkshere-filters' => 'Filtri',
 
 # Block/unblock
@@ -3002,7 +3005,7 @@ Tutte le operazioni di importazione trans-wiki sono registrate nel [[Special:Log
 
 # Info page
 'pageinfo-title' => 'Informazioni per "$1"',
-'pageinfo-not-current' => 'Le informazioni possono essere visualizzate solo per la versione corrente.',
+'pageinfo-not-current' => "Spiacente, ma è impossibile fornire quest'informazione per vecchie versioni.",
 'pageinfo-header-basic' => 'Informazioni di base',
 'pageinfo-header-edits' => 'Cronologia delle modifiche',
 'pageinfo-header-restrictions' => 'Protezione della pagina',
@@ -3011,11 +3014,12 @@ Tutte le operazioni di importazione trans-wiki sono registrate nel [[Special:Log
 'pageinfo-default-sort' => 'Criterio di ordinamento predefinito',
 'pageinfo-length' => 'Lunghezza della pagina (in byte)',
 'pageinfo-article-id' => 'ID della pagina',
+'pageinfo-language' => 'Lingua del contenuto della pagina',
 'pageinfo-robot-policy' => 'Stato per i motori di ricerca',
 'pageinfo-robot-index' => 'Indicizzabile',
 'pageinfo-robot-noindex' => 'Non indicizzabile',
 'pageinfo-views' => 'Numero di visualizzazioni',
-'pageinfo-watchers' => 'Numero di utenti che hanno la pagina nei loro Osservati Speciali',
+'pageinfo-watchers' => 'Numero di utenti che hanno la pagina nei loro osservati speciali',
 'pageinfo-redirects-name' => 'Redirect a questa pagina',
 'pageinfo-subpages-name' => 'Sottopagine di questa pagina',
 'pageinfo-subpages-value' => '$1 ($2 {{PLURAL:$2|redirect}}; $3 {{PLURAL:$3|non redirect}})',
@@ -3734,6 +3738,7 @@ Si noti che è anche possibile [[Special:EditWatchlist|modificare la lista con l
 'version-license' => 'Licenza',
 'version-poweredby-credits' => "Questo wiki è realizzato con '''[//www.mediawiki.org/ MediaWiki]''', copyright © 2001-$1 $2.",
 'version-poweredby-others' => 'altri',
+'version-credits-summary' => 'Siamo lieti di riconoscere le seguenti persone per aver contribuito a [[Special:Version|MediaWiki]].',
 'version-license-info' => 'MediaWiki è un software libero; puoi redistribuirlo e/o modificarlo secondo i termini della GNU General Public License, come pubblicata dalla Free Software Foundation; o la versione 2 della Licenza o (a propria scelta) qualunque versione successiva.
 
 MediaWiki è distribuito nella speranza che sia utile, ma SENZA ALCUNA GARANZIA; senza neppure la garanzia implicita di NEGOZIABILITÀ o di APPLICABILITÀ PER UN PARTICOLARE SCOPO. Si veda la GNU General Public License per maggiori dettagli.
diff --git a/languages/messages/MessagesJa.php b/languages/messages/MessagesJa.php
index 608cf6bdbf..4199820209 100644
--- a/languages/messages/MessagesJa.php
+++ b/languages/messages/MessagesJa.php
@@ -179,7 +179,6 @@ $specialPageAliases = array(
 	'Recentchanges'             => array( '最近の更新', '最近更新したページ' ),
 	'Recentchangeslinked'       => array( '関連ページの更新状況', 'リンク先の更新状況' ),
 	'Revisiondelete'            => array( '版指定削除', '特定版削除' ),
-	'RevisionMove'              => array( '版移動' ),
 	'Search'                    => array( '検索' ),
 	'Shortpages'                => array( '短いページ' ),
 	'Specialpages'              => array( '特別ページ一覧' ),
@@ -218,7 +217,6 @@ $magicWords = array(
 	'forcetoc'                  => array( '0', '__目次強制__', '＿＿目次強制＿＿', '__FORCETOC__' ),
 	'toc'                       => array( '0', '__目次__', '＿＿目次＿＿', '__TOC__' ),
 	'noeditsection'             => array( '0', '__節編集非表示__', '__セクション編集非表示__', '＿＿セクション編集非表示＿＿', '__NOEDITSECTION__' ),
-	'noheader'                  => array( '0', '__見出し非表示__', '＿＿見出し非表示＿＿', '__NOHEADER__' ),
 	'currentmonth'              => array( '1', '現在の月', '協定月', 'CURRENTMONTH', 'CURRENTMONTH2' ),
 	'currentmonth1'             => array( '1', '現在の月1', '協定月1', '協定月１', 'CURRENTMONTH1' ),
 	'currentmonthname'          => array( '1', '現在の月名', '協定月名', 'CURRENTMONTHNAME' ),
@@ -292,7 +290,7 @@ $magicWords = array(
 	'img_text_bottom'           => array( '1', '文下端', 'text-bottom' ),
 	'img_link'                  => array( '1', 'リンク=$1', 'link=$1' ),
 	'img_alt'                   => array( '1', '代替文=$1', 'alt=$1' ),
-	'int'                       => array( '0', 'インターフェース:', 'インタ:', 'インターフェース：', 'インタ：', 'INT:' ),
+	'int'                       => array( '0', 'インターフェース:', 'インタ:', 'インターフェース：', 'インタ：', 'インターフェイス:', 'インターフェイス：', 'INT:' ),
 	'sitename'                  => array( '1', 'サイト名', 'サイトネーム', 'SITENAME' ),
 	'ns'                        => array( '0', '名前空間:', '名前空間：', '名空:', '名空：', 'NS:' ),
 	'nse'                       => array( '0', '名前空間E:', 'NSE:' ),
@@ -359,7 +357,7 @@ $magicWords = array(
 	'formatdate'                => array( '0', '日付整形', 'formatdate', 'dateformat' ),
 	'url_path'                  => array( '0', 'パス', 'PATH' ),
 	'url_wiki'                  => array( '0', 'ウィキ', 'WIKI' ),
-	'url_query'                 => array( '0', 'クエリー', 'QUERY' ),
+	'url_query'                 => array( '0', 'クエリ', 'クエリー', 'QUERY' ),
 );
 
 $messages = array(
@@ -412,7 +410,7 @@ $messages = array(
 
 'underline-always' => '常に付ける',
 'underline-never' => '常に付けない',
-'underline-default' => 'ブラウザーの設定を使用',
+'underline-default' => '外装またはブラウザーの既定値を使用',
 
 # Font style option in Special:Preferences
 'editfont-style' => '編集エリアのフォント:',
@@ -497,8 +495,8 @@ $messages = array(
 'newwindow' => '(新しいウィンドウで開きます)',
 'cancel' => '中止',
 'moredotdotdot' => '続き...',
-'mypage' => '自分のページ',
-'mytalk' => '自分のトーク',
+'mypage' => 'ページ',
+'mytalk' => 'トーク',
 'anontalk' => 'このIPアドレスのトーク',
 'navigation' => '案内',
 'and' => '&#32;および&#32;',
@@ -1064,9 +1062,9 @@ IP アドレスは複数の利用者で共有されている場合がありま
 'blocked-notice-logextract' => 'この利用者は現在ブロックされています。
 参考のために最新のブロック記録を以下に表示します：',
 'clearyourcache' => "'''注意:''' 保存後、変更を確認するにはブラウザーのキャッシュを消去する必要がある場合があります。
-* '''Firefox / Safari:''' ''Shift'' を押しながら ''再読み込み'' をクリックする、もしくは ''Ctrl-F5'' か ''Ctrl-R'' を押してください (Macでは ''&#x2318;-R'' )
-* '''Google Chrome:''' ''Ctrl-Shift-R'' を押してください (Macでは ''&#x2318;-Shift-R'' )
-* '''Internet Explorer:''' ''Ctrl'' を押しながら ''最新の情報に更新'' をクリックする、もしくは ''Ctrl-F5'' を押してください
+* '''Firefox / Safari:''' ''Shift'' を押しながら ''再読み込み'' をクリックするか、''Ctrl-F5'' または ''Ctrl-R'' を押してください (Mac では ''&#x2318;-R'')
+* '''Google Chrome:''' ''Ctrl-Shift-R'' を押してください (Mac では ''&#x2318;-Shift-R'')
+* '''Internet Explorer:''' ''Ctrl'' を押しながら ''最新の情報に更新'' をクリックするか、''Ctrl-F5'' を押してください
 * '''Opera:''' ''ツール → 設定'' からキャッシュをクリアしてください。",
 'usercssyoucanpreview' => "'''ヒント：'''「{{int:showpreview}}」ボタンを使うと、保存前に新しいスタイルシートを試験できます。",
 'userjsyoucanpreview' => "'''ヒント:''' 「{{int:showpreview}}」ボタンを使うと、保存前に新しいスクリプトを試験できます。",
@@ -1083,7 +1081,7 @@ IP アドレスは複数の利用者で共有されている場合がありま
 'updated' => '（更新）',
 'note' => "'''お知らせ：'''",
 'previewnote' => "'''これはプレビューです。'''
-変更箇所はまだ保存されていません！",
+変更内容はまだ保存されていません!",
 'continue-editing' => '編集を続行',
 'previewconflict' => 'これは、上の編集エリアの文章を保存した場合にどう表示されるかを示すプレビューです。',
 'session_fail_preview' => "'''申し訳ありません！セッションデータが消失したため編集を処理できませんでした。'''
@@ -1333,11 +1331,11 @@ $1",
 'revdelete-concurrent-change' => '$1$2の項目の変更に失敗しました：あなたが変更しようとしている間に、他の誰かが変更したようです。
 記録を確認してください。',
 'revdelete-only-restricted' => '$1$2の項目の版指定削除に失敗しました：他の閲覧レベルの選択肢のうちどれかをさらに選択しなければ、管理者から項目を秘匿できません。',
-'revdelete-reason-dropdown' => '
-*よくある削除理由
+'revdelete-reason-dropdown' => '*よくある削除理由
 ** 著作権侵害
-** 名誉毀損のおそれ
-** 非公開個人情報',
+** 不適切なコメントや個人情報の開示
+** 不適切な利用者名
+** 名誉毀損のおそれ',
 'revdelete-otherreason' => '他の、または追加の理由：',
 'revdelete-reasonotherlist' => 'その他の理由',
 'revdelete-edit-reasonlist' => '削除理由を編集',
@@ -1425,26 +1423,26 @@ $1",
 'searchprofile-articles-tooltip' => '$1内を検索',
 'searchprofile-project-tooltip' => '$1内を検索',
 'searchprofile-images-tooltip' => 'ファイルを検索',
-'searchprofile-everything-tooltip' => '全本文ページ（トークページ含む）を検索',
+'searchprofile-everything-tooltip' => '全本文ページ (トークページを含む) 内を検索',
 'searchprofile-advanced-tooltip' => '特定の名前空間内を検索',
-'search-result-size' => '$1（{{PLURAL:$2|$2単語}}）',
-'search-result-category-size' => '{{PLURAL:$1|$1件}}（{{PLURAL:$2|$2下位カテゴリ}}、{{PLURAL:$3|$3ファイル}}）',
-'search-result-score' => '関連度：$1%',
+'search-result-size' => '$1 ({{PLURAL:$2|$2 単語}})',
+'search-result-category-size' => '{{PLURAL:$1|$1 件}} ({{PLURAL:$2|$2 下位カテゴリ}}、{{PLURAL:$3|$3 ファイル}})',
+'search-result-score' => '関連度: $1%',
 'search-redirect' => '($1からのリダイレクト)',
 'search-section' => '($1の節)',
-'search-suggest' => 'もしかして：$1',
+'search-suggest' => 'もしかして: $1',
 'search-interwiki-caption' => '姉妹プロジェクト',
-'search-interwiki-default' => '$1の結果：',
+'search-interwiki-default' => '$1の結果:',
 'search-interwiki-more' => '(続き)',
 'search-relatedarticle' => '関連',
 'mwsuggest-disable' => 'Ajaxによる検索候補の提示を無効にする',
 'searcheverything-enable' => 'すべての名前空間を検索',
 'searchrelated' => '関連',
 'searchall' => 'すべて',
-'showingresults' => "'''$2''' 件目以降の {{PLURAL:$1|'''$1''' 件の結果}}を表示しています。",
+'showingresults' => "'''$2''' 件目以降の最大 {{PLURAL:$1|'''$1''' 件の結果}}を表示しています。",
 'showingresultsnum' => "'''$2''' 件目以降の {{PLURAL:$3|'''$3''' 件の結果}}を表示しています。",
 'showingresultsheader' => "「'''$4'''」の検索結果 {{PLURAL:$5|'''$3''' 件中の '''$1''' 件目|'''$3''' 件中の '''$1''' 件目から '''$2''' 件目}}",
-'nonefound' => "'''注意'''：既定では一部の名前空間のみを検索します。
+'nonefound' => "'''注意''': 既定では一部の名前空間のみを検索します。
 ''all:''を前に付けると、すべて（トークページやテンプレートなどを含む）を対象にできます。検索する名前空間を前に付けることもできます。",
 'search-nonefound' => '問い合わせに合致する検索結果はありませんでした。',
 'powersearch' => '高度な検索',
@@ -1489,7 +1487,7 @@ $1",
 'prefs-watchlist-days' => 'ウォッチリストの表示日数:',
 'prefs-watchlist-days-max' => '最大 $1 {{PLURAL:$1|日間}}',
 'prefs-watchlist-edits' => '拡張ウォッチリストの表示件数:',
-'prefs-watchlist-edits-max' => '最大数：1000',
+'prefs-watchlist-edits-max' => '最大数: 1000',
 'prefs-watchlist-token' => 'ウォッチリストのトークン:',
 'prefs-misc' => 'その他',
 'prefs-resetpass' => 'パスワードを変更',
@@ -1505,7 +1503,7 @@ $1",
 'rows' => '行数:',
 'columns' => '列数:',
 'searchresultshead' => '検索',
-'resultsperpage' => '1ページあたりの表示件数：',
+'resultsperpage' => '1 ページあたりの表示件数:',
 'stub-threshold' => '<a href="#" class="stub">スタブリンク</a>として表示する閾値 (バイト):',
 'stub-threshold-disabled' => '無効',
 'recentchangesdays' => '最近の更新に表示する日数:',
@@ -1514,7 +1512,7 @@ $1",
 'prefs-help-recentchangescount' => 'この設定は最近の更新、ページの履歴、および記録に適用されます。',
 'prefs-help-watchlist-token' => 'この欄に秘密鍵を入力すると、あなたのウォッチリストのRSSフィードが生成されます。
 この欄に入力されている鍵を知っている人は誰でもこのウォッチリストを閲覧できるようになるため、他人に分からない値を選んでください。
-乱数によって生成された次の値を使うこともできます：$1',
+乱数によって生成された次の値を使うこともできます: $1',
 'savedprefs' => '個人設定を保存しました。',
 'timezonelegend' => 'タイムゾーン:',
 'localtime' => 'ローカルの時刻:',
@@ -1567,7 +1565,7 @@ $1 {{PLURAL:$1|文字}}以下である必要があります。',
 'gender-unknown' => '未指定',
 'gender-male' => '男',
 'gender-female' => '女',
-'prefs-help-gender' => '省略可：ソフトウェアによる文法的性の解決に使用されます。
+'prefs-help-gender' => '省略可: ソフトウェアによる文法的性の解決に使用されます。
 この情報は公開されます。',
 'email' => 'メール',
 'prefs-help-realname' => '本名は省略できます。
@@ -1598,18 +1596,19 @@ $1 {{PLURAL:$1|文字}}以下である必要があります。',
 # User rights
 'userrights' => '利用者権限を管理',
 'userrights-lookup-user' => '利用者グループを管理',
-'userrights-user-editname' => '利用者名を入力：',
+'userrights-user-editname' => '利用者名を入力:',
 'editusergroup' => '利用者グループを編集',
 'editinguser' => "利用者''' [[User:$1|$1]]''' $2 の権限を変更",
 'userrights-editusergroup' => '利用者グループを編集',
 'saveusergroups' => '利用者グループを保存',
-'userrights-groupsmember' => '所属グループ：',
-'userrights-groupsmember-auto' => '自動的に付与される権限：',
+'userrights-groupsmember' => '所属グループ:',
+'userrights-groupsmember-auto' => '自動的に付与される権限:',
+'userrights-groupsmember-type' => '$1',
 'userrights-groups-help' => 'この利用者が属するグループを変更できます。
 * チェックが入っているボックスは、この利用者がそのグループに属していることを意味します。
 * チェックが入っていないボックスは、この利用者がそのグループに属していないことを意味します。
 * 「*」はグループに一旦追加した場合に除去（あるいはその逆）ができないことを示しています。',
-'userrights-reason' => '理由：',
+'userrights-reason' => '理由:',
 'userrights-no-interwiki' => '他ウィキ上における利用者権限の編集権限はありません。',
 'userrights-nodatabase' => 'データベース$1は存在しないか、ローカル上にありません。',
 'userrights-nologin' => '利用者権限を付与するには、管理者アカウントで[[Special:UserLogin|ログイン]]する必要があります。',
@@ -1619,7 +1618,7 @@ $1 {{PLURAL:$1|文字}}以下である必要があります。',
 'userrights-irreversible-marker' => '$1*',
 
 # Groups
-'group' => 'グループ：',
+'group' => 'グループ:',
 'group-user' => '登録利用者',
 'group-autoconfirmed' => '自動承認された利用者',
 'group-bot' => 'ボット',
@@ -1709,6 +1708,9 @@ $1 {{PLURAL:$1|文字}}以下である必要があります。',
 'rightslogtext' => '以下は利用者権限の変更記録です。',
 'rightslogentry' => '$1 の所属グループを $2 から $3 に変更しました',
 'rightslogentry-autopromote' => '$2 から $3 に自動的に昇格しました',
+'logentry-rights-rights' => '$1 が $3 の所属グループを $4 から $5 に変更しました',
+'logentry-rights-rights-legacy' => '$1 が $3 の所属グループを変更しました',
+'logentry-rights-autopromote' => '$1 が $4 から $5 に自動的に昇格しました',
 'rightsnone' => '(なし)',
 
 # Associated actions - in the sentence "You do not have permission to X"
@@ -1759,7 +1761,7 @@ $1 {{PLURAL:$1|文字}}以下である必要があります。',
 'recentchanges-label-bot' => 'この編集はボットによって行われました',
 'recentchanges-label-unpatrolled' => 'この編集はまだ巡回されていません',
 'rcnote' => "$4 $5 までの{{PLURAL:$2|'''$2'''日間}}になされた{{PLURAL:$1|'''$1'''件の変更}}は以下の通りです。",
-'rcnotefrom' => "以下は、'''$2'''以降の更新です（最大'''$1'''件）。",
+'rcnotefrom' => "以下は'''$2'''以降の更新です (最大 '''$1''' 件)。",
 'rclistfrom' => '$1以降の更新を表示する',
 'rcshowhideminor' => '細部の編集を$1',
 'rcshowhidebots' => 'ボットを$1',
@@ -1794,7 +1796,7 @@ $1 {{PLURAL:$1|文字}}以下である必要があります。',
 'recentchangeslinked-noresult' => '指定期間中に指定ページのリンク先に変更はありませんでした。',
 'recentchangeslinked-summary' => "これは指定したページからリンクされている（または指定したカテゴリに含まれている）ページの最近の変更の一覧です。
 [[Special:Watchlist|自分のウォッチリスト]]にあるページは'''太字'''で表示されます。",
-'recentchangeslinked-page' => 'ページ名：',
+'recentchangeslinked-page' => 'ページ名:',
 'recentchangeslinked-to' => '指定したページの「リンク元」ページの変更を表示',
 
 # Upload
@@ -1807,16 +1809,16 @@ $1 {{PLURAL:$1|文字}}以下である必要があります。',
 'upload_directory_missing' => 'アップロード先ディレクトリ ($1) が見つかりませんでした。ウェブ サーバーによる作成もできませんでした。',
 'upload_directory_read_only' => 'アップロード先ディレクトリ（$1）には、ウェブサーバーが書き込めません。',
 'uploaderror' => 'アップロードのエラー',
-'upload-recreate-warning' => "'''警告：その名前のファイルは、以前に削除または移動されています。'''
+'upload-recreate-warning' => "'''警告: その名前のファイルは、以前に削除または移動されています。'''
 
-参考のため、このページの削除と移動の記録を以下に示します：",
-'uploadtext' => "ファイルをアップロードするには、以下のフォームを利用してください。
-以前にアップロードされたファイルの表示と検索には[[Special:FileList|{{int:listfiles}}]]を使用し、（再）アップロードは[[Special:Log/upload|アップロード記録]]に、削除は[[Special:Log/delete|削除記録]]にも記録されます。
+参考のため、このページの削除と移動の記録を以下に示します:",
+'uploadtext' => "ファイルをアップロードするには、以下のフォームを使用してください。
+以前にアップロードされたファイルの表示と検索には[[Special:FileList|{{int:listfiles}}]]を使用してください。(再) アップロードは[[Special:Log/upload|アップロード記録]]に、削除は[[Special:Log/delete|削除記録]]にも記録されます。
 
-ページにファイルを入れるには、以下の書式のリンクを使用してください：
-* '''<code><nowiki>[[</nowiki>{{ns:file}}:<nowiki>File.jpg]]</nowiki></code>'''とすると、ファイルが完全なままで使用されます
-* '''<code><nowiki>[[</nowiki>{{ns:file}}:<nowiki>File.png|200px|thumb|left|代替文]]</nowiki></code>'''とすると、200ピクセルの幅に修正された状態で、左寄せの枠内に、「代替文」が説明として使用されます。
-* '''<code><nowiki>[[</nowiki>{{ns:media}}:<nowiki>File.ogg]]</nowiki></code>'''とするとファイルを表示せずに直接ファイルへリンクします",
+ページにファイルを入れるには、以下の書式のリンクを使用してください:
+* '''<code><nowiki>[[</nowiki>{{ns:file}}:<nowiki>File.jpg]]</nowiki></code>''' とすると、ファイルが完全なままで使用されます
+* '''<code><nowiki>[[</nowiki>{{ns:file}}:<nowiki>File.png|200px|thumb|left|代替文]]</nowiki></code>''' とすると、200ピクセルの幅に修正された状態で、左寄せの枠内に、「代替文」が説明として使用されます。
+* '''<code><nowiki>[[</nowiki>{{ns:media}}:<nowiki>File.ogg]]</nowiki></code>''' とすると、ファイルを表示せずにそのファイルに直接リンクします",
 'upload-permitted' => '許可されているファイル形式: $1。',
 'upload-preferred' => '推奨されているファイル形式: $1。',
 'upload-prohibited' => '禁止されているファイル形式: $1。',
@@ -1946,7 +1948,7 @@ $1',
 'upload-file-error' => '内部エラー',
 'upload-file-error-text' => '内部エラーのため、サーバー上の一時ファイル作成に失敗しました。
 [[Special:ListUsers/sysop|管理者]]に連絡してください。',
-'upload-misc-error' => '不明なアップロードのエラー',
+'upload-misc-error' => '不明なアップロードエラー',
 'upload-misc-error-text' => 'アップロード中に不明なエラーが発生しました。
 指定した URL が正しいこととアクセスできることを確認して、もう一度試してください。
 それでもこのエラーが発生する場合は、[[Special:ListUsers/sysop|管理者]]に連絡してください。',
@@ -2352,26 +2354,26 @@ contenttype/subtypeの形式で入力してください（例：<code>image/jpeg
 
 # Special:LinkSearch
 'linksearch' => '外部リンクの検索',
-'linksearch-pat' => '検索パターン：',
+'linksearch-pat' => '検索パターン:',
 'linksearch-ns' => '名前空間:',
 'linksearch-ok' => '検索',
-'linksearch-text' => '"*.wikipedia.org" のようにワイルドカードを使用できます。
-少なくとも "*.org" のようなトップレベルドメインが必要です。<br />
-対応プロトコル: <code>$1</code> (これらを検索に含めないでください)。',
+'linksearch-text' => '「*.wikipedia.org」のようにワイルドカードを使用できます。
+少なくとも「*.org」のようなトップレベルドメインが必要です。<br />
+対応プロトコル: <code>$1</code> (プロトコルを省略した場合の既定値は http:// )。',
 'linksearch-line' => '$1 が $2 からリンクされています',
 'linksearch-error' => 'ワイルドカードはホスト名の先頭でのみ使用できます。',
 
 # Special:ListUsers
-'listusersfrom' => '最初に表示する利用者：',
+'listusersfrom' => '最初に表示する利用者:',
 'listusers-submit' => '表示',
 'listusers-noresult' => '利用者が見つかりませんでした。',
-'listusers-blocked' => '（ブロック中）',
+'listusers-blocked' => '(ブロック中)',
 
 # Special:ActiveUsers
 'activeusers' => '活動中の利用者一覧',
 'activeusers-intro' => 'これは過去 $1 {{PLURAL:$1|日|日間}}に何らかの活動をした利用者の一覧です。',
 'activeusers-count' => '過去 {{PLURAL:$3|1 日|$3 日間}}に $1 {{PLURAL:$1|回の編集}}',
-'activeusers-from' => '最初に表示する利用者：',
+'activeusers-from' => '最初に表示する利用者:',
 'activeusers-hidebots' => 'ボットを隠す',
 'activeusers-hidesysops' => '管理者を隠す',
 'activeusers-noresult' => '利用者が見つかりませんでした。',
@@ -2706,7 +2708,7 @@ $1',
 # Contributions
 'contributions' => '利用者の投稿記録',
 'contributions-title' => '$1の投稿記録',
-'mycontris' => '自分の投稿記録',
+'mycontris' => '投稿記録',
 'contribsub2' => '利用者: $1 ($2)',
 'nocontribs' => 'これらの条件に一致する変更は見つかりませんでした。',
 'uctop' => '(最新)',
@@ -2747,7 +2749,7 @@ $1',
 'whatlinkshere-hideredirs' => '転送ページを$1',
 'whatlinkshere-hidetrans' => '参照読み込みを$1',
 'whatlinkshere-hidelinks' => 'リンクを$1',
-'whatlinkshere-hideimages' => '画像リンクを$1',
+'whatlinkshere-hideimages' => 'ファイルへのリンクを$1',
 'whatlinkshere-filters' => '絞り込み',
 
 # Block/unblock
@@ -2801,7 +2803,7 @@ $1',
 'unblockiptext' => '以下のフォームで利用者またはIPアドレスのブロックを解除できます。',
 'ipusubmit' => 'このブロックを解除',
 'unblocked' => '[[User:$1|$1]]のブロックを解除しました',
-'unblocked-range' => '$1のブロックは解除されています',
+'unblocked-range' => '$1のブロックを解除しました',
 'unblocked-id' => 'ブロック$1は除去されました',
 'blocklist' => 'ブロックされている利用者',
 'ipblocklist' => 'ブロックされている利用者',
@@ -3252,7 +3254,7 @@ MediaWiki 全般のローカライズ（地域化）に貢献したい場合は
 
 # Info page
 'pageinfo-title' => '「$1」の情報',
-'pageinfo-not-current' => '現在のバージョンの情報のみが表示される可能性があります。',
+'pageinfo-not-current' => '申し訳ありませんが、過去の版の情報は表示できません。',
 'pageinfo-header-basic' => '基本情報',
 'pageinfo-header-edits' => '編集履歴',
 'pageinfo-header-restrictions' => 'ページの保護',
@@ -3261,16 +3263,17 @@ MediaWiki 全般のローカライズ（地域化）に貢献したい場合は
 'pageinfo-default-sort' => '既定のソートキー',
 'pageinfo-length' => 'ページの長さ (バイト単位)',
 'pageinfo-article-id' => 'ページ ID',
+'pageinfo-language' => 'ページ本文の言語',
 'pageinfo-robot-policy' => '検索エンジンの状態',
-'pageinfo-robot-index' => 'インデックス可能',
-'pageinfo-robot-noindex' => 'インデックス不可',
+'pageinfo-robot-index' => '検索エンジンに収集される',
+'pageinfo-robot-noindex' => '検索エンジンに収集されない',
 'pageinfo-views' => '閲覧回数',
 'pageinfo-watchers' => 'ページをウォッチリストに入れている人数',
-'pageinfo-redirects-name' => 'このページへのリダイレクト',
+'pageinfo-redirects-name' => 'このページへのリダイレクト数',
 'pageinfo-redirects-value' => '$1',
 'pageinfo-subpages-name' => 'このページの下位ページ数',
-'pageinfo-subpages-value' => '$1 ($2 {{PLURAL:$2|リダイレクト}}、$3 {{PLURAL:$3|非リダイレクト}})',
-'pageinfo-firstuser' => 'ページ作成者',
+'pageinfo-subpages-value' => '$1 ($2 {{PLURAL:$2|件のリダイレクト}}、$3 {{PLURAL:$3|件の非リダイレクト}})',
+'pageinfo-firstuser' => 'ページの作成者',
 'pageinfo-firsttime' => 'ページの作成日時',
 'pageinfo-lastuser' => '最終編集者',
 'pageinfo-lasttime' => '最終編集日時',
@@ -3280,7 +3283,7 @@ MediaWiki 全般のローカライズ（地域化）に貢献したい場合は
 'pageinfo-recent-authors' => '最近の投稿者数',
 'pageinfo-magic-words' => 'マジック {{PLURAL:$1|ワード}} ($1)',
 'pageinfo-hidden-categories' => '隠し{{PLURAL:$1|カテゴリ}} ($1)',
-'pageinfo-templates' => '参照読み込みされた{{PLURAL:$1|テンプレート}} ($1)',
+'pageinfo-templates' => '参照読み込みされている{{PLURAL:$1|テンプレート}} ($1)',
 'pageinfo-toolboxlink' => 'ページ情報',
 'pageinfo-redirectsto' => '転送先',
 'pageinfo-redirectsto-info' => '情報',
@@ -3335,13 +3338,13 @@ $1',
 # Media information
 'mediawarning' => "'''警告：'''この種類のファイルは悪意のあるコードを含んでいる可能性があります。
 実行するとシステムが危険にさらされる可能性があります。",
-'imagemaxsize' => "画像のサイズ制限：<br />''（ファイルページに対する）''",
-'thumbsize' => 'サムネイルの大きさ：',
+'imagemaxsize' => "画像のサイズ制限: <br />''(ファイルページに対する)''",
+'thumbsize' => 'サムネイルの大きさ:',
 'widthheight' => '$1 × $2',
 'widthheightpage' => '$1 × $2、$3 {{PLURAL:$3|ページ}}',
-'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-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' => '高解像度版はありません。',
 'svg-long-desc' => 'SVG ファイル、$1 × $2 ピクセル、ファイルサイズ: $3',
 'svg-long-desc-animated' => 'アニメーション SVG ファイル、$1 × $2 ピクセル、ファイルサイズ: $3',
@@ -4033,8 +4036,8 @@ $5
 'watchlistedit-raw-titles' => 'ページ名：',
 'watchlistedit-raw-submit' => 'ウォッチリストを更新',
 'watchlistedit-raw-done' => 'ウォッチリストを更新しました。',
-'watchlistedit-raw-added' => '{{PLURAL:$1|$1 件のページ}}を追加しました：',
-'watchlistedit-raw-removed' => '{{PLURAL:$1|$1 件のページ}}を除去しました：',
+'watchlistedit-raw-added' => '{{PLURAL:$1|$1 ページ}}を追加しました：',
+'watchlistedit-raw-removed' => '{{PLURAL:$1|$1 ページ}}を除去しました：',
 
 # Watchlist editing tools
 'watchlisttools-view' => '関連する変更を閲覧',
@@ -4122,10 +4125,11 @@ $5
 'version-parser-function-hooks' => 'パーサー関数フック',
 'version-hook-name' => 'フック名',
 'version-hook-subscribedby' => '使用個所',
-'version-version' => '（バージョン$1）',
+'version-version' => '(バージョン $1)',
 'version-license' => 'ライセンス',
 'version-poweredby-credits' => "このウィキは、'''[//www.mediawiki.org/ MediaWiki]'''(copyright © 2001-$1 $2)で動作しています。",
 'version-poweredby-others' => 'その他',
+'version-credits-summary' => '[[Special:Version|MediaWiki]] に貢献した以下の人たちに感謝します。',
 'version-license-info' => 'MediaWikiはフリーソフトウェアです。あなたは、フリーソフトウェア財団の発行するGNU一般公衆利用許諾書 (GNU General Public License)（バージョン2、またはそれ以降のライセンス）の規約に基づき、このライブラリを再配布および改変できます。
 
 MediaWikiは、有用であることを期待して配布されていますが、商用あるいは特定の目的に適するかどうかも含めて、暗黙的にも、一切保証されません。詳しくは、GNU一般公衆利用許諾書をご覧ください。
@@ -4142,7 +4146,7 @@ MediaWikiは、有用であることを期待して配布されていますが
 
 # Special:FilePath
 'filepath' => 'ファイルパス',
-'filepath-page' => 'ファイル：',
+'filepath-page' => 'ファイル:',
 'filepath-submit' => '取得',
 'filepath-summary' => 'この特別ページは、ファイルへの完全なパスを返します。
 画像は最大解像度で表示され、他のファイルタイプは関連付けされたプログラムが直接起動します。',
@@ -4151,9 +4155,9 @@ MediaWikiは、有用であることを期待して配布されていますが
 'fileduplicatesearch' => '重複ファイルの検索',
 'fileduplicatesearch-summary' => '重複ファイルをハッシュ値に基づいて検索します。',
 'fileduplicatesearch-legend' => '重複の検索',
-'fileduplicatesearch-filename' => 'ファイル名：',
+'fileduplicatesearch-filename' => 'ファイル名:',
 'fileduplicatesearch-submit' => '検索',
-'fileduplicatesearch-info' => '$1 × $2 ピクセル<br />ファイルサイズ：$3<br />MIMEタイプ：$4',
+'fileduplicatesearch-info' => '$1 × $2 ピクセル<br />ファイルサイズ: $3<br />MIME タイプ: $4',
 'fileduplicatesearch-result-1' => 'ファイル「$1」と重複するファイルはありません。',
 'fileduplicatesearch-result-n' => 'ファイル「$1」には {{PLURAL:$2|$2 件の重複ファイル}}があります。',
 'fileduplicatesearch-noresults' => '「$1」という名前のファイルはありません。',
diff --git a/languages/messages/MessagesJam.php b/languages/messages/MessagesJam.php
index 5494817f08..1d68f6efa7 100644
--- a/languages/messages/MessagesJam.php
+++ b/languages/messages/MessagesJam.php
@@ -156,7 +156,6 @@ Lef aaf dif afta pofaamin ruolbak',
 'qbbrowse' => 'Brouz',
 'qbedit' => 'Edit',
 'qbpageoptions' => 'Dis piej',
-'qbpageinfo' => 'Kantex',
 'qbmyoptions' => 'Mi piejdem',
 'qbspecialpages' => 'Peshal piejdem',
 'faq' => 'FAK',
diff --git a/languages/messages/MessagesJut.php b/languages/messages/MessagesJut.php
index 017297f86c..575d86412e 100644
--- a/languages/messages/MessagesJut.php
+++ b/languages/messages/MessagesJut.php
@@ -136,7 +136,6 @@ $messages = array(
 'qbbrowse' => 'Gennemse',
 'qbedit' => 'Redigær',
 'qbpageoptions' => 'Endstellenger før side',
-'qbpageinfo' => "Informåsje side'm",
 'qbmyoptions' => 'Miine endstellenger',
 'qbspecialpages' => 'Sonst sider',
 'faq' => 'VSF',
diff --git a/languages/messages/MessagesKa.php b/languages/messages/MessagesKa.php
index 12356df2ed..fc13f17ae2 100644
--- a/languages/messages/MessagesKa.php
+++ b/languages/messages/MessagesKa.php
@@ -303,7 +303,7 @@ $messages = array(
 'newwindow' => '(ახალ ფანჯარაში)',
 'cancel' => 'გაუქმება',
 'moredotdotdot' => 'ვრცლად...',
-'mypage' => 'ჩემი გვერდი',
+'mypage' => 'გვერდი',
 'mytalk' => 'ჩემი განხილვა',
 'anontalk' => 'ამ IP-ს განხილვა',
 'navigation' => 'ნავიგაცია',
@@ -877,7 +877,7 @@ $2
 'note' => "'''შენიშვნა:'''",
 'previewnote' => "'''დაიმახსოვრეთ, ეს მხოლოდ წინასწარი გადახედვაა.'''
 თქვენი ცვლილებები ჯერ არ შენახულა!",
-'continue-editing' => 'რედაქტირების გაგრძელება',
+'continue-editing' => 'რედაქტირებაზე გადასვლა',
 'previewconflict' => 'შავი ნიმუში უჩვენებს ტექსტს ზედა რედაქტირების ფანჯარაში, როგორც ის გამოჩნდება თუ თქვენ მას შეინახავთ.',
 'session_fail_preview' => "'''უკაცრავად! ვერ შევძელით თქვენი რედაქტირების შენახვა სესიის მონაცემთა დაკარგვის გამო.
 გთხოვთ ისევ სცადოთ.
@@ -2152,7 +2152,7 @@ $1',
 'emailuser-title-target' => 'ელ. ფოსტის მიწერა {{GENDER:$1|მომხმარებელთან}}',
 'emailuser-title-notarget' => 'ელ. ფოსტის გაგზავნა მომხმარებელთან',
 'emailpage' => 'ელ. ფოსტა მომხმარებელს',
-'emailpagetext' => 'თუ ამ მომხმარებელმა თავის პარამეტრებში ელ. ფოსტის მოქმედი მისამართი მიუთითა, ქვემოთ მოყვანილი ფორმის შევსებისას შეგიძლიათ მისთვის შეტყობინების გაგზავნა. ელ. ფოსტის მისამართი, რომელიც [[Special:Preferences|თქვენს პარამეტრებში]] მიუთითეთ, დაფიქსირდება „გამომგზავნის“ ველში, რათა ადრესატმა პასუხის გაცემა შეძლოს.',
+'emailpagetext' => 'თუ ამ მომხმარებელმა თავის პარამეტრებში ელ. ფოსტის მოქმედი მისამართი მიუთითა, ქვემოთ მოყვანილი ფორმის შევსებისას შეგიძლიათ {{GENDER:$1|მისთვის}} შეტყობინების გაგზავნა. ელ. ფოსტის მისამართი, რომელიც [[Special:Preferences|თქვენს პარამეტრებში]] მიუთითეთ, დაფიქსირდება „გამომგზავნის“ ველში, რათა ადრესატმა პასუხის გაცემა შეძლოს.',
 'usermailererror' => 'ელ. ფოსტა დაბრუნდა შეცდომის გამო:',
 'defemailsubject' => 'ელ-ფოსტა საიტის {{SITENAME}} მომხმარებლისგან „$1“',
 'usermaildisabled' => 'მომხმარებლის e-mail გათიშულია',
@@ -2983,6 +2983,9 @@ $1',
 'pageinfo-hidden-categories' => 'დამალული {{PLURAL:$1|კატეგორია|კატეგორია}} ($1)',
 'pageinfo-templates' => 'ინტეგრირებულია {{PLURAL:$1|თარგი|თარგი}} ($1)',
 'pageinfo-toolboxlink' => 'გვერდის ინფორმაცია',
+'pageinfo-redirectsto-info' => 'ინფორმაცია',
+'pageinfo-contentpage-yes' => 'დიახ',
+'pageinfo-protect-cascading-yes' => 'დიახ',
 
 # Skin names
 'skinname-standard' => 'კლასიკური',
diff --git a/languages/messages/MessagesKaa.php b/languages/messages/MessagesKaa.php
index 6e8a6d4a3c..8b12cf6fdb 100644
--- a/languages/messages/MessagesKaa.php
+++ b/languages/messages/MessagesKaa.php
@@ -285,7 +285,6 @@ $messages = array(
 'qbbrowse' => "Ko'riw",
 'qbedit' => "O'zgertiw",
 'qbpageoptions' => 'Usı bet',
-'qbpageinfo' => 'Kontekst',
 'qbmyoptions' => "Menin' betlerim",
 'qbspecialpages' => 'Arnawlı betler',
 'faq' => 'KBS',
diff --git a/languages/messages/MessagesKab.php b/languages/messages/MessagesKab.php
index e8e12bd490..f5531d0196 100644
--- a/languages/messages/MessagesKab.php
+++ b/languages/messages/MessagesKab.php
@@ -2097,7 +2097,13 @@ Tuɣalin d tadhelt :
 'deletecomment' => 'Ayɣer',
 'deleteotherreason' => 'Taɣẓint nniḍen / taɣzint tamarnant :',
 'deletereasonotherlist' => 'Taɣẓint nniḍen',
+'deletereason-dropdown' => '* Tiɣẓinin n umḥu id t-uɣalen aṭas tikkwal
+** Asuter n useqdac
+** Akukel n izerfan umeskar
+** Asfata',
 'delete-edit-reasonlist' => 'Beddel tiɣẓinin n umḥu n usebter',
+'delete-toobig' => 'Asebter agi yesɛa amezruy ameqqṛan aṭas n ibeddilen, yugar $1 {{PLURAL:$1|lqem|ileqman}}.
+Amḥu n isebtar am wagi yesɛa akref iwakken {{SITENAME}} ur yesɛu ara arway.',
 
 # Rollback
 'rollback' => 'Semmet ibeddilen',
@@ -2491,6 +2497,8 @@ Anda tebɣiḍ tesmimeḍ "[[:$1]]" yella yagi. tebɣiḍ ad temḥuḍ iwakken
 'pageinfo-views' => 'Amḍan n timuɣliwin',
 'pageinfo-watchers' => 'Amḍan n imttekkiyen yesɛan asebter agi deg umuɣ nsen n uɛassi',
 'pageinfo-subpages-name' => 'Adu-isebtar n usebter agi',
+'pageinfo-contentpage-yes' => 'Ih',
+'pageinfo-protect-cascading-yes' => 'Ih',
 
 # Patrolling
 'markaspatrolleddiff' => 'Rcem "yettwassenqden"',
@@ -2976,6 +2984,17 @@ G leɛnaya-k sentem belli ṣaḥḥ tebɣiḍ ad tɛiwedeḍ axlaq n usebter-ag
 # Special:Version
 'version' => 'Lqem',
 'version-specialpages' => 'isebtar usligen',
+'version-software' => 'Iseɣẓanen i serkeben',
+'version-software-product' => 'Afaris',
+'version-software-version' => 'Lqem',
+'version-entrypoints' => 'Tansa URL n irden n wekcam',
+'version-entrypoints-header-entrypoint' => 'Ired n wekcam',
+'version-entrypoints-header-url' => 'Tansa URL',
+
+# Special:FilePath
+'filepath' => 'Abrid n wadduf ufaylu',
+'filepath-page' => 'Afaylu :',
+'filepath-submit' => 'Ruḥ',
 
 # Special:SpecialPages
 'specialpages' => 'isebtar usligen',
diff --git a/languages/messages/MessagesKbd_cyrl.php b/languages/messages/MessagesKbd_cyrl.php
index 6aeebf5ce8..4d79af78f1 100644
--- a/languages/messages/MessagesKbd_cyrl.php
+++ b/languages/messages/MessagesKbd_cyrl.php
@@ -161,7 +161,6 @@ $messages = array(
 'qbbrowse' => 'Хэплъэн',
 'qbedit' => 'Гъэтэрэзын',
 'qbpageoptions' => 'НапэкӀуэцӀым и зэгъэзэхуэгъуэр',
-'qbpageinfo' => 'НапэкIуэцIым теухуауэ',
 'qbmyoptions' => 'Уи зэгъэзэхуэгъуэхэр',
 'qbspecialpages' => 'Специал напэкӀуэцӀхэр',
 'faq' => 'FAQ',
diff --git a/languages/messages/MessagesKhw.php b/languages/messages/MessagesKhw.php
index ff6fdad72f..a685766f83 100644
--- a/languages/messages/MessagesKhw.php
+++ b/languages/messages/MessagesKhw.php
@@ -556,6 +556,10 @@ MySQL جوابِ خطاء پرائے "$3: $4"',
 'moveddeleted-notice' => 'ھیہ ای حذف شدہ صفحہ شیر.
 صفحو نوشتۂ حذف شدگی و منتقلی ذیلا بطورِ حوالہ دیونو بویان.',
 
+# Parser/template warnings
+'post-expand-template-inclusion-category' => 'ھش صفحات کہ ھتیرا ٹمپلیٹ یعنی سانچو ناپ لوٹ بیتی شیر۔',
+'post-expand-template-argument-category' => 'ھش صفحات کہ ھتیرا بوغینو بیرو سانچان یعنی(ٹمپلیٹان) لو شینی۔',
+
 # History pages
 'viewpagelogs' => 'ھیہ صفحہو بچے نوشتہ جاتن لوڑے',
 'currentrev-asof' => 'حالیہ نظرثانی بمطابق $1',
@@ -747,6 +751,8 @@ HTML tags لوڑے.',",
 # Statistics
 'statistics' => 'اعداد و شمار',
 
+'disambiguationspage' => 'سانچہ: ڈسایمبگ',
+
 # Miscellaneous special pages
 'nbytes' => '$1 {{PLURAL:$1|بایٹ|بایٹس}}',
 'nmembers' => '$1 {{PLURAL:$1|ممبار|ممباران}}',
@@ -1071,6 +1077,9 @@ HTML tags لوڑے.',",
 'watchlisttools-edit' => 'لوڑے یا واچ لسٹہ ترمیم کورے',
 'watchlisttools-raw' => 'نوغ واچ لسٹان ایڈیٹ کورے',
 
+# Core parser functions
+'duplicate-defaultsort' => '\'\'\'خبردار:\'\'\' ڈیفالٹ تاڑٰ(نغڑی) "$2" پروشٹیو ڈیفالٹ تاڑا "$1" لیگی شیر۔',
+
 # Special:SpecialPages
 'specialpages' => 'اسپیشل صفحہ',
 
diff --git a/languages/messages/MessagesKiu.php b/languages/messages/MessagesKiu.php
index 08bf1de3d5..7dd96647bd 100644
--- a/languages/messages/MessagesKiu.php
+++ b/languages/messages/MessagesKiu.php
@@ -53,61 +53,61 @@ $namespaceAliases = array(
 
 $messages = array(
 # User preference toggles
-'tog-underline' => 'Bınê girey de xete bonce:',
+'tog-underline' => 'Bınê girey de xete bıonce:',
 'tog-justify' => 'Paragrafu ayar ke',
-'tog-hideminor' => 'Vurnaisunê senıku pela vurnaisunê peyênu de wedare',
-'tog-hidepatrolled' => 'Vurnaisunê qontrolkerdu pela vurnaisê peyêni de wedare',
+'tog-hideminor' => 'Vurnayisunê senıku pela vurnayisunê peyênu de wedare',
+'tog-hidepatrolled' => 'Vurnayisunê qontrolkerdu pela vurnayisê peyêni de wedare',
 'tog-newpageshidepatrolled' => 'Pelunê qontrolkerdu lista pelunê newu de wedare',
-'tog-extendwatchlist' => 'Lista şêrkerdene hira bıke ke vurnaişi pêro basê, teyna tewr peyêni nê',
-'tog-usenewrc' => 'Vurnaisunê peyênunê hirakerdiu bıgurene (JavaScript lazımo)',
+'tog-extendwatchlist' => 'Lista şêrkerdene hira bıke ke vurnayişi pêro bıasê, teyna tewr peyêni nê',
+'tog-usenewrc' => 'Pele be vurnayisunê grube de vurnayisê peyêni u lista şêrkerdişi (JavaScript lazımo)',
 'tog-numberheadings' => 'Sernustu be ho numra cı sane',
-'tog-showtoolbar' => 'Gozagunê hacetunê vurnaişi basne (JavaScript lazımo)',
-'tog-editondblclick' => 'Pê dı rey teqnaene pele sero bıguriye (JavaScript lazımo)',
-'tog-editsection' => 'Vurnaena qısımi ebe gireunê [bıvurne] ra feal ke',
-'tog-editsectiononrightclick' => 'Qısımu be teqnaena serrêze ra ebe gozaga raste bıvurne (JavaScript lazımo)',
-'tog-showtoc' => 'Tabloê tedeesteu basne (de pelunê be hirê sernustu ra jêdêri de)',
-'tog-rememberpassword' => 'Parola mı nê cıcêraoği de bia ho viri (serba tewr jêde $1 {{PLURAL:$1|roze|rozu}}).',
+'tog-showtoolbar' => 'Gozagunê hacetunê vurnayişi bıasne (JavaScript lazımo)',
+'tog-editondblclick' => 'Pê dı rey teqnayene pele sero bıguriye (JavaScript lazımo)',
+'tog-editsection' => 'Vurnayena qısımi ebe gireyunê [bıvurne] ra feal ke',
+'tog-editsectiononrightclick' => 'Qısımu be teqnayena serrêze ra ebe gozaga raste bıvurne (JavaScript lazımo)',
+'tog-showtoc' => 'Tablowê tedeestewu bıasne (de pelunê be hirê sernustu ra jêdêri de)',
+'tog-rememberpassword' => 'Parola mı nê cıcêrawoği de bia ho viri (serba tewr jêde $1 {{PLURAL:$1|roze|rozu}}).',
 'tog-watchcreations' => 'Pelê ke mı afernê u dosyê ke mı bar kerdê lista mına şêrkerdişi ke',
 'tog-watchdefault' => 'Pel u dosyê ke mı vurnê lista mına şêrkerdişi ke',
 'tog-watchmoves' => 'Pel u dosyê ke mı kırısnê lista mına şêrkerdişi ke',
 'tog-watchdeletion' => 'Pel u dosyê ke mı esterıtê, lista mına şêrkerdişi ke',
-'tog-minordefault' => 'Vurnaisunê ho pêrune ‘vurnaiso qızkek’ nisan bıde',
-'tog-previewontop' => 'Verqayti pela nustene ser de basne',
-'tog-previewonfirst' => 'Vurnaiso verên de verqayti tım basne',
-'tog-nocache' => 'Pelunê cıcêraoği mia ho viri',
-'tog-enotifwatchlistpages' => 'Zu pele ya ki dosyawa ke lista mına şêrkerdişi de vurnê mı rê e-poste bırusne',
-'tog-enotifusertalkpages' => 'Pela mına hurênaişi ke vurnê mı rê e-poste bırusne',
-'tog-enotifminoredits' => 'Vurnaisunê qızkekunê pelun u dosyu de ki mı rê e-poste bırusne',
-'tog-enotifrevealaddr' => 'Adresa e-postê mı postê xeberu de basne',
-'tog-shownumberswatching' => 'Amorê karberunê şêrkerdoğu basne',
-'tog-oldsig' => 'Verqaytê imza mewcude:',
-'tog-fancysig' => 'İmza rê mamelê wikimeqaley bıke (bê gireo otomatik)',
-'tog-externaleditor' => 'Editorê teberi standart bıgurene (teyna serba ekspertuno, komputerê sıma de ayarê xısuşiy lazımê. [//www.mediawiki.org/wiki/Manual:External_editors Melumato jêdêr.])',
+'tog-minordefault' => 'Vurnayisunê ho pêrune ‘vurnayiso qızkek’ nisan bıde',
+'tog-previewontop' => 'Verqayti pela nustene ser de bıasne',
+'tog-previewonfirst' => 'Vurnayiso verên de verqayti tım bıasne',
+'tog-nocache' => 'Pelunê cıfeteliyawoği mia ho viri',
+'tog-enotifwatchlistpages' => 'Zû pele ya ki dosyawa ke lista mına şêrkerdişi de vurnê mı rê e-poste bırusne',
+'tog-enotifusertalkpages' => 'Pela mına hurênayişi ke vurnê mı rê e-poste bırusne',
+'tog-enotifminoredits' => 'Vurnayisunê qızkekunê pelun u dosyu de ki mı rê e-poste bırusne',
+'tog-enotifrevealaddr' => 'Adresa e-postê mı postê xeberu de bıasne',
+'tog-shownumberswatching' => 'Amorê karberunê şêrkerdoğu bıasne',
+'tog-oldsig' => 'Ä°mza mewcude:',
+'tog-fancysig' => 'İmza rê mamelê wikimeqaley bıke (bê girewo otomatik)',
+'tog-externaleditor' => 'Editorê teberi standart bıgurene (teyna serba ekspertuno, komputerê sıma de ayarê xusışiy lazımê. [//www.mediawiki.org/wiki/Manual:External_editors Melumato jêdêr.])',
 'tog-externaldiff' => 'Têversanaene pê programê teberi vıraze (teyna serba ekspertuno, komputerê sıma de ayarê xısuşiy lazımê. [//www.mediawiki.org/wiki/Manual:External_editors Melumato jêdêr.])',
 'tog-showjumplinks' => 'Girê "so"y feal ke',
-'tog-uselivepreview' => 'Verqayto cınde bıgurene (JavaScript) (hona cerrebnaene dero)',
+'tog-uselivepreview' => 'Verqayto cande bıgurene (JavaScript) (hona cerrebnayene dero)',
 'tog-forceeditsummary' => 'Mı ke xulasa kerde cı vira, hay be mı ser de',
-'tog-watchlisthideown' => 'Vurnaisunê mı lista mına şêrkerdişi de wedare',
-'tog-watchlisthidebots' => 'Vurnaisunê boti lista mına şêrkerdişi de wedare',
-'tog-watchlisthideminor' => 'Vurnaisunê qızkeku lista mına şêrkerdişi de wedare',
-'tog-watchlisthideliu' => 'Lista şêrkerdişi ra vurnaisunê karberunê cıkotu wedare',
-'tog-watchlisthideanons' => 'Lista şêrkerdişi ra vurnaisunê karberunê anonimu wedare',
-'tog-watchlisthidepatrolled' => 'Lista şêrkerdişi ra vurnaisunê qontrolkerdu wedare',
+'tog-watchlisthideown' => 'Vurnayisunê mı lista mına şêrkerdişi de wedare',
+'tog-watchlisthidebots' => 'Vurnayisunê boti lista mına şêrkerdişi de wedare',
+'tog-watchlisthideminor' => 'Vurnayisunê qızkeku lista mına şêrkerdişi de wedare',
+'tog-watchlisthideliu' => 'Lista şêrkerdişi ra vurnayisunê karberunê cıkotu wedare',
+'tog-watchlisthideanons' => 'Lista şêrkerdişi ra vurnayisunê karberunê anonimu wedare',
+'tog-watchlisthidepatrolled' => 'Lista şêrkerdişi ra vurnayisunê qontrolkerdu wedare',
 'tog-ccmeonemails' => 'E-postunê ke ez karberunê binu rê rusnenu, mı rê kopya inu bırusne',
-'tog-diffonly' => 'Qıyasê versiyonu de tek ferqu basne, pela butıne nê',
-'tog-showhiddencats' => 'Kategoriunê dızdêni basne',
+'tog-diffonly' => 'Qıyasê versiyonu de tek ferqu bıasne, pela butıne nê',
+'tog-showhiddencats' => 'Kategoriyunê dızdêni bıasne',
 'tog-norollbackdiff' => 'Peyserardene ra dıme ferqi caverde',
 
 'underline-always' => 'Tım',
 'underline-never' => 'Qet',
-'underline-default' => 'Qerar cıcêraoği dest dero',
+'underline-default' => 'Cild ya ki cıfeteliyayoğo hesebiyaye',
 
 # Font style option in Special:Preferences
-'editfont-style' => 'Warê vurnaena tipê nustey:',
-'editfont-default' => 'Fereziya cıfeteliyaoği',
-'editfont-monospace' => 'Tipê nustê sabıtcaguretoği',
-'editfont-sansserif' => 'Tipê nustê Sans-serifi',
-'editfont-serif' => 'Tipê nustê Serifi',
+'editfont-style' => 'Warê vurnayena terzê nustey:',
+'editfont-default' => 'Fereziya cıfeteliyawoği',
+'editfont-monospace' => 'Terzê nustê sabıtcaguretoği',
+'editfont-sansserif' => 'Babetê Sans-serifi',
+'editfont-serif' => 'Babetê serifi',
 
 # Dates
 'sunday' => 'Bazar',
@@ -120,7 +120,7 @@ $messages = array(
 'sun' => 'Baz',
 'mon' => 'Dıs',
 'tue' => 'Şês',
-'wed' => 'Çar',
+'wed' => 'Çrs',
 'thu' => 'Pho',
 'fri' => 'Yen',
 'sat' => 'Sem',
@@ -198,7 +198,6 @@ $messages = array(
 'qbbrowse' => 'Çım ra viarne',
 'qbedit' => 'Bıvurne',
 'qbpageoptions' => 'Na pele',
-'qbpageinfo' => 'Gire',
 'qbmyoptions' => 'Pelê mı',
 'qbspecialpages' => 'Pelê xısusiy',
 'faq' => 'PZP (Persê ke zaf perşinê)',
@@ -455,7 +454,7 @@ Vurnaena [[Special:Preferences|melumatanê {{SITENAME}}]] ho vira mekerê.',
 'yourname' => 'Namê karberi:',
 'yourpassword' => 'Parola:',
 'yourpasswordagain' => 'Parola tekrar ke:',
-'remembermypassword' => 'Cıkotena mı na komputeri de bia ho viri ($1 {{PLURAL:$1|roze|rozu}} ra seba zu zêdêrêni)',
+'remembermypassword' => 'Cıkotena mı na komputeri de bia ho viri (seba tewr jêde $1 {{PLURAL:$1|roze|rozu}})',
 'securelogin-stick-https' => 'Cıkotene ra dıme HTTPS rê giredae bımane',
 'yourdomainname' => 'Bandıra sıma:',
 'externaldberror' => 'Cıfeteliyaisê naskerdene de ya xeta esta ya ki tebera vırastena hesabê sıma rê destur çino.',
@@ -591,7 +590,7 @@ Dosyunê ebe namê .css u .js'y de herfa hurdiye bıgurêne, mesela hurêndia {{
 'note' => "'''Not:'''",
 'previewnote' => "Teme! ena teyna verqeyda.'''
 Vurnayışê tu hama qeyd nıbiyo!",
-'editing' => 'Tıya $1 vurnena',
+'editing' => '$1 Vurnayis',
 'editingsection' => 'Vurnaena $1 (qısım)',
 'editingcomment' => '$1 vurnino (qısımo newe)',
 'editconflict' => 'Têverabiyaena vurnaişi: $1',
@@ -901,7 +900,7 @@ Kaberê bini ke şıma de kewti irtıbat, adresa e-postey şıma eşkera nêbena
 'grouppage-bureaucrat' => '{{ns:project}}:Burokrati',
 
 # Rights
-'right-read' => 'Pelan bıwanê',
+'right-read' => 'Pelan bıwane',
 'right-edit' => 'Pelu bıvurne',
 'right-move' => 'Pelu bere',
 'right-movefile' => 'Dosyu bere',
@@ -941,12 +940,12 @@ Kaberê bini ke şıma de kewti irtıbat, adresa e-postey şıma eşkera nêbena
 'rcnotefrom' => "Cêr de vurnayîşê esto ke '''$2''' ra raver  (heta '''$1''' mucnayiyo).",
 'rclistfrom' => '$1 ra hata nıka vurnaisunê newu bıasne',
 'rcshowhideminor' => '$1 vurnaisê qızkeki',
-'rcshowhidebots' => 'botê $1i',
-'rcshowhideliu' => '$1 karberê qeydbiyaey',
+'rcshowhidebots' => 'Botu $1',
+'rcshowhideliu' => 'Karberunê qeydbiyayu $1',
 'rcshowhideanons' => '$1 karberê anonimi',
 'rcshowhidepatr' => 'Vurnayışê cıyê vênıtey $1',
-'rcshowhidemine' => '$1 vurnaisê mı',
-'rclinks' => '$1 vurnaisunê peyênunê $2 rozunê<br />$3 peyênun bıasne',
+'rcshowhidemine' => 'Vurnayisanê mı $1',
+'rclinks' => 'Peyniya $2 rozu de $1 vurnayisu bıasne <br />$3',
 'diff' => 'ferq',
 'hist' => 'ver',
 'hide' => 'Bınımne',
@@ -1254,7 +1253,7 @@ Tı şikina sewiya sevekiyaena na pele bıvurnê, hema yê nae sevekiyaena qedem
 
 # Namespace form on various pages
 'namespace' => 'Caê namey:',
-'invert' => 'Weçinıtu ra qêri bıasne',
+'invert' => 'Weçinıtiso peyserki',
 'blanknamespace' => '(Ser)',
 
 # Contributions
@@ -1291,7 +1290,7 @@ Tı şikina sewiya sevekiyaena na pele bıvurnê, hema yê nae sevekiyaena qedem
 'whatlinkshere-hideredirs' => 'peyser sono $1',
 'whatlinkshere-hidetrans' => 'İlawekerdê çaprazi $1',
 'whatlinkshere-hidelinks' => '$1 girey',
-'whatlinkshere-hideimages' => 'girê resmu $1',
+'whatlinkshere-hideimages' => 'Girê dosya $1',
 'whatlinkshere-filters' => 'Filtrey',
 
 # Block/unblock
@@ -1316,7 +1315,7 @@ Tı şikina sewiya sevekiyaena na pele bıvurnê, hema yê nae sevekiyaena qedem
 'blocklink' => 'kilıt ke',
 'unblocklink' => 'ra ke',
 'change-blocklink' => 'mani bıvurne',
-'contribslink' => 'iştıraki',
+'contribslink' => 'iştıraqi',
 'emaillink' => 'e-poste bırusne',
 'autoblocker' => 'Sıma otomatikmen kılit biy, çıke adresa sımawa \'\'IP\'\'y terefê "[[User:$1|$1]]" gurenina.
 Sebebê kılit-biyaena $1\'i: "$2"o',
diff --git a/languages/messages/MessagesKm.php b/languages/messages/MessagesKm.php
index 77898c1f38..fa139c843b 100644
--- a/languages/messages/MessagesKm.php
+++ b/languages/messages/MessagesKm.php
@@ -195,7 +195,6 @@ $magicWords = array(
 	'forcetoc'                  => array( '0', '__បង្ខំមាតិកា__', '__បង្ខំបញ្ជីអត្ថបទ__', '__បង្ខំអោយបង្ហាញមាតិកា__', '__FORCETOC__' ),
 	'toc'                       => array( '0', '__មាតិកា__', '__បញ្ជីអត្ថបទ__', '__TOC__' ),
 	'noeditsection'             => array( '0', '__ផ្នែកមិនត្រូវកែប្រែ__', '__មិនមានផ្នែកកែប្រែ__', '__លាក់ផ្នែកកែប្រែ__', '__NOEDITSECTION__' ),
-	'noheader'                  => array( '0', '__លាក់បឋមកថា__', '__NOHEADER__' ),
 	'currentmonth'              => array( '1', 'ខែនេះ', 'CURRENTMONTH', 'CURRENTMONTH2' ),
 	'currentmonthname'          => array( '1', 'ឈ្មោះខែនេះ', 'CURRENTMONTHNAME' ),
 	'currentday'                => array( '1', 'ថ្ងៃនេះ', 'CURRENTDAY' ),
diff --git a/languages/messages/MessagesKo.php b/languages/messages/MessagesKo.php
index 8bd46c003f..caed2560d6 100644
--- a/languages/messages/MessagesKo.php
+++ b/languages/messages/MessagesKo.php
@@ -134,7 +134,6 @@ $specialPageAliases = array(
 	'Recentchanges'             => array( '최근바뀜' ),
 	'Recentchangeslinked'       => array( '링크최근바뀜' ),
 	'Revisiondelete'            => array( '특정판삭제' ),
-	'RevisionMove'              => array( '특정판이동' ),
 	'Search'                    => array( '찾기', '검색' ),
 	'Shortpages'                => array( '짧은문서' ),
 	'Specialpages'              => array( '특수문서', '특수기능' ),
@@ -172,8 +171,7 @@ $magicWords = array(
 	'nogallery'                 => array( '0', '__화랑숨김__', '__갤러리숨김__', '__NOGALLERY__' ),
 	'forcetoc'                  => array( '0', '__목차보임__', '__목차표시__', '__FORCETOC__' ),
 	'toc'                       => array( '0', '__목차__', '__TOC__' ),
-	'noeditsection'             => array( '0', '__단락편집숨김__', '__NOEDITSECTION__' ),
-	'noheader'                  => array( '0', '__머릿글숨김__', '__헤더숨김__', '__NOHEADER__' ),
+	'noeditsection'             => array( '0', '__부분편집숨김__', '__문단편집숨김__', '__단락편집숨김__', '__NOEDITSECTION__' ),
 	'currentmonth'              => array( '1', '현재월', 'CURRENTMONTH', 'CURRENTMONTH2' ),
 	'currentmonth1'             => array( '1', '현재월1', 'CURRENTMONTH1' ),
 	'currentmonthname'          => array( '1', '현재월이름', 'CURRENTMONTHNAME' ),
@@ -248,6 +246,7 @@ $magicWords = array(
 	'img_text_bottom'           => array( '1', '글자아래', '텍스트아래', 'text-bottom' ),
 	'img_link'                  => array( '1', '링크=$1', 'link=$1' ),
 	'img_alt'                   => array( '1', '대체글=$1', 'alt=$1' ),
+	'img_class'                 => array( '1', '클래스=$1', 'class=$1' ),
 	'int'                       => array( '0', '정수:', 'INT:' ),
 	'sitename'                  => array( '1', '사이트이름', 'SITENAME' ),
 	'ns'                        => array( '0', '이름:', '이름공간:', 'NS:' ),
@@ -393,7 +392,7 @@ $messages = array(
 
 'underline-always' => '항상',
 'underline-never' => '치지 않음',
-'underline-default' => '브라우저 설정을 따르기',
+'underline-default' => '스킨 또는 브라우저 설정을 따르기',
 
 # Font style option in Special:Preferences
 'editfont-style' => '편집창의 글꼴:',
@@ -478,8 +477,8 @@ $messages = array(
 'newwindow' => '(새 창으로 열림)',
 'cancel' => '취소',
 'moredotdotdot' => '더 보기...',
-'mypage' => '내 사용자 문서',
-'mytalk' => '내 사용자 토론',
+'mypage' => '문서',
+'mytalk' => '토론',
 'anontalk' => '익명 사용자 토론',
 'navigation' => '둘러보기',
 'and' => ',',
@@ -654,7 +653,7 @@ $1',
 'nosuchaction' => '해당하는 동작이 없습니다.',
 'nosuchactiontext' => 'URL로 요청한 동작이 잘못되었습니다.
 URL을 잘못 입력하였거나, 잘못된 링크를 따라갔을 수 있습니다.
-이것은 {{SITENAME}}의 버그일 수도 있습니다.',
+{{SITENAME}}의 버그일 수도 있습니다.',
 'nosuchspecialpage' => '해당하는 특수 문서가 없습니다.',
 'nospecialpagetext' => '<strong>요청한 특수 문서가 존재하지 않습니다.</strong>
 
@@ -819,7 +818,7 @@ $2',
 'passwordremindertext' => '$1 IP 주소에서 누군가가 아마 자신이 {{SITENAME}} ($4)의 새 비밀번호를 요청했습니다.
 "$2" 사용자의 임시 비밀번호는 "$3"로 설정되었습니다. 이것이 자신이 의도한 바라면
 지금 로그인하여 새로운 비밀번호를 만드세요.
-당신의 임시 비밀번호는 $5일 후에 만료됩니다.
+임시 비밀번호는 $5일 후에 만료됩니다.
 
 이 요청을 다른 사람이 했거나 이전 비밀번호를 기억해 내서 바꿀 필요가 없으면
 이 메시지를 무시하고 이전 비밀번호를 계속 사용할 수 있습니다.',
@@ -835,7 +834,7 @@ $2',
 'mailerror' => '메일 보내기 오류: $1',
 'acct_creation_throttle_hit' => '당신의 IP 주소를 이용한 방문자가 이전에 이미 계정을 $1개 만들어, 계정 만들기 한도를 초과하였습니다.
 따라서 지금은 이 IP 주소로는 더 이상 계정을 만들 수 없습니다.',
-'emailauthenticated' => '당신의 이메일 주소는 $2 $3에 인증되었습니다.',
+'emailauthenticated' => '이메일 주소는 $2 $3에 인증되었습니다.',
 'emailnotauthenticated' => '이메일 주소를 인증하지 않았습니다.
 이메일 확인 절차를 거치지 않으면 다음 이메일 기능을 사용할 수 없습니다.',
 'noemailprefs' => '이 기능을 사용하기 위해서는 사용자 환경 설정에서 이메일 주소를 설정해야 합니다.',
@@ -879,7 +878,7 @@ $2',
 'resetpass-submit-loggedin' => '비밀번호 바꾸기',
 'resetpass-submit-cancel' => '취소',
 'resetpass-wrong-oldpass' => '비밀번호가 잘못되었거나 현재의 비밀번호와 같습니다.
-당신은 이미 비밀번호를 성공적으로 바꾸었거나 새 임시 비밀번호를 발급받았을 수 있습니다.',
+이미 비밀번호를 성공적으로 바꾸었거나 새 임시 비밀번호를 요청했을 수 있습니다.',
 'resetpass-temp-password' => '임시 비밀번호:',
 
 # Special:PasswordReset
@@ -919,7 +918,7 @@ $2
 # Special:ChangeEmail
 'changeemail' => '이메일 주소 바꾸기',
 'changeemail-header' => '계정 메일 주소 바꾸기',
-'changeemail-text' => '이메일 주소를 바꾸려면 이 양식을 채우세요. 바뀜 내용을 확인하기 위해 당신의 비밀번호를 입력해야 합니다.',
+'changeemail-text' => '이메일 주소를 바꾸려면 이 양식을 채우세요. 바뀜 내용을 확인하기 위해 비밀번호를 입력해야 합니다.',
 'changeemail-no-info' => '이 특수 문서에 직접 접근하려면 반드시 로그인해야 합니다.',
 'changeemail-oldemail' => '현재 이메일 주소 :',
 'changeemail-newemail' => '새 이메일 주소:',
@@ -957,7 +956,7 @@ $2
 'showdiff' => '차이 보기',
 'anoneditwarning' => "'''경고''': 로그인하고 있지 않습니다.
 당신의 IP 주소가 문서 역사에 남게 됩니다.",
-'anonpreviewwarning' => "'''당신은 지금 로그인하고 있지 않습니다. 문서를 저장하면 당신의 IP 주소가 문서 역사에 남게 됩니다.'''",
+'anonpreviewwarning' => "'''로그인하고 있지 않습니다. 문서를 저장하면 당신의 IP 주소가 문서 역사에 남게 됩니다.'''",
 'missingsummary' => "'''알림:''' 편집 요약을 적지 않았습니다.
 이대로 \"{{int:savearticle}}\"을 클릭하면 편집 요약 없이 저장됩니다.",
 'missingcommenttext' => '아래에 내용을 채워 넣어 주세요.',
@@ -966,7 +965,7 @@ $2
 'summary-preview' => '요약 미리 보기:',
 'subject-preview' => '주제/제목 미리 보기:',
 'blockedtitle' => '차단됨',
-'blockedtext' => "'''당신의 계정 혹은 IP 주소가 차단되었습니다.'''
+'blockedtext' => "'''사용자 계정 또는 IP 주소가 차단되었습니다.'''
 
 차단한 사람은 $1입니다.
 차단한 이유는 다음과 같습니다: $2
@@ -1038,21 +1037,21 @@ IP 주소는 여러 사용자가 공유할 수 있습니다.
 * '''오페라''': ''도구→설정''에서 캐시를 비움",
 'usercssyoucanpreview' => "'''안내''': CSS 문서를 저장하기 전에 \"{{int:showpreview}}\" 기능을 통해 작동을 확인해주세요.",
 'userjsyoucanpreview' => "'''안내''': 자바스크립트 문서를 저장하기 전에 \"{{int:showpreview}}\" 기능을 통해 작동을 확인해주세요.",
-'usercsspreview' => "'''이것은 사용자 CSS의 미리 보기입니다.'''
-'''아직 저장하지 않았다는 것을 기억해두세요!'''",
-'userjspreview' => "'''이것은 자바스크립트 미리 보기입니다'''
-'''아직 저장하지 않았다는 것을 기억해두세요!'''",
-'sitecsspreview' => "'''이것은 이 CSS의 미리 보기일 뿐입니다.'''
-'''아직 저장하지 않았다는 것을 기억해두세요!'''",
-'sitejspreview' => "'''이것은 이 자바스크립트 코드의 미리 보기일 뿐입니다.'''
-'''아직 저장하지 않았다는 것을 기억해두세요!'''",
+'usercsspreview' => "'''사용자 CSS의 미리 보기입니다.'''
+'''아직 저장하지 않았습니다!'''",
+'userjspreview' => "'''사용자 자바스크립트 미리 보기입니다.'''
+'''아직 저장하지 않았습니다!'''",
+'sitecsspreview' => "'''이 CSS의 미리 보기일 뿐입니다.'''
+'''아직 저장하지 않았습니다!'''",
+'sitejspreview' => "'''이 자바스크립트 코드의 미리 보기일 뿐입니다.'''
+'''아직 저장하지 않았습니다!'''",
 'userinvalidcssjstitle' => "'''경고''': \"\$1\" 스킨은 없습니다.
 .css와 .js 문서의 제목은 {{ns:user}}:Foo/vector.css 처럼 소문자로 써야 합니다. {{ns:user}}:Foo/Vector.css 와 같이 대문자로 쓸 경우 작동하지 않습니다.",
 'updated' => '(바뀜)',
 'note' => "'''참고:'''",
 'previewnote' => "'''이 화면은 미리 보기입니다.'''
-편집한 내용은 아직 저장되지 않았습니다!",
-'continue-editing' => '계속 편집하기',
+편집한 내용은 아직 저장하지 않았습니다!",
+'continue-editing' => '편집 영역으로 가기',
 'previewconflict' => '이 미리 보기는 저장할 때의 모습으로 위쪽 편집창의 문서를 반영합니다.',
 'session_fail_preview' => "'''세션 데이터가 없어져 편집을 저장하지 못했습니다.'''
 다시 시도하세요.
@@ -1066,7 +1065,7 @@ IP 주소는 여러 사용자가 공유할 수 있습니다.
 'token_suffix_mismatch' => "'''저장하려는 내용의 문장 부호가 망가져 있습니다.'''
 문서 보호를 위해 해당 내용을 저장하지 않습니다.
 버그가 있는 익명 프록시 서비스 등을 사용할 때 이런 문제가 발생할 수 있습니다.",
-'edit_form_incomplete' => "'''편집의 일부 내용이 서버에 전달되지 않았습니다. 당신의 편집이 손상되지 않았는지 확인하고 다시 시도해 주십시오.'''",
+'edit_form_incomplete' => "'''편집의 일부 내용이 서버에 전달되지 않았습니다. 편집이 손상되지 않았는지 확인하고 다시 시도해 주십시오.'''",
 'editing' => '$1 편집하기',
 'creating' => '$1 만들기',
 'editingsection' => '$1 편집하기 (부분)',
@@ -1078,7 +1077,7 @@ IP 주소는 여러 사용자가 공유할 수 있습니다.
 \"{{int:savearticle}}\"을 누르면 '''위쪽의 편집 내역만''' 저장됩니다.",
 'yourtext' => '당신의 편집',
 'storedversion' => '현재 문서',
-'nonunicodebrowser' => "'''경고: 당신의 웹 브라우저가 유니코드를 완벽하게 지원하지 않습니다.'''
+'nonunicodebrowser' => "'''경고: 웹 브라우저가 유니코드를 완벽하게 지원하지 않습니다.'''
 아스키가 아닌 문자가 16진수 코드로 나타날 수 있습니다.",
 'editingold' => "'''경고: 지금 이전 버전의 문서를 고치고 있습니다.'''
 이것을 저장하면 최근에 편집된 부분이 사라질 수 있습니다.",
@@ -1118,8 +1117,8 @@ IP 주소는 여러 사용자가 공유할 수 있습니다.
 'sectioneditnotsupported-title' => '부분 편집 지원 안됨',
 'sectioneditnotsupported-text' => '이 문서에서는 문단 편집을 지원하지 않습니다.',
 'permissionserrors' => '권한 오류',
-'permissionserrorstext' => '해당 명령을 수행할 권한이 없습니다. 다음의 {{PLURAL:$1|이유}}를 확인해보세요:',
-'permissionserrorstext-withaction' => '$2 권한이 없습니다. 다음의 {{PLURAL:$1|이유}}를 확인해주세요:',
+'permissionserrorstext' => '해당 명령을 수행할 권한이 없습니다. 다음 {{PLURAL:$1|이유}}를 확인해보세요:',
+'permissionserrorstext-withaction' => '$2 권한이 없습니다. 다음 {{PLURAL:$1|이유}}를 확인해주세요:',
 'recreate-moveddeleted-warn' => "'''경고: 삭제된 적이 있는 문서를 다시 만들고 있습니다.'''
 
 이 문서를 계속 편집하는 것이 적합한 것인지 확인해주세요.
@@ -1415,7 +1414,7 @@ $1",
 'search-nonefound' => '찾기 결과가 없습니다.',
 'powersearch' => '고급 찾기',
 'powersearch-legend' => '고급 찾기',
-'powersearch-ns' => '다음의 이름공간에서 찾기:',
+'powersearch-ns' => '다음 이름공간에서 찾기:',
 'powersearch-redir' => '넘겨주기 목록',
 'powersearch-field' => '찾기',
 'powersearch-togglelabel' => '확인:',
@@ -1437,7 +1436,7 @@ $1",
 
 # Preferences page
 'preferences' => '사용자 환경 설정',
-'mypreferences' => '사용자 환경 설정',
+'mypreferences' => '환경 설정',
 'prefs-edits' => '편집 횟수:',
 'prefsnologin' => '로그인하지 않음',
 'prefsnologintext' => '사용자 환경 설정을 바꾸려면 먼저 <span class="plainlinks">[{{fullurl:{{#Special:UserLogin}}|returnto=$1}} 로그인]</span>해야 합니다.',
@@ -1537,7 +1536,7 @@ HTML 태그를 확인하세요.',
 'prefs-help-realname' => '실명 기입은 자유입니다.
 실명을 입력할 경우 문서 기여에 자신의 이름이 들어가게 됩니다.',
 'prefs-help-email' => '이메일 주소 입력은 선택 사항입니다. 다만 비밀번호를 잊었을 때 비밀번호 바꾸기를 위해 필요합니다.',
-'prefs-help-email-others' => '당신은 자신의 문서나 토론 문서에 있는 이메일 보내기 링크로 다른 사용자가 연락할 수 있게 할 수도 있습니다.
+'prefs-help-email-others' => '자신의 문서나 토론 문서에 있는 이메일 보내기 링크로 다른 사용자가 연락할 수 있게 할 수도 있습니다.
 이 경우에도 당신의 이메일 주소는 다른 사용자가 연락할 때 공개되지 않습니다.',
 'prefs-help-email-required' => '이메일 주소가 필요합니다.',
 'prefs-info' => '기본 정보',
@@ -1577,7 +1576,7 @@ HTML 태그를 확인하세요.',
 'userrights-no-interwiki' => '다른 위키의 사용자 권한을 바꿀 권한이 없습니다.',
 'userrights-nodatabase' => '데이터베이스 $1이 존재하지 않거나 로컬에 있지 않습니다.',
 'userrights-nologin' => '사용자의 권한을 바꾸기 위해서는 반드시 관리자 계정으로 [[Special:UserLogin|로그인]]해야 합니다.',
-'userrights-notallowed' => '당신은 다른 사용자의 권한을 조정할 권한이 없습니다.',
+'userrights-notallowed' => '다른 사용자의 권한을 조정할 권한이 없습니다.',
 'userrights-changeable-col' => '바꿀 수 있는 권한',
 'userrights-unchangeable-col' => '바꿀 수 없는 권한',
 
@@ -1670,8 +1669,11 @@ HTML 태그를 확인하세요.',
 # User rights log
 'rightslog' => '사용자 권한 기록',
 'rightslogtext' => '사용자 권한 조정 기록입니다.',
-'rightslogentry' => '사용자가 $1의 권한을 $2에서 $3(으)로 바꿈',
+'rightslogentry' => '사용자가 $1의 권한을 $2에서 $3으로 바꾸었습니다',
 'rightslogentry-autopromote' => '사용자의 권한이 자동적으로 $2에서 $3으로 바뀌었습니다.',
+'logentry-rights-rights' => '$1 사용자가 $3 사용자의 권한을 $4에서 $5으로 바꾸었습니다.',
+'logentry-rights-rights-legacy' => '$1 사용자가 $3 사용자의 권한을 바꾸었습니다.',
+'logentry-rights-autopromote' => '$1 사용자의 권한이 자동적으로 $4에서 $5으로 바뀌었습니다.',
 'rightsnone' => '(없음)',
 
 # Associated actions - in the sentence "You do not have permission to X"
@@ -1807,12 +1809,12 @@ HTML 태그를 확인하세요.',
 'filetype-banned-type' => '{{PLURAL:$3$4}}\'\'\'".$1"\'\'\' 형식의 파일은 올릴 수 없습니다.
 $2 형식만 사용할 수 있습니다.',
 'filetype-missing' => '파일에 확장자(".jpg" 등)가 없습니다.',
-'empty-file' => '당신이 올린 파일이 비어 있습니다.',
+'empty-file' => '올린 파일이 비어 있습니다.',
 'file-too-large' => '올리려는 파일이 너무 큽니다.',
 'filename-tooshort' => '파일 이름이 너무 짧습니다.',
 'filetype-banned' => '이러한 종류의 파일은 금지되어 있습니다.',
 'verification-error' => '이 파일은 파일 확인 절차를 통과하지 않았습니다.',
-'hookaborted' => '당신이 수정하려고 한 것이 확장 기능 훅에 의해 중지되었습니다.',
+'hookaborted' => '수정하려고 한 것이 확장 기능 훅에 의해 중지되었습니다.',
 'illegal-filename' => '이 파일 이름은 허용되지 않습니다.',
 'overwrite' => '기존 파일을 덮어쓰는 것은 허용되지 않습니다.',
 'unknown-error' => '알 수 없는 오류가 발생했습니다.',
@@ -1857,7 +1859,7 @@ $2 형식만 사용할 수 있습니다.',
 'overwroteimage' => '사용자가 "[[$1]]" 파일의 새 판을 올렸습니다.',
 'uploaddisabled' => '올리기 비활성화됨',
 'copyuploaddisabled' => 'URL로 파일 올리기가 비활성화되어 있습니다.',
-'uploadfromurl-queued' => '당신의 올리기 명령이 기록되었습니다.',
+'uploadfromurl-queued' => '올리기 명령이 기록되었습니다.',
 'uploaddisabledtext' => '파일 올리기 기능이 비활성화되어 있습니다.',
 'php-uploaddisabledtext' => 'PHP 파일 올리기가 비활성화되었습니다. 파일 올리기 설정을 확인하십시오.',
 'uploadscripted' => '이 파일에는 HTML이나 다른 스크립트 코드가 포함되어 있어, 웹 브라우저에서 오류를 일으킬 수 있습니다.',
@@ -1892,7 +1894,7 @@ MGP # 펜탁스
 PICT # 기타
  #</pre> <!-- 이 줄은 그대로 두십시오 -->',
 'upload-success-subj' => '올리기 성공',
-'upload-success-msg' => '파일을 [$2]에서 성공적으로 올렸습니다. 당신이 올린 파일이 여기 있습니다: [[:{{ns:file}}:$1]]',
+'upload-success-msg' => '파일을 [$2]에서 성공적으로 올렸습니다. 올린 파일은 여기 있습니다: [[:{{ns:file}}:$1]]',
 'upload-failure-subj' => '올리기 실패',
 'upload-failure-msg' => '[$2]에서 파일을 올리는 중 문제가 발생했습니다:
 
@@ -1982,7 +1984,7 @@ URL이 올바르고 접근 가능한지를 확인하고 다시 시도해주세
 https://www.mediawiki.org/wiki/Manual:Image_Authorization 을 참고하십시오.',
 'img-auth-notindir' => '요청한 경로가 설정한 올리기 디렉토리에 없습니다.',
 'img-auth-badtitle' => '"$1"에서 올바른 제목을 만들 수 없습니다.',
-'img-auth-nologinnWL' => '당신은 로그인하지 않았으며 "$1" 파일은 화이트리스트에 존재하지 않습니다.',
+'img-auth-nologinnWL' => '로그인하지 않았으며 "$1" 파일은 화이트리스트에 존재하지 않습니다.',
 'img-auth-nofile' => '"$1" 파일이 없습니다.',
 'img-auth-isdir' => '"$1" 디렉토리에 접근을 시도했습니다.
 파일에만 접근할 수 있습니다.',
@@ -2157,7 +2159,7 @@ URL이 맞고 해당 웹사이트가 작동하는지 확인해주세요.',
 
 'disambiguations' => '동음이의 문서를 가리키는 문서 목록',
 'disambiguationspage' => 'Template:disambig',
-'disambiguations-text' => "다음의 문서는 적어도 하나 이상 '''동음이의 문서'''를 가리키고 있습니다.
+'disambiguations-text' => "다음 문서는 적어도 하나 이상 '''동음이의 문서'''를 가리키고 있습니다.
 그 링크는 다른 적절한 문서로 연결할 필요가 있습니다.<br />
 [[MediaWiki:Disambiguationspage]]에서 링크된 틀을 사용하는 문서를 동음이의 문서로 간주합니다.",
 
@@ -2225,7 +2227,7 @@ URL이 맞고 해당 웹사이트가 작동하는지 확인해주세요.',
 'protectedpages' => '보호된 문서 목록',
 'protectedpages-indef' => '오른쪽 조건에 맞는 보호만 보기',
 'protectedpages-cascade' => '연쇄적 보호만 보기',
-'protectedpagestext' => '다음의 문서는 이동/편집이 불가능하도록 보호되어 있습니다.',
+'protectedpagestext' => '다음 문서는 이동이나 편집이 불가능하도록 보호되어 있습니다.',
 'protectedpagesempty' => '보호되어 있는 문서가 없습니다.',
 'protectedtitles' => '만들기 보호된 표제어 목록',
 'protectedtitlestext' => '다음 표제어는 만들기가 금지되어 있습니다.',
@@ -2246,7 +2248,7 @@ URL이 맞고 해당 웹사이트가 작동하는지 확인해주세요.',
 'notargettitle' => '해당하는 문서 없음',
 'notargettext' => '기능을 수행할 대상 문서나 사용자를 지정하지 않았습니다.',
 'nopagetitle' => '해당 문서 없음',
-'nopagetext' => '당신이 찾는 문서는 존재하지 않습니다.',
+'nopagetext' => '찾는 문서가 존재하지 않습니다.',
 'pager-newer-n' => '이전 $1개',
 'pager-older-n' => '다음 $1개',
 'suppress' => '오버사이트',
@@ -2255,6 +2257,7 @@ URL이 맞고 해당 웹사이트가 작동하는지 확인해주세요.',
 # Book sources
 'booksources' => '책 찾기',
 'booksources-search-legend' => '책 찾기',
+'booksources-isbn' => 'ISBN:',
 'booksources-go' => '찾기',
 'booksources-text' => '아래의 목록은 새 책이나 중고 책을 판매하는 바깥 사이트로, 원하는 책의 정보를 얻을 수 있습니다:',
 'booksources-invalid-isbn' => '입력한 ISBN이 잘못된 것으로 보입니다. 원본과 대조해 보세요.',
@@ -2313,9 +2316,9 @@ URL이 맞고 해당 웹사이트가 작동하는지 확인해주세요.',
 'linksearch-pat' => '찾기 패턴:',
 'linksearch-ns' => '이름공간:',
 'linksearch-ok' => '찾기',
-'linksearch-text' => '"*.wikipedia.org"와 같이 와일드카드를 사용할 수 있습니다.
+'linksearch-text' => '"*.wikipedia.org"와 같이 와일드 카드를 사용할 수 있습니다.
 적어도 "*.org"와 같이 최상위 도메인을 입력해야 합니다.<br />
-지원하는 프로토콜 목록: <code>$1</code> (찾을 때 이것을 추가하지 마세요)',
+지원하는 프로토콜: <code>$1</code> (프로토콜을 지정하지 않을 때 기본값은 http://)',
 'linksearch-line' => '$2에서 $1 을 링크하고 있습니다.',
 'linksearch-error' => '와일드카드는 주소의 처음 부분에만 사용될 수 있습니다.',
 
@@ -2364,12 +2367,12 @@ URL이 맞고 해당 웹사이트가 작동하는지 확인해주세요.',
 'emailuser-title-target' => '이 {{GENDER:$1|사용자}} 이메일',
 'emailuser-title-notarget' => '사용자 이메일',
 'emailpage' => '사용자에게 이메일 보내기',
-'emailpagetext' => '이 사용자가 환경 설정에 올바른 이메일 주소를 적었다면, 아래 양식을 통해 이메일을 보낼 수 있습니다.
-이메일을 받은 사용자가 바로 답장할 수 있도록 하기 위해 당신이 [[Special:Preferences|사용자 환경 설정]]에 적은 이메일 주소가 "발신자" 정보에 들어갑니다. 따라서 수신자가 당신에게 직접 답장을 보낼 수 있습니다.',
-'usermailererror' => '메일 객체에서 오류 발생:',
+'emailpagetext' => '이 {{GENDER:$1|사용자}}가 환경 설정에 올바른 이메일 주소를 적었다면, 아래 양식을 통해 이메일을 보낼 수 있습니다.
+이메일을 받은 사용자가 바로 답장할 수 있도록 하기 위해 [[Special:Preferences|사용자 환경 설정]]에 적은 이메일 주소가 "발신자" 정보에 들어갑니다. 따라서 수신자가 당신에게 직접 답장을 보낼 수 있습니다.',
+'usermailererror' => '메일 개체에서 오류 발생:',
 'defemailsubject' => '"$1" 사용자가 보낸 {{SITENAME}} 이메일',
 'usermaildisabled' => '사용자 이메일 비활성화됨',
-'usermaildisabledtext' => '당신은 이 위키에서 다른 사용자에게 메일을 보낼 수 없습니다',
+'usermaildisabledtext' => '이 위키에서 다른 사용자에게 메일을 보낼 수 없습니다',
 'noemailtitle' => '이메일 주소 없음',
 'noemailtext' => '이 사용자는 올바른 이메일 주소를 입력하지 않았습니다.',
 'nowikiemailtitle' => '이메일이 허용되지 않음',
@@ -2397,7 +2400,7 @@ URL이 맞고 해당 웹사이트가 작동하는지 확인해주세요.',
 
 # Watchlist
 'watchlist' => '주시문서 목록',
-'mywatchlist' => '내 주시문서 목록',
+'mywatchlist' => '주시문서 목록',
 'watchlistfor2' => '사용자:$1 $2',
 'nowatchlist' => '주시하는 문서가 아직 없습니다.',
 'watchlistanontext' => '주시문서 목록을 보거나 고치려면 $1 하세요.',
@@ -2433,7 +2436,7 @@ URL이 맞고 해당 웹사이트가 작동하는지 확인해주세요.',
 
 'enotif_mailer' => '{{SITENAME}} 자동 알림 메일',
 'enotif_reset' => '모든 문서를 방문한 것으로 표시하기',
-'enotif_newpagetext' => '이것은 새 문서입니다.',
+'enotif_newpagetext' => '이 문서는 새 문서입니다.',
 'enotif_impersonal_salutation' => '{{SITENAME}} 사용자',
 'changed' => '바꾸',
 'created' => '만들',
@@ -2662,7 +2665,7 @@ $1',
 # Contributions
 'contributions' => '사용자 기여',
 'contributions-title' => '$1 사용자의 기여 목록',
-'mycontris' => '내 기여 목록',
+'mycontris' => '기여 목록',
 'contribsub2' => '$1($2)의 기여',
 'nocontribs' => '이 사용자는 아무 것도 기여하지 않았습니다.',
 'uctop' => '(최신)',
@@ -2692,7 +2695,7 @@ $1',
 'whatlinkshere' => '여기를 가리키는 문서',
 'whatlinkshere-title' => '"$1" 문서를 가리키는 문서 목록',
 'whatlinkshere-page' => '문서:',
-'linkshere' => "다음의 문서가 '''[[:$1]]''' 문서를 가리키고 있습니다:",
+'linkshere' => "다음 문서가 '''[[:$1]]''' 문서를 가리키고 있습니다:",
 'nolinkshere' => "'''[[:$1]]''' 문서를 가리키는 문서가 없습니다.",
 'nolinkshere-ns' => "선택한 이름공간에는 '''[[:$1]]''' 문서를 가리키는 문서가 없습니다.",
 'isredirect' => '넘겨주기 문서',
@@ -2704,7 +2707,7 @@ $1',
 'whatlinkshere-hideredirs' => '넘겨주기를 $1',
 'whatlinkshere-hidetrans' => '틀을 $1',
 'whatlinkshere-hidelinks' => '링크를 $1',
-'whatlinkshere-hideimages' => '그림 포함을 $1',
+'whatlinkshere-hideimages' => '파일 링크를 $1',
 'whatlinkshere-filters' => '필터',
 
 # Block/unblock
@@ -2748,7 +2751,7 @@ $1',
 'blockipsuccesstext' => '[[Special:Contributions/$1|$1]] 사용자가 차단되었습니다.<br />
 차단된 사용자 목록은 [[Special:BlockList|여기]]에서 볼 수 있습니다.',
 'ipb-blockingself' => '자기 자신을 차단하려고 합니다! 정말로 실행할까요?',
-'ipb-confirmhideuser' => '당신은 사용자를 차단하면서 "사용자 숨기기" 설정을 선택했습니다. 이로써 모든 기록에서 이 사용자의 사용자 이름을 숨기게 됩니다. 정말로 계정을 숨기시겠습니까?',
+'ipb-confirmhideuser' => '사용자를 차단하면서 "사용자 숨기기" 설정을 선택했습니다. 모든 기록에서 이 사용자의 사용자 이름을 숨기게 됩니다. 정말로 계정을 숨기시겠습니까?',
 'ipb-edit-dropdown' => '차단 이유 목록 편집하기',
 'ipb-unblock-addr' => '$1 차단 해제하기',
 'ipb-unblock' => '사용자 또는 IP 주소 차단 해제하기',
@@ -2784,7 +2787,7 @@ $1',
 'emailblock' => '이메일 차단됨',
 'blocklist-nousertalk' => '자신의 토론 문서 편집 불가',
 'ipblocklist-empty' => '차단된 사용자가 없습니다.',
-'ipblocklist-no-results' => '당신이 입력한 IP 주소나 사용자는 차단되지 않았습니다.',
+'ipblocklist-no-results' => '요청한 IP 주소나 사용자는 차단되지 않았습니다.',
 'blocklink' => '차단',
 'unblocklink' => '차단 해제',
 'change-blocklink' => '차단 설정 바꾸기',
@@ -2832,11 +2835,11 @@ $1 사용자가 차단된 이유는 다음과 같습니다: "$2"',
 'sorbsreason' => '당신의 IP 주소는 {{SITENAME}}에서 사용하는 DNSBL 공개 프록시 목록에 들어 있습니다.',
 'sorbs_create_account_reason' => '당신의 IP 주소는 {{SITENAME}}에서 사용하는 DNSBL 공개 프록시 목록에 들어 있습니다.
 계정을 만들 수 없습니다.',
-'cant-block-while-blocked' => '당신이 차단되어 있는 동안에는 다른 사용자를 차단할 수 없습니다.',
-'cant-see-hidden-user' => '당신이 차단하려 하는 사용자는 이미 차단되었고 숨김 처리되었습니다.
-당신이 사용자 숨기기 권한을 갖고 있지 않기 때문에, 이 사용자의 차단 기록을 보거나 차단 설정을 바꿀 수 없습니다.',
-'ipbblocked' => '당신은 차단되어 있기 때문에 다른 사용자를 차단하거나 차단을 해제할 수 없습니다.',
-'ipbnounblockself' => '당신은 자기 스스로를 차단 해제할 수 없습니다.',
+'cant-block-while-blocked' => '자신이 차단되어 있는 동안에는 다른 사용자를 차단할 수 없습니다.',
+'cant-see-hidden-user' => '차단하려 하는 사용자는 이미 차단되었고 숨김 처리되었습니다.
+사용자 숨기기 권한을 갖고 있지 않기 때문에, 이 사용자의 차단 기록을 보거나 차단 설정을 바꿀 수 없습니다.',
+'ipbblocked' => '자신이 차단되어 있기 때문에 다른 사용자를 차단하거나 차단을 해제할 수 없습니다.',
+'ipbnounblockself' => '자기 스스로를 차단 해제할 수 없습니다.',
 
 # Developer tools
 'lockdb' => '데이터베이스 잠그기',
@@ -2867,10 +2870,10 @@ $1 사용자가 차단된 이유는 다음과 같습니다: "$2"',
 이전의 제목은 새 제목으로 넘겨줄 것입니다.
 원래 이름을 가리키는 넘겨주기를 자동으로 새로 고칠 수 있습니다.
 만약 이 설정을 선택하지 않았다면 [[Special:DoubleRedirects|이중 넘겨주기]]와 [[Special:BrokenRedirects|끊긴 넘겨주기]]가 있는지 확인해주세요.
-당신은 넘겨주기 링크가 제대로 향하고 있는지 확인하여야 합니다.
+넘겨주기 링크가 제대로 향하고 있는지 확인하여야 합니다.
 
-만약 문서의 새 이름으로 된 문서가 존재할 때, 그 문서가 비었거나 넘겨주기 문서이고 문서 역사가 없을 때에만 이동합니다. 그렇지 않을 경우에는 이동하지 '''않습니다'''.
-이것은 실수로 이동한 문서를 되돌릴 수는 있지만, 이미 존재하는 문서 위에 덮어씌울 수는 없다는 것을 의미합니다.
+참고로 새 제목으로 된 문서가 이미 있을 때, 비어 있거나 넘겨주기 문서이고 문서 역사가 없을 때에만 이동하며 그렇지 않을 경우에는 이동하지 '''않습니다'''.
+실수로 문서를 옮겼을 때 되돌릴 수는 있지만 이미 있는 문서를 덮어쓸 수 없음을 의미합니다.
 
 '''경고!'''
 인기 있는 문서일 경우 심각하고 예상하지 못한 문제를 초래할 수 있습니다.
@@ -2878,10 +2881,10 @@ $1 사용자가 차단된 이유는 다음과 같습니다: "$2"',
 'movepagetext-noredirectfixer' => "아래의 양식을 사용해 문서의 이름을 바꾸고 문서의 모든 역사를 새 이름으로 옮길 수 있습니다.
 이전의 제목은 새 제목으로 넘겨줄 것입니다.
 [[Special:DoubleRedirects|이중 넘겨주기]]나 [[Special:BrokenRedirects|끊긴 넘겨주기]]가 있는지 확인해주세요.
-당신은 넘겨주기 링크가 제대로 향하고 있는지 확인하여야 합니다.
+넘겨주기 링크가 제대로 향하고 있는지 확인하여야 합니다.
 
-참고로 새 제목을 가진 문서가 이미 있다면 비어 있거나 넘겨주기 문서이며, 과거에 편집 내역이 없으면 이 문서는 옮겨지지 '''않을''' 것입니다.
-이는 당신이 실수로 문서를 옮겼을 때 되돌릴 수 있으며 이미 있는 문서를 덮어쓸 수 없음을 의미합니다.
+참고로 새 제목으로 된 문서가 이미 있을 때, 비어 있거나 넘겨주기 문서이고 문서 역사가 없을 때에만 이동하며 그렇지 않을 경우에는 이동하지 '''않습니다'''.
+실수로 문서를 옮겼을 때 되돌릴 수는 있지만 이미 있는 문서를 덮어쓸 수 없음을 의미합니다.
 
 '''경고!'''
 인기 있는 문서일 경우 심각하고 예상하지 못한 문제를 초래할 수 있습니다.
@@ -2892,7 +2895,7 @@ $1 사용자가 차단된 이유는 다음과 같습니다: "$2"',
 
 이 경우에는 문서를 직접 이동하거나 두 문서를 합쳐야 합니다.",
 'movearticle' => '문서 이동하기',
-'moveuserpage-warning' => "'''경고:''' 당신은 사용자 문서를 옮기려 하고 있습니다. 사용자 문서만 이동되며 사용자 이름이 바뀌지 '''않는다'''는 점을 명심해주시기 바랍니다.",
+'moveuserpage-warning' => "'''경고:''' 사용자 문서를 옮기려 하고 있습니다. 사용자 문서만 이동되며 사용자 이름이 바뀌지 '''않는다'''는 점을 참고해주시기 바랍니다.",
 'movenologin' => '로그인하지 않음',
 'movenologintext' => '문서를 이동하려면 [[Special:UserLogin|로그인]]해야 합니다.',
 'movenotallowed' => '문서를 이동할 권한이 없습니다.',
@@ -2951,7 +2954,7 @@ $1 사용자가 차단된 이유는 다음과 같습니다: "$2"',
 최근 기록 내용을 참고용로 제공합니다:",
 'move-over-sharedrepo' => '== 파일이 존재함 ==
 [[:$1]] 파일이 공용 저장소에 있습니다. 이 이름으로 파일을 옮기면 공용의 파일을 덮어쓰게 될 것입니다.',
-'file-exists-sharedrepo' => '당신이 선택한 파일 이름은 공용 저장소에서 사용 중입니다.
+'file-exists-sharedrepo' => '선택한 파일 이름은 공용 저장소에서 사용 중입니다.
 다른 이름을 선택해주세요.',
 
 # Export
@@ -3124,7 +3127,7 @@ $1 사용자가 차단된 이유는 다음과 같습니다: "$2"',
 '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' => '시스템 메시지 내용을 봅니다.',
@@ -3208,7 +3211,7 @@ $1 사용자가 차단된 이유는 다음과 같습니다: "$2"',
 
 # Info page
 'pageinfo-title' => '"$1" 문서에 대한 정보',
-'pageinfo-not-current' => '정보는 현재 판만을 보여줄 수 있습니다.',
+'pageinfo-not-current' => '죄송합니다, 이전 판에 대한 정보는 제공하지 않습니다.',
 'pageinfo-header-basic' => '기본 정보',
 'pageinfo-header-edits' => '편집 역사',
 'pageinfo-header-restrictions' => '문서 보호',
@@ -3217,6 +3220,7 @@ $1 사용자가 차단된 이유는 다음과 같습니다: "$2"',
 'pageinfo-default-sort' => '기본 정렬 키',
 'pageinfo-length' => '문서 길이 (바이트)',
 'pageinfo-article-id' => '문서 ID',
+'pageinfo-language' => '문서 내용 언어',
 'pageinfo-robot-policy' => '검색 엔진 통계',
 'pageinfo-robot-index' => '색인 가능',
 'pageinfo-robot-noindex' => '색인 불가능',
@@ -3849,7 +3853,7 @@ $5
 'scarytranscludetoolong' => '[URL이 너무 깁니다]',
 
 # Delete conflict
-'deletedwhileediting' => "'''경고''': 당신이 이 문서를 편집하던 중에 이 문서가 삭제되었습니다!",
+'deletedwhileediting' => "'''경고''': 이 문서를 편집하던 중에 이 문서가 삭제되었습니다!",
 'confirmrecreate' => '[[User:$1|$1]] 사용자([[User talk:$1|토론]])가 당신이 편집하는 도중에 문서를 삭제했습니다. 삭제 이유는 다음과 같습니다:
 : $2
 문서를 다시 만들어야 하는지 확인해주세요.',
@@ -3957,6 +3961,7 @@ $5
 'version-license' => '라이선스',
 'version-poweredby-credits' => "이 위키는 '''[//www.mediawiki.org/ MediaWiki]'''를 기반으로 작동합니다. Copyright © 2001-$1 $2.",
 'version-poweredby-others' => '그 외 다른 개발자',
+'version-credits-summary' => '우리는 [[Special:Version|미디어위키]]에 기여한 다음 사람한테 감사드립니다.',
 'version-license-info' => "미디어위키는 자유 소프트웨어입니다. 당신은 자유 소프트웨어 재단이 발표한 GNU 일반 공중 사용 허가서 버전 2나 그 이후 버전에 따라 이 파일을 재배포하거나 수정할 수 있습니다.
 
 미디어위키가 유용하게 사용될 수 있기를 바라지만 '''상용으로 사용'''되거나 '''특정 목적에 맞을 것'''이라는 것을 '''보증하지 않습니다'''. 자세한 내용은 GNU 일반 공중 사용 허가서 전문을 참고하십시오.
@@ -4042,9 +4047,9 @@ $5
 'compare-rev1' => '첫 번째 판',
 'compare-rev2' => '두 번째 판',
 'compare-submit' => '비교하기',
-'compare-invalid-title' => '당신이 입력한 제목이 잘못되었습니다.',
-'compare-title-not-exists' => '당신이 입력한 문서가 존재하지 않습니다.',
-'compare-revision-not-exists' => '당신이 지정한 판이 없습니다.',
+'compare-invalid-title' => '입력한 제목이 잘못되었습니다.',
+'compare-title-not-exists' => '입력한 문서가 존재하지 않습니다.',
+'compare-revision-not-exists' => '지정한 판이 없습니다.',
 
 # Database error messages
 'dberr-header' => '이 위키에 문제가 있습니다.',
@@ -4057,12 +4062,12 @@ $5
 'dberr-cachederror' => '다음은 요청한 문서의 캐시된 복사본이며, 최신이 아닐 수도 있습니다.',
 
 # HTML forms
-'htmlform-invalid-input' => '당신이 입력한 값에 문제가 있습니다.',
-'htmlform-select-badoption' => '당신이 입력한 값은 올바른 설정이 아닙니다.',
-'htmlform-int-invalid' => '당신이 입력한 값은 정수가 아닙니다.',
-'htmlform-float-invalid' => '입력한 값이 수가 아닙니다.',
-'htmlform-int-toolow' => '당신이 입력한 값은 최소값 $1 미만입니다.',
-'htmlform-int-toohigh' => '당신이 입력한 값은 최대값 $1 이상입니다.',
+'htmlform-invalid-input' => '입력한 값에 문제가 있습니다.',
+'htmlform-select-badoption' => '지정한 값은 올바른 설정이 아닙니다.',
+'htmlform-int-invalid' => '지정한 값은 정수가 아닙니다.',
+'htmlform-float-invalid' => '지정한 값은 수가 아닙니다.',
+'htmlform-int-toolow' => '지정한 값은 최소값 $1 미만입니다.',
+'htmlform-int-toohigh' => '지정한 값은 최대값 $1 이상입니다.',
 'htmlform-required' => '이 값은 필수 항목입니다',
 'htmlform-submit' => '저장',
 'htmlform-reset' => '바꾼 것을 되돌리기',
@@ -4122,30 +4127,30 @@ $5
 
 # Search suggestions
 'searchsuggest-search' => '찾기',
-'searchsuggest-containing' => '다음의 어구가 들어간 문서 찾기',
+'searchsuggest-containing' => '다음 어구가 들어간 문서 찾기',
 
 # API errors
-'api-error-badaccess-groups' => '당신은 이 위키에 파일을 올릴 권한이 없습니다.',
+'api-error-badaccess-groups' => '이 위키에 파일을 올릴 권한이 없습니다.',
 'api-error-badtoken' => '내부 오류: 토큰이 잘못되었습니다.',
 'api-error-copyuploaddisabled' => '이 서버에서 URL을 통해 파일 올리기가 비활성화되어 있습니다.',
 'api-error-duplicate' => '이 위키에 내용이 똑같은 {{PLURAL:$1|[$2 다른 파일]}}이 있습니다.',
 'api-error-duplicate-archive' => '같은 내용을 담고 있던 {{PLURAL:$1|[$2 다른 파일]}}이 있었지만 이 {{PLURAL:$1|파일}}은 삭제되었습니다.',
 'api-error-duplicate-archive-popup-title' => '중복된 {{PLURAL:$1|파일}}이 이미 삭제되었습니다.',
 'api-error-duplicate-popup-title' => '중복된 {{PLURAL:$1|파일}}입니다.',
-'api-error-empty-file' => '당신이 올리려는 파일이 비어 있습니다.',
+'api-error-empty-file' => '올리려는 파일이 비어 있습니다.',
 'api-error-emptypage' => '새 문서로 빈 문서를 만들 수 없습니다.',
 'api-error-fetchfileerror' => '내부 오류: 파일을 불러오는 중 문제가 발생했습니다.',
 'api-error-fileexists-forbidden' => '"$1" 이름으로 된 파일은 이미 존재하고 덮어쓸 수 없습니다.',
 'api-error-fileexists-shared-forbidden' => '"$1" 이름으로 된 파일이 이미 공용 저장소에 존재하며 덮어쓸 수 없습니다.',
-'api-error-file-too-large' => '당신이 올리려는 파일이 너무 큽니다.',
+'api-error-file-too-large' => '올리려는 파일이 너무 큽니다.',
 'api-error-filename-tooshort' => '파일 이름이 너무 짧습니다.',
 'api-error-filetype-banned' => '이런 파일 형식은 올릴 수 없습니다.',
 'api-error-filetype-banned-type' => '$1 {{PLURAL:$4|파일 형식은 올릴 수 없습니다}}. $2 {{PLURAL:$3|파일 형식만 사용할 수 있습니다}}.',
 'api-error-filetype-missing' => '파일 이름에 확장자가 없습니다.',
-'api-error-hookaborted' => '당신이 시도한 수정이 확장 기능 훅에 의해 중단되었습니다.',
+'api-error-hookaborted' => '수정하려고 한 것이 확장 기능에 의해 중지되었습니다.',
 'api-error-http' => '내부 오류: 서버에 연결할 수 없습니다.',
 'api-error-illegal-filename' => '이 파일 이름을 사용할 수 없습니다.',
-'api-error-internal-error' => '내부 오류: 당신이 올린 파일을 위키에서 처리하는 중 문제가 발생했습니다.',
+'api-error-internal-error' => '내부 오류: 올린 파일을 위키에서 처리하는 중 어떤 문제가 발생했습니다.',
 'api-error-invalid-file-key' => '내부 오류: 임시 저장소에서 파일을 찾지 못했습니다.',
 'api-error-missingparam' => '내부 오류: 요청 중 매개변수가 누락되었습니다.',
 'api-error-missingresult' => '내부 오류: 파일의 복제가 성공했는지 판단할 수 없습니다.',
diff --git a/languages/messages/MessagesKrc.php b/languages/messages/MessagesKrc.php
index 6ba2d82182..414eadab48 100644
--- a/languages/messages/MessagesKrc.php
+++ b/languages/messages/MessagesKrc.php
@@ -100,15 +100,15 @@ $messages = array(
 # Dates
 'sunday' => 'Ыйых кюн',
 'monday' => 'Баш кюн',
-'tuesday' => 'Геурге кюн',
-'wednesday' => 'Барас кюн',
+'tuesday' => 'Гюрге кюн',
+'wednesday' => 'Бараз кюн',
 'thursday' => 'Орта кюн',
 'friday' => 'Байрым кюн',
 'saturday' => 'Шабат кюн',
 'sun' => 'Ыйых кюн',
 'mon' => 'Баш кюн',
-'tue' => 'Геурге кюн',
-'wed' => 'Барас кюн',
+'tue' => 'Гр',
+'wed' => 'Брз',
 'thu' => 'Орта кюн',
 'fri' => 'Байрым кюн',
 'sat' => 'Шабат кюн',
@@ -302,6 +302,9 @@ $1',
 'youhavenewmessages' => 'Сизге $1 келдиле ($2).',
 'newmessageslink' => 'джангы билдириуле',
 'newmessagesdifflink' => 'сюзюу бетигизни ахыр тюрлениую',
+'youhavenewmessagesmanyusers' => 'Талай къошулуучудан $1 барды. ($2)',
+'newmessageslinkplural' => '{{PLURAL:$1|джангы билдириуюгюз|джангы билдириулеригиз}}',
+'newmessagesdifflinkplural' => 'ахыр {{PLURAL:$1|тюрлениу|тюрлениу}}',
 'youhavenewmessagesmulti' => '$1 бетде джангы билдириуле бардыла.',
 'editsection' => 'тюрлендир',
 'editold' => 'тюрлендир',
@@ -2583,6 +2586,7 @@ MediaWiki локализациясына юлюш къошаргъа излей
 'pageinfo-watchers' => 'Кёргенлени саны',
 'pageinfo-edits' => 'Тюрлендириулени саны',
 'pageinfo-authors' => 'Авторланы саны',
+'pageinfo-toolboxlink' => 'Бетни юсюнден',
 
 # Skin names
 'skinname-standard' => 'Стандарт',
diff --git a/languages/messages/MessagesKs_arab.php b/languages/messages/MessagesKs_arab.php
index 3640f3391d..9f9eefa231 100644
--- a/languages/messages/MessagesKs_arab.php
+++ b/languages/messages/MessagesKs_arab.php
@@ -12,6 +12,24 @@
 
 $rtl = true;
 
+$namespaceNames = array(
+	NS_MEDIA            => 'میڈیا',
+	NS_SPECIAL          => 'خاص',
+	NS_MAIN             => '',
+	NS_TALK             => 'بَحَژ',
+	NS_USER             => 'رُکُن',
+	NS_USER_TALK        => 'رُکُن_بَحَژ',
+	NS_PROJECT_TALK     => '$1_بَحَژ',
+	NS_FILE             => 'فَیِل',
+	NS_FILE_TALK        => 'فَیِل_بَحَژ',
+	NS_MEDIAWIKI        => 'میڈیاوکی',
+	NS_MEDIAWIKI_TALK   => 'میڈیاوکی_بَحَژ',
+	NS_HELP             => 'پَلزُن',
+	NS_HELP_TALK        => 'پَلزُن_بَحَژ',
+	NS_CATEGORY         => 'زٲژ',
+	NS_CATEGORY_TALK    => 'زٲژ_بَحَژ',
+);
+
 $digitTransformTable = array(
 	'0' => 'Ù ', # &#x0660;
 	'1' => 'Ù¡', # &#x0661;
diff --git a/languages/messages/MessagesKsh.php b/languages/messages/MessagesKsh.php
index d38342d760..7e9bd87b0e 100644
--- a/languages/messages/MessagesKsh.php
+++ b/languages/messages/MessagesKsh.php
@@ -165,7 +165,6 @@ $specialPageAliases = array(
 	'Recentchanges'             => array( 'Neuste_Änderunge', 'Änderunge' ),
 	'Recentchangeslinked'       => array( 'Änderungen_an_verlinkte_Sigge' ),
 	'Revisiondelete'            => array( 'Version_fottschmieße' ),
-	'RevisionMove'              => array( 'VersioneÖmnänne', 'Versione_Ömnänne', 'VersioneÖmnenne', 'Versione_Ömnenne' ),
 	'Search'                    => array( 'Sök', 'Söök', 'Söke', 'Sööke' ),
 	'Shortpages'                => array( 'Koote_Atikelle' ),
 	'Specialpages'              => array( 'Sondersigge', 'Söndersigge' ),
@@ -1489,7 +1488,7 @@ Ene zohfällesch ußjewörfelte Schlößel, dää De nämme künnß, wöhr: <cod
 'yourgender' => 'Do bes *',
 'gender-unknown' => 'wesse mer nit',
 'gender-male' => 'Kääl odder Jung',
-'gender-female' => 'Möhn, Weech odder Mädche',
+'gender-female' => 'Möhn, Weesch odder Mädsche',
 'prefs-help-gender' => '* Moß mer nit aanjevve, un wann et aanjejovve eß, dann kallt et Wiki övver Desch als „dä Pitter“ udder „dat Tiina“, sönß uns „Metmaacher Pütz“. Dat kritt de janne Welt ze sinn, nit nur Do allein.',
 'email' => '<i lang="en">e-mail</i>',
 'prefs-help-realname' => '* Dinge richtije Name — kanns De fott looße — wann De en ävver nenne wells, dann weed dä jebruch, öm Ding Beidräch domet ze schmöcke.',
@@ -1629,6 +1628,8 @@ Ene zohfällesch ußjewörfelte Schlößel, dää De nämme künnß, wöhr: <cod
 'rightslogtext' => 'Hee sin de Änderunge an Metmaacher ehre Räächde opjeliss. Op de Sigge üvver Metmaacher, Wiki-Köbesse, Bürrokrade, Stewards, un esu, kanns De nohlese, wat domet es.',
 'rightslogentry' => 'hät däm Metmaacher „$1“ sing Räächde vun „$2“ op „$3“ ömjestallt.',
 'rightslogentry-autopromote' => 'wood automattesch vun $2 zohm $3 jemaat.',
+'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.',
 'rightsnone' => '(nix)',
 
 # Associated actions - in the sentence "You do not have permission to X"
@@ -2367,11 +2368,10 @@ schecke.',
 '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 heh dä Metmaacher en Adräß för sing <i lang="en">e-mail</i> aanjejovve hätt en singe Enstellunge,
-un die deit et och, dann kanns De met däm Fomular hee unge en einzel <i lang="en">e-mail</i> aan dä Metmaacher schecke.
+'emailpagetext' => 'Wann {{GENDER:$1|dä Metmaacher heh|dat heh|heh dä Metmaacher|sei|dat heh}} en Adräß för sing <i lang="en">e-mail</i> aanjejovve hätt en singe Enstellunge, un die deit et och, dann kanns De met däm Fomular heh unge en einzel <i lang="en">e-mail</i> aan {{GENDER:$1|inn|it|dä Metmaacher|heh di Metmaacherėn|et}} schecke.
 
 Ding <i lang="en">e-mail</i>-Adräß, di De en [[Special:Preferences|Ding eije Enstellunge]] aanjejovve häs,
-di weed als em Afsender sing Adräß en Ding <i lang="en">e-mail</i> enjedrage.
+di weed als em Afsender sing Adräß enjedrare.
 Domet kann, wä di <i lang="en">e-mail</i> kritt, drop antwoote, un di Antwood jeiht tirek aan Desch.
 Alles klor?',
 'usermailererror' => 'Dat E-Mail-Objek jov ene Fähler us:',
@@ -2629,7 +2629,9 @@ Versione för die neu Sigg enjerich. Die neu Sigg weed nit ersetz.',
 'undeletedrevisions' => '{{PLURAL:$1|ein Version|$1 Versione}} zeröckjehollt',
 'undeletedrevisions-files' => 'Zesammejenomme {{PLURAL:$1|Ein Version|<strong>$1</strong> Versione|<strong>Kein</strong> Version}} vun {{PLURAL:$2|eine Datei|<strong>$2</strong> Dateie|<strong>nix</strong>}} zeröckjehollt',
 'undeletedfiles' => '{{PLURAL:$1|Ein Datei|<strong>$1</strong> Dateie|<strong>Kein</strong> Dateie}} zeröckjehollt',
-'cannotundelete' => '<strong>Dä.</strong> Et Zeröckholle jing donevve. Maach sinn, dat ene andere Metmaacher flöcker wor, un et et eets jedon hät, un jetz es die Sigg ald widder do jewäse.',
+'cannotundelete' => '<strong>Dä.</strong> Et Zeröckholle jing donävve.
+
+$1',
 'undeletedpage' => '<strong>De Sigg „$1“ es jetz widder do</strong>
 Luur Der et [[Special:Log/delete|Logboch met de fottjeschmesse Sigge]] aan, do häs De de Neuste fottjeschmesse
 un widder herjehollte Sigge.',
@@ -3213,7 +3215,7 @@ Esu kam_mer noch en Aanmerkung en „{{int:summary}}“ maache.',
 
 # Info page
 'pageinfo-title' => 'Övver di Sigg: „$1“',
-'pageinfo-not-current' => 'Esu en Aanjaabe künne mer bloß övver de Neuste Version vun dä Sigg maache.',
+'pageinfo-not-current' => 'Esu en Aanjaabe künne mer övver ällder Versione vun Sigge nit maache.',
 'pageinfo-header-basic' => 'Jrundlääje Aanjabe',
 'pageinfo-header-edits' => 'De Änderonge',
 'pageinfo-header-restrictions' => 'Siggeschoz',
@@ -3222,6 +3224,7 @@ Esu kam_mer noch en Aanmerkung en „{{int:summary}}“ maache.',
 'pageinfo-default-sort' => 'Shtandattmääßesch zottiere met däm Schlößel',
 'pageinfo-length' => 'Bytes en dä Sigg',
 'pageinfo-article-id' => 'Dä Sigg ier Nommer en dä Daatebangk',
+'pageinfo-language' => 'De Schprooch vum Sigge-Enhallt',
 'pageinfo-robot-policy' => 'Eijeschaffte för de Söhkmaschiine',
 'pageinfo-robot-index' => 'kammer opnämme',
 'pageinfo-robot-noindex' => 'kammer nit opnämme',
@@ -4021,6 +4024,7 @@ Dä Shtanndat-Zoot-Schlößel „$1“ övverschriif dä älldere Zoot-Schlöße
 'version-license' => 'Lizänz',
 'version-poweredby-credits' => "Dat Wiki heh löp met '''[//www.mediawiki.org/ MediaWiki]''', copyright © 2001–$1 $2.",
 'version-poweredby-others' => 'sönß wää',
+'version-credits-summary' => 'Mer bedanke ons för iehr Beidrähsch zom [[Special:Version|MediaWiki]] bei:',
 'version-license-info' => 'MediaWiki es e frei Projramm. Mer kann et unmolesteet wigger verdeile, un mer kann et verändere, wi mer löstich es, wam_mer sesch dobei aan de <i lang="en">GNU General Public License</i> (jenerälle öffentlesche Lizänz noh GNU) hallde deiht, wi se vun der <i lang="en">Free Software Foundation</i> (Steftung för frei Soffwäer) veröffentlesch woode es. Dobei kam_mer sesch ußsöhke of mer sesch aan de Version 2 dovun hallde deiht, udder öhnz en späädere Fassung.
 
 MediaWiki weed verdeilt met dä Hoffnung, dat et för jet jood es, ävver <span style="text-transform:uppercase">der ohne jeede Jarantie</span>, un esujaa ohne ene unjesaate Jedangke, et künnt <span style="text-transform:uppercase">ze verkoufe</span> sin udder <span style="text-transform:uppercase;">för öhndsene bestemmpte Zweck ze jebruche</span>. Loor Der de jenannte Lizänz aan, wann De mieh Einzelheite weße wells.
diff --git a/languages/messages/MessagesKu_latn.php b/languages/messages/MessagesKu_latn.php
index 93f517ca1c..a9f3b97bc2 100644
--- a/languages/messages/MessagesKu_latn.php
+++ b/languages/messages/MessagesKu_latn.php
@@ -74,7 +74,6 @@ $magicWords = array(
 	'notoc'                     => array( '0', '_NAVEROKTUNE_', '__NOTOC__' ),
 	'nogallery'                 => array( '0', '_GALERÎTUNE_', '__NOGALLERY__' ),
 	'toc'                       => array( '0', '_NAVEROK_', '__TOC__' ),
-	'noheader'                  => array( '0', '_SERÎTUNE_', '__NOHEADER__' ),
 	'currentmonth1'             => array( '1', 'MEHANIHA1', 'CURRENTMONTH1' ),
 	'currentday'                => array( '1', 'ROJA_NIHA', 'CURRENTDAY' ),
 	'currentday2'               => array( '1', 'ROJA_NIHA2', 'CURRENTDAY2' ),
@@ -88,7 +87,7 @@ $magicWords = array(
 	'subpagename'               => array( '1', 'BINRÛPEL', 'SUBPAGENAME' ),
 	'img_right'                 => array( '1', 'rast', 'right' ),
 	'img_left'                  => array( '1', 'çep', 'left' ),
-	'img_link'                  => array( '1', 'girêdan=$', 'link=$1' ),
+	'img_link'                  => array( '1', 'girêdan=$1', 'link=$1' ),
 	'sitename'                  => array( '1', 'NAVÊ_PROJEYÊ', 'SITENAME' ),
 	'grammar'                   => array( '0', 'RÊZIMAN.', 'GRAMMAR:' ),
 	'gender'                    => array( '0', 'ZAYEND.', 'GENDER:' ),
@@ -734,8 +733,7 @@ Sedema qedexekirina $3 ev e: ''$2''",
 'last' => 'berê',
 'page_first' => 'ya pêşîn',
 'page_last' => 'ya paşîn',
-'histlegend' => 'Rênîşan: (cudahî) = cudahiya nav vê û versiyona niha,
-(berê) = cudahiya nav vê û ya berî vê, B = guhertina biçûk',
+'histlegend' => "Rênîşan: ({{int:cur}}) = cudahiya nav vê û versiyona niha, ({{int:last}}) = cudahiya nav vê û ya berî vê, '''{{int:minoreditletter}}''' = guhertina biçûk",
 'history-fieldset-title' => 'Li dîrokê bigere',
 'history-show-deleted' => 'Tenê yên jêbirî',
 'histfirst' => 'Kevintirîn',
diff --git a/languages/messages/MessagesKy.php b/languages/messages/MessagesKy.php
index ec9c19b530..b2ea2a777a 100644
--- a/languages/messages/MessagesKy.php
+++ b/languages/messages/MessagesKy.php
@@ -135,7 +135,6 @@ $messages = array(
 'qbbrowse' => 'Сереп сал',
 'qbedit' => 'Оңдоо',
 'qbpageoptions' => 'Бул барак',
-'qbpageinfo' => 'Контекст',
 'qbmyoptions' => 'Барактарым',
 'qbspecialpages' => 'Атайын барактар',
 'faq' => 'КБС',
diff --git a/languages/messages/MessagesLa.php b/languages/messages/MessagesLa.php
index 9b37238ebb..abcaeab103 100644
--- a/languages/messages/MessagesLa.php
+++ b/languages/messages/MessagesLa.php
@@ -279,8 +279,8 @@ $messages = array(
 'newwindow' => '(in fenestra nova aperietur)',
 'cancel' => 'Abrogare',
 'moredotdotdot' => 'Plus...',
-'mypage' => 'Pagina mea',
-'mytalk' => 'Disputatio mea',
+'mypage' => 'Pagina',
+'mytalk' => 'Disputatio',
 'anontalk' => 'Disputatio huius IP',
 'navigation' => 'Navigatio',
 'and' => '&#32;et',
@@ -878,7 +878,7 @@ Conare praefixare tua inquisitionem cum ''all:'' ut quaeras contenta omnia (pagi
 
 # Preferences page
 'preferences' => 'Praeferentiae',
-'mypreferences' => 'Praeferentiae meae',
+'mypreferences' => 'Praeferentiae',
 'prefs-edits' => 'Numerus recensionum:',
 'prefsnologin' => 'Conventum non est apertum',
 'prefsnologintext' => '<span class="plainlinks">[{{fullurl:{{#Special:UserLogin}}|returnto=$1}} Conventum aperire]</span> debes ad praeferentias tuas modificandum.',
@@ -1657,7 +1657,7 @@ Si pagina nova cum ipso nomine post deletionem creata est, emendationes restitut
 # Contributions
 'contributions' => 'Conlationes usoris',
 'contributions-title' => 'Conlationes usoris $1',
-'mycontris' => 'Conlationes meae',
+'mycontris' => 'Conlationes',
 'contribsub2' => 'Pro $1 ($2)',
 'nocontribs' => 'Nullae mutationes inventae sunt ex his indiciis.',
 'uctop' => ' (vertex)',
diff --git a/languages/messages/MessagesLad.php b/languages/messages/MessagesLad.php
index 2a4f304a99..819a02fe39 100644
--- a/languages/messages/MessagesLad.php
+++ b/languages/messages/MessagesLad.php
@@ -9,6 +9,7 @@
  *
  * @author ILVI
  * @author Jewbask
+ * @author Maor X
  * @author Remember the dot
  * @author Runningfridgesrule
  * @author Taichi
@@ -139,7 +140,6 @@ $specialPageAliases = array(
 	'Recentchanges'             => array( 'TrocamientosFreskos' ),
 	'Recentchangeslinked'       => array( 'TrocamientosÈnterassados' ),
 	'Revisiondelete'            => array( 'EfassarRēvizyón' ),
-	'RevisionMove'              => array( 'TaxireaRēvizyón' ),
 	'Search'                    => array( 'Buscar' ),
 	'Shortpages'                => array( 'HojasKurtas' ),
 	'Specialpages'              => array( 'HojasEspesyales' ),
@@ -325,7 +325,6 @@ $messages = array(
 'qbbrowse' => 'Navigar',
 'qbedit' => 'Trocar',
 'qbpageoptions' => 'Esta hoja',
-'qbpageinfo' => 'Enformasyón de hoja',
 'qbmyoptions' => 'Mis hojas',
 'qbspecialpages' => 'Hojas especiales',
 'faq' => 'DAD',
diff --git a/languages/messages/MessagesLb.php b/languages/messages/MessagesLb.php
index 3cc772c870..82aaefe151 100644
--- a/languages/messages/MessagesLb.php
+++ b/languages/messages/MessagesLb.php
@@ -92,6 +92,7 @@ $specialPageAliases = array(
 	'MIMEsearch'                => array( 'No_MIME-Zorte_sichen' ),
 	'Mostcategories'            => array( 'Säite_mat_de_meeschte_Kategorien' ),
 	'Mostimages'                => array( 'Dacks_benotzte_Biller' ),
+	'Mostinterwikis'            => array( 'Meescht_Interwikien' ),
 	'Mostlinked'                => array( 'Dacks_verlinkte_Säiten' ),
 	'Mostlinkedcategories'      => array( 'Dacks_benotzte_Kategorien' ),
 	'Mostlinkedtemplates'       => array( 'Dacks_benotzte_Schablounen' ),
@@ -115,7 +116,6 @@ $specialPageAliases = array(
 	'Recentchanges'             => array( 'Rezent_Ännerungen' ),
 	'Recentchangeslinked'       => array( 'Ännerungen_op_verlinkte_Säiten' ),
 	'Revisiondelete'            => array( 'Versioun_läschen' ),
-	'RevisionMove'              => array( 'Versioun_réckelen' ),
 	'Search'                    => array( 'Sichen' ),
 	'Shortpages'                => array( 'Kuerz_Säiten' ),
 	'Specialpages'              => array( 'Spezialsäiten' ),
@@ -229,7 +229,7 @@ $messages = array(
 
 'underline-always' => 'Ëmmer',
 'underline-never' => 'Ni',
-'underline-default' => 'vun der Browserastellung ofhängeg',
+'underline-default' => 'Skin oder Standard vum Browser',
 
 # Font style option in Special:Preferences
 'editfont-style' => "Schrëftfamill fir d'Ännerungsfënster:",
@@ -314,8 +314,8 @@ $messages = array(
 'newwindow' => '(geet an enger neier Fënster op)',
 'cancel' => 'Zréck',
 'moredotdotdot' => 'Méi …',
-'mypage' => 'Meng Säit',
-'mytalk' => 'Meng Diskussioun',
+'mypage' => 'Säit',
+'mytalk' => 'Diskussioun',
 'anontalk' => 'Diskussioun fir dës IP Adress',
 'navigation' => 'Navigatioun',
 'and' => '&#32;a(n)',
@@ -864,7 +864,7 @@ Denkt drun datt eegen .css an .js Säiten e kleng geschriwwenen Titel benotzen,
 'note' => "'''Notiz:'''",
 'previewnote' => "'''Denkt drun datt dëst nëmmen eng net gespäichert Versioun ass.'''
 Är Ännerunge sinn nach net gespäichert!",
-'continue-editing' => 'Weider änneren',
+'continue-editing' => "Gitt weider an de Beräich fir z'änneren",
 'previewconflict' => 'Dir gesitt an dem ieweschten Textfeld wéi den Text ausgesi wäert, wann Dir späichert.',
 'session_fail_preview' => "'''Är Ännerung konnt net gespäichert gi well d'Date vun Ärer Sessioun verluergaange sinn.
 Versicht et w.e.g. nach eng Kéier.
@@ -937,6 +937,7 @@ Si gouf anscheinend geläscht.",
 'edit-no-change' => 'Är ännerung gouf ignoréiert, well Dir näischt um Text geännert hutt.',
 'edit-already-exists' => 'Déi nei Säit konnt net ugeluecht ginn, well et se scho gëtt.',
 'defaultmessagetext' => 'Standardtext',
+'invalid-content-data' => 'Donnéeë vum Inhalt sinn net valabel',
 'content-not-allowed-here' => '"$1"-Inhalt ass op der Säit [[$2]] net erlaabt',
 
 # Content models
@@ -1225,7 +1226,7 @@ Denkt w.e.g drunn datt d'Navigatiounslinken d'Wiel vun de Versiounen nees zréck
 
 # Preferences page
 'preferences' => 'Astellungen',
-'mypreferences' => 'Meng Astellungen',
+'mypreferences' => 'Astellungen',
 'prefs-edits' => 'Zuel vun den Ännerungen:',
 'prefsnologin' => 'Net ageloggt',
 'prefsnologintext' => 'Dir musst <span class="plainlinks">[{{fullurl:{{#Special:UserLogin}}|returnto=$1}}ageloggt]</span> sinn, fir Är Astellungen änneren ze kënnen.',
@@ -2056,9 +2057,9 @@ Kuckt och [[Special:WantedCategories|Gewënscht Kategorien]].',
 'linksearch-pat' => 'Sich-Critère:',
 'linksearch-ns' => 'Nummraum:',
 'linksearch-ok' => 'Sichen',
-'linksearch-text' => 'Sougennante "Wildcards" wéi zum Beispill <code>*.example.com</code> kënne benotzt ginn.
+'linksearch-text' => '"Wildcards" wéi zum Beispill "*.example.com" kënne benotzt ginn.
 Et muss mindestens en Top-Level-Domaine ugi ginn, wéi z. Bsp. ".org".<br />
-Ënnerstëtzte Protekoller: <code>$1</code>',
+Ënnerstëtzte Protekoller: <code>$1</code> (http:// gëtt benotzt wann näischt spezifizéiert gëtt).',
 'linksearch-line' => '$1 verlinkt vun $2',
 'linksearch-error' => 'Wildcards (*,?) kënnen nëmmen am Ufank vum Host-Numm benotzt ginn.',
 
@@ -2107,7 +2108,7 @@ Et ginn [[{{MediaWiki:Listgrouprights-helppage}}|zousätzlech Informatiounen]] i
 '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 dësem Benotzer en E-Mail-Message schécken.
+'emailpagetext' => 'Dir kënnt mat dësem Formulaire {{GENDER:$1|dësem Benotzer}} en E-Mail-Message schécken.
 D\'E-Mailadress, 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.',
 'usermailererror' => 'E-Mail-Objet mellt deen heite Feeler:',
 'defemailsubject' => '{{SITENAME}} E-Mail vum Benotzer "$1"',
@@ -2139,7 +2140,7 @@ D\'E-Mailadress, déi Dir an [[Special:Preferences|Ären Astellungen]] aginn hut
 
 # Watchlist
 'watchlist' => 'Meng Iwwerwaachungslëscht',
-'mywatchlist' => 'Meng Iwwerwaachungslëscht',
+'mywatchlist' => 'Iwwerwaachungslëscht',
 'watchlistfor2' => 'Vum $1 $2',
 'nowatchlist' => 'Är Iwwerwaachungslëscht ass eidel.',
 'watchlistanontext' => "Dir musst $1 fir Säiten op ärer Iwwerwaachungslëscht ze gesinn oder z'änneren.",
@@ -2401,7 +2402,7 @@ $1',
 # Contributions
 'contributions' => 'Kontributioune vum Benotzer',
 'contributions-title' => 'Kontributioune vum $1',
-'mycontris' => 'Meng Kontributiounen',
+'mycontris' => 'Kontributiounen',
 'contribsub2' => 'Fir $1 ($2)',
 'nocontribs' => 'Et goufe keng Ännerunge fonnt, déi dëse Kritèren entspriechen.',
 'uctop' => '(aktuell)',
@@ -2441,7 +2442,7 @@ $1',
 'whatlinkshere-hideredirs' => 'Viruleedunge $1',
 'whatlinkshere-hidetrans' => 'Agebonne Schabloune $1',
 'whatlinkshere-hidelinks' => 'Linken $1',
-'whatlinkshere-hideimages' => '$1 Linken op de Fichier',
+'whatlinkshere-hideimages' => 'Linken op Fichiere $1',
 'whatlinkshere-filters' => 'Filteren',
 
 # Block/unblock
@@ -2909,7 +2910,7 @@ Dëst warscheinlech duerch en externe Link den op der schwaarzer Lëscht (blackl
 
 # Info page
 'pageinfo-title' => 'Informatioun iwwer "$1"',
-'pageinfo-not-current' => 'Dës Informatioune kënnen nëmme fir dës Versioun gewise ginn.',
+'pageinfo-not-current' => 'Pardon, et ass onméiglech dës Informatioun fir al Versiounen ze weisen.',
 'pageinfo-header-basic' => 'Basisinformatiounen',
 'pageinfo-header-edits' => 'Historique vun den Ännerungen',
 'pageinfo-header-restrictions' => 'Spär vun der Säit',
@@ -2918,11 +2919,13 @@ Dëst warscheinlech duerch en externe Link den op der schwaarzer Lëscht (blackl
 'pageinfo-default-sort' => 'Standard-Zortéierschlëssel',
 'pageinfo-length' => 'Gréisst vun der Säit (a Bytes)',
 'pageinfo-article-id' => 'ID (Nummer) vun der Säit',
+'pageinfo-language' => 'Sprooch vum Inhalt vun der Säit',
 'pageinfo-views' => 'Zuel vun de Kéieren déi dës Säit gekuckt gouf',
 'pageinfo-watchers' => "Zuel vun de Benotzer déi d'Säit iwwerwaachen",
 'pageinfo-redirects-name' => 'Viruleedungen op dës Säit',
 'pageinfo-subpages-name' => 'Ënnersäite vun dëser Säit',
 'pageinfo-subpages-value' => '$1 ($2 {{PLURAL:$2|Viruleedung|Viruleedungen}}; $3 {{PLURAL:$3|Ënnersäit|Ënnersäiten}})',
+'pageinfo-firstuser' => '1. Auteur vun der Säit',
 'pageinfo-firsttime' => 'Datum vum Uleeë vun der Säit',
 'pageinfo-lastuser' => 'Leschte Benotzer deen eppes geännert huet',
 'pageinfo-lasttime' => 'Datum vun der leschter Ännerung',
diff --git a/languages/messages/MessagesLez.php b/languages/messages/MessagesLez.php
index c5cb83302e..783d0f8b55 100644
--- a/languages/messages/MessagesLez.php
+++ b/languages/messages/MessagesLez.php
@@ -303,6 +303,7 @@ $messages = array(
 'missingarticle-rev' => '(жуьре#: $1)',
 'internalerror' => 'КЪенепатан гъалатI',
 'internalerror_info' => 'КЪенепатан гъалатI $1',
+'filecopyerror' => 'Kopi aqudiz jezach fail "$1"  "$2" - diz.',
 'filerenameerror' => '«$1» файл  «$2» -з тIвар эхцигиз жезвач..',
 'badarticleerror' => 'И ччина и кар кьилиз акъудиз мумкин ттуш.',
 'cannotdelete-title' => ' "$1" ччин алудиз жезвач',
@@ -419,9 +420,9 @@ $messages = array(
 Квевай [[Special:Search/{{PAGENAME}}| и тlвар алай ччин]] муькуь ччинра жугъуриз,
 <span class="plainlinks"> [{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} журналрин талукь тир кхьей затIар жугъуриз],
 ва я [{{fullurl:{{FULLPAGENAME}}|action=edit}} и тlвар алай ччин туькIуьриз жеда] </span>.',
-'noarticletext-nopermission' => 'Исятда и  ччина са текстни авач.
-Квевай [[Special:Search/{{PAGENAME}}| и тlвар алай ччин]] муькуь ччинра жугъуриз ва я
-<span class="plainlinks"> [{{fullurl: {{# Special:Log}} | page = {{FULLPAGENAMEE}}}} журналрин талукь тир кхьей затIар жугъуриз] жеда.',
+'noarticletext-nopermission' => 'Iseatda china kxhin avach.
+Kwevay [[Special:Search/{{PAGENAME}}| i twar alay chin алай]] mukiu chinra jaghuriz ak\'ni
+<span class="plainlinks"> [{{fullurl: {{# Special:Log}} | page = {{FULLPAGENAMEE}}}} jurnalrin taluq\' tir kxhey zathar jaghuriz] jeda.',
 'blocked-notice-logextract' => 'И уртах алайчIава блокарнава.
 Агъадихъ блокарунин журналдикай эхиримжи кхьинар къалурнава:',
 'previewnote' => "'''Рикlел хуьх хьи, им анжах сифтедин килигун я.'''  
diff --git a/languages/messages/MessagesLfn.php b/languages/messages/MessagesLfn.php
index 2ff608d24d..03dae9f6a2 100644
--- a/languages/messages/MessagesLfn.php
+++ b/languages/messages/MessagesLfn.php
@@ -152,7 +152,6 @@ $messages = array(
 'qbbrowse' => 'Surfa',
 'qbedit' => 'Edita',
 'qbpageoptions' => 'Esta paje',
-'qbpageinfo' => 'Situa',
 'qbmyoptions' => 'Me pajes',
 'qbspecialpages' => 'Pajes spesial',
 
diff --git a/languages/messages/MessagesLmo.php b/languages/messages/MessagesLmo.php
index adaa3c1805..bd0421f5a8 100644
--- a/languages/messages/MessagesLmo.php
+++ b/languages/messages/MessagesLmo.php
@@ -235,7 +235,6 @@ süi titul dai sezziún (JavaScript)',
 'qbbrowse' => 'Sföja',
 'qbedit' => 'Mudifega',
 'qbpageoptions' => 'Opzión de la pagina',
-'qbpageinfo' => 'Infurmazión revard a la pagina',
 'qbmyoptions' => 'I mè paginn',
 'qbspecialpages' => 'Paginn special',
 'faq' => 'FAQ',
diff --git a/languages/messages/MessagesLoz.php b/languages/messages/MessagesLoz.php
index 333e04f716..15e1eaded1 100644
--- a/languages/messages/MessagesLoz.php
+++ b/languages/messages/MessagesLoz.php
@@ -124,7 +124,6 @@ $messages = array(
 'qbbrowse' => 'Nepile',
 'qbedit' => "Hloli ye ng'i",
 'qbpageoptions' => 'Bye petulo',
-'qbpageinfo' => 'Petulo tuto',
 'qbmyoptions' => 'Zwa petulona',
 'qbspecialpages' => 'Petulo zwenti',
 'faq' => 'Alabile',
diff --git a/languages/messages/MessagesLus.php b/languages/messages/MessagesLus.php
index c431b99afc..0638a5d0c5 100644
--- a/languages/messages/MessagesLus.php
+++ b/languages/messages/MessagesLus.php
@@ -1,5 +1,5 @@
 <?php
-/** Lushai (Mizo ţawng)
+/** Mizo (Mizo ţawng)
  *
  * See MessagesQqq.php for message documentation incl. usage of parameters
  * To improve a translation please visit http://translatewiki.net
diff --git a/languages/messages/MessagesLzh.php b/languages/messages/MessagesLzh.php
index 43ef68723a..8e80197cdb 100644
--- a/languages/messages/MessagesLzh.php
+++ b/languages/messages/MessagesLzh.php
@@ -164,7 +164,7 @@ $messages = array(
 'tog-watchcreations' => '哨己撰',
 'tog-watchdefault' => '哨己纂',
 'tog-watchmoves' => '派哨予吾遷之頁',
-'tog-watchdeletion' => '派哨予吾除之頁',
+'tog-watchdeletion' => '派哨至吾除之頁',
 'tog-minordefault' => '慣為校',
 'tog-previewontop' => '頂草覽',
 'tog-previewonfirst' => '覽首修',
@@ -951,6 +951,8 @@ $1",
 
 # Diffs
 'history-title' => '$1之誌',
+'difference-title' => '$1各本之异',
+'difference-title-multipage' => '$1、$2之异',
 'difference-multipage' => '（辨頁）',
 'lineno' => '列$1：',
 'compareselectedversions' => '辨二擇',
diff --git a/languages/messages/MessagesMap_bms.php b/languages/messages/MessagesMap_bms.php
index 7b6732d836..0bb810cb9d 100644
--- a/languages/messages/MessagesMap_bms.php
+++ b/languages/messages/MessagesMap_bms.php
@@ -159,7 +159,6 @@ $messages = array(
 'qbbrowse' => 'Jelajahi',
 'qbedit' => 'Sunting',
 'qbpageoptions' => 'Kaca kiye',
-'qbpageinfo' => 'Konteks kaca',
 'qbmyoptions' => 'Kaca-ne inyong',
 'qbspecialpages' => 'Kaca-kaca astamiwa',
 'faq' => 'FAQ (Pitakonan sing sering ditakokna)',
diff --git a/languages/messages/MessagesMg.php b/languages/messages/MessagesMg.php
index b537a3e008..834a00dba6 100644
--- a/languages/messages/MessagesMg.php
+++ b/languages/messages/MessagesMg.php
@@ -185,7 +185,6 @@ $specialPageAliases = array(
 	'Recentchanges'             => array( 'Fanovàna_farany' ),
 	'Recentchangeslinked'       => array( 'Fanarahana_ny_rohy' ),
 	'Revisiondelete'            => array( 'Santiôna_voafafa' ),
-	'RevisionMove'              => array( 'Fanalana_santiôna' ),
 	'Search'                    => array( 'Fikarohana' ),
 	'Shortpages'                => array( 'Pejy_fohy' ),
 	'Specialpages'              => array( 'Pejy_manokana' ),
@@ -481,6 +480,10 @@ Mitaky version $1-n'i MediaWiki",
 'youhavenewmessages' => 'Manana $1 ($2).',
 'newmessageslink' => 'hafatra vaovao',
 'newmessagesdifflink' => 'fanovana farany',
+'youhavenewmessagesfromusers' => "Manana $1 avy amin'ny mpikambana {{PLURAL:$3|hafa|$3}} ($2).",
+'youhavenewmessagesmanyusers' => "Manana $1 avy amin'ny mpikambana maro ($2).",
+'newmessageslinkplural' => '{{PLURAL:$1|hafatra iray|hafatra maro}}',
+'newmessagesdifflinkplural' => 'fanovana farany{{PLURAL:$1}}',
 'youhavenewmessagesmulti' => "Manana hafatra vaovao ianao eo amin'ny $1.",
 'editsection' => 'hanova',
 'editold' => 'hanova',
@@ -623,6 +626,7 @@ Aza hadino ny manova ny [[Special:Preferences|safidinao]]',
 'remembermypassword' => '{{PLURAL:}}Tadidio ny tenimiafiko (mandritry ny $1 andro fara-fahabetsany)',
 'securelogin-stick-https' => "Mijanona tafiditra amin'i HTTPS rehefa tafiditra",
 'yourdomainname' => 'faritra (domaine) misy anao',
+'password-change-forbidden' => "Tsy afaka manova ny tenimiafina ianao eto amin'ity wiki ity.",
 'externaldberror' => "Nisy tsy fetezana angamba teo amin'ny fanamarinana anao tamin'ny sehatra ivelan'ity wiki ity, na tsy manana alalana hanova ny kaontinao ivelany ianao.",
 'login' => 'Midira',
 'nav-login-createaccount' => 'Ampidiro ny solonanarana',
@@ -888,7 +892,7 @@ Tadidio fa mampiasa soramadinika ny lohatenin'ny pejinao manan-tovana *.css sy *
 'note' => "'''Fanamarihana:'''",
 'previewnote' => "'''Fantaro fa topi-maso fotsiny ity.'''
 Mbola tsy voatahiry ny fanovanao !",
-'continue-editing' => 'Tohizana ny fanovana',
+'continue-editing' => 'Hanohy ny fanovàna',
 'previewconflict' => "
 Ity topi-maso ity no mifanaraka amin'ny lahatsoratra ao amin'ny faritra eo ambony,
 ary toy izao no ho fisehon'ny pejy raha misafidy ny hitahiry azy ianao.",
@@ -1247,6 +1251,7 @@ ihany no miseho amin'ny vokatry ny karoka).",
 'qbsettings-fixedright' => 'Ankavanana',
 'qbsettings-floatingleft' => 'Mitsingevaheva any ankavanana',
 'qbsettings-floatingright' => 'Mitsigevaheva any ankavanana',
+'qbsettings-directionality' => "Tsy mihetsika, arakaraky ny fizotran'ny soratra amin'ny teninao (avy any havanana miankavia, na avy any havia miankavanana)",
 
 # Preferences page
 'preferences' => 'Ny momba anao',
@@ -1314,7 +1319,7 @@ Fenoy araka ny datin'ny solosainan'ny mpitsidika",
 'timezoneregion-indian' => 'Ranomasimbe Indianina',
 'timezoneregion-pacific' => 'Ranomasimbe Pasifika',
 'allowemail' => "Ekeo ny handraisana imailaka avy amin'ny mpikambana hafa",
-'prefs-searchoptions' => 'Safidy mikasika ny fikarohana',
+'prefs-searchoptions' => 'Karoka',
 'prefs-namespaces' => "Toeran'anarana",
 'defaultns' => "Fikarohana tsipalotra anatin'ireo anaran-tsehatra ireo :",
 'default' => 'tsipalotra',
@@ -1481,6 +1486,9 @@ Tsy haseho ny adiresy imailakao rehefa manoratra any aminao ny mpikambana hafa."
 'rightslogtext' => "Ity ny laogy momban'ny fanovana ny zom-pikambana.",
 'rightslogentry' => "nanova ny fahefan'ny mpikambana « $1 », avy amin'ny $2 izy lasa $3",
 'rightslogentry-autopromote' => '$2 navadika $3 ho azy',
+'logentry-rights-rights' => "$1 dia nanova ny sokajim-pikambana isian'i $3 avy amin'ny $4 lasa $5",
+'logentry-rights-rights-legacy' => "$1 nanova ny vonodrom-pikambana isian'i $3",
+'logentry-rights-autopromote' => 'Lasa $5 ho azy i $1 izay $4 taloha',
 'rightsnone' => '(tsy misy)',
 
 # Associated actions - in the sentence "You do not have permission to X"
@@ -1683,6 +1691,7 @@ Misafidia anaran-drakitra mambangovango.",
 
 $1",
 'upload-warning-subj' => 'Fampitandremana rehefa mampiditra',
+'upload-warning-msg' => "Nisy olana nitranga tam-pampidirana avy amin'i [$2] afaka miverina any amin'ny [[Special:Upload/stash/$1|formiolera fampidirana]] ianao hamahana izany olana izany.",
 
 'upload-proto-error' => 'Protokolina diso',
 'upload-proto-error-text' => "Mila URL manomboka amin'ny <code>http://</code> na <code>ftp://</code> ny fampidiran-drakitra.",
@@ -1750,9 +1759,9 @@ Avereno fanindroany.',
 
 # img_auth script messages
 'img-auth-accessdenied' => 'Tsy afa-mankao',
-'img-auth-nopathinfo' => "Tsy misy ny PATH_INFO.
+'img-auth-nopathinfo' => "Tsy misy PATH_INFO.
 Tsy voaparametatra ny lohamilinao hampita io fampahalalàna io.
-Mety mifototra amin'ny CGI izy ka mety tsy mahazaka img_auth
+Mety mampiasa CGI angamba ilay lohamilina ka tsy mahazaka an'i img_auth
 Vangio ny https://www.mediawiki.org/wiki/Manual:Image_Authorization.",
 'img-auth-notindir' => 'Ny lalana nangatahana dia tsy ny petra-drakitra nokaonfigiorena.',
 'img-auth-badtitle' => "Tsy afaka mamorona lohateny azo ampiasaina avy amin'ny « $1 ».",
@@ -2092,6 +2101,8 @@ Protokoly zaka <code>$1</code> aza ampiana ao amin'ny karokao izy ireo.",
 'listgrouprights-removegroup' => "Manala ny mpikambana {{PLURAL:$2}}amin'ny gropy : $1",
 'listgrouprights-addgroup-all' => 'Manampy mpikambana anaty vondrona rehetra',
 'listgrouprights-removegroup-all' => 'Manala mpikambana anaty gropy rehetra',
+'listgrouprights-addgroup-self' => "Afaka manampy ny tenany amin'ny vondrona{{PLURAL:$2}}: $1",
+'listgrouprights-removegroup-self' => "Afaka manala ny tenany amin'ny vondrona{{PLURAL:$2}} : $1",
 'listgrouprights-addgroup-self-all' => "Manampy ny vondrom-pikambana rehetra amin'ny kaontiny",
 'listgrouprights-removegroup-self-all' => "Manala ny vondrom-pikambana rehetra amin'ny kaontiny",
 
@@ -2099,6 +2110,7 @@ Protokoly zaka <code>$1</code> aza ampiana ao amin'ny karokao izy ireo.",
 'mailnologin' => 'Tsy misy adiresy handefasana ny tenimiafina',
 'mailnologintext' => "Mila [[Special:UserLogin|miditra]] ianao sady manana imailaka mandeha sy voamarina ao amin'ny [[Special:Preferences|mombamomba anao]] vao afaka mandefa imailaka amin'ny mpikambana hafa.",
 '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' => "Raha nametraka adiresy tena miasa tao amin'ny [[Special:Preferences|mombamomba azy io mpikambana io]],
@@ -2247,6 +2259,7 @@ ataovy am-pitandremana ity tao ity.",
 'rollback' => 'Foano indray ilay fanovana',
 'rollback_short' => 'Aza ovaina indray',
 'rollbacklink' => 'foano',
+'rollbacklinkcount' => 'hamoana fanovana{{PLURAL:$1}} $1',
 'rollbackfailed' => "Tsy voaverina amin'ny teo aloha",
 'cantrollback' => "Tsy afaka iverenana ny fanovana; ny mpanova farany ihany no tompon'ny pejy.",
 'alreadyrolled' => "Tsy afaka foanana ny fanovana ny pejy « [[:$1]] » nataon'i [[User:$2|$2]] ([[User talk:$2|Dinika]]{{int:pipe-separator}}[[Special:Contributions/$2|{{int:contribslink}}]])
@@ -2382,6 +2395,7 @@ $1',
 'namespace' => 'Anaran-tsehatra :',
 'invert' => 'Ampifamadiho ny safidy',
 'namespace_association' => 'Anaran-tsehatra nampiarahana',
+'tooltip-namespace_association' => 'Mariho ity boaty ity mba hampiditra ny pejin-dresaky ny anaran-tsehatra voafidy',
 'blanknamespace' => '(fotony)',
 
 # Contributions
@@ -2428,7 +2442,7 @@ Aseho eo ambany ny iditra farany ao amin'ny laogim-panakanana  mba hampahalala :
 'whatlinkshere-hideredirs' => '$1 ny fihodinana',
 'whatlinkshere-hidetrans' => '$1 ny tsofo-pejy',
 'whatlinkshere-hidelinks' => '$1 ny rohy',
-'whatlinkshere-hideimages' => '$1 rakitra mirohy',
+'whatlinkshere-hideimages' => '$1 ny rakitra mirohy',
 'whatlinkshere-filters' => 'sivana',
 
 # Block/unblock
@@ -2466,6 +2480,7 @@ Fenoy etsy ambany ny antony manokana (ohatra, mitanisà pejy nosomparana).",
 'blockipsuccesstext' => 'Voasakana i [[Special:Contributions/$1|$1]].
 <br />Jereo ny [[Special:BlockList|lisitry ny IP voasakana]] raha hanala ny sakana efa misy.',
 'ipb-blockingself' => 'Hanakana ny kaontinao ianao ! Tena hanao izany ve ?',
+'ipb-confirmhideuser' => "Eo ampanakanana mpikambana miaraka amin'ny \"fanakonana mpikambana\" ampiasaina. Izany dia mamafa ny anaran'ilay mpikambana amin'ny listra ary amin'ny iditra laogy. Tena hanao izany ve ianao?",
 'ipb-edit-dropdown' => 'Hanova ny antony fanakanana tsipalotra',
 'ipb-unblock-addr' => "Hanala ny sakan' i $1",
 'ipb-unblock' => "Hanala ny sakan'ny mpikambana na adiresy IP",
@@ -2581,6 +2596,7 @@ Azafady mba antero fa izay tokoa no tena irinao.",
 'lockfilenotwritable' => "Tsy azo soratana ny rakitra fanidiana ny banky angona.
 Mba hahafahany manidy na mamoha ny banky angona, mila azo soratan'ny lohamilin-tranonkala izy.",
 'databasenotlocked' => 'Tsy voaidy ny banky angona.',
+'lockedbyandtime' => "(nataon'i $1 ny $2 tamin'ny $3)",
 
 # Move page
 'move-page' => "Hanova anarana an'i $1",
@@ -2923,6 +2939,13 @@ Raha alefanao ilay izy, mety ho simban'io renifango io ny solosainao.",
 'bydate' => 'araka ny daty',
 'sp-newimages-showfrom' => "Aseho ny rakitra vaovao manomboka amin'ny $1 tamin'ny $2",
 
+# Video information, used by Language::formatTimePeriod() to format lengths in the above messages
+'seconds' => 'segondra{{PLURAL:$1}}',
+'minutes' => 'minitra{{PLURAL:$1}}',
+'hours' => 'ora{{PLURAL:$1}}',
+'days' => 'andro{{PLURAL:$1}}',
+'ago' => '$1 lasa izay',
+
 # Bad image list
 'bad_image_list' => "Ity ny andrefiny :
 
@@ -2977,8 +3000,8 @@ Tokony sary tsy misy na sary tsy izy ny rohy voalohany anaty andalana iray .
 'exif-exifversion' => 'Santiôna EXIF',
 'exif-flashpixversion' => 'Santiôna FlashPix',
 'exif-colorspace' => 'Valan-doko',
-'exif-pixelydimension' => 'Haavon-tsary ekena',
-'exif-pixelxdimension' => 'Halalan-tsary ekena',
+'exif-pixelydimension' => 'Haavon-tsary',
+'exif-pixelxdimension' => 'Halala-tsary',
 'exif-usercomment' => 'Diniky ny mpikambana',
 'exif-relatedsoundfile' => 'Rakitra audio miaraka',
 'exif-datetimeoriginal' => 'Daty fangalana niaviana',
@@ -2989,7 +3012,7 @@ Tokony sary tsy misy na sary tsy izy ny rohy voalohany anaty andalana iray .
 'exif-fnumber' => 'Isa F',
 'exif-exposureprogram' => 'Fomba famakiana',
 'exif-isospeedratings' => 'ISO',
-'exif-aperturevalue' => 'Sanasana',
+'exif-aperturevalue' => 'Fisanasana APEX',
 'exif-lightsource' => 'Loharanon-kazavana',
 'exif-flashenergy' => "Angôvon'akonkazavana",
 'exif-filesource' => 'Fangon-drakitra',
@@ -3010,9 +3033,17 @@ Tokony sary tsy misy na sary tsy izy ny rohy voalohany anaty andalana iray .
 'exif-gpsareainformation' => 'Anaram-paritra GPS',
 'exif-gpsdatestamp' => 'Daty GPS',
 'exif-countrycreated' => 'Firenena nangalana ilay sary',
+'exif-cameraownername' => "Tompon'ilay mpaka sary",
+'exif-licenseurl' => "URl an'ilay lisansa",
+'exif-pngfilecomment' => "Famoahan-kevitra momban'ilay rakitra PNG",
+
+'exif-copyrighted-true' => "Iharan'ny zom-pamorona",
+'exif-copyrighted-false' => 'Valam-bahoaka',
 
 'exif-unknowndate' => 'Daty tsy fantatra',
 
+'exif-orientation-1' => 'Tsotra',
+
 'exif-componentsconfiguration-0' => 'tsy nahitana',
 
 'exif-exposureprogram-0' => 'Tsy nolazaina',
@@ -3021,6 +3052,9 @@ Tokony sary tsy misy na sary tsy izy ny rohy voalohany anaty andalana iray .
 
 'exif-meteringmode-0' => 'Tsy fantatra',
 'exif-meteringmode-1' => 'Elanelana',
+'exif-meteringmode-3' => 'Spot',
+'exif-meteringmode-5' => 'Modely',
+'exif-meteringmode-255' => 'Hafa',
 
 # Flash modes
 'exif-flash-mode-3' => 'Toetra aotômatika',
@@ -3273,6 +3307,7 @@ Aseho amin'ny tena habeny ny sary aseho, ny hafa dia alefa miaraka amin'ny rindr
 'logentry-suppress-delete' => "nofafan'i $1 ny pejy $3",
 'revdelete-restricted' => "nametraka fanerena ho an'ny mpandrindra",
 'revdelete-unrestricted' => "fanerena nesorina tamin'ny mpandrindra",
+'logentry-newusers-create' => 'nanokatra ny kaontiny i $1',
 'newuserlog-byemail' => 'tenimiafina nalefa imailaka',
 
 );
diff --git a/languages/messages/MessagesMin.php b/languages/messages/MessagesMin.php
index b5f7718be8..ebda5281cf 100644
--- a/languages/messages/MessagesMin.php
+++ b/languages/messages/MessagesMin.php
@@ -11,6 +11,7 @@
  * @author Luthfi94
  * @author Naval Scene
  * @author Rahmatdenas
+ * @author SpartacksCompatriot
  * @author VoteITP
  */
 
@@ -24,7 +25,7 @@ $messages = array(
 'tog-hidepatrolled' => 'Suruakkan suntingan nan lah dijago di parubahan tabaru',
 'tog-newpageshidepatrolled' => 'Suruakkan halaman nan lah dijago dari senarai halaman baru',
 'tog-extendwatchlist' => 'Kambangkan senarai pantauan untuak malihek sado parubahan, indak nan baru se',
-'tog-usenewrc' => 'Gunoan parubahan terkini tingkek lanjut (perlu JavaScript)',
+'tog-usenewrc' => 'Gunoan parubahan terkini tingkek lanjut (paralu JavaScript)',
 'tog-numberheadings' => 'Agiah nomor judua sacaro otomatis',
 'tog-showtoolbar' => 'Tampilkan bilah suntiang (paralu JavaScript)',
 'tog-editondblclick' => 'Suntiang laman jo klik ganda (JavaScript)',
@@ -32,17 +33,17 @@ $messages = array(
 'tog-editsectiononrightclick' => 'Hiduikan bagian panyuntiangan jo mangklik kanan pado judul bagian (JavaScript)',
 'tog-showtoc' => 'Caliakkan dafta isi (untuak laman nan mampunyoi labiah dari 3 subbagian)',
 'tog-rememberpassword' => 'Kana log masuak denai di peramban ko (salamo $1 {{PLURAL:$1|hari|hari}})',
-'tog-watchcreations' => 'Tambahkan halaman nan denai buek ka senarai pantauan',
-'tog-watchdefault' => 'Tambahkan halaman yang denai sunting ka senarai pantauan',
-'tog-watchmoves' => 'Tambahkan halaman yang denai pindahkan ka senarai pantauan',
-'tog-watchdeletion' => 'Tambahkan halaman yang denai hapuih ka senarai pantauan',
+'tog-watchcreations' => 'Tambahkan halaman nan den buek ka daftar pantauan',
+'tog-watchdefault' => 'Tambahkan halaman nan den suntiang ka daftar pantauan',
+'tog-watchmoves' => 'Tambahkan halaman nan den pindahkan ka daftar pantauan',
+'tog-watchdeletion' => 'Tambahkan halaman nan den hapuih ka daftar pantauan',
 'tog-minordefault' => 'Tandoi sadoalah suntiangan sabagai suntiangan ketek sacaro baku',
 'tog-previewontop' => 'Tampilkan pratonton sabalun kotak suntiang',
 'tog-previewonfirst' => 'Caliakkan pratayang pado suntiangan patamo',
 'tog-nocache' => 'Matikan panyinggahan laman peramban',
-'tog-enotifwatchlistpages' => 'E-mail ambo jiko laman nan denai jago lah barubah',
+'tog-enotifwatchlistpages' => 'Kirim e-mail kalau laman nan den pantau lah barubah',
 'tog-enotifusertalkpages' => 'E-mail ambo jiko laman barundiang denai lah barubah',
-'tog-enotifminoredits' => 'E-mail ambo walau hanyo ado parubahan saketek',
+'tog-enotifminoredits' => 'Kirim e-mail walau hanyo ado parubahan saketek',
 'tog-enotifrevealaddr' => 'Cogokan alamaik e-mail den pado e-mail notifikasi',
 'tog-shownumberswatching' => 'Tujuakkan jumlah pamantau',
 'tog-oldsig' => 'Pratayang tando tangan:',
@@ -161,7 +162,6 @@ $messages = array(
 'qbbrowse' => 'Browse',
 'qbedit' => 'Suntiang',
 'qbpageoptions' => 'Laman ko',
-'qbpageinfo' => 'Konteks',
 'qbmyoptions' => 'Laman denai',
 'qbspecialpages' => 'Halaman istimewa',
 'faq' => 'FAQ',
@@ -280,6 +280,8 @@ $1',
 'youhavenewmessages' => 'Awak punyo $1 ($2).',
 'newmessageslink' => 'pasan baru',
 'newmessagesdifflink' => 'parubahan terakhir',
+'youhavenewmessagesfromusers' => 'Sanak mandapek $1 dari {{PLURAL:$3|another user|$3 users}} ($2)',
+'youhavenewmessagesmanyusers' => 'Sanak mandapek $1 dari banyak pangguno ($2)',
 'youhavenewmessagesmulti' => 'Awak ang mandapek pasan baru pado $1',
 'editsection' => 'suntiang',
 'editold' => 'suntiang',
@@ -368,6 +370,7 @@ Sila laporkan ka [[Special:ListUsers/sysop|Pengurus]], dengan manandokan alamat
 'badarticleerror' => 'Tindakan iko indak dapek dilaksanakan di laman iko.',
 'cannotdelete' => 'Laman atau berkas "$1" indak dapek dihapuih.
 Mungkin alah dihapuih jo urang lain.',
+'cannotdelete-title' => 'Indak bisa mangapuih halaman "$1"',
 'badtitle' => 'Judul indak sah',
 'badtitletext' => 'Permintaan judul laman indak sah, kosong, atau antarbaso atau antarwiki yang salah sambuang. Mungkin juo ado kandungan karakter yang indak buliah digunoan untuak judul.',
 'perfcached' => 'Data barikuik iko diambiak dari singgahan dan mungkin indak data nan baharu. A maximum of {{PLURAL:$1|one result is|$1 results are}} available in the cache.',
@@ -375,10 +378,12 @@ Mungkin alah dihapuih jo urang lain.',
 'querypage-no-updates' => 'Pamutakhiran dari laman iko sadang dimatian. Data nan ado di siko saat iko indak akan dimuaik ulang.',
 'wrong_wfQuery_params' => 'Parameter salah ka wfQuery()<br />Fungsi: $1<br />Pamintaan: $2',
 'viewsource' => 'Lihek sumber',
+'viewsource-title' => 'Caliak sumber untuak $1',
 'actionthrottled' => 'Tindakan dibatasi',
 'actionthrottledtext' => 'Anda dibatasi untuak malakuan tindakan iko talalu banyak dalam waktu singkek. Sila mancubo laik satalah bara menit.',
 'protectedpagetext' => 'Laman iko alah dikunci untuak manghindari panyuntiangan.',
 'viewsourcetext' => 'Sanak dapek malihek atau manyalin sumber laman iko:',
+'viewyourtext' => 'Sanak bisa mancaliak dan mangopi sumber untuak "editan sanak" ka halaman iko',
 'protectedinterface' => 'Laman iko barisi teks antarmuko untuak digunoan oleh parangkaik lunak dan alah dikunci untuak manghindari kasalahan.',
 'editinginterface' => "'''Paringatan:''' Sanak manyuntiang suatu laman nan digunoan untuak manyediakan teks antarmuko untuak parangkaik lunak situs iko. Parubahan teks iko akan mampangaruhi tampilan pado antarmuko pangguno untuak pangguno lain.
 Untuak tarjamahan, harap gunokan [//translatewiki.net/wiki/Main_Page?setlang=id translatewiki.net], proyek palokalan MediaWiki.",
@@ -391,6 +396,11 @@ $2',
 'ns-specialprotected' => 'Laman istimewa indak dapek disuntiang.',
 'titleprotected' => "Judul iko alah dilindungi dari pambantuakan oleh [[User:$1|$1]].
 Alasan nan diberikan adolah ''$2''.",
+'filereadonlyerror' => 'Indak bisa mangubah berkas "$1" karano repositori berkas "$2" dalam moda baco-sajo.
+
+Pangurus nan manguncinyo manawarkan penjelasan: "$3"',
+'exception-nologin' => 'Indak log masuak',
+'exception-nologin-text' => 'Halaman ko hanyo bisa disuntiang dek pangguno badaftar.',
 
 # Virus scanner
 'virus-badscanner' => "Kasalahan konfigurasi: pamindai virus indak dikenal: ''$1''",
@@ -411,6 +421,7 @@ Akun Sanak alah dibuek. Jan lupo maatur konfigurasi [[Special:Preferences|prefer
 'remembermypassword' => 'Kana log masuak denai di komputer ko (salamo $1 {{PLURAL:$1|hari|hari}})',
 'securelogin-stick-https' => 'Tetap tahubuang ka HTTPS sasudah masuk log',
 'yourdomainname' => 'Domain Sanak:',
+'password-change-forbidden' => 'Sanak indak bisa mengubah kato kunci di wiki ko.',
 'externaldberror' => 'Alah tajadi kasalahan otentikasi basis data eksternal atau Sanak indak diizinan malakuan kamaskini tahadok akun eksternal Sanak.',
 'login' => 'Masuak log',
 'nav-login-createaccount' => 'Masuak log / buek akun',
@@ -480,6 +491,8 @@ Karanonyo, pangunjuang jo alamaik IP iko indak dapek baliak mambuek akun lain un
 'emailconfirmlink' => 'Konfirmasikan alamaik surel Sanak',
 'invalidemailaddress' => 'Alamaik surel iko indak dapek ditarimo karano formatnyo indak sasuai.
 Harap masuakan alamaik surel dalam format nan batua atau kosoangan isian tasabuik.',
+'cannotchangeemail' => 'Alamat e-mail sanak indak bisa diubah di wiki ko.',
+'emaildisabled' => 'Situs iko indak bisa mangirim e-mail.',
 'accountcreated' => 'Akun dibuek',
 'accountcreatedtext' => 'Akun pangguno untuak $1 alah dibuek.',
 'createaccount-title' => 'Pambuekan akun untuak {{SITENAME}}',
@@ -495,6 +508,7 @@ Sila manunggu sabalun mancubo baliak.',
 
 # E-mail sending
 'php-mail-error-unknown' => 'Kasalahan nan indak dikana dalam fungsi mail() PHP',
+'user-mail-no-addy' => 'Mancubo mangirim e-mail tanpa alamat e-mail nan sah.',
 
 # Change password dialog
 'resetpass' => 'Tuka kato sandi',
@@ -521,6 +535,9 @@ Sanak mungkin alah berhasil mangganti kato sandi Sanak atau alah maminto kato sa
 'passwordreset-disabled' => 'Panukaran baliak kato sandi alah dimatian di wiki iko.',
 'passwordreset-pretext' => '{{PLURAL:$1||Masuakan ciek data di bawah iko}}',
 'passwordreset-username' => 'Namo pangguno:',
+'passwordreset-domain' => 'Domain:',
+'passwordreset-capture' => 'Caliak kaputusannyo?',
+'passwordreset-capture-help' => 'Kalau sanak meancek boks iko, e-mail (jo kato kunci samantaro) akan dicaliakkan ka sanak.',
 'passwordreset-email' => 'Alamaik surel:',
 'passwordreset-emailtitle' => 'Detail akun di {{SITENAME}}',
 'passwordreset-emailtext-ip' => 'Sasaurang (mungkin Sanak, dari alamaik IP $1) maminta pangingek
@@ -545,6 +562,18 @@ ingin maubahnyo, Sanak dapek maabaikan pasan iko dan taruih manggunokan sandi la
 'passwordreset-emailelement' => 'Namo pangguno: $1
 Sandi samantaro: $2',
 'passwordreset-emailsent' => 'Surel pangingek alah dikiriman.',
+'passwordreset-emailsent-capture' => 'E-mail paringatan alah dikirim, nan tacaliak di bawah ko.',
+
+# Special:ChangeEmail
+'changeemail' => 'Tuka alamat e-mail.',
+'changeemail-header' => 'Ganti alamat e-mail.',
+'changeemail-text' => 'Panuahan formulir iko untuak mangganti alamat e-mail. Sanak harus mamasuakkan kato kunci untuak mangonfirmasi.',
+'changeemail-no-info' => 'Sanak harus masuak log untuak mangakses halaman ko.',
+'changeemail-oldemail' => 'Alamat e-mail kini:',
+'changeemail-newemail' => 'Alamat e-mail baharu:',
+'changeemail-none' => '(indak ado)',
+'changeemail-submit' => 'Ganti e-mail.',
+'changeemail-cancel' => 'Batalkan',
 
 # Edit page toolbar
 'bold_sample' => 'Teks dicetak taba',
@@ -639,6 +668,10 @@ Awak dapek [[Special:Search/{{PAGENAME}}|mancari judul laman ko]] pado laman lai
 atau [{{fullurl:{{FULLPAGENAME}}|action=edit}} suntiang laman ko]</span>.',
 'noarticletext-nopermission' => 'Kini ko indak ado teks dalam laman iko.
 Sanak dapek [[Special:Search/{{PAGENAME}}|malakukan pancaharian untuak judul laman iko]] di laman-laman lain, <span class="plainlinks">[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} mancahari log takaik], atau [{{fullurl:{{FULLPAGENAME}}|action=edit}} manyuntiang laman iko]</span>.',
+'missing-revision' => 'Revisi $1 di halaman ko nan banamo "{{PAGENAME}}" indak ado.
+
+Hal iko biasonyo disababkan dek pranala sajarah nan alah kadaluarsa ka halaman ko nan alah dihapuih.
+Rinciannyo dapek dicaliak di [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} log panghapuihan].',
 'userpage-userdoesnotexist' => 'Akun pangguno "<nowiki>$1</nowiki>" indak tadafta.',
 'userpage-userdoesnotexist-view' => 'Pangguno "$1" indak tadafta.',
 'blocked-notice-logextract' => 'Pangguno iko sadang diblokir.
@@ -661,6 +694,7 @@ Pratayang iko alun disimpan!'''",
 'note' => "'''Catatan:'''",
 'previewnote' => "'''Iko hanyo tampilan pratonton.'''
 Parubahan yang awak lakukan alun disimpan!",
+'continue-editing' => 'Pai ka area mangedit.',
 'previewconflict' => 'Pratayang iko mancaminan teks pado bagian ateh kotak suntiangan teks sabagaimano akan taliek bilo Sanak manyimpannyo.',
 'session_fail_preview' => "'''Maaf, kami ndak dapek mangolah suntiangan Sanak akibat tahapuihnyo data sesi.
 Sila cubo sakali lai.
@@ -676,6 +710,7 @@ Suntiangan tasabuik ditolak untuak mancegah kasalahan pado teks laman.
 Hal iko kadang tajadi jikok Sanak manggunokan layanan proxy anonim babasis web nan bamasalah.",
 'edit_form_incomplete' => "'''Babarapo bagian dari formulir suntiangan indak mancapai server; pariso baliak apokah suntiangan Sanak tatap utuah dan cubo lai.'''",
 'editing' => 'Manyuntiang $1',
+'creating' => 'Mambuek $!',
 'editingsection' => 'Suntiang $1 (bagian)',
 'editingcomment' => 'Manyuntiang $1 (bahagian baharu)',
 'editconflict' => 'Konflik panyuntiangan: $1',
@@ -731,6 +766,11 @@ Barikuik adolah log panghapuihan dan pamindahan dari laman iko:",
 'moveddeleted-notice' => 'Laman iko alah dihapuih.
 Sabagai referensi, barikuik adolah log panghapusan dan pamindahan laman iko.',
 'log-fulllog' => 'Liek saluruah log',
+'edit-conflict' => 'Konflik suntingan.',
+'edit-no-change' => 'Suntiangan sanak ditulak, karano indak ado parubahan nan tajadi ka teks.',
+'edit-already-exists' => 'Indak bisa mambuek halaman baru.
+Alah ado.',
+'defaultmessagetext' => 'Teks pasan default.',
 
 # Parser/template warnings
 'post-expand-template-inclusion-warning' => "'''Peringatan:''' Ukuran templat talalu gadang.
diff --git a/languages/messages/MessagesMk.php b/languages/messages/MessagesMk.php
index 543f76bfe3..9a5aa18a1c 100644
--- a/languages/messages/MessagesMk.php
+++ b/languages/messages/MessagesMk.php
@@ -163,7 +163,6 @@ $specialPageAliases = array(
 	'Recentchanges'             => array( 'СкорешниПромени' ),
 	'Recentchangeslinked'       => array( 'ПоврзаниПромени' ),
 	'Revisiondelete'            => array( 'БришењеРевизија' ),
-	'RevisionMove'              => array( 'ПреместиРевизија' ),
 	'Search'                    => array( 'Барај' ),
 	'Shortpages'                => array( 'КраткиСтраници' ),
 	'Specialpages'              => array( 'СпецијалниСтраници' ),
@@ -202,7 +201,6 @@ $magicWords = array(
 	'forcetoc'                  => array( '0', '__СОСОДРЖИНА__', '__FORCETOC__' ),
 	'toc'                       => array( '0', '__СОДРЖИНА__', '__TOC__' ),
 	'noeditsection'             => array( '0', '__БЕЗ_УРЕДУВАЊЕ_НА_ПОДНАСЛОВИ__', '__NOEDITSECTION__' ),
-	'noheader'                  => array( '0', '__БЕЗНАСЛОВ__', '__NOHEADER__' ),
 	'currentmonth'              => array( '1', 'ТЕКОВЕНМЕСЕЦ', 'CURRENTMONTH', 'CURRENTMONTH2' ),
 	'currentmonth1'             => array( '1', 'ТЕКОВЕНМЕСЕЦ1', 'CURRENTMONTH1' ),
 	'currentmonthname'          => array( '1', 'ТЕКОВЕНМЕСЕЦИМЕ', 'CURRENTMONTHNAME' ),
@@ -241,6 +239,7 @@ $magicWords = array(
 	'basepagename'              => array( '1', 'ИМЕНАОСНОВНАСТРАНИЦА', 'BASEPAGENAME' ),
 	'talkpagename'              => array( '1', 'СТРАНИЦАЗАРАЗГОВОР', 'TALKPAGENAME' ),
 	'subjectpagename'           => array( '1', 'ИМЕНАСТАТИЈА', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
+	'msg'                       => array( '0', 'ПОР:', 'MSG:' ),
 	'subst'                     => array( '0', 'ЗАМЕНИ:', 'SUBST:' ),
 	'safesubst'                 => array( '0', 'БЕЗБЗАМЕНИ', 'SAFESUBST:' ),
 	'msgnw'                     => array( '0', 'ИЗВЕШТNW:', 'MSGNW:' ),
@@ -294,6 +293,9 @@ $magicWords = array(
 	'revisionuser'              => array( '1', 'КОРИСНИКНАНАРЕВИЗИЈА', 'REVISIONUSER' ),
 	'plural'                    => array( '0', 'МНОЖИНА:', 'PLURAL:' ),
 	'fullurl'                   => array( '0', 'ПОЛНАURL:', 'FULLURL:' ),
+	'fullurle'                  => array( '0', 'ПОЛНАURLE:', 'FULLURLE:' ),
+	'canonicalurl'              => array( '0', 'КАНОНСКАURL:', 'CANONICALURL:' ),
+	'canonicalurle'             => array( '0', 'КАНОНСКАURLE:', 'CANONICALURLE:' ),
 	'lcfirst'                   => array( '0', 'ПРВОМБ', 'LCFIRST:' ),
 	'ucfirst'                   => array( '0', 'ПРВОГБ', 'UCFIRST:' ),
 	'lc'                        => array( '0', 'МБ', 'LC:' ),
@@ -393,7 +395,7 @@ $messages = array(
 
 'underline-always' => 'Секогаш',
 'underline-never' => 'Никогаш',
-'underline-default' => 'Според нагодувањата на прелистувачот',
+'underline-default' => 'Според рувото или прелистувачот',
 
 # Font style option in Special:Preferences
 'editfont-style' => 'Фонт во полето за уредување:',
@@ -480,8 +482,8 @@ $messages = array(
 'newwindow' => '(се отвора во нов прозорец)',
 'cancel' => 'Откажи',
 'moredotdotdot' => 'Повеќе...',
-'mypage' => 'Моја страница',
-'mytalk' => 'мои разговори',
+'mypage' => 'Страница',
+'mytalk' => 'Разговор',
 'anontalk' => 'Разговор за оваа IP-адреса',
 'navigation' => 'Навигација',
 'and' => '&#32;и',
@@ -1057,7 +1059,7 @@ $2
 'note' => "'''Напомена:'''",
 'previewnote' => "'''Имајте предвид дека ова е само преглед.'''
 Промените сè уште не се зачувани!",
-'continue-editing' => 'Продолжете со уредување',
+'continue-editing' => 'Оди на полето за уредување',
 'previewconflict' => 'Овој преглед прикажува како ќе изгледа текстот внесен во горниот дел откако ќе се зачува страницата.',
 'session_fail_preview' => "'''Жалиме! Не можевме да го обработиме вашето уредување поради загуба на сесиски податоци.'''
 Обидете се повторно.
@@ -1438,7 +1440,7 @@ $1",
 
 # Preferences page
 'preferences' => 'Нагодувања',
-'mypreferences' => 'мои нагодувања',
+'mypreferences' => 'Нагодувања',
 'prefs-edits' => 'Број на уредувања:',
 'prefsnologin' => 'Не сте најавени',
 'prefsnologintext' => 'Мора да бидете <span class="plainlinks">[{{fullurl:{{#Special:UserLogin}}|returnto=$1}} најавени]</span> за да ги менувате вашите кориснички нагодувања.',
@@ -1672,6 +1674,9 @@ $1",
 'rightslogtext' => 'Ова е дневник на промени на кориснички права.',
 'rightslogentry' => 'Променето членство во група за $1 од $2 во $3',
 'rightslogentry-autopromote' => 'е автоматски унапреден од $2 во $3',
+'logentry-rights-rights' => '$1 го смени групното членство за $3 од $4 во $5',
+'logentry-rights-rights-legacy' => '$1 го смени групното членство за $3',
+'logentry-rights-autopromote' => '$1 е автоматски унапреден од $4 во $5',
 'rightsnone' => '(нема)',
 
 # Associated actions - in the sentence "You do not have permission to X"
@@ -2312,8 +2317,8 @@ $1',
 'linksearch-ns' => 'Именски простор:',
 'linksearch-ok' => 'Барај',
 'linksearch-text' => 'Може да се користат џокери, како на „*.wikipedia.org“.
-Бара највисок домен, како на пр. „*.org“.<br />
-Поддржани протоколи: <code>$1</code> (не ги ставајте во пребарувањето).',
+Бара барем највисок домен, како на пр. „*.org“.<br />
+Поддржани протоколи: <code>$1</code> (задава http:// ако не укажете протокол).',
 'linksearch-line' => '$1 врска во $2',
 'linksearch-error' => 'Џокер-знаците може да се користат само на почетокот во името на домаќинот.',
 
@@ -2362,8 +2367,8 @@ $1',
 'emailuser-title-target' => 'Составување на е-пошта за {{GENDER:$1|корисникот}}',
 'emailuser-title-notarget' => 'Е-пошта за корисникот',
 'emailpage' => 'Е-пошта',
-'emailpagetext' => 'Можете да го користите следниов образец за праќање на е-поштенска порака до овој корисник.
-Е-поштенската адреса која ја имате наведено во [[Special:Preferences|вашите нагодувања]] ќе се прикаже во „Од“ полето на е-пораката, со што примачот ќе може да ви одговори директно вам.',
+'emailpagetext' => 'Можете да го употребите следниов образец за да му испратите е-пошта на овој {{GENDER:$1|корисник}}.
+Адреса која ја имате наведено во [[Special:Preferences|вашите нагодувања]] ќе се прикаже во полето „Од“ на пораката, со што примачот ќе може да ви одговори директно вам.',
 'usermailererror' => 'Настана следната грешка при праќање е-пошта:',
 'defemailsubject' => '{{SITENAME}} — писмо од корисникот „$1“',
 'usermaildisabled' => 'Корисничката е-пошта е оневозможена',
@@ -2394,7 +2399,7 @@ $1',
 
 # Watchlist
 'watchlist' => 'мои набљудувања',
-'mywatchlist' => 'мои набљудувања',
+'mywatchlist' => 'Набљудувања',
 'watchlistfor2' => 'За $1 $2',
 'nowatchlist' => 'Немате ништо во списокот на набљудувања.',
 'watchlistanontext' => 'Се бара $1 за да можете да го прегледувате и уредувате списокот на набљудувања.',
@@ -2660,7 +2665,7 @@ $1',
 # Contributions
 'contributions' => 'Кориснички придонеси',
 'contributions-title' => 'Придонеси на корисникот $1',
-'mycontris' => 'мои придонеси',
+'mycontris' => 'Придонеси',
 'contribsub2' => 'За $1 ($2)',
 'nocontribs' => 'Не се пронајдени промени што одговараат на овој критериум.',
 'uctop' => ' (врв)',
@@ -2700,7 +2705,7 @@ $1',
 'whatlinkshere-hideredirs' => '$1 пренасочувања',
 'whatlinkshere-hidetrans' => '$1 превметнувања',
 'whatlinkshere-hidelinks' => '$1 врски',
-'whatlinkshere-hideimages' => '$1 врски кон слика',
+'whatlinkshere-hideimages' => '$1 врски кон податотека',
 'whatlinkshere-filters' => 'Филтри',
 
 # Block/unblock
@@ -3213,6 +3218,7 @@ $1',
 'pageinfo-default-sort' => 'Основен подредбен клуч',
 'pageinfo-length' => 'Должина на страницата (во бајти)',
 'pageinfo-article-id' => 'Назнака на страницата',
+'pageinfo-language' => 'Јазик на содржината на страницата',
 'pageinfo-robot-policy' => 'Статус на прелистувачот',
 'pageinfo-robot-index' => 'Се индексира',
 'pageinfo-robot-noindex' => 'Не се индексира',
@@ -4093,6 +4099,7 @@ $5
 'version-license' => 'Лиценца',
 'version-poweredby-credits' => "Ова вики работи на '''[//www.mediawiki.org/ МедијаВики]''', авторски права © 2001-$1 $2.",
 'version-poweredby-others' => 'други',
+'version-credits-summary' => 'Би сакале да им се заблагодариме на следниве лица за нивните придонеси кон [[Special:Version|МедијаВики]].',
 'version-license-info' => 'МедијаВики е слободна програмска опрема; можете да ја редистрибуирате и/или менувате под условите на ГНУ-овата општа јавна лиценца на Фондацијата за слободна програмска опрема; или верзија 2 на Лиценцата, или некоја понова верзија (по ваш избор).
 
 МедијаВики се нуди со надеж дека ќе биде од корист, но БЕЗ БИЛО КАКВА ГАРАНЦИЈА; дури и без подразбраната гаранција за ПРОДАЖНА ВРЕДНОСТ или ПОГОДНОСТ ЗА ДАДЕНА ЦЕЛ. За повеќе информации, погледајте ја ГНУ-овата општа јавна лиценца.
@@ -4311,4 +4318,6 @@ $5
 'duration-centuries' => '$1 {{PLURAL:$1|век|века}}',
 'duration-millennia' => '$1 {{PLURAL:$1|милениум|милениуми}}',
 
+# Unknown messages
+'mytalk-parenthetical' => 'разговор',
 );
diff --git a/languages/messages/MessagesMl.php b/languages/messages/MessagesMl.php
index fc159a19d5..4d35104004 100644
--- a/languages/messages/MessagesMl.php
+++ b/languages/messages/MessagesMl.php
@@ -120,12 +120,13 @@ $specialPageAliases = array(
 	'Listusers'                 => array( 'ഉപയോക്താക്കളുടെ_പട്ടിക' ),
 	'Lockdb'                    => array( 'ഡി.ബി.ബന്ധിക്കുക' ),
 	'Log'                       => array( 'രേഖ', 'രേഖകൾ' ),
-	'Lonelypages'               => array( 'അനാഥ_താളുകൾ' ),
-	'Longpages'                 => array( 'വലിയ_താളുകൾ' ),
+	'Lonelypages'               => array( 'അനാഥതാളുകൾ' ),
+	'Longpages'                 => array( 'വലിയതാളുകൾ' ),
 	'MergeHistory'              => array( 'നാൾവഴിലയിപ്പിക്കുക' ),
 	'MIMEsearch'                => array( 'മൈംതിരയൽ' ),
 	'Mostcategories'            => array( 'കൂടുതൽ_വർഗ്ഗങ്ങൾ' ),
 	'Mostimages'                => array( 'കൂടുതൽ_കണ്ണികളുള്ള_പ്രമാണങ്ങൾ', 'കൂടുതൽ_പ്രമാണങ്ങൾ', 'കൂടുതൽ_ചിത്രങ്ങൾ' ),
+	'Mostinterwikis'            => array( 'ഏറ്റവുമധികമന്തർവിക്കികൾ' ),
 	'Mostlinked'                => array( 'കൂടുതൽ_കണ്ണികളുള്ള_താളുകൾ', 'കൂടുതൽ_കണ്ണികളുള്ളവ' ),
 	'Mostlinkedcategories'      => array( 'കൂടുതൽ_കണ്ണികളുള്ള_വർഗ്ഗങ്ങൾ', 'കൂടുതൽ_ഉപയോഗിച്ചിട്ടുള്ള_വർഗ്ഗങ്ങൾ' ),
 	'Mostlinkedtemplates'       => array( 'കൂടുതൽ_കണ്ണികളുള്ള_ഫലകങ്ങൾ', 'കൂടുതൽ_ഉപയോഗിച്ചിട്ടുള്ള_ഫലകങ്ങൾ' ),
@@ -149,7 +150,6 @@ $specialPageAliases = array(
 	'Recentchanges'             => array( 'സമീപകാലമാറ്റങ്ങൾ' ),
 	'Recentchangeslinked'       => array( 'ബന്ധപ്പെട്ട_മാറ്റങ്ങൾ' ),
 	'Revisiondelete'            => array( 'നാൾപ്പതിപ്പ്_മായ്ക്കൽ' ),
-	'RevisionMove'              => array( 'നാൾപ്പതിപ്പ്മാറ്റൽ' ),
 	'Search'                    => array( 'അന്വേഷണം' ),
 	'Shortpages'                => array( 'ചെറിയ_താളുകൾ' ),
 	'Specialpages'              => array( 'പ്രത്യേകതാളുകൾ' ),
@@ -188,7 +188,6 @@ $magicWords = array(
 	'forcetoc'                  => array( '0', '__ഉള്ളടക്കംഇടുക__', '__FORCETOC__' ),
 	'toc'                       => array( '0', '__ഉള്ളടക്കം__', '__TOC__' ),
 	'noeditsection'             => array( '0', '__സംശോധിക്കേണ്ട__', '__NOEDITSECTION__' ),
-	'noheader'                  => array( '0', '__തലക്കെട്ടുവേണ്ട__', '__NOHEADER__' ),
 	'currentmonth'              => array( '1', 'ഈമാസം', 'ഈമാസം2', 'CURRENTMONTH', 'CURRENTMONTH2' ),
 	'currentmonth1'             => array( '1', 'ഈമാസം1', 'CURRENTMONTH1' ),
 	'currentmonthname'          => array( '1', 'ഈമാസത്തിന്റെപേര്‌', 'CURRENTMONTHNAME' ),
@@ -268,6 +267,7 @@ $magicWords = array(
 	'localurl'                  => array( '0', 'ലോക്കൽയുആർഎൽ:', 'LOCALURL:' ),
 	'localurle'                 => array( '0', 'ലോക്കൽയുആർഎൽഇ:', 'LOCALURLE:' ),
 	'articlepath'               => array( '0', 'ലേഖനപഥം', 'ARTICLEPATH' ),
+	'pageid'                    => array( '0', 'താൾഐ‌ഡി', 'PAGEID' ),
 	'server'                    => array( '0', 'സെർവർ', 'SERVER' ),
 	'servername'                => array( '0', 'സെർവറിന്റെപേര്', 'SERVERNAME' ),
 	'scriptpath'                => array( '0', 'സ്ക്രിപ്റ്റ്പഥം', 'SCRIPTPATH' ),
@@ -309,7 +309,7 @@ $magicWords = array(
 	'special'                   => array( '0', 'പ്രത്യേകം', 'special' ),
 	'defaultsort'               => array( '1', 'സ്വതവേയുള്ളക്രമപ്പെടുത്തൽ:', 'സ്വതവേയുള്ളക്രമപ്പെടുത്തൽചാവി:', 'സ്വതവേയുള്ളവർഗ്ഗക്രമപ്പെടുത്തൽ:', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:' ),
 	'filepath'                  => array( '0', 'പ്രമാണപഥം:', 'FILEPATH:' ),
-	'tag'                       => array( '0', 'റ്റാഗ്', 'tag' ),
+	'tag'                       => array( '0', 'റ്റാഗ്', 'ടാഗ്', 'tag' ),
 	'hiddencat'                 => array( '1', '‌‌__മറഞ്ഞിരിക്കുംവർഗ്ഗം__', '__HIDDENCAT__' ),
 	'pagesincategory'           => array( '1', 'വർഗ്ഗത്തിലുള്ളതാളുകൾ', 'PAGESINCATEGORY', 'PAGESINCAT' ),
 	'pagesize'                  => array( '1', 'താൾവലിപ്പം', 'PAGESIZE' ),
@@ -323,6 +323,10 @@ $magicWords = array(
 	'url_query'                 => array( '0', 'ക്വറി', 'QUERY' ),
 	'defaultsort_noerror'       => array( '0', 'പിഴവില്ല', 'noerror' ),
 	'defaultsort_noreplace'     => array( '0', 'മാറ്റേണ്ടതില്ല', 'noreplace' ),
+	'pagesincategory_all'       => array( '0', 'എല്ലാം', 'all' ),
+	'pagesincategory_pages'     => array( '0', 'താളുകൾ', 'pages' ),
+	'pagesincategory_subcats'   => array( '0', 'ഉപവർഗ്ഗങ്ങൾ', 'subcats' ),
+	'pagesincategory_files'     => array( '0', 'പ്രമാണങ്ങൾ', 'files' ),
 );
 
 $digitGroupingPattern = "##,##,###";
@@ -376,7 +380,7 @@ $messages = array(
 
 'underline-always' => 'എല്ലായ്പ്പോഴും',
 'underline-never' => 'ഒരിക്കലും അരുത്',
-'underline-default' => 'ബ്രൗസറിലേതു പോലെ',
+'underline-default' => 'ദൃശ്യരൂപത്തിൽ അഥവാ ബ്രൗസറിൽ സ്വതേയുള്ള സ്വഭാവം',
 
 # Font style option in Special:Preferences
 'editfont-style' => 'തിരുത്തൽ മേഖലയിലെ ഫോണ്ടിന്റെ ശൈലി:',
@@ -461,8 +465,8 @@ $messages = array(
 'newwindow' => '(പുതിയ ജാലകത്തിൽ തുറന്നു വരും)',
 'cancel' => 'റദ്ദാക്കുക',
 'moredotdotdot' => 'കൂടുതൽ...',
-'mypage' => 'എന്റെ താൾ',
-'mytalk' => 'എന്റെ സംവാദത്താൾ',
+'mypage' => 'താൾ',
+'mytalk' => 'സംവാദത്താൾ',
 'anontalk' => 'ഈ ഐ.പി.യുടെ സം‌വാദം താൾ',
 'navigation' => 'ഉള്ളടക്കം',
 'and' => '&#32;ഒപ്പം',
@@ -590,7 +594,7 @@ $1',
 'youhavenewmessages' => 'താങ്കൾക്ക് $1 ഉണ്ട് ($2).',
 'newmessageslink' => 'പുതിയ സന്ദേശങ്ങൾ',
 'newmessagesdifflink' => 'അവസാന മാറ്റം',
-'youhavenewmessagesfromusers' => 'താങ്കൾക്ക് {{PLURAL:$3|മറ്റൊരു ഉപയോക്താവ്|മറ്റ് $3 ഉപയോക്താക്കൾ}} $1 ചേർത്തിട്ടുണ്ട് ($2).',
+'youhavenewmessagesfromusers' => 'താങ്കൾക്ക് {{PLURAL:$3|ഒരു ഉപയോക്താവ്|$3 ഉപയോക്താക്കൾ}} $1 ചേർത്തിട്ടുണ്ട് ($2).',
 'youhavenewmessagesmanyusers' => 'താങ്കൾക്ക് പലർ $1 ചേർത്തിട്ടുണ്ട് ($2).',
 'newmessageslinkplural' => '{{PLURAL:$1|പുതിയ സന്ദേശം|പുതിയ സന്ദേശങ്ങൾ}}',
 'newmessagesdifflinkplural' => 'അവസാന {{PLURAL:$1|മാറ്റം|മാറ്റങ്ങൾ}}',
@@ -1001,7 +1005,7 @@ $1 ആണ് ഈ തടയൽ നടത്തിയത്. ''$2'' എന്ന
 'note' => "'''പ്രത്യേക ശ്രദ്ധയ്ക്ക്:'''",
 'previewnote' => "'''ഇതൊരു പ്രിവ്യൂ മാത്രമാണെന്ന് ഓർക്കുക.'''
 താങ്കൾ വരുത്തിയ മാറ്റങ്ങൾ ഇതുവരെ സേവ് ചെയ്തിട്ടില്ല!",
-'continue-editing' => 'തിരുത്തൽ തുടരുക',
+'continue-editing' => 'തിരുത്തൽ മേഖലയിലേയ്ക്ക് പോവുക',
 'previewconflict' => 'ഈ പ്രിവ്യൂവിൽ മുകളിലെ ടെക്സ്റ്റ് ഏരിയയിലുള്ള എഴുത്ത് മാത്രമാണ് കാട്ടുന്നത്, സേവ്‌ ചെയ്യാൻ താങ്കൾ തീരുമാനിച്ചാൽ അത് സേവ് ആകുന്നതാണ്.',
 'session_fail_preview' => "'''ക്ഷമിക്കണം! സെഷൻ ഡാറ്റ നഷ്ടപ്പെട്ടതിനാൽ താങ്കളുടെ തിരുത്തലിന്റെ തുടർപ്രക്രിയ നടത്തുവാൻ സാധിച്ചില്ല.''' 
 ദയവായി വീണ്ടും ശ്രമിക്കൂ.
@@ -1372,7 +1376,7 @@ $1",
 
 # Preferences page
 'preferences' => 'ക്രമീകരണങ്ങൾ',
-'mypreferences' => 'എന്റെ ക്രമീകരണങ്ങൾ',
+'mypreferences' => 'ക്രമീകരണങ്ങൾ',
 'prefs-edits' => 'ആകെ തിരുത്തലുകൾ:',
 'prefsnologin' => 'ലോഗിൻ ചെയ്തിട്ടില്ല',
 'prefsnologintext' => 'ഉപയോക്തൃക്രമീകരണങ്ങൾ മാറ്റാൻ താങ്കൾ <span class="plainlinks">[{{fullurl:{{#Special:UserLogin}}|returnto=$1}} ലോഗിൻ]</span> ചെയ്തിരിക്കണം.',
@@ -1605,6 +1609,9 @@ $1",
 'rightslogtext' => 'ഈ പ്രവർത്തനരേഖ ഉപയോക്തൃ അവകാശങ്ങൾക്കുണ്ടായ മാറ്റങ്ങളുടേതാണ്.',
 'rightslogentry' => '$1 എന്ന ഉപയോക്താവിന്റെ സംഘ അംഗത്വം $2 എന്നതിൽ നിന്നു $3 എന്നതിലേക്കു മാറ്റിയിരിക്കുന്നു',
 'rightslogentry-autopromote' => '$2 എന്നതിൽ നിന്ന് $3 എന്നതിലേയ്ക്ക് സ്വയം ഉയർത്തിയിരിക്കുന്നു',
+'logentry-rights-rights' => '$3 എന്ന ഉപയോക്താവിന്റെ സംഘ അംഗത്വം $1, $4 എന്നതിൽ നിന്നു $5 എന്നതിലേക്കു മാറ്റിയിരിക്കുന്നു',
+'logentry-rights-rights-legacy' => '$3 എന്ന ഉപയോക്താവിന്റെ സംഘ അംഗത്വം $1 മാറ്റിയിരിക്കുന്നു',
+'logentry-rights-autopromote' => '$1 എന്ന ഉപയോക്താവ് $4 എന്നതിൽ നിന്നും $5 എന്നതിലേയ്ക്ക് സ്വയം ഉയർത്തിയിരിക്കുന്നു',
 'rightsnone' => '(ഒന്നുമില്ല)',
 
 # Associated actions - in the sentence "You do not have permission to X"
@@ -2221,8 +2228,8 @@ https://www.mediawiki.org/wiki/Manual:Image_Authorization കാണുക.',
 'linksearch-ns' => 'നാമമേഖല:',
 'linksearch-ok' => 'തിരയൂ',
 'linksearch-text' => '"*.wikipedia.org" പോലുള്ള വൈൽഡ് കാർഡുകൾ ഉപയോഗിക്കാവുന്നതാണ്‌.
-കുറഞ്ഞത് "*.org" പോലുള്ള ടോപ്-ലെവൽ ഡൊമൈൻ എങ്കിലും ഉണ്ടായിരിക്കണം.<br />
-പിന്താങ്ങുന്ന പ്രോട്ടോക്കോളുകൾ: <code>$1</code> (താങ്കളുടെ തിരച്ചിലിൽ ഇവ ചേർക്കരുത്).',
+കുറഞ്ഞത് "*.org" പോലുള്ള ഒരു ടോപ്-ലെവൽ ഡൊമൈൻ എങ്കിലും ഉണ്ടായിരിക്കണം.<br />
+പിന്തുണയുള്ള പ്രോട്ടോക്കോളുകൾ: <code>$1</code> (ഒന്നും നൽകിയില്ലെങ്കിൽ സ്വതേയുള്ള http:// ഉപയോഗിക്കുന്നതാണ്).',
 'linksearch-line' => '$1,  $2ൽ നിന്നു കണ്ണി ചേർക്കപ്പെട്ടിരിക്കുന്നു.',
 'linksearch-error' => 'ഹോസ്റ്റ്നെയിമിന്റെ തുടക്കത്തിൽ മാത്രമേ വൈൽഡ് കാർഡുകൾ വരാവൂ.',
 
@@ -2271,7 +2278,7 @@ https://www.mediawiki.org/wiki/Manual:Image_Authorization കാണുക.',
 'emailuser-title-target' => 'ഈ {{GENDER:$1|ഉപയോക്താവിന്}} ഇമെയിൽ അയയ്ക്കുക',
 'emailuser-title-notarget' => 'ഉപയോക്താവിന് ഇമെയിൽ അയക്കുക',
 'emailpage' => 'ഉപയോക്താവിന് ഇമെയിൽ അയക്കുക',
-'emailpagetext' => 'താഴെ കാണുന്ന ഫോം മറ്റൊരു ഉപയോക്താവിന്‌ ഇമെയിൽ അയക്കാൻ ഉപയോഗിക്കാവുന്നതാണ്.
+'emailpagetext' => 'താഴെ കാണുന്ന ഫോം ഈ {{GENDER:$1|ഉപയോക്താവിന്‌}} ഇമെയിൽ അയക്കാൻ ഉപയോഗിക്കാവുന്നതാണ്.
 [[Special:Preferences|ഉപയോക്താവിന്റെ ക്രമീകരണങ്ങളിൽ]] കൊടുത്തിട്ടുള്ള ഇമെയിൽ വിലാസം "ദാതാവ്" ആയി വരുന്നതാണ്‌, അതുകൊണ്ട് സ്വീകർത്താവിന്‌ താങ്കൾക്ക് നേരിട്ട് മറുപടി അയക്കാൻ കഴിയും.',
 'usermailererror' => 'മെയിലുണ്ടായ പിഴവ് തിരിച്ചയച്ചിരിക്കുന്നു:',
 'defemailsubject' => '"$1" എന്ന ഉപയോക്താവ് അയച്ച {{SITENAME}} ഇമെയിൽ',
@@ -2303,7 +2310,7 @@ https://www.mediawiki.org/wiki/Manual:Image_Authorization കാണുക.',
 
 # Watchlist
 'watchlist' => 'ശ്രദ്ധിക്കുന്ന താളുകളുടെ പട്ടിക',
-'mywatchlist' => 'ഞാൻ ശ്രദ്ധിക്കുന്നവ',
+'mywatchlist' => 'ശ്രദ്ധിക്കുന്നവ',
 'watchlistfor2' => 'ഉപയോക്താവ്:$1 $2',
 'nowatchlist' => 'താങ്കൾ ശ്രദ്ധിക്കുന്ന താളുകളുടെ പട്ടികയിൽ ഇനങ്ങളൊന്നുമില്ല.',
 'watchlistanontext' => 'താങ്കൾ ശ്രദ്ധിക്കുന്ന താളുകളുടെ പട്ടിക കാണുവാനോ തിരുത്തുവാനോ $1.',
@@ -2557,7 +2564,7 @@ $1',
 # Contributions
 'contributions' => 'ഉപയോക്താവിന്റെ സംഭാവനകൾ',
 'contributions-title' => '$1 എന്ന ഉപയോക്താവിന്റെ സംഭാവനകൾ',
-'mycontris' => 'എന്റെ സംഭാവനകൾ',
+'mycontris' => 'സംഭാവനകൾ',
 'contribsub2' => '$1 എന്ന ഉപയോക്താവിന്റെ $2.',
 'nocontribs' => 'ഈ മാനദണ്ഡങ്ങളുമായി യോജിക്കുന്ന മാറ്റങ്ങൾ ഒന്നും കണ്ടില്ല.',
 'uctop' => '(അവസാനത്തെ തിരുത്തൽ)',
@@ -2597,7 +2604,7 @@ $1',
 'whatlinkshere-hideredirs' => 'തിരിച്ചുവിടലുകൾ $1',
 'whatlinkshere-hidetrans' => 'ഉൾപ്പെടുത്തലുകൾ $1',
 'whatlinkshere-hidelinks' => 'കണ്ണികൾ $1',
-'whatlinkshere-hideimages' => 'ചിത്രങ്ങളിൽ നിന്ന് $1 കണ്ണികൾ',
+'whatlinkshere-hideimages' => 'പ്രമാണങ്ങളിൽ നിന്നുള്ള കണ്ണികൾ $1',
 'whatlinkshere-filters' => 'അരിപ്പകൾ',
 
 # Block/unblock
@@ -3087,7 +3094,7 @@ $1',
 
 # Info page
 'pageinfo-title' => '"$1" എന്ന താളിന്റെ വിവരങ്ങൾ',
-'pageinfo-not-current' => 'ഇപ്പോഴത്തെ നാൾപ്പതിപ്പിൽ മാത്രമേ വിവരങ്ങൾ പ്രദർശിപ്പിക്കപ്പെടാനിടയുള്ളു.',
+'pageinfo-not-current' => 'ക്ഷമിക്കുക, പഴയ നാൾപ്പതിപ്പുകളിൽ ഈ വിവരം പ്രദർശിപ്പിക്കുക അസാദ്ധ്യമാണ്.',
 'pageinfo-header-basic' => 'അടിസ്ഥാനവിവരങ്ങൾ',
 'pageinfo-header-edits' => 'തിരുത്തൽചരിത്രം',
 'pageinfo-header-restrictions' => 'സംരക്ഷണം',
@@ -3096,6 +3103,7 @@ $1',
 'pageinfo-default-sort' => 'സ്വതേയുള്ള ക്രമപ്പെടുത്തൽ ചാവി',
 'pageinfo-length' => 'താളിന്റെ നീളം (ബൈറ്റിൽ)',
 'pageinfo-article-id' => 'താളിന്റെ ഐ.ഡി.',
+'pageinfo-language' => 'താളിന്റെ ഉള്ളടക്കത്തിന്റെ ഭാഷ',
 'pageinfo-robot-policy' => 'തിരച്ചിൽ പ്രവർത്തനത്തിന്റെ സ്ഥിതി',
 'pageinfo-robot-index' => 'സൂചികാവത്കരിക്കാവുന്നത്',
 'pageinfo-robot-noindex' => 'സൂചികാവത്കരിക്കാനാവാത്തത്',
@@ -3120,6 +3128,9 @@ $1',
 'pageinfo-redirectsto-info' => 'വിവരം',
 'pageinfo-contentpage' => 'ഉള്ളടക്ക താളായി എണ്ണുന്നവ',
 'pageinfo-contentpage-yes' => 'അതെ',
+'pageinfo-protect-cascading' => 'സംരക്ഷണങ്ങൾ ഇവിടെ നിന്ന് നിർഝരിതപ്പെടുത്തുന്നു',
+'pageinfo-protect-cascading-yes' => 'അതെ',
+'pageinfo-protect-cascading-from' => 'സംരക്ഷണങ്ങൾ നിർഝരിതപ്പെടുത്തുന്നത്',
 
 # Skin names
 'skinname-standard' => 'സാർവത്രികം',
@@ -3320,13 +3331,13 @@ $1',
 'exif-gpslongitude' => 'രേഖാംശം',
 'exif-gpsaltituderef' => 'ഉന്നതിയുടെ അവലംബം',
 'exif-gpsaltitude' => 'ഉന്നതി',
-'exif-gpstimestamp' => 'GPS സമയം (ആറ്റോമിക് ക്ലോക്ക്)',
+'exif-gpstimestamp' => 'ജി.പി.എസ്. സമയം (ആറ്റോമിക് ഘടികാരം)',
 'exif-gpssatellites' => 'അളക്കാൻ ഉപയോഗിച്ച കൃത്രിമോപഗ്രഹങ്ങൾ',
 'exif-gpsstatus' => 'സ്വീകരണിയുടെ സ്ഥിതി',
 'exif-gpsmeasuremode' => 'അളവെടുക്കൽ രീതി',
 'exif-gpsdop' => 'അളവുകളുടെ കൃത്യത',
 'exif-gpsspeedref' => 'വേഗതയുടെ ഏകകം',
-'exif-gpsspeed' => 'GPS പരിഗ്രാഹിയുടെ ഗതിവേഗം (Speed of GPS receiver)',
+'exif-gpsspeed' => 'ജി.പി.എസ്. പരിഗ്രാഹിയുടെ ഗതിവേഗം',
 'exif-gpstrackref' => 'ചലനത്തിന്റെ ദിശയ്ക്കുള്ള അവലംബം',
 'exif-gpstrack' => 'ചലനത്തിന്റെ ദിശ',
 'exif-gpsimgdirectionref' => 'ചിത്രത്തിന്റെ ദിശയ്ക്കുള്ള അവലംബം',
@@ -3432,6 +3443,8 @@ $1',
 'exif-planarconfiguration-1' => 'ചങ്കി ഫോർമാറ്റ്',
 'exif-planarconfiguration-2' => 'പ്ലാനാർ ഫോർമാറ്റ്',
 
+'exif-colorspace-65535' => 'അളവ് നിർണ്ണയിക്കാത്ത',
+
 'exif-componentsconfiguration-0' => 'നിലവിലില്ല',
 
 'exif-exposureprogram-0' => 'നിർവചിക്കപ്പെട്ടിട്ടില്ല',
@@ -3439,10 +3452,10 @@ $1',
 'exif-exposureprogram-2' => 'സാധാരണ പ്രോഗ്രാം',
 'exif-exposureprogram-3' => 'അപ്പെർച്ചർ മുൻഗണന',
 'exif-exposureprogram-4' => 'ഷട്ടർ മുൻഗണന',
-'exif-exposureprogram-5' => 'ക്രിയേറ്റീവ് പ്രോഗ്രാം (biased toward depth of field)',
-'exif-exposureprogram-6' => 'ആക്ഷൻ പ്രോഗ്രാം (biased toward fast shutter speed)',
-'exif-exposureprogram-7' => 'പോർട്ടറൈറ്റ് മോഡ് (for closeup photos with the background out of focus)',
-'exif-exposureprogram-8' => 'ലാൻഡ് സ്കേപ്പ് മോഡ് (for landscape photos with the background in focus)',
+'exif-exposureprogram-5' => 'ക്രിയേറ്റീവ് പ്രോഗ്രാം (മണ്ഡലത്തിന്റെ ആഴം കാണിക്കാൻ അനുയോജ്യം)',
+'exif-exposureprogram-6' => 'ആക്ഷൻ പ്രോഗ്രാം (വേഗത്തിലുള്ള ഷട്ടർ വേഗത്തിന് അനുയോജ്യം)',
+'exif-exposureprogram-7' => 'പോർട്ടറൈറ്റ് മോഡ് (പശ്ചാത്തലം ഫോക്കസിനു വെളിയിലുള്ള സമീപ ഫോട്ടോകൾക്ക്)',
+'exif-exposureprogram-8' => 'ലാൻഡ് സ്കേപ്പ് മോഡ് (പശ്ചാത്തലവും ഫോക്കസിലുള്ള വിശാല ഫോട്ടോകൾക്ക്)',
 
 'exif-subjectdistance-value' => '$1 മീറ്റർ',
 
@@ -3464,9 +3477,9 @@ $1',
 'exif-lightsource-10' => 'മൂടിക്കെട്ടിയ കാലാവസ്ഥ',
 'exif-lightsource-11' => 'തണൽ',
 'exif-lightsource-12' => 'പകൽവെളിച്ച ഫ്ലൂറോസെന്റ് (D 5700 – 7100K)',
-'exif-lightsource-13' => 'പകൽ വെള്ള ഫ്ലൂറോസെന്റ് (N 4600 – 5400K)',
-'exif-lightsource-14' => 'ശീത വെള്ള ഫ്ലൂറോസെന്റ് (W 3900 – 4500K)',
-'exif-lightsource-15' => 'വെള്ള ഫ്ലൂറോസെന്റ് (WW 3200 – 3700K)',
+'exif-lightsource-13' => 'പകൽ വെളുപ്പ് ഫ്ലൂറോസെന്റ് (N 4600 – 5400K)',
+'exif-lightsource-14' => 'ശീത വെളുപ്പ് ഫ്ലൂറോസെന്റ് (W 3900 – 4500K)',
+'exif-lightsource-15' => 'വെളുപ്പ് ഫ്ലൂറോസെന്റ് (WW 3200 – 3700K)',
 'exif-lightsource-17' => 'മാതൃകാ വെളിച്ചം A',
 'exif-lightsource-18' => 'മാതൃകാ വെളിച്ചം B',
 'exif-lightsource-19' => 'മാതൃകാ വെളിച്ചം C',
@@ -3811,6 +3824,7 @@ $5
 'version-license' => 'അനുമതി',
 'version-poweredby-credits' => "ഈ വിക്കി പ്രവർത്തിക്കാൻ '''[//www.mediawiki.org/ മീഡിയവിക്കി]''' ഉപയോഗിക്കുന്നു. പകർപ്പവകാശം © 2001-$1 $2.",
 'version-poweredby-others' => 'മറ്റുള്ളവർ',
+'version-credits-summary' => '[[Special:Version|മീഡിയവിക്കിയ്ക്ക്]] നൽകിയ സംഭാവനകളുടെ പേരിൽ താഴെക്കൊടുക്കുന്നവർക്ക് ഞങ്ങൾ നന്ദി പറയുന്നു.',
 'version-license-info' => 'മീഡിയവിക്കി ഒരു സ്വതന്ത്ര സോഫ്റ്റ്‌വേറാണ്; സ്വതന്ത്ര സോഫ്റ്റ്‌വേർ ഫൗണ്ടേഷൻ പ്രസിദ്ധീകരിച്ചിട്ടുള്ള ഗ്നു സാർവ്വജനിക അനുവാദപത്രത്തിന്റെ പതിപ്പ് 2 പ്രകാരമോ, അല്ലെങ്കിൽ (താങ്കളുടെ ഇച്ഛാനുസരണം) പിന്നീട് പ്രസിദ്ധീകരിച്ച ഏതെങ്കിലും പതിപ്പ് പ്രകാരമോ താങ്കൾക്കിത് പുനർവിതരണം ചെയ്യാനും ഒപ്പം/അല്ലെങ്കിൽ മാറ്റങ്ങൾ വരുത്താനും സാധിക്കുന്നതാണ്.
 
 മീഡിയവിക്കി താങ്കൾക്കുപകരിക്കുമെന്ന പ്രതീക്ഷയോടെയാണ് വിതരണം ചെയ്യുന്നത്, പക്ഷേ യാതൊരു ഗുണമേന്മോത്തരവാദിത്തവും വഹിക്കുന്നില്ല; വ്യാപാരയോഗ്യമെന്നോ പ്രത്യേക ഉപയോഗത്തിന് അനുയോജ്യമെന്നോ ഉള്ള യാതൊരു ഗുണമേന്മോത്തരവാദിത്തവും ഇത് ഉൾക്കൊള്ളുന്നില്ല. കൂടുതൽ വിവരങ്ങൾക്ക് ഗ്നു സാർവ്വജനിക അനുവാദപത്രം കാണുക.
diff --git a/languages/messages/MessagesMr.php b/languages/messages/MessagesMr.php
index ad74677b1f..df26a3dee8 100644
--- a/languages/messages/MessagesMr.php
+++ b/languages/messages/MessagesMr.php
@@ -169,7 +169,6 @@ $magicWords = array(
 	'forcetoc'                  => array( '0', '__अनुक्रमणिकाहवीच__', '__FORCETOC__' ),
 	'toc'                       => array( '0', '__अनुक्रमणिका__', '__TOC__' ),
 	'noeditsection'             => array( '0', '__असंपादनक्षम__', '__NOEDITSECTION__' ),
-	'noheader'                  => array( '0', '__शीर्षकनाही__', '__NOHEADER__' ),
 	'currentmonth'              => array( '1', 'सद्यमहिना', 'सद्यमहिना२', 'CURRENTMONTH', 'CURRENTMONTH2' ),
 	'currentmonth1'             => array( '1', 'सद्यमहिना१', 'CURRENTMONTH1' ),
 	'currentmonthname'          => array( '1', 'सद्यमहिनानाव', 'CURRENTMONTHNAME' ),
diff --git a/languages/messages/MessagesMs.php b/languages/messages/MessagesMs.php
index 1e04a18e5f..adfdef0ae2 100644
--- a/languages/messages/MessagesMs.php
+++ b/languages/messages/MessagesMs.php
@@ -160,7 +160,6 @@ $specialPageAliases = array(
 	'Recentchanges'             => array( 'Perubahan_terkini' ),
 	'Recentchangeslinked'       => array( 'Perubahan_berkaitan' ),
 	'Revisiondelete'            => array( 'Hapus_semakan' ),
-	'RevisionMove'              => array( 'Pindah_semakan' ),
 	'Search'                    => array( 'Gelintar' ),
 	'Shortpages'                => array( 'Laman_pendek' ),
 	'Specialpages'              => array( 'Laman_khas' ),
@@ -240,7 +239,7 @@ $messages = array(
 
 'underline-always' => 'Sentiasa',
 'underline-never' => 'Jangan',
-'underline-default' => 'Pelayar web utama',
+'underline-default' => 'Tetapan azali kulit/pelayar',
 
 # Font style option in Special:Preferences
 'editfont-style' => 'Gaya fon ruang sunting:',
@@ -327,8 +326,8 @@ $messages = array(
 'newwindow' => '(dibuka di tetingkap baru)',
 'cancel' => 'Batalkan',
 'moredotdotdot' => 'Lagi...',
-'mypage' => 'Laman saya',
-'mytalk' => 'Perbualan saya',
+'mypage' => 'Halaman',
+'mytalk' => 'Perbualan',
 'anontalk' => 'Perbualan bagi IP ini',
 'navigation' => 'Pandu arah',
 'and' => '&#32;dan',
@@ -873,7 +872,7 @@ Masukan log sekatan terakhir disediakan di bawah sebagai rujukan:',
 'note' => "'''Catatan:'''",
 'previewnote' => "'''Ingatlah bahawa ini hanya pralihat.'''
 Perubahan anda belum disimpan!",
-'continue-editing' => 'Teruskan menyunting',
+'continue-editing' => 'Pergi ke tempat menyunting',
 'previewconflict' => 'Paparan ini merupakan teks di bahagian atas dalam kotak sunting teks. Teks ini akan disimpan sekiranya anda memilih berbuat demikian.',
 'session_fail_preview' => "'''Kami tidak dapat memproses suntingan anda kerana kehilangan data sesi. Sila cuba lagi. Jika masalah ini berlanjutan, [[Special:UserLogout|log keluar]] dahulu, kemudian log masuk sekali lagi.'''",
 'session_fail_preview_html' => "'''Kami tidak dapat memproses suntingan anda kerana kehilangan data sesi.'''
@@ -1251,7 +1250,7 @@ Cuba berikan awalan ''all:'' untuk mencari semua kandungan (termasuk laman perbi
 
 # Preferences page
 'preferences' => 'Keutamaan',
-'mypreferences' => 'Keutamaan saya',
+'mypreferences' => 'Keutamaan',
 'prefs-edits' => 'Jumlah suntingan:',
 'prefsnologin' => 'Belum log masuk',
 'prefsnologintext' => 'Anda hendaklah <span class="plainlinks">[{{fullurl:{{#Special:UserLogin}}|returnto=$1}} log masuk]</span> terlebih dahulu untuk menetapkan keutamaan.',
@@ -1484,6 +1483,9 @@ Tindakan ini tidak boleh dibatalkan.',
 'rightslogtext' => 'Ini ialah log perubahan terhadap hak pengguna.',
 'rightslogentry' => 'menukar keahlian kumpulan bagi $1 daripada $2 kepada $3',
 'rightslogentry-autopromote' => 'dinaik pangkat secara automatik dari $2 ke $3',
+'logentry-rights-rights' => '$1 menukar keahlian kumpulan untuk $3 dari $4 ke $5',
+'logentry-rights-rights-legacy' => '$1 menukar keahlian kumpulan untuk $3',
+'logentry-rights-autopromote' => '$1 dinaik pangkat secara automatik dari $4 ke $5',
 'rightsnone' => '(tiada)',
 
 # Associated actions - in the sentence "You do not have permission to X"
@@ -2104,7 +2106,7 @@ Lihat juga [[Special:WantedCategories|kategori yang dikehendaki]].',
 'linksearch-ok' => 'Cari',
 'linksearch-text' => 'Kad bebas seperti "*.wikipedia.org" dibenarkan.<br />
 Memerlukan sekurang-kurangnya satu domain peringkat tinggi, cth. "*.org".<br />
-Protokol yang disokong: <code>$1</code> (jangan bubuh sebarang protokol ini dalam carian anda)',
+Protokol yang disokong: <code>$1</code> (menjadi http:// jika tiada protokol dinyatakan).',
 'linksearch-line' => '$1 dipaut dari $2',
 'linksearch-error' => 'Kad bebas hanya boleh digunakan pada permulaan nama hos.',
 
@@ -2155,7 +2157,7 @@ terlebih dahulu dan mempunyai alamat e-mel yang sah dalam
 '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 pengguna ini.
+'emailpagetext' => 'Gunakan borang berikut untuk mengirim pesanan e-mel kepada {{GENDER:$1|pengguna}} ini.
 
 Alamat e-mel yang ditetapkan dalam [[Special:Preferences|keutamaan anda]] akan digunakan sebagai alamat "Daripada" dalam e-mel tersebut supaya si penerima boleh membalasnya.',
 'usermailererror' => 'Objek Mail memulangkan ralat:',
@@ -2188,7 +2190,7 @@ Alamat e-mel yang ditetapkan dalam [[Special:Preferences|keutamaan anda]] akan d
 
 # Watchlist
 'watchlist' => 'Senarai pantau',
-'mywatchlist' => 'Senarai pantau saya',
+'mywatchlist' => 'Senarai pantau',
 'watchlistfor2' => 'Bagi $1 $2',
 'nowatchlist' => 'Tiada item dalam senarai pantau anda.',
 'watchlistanontext' => 'Sila $1 terlebih dahulu untuk melihat atau menyunting senarai pantau anda.',
@@ -2449,7 +2451,7 @@ $1',
 # Contributions
 'contributions' => 'Sumbangan pengguna',
 'contributions-title' => 'Sumbangan oleh $1',
-'mycontris' => 'Sumbangan saya',
+'mycontris' => 'Sumbangan',
 'contribsub2' => 'Oleh $1 ($2)',
 'nocontribs' => 'Tiada sebarang perubahan yang sepadan dengan kriteria-kriteria ini.',
 'uctop' => '(puncak)',
@@ -2488,7 +2490,7 @@ $1',
 'whatlinkshere-hideredirs' => '$1 pelencongan',
 'whatlinkshere-hidetrans' => '$1 penyertaan',
 'whatlinkshere-hidelinks' => '$1 pautan',
-'whatlinkshere-hideimages' => '$1 pautan imej',
+'whatlinkshere-hideimages' => '$1 pautan fail',
 'whatlinkshere-filters' => 'Penapis',
 
 # Block/unblock
@@ -2961,7 +2963,7 @@ Simpan dalam komputer anda dan muat naiknya di sini.',
 
 # Info page
 'pageinfo-title' => 'Maklumat untuk "$1"',
-'pageinfo-not-current' => 'Maklumat mungkin hanya dipaparkan untuk versi semasa.',
+'pageinfo-not-current' => 'Maaf, maklumat ini tidak dapat disediakan untuk semakan lama.',
 'pageinfo-header-basic' => 'Maklumat asas',
 'pageinfo-header-edits' => 'Sunting sejarah',
 'pageinfo-header-restrictions' => 'Perlindungan halaman',
@@ -2970,6 +2972,7 @@ Simpan dalam komputer anda dan muat naiknya di sini.',
 'pageinfo-default-sort' => 'Kunci isih azali',
 'pageinfo-length' => 'Kepanjangan halaman (bait)',
 'pageinfo-article-id' => 'ID halaman',
+'pageinfo-language' => 'Bahasa isi kandungan halaman',
 'pageinfo-robot-policy' => 'Status enjin pencarian',
 'pageinfo-robot-index' => 'Boleh diindekskan',
 'pageinfo-robot-noindex' => 'Tidak boleh diindekskan',
@@ -3699,6 +3702,7 @@ Anda juga boleh [[Special:EditWatchlist|menggunakan penyunting piawai]].',
 'version-license' => 'Lesen',
 'version-poweredby-credits' => "Wiki ini dikuasakan oleh '''[//www.mediawiki.org/ MediaWiki]''', hak cipta © 2001-$1 $2.",
 'version-poweredby-others' => 'penyumbang-penyumbang lain',
+'version-credits-summary' => 'Kami ingin mengucapkan sekalung budi kepada mereka yang berikut atas sumbangan mereka keada [[Special:Version|MediaWiki]].',
 'version-license-info' => 'MediaWiki adalah perisian bebas; anda boleh mengedarkannya semula dan/atau mengubah suainya di bawah terma-terma Lesen Awam GNU sebagai mana yang telah diterbitkan oleh Yayasan Perisian Bebas, sama ada versi 2 bagi Lesen tersebut, atau (berdasarkan pilihan anda) mana-mana versi selepasnya.
 
 MediaWiki diedarkan dengan harapan bahawa ia berguna, tetapi TANPA SEBARANG WARANTI; hatta waranti yang tersirat bagi KEBOLEHDAGANGAN mahupun KESESUAIAN UNTUK TUJUAN TERTENTU. Sila lihat Lesen Awam GNU untuk butiran lanjut.
diff --git a/languages/messages/MessagesMwl.php b/languages/messages/MessagesMwl.php
index 5aaf7e2cf4..df7e6c1577 100644
--- a/languages/messages/MessagesMwl.php
+++ b/languages/messages/MessagesMwl.php
@@ -211,7 +211,6 @@ $messages = array(
 'qbbrowse' => 'Nabegar',
 'qbedit' => 'Eiditar',
 'qbpageoptions' => 'Esta páigina',
-'qbpageinfo' => 'Cuntesto',
 'qbmyoptions' => 'Mies páiginas',
 'qbspecialpages' => 'Páiginas speciales',
 'faq' => 'FAQ',
diff --git a/languages/messages/MessagesMy.php b/languages/messages/MessagesMy.php
index 56298d6049..310099f72c 100644
--- a/languages/messages/MessagesMy.php
+++ b/languages/messages/MessagesMy.php
@@ -191,7 +191,6 @@ $messages = array(
 'qbbrowse' => 'ရှာဖွေလှန်လှောရန်',
 'qbedit' => 'ပြင်​ဆင်​ရန်​',
 'qbpageoptions' => 'ဤစာမျက်နှာ',
-'qbpageinfo' => 'မာတိကာ',
 'qbmyoptions' => 'ကျွန်ုပ် စာမျက်နှာများ',
 'qbspecialpages' => 'အ​ထူး​စာ​မျက်​နှာ​',
 'faq' => 'မေးလေ့ရှိကြသည်များ',
diff --git a/languages/messages/MessagesMyv.php b/languages/messages/MessagesMyv.php
index 2223760fc4..76d388bf06 100644
--- a/languages/messages/MessagesMyv.php
+++ b/languages/messages/MessagesMyv.php
@@ -329,7 +329,6 @@ $messages = array(
 'qbbrowse' => 'Ваномо-тееме',
 'qbedit' => 'Витнеме-петнеме',
 'qbpageoptions' => 'Те лопась',
-'qbpageinfo' => 'Косо-зярдо',
 'qbmyoptions' => 'Монь лопан',
 'qbspecialpages' => 'Башка тевень лопат',
 'faq' => 'Сеедьстэ кепедень кевкстемат',
diff --git a/languages/messages/MessagesMzn.php b/languages/messages/MessagesMzn.php
index e0b58f550a..c5e80be46f 100644
--- a/languages/messages/MessagesMzn.php
+++ b/languages/messages/MessagesMzn.php
@@ -80,7 +80,6 @@ $magicWords = array(
 	'forcetoc'                  => array( '0', '__بافهرست__', '__FORCETOC__' ),
 	'toc'                       => array( '0', '__فهرست__', '__TOC__' ),
 	'noeditsection'             => array( '0', '__بی‌بخش__', '__NOEDITSECTION__' ),
-	'noheader'                  => array( '0', 'بی‌عنوان__', '__بی‌عنوان__', '__NOHEADER__' ),
 	'currentmonth'              => array( '1', 'ماه', 'ماه‌کنونی', 'ماه_کنونی', 'ماه‌کنونی۲', 'ماه_اسایی۲', 'ماه_کنونی۲', 'CURRENTMONTH', 'CURRENTMONTH2' ),
 	'currentmonth1'             => array( '1', 'ماه۱', 'ماه‌کنونی۱', 'ماه_کنونی۱', 'CURRENTMONTH1' ),
 	'currentmonthname'          => array( '1', 'نام‌ماه', 'نام_ماه', 'نام‌ماه‌کنونی', 'نام_ماه_کنونی', 'CURRENTMONTHNAME' ),
@@ -271,7 +270,6 @@ $messages = array(
 'qbbrowse' => 'چأرخه‌سه‌ن',
 'qbedit' => 'دچی‌ین',
 'qbpageoptions' => 'این صفحه',
-'qbpageinfo' => 'بافت',
 'qbmyoptions' => 'مه صفحه‌ئون',
 'qbspecialpages' => 'شا صفحه‌ئون',
 'faq' => 'معمولی سوالا',
diff --git a/languages/messages/MessagesNah.php b/languages/messages/MessagesNah.php
index 7caadce83a..8de89e8fd2 100644
--- a/languages/messages/MessagesNah.php
+++ b/languages/messages/MessagesNah.php
@@ -418,7 +418,7 @@ Xiquitta moyēquihcuilōl.',
 Timitztlātlauhtia xicchīhua occeppa.',
 'wrongpasswordempty' => 'Ayāc motlahtōlichtacāyo.
 Timitztlātlauhtia xicchīhua occeppa.',
-'mailmypassword' => 'E-mailīz yancuīc motlahtōlichtacāyo',
+'mailmypassword' => 'Notech moēhualtia maltzinteyōtl netitlaniztica yancuīc ichtacātlahtōlli',
 'noemail' => '"$1" ahmo quipiya īe-mailcān.',
 'passwordsent' => 'Ōmoihuah yancuīc motlahtōlichtacāyo īhuīc mo e-mail ("$1").
 Occeppa xicalaqui niman ticmatīz.',
@@ -671,7 +671,7 @@ Hueliz ōmopolo huiqui nozo ōmozacac.
 'defaultns' => 'Tlatēmōz inīn tōcātzimpan achtopa:',
 'default' => 'ic default',
 'prefs-files' => 'Tlahcuilōlli',
-'youremail' => 'E-mail:',
+'youremail' => 'Maltzinteyōtl netitlanizyeyāntli:',
 'username' => 'Tlatequitiltilīltōcāitl:',
 'uid' => 'Tlatequitiltilīlli ID:',
 'prefs-memberingroups' => 'Tlācatl {{PLURAL:$1|olōlco|olōlco}}:',
@@ -1004,7 +1004,7 @@ Nò mà mỏta in tlèn [[Special:WantedCategories|ìpan kineki tlaìxmatkàtlà
 'listgrouprights-rights' => 'Huelītiliztli',
 
 # E-mail user
-'emailuser' => 'Tique-mailīz inīn tlatequitiltilīlli',
+'emailuser' => 'Tiquēhualtlīz maltzinteyōtl netitlaniztli inīn tlatequitiltilīlli',
 'defemailsubject' => '{{SITENAME}} correo tlatequitiltilīlhuīc $1',
 'emailfrom' => 'Īhuīcpa:',
 'emailto' => 'Īhuīc:',
@@ -1152,7 +1152,7 @@ Xiquitta $2 ic yancuīc tlapololiztli.',
 'whatlinkshere-links' => '← tzòwilistìn',
 'whatlinkshere-hideredirs' => '$1 tlacuepaliztli',
 'whatlinkshere-hidelinks' => '$1 tzòwilistìn',
-'whatlinkshere-hideimages' => '$1 ìxiptzòwilistli',
+'whatlinkshere-hideimages' => '$1 tlahcuilōltzonhuīliztli',
 
 # Block/unblock
 'blockip' => 'Tiquitzacuilīz tlatequitiltilīlli',
@@ -1280,7 +1280,7 @@ Hueliz cah inīn huēyi tlapatlaliztli. Timitztlātlauhtia ticmatīz cuallōtl a
 'tooltip-n-portal' => 'Tlachīhualiztechcopa, inōn tihuelīti titlachīhua, tlatēmoyān',
 'tooltip-n-recentchanges' => 'Yancuīc tlapatlaliztli huiquipan',
 'tooltip-n-randompage' => 'Tiquittāz cē zāzotlein zāzanilli',
-'tooltip-n-help' => 'Tlamachtiyān.',
+'tooltip-n-help' => 'In tēmachtīlōyān',
 'tooltip-t-whatlinkshere' => 'Mochīntīn zāzaniltin huiquipan quitzonhuiliah nicān',
 'tooltip-t-recentchangeslinked' => 'Yancuīc tlapatlaliztli inīn zāzanilhuīcpa moquintzonhuilia',
 'tooltip-feed-rss' => 'RSS tlachicāhualiztli inīn zāzaniltechcopa',
diff --git a/languages/messages/MessagesNan.php b/languages/messages/MessagesNan.php
index b4b07a7bd4..c65f0b8675 100644
--- a/languages/messages/MessagesNan.php
+++ b/languages/messages/MessagesNan.php
@@ -167,7 +167,6 @@ $messages = array(
 'qbbrowse' => 'Liū-lám',
 'qbedit' => 'Siu-kái',
 'qbpageoptions' => 'Chit ia̍h',
-'qbpageinfo' => 'Bo̍k-lo̍k',
 'qbmyoptions' => 'Goá ê ia̍h',
 'qbspecialpages' => 'Te̍k-sû-ia̍h',
 'faq' => 'BÅ«n-tah',
diff --git a/languages/messages/MessagesNb.php b/languages/messages/MessagesNb.php
index b213ccf3eb..82cf54de00 100644
--- a/languages/messages/MessagesNb.php
+++ b/languages/messages/MessagesNb.php
@@ -40,6 +40,7 @@
  * @author Sjurhamre
  * @author Stigmj
  * @author Teak
+ * @author Wouterkoch
  * @author לערי ריינהארט
  */
 
@@ -162,7 +163,6 @@ $specialPageAliases = array(
 	'Recentchanges'             => array( 'Siste_endringer' ),
 	'Recentchangeslinked'       => array( 'Relaterte_endringer' ),
 	'Revisiondelete'            => array( 'Revisjonssletting' ),
-	'RevisionMove'              => array( 'Revisjonsflytting' ),
 	'Search'                    => array( 'Søk' ),
 	'Shortpages'                => array( 'Korte_sider' ),
 	'Specialpages'              => array( 'Spesialsider' ),
@@ -363,7 +363,7 @@ $messages = array(
 
 'underline-always' => 'Alltid',
 'underline-never' => 'Aldri',
-'underline-default' => 'Bruk nettleserstandard',
+'underline-default' => 'Nettleserens standardinnstillinger',
 
 # Font style option in Special:Preferences
 'editfont-style' => 'Skrifttype i redigeringsboksen:',
@@ -448,8 +448,8 @@ $messages = array(
 'newwindow' => '(Ã¥pnes i et nytt vindu)',
 'cancel' => 'Avbryt',
 'moredotdotdot' => 'Mer …',
-'mypage' => 'Min side',
-'mytalk' => 'Min diskusjonsside',
+'mypage' => 'Egen brukerside',
+'mytalk' => 'Egen brukerdiskusjonsside',
 'anontalk' => 'Brukerdiskusjon for denne IP-adressen',
 'navigation' => 'Navigasjon',
 'and' => '&#32;og',
@@ -1009,7 +1009,7 @@ Siste blokkeringsloggelement kan sees nedenfor.',
 'note' => "'''Merk:'''",
 'previewnote' => "'''Husk at dette bare er en forhåndsvisning.'''
 Endringene dine har ikke blitt lagret ennå!",
-'continue-editing' => 'Fortsett med redigeringen',
+'continue-editing' => 'GÃ¥ til redigeringsfeltet',
 'previewconflict' => 'Slik vil teksten i redigeringsvinduet se ut dersom du lagrer den.',
 'session_fail_preview' => "'''Beklager! Klarte ikke å lagre redigeringen din på grunn av tap av øktdata.'''
 Prøv igjen.
@@ -1384,7 +1384,7 @@ For å søke i alle, bruk prefikset ''all:'' (inkluderer diskusjonssider, maler,
 
 # Preferences page
 'preferences' => 'Innstillinger',
-'mypreferences' => 'Innstillinger',
+'mypreferences' => 'Egne brukerinnstillinger',
 'prefs-edits' => 'Antall redigeringer:',
 'prefsnologin' => 'Ikke logget inn',
 'prefsnologintext' => 'Du må være <span class="plainlinks">[{{fullurl:{{#Special:UserLogin}}|returnto=$1}} logget inn]</span> for å endre brukerinnstillingene.',
@@ -1616,6 +1616,9 @@ Den kan maks inneholde $1 {{PLURAL:$1|tegn|tegn}}.',
 'rightslogtext' => 'Dette er en logg over endringer av brukerrettigheter.',
 'rightslogentry' => 'endret gruppe for $1 fra $2 til $3',
 'rightslogentry-autopromote' => 'ble automatisk forfremmet fra $2 til $3',
+'logentry-rights-rights' => '$1 endret gruppemedlemskap for $3 fra $4 til $5',
+'logentry-rights-rights-legacy' => '$1 endret gruppemedlemskap for $3',
+'logentry-rights-autopromote' => '$1 ble automatisk forfremmet fra $4 til $5',
 'rightsnone' => '(ingen)',
 
 # Associated actions - in the sentence "You do not have permission to X"
@@ -2236,7 +2239,7 @@ Se også [[Special:WantedCategories|ønskede kategorier]].',
 'linksearch-pat' => 'Søkemønster:',
 'linksearch-ns' => 'Navnerom:',
 'linksearch-ok' => 'Søk',
-'linksearch-text' => 'Jokertegn som «*.wikipedia.org» kan brukes.
+'linksearch-text' => 'Jokertegn slik som i «*.wikipedia.org» kan brukes.
 Det kreves at det oppgis minst et toppnivådomene, for eksempel «*.org».<br />
 Støttede protokoller: <code>$1</code> (ikke legg til noen av disse i søket ditt).',
 'linksearch-line' => '$1 lenkes fra $2',
@@ -2287,8 +2290,8 @@ Mer informasjon om de enkelte rettighetstypene kan finnes [[{{MediaWiki:Listgrou
 'emailuser-title-target' => 'Send epost til denne {{GENDER:$1|brukeren}}',
 'emailuser-title-notarget' => 'E-post til bruker',
 'emailpage' => 'E-post til bruker',
-'emailpagetext' => 'Du kan bruke skjemaet nedenfor for å sende en e-post til denne brukeren.
-Den e-postadressen du har satt i [[Special:Preferences|innstillingene dine]] vil dukke opp i «fra»-feltet på denne e-posten, så mottakeren er i stand til å svare.',
+'emailpagetext' => 'Du kan bruke skjemaet under for å sende en e-post til denne {{GENDER:$1|brukeren}}.
+E-postadressen du har satt i [[Special:Preferences|innstillingene dine]] vil vises i «Fra»-feltet i e-posten, slik at mottakeren kan svare deg direkte.',
 'usermailererror' => 'E-postobjekt returnerte feilen:',
 'defemailsubject' => 'E-post fra {{SITENAME}}-brukeren «$1»',
 'usermaildisabled' => 'Brukerepost deaktivert',
@@ -2319,7 +2322,7 @@ Den e-postadressen du har satt i [[Special:Preferences|innstillingene dine]] vil
 
 # Watchlist
 'watchlist' => 'Overvåkningsliste',
-'mywatchlist' => 'Overvåkningsliste',
+'mywatchlist' => 'Egen brukers overvåkningsliste',
 'watchlistfor2' => 'For $1 $2',
 'nowatchlist' => 'Du har ingenting i overvåkningslisten.',
 'watchlistanontext' => 'Vennligst $1 for å vise eller redigere sider på overvåkningslisten din.',
@@ -2570,7 +2573,7 @@ $1',
 # Contributions
 'contributions' => 'Brukerbidrag',
 'contributions-title' => 'Brukerbidrag av $1',
-'mycontris' => 'Mine bidrag',
+'mycontris' => 'Mine redigeringer',
 'contribsub2' => 'For $1 ($2)',
 'nocontribs' => 'Ingen endringer er funnet som passer disse kriteriene.',
 'uctop' => '(siste)',
@@ -3090,7 +3093,7 @@ Dette er sannsynligvis forårsaket av en lenke til et svartelistet eksternt nett
 
 # Info page
 'pageinfo-title' => 'Informasjon om «$1»',
-'pageinfo-not-current' => 'Informasjonen vises kanskje bare for den gjeldende revisjonen.',
+'pageinfo-not-current' => 'Beklager, det er ikke mulig å vise denne informasjonen for gamle revisjoner.',
 'pageinfo-header-basic' => 'Grunnleggende informasjon',
 'pageinfo-header-edits' => 'Redigeringshistorikk',
 'pageinfo-header-restrictions' => 'Sidebeskyttelse',
@@ -3099,6 +3102,7 @@ Dette er sannsynligvis forårsaket av en lenke til et svartelistet eksternt nett
 'pageinfo-default-sort' => 'Standardsorteringsnøkkel',
 'pageinfo-length' => 'Sidelengde (i bytes)',
 'pageinfo-article-id' => 'Side-ID',
+'pageinfo-language' => 'Språk for sideinnholdet',
 'pageinfo-robot-policy' => 'Søkemotorstatus',
 'pageinfo-robot-index' => 'Indekserbar',
 'pageinfo-robot-noindex' => 'Ikke indekserbar',
@@ -3839,6 +3843,7 @@ Du kan også [[Special:EditWatchlist|bruke standardverktøyet]].',
 'version-license' => 'Lisens',
 'version-poweredby-credits' => "Denne wikien er drevet av '''[//www.mediawiki.org/ MediaWiki]''', copyright © 2001-$1 $2.",
 'version-poweredby-others' => 'andre',
+'version-credits-summary' => 'Vi ønsker å takke følgende personer for deres bidrag til [[Special:Version|MediaWiki]].',
 'version-license-info' => 'MediaWiki er fri programvare; du kan redistribuere det og/eller modifisere det under betingelsene i GNU General Public License som publisert av Free Software Foundation; enten versjon 2 av lisensen, eller (etter eget valg) enhver senere versjon.
 
 MediaWiki er distribuert i håp om at det vil være nyttig, men UTEN NOEN GARANTI; ikke engang implisitt garanti av SALGBARHET eller EGNETHET FOR ET BESTEMT FORMÅL. Se GNU General Public License for flere detaljer.
diff --git a/languages/messages/MessagesNds_nl.php b/languages/messages/MessagesNds_nl.php
index 7ed5534aa5..8ec9d622cd 100644
--- a/languages/messages/MessagesNds_nl.php
+++ b/languages/messages/MessagesNds_nl.php
@@ -80,7 +80,6 @@ $magicWords = array(
 	'forcetoc'                  => array( '0', '__FORSEERONDERWARPEN__', '__INHOUD_DWINGEN__', '__FORCEERINHOUD__', '__FORCETOC__' ),
 	'toc'                       => array( '0', '__ONDERWARPEN__', '__INHOUD__', '__TOC__' ),
 	'noeditsection'             => array( '0', '__GIENBEWARKSEKSIE__', '__NIETBEWERKBARESECTIE__', '__NOEDITSECTION__' ),
-	'noheader'                  => array( '0', '__GIENKOPJEN__', '__GEENKOP__', '__NOHEADER__' ),
 	'currentmonth'              => array( '1', 'DISSEMAOND', 'HUIDIGEMAAND', 'HUIDIGEMAAND2', 'CURRENTMONTH', 'CURRENTMONTH2' ),
 	'currentmonthname'          => array( '1', 'DISSEMAONDNAAM', 'HUIDIGEMAANDNAAM', 'CURRENTMONTHNAME' ),
 	'currentmonthnamegen'       => array( '1', 'DISSEMAONDGEN', 'HUIDIGEMAANDGEN', 'CURRENTMONTHNAMEGEN' ),
@@ -147,7 +146,7 @@ $magicWords = array(
 	'img_middle'                => array( '1', 'midden', 'middle' ),
 	'img_bottom'                => array( '1', 'benejen', 'beneden', 'bottom' ),
 	'img_text_bottom'           => array( '1', 'tekste-benejen', 'tekst-beneden', 'text-bottom' ),
-	'img_link'                  => array( '1', 'verwiezing=$', 'verwijzing=$1', 'link=$1' ),
+	'img_link'                  => array( '1', 'verwiezing=$1', 'verwijzing=$1', 'link=$1' ),
 	'sitename'                  => array( '1', 'WEBSTEENAAM', 'SITENAAM', 'SITENAME' ),
 	'ns'                        => array( '0', 'NR:', 'NS:' ),
 	'localurl'                  => array( '0', 'LOKALEURL', 'LOCALURL:' ),
@@ -274,7 +273,6 @@ $specialPageAliases = array(
 	'Recentchanges'             => array( 'Leste_wiezigingen' ),
 	'Recentchangeslinked'       => array( 'Volg_verwiezingen' ),
 	'Revisiondelete'            => array( 'Versie_vortdoon' ),
-	'RevisionMove'              => array( 'Versie_verplaotsen' ),
 	'Search'                    => array( 'Zeuken' ),
 	'Shortpages'                => array( 'Korte_artikels' ),
 	'Specialpages'              => array( 'Spesiale_pagina\'s' ),
diff --git a/languages/messages/MessagesNl.php b/languages/messages/MessagesNl.php
index 51f7ad9a45..1f942272cc 100644
--- a/languages/messages/MessagesNl.php
+++ b/languages/messages/MessagesNl.php
@@ -102,7 +102,6 @@ $magicWords = array(
 	'forcetoc'                  => array( '0', '__INHOUD_DWINGEN__', '__FORCEERINHOUD__', '__FORCETOC__' ),
 	'toc'                       => array( '0', '__INHOUD__', '__TOC__' ),
 	'noeditsection'             => array( '0', '__NIETBEWERKBARESECTIE__', '__NOEDITSECTION__' ),
-	'noheader'                  => array( '0', '__GEENKOP__', '__NOHEADER__' ),
 	'currentmonth'              => array( '1', 'HUIDIGEMAAND', 'HUIDIGEMAAND2', 'CURRENTMONTH', 'CURRENTMONTH2' ),
 	'currentmonth1'             => array( '1', 'HUIDIGEMAAND1', 'CURRENTMONTH1' ),
 	'currentmonthname'          => array( '1', 'HUIDIGEMAANDNAAM', 'CURRENTMONTHNAME' ),
@@ -243,6 +242,10 @@ $magicWords = array(
 	'url_query'                 => array( '0', 'ZOEKOPDRACHT', 'QUERY' ),
 	'defaultsort_noerror'       => array( '0', 'geenfout', 'noerror' ),
 	'defaultsort_noreplace'     => array( '0', 'nietvervangen', 'noreplace' ),
+	'pagesincategory_all'       => array( '0', 'alle', 'all' ),
+	'pagesincategory_pages'     => array( '0', 'paginas', 'pages' ),
+	'pagesincategory_subcats'   => array( '0', 'ondercategorieen', 'subcats' ),
+	'pagesincategory_files'     => array( '0', 'bestanden', 'files' ),
 );
 
 $specialPageAliases = array(
@@ -315,7 +318,6 @@ $specialPageAliases = array(
 	'Recentchanges'             => array( 'RecenteWijzigingen' ),
 	'Recentchangeslinked'       => array( 'RecenteWijzigingenGelinkt', 'VerwanteWijzigingen' ),
 	'Revisiondelete'            => array( 'VersieVerwijderen', 'HerzieningVerwijderen', 'RevisieVerwijderen' ),
-	'RevisionMove'              => array( 'VersieVerplaatsen' ),
 	'Search'                    => array( 'Zoeken' ),
 	'Shortpages'                => array( 'KortePaginas', 'KortePagina’s', 'KortePagina\'s' ),
 	'Specialpages'              => array( 'SpecialePaginas', 'SpecialePagina’s', 'SpecialePagina\'s' ),
@@ -399,7 +401,7 @@ $messages = array(
 
 'underline-always' => 'Altijd',
 'underline-never' => 'Nooit',
-'underline-default' => 'Webbrowser-standaard',
+'underline-default' => 'Standaard in uw vormgeving of webbrowser',
 
 # Font style option in Special:Preferences
 'editfont-style' => 'Lettertypestijl bewerkingsvenster:',
@@ -484,8 +486,8 @@ $messages = array(
 'newwindow' => '(opent in een nieuw venster)',
 'cancel' => 'Annuleren',
 'moredotdotdot' => 'Meer…',
-'mypage' => 'Mijn gebruikerspagina',
-'mytalk' => 'Mijn overleg',
+'mypage' => 'Gebruikerspagina',
+'mytalk' => 'Overleg',
 'anontalk' => 'Overlegpagina voor dit IP-adres',
 'navigation' => 'Navigatie',
 'and' => '&#32;en',
@@ -1068,7 +1070,7 @@ Uw eigen .css- en .js-pagina's beginnen met een kleine letter, bijvoorbeeld {{ns
 'note' => "'''Opmerking:'''",
 'previewnote' => "'''Let op: dit is een controlepagina.'''
 Uw tekst is niet opgeslagen!",
-'continue-editing' => 'Doorgaan met bewerken',
+'continue-editing' => 'Naar het bewerkingsvenster gaan',
 'previewconflict' => 'Deze voorvertoning geeft aan hoe de tekst in het bovenste veld eruit ziet als u deze opslaat.',
 'session_fail_preview' => "'''Uw bewerking is niet verwerkt, omdat de sessiegegevens verloren zijn gegaan.
 Probeer het opnieuw.
@@ -1457,7 +1459,7 @@ De gegevens over {{SITENAME}} zijn mogelijk niet bijgewerkt.',
 
 # Preferences page
 'preferences' => 'Voorkeuren',
-'mypreferences' => 'Mijn voorkeuren',
+'mypreferences' => 'Voorkeuren',
 'prefs-edits' => 'Aantal bewerkingen:',
 'prefsnologin' => 'Niet aangemeld',
 'prefsnologintext' => 'U moet <span class="plainlinks">[{{fullurl:{{#Special:UserLogin}}|returnto=$1}} aangemeld]</span> zijn om uw voorkeuren te kunnen instellen.',
@@ -1691,6 +1693,9 @@ Als u deze opgeeft, kan deze naam gebruikt worden om u erkenning te geven voor u
 'rightslogtext' => 'Hieronder staan de wijzigingen in gebruikersrechten.',
 'rightslogentry' => 'heeft de gebruikersrechten voor $1 gewijzigd van $2 naar $3',
 'rightslogentry-autopromote' => 'is automatisch gepromoveerd van de groepen "$2" naar de groepen "$3"',
+'logentry-rights-rights' => '$1 heeft groepslidmaatschap voor $3 gewijzigd van $4 naar $5',
+'logentry-rights-rights-legacy' => '$1 heeft groepslidmaatschap voor $3 gewijzigd',
+'logentry-rights-autopromote' => '$1 is automatisch gepromoveerd van $4 naar $5',
 'rightsnone' => '(geen)',
 
 # Associated actions - in the sentence "You do not have permission to X"
@@ -2339,8 +2344,8 @@ Zie ook [[Special:WantedCategories|niet-bestaande categorieën met verwijzingen]
 'linksearch-ns' => 'Naamruimte:',
 'linksearch-ok' => 'Zoeken',
 'linksearch-text' => 'Wildcards zoals "*.wikipedia.org" of "*.org" zijn toegestaan.
-Heeft tenminste een topleveldomein, zoals bijvoorbeeld "*.org".<br />
-Ondersteunde protocollen: <code>$1</code> (voeg deze niet toe in uw zoekopdracht).',
+Heeft tenminste een topleveldomein nodig, zoals bijvoorbeeld "*.org".<br />
+Ondersteunde protocollen: <code>$1</code> (wordt "http://"als er geen protocol wordt opgegeven).',
 'linksearch-line' => '$1 heeft een verwijzing in $2',
 'linksearch-error' => 'Wildcards zijn alleen toegestaan aan het begin van een hostnaam.',
 
@@ -2389,7 +2394,7 @@ Er kan [[{{MediaWiki:Listgrouprights-helppage}}|extra informatie]] over individu
 '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 deze gebruiker verzenden.
+'emailpagetext' => 'Via dit formulier kunt u een e-mail aan {{GENDER:$1|deze gebruiker}} verzenden.
 Het e-mailadres dat u hebt opgegeven bij [[Special:Preferences|uw voorkeuren]] wordt als afzender gebruikt.
 De ontvanger kan dus direct naar u reageren.',
 'usermailererror' => 'Foutmelding bij het verzenden:',
@@ -2422,7 +2427,7 @@ De ontvanger kan dus direct naar u reageren.',
 
 # Watchlist
 'watchlist' => 'Volglijst',
-'mywatchlist' => 'Mijn volglijst',
+'mywatchlist' => 'Volglijst',
 'watchlistfor2' => 'Voor $1 $2',
 'nowatchlist' => 'Uw volglijst is leeg.',
 'watchlistanontext' => 'Om uw volglijst te bekijken of te bewerken moet u zich $1.',
@@ -2685,7 +2690,7 @@ $1',
 # Contributions
 'contributions' => 'Gebruikersbijdragen',
 'contributions-title' => 'Bijdragen van $1',
-'mycontris' => 'Mijn bijdragen',
+'mycontris' => 'Bijdragen',
 'contribsub2' => 'Voor $1 ($2)',
 'nocontribs' => 'Geen wijzigingen gevonden die aan de gestelde criteria voldoen.',
 'uctop' => '(laatste wijziging)',
@@ -3231,7 +3236,7 @@ Meestal wordt dit door een externe verwijzing op een zwarte lijst veroorzaakt.',
 
 # Info page
 'pageinfo-title' => 'Informatie over "$1"',
-'pageinfo-not-current' => 'Gegevens worden mogelijk alleen weergegeven voor de huidige versie.',
+'pageinfo-not-current' => 'Deze gegevens zijn alleen beschikbaar voor de huidige versie.',
 'pageinfo-header-basic' => 'Basisgegevens',
 'pageinfo-header-edits' => 'Bewerkingsgeschiedenis',
 'pageinfo-header-restrictions' => 'Paginabeveiliging',
@@ -3240,6 +3245,7 @@ Meestal wordt dit door een externe verwijzing op een zwarte lijst veroorzaakt.',
 'pageinfo-default-sort' => 'Standaard sorteerwijze',
 'pageinfo-length' => 'Paginalengte (in bytes)',
 'pageinfo-article-id' => 'Paginanummer',
+'pageinfo-language' => 'Pagina-inhoudstaal',
 'pageinfo-robot-policy' => 'Status voor de zoekmachine',
 'pageinfo-robot-index' => 'Indexeerbaar',
 'pageinfo-robot-noindex' => 'Niet indexeerbaar',
@@ -3980,6 +3986,7 @@ U kunt ook [[Special:EditWatchlist|het standaard bewerkingsscherm gebruiken]].',
 'version-license' => 'Licentie',
 'version-poweredby-credits' => "Deze wiki wordt aangedreven door '''[//www.mediawiki.org/ MediaWiki]''', copyright © 2001-$1 $2.",
 'version-poweredby-others' => 'anderen',
+'version-credits-summary' => 'We zouden graag de volgende personen erkennen voor hun bijdrage aan [[Special:Version|MediaWiki]].',
 'version-license-info' => 'MediaWiki is vrije software; u kunt MediaWiki verspreiden en/of aanpassen onder de voorwaarden van de GNU General Public License zoals gepubliceerd door de Free Software Foundation; ofwel versie 2 van de Licentie, of - naar uw wens - enige latere versie.
 
 MediaWiki wordt verspreid in de hoop dat het nuttig is, maar ZONDER ENIGE GARANTIE; zonder zelfs de impliciete garantie van VERKOOPBAARHEID of GESCHIKTHEID VOOR ENIG DOEL IN HET BIJZONDER. Zie de GNU General Public License voor meer informatie.
diff --git a/languages/messages/MessagesNn.php b/languages/messages/MessagesNn.php
index 37795cf440..e63863ee8c 100644
--- a/languages/messages/MessagesNn.php
+++ b/languages/messages/MessagesNn.php
@@ -362,7 +362,7 @@ $messages = array(
 
 'underline-always' => 'Alltid',
 'underline-never' => 'Aldri',
-'underline-default' => 'Nettlesarstandard',
+'underline-default' => 'Drakt- eller nettlesarstandard',
 
 # Font style option in Special:Preferences
 'editfont-style' => 'Endre stilen for skrifttypen i området:',
@@ -450,7 +450,7 @@ $messages = array(
 'cancel' => 'Avbryt',
 'moredotdotdot' => 'Meir …',
 'mypage' => 'Sida mi',
-'mytalk' => 'Diskusjonssida mi',
+'mytalk' => 'Diskusjon',
 'anontalk' => 'Diskusjonside for denne IP-adressa',
 'navigation' => 'Navigering',
 'and' => '&#32;og',
@@ -578,7 +578,7 @@ $1',
 'youhavenewmessages' => 'Du har $1 ($2).',
 'newmessageslink' => 'nye meldingar',
 'newmessagesdifflink' => 'sjå skilnad',
-'youhavenewmessagesfromusers' => 'Du har $1 frå {{PLURAL:$3|ein annan bruker| $3 brukarar}} ($2).',
+'youhavenewmessagesfromusers' => 'Du har $1 frå {{PLURAL:$3|ein annan brukar| $3 brukarar}} ($2).',
 'youhavenewmessagesmanyusers' => 'Du har $1 frå mange brukarar ($2).',
 'newmessageslinkplural' => '{{PLURAL:$1|ei ny melding|nye meldingar}}',
 'newmessagesdifflinkplural' => 'siste {{PLURAL:$1|endringa|endringane}}',
@@ -937,11 +937,9 @@ Han kan ha vorten flytta eller sletta medan du såg på sida.',
 
 Passordet for den nye kontoen kan verta endra på ''[[Special:ChangePassword|endra passord]]''-sida etter innlogging.",
 'newarticle' => '(Ny)',
-'newarticletext' => "'''{{SITENAME}} har ikkje noka side med namnet {{PAGENAME}} enno.'''
-* For å opprette ei slik side kan du skrive i boksen under og klikke på «Lagre». Endringane vil vere synlege med det same.
-* Om du er ny her er det tilrådd å sjå på [[{{MediaWiki:Helppage}}|hjelpesida]] først.
-* Om du lagrar ei testside, vil du ikkje kunne slette henne sjølv.
-* Dersom du ikkje ønskjer å endre sida, kan du utan risiko klikke på '''attende'''-knappen i nettlesaren din.",
+'newarticletext' => "Du har følgt ei lenkje til ei side som ikkje finst enno.
+For å opprette sida, kan du skrive i boksen under (sjå [[{{MediaWiki:Helppage}}|hjelpesida]] for meir informasjon).
+Dersom du ikkje ønskjer å opprette sida, kan du utan risiko klikke på '''attende'''-knappen i nettlesaren din.",
 'anontalkpagetext' => "----''Dette er ei diskusjonsside for ein anonym brukar som ikkje har oppretta konto eller ikkje har logga inn.
 Vi er difor nøydde til å bruke den numeriske IP-adressa til å identifisere brukaren. Same IP-adresse kan vere knytt til fleire brukarar. Om du er ein anonym brukar og meiner at du har fått irrelevante kommentarar på ei slik side, [[Special:UserLogin/signup|opprett ein brukarkonto]] eller [[Special:UserLogin|logg inn]] slik at vi unngår framtidige forvekslingar med andre anonyme brukarar.''",
 'noarticletext' => 'Det er nett no ikkje noko tekst på denne sida.
@@ -962,7 +960,6 @@ Det siste elementet i blokkeringsloggen er oppgjeve nedanfor:',
 * '''Firefox og Safari:''' Haldt nede ''Shift'' medan du klikkar på ''Oppdater'', eller trykk anten ''Ctrl-F5'' eller ''Ctrl-R'' (''⌘-R'' på Mac)
 * '''Google Chrome:''' Trykk ''Ctrl-Shift-R'' (''⌘-Shift-R'' på Mac)
 * '''Internet Explorer:''' Haldt nede ''Ctrl'' medan du klikkar ''Oppdater'', eller trykk ''Ctrl-F5.''
-* '''Konqueror:''' Klikk ''Oppdater'' eller trykk ''F5''. 
 * '''Opera:''' Tøm mellomlageret i ''Verktøy → Innstillingar''.",
 'usercssyoucanpreview' => "'''Tips:''' Bruk «{{int:showpreview}}»-knappen for å teste den nye CSS- eller JavaScript-koden din før du lagrar.",
 'userjsyoucanpreview' => "''Tips:''' Bruk «{{int:showpreview}}»-knappen for å teste den nye CSS- eller JavaScript-koden din før du lagrar.",
@@ -977,7 +974,7 @@ Det siste elementet i blokkeringsloggen er oppgjeve nedanfor:',
 'note' => "'''Merk:'''",
 'previewnote' => "'''Hugsa at dette berre er ei førehandsvising.'''
 Endringane dine er ikkje lagra enno!",
-'continue-editing' => 'Endra vidare',
+'continue-editing' => 'Gå til endringsområdet',
 'previewconflict' => 'Dette er ei førehandsvising av teksten i endringsboksen over, slik han vil sjå ut om du lagrar han',
 'session_fail_preview' => "'''Orsak! Endringa di kunne ikkje lagrast. Ver venleg og prøv ein gong til. Dersom det framleis ikkje går, prøv å logge deg ut og inn att.'''",
 'session_fail_preview_html' => "'''Beklagar! Endringa di kunne ikkje lagrast.'''
@@ -1347,7 +1344,7 @@ Ver merksam på at registra deira kan vera utdaterte.',
 
 # Preferences page
 'preferences' => 'Innstillingar',
-'mypreferences' => 'Innstillingane mine',
+'mypreferences' => 'Innstillingar',
 'prefs-edits' => 'Tal på endringar:',
 'prefsnologin' => 'Ikkje innlogga',
 'prefsnologintext' => 'Du må vere <span class="plainlinks">[{{fullurl:{{#Special:UserLogin}}|returnto=$1}} logga inn]</span> for å endre brukarinnstillingane.',
@@ -1577,6 +1574,9 @@ Dette kan ikkje tilbakestillast.',
 'rightslogtext' => 'Dette er ein logg over endringar av brukartilgang.',
 'rightslogentry' => 'endra brukartilgangen til $1 frå $2 til $3',
 'rightslogentry-autopromote' => '↓vart automatisk forfremja frå $2 til $3',
+'logentry-rights-rights' => '$1 endra gruppemedlemskap for $3 frå $4 til $5',
+'logentry-rights-rights-legacy' => '$1 endra gruppemedlemskap for $3',
+'logentry-rights-autopromote' => '$1 vart automatisk forfremja frå $4 til $5',
 'rightsnone' => '(ingen)',
 
 # Associated actions - in the sentence "You do not have permission to X"
@@ -1756,6 +1756,8 @@ Om du framleis ønskjer å laste opp fila, gå tilbake og last ho opp med eit an
 'php-uploaddisabledtext' => 'PHP-filopplasting er deaktivert. Sjå innstillinga for file_uploads.',
 'uploadscripted' => 'Fila inneheld HTML- eller skriptkode som feilaktig kan bli tolka og køyrd av nettlesarar.',
 'uploadvirus' => 'Fila innheld virus! Detaljar: $1',
+'uploadjava' => 'Fila er ei ZIP-fil som inneheld ei Java .class-fil.
+Opplasting av Java-filer er ikkje tillate av di dei kan gå utanom tryggingsavgrensingane.',
 'upload-source' => 'Kjeldefil',
 'sourcefilename' => 'Filsti:',
 'sourceurl' => 'Kjelde-URL:',
@@ -1822,7 +1824,9 @@ $1',
 'backend-fail-synced' => 'Fila «$1» er i ei inkonsistent stode i dei interne lagringsbaksystema',
 'backend-fail-connect' => 'Kunne ikkje kopla til filbaksystemet «$1».',
 'backend-fail-internal' => 'Ein ukjend feil oppstod i lagringsbaksystemet «$1».',
+'backend-fail-contenttype' => 'Kunne ikkje avgjera innhaldstypen til fila som skulle lagrast på «$1».',
 'backend-fail-batchsize' => 'Baksystemet vart gjeve ei gruppe med $1 {{PLURAL:$1|filoperasjon|filoperasjonar}}; grensa er $2 {{PLURAL:$2|operasjon|operasjonar}}.',
+'backend-fail-usable' => 'Kunne ikkje lesa eller skriva fila «$1» grunna vantande rettar eller mapper/kjerald.',
 
 # File journal errors
 'filejournal-fail-dbconnect' => 'Kunne ikkje kopla til journaldatabasen for lagringsbaksystemet «$1».',
@@ -1841,9 +1845,12 @@ $1',
 'lockmanager-fail-svr-release' => 'Kunne ikkje løysa låsane på tenaren $1.',
 
 # ZipDirectoryReader
+'zip-file-open-error' => 'Det oppstod ein feil under opninga av fila for ZIP-undersøking.',
 'zip-wrong-format' => 'Den oppgjevne fila var ikkje ei ZIP-fil',
 'zip-bad' => 'Fila er ei skadd eller på annan måte uleseleg ZIP-fil.
 Ho kan ikkje tryggingskontrollerast.',
+'zip-unsupported' => 'Fila er ei ZIP-fil son nyttar ZIP-funksjonar som ikkje er stødde av MediaWiki.
+Ho kan ikkje tryggingskontrollerast godt nok.',
 
 # Special:UploadStash
 'uploadstash' => 'Lasta opp løynd samling',
@@ -1853,12 +1860,13 @@ Ho kan ikkje tryggingskontrollerast.',
 'uploadstash-badtoken' => 'Utføringa av handlinga lukkast ikkje; kan henda av di endringsrettane dine har gått ut. Freista om att.',
 'uploadstash-errclear' => 'Fjerning av filene var mislykka.',
 'uploadstash-refresh' => 'Oppdater fillista',
+'invalid-chunk-offset' => 'Ugild delforskuving',
 
 # img_auth script messages
 'img-auth-accessdenied' => 'Tilgjenge avslått',
-'img-auth-nopathinfo' => 'PATH_INFO manglar.
-Filtenaren din er ikkje sett opp for å gje denne informasjonen.
-Han kan vera CGI-basert og stør ikkje img_auth.
+'img-auth-nopathinfo' => 'PATH_INFO saknar.
+Filtenaren din er ikkje sett opp for å gjeva denne informasjonen.
+Han kan vera CGI-basert og ikkje stø img_auth.
 Sjå https://www.mediawiki.org/wiki/Manual:Image_Authorization.',
 'img-auth-notindir' => 'Den ynskte filstien er ikkje i den oppsette opplastingskatalogen',
 'img-auth-badtitle' => 'Kan ikkje laga ein gyldig ttitel ut frå "$1".',
@@ -2181,7 +2189,9 @@ Sjå òg [[Special:WantedCategories|ønska kategoriar]].',
 'linksearch-pat' => 'Søkemønster:',
 'linksearch-ns' => 'Namnerom:',
 'linksearch-ok' => 'Søk',
-'linksearch-text' => 'Jokerteikn som «*.wikipedia.org» kan nyttast.<br />Støtta protokollar: <code>$1</code>',
+'linksearch-text' => 'Jokerteikn som «*.wikipedia.org» kan nyttast.
+Det er påkravt med eit toppnivådomene, til dømes «*.org».<br />
+Støtta protokollar: <code>$1</code> (nyttar http:// som standard om ingen protokoll er oppgjeven)',
 'linksearch-line' => '$2 lenkjer til $1',
 'linksearch-error' => 'Jokerteikn kan berre nyttast føre tenarnamnet.',
 
@@ -2229,7 +2239,7 @@ Sjå òg [[Special:WantedCategories|ønska kategoriar]].',
 '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 brukaren.
+'emailpagetext' => 'Du kan nytte skjemaet nedanfor til å sende ein e-post til denne {{GENDER:$1|brukaren}}.
 E-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.',
 'usermailererror' => 'E-post systemet gav feilmelding:',
 'defemailsubject' => '{{SITENAME}} epost frå brukar "$1"',
@@ -2261,7 +2271,7 @@ E-postadressa du har sett i [[Special:Preferences|innstillingane dine]] vil dukk
 
 # Watchlist
 'watchlist' => 'Overvakingsliste',
-'mywatchlist' => 'Overvakingslista mi',
+'mywatchlist' => 'Overvakingsliste',
 'watchlistfor2' => 'For $1 $2',
 'nowatchlist' => 'Du har ikkje noko i overvakingslista di.',
 'watchlistanontext' => 'Du lyt $1 for å vise eller endre sider på overvakingslista di.',
@@ -2313,25 +2323,28 @@ Om du seinare vil fjerne sida frå overvakingslista, klikk på «Fjern overvakin
 
 $NEWPAGE
 
-Bidragsytaren sitt endringssamandrag: $PAGESUMMARY $PAGEMINOREDIT
+Endringssamandraget var: $PAGESUMMARY $PAGEMINOREDIT
 
-Du kan kontakte bidragsytaren gjennom:
-e-post: $PAGEEDITOR_EMAIL , eller
+Kontakta brukaren:
+e-post: $PAGEEDITOR_EMAIL
 wiki: $PAGEEDITOR_WIKI
 
-Du får ikkje fleire endringsmeldingar om denne sida før du har vitja henne på nytt.
-Du kan også tilbakestille endringsmeldingsstatus for alle sidene på overvakingslista di.
+Du får ikkje fleire endringsvarsel minder du vitjar sida på nytt.
+Du kan dessutan nullstilla varselflagga for alle sidene på overvakingslista di.
 
-             Helsing det venlege {{SITENAME}}-meldingssystemet ditt
+Helsing det venlege meldingssystemet ditt for {{SITENAME}}
 
 --
-For å endre innstillingane for overvakingslista di, gå til
+For å endra innstillingane dine for e-postvarsling, vitja
+{{canonicalurl:{{#special:Preferences}}}}
+
+For å endra innstillingane for overvakingslista di, vitja
 {{canonicalurl:{{#special:EditWatchlist}}}}
 
-For hjelp og meir informasjon:
+For å fjerna sita frå overvakingslista di, vitja
 $UNWATCHURL
 
-Tilbakemeldingar og anna hjelp:
+Attendemelding og hjelp:
 {{canonicalurl:{{MediaWiki:Helppage}}}}',
 
 # Delete
@@ -2508,7 +2521,7 @@ $1',
 # Contributions
 'contributions' => 'Brukarbidrag',
 'contributions-title' => 'Bidrag av $1',
-'mycontris' => 'Eigne bidrag',
+'mycontris' => 'Bidrag',
 'contribsub2' => 'For $1 ($2)',
 'nocontribs' => 'Det vart ikkje funne nokon endringar gjorde av denne brukaren.',
 'uctop' => ' (øvst)',
@@ -2750,7 +2763,7 @@ I desse falla lyt du flytta eller fletta sida manuelt, om ynskeleg.",
 'delete_and_move' => 'Slett og flytt',
 'delete_and_move_text' => '== Sletting påkravd ==
 
-Målsida «[[:$1]]» finst alt. Vil du sletta henne for å gjeva rom for flytting?',
+Målsida «[[:$1]]» finst allereie. Vil du slette ho for å gje rom for flytting?',
 'delete_and_move_confirm' => 'Ja, slett sida',
 'delete_and_move_reason' => 'Sletta for å gje rom for flytting frå «[[$1]]»',
 'selfmove' => 'Kjelde- og måltitlane er like; kan ikkje flytte sida over seg sjølv.',
@@ -2759,6 +2772,7 @@ Målsida «[[:$1]]» finst alt. Vil du sletta henne for å gjeva rom for flyttin
 'immobile-target-namespace-iw' => 'Interwikilenkja er ikkje eit gyldig mål for flytting av sider.',
 'immobile-source-page' => 'Denne sida kan ikkje flyttast.',
 'immobile-target-page' => 'Kan ikkje flytte til det målnamnet.',
+'bad-target-model' => 'Det ynskte målet nyttar ein annan innhaldsmodell. Kan ikkje konvertera frå $1 til $2.',
 'imagenocrossnamespace' => 'Kan ikkje flytte bilete til andre namnerom enn biletnamnerommet',
 'nonfile-cannot-move-to-file' => 'Kan ikkje flytta ikkje-filer til filnamnerommet.',
 'imagetypemismatch' => 'Den nye filendinga høver ikkje til filtypen',
@@ -2888,6 +2902,7 @@ Vitja [//www.mediawiki.org/wiki/Localisation MediaWiki Localisation] og [//trans
 'javascripttest-pagetext-frameworks' => 'Vel eitt av dei fylgjande utrøyningsrammeverka: $1',
 'javascripttest-pagetext-skins' => 'Vel ei drakt som utrøyningane skal køyrast med:',
 'javascripttest-qunit-intro' => 'Sjå [$1 utrøyningsdokumentasjon] på mediawiki.org.',
+'javascripttest-qunit-heading' => 'MediaWiki JavaScript QUnit testsuite',
 
 # Tooltip help for the actions
 'tooltip-pt-userpage' => 'Brukarsida di',
@@ -3008,7 +3023,7 @@ Vitja [//www.mediawiki.org/wiki/Localisation MediaWiki Localisation] og [//trans
 
 # Info page
 'pageinfo-title' => 'Informasjon om «$1»',
-'pageinfo-not-current' => 'Informasjon vert berre vist for den gjeldande versjonen.',
+'pageinfo-not-current' => 'Orsak, det er umogeleg å gjeva denne informasjonen for gamle versjonar.',
 'pageinfo-header-basic' => 'Grunnleggjande informasjon',
 'pageinfo-header-edits' => 'Endringshistorikk',
 'pageinfo-header-restrictions' => 'Sidevern',
@@ -3017,6 +3032,7 @@ Vitja [//www.mediawiki.org/wiki/Localisation MediaWiki Localisation] og [//trans
 'pageinfo-default-sort' => 'Standard sorteringsnykel',
 'pageinfo-length' => 'Sidelengd (i byte)',
 'pageinfo-article-id' => 'Side-ID',
+'pageinfo-language' => 'Sideinnhaldsspråk',
 'pageinfo-robot-policy' => 'Søkjemotorstode',
 'pageinfo-robot-index' => 'Kan indekserast',
 'pageinfo-robot-noindex' => 'Kan ikkje indekserast',
@@ -3291,23 +3307,32 @@ Andre er gøymde som standard.
 'exif-source' => 'Kjelde',
 'exif-editstatus' => 'Den redaksjonelle stoda til biletet',
 'exif-urgency' => 'Prioritet',
+'exif-fixtureidentifier' => 'Namn på tidgjengt emne',
+'exif-locationdest' => 'Avbilda stad',
+'exif-locationdestcode' => 'Koden til staden som er avbilda',
 'exif-objectcycle' => 'Tid på dagen mediet er meint for',
 'exif-contact' => 'Kontaktinformasjon',
 'exif-writer' => 'Forfattar',
 'exif-languagecode' => 'Språk',
 'exif-iimversion' => 'IIM-versjon',
 'exif-iimcategory' => 'Kategori',
+'exif-iimsupplementalcategory' => 'Tilleggskategoriar',
 'exif-datetimeexpires' => 'Skal ikkje nyttast etter',
 'exif-datetimereleased' => 'Frigjeve',
+'exif-originaltransmissionref' => 'Opphavleg stadkode for overføring',
+'exif-identifier' => 'Kjennemerke',
 'exif-lens' => 'Objektiv',
 'exif-serialnumber' => 'Serienummeret på kameraet',
 'exif-cameraownername' => 'Eigar av kameraet',
 'exif-label' => 'Merkelapp',
+'exif-datetimemetadata' => 'Datoen metadata sist vart endra',
 'exif-nickname' => 'Det uformelle namnet på biletet',
 'exif-rating' => 'Vurdering (av 5)',
+'exif-rightscertificate' => 'Retthandsamingssertifikat',
 'exif-copyrighted' => 'Opphavsrettsstode',
 'exif-copyrightowner' => 'Opphavsrettseigar',
 'exif-usageterms' => 'Bruksvilkår',
+'exif-webstatement' => 'Opphavsrettsfråsegn på nett',
 'exif-originaldocumentid' => 'Unik ID til originaldokumentet',
 'exif-licenseurl' => 'URL for opphavsrettsløyve',
 'exif-morepermissionsurl' => 'Alternativ løyveinformasjon',
@@ -3499,8 +3524,10 @@ Andre er gøymde som standard.
 'exif-gpsdirection-m' => 'Magnetisk retning',
 
 'exif-ycbcrpositioning-1' => 'Sentrert',
+'exif-ycbcrpositioning-2' => 'Samanfallande',
 
 'exif-dc-contributor' => 'Bidragsytarar',
+'exif-dc-coverage' => 'Rom- eller tidssutstrekning til medium',
 'exif-dc-date' => 'Dato(ar)',
 'exif-dc-publisher' => 'Utgjevar',
 'exif-dc-relation' => 'Skylde medium',
@@ -3720,6 +3747,7 @@ Du kan òg [[Special:EditWatchlist|nytte standardverktøyet]].',
 'version-license' => 'Lisens',
 'version-poweredby-credits' => "Denne wikien er dreven av '''[//www.mediawiki.org/ MediaWiki]''', copyright © 2001-$1 $2.",
 'version-poweredby-others' => 'andre',
+'version-credits-summary' => 'Me ynskjer godskriva desse personane for tilskotet deira til [[Special:Version|MediaWiki]].',
 'version-software' => 'Installert programvare',
 'version-software-product' => 'Produkt',
 'version-software-version' => 'Versjon',
@@ -3731,9 +3759,8 @@ Du kan òg [[Special:EditWatchlist|nytte standardverktøyet]].',
 'filepath' => 'Filsti',
 'filepath-page' => 'Fil:',
 'filepath-submit' => 'GÃ¥',
-'filepath-summary' => 'Denne spesialsida gjev den fullstendige stien for ei fil. Bilete vert vist i oppløysing; andre filtypar vert starta direkte i dei tilknytte programma sine.
-
-Skriv inn filnamnet utan «{{ns:file}}:»-prefikset.',
+'filepath-summary' => 'Denne spesialsida svarar med den fullstendige stigen til ei fil.
+Bilete vert viste i full oppløysing, andre filtypar vert starta direkte i dei tilknytte programma sine.',
 
 # Special:FileDuplicateSearch
 'fileduplicatesearch' => 'Søk etter duplikatfiler',
@@ -3832,10 +3859,14 @@ Skriv inn filnamnet utan «{{ns:file}}:»-prefikset.',
 'logentry-delete-delete' => '$1 sletta sida $3',
 'logentry-delete-restore' => '$1 attoppretta sida $3',
 'logentry-delete-event' => '$1 endra synlegdomen av {{PLURAL:$5|éi loggoppføring|$5 loggoppføringar}} på $3: $4',
-'logentry-delete-revision' => '$1 endra synlegdomen av {{PLURAL:$5|éin versjon|$5 versjonar}} på sida $3: $4',
-'logentry-delete-event-legacy' => '$1 endra synlegdomen av loggoppføringar på $3',
-'logentry-delete-revision-legacy' => '$1 endra synlegdomen av versjonar på sida $3',
+'logentry-delete-revision' => '$1 endra synlegdomen til {{PLURAL:$5|éin versjon|$5 versjonar}} på sida $3: $4',
+'logentry-delete-event-legacy' => '$1 endra synlegdomen til loggoppføringar på $3',
+'logentry-delete-revision-legacy' => '$1 endra synlegdomen til versjonar på sida $3',
 'logentry-suppress-delete' => '$1 gøymde sida $3',
+'logentry-suppress-event' => '$1 endra i løyndom synlegdomen til {{PLURAL:$5|éi logghending|$5 logghendingar}} på $3: $4',
+'logentry-suppress-revision' => '$1 endra i løyndom synlegdomen til {{PLURAL:$5|éin versjon|$5 versjonar}} på sida $3: $4',
+'logentry-suppress-event-legacy' => '$1 endra i løyndom synlegdomen til logghendingar på $3',
+'logentry-suppress-revision-legacy' => '$1 endra i løyndom synlegdomen til versjonar på sida $3',
 'revdelete-content-hid' => 'innhald gøymt',
 'revdelete-summary-hid' => 'endringsamandrag gøymt',
 'revdelete-uname-hid' => 'brukarnamn gøymt',
diff --git a/languages/messages/MessagesOc.php b/languages/messages/MessagesOc.php
index d0b3ec7605..b29de6064f 100644
--- a/languages/messages/MessagesOc.php
+++ b/languages/messages/MessagesOc.php
@@ -153,7 +153,6 @@ $magicWords = array(
 	'forcetoc'                  => array( '0', '__FORÇARTAULA__', '__FORÇARSOMARI__', '__FORÇARTDM__', '__FORCETOC__' ),
 	'toc'                       => array( '0', '__TAULA__', '__SOMARI__', '__TDM__', '__TOC__' ),
 	'noeditsection'             => array( '0', '__SECCIONNONEDITABLA__', '__NOEDITSECTION__' ),
-	'noheader'                  => array( '0', '__PASCAPDENTÈSTA__', '__NOHEADER__' ),
 	'currentmonth'              => array( '1', 'MESCORRENT', 'MESACTUAL', 'CURRENTMONTH', 'CURRENTMONTH2' ),
 	'currentmonthname'          => array( '1', 'NOMMESCORRENT', 'NOMMESACTUAL', 'CURRENTMONTHNAME' ),
 	'currentmonthnamegen'       => array( '1', 'NOMGENMESCORRENT', 'NOMGENMESACTUAL', 'CURRENTMONTHNAMEGEN' ),
diff --git a/languages/messages/MessagesOr.php b/languages/messages/MessagesOr.php
index 89c91c413b..cd36ce121c 100644
--- a/languages/messages/MessagesOr.php
+++ b/languages/messages/MessagesOr.php
@@ -141,7 +141,6 @@ $specialPageAliases = array(
 	'Recentchanges'             => array( 'ନଗଦବଦଳ' ),
 	'Recentchangeslinked'       => array( 'ଜୋଡ଼ାଥିବାନଗଦବଦଳ', 'ପାଖାପାଖିବଦଳ' ),
 	'Revisiondelete'            => array( 'ସଙ୍କଳନଲିଭାଇଦିଅଦେବେ' ),
-	'RevisionMove'              => array( 'ସଙ୍କଳନ' ),
 	'Search'                    => array( 'ଖୋଜନ୍ତୁ' ),
 	'Shortpages'                => array( 'ଛୋଟପୃଷ୍ଠା' ),
 	'Specialpages'              => array( 'ବିଶେଷପୃଷ୍ଠା' ),
@@ -2557,7 +2556,7 @@ $1',
 'whatlinkshere-hideredirs' => '$1 କୁ ଲେଉଟାଣି',
 'whatlinkshere-hidetrans' => '$1 ଆଧାର ସହ ଭିତରେ ରଖିବା',
 'whatlinkshere-hidelinks' => '$1 ଟି ଲିଙ୍କ',
-'whatlinkshere-hideimages' => '$1 ଛବିର ଲିଙ୍କସବୁ',
+'whatlinkshere-hideimages' => '$1 ଫାଇଲର ଲିଙ୍କସବୁ',
 'whatlinkshere-filters' => 'ଛଣା',
 
 # Block/unblock
@@ -3016,6 +3015,8 @@ MediaWiki ବ୍ୟବହାର କରି [[Special:Import|ପୃଷ୍ଠା 
 'pageinfo-watchers' => 'ଦେଖଣାହାରି ସଂଖ୍ୟା',
 'pageinfo-edits' => 'ସମ୍ପାଦନା ସଂଖ୍ୟା',
 'pageinfo-authors' => 'ନିଆରା ଲେଖକଙ୍କ ସଂଖ୍ୟା',
+'pageinfo-contentpage-yes' => 'ହଁ',
+'pageinfo-protect-cascading-yes' => 'ହଁ',
 
 # Patrolling
 'markaspatrolleddiff' => 'ଜଗାଯାଇଅଛି ବୋଲି ଚିହ୍ନିତ କରାଗଲା',
diff --git a/languages/messages/MessagesOs.php b/languages/messages/MessagesOs.php
index 81c18a72ec..d9c6daf759 100644
--- a/languages/messages/MessagesOs.php
+++ b/languages/messages/MessagesOs.php
@@ -27,8 +27,8 @@ $namespaceNames = array(
 	NS_FILE_TALK        => 'Файлы_тæрхон',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'MediaWiki-йы_тæрхон',
-	NS_TEMPLATE         => 'Шаблон',
-	NS_TEMPLATE_TALK    => 'Шаблоны_тæрхон',
+	NS_TEMPLATE         => 'Хуызæг',
+	NS_TEMPLATE_TALK    => 'Хуызæджы_тæрхон',
 	NS_HELP             => 'Æххуыс',
 	NS_HELP_TALK        => 'Æххуысы_тæрхон',
 	NS_CATEGORY         => 'Категори',
@@ -44,6 +44,8 @@ $namespaceAliases = array(
 	'Нывы_тыххæй_дискусси'        => NS_FILE_TALK,
 	'Дискусси_MediaWiki'          => NS_MEDIAWIKI_TALK,
 	'Тæрхон_MediaWiki'            => NS_MEDIAWIKI_TALK,
+	'Шаблон'                      => NS_TEMPLATE,
+	'Шаблоны_тæрхон'              => NS_TEMPLATE_TALK,
 	'Шаблоны_тыххæй_дискусси'     => NS_TEMPLATE_TALK,
 	'Æххуысы_тыххæй_дискусси'     => NS_HELP_TALK,
 	'Категорийы_тыххæй_дискусси'  => NS_CATEGORY_TALK,
diff --git a/languages/messages/MessagesPa.php b/languages/messages/MessagesPa.php
index c5bd9e61bb..5a022f1db9 100644
--- a/languages/messages/MessagesPa.php
+++ b/languages/messages/MessagesPa.php
@@ -57,10 +57,58 @@ $namespaceAliases = array(
 );
 
 $specialPageAliases = array(
-	'Activeusers'               => array( 'ਸਰਗਰਮ_ਵਰਤੌਂਕਾਰ' ),
-	'Blankpage'                 => array( 'ਖਾਲੀ_ਸਫ਼ਾ' ),
-	'Block'                     => array( 'ਪਾਬੰਦੀ_ਲਾਉਣਾ', 'ਪਾਬੰਦੀ_ਸ਼ੁਦਾ_ਆਈ_ਪੀ', 'ਪਾਬੰਦੀ_ਸ਼ੁਦਾ_ਵਰਤੌਂਕਾਰ' ),
-	'Listusers'                 => array( 'ਵਰਤੌਂਕਾਰਾਂ_ਦੀ_ਸੂਚੀ' ),
+	'Activeusers'               => array( 'ਸਰਗਰਮ_ਮੈਂਬਰ' ),
+	'Badtitle'                  => array( 'ਖਰਾਬ_ਸਿਰਲੇਖ' ),
+	'Blankpage'                 => array( 'ਖਾਲੀ_ਪੰਨਾ' ),
+	'Block'                     => array( 'ਪਾਬੰਦੀ_ਲਾਓ', 'IP_’ਤੇ_ਪਾਬੰਦੀ_ਲਾਓ', 'ਮੈਂਬਰ_’ਤੇ_ਪਾਬੰਦੀ_ਲਾਓ' ),
+	'Categories'                => array( 'ਸ਼੍ਰੇਣੀਆਂ' ),
+	'ChangeEmail'               => array( 'ਈ-ਮੇਲ_ਬਦਲੋ' ),
+	'ChangePassword'            => array( 'ਪਾਸਵਰਡ_ਬਦਲੋ', 'ਪਾਸਵਰਡ_ਰੀਸੈੱਟ_ਕਰੋ' ),
+	'Contributions'             => array( 'ਯੋਗਦਾਨ' ),
+	'CreateAccount'             => array( 'ਖਾਤਾ_ਬਣਾਓ' ),
+	'DeletedContributions'      => array( 'ਮਿਟਾਏ_ਯੋਗਦਾਨ' ),
+	'DoubleRedirects'           => array( 'ਦੂਹਰੇ_ਰੀਡਿਰੈਕਟ' ),
+	'EditWatchlist'             => array( 'ਨਿਗਰਾਨੀ-ਲਿਸਟ_ਸੋਧੋ' ),
+	'Emailuser'                 => array( 'ਵਰਤੋਂਕਾਰ_ਨੂੰ_ਈ-ਮੇਲ' ),
+	'JavaScriptTest'            => array( 'ਜਾਵਾਸਕ੍ਰਿਪਟ_ਪਰਖ' ),
+	'Listadmins'                => array( 'ਐਡਮਿਨਾਂ_ਦੀ_ਸੂਚੀ' ),
+	'Listbots'                  => array( 'ਬੋਟਾਂ_ਦੀ_ਲਿਸਟ' ),
+	'Listfiles'                 => array( 'ਫ਼ਾਈਲਾਂ_ਦੀ_ਲਿਸਟ', 'ਤਸਵੀਰਾਂ_ਦੀ_ਲਿਸਟ' ),
+	'Listredirects'             => array( 'ਰੀਡਿਰੈਕਟਾਂ_ਦੀ_ਲਿਸਟ' ),
+	'Listusers'                 => array( 'ਵਰਤੋਂਕਾਰਾਂ_ਦੀ_ਲਿਸਟ' ),
+	'Longpages'                 => array( 'ਲੰਬੇ_ਸਫ਼ੇ' ),
+	'MergeHistory'              => array( 'ਰਲ਼ਾਉਣ_ਦਾ_ਅਤੀਤ' ),
+	'MIMEsearch'                => array( 'MIME_ਖੋਜ' ),
+	'Movepage'                  => array( 'ਸਿਰਲੇਖ_ਬਦਲੋ' ),
+	'Mycontributions'           => array( 'ਮੇਰੇ_ਯੋਗਦਾਨ' ),
+	'Mytalk'                    => array( 'ਮੇਰੀ_ਚਰਚਾ' ),
+	'Myuploads'                 => array( 'ਮੇਰੇ_ਅੱਪਲੋਡ' ),
+	'Newimages'                 => array( 'ਨਵੀਆਂ_ਫ਼ਾਈਲਾਂ', 'ਨਵੀਆਂ_ਤਸਵੀਰਾਂ' ),
+	'Newpages'                  => array( 'ਨਵੇਂ_ਪੰਨੇ' ),
+	'PasswordReset'             => array( 'ਪਾਸਵਰਡ_ਰੀਸੈੱਟ' ),
+	'PermanentLink'             => array( 'ਪੱਕਾ_ਲਿੰਕ' ),
+	'Popularpages'              => array( 'ਮਸ਼ਹੂਰ_ਪੰਨੇ' ),
+	'Preferences'               => array( 'ਪਸੰਦਾਂ' ),
+	'Prefixindex'               => array( 'ਅਗੇਤਰ_ਤਤਕਰਾ' ),
+	'Protectedpages'            => array( 'ਸੁਰੱਖਿਅਤ_ਪੰਨੇ' ),
+	'Protectedtitles'           => array( 'ਸੁਰੱਖਿਅਤ_ਸਿਰਲੇਖ' ),
+	'Randompage'                => array( 'ਰਲ਼ਵਾਂ', 'ਰਲਵਾਂ_ਪੰਨਾ' ),
+	'Randomredirect'            => array( 'ਰਲਵਾਂ_ਰੀਡਿਰੈਕਟ' ),
+	'Recentchanges'             => array( 'ਤਾਜਾ_ਤਬਦੀਲੀਆਂ' ),
+	'Search'                    => array( 'ਖੋਜ' ),
+	'Shortpages'                => array( 'ਛੋਟੇ_ਪੰਨੇ' ),
+	'Specialpages'              => array( 'ਖਾਸ_ਪੰਨੇ' ),
+	'Statistics'                => array( 'ਆਂਕੜੇ' ),
+	'Tags'                      => array( 'ਟੈਗ' ),
+	'Undelete'                  => array( 'ਅਣ-ਮਿਟਾਉਣ' ),
+	'Upload'                    => array( 'ਅੱਪਲੋਡ' ),
+	'Userlogin'                 => array( 'ਮੈਂਬਰ_ਲਾਗਇਨ' ),
+	'Userlogout'                => array( 'ਮੈਂਬਰ_ਲਾਗਆਊਟ' ),
+	'Wantedcategories'          => array( 'ਚਾਹੀਦੀਆਂ_ਸ਼੍ਰੇਣੀਆਂ' ),
+	'Wantedfiles'               => array( 'ਚਾਹੀਦੀਆਂ_ਫ਼ਾਈਲਾਂ' ),
+	'Wantedtemplates'           => array( 'ਚਾਹੀਦੇ_ਫਰਮੇ' ),
+	'Watchlist'                 => array( 'ਨਿਗਰਾਨੀ-ਲਿਸਟ' ),
+	'Withoutinterwiki'          => array( 'ਬਿਨਾਂ_ਇੰਟਰਵਿਕੀਆਂ_ਵਾਲੇ' ),
 );
 
 $digitTransformTable = array(
@@ -231,7 +279,6 @@ Manual:External_editors ਹੋਰ ਜਾਣਕਾਰੀ।])',
 'qbbrowse' => 'ਬਰਾਊਜ਼',
 'qbedit' => 'ਸੋਧ',
 'qbpageoptions' => 'ਇਹ ਸਫ਼ਾ',
-'qbpageinfo' => 'ਭਾਗ',
 'qbmyoptions' => 'ਮੇਰੇ ਸਫ਼ੇ',
 'qbspecialpages' => 'ਖ਼ਾਸ ਸਫ਼ਾ',
 'faq' => 'ਅਕਸਰ ਪੁੱਛੇ ਜਾਣ ਵਾਲ਼ੇ ਸਵਾਲ',
diff --git a/languages/messages/MessagesPcd.php b/languages/messages/MessagesPcd.php
index 7d5451b484..41a9597b89 100644
--- a/languages/messages/MessagesPcd.php
+++ b/languages/messages/MessagesPcd.php
@@ -38,10 +38,10 @@ $messages = array(
 'tog-enotifusertalkpages' => 'Éspédier un imèle su em bouéte quante m\'pache "Dvise Uzeu" est candgée.',
 'tog-enotifminoredits' => "M'éspédier étou un imèle pou chés tiots canjemints d'chés paches o d'chés fichiés",
 'tog-shownumberswatching' => "Aficher ch'nombe ed gins qu'ont vu.",
-'tog-watchlisthideown' => 'Muche mes édites dseur el lisse',
-'tog-watchlisthidebots' => 'Muche ches robots édites su el lisse',
-'tog-watchlisthideminor' => 'Muche ches tiots édites su el lisse.',
-'tog-watchlisthideliu' => 'Muche ches édites ed ches lodjés gins su el lisse.',
+'tog-watchlisthideown' => 'Muche ems édicions dseur el lisse à suire',
+'tog-watchlisthidebots' => 'Muche chés édicions des robots su el lisse à suire',
+'tog-watchlisthideminor' => 'Muche chés tiotes édicions su el lisse à suire.',
+'tog-watchlisthideliu' => 'Muche chés édicions ed ches lodjés gins su el lisse.',
 'tog-watchlisthideanons' => 'Muche ches édites ed ches gins annonimes su el lisse.',
 'tog-watchlisthidepatrolled' => 'Muche ches édites pormenés su el lisse.',
 'tog-ccmeonemails' => "Éspédier din m'bouéte ches copies ed ches imèles éq j'éspédie à ches autes uzeus",
@@ -121,6 +121,7 @@ $messages = array(
 'category-file-count' => "{{PLURAL:$2|Chol catégorie o seulemint chol fichié-lo.|{{PLURAL:$1|Ech fichier-lo est|$1 Chés fichiés-lo sont}} din l'catégorie-lo, pou un total éd $2 fichiés.}}",
 'category-file-count-limited' => "{{PLURAL:$1|Ech fichié d'apré est|Chés $1 fichiés d'apré sont}} dins l'catégorie-lo.",
 'listingcontinuesabbrev' => 'cont.',
+'noindex-category' => 'Paches nin indécsées',
 'broken-file-category' => "Paches aveuc des loïens d'fichiés bérzillés",
 
 'about' => 'À pérpos',
@@ -128,8 +129,8 @@ $messages = array(
 'newwindow' => '(ouvrir din eune nouvèle fernéte)',
 'cancel' => 'Canchler',
 'moredotdotdot' => 'Plu...',
-'mypage' => 'Em pache',
-'mytalk' => 'Mi bavouér',
+'mypage' => 'Pache',
+'mytalk' => 'Min bavouér',
 'anontalk' => "Bavouér pou chl'IP-lo",
 'navigation' => 'Navigachon',
 'and' => '&#32;pi',
@@ -330,6 +331,7 @@ Si s'n'est poin ch'cas-lo, pététe éq ch'est un bogue din ch'businkillache. <b
 'createaccount' => 'Créer un conpte',
 'gotaccount' => "Jou qu'os avez piécha un conpte? '''$1'''.",
 'gotaccountlink' => 'Intrer',
+'userlogin-resetlink' => "Vos avez oblié vous détals d'connécsion ?",
 'createaccountmail' => 'par imèle',
 'badretype' => "Chés mots d'passe intrés, is sont poin bon.",
 'userexists' => "Nom d’utilisateur entré déjà utilisé.
@@ -394,6 +396,10 @@ Si vos ètes ichi par bérlure, bukez su l'bouton '''értour''' du navigateu.",
 Os povez [[Special:Search/{{PAGENAME}}|foaire eune érchérche du tite del pache]] din chés eutes paches,
 <span class="plainlinks">[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} érchércher din chés érliées opéracions]
 ou [{{fullurl:{{FULLPAGENAME}}|action=edit}} créer chol pache]</span>.',
+'noarticletext-nopermission' => "Achteure i n’y o autchun teske dseur l'pache-lo.
+Os povez [[Special:Search/{{PAGENAME}}|foaire eune érchérche du tite del pache]] din chés eutes paches,
+o bin <span class=\"plainlinks\">[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} érchércher din chés érliées gazètes]</span>
+mais vos n'avez poin l'droué d'créer chol pache.",
 'previewnote' => "'''Afute! ch'teske-lo ch'est seulemint eune prévue.'''
 
 Vos cangemints, is sont poin coèr inrégistrés!",
@@ -408,10 +414,16 @@ Os prométtez auchi éq vos avez écrit ch'teske vous-méme, ou éq vos l’avez
 'template-semiprotected' => '(semi-garanti)',
 'hiddencategories' => '{{PLURAL:$1|Catégorie muchée|Catégories muchées}} pou chol pache:',
 'permissionserrorstext-withaction' => "Vos n’avez poin l'pérmichon éd $2, pou {{PLURAL:$1|ch'motif suivant|chés motifs suivants}}:",
+'recreate-moveddeleted-warn' => "'''Afute ! : Os ètes in route à ércréer eune pache qu'o té abolie édvant.'''
+
+Controler qu'ch'est pértinint d' porsuire chés modificacions édseur chol pache. L'jornal des défacions pi des déplachemints l'est affiké chi-édsous :",
+'moveddeleted-notice' => "Chol pache ale o té abolie. L'jornal des défacions pi des déplachemints il est affiké chi-édsous pour référinche.",
 
 # Parser/template warnings
 'post-expand-template-inclusion-warning' => "Affute : Chèle pache ale a trop d’modèles. Des inclusions n'sront poin foaites.",
 'post-expand-template-inclusion-category' => "Paches aveuc granmint d'modèles",
+'post-expand-template-argument-warning' => "Afute : Chol pache ale o au moins un paramète d'modèle dont l'inclusion est rindue impossibe. Apré éstinsion, chti-chi il éroait produit un résultat trop long, i n'a donc poin té inclus.",
+'post-expand-template-argument-category' => "Paches aveuc des paramètes d'modèle mie évalués",
 
 # History pages
 'viewpagelogs' => 'Vir chés gasètes del pache-lo',
@@ -428,9 +440,13 @@ Os prométtez auchi éq vos avez écrit ch'teske vous-méme, ou éq vos l’avez
 'histlegend' => "Diff séléccion: buke chés boétes d'chés canjemints à comparète pi détriquer intrer ou ch'bouton édsou.<br />
 Léginde : ({{MediaWiki:Cur}}) = différinches aveuc el vérchon à ch'momint-chi, ({{MediaWiki:Last}}) = différinches aveuc el vérchon édvant, <b>m</b> = tiot canjemint.",
 'history-fieldset-title' => "S'déplacher din l'historique",
+'history-show-deleted' => 'Défacés seulemint',
 'histfirst' => 'preumières paches',
 'histlast' => 'Darin',
 
+# Revision feed
+'history-feed-item-nocomment' => '$1 à $2',
+
 # Revision deletion
 'rev-delundel' => 'montrer/mucher',
 'revdel-restore' => 'cange écmint vir',
@@ -442,10 +458,11 @@ Léginde : ({{MediaWiki:Cur}}) = différinches aveuc el vérchon à ch'momint-ch
 'revertmerge' => "N'poin mélinger",
 
 # Diffs
-'history-title' => 'Histoère des cangemints éd "$1"',
+'history-title' => 'Historike des canjemints éd "$1"',
 'lineno' => 'Line $1:',
 'compareselectedversions' => 'Compérer chés couésies contérbuchons',
 'editundo' => "n'poin foaire",
+'diff-multi' => '({{PLURAL:$1|Un canjemint intarmédiaire|$1 canjemints intarmédiaires}} par {{PLURAL:$2|un uzeu|$2 uzeus}} {{PLURAL:$1|est muché|sont muchées}})',
 
 # Search results
 'searchresults' => 'Tracher chés résultats',
@@ -459,7 +476,10 @@ Léginde : ({{MediaWiki:Cur}}) = différinches aveuc el vérchon à ch'momint-ch
 'prevn' => 'dvant {{PLURAL:$1|$1}}',
 'nextn' => 'apreu {{PLURAL:$1|$1}}',
 'prevn-title' => 'Dvant $1 {{PLURAL:$1|résultat|résultats}}',
+'nextn-title' => "$1 {{PLURAL:$1|résultat d'apré|résultats d'apré}}",
+'shown-title' => 'Montrer $1 résultat{{PLURAL:$1||s}} pèr pache',
 'viewprevnext' => 'Vir ($1 {{int:pipe-separator}} $2) ($3)',
+'searchmenu-exists' => "'''Il y o eune pache lonmée « [[:$1]] » édseur ch'wiki'''",
 'searchmenu-new' => "'''Créer l'pache « [[:$1|$1]] » édseur ech wiki !'''",
 'searchprofile-articles' => "Paches d'étnu",
 'searchprofile-project' => "Paches d’aïude et pi d'prodjé",
@@ -472,13 +492,16 @@ Léginde : ({{MediaWiki:Cur}}) = différinches aveuc el vérchon à ch'momint-ch
 'searchprofile-everything-tooltip' => "Tracher dins tout ch'wikipédia (et ochi dins chés paches éd distchucion)",
 'searchprofile-advanced-tooltip' => "Couésir chés éspaches d'noms pour l'értrache",
 'search-result-size' => '$1 ({{PLURAL:$2|1 mot|$2 mots}})',
+'search-result-category-size' => '$1 mimbe{{PLURAL:$1||s}} ($2 édsous-catégorie{{PLURAL:$2||s}}, $3 fichié{{PLURAL:$3||s}})',
 'search-redirect' => '(érdirection $1)',
 'search-section' => '(sekchon $1)',
 'search-suggest' => 'Cha vo ti dire: $1',
 'search-interwiki-caption' => 'Proujé analocq',
 'search-interwiki-default' => '$1 résultats:',
 'search-interwiki-more' => '(pus)',
+'searchrelated' => 'relaté',
 'searchall' => 'tout',
+'showingresultsheader' => "{{PLURAL:$5|Résultat '''$1'''|Résultats '''$1–$2'''}} éd '''$3''' pour '''$4'''",
 'nonefound' => "'''Note''': il y o tasseulemint quéques éspaces éd noms éq sont trachés pèr défeut. <br /> Pou tracher din tous chés contnus (paches éd pérlache, modéles, etc... comprins) insséyer in imploéyant ch'préfixe ''all:'' o bin imploéyer echl éspace éd noms édmindé conme préfixe.",
 'search-nonefound' => 'Y a autchun résultat pour chol dmanne.',
 'powersearch' => 'Érvue avanchée',
@@ -502,6 +525,8 @@ Ale doét mie éte pu longue éq $1 {{PLURAL:$1|caracter|caractéres}}.',
 'gender-male' => 'Marle',
 'gender-female' => 'Femelle',
 'email' => 'Imèle',
+'prefs-help-email' => "L’adrèche du courrièl est facultative, mais ale est nécessaire pour artreuver vote mot d'passe, si vos vnoète à l’oblier.",
+'prefs-help-email-others' => "Os pouvez auchi couésir d'laicher les eutes vos contacter par imèle aveuc un loïen édseur vote pache éd distchussion d'uzeu sans qu'i soèche nécessaire ed révéler vote idintité.",
 'prefs-help-email-required' => 'I feut eune iméle adérche',
 
 # User rights
@@ -550,12 +575,18 @@ Ale doét mie éte pu longue éq $1 {{PLURAL:$1|caracter|caractéres}}.',
 'recentchanges' => 'Darins canjemints',
 'recentchanges-legend' => 'Opchons éd chés nouvieus canjemints',
 'recentchanges-feed-description' => 'Tracher chés pus darins cangemints du wiki din chol alimintachon.',
+'recentchanges-label-newpage' => 'Chol modificacion ale o créé eune nouvèle pache',
+'recentchanges-label-minor' => "C'est un tiot canjemint",
+'recentchanges-label-bot' => 'Chol modificacion ale o té foaite pèr un robot.',
+'recentchanges-label-unpatrolled' => 'Chol modificacion ale n’o poin coèr té controlée.',
 'rcnote' => "Vlo {{PLURAL:$1|ech darin canjemint foait|chés $1 darins canjemints foaits}} din {{PLURAL:$2|l'darinne jornèe|chés <b>$2</b> darins jours}} dusque  l' $4 à $5.",
+'rcnotefrom' => "Vlo chés modificacions foaites édpuis l' '''$2''' (dousqu'à '''$1''' au plus).",
 'rclistfrom' => "Montrer chés nouvieus cangemints d'puis $1",
 'rcshowhideminor' => '$1 tiotes éditions',
 'rcshowhidebots' => '$1 bots',
 'rcshowhideliu' => '$1 lodjés uzeus',
 'rcshowhideanons' => '$1 uzeus anonimes',
+'rcshowhidepatr' => '$1 chés modificacions wardées',
 'rcshowhidemine' => '$1 ems éditions',
 'rclinks' => 'Afiqher chés $1 darins canjemints din chés $2 darins jours<br />$3',
 'diff' => 'dif',
@@ -570,7 +601,9 @@ Ale doét mie éte pu longue éq $1 {{PLURAL:$1|caracter|caractéres}}.',
 
 # Recent changes linked
 'recentchangeslinked' => 'Darins canjemints érliés',
+'recentchangeslinked-toolbox' => 'Suivi des paches loïées',
 'recentchangeslinked-title' => 'Cangemints à pérpos éd "$1"',
+'recentchangeslinked-noresult' => "I n’y a poin d' modificacion des paches loïées pindant l'période couésie.",
 'recentchangeslinked-summary' => "Ch'est eune lisse d'chés darins canjemints su chés paches qu'ont un loïen aveuc l'pache-lo. Chés paches din vote [[Special:Watchlist|''lisse à suire'']] il sont in '''cros'''.",
 'recentchangeslinked-page' => 'Nom del pache:',
 'recentchangeslinked-to' => "Vir putot chés canjemints d'chés paches aveuc un loïen su l'pache-lo",
@@ -578,8 +611,12 @@ Ale doét mie éte pu longue éq $1 {{PLURAL:$1|caracter|caractéres}}.',
 # Upload
 'upload' => 'Quértcher chés fichiés',
 'uploadlogpage' => 'Jornal éd chés quértchémints',
+'filedesc' => 'Résumè',
 'uploadedimage' => '"[[$1]]" quértchée',
 
+'license' => 'Licince',
+'license-header' => 'Licince',
+
 # File description page
 'file-anchor-link' => 'Fichié',
 'filehist' => 'Histoère dech fichié',
@@ -594,6 +631,7 @@ Ale doét mie éte pu longue éq $1 {{PLURAL:$1|caracter|caractéres}}.',
 'filehist-comment' => 'Fichié éd chés conmints',
 'imagelinks' => 'Usage dech fichié',
 'linkstoimage' => "{{PLURAL:$1|L'pache d'apreu est liée|Chés $1 paches d'apreu sont liées}} à ch'fichié-lo :",
+'nolinkstoimage' => "Autchune pache n'est loïée aveuc ch'fichié-lo",
 'sharedupload' => "Cht'fichié vient éd $1 pi i put ète imploïé par d'eutes proujés.",
 'sharedupload-desc-here' => "Ch'fichié i vient éd $1. I put ète uzer pèr d’eutes prodjés.
 Vir apré ([$2 pache]).",
@@ -605,6 +643,8 @@ Vir apré ([$2 pache]).",
 # Statistics
 'statistics' => 'Éstatistikes',
 
+'disambiguationspage' => 'Template:Omonymie',
+
 # Miscellaneous special pages
 'nbytes' => '$1 {{PLURAL:$1|octé|octés}}',
 'nmembers' => '$1 {{PLURAL:$1|mimbe|mimbes}}',
@@ -638,8 +678,12 @@ Vir apré ([$2 pache]).",
 'allpagessubmit' => 'Aler',
 'allpagesprefix' => "Foaire vir chés paches aveuc ch'préfix:",
 
+# Special:Categories
+'categories' => 'Lisse des catégories',
+
 # Special:LinkSearch
 'linksearch' => 'Loïens éstérieurs',
+'linksearch-line' => '$1 est loïé édpuis $2',
 
 # Special:Log/newusers
 'newuserlogpage' => "Jornal éd chés créachons d'comptes d'uzeu",
@@ -672,6 +716,7 @@ Vir apré ([$2 pache]).",
 'deletepage' => "Défacer l'pache",
 'confirmdeletetext' => "Vos alez défacer eune pache ou un fichié aveuc toutes chés antieusses vérchons.<br /> Confreumer éq ch'est cho éq vos voulez foaire, éq vos conprindez chés consécanches et pi éq ch'est bin s'lon el [[{{MediaWiki:Policy-url}}|politique éd MédiaWiki]].",
 'actioncomplete' => 'Plònne acchon',
+'actionfailed' => "L’action n'a poin réussi",
 'deletedtext' => "« $1 » o té défacé.
 Vir $2 pou eune lisse d'chés darinnes défachons.",
 'dellogpage' => 'jornal éd chés défacions',
@@ -724,7 +769,7 @@ Vlo chés réglages del pache '''$1''' à ch'momint-chi:",
 # Contributions
 'contributions' => 'Contérbuchons dechl uzeu',
 'contributions-title' => 'Contérbuchons dechl uzeu à pérpos éd $1',
-'mycontris' => 'Ems contérbuchons',
+'mycontris' => 'Mes contérbuchons',
 'contribsub2' => 'Pou $1 ($2)',
 'uctop' => '(darin)',
 'month' => "Dpuis ch'moés (pi édvant)",
@@ -732,6 +777,7 @@ Vlo chés réglages del pache '''$1''' à ch'momint-chi:",
 
 'sp-contributions-newbies' => 'Montrer chés contérbuchons éd chés nouvieus conptes seulemint',
 'sp-contributions-blocklog' => 'jornal éd chés blotcåjhes',
+'sp-contributions-uploads' => "téléquértch'mints",
 'sp-contributions-logs' => 'Gasètes',
 'sp-contributions-talk' => 'Dviser',
 'sp-contributions-search' => 'Tracher pou chés contérbuchons',
@@ -748,7 +794,7 @@ Vlo chés réglages del pache '''$1''' à ch'momint-chi:",
 'nolinkshere-ns' => "i n'y o poin d'pache aveuc un loïen vers '''[[:$1]]''' dins echl'éspace d'noms coési.",
 'isredirect' => 'pache érdirigée',
 'istemplate' => 'transclusion',
-'isimage' => "Loïen aveuc l'imache",
+'isimage' => "Loïen aveuc l'fichié",
 'whatlinkshere-prev' => '{{PLURAL:$1|édvant|édvants $1}}',
 'whatlinkshere-next' => "{{PLURAL:$1|d'apreu|d'apreu $1}}",
 'whatlinkshere-links' => '← loïens',
@@ -808,9 +854,11 @@ Din chés cas-lo, I feut érlonmer ou ratatouiller l'pache aveuc l'main.",
 
 # Namespace 8 related
 'allmessagesname' => 'Nom',
+'allmessagesdefault' => 'Messache pèr défeut',
 
 # Thumbnails
 'thumbnail-more' => 'Pu grand',
+'thumbnail_error' => "Bérlurage tandir l'créachon éd la miniature : $1",
 
 # Tooltip help for the actions
 'tooltip-pt-userpage' => 'Vote pache éd uzeu',
@@ -930,6 +978,9 @@ Chés eutes cans is s'ront muchés pèr défeut.
 'watchlisttools-edit' => "Vir pi éditer l'lisse à suire",
 'watchlisttools-raw' => 'Éditer eune brute lisse à suire',
 
+# Core parser functions
+'duplicate-defaultsort' => "Afute : él cleu d'tri pèr défeut « $2 » écrase l'précédinte « $1 ».",
+
 # Special:Version
 'version-specialpages' => 'Paches éspéchiales',
 
@@ -944,6 +995,19 @@ Chés eutes cans is s'ront muchés pèr défeut.
 # Special:BlankPage
 'blankpage' => 'Blanke pache',
 
+# External image whitelist
+'external_image_whitelist' => " #Laicher chol line egzactemint telle quelle.<pre>
+#Dire chés bérlukes d’éspressions rationnelles (juste l'partie désignée inte chés //) chi-édsous.
+#I correspondront aveuc chés URL des images éstérnes.
+#Chelles qui corresponde'te s’affikeront conme des images, sinon seul un loïen vers l’image i s'ra affiké.
+#Les lines conmençant par un # s'ront considérées conme des conmintaires.
+#Chol lisse n’est mie sensibe à la casse.
+
+#Mettez tous chés bérlukes d’éspressions rationnelles au-d'sus éd chol line. Laichez chol darin.ne line telle quelle.</pre>",
+
+# Special:Tags
+'tag-filter' => 'Filtrer chés [[Special:Tags|balises]] :',
+
 # Special:ComparePages
 'compare-page1' => 'Pache 1',
 'compare-page2' => 'Pache 2',
diff --git a/languages/messages/MessagesPdc.php b/languages/messages/MessagesPdc.php
index 7943edb4f3..74e293cc99 100644
--- a/languages/messages/MessagesPdc.php
+++ b/languages/messages/MessagesPdc.php
@@ -138,7 +138,7 @@ $messages = array(
 'cancel' => 'Zerick',
 'moredotdotdot' => 'Mehner…',
 'mypage' => 'Mei Blatt',
-'mytalk' => 'Mei Gschwetz-Blatt',
+'mytalk' => 'Mei Dischbedutt',
 'anontalk' => 'Gschwetz-Blatt fer die IP',
 'navigation' => 'Faahre-Gnepp',
 'and' => '&#32;unn',
@@ -147,7 +147,6 @@ $messages = array(
 'qbfind' => 'Finne',
 'qbedit' => 'Ennere',
 'qbpageoptions' => 'Des Blatt',
-'qbpageinfo' => 'Daade vun dem Blatt',
 'qbmyoptions' => 'Mei Bledder',
 'qbspecialpages' => 'Besunnere Bledder',
 'faq' => 'FAQ',
@@ -188,7 +187,7 @@ $messages = array(
 'protectthispage' => 'Des Blatt schitze',
 'newpage' => 'Neies Blatt',
 'talkpage' => 'Sell Blatt dischbediere',
-'talkpagelinktext' => 'Gschwetz',
+'talkpagelinktext' => 'Dischbedutt',
 'specialpage' => 'Besunneres Blatt',
 'personaltools' => 'Paerseenlich Gscharr',
 'articlepage' => 'Inhalt vun dem Blatt aagucke',
@@ -426,7 +425,7 @@ Paesswatt fer nau: $2',
 
 # Preferences page
 'preferences' => 'Paerseenlich Profil',
-'mypreferences' => 'Mei Uffschtelling',
+'mypreferences' => 'Uffschtellinge',
 'changepassword' => 'Paesswatt ennere',
 'skin-preview' => 'Aagucke',
 'prefs-personal' => 'Yuuser Profile',
@@ -692,7 +691,7 @@ Paesswatt fer nau: $2',
 
 # Watchlist
 'watchlist' => 'Mei Watsch-Lischt',
-'mywatchlist' => 'Mei Watsch-Lischt',
+'mywatchlist' => 'Watsch-Lischt',
 'watchlistfor2' => 'Vun $1 $2',
 'watch' => 'watsche',
 'watchthispage' => 'watsch des Blatt',
@@ -765,7 +764,7 @@ Guck $2 fer e Lischt vun de letscht Leschunge.',
 'month' => 'unn Munet:',
 'year' => 'bis Yaahr:',
 
-'sp-contributions-talk' => 'Gschwetz',
+'sp-contributions-talk' => 'Dischbedutt',
 'sp-contributions-search' => 'Guck fer Ardickel',
 'sp-contributions-username' => 'IP-Adress odder Yuusernaame:',
 'sp-contributions-submit' => 'Guck uff',
diff --git a/languages/messages/MessagesPfl.php b/languages/messages/MessagesPfl.php
index 8fd03510cf..77d482307a 100644
--- a/languages/messages/MessagesPfl.php
+++ b/languages/messages/MessagesPfl.php
@@ -129,7 +129,7 @@ $messages = array(
 'otherlanguages' => 'In annere Sproche',
 'redirectedfrom' => '(Wairrerglaidet vun $1)',
 'redirectpagesub' => 'Wairerlaidungssaid',
-'lastmodifiedat' => 'Die Said isch zum ledschde Mol gänneret woore am $1, am $2.',
+'lastmodifiedat' => 'Die Said isch zum ledschde Mol gänneret worre am $1, am $2.',
 'viewcount' => 'Die Seid isch bis jetzerd {{PLURAL:$1|$1|$1}} mol uffgerufe worre.',
 'jumpto' => 'Spring zu:',
 'jumptonavigation' => 'Navigation',
@@ -187,7 +187,7 @@ $messages = array(
 # General errors
 'missing-article' => 'De Text fer „$1“ $2 isch in de Datebank nit gfunne worre.
 
-Normalerwais hääßt des, dass die Said glescht woore isch.
+Normalerwais hääßt des, dass die Said gleschd worre isch.
 
 Wenn s des nit isch, hoscht villaicht en Fehler in de Datebank gfunne.
 Bitte meld des an e [[Special:ListUsers/sysop|Adminischtrator]], un gebb d URL dezu aa.',
@@ -260,7 +260,7 @@ du gebbscht do au zu, dass Du des selwerscht gschriwwe hoscht orrer vun ere effe
 'template-semiprotected' => '(halb-gschitzt)',
 'hiddencategories' => 'Die Said ghert zu {{PLURAL:$1|1 versteckelte Kategorie|$1 versteckelte Kategorie}}:',
 'permissionserrorstext-withaction' => 'Du därfscht nid $2, aus {{PLURAL:$1|dem Grund|denne Grind}}:',
-'moveddeleted-notice' => 'Die Said isch glescht worre.
+'moveddeleted-notice' => 'Die Said isch gleschd worre.
 De Leschaidrach fa die Said isch do unne als Kwell aagewwe.',
 
 # History pages
@@ -357,7 +357,7 @@ Erklärung: '''({{int:cur}})''' = Unnerschied zu jetzert,
 
 # Recent changes
 'nchanges' => '$1 {{PLURAL:$1|Ännerung|Ännerunge}}',
-'recentchanges' => 'Was zuletschd gemacht worre isch',
+'recentchanges' => 'Was zuletschd gemachd worre isch',
 'recentchanges-legend' => 'Optione vun de Aazaich',
 'recentchanges-feed-description' => 'Di letschte Ännerunge vun {{SITENAME}} in des Feed aigewwe.',
 'rcnote' => "Aagezaicht {{PLURAL:$1|werd '''1''' Ännerung|werre die letschte '''$1''' Ännerunge}} {{PLURAL:$2|vum letschte Dach|in de letschte '''$2''' Dache}} (Stand: $4, $5)",
@@ -681,7 +681,7 @@ Du kannscht awwer de Quelltext aagucke',
 'tooltip-n-randompage' => 'E zufälliche Said lade',
 'tooltip-n-help' => 'De Ort zum rausfinne',
 'tooltip-t-whatlinkshere' => 'Lischt vun alle Wikisaide, wu do her verlinkt sinn',
-'tooltip-t-recentchangeslinked' => 'Letschte Ännerunge in Saide, wu vun do verlinkt sin',
+'tooltip-t-recentchangeslinked' => 'Letschde Ännerunge in Saide, wu vun do verlinkt sin',
 'tooltip-feed-rss' => 'RSS feed fer die Said',
 'tooltip-feed-atom' => 'Atom feed fer die Said',
 'tooltip-t-contributions' => 'Die letschte Baidräch vun däm Benutzer aagucke',
diff --git a/languages/messages/MessagesPl.php b/languages/messages/MessagesPl.php
index 31ea8bf7bf..5aff86f809 100644
--- a/languages/messages/MessagesPl.php
+++ b/languages/messages/MessagesPl.php
@@ -150,6 +150,7 @@ $specialPageAliases = array(
 	'MIMEsearch'                => array( 'Wyszukiwanie_MIME' ),
 	'Mostcategories'            => array( 'Najwięcej_kategorii' ),
 	'Mostimages'                => array( 'Najczęściej_linkowane_pliki' ),
+	'Mostinterwikis'            => array( 'Najwięcej_interwiki' ),
 	'Mostlinked'                => array( 'Najczęściej_linkowane' ),
 	'Mostlinkedcategories'      => array( 'Najczęściej_linkowane_kategorie' ),
 	'Mostlinkedtemplates'       => array( 'Najczęściej_linkowane_szablony' ),
@@ -171,9 +172,8 @@ $specialPageAliases = array(
 	'Randompage'                => array( 'Losowa_strona', 'Losowa' ),
 	'Randomredirect'            => array( 'Losowe_przekierowanie' ),
 	'Recentchanges'             => array( 'Ostatnie_zmiany', 'OZ' ),
-	'Recentchangeslinked'       => array( 'Zmiany_w_linkujących' ),
+	'Recentchangeslinked'       => array( 'Zmiany_w_linkowanych', 'Zmiany_w_linkujących' ),
 	'Revisiondelete'            => array( 'Usuń_wersję' ),
-	'RevisionMove'              => array( 'Przenoszenie_wersji' ),
 	'Search'                    => array( 'Szukaj' ),
 	'Shortpages'                => array( 'Najkrótsze_strony' ),
 	'Specialpages'              => array( 'Strony_specjalne' ),
@@ -212,7 +212,6 @@ $magicWords = array(
 	'forcetoc'                  => array( '0', '__ZESPISEM__', '__FORCETOC__' ),
 	'toc'                       => array( '0', '__SPIS__', '__TOC__' ),
 	'noeditsection'             => array( '0', '__BEZEDYCJISEKCJI__', '__NOEDITSECTION__' ),
-	'noheader'                  => array( '0', '__BEZNAGŁÓWKA__', '__NOHEADER__' ),
 	'currentday'                => array( '1', 'AKTUALNYDZIEŃ', 'CURRENTDAY' ),
 	'currentdayname'            => array( '1', 'NAZWADNIA', 'CURRENTDAYNAME' ),
 	'currentyear'               => array( '1', 'AKTUALNYROK', 'CURRENTYEAR' ),
@@ -427,8 +426,8 @@ $messages = array(
 'newwindow' => '(otwiera się w nowym oknie)',
 'cancel' => 'Anuluj',
 'moredotdotdot' => 'Więcej...',
-'mypage' => 'Moja strona',
-'mytalk' => 'Moja dyskusja',
+'mypage' => 'Strona',
+'mytalk' => 'Dyskusja',
 'anontalk' => 'Dyskusja tego IP',
 'navigation' => 'Nawigacja',
 'and' => '&#32;oraz',
@@ -990,7 +989,7 @@ Strony użytkownika zawierające CSS i JavaScript powinny zaczynać się małą
 'note' => "'''Uwaga:'''",
 'previewnote' => "'''To jest tylko podgląd'''
 Zmiany nie zostały jeszcze zapisane!",
-'continue-editing' => 'Kontynuuj edycję',
+'continue-editing' => 'Przejdź do pola edycji',
 'previewconflict' => 'Podgląd odnosi się do tekstu z górnego pola edycji. Tak będzie wyglądać strona, jeśli zdecydujesz się ją zapisać.',
 'session_fail_preview' => "'''Uwaga! Serwer nie może przetworzyć tej edycji z powodu utraty danych sesji.
 Spróbuj jeszcze raz.
@@ -1072,6 +1071,15 @@ Zdaje się, że została skasowana.',
 'edit-already-exists' => 'Nie udało się stworzyć nowej strony.
 Strona już istnieje.',
 'defaultmessagetext' => 'Domyślny tekst komunikatu',
+'content-failed-to-parse' => 'Format zawartości typu $2 (dla modelu: $1) nieprawidłowy: $3',
+'invalid-content-data' => 'Zawartość strony zawiera nieprawidłowe dane',
+'content-not-allowed-here' => 'Zawartość tego typu ($1) nie jest dozwolona na stronie [[$2]]',
+
+# Content models
+'content-model-wikitext' => 'wikitekst',
+'content-model-text' => 'zwykły tekst',
+'content-model-javascript' => 'JavaScript',
+'content-model-css' => 'CSS',
 
 # Parser/template warnings
 'expensive-parserfunction-warning' => 'Uwaga! Ta strona zawiera zbyt wiele wywołań złożonych obliczeniowo funkcji parsera.
@@ -1423,7 +1431,7 @@ Wygenerowany losowo klucz, którego możesz użyć to $1',
 'timezoneregion-indian' => 'Ocean Indyjski',
 'timezoneregion-pacific' => 'Ocean Spokojny',
 'allowemail' => 'Zgadzam się, by inni użytkownicy mogli przesyłać do mnie e‐maile',
-'prefs-searchoptions' => 'Szukaj',
+'prefs-searchoptions' => 'Wyszukiwanie',
 'prefs-namespaces' => 'Przestrzenie nazw',
 'defaultns' => 'Albo przeszukuj przestrzenie nazw:',
 'default' => 'domyślnie',
@@ -1461,7 +1469,7 @@ Jeśli zdecydujesz się je podać, zostaną użyte, by udokumentować Twoje auto
 'prefs-help-email-others' => 'Możesz również umożliwić innym użytkownikom wysłanie do Ciebie e‐maila poprzez Twoją stronę użytkownika lub stronę dyskusji (bez ujawniania Twojego adresu).',
 'prefs-help-email-required' => 'Wymagany jest adres e‐mail.',
 'prefs-info' => 'Podstawowe informacje',
-'prefs-i18n' => 'Ustawienia międzynarodowe',
+'prefs-i18n' => 'Ustawienia językowe',
 'prefs-signature' => 'Podpis',
 'prefs-dateformat' => 'Format daty',
 'prefs-timeoffset' => 'Różnica czasu',
@@ -1987,7 +1995,7 @@ Być może zechcesz zmienić opis na tej [$2 stronie opisu pliku].',
 'uploadnewversion-linktext' => 'Załaduj nowszą wersję tego pliku',
 'shared-repo-from' => 'z $1',
 'shared-repo' => 'współdzielone zasoby',
-'upload-disallowed-here' => 'Niestety, nie możesz nadpisać tego pliku.',
+'upload-disallowed-here' => 'Nie możesz nadpisać tego pliku.',
 
 # File reversion
 'filerevert' => 'Przywracanie $1',
@@ -2274,7 +2282,7 @@ Sprawdź stronę z [[{{MediaWiki:Listgrouprights-helppage}}|dodatkowymi informac
 '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 tego 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}}.
 Adres 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ć.',
 'usermailererror' => 'Moduł obsługi poczty zwrócił błąd:',
 'defemailsubject' => '{{SITENAME}} – e‐mail od użytkownika „$1“',
@@ -2529,8 +2537,8 @@ Możesz mieć zły link lub wersja mogła zostać odtworzona lub usunięta z arc
 'undeletedrevisions' => 'odtworzono {{PLURAL:$1|1 wersję|$1 wersje|$1 wersji}}',
 'undeletedrevisions-files' => 'odtworzono $1 {{PLURAL:$1|wersję|wersje|wersji}} i $2 {{PLURAL:$2|plik|pliki|plików}}',
 'undeletedfiles' => 'odtworzył $1 {{PLURAL:$1|plik|pliki|plików}}',
-'cannotundelete' => 'Odtworzenie nie powiodło się.
-Ktoś inny prawdopodobnie odtworzył już tę stronę.',
+'cannotundelete' => 'Odtworzenie nie powiodło się:
+$1',
 'undeletedpage' => "'''Odtworzono stronę $1.'''
 
 Zobacz [[Special:Log/delete|rejestr usunięć]], jeśli chcesz przejrzeć ostatnie operacje usuwania i odtwarzania stron.",
@@ -2836,6 +2844,7 @@ Strony nie można przenieść na nią samą.',
 'immobile-target-namespace-iw' => 'Link interwiki jest nieprawidłowym tytułem, pod który miałaby być przeniesiona strona.',
 'immobile-source-page' => 'Tej strony nie można przenieść.',
 'immobile-target-page' => 'Nie można przenieść pod wskazany tytuł.',
+'bad-target-model' => 'Strona docelowa używa innego modelu zawartości. Konwersja $1 → $2 nie jest możliwa.',
 'imagenocrossnamespace' => 'Nie można przenieść grafiki do przestrzeni nazw nie przeznaczonej dla grafik',
 'nonfile-cannot-move-to-file' => 'Nie można przenieść obiektu nie będącego plikiem do przestrzeni nazw „{{ns:file}}“',
 'imagetypemismatch' => 'Nowe rozszerzenie nazwy pliku jest innego typu niż zawartość',
@@ -3095,6 +3104,7 @@ Najprawdopodobniej zostało to spowodowane przez link do zewnętrznej strony int
 
 # Info page
 'pageinfo-title' => 'Informacje o „$1“',
+'pageinfo-not-current' => 'Informacje mogą być wyświetlane tylko dla najnowszej wersji strony.',
 'pageinfo-header-basic' => 'Podstawowe informacje',
 'pageinfo-header-edits' => 'Historia edycji',
 'pageinfo-header-restrictions' => 'Zmień zabezpieczenie',
@@ -3103,6 +3113,7 @@ Najprawdopodobniej zostało to spowodowane przez link do zewnętrznej strony int
 'pageinfo-default-sort' => 'Domyślny klucz sortowania',
 'pageinfo-length' => 'Długość strony (w bajtach)',
 'pageinfo-article-id' => 'Identyfikator strony',
+'pageinfo-language' => 'Język zawartości strony',
 'pageinfo-robot-policy' => 'Status w wyszukiwarce',
 'pageinfo-robot-index' => 'Indeksowalne',
 'pageinfo-robot-noindex' => 'Nieindeksowalne',
@@ -3122,6 +3133,14 @@ Najprawdopodobniej zostało to spowodowane przez link do zewnętrznej strony int
 'pageinfo-magic-words' => 'Magiczne {{PLURAL:$1|słowo|słowa|słowa}} ($1)',
 'pageinfo-hidden-categories' => '{{PLURAL:$1|Ukryta kategoria|Ukryte kategorie|Ukryte kategorie}} ($1)',
 'pageinfo-templates' => 'Wykorzystywan{{PLURAL:$1|y szablon|e szablony}} ($1)',
+'pageinfo-toolboxlink' => 'Informacje o tej stronie',
+'pageinfo-redirectsto' => 'Przekierowuje na',
+'pageinfo-redirectsto-info' => 'informacje',
+'pageinfo-contentpage' => 'Liczona jako artykuł',
+'pageinfo-contentpage-yes' => 'Tak',
+'pageinfo-protect-cascading' => 'Zabezpieczona z włączoną opcją dziedziczenia',
+'pageinfo-protect-cascading-yes' => 'Tak',
+'pageinfo-protect-cascading-from' => 'Zabezpieczenie dziedziczone z',
 
 # Skin names
 'skinname-standard' => 'Standardowa',
@@ -3717,6 +3736,7 @@ Kod zawarty w linku straci ważność $4.',
 # Scary transclusion
 'scarytranscludedisabled' => '[Transkluzja przez interwiki jest wyłączona]',
 'scarytranscludefailed' => '[Pobranie szablonu dla $1 nie powiodło się]',
+'scarytranscludefailed-httpstatus' => '[Pobranie szablonu dla $1 nie powiodło się: HTTP $2]',
 'scarytranscludetoolong' => '[zbyt długi adres URL]',
 
 # Delete conflict
@@ -3874,6 +3894,7 @@ Możesz także użyć [[Special:EditWatchlist|standardowego edytora obserwowanyc
 'version-license' => 'Licencja',
 'version-poweredby-credits' => "To wiki korzysta z oprogramowania '''[//www.mediawiki.org/ MediaWiki]''', copyright © 2001‐$1 $2.",
 'version-poweredby-others' => 'inni',
+'version-credits-summary' => 'Następujące osoby wniosły istotny wkład w rozwój oprogramowania [[Special:Version|MediaWiki]].',
 'version-license-info' => 'MediaWiki jest wolnym oprogramowaniem – możesz je dystrybuować i modyfikować zgodnie z warunkami licencji GNU General Public License opublikowanej przez Free Software Foundation w wersji 2 tej licencji lub (jeśli wolisz) dowolnej późniejszej.
 
 MediaWiki jest dystrybuowane w nadziei, że okaże się użyteczne ale BEZ JAKIEJKOLWIEK GWARANCJI – nawet bez domyślnej gwarancji PRZYDATNOŚCI HANDLOWEJ lub PRZYDATNOŚCI DO OKREŚLONYCH ZASTOSOWAŃ. Więcej szczegółów znajdziesz w treści licencji GNU General Public License.
diff --git a/languages/messages/MessagesPms.php b/languages/messages/MessagesPms.php
index fbfdd1b2e4..52dfba7721 100644
--- a/languages/messages/MessagesPms.php
+++ b/languages/messages/MessagesPms.php
@@ -90,7 +90,7 @@ $messages = array(
 
 'underline-always' => 'Sempe',
 'underline-never' => 'Mai',
-'underline-default' => 'Deuvra lë stàndard dël programma ëd navigassion (browser)',
+'underline-default' => 'Stàndard dël navigator',
 
 # Font style option in Special:Preferences
 'editfont-style' => "Stil dël font ëd l'àrea ëd modìfica:",
@@ -175,8 +175,8 @@ $messages = array(
 'newwindow' => '(as deurb ant na fnestra neuva)',
 'cancel' => 'Scancela',
 'moredotdotdot' => 'Dë pì...',
-'mypage' => 'Mia pàgina',
-'mytalk' => 'Mie ciaciarade',
+'mypage' => 'Pàgina',
+'mytalk' => 'Ciaciarade',
 'anontalk' => "Ciaciarade për st'adrëssa IP-sì",
 'navigation' => 'Navigassion',
 'and' => '&#32;e',
@@ -725,7 +725,7 @@ Sòn a l'é normalment causà da l'andèje dapress a na vej liura stòrica a na
 'note' => "'''NÒTA:'''",
 'previewnote' => "'''Che a ten-a present che costa-sì a l'é mach na preuva.'''
 Ij sò cambi a son anco' pa stàit salvà!",
-'continue-editing' => 'Continua a modifiché',
+'continue-editing' => 'Andé a la zòna ëd modìfica',
 'previewconflict' => "Costa preuva a-j mostra ël test dl'artìcol ambelessì dzora. Se a sërn dë salvelo, a l'é parèj che a lo s-ciairëran ëdcò tuti j'àutri Utent.",
 'session_fail_preview' => "'''Darmagi! I l'oma pa podù processé soa modìfica per via che a son përdusse për la stra ij dat ëd session.
 Për piasì che a preuva n'àutra vira. Se a dovèissa mai torna riveje sossì, che a preuva a seurte dal sistema e peuj torna a rintré.'''",
@@ -1102,7 +1102,7 @@ Ch'a preuva a gionté dnans a soa arserca ël prefiss ''all:'' për sërché an
 
 # Preferences page
 'preferences' => 'Mè gust',
-'mypreferences' => 'mè gust',
+'mypreferences' => 'Gust',
 'prefs-edits' => 'Nùmer ëd modìfiche fàite:',
 'prefsnologin' => "A l'é ancó pa rintrà ant ël sistema",
 'prefsnologintext' => 'A deuv esse <span class="plainlinks">[{{fullurl:{{#Special:UserLogin}}|returnto=$1}} intrà ant ël sistema]</span> për amposté ij sò gust.',
@@ -1337,6 +1337,9 @@ Costa anformassion a sarà pùblica.",
 'rightslogtext' => "Costa a l'é na lista dij cambiament aj drit ëd j'utent.",
 'rightslogentry' => "a l'ha tramudà $1 da 'nt la partìa $2 a la partìa $3",
 'rightslogentry-autopromote' => "a l'é stàit automaticament promovù da $2 a $3",
+'logentry-rights-rights' => "$1 a l'ha tramudà l'apartenesa a la partìa për $3 da $4 a $5",
+'logentry-rights-rights-legacy' => "$1 a l'ha tramudà l'apartenensa a la partìa për $3",
+'logentry-rights-autopromote' => "$1 a l'é stàit automaticament promovù da $4 a $5",
 'rightsnone' => '(gnun)',
 
 # Associated actions - in the sentence "You do not have permission to X"
@@ -1968,7 +1971,7 @@ Ch'a bèica ëdcò [[Special:WantedCategories|le categorìe domandà]].",
 'linksearch-ok' => 'Sërché',
 'linksearch-text' => 'As peulo dovresse dij ciapatut com "*.wikipedia.org".
 A-i é dabzògn almanch d\'un domini a livel pi àut, për esempi "*.org".<br />
-Protocòj ch\'as peulo dovresse: <code>$1</code> (ch\'a gionta gnun ëd costi an soa arserca).',
+Protocòj ch\'as peulo dovresse: <code>$1</code> (predefinì http:// se gnun protocòj a son specificà).',
 'linksearch-line' => "$1 a l'ha n'anliura ch'a-j riva dzora da $2",
 'linksearch-error' => 'Ij ciapatut as peulo butesse mach an prinsipi dël nòm dël sërvent.',
 
@@ -2018,8 +2021,8 @@ e avèj registrà n'adrëssa ëd pòsta eletrònica vàlida ant ij [[Special:Pre
 '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 peule dovré ël formolari sì-sota për mandé un mëssagi ëd pòsta eletrònica a st'utent-sì.
-L'adrëssa ëd pòsta eletrònica ch'a l'ha butà ant ij [[Special:Preferences|Ij 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.",
+'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ì.
+L'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.",
 'usermailererror' => "L'oget che a goèrna la pòsta eletrònica a l'ha dàit eror:",
 'defemailsubject' => 'Mëssagi da l\'utent "$1"',
 'usermaildisabled' => "Pòsta eletrònica dl'utent disabilità",
@@ -2050,7 +2053,7 @@ L'adrëssa ëd pòsta eletrònica ch'a l'ha butà ant ij [[Special:Preferences|I
 
 # Watchlist
 'watchlist' => 'Ròba che im ten-o sot-euj',
-'mywatchlist' => 'Ròba che im ten-o sot-euj',
+'mywatchlist' => 'Ròba che as ten sot euj',
 'watchlistfor2' => 'Për $1 $2',
 'nowatchlist' => "A l'ha ancó pa marcà dj'artìcoj coma ròba da tnì sot-euj.",
 'watchlistanontext' => "Për piasì, $1 për ës-ciairé ò pura modifiché j'element ëd soa lista dla ròba che as ten sot-euj.",
@@ -2308,7 +2311,7 @@ $1",
 # Contributions
 'contributions' => "Contribussion dë st'Utent-sì",
 'contributions-title' => 'Contribussion ëd $1',
-'mycontris' => 'Mie contribussion',
+'mycontris' => 'Contribussion',
 'contribsub2' => 'Për $1 ($2)',
 'nocontribs' => "A l'é pa trovasse gnun-a modìfica che a fussa conforma a costi criteri-sì",
 'uctop' => ' (ùltima dla pàgina)',
@@ -2348,7 +2351,7 @@ L'ùltima intrada dël registr dij blocagi a l'é butà sì-sota për arferiment
 'whatlinkshere-hideredirs' => '$1 le ridiression',
 'whatlinkshere-hidetrans' => '$1 anclusion',
 'whatlinkshere-hidelinks' => '$1 anliura',
-'whatlinkshere-hideimages' => '$1 anliure ëd figure',
+'whatlinkshere-hideimages' => "$1 j'archivi lijà",
 'whatlinkshere-filters' => 'Filtr',
 
 # Block/unblock
@@ -2833,6 +2836,7 @@ Sòn a l'é motobin belfé che a sia rivà përchè a-i era n'anliura a un sit e
 'pageinfo-default-sort' => "ciav d'ordinament për sòlit",
 'pageinfo-length' => 'Longheur ëd la pàgina (an byte)',
 'pageinfo-article-id' => 'Identificativ ëd la pàgina',
+'pageinfo-language' => 'Lenga dël contnù dla pàgina',
 'pageinfo-robot-policy' => "Stat dël motor d'arserca",
 'pageinfo-robot-index' => 'Indesàbil',
 'pageinfo-robot-noindex' => 'Nen indesàbil',
@@ -3215,17 +3219,17 @@ J'àutri a saran stërmà coma stàndard.
 
 # Flash modes
 'exif-flash-fired-0' => "La lòsna a l'é nen ëscatà",
-'exif-flash-fired-1' => 'Flash scatà',
-'exif-flash-return-0' => "Gnun-e fonsion ëd rilevassion dl'artorn ëd lë stroboscòpi",
-'exif-flash-return-2' => "lus stoboscòpica d'artorn pa arlevà",
-'exif-flash-return-3' => "lus stroboscòpica d'artorn arlevà",
-'exif-flash-mode-1' => 'scat dël flash sforsà',
-'exif-flash-mode-2' => 'eliminassion dël flash sforsà',
+'exif-flash-fired-1' => "La lòsna a l'ha scatà",
+'exif-flash-return-0' => "gnun ëstroboscòpi a dà andaré na fonsion d'artrovament",
+'exif-flash-return-2' => "lë stoboscòpi a arleva gnun-a lus d'artorn",
+'exif-flash-return-3' => "lë stroboscòpi a l'ha arlevà n'artorn ëd lus",
+'exif-flash-mode-1' => 'lus dla lòsna obligatòria',
+'exif-flash-mode-2' => 'eliminassion dla lòsna obligatòria',
 'exif-flash-mode-3' => 'manera automàtica',
-'exif-flash-function-1' => 'Gnente fonsion flash',
+'exif-flash-function-1' => 'Gnun-a fonsion ëd lòsna',
 'exif-flash-redeye-1' => "Manera ëd ridussion ëd j'euj ross",
 
-'exif-focalplaneresolutionunit-2' => 'pòles anglèis (inches)',
+'exif-focalplaneresolutionunit-2' => 'pòles anglèis',
 
 'exif-sensingmethod-1' => 'Nen definì',
 'exif-sensingmethod-2' => 'Sensor dlë spassi color a 1 processor',
@@ -3244,7 +3248,7 @@ J'àutri a saran stërmà coma stàndard.
 
 'exif-exposuremode-0' => 'Esposission automàtica',
 'exif-exposuremode-1' => 'Esposission manual',
-'exif-exposuremode-2' => 'Esposission automàtica (auto bracket)',
+'exif-exposuremode-2' => 'Forciolin-a automàtica',
 
 'exif-whitebalance-0' => "Balansa dël bianch n'automàtich",
 'exif-whitebalance-1' => 'Balansa dël bianch an manual',
@@ -3257,11 +3261,11 @@ J'àutri a saran stërmà coma stàndard.
 'exif-gaincontrol-0' => 'Gnun',
 'exif-gaincontrol-1' => 'Sparé ij contrast bass',
 'exif-gaincontrol-2' => 'Sparé ij contrast fòrt',
-'exif-gaincontrol-3' => 'Bassé ij contrast bass',
-'exif-gaincontrol-4' => 'Bassé ij contrast fòrt',
+'exif-gaincontrol-3' => 'Sbassé ij contrast bass',
+'exif-gaincontrol-4' => 'Sbassé ij contrast fòrt',
 
 'exif-contrast-0' => 'Normal',
-'exif-contrast-1' => 'dosman',
+'exif-contrast-1' => 'Doss',
 'exif-contrast-2' => 'contrastà fòrt',
 
 'exif-saturation-0' => 'Normal',
@@ -3272,8 +3276,8 @@ J'àutri a saran stërmà coma stàndard.
 'exif-sharpness-1' => 'dossa',
 'exif-sharpness-2' => 'contrastà',
 
-'exif-subjectdistancerange-0' => 'Pa conossù',
-'exif-subjectdistancerange-1' => 'Macro',
+'exif-subjectdistancerange-0' => 'Dësconossùa',
+'exif-subjectdistancerange-1' => 'Motobin davzin',
 'exif-subjectdistancerange-2' => 'Prim pian',
 'exif-subjectdistancerange-3' => 'Anquadratura a soget lontan',
 
@@ -3298,7 +3302,7 @@ J'àutri a saran stërmà coma stàndard.
 # Pseudotags used for GPSSpeedRef
 'exif-gpsspeed-k' => 'Km/h',
 'exif-gpsspeed-m' => 'mija/h',
-'exif-gpsspeed-n' => 'Grop (marin)',
+'exif-gpsspeed-n' => 'Grop',
 
 # Pseudotags used for GPSDestDistanceRef
 'exif-gpsdestdistance-k' => 'Chilòmeter',
@@ -3316,7 +3320,7 @@ J'àutri a saran stërmà coma stàndard.
 'exif-objectcycle-b' => 'Sia matin che dòp-mesdì',
 
 # Pseudotags used for GPSTrackRef, GPSImgDirectionRef and GPSDestBearingRef
-'exif-gpsdirection-t' => 'Diression vèira',
+'exif-gpsdirection-t' => 'Diression vera',
 'exif-gpsdirection-m' => 'Diression magnética',
 
 'exif-ycbcrpositioning-1' => 'Sentrà',
@@ -3354,13 +3358,13 @@ J'àutri a saran stërmà coma stàndard.
 'exif-iimcategory-wea' => 'Temp',
 
 'exif-urgency-normal' => 'Normal ($1)',
-'exif-urgency-low' => 'Bass ($1)',
+'exif-urgency-low' => 'Bassa ($1)',
 'exif-urgency-high' => 'Àuta ($1)',
 'exif-urgency-other' => "Priorità definìa da l'utent ($1)",
 
 # External editor support
 'edit-externally' => "Modifiché st'archivi con un programa estern",
-'edit-externally-help' => "(Varda [//www.mediawiki.org/wiki/Manual:External_editors setup instructions] për avej pì d'anformassion)",
+'edit-externally-help' => "(Lese [//www.mediawiki.org/wiki/Manual:External_editors j'anstrussion d'anstalassion] për avèj pì d'anformassion)",
 
 # 'all' in various places, this might be different for inflected languages
 'watchlistall2' => 'tute',
@@ -3371,70 +3375,70 @@ J'àutri a saran stërmà coma stàndard.
 # E-mail address confirmation
 'confirmemail' => "Confermé l'adrëssa postal",
 'confirmemail_noemail' => "A l'ha pa butà gnun-a adrëssa vàlida ëd pòsta eletrònica ant ij [[Special:Preferences|sò gust]].",
-'confirmemail_text' => "Costa wiki a ciama che chiel a convalida n'adrëssa postal anans che
-dovré lòn che toca la pòsta. Che a sgnaca ël boton ambelessì sota
-për fesse mandé un messa ëd conferma a soa adrëssa eletrònica.
-Andrinta al messagi a-i sara n'anliura (URL) con andrinta un còdes.
-Che a deurba st'anliura andrinta a sò programa ëd navigassion (browser)
+'confirmemail_text' => "Costa wiki a ciama che chiel a convàlida n'adrëssa ëd pòsta eletrònica anans che
+dovré lòn che a toca la pòsta. Che a sgnaca ël boton ambelessì-sota
+për fesse mandé un mëssage ëd conferma a soa adrëssa eletrònica.
+Andrinta al messagi a-i sara n'anliura con andrinta un còdes.
+Che a deurba st'anliura andrinta a sò programa ëd navigassion
 për confermé che soa adrëssa a l'é pròpe cola.",
 'confirmemail_pending' => "I l'oma già mandaje sò còdes ëd conferma;
-se a l'ha pen-a creasse sò cont, miraco a venta che a speta dontre minute che a-j riva ant la pòsta, nopà che ciamene un neuv.",
-'confirmemail_send' => 'Manda un còdes ëd conferma për pòsta eletrònica',
-'confirmemail_sent' => "Ël messagi ëd conferma a l'é stait mandà.",
-'confirmemail_oncreate' => "Un còdes ëd conferma a l'é stait mandà a soa adrëssa ëd pòsta eletrònica.
-D'ës còdes a fa pa dë manca për rintré ant ël sistema, ma a ventrà che a lo mostra al sistema për podej abilité cole funsion dla wiki che a son basà ant sla pòsta eletrònica.",
-'confirmemail_sendfailed' => "{{SITENAME}} a l'ha pa podù mandete l'e-mail ëd conferma.
+se a l'ha pen-a creasse sò cont, miraco a venta che a speta dontré minute che a-j riva ant la pòsta, nopà che ciamene un neuv.",
+'confirmemail_send' => 'Mandé un còdes ëd conferma për pòsta eletrònica',
+'confirmemail_sent' => "Ël mëssagi ëd conferma a l'é stàit mandà.",
+'confirmemail_oncreate' => "Un còdes ëd conferma a l'é stàit mandà a soa adrëssa ëd pòsta eletrònica.
+D'ës còdes a fa pa dë manca për rintré ant ël sistema, ma a ventrà che a lo mostra al sistema për podèj abilité cole funsion dla wiki che a son basà ant sla pòsta eletrònica.",
+'confirmemail_sendfailed' => "{{SITENAME}} a l'ha pa podù mandeje ël mëssagi ëd conferma.
 Che a controla l'adrëssa che a l'ha dane, mai che a-i fusso dij caràter nen vàlid.
 
-Ël programa ëd pòsta a l'ha arspondù: $1",
+Ël programa ëd pòsta a l'ha rëspondù: $1",
 'confirmemail_invalid' => 'Còdes ëd conferma nen vàlid. A podrìa ëdcò mach esse scadù.',
-'confirmemail_needlogin' => 'A venta che a fasa $1 për confermé soa addrëssa postal eletrònica.',
-'confirmemail_success' => "Soa adrëssa postal a l'é staita confermà, adess a peul rintré ant ël sistema e i-j auguroma da fessla bin ant la wiki!",
+'confirmemail_needlogin' => 'A venta $1 për confermé soa adrëssa ëd pòsta eletrònica.',
+'confirmemail_success' => "Soa adrëssa a l'é stàita confermà, adess a peul [[Special:UserLogin|rintré ant ël sistema]] e i-j auguroma da fessla bin ant la wiki!",
 'confirmemail_loggedin' => "Motobin mersì. Soa adrëssa ëd pòsta eletrònica adess a l'é confermà.",
-'confirmemail_error' => "Cheich-còs a l'é andà mal ën salvand soa conferma.",
+'confirmemail_error' => "Cheicòs a l'é andà mal ën salvand soa conferma.",
 'confirmemail_subject' => "Conferma dl'adrëssa postal da 'nt la {{SITENAME}}",
-'confirmemail_body' => "Cheidun, a l'é belfé che a sia stait pròpe chiel (ò chila), da 'nt l'adrëssa IP \$1,
-a l'ha doertà un cont utent \"\$2\" ansima a {{SITENAME}}, lassand-ne st'adrëssa ëd pòsta eletrònica-sì.
+'confirmemail_body' => "Cheidun, a l'é belfé che a sia stàit pròpe chiel, da 'nt l'adrëssa IP $1,
+a l'ha duvertà un cont utent «$2» ansima a {{SITENAME}}, lassand-ne st'adrëssa ëd pòsta eletrònica-sì.
 
 Për confermé che ës cont a l'é da bon sò e për ativé
-le possibilità corelà a la pòsta eletrònica ansima a {{SITENAME}}, che a deurba st'adrëssa-sì andrinta a sò programa ëd navigassion (browser):
+le possibilità gropà a la pòsta eletrònica ansima a {{SITENAME}}, che a deurba st'adrëssa-sì andrinta a sò programa ëd navigassion:
 
-\$3
+$3
 
-Se a fussa *nen* stait chiel a deurbe ël cont, anlora che a vada daré a sto colegament-sì
-për scanselé la conferma ëd l'adrëssa e-mail:
+Se a fussa *nen* stàit chiel a deurbe ël cont, anlora che a vada dapress a la liura sì-sota
+për scancelé la conferma ëd l'adrëssa ëd pòsta eletrònica:
 
-\$5
+$5
 
-Cost còdes ëd conferma a l'é bon fin-a al \$4.",
-'confirmemail_body_changed' => "Cheidun, a l'é belfé ch'a sia chiel, da l'adrëssa IP \$1,
-a l'ha cangià l'adrëssa ëd pòsta eletrònica dël cont \"\$2\" con st'adrëssa-sì dzora a {{SITENAME}}.
+Cost còdes ëd conferma a l'é bon fin-a al $4.",
+'confirmemail_body_changed' => "Cheidun, a l'é belfé ch'a sia chiel, da l'adrëssa IP $1,
+a l'ha cangià l'adrëssa ëd pòsta eletrònica dël cont «$2» con st'adrëssa-sì dzora a {{SITENAME}}.
 
 Për confirmé che sto cont-sì a l'é pròpi sò e për riativé
-le possibilità ëd pòsta eletrònica dzora a {{SITENAME}}, ch'a deurba sto colegament-sì an sò navigador:
+le fonsion ëd pòsta eletrònica dzora a {{SITENAME}}, ch'a deurba costa liura-sì an sò navigador:
 
-\$3
+$3
 
-Se ël cont a l'é *nen* sò, ch'a vada andré a sto colegament-sì
+Se ël cont a l'é *nen* sò, ch'a-i vada dapress a costa liura-sì
 për scancelé la conferma dl'adrëssa ëd pòsta eletrònica:
 
-\$5
+$5
 
-Ës còdes ëd conferma a scadrà a \$4.",
-'confirmemail_body_set' => "Quaidun, miraco chiel, da l'adrëssa IP \$1,
-a l'ha ampostà l'adrëssa ëd pòsta eletrònica dël cont \"\$2\" con costa adrëssa su {{SITENAME}}.
+Ës còdes ëd conferma a scadrà ël $4.",
+'confirmemail_body_set' => "Quaidun, miraco chiel, da l'adrëssa IP $1,
+a l'ha ampostà l'adrëssa ëd pòsta eletrònica dël cont «$2» con costa adrëssa su {{SITENAME}}.
 
 Për confirmé che sto cont a l'é pròpi sò e ativé torna
 le funsion ëd pòsta eletrònica su {{SITENAME}}, ch'a duverta cost'anliura an sò navigador:
 
-\$3
+$3
 
 Se ël cont a l'é *pa* sò, ch'a-j vada dapress a st'anliura
 për scancelé la conferma ëd l'adrëssa ëd pòsta eletrònica:
 
-\$5
+$5
 
-Cost còdes ëd conferma a scad ai \$4.",
+Cost còdes ëd conferma a scad ai $4.",
 'confirmemail_invalidated' => "Conferma ëd l'adrëssa e-mail scanselà",
 'invalidateemail' => "Scansela l'e-mail ëd conferma",
 
@@ -3571,6 +3575,7 @@ As peul ëdcò [[Special:EditWatchlist|dovré l'editor sòlit]].",
 'version-license' => 'Licensa',
 'version-poweredby-credits' => "Sta wiki-sì a l'é basà su '''[//www.mediawiki.org/ MediaWiki]''', copyright © 2001-$1 $2.",
 'version-poweredby-others' => 'àutri',
+'version-credits-summary' => 'I tnoma a aringrassié le përson-e sì-dapress për soa contribussion a [[Special:Version|MediaWiki]].',
 'version-license-info' => "MediaWiki a l'é un programa lìber; a peul passelo an gir e/o modifichelo sota le condission dla Licensa Pùblica General GNU coma publicà da la Free Software Foundation; o la version 2 dla licensa o (a soa decision) qualsëssìa version apress.
 
 MediaWiki a l'é distribuì ant la speransa che a sia ùtil, ma SENSA GNUN-A GARANSÌA; sensa gnanca la garansìa implìcita ëd COMERSIABILITA' o d'ADATAMENT A UN BUT PARTICOLAR. Ch'a lesa la Licensa General Pùblica GNU per pi 'd detaj.
diff --git a/languages/messages/MessagesPnt.php b/languages/messages/MessagesPnt.php
index d7331b999f..6c2088e548 100644
--- a/languages/messages/MessagesPnt.php
+++ b/languages/messages/MessagesPnt.php
@@ -160,7 +160,6 @@ $messages = array(
 'qbbrowse' => 'Πλοήγησην',
 'qbedit' => 'Άλλαξον',
 'qbpageoptions' => 'Ατή η σελίδαν',
-'qbpageinfo' => 'Συμφραζόμενα',
 'qbmyoptions' => "Τ' εμά τα σελίδας",
 'qbspecialpages' => 'Ειδικά σελίδας',
 'faq' => 'Πολλά ερωτήσεις (FAQ)',
diff --git a/languages/messages/MessagesPt.php b/languages/messages/MessagesPt.php
index aaee1a5913..e85ff8e256 100644
--- a/languages/messages/MessagesPt.php
+++ b/languages/messages/MessagesPt.php
@@ -201,7 +201,6 @@ $magicWords = array(
 	'forcetoc'                  => array( '0', '__FORCARTDC__', '__FORCARSUMARIO__', '__FORÇARTDC__', '__FORÇARSUMÁRIO__', '__FORCETOC__' ),
 	'toc'                       => array( '0', '__TDC__', '__SUMÁRIO__', '__SUMARIO__', '__TOC__' ),
 	'noeditsection'             => array( '0', '__NÃOEDITARSEÇÃO__', '__SEMEDITARSEÇÃO__', '__NAOEDITARSECAO__', '__SEMEDITARSECAO__', '__NOEDITSECTION__' ),
-	'noheader'                  => array( '0', '__SEMCABECALHO__', '__SEMCABEÇALHO__', '__SEMTITULO__', '__SEMTÍTULO__', '__NOHEADER__' ),
 	'currentmonth'              => array( '1', 'MESATUAL', 'MESATUAL2', 'CURRENTMONTH', 'CURRENTMONTH2' ),
 	'currentmonth1'             => array( '1', 'MESATUAL1', 'CURRENTMONTH1' ),
 	'currentmonthname'          => array( '1', 'NOMEDOMESATUAL', 'CURRENTMONTHNAME' ),
@@ -443,7 +442,7 @@ $messages = array(
 'newwindow' => '(abre numa janela nova)',
 'cancel' => 'Cancelar',
 'moredotdotdot' => 'Mais...',
-'mypage' => 'Utilizador',
+'mypage' => 'Página',
 'mytalk' => 'Discussão',
 'anontalk' => 'Discussão para este IP',
 'navigation' => 'Navegação',
@@ -3147,6 +3146,7 @@ Este bloqueio foi provavelmente causado por um link para um site externo que con
 'pageinfo-recent-authors' => 'Número recente de autores distintos',
 'pageinfo-magic-words' => '{{PLURAL:$1|Palavra mágica|Palavras mágicas}} ($1)',
 'pageinfo-hidden-categories' => '{{PLURAL:$1|Categoria oculta|Categorias ocultas}} ($1)',
+'pageinfo-toolboxlink' => 'Informações da página',
 
 # Skin names
 'skinname-standard' => 'Clássico',
diff --git a/languages/messages/MessagesPt_br.php b/languages/messages/MessagesPt_br.php
index 649fa98bee..0fbe91eb8c 100644
--- a/languages/messages/MessagesPt_br.php
+++ b/languages/messages/MessagesPt_br.php
@@ -204,7 +204,6 @@ $magicWords = array(
 	'forcetoc'                  => array( '0', '__FORCARTDC__', '__FORCARSUMARIO__', '__FORÇARTDC__', '__FORÇARSUMÁRIO__', '__FORCETOC__' ),
 	'toc'                       => array( '0', '__TDC__', '__SUMARIO__', '__SUMÁRIO__', '__TOC__' ),
 	'noeditsection'             => array( '0', '__NAOEDITARSECAO__', '__NÃOEDITARSEÇÃO__', '__SEMEDITARSEÇÃO__', '__SEMEDITARSECAO__', '__NOEDITSECTION__' ),
-	'noheader'                  => array( '0', '__SEMCABECALHO__', '__SEMCABEÇALHO__', '__SEMTITULO__', '__SEMTÍTULO__', '__NOHEADER__' ),
 	'currentmonth'              => array( '1', 'MESATUAL', 'MESATUAL2', 'CURRENTMONTH', 'CURRENTMONTH2' ),
 	'currentmonth1'             => array( '1', 'MESATUAL1', 'CURRENTMONTH1' ),
 	'currentmonthname'          => array( '1', 'NOMEDOMESATUAL', 'CURRENTMONTHNAME' ),
@@ -447,8 +446,8 @@ $messages = array(
 'newwindow' => '(abre em uma nova janela)',
 'cancel' => 'Cancelar',
 'moredotdotdot' => 'Mais...',
-'mypage' => 'Minha página',
-'mytalk' => 'Minha discussão',
+'mypage' => 'Página',
+'mytalk' => 'Discussão',
 'anontalk' => 'Discussão para este IP',
 'navigation' => 'Navegação',
 'and' => '&#32;e',
@@ -1047,7 +1046,7 @@ A página não pode ser salva.",
 Pode, no entanto, copiar o seu texto num editor externo e guardá-lo para posterior envio.
 
 Quem bloqueou o banco de dados forneceu a seguinte justificativa: $1",
-'protectedpagewarning' => "'''Atenção: Esta página foi protegida para que apenas usuários com privilégios de administrado possam editá-la.'''
+'protectedpagewarning' => "'''Atenção: Esta página foi protegida para que apenas usuários com privilégios de administrador possam editá-la.'''
 A ú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.
 A última entrada no histórico é fornecida abaixo para referência:",
@@ -1375,7 +1374,7 @@ Note que os índices do sistema de busca externo poderão conter referências de
 
 # Preferences page
 'preferences' => 'Preferências',
-'mypreferences' => 'Minhas preferências',
+'mypreferences' => 'Preferências',
 'prefs-edits' => 'Número de edições:',
 'prefsnologin' => 'Não autenticado',
 'prefsnologintext' => 'É necessário estar <span class="plainlinks">[{{fullurl:{{#Special:UserLogin}}|returnto=$1}} autenticado]</span> para definir as suas preferências.',
@@ -2581,7 +2580,7 @@ $1',
 # Contributions
 'contributions' => 'Contribuições {{GENDER:{{BASEPAGENAME}}|do usuário|da usuária}}',
 'contributions-title' => 'Contribuições {{GENDER:$1|do usuário|da usuária}} $1',
-'mycontris' => 'Minhas contribuições',
+'mycontris' => 'Contribuições',
 'contribsub2' => 'Para $1 ($2)',
 'nocontribs' => 'Não foram encontradas mudanças com este critério.',
 'uctop' => '(atual)',
@@ -3111,6 +3110,16 @@ Tal bloqueio foi provavelmente causado por uma ligação para um ''website'' ext
 'pageinfo-authors' => 'Número total de autores distintos',
 'pageinfo-recent-edits' => 'Número de edições recentes (nos últimos $1)',
 'pageinfo-recent-authors' => 'Número recente de autores distintos',
+'pageinfo-magic-words' => '{{PLURAL:$1|Palavra mágica|Palavras mágicas}} ($1)',
+'pageinfo-hidden-categories' => '{{PLURAL:$1|Categoria oculta|Categorias ocultas}} ($1)',
+'pageinfo-templates' => '{{PLURAL:$1|predefinição transcluída|predefinições transcluídas}}',
+'pageinfo-toolboxlink' => 'Informações da página',
+'pageinfo-redirectsto' => 'Redirecionar para',
+'pageinfo-redirectsto-info' => 'informações',
+'pageinfo-contentpage' => 'Contado como uma página de conteúdo',
+'pageinfo-contentpage-yes' => 'Sim',
+'pageinfo-protect-cascading' => 'Proteção em cascata ativada',
+'pageinfo-protect-cascading-yes' => 'Sim',
 
 # Skin names
 'skinname-standard' => 'Clássico',
@@ -3124,7 +3133,7 @@ Tal bloqueio foi provavelmente causado por uma ligação para um ''website'' ext
 
 # Patrolling
 'markaspatrolleddiff' => 'Marcar como patrulhada',
-'markaspatrolledtext' => 'Marcar esta página como verificada',
+'markaspatrolledtext' => 'Marcar esta página como patrulhada',
 'markedaspatrolled' => 'Marcado como verificado',
 'markedaspatrolledtext' => 'A revisão selecionada de [[:$1]] foi marcada como patrulhada.',
 'rcpatroldisabled' => 'Edições verificadas nas Mudanças Recentes desativadas',
diff --git a/languages/messages/MessagesQqq.php b/languages/messages/MessagesQqq.php
index 8cb1f58161..14e3886000 100644
--- a/languages/messages/MessagesQqq.php
+++ b/languages/messages/MessagesQqq.php
@@ -69,6 +69,7 @@
  * @author MF-Warburg
  * @author Malafaya
  * @author MarkvA
+ * @author Matma Rex
  * @author MaxSem
  * @author McDutchie
  * @author Meno25
@@ -196,13 +197,23 @@ Is only shown if {{msg-mw|tog-enotifusertalkpages}} or/and {{msg-mw|tog-enotifwa
 'tog-norollbackdiff' => "Option in [[Special:Preferences]], 'Misc' tab. Only shown for users with the rollback right. By default a diff is shown below the return screen of a rollback. Checking this preference toggle will suppress that. {{Gender}}
 {{Identical|Rollback}}",
 
-'underline-always' => 'Used in [[Special:Preferences]] (under "Misc"). This option means "always underline links", there are also options "never" and "browser default". {{Gender}}
+'underline-always' => 'Used in [[Special:Preferences#mw-prefsection-rendering|Preferences]].
+
+This option means "always underline links", there are also options {{msg-mw|Underline-never}} and {{msg-mw|Underline-default}}.
+
+{{Gender}}
 {{Identical|Always}}',
-'underline-never' => 'Used in [[Special:Preferences]] (under "Misc"). This option means "never underline links", there are also options "always" and "browser default". {{Gender}}
+'underline-never' => 'Used in [[Special:Preferences#mw-prefsection-rendering|Preferences]].
+
+This option means "never underline links", there are also options {{msg-mw|Underline-always}} and {{msg-mw|Underline-default}}.
 
+{{Gender}}
 {{Identical|Never}}',
-'underline-default' => 'Used in [[Special:Preferences]] (under "Misc"). This option means "underline links as in your browser", there are also options "never" and "always". {{Gender}}
+'underline-default' => 'Used in [[Special:Preferences#mw-prefsection-rendering|Preferences]].
 
+This option means "underline links as in your user skin or your browser", there are also options {{msg-mw|Underline-never}} and {{msg-mw|Underline-always}}.
+
+{{Gender}}
 {{Identical|Browser default}}',
 
 # Font style option in Special:Preferences
@@ -335,7 +346,10 @@ Possible alternatives to the word 'content' are 'subject matter' or 'wiki subjec
 
 {{Identical|Cancel}}',
 'moredotdotdot' => '{{Identical|More...}}',
-'mytalk' => 'In the personal urls page section - right upper corner.',
+'mypage' => "A text for the link to the user's user page in the links at the top of the page.",
+'mytalk' => 'In the personal urls page section - right upper corner.
+
+Used as link title in "Personal tools" toolbar.',
 'anontalk' => 'Link to the talk page appearing in [[mw:Help:Navigation#User_Links|user links]] for each anonymous users when [[mw:Manual:$wgShowIPinHeader|$wgShowIPinHeader]] is true.',
 'navigation' => 'This is shown as a section header in the sidebar of most skins.
 
@@ -464,6 +478,7 @@ Also used as title of [[Special:Search]] page in [[Special:SpecialPages]].
 \'\'\'Note:\'\'\' This is "views" as in "appearances"/"representations", \'\'\'not\'\'\' as in "visits"/"accesses".
 {{Identical|View}}',
 'toolbox' => 'The title of the toolbox below the search menu.',
+'viewtalkpage' => 'Used in Standard (a.k.a. Classic) skin as a link to talk page for all namespaces, in edit or history mode.',
 'otherlanguages' => 'This message is shown under the toolbox. It is used if there are interwiki links added to the page, like <tt><nowiki>[[</nowiki>en:Interwiki article]]</tt>.
 {{Identical|Otherlanguages}}',
 'redirectedfrom' => 'The text displayed when a certain page is redirected to another page.
@@ -1484,7 +1499,7 @@ This is a search result (and I guess search engine) dependent messages. I do not
 'preferences' => 'Title of the Special:Preferences page.
 
 {{Identical|Preferences}}',
-'mypreferences' => 'Action link label that leads to Special:Preferences; appears in the top menu (e.g. "Username My talk My preferences My watchlist My contributions Log out").
+'mypreferences' => 'Action link label that leads to Special:Preferences; appears in the top menu (e.g. "Username Talk Preferences Watchlist Contributions Log out").
 
 {{Identical|My preferences}}',
 'prefs-edits' => 'In user preferences.',
@@ -1650,6 +1665,10 @@ Parameters:
 Parameters
 * $1 - the number of items in the list following the message, for PLURAL.
 * $2 - the user name, for GENDER.',
+'userrights-groupsmember-type' => '{{optional}}
+Parameters:
+* $1 is list of group names.
+* $2 is list of group member names. Used with labels {{msg-mw|userrights-groupsmember}} and {{msg-mw|userrights-groupsmember-auto}}',
 'userrights-groups-help' => 'Instructions displayed on [[Special:UserRights]]. Parameters:
 * $1 is a username - optional, can be used for GENDER',
 'userrights-reason' => 'Text beside log field when editing user groups
@@ -1843,6 +1862,21 @@ Similar to {{msg-mw|Gur-rightslog-entry}}',
 Parameters:
 * $2 is a comma separated list of old user groups or {{msg-mw|Rightsnone}}
 * $3 is a comma separated list of new user groups',
+'logentry-rights-rights' => '*$1 - username
+*$3 - username
+*$4 - list of user groups or {{msg-mw|Rightsnone}}
+*$5 - list of user groups or {{msg-mw|Rightsnone}}
+
+{{Logentry}}',
+'logentry-rights-rights-legacy' => '*$1 - username
+*$3 - username
+
+{{Logentry}}',
+'logentry-rights-autopromote' => '*$1 - username
+*$4 - comma separated list of old user groups or {{msg-mw|Rightsnone}}
+*$5 - comma separated list of new user groups
+
+{{Logentry}}',
 'rightsnone' => 'Default rights for registered users.
 
 {{Identical|None}}',
@@ -2843,6 +2877,12 @@ This message was something like "unlock move protection" in the past.',
 'protect-text' => 'Intro of the protection interface. See [[meta:Protect]] for more information.',
 'protect-default' => '{{Identical|Default}}',
 'protect-fallback' => 'This message is used as an option in the protection form on wikis were extra protection levels have been configured.',
+'protect-level-autoconfirmed' => 'Used as protect level.
+
+See example: [http://translatewiki.net/w/i.php?title=Main_Page&action=info]',
+'protect-level-sysop' => 'Used as protect level.
+
+See example: [http://translatewiki.net/w/i.php?title=Main_Page&action=info]',
 'protect-summary-cascade' => 'Used in edit summary when cascade protecting a page. Appears in protection log. See [[Special:Log]] and [[m:Special:Log]].
 
 Also used in [[Special:ProtectedPages]] when a page is cascade protected. See example: [[m:Special:ProtectedPages]].<br />
@@ -3052,7 +3092,11 @@ Example line:
 'whatlinkshere-hidelinks' => 'Filter option in [[Special:WhatLinksHere]]. Parameters:
 * $1 is the {{msg-mw|hide}} or {{msg-mw|show}}',
 'whatlinkshere-hideimages' => 'Filter option in [[Special:WhatLinksHere]]. Parameters:
-* $1 is the {{msg-mw|hide}} or {{msg-mw|show}}',
+* $1 is the {{msg-mw|hide}} or {{msg-mw|show}}
+
+See also:
+*{{msg-mw|Isimage}}
+*{{msg-mw|Media_tip}}',
 'whatlinkshere-filters' => '{{Identical|Filter}}',
 
 # Block/unblock
@@ -3538,17 +3582,24 @@ See also {{msg-mw|Anonuser}} and {{msg-mw|Siteusers}}.',
 'pageinfo-header-properties' => 'Table section header in action=info.',
 'pageinfo-display-title' => 'The title that is displayed when the page is viewed.',
 'pageinfo-default-sort' => 'The key by which the page is sorted in categories by default.',
-'pageinfo-length' => 'પૃષ્ઠની લંબાઇ બાઇટમાં',
+'pageinfo-length' => 'The length of the page, in bytes.',
 'pageinfo-article-id' => 'The numeric identifier of the page.',
-'pageinfo-robot-policy' => 'The search engine status of the page, e.g. "marked as index".',
+'pageinfo-language' => 'Language in which the page content is written.',
+'pageinfo-robot-policy' => 'The search engine status of the page.
+*{{msg-mw|Pageinfo-robot-index}}
+*{{msg-mw|Pageinfo-robot-noindex}}',
 'pageinfo-robot-index' => 'An indication that the page is indexable.',
 'pageinfo-robot-noindex' => 'An indication that the page is not indexable.',
 'pageinfo-views' => 'The number of times the page has been viewed.',
 'pageinfo-watchers' => 'The number of users watching the page.',
-'pageinfo-redirects-name' => 'The number of redirects to the page.',
+'pageinfo-redirects-name' => "The number of redirects to the page.
+
+Used as link text, linked to '{{int:Whatlinkshere-title}}' page ([[Special:WhatLinksHere]]).",
 'pageinfo-redirects-value' => 'Parameters:
 * $1 is the number of redirects to the page.',
-'pageinfo-subpages-name' => 'The number of subpages of the page.',
+'pageinfo-subpages-name' => "The number of subpages of the page.
+
+Used as link text, linked to '{{int:Prefixindex}}' page ([[Special:PrefixIndex]]).",
 'pageinfo-subpages-value' => 'Parameters:
 * $1 is the number of subpages of the page.
 * $2 is the number of subpages of the page that are redirects.
@@ -3641,6 +3692,7 @@ Start with a lowercase letter, unless the first word is “SVG”.',
 
 Start with a lowercase letter, unless the first word is “SVG”.',
 'show-big-image' => 'Displayed under an image at the image description page, when it is displayed smaller there than it was uploaded.',
+'show-big-image-other' => 'Message shown under the image description page thumbnail, next to {{msg-mw|show-big-image-preview}}, if the image is in high resolution.',
 'show-big-image-size' => '
 Parameters:
 * $1 is the width of the image(s) in pixels.
@@ -3720,21 +3772,6 @@ Part of variable $1 in {{msg-mw|Ago}}
 *{{msg-mw|Hours}}
 *{{msg-mw|Days}}',
 
-'hours-ago'      => 'Phrase for indicating that something occurred a certain number of hours ago',
-'minutes-ago'    => 'Phrase for indicating that something occurred a certain number of minutes ago',
-'seconds-ago'    => 'Phrase for indicating that something occurred a certain number of seconds ago',
-
-'monday-at'   => 'Phrase for indicating that something occurred at a particular time on the most recent Monday. $1 is the time.',
-'tuesday-at'   => 'Phrase for indicating that something occurred at a particular time on the most recent Tuesday. $1 is the time.',
-'wednesday-at'   => 'Phrase for indicating that something occurred at a particular time on the most recent Wednesday. $1 is the time.',
-'thursday-at'   => 'Phrase for indicating that something occurred at a particular time on the most recent Thursday. $1 is the time.',
-'friday-at'   => 'Phrase for indicating that something occurred at a particular time on the most recent Friday. $1 is the time.',
-'saturday-at'   => 'Phrase for indicating that something occurred at a particular time on the most recent Saturday. $1 is the time.',
-'sunday-at'   => 'Phrase for indicating that something occurred at a particular time on the most recent Sunday. $1 is the time.',
-'today-at'       => 'Phrase for indicating that something occurred at a particular time today. $1 is the time.',
-'yesterday-at'   => 'Phrase for indicating that something occurred at a particular time yesterday. $1 is the time.',
-'just-now'       => 'Phrase for indicating that something occurred very recently (for example, less than 30 seconds ago)',
-
 # Bad image list
 'bad_image_list' => 'This message only appears to guide administrators to add links with the right format. This will not appear anywhere else in MediaWiki.',
 
@@ -4699,7 +4736,8 @@ There are no such extensions here, so look at [[wikipedia:Special:Version]] for
 'version-parser-function-hooks' => 'Shown in [[Special:Version]]',
 'version-hook-name' => 'Shown in [[Special:Version]]',
 'version-hook-subscribedby' => 'Shown in [[Special:Version]]',
-'version-version' => '{{Identical|Version}}',
+'version-version' => '*$1 - version number
+{{Identical|Version}}',
 'version-svn-revision' => '{{optional}}
 This is being used in [[Special:Version]], preceeding the subversion revision numbers of the extensions loaded inside brackets, like this: "({{int:version-revision}} r012345")
 
@@ -4709,6 +4747,7 @@ This is being used in [[Special:Version]], preceeding the subversion revision nu
 *$1: the current year
 *$2: a list of selected MediaWiki authors',
 'version-poweredby-others' => 'Used at the very end of {{msg-mw|version-poweredby-credits}} on [[Special:Version]]. First, there\'s a long list of selected MediaWiki authors, then the word "and" (from {{msg-mw|and}}) follows and then this translation, which is supposed to credit the many other people than developer helping with MediaWiki.',
+'version-credits-summary' => 'Summary of the [[Special:Version/Credits]] sub page, which lists all developers etc. who contributed to MediaWiki. Shown at the top.',
 'version-license-info' => '[[wikipedia:GNU GPL|GNU GPL]] notice shown at [[Special:Version]]. See //www.gnu.org/licenses/old-licenses/gpl-2.0-translations.html for available translations.',
 'version-software-product' => 'Shown in [[Special:Version]]',
 'version-software-version' => '{{Identical|Version}}',
@@ -4908,6 +4947,9 @@ Parameter $4, the target page, is also not visible to parser functions.',
 'logentry-patrol-patrol-auto' => '{{Logentry}}
 * $4 is a formatted revision number, maybe linked to the diff.
 "Automatically" refers to users with autopatrol right who mark revisions automatically patrolled when editing.',
+'logentry-newusers-create' => '{{Logentry}}
+
+$4 is the gender of the target user.',
 'logentry-newusers-create2' => '{{Logentry}}
 
 $4 is the gender of the target user.',
@@ -4989,4 +5031,6 @@ $4 is the gender of the target user.',
 'api-error-uploaddisabled' => 'API error message that can be used for client side localisation of API errors.',
 'api-error-verification-error' => 'The word "extension" refers to the part behind the last dot in a file name, that by convention gives a hint about the kind of data format which a files contents are in.',
 
+# Unknown messages
+'mytalk-parenthetical' => 'When user page and talk combined into single label, link title for talk label',
 );
diff --git a/languages/messages/MessagesQu.php b/languages/messages/MessagesQu.php
index afb3cc73ee..8f151ebf4c 100644
--- a/languages/messages/MessagesQu.php
+++ b/languages/messages/MessagesQu.php
@@ -131,12 +131,11 @@ $specialPageAliases = array(
 
 $magicWords = array(
 	'redirect'                  => array( '0', '#PUSAPUNA', '#REDIRECCIÓN', '#REDIRECCION', '#REDIRECT' ),
-	'notoc'                     => array( '0', '__YUYARINANNAQ__', '__NOTDC__', '__NOTOC__' ),
-	'nogallery'                 => array( '0', '__RIKCHASUYUNNAQ__', '__NOGALERÍA__', '__NOGALERIA__', '__NOGALLERY__' ),
-	'forcetoc'                  => array( '0', '__YUYARINATAATIPACHIY__', '__FORZARTDC__', '__FORZARTOC__', '__FORCETOC__' ),
+	'notoc'                     => array( '0', '__YUYARINANNAQ__', '__NOTDC__', '__SIN_TDC__', '__NOTOC__' ),
+	'nogallery'                 => array( '0', '__RIKCHASUYUNNAQ__', '__NOGALERÍA__', '__NOGALERIA__', '__SIN_GALERÍA__', '__NOGALLERY__' ),
+	'forcetoc'                  => array( '0', '__YUYARINATAATIPACHIY__', '__FORZARTDC__', '__FORZARTOC__', '__FORZAR_TDC__', '__FORCETOC__' ),
 	'toc'                       => array( '0', '__YUYARINA__', '__TDC__', '__TOC__' ),
-	'noeditsection'             => array( '0', '__AMARAKITAHUKCHAYCHU__', '__NOEDITARSECCIÓN__', '__NOEDITARSECCION__', '__NOEDITSECTION__' ),
-	'noheader'                  => array( '0', '__UMANNAQ__', '__NOTÍTULO__', '__NOTITULO__', '__NOHEADER__' ),
+	'noeditsection'             => array( '0', '__AMARAKITAHUKCHAYCHU__', '__NOEDITARSECCIÓN__', '__NOEDITARSECCION__', '__NO_EDITAR_SECCIÓN__', '__NOEDITSECTION__' ),
 	'currentmonth'              => array( '1', 'KUNANKILLA', 'MESACTUAL', 'MES_ACTUAL', 'MESACTUAL2', 'CURRENTMONTH', 'CURRENTMONTH2' ),
 	'currentmonthname'          => array( '1', 'KUNANKILLASUTI', 'NOMBREMESACTUAL', 'NOMBRE_MES_ACTUAL', 'MESACTUALCOMPLETO', 'CURRENTMONTHNAME' ),
 	'currentmonthnamegen'       => array( '1', 'KUNANKILLASUTIP', 'GENERADORNOMBREMESACTUAL', 'MESACTUALGENITIVO', 'CURRENTMONTHNAMEGEN' ),
@@ -183,7 +182,7 @@ $magicWords = array(
 	'subjectpagename'           => array( '1', 'QILLQAPANQASUTI', 'NOMBREDEPAGINADETEMA', 'NOMBREDEPÁGINADETEMA', 'NOMBREDEPÁGINADEASUNTO', 'NOMBREDEPAGINADEASUNTO', 'NOMBREDEPAGINADEARTICULO', 'NOMBREDEPÁGINADEARTÍCULO', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
 	'subjectpagenamee'          => array( '1', 'QILLQAPANQASUTIE', 'NOMBREDEPAGINADETEMAC', 'NOMBREDEPÁGINADETEMAC', 'NOMBREDEPÁGINADEASUNTOC', 'NOMBREDEPAGINADEASUNTOC', 'NOMBREDEPAGINADEARTICULOC', 'NOMBREDEPÁGINADEARTÍCULOC', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
 	'msg'                       => array( '0', 'WILLA:', 'MSJ:', 'MSG:' ),
-	'subst'                     => array( '0', 'WAKCHAY:', 'SUBST:' ),
+	'subst'                     => array( '0', 'WAKCHAY:', 'SUST:', 'FIJAR:', 'SUBST:' ),
 	'msgnw'                     => array( '0', 'WILLAMUSUQ:', 'MSGNW:' ),
 	'img_thumbnail'             => array( '1', 'rikchacha', 'miniaturadeimagen', 'miniatura', 'mini', 'thumbnail', 'thumb' ),
 	'img_manualthumb'           => array( '1', 'rikchacha=$1', 'miniaturadeimagen=$1', 'miniatura=$1', 'thumbnail=$1', 'thumb=$1' ),
@@ -236,7 +235,7 @@ $magicWords = array(
 	'ucfirst'                   => array( '0', 'HATUNÑAWPAQ:', 'HATUNNAWPAQ:', 'PRIMEROMAYUS;', 'PRIMEROMAYÚS:', 'UCFIRST:' ),
 	'lc'                        => array( '0', 'UCHUY:', 'MINUS:', 'MINÚS:', 'LC:' ),
 	'uc'                        => array( '0', 'HATUN:', 'MAYUS:', 'MAYÚS:', 'UC:' ),
-	'raw'                       => array( '0', 'CHAWA:', 'RAW:' ),
+	'raw'                       => array( '0', 'CHAWA:', 'SINFORMATO', 'SINPUNTOS', 'RAW:' ),
 	'displaytitle'              => array( '1', 'SUTITARIKUCHIY', 'MOSTRARTÍTULO', 'MOSTRARTITULO', 'DISPLAYTITLE' ),
 	'currentversion'            => array( '1', 'KUNANMUSUQCHASQA', 'REVISIÓNACTUAL', 'VERSIONACTUAL', 'VERSIÓNACTUAL', 'CURRENTVERSION' ),
 	'urlencode'                 => array( '0', 'URLLLAWICHAY', 'URL-LLAWICHAY', 'CODIFICAR', 'CODIFICARURL:', 'URLENCODE:' ),
@@ -246,7 +245,7 @@ $magicWords = array(
 	'directionmark'             => array( '1', 'PURIRIYSANANCHA', 'DIRECTIONMARK', 'DIRMARK' ),
 	'language'                  => array( '0', '#RIMAY:', '#IDIOMA:', '#LANGUAGE:' ),
 	'contentlanguage'           => array( '1', 'SAMIQRIMAY', 'IDIOMADELCONTENIDO', 'IDIOMADELCONT', 'CONTENTLANGUAGE', 'CONTENTLANG' ),
-	'pagesinnamespace'          => array( '1', 'SUTIKITIPIPANQAKUNA:', 'PAGESINNAMESPACE:', 'PAGESINNS:' ),
+	'pagesinnamespace'          => array( '1', 'SUTIKITIPIPANQAKUNA:', 'PÁGINASENESPACIO', 'PAGESINNAMESPACE:', 'PAGESINNS:' ),
 	'numberofadmins'            => array( '1', 'HAYKAKAMACHIQ', 'NÚMEROADMINISITRADORES', 'NÚMEROADMINS', 'NUMEROADMINS', 'NUMEROADMINISTRADORES', 'NUMERODEADMINISTRADORES', 'NUMERODEADMINS', 'NÚMERODEADMINISTRADORES', 'NÚMERODEADMINS', 'NÚMEROADMINIISTRADORES', 'NUMBEROFADMINS' ),
 	'formatnum'                 => array( '0', 'YUPAYRIKCHAKUY', 'FORMATONÚMERO', 'FORMATONUMERO', 'FORMATNUM' ),
 	'padleft'                   => array( '0', 'PADLLUQI', 'PADICHUQ', 'PADLEFT' ),
@@ -273,7 +272,7 @@ $messages = array(
 'tog-hidepatrolled' => "Patrullasqa llamk'apusqakunata ñaqha hukchasqapi pakay",
 'tog-newpageshidepatrolled' => "Patrullasqa llamk'apusqakunata musuq p'anqakunapi pakay",
 'tog-extendwatchlist' => "Watiqana sutisuyuta tukuy rurachinalla hukchaykunaman mast'ay, ama lliwmanta aswan ñaqhallachu",
-'tog-usenewrc' => "Sananchasqa ñaqha hukchasqakuna (JavaScript nisqallawanmi llamk'an)",
+'tog-usenewrc' => "Huñu hukchasqakuna p'anqallakama ñaqha hukchasqakunapi watiqasqakunapipas (JavaScript nisqallawanmi llamk'an)",
 'tog-numberheadings' => "Uma siq'ikunata kikinmanta yupay",
 'tog-showtoolbar' => "Llamk'apuna sillwita rikuchiy",
 'tog-editondblclick' => "P'anqakunata llamk'apuy iskaylla ñit'iywan (JavaScript)",
@@ -281,17 +280,17 @@ $messages = array(
 'tog-editsectiononrightclick' => "Rakirilla llamk'apuyta saqillay paña butunta rakirip sutinpi ñit'ispa (JavaScript)",
 'tog-showtoc' => "Yuyarina wachuchasqata rikuchiy (kimsamanta aswan uma siq'iyuq p'anqakunapaq)",
 'tog-rememberpassword' => "Ruraqpa sutiyta yaykuna rimaytapas yuyaykuy kay llika wamp'unapi ({{PLURAL:$1|huk p'unchawkama|$1 p'unchawkama}})",
-'tog-watchcreations' => "Qallarisqay p'anqakunata watiqay.",
-'tog-watchdefault' => "Hukchasqay p'anqakunata watiqay",
-'tog-watchmoves' => "Astasqay p'anqakunata watiqay",
-'tog-watchdeletion' => "Qullusqay p'anqakunata watiqay",
+'tog-watchcreations' => "Qallarisqay p'anqakunata churkusqay willañiqikunatapas watiqay",
+'tog-watchdefault' => "Hukchasqay p'anqakunata willañiqikunatapas watiqay",
+'tog-watchmoves' => "Astasqay p'anqakunata willañiqikunatapas watiqay",
+'tog-watchdeletion' => "Qullusqay p'anqakunata willañiqikunatapas watiqay",
 'tog-minordefault' => 'Tukuy hukchasqakunata kikinmanta aslla nispa sananchay',
 'tog-previewontop' => "Rikch'ay qhawana ñawpaqman, ama qhipanpi kachunchu",
 'tog-previewonfirst' => "Manaraq llamk'apuspa rikch'ayta qhaway",
 'tog-nocache' => "Llika wamp'unap ''cache'' nisqa paki hallch'anman ama niy",
-'tog-enotifwatchlistpages' => "Watiqasqay p'anqa hukchasqa kaptinqa, e-chaskita kachamuway",
+'tog-enotifwatchlistpages' => "Watiqasqay p'anqa icha willañiqi hukchasqa kaptinqa, e-chaskita kachamuway",
 'tog-enotifusertalkpages' => "Rimachinay p'anqa hukchasqa kaptinqa, e-chaskita kachamuway",
-'tog-enotifminoredits' => "P'anqapi uchuy hukchasqamantapas willawaspa e-chaskita kachamuway",
+'tog-enotifminoredits' => "P'anqapi icha willañiqipi uchuy hukchasqamantapas willawaspa e-chaskita kachamuway",
 'tog-enotifrevealaddr' => 'E-chaski imamaytayta rikuchiy willamuwanayki e-chaskikunapi',
 'tog-shownumberswatching' => "Rikuchiy hayk'a watiqaq ruraqkuna",
 'tog-oldsig' => "Kachkaqña silq'uy:",
@@ -423,7 +422,7 @@ $messages = array(
 'vector-action-protect' => 'Amachay',
 'vector-action-undelete' => 'Qullusqata paqarichiy',
 'vector-action-unprotect' => 'Amachayta wakinchay',
-'vector-simplesearch-preference' => 'Maskanapaq kallpachasqa sakumanakunata atichiy (Vector qarallapi)',
+'vector-simplesearch-preference' => 'Maskanapaq sikllallachasqa sinruta atichiy (Vector qarallapi)',
 'vector-view-create' => 'Kamariy',
 'vector-view-edit' => "Llamk'apuy",
 'vector-view-history' => 'Wiñay kawsayta qhaway',
@@ -529,6 +528,10 @@ $1",
 'youhavenewmessages' => '$1 qhawanayki kachkan ($2).',
 'newmessageslink' => 'Musuq willaymi',
 'newmessagesdifflink' => 'qayna hukchasqapi wakin kaynin',
+'youhavenewmessagesfromusers' => '$1 {{PLURAL:$3|huk ruraqmanta|$3 ruraqkunamanta}} qhawanayki kachkan ($2).',
+'youhavenewmessagesmanyusers' => '$1 achka ruraqkunamanta qhawanayki kachkan ($2).',
+'newmessageslinkplural' => '{{PLURAL:$1|Musuq willaymi|Musuq willaykunam}}',
+'newmessagesdifflinkplural' => 'qayna {{PLURAL:$1|hukchasqapi|hukchasqakunapi}} wakin kaynin',
 'youhavenewmessagesmulti' => 'Musuq willaykunam qhawanayki kachkan $1-pi',
 'editsection' => 'allichay',
 'editold' => "llamk'apuy",
@@ -582,7 +585,10 @@ Allin sapaq p'anqakunataqa tarinki [[Special:SpecialPages|Sapaq p'anqakuna]] nis
 'databaseerror' => 'Willañiqintin pantasqa',
 'dberrortext' => 'Willañiqimanta mañakuptiyki sintaksis pantasqam tukurqan.
 Llamp\'u kaq wakichipi pantasqachá.
-Qayna willañiqimanta mañakusqaqa karqan kaypacham: <blockquote><tt>$1</tt></blockquote> kay ruraypim: "<tt>$2</tt>". MySQL-pa kutichisqan pantasqaqa karqan "<tt>$3: $4</tt>".',
+Qayna willañiqimanta mañakusqaqa karqan kaypacham:
+<blockquote><code>$1</code></blockquote>
+kay ruraypim: "<code>$2</code>".
+Willañiqintinpa kutichisqan pantasqaqa karqan "<samp>$3: $4</samp>".',
 'dberrortextcl' => 'Willañiqimanta mañakuptiyki sintaksis pantasqam tukurqan.
 Qayna willañiqimanta mañakusqaqa karqan kaymi:
 "$1"
@@ -634,9 +640,11 @@ Tapuna: $2',
 'protectedpagetext' => "Kay p'anqaqa llamk'apuymanta amachasqam.",
 'viewsourcetext' => "Kay p'anqap pukyu qillqantam qhawayta iskaychaytapas atinki:",
 'viewyourtext' => "'''Qampa llamk'apusqayki'''p pukyu qillqantam qhawayta iskaychaytapas atinki:",
-'protectedinterface' => "Kay p'anqapiqa wakichintinpa uyapuranpaq qillqam.
-Wandalismu nisqamanta amachasqam kachkan.",
-'editinginterface' => "'''Paqtataq:''' Uyapura p'anqatam llamk'apuchkanki. Hukchaptiykiqa, chay uyapurap rikch'ayninqa hukyanqa huk ruraqkunapaqpas. Uyapurata t'ikrayta munaspaykiqa, [//translatewiki.net/wiki/Main_Page?setlang=qu translatewiki.net] nisqa MediaWiki t'ikrana ruraykamay llika tiyaypi ruranaykimanta hamut'ariy.",
+'protectedinterface' => "Kay p'anqapiqa wakichintinpa uyapuranpaq qillqam. Wandalismu nisqamanta amachasqam kachkan.
+Tukuy wikikunapi uyapuraman t'ikrasqakunata yapayta icha hukchayta munaspaykiqa, [//translatewiki.net/wiki/Main_Page?setlang=qu translatewiki.net] nisqa MediaWiki t'ikrana ruraykamay llika tiyaypi ruray.",
+'editinginterface' => "'''Paqtataq:''' Llamp'u kaqpaq uyapura qillqakuna runanapaq p'anqatam llamk'apuchkanki.
+Hukchaptiykiqa, chay uyapurap rikch'ayninqa hukyanqa kay wikipi huk ruraqkunapaqpas.
+Uyapuraman t'ikrasqakunata yapayta icha hukchayta munaspaykiqa, [//translatewiki.net/wiki/Main_Page?setlang=qu translatewiki.net] nisqa MediaWiki t'ikrana ruraykamay llika tiyaypi ruranaykimanta hamut'ariy.",
 'sqlhidden' => '(SQL tapunaqa pakasqam)',
 'cascadeprotected' => "Kay p'anqaqa amachasqam kachkan, ''phaqcha'' nisqa kamachiwan amachasqa kay {{PLURAL:$1|p'anqapi|p'anqakunapi}} ch'aqtasqa kaspanmi:
 $2",
@@ -650,6 +658,7 @@ $2",
 Amachaq kamachiqqa kayrayku amachani nispa nirqanmi: "$3".',
 'invalidtitle-knownnamespace' => '"$2" sutisuyu, "$3" qillqasqayuq mana allin kaq qillqa suti',
 'invalidtitle-unknownnamespace' => 'Mana riqsisqa $1 kaq sutisuyu yupay, "$2" qillqasqayuq mana allin kaq qillqa suti',
+'exception-nologin' => 'Manam yaykurqankichu',
 
 # Virus scanner
 'virus-badscanner' => "Manam allintachu churapusqa: mana riqsisqa añaw maskaq: ''$1''",
@@ -892,10 +901,14 @@ Yaykurqaspaqa ''[[Special:ChangePassword|yaykuna rima hukchana]]'' p'anqapi kay
 'newarticle' => '(Musuq)',
 'newarticletext' => "Manaraq kachkaq p'anqatam llamk'apuchkanki. Musuq p'anqata kamariyta munaspaykiqa, qillqarillay. Astawan ñawiriyta munaspaykiqa, [[{{MediaWiki:Helppage}}|yanapana p'anqata]] qhaway. Mana munaspaykitaq, ñawpaq p'anqaman ripuy.",
 'anontalkpagetext' => "---- ''Kayqa huk sutinnaq icha mana sutinta llamk'achiq ruraqpa rimanakuyninmi. IP huchhantam hallch'asunchik payta sutinchanapaq. Achka ruraqkunam huklla IP huchhanta llamk'achiyta atin. Sutinnaq ruraq kaspaykiqa, mana qampa rurasqaykimanta willamusqakunata rikuspaykiqa, ama hina kaspa [[Special:UserLogin/signup|rakiqunaykita kamariy]] icha [[Special:UserLogin|yaykuy]] huk sutinnaq ruraqkunawan ama pantasqa kanaykipaq.''",
-'noarticletext' => "Kunanqa kay p'anqa ch'usaqmi. Kaytam rurayta atinkiman: kay p'anqap sutinta [[Special:Search/{{PAGENAME}}|huk p'anqakunapi maskay]], <span class=\"plainlinks\">[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} hallch'ankunapi maskay] icha [{{fullurl:{{FULLPAGENAME}}|action=edit}} kay p'anqata llamk'apuy]</span>.",
-'noarticletext-nopermission' => "Kay p'anqaqa ch'usaqmi.
-Kay p'anqap sutintaqa [[Special:Search/{{PAGENAME}}|huk p'anqakunapi maskaytam atinki]],
-icha payman kapuq <span class=\"plainlinks\">[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} hallch'akunapi maskaykiman]</span>.",
+'noarticletext' => "Kunanqa kay p'anqa ch'usaqmi kachkan.
+Kaytam rurayta atinkiman: kay p'anqap sutinta [[Special:Search/{{PAGENAME}}|huk p'anqakunapi maskay]],
+<span class=\"plainlinks\">[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} hallch'ankunapi maskay]
+icha [{{fullurl:{{FULLPAGENAME}}|action=edit}} kay p'anqata llamk'apuy]</span>.",
+'noarticletext-nopermission' => "Kunanqa kay p'anqa ch'usaqmi kachkan.
+Kaytam rurayta atinkiman: kay p'anqap sutinta [[Special:Search/{{PAGENAME}}|huk p'anqakunapi maskay]]
+icha payman kapuq <span class=\"plainlinks\">[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} hallch'akunapi maskay]</span>,
+ichataq kay p'anqata kamariyta manam saqillasunkichu.",
 'userpage-userdoesnotexist' => '"<nowiki>$1</nowiki>" sutiyuq ruraqpa rakiqunanqa manam kanchu. Ama hina kaspa, llanchikuy kay p\'anqata kamarinaykimanta.',
 'userpage-userdoesnotexist-view' => '"$1" sutiyuq rakiqunaqa manam hallch\'asqachu.',
 'blocked-notice-logextract' => "Kay ruraqqa hark'asqam kachkan.
@@ -904,7 +917,6 @@ Hark'ay hallch'api qhipaq hark'asqataqa kaypim rikunki willasunaykipaq:",
 * '''Firefox / Safari:''' ''Shift'' yatachkaspa ''Reload'' ñit'iy, ichataq ''Ctrl-F5'' icha ''Ctrl-R'' yatay (''⌘-R'' Mac nisqapi)
 * '''Google Chrome:''' ''Ctrl-Shift-R'' yatay (''⌘-Shift-R'' Mac nisqapi)
 * '''Internet Explorer:''' ''Ctrl'' yatachkaspa ''Refresh'' ñit'iy, icha ''Ctrl-F5'' yatay
-* '''Konqueror: '''''Reload'' ñit'iy icha ''F5'' yatay
 * '''Opera:''' ''cache'' nisqata ch'usaqchay kaypi: ''Tools → Preferences''",
 'usercssyoucanpreview' => "'''Kunay:''' \"{{int:showpreview}}\" nisqa ñit'inata llamk'achiy musuq css nisqata qhawanaykipaq, manaraq waqaychaspa.",
 'userjsyoucanpreview' => "'''Kunay:''' \"{{int:showpreview}}\" nisqa ñit'inata llamk'achiy musuq JavaScript nisqata qhawanaykipaq, manaraq waqaychaspa.",
@@ -919,7 +931,7 @@ Hark'ay hallch'api qhipaq hark'asqataqa kaypim rikunki willasunaykipaq:",
 'note' => "'''Musyay:'''",
 'previewnote' => "'''Yuyaykuy: Kayqa qhawariyllam.'''
 Llamk'apusqaykiqa manaraqmi waqaychasqachu!",
-'continue-editing' => "Llamk'apuyta qatiykuy",
+'continue-editing' => "Llamk'apuy millkaman riy",
 'previewconflict' => "Rikuchkanki kay p'anqataqa, ima hinachus waqaychasqa kanqa.",
 'session_fail_preview' => "'''Achachaw! Llamk'apusqaykiqa manam waqaychasqachu, llamk'ana tiyaypa willankuna chinkaptinmi. Ama hina kaspa, musuqmanta ruraykachay. Mana atispaykiqa, [[Special:UserLogout|lluqsispa]] musuqmanta yaykuy.'''",
 'session_fail_preview_html' => "'''Achachaw! Llamk'apusqaykiqa manam waqaychasqachu, llamk'ana tiyaypa willankuna chinkaptinmi.'''
@@ -994,6 +1006,12 @@ Qullusqachá.",
 Kachkañam.",
 'defaultmessagetext' => 'Ñawpaq qillqa',
 
+# Content models
+'content-model-wikitext' => 'wiki qillqa',
+'content-model-text' => 'qillqalla',
+'content-model-javascript' => 'JavaScript',
+'content-model-css' => 'CSS',
+
 # Parser/template warnings
 'expensive-parserfunction-warning' => "Paqtataq: Kay p'anqaqa nisyu achka qullqipaq t'ikrana rurana qayayniyuqmi.
 
@@ -1148,6 +1166,7 @@ Ama hina kaspa, hallch'akunapi qhaway.",
 'revdelete-reason-dropdown' => "*Qulluypaq sapsi raykukuna
 ** Ruraqpa hayñinta k'irisqa
 ** Runamanta mana allin willaykuna
+** Ruraqpa mana allin sutin
 ** Runata k'amiqchá willaykuna",
 'revdelete-otherreason' => 'Huk/aswan rayku:',
 'revdelete-reasonotherlist' => 'Huk rayku',
@@ -1334,7 +1353,7 @@ Pi kay k'itichapi llawiykita riqsiqpas watiqasqaykikunata ñawiriytam atinqa. Ch
 'timezoneregion-indian' => 'Indiku mama qucha',
 'timezoneregion-pacific' => 'Pasiphiku mama qucha',
 'allowemail' => 'Huk ruraqkunamanta e-chaskita saqillay',
-'prefs-searchoptions' => 'Akllanakunata maskay',
+'prefs-searchoptions' => 'Maskay',
 'prefs-namespaces' => "Suti k'itikuna",
 'defaultns' => "Mana hinaptintaq kay suti k'itikunapi maskay:",
 'default' => 'kikinmanta',
@@ -1732,7 +1751,7 @@ $1',
 'backend-fail-internal' => '"$1" sutiyuq willañiqi hallch\'ana sirwiqpi mana riqsisqa pantasqam tukurqan.',
 'backend-fail-contenttype' => 'Manam atinichu "$1" nisqapi hallch\'ana willañiqip samiqninpa layanta yuqanchayta.',
 'backend-fail-batchsize' => "Willañiqi hallch'ana sirwiqmanqa $1 willañiqi {{PLURAL:$1|ruranayuq|ruranayuq}} tawqam qusqa; saywataq $2 {{PLURAL:$1|ruranam|ruranam}}.",
-'backend-fail-usable' => 'Manam atinichu $1 sutiyuq willañiqita qillqayta, mana aypalla saqillaykuna icha mana churanakuna/qullqakuna kaptinmi.',
+'backend-fail-usable' => 'Manam atinichu "$1" sutiyuq willañiqita ñawiriyta icha qillqayta, mana aypalla saqillaykuna icha mana churanakuna/qullqakuna kaptinmi.',
 
 # File journal errors
 'filejournal-fail-dbconnect' => "Manam atinichu \"\$1\" sutiyuq willañiqi hallch'ana sirwiqpaq p'unchawnintin hallch'awan t'inkiyta.",
@@ -1942,7 +1961,9 @@ Ama hina kaspa, [$2 willañiqi ch'uyanchana p'anqata] qhaway astawan willachikun
 
 'disambiguations' => "Sut'ichana qillqakunaman t'inkimuq p'anqakuna",
 'disambiguationspage' => "Template:Sut'ichana qillqa",
-'disambiguations-text' => "Kay qatiq p'anqakunam t'inkimun '''sut'ichana qillqaman'''. Chiqap, hukchanasqa p'anqaman t'inkichun.<br />Tukuy [[MediaWiki:Disambiguationspage]] plantillayuq p'anqakunaqa sut'ichana qillqam.",
+'disambiguations-text' => "Kay qatiq p'anqakunam t'inkimun '''sut'ichana qillqa''' nisqaman.
+Chay rantiqa chiqap, hukchanasqa p'anqamanmi t'inkichun.<br />
+P'anqa [[MediaWiki:Disambiguationspage]] plantillayuq kaspaqa sut'ichana qillqam kanqa.",
 
 'doubleredirects' => 'Iskaylla pusapunakuna',
 'doubleredirectstext' => "Kay p'anqapiqa huk pusapuna p'anqaman pusapuq p'anqakunap sutinkunatam rikunki. Sapa sinrupiqa ñawpaq ñiqin, iskay ñiqinpas pusapunaman t'inkikunam, iskay ñiqin pusapunap taripananpa qallariyninpas, sapsilla \"chiqap\" allin taripana qillqam, maymanchus ñawpaq ñiqin pusapuna p'anqa pusachun.
@@ -2383,7 +2404,7 @@ Huklla llamk'apusqakunata paqarichinaykipaqqa, munasqayki llamk'apusqakunata akl
 'undeletedrevisions' => "{{PLURAL:$1|Huk paqarichisqa llamk'apusqa|$1 paqarichisqa llamk'apusqakuna}}",
 'undeletedrevisions-files' => "{{PLURAL:$1|1 llamk'apusqaqa|$1 llamk'apusqakunaqa}} {{PLURAL:$2|1 willañiqipas|$2 willañiqikunapas}} paqarichisqam",
 'undeletedfiles' => '{{PLURAL:$1|1 willañiqiqa|$1 willañiqikunaqa}} paqarichisqam',
-'cannotundelete' => 'Manam atinichu qullusqata paqarichiyta; huk runachá ñawpaqtaña qullusqata paqarichirqan.',
+'cannotundelete' => 'Manam atinichu qullusqata paqarichiyta: $1',
 'undeletedpage' => "'''$1 nisqaqa paqarichisqañam'''
 
 [[Special:Log/delete|Qulluy hallch'api]] qhaway ñaqha qullusqakunata paqarichisqakunatapas rikunaykipaq.",
@@ -2920,11 +2941,21 @@ Tukuy hawa wikimanta chaskisqakunaqa [[Special:Log/import|hawamanta chaskiy hall
 
 # Info page
 'pageinfo-title' => '"$1" sutiyuq p\'anqamanta willay',
-'pageinfo-header-edits' => "Llamk'apusqakuna",
+'pageinfo-header-edits' => "Llamk'apusqakunap wiñay kawsaynin",
 'pageinfo-views' => "Hayk'a qhawaykuna",
-'pageinfo-watchers' => "Hayk'a watiqaqkuna",
-'pageinfo-edits' => "Hayk'a hukchasqakuna",
-'pageinfo-authors' => "Hayk'a sapaq kaq ruraqkuna",
+'pageinfo-watchers' => "P'anqata hayk'a watiqaqkuna",
+'pageinfo-firstuser' => "P'anqap kamariqnin",
+'pageinfo-firsttime' => "P'anqa kamariypa p'unchawnin",
+'pageinfo-lastuser' => "Ñaqha llamk'apuqnin",
+'pageinfo-lasttime' => "Ñaqha llamk'apuypa p'unchawnin",
+'pageinfo-edits' => "Tukuymanta hayk'a hukchasqakuna",
+'pageinfo-authors' => "Tukuymanta hayk'a sapaq kaq ruraqkuna",
+'pageinfo-toolboxlink' => "P'anqamanta willakuna",
+'pageinfo-redirectsto' => 'Kayman pusampun:',
+'pageinfo-redirectsto-info' => 'willachikuy',
+'pageinfo-contentpage' => "Samiqniyuq p'anqa hinam chaninchasqa",
+'pageinfo-contentpage-yes' => 'Arí',
+'pageinfo-protect-cascading-yes' => 'Arí',
 
 # Patrolling
 'markaspatrolleddiff' => 'Qhawakipasqaman sananchay',
@@ -3624,7 +3655,7 @@ Rikchakunatataq hunt'a ch'irkukupim rikunki. Huk willañiqi llayakunaqa tantapus
 * <span class="mw-specialpagerestricted">Sapaqkunallapaq sapaq p\'anqakuna.</span>',
 'specialpages-group-maintenance' => 'Hatalliy willaykuna',
 'specialpages-group-other' => "Huk sapaq p'anqakuna",
-'specialpages-group-login' => 'Yaykuy / rakiqunata kichariy',
+'specialpages-group-login' => 'Yaykuy / rakiqunata kamariy',
 'specialpages-group-changes' => "Ñaqha hukchasqa hallch'asqapas",
 'specialpages-group-media' => 'Midya willaykuna churkuykunapas',
 'specialpages-group-users' => 'Ruraqkuna hayñinkunapas',
diff --git a/languages/messages/MessagesQug.php b/languages/messages/MessagesQug.php
index ae3564fb34..38deb9678a 100644
--- a/languages/messages/MessagesQug.php
+++ b/languages/messages/MessagesQug.php
@@ -163,7 +163,6 @@ $messages = array(
 'qbbrowse' => 'Maskana',
 'qbedit' => 'Killkana',
 'qbpageoptions' => 'Pankapak akllanakuna',
-'qbpageinfo' => 'Pankamanta willaykuna',
 'qbmyoptions' => 'Ñukapak pankakuna',
 'qbspecialpages' => 'mans shukkunashina pankakuna',
 'faq' => 'Ashtawan tapushkaka tapunakuna',
diff --git a/languages/messages/MessagesRgn.php b/languages/messages/MessagesRgn.php
index 16f54fad10..9cc078e803 100644
--- a/languages/messages/MessagesRgn.php
+++ b/languages/messages/MessagesRgn.php
@@ -157,7 +157,6 @@ $messages = array(
 'qbbrowse' => 'Sföja',
 'qbedit' => 'Mudèfica',
 'qbpageoptions' => 'Upziòn dla pàgina',
-'qbpageinfo' => 'Infurmaziòn sora la pàgina',
 'qbmyoptions' => 'Al mi pàgin',
 'qbspecialpages' => 'Pàgin particulèri',
 'faq' => 'Question frequenti',
diff --git a/languages/messages/MessagesRm.php b/languages/messages/MessagesRm.php
index e295cd6cb1..d9920576c9 100644
--- a/languages/messages/MessagesRm.php
+++ b/languages/messages/MessagesRm.php
@@ -49,7 +49,7 @@ $messages = array(
 'tog-hidepatrolled' => 'Zuppentar midadas controlladas en las «ultimas midadas»',
 'tog-newpageshidepatrolled' => 'Zuppentar paginas controlladas en las «paginas novas»',
 'tog-extendwatchlist' => "Extender la glista d'observaziun per mussar tut las midadas e betg be las ultimas",
-'tog-usenewrc' => "Duvrar la versiun extendida da las ''Ultimas midadas'' (basegna JavaScript)",
+'tog-usenewrc' => "Gruppar las midadas tenor pagina en las ''ultimas midadas'' ed la ''glista d'observaziun'' (basegna JavaScript)",
 'tog-numberheadings' => 'Numerar automaticamain ils titels',
 'tog-showtoolbar' => "Mussa la trav d'utensils (basegna JavaScript)",
 'tog-editondblclick' => 'Modifitgar paginas cun in clic dubel (basegna JavaScript)',
@@ -57,17 +57,17 @@ $messages = array(
 'tog-editsectiononrightclick' => 'Activar la pussaivladad da modifitgar secziuns cun in clic dretg (basegna JavaScript)',
 'tog-showtoc' => 'Mussar ina tabla da cuntegn sin paginas cun dapli che trais tetels',
 'tog-rememberpassword' => "S'annunziar permanantamain cun quest navigatur (per maximalmain $1 {{PLURAL:$1|di|dis}})",
-'tog-watchcreations' => "Observar paginas ch'jau hai creà",
-'tog-watchdefault' => "Observar paginas ch'jau hai edità",
-'tog-watchmoves' => "Observar paginas ch'jau hai spustà",
-'tog-watchdeletion' => "Observar paginas ch'jau hai stizzà",
+'tog-watchcreations' => "Agiuntar paginas ch'jeu creesch e datotecas ch'jau transferesch a la glista d'observaziun",
+'tog-watchdefault' => "Agiuntar paginas e datotecas ch'jau modifitgesch a la glista d'observaziun",
+'tog-watchmoves' => "Agiuntar paginas e datotecas ch'jau hai spustà a la glista d'observaziun",
+'tog-watchdeletion' => "Agiuntar paginas e datotecas ch'jau hai stizzà a la glista d'observaziun",
 'tog-minordefault' => 'Marcar tut las modificaziuns per ordinari sco pitschnas',
 'tog-previewontop' => "Mussar la prevista sur il champ d'endatziun",
 'tog-previewonfirst' => "Adina mussar la prevista suenter l'emprima modificaziun",
 'tog-nocache' => 'Impedir che tes navigatur memorisescha las paginas en il cache',
-'tog-enotifwatchlistpages' => "Trametta in e-mail sch'ina pagina sin mia glista d'observaziun vegn midada",
+'tog-enotifwatchlistpages' => "Ma trametter in e-mail sch'ina pagina u ina datoteca sin mia glista d'observaziun vegn midada",
 'tog-enotifusertalkpages' => "Trametta in e-mail sch'i ha dà midadas sin mia pagina da discussiun.",
-'tog-enotifminoredits' => 'Trametta era in e-mail tar pitschnas midadas da las paginas',
+'tog-enotifminoredits' => 'Era ma trametter in e-mail en cas da midadas pitschnas vid paginas u datotecas',
 'tog-enotifrevealaddr' => "Mussar mia adressa dad e-mail en e-mails d'avis",
 'tog-shownumberswatching' => "Mussar il dumber d'utilisaders che obervan questa pagina",
 'tog-oldsig' => 'Signatura actuala:',
@@ -186,7 +186,6 @@ $messages = array(
 'qbbrowse' => 'Sfegliar',
 'qbedit' => 'Modifitgar',
 'qbpageoptions' => 'Questa pagina',
-'qbpageinfo' => 'Context',
 'qbmyoptions' => 'Mia pagina',
 'qbspecialpages' => 'paginas spezialas',
 'faq' => 'FAQ',
@@ -199,7 +198,7 @@ $messages = array(
 'vector-action-protect' => 'Bloccar',
 'vector-action-undelete' => 'Restituir',
 'vector-action-unprotect' => 'Midar la protecziun',
-'vector-simplesearch-preference' => 'Activar las propostas per tschertgar extendidas (be per il skin Vector)',
+'vector-simplesearch-preference' => 'Activar la trav da tschertgar simplifitgada (be per il skin Vector)',
 'vector-view-create' => 'Crear',
 'vector-view-edit' => 'Modifitgar',
 'vector-view-history' => 'Cronologia',
@@ -305,6 +304,10 @@ $1',
 'youhavenewmessages' => 'Ti has $1 ($2).',
 'newmessageslink' => 'novs messadis',
 'newmessagesdifflink' => "l'ultima midada",
+'youhavenewmessagesfromusers' => 'Ti has $1 da{{PLURAL:$3|d in utilisader| $3 utilisaders}} ($2).',
+'youhavenewmessagesmanyusers' => 'Ti has $1 da divers utilisaders ($2).',
+'newmessageslinkplural' => '{{PLURAL:$1|in nov messadi|novs messadis}}',
+'newmessagesdifflinkplural' => 'ultima{{PLURAL:$1| midada|s midadas}}',
 'youhavenewmessagesmulti' => 'Ti as novs messadis en $1',
 'editsection' => 'modifitgar',
 'editold' => 'modifitgar',
@@ -361,9 +364,9 @@ Ina glista da las paginas spezialas existentas chattais vus sut [[Special:Specia
 'dberrortext' => 'In sbagl da la sintaxa da la dumonda a la banca da datas è capità.
 Quai po esser in sbagl en la software.
 L\'ultima dumonda per la banca da datas era:
-<blockquote><tt>$1</tt></blockquote>
-ord la funcziun "<tt>$2</tt>".
-La banca da datas ha rapportà l\'errur "<tt>$3: $4</tt>".',
+<blockquote><code>$1</code></blockquote>
+ord la funcziun "<code>$2</code>".
+La banca da datas ha rapportà l\'errur "<samp>$3: $4</samp>".',
 'dberrortextcl' => 'In sbagl da la sintaxa da la dumonda a la banca da datas è capità.
 L\'ultima dumonda per la banca da datas era:
 "$1"
@@ -400,6 +403,8 @@ Annunzia per plaschair la URL ad in [[Special:ListUsers/sysop|administratur]].',
 'cannotdelete' => 'Betg pussaivel da stizzar la pagina u datoteca "$1".
 Eventualmain ha gia insatgi auter stizza quest element.',
 'cannotdelete-title' => 'Impussibel da stizzar la pagina "$1"',
+'delete-hook-aborted' => 'Il prozess da stizzar è vegnì interrut dal hook. 
+El ha dà nagina explicaziun.',
 'badtitle' => "Il num da titel endatà n'è betg valid",
 'badtitletext' => 'Il titel da pagina era betg valid, vids u in titel inter-lingua u inter-wiki betg correct.
 El po cuntegnair in u plirs segns che na pon betg vegnir utilisads en titels.',
@@ -417,8 +422,11 @@ Query: $2',
 Emprova danovamain en in per minutas.',
 'protectedpagetext' => "Questa pagina è vegnida bloccada per evitar ch'ella vegn modifitgada.",
 'viewsourcetext' => 'Ti pos guardar e copiar il code-fundamental da questa pagina:',
-'protectedinterface' => "Questa pagina cuntegna text per l'interfatscha da la software ed è protegida per evitar abus.",
-'editinginterface' => "'''Attenziun:''' Questa pagina cuntegna text che vegn duvra da la software MediaWiki. Midadas influenzeschan directamain l'interfatscha da l'utilisader. Sche ti vuls far translaziuns u correcturas: Studegia da far quai sin [//translatewiki.net/wiki/Main_Page?setlang=rm translatewiki.net], per che las midadas pon vegnidas surprendidas da tut ils projects.",
+'viewyourtext' => "Ti pos giardar e copiar la il code da funatuna da '''tias midadas''' vid questa pagina:",
+'protectedinterface' => "Questa pagina cuntegna ils texts per l'interfatscha da la software ed è protegida per evitar abus.",
+'editinginterface' => "'''Attenziun:''' Questa pagina cuntegna text che vegn duvra en la interfatscha da questa software. 
+Midadas influenzeschan directamain l'interfatscha per tut ils utilisaders sin questa vichi. 
+Sche ti vuls far translaziuns u correcturas per tut las vichis, lura utilisescha [//translatewiki.net/ translatewiki.net], il project per translatar MediaWiki.",
 'sqlhidden' => '(Zuppentà la dumonda da SQL)',
 'cascadeprotected' => "Questa pagina è protegida da modificaziuns perquai ch'ella è integrada en suandanta{{PLURAL:$1| pagina, ch'è protegida|s paginas, ch'èn protegidas}} entras l'opziun «protecziun ertada»: 
 $2",
@@ -428,6 +436,13 @@ $2",
 'ns-specialprotected' => 'Paginas spezialas no pon betg vegnir modifitgadas.',
 'titleprotected' => 'Quest titel è vegnì protegì da la creaziun da [[User:$1|$1]].
 Il motiv inditgà è "\'\'$2\'\'".',
+'filereadonlyerror' => 'Impussibel da modifitgar la datoteca "$1" perquai ch\'il repository da datotecas "$2" è en il modus \'be leger\'.
+
+L\'administratur che ha bloccà l\'access da scriva ha dà suandanta explicaziun: "$3".',
+'invalidtitle-knownnamespace' => 'Titel nunvalid cun tip da pagina "$2" e text "$3"',
+'invalidtitle-unknownnamespace' => 'Titel nunvalid cun numer da tip da pagina nunenconuschent $1 e text "$2"',
+'exception-nologin' => "Betg s'annunzià",
+'exception-nologin-text' => "Questa pagina u acziun pretenda che ti es s'annunzià en quest vichi.",
 
 # Virus scanner
 'virus-badscanner' => "Configuraziun fauss: antivirus nunenconuschent: ''$1''",
@@ -447,6 +462,7 @@ Betg emblida da midar tias [[Special:Preferences|preferenzas da {{SITENAME}}]].'
 'remembermypassword' => "S'annunziar permanantamain sin quest computer (per maximalmain $1 {{PLURAL:$1|di|dis}})",
 'securelogin-stick-https' => "Restar collià entras HTTPS suenter l'annunzia",
 'yourdomainname' => 'Vossa domain',
+'password-change-forbidden' => 'Ti na pos betg midar pleds-clav sin quest vichi.',
 'externaldberror' => "U ch'i è capità ina errur cun l'autentificaziun externa u che ti na dastgas betg actualisar tes conto extern.",
 'login' => "T'annunziar",
 'nav-login-createaccount' => "T'annunziar / registrar",
@@ -517,6 +533,8 @@ Perquei è anc nagin retschaiver e trametter dad e-mails per las suandantas func
 'emailconfirmlink' => "Confermar l'adressa dad e-mail",
 'invalidemailaddress' => "L'adressa dad e-mail na po betg vegnir acceptada perquai ch'ella para dad avair in format nunvalid. 
 Endatescha per plaschair ina adressa formatada correctamain u svida cumplettamain il champ.",
+'cannotchangeemail' => "L'adressa dad e-mail dal conto na po betg vegnir midada sin questa vichi.",
+'emaildisabled' => 'Questa pagina na sa betg trametter e-mails.',
 'accountcreated' => "Creà il conto d'utilisader",
 'accountcreatedtext' => "Il conto d'utilisader per $1 è vegnì creà.",
 'createaccount-title' => 'Crear in conto per {{SITENAME}}',
@@ -532,6 +550,7 @@ Spetga per plaschair avant ch'empruvar anc ina giada.",
 
 # E-mail sending
 'php-mail-error-unknown' => 'Errur nunenconuschenta en la funcziun mail() da PHP',
+'user-mail-no-addy' => 'Empruvà da trametter in e-mail senza ina adressa dad e-mail.',
 
 # Change password dialog
 'resetpass' => 'Midar il pled-clav',
@@ -560,6 +579,8 @@ Eventualmain has ti gia midà cun success tes pled-clav u dumandà per in nov pl
 'passwordreset-pretext' => '{{PLURAL:$1||Endatescha in dals tocs da data sutvart}}',
 'passwordreset-username' => "Num d'utilisader:",
 'passwordreset-domain' => 'Domain:',
+'passwordreset-capture' => "Mussar l'e-mail che resultescha?",
+'passwordreset-capture-help' => "Sche ti activeschas quest champ vegn l'e-mail (cun il pled-clav temporar) mussà a ti sco era tramess a l'utilisader.",
 'passwordreset-email' => 'Adressa dad e-mail:',
 'passwordreset-emailtitle' => 'Detagls davart il conto sn {{SITENAME}}',
 'passwordreset-emailtext-ip' => "Insatgi (probablamain ti da l'adressa dad IP $1) ha dumandà in nov pled-clav per la pagina {{SITENAME}} ($4). 
@@ -579,12 +600,18 @@ Ti duessas t'annunziar e tscherner ussa in nov pled-clav. Sche ti na levas betg
 'passwordreset-emailelement' => "Num d'utilisader: $1
 Pled-clav temporar: $2",
 'passwordreset-emailsent' => 'In e-mail cun in nov pled-clav è vegnì tramess.',
+'passwordreset-emailsent-capture' => "L'e-mail per far endament, che vegn mussà sutvart, è vegnì tramess.",
+'passwordreset-emailerror-capture' => "L'e-mail per far endament, che vegn mussà sutvart, è vegnì generà, ma ha dentant betg pudì vegnir spedì a l'utilisader: $1",
 
 # Special:ChangeEmail
 'changeemail' => "Midar l'adressa dad e-mail",
+'changeemail-header' => "Midar l'adressa dad e-mail dal conto",
+'changeemail-text' => 'Cumpletescha quest formular per midar tia adressa dad e-mail. Ti stos endatar tes pled-clav per confermar questa midada.',
 'changeemail-no-info' => "Ti stos t'annunziar per acceder directamain questa pagina.",
+'changeemail-oldemail' => 'Adressa dad e-mail actuala:',
 'changeemail-newemail' => ' Nova adressa dad e-mail',
 'changeemail-none' => '(nagina)',
+'changeemail-submit' => "Midar l'adressa dad e-mail",
 'changeemail-cancel' => 'Interrumper',
 
 # Edit page toolbar
@@ -678,8 +705,11 @@ Ti pos [[Special:Search/{{PAGENAME}}|tschertgar il term]] sin in\'autra pagina,
 <span class="plainlinks">[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} tschertgar en ils logs],
 u [{{fullurl:{{FULLPAGENAME}}|action=edit}} crear questa pagina]</span>.',
 'noarticletext-nopermission' => 'Questa pagina cuntegna actualmain nagin text.
-Ti pos [[Special:Search/{{PAGENAME}}|tschertgar il term]] sin in\'autra pagina,
-<span class="plainlinks">[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} tschertgar en ils logs]</span>.',
+Ti pos [[Special:Search/{{PAGENAME}}|tschertgar quest titel]] en autras paginas u <span class="plainlinks">[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} tschertgar en ils protocols correspundents]</span>, ma ti n\'has betg ils dretgs da crear questa pagina.',
+'missing-revision' => 'La versiun #$1 da la pagina cun il num "{{PAGENAME}}" n\'exista betg.
+
+Quai capita savnes sche ti cliccas sin ina colliaziun antiquada en la cronologia per ina pagina ch\'è vegnida stizzada.
+Detagls pon vegnri chattads en il [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} protocol da stizzar].',
 'userpage-userdoesnotexist' => 'Il conto d\'utilisader "<nowiki>$1</nowiki>" n\'èxista betg.
 Controllescha sch ti vuls propi crear/modiftgar questa pagina.',
 'userpage-userdoesnotexist-view' => 'Il conto d\'utilisader "$1" n\'exista betg.',
@@ -689,7 +719,6 @@ L'ultima endataziun dal log da bloccar vegn mussà sutvart sco referenza:",
 * '''Firefox / Safari:''' Tegnair ''Shift'' durant cliccar ''chargiar danovamain'', u smatgar ''Ctrl-F5'' u ''Ctrl-R'' (''⌘-R'' sin in Mac)
 * '''Google Chrome:''' Smatgar ''Ctrl-Shift-R'' (''⌘-Shift-R'' sin in Mac)
 * '''Internet Explorer:''' Tegnair ''Ctrl'' durant cliccar ''Rechargiar,'' u smatgar ''Ctrl-F5''
-* '''Konqueror:''' Cliccar ''Rechargiar'' ni smatgar ''F5''
 * '''Opera:''' Stizzar il cache sut ''Tools → Preferences''",
 'usercssyoucanpreview' => "'''Tip:''' Utilisescha il buttun \"{{int:showpreview}}\" per testar tes nov CSS avant che memorisar.",
 'userjsyoucanpreview' => "'''Tip:''' Utilisescha il buttun \"{{int:showpreview}}\" per testar tes nov JavaScript avant che memorisar.",
@@ -707,6 +736,7 @@ Fa stim che titels da paginas persunalisadas .css u .js vegnan scrits pitschen,
 'note' => "'''Remartga:'''",
 'previewnote' => "'''Fa stim che quai è be ina prevista.'''
 Tias midadas n'èn anc betg vegnidas memorisadas!",
+'continue-editing' => 'Cuntinuar da modifitgar',
 'previewconflict' => "Questa prevista visualisescha il text en il champ d'endataziun sura. Uschia vegn la pagina vesair ora, sche ti la memoriseschas ussa.",
 'session_fail_preview' => "'''Stgisa! Tia modificaziun na pudeva betg vegnir memorisada perquei che las datas da la sesida èn idas a perder.'''
 Emprova per plaschair danovamain.
@@ -722,6 +752,7 @@ La modificaziun è vegnida refusada per evitar ch'il cuntegn da la pagina vegnia
 Quai po capitar sche ti utiliseschas in survetsch da proxy anonim che na funcziuna betg correctamain.",
 'edit_form_incomplete' => "'''Entginas parts dal formular da modifitgar n'èn betg arrivadas cumplattamain al server; controllescha p.pl. che tias midadas èn intactas ed emprova danovamain.'''",
 'editing' => 'Modifitgar $1',
+'creating' => 'Crear $1',
 'editingsection' => 'Modifitgar $1 (secziun)',
 'editingcomment' => 'Modifitgar $1 (nova secziun)',
 'editconflict' => 'Conflict da modifitgar: $1',
@@ -787,6 +818,7 @@ I para sco sch'ella fiss vegnida stizzada.",
 'edit-conflict' => 'Conflict da modifitgar.',
 'edit-no-change' => 'Tia modificaziun è vegnida ignorada perquai che naginas midadas èn vegnidas fatgas en il text.',
 'edit-already-exists' => "Betg pussaivel da crear ina nova pagina perquai ch'ella exista gia.",
+'defaultmessagetext' => 'Text da standard',
 
 # Parser/template warnings
 'expensive-parserfunction-warning' => "'''Attenziun:''' Questa pagina cuntegna memia bleras funcziuns dal parser cumplitgadas. 
@@ -802,6 +834,13 @@ Quests arguments vegnan ignorads.",
 'parser-template-loop-warning' => 'Chattà cirquit da models: [[$1]]',
 'parser-template-recursion-depth-warning' => 'Surpassa la limita da recursiun da models ($1)',
 'language-converter-depth-warning' => 'Surpassà la limita ($1) dal convertader da linguas',
+'node-count-exceeded-category' => "Paginas, nua ch'il dumber da nufs è surpassà",
+'node-count-exceeded-warning' => 'Questa pagina ha surpassà il dumber da nufs',
+'expansion-depth-exceeded-category' => "Paginas, nua che la porfunditad d'extensiun è surpassada",
+'expansion-depth-exceeded-warning' => "Questa pagina ha surpassà la profunditad d'expansiun",
+'parser-unstrip-loop-warning' => "Chattà circul d'unstrip",
+'parser-unstrip-recursion-limit' => 'Limita da recursiun ($1) per unstrip è surpassà',
+'converter-manual-rule-error' => 'Ina errur è cumparida en la regla manuala da convertir la lingua',
 
 # "Undo" feature
 'undo-success' => 'Questa modificaziun na po betg vegnir revocada.
@@ -866,20 +905,20 @@ Ti pos anc adina [$1 contemplar questa versiun].",
 'rev-deleted-text-view' => "Questa versiun da la pagina è vegnida '''stizzada'''.
 Ti pos la vesair; detagls pon vegnir chattads en il [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} log da stizzar].",
 'rev-suppressed-text-view' => "Questa versiun da la pagina è vegnida '''supprimida'''.
-Sco administratur pos ti la vesair; detagls pon vegnir chattads en il [{{fullurl:{{#Special:Log}}/suppress|page={{FULLPAGENAMEE}}}}  log da supprimer].",
+Ti pos la vesair; detagls pon vegnir chattads en il [{{fullurl:{{#Special:Log}}/suppress|page={{FULLPAGENAMEE}}}}  log da supprimer].",
 'rev-deleted-no-diff' => "Ti na pos betg guardar quest diff perquai ch'ina da las versiuns è vegnida '''stizzada'''.
 Detagls pos ti chattar en [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} log da stizzar].",
 'rev-suppressed-no-diff' => "Ti na pos betg guardar quest diff perquai ch'ina da las versiuns è vegnida '''stizzada'''.",
 'rev-deleted-unhide-diff' => "Ina da las versiuns da quest diff è vegnida '''stizzada'''.
 Detagls pon vegnir chattads en il [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} log da stizzar].
-Sco administratur pos ti anc adina [$1 contemplar quest diff].",
+Ti pos anc adina [$1 contemplar quest diff] sche ti vuls cuntinuar.",
 'rev-suppressed-unhide-diff' => "Ina da las versiuns da quest diff è vegnida '''supprimida'''.
 Detagls pon vegnir chattads en il [{{fullurl:{{#Special:Log}}/suppress|page={{FULLPAGENAMEE}}}} log da supprimer].
-Sco administratur pos ti anc adina [$1 contemplar quest diff] sche ti vuls cuntinuar.",
+Ti pos anc adina [$1 contemplar quest diff] sche ti vuls cuntinuar.",
 'rev-deleted-diff-view' => "Ina da las versiuns da quest diff è vegnida '''stizzada'''.
-Sco administratur pos ti vesair quest diff; detagls pon vegnir chattads en il [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} log da stizzar].",
+Ti pos vesair quest diff; detagls pon vegnir chattads en il [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} log da stizzar].",
 'rev-suppressed-diff-view' => "Ina da las versiuns da quest diff è vegnida '''supprimida'''.
-Sco administratur pos ti vesair quest diff; detagls pon vegnir chattads en il [{{fullurl:{{#Special:Log}}/suppress|page={{FULLPAGENAMEE}}}}  log da supprimer].",
+Ti pos vesair quest diff; detagls pon vegnir chattads en il [{{fullurl:{{#Special:Log}}/suppress|page={{FULLPAGENAMEE}}}}  log da supprimer].",
 'rev-delundel' => 'mussar/zuppentar',
 'rev-showdeleted' => 'mussar',
 'revisiondelete' => 'Stizzar/restituir versiuns',
@@ -894,18 +933,62 @@ Sco administratur pos ti vesair quest diff; detagls pon vegnir chattads en il [{
 'revdelete-show-file-submit' => 'Gea',
 'revdelete-selected' => "'''{{PLURAL:$2|Versiun tschernida|Versiuns tschernidas}} da [[:$1]]:'''",
 'logdelete-selected' => "'''{{PLURAL:$1|Elements dal log tschernì|Elements dal log tschernids}}:'''",
+'revdelete-text' => "'''Versiuns ed ocurrenzas stizzadas cumparan era vinavant en la cronologia ed en ils protocols, dentant èn parts dal cuntegn betg accessibels al public.'''
+Auters administraturs sin {{SITENAME}} vegnan tuttina ad avair access al cuntegn zuppentà e pon restaurar puspè la pagina, sch'i na vegnan betg definidas restricziuns supplementaras.",
+'revdelete-confirm' => 'Confermescha che ti vuls far quai, che ti chapeschas las consequenzas e che ti fas quai en accordanza cun [[{{MediaWiki:Policy-url}}|las directivas]].',
+'revdelete-suppress-text' => "Ti duessas '''be''' supprimer en quests cas: 
+* Infurmaziuns offendentas
+* Infurmaziuns persunalas deplazzadas
+*: ''Adressas e numers da telefon, numers d'AVS, etc.''",
+'revdelete-legend' => 'Definir restricziuns da la visibilitad',
+'revdelete-hide-text' => 'Zuppetar il text da la versiun',
+'revdelete-hide-image' => 'Zuppentar il cuntegn da la datoteca',
+'revdelete-hide-name' => "Zuppentar l'acziun ed la destinaziun",
+'revdelete-hide-comment' => 'Zuppentar la resumaziun da la midada',
+'revdelete-hide-user' => "Zuppentar il num d'utilisader/l'adressa IP da l'autur",
+'revdelete-hide-restricted' => 'Supprimer las datas per administraturs sco per auters',
+'revdelete-radio-same' => '(na betg midar)',
 'revdelete-radio-set' => 'Gea',
 'revdelete-radio-unset' => 'Na',
+'revdelete-suppress' => 'Supprimer il motiv per administraturs sco per auters',
+'revdelete-unsuppress' => 'Allontanar las restricziuns per versiuns restauradas',
 'revdelete-log' => 'Motiv:',
+'revdelete-submit' => 'Applitar a {{PLURAL:$1|la versiun tschernida|las versiuns tschernidas}}',
+'revdelete-success' => "'''Actualià cun success la visibilitad da la versiun.'''",
+'revdelete-failure' => "'''Betg pussaivel da midar la visibilitad da la versiun:'''
+$1",
+'logdelete-success' => "'''Definì cun success la visibilitad dal protocol.'''",
+'logdelete-failure' => "'''Betg pussaivel da midar la visibilitad dal protocol:'''
+$1",
 'revdel-restore' => 'midar la visibilitad',
 'revdel-restore-deleted' => 'versiuns stizzadas',
 'revdel-restore-visible' => 'versiuns visiblas',
 'pagehist' => 'Istorgia da las versiuns',
+'deletedhist' => 'Cronologia da stizzar',
+'revdelete-hide-current' => "Errur cun zuppentar l'element datà ils $1 las $2: Quai è la versiun actuala. 
+Ella na po betg vegnir zuppentada.",
+'revdelete-show-no-access' => 'Errur cun mussar l\'element datà ils $1 las $2: Quest element è vegnì marcà sco "restrenschì".
+Ti n\'has nagin access ad ella.',
+'revdelete-modify-no-access' => 'Errur cun modifitgar l\'element datà ils $1 las $2: Quest element è vegnì marcà sco "restrenschì".
+Ti n\'has nagin access ad ella.',
+'revdelete-modify-missing' => "Errur cun modifitgar l'element cun l'ID $1: El manca en la banca da datas!",
+'revdelete-no-change' => "'''Attenziun:''' L'element datà ils $1 las $2 ha gia giu la configuraziun da visibilitad dumandada.",
+'revdelete-concurrent-change' => "Errur cun modifitgar l'element datà ils $1 las $2: Il status para dad avair midà dad insatgi durant che ti has empruvà da modifitgar el. 
+Controllescha per plaschair ils protocols.",
+'revdelete-only-restricted' => "Errur cun zuppentar l'element datà ils $1 las$2: Ti na pos betg zuppentar elements dad administraturs senza era tscherner ina da las autras opziuns da visibilitad.",
+'revdelete-reason-dropdown' => "*Motivs generals per stizzar
+** Violaziun da dretgs d'autur
+** Commentari nunadattà u infurmaziuns persunalas
+** Num d'utilisader betg adattà
+** Infurmaziuns potenzialmain disfamantas",
 'revdelete-otherreason' => 'Auter/ulteriur motiv:',
 'revdelete-reasonotherlist' => 'Auter motiv',
 'revdelete-edit-reasonlist' => 'Modifitgar ils motivs per stizzar',
 'revdelete-offender' => 'Autur da la versiun:',
 
+# Suppression log
+'suppressionlog' => 'Protocol da suppressiuns',
+
 # History merging
 'mergehistory' => 'Unir la cronologia da paginas',
 'mergehistory-header' => "Cun questa pagina speziala pos ti integrar versiuns da la cronologia d'ina pagina originala en ina pagina pli nova. 
@@ -1029,7 +1112,10 @@ Considerescha che lur index da {{SITENAME}} po cuntegnair datas ch'èn betg pli
 'prefs-skin' => 'Skin',
 'skin-preview' => 'Prevista',
 'datedefault' => 'Nagina preferenza',
+'prefs-beta' => 'Funcziuns da Beta',
 'prefs-datetime' => 'Data e temp',
+'prefs-labs' => 'Funcziuns experimentalas',
+'prefs-user-pages' => 'Paginas dad utilisader',
 'prefs-personal' => "Profil da l'utilisader",
 'prefs-rc' => 'Ultimas midadas',
 'prefs-watchlist' => "Glista d'observaziun",
@@ -1040,6 +1126,8 @@ Considerescha che lur index da {{SITENAME}} po cuntegnair datas ch'èn betg pli
 'prefs-watchlist-token' => "Token da la glista d'observaziun",
 'prefs-misc' => 'Different',
 'prefs-resetpass' => 'Midar il pled clav',
+'prefs-changeemail' => "Midar l'adressa dad e-mail",
+'prefs-setemail' => 'Definir ina adressa dad e-mail',
 'prefs-email' => 'Opziuns dad e-mail',
 'prefs-rendering' => 'Cumparsa',
 'saveprefs' => 'memorisar',
@@ -1074,7 +1162,7 @@ Considerescha che lur index da {{SITENAME}} po cuntegnair datas ch'èn betg pli
 'timezoneregion-indian' => 'Ocean Indic',
 'timezoneregion-pacific' => 'Ocean pacific',
 'allowemail' => 'Retschaiver e-mails dad auters utilisaders',
-'prefs-searchoptions' => 'Opziuns da tschertgar',
+'prefs-searchoptions' => 'Tschertgar',
 'prefs-namespaces' => 'Tips da pagina',
 'defaultns' => 'Uschiglio tschertgar en quests tips da pagina:',
 'default' => 'Standard',
@@ -1704,7 +1792,7 @@ I renviescha uss a [[$2]].',
 
 # Special:Log
 'specialloguserlabel' => 'Acziun exequida da:',
-'speciallogtitlelabel' => 'Titel:',
+'speciallogtitlelabel' => 'Destinaziun (titel u utilisader):',
 'log' => 'logs / cudesch da navigaziun',
 'all-logs-page' => 'Tut ils logs publics',
 
@@ -1737,9 +1825,9 @@ I renviescha uss a [[$2]].',
 'linksearch-pat' => 'Muster da tschertgar:',
 'linksearch-ns' => 'Tip da pagina:',
 'linksearch-ok' => 'Tschertgar',
-'linksearch-text' => 'Sin questa pagina pos ti tschertgar paginas che cuntegnan colliaziuns a tschertas websites. 
-Uschenumnadas wildcards sco p.ex. "*.wikipedia.org" pon vegnir utilisadas.<br />
-Protocols sustegnids: <code>$1</code>',
+'linksearch-text' => 'Tegnaplazzas sco "*.wikipedia.org" pon vegnir utilisads.
+Dovra almain ina top-level domain, per exempel "*.org".<br />
+Protocols sustegnids: <code>$1</code> (n\'agiunta betg quels a tia tschertga).',
 'linksearch-line' => '$1 è collià davent da la pagina $2',
 'linksearch-error' => "Wildcards pon esser be a l'entschatta dal num da host.",
 
@@ -1785,6 +1873,8 @@ Infurmaziuns supplementaras davart ils singuls dretgs chattas [[{{MediaWiki:List
 'mailnologin' => 'Nagina adressa per trametter',
 'mailnologintext' => "Ti stos [[Special:UserLogin|t'annunziar]] ed avair ina adressa dad e-mail valida en tias [[Special:Preferences|preferenzas]] per trametter e-mails ad auters utilisaders.",
 '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 quest utilisader.
 L'adressa dad e-mail che ti has endatà en [[Special:Preferences|tias preferenzas]] vegn inditgada sco speditur da l'e-mail, uschia ch'il retschavider po rispunder directamain a tai.",
@@ -1843,7 +1933,7 @@ Midadas futuras vid quai artitgel e la pagina da discussiun appertegnenta vegnan
 'watchmethod-list' => 'intercurir las paginas observadas davart novas midadas',
 'watchlistcontains' => "Tia glista d'observaziun cuntegna $1 {{PLURAL:$1|pagina|paginas}}.",
 'iteminvalidname' => "Problem cun endataziun '$1', num nunvalid...",
-'wlnote' => "Sutvart {{PLURAL:$1|è l'ultima midada|èn las ultimas '''$1''' midadas}} entaifer {{PLURAL:$2|l'ultima ura|las ultimas '''$2''' uras}}.",
+'wlnote' => "Sutvart {{PLURAL:$1|è l'ultima midada|èn las ultimas '''$1''' midadas}} entaifer {{PLURAL:$2|l'ultima ura|las ultimas '''$2''' uras}}. Actualisà ils $3 las $4.",
 'wlshowlast' => 'Mussar: las ultimas $1 uras, ils ultims $2 dis u $3.',
 'watchlist-options' => "Opziuns per la glista d'observaziun",
 
@@ -2004,6 +2094,8 @@ L'archiv vegn eventualmain svidà periodicamain.",
 'undeleteextrahelp' => "Per restituir l'entira cronologia d'ina pagina, lascha inactiv tut las chaschettas e cllicca sin '''''{{int:undeletebtn}}'''''.
 Per restituir be tschertgas part, activescha las chaschettas correspundentas per las versiuns che duain vegnir restituidas e clicca sin '''''{{int:undeletebtn}}'''''.",
 'undeleterevisions' => 'Archivà $1 {{PLURAL:$1|versiun|versiuns}} archived',
+'undeletehistory' => "Sche ti restaureschas ina pagina vegnan tut las versiuns en la coronologia era restauradas. 
+Sch'ina nova pagina cun il medem num è vegnida creada dapi che la pagina è vegnida stizzada, vegnan las versiuns restauradas cumparir avant en la cronologia.",
 'undelete-nodiff' => 'Chattà naginas versiuns anteriuras.',
 'undeletebtn' => 'restituir',
 'undeletelink' => 'mussar/restituir',
@@ -2102,7 +2194,7 @@ Inditgescha sutvart in motiv (per exempel pos ti inditgar paginas ch'èn vegnida
 'badipaddress' => "L'adressa IP è nunvalida",
 'blockipsuccesssub' => 'Bloccà cun success',
 'blockipsuccesstext' => '[[Special:Contributions/$1|$1]] è vegnì bloccà.<br />
-Sin [[Special:BlockList|la glista dad IPs bliccadas]] pos ti repassar tut las bloccadas.',
+La [[Special:BlockList|glista da bloccadas]] mussa tut las bloccadas.',
 'ipb-edit-dropdown' => 'Modifitgar ils motivs per bloccar',
 'ipb-unblock-addr' => 'Debloccar $1',
 'ipb-unblock' => 'Debloccar in utilisader u ina adressa IP',
@@ -2507,11 +2599,31 @@ Probablamien è quai capità pervia dad in link ad ina pagina externa ch'è sin
 
 # Info page
 'pageinfo-title' => 'Infurmaziuns per "$1"',
-'pageinfo-header-edits' => 'Midadas',
+'pageinfo-header-basic' => 'Infurmaziuns da basa',
+'pageinfo-header-edits' => 'Cronologia da las midadas',
+'pageinfo-display-title' => 'Titel mussà',
+'pageinfo-default-sort' => 'Criteri da zavrar da standard',
+'pageinfo-length' => 'Lunghezza da la pagina (en bytes)',
+'pageinfo-article-id' => 'ID da la pagina',
+'pageinfo-robot-policy' => 'Status per maschinas da tschertgar',
+'pageinfo-robot-index' => 'Indexabel',
+'pageinfo-robot-noindex' => 'Betg indexabel',
 'pageinfo-views' => 'Dumber da visitas',
-'pageinfo-watchers' => 'Dumber dad observaturs',
-'pageinfo-edits' => 'Dumber da midadas',
-'pageinfo-authors' => 'Dumber dad auturs differents',
+'pageinfo-watchers' => 'Dumber dad observaturs da la pagina',
+'pageinfo-redirects-name' => 'Renviaments a questa pagina',
+'pageinfo-subpages-name' => 'Sutpaginas da questa pagina',
+'pageinfo-subpages-value' => '$1 ($2 {{PLURAL:$2|renviament|renviaments}}; $3 {{PLURAL:$3|betg in renviament|betg renviaments}})',
+'pageinfo-firstuser' => 'Creatur da la pagina',
+'pageinfo-firsttime' => 'Data da la creaziun da la pagina',
+'pageinfo-lastuser' => 'Ultima midada da',
+'pageinfo-lasttime' => "Data da l'ultima midada",
+'pageinfo-edits' => 'Dumber total da midadas',
+'pageinfo-authors' => 'Dumber total dad auturs differents',
+'pageinfo-recent-edits' => 'Dumber da midadas capitadas dacurt (entaifer ils ultims $1)',
+'pageinfo-recent-authors' => 'Dumber da differents auturs che han midà dacurt la pagina',
+'pageinfo-magic-words' => '{{PLURAL:$1|Pled magic|Pleds magics}} ($1)',
+'pageinfo-hidden-categories' => '{{PLURAL:$1|Categoria zuppentada|Categorias zuppentadas}} ($1)',
+'pageinfo-templates' => '{{PLURAL:$1|Template integrà|Templates integrads}} ($1)',
 
 # Patrolling
 'markaspatrolleddiff' => 'Marcar sco controllà',
@@ -2555,6 +2667,7 @@ Cun exequir questa datoteca po tes sistem vegnir donnegià.",
 'file-info-size-pages' => '$1 × $2 pixels, grondezza da datoteca: $3, tip da MIME: $4, $5 {{PLURAL:$5|pagina|paginas}}',
 'file-nohires' => 'Nagina resuluziun pli auta disponibla.',
 'svg-long-desc' => 'datoteca da SVG, grondezza da basa $1 × $2 pixels, grondezza da datoteca: $3',
+'svg-long-desc-animated' => 'Datoteca da SVG animada, dimensiun normala $1 x $2 pixels, grondezza da datoteca: $3',
 'show-big-image' => 'Resoluziun cumplaina',
 'show-big-image-preview' => 'Grondezza da questa prevista: $1.',
 'show-big-image-other' => 'Other {{PLURAL:$2|resoluziun|resoluziuns}}: $1.',
@@ -2564,6 +2677,8 @@ Cun exequir questa datoteca po tes sistem vegnir donnegià.",
 'file-info-png-looped' => 'marscha infinit',
 'file-info-png-repeat' => 'Reprodicì $1 {{PLURAL:$1|giada|giadas}}',
 'file-info-png-frames' => '$1 {{PLURAL:$1|frame|frames}}',
+'file-no-thumb-animation' => "'''Avis: Per motivs tecnics n'èn las miniaturas da questa datoteca betg animadas.'''",
+'file-no-thumb-animation-gif' => "'''Avis: Per motivs tecnics n'èn las miniaturas da maletgs da GIF dad auta resoluziun sco quest betg animadas.'''",
 
 # Special:NewFiles
 'newimages' => 'Galleria dals novs maletgs',
@@ -3043,7 +3158,7 @@ sbittar la confermaziun da l\'adressa dad e-mail:
 
 $5
 
-Quai code da confermaziun vegn a scrudar ils $6 las $7.',
+Quai code da confermaziun vegn a scrudar ils $4.',
 'confirmemail_invalidated' => "La confermaziun da l'adressa dad e-mail è vegnida stizzada",
 'invalidateemail' => "Stizzar la confermaziun da l'adressa dad e-mail",
 
@@ -3132,6 +3247,9 @@ Ti pos era utilisar [[Special:EditWatchlist|la pagina da standard]].',
 'watchlisttools-edit' => "Mussar e modifitgar la glista d'observaziun",
 'watchlisttools-raw' => 'Modifitgar il format da la glista (import/export)',
 
+# Signatures
+'signature' => '[[{{ns:user}}:$1|$2]] ([[{{ns:user_talk}}:$1|talk]])',
+
 # Core parser functions
 'unknown_extension_tag' => 'Tag d\'extensiun nunenconuschent "$1"',
 'duplicate-defaultsort' => '\'\'\'Attenziun:\'\'\' La clav da zavrar da standard "$2" remplazza la clav da zavrar da standard veglia "$1".',
@@ -3164,6 +3282,9 @@ Ti duessas avair retschavì [{{SERVER}}{{SCRIPTPATH}}/COPYING ina copia da la GN
 'version-software' => 'Software installada',
 'version-software-product' => 'Product',
 'version-software-version' => 'Versiun',
+'version-entrypoints' => "URLs dals puncts d'entrada",
+'version-entrypoints-header-entrypoint' => "Punct d'entrada",
+'version-entrypoints-header-url' => 'URL',
 
 # Special:FilePath
 'filepath' => 'Percurs da la datoteca',
@@ -3193,7 +3314,7 @@ Endatescha il num da datoteca senza il prefix "{{ns:file}}:".',
 * <span class="mw-specialpagecached">Paginas spezialas en il cache (pon esser antiquadas).</span>',
 'specialpages-group-maintenance' => 'Rapports da mantegnamant',
 'specialpages-group-other' => 'Autras paginas spezialas',
-'specialpages-group-login' => "T'annunziar / registrar",
+'specialpages-group-login' => "S'annunziar / crear in conto",
 'specialpages-group-changes' => 'Ultimas midadas e logs',
 'specialpages-group-media' => 'Rapports ed elements multimedials',
 'specialpages-group-users' => 'Utilisaders e dretgs',
@@ -3272,9 +3393,38 @@ Questa pagina ha actualmain difficultads tecnicas.',
 # New logging system
 'logentry-delete-delete' => '$1 ha stizzà la pagina $3',
 'logentry-delete-restore' => '$1 ha restaurà la pagina $3',
+'logentry-delete-event' => "$1 ha midà la visibilitad da{{PLURAL:$5|d ina occurrenza en il protocol| $5 occurrenzas en il protocol}} da '''$3''': $4",
+'logentry-delete-revision' => '$1 ha midà la visibilitad da{{PLURAL:$5|d ina versiun| $5 versiuns}} da la pagina $3: $4',
+'logentry-delete-event-legacy' => '$1 ha midà la visibilitad dad occurrenzas da protocol sin $3',
+'logentry-delete-revision-legacy' => '$1 ha midà la visibilitad da versiuns sin la pagina $3',
+'logentry-suppress-delete' => '$1 ha supprimì la pagina $3',
+'logentry-suppress-event' => '$1 ha midà secretamain la visibilitad da{{PLURAL:$5|d ina occurrenza da protocol| $5 ocurrenzas da protocol}} sin $3: $4',
+'logentry-suppress-revision' => '$1 ha midà secretamain la visibilitad da{{PLURAL:$5|d ina versiun| $5 versiuns}} da la pagina $3: $4',
+'logentry-suppress-event-legacy' => '$1 ha midà secretamain la visibilitad dad occurrenzas da protocol sin $3',
+'logentry-suppress-revision-legacy' => '$1 ha midà secretamain la visibilitad da versiuns sin la pagina $3',
+'revdelete-content-hid' => 'zuppentà il cuntegn',
+'revdelete-summary-hid' => 'zuppentà la resumaziun da las midadas',
+'revdelete-uname-hid' => "zuppentà il num d'utilisader",
+'revdelete-content-unhid' => 'dà liber il cuntegn',
+'revdelete-summary-unhid' => 'dà liber la resumaziun da las midadas',
+'revdelete-uname-unhid' => "dà liber il num d'utilisader",
+'revdelete-restricted' => 'applitgà restricziuns per administraturs',
+'revdelete-unrestricted' => 'allontanà restricziuns per administraturs',
+'logentry-move-move' => '$1 ha spustà la pagina $3 a $4',
+'logentry-move-move-noredirect' => '$1 ha spustà la pagina $3 a $4 senza crear in renviament',
+'logentry-move-move_redir' => '$1 ha spustà la pagina $3 a $4 e surscrit quatras in renviament',
+'logentry-move-move_redir-noredirect' => '$1 ha spustà la pagina $3 a $4 e surscrit quatras in renviament senza crear in renviament',
+'logentry-patrol-patrol' => '$1 ha marcà la versiun $4 da la pagina $3 sco controllada',
+'logentry-patrol-patrol-auto' => '$1 ha marcà automaticamain la versiun $4 da la pagina $3 sco controllada',
+'logentry-newusers-newusers' => "$1 ha creà in conto d'utilisader",
+'logentry-newusers-create' => "$1 ha creà in conto d'utilisader",
+'logentry-newusers-create2' => "$1 ha creà in conto d'utilisader $3",
+'logentry-newusers-autocreate' => 'Il conto $1 è vegnì creà automaticamain',
 'newuserlog-byemail' => 'tramess il pled-clav per e-mail',
 
 # Feedback
+'feedback-bugornote' => 'Sche ti vuls descriver detagliadamain in problem techic, lura [$1 rapporta in bug].
+Uschiglio pos ti utilisar il formular simpel sutvart. Tes commentari vegn agiuntà a la pagina "[$3 $2]" ensemen cun tes num d\'utilisader.',
 'feedback-subject' => 'Object:',
 'feedback-message' => 'Messadi:',
 'feedback-cancel' => 'Interrumper',
@@ -3288,6 +3438,10 @@ Questa pagina ha actualmain difficultads tecnicas.',
 'feedback-bugcheck' => "Grondius! Controllescha simplamain che quai n'è betg gia in da las [$1 errurs enconuschentas].",
 'feedback-bugnew' => 'Jau hai controllà. Rapportar ina nova errur.',
 
+# Search suggestions
+'searchsuggest-search' => 'Tschertgar',
+'searchsuggest-containing' => 'cuntegna…',
+
 # API errors
 'api-error-badaccess-groups' => 'Ti na dastgas betg chargiar datotecas en quest wiki.',
 'api-error-badtoken' => 'Errur interna: Token fauss.',
@@ -3299,6 +3453,8 @@ Questa pagina ha actualmain difficultads tecnicas.',
 'api-error-empty-file' => 'La datoteca tramessa è vida.',
 'api-error-emptypage' => "Crear paginas novas e vidas n'è betg lubì.",
 'api-error-fetchfileerror' => "Errur interna: Insatge n'ha betg funcziunà durant retschaiver la datoteca.",
+'api-error-fileexists-forbidden' => 'Ina datoteca cun il num "$1" exista gia e na po betg vegnir remplazzada.',
+'api-error-fileexists-shared-forbidden' => 'Ina datoteca cun il num "$1" exista gia en il repository communabel e na po betg vegnir remplazzada.',
 'api-error-file-too-large' => 'La datoteca che ti has tramess era memia gronda.',
 'api-error-filename-tooshort' => 'Il num da datoteca è memia curt.',
 'api-error-filetype-banned' => 'Quest tip da datoteca è scumandà.',
@@ -3327,4 +3483,15 @@ Questa pagina ha actualmain difficultads tecnicas.',
 'api-error-uploaddisabled' => 'La funcziun da chargiar datotecas sin quest vichi è deactivada.',
 'api-error-verification-error' => 'Questa datoteca pudess esser corrupta ni avair ina extensiun faussa.',
 
+# Durations
+'duration-seconds' => '$1 {{PLURAL:$1|secunda|secundas}}',
+'duration-minutes' => '$1 {{PLURAL:$1|minuta|minutas}}',
+'duration-hours' => '$1 {{PLURAL:$1|ura|uras}}',
+'duration-days' => '$1 {{PLURAL:$1|di|dis}}',
+'duration-weeks' => '$1 {{PLURAL:$1|emna|emnas}}',
+'duration-years' => '$1 {{PLURAL:$1|onn|onns}}',
+'duration-decades' => '$1 {{PLURAL:$1|decada|decadas}}',
+'duration-centuries' => '$1 {{PLURAL:$1|tschientaner|tschientaners}}',
+'duration-millennia' => '$1 {{PLURAL:$1|millenni|millennis}}',
+
 );
diff --git a/languages/messages/MessagesRo.php b/languages/messages/MessagesRo.php
index ec3693af93..6979782d9e 100644
--- a/languages/messages/MessagesRo.php
+++ b/languages/messages/MessagesRo.php
@@ -37,7 +37,6 @@ $magicWords = array(
 	'forcetoc'                  => array( '0', '__FORTEAZACUPRINS__', '__FORCETOC__' ),
 	'toc'                       => array( '0', '__CUPRINS__', '__TOC__' ),
 	'noeditsection'             => array( '0', '__FARAEDITSECTIUNE__', '__NOEDITSECTION__' ),
-	'noheader'                  => array( '0', '__FARAANTET__', '__NOHEADER__' ),
 	'currentmonth'              => array( '1', 'NUMARLUNACURENTA', 'CURRENTMONTH', 'CURRENTMONTH2' ),
 	'currentmonth1'             => array( '1', 'LUNACURENTA1', 'CURRENTMONTH1' ),
 	'currentmonthname'          => array( '1', 'NUMELUNACURENTA', 'CURRENTMONTHNAME' ),
@@ -348,7 +347,7 @@ pe titlul secțiunii (JavaScript)',
 
 'underline-always' => 'Întotdeauna',
 'underline-never' => 'Niciodată',
-'underline-default' => 'Standardul navigatorului',
+'underline-default' => 'Standardul temei sau al navigatorului',
 
 # Font style option in Special:Preferences
 'editfont-style' => 'Stilul fontului din zona de modificare:',
@@ -435,7 +434,7 @@ pe titlul secțiunii (JavaScript)',
 'newwindow' => '(se deschide într-o fereastră nouă)',
 'cancel' => 'Revocare',
 'moredotdotdot' => 'Mai mult…',
-'mypage' => 'Pagina mea',
+'mypage' => 'Pagină',
 'mytalk' => 'Discuții',
 'anontalk' => 'Discuția pentru această adresă IP',
 'navigation' => 'Navigare',
@@ -992,7 +991,7 @@ Paginile .css și .js specifice utilizatorilor au titluri care încep cu literă
 'note' => "'''Notă:'''",
 'previewnote' => "'''Țineți cont că aceasta este doar o previzualizare.'''
 Modificările dumneavoastră nu au fost încă salvate!",
-'continue-editing' => 'Continuare editare',
+'continue-editing' => 'Mergi la zona de editare',
 'previewconflict' => 'Această pre-vizualizare reflectă textul din caseta de sus, respectiv felul în care va arăta articolul dacă alegeți să-l salvați acum.',
 'session_fail_preview' => "'''Ne pare rău! Nu am putut procesa modificarea dumneavoastră din cauza pierderii datelor sesiunii.
 Vă rugăm să încercați din nou.
@@ -1605,6 +1604,9 @@ Dacă decideți furnizarea sa, acesta va fi folosit pentru a vă atribui munca.'
 'rightslogtext' => 'Acest jurnal cuprinde modificările permisiunilor utilizatorilor.',
 'rightslogentry' => 'a schimbat permisiunile pentru $1 de la $2 la $3',
 'rightslogentry-autopromote' => 'a fost promovat în mod automat de la $2 la $3',
+'logentry-rights-rights' => '$1 a schimbat apartenența la grup pentru $3 de la $4 la $5',
+'logentry-rights-rights-legacy' => '$1 a schimbat apartenența la grup pentru $3',
+'logentry-rights-autopromote' => '$1 a fost promovat în mod automat de la $4 la $5',
 'rightsnone' => '(niciunul)',
 
 # Associated actions - in the sentence "You do not have permission to X"
@@ -2234,7 +2236,7 @@ Vedeți și [[Special:WantedCategories|categoriile dorite]].',
 'linksearch-ok' => 'Caută',
 'linksearch-text' => 'Pot fi folosite metacaractere precum „*.wikipedia.org”.
 Necesită cel puțin un domeniu de nivel superior, cum ar fi „*.org”.<br />
-Protocoale suportate: <code>$1</code> (nu adăugați niciunul dintre acestea în câmpul de căutare).',
+Protocoale suportate: <code>$1</code> (se trece implicit la http:// dacă nu este specificat niciun protocol).',
 'linksearch-line' => '$1 este legat de $2',
 'linksearch-error' => 'Metacaracterele pot să apară doar la începutul hostname-ului.',
 
@@ -2283,7 +2285,7 @@ Pot exista [[{{MediaWiki:Listgrouprights-helppage}}|informații suplimentare]] d
 '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 acestui utilizator.
+'emailpagetext' => 'Puteți folosi formularul de mai jos pentru a trimite un e-mail {{GENDER:$1|acestui utilizator|acestei utilizatoare}}.
 Adresa 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.',
 'usermailererror' => 'Obiectul de mail a dat eroare:',
 'defemailsubject' => 'E-mail {{SITENAME}} de la utilizatorul „$1”',
@@ -2306,7 +2308,7 @@ Adresa de e-mail specificată de dumneavoastră în [[Special:Preferences|prefer
 'emailccme' => 'Trimite-mi pe e-mail o copie a mesajului meu.',
 'emailccsubject' => 'O copie a mesajului la $1: $2',
 'emailsent' => 'E-mail trimis',
-'emailsenttext' => 'E-mailul tău a fost trimis.',
+'emailsenttext' => 'E-mailul dumneavoastră a fost trimis.',
 'emailuserfooter' => 'Acest mesaj a fost trimis de $1 către $2 prin intermediul funcției „Trimite e-mail” de la {{SITENAME}}.',
 
 # User Messenger
@@ -2317,7 +2319,7 @@ Adresa de e-mail specificată de dumneavoastră în [[Special:Preferences|prefer
 'watchlist' => 'Pagini urmărite',
 'mywatchlist' => 'Pagini urmărite',
 'watchlistfor2' => 'Pentru $1 $2',
-'nowatchlist' => 'Nu ați ales să urmăriți nici o pagină.',
+'nowatchlist' => 'Lista dumneavoastră de pagini urmărite nu conține nici o pagină.',
 'watchlistanontext' => 'Vă rugăm să vă $1 pentru a vizualiza sau edita elementele din lista dumneavoastră de pagini urmărite.',
 'watchnologin' => 'Nu sunteți autentificat',
 'watchnologintext' => 'Trebuie să fiți [[Special:UserLogin|autentificat]] pentru a vă modifica lista de pagini urmărite.',
@@ -2352,7 +2354,7 @@ Modificările viitoare efectuate asupra acestei pagini dar și asupra paginii de
 'enotif_mailer' => 'Sistemul de notificare {{SITENAME}}',
 'enotif_reset' => 'Marchează toate paginile vizitate',
 'enotif_newpagetext' => 'Aceasta este o pagină nouă.',
-'enotif_impersonal_salutation' => '{{SITENAME}} utilizator',
+'enotif_impersonal_salutation' => 'Utilizator {{SITENAME}}',
 'changed' => 'modificată',
 'created' => 'creată',
 'enotif_subject' => 'Pagina $PAGETITLE de la {{SITENAME}} a fost $CHANGEDORCREATED de $PAGEEDITOR',
@@ -2613,7 +2615,7 @@ Iată aici ultima înregistrare relevantă din jurnalul blocărilor:',
 'whatlinkshere-hideredirs' => '$1 redirecționările',
 'whatlinkshere-hidetrans' => '$1 transcluderile',
 'whatlinkshere-hidelinks' => '$1 legăturile',
-'whatlinkshere-hideimages' => '$1 legăturile către imagine',
+'whatlinkshere-hideimages' => '$1 legăturile către fișier',
 'whatlinkshere-filters' => 'Filtre',
 
 # Block/unblock
@@ -3094,7 +3096,7 @@ Permite adăugarea unui motiv în descrierea modificărilor',
 
 # Info page
 'pageinfo-title' => 'Informații pentru „$1”',
-'pageinfo-not-current' => 'Informațiile se pot afișa doar pentru versiunea curentă.',
+'pageinfo-not-current' => 'Ne cerem scuze, dar este imposibilă furnizarea acestor informații pentru versiunile mai vechi ale paginii.',
 'pageinfo-header-basic' => 'Informații de bază',
 'pageinfo-header-edits' => 'Istoric modificări',
 'pageinfo-header-restrictions' => 'Protecție pagină',
@@ -3103,6 +3105,7 @@ Permite adăugarea unui motiv în descrierea modificărilor',
 'pageinfo-default-sort' => 'Cheie de sortare implicită',
 'pageinfo-length' => 'Lungimea paginii (în octeți)',
 'pageinfo-article-id' => 'ID pagină',
+'pageinfo-language' => 'Limba conținutului paginii',
 'pageinfo-robot-policy' => 'Statut pentru motorul de căutare',
 'pageinfo-robot-index' => 'Indexabilă',
 'pageinfo-robot-noindex' => 'Neindexabilă',
@@ -3819,6 +3822,7 @@ Puteți folosi în schimb [[Special:EditWatchlist|editorul standard]].',
 'version-license' => 'Licență',
 'version-poweredby-credits' => "Acest wiki este dezvoltat de '''[//www.mediawiki.org/ MediaWiki]''', drepturi de autor © 2001-$1 $2.",
 'version-poweredby-others' => 'alții',
+'version-credits-summary' => 'Am dori să amintim următoarele persoane pentru contribuțiile aduse proiectului [[Special:Version|MediaWiki]].',
 'version-license-info' => 'MediaWiki este un software liber pe care îl puteți redistribui și/sau modifica sub termenii Licenței Publice Generale GNU publicată de Free Software Foundation – fie a doua versiune a acesteia, fie, la alegerea dumneavoastră, orice altă versiune ulterioară. 
 
 MediaWiki este distribuit în speranța că va fi folositor, dar FĂRĂ VREO GARANȚIE, nici măcar cea implicită de COMERCIALIZARE sau de ADAPTARE PENTRU UN UN SCOP ANUME. Vedeți Licența Publică Generală GNU pentru mai multe detalii. 
@@ -4036,4 +4040,6 @@ Imaginile sunt afișate la rezoluția lor maximă, în timp ce alte tipuri de fi
 'duration-centuries' => '$1 {{PLURAL:$1|secol|secole|de secole}}',
 'duration-millennia' => '$1 {{PLURAL:$1|mileniu|milenii|de milenii}}',
 
+# Unknown messages
+'mytalk-parenthetical' => 'discuție',
 );
diff --git a/languages/messages/MessagesRu.php b/languages/messages/MessagesRu.php
index 923e2b312f..9d9010afe6 100644
--- a/languages/messages/MessagesRu.php
+++ b/languages/messages/MessagesRu.php
@@ -69,6 +69,7 @@
  * @author Temuri rajavi
  * @author Vago
  * @author VasilievVV
+ * @author Volkov
  * @author Ytsukeng Fyvaprol
  * @author Александр Сигачёв
  * @author Гусейн
@@ -200,7 +201,6 @@ $magicWords = array(
 	'forcetoc'                  => array( '0', '__ОБЯЗАТЕЛЬНОЕ_ОГЛАВЛЕНИЕ__', '__ОБЯЗ_ОГЛ__', '__FORCETOC__' ),
 	'toc'                       => array( '0', '__ОГЛАВЛЕНИЕ__', '__ОГЛ__', '__TOC__' ),
 	'noeditsection'             => array( '0', '__БЕЗ_РЕДАКТИРОВАНИЯ_РАЗДЕЛА__', '__NOEDITSECTION__' ),
-	'noheader'                  => array( '0', '__БЕЗ_ЗАГОЛОВКА__', '__NOHEADER__' ),
 	'currentmonth'              => array( '1', 'ТЕКУЩИЙ_МЕСЯЦ', 'ТЕКУЩИЙ_МЕСЯЦ_2', 'CURRENTMONTH', 'CURRENTMONTH2' ),
 	'currentmonth1'             => array( '1', 'ТЕКУЩИЙ_МЕСЯЦ_1', 'CURRENTMONTH1' ),
 	'currentmonthname'          => array( '1', 'НАЗВАНИЕ_ТЕКУЩЕГО_МЕСЯЦА', 'CURRENTMONTHNAME' ),
@@ -420,7 +420,7 @@ $messages = array(
 'tog-minordefault' => 'Помечать по умолчанию правки как малозначимые',
 'tog-previewontop' => 'Помещать предпросмотр перед окном редактирования',
 'tog-previewonfirst' => 'Показывать предпросмотр при переходе к редактированию',
-'tog-nocache' => 'Отключить кеширование страниц в браузере',
+'tog-nocache' => 'Отключить кэширование страниц в браузере',
 'tog-enotifwatchlistpages' => 'Уведомлять по эл. почте об изменениях страниц и файлов из списка наблюдения',
 'tog-enotifusertalkpages' => 'Уведомлять по эл. почте об изменении персональной страницы обсуждения',
 'tog-enotifminoredits' => 'Уведомлять даже при незначительных изменениях страниц и файлов',
@@ -516,11 +516,11 @@ $messages = array(
 'category-empty' => "''Эта категория в данный момент пуста.''",
 'hidden-categories' => '{{PLURAL:$1|Скрытая категория|Скрытые категории}}',
 'hidden-category-category' => 'Скрытые категории',
-'category-subcat-count' => '{{PLURAL:$2|Данная категория содержит только следующую подкатегорию.|{{PLURAL:$1|Показана $1 подкатегория|Показано $1 подкатегории|Показано $1 подкатегорий}} из $2.}}',
+'category-subcat-count' => '{{PLURAL:$2|Данная категория содержит только следующую подкатегорию.|{{PLURAL:$1|Показана $1 подкатегория|Показано $1 подкатегории|Показано $1 подкатегорий}} из $2, находящихся в этой категории.}}',
 'category-subcat-count-limited' => 'В этой категории {{PLURAL:$1|$1 подкатегория|$1 подкатегории|$1 подкатегорий}}.',
-'category-article-count' => '{{PLURAL:$2|Эта категория содержит только одну страницу.|{{PLURAL:$1|Показана $1 страница|Показано $1 страницы|Показано $1 страниц}} этой категории из $2.}}',
+'category-article-count' => '{{PLURAL:$2|Эта категория содержит только одну страницу.|{{PLURAL:$1|Показана $1 страница|Показано $1 страницы|Показано $1 страниц}} из $2, находящихся в этой категории.}}',
 'category-article-count-limited' => 'В этой категории {{PLURAL:$1|$1 страница|$1 страницы|$1 страниц}}.',
-'category-file-count' => '{{PLURAL:$2|Эта категория содержит только один файл.|{{PLURAL:$1|Показан $1 файл|Показано $1 файла|Показано $1 файлов}} этой категории  из $2.}}',
+'category-file-count' => '{{PLURAL:$2|Эта категория содержит только один файл.|{{PLURAL:$1|Показан $1 файл|Показано $1 файла|Показано $1 файлов}} из $2, находящихся в этой категории.}}',
 'category-file-count-limited' => 'В этой категории {{PLURAL:$1|$1 файл|$1 файла|$1 файлов}}.',
 'listingcontinuesabbrev' => '(продолжение)',
 'index-category' => 'Индексируемые страницы',
@@ -533,7 +533,7 @@ $messages = array(
 'cancel' => 'Отменить',
 'moredotdotdot' => 'Далее…',
 'mypage' => 'Личная страница',
-'mytalk' => 'Моя страница обсуждения',
+'mytalk' => 'Обсуждения',
 'anontalk' => 'Обсуждение для этого IP-адреса',
 'navigation' => 'Навигация',
 'and' => '&#32;и',
@@ -559,7 +559,7 @@ $messages = array(
 'vector-view-create' => 'Создание',
 'vector-view-edit' => 'Правка',
 'vector-view-history' => 'История',
-'vector-view-view' => 'Чтение',
+'vector-view-view' => 'Читать',
 'vector-view-viewsource' => 'Просмотр разметки',
 'actions' => 'Действия',
 'namespaces' => 'Пространства имён',
@@ -597,7 +597,7 @@ $messages = array(
 'talkpage' => 'Обсудить эту страницу',
 'talkpagelinktext' => 'обсуждение',
 'specialpage' => 'Служебная страница',
-'personaltools' => 'Личные инструменты',
+'personaltools' => 'Персональные инструменты',
 'postcomment' => 'Новый раздел',
 'articlepage' => 'Просмотреть статью',
 'talk' => 'Обсуждение',
@@ -644,7 +644,7 @@ $1',
 'mainpage' => 'Заглавная страница',
 'mainpage-description' => 'Заглавная страница',
 'policy-url' => 'Project:Правила',
-'portal' => 'Сообщество',
+'portal' => 'Портал сообщества',
 'portal-url' => 'Project:Портал сообщества',
 'privacy' => 'Политика конфиденциальности',
 'privacypage' => 'Project:Политика конфиденциальности',
@@ -672,7 +672,7 @@ $1',
 'viewsourceold' => 'просмотреть исходный код',
 'editlink' => 'править',
 'viewsourcelink' => 'просмотреть исходный код',
-'editsectionhint' => 'Править секцию «$1»',
+'editsectionhint' => 'Редактировать раздел «$1»',
 'toc' => 'Содержание',
 'showtoc' => 'показать',
 'hidetoc' => 'убрать',
@@ -693,7 +693,7 @@ $1',
 'sort-ascending' => 'Упорядочить по возрастанию',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
-'nstab-main' => 'Статья',
+'nstab-main' => 'Страница',
 'nstab-user' => 'Участник',
 'nstab-media' => 'Мультимедиа',
 'nstab-special' => 'Служебная страница',
@@ -761,7 +761,7 @@ $1',
 'delete-hook-aborted' => 'Правка отменена процедурой-перехватчиком.
 Дополнительных пояснений не приведено.',
 'badtitle' => 'Недопустимое название',
-'badtitletext' => 'Запрашиваемое название страницы неправильно, пусто, либо неправильно указано межъязыковое или интервики название. Возможно, в названии используются недопустимые символы.',
+'badtitletext' => 'Запрашиваемое название страницы неправильно, пусто, либо неверно указано межъязыковое или интервики название. Возможно, в названии используются недопустимые символы.',
 'perfcached' => 'Следующие данные взяты из кэша и могут не учитывать последних изменений. В кэше хранится не более $1 {{PLURAL:$1|записи|записей|записей}}.',
 'perfcachedts' => 'Следующие данные взяты из кэша, последний раз он обновлялся в $1. В кэше хранится не более $4 {{PLURAL:$4|записи|записей|записей}}.',
 'querypage-no-updates' => 'Обновление этой страницы сейчас отключено.
@@ -807,11 +807,11 @@ $2',
 'logouttext' => "'''Вы завершили сеанс работы.'''
 
 Вы можете продолжить участие в {{grammar:genitive|{{SITENAME}}}} анонимно или <span class='plainlinks'>[$1 представиться заново]</span> под тем же или другим именем.
-Некоторые страницы могут продолжать отображаться в том виде, как будто вы всё ещё представлены системе. Для борьбы с этим явлением обновите кеш браузера.",
+Некоторые страницы могут продолжать отображаться в том виде, как будто вы всё ещё представлены системе. Для борьбы с этим явлением обновите кэш браузера.",
 'welcomecreation' => '== Добро пожаловать, $1! ==
 Ваша учётная запись создана.
 Не забудьте провести [[Special:Preferences|персональную настройку]] сайта.',
-'yourname' => 'Имя участника:',
+'yourname' => 'Имя учётной записи:',
 'yourpassword' => 'Пароль:',
 'yourpasswordagain' => 'Повторный набор пароля:',
 'remembermypassword' => 'Помнить мою учётную запись на этом компьютере (не более $1 {{PLURAL:$1|дня|дней|дней}})',
@@ -827,9 +827,9 @@ $2',
 'logout' => 'Завершение сеанса',
 'userlogout' => 'Завершение сеанса',
 'notloggedin' => 'Вы не представились системе',
-'nologin' => "Нет учётной записи? '''$1'''.",
+'nologin' => 'Нет учётной записи? $1.',
 'nologinlink' => 'Создать учётную запись',
-'createaccount' => 'Зарегистрировать нового участника',
+'createaccount' => 'Создать учётную запись',
 'gotaccount' => "Вы уже зарегистрированы? '''$1'''.",
 'gotaccountlink' => 'Представьтесь',
 'userlogin-resetlink' => 'Забыли данные для входа?',
@@ -1006,8 +1006,8 @@ $2
 'showpreview' => 'Предварительный просмотр',
 'showlivepreview' => 'Быстрый предпросмотр',
 'showdiff' => 'Внесённые изменения',
-'anoneditwarning' => "'''Внимание:''' Вы не представились системе.
-Ваш IP-адрес будет записан в историю изменений этой страницы.",
+'anoneditwarning' => "'''Внимание!''' Вы не авторизовались на сайте.
+В истории изменений этой страницы будет записан ваш IP-адрес.",
 'anonpreviewwarning' => "''Вы не представились системе. Сохранение приведёт к записи вашего IP-адреса в историю изменений страницы.''",
 'missingsummary' => "'''Напоминание.''' Вы не дали краткого описания изменений. При повторном нажатии на кнопку «{{int:savearticle}}», ваши изменения будут сохранены без комментария.",
 'missingcommenttext' => 'Пожалуйста, введите ниже ваше сообщение.',
@@ -1068,7 +1068,7 @@ $2
 Если вы анонимный участник и полагаете, что получили сообщения, адресованные не вам, пожалуйста, [[Special:UserLogin/signup|создайте учётную запись]] или [[Special:UserLogin|представьтесь системе]], чтобы впредь избежать возможной путаницы с другими анонимными участниками.''",
 'noarticletext' => "В настоящий момент текст на данной странице отсутствует.
 Вы можете [[Special:Search/{{PAGENAME}}|найти упоминание данного названия]] в других статьях,
-<span class=\"plainlinks\">[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} найти соответствующие записи журналов],
+<span class=\"plainlinks\">[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} найти соответствующие записи журналов]
 или '''[{{fullurl:{{FULLPAGENAME}}|action=edit}} создать страницу с таким названием]'''</span>.",
 'noarticletext-nopermission' => 'В настоящее время на этой странице нет текста.
 Вы можете [[Special:Search/{{PAGENAME}}|найти упоминание данного названия]] на других страницах,
@@ -1081,11 +1081,11 @@ $2
 'userpage-userdoesnotexist-view' => 'Не зарегистрировано учётной записи «$1».',
 'blocked-notice-logextract' => 'Этот участник в данный момент заблокирован.
 Ниже приведена последняя запись из журнала блокировок:',
-'clearyourcache' => "'''Замечание.''' Возможно, после сохранения вам придётся очистить кеш своего браузера, чтобы увидеть изменения.
-* '''Firefox / Safari:''' Удерживая клавишу ''Shift'', нажмите на панели инструментов ''Обновить'', или нажмите ''Ctrl-F5'' или ''Ctrl-R'' (''⌘-R'' на Mac)
+'clearyourcache' => "'''Замечание.''' Возможно, после сохранения вам придётся очистить кэш своего браузера, чтобы увидеть изменения.
+* '''Firefox / Safari:''' Удерживая клавишу ''Shift'', нажмите на панели инструментов ''Обновить'' либо нажмите ''Ctrl-F5'' или ''Ctrl-R'' (''⌘-R'' на Mac)
 * '''Google Chrome:''' Нажмите ''Ctrl-Shift-R'' (''⌘-Shift-R'' на Mac)
-* '''Internet Explorer:''' Удерживая ''Ctrl'' нажмите ''Обновить'', или нажмите ''Ctrl-F5''
-* '''Opera:''' Выберите очистку кеша в меню ''Инструменты → Настройки''",
+* '''Internet Explorer:''' Удерживая ''Ctrl'', нажмите ''Обновить'' либо нажмите ''Ctrl-F5''
+* '''Opera:''' Выберите очистку кэша в меню ''Инструменты → Настройки''",
 'usercssyoucanpreview' => "'''Подсказка.''' Нажмите кнопку «{{int:showpreview}}», чтобы проверить свой новый CSS-файл перед сохранением.",
 'userjsyoucanpreview' => "'''Подсказка.''' Нажмите кнопку «{{int:showpreview}}», чтобы проверить свой новый JS-файл перед сохранением.",
 'usercsspreview' => "'''Помните, что это только предварительный просмотр вашего CSS-файла, он ещё не сохранён!'''",
@@ -1130,9 +1130,9 @@ $2
 'editingold' => "'''Предупреждение. Вы редактируете устаревшую версию данной страницы.'''
 После сохранения будут потеряны изменения, сделанные в последующих версиях.",
 'yourdiff' => 'Различия',
-'copyrightwarning' => "Обратите внимание, что все добавления и изменения текста статьи рассматриваются, как выпущенные на условиях лицензии $2 (см. $1).
+'copyrightwarning' => "Обратите внимание, что все добавления и изменения текста статьи рассматриваются как выпущенные на условиях лицензии $2 (см. $1).
 Если вы не хотите, чтобы ваши тексты свободно распространялись и редактировались любым желающим, не помещайте их сюда.<br />
-Вы также подтверждаете, что являетесь автором вносимых дополнений, или скопировали их из
+Вы также подтверждаете, что являетесь автором вносимых дополнений или скопировали их из
 источника, допускающего свободное распространение и изменение своего содержимого.<br />
 '''НЕ РАЗМЕЩАЙТЕ БЕЗ РАЗРЕШЕНИЯ МАТЕРИАЛЫ, ОХРАНЯЕМЫЕ АВТОРСКИМ ПРАВОМ!'''",
 'copyrightwarning2' => "Пожалуйста, учтите, что любой ваш вклад в проект «{{SITENAME}}» может быть отредактирован или удалён другими участниками.
@@ -1151,12 +1151,12 @@ $2
 'cascadeprotectedwarning' => "'''Предупреждение:''' Данную страницу могут редактировать только участники группы «Администраторы», поскольку она включена {{PLURAL:$1|в следующую страницу, для которой|в следующие страницы, для которых}} включена каскадная защита:",
 'titleprotectedwarning' => "'''Предупреждение.  Это название защищено. Создать эту страницу могут только участники с [[Special:ListGroupRights|соответствующими правами]].'''
 Ниже для справки приведена последняя запись журнала:",
-'templatesused' => '{{PLURAL:$1|Шаблон, использованный|Шаблоны, использованные}} на текущей версии страницы:',
+'templatesused' => '{{PLURAL:$1|Шаблон, использованный|Шаблоны, использованные}} на этой странице:',
 'templatesusedpreview' => '{{PLURAL:$1|Шаблон, используемый|Шаблоны, используемые}} в предпросматриваемой странице:',
 'templatesusedsection' => '{{PLURAL:$1|Шаблон, используемый|Шаблоны, использованные}} в этом разделе:',
 'template-protected' => '(защищено)',
 'template-semiprotected' => '(частично защищено)',
-'hiddencategories' => 'Эта страница относится к $1 {{PLURAL:$1|скрытой категории|скрытым категориям|скрытым категориям}}:',
+'hiddencategories' => 'Эта страница относится к $1 {{PLURAL:$1|скрытой категории|скрытым категориям}}:',
 'edittools' => '<!-- Расположенный здесь текст будет показываться под формой редактирования и формой загрузки. -->',
 'nocreatetitle' => 'Создание страниц ограничено',
 'nocreatetext' => 'На этом сайте ограничена возможность создания новых страниц.
@@ -1166,7 +1166,7 @@ $2
 'sectioneditnotsupported-text' => 'На этой странице не поддерживается редактирование разделов',
 'permissionserrors' => 'Ошибки прав доступа',
 'permissionserrorstext' => 'У вас нет прав на выполнение этой операции по {{PLURAL:$1|следующей причине|следующим причинам}}:',
-'permissionserrorstext-withaction' => "У вас нет разрешения на «'''$2'''» по {{PLURAL:$1|следующей причине|следующим причинам}}:",
+'permissionserrorstext-withaction' => 'У вас нет прав на $2 по {{PLURAL:$1|следующей причине|следующим причинам}}:',
 'recreate-moveddeleted-warn' => "'''Внимание. Вы пытаетесь воссоздать страницу, которая ранее удалялась.'''
 
 Проверьте, действительно ли вам нужно воссоздавать эту страницу.
@@ -1188,15 +1188,15 @@ $2
 'content-not-allowed-here' => 'Содержимое "$1" недопустимо на странице [[$2]]',
 
 # Content models
-'content-model-wikitext' => 'викитекст',
+'content-model-wikitext' => 'вики-текст',
 'content-model-text' => 'обычный текст',
 'content-model-javascript' => 'JavaScript',
 'content-model-css' => 'CSS',
 
 # Parser/template warnings
-'expensive-parserfunction-warning' => 'Внимание. Эта страница содержит слишком много вызовов ресурсоёмких функций.
+'expensive-parserfunction-warning' => "'''Внимание!''' Эта страница содержит слишком много вызовов ресурсоёмких функций.
 
-Ограничение на количество вызовов установлено на уровне $2 {{PLURAL:$2|вызова|вызовов|вызовов}}, в данном случае требуется сделать {{PLURAL:$1|$1 вызов|$1 вызова|$1 вызовов}}.',
+Должно быть не более $2 {{PLURAL:$2|вызова|вызовов}}, в то время как сейчас здесь $1 {{PLURAL:$1|вызов|вызова|вызовов}}.",
 'expensive-parserfunction-category' => 'Страницы со слишком большим количеством вызовов ресурсоёмких функций',
 'post-expand-template-inclusion-warning' => 'Предупреждение: суммарный размер включаемых шаблонов слишком велик.
 Некоторые шаблоны не будут включены.',
@@ -1352,7 +1352,7 @@ $1",
 ** Потенциально клеветнические сведения',
 'revdelete-otherreason' => 'Другая/дополнительная причина:',
 'revdelete-reasonotherlist' => 'Другая причина',
-'revdelete-edit-reasonlist' => 'Править список причин',
+'revdelete-edit-reasonlist' => 'Редактировать список причин',
 'revdelete-offender' => 'Автор версии страницы:',
 
 # Suppression log
@@ -1402,7 +1402,7 @@ $1",
 'diff-multi-manyusers' => '(не {{PLURAL:$1|показана $1 промежуточная версия|показаны $1 промежуточные версии|показаны $1 промежуточных версий}}, сделанные более чем $2 {{PLURAL:$2|участником|участниками}})',
 'difference-missing-revision' => '{{PLURAL:$2|$2 версия|$2 версии|$2 версий}} для этого сравнения ($1) {{PLURAL:$2|не обнаружена|не обнаружены}}.
 
-Это обычно бывает, если последовать по устаревшей ссылке на страницу, которая была удалена.
+Это обычно бывает, если перейти по устаревшей ссылке сравнения версий для страницы, которая была удалена.
 Подробности могут быть в [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} журнале удалений].',
 
 # Search results
@@ -1411,7 +1411,7 @@ $1",
 'searchresulttext' => 'Для получения более подробной информации о поиске на страницах проекта, см. [[{{MediaWiki:Helppage}}|справочный раздел]].',
 'searchsubtitle' => 'По запросу «[[:$1]]» ([[Special:Prefixindex/$1|страницы, начинающиеся с этого названия]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|ссылающиеся на это название]])',
 'searchsubtitleinvalid' => 'По запросу «$1»',
-'toomanymatches' => 'Найдено слишком много соответствий, пожалуйста, попробуйте другой запрос',
+'toomanymatches' => 'Найдено слишком много соответствий; пожалуйста, попробуйте сформулировать запрос иначе',
 'titlematches' => 'Совпадения в названиях страниц',
 'notitlematches' => 'Нет совпадений в названиях страниц',
 'textmatches' => 'Совпадения в текстах страниц',
@@ -1423,7 +1423,7 @@ $1",
 'shown-title' => 'Показывать $1 {{PLURAL:$1|запись|записи|записей}} на странице',
 'viewprevnext' => 'Просмотреть ($1 {{int:pipe-separator}} $2) ($3)',
 'searchmenu-legend' => 'Настройки поиска',
-'searchmenu-exists' => "'''В этом вики-проекте есть страница «[[:$1]]»'''",
+'searchmenu-exists' => "'''В этой вики есть страница «[[:$1]]»'''",
 'searchmenu-new' => "'''Создать страницу «[[:$1]]» в этом вики-проекте!'''",
 'searchhelp-url' => 'Help:Содержание',
 'searchmenu-prefix' => '[[Special:PrefixIndex/$1|Показать страницы с этим префиксом]]',
@@ -1435,10 +1435,10 @@ $1",
 'searchprofile-articles-tooltip' => 'Поиск в $1',
 'searchprofile-project-tooltip' => 'Поиск в $1',
 'searchprofile-images-tooltip' => 'Поиск файлов',
-'searchprofile-everything-tooltip' => 'Поиск на всех страницах (включая страницы обсуждения)',
+'searchprofile-everything-tooltip' => 'Поиск на всех страницах (включая страницы обсуждений)',
 'searchprofile-advanced-tooltip' => 'Искать в заданных пространствах имён',
 'search-result-size' => '$1 ({{PLURAL:$2|$2 слово|$2 слова|$2 слов}})',
-'search-result-category-size' => '$1 {{PLURAL:$1|член|члена|членов}} ($2 {{PLURAL:$2|подкатегория|подкатегории|подкатегорий}}, $3 {{PLURAL:$3|файл|файла|файлов}}).',
+'search-result-category-size' => '$1 {{PLURAL:$1|вхождение|вхождения|вхождений}} ($2 {{PLURAL:$2|подкатегория|подкатегории|подкатегорий}}, $3 {{PLURAL:$3|файл|файла|файлов}}).',
 'search-result-score' => 'Релевантность: $1%.',
 'search-redirect' => '(перенаправление с $1)',
 'search-section' => '(раздел «$1»)',
@@ -1465,7 +1465,7 @@ $1",
 'powersearch-toggleall' => 'Все',
 'powersearch-togglenone' => 'Ничего',
 'search-external' => 'Внешний поиск',
-'searchdisabled' => 'Извините, но встроенный полнотекстовый поиск выключен. Вы можете воспользоваться поиском по сайту через поисковые системы общего назначения, однако имейте в виду, что копия сайта в их кеше может быть несколько устаревшей.',
+'searchdisabled' => 'Извините, но встроенный полнотекстовый поиск выключен. Вы можете воспользоваться поиском по сайту через поисковые системы общего назначения, однако имейте в виду, что копия сайта в их кэше может быть несколько устаревшей.',
 
 # Quickbar
 'qbsettings' => 'Панель навигации',
@@ -1540,7 +1540,7 @@ $1",
 'timezoneregion-europe' => 'Европа',
 'timezoneregion-indian' => 'Индийский океан',
 'timezoneregion-pacific' => 'Тихий океан',
-'allowemail' => 'Разрешить приём электронной почты от других участников',
+'allowemail' => 'Разрешить получение электронной почты от других участников',
 'prefs-searchoptions' => 'Поиск',
 'prefs-namespaces' => 'Пространства имён',
 'defaultns' => 'Иначе искать в следующих пространствах имён:',
@@ -1554,11 +1554,11 @@ $1",
 'prefs-emailconfirm-label' => 'Подтверждение электронной почты:',
 'prefs-textboxsize' => 'Размер окна редактирования',
 'youremail' => 'Электронная почта:',
-'username' => 'Регистрационное имя:',
+'username' => 'Имя учётной записи:',
 'uid' => 'Идентификатор участника:',
 'prefs-memberingroups' => 'Член {{PLURAL:$1|группы|групп}}:',
 'prefs-registration' => 'Время регистрации:',
-'yourrealname' => 'Ваше настоящее имя:',
+'yourrealname' => 'Настоящее имя:',
 'yourlanguage' => 'Язык интерфейса:',
 'yourvariant' => 'Вариант языка содержания:',
 'prefs-help-variant' => 'Предпочитаемый для отображения содержимого страниц вики вариант языка или орфография.',
@@ -1577,7 +1577,7 @@ $1",
 'prefs-help-realname' => 'Настоящее имя (необязательное поле).
 Если вы укажете его, то оно будет использовано для того, чтобы показать, кем была внесена правка страницы.',
 'prefs-help-email' => 'Адрес электронной почты указывать необязательно, но он будет необходим в том случае, если вы забудете пароль.',
-'prefs-help-email-others' => 'Он также позволит другим участникам связаться с вами через ссылку на вашей личной странице без необходимости раскрытия адреса вашей электронной почты.',
+'prefs-help-email-others' => 'Он также позволит другим участникам связаться с вами по электронной почте с помощью ссылки на вашей персональной странице или на вашей странице обсуждения. При этом ваш адрес электронной почты не будет никому раскрыт.',
 'prefs-help-email-required' => 'Необходимо указать адрес электронной почты.',
 'prefs-info' => 'Основные сведения',
 'prefs-i18n' => 'Интернационализация',
@@ -1596,22 +1596,22 @@ $1",
 
 # User preference: e-mail validation using jQuery
 'email-address-validity-valid' => 'Выглядит корректно',
-'email-address-validity-invalid' => 'Требуется корректный адрес!',
+'email-address-validity-invalid' => 'Введите корректный адрес электронной почты!',
 
 # User rights
 'userrights' => 'Управление правами участника',
 'userrights-lookup-user' => 'Управление группами участников',
-'userrights-user-editname' => 'Введите имя участника:',
+'userrights-user-editname' => 'Введите имя учётной записи:',
 'editusergroup' => 'Изменить членство в группах',
 'editinguser' => "Изменение прав {{GENDER:$1|участника|участницы}} '''[[User:$1|$1]]''' $2",
 'userrights-editusergroup' => 'Изменение членства в группах',
 'saveusergroups' => 'Сохранить группы участника',
-'userrights-groupsmember' => 'Член групп:',
-'userrights-groupsmember-auto' => 'Неявный член:',
+'userrights-groupsmember' => 'Состоит в группах:',
+'userrights-groupsmember-auto' => 'Неявно состоит в группах:',
 'userrights-groups-help' => 'Вы можете изменить группы, в которые входит этот участник.
 * Если около названия группы стоит отметка, значит участник входит в эту группу.
 * Если отметка не стоит — участник не относится к соответствующей группе.
-* Знак * отмечает, что вы не можете удалить из группы участника, если добавите его в неё или наоборот.',
+* Знак * отмечает, что вы не сможете удалить участника из группы, если добавите его в неё, или наоборот.',
 'userrights-reason' => 'Причина:',
 'userrights-no-interwiki' => 'У вас нет разрешения изменять права участников на других вики.',
 'userrights-nodatabase' => 'База данных $1 не существует или не является локальной.',
@@ -1661,7 +1661,7 @@ $1",
 'right-reupload-own' => 'перезапись файлов тем же участником',
 'right-reupload-shared' => 'подмена файлов из общих хранилищ локальными',
 'right-upload_by_url' => 'загрузка файлов с адреса URL',
-'right-purge' => 'очистка кеша страниц без страницы подтверждения',
+'right-purge' => 'очистка кэша страниц без страницы подтверждения',
 'right-autoconfirmed' => 'правка частично защищённых страниц',
 'right-bot' => 'считаться автоматическим процессом',
 'right-nominornewtalk' => 'отсутствие малых правок на страницах обсуждений включает режим новых сообщений',
@@ -1677,7 +1677,7 @@ $1",
 'right-undelete' => 'восстановление страниц',
 'right-suppressrevision' => 'просмотр и восстановление скрытых от администраторов версий страниц',
 'right-suppressionlog' => 'просмотр частных журналов',
-'right-block' => 'установка запрета на редактирование другим участникам',
+'right-block' => 'установка ограничений на редактирование для других участников',
 'right-blockemail' => 'установка запрета на отправку электронной почты',
 'right-hideuser' => 'запрет имени участника и его сокрытие',
 'right-ipblock-exempt' => 'обход блокировок по IP, автоблокировок и блокировок диапазонов',
@@ -1711,6 +1711,9 @@ $1",
 'rightslogtext' => 'Это журнал изменений прав участника.',
 'rightslogentry' => 'изменил членство в группах для $1 с $2 на $3',
 'rightslogentry-autopromote' => 'был автоматически переведён из $2 в $3',
+'logentry-rights-rights' => '$1 {{GENDER:$1|изменил|изменила}} членство в группах для $3 с $4 на $5',
+'logentry-rights-rights-legacy' => '$1 {{GENDER:$1|изменил|изменила}} членство в группах для $3',
+'logentry-rights-autopromote' => '$1 {{GENDER:$1|был автоматически переведён|была автоматически переведена}} из $4 в $5',
 'rightsnone' => '(нет)',
 
 # Associated actions - in the sentence "You do not have permission to X"
@@ -1718,16 +1721,16 @@ $1",
 'action-edit' => 'редактирование этой страницы',
 'action-createpage' => 'создание страниц',
 'action-createtalk' => 'создание страниц обсуждений',
-'action-createaccount' => 'создание этой учётной записи участника',
-'action-minoredit' => 'отметка этой правки как малой',
+'action-createaccount' => 'создание этой учётной записи',
+'action-minoredit' => 'пометку этой правки как малой',
 'action-move' => 'переименование этой страницы',
 'action-move-subpages' => 'переименование этой страницы со всеми её подстраницами',
 'action-move-rootuserpages' => 'переименование корневых страниц участников',
 'action-movefile' => 'переименовать этот файл',
-'action-upload' => 'загрузка этого файла',
+'action-upload' => 'загрузку этого файла',
 'action-reupload' => 'перезапись существующего файла',
 'action-reupload-shared' => 'перекрытие файла из общего хранилища',
-'action-upload_by_url' => 'загрузка этого файла с адреса URL',
+'action-upload_by_url' => 'загрузку этого файла с адреса URL',
 'action-writeapi' => 'использование API для правок',
 'action-delete' => 'удаление этой страницы',
 'action-deleterevision' => 'удаление этой версии страницы',
@@ -1736,9 +1739,9 @@ $1",
 'action-undelete' => 'восстановление этой страницы',
 'action-suppressrevision' => 'просмотр и восстановление этой скрытой версии страницы',
 'action-suppressionlog' => 'просмотр этого частного журнала',
-'action-block' => 'блокировка участника',
+'action-block' => 'ограничивать возможность редактирования для этого участника',
 'action-protect' => 'изменение уровня защиты этой страницы',
-'action-rollback' => 'быстрый откат изменений последнего пользователя, который редактировал страницу',
+'action-rollback' => 'быстрый откат изменений участника, который последним редактировал страницу',
 'action-import' => 'импорт этой страницы из другой вики',
 'action-importupload' => 'импорт этой страницы из загруженного файла',
 'action-patrol' => 'отметка чужих правок как отпатрулированных',
@@ -1755,13 +1758,13 @@ $1",
 'recentchanges' => 'Свежие правки',
 'recentchanges-legend' => 'Настройки свежих правок',
 'recentchanges-summary' => 'Ниже в хронологическом порядке перечислены последние изменения на страницах {{grammar:genitive|{{SITENAME}}}}.',
-'recentchanges-feed-description' => 'Отслеживать последние изменения в вики в этом потоке.',
+'recentchanges-feed-description' => 'Отслеживать в этом потоке последние изменения в вики.',
 'recentchanges-label-newpage' => 'Этой правкой была создана новая страница.',
 'recentchanges-label-minor' => 'Это незначительное изменение',
 'recentchanges-label-bot' => 'Эта правка сделана ботом',
-'recentchanges-label-unpatrolled' => 'Эту правку ещё не отпатрулировали',
+'recentchanges-label-unpatrolled' => 'Эта правку ещё никем не патрулировалась',
 'rcnote' => "{{PLURAL:$1|Последнее '''$1''' изменение|Последние '''$1''' изменения|Последние '''$1''' изменений}} за '''$2''' {{PLURAL:$2|день|дня|дней}}, на момент времени $5 $4.",
-'rcnotefrom' => 'Ниже перечислены изменения с <strong>$2</strong> (по <strong>$1</strong>).',
+'rcnotefrom' => "Ниже перечислены изменения с '''$2''' (не более '''$1''').",
 'rclistfrom' => 'Показать изменения с $1.',
 'rcshowhideminor' => '$1 малые правки',
 'rcshowhidebots' => '$1 ботов',
@@ -1910,7 +1913,7 @@ $1",
 'filename-bad-prefix' => "Имя загружаемого файла начинается с «'''$1'''» и, вероятно, является одним из шаблонных имён, которые цифровые фотокамеры дают снимкам. Пожалуйста, выберите имя, лучше описывающее содержание файла.",
 'filename-prefix-blacklist' => ' #<!-- оставьте эту строчку как есть --> <pre>
 # Синтаксис следующий:
-#   * Всё, что начинается с символа «#» считается комментарием (до конца строки)
+#   * Всё, что начинается с символа «#», считается комментарием (до конца строки)
 #   * Каждая непустая строка — префикс стандартного названия файла, которое обычно даёт цифровая камера
 CIMG # Casio
 DSC_ # Nikon
@@ -1988,7 +1991,7 @@ $1',
 # ZipDirectoryReader
 'zip-file-open-error' => 'Произошла ошибка при открытии файла для проверки архива.',
 'zip-wrong-format' => 'Указанный файл не является файлом ZIP.',
-'zip-bad' => 'ZIP-файл повреждён, или не может быть прочитан.
+'zip-bad' => 'ZIP-файл повреждён или не может быть прочитан.
 Он не может быть должным образом проверен.',
 'zip-unsupported' => 'Этот ZIP-файл использует возможности, не поддерживаемые MediaWiki.
 Он не может быть должным образом проверен.',
@@ -2198,9 +2201,9 @@ $1',
 'brokenredirects-edit' => 'править',
 'brokenredirects-delete' => 'удалить',
 
-'withoutinterwiki' => 'Страницы без межъязыковых ссылок',
+'withoutinterwiki' => 'Страницы без интервики-ссылок',
 'withoutinterwiki-summary' => 'Следующие страницы не имеют интервики-ссылок:',
-'withoutinterwiki-legend' => 'Приставка',
+'withoutinterwiki-legend' => 'Префикс',
 'withoutinterwiki-submit' => 'Показать',
 
 'fewestrevisions' => 'Страницы с наименьшим количеством версий',
@@ -2237,7 +2240,7 @@ $1',
 'mostlinkedtemplates' => 'Самые используемые шаблоны',
 'mostcategories' => 'Страницы, включённые в большое количество категорий',
 'mostimages' => 'Самые используемые файлы',
-'mostinterwikis' => 'Страницы с наибольшим числом межъязыковых ссылок',
+'mostinterwikis' => 'Страницы с наибольшим числом интервики-ссылок',
 'mostrevisions' => 'Наиболее часто редактировавшиеся страницы',
 'prefixindex' => 'Указатель по началу названий страниц',
 'prefixindex-namespace' => 'Указатель по началу страниц (пространство имён «{{ns:$1}}»)',
@@ -2370,7 +2373,7 @@ $1',
 'listgrouprights-group' => 'Группа',
 'listgrouprights-rights' => 'Права',
 'listgrouprights-helppage' => 'Help:Права групп',
-'listgrouprights-members' => '(список группы)',
+'listgrouprights-members' => '(список участников)',
 'listgrouprights-right-display' => '<span class="listgrouprights-granted">$1 (<code>$2</code>)</span>',
 'listgrouprights-right-revoked' => '<span class="listgrouprights-revoked">$1 (<code>$2</code>)</span>',
 'listgrouprights-addgroup' => 'может добавлять в {{PLURAL:$2|группу|группы}}: $1',
@@ -2389,7 +2392,7 @@ $1',
 'emailuser-title-target' => 'Написание электронного письма {{GENDER:$1|участнику|участнице}}',
 'emailuser-title-notarget' => 'Написание электронного письма участнику',
 'emailpage' => 'Письмо участнику',
-'emailpagetext' => 'С помощью данной формы можно отправить сообщение на адрес электронной почты этого участника.
+'emailpagetext' => 'С помощью данной формы можно отправить сообщение на адрес электронной почты {{GENDER:$1|этого участника|этой участницы}}.
 В качестве обратного адреса будет указан тот адрес, который вы указали в [[Special:Preferences|своих настройках]], таким образом получатель будет иметь возможность ответить непосредственно вам.',
 'usermailererror' => 'При отправке сообщения электронной почты произошла ошибка:',
 'defemailsubject' => '{{SITENAME}} — Письмо от $1',
@@ -2465,7 +2468,7 @@ $1',
 'enotif_lastvisited' => 'См. $1 для просмотра всех изменений, произошедших с вашего последнего посещения.',
 'enotif_lastdiff' => 'См. $1 для ознакомления с изменением.',
 'enotif_anon_editor' => 'анонимный участник $1',
-'enotif_body' => 'Уважаемый(ая) $WATCHINGUSERNAME,
+'enotif_body' => 'Здравствуйте, $WATCHINGUSERNAME!
 
 $PAGEEDITDATE страница проекта «{{SITENAME}}» $PAGETITLE была $CHANGEDORCREATED участником $PAGEEDITOR, см. $PAGETITLE_URL для просмотра текущей версии.
 
@@ -2593,7 +2596,7 @@ $UNWATCHURL
 'protect-otherreason' => 'Другая причина/дополнение:',
 'protect-otherreason-op' => 'Другая причина',
 'protect-dropdown' => '* Типовые причины защиты
-** заядлый вандализм
+** частый вандализм
 ** чрезмерный спам
 ** непродуктивная война правок
 ** популярная страница',
@@ -2621,7 +2624,7 @@ $UNWATCHURL
 'undeletepage' => 'Просмотр и восстановление удалённых страниц',
 'undeletepagetitle' => "'''Ниже перечислены удалённые версии страницы [[:$1]]'''.",
 'viewdeletedpage' => 'Просмотр удалённых страниц',
-'undeletepagetext' => '{{PLURAL:$1|Следующая $1 страница была удалена|Следующие $1 страницы были удалены|Следующие $1 страниц были удалены}}, однако {{PLURAL:$1|она всё ещё находятся в архиве, и поэтому может быть восстановлена|они всё ещё находятся в архиве, и поэтому могут быть восстановлены}}.
+'undeletepagetext' => '{{PLURAL:$1|Следующая $1 страница была удалена|Следующие $1 страницы были удалены|Следующие $1 страниц были удалены}}, однако {{PLURAL:$1|она всё ещё находится в архиве и поэтому может быть восстановлена|они всё ещё находятся в архиве и поэтому могут быть восстановлены}}.
 Архив может периодически очищаться.',
 'undelete-fieldset-title' => 'Восстановить версии',
 'undeleteextrahelp' => "Для полного восстановления истории страницы оставьте все отметки пустыми и нажмите '''«{{int:undeletebtn}}»'''.
@@ -2678,10 +2681,10 @@ $1',
 # Contributions
 'contributions' => 'Вклад участника',
 'contributions-title' => 'Вклад {{GENDER:$1|участника|участницы}} $1',
-'mycontris' => 'Мой вклад',
+'mycontris' => 'Вклад',
 'contribsub2' => 'Вклад $1 ($2)',
 'nocontribs' => 'Изменений, соответствующих заданным условиям, найдено не было.',
-'uctop' => ' (последняя)',
+'uctop' => '(последняя)',
 'month' => 'С месяца (и ранее):',
 'year' => 'С года (и ранее):',
 
@@ -2712,13 +2715,13 @@ $1',
 'isredirect' => 'страница-перенаправление',
 'istemplate' => 'включение',
 'isimage' => 'файловая ссылка',
-'whatlinkshere-prev' => '{{PLURAL:$1|предыдущая|предыдущие|предыдущие}} $1',
-'whatlinkshere-next' => '{{PLURAL:$1|следующая|следующие|следующие}} $1',
+'whatlinkshere-prev' => '{{PLURAL:$1|предыдущая|предыдущие}} $1',
+'whatlinkshere-next' => '{{PLURAL:$1|следующая|следующие}} $1',
 'whatlinkshere-links' => '← ссылки',
 'whatlinkshere-hideredirs' => '$1 перенаправления',
 'whatlinkshere-hidetrans' => '$1 включения',
 'whatlinkshere-hidelinks' => '$1 ссылки',
-'whatlinkshere-hideimages' => '$1 ссылки для изображений',
+'whatlinkshere-hideimages' => '$1 файловые ссылки',
 'whatlinkshere-filters' => 'Фильтры',
 
 # Block/unblock
@@ -2999,7 +3002,7 @@ $1',
 'allmessages-filter-unmodified' => 'Неизменённые',
 'allmessages-filter-all' => 'Все',
 'allmessages-filter-modified' => 'Изменённые',
-'allmessages-prefix' => 'Фильтр по приставке:',
+'allmessages-prefix' => 'Фильтр по префиксу:',
 'allmessages-language' => 'Язык:',
 'allmessages-filter-submit' => 'Перейти',
 
@@ -3015,7 +3018,7 @@ $1',
 'thumbnail_dest_directory' => 'Невозможно создать целевую директорию',
 'thumbnail_image-type' => 'Данный тип изображения не поддерживается',
 'thumbnail_gd-library' => 'Неполная конфигурация библиотеки GD, отсутствует функция $1',
-'thumbnail_image-missing' => 'По видимому, отсутствует файл $1',
+'thumbnail_image-missing' => 'По-видимому, отсутствует файл $1',
 
 # Special:Import
 'import' => 'Импортирование страниц',
@@ -3035,7 +3038,7 @@ $1',
 'importstart' => 'Импортирование страниц…',
 'import-revision-count' => '$1 {{PLURAL:$1|версия|версии|версий}}',
 'importnopages' => 'Нет страниц для импортирования.',
-'imported-log-entries' => '{{PLURAL:$1|Импортирована $1 запись журнала|Импортировано $1 записи журнала|Импортировано $1 записей журнала}}.',
+'imported-log-entries' => '{{PLURAL:$1|Импортирована $1 запись|Импортировано $1 записи|Импортировано $1 записей}} журнала.',
 'importfailed' => 'Не удалось импортировать: $1',
 'importunknownsource' => 'Неизвестный тип импортируемой страницы',
 'importcantopen' => 'Невозможно открыть импортируемый файл',
@@ -3093,8 +3096,8 @@ $1',
 'tooltip-pt-login' => 'Здесь можно зарегистрироваться в системе, но это необязательно.',
 'tooltip-pt-anonlogin' => 'Здесь можно зарегистрироваться в системе, но это необязательно.',
 'tooltip-pt-logout' => 'Завершить сеанс работы',
-'tooltip-ca-talk' => 'Обсуждение содержания страницы',
-'tooltip-ca-edit' => 'Эту страницу можно изменять. Используйте, пожалуйста, предварительный просмотр перед сохранением',
+'tooltip-ca-talk' => 'Обсуждение основной страницы',
+'tooltip-ca-edit' => 'Вы можете редактировать эту страницу. Перед тем, как записать свои изменения, воспользуйтесь, пожалуйста, кнопкой предварительного просмотра.',
 'tooltip-ca-addsection' => 'Создать новый раздел',
 'tooltip-ca-viewsource' => 'Эта страница защищена от изменений, но вы можете посмотреть и скопировать её исходный текст',
 'tooltip-ca-history' => 'Журнал изменений страницы',
@@ -3112,21 +3115,21 @@ $1',
 'tooltip-n-mainpage' => 'Перейти на заглавную страницу',
 'tooltip-n-mainpage-description' => 'Перейти на заглавную страницу',
 'tooltip-n-portal' => 'О проекте, о том, что вы можете сделать, где что находится',
-'tooltip-n-currentevents' => 'Список текущих событий',
+'tooltip-n-currentevents' => 'Информация о текущих событиях',
 'tooltip-n-recentchanges' => 'Список последних изменений',
 'tooltip-n-randompage' => 'Посмотреть случайную страницу',
 'tooltip-n-help' => 'Справочник по проекту «{{SITENAME}}»',
-'tooltip-t-whatlinkshere' => 'Список всех страниц, которые ссылаются на эту страницу',
+'tooltip-t-whatlinkshere' => 'Список всех страниц, ссылающихся на данную',
 'tooltip-t-recentchangeslinked' => 'Последние изменения в страницах, на которые ссылается эта страница',
 'tooltip-feed-rss' => 'Трансляция в RSS для этой страницы',
 'tooltip-feed-atom' => 'Трансляция в Atom для этой страницы',
 'tooltip-t-contributions' => 'Список страниц, которые изменял этот участник',
 'tooltip-t-emailuser' => 'Отправить письмо этому участнику',
-'tooltip-t-upload' => 'Загрузить изображения или мультимедиа-файлы',
+'tooltip-t-upload' => 'Загрузить файлы',
 'tooltip-t-specialpages' => 'Список служебных страниц',
 'tooltip-t-print' => 'Версия этой страницы для печати',
 'tooltip-t-permalink' => 'Постоянная ссылка на эту версию страницы',
-'tooltip-ca-nstab-main' => 'Содержание статьи',
+'tooltip-ca-nstab-main' => 'Просмотр основной страницы',
 'tooltip-ca-nstab-user' => 'Персональная страница участника',
 'tooltip-ca-nstab-media' => 'Медиа-файл',
 'tooltip-ca-nstab-special' => 'Это служебная страница, она недоступна для редактирования',
@@ -3223,6 +3226,7 @@ The wiki server can't provide data in a format your client can read.",
 'pageinfo-default-sort' => 'Ключ сортировки по умолчанию',
 'pageinfo-length' => 'Длина страницы (в байтах)',
 'pageinfo-article-id' => 'Идентификатор страницы',
+'pageinfo-language' => 'Язык страницы',
 'pageinfo-robot-policy' => 'Индексация поисковыми службами',
 'pageinfo-robot-index' => 'Индексируется',
 'pageinfo-robot-noindex' => 'Не индексируется',
@@ -3244,6 +3248,8 @@ The wiki server can't provide data in a format your client can read.",
 'pageinfo-hidden-categories' => '{{PLURAL:$1|Скрытая категория|Скрытых категорий}} ($1)',
 'pageinfo-templates' => '{{PLURAL:$1|Шаблон|Шаблонов}} ($1)',
 'pageinfo-toolboxlink' => 'Сведения о странице',
+'pageinfo-redirectsto' => 'Перенаправление',
+'pageinfo-redirectsto-info' => 'сведения',
 'pageinfo-contentpage-yes' => 'Да',
 'pageinfo-protect-cascading-yes' => 'Да',
 
@@ -3310,13 +3316,13 @@ $1',
 'file-info-png-looped' => 'закольцованный',
 'file-info-png-repeat' => 'проигрывается $1 {{PLURAL:$1|раз|раза|раз}}',
 'file-info-png-frames' => '$1 {{PLURAL:$1|кадр|кадра|кадров}}',
-'file-no-thumb-animation' => "'''Примечание. По техническим причинам, миниатюры этого файла не будет анимироваться.'''",
-'file-no-thumb-animation-gif' => "'''Примечание. По техническим причинам, миниатюры подобных GIF-изображений высокого разрешения не анимируются.'''",
+'file-no-thumb-animation' => "'''Примечание. По техническим причинам миниатюры этого файла не будет анимироваться.'''",
+'file-no-thumb-animation-gif' => "'''Примечание. По техническим причинам миниатюры подобных GIF-изображений высокого разрешения не анимируются.'''",
 
 # Special:NewFiles
 'newimages' => 'Галерея новых файлов',
 'imagelisttext' => "Ниже представлен список из '''$1''' {{PLURAL:$1|файла|файлов|файлов}}, отсортированных $2.",
-'newimages-summary' => 'Эта служебная страница показывает недавно загруженные файлы.',
+'newimages-summary' => 'На этой служебной странице показаны недавно загруженные файлы.',
 'newimages-legend' => 'Фильтр',
 'newimages-label' => 'Имя файла (или его часть):',
 'showhidebots' => '($1 ботов)',
@@ -3583,7 +3589,7 @@ $1',
 'exif-exposureprogram-7' => 'Портретный режим (для снимков на близком расстоянии, с фоном не в фокусе)',
 'exif-exposureprogram-8' => 'Пейзажный режим (для пейзажных снимков, с фоном в фокусе)',
 
-'exif-subjectdistance-value' => '$1 метров',
+'exif-subjectdistance-value' => '$1 {{PLURAL:$1|метр|метра|метров}}',
 
 'exif-meteringmode-0' => 'Неизвестно',
 'exif-meteringmode-1' => 'Средний',
@@ -3856,7 +3862,7 @@ $5
 # action=purge
 'confirm_purge_button' => 'OK',
 'confirm-purge-top' => 'Очистить кэш этой страницы?',
-'confirm-purge-bottom' => 'После очистки кеша страницы будет показана её последняя версия.',
+'confirm-purge-bottom' => 'После очистки кэша страницы будет показана её последняя версия.',
 
 # action=watch/unwatch
 'confirm-watch-button' => 'ОК',
@@ -3938,8 +3944,8 @@ $5
 
 # Watchlist editing tools
 'watchlisttools-view' => 'Изменения на страницах из списка',
-'watchlisttools-edit' => 'Смотреть/править список',
-'watchlisttools-raw' => 'Править как текст',
+'watchlisttools-edit' => 'Смотреть и редактировать список',
+'watchlisttools-raw' => 'Редактировать как обычный текст',
 
 # Iranian month names
 'iranian-calendar-m1' => 'Фарвардин',
@@ -4026,6 +4032,7 @@ $5
 'version-license' => 'Лицензия',
 'version-poweredby-credits' => "Эта вики работает на движке '''[//www.mediawiki.org/ MediaWiki]''', copyright © 2001-$1 $2.",
 'version-poweredby-others' => 'другие',
+'version-credits-summary' => 'Хотим поблагодарить следующих участников за их вклад в развитие [[Special:Version|MediaWiki]].',
 'version-license-info' => 'MediaWiki является свободным программным обеспечением, которое вы можете распространять и/или изменять в соответствии с условиями лицензии GNU General Public License, опубликованной фондом свободного программного обеспечения; второй версии, либо любой более поздней версии.
 
 MediaWiki распространяется в надежде, что она будет полезной, но БЕЗ КАКИХ-ЛИБО ГАРАНТИЙ, даже без подразумеваемых гарантий КОММЕРЧЕСКОЙ ЦЕННОСТИ или ПРИГОДНОСТИ ДЛЯ ОПРЕДЕЛЕННОЙ ЦЕЛИ. См. лицензию GNU General Public License для более подробной информации.
@@ -4063,7 +4070,7 @@ MediaWiki распространяется в надежде, что она бу
 'specialpages-note' => '----
 * Обычные служебные страницы.
 * <span class="mw-specialpagerestricted">Служебные страницы с ограниченным доступом.</span>
-* <span class="mw-specialpagecached">Закешированные служебные страницы (могут быть устаревшими).</span>',
+* <span class="mw-specialpagecached">Закэшированные служебные страницы (могут быть устаревшими).</span>',
 'specialpages-group-maintenance' => 'Отчёты технического обслуживания',
 'specialpages-group-other' => 'Другие служебные страницы',
 'specialpages-group-login' => 'Представиться / Зарегистрироваться',
@@ -4142,17 +4149,17 @@ MediaWiki распространяется в надежде, что она бу
 'sqlite-no-fts' => '$1 без поддержки полнотекстового поиска',
 
 # New logging system
-'logentry-delete-delete' => '$1 {{GENDER:$1|удалил|удалила}} страницу $3',
-'logentry-delete-restore' => '$1 восстановил страницу $3',
-'logentry-delete-event' => '$1 изменил видимость {{PLURAL:$5|$5 записи журнала|$5 записей журнала|$5 записей журнала}} на $3: $4',
-'logentry-delete-revision' => '$1 изменил видимость {{PLURAL:$5|$5 версии|$5 версий|$5 версий}} на странице $3: $4',
-'logentry-delete-event-legacy' => '$1 изменил видимость записей журнала $3',
-'logentry-delete-revision-legacy' => '$1 изменил видимость версий на странице $3',
-'logentry-suppress-delete' => '$1 подавил страницу $3',
-'logentry-suppress-event' => '$1 скрытно изменил видимость {{PLURAL:$5|$5 записи журнала|$5 записей журнала|$5 записей журнала}} на $3: $4',
-'logentry-suppress-revision' => '$1 скрытно изменил видимость {{PLURAL:$5|$5 версии|$5 версий|$5 версий}} на странице $3: $4',
-'logentry-suppress-event-legacy' => '$1 скрытно изменил видимость записей журнала $3',
-'logentry-suppress-revision-legacy' => '$1 скрытно изменил видимость версий на странице $3',
+'logentry-delete-delete' => '$1 {{GENDER:$2|удалил|удалила}} страницу $3',
+'logentry-delete-restore' => '$1 {{GENDER:$1|восстановил|восстановила}} страницу $3',
+'logentry-delete-event' => '$1 {{GENDER:$1|изменил|изменила}} видимость {{PLURAL:$5|$5 записи|$5 записей|$5 записей}} журнала на $3: $4',
+'logentry-delete-revision' => '$1 {{GENDER:$1|изменил|изменила}} видимость {{PLURAL:$5|$5 версии|$5 версий|$5 версий}} на странице $3: $4',
+'logentry-delete-event-legacy' => '$1 {{GENDER:$1|изменил|изменила}} видимость записей журнала $3',
+'logentry-delete-revision-legacy' => '$1 {{GENDER:$1|изменил|изменила}} видимость версий на странице $3',
+'logentry-suppress-delete' => '$1 {{GENDER:$1|подавил|подавила}} страницу $3',
+'logentry-suppress-event' => '$1 скрытно {{GENDER:$1|изменил|изменила}} видимость {{PLURAL:$5|$5 записи|$5 записей|$5 записей}} журнала на $3: $4',
+'logentry-suppress-revision' => '$1 скрытно {{GENDER:$1|изменил|изменила}} видимость {{PLURAL:$5|$5 версии|$5 версий|$5 версий}} на странице $3: $4',
+'logentry-suppress-event-legacy' => '$1 скрытно {{GENDER:$1|изменил|изменила}} видимость записей журнала $3',
+'logentry-suppress-revision-legacy' => '$1 скрытно {{GENDER:$1|изменил|изменила}} видимость версий на странице $3',
 'revdelete-content-hid' => 'содержание скрыто',
 'revdelete-summary-hid' => 'описание правки скрыто',
 'revdelete-uname-hid' => 'имя участника скрыто',
@@ -4161,15 +4168,15 @@ MediaWiki распространяется в надежде, что она бу
 'revdelete-uname-unhid' => 'имя участника раскрыто',
 'revdelete-restricted' => 'ограничения применяются к администраторам',
 'revdelete-unrestricted' => 'ограничения сняты для администраторов',
-'logentry-move-move' => '$1 переименовал страницу $3 в $4',
-'logentry-move-move-noredirect' => '$1 переименовал страницу $3 в $4 без оставления перенаправления',
-'logentry-move-move_redir' => '$1 переименовал страницу $3 в $4 поверх перенаправления',
-'logentry-move-move_redir-noredirect' => '$1 переименовал страницу $3 в $4 поверх перенаправления и без оставления перенаправления',
-'logentry-patrol-patrol' => '$1 отпатрулировал версию $4 страницы $3',
-'logentry-patrol-patrol-auto' => '$1 автоматически отпатрулировал версию $4 страницы $3',
-'logentry-newusers-newusers' => '$1 создал учётную запись участника',
-'logentry-newusers-create' => '$1 создал учётную запись',
-'logentry-newusers-create2' => '$1 создал учётную запись участника $3',
+'logentry-move-move' => '$1 {{GENDER:$1|переименовал|переименовала}} страницу $3 в $4',
+'logentry-move-move-noredirect' => '$1 {{GENDER:$1|переименовал|переименовала}} страницу $3 в $4 без оставления перенаправления',
+'logentry-move-move_redir' => '$1 {{GENDER:$1|переименовал|переименовала}} страницу $3 в $4 поверх перенаправления',
+'logentry-move-move_redir-noredirect' => '$1 {{GENDER:$1|переименовал|переименовала}} страницу $3 в $4 поверх перенаправления и без оставления перенаправления',
+'logentry-patrol-patrol' => '$1 {{GENDER:$1|отпатрулировал|отпатрулировала}} версию $4 страницы $3',
+'logentry-patrol-patrol-auto' => '$1 автоматически {{GENDER:$1|отпатрулировал|отпатрулировала}} версию $4 страницы $3',
+'logentry-newusers-newusers' => '$1 {{GENDER:$1|создал|создала}} учётную запись участника',
+'logentry-newusers-create' => '$1 {{GENDER:$1|создал|создала}} учётную запись',
+'logentry-newusers-create2' => '$1 {{GENDER:$1|создал|создала}} учётную запись участника $3',
 'logentry-newusers-autocreate' => 'Автоматически создана учётная запись $1',
 'newuserlog-byemail' => 'пароль отправлен по эл. почте',
 
@@ -4186,7 +4193,7 @@ MediaWiki распространяется в надежде, что она бу
 'feedback-error3' => 'Ошибка. Нет ответа от API',
 'feedback-thanks' => 'Спасибо! Ваш отзыв размещён на странице «[$2 $1]».',
 'feedback-close' => 'Готово',
-'feedback-bugcheck' => 'Прекрасно! Только проверьте, что в списке [$1 известных ошибок] её нет подобной записи.',
+'feedback-bugcheck' => 'Прекрасно! Только проверьте, что в списке [$1 известных ошибок] нет подобной записи.',
 'feedback-bugnew' => 'Я проверил. Сообщить о новой ошибке',
 
 # Search suggestions
@@ -4241,7 +4248,7 @@ MediaWiki распространяется в надежде, что она бу
 'duration-days' => '$1 {{PLURAL:$1|день|дня|дней}}',
 'duration-weeks' => '$1 {{PLURAL:$1|неделя|недели|недель}}',
 'duration-years' => '$1 {{PLURAL:$1|год|года|лет}}',
-'duration-decades' => '$1 {{PLURAL:$1|декада|декады|декад}}',
+'duration-decades' => '$1 {{PLURAL:$1|десятилетие|десятилетия|десятилетий}}',
 'duration-centuries' => '$1 {{PLURAL:$1|век|века|веков}}',
 'duration-millennia' => '$1 {{PLURAL:$1|тысячелетие|тысячелетия|тысячелетий}}',
 
diff --git a/languages/messages/MessagesSa.php b/languages/messages/MessagesSa.php
index d83b5df61d..83488863e1 100644
--- a/languages/messages/MessagesSa.php
+++ b/languages/messages/MessagesSa.php
@@ -178,7 +178,6 @@ $magicWords = array(
 	'forcetoc'                  => array( '0', '__अनुक्रमणीसचते__', '__FORCETOC__' ),
 	'toc'                       => array( '0', '__अनुक्रमणी__', '__TOC__' ),
 	'noeditsection'             => array( '0', '__नैवसम्पादनविभाग__', '__NOEDITSECTION__' ),
-	'noheader'                  => array( '0', '__नैवमुख्यशिर्षक__', '__NOHEADER__' ),
 	'currentmonth'              => array( '1', 'अद्यमासे', 'CURRENTMONTH', 'CURRENTMONTH2' ),
 	'currentmonthname'          => array( '1', 'अद्यमासेनाम', 'CURRENTMONTHNAME' ),
 	'currentmonthnamegen'       => array( '1', 'अद्यमासेनामसाधारण', 'CURRENTMONTHNAMEGEN' ),
diff --git a/languages/messages/MessagesSah.php b/languages/messages/MessagesSah.php
index f126d897f6..4c07e55545 100644
--- a/languages/messages/MessagesSah.php
+++ b/languages/messages/MessagesSah.php
@@ -91,7 +91,7 @@ $messages = array(
 
 'underline-always' => 'Куруук',
 'underline-never' => 'Аннынан тардыма',
-'underline-default' => 'Браузер настройкатынан',
+'underline-default' => 'Браузер туруоруутунан',
 
 # Font style option in Special:Preferences
 'editfont-style' => 'Эрэдээксийэлиир түннүк бичигэ:',
@@ -199,7 +199,7 @@ $messages = array(
 'vector-action-protect' => 'Уларыйбат гын',
 'vector-action-undelete' => 'Төннөр',
 'vector-action-unprotect' => 'Көмүскэлин уларыт',
-'vector-simplesearch-preference' => 'Көрдөбүл этэн биэриилэрин кэҥэтиллибит барылын туруор («Векторга» эрэ)',
+'vector-simplesearch-preference' => 'Көрдөбүл устуруокатын судургу барылын туруор («Векторга» эрэ)',
 'vector-view-create' => 'Ай',
 'vector-view-edit' => 'Уларыт',
 'vector-view-history' => 'Устуоруйатын көрүү',
@@ -307,6 +307,7 @@ $1',
 'newmessagesdifflink' => 'кэлиҥҥи уларытыы',
 'youhavenewmessagesfromusers' => 'Маны $1 {{PLURAL:$3|соҕотох кыттааччыттан|$3 кыттааччыттан}} туппуккун ($2).',
 'youhavenewmessagesmanyusers' => 'Маны $1 элбэх кыттааччыттан туппуккун ($2).',
+'newmessageslinkplural' => '{{PLURAL:$1|саҥа этии|саҥа этии}}',
 'newmessagesdifflinkplural' => 'тиһэх {{PLURAL:$1|уларытыы|уларытыылар}}',
 'youhavenewmessagesmulti' => '$1, саҥа суруктар кэллилэр',
 'editsection' => 'уларыт',
@@ -360,9 +361,9 @@ $1',
 'dberrortext' => 'Билии олоҕор ыйытык синтаксииһа сыыһалаах эбит.
 Ол бырагырааммаҕар баар сыыһаттан буолуон сөп.
 Билии олоҕор бүтэһик ыйытык маннык:
-<blockquote><tt>$1</tt></blockquote>
-(бу пуунсуйаттан тахсыбыт "<tt>$2</tt>").
-Билии олоҕо сыыһаны көрдөрдө "<tt>$3: $4</tt>".',
+: <code>$1</code>
+(бу пуунсуйаттан тахсыбыт «<code>$2</code>»).
+Билии олоҕо сыыһаны көрдөрдө «<code>$3: $4</code>».',
 'dberrortextcl' => 'Билии олоҕор ыйытык синтаксииһын сыыһата таҕыста.
 Билии олоҕор бүтэһик ыйытык:
 "$1"
@@ -415,8 +416,11 @@ $1',
 'protectedpagetext' => 'Бу сирэй уларытыллыбат.',
 'viewsourcetext' => 'Эн бу сирэй төрдүн көрүөххүн уонна төгүллүөххүн сөп:',
 'viewyourtext' => "'''Бэйэҥ көннөрүүлэриҥ''' исходнигын бу сирэйгэ көрүөххүн уонна хатылаан ылыаххын сөп:",
-'protectedinterface' => 'Бу сирэй бырагыраамма холбуурун хааччыйар, онон моһуогурууттан халытан хатанан турар',
-'editinginterface' => "'''Болҕой:''' Быраҕыраамма тас көстүүтүн (интерфейсын) хааччыйар тиэкиһи уларытаары гынан эрэҕин. Бу сирэйи уларыттаххына атын кыттааччылар көрөллөрүгэр бырагыраамма көстүүтэ уларыйыа. Тылбаастыыр буоллаххына Медиавики бырайыактарын сахалыы тылбааһын [//translatewiki.net/wiki/Main_Page?setlang=sah translatewiki.net] туһан.",
+'protectedinterface' => 'Бу сирэй бырагыраамма интерфейсын биллэриитин көрдөрөр, онон моһуогурууттан халытан хатанан турар.
+Тылбааһын уларытыаххын баҕарар буоллаххына онно аналлаах тылбаас ситим-сирин туһан: MediaWiki [//translatewiki.net/ translatewiki.net]',
+'editinginterface' => "'''Болҕой:''' Быраҕыраамма тас көстүүтүн (интерфейсын) хааччыйар тиэкиһи уларытаары гынан эрэҕин.
+Бу сирэйи уларыттаххына атын кыттааччылар көрөллөрүгэр бырагыраамма көстүүтэ уларыйыа. 
+Тылбааһын уларытыаххын эбэтэр эбиэххин баҕарар буоллаххына Медиавики бырайыактарын тылбаастыыр сиргэ киир [//translatewiki.net/ translatewiki.net].",
 'sqlhidden' => '(SQL ыйытык кистэммит)',
 'cascadeprotected' => 'Бу сирэй уларыйар кыаҕа суох, тоҕо диэтэххэ уларыйара бобуллубут (каскаднай көмүскэл холбоммут) {{PLURAL:$1|сирэй бөлөҕөр|сирэйдэр бөлөхтөрүгэр}} киирэр:
 $2',
@@ -454,6 +458,7 @@ $2',
 'remembermypassword' => 'Миигин бу көмпүүтэргэ сигээ ($1 {{PLURAL:$1|күн|күнтэн ордуга суох}})',
 'securelogin-stick-https' => 'Киирэн баран HTTPS нөҥүө холбонууну салгыырга',
 'yourdomainname' => 'Эн дөмүөнүҥ:',
+'password-change-forbidden' => 'Бу биикигэ киирии тылы уоарытар табыллыбат.',
 'externaldberror' => 'Тас киирии билиитин олоҕун сыыһата буолла, эбэтэр тас киирии билииҥ олоҕун саҥардар кыаҕыҥ суох.',
 'login' => 'Киир',
 'nav-login-createaccount' => 'Киир / бэлиэтэн',
@@ -2268,7 +2273,7 @@ $1',
 # Contributions
 'contributions' => 'Кыттааччы суруйуута (вклад)',
 'contributions-title' => '$1 кыттааччы киллэрбит уларытыылара',
-'mycontris' => 'Суруйуум тиһигэ',
+'mycontris' => 'Суруйуу тиһигэ',
 'contribsub2' => 'Вклад $1 ($2)',
 'nocontribs' => 'Эппит критерийгэр эппиэттиир уларытыылар көстүбэтилэр.',
 'uctop' => '(бүтэһик)',
@@ -2308,7 +2313,7 @@ $1',
 'whatlinkshere-hideredirs' => '$1 утаарыы',
 'whatlinkshere-hidetrans' => '$1 киллэриилэр',
 'whatlinkshere-hidelinks' => '$1 сигэ (ыйынньык)',
-'whatlinkshere-hideimages' => '$1 ойуу сигэтэ',
+'whatlinkshere-hideimages' => '$1 билэ сигэтэ',
 'whatlinkshere-filters' => 'Фильтрдар',
 
 # Block/unblock
@@ -3475,6 +3480,7 @@ MediaWiki туһалаах буоллун диэн тарҕатыллар, ол
 'version-software' => 'Туруоруллубут бырагырааммалар',
 'version-software-product' => 'Бородуукта',
 'version-software-version' => 'Барыл (торум)',
+'version-entrypoints' => 'Киирэр аадырыстар (URL)',
 'version-entrypoints-header-entrypoint' => 'Киирии сирэ',
 'version-entrypoints-header-url' => 'URL',
 
@@ -3647,7 +3653,8 @@ MediaWiki туһалаах буоллун диэн тарҕатыллар, ол
 'api-error-file-too-large' => 'Ыыппыт билэҥ наһаа улахан эбит.',
 'api-error-filename-tooshort' => 'Билэҥ аата наһаа кылгас.',
 'api-error-filetype-banned' => 'Маннык көрүҥнээх билэлэр бобуулаахтар.',
-'api-error-filetype-banned-type' => '$1 — {{PLURAL:$4|билэ бобуллубут көрүҥэ|билэ бобуллубут көрүҥнэрэ}}.. Көҥүллэммит билэ {{PLURAL:$3|көрүҥэ маннык|көрүҥнэрэ манныктар}}: $2.',
+'api-error-filetype-banned-type' => '$1 — {{PLURAL:$4|билэ бобуллубут көрүҥэ|билэ бобуллубут көрүҥнэрэ}}. 
+Көҥүллэммит билэ {{PLURAL:$3|көрүҥэ маннык|көрүҥнэрэ манныктар}}: $2.',
 'api-error-filetype-missing' => 'Бу билэ тэнитиитэ (расширение) суох эбит.',
 'api-error-hookaborted' => 'Эн киллэрбит уларытыыгын кэҥэтии таҥастааччыта оннугар төннөрбүт.',
 'api-error-http' => 'Ис алҕас: Сиэрбэргэ холбонор табыллыбата.',
diff --git a/languages/messages/MessagesSc.php b/languages/messages/MessagesSc.php
index 5e034bc0c1..bc645bd5c5 100644
--- a/languages/messages/MessagesSc.php
+++ b/languages/messages/MessagesSc.php
@@ -195,7 +195,6 @@ $messages = array(
 'qbbrowse' => 'Nàviga',
 'qbedit' => 'Acontza',
 'qbpageoptions' => 'Possibilidades de sa pàgina',
-'qbpageinfo' => 'Cuntestu de sa pàgina',
 'qbmyoptions' => 'Is preferèntzias meas',
 'qbspecialpages' => 'Pàginas spetziales',
 'faq' => 'Pregontas/Respostas (FAQ)',
diff --git a/languages/messages/MessagesSe.php b/languages/messages/MessagesSe.php
index 42e45b4032..45e4e9b1c5 100644
--- a/languages/messages/MessagesSe.php
+++ b/languages/messages/MessagesSe.php
@@ -43,52 +43,81 @@ $namespaceAliases = array(
 
 $specialPageAliases = array(
 	'Activeusers'               => array( 'Aktiivvalaš_geavaheaddjit' ),
-	'Allmessages'               => array( 'Buot_systemasánit' ),
+	'Allmessages'               => array( 'Buot_systemadieđáhusat', 'Buot_vuogádatdieđáhusat' ),
 	'Allpages'                  => array( 'Buot_siiddut' ),
 	'Ancientpages'              => array( 'Dološ_siiddut' ),
-	'Block'                     => array( 'Cagge_geavaheaddji' ),
+	'Badtitle'                  => array( 'Veadjemeahttun_bajilčála' ),
+	'Blankpage'                 => array( 'Guoros_siidu' ),
+	'Block'                     => array( 'Hehtte', 'Hehtte_geavaheaddji', 'Hehtte_IP' ),
+	'Blockme'                   => array( 'Hehtte_mu' ),
 	'Booksources'               => array( 'Girjegáldut' ),
+	'BrokenRedirects'           => array( 'Feaillalaš_stivremat', 'Feaillalaš_ođđasitstivremat' ),
 	'Categories'                => array( 'Kategoriijat' ),
-	'Contributions'             => array( 'Geavaheaddji_rievdadusat' ),
+	'ComparePages'              => array( 'Veardit_siidduid' ),
+	'Confirmemail'              => array( 'Sihkaraste_e-poastta' ),
+	'Contributions'             => array( 'Rievdadusat' ),
+	'CreateAccount'             => array( 'Ráhkat_dovddaldaga' ),
+	'DeletedContributions'      => array( 'Sihkkojuvvon_rievdadusat' ),
 	'Disambiguations'           => array( 'Liŋkkat_dárkonsiidduide' ),
 	'DoubleRedirects'           => array( 'Guoktegeardásaš_ođđasitstivremat' ),
-	'Emailuser'                 => array( 'SáddeEpoastta' ),
+	'EditWatchlist'             => array( 'Rievdat_čuovvunlisttu' ),
+	'Emailuser'                 => array( 'Sádde_e-poastta' ),
 	'Export'                    => array( 'Olggosfievrrit_siidduid' ),
+	'Import'                    => array( 'Sisafievrrit' ),
+	'BlockList'                 => array( 'Hehttenlistu', 'Listu_hehttemiin' ),
+	'Listadmins'                => array( 'Administráhtorlistu', 'Listu_administráhtoriin' ),
+	'Listbots'                  => array( 'Bohttalistu', 'Listu_bohtain' ),
 	'Listfiles'                 => array( 'Fiilalogahallan' ),
-	'Listredirects'             => array( 'Listu_ođđasitstivremiin' ),
-	'Listusers'                 => array( 'Listu_geavaheddjiin' ),
+	'Listgrouprights'           => array( 'Listu_joavkkuid_vuoigavuođain' ),
+	'Listredirects'             => array( 'Stivrenlistu', 'Listu_stivremiin', 'Listu_ođđasitstivremiin' ),
+	'Listusers'                 => array( 'Geavaheaddjelistu', 'Listu_geavaheddjiin' ),
 	'Log'                       => array( 'Loggat', 'Logga' ),
 	'Lonelypages'               => array( 'Oarbbes_siiddut' ),
 	'Longpages'                 => array( 'Guhkes_siiddut' ),
 	'MIMEsearch'                => array( 'MIME-ohcan' ),
-	'Newimages'                 => array( 'Ođđa_govat' ),
+	'Movepage'                  => array( 'Sirdde_siiddu' ),
+	'Mycontributions'           => array( 'Mu_rievdadusat' ),
+	'Mypage'                    => array( 'Mu_siidu' ),
+	'Mytalk'                    => array( 'Mu_ságastallan' ),
+	'Newimages'                 => array( 'Ođđa_govat', 'Ođđa_fiillat' ),
 	'Newpages'                  => array( 'Ođđa_siiddut' ),
-	'Preferences'               => array( 'Válljemat' ),
+	'Popularpages'              => array( 'Bivnnuhis_siiddut' ),
+	'Preferences'               => array( 'Válljemat', 'Ásahusat' ),
 	'Protectedpages'            => array( 'Suodjaluvvon_siiddut' ),
-	'Randompage'                => array( 'Summal_siidu' ),
+	'Protectedtitles'           => array( 'Suodjaluvvon_bajilčállagat', 'Suodjaluvvon_siidonamat' ),
+	'Randompage'                => array( 'Summal', 'Summal_siidu' ),
 	'Randomredirect'            => array( 'Summal_ođđasitstivren' ),
 	'Recentchanges'             => array( 'Varas_rievdadusat' ),
+	'Revisiondelete'            => array( 'Sihko_veršuvnna' ),
 	'Search'                    => array( 'Oza' ),
 	'Shortpages'                => array( 'Oanehis_siiddut' ),
-	'Specialpages'              => array( 'Erenoamáš_siiddut' ),
+	'Specialpages'              => array( 'Erenoamáš_siiddut', 'Doaibmasiiddut' ),
 	'Statistics'                => array( 'Statistihkat' ),
-	'Uncategorizedcategories'   => array( 'Klassifiserekeahtes_kategoriijat' ),
-	'Uncategorizedimages'       => array( 'Klassifiserekeahtes_govat' ),
-	'Uncategorizedpages'        => array( 'Klassifiserekeahtes_siiddut' ),
-	'Uncategorizedtemplates'    => array( 'Klassifiserekeahtes_mállevuođut' ),
-	'Unusedcategories'          => array( 'Geavatkeahtes_lágit' ),
-	'Unusedimages'              => array( 'Geavatkeahtes_govat' ),
-	'Unusedtemplates'           => array( 'Geavatkeahtes_mállevuođut' ),
-	'Unwatchedpages'            => array( 'Čuovvotkeahtes_siiddut' ),
+	'Unblock'                   => array( 'Sihko_hehttema' ),
+	'Uncategorizedcategories'   => array( 'Kategoriserekeahtes_kategoriijat' ),
+	'Uncategorizedimages'       => array( 'Kategoriserekeahtes_govat', 'Kategoriserekeahtes_fiillat' ),
+	'Uncategorizedpages'        => array( 'Kategoriserekeahtes_siiddut' ),
+	'Uncategorizedtemplates'    => array( 'Kategoriserekeahtes_mállet' ),
+	'Undelete'                  => array( 'Máhccat' ),
+	'Unusedcategories'          => array( 'Geavatkeahtes_kategoriijat' ),
+	'Unusedimages'              => array( 'Geavatkeahtes_govat', 'Geavatkeahtes_fiillat' ),
+	'Unusedtemplates'           => array( 'Geavatkeahtes_mállet' ),
+	'Unwatchedpages'            => array( 'Čuovotkeahtes_siiddut' ),
 	'Upload'                    => array( 'Sádde_fiilla' ),
+	'Userlogin'                 => array( 'Logge_sisa' ),
+	'Userlogout'                => array( 'Logge_olggos' ),
+	'Userrights'                => array( 'Geavaheaddjevuoigatvuođat' ),
 	'Version'                   => array( 'Veršuvdna' ),
 	'Wantedcategories'          => array( 'Kategoriijasávaldagat' ),
-	'Wantedpages'               => array( 'Siidusávaldagat' ),
+	'Wantedfiles'               => array( 'Fiilasávaldagat', 'Govvasávaldagat' ),
+	'Wantedpages'               => array( 'Siidosávaldagat' ),
+	'Wantedtemplates'           => array( 'Mállesávaldagat' ),
 	'Watchlist'                 => array( 'Čuovvunlistu' ),
+	'Withoutinterwiki'          => array( 'Interwikihis_siiddut', 'Giellaliŋkkahis_siiddut', 'Giellaleaŋkkahis_siiddut' ),
 );
 
 $magicWords = array(
-	'redirect'                  => array( '0', '#OĐĐASITSTIVREN', '#STIVREN', '#REDIRECT' ),
+	'redirect'                  => array( '0', '#STIVREN', '#OĐĐASITSTIVREN', '#REDIRECT' ),
 	'numberofarticles'          => array( '1', 'ARTIHKKALIIDMEARRI', 'NUMBEROFARTICLES' ),
 );
 
diff --git a/languages/messages/MessagesSei.php b/languages/messages/MessagesSei.php
index 6abfc5a88f..3b89821c17 100644
--- a/languages/messages/MessagesSei.php
+++ b/languages/messages/MessagesSei.php
@@ -133,7 +133,6 @@ $messages = array(
 'qbbrowse' => 'Quetzexal',
 'qbedit' => 'Ticpatlöx',
 'qbpageoptions' => 'Jan páhina',
-'qbpageinfo' => 'Contextua',
 'qbmyoptions' => 'Hepáhinám',
 'qbspecialpages' => 'Páhinám extravám',
 'faq' => 'Cocmíiit cmaa',
diff --git a/languages/messages/MessagesSgs.php b/languages/messages/MessagesSgs.php
index 79828961dc..a91db8d963 100644
--- a/languages/messages/MessagesSgs.php
+++ b/languages/messages/MessagesSgs.php
@@ -198,7 +198,6 @@ $messages = array(
 'qbbrowse' => 'Naršītė',
 'qbedit' => 'Taisītė',
 'qbpageoptions' => 'Tas poslapis',
-'qbpageinfo' => 'Konteksts',
 'qbmyoptions' => 'Mona poslapē',
 'qbspecialpages' => 'Specēlė̅jė poslapē',
 'faq' => 'DOK',
diff --git a/languages/messages/MessagesSh.php b/languages/messages/MessagesSh.php
index c37b4e4cfb..fe51c7c993 100644
--- a/languages/messages/MessagesSh.php
+++ b/languages/messages/MessagesSh.php
@@ -121,7 +121,6 @@ $magicWords = array(
 	'forcetoc'                  => array( '0', '__FORSIRANISADRŽAJ__', '__UKLJUČISADRŽAJ__', '__FORCETOC__' ),
 	'toc'                       => array( '0', '__SADRŽAJ__', '__TOC__' ),
 	'noeditsection'             => array( '0', '__BEZ_IZMJENA__', '__BEZIZMJENA__', '__BEZ_IZMENA__', '__BEZIZMENA__', '__NOEDITSECTION__' ),
-	'noheader'                  => array( '0', '__BEZ_ZAGLAVLJA__', '__NOHEADER__' ),
 	'currentmonth'              => array( '1', 'TRENUTNIMJESEC', 'TRENUTNIMESEC', 'TRENUTAČNIMJESEC', 'CURRENTMONTH', 'CURRENTMONTH2' ),
 	'currentmonth1'             => array( '1', 'TRENUTNIMJESEC1', 'TRENUTNIMESEC1', 'TRENUTAČNIMJESEC1', 'CURRENTMONTH1' ),
 	'currentmonthname'          => array( '1', 'TRENUTNIMJESECIME', 'TRENUTNIMESECIME', 'TRENUTAČNIMJESECIME', 'CURRENTMONTHNAME' ),
diff --git a/languages/messages/MessagesShi.php b/languages/messages/MessagesShi.php
index 7cb6512a23..602a15e5dd 100644
--- a/languages/messages/MessagesShi.php
+++ b/languages/messages/MessagesShi.php
@@ -157,7 +157,6 @@ $messages = array(
 'qbbrowse' => 'Cabba',
 'qbedit' => 'Sbadl',
 'qbpageoptions' => 'Tasnat ad',
-'qbpageinfo' => 'Context',
 'qbmyoptions' => 'Tisnatin inu',
 'qbspecialpages' => 'Tisnatin timzlay',
 'faq' => 'Isqsitn li bdda tsutulnin',
diff --git a/languages/messages/MessagesSi.php b/languages/messages/MessagesSi.php
index 936f8db75b..8a97d5c0a6 100644
--- a/languages/messages/MessagesSi.php
+++ b/languages/messages/MessagesSi.php
@@ -2954,11 +2954,29 @@ $1 ගේ වාරණයට හේතුව මෙය වේ: "$2"',
 
 # Info page
 'pageinfo-title' => '"$1" සඳහා තොරතුරු',
+'pageinfo-header-basic' => 'මූලික තොරතුරු',
 'pageinfo-header-edits' => 'සංස්කරණ',
+'pageinfo-header-restrictions' => 'පිටු ආරක්ෂණය',
+'pageinfo-display-title' => 'මාතෘකාව පෙන්වන්න',
+'pageinfo-default-sort' => 'පෙරනිමි තේරීම් යතුර',
+'pageinfo-length' => 'පිටු දිග (බයිට් වලින්)',
+'pageinfo-article-id' => 'පිටු අනන්‍යනාංකය',
+'pageinfo-robot-policy' => 'සෙවුම් එන්ජිම් තත්ත්වය',
 'pageinfo-views' => 'නැරඹුම් සංඛ්‍යාව',
-'pageinfo-watchers' => 'මුරකරන්නන් සංඛ්‍යාව',
-'pageinfo-edits' => 'සංස්කරණයන් සංඛ්‍යාව',
-'pageinfo-authors' => 'ප්‍රභින්න කර්තෘවරුන් සංඛ්‍යාව',
+'pageinfo-watchers' => 'පිටු මුරකරන්නන් සංඛ්‍යාව',
+'pageinfo-redirects-name' => 'මෙම පිටුවට යළියොමු ගණන',
+'pageinfo-subpages-name' => 'මෙම පිටුවෙහි උපපිටු',
+'pageinfo-subpages-value' => '$1 ($2 {{PLURAL:$2|යළියොමු වෙයි|යළියොමු වෙති}}; $3 {{PLURAL:$3|යළියොමු-නොවෙයි|යළියොමු-නොවෙති}})',
+'pageinfo-firstuser' => 'පිටු තැනූ තැනැත්තේ',
+'pageinfo-firsttime' => 'පිටු තැනූ දිනය',
+'pageinfo-lastuser' => 'අවසන් සංස්කාරක',
+'pageinfo-lasttime' => 'අවසන් සංස්කරණය වූ දිනය',
+'pageinfo-edits' => 'මුළු සංස්කරණ සංඛ්‍යාව',
+'pageinfo-authors' => 'ප්‍රභින්න කර්තෘවරුන් මුළු  සංඛ්‍යාව',
+'pageinfo-recent-edits' => 'මෑත සංස්කරණ සංඛ්‍යාව (අවසන් $1 තුලදී)',
+'pageinfo-recent-authors' => 'මෑත ප්‍රභින්න කර්තෘවරුන් සංඛ්‍යාව',
+'pageinfo-magic-words' => 'මැජික් {{PLURAL:$1|වචනය|වචන}} ($1)',
+'pageinfo-toolboxlink' => 'පිටු තොරතුරු',
 
 # Patrolling
 'markaspatrolleddiff' => 'පරික්ෂාකර බැලූ ලෙස සලකුණු කරන්න',
diff --git a/languages/messages/MessagesSk.php b/languages/messages/MessagesSk.php
index d4b6883949..c7d4211d5a 100644
--- a/languages/messages/MessagesSk.php
+++ b/languages/messages/MessagesSk.php
@@ -1648,7 +1648,7 @@ Musí obsahovať menej ako $1 {{PLURAL:$1|znak|znaky|znakov}}.',
 'hist' => 'história',
 'hide' => 'skryť',
 'show' => 'zobraziť',
-'minoreditletter' => 'D',
+'minoreditletter' => 'd',
 'newpageletter' => 'N',
 'boteditletter' => 'b',
 'number_of_watching_users_pageview' => '[$1 {{PLURAL:$1|sledujúci používateľ|sledujúci používatelia|sledujúcich používateľov}}]',
@@ -1971,7 +1971,7 @@ Možno chcete upraviť popis na jeho [$2 popisnej stránke súboru] tam.',
 'uploadnewversion-linktext' => 'Nahrať novú verziu tohto súboru',
 'shared-repo-from' => 'z $1',
 'shared-repo' => 'zdieľané úložisko',
-'upload-disallowed-here' => 'Ľutujeme, tento súbor nie je možné prepísať.',
+'upload-disallowed-here' => 'Tento súbor nie je možné prepísať.',
 
 # File reversion
 'filerevert' => 'Obnoviť $1',
diff --git a/languages/messages/MessagesSl.php b/languages/messages/MessagesSl.php
index 29c71486f5..afd5f124ce 100644
--- a/languages/messages/MessagesSl.php
+++ b/languages/messages/MessagesSl.php
@@ -233,7 +233,7 @@ $messages = array(
 
 'underline-always' => 'Vedno',
 'underline-never' => 'Nikoli',
-'underline-default' => 'Privzeto (brskalnik)',
+'underline-default' => 'Koža ali privzeto v brskalniku',
 
 # Font style option in Special:Preferences
 'editfont-style' => 'Uredi področni slog pisave:',
@@ -318,7 +318,7 @@ $messages = array(
 'newwindow' => '(odpre se novo okno)',
 'cancel' => 'Prekliči',
 'moredotdotdot' => 'Več ...',
-'mypage' => 'Moja stran',
+'mypage' => 'Stran',
 'mytalk' => 'Pogovor',
 'anontalk' => 'Pogovorna stran IP',
 'navigation' => 'Navigacija',
@@ -891,7 +891,7 @@ Vedite, da .css in .js strani po meri uporabljajo naslov z malo začetnico, npr.
 'note' => "'''Opomba:'''",
 'previewnote' => "'''Pomnite, da stran le predogledujete.'''
 Vaših sprememb še nismo shranili!",
-'continue-editing' => 'Nadaljujte z urejanjem',
+'continue-editing' => 'Pojdi na urejevalno območje',
 'previewconflict' => 'V prikazanem predogledu je v zgornjem predelu urejanja navedeno besedilo, kakor se bo prikazalo, če ga boste shranili.',
 'session_fail_preview' => "'''Oprostite! Zaradi izgube podatkov o seji nam vašega urejanja žal ni uspelo obdelati.'''
 Prosimo, poskusite znova.
@@ -971,6 +971,9 @@ Izgleda, da je bila izbrisana.',
 'edit-no-change' => 'Vaše urejanje je bilo prezrto, saj ni vsebovalo sprememb.',
 'edit-already-exists' => 'Ni bilo mogoče ustvariti nove strani, ker že obstaja.',
 'defaultmessagetext' => 'Prednastavljeno besedilo',
+'content-failed-to-parse' => 'Nisem mogel razčleniti vsebine $2 za obliko $1: $3',
+'invalid-content-data' => 'Neveljavni podatki vsebine',
+'content-not-allowed-here' => 'Vsebina »$1« ni dovoljena na strani [[$2]]',
 
 # Content models
 'content-model-wikitext' => 'wikibesedilo',
@@ -1503,6 +1506,9 @@ Ko vas drugi uporabniki kontaktirajo, jim vašega e-poštnega naslova ne bomo ra
 'rightslogtext' => 'Prikazan je dnevnik sprememb uporabniških pravic.',
 'rightslogentry' => 'je spremenil(-a) pravice uporabnika $1 iz $2 v $3',
 'rightslogentry-autopromote' => 'je bil(-a) samodejno povišan(-a) z $2 na $3',
+'logentry-rights-rights' => '$1 je spremenil(-a) članstvo skupine $3 z $4 na $5',
+'logentry-rights-rights-legacy' => '$1 je spremenil(-a) članstvo skupine $3',
+'logentry-rights-autopromote' => '$1 je bil(-a) samodejno povišan(-a) z $4 na $5',
 'rightsnone' => '(nobeno)',
 
 # Associated actions - in the sentence "You do not have permission to X"
@@ -1564,7 +1570,7 @@ Ko vas drugi uporabniki kontaktirajo, jim vašega e-poštnega naslova ne bomo ra
 'rclinks' => 'Prikaži zadnjih $1 sprememb v zadnjih $2 dneh<br />$3',
 'diff' => 'prim',
 'hist' => 'zgod',
-'hide' => 'skrij',
+'hide' => 'Skrij',
 'show' => 'Prikaži',
 'minoreditletter' => 'm',
 'newpageletter' => 'N',
@@ -2140,9 +2146,9 @@ Glej tudi [[Special:WantedCategories|želene kategorije]].',
 'linksearch-pat' => 'Iskalni vzorec:',
 'linksearch-ns' => 'Imenski prostor:',
 'linksearch-ok' => 'Išči',
-'linksearch-text' => 'Nadomestne znake, kot je »*.wikipedia.org«, lahko uporabljate.
+'linksearch-text' => 'Uporabljate lahko nadomestne znake, kot je »*.wikipedia.org«.
 Zahtevana je vsaj najvišja domena, na primer »*.org«.<br />
-Podprti protokoli: <code>$1</code> (teh ne dodajte v svoje iskanje).',
+Podprti protokoli: <code>$1</code> (če protokol ni določen, se privzame http://).',
 'linksearch-line' => '$1 povezano iz $2',
 'linksearch-error' => 'Jokerji se lahko pojavijo le na začetku gostiteljskega imena.',
 
@@ -2191,8 +2197,8 @@ Morda so na razpolago tudi [[{{MediaWiki:Listgrouprights-helppage}}|dodatne info
 '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 uporabniku pošljete e-poštno sporočilo.
-E-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 prejemnik lahko odgovoril neposredno vam.',
+'emailpagetext' => 'S spodnjim obrazcem lahko {{GENDER:$1|uporabniku|uporabnici}} pošljete e-poštno sporočilo.
+E-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.',
 'usermailererror' => 'Predmet e-pošte je vrnil napako:',
 'defemailsubject' => 'Elektronska pošta {{GRAMMAR:rodilnik|{{SITENAME}}}} od uporabnika »$1«',
 'usermaildisabled' => 'Uporabniška e-pošta je onemogočena',
@@ -2528,7 +2534,7 @@ Najnovejši vnos v dnevniku blokad je naveden spodaj:',
 'whatlinkshere-hideredirs' => '$1 preusmeritve',
 'whatlinkshere-hidetrans' => '$1 vključitve',
 'whatlinkshere-hidelinks' => '$1 povezave',
-'whatlinkshere-hideimages' => '$1 povezave slik',
+'whatlinkshere-hideimages' => '$1 povezave datotek',
 'whatlinkshere-filters' => 'Filtri',
 
 # Block/unblock
@@ -2761,6 +2767,7 @@ strani ni mogoče prestaviti samo vaše.',
 'immobile-target-namespace-iw' => 'Povezava interwiki ni veljaven cilj za premik strani.',
 'immobile-source-page' => 'Te strani ni mogoče prestaviti.',
 'immobile-target-page' => 'Ne morem premakniti na ta ciljni naslov.',
+'bad-target-model' => 'Želen cilj uporablja drugačno obliko vsebine. Ne morem pretvoriti iz $1 v $2.',
 'imagenocrossnamespace' => 'Ne morem premakniti datoteke izven imenskega prostora datotek',
 'nonfile-cannot-move-to-file' => 'Ne morem premakniti nedatoteko v imenski prostor datotek',
 'imagetypemismatch' => 'Nova končnica datoteke se ne ujema z njeno vrsto',
@@ -2924,7 +2931,7 @@ Prosimo, poskusite znova.',
 'tooltip-ca-watch' => 'Dodajte stran na spisek nadzorov',
 'tooltip-ca-unwatch' => 'Odstranite stran s spiska nadzorov',
 'tooltip-search' => 'Preiščite wiki',
-'tooltip-search-go' => 'Pojdi na strani z natanko takim imenom, če obstaja',
+'tooltip-search-go' => 'Pojdi na stran z natanko takim imenom, če obstaja',
 'tooltip-search-fulltext' => 'Najde vneseno besedilo po straneh',
 'tooltip-p-logo' => 'Glavna stran',
 'tooltip-n-mainpage' => 'Obiščite Glavno stran',
@@ -2996,6 +3003,7 @@ Omogoča vnos pojasnila v povzetku urejanja.',
 
 # Info page
 'pageinfo-title' => 'Informacije o »$1«',
+'pageinfo-not-current' => 'Oprostite, vendar ne moremo nuditi podatkov starejših redakcij.',
 'pageinfo-header-basic' => 'Osnovni podatki',
 'pageinfo-header-edits' => 'Zgodovina urejanja',
 'pageinfo-header-restrictions' => 'Zaščita strani',
@@ -3004,6 +3012,7 @@ Omogoča vnos pojasnila v povzetku urejanja.',
 'pageinfo-default-sort' => 'Privzeti ključ za razvrščanje',
 'pageinfo-length' => 'Dolžina strani (v bajtih)',
 'pageinfo-article-id' => 'ID strani',
+'pageinfo-language' => 'Jezik vsebine strani',
 'pageinfo-robot-policy' => 'Status iskalnega pogona',
 'pageinfo-robot-index' => 'Na voljo za indeksiranje',
 'pageinfo-robot-noindex' => 'Ni na voljo za indeksiranje',
@@ -3024,6 +3033,13 @@ Omogoča vnos pojasnila v povzetku urejanja.',
 'pageinfo-hidden-categories' => '{{PLURAL:$1|Skrita kategorija|Skriti kategoriji|Skrite kategorije}} ($1)',
 'pageinfo-templates' => '{{PLURAL:$1|Vključena predloga|Vključeni predlogi|Vključene predloge}} ($1)',
 'pageinfo-toolboxlink' => 'Podatki o strani',
+'pageinfo-redirectsto' => 'Preusmerja na',
+'pageinfo-redirectsto-info' => 'informacije',
+'pageinfo-contentpage' => 'Å teje kot stran s vsebino',
+'pageinfo-contentpage-yes' => 'Da',
+'pageinfo-protect-cascading' => 'Zaščite se dedujejo od tukaj',
+'pageinfo-protect-cascading-yes' => 'Da',
+'pageinfo-protect-cascading-from' => 'Zaščite se dedujejo od',
 
 # Patrolling
 'markaspatrolleddiff' => 'Označite kot nadzorovano',
@@ -3717,6 +3733,7 @@ Uporabite lahko tudi [[Special:EditWatchlist|standardni urejevalnik]].',
 'version-license' => 'Licenca',
 'version-poweredby-credits' => "Ta wiki poganja '''[//www.mediawiki.org/ MediaWiki]''', vse pravice pridržave © 2001-$1 $2.",
 'version-poweredby-others' => 'drugi',
+'version-credits-summary' => 'Radi bi priznali prispevek naslednjih oseb k [[Special:Version|MediaWiki]].',
 'version-license-info' => 'MediaWiki je prosto programje; lahko ga razširjate in / ali spreminjate pod pogoji GNU General Public License, kot ga je objavila Free Software Foundation; bodisi License različice 2 ali (po vaši izbiri) katere koli poznejše različice.
 
 MediaWiki je razširjan v upanju, da bo uporaben, vendar BREZ KAKRŠNEGA KOLI ZAGOTOVILA; tudi brez posrednega jamstva PRODAJNE VREDNOSTI ali PRIMERNOSTI ZA DOLOČEN NAMEN. Oglejte si GNU General Public License za več podrobnosti.
diff --git a/languages/messages/MessagesSr_ec.php b/languages/messages/MessagesSr_ec.php
index 98501b2a42..8b3190b330 100644
--- a/languages/messages/MessagesSr_ec.php
+++ b/languages/messages/MessagesSr_ec.php
@@ -141,7 +141,6 @@ $specialPageAliases = array(
 	'Protectedtitles'           => array( 'Заштићени_наслови' ),
 	'Randompage'                => array( 'СлучајнаСтрана', 'Насумична_страница' ),
 	'Recentchanges'             => array( 'СкорашњеИзмене', 'Скорашње_измене' ),
-	'RevisionMove'              => array( 'Премести_измену' ),
 	'Search'                    => array( 'Претражи' ),
 	'Shortpages'                => array( 'КраткиЧланци' ),
 	'Specialpages'              => array( 'СпецијалнеСтране', 'Посебне_странице' ),
@@ -252,7 +251,6 @@ $magicWords = array(
 	'forcetoc'                  => array( '0', '__ФОРСИРАНИСАДРЖАЈ__', '__ФОРСИРАНИ_САДРЖАЈ__', '__ПРИМОРАНИСАДРЖАЈ__', '__ПРИМОРАНИ_САДРЖАЈ__', '__FORCETOC__' ),
 	'toc'                       => array( '0', '__САДРЖАЈ__', '__TOC__' ),
 	'noeditsection'             => array( '0', '__БЕЗИЗМЕНА__', '__БЕЗ_ИЗМЕНА__', '__БЕЗИЗМЈЕНА__', '__БЕЗ_ИЗМЈЕНА__', '__NOEDITSECTION__' ),
-	'noheader'                  => array( '0', '__БЕЗЗАГЛАВЉА__', '__БЕЗ_ЗАГЛАВЉА__', '__NOHEADER__' ),
 	'currentmonth'              => array( '1', 'ТРЕНУТНИМЕСЕЦ', 'ТРЕНУТНИ_МЕСЕЦ', 'ТЕКУЋИМЕСЕЦ', 'ТЕКУЋИ_МЕСЕЦ', 'CURRENTMONTH', 'CURRENTMONTH2' ),
 	'currentmonth1'             => array( '1', 'ТРЕНУТНИМЕСЕЦ1', 'ТРЕНУТНИ_МЕСЕЦ1', 'ТЕКУЋИМЕСЕЦ1', 'ТЕКУЋИ_МЕСЕЦ1', 'CURRENTMONTH1' ),
 	'currentmonthname'          => array( '1', 'ТРЕНУТНИМЕСЕЦИМЕ', 'ИМЕТЕКУЋЕГМЕСЕЦА', 'ИМЕ_ТЕКУЋЕГ_МЕСЕЦА', 'CURRENTMONTHNAME' ),
@@ -443,7 +441,7 @@ $messages = array(
 
 'underline-always' => 'увек подвлачи',
 'underline-never' => 'никад не подвлачи',
-'underline-default' => 'по поставкама прегледача',
+'underline-default' => 'према теми или прегледачу',
 
 # Font style option in Special:Preferences
 'editfont-style' => 'Изглед фонта у уређивачком оквиру:',
@@ -1105,7 +1103,7 @@ $2
 'note' => "'''Напомена:'''",
 'previewnote' => "'''Имајте у виду да је ово само преглед.'''
 Ваше измене још нису сачуване!",
-'continue-editing' => 'Настави уређивање',
+'continue-editing' => 'Иди на уређивачки оквир',
 'previewconflict' => 'Овај преглед осликава како ће текст у текстуалном оквиру изгледати.',
 'session_fail_preview' => "'''Нисмо могли да обрадимо вашу измену због губитка података сесије.'''
 Покушајте поново.
@@ -1728,6 +1726,9 @@ $1",
 'rightslogtext' => 'Ово је дневник измена корисничких права.',
 'rightslogentry' => '{{GENDER:|је променио|је променила|је променио}} права за члана $1 из $2 у $3',
 'rightslogentry-autopromote' => 'је унапређен из $2 у $3',
+'logentry-rights-rights' => '$1 {{GENDER:$1|је променио|је променила|је променио}} чланство групе за $3 из $4 у $5',
+'logentry-rights-rights-legacy' => '$1 {{GENDER:$1|је променио|је променила|је променио}} чланство групе за $3',
+'logentry-rights-autopromote' => '$1 је аутоматски {{GENDER:$1|унапређен|унапређена|унапређен}} из $4 у $5',
 'rightsnone' => '(ништа)',
 
 # Associated actions - in the sentence "You do not have permission to X"
@@ -2375,7 +2376,7 @@ $1',
 'linksearch-ok' => 'Претражи',
 'linksearch-text' => 'Могу се користити џокери попут „*.wikipedia.org“.<br />
 Потребан је највиши домен, као „*.org“.<br />
-Подржани протоколи: <code>$1</code> (не стављајте у претрагу)',
+Подржани протоколи: <code>$1</code> (задаје http:// ако не наведете протокол).',
 'linksearch-line' => '$1 веза у $2',
 'linksearch-error' => 'Џокери се могу појавити само на почетку адресе.',
 
@@ -2426,8 +2427,8 @@ $1',
 'emailuser-title-target' => 'Слање е-поруке {{GENDER:$1|кориснику|корисници|кориснику}}',
 'emailuser-title-notarget' => 'Слање е-поруке кориснику',
 'emailpage' => 'Слање е-порука',
-'emailpagetext' => 'Користите овај образац да пошаљете е-поруку овом кориснику.
-Е-адреса коју сте унели у [[Special:Preferences|подешавањима]] ће бити приказана као адреса пошиљаоца, тако да ће прималац поруке моћи да вам одговори.',
+'emailpagetext' => 'Можете да користите доњи образац да пошаљете е-поруку {{GENDER:$1|овом кориснику|овој корисници|овом кориснику|}}.
+Е-адреса коју сте унели у вашим [[Special:Preferences|подешавањима]] ће се приказати у пољу „Од“, тако да ће прималац моћи да вам одговори директно.',
 'usermailererror' => 'Дошло је до грешке при слању поруке:',
 'defemailsubject' => '{{SITENAME}} е-адреса {{GENDER:$1|корисника|кориснице|корисника}} $1',
 'usermaildisabled' => 'Корисничка е-пошта је онемогућена',
@@ -2759,14 +2760,14 @@ $1',
 'nolinkshere-ns' => "Ниједна страница не води до '''[[:$1]]''' у изабраном именском простору.",
 'isredirect' => 'преусмерење',
 'istemplate' => 'укључивање',
-'isimage' => 'веза ка датотеци',
+'isimage' => 'веза до датотеке',
 'whatlinkshere-prev' => '{{PLURAL:$1|претходни|претходних $1}}',
 'whatlinkshere-next' => '{{PLURAL:$1|следећи|следећих $1}}',
 'whatlinkshere-links' => '← везе',
 'whatlinkshere-hideredirs' => '$1 преусмерења',
 'whatlinkshere-hidetrans' => '$1 укључивања',
 'whatlinkshere-hidelinks' => '$1 везе',
-'whatlinkshere-hideimages' => '$1 везе до слика',
+'whatlinkshere-hideimages' => '$1 везе до датотеке',
 'whatlinkshere-filters' => 'Филтери',
 
 # Block/unblock
@@ -3273,7 +3274,7 @@ $1',
 
 # Info page
 'pageinfo-title' => 'Подаци о „$1“',
-'pageinfo-not-current' => 'Подаци могу бити приказани само за текућу измену.',
+'pageinfo-not-current' => 'Нажалост, немогуће је прибавити ове податке за старије измене.',
 'pageinfo-header-basic' => 'Основни подаци',
 'pageinfo-header-edits' => 'Историја измена',
 'pageinfo-header-restrictions' => 'Заштита странице',
@@ -3282,6 +3283,7 @@ $1',
 'pageinfo-default-sort' => 'Подразумевани кључ сортирања',
 'pageinfo-length' => 'Дужина странице (у бајтовима)',
 'pageinfo-article-id' => 'ИД странице',
+'pageinfo-language' => 'Језик садржаја странице',
 'pageinfo-robot-policy' => 'Статус претраживача',
 'pageinfo-robot-index' => 'Може да се попише',
 'pageinfo-robot-noindex' => 'Не може да се попише',
@@ -3306,6 +3308,9 @@ $1',
 'pageinfo-redirectsto-info' => 'подаци',
 'pageinfo-contentpage' => 'Рачуна се као страница са садржајем',
 'pageinfo-contentpage-yes' => 'Да',
+'pageinfo-protect-cascading' => 'Преносива заштита страница важи одавде',
+'pageinfo-protect-cascading-yes' => 'Да',
+'pageinfo-protect-cascading-from' => 'Странице са преносивом заштитом од',
 
 # Skin names
 'skinname-standard' => 'Класично',
@@ -4179,6 +4184,7 @@ $5
 'version-license' => 'Лиценца',
 'version-poweredby-credits' => "Овај вики покреће '''[//www.mediawiki.org/ Медијавики]''', ауторска права © 2001-$1 $2.",
 'version-poweredby-others' => 'остали',
+'version-credits-summary' => 'Желели бисмо да захвалимо следећим људима на њиховом доприносу [[Special:Version|Медијавикији]].',
 'version-license-info' => 'Медијавики је слободан софтвер; можете га расподељивати и мењати под условима ГНУ-ове опште јавне лиценце (ОЈЛ) коју је објавила Задужбина за слободан софтвер, било да је у питању друго или новије издање лиценце.
 
 Медијавики се нуди у нади да ће бити од користи, али БЕЗ ИКАКВЕ ГАРАНЦИЈЕ; чак и без подразумеване гаранције о ПРОДАЈНОЈ ВРЕДНОСТИ или ПОГОДНОСТИ ЗА ОДРЕЂЕНЕ НАМЕНЕ. Погледајте ГНУ-ову општу јавну лиценцу за више информација.
diff --git a/languages/messages/MessagesSr_el.php b/languages/messages/MessagesSr_el.php
index fd17f26386..9bd7e25097 100644
--- a/languages/messages/MessagesSr_el.php
+++ b/languages/messages/MessagesSr_el.php
@@ -164,7 +164,6 @@ $magicWords = array(
 	'forcetoc'                  => array( '0', '__FORSIRANISADRŽAJ__', '__FORSIRANI_SADRŽAJ__', '__PRIMORANISADRŽAJ__', '__PRIMORANI_SADRŽAJ__', '__FORCETOC__' ),
 	'toc'                       => array( '0', '__SADRŽAJ__', '__TOC__' ),
 	'noeditsection'             => array( '0', '__BEZIZMENA__', '__BEZ_IZMENA__', '__BEZIZMJENA__', '__BEZ_IZMJENA__', '__NOEDITSECTION__' ),
-	'noheader'                  => array( '0', '__BEZZAGLAVLJA__', '__BEZ_ZAGLAVLJA__', '__NOHEADER__' ),
 	'currentmonth'              => array( '1', 'TRENUTNIMESEC', 'TRENUTNI_MESEC', 'TEKUĆIMESEC', 'TEKUĆI_MESEC', 'CURRENTMONTH', 'CURRENTMONTH2' ),
 	'currentmonth1'             => array( '1', 'TRENUTNIMESEC1', 'TRENUTNI_MESEC1', 'TEKUĆIMESEC1', 'TEKUĆI_MESEC1', 'CURRENTMONTH1' ),
 	'currentmonthname'          => array( '1', 'TRENUTNIMESECIME', 'IMETEKUĆEGMESECA', 'IME_TEKUĆEG_MESECA', 'CURRENTMONTHNAME' ),
@@ -352,7 +351,7 @@ $messages = array(
 
 'underline-always' => 'uvek podvlači',
 'underline-never' => 'nikad ne podvlači',
-'underline-default' => 'po postavkama pregledača',
+'underline-default' => 'prema temi ili pregledaču',
 
 # Font style option in Special:Preferences
 'editfont-style' => 'Izgled fonta u uređivačkom okviru:',
@@ -1014,7 +1013,7 @@ Prilagođene stranice CSS i javaskript počinju malim slovom, npr. {{ns:user}}:F
 'note' => "'''Napomena:'''",
 'previewnote' => "'''Imajte u vidu da je ovo samo pregled.'''
 Vaše izmene još nisu sačuvane!",
-'continue-editing' => 'Nastavi uređivanje',
+'continue-editing' => 'Idi na uređivački okvir',
 'previewconflict' => 'Ovaj pregled oslikava kako će tekst u tekstualnom okviru izgledati.',
 'session_fail_preview' => "'''Nismo mogli da obradimo vašu izmenu zbog gubitka podataka sesije.'''
 Pokušajte ponovo.
@@ -1637,6 +1636,9 @@ Ako izaberete da ga unesete, ono će biti korišćeno za pripisivanje vašeg rad
 'rightslogtext' => 'Ovo je dnevnik izmena korisničkih prava.',
 'rightslogentry' => '{{GENDER:|je promenio|je promenila|je promenio}} prava za člana $1 iz $2 u $3',
 'rightslogentry-autopromote' => 'je unapređen iz $2 u $3',
+'logentry-rights-rights' => '$1 {{GENDER:$1|je promenio|je promenila|je promenio}} članstvo grupe za $3 iz $4 u $5',
+'logentry-rights-rights-legacy' => '$1 {{GENDER:$1|je promenio|je promenila|je promenio}} članstvo grupe za $3',
+'logentry-rights-autopromote' => '$1 je automatski {{GENDER:$1|unapređen|unapređena|unapređen}} iz $4 u $5',
 'rightsnone' => '(ništa)',
 
 # Associated actions - in the sentence "You do not have permission to X"
@@ -2284,7 +2286,7 @@ Pogledajte i [[Special:WantedCategories|tražene kategorije]].',
 'linksearch-ok' => 'Pretraži',
 'linksearch-text' => 'Mogu se koristiti džokeri poput „*.wikipedia.org“.<br />
 Potreban je najviši domen, kao „*.org“.<br />
-Podržani protokoli: <code>$1</code> (ne stavljajte u pretragu)',
+Podržani protokoli: <code>$1</code> (zadaje http:// ako ne navedete protokol).',
 'linksearch-line' => '$1 veza u $2',
 'linksearch-error' => 'Džokeri se mogu pojaviti samo na početku adrese.',
 
@@ -2335,8 +2337,8 @@ Pogledajte [[{{MediaWiki:Listgrouprights-helppage}}|više detalja]] o pojedinač
 'emailuser-title-target' => 'Slanje e-poruke {{GENDER:$1|korisniku|korisnici|korisniku}}',
 'emailuser-title-notarget' => 'Slanje e-poruke korisniku',
 'emailpage' => 'Slanje e-poruka',
-'emailpagetext' => 'Koristite ovaj obrazac da pošaljete e-poruku ovom korisniku.
-E-adresa koju ste uneli u [[Special:Preferences|podešavanjima]] će biti prikazana kao adresa pošiljaoca, tako da će primalac poruke moći da vam odgovori.',
+'emailpagetext' => 'Možete da koristite donji obrazac da pošaljete e-poruku {{GENDER:$1|ovom korisniku|ovoj korisnici|ovom korisniku|}}.
+E-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.',
 'usermailererror' => 'Došlo je do greške pri slanju poruke:',
 'defemailsubject' => '{{SITENAME}} e-adresa {{GENDER:$1|korisnika|korisnice|korisnika}} $1',
 'usermaildisabled' => 'Korisnička e-pošta je onemogućena',
@@ -2675,7 +2677,7 @@ Izveštaj o blokiranim korisnicima se nalazi ispod:',
 'whatlinkshere-hideredirs' => '$1 preusmerenja',
 'whatlinkshere-hidetrans' => '$1 uključivanja',
 'whatlinkshere-hidelinks' => '$1 veze',
-'whatlinkshere-hideimages' => '$1 veze do slika',
+'whatlinkshere-hideimages' => '$1 veze do datoteke',
 'whatlinkshere-filters' => 'Filteri',
 
 # Block/unblock
@@ -3182,7 +3184,7 @@ Ovo je verovatno izazvano vezom do spoljašnjeg sajta koji se nalazi na crnoj li
 
 # Info page
 'pageinfo-title' => 'Podaci o „$1“',
-'pageinfo-not-current' => 'Podaci mogu biti prikazani samo za tekuću izmenu.',
+'pageinfo-not-current' => 'Nažalost, nemoguće je pribaviti ove podatke za starije izmene.',
 'pageinfo-header-basic' => 'Osnovni podaci',
 'pageinfo-header-edits' => 'Istorija izmena',
 'pageinfo-header-restrictions' => 'Zaštita stranice',
@@ -3191,6 +3193,7 @@ Ovo je verovatno izazvano vezom do spoljašnjeg sajta koji se nalazi na crnoj li
 'pageinfo-default-sort' => 'Podrazumevani ključ sortiranja',
 'pageinfo-length' => 'Dužina stranice (u bajtovima)',
 'pageinfo-article-id' => 'ID stranice',
+'pageinfo-language' => 'Jezik sadržaja stranice',
 'pageinfo-robot-policy' => 'Status pretraživača',
 'pageinfo-robot-index' => 'Može da se popiše',
 'pageinfo-robot-noindex' => 'Ne može da se popiše',
@@ -3215,6 +3218,9 @@ Ovo je verovatno izazvano vezom do spoljašnjeg sajta koji se nalazi na crnoj li
 'pageinfo-redirectsto-info' => 'podaci',
 'pageinfo-contentpage' => 'Računa se kao stranica sa sadržajem',
 'pageinfo-contentpage-yes' => 'Da',
+'pageinfo-protect-cascading' => 'Prenosiva zaštita stranica važi odavde',
+'pageinfo-protect-cascading-yes' => 'Da',
+'pageinfo-protect-cascading-from' => 'Stranice sa prenosivom zaštitom od',
 
 # Skin names
 'skinname-standard' => 'Klasično',
@@ -4088,6 +4094,7 @@ Možete da [[Special:EditWatchlist|koristite i običan uređivač]].',
 'version-license' => 'Licenca',
 'version-poweredby-credits' => "Ovaj viki pokreće '''[//www.mediawiki.org/ Medijaviki]''', autorska prava © 2001-$1 $2.",
 'version-poweredby-others' => 'ostali',
+'version-credits-summary' => 'Želeli bismo da zahvalimo sledećim ljudima na njihovom doprinosu [[Special:Version|Medijavikiji]].',
 'version-license-info' => 'Medijaviki je slobodan softver; možete ga raspodeljivati i menjati pod uslovima GNU-ove opšte javne licence (OJL) koju je objavila Zadužbina za slobodan softver, bilo da je u pitanju drugo ili novije izdanje licence.
 
 Medijaviki se nudi u nadi da će biti od koristi, ali BEZ IKAKVE GARANCIJE; čak i bez podrazumevane garancije o PRODAJNOJ VREDNOSTI ili POGODNOSTI ZA ODREĐENE NAMENE. Pogledajte GNU-ovu opštu javnu licencu za više informacija.
diff --git a/languages/messages/MessagesSrn.php b/languages/messages/MessagesSrn.php
index 991808776b..e419c7a4d7 100644
--- a/languages/messages/MessagesSrn.php
+++ b/languages/messages/MessagesSrn.php
@@ -279,7 +279,6 @@ $messages = array(
 'qbbrowse' => 'Browse',
 'qbedit' => 'Kenki',
 'qbpageoptions' => 'A papira disi',
-'qbpageinfo' => 'Abra a papira',
 'qbmyoptions' => 'Mi papira',
 'qbspecialpages' => 'Spesrutu papira',
 'faq' => 'FAQ (Sani di ben aksi furu)',
diff --git a/languages/messages/MessagesSv.php b/languages/messages/MessagesSv.php
index 3bebf45994..29c46a068d 100644
--- a/languages/messages/MessagesSv.php
+++ b/languages/messages/MessagesSv.php
@@ -9,6 +9,7 @@
  *
  * @author Ainali
  * @author Boivie
+ * @author Cybjit
  * @author Dafer45
  * @author Diupwijk
  * @author EPO
@@ -181,7 +182,6 @@ $magicWords = array(
 	'forcetoc'                  => array( '0', '__ALLTIDINNEHÅLLSFÖRTECKNING__', '__FORCETOC__' ),
 	'toc'                       => array( '0', '__INNEHÅLLSFÖRTECKNING__', '__TOC__' ),
 	'noeditsection'             => array( '0', '__INTEREDIGERASEKTION__', '__NOEDITSECTION__' ),
-	'noheader'                  => array( '0', '__INGENRUBRIK__', '__NOHEADER__' ),
 	'currentmonth'              => array( '1', 'NUVARANDEMÅNAD', 'NUMÅNAD', 'CURRENTMONTH', 'CURRENTMONTH2' ),
 	'currentmonth1'             => array( '1', 'NUVARANDEMÅNAD1', 'CURRENTMONTH1' ),
 	'currentmonthname'          => array( '1', 'NUVARANDEMÅNADSNAMN', 'NUMÅNADSNAMN', 'CURRENTMONTHNAME' ),
@@ -455,7 +455,7 @@ $messages = array(
 'cancel' => 'Avbryt',
 'moredotdotdot' => 'Mer...',
 'mypage' => 'Min sida',
-'mytalk' => 'Min diskussion',
+'mytalk' => 'Diskussion',
 'anontalk' => 'Diskussionssida för denna IP-adress',
 'navigation' => 'Navigering',
 'and' => '&#32;och',
@@ -1385,7 +1385,7 @@ Notera dock att deras indexering av {{SITENAME}} kan vara något föråldrad.',
 
 # Preferences page
 'preferences' => 'Inställningar',
-'mypreferences' => 'Mina inställningar',
+'mypreferences' => 'Inställningar',
 'prefs-edits' => 'Antal redigeringar:',
 'prefsnologin' => 'Inte inloggad',
 'prefsnologintext' => 'Du måste vara <span class="plainlinks">[{{fullurl:{{#Special:UserLogin}}|returnto=$1}} inloggad]</span> för att kunna ändra dina inställningar.',
@@ -2292,7 +2292,7 @@ Det kan finnas [[{{MediaWiki:Listgrouprights-helppage}}|ytterligare information]
 '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 det här formuläret för att skicka e-post till den här användaren.
+'emailpagetext' => 'Du kan använda formuläret nedan för att skicka e-post till den här {{GENDER:$1|användaren}}.
 Den 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.',
 'usermailererror' => 'Fel i hanteringen av mail:',
 'defemailsubject' => '{{SITENAME}} e-post från användare "$1"',
@@ -2324,7 +2324,7 @@ Den e-postadress du har angivit i [[Special:Preferences|dina användarinställni
 
 # Watchlist
 'watchlist' => 'Bevakningslista',
-'mywatchlist' => 'Min bevakningslista',
+'mywatchlist' => 'Bevakningslista',
 'watchlistfor2' => 'För $1 $2',
 'nowatchlist' => 'Du har inga sidor i din bevakningslista.',
 'watchlistanontext' => 'Du måste $1 för att se eller redigera din bevakningslista.',
@@ -2579,7 +2579,7 @@ $1',
 # Contributions
 'contributions' => 'Användarbidrag',
 'contributions-title' => 'Bidrag av $1',
-'mycontris' => 'Mina bidrag',
+'mycontris' => 'Bidrag',
 'contribsub2' => 'För $1 ($2)',
 'nocontribs' => 'Inga ändringar som motsvarar dessa kriterier hittades.',
 'uctop' => '(senaste)',
@@ -3117,7 +3117,7 @@ Detta orsakades troligen av en länk till en svartlistad webbplats.',
 
 # Info page
 'pageinfo-title' => 'Information om "$1"',
-'pageinfo-not-current' => 'Information kan endast visas för den aktuella versionen.',
+'pageinfo-not-current' => 'Informationen kan endast visas för den aktuella versionen.',
 'pageinfo-header-basic' => 'Grundläggande information',
 'pageinfo-header-edits' => 'Redigeringshistorik',
 'pageinfo-header-restrictions' => 'Sidskydd',
@@ -3848,6 +3848,7 @@ Du kan också [[Special:EditWatchlist|använda standardeditorn]].',
 'version-license' => 'Licens',
 'version-poweredby-credits' => "Den här wikin drivs av '''[//www.mediawiki.org/ MediaWiki]''', copyright © 2001-$1 $2.",
 'version-poweredby-others' => 'andra',
+'version-credits-summary' => 'Vi skulle vilja tacka följande personer för deras bidrag till [[Special:Version|MediaWiki]].',
 'version-license-info' => 'MediaWiki är fri programvara; du kan distribuera det och/eller modifiera det under villkoren i GNU General Public License, publicerad av Free Software Foundation; antingen version 2 av licensen, eller (om du önskar) någon senare version. 
 
 MediaWiki distribueras i hopp om att det ska vara användbart, men UTAN NÅGON GARANTI, även utan underförstådd garanti om SÄLJBARHET eller LÄMPLIGHET FÖR ETT VISST SYFTE. Se GNU General Public License för fler detaljer. 
diff --git a/languages/messages/MessagesTa.php b/languages/messages/MessagesTa.php
index daf40e227e..0a1b18f1c2 100644
--- a/languages/messages/MessagesTa.php
+++ b/languages/messages/MessagesTa.php
@@ -129,7 +129,7 @@ $messages = array(
 
 'underline-always' => 'எப்பொழுதும்',
 'underline-never' => 'எப்போதுமில்லை',
-'underline-default' => 'உலாவி இயல்பிருப்பு',
+'underline-default' => 'தோல் அல்லது உலாவி இயல்பிருப்பு',
 
 # Font style option in Special:Preferences
 'editfont-style' => 'தொகுத்தல் பெட்டி எழுத்துரு:',
@@ -214,8 +214,8 @@ $messages = array(
 'newwindow' => '(புதிய சாளரத்துள் திறக்கும்)',
 'cancel' => 'சேமிக்காமல் திரும்பு',
 'moredotdotdot' => 'மேலும்...',
-'mypage' => 'எனது பக்கம்',
-'mytalk' => 'என் பேச்சு',
+'mypage' => 'பக்கம்',
+'mytalk' => 'பேச்சு',
 'anontalk' => 'இந்த ஐ.பி. முகவரிக்கான பேச்சு',
 'navigation' => 'வழிசெலுத்தல்',
 'and' => ' மற்றும்',
@@ -740,7 +740,7 @@ or <span class="plainlinks">[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}}
 'updated' => '(இற்றைப்படுத்தப்பட்டது)',
 'note' => "'''குறிப்பு:'''",
 'previewnote' => "'''இது ஒரு முன்தோற்றம் மட்டுமே''', உங்கள் மாற்றங்கள் இன்னும் சேமிக்கப்படவில்லை!",
-'continue-editing' => 'தொகுத்தலைத் தொடரவும்',
+'continue-editing' => 'தொகுக்கும் பகுதிக்கு செல்லவும்',
 'previewconflict' => 'இந்த முன்தோற்றம் உரை தொகுப்புப் பகுதியின் மேற்பகுதியிலுள்ள உரையைப் பிரதிபலிக்கின்றது. நீங்கள் இப்பொழுது சேமித்தால் மேற்படி தோற்றமே கிடைக்கும்.',
 'session_fail_preview' => "'''உங்கள் அமர்வுத் தரவுகள் அழிந்துப்போனமையால் உங்கள் தொகுப்பை செயற்படுத்த முடியவில்லை. அருள் கூர்ந்து மீண்டும் முயலவும். அதுவும் பலனளிக்காவிட்டால் விடுபதிகைச் செய்து மீண்டும் புகுபதிகைச் செய்யவும்'''",
 'session_fail_preview_html' => "'''மன்னிக்கவும்! தங்கள் அமர்வுத் தரவுகள் அழிந்துப்போனமையால் தொகுப்பைச் செயற்படுத்த முடியவில்லை.'''
@@ -1103,7 +1103,7 @@ $1",
 
 # Preferences page
 'preferences' => 'விருப்பங்கள்',
-'mypreferences' => 'என் விருப்பத்தேர்வுகள்',
+'mypreferences' => 'விருப்பத்தேர்வுகள்',
 'prefs-edits' => 'தொகுப்புகளின் எண்ணிக்கை:',
 'prefsnologin' => 'புகுபதிகை செய்யப்படவில்லை',
 'prefsnologintext' => 'பயனர் விருப்பத்தேர்வுகளை அமைப்பதற்கு நீங்கள் <span class="plainlinks">[{{fullurl:{{#Special:UserLogin}}|returnto=$1}} புகுபதிகை ]</span> செய்திருக்க வேண்டும்.',
@@ -1687,6 +1687,7 @@ $1',
 'uploadnewversion-linktext' => 'இப்படிமத்தின் புதிய பதிப்பை பதிவேற்று',
 'shared-repo-from' => '$1-ல் இருந்து',
 'shared-repo' => 'பகிர்ந்து பயன்கொள் வைப்பகம்',
+'upload-disallowed-here' => 'நீங்கள் இந்தக் கோப்பை மேலெழுத முடியாது.',
 
 # File reversion
 'filerevert' => '$1 ஐ முன்நிலையாக்கு',
@@ -1771,6 +1772,7 @@ $1',
 'doubleredirects' => 'இரட்டை வழிமாற்றுகள்',
 'doubleredirectstext' => 'இந்தப் பட்டியல் போலியான நேர்மதிப்புக்களைக் கொண்டிருக்கக்கூடும். இது வழக்கமாக, இணைப்புடன் கூடிய மேலதிக உரை முதலாவது #வழிமாற்றுக்குக் கீழ் இருப்பதைக் குறிக்கும்.ஒவ்வொரு வரியும், முதலாம் இரண்டாம் வழிமாற்றுகளுக்கு இணைப்புகளைக் கொண்டிருப்பதுடன், இரண்டாவது வழிமாற்று உரையின் முதல் வரிக்கும் இணைப்பைக் கொண்டிருக்கும், இது வழக்கமாக முதலாவது வழிமாற்று குறித்துக் காட்ட வேண்டிய "உண்மையான" இலக்குக் கட்டுரையைக் கொடுக்கும்.',
 'double-redirect-fixed-move' => '[[$1]] நகர்த்தப்பட்டுவிட்டது. இப்பொழுது [[$2]] உக்கு வழிமாற்று தருகின்றது.',
+'double-redirect-fixed-maintenance' => '[[$1]] என்பதிலிருந்து [[$2]] என்பதற்கு இரட்டை வழிமாற்றைச் சரிசெய்கிறது',
 'double-redirect-fixer' => '(இரட்டை) வழிமாற்றைத் திருத்தியபயனர்',
 
 'brokenredirects' => 'முறிந்த வழிமாற்றுகள்',
@@ -1952,6 +1954,7 @@ $1',
 'mailnologintext' => 'நீங்கள்[[Special:UserLogin|புகுபதிகை செய்திருப்பதுடன்]]
 ஏனைய பயனர்களுக்கு மின்னஞ்சல் அனுப்பக்கூடியத்தாக செல்லுபடியாகக்கூடிய மின்னஞ்சல் முகவரியொன்றும் உங்களுடைய  [[Special:Preferences|விருப்பத் தெரிவுகளில்]] கொடுபட்டிருக்கவேண்டும்.',
 'emailuser' => 'இப் பயனருக்கு மின்னஞ்சல் செய்',
+'emailuser-title-notarget' => 'பயனருக்கு மின்னஞ்சல் செய்',
 'emailpage' => 'மின்னஞ்சல் பயனர்',
 'emailpagetext' => 'நீங்கள் கீழ்வரும் படிவத்தை உபயோகித்து இந்த பயனருக்கு மின்னஞ்சல் செய்யலாம்.
 
@@ -1986,7 +1989,7 @@ $1',
 
 # Watchlist
 'watchlist' => 'என் கவனிப்புப் பட்டியல்',
-'mywatchlist' => 'என் கவனிப்புப் பட்டியல்',
+'mywatchlist' => 'கவனிப்புப் பட்டியல்',
 'watchlistfor2' => '$1 பயனரின் ($2)',
 'nowatchlist' => 'உங்களுடைய கவனிப்புப் பட்டியலில் ஒரு விடயமும் இல்லை.',
 'watchlistanontext' => 'உங்கள் கவனிப்புப் பட்டியலைப் பார்க்க அல்லது தொகுக்க அருள் கூர்ந்து $1 செய்யுங்கள்.',
@@ -2231,7 +2234,7 @@ $1',
 # Contributions
 'contributions' => 'பயனர் பங்களிப்புக்கள்',
 'contributions-title' => '$1 இற்கான பயனர் பங்களிப்புகள்',
-'mycontris' => 'என் பங்களிப்புக்கள்',
+'mycontris' => 'பங்களிப்புக்கள்',
 'contribsub2' => '$1 பயனரின் ($2)',
 'nocontribs' => 'இந்த நிபந்தனையுடன் ஒத்துப்போகும் வகையில் மாற்றங்களெதுவும் காணப்படவில்லை.',
 'uctop' => '(மேல்)',
@@ -2707,9 +2710,19 @@ $1',
 
 # Info page
 'pageinfo-title' => '"$1" பக்கத்துக்கான தகவல்',
-'pageinfo-header-edits' => 'தொகுப்புகள்',
+'pageinfo-header-basic' => 'அடிப்படைத் தகவல்',
+'pageinfo-header-edits' => 'தொகுப்பு வரலாறு',
+'pageinfo-header-restrictions' => 'பக்கக் காப்பு',
+'pageinfo-header-properties' => 'பக்க இயல்புகள்',
+'pageinfo-display-title' => 'காட்சித் தலைப்பு',
+'pageinfo-length' => 'பக்க நீளம் (எண்ணுண்மிகளில்)',
+'pageinfo-article-id' => 'பக்க அடையாள இலக்கம்',
+'pageinfo-robot-policy' => 'தேடற்பொறி நிலைமை',
 'pageinfo-views' => 'காட்சிகள் எண்ணிக்கை',
 'pageinfo-watchers' => 'பார்வையாளர்கள் எண்ணிக்கை',
+'pageinfo-firstuser' => 'பக்க உருவாக்குநர்',
+'pageinfo-firsttime' => 'பக்கம் உருவாக்கப்பட்ட காலம்',
+'pageinfo-lastuser' => 'அண்மைய தொகுப்பாளர்',
 'pageinfo-edits' => 'தொகுப்புகளின் எண்ணிக்கை:',
 'pageinfo-authors' => 'சாதகமான அம்சங்களை பெற்றிருக்கும் எழுத்தாளர்கள் எண்ணிக்கை',
 
diff --git a/languages/messages/MessagesTcy.php b/languages/messages/MessagesTcy.php
index ecb1d83073..4912779b21 100644
--- a/languages/messages/MessagesTcy.php
+++ b/languages/messages/MessagesTcy.php
@@ -154,7 +154,6 @@ $messages = array(
 'qbbrowse' => 'ಬ್ರೌಸ್',
 'qbedit' => 'ಸಂಪಾದನೆ ಮಲ್ಪುಲೆ',
 'qbpageoptions' => 'ಈ ಪುಟ',
-'qbpageinfo' => 'ಸನ್ನಿವೇಶ',
 'qbmyoptions' => 'ಎನ್ನ ಪುಟೊಲು',
 'qbspecialpages' => 'ವಿಶೇಷ ಪುಟೊಲು',
 'faq' => 'ಸಾಮಾನ್ಯವಾದ್ ಕೇನುನ ಪ್ರಶ್ನೆಲು',
diff --git a/languages/messages/MessagesTe.php b/languages/messages/MessagesTe.php
index 5bbccf2ec1..4c08f5c47d 100644
--- a/languages/messages/MessagesTe.php
+++ b/languages/messages/MessagesTe.php
@@ -809,7 +809,7 @@ $2
 'note' => "'''గమనిక:'''",
 'previewnote' => "'''ఇది మునుజూపు మాత్రమేనని గుర్తుంచుకోండి.'''
 మీ మార్పులు ఇంకా భద్రమవ్వలేదు!",
-'continue-editing' => 'దిద్దుబాటుని కొనసాగించండి',
+'continue-editing' => 'సరిదిద్దే చోటుకి వెళ్ళండి',
 'previewconflict' => 'భద్రపరచిన తరువాత పై టెక్స్ట్‌ ఏరియాలోని టెక్స్టు ఇలాగ కనిపిస్తుంది.',
 'session_fail_preview' => "'''క్షమించండి! సెషను డేటా పోవడం వలన మీ మార్పులను స్వీకరించలేకపోతున్నాం.'''
 దయచేసి మళ్ళీ ప్రయత్నించండి.
diff --git a/languages/messages/MessagesTet.php b/languages/messages/MessagesTet.php
index d4600e0273..c58fd6a60d 100644
--- a/languages/messages/MessagesTet.php
+++ b/languages/messages/MessagesTet.php
@@ -156,7 +156,7 @@ $messages = array(
 'cancel' => 'Para',
 'moredotdotdot' => 'Barak liu...',
 'mypage' => "Ha'u-nia pájina",
-'mytalk' => "Ha'u-nia diskusaun",
+'mytalk' => 'Diskusaun',
 'anontalk' => "Diskusaun ba IP ne'e",
 'navigation' => 'Hatudu-dalan',
 'and' => '&#32;ho',
@@ -419,7 +419,7 @@ Ita-nia mudansa la armazenadu seidauk!",
 
 # Preferences page
 'preferences' => 'Preferénsia',
-'mypreferences' => "Ha'u-nia preferénsia",
+'mypreferences' => 'Preferénsia',
 'prefs-rc' => 'Mudansa foufoun sira',
 'prefs-watchlist' => 'Lista hateke',
 'prefs-editing' => 'Edita',
@@ -648,7 +648,7 @@ Ita-nia mudansa la armazenadu seidauk!",
 
 # Watchlist
 'watchlist' => "Ha'u-nia lista hateke",
-'mywatchlist' => "Ha'u-nia lista hateke",
+'mywatchlist' => 'Lista hateke',
 'removedwatchtext' => 'La hateke pájina "[[:$1]]" ona (haree [[Special:Watchlist|"lista hateke"]]).',
 'watch' => 'Hateke',
 'watchthispage' => "Hateke pájina ne'e",
@@ -721,7 +721,7 @@ Ita-nia mudansa la armazenadu seidauk!",
 # Contributions
 'contributions' => "Kontribuisaun uza-na'in",
 'contributions-title' => 'Kontribuisaun "$1" nian',
-'mycontris' => "Ha'u-nia kontribuisaun",
+'mycontris' => 'Kontribuisaun',
 'contribsub2' => 'Ba $1 ($2)',
 'uctop' => '(versaun atuál)',
 'month' => 'Fulan (ho molok):',
diff --git a/languages/messages/MessagesTh.php b/languages/messages/MessagesTh.php
index e9e148b1be..0314e0d023 100644
--- a/languages/messages/MessagesTh.php
+++ b/languages/messages/MessagesTh.php
@@ -50,16 +50,20 @@ $namespaceAliases = array(
 );
 
 $specialPageAliases = array(
+	'Activeusers'               => array( 'ผู้ใช้ที่มีความเคลื่อนไหว' ),
 	'Allmessages'               => array( 'ข้อความทั้งหมด' ),
 	'Allpages'                  => array( 'หน้าทั้งหมด' ),
 	'Ancientpages'              => array( 'บทความที่ไม่ได้แก้ไขนานที่สุด' ),
+	'Badtitle'                  => array( 'ชื่อเรื่องไม่เหมาะสม' ),
 	'Blankpage'                 => array( 'หน้าว่าง' ),
 	'Block'                     => array( 'บล็อกไอพี' ),
 	'Blockme'                   => array( 'บล็อกฉัน' ),
 	'Booksources'               => array( 'แหล่งหนังสือ' ),
 	'BrokenRedirects'           => array( 'เปลี่ยนทางเสีย' ),
 	'Categories'                => array( 'หมวดหมู่' ),
-	'ChangePassword'            => array( 'ตั้งรหัสผ่านใหม่' ),
+	'ChangeEmail'               => array( 'เปลี่ยนอีเมล' ),
+	'ChangePassword'            => array( 'เปลี่ยนรหัสผ่าน' ),
+	'ComparePages'              => array( 'เปรียบเทียบหน้า' ),
 	'Confirmemail'              => array( 'ยืนยันอีเมล' ),
 	'Contributions'             => array( 'เรื่องที่เขียน' ),
 	'CreateAccount'             => array( 'สร้างบัญชีผู้ใช้ใหม่' ),
@@ -67,6 +71,7 @@ $specialPageAliases = array(
 	'DeletedContributions'      => array( 'การแก้ไขที่ถูกลบ' ),
 	'Disambiguations'           => array( 'แก้ความกำกวม' ),
 	'DoubleRedirects'           => array( 'เปลี่ยนทางซ้ำซ้อน' ),
+	'EditWatchlist'             => array( 'แก้ไขรายการเฝ้าดู' ),
 	'Emailuser'                 => array( 'อีเมลผู้ใช้' ),
 	'Export'                    => array( 'ส่งออก' ),
 	'Fewestrevisions'           => array( 'บทความที่ถูกแก้ไขน้อยที่สุด' ),
@@ -74,6 +79,7 @@ $specialPageAliases = array(
 	'Filepath'                  => array( 'พาธของไฟล์', 'ตำแหน่งไฟล์' ),
 	'Import'                    => array( 'นำเข้า' ),
 	'Invalidateemail'           => array( 'ยกเลิกการยืนยันทางอีเมล' ),
+	'JavaScriptTest'            => array( 'ทดสอบจาวาสคริปต์' ),
 	'BlockList'                 => array( 'รายชื่อผู้ใช้ที่ถูกบล็อก', 'รายการบล็อก', 'รายชื่อไอพีที่ถูกบล็อก' ),
 	'LinkSearch'                => array( 'ค้นหาเว็บลิงก์' ),
 	'Listadmins'                => array( 'รายชื่อผู้ดูแล' ),
@@ -98,8 +104,11 @@ $specialPageAliases = array(
 	'Mycontributions'           => array( 'เรื่องที่ฉันเขียน' ),
 	'Mypage'                    => array( 'หน้าของฉัน' ),
 	'Mytalk'                    => array( 'หน้าพูดคุยของฉัน' ),
+	'Myuploads'                 => array( 'ไฟล์ที่อัปโหลดของฉัน' ),
 	'Newimages'                 => array( 'ภาพใหม่' ),
 	'Newpages'                  => array( 'หน้าใหม่' ),
+	'PasswordReset'             => array( 'ตั้งรหัสผ่านใหม่' ),
+	'PermanentLink'             => array( 'ลิงก์ถาวร' ),
 	'Popularpages'              => array( 'หน้าที่ได้รับความนิยม' ),
 	'Preferences'               => array( 'การตั้งค่า', 'ตั้งค่า' ),
 	'Prefixindex'               => array( 'ดัชนีตามคำขึ้นต้น' ),
@@ -109,11 +118,13 @@ $specialPageAliases = array(
 	'Randomredirect'            => array( 'สุ่มหน้าเปลี่ยนทาง' ),
 	'Recentchanges'             => array( 'ปรับปรุงล่าสุด' ),
 	'Recentchangeslinked'       => array( 'การปรับปรุงที่โยงมา' ),
+	'Revisiondelete'            => array( 'ลบรุ่นการแก้ไข' ),
 	'Search'                    => array( 'ค้นหา' ),
 	'Shortpages'                => array( 'หน้าที่สั้นที่สุด' ),
 	'Specialpages'              => array( 'หน้าพิเศษ' ),
 	'Statistics'                => array( 'สถิติ' ),
 	'Tags'                      => array( 'ป้ายกำกับ' ),
+	'Unblock'                   => array( 'เลิกบล็อก' ),
 	'Uncategorizedcategories'   => array( 'หมวดหมู่ที่ไม่ได้จัดหมวดหมู่' ),
 	'Uncategorizedimages'       => array( 'ภาพที่ไม่ได้จัดหมวดหมู่' ),
 	'Uncategorizedpages'        => array( 'หน้าที่ไม่ได้จัดหมวดหมู่' ),
@@ -128,7 +139,7 @@ $specialPageAliases = array(
 	'Userlogin'                 => array( 'ล็อกอิน' ),
 	'Userlogout'                => array( 'ล็อกเอาต์' ),
 	'Userrights'                => array( 'สิทธิผู้ใช้' ),
-	'Version'                   => array( 'เวอร์ชั่น' ),
+	'Version'                   => array( 'เวอร์ชัน', 'เวอร์ชั่น' ),
 	'Wantedcategories'          => array( 'หมวดหมู่ที่ต้องการ' ),
 	'Wantedfiles'               => array( 'ไฟล์ที่ต้องการ' ),
 	'Wantedpages'               => array( 'หน้าที่ต้องการ', 'การเชื่อมโยงเสีย' ),
diff --git a/languages/messages/MessagesTl.php b/languages/messages/MessagesTl.php
index f4d5e2098c..45104e70fa 100644
--- a/languages/messages/MessagesTl.php
+++ b/languages/messages/MessagesTl.php
@@ -114,7 +114,6 @@ $specialPageAliases = array(
 	'Recentchanges'             => array( 'Mga_huling_binago', 'HulingBinago' ),
 	'Recentchangeslinked'       => array( 'Nakakawing_ng_kamakailang_pagbabago', 'Kaugnay_na_mga_pagbabago' ),
 	'Revisiondelete'            => array( 'Pagbura_ng_pagbabago' ),
-	'RevisionMove'              => array( 'Paglipat_ng_Rebisyon' ),
 	'Search'                    => array( 'Maghanap' ),
 	'Shortpages'                => array( 'Maikling_mga_pahina' ),
 	'Specialpages'              => array( 'Natatanging_mga_pahina' ),
diff --git a/languages/messages/MessagesTly.php b/languages/messages/MessagesTly.php
index 48da3354ed..c405f16174 100644
--- a/languages/messages/MessagesTly.php
+++ b/languages/messages/MessagesTly.php
@@ -71,7 +71,6 @@ $magicWords = array(
 	'notoc'                     => array( '0', '__БЕМЫНДӘРИҸОТ__', '__NOTOC__' ),
 	'forcetoc'                  => array( '0', '__МӘҸБУРИЈӘ_МЫНДӘРИҸОТ__', '__FORCETOC__' ),
 	'toc'                       => array( '0', '__МЫНДӘРИҸОТ__', '__TOC__' ),
-	'noheader'                  => array( '0', '__БЕСӘРЛОВҺӘ__', '__NOHEADER__' ),
 	'currentmonth'              => array( '1', 'ЕСӘТНӘ_МАНГ', 'ЕСӘТНӘ_МАНГ_2', 'CURRENTMONTH', 'CURRENTMONTH2' ),
 	'currentmonth1'             => array( '1', 'ЕСӘТНӘ_МАНГ_1', 'CURRENTMONTH1' ),
 	'currentmonthname'          => array( '1', 'ЕСӘТНӘ_МАНГИ_НОМ', 'CURRENTMONTHNAME' ),
@@ -264,7 +263,6 @@ $messages = array(
 'qbbrowse' => 'Дијә кардеј',
 'qbedit' => 'Сәрост кардеј',
 'qbpageoptions' => 'Ым сәһифә',
-'qbpageinfo' => 'Мәзмун.',
 'qbmyoptions' => 'Чымы сәһифон',
 'qbspecialpages' => 'Хысусијә сәһифон',
 'faq' => 'РАП',
diff --git a/languages/messages/MessagesTr.php b/languages/messages/MessagesTr.php
index 6745bad6a2..a2ca3c0fd3 100644
--- a/languages/messages/MessagesTr.php
+++ b/languages/messages/MessagesTr.php
@@ -9,6 +9,7 @@
  *
  * @author 82-145
  * @author Bekiroflaz
+ * @author BetelgeuSeginus
  * @author Bilalokms
  * @author Bombola
  * @author Cekli829
@@ -21,6 +22,7 @@
  * @author Goktr001
  * @author Hanberke
  * @author Hcagri
+ * @author Hedda Gabler
  * @author Ijon
  * @author Incelemeelemani
  * @author Joseph
@@ -54,7 +56,7 @@
  */
 
 $namespaceNames = array(
-	NS_MEDIA            => 'Medya',
+	NS_MEDIA            => 'Ortam',
 	NS_SPECIAL          => 'Özel',
 	NS_TALK             => 'Tartışma',
 	NS_USER             => 'Kullanıcı',
@@ -73,9 +75,10 @@ $namespaceNames = array(
 );
 
 $namespaceAliases = array(
-	'Resim' => NS_FILE,
-	'Resim_tartışma' => NS_FILE_TALK,
-	'MedyaViki' => NS_MEDIAWIKI,
+	'Medya'              => NS_MEDIA,
+	'Resim'              => NS_FILE,
+	'Resim_tartışma'     => NS_FILE_TALK,
+	'MedyaViki'          => NS_MEDIAWIKI,
 	'MedyaViki_tartışma' => NS_MEDIAWIKI_TALK,
 );
 
@@ -91,7 +94,8 @@ $specialPageAliases = array(
 	'Booksources'               => array( 'KitapKaynakları' ),
 	'BrokenRedirects'           => array( 'BozukYönlendirmeler' ),
 	'Categories'                => array( 'Kategoriler', 'Ulamlar' ),
-	'ChangePassword'            => array( 'ŞifreDeğiştir', 'ParolaDeğiştir', 'ŞifreSıfırla', 'ParolaSıfırla' ),
+	'ChangeEmail'               => array( 'E-postaDeğiştir' ),
+	'ChangePassword'            => array( 'ParolaDeğiştir', 'ParolaSıfırla' ),
 	'ComparePages'              => array( 'SayfaKarşılaştır' ),
 	'Confirmemail'              => array( 'E-postaDoğrula' ),
 	'Contributions'             => array( 'Katkılar' ),
@@ -108,6 +112,7 @@ $specialPageAliases = array(
 	'Filepath'                  => array( 'DosyaYolu', 'DosyaKonumu' ),
 	'Import'                    => array( 'İçeAktar', 'İçeriAktar' ),
 	'Invalidateemail'           => array( 'E-postaDoğrulamaİptal' ),
+	'JavaScriptTest'            => array( 'JavaScriptTesti' ),
 	'BlockList'                 => array( 'EngelListesi', 'IPEngelListesi', 'EngelListele' ),
 	'LinkSearch'                => array( 'BağArama', 'BağlantıArama' ),
 	'Listadmins'                => array( 'HizmetliListele', 'YöneticiListele', 'HizmetliListesi', 'YöneticiListesi' ),
@@ -124,6 +129,7 @@ $specialPageAliases = array(
 	'MIMEsearch'                => array( 'MIMEArama' ),
 	'Mostcategories'            => array( 'EnFazlaKategorili' ),
 	'Mostimages'                => array( 'EnÇokBağlantıVerilenDosyalar' ),
+	'Mostinterwikis'            => array( 'EnFazlaÄ°nterviki' ),
 	'Mostlinked'                => array( 'EnÇokBağlantıVerilenSayfalar' ),
 	'Mostlinkedcategories'      => array( 'EnÇokBağlantıVerilenKategoriler' ),
 	'Mostlinkedtemplates'       => array( 'EnÇokBağlantıVerilenŞablonlar' ),
@@ -147,7 +153,6 @@ $specialPageAliases = array(
 	'Recentchanges'             => array( 'SonDeğişiklikler' ),
 	'Recentchangeslinked'       => array( 'İlgiliDeğişiklikler' ),
 	'Revisiondelete'            => array( 'RevizyonSil' ),
-	'RevisionMove'              => array( 'RevizyonTaşı' ),
 	'Search'                    => array( 'Ara', 'Arama' ),
 	'Shortpages'                => array( 'KısaSayfalar' ),
 	'Specialpages'              => array( 'ÖzelSayfalar' ),
@@ -165,10 +170,11 @@ $specialPageAliases = array(
 	'Unusedtemplates'           => array( 'KullanılmayanŞablonlar' ),
 	'Unwatchedpages'            => array( 'Ä°zlenmeyenSayfalar' ),
 	'Upload'                    => array( 'Yükle' ),
+	'UploadStash'               => array( 'ZulaYükle', 'ZulaYükleme' ),
 	'Userlogin'                 => array( 'KullanıcıOturumuAçma', 'KullanıcıGiriş' ),
 	'Userlogout'                => array( 'KullanıcıOturumuKapatma', 'KullanıcıÇıkış' ),
 	'Userrights'                => array( 'KullanıcıHakları' ),
-	'Version'                   => array( 'Sürüm' ),
+	'Version'                   => array( 'Sürüm', 'Versiyon' ),
 	'Wantedcategories'          => array( 'Ä°stenenKategoriler' ),
 	'Wantedfiles'               => array( 'Ä°stenenDosyalar' ),
 	'Wantedpages'               => array( 'Ä°stenenSayfalar' ),
@@ -185,11 +191,10 @@ $magicWords = array(
 	'forcetoc'                  => array( '0', '__İÇİNDEKİLERZORUNLU__', '__FORCETOC__' ),
 	'toc'                       => array( '0', '__İÇİNDEKİLER__', '__TOC__' ),
 	'noeditsection'             => array( '0', '__DEĞİŞTİRYOK__', '__DÜZENLEMEYOK__', '__NOEDITSECTION__' ),
-	'noheader'                  => array( '0', '__BAŞLIKYOK__', '__NOHEADER__' ),
 	'currentmonth'              => array( '1', 'MEVCUTAY', 'MEVCUTAY2', 'GÜNCELAY', 'GÜNCELAY2', 'CURRENTMONTH', 'CURRENTMONTH2' ),
 	'currentmonth1'             => array( '1', 'MEVCUTAY1', 'GÜNCELAY1', 'CURRENTMONTH1' ),
 	'currentmonthname'          => array( '1', 'MEVCUTAYADI', 'GÜNCELAYADI', 'CURRENTMONTHNAME' ),
-	'currentmonthnamegen'       => array( '1', 'MEVCUTAYADIÄ°YELÄ°K', 'CURRENTMONTHNAMEGEN' ),
+	'currentmonthnamegen'       => array( '1', 'MEVCUTAYADIİYELİK', 'GÜNCELAYADIİYELİK', 'CURRENTMONTHNAMEGEN' ),
 	'currentmonthabbrev'        => array( '1', 'MEVCUTAYKISALTMASI', 'GÜNCELAYKISALTMASI', 'CURRENTMONTHABBREV' ),
 	'currentday'                => array( '1', 'MEVCUTGÜN', 'GÜNCELGÜN', 'CURRENTDAY' ),
 	'currentday2'               => array( '1', 'MEVCUTGÜN2', 'GÜNCELGÜN2', 'CURRENTDAY2' ),
@@ -219,6 +224,7 @@ $magicWords = array(
 	'pagenamee'                 => array( '1', 'SAYFAADIU', 'PAGENAMEE' ),
 	'namespace'                 => array( '1', 'ADALANI', 'Ä°SÄ°MALANI', 'NAMESPACE' ),
 	'namespacee'                => array( '1', 'ADALANIU', 'Ä°SÄ°MALANIU', 'NAMESPACEE' ),
+	'namespacenumber'           => array( '1', 'ADALANINUMARASI', 'NAMESPACENUMBER' ),
 	'talkspace'                 => array( '1', 'TARTIŞMAALANI', 'TARTIŞMABOŞLUĞU', 'TALKSPACE' ),
 	'talkspacee'                => array( '1', 'TARTIŞMAALANIU', 'TARTIŞMABOŞLUĞUU', 'TALKSPACEE' ),
 	'subjectspace'              => array( '1', 'KONUALANI', 'MADDEALANI', 'KONUBOŞLUĞU', 'MADDEBOŞLUĞU', 'SUBJECTSPACE', 'ARTICLESPACE' ),
@@ -234,9 +240,9 @@ $magicWords = array(
 	'subjectpagename'           => array( '1', 'KONUSAYFASIADI', 'MADDESAYFASIADI', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
 	'subjectpagenamee'          => array( '1', 'KONUSAYFASIADIU', 'MADDESAYFASIADIU', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
 	'msg'                       => array( '0', 'MSJ:', 'Ä°LT:', 'MSG:' ),
-	'subst'                     => array( '0', 'KOPYALA:', 'AKTAR:', 'SUBST:' ),
-	'safesubst'                 => array( '0', 'GÜVENLİAKTAR:', 'SAFESUBST:' ),
-	'msgnw'                     => array( '0', 'MSJNW:', 'MSGNW:' ),
+	'subst'                     => array( '0', 'YK:', 'YERİNEKOY:', 'KOPYALA:', 'AKTAR:', 'YAPIŞTIR:', 'SUBST:' ),
+	'safesubst'                 => array( '0', 'GÜVENLİYERİNEKOY:', 'GÜVENLİKOPYALA:', 'GÜVENLİAKTAR:', 'GÜVENLİYAPIŞTIR:', 'SAFESUBST:' ),
+	'msgnw'                     => array( '0', 'MSJYN:', 'Ä°LTYN:', 'MSGNW:' ),
 	'img_thumbnail'             => array( '1', 'küçükresim', 'küçük', 'thumbnail', 'thumb' ),
 	'img_manualthumb'           => array( '1', 'küçükresim=$1', 'küçük=$1', 'thumbnail=$1', 'thumb=$1' ),
 	'img_right'                 => array( '1', 'sağ', 'right' ),
@@ -258,18 +264,20 @@ $magicWords = array(
 	'img_bottom'                => array( '1', 'taban', 'bottom' ),
 	'img_text_bottom'           => array( '1', 'metin-taban', 'text-bottom' ),
 	'img_link'                  => array( '1', 'bağlantı=$1', 'link=$1' ),
+	'img_class'                 => array( '1', 'sınıf=$1', 'class=$1' ),
 	'int'                       => array( '0', 'Ä°NT:', 'INT:' ),
 	'sitename'                  => array( '1', 'SÄ°TEADI', 'SITENAME' ),
 	'ns'                        => array( '0', 'AA:', 'AB:', 'NS:' ),
 	'nse'                       => array( '0', 'AAU:', 'ABU:', 'NSE:' ),
 	'localurl'                  => array( '0', 'YERELURL:', 'LOCALURL:' ),
 	'localurle'                 => array( '0', 'YERELURLU:', 'LOCALURLE:' ),
+	'articlepath'               => array( '0', 'MADDEYOLU', 'ARTICLEPATH' ),
 	'pageid'                    => array( '0', 'SAYFANO', 'PAGEID' ),
 	'server'                    => array( '0', 'SUNUCU', 'SERVER' ),
 	'servername'                => array( '0', 'SUNUCUADI', 'SERVERNAME' ),
 	'scriptpath'                => array( '0', 'BETÄ°KYOLU', 'SCRIPTPATH' ),
 	'stylepath'                 => array( '0', 'BİÇEMYOLU', 'STYLEPATH' ),
-	'grammar'                   => array( '0', 'GRAMER:', 'GRAMMAR:' ),
+	'grammar'                   => array( '0', 'DÄ°LBÄ°LGÄ°SÄ°:', 'GRAMER:', 'GRAMMAR:' ),
 	'gender'                    => array( '0', 'CÄ°NSÄ°YET:', 'GENDER:' ),
 	'notitleconvert'            => array( '0', '__BAŞLIKDÖNÜŞÜMÜYOK__', '__BDY__', '__NOTITLECONVERT__', '__NOTC__' ),
 	'nocontentconvert'          => array( '0', '__İÇERİKDÖNÜŞÜMÜYOK__', '__İDY__', '__NOCONTENTCONVERT__', '__NOCC__' ),
@@ -281,13 +289,15 @@ $magicWords = array(
 	'revisionday'               => array( '1', 'SÜRÜMGÜNÜ', 'REVISIONDAY' ),
 	'revisionday2'              => array( '1', 'SÜRÜMGÜNÜ2', 'REVISIONDAY2' ),
 	'revisionmonth'             => array( '1', 'SÜRÜMAYI', 'REVISIONMONTH' ),
+	'revisionmonth1'            => array( '1', 'SÜRÜMAYI1', 'REVISIONMONTH1' ),
 	'revisionyear'              => array( '1', 'SÜRÜMYILI', 'REVISIONYEAR' ),
 	'revisiontimestamp'         => array( '1', 'SÜRÜMZAMANBİLGİSİ', 'REVISIONTIMESTAMP' ),
 	'revisionuser'              => array( '1', 'SÜRÜMKULLANICI', 'REVISIONUSER' ),
 	'plural'                    => array( '0', 'ÇOĞUL:', 'PLURAL:' ),
 	'fullurl'                   => array( '0', 'TAMURL:', 'FULLURL:' ),
 	'fullurle'                  => array( '0', 'TAMURLU:', 'FULLURLE:' ),
-	'canonicalurl'              => array( '0', 'KANONÄ°KURL', 'CANONICALURL:' ),
+	'canonicalurl'              => array( '0', 'KURALLIURL:', 'CANONICALURL:' ),
+	'canonicalurle'             => array( '0', 'KURALLIURLU:', 'CANONICALURLE:' ),
 	'lcfirst'                   => array( '0', 'KHÄ°LK:', 'LCFIRST:' ),
 	'ucfirst'                   => array( '0', 'BHÄ°LK:', 'UCFIRST:' ),
 	'lc'                        => array( '0', 'KH:', 'LC:' ),
@@ -297,15 +307,22 @@ $magicWords = array(
 	'newsectionlink'            => array( '1', '__YENİBAŞLIKBAĞLANTISI__', '__NEWSECTIONLINK__' ),
 	'nonewsectionlink'          => array( '1', '__YENİBAŞLIKBAĞLANTISIYOK__', '__NONEWSECTIONLINK__' ),
 	'currentversion'            => array( '1', 'MEVCUTSÜRÜM', 'GÜNCELSÜRÜM', 'CURRENTVERSION' ),
+	'urlencode'                 => array( '0', 'URLKODLAMA:', 'URLENCODE:' ),
+	'anchorencode'              => array( '0', 'ÇENGELKODLAMA:', 'ANCHORENCODE' ),
 	'currenttimestamp'          => array( '1', 'MEVCUTZAMANBİLGİSİ', 'GÜNCELZAMANBİLGİSİ', 'CURRENTTIMESTAMP' ),
 	'localtimestamp'            => array( '1', 'YERELZAMANBÄ°LGÄ°SÄ°', 'LOCALTIMESTAMP' ),
+	'directionmark'             => array( '1', 'YÖNİŞARETİ:', 'DIRECTIONMARK', 'DIRMARK' ),
 	'language'                  => array( '0', '#DÄ°L:', '#LÄ°SAN:', '#LANGUAGE:' ),
 	'contentlanguage'           => array( '1', 'İÇERİKDİLİ', 'İÇERİKLİSANI', 'CONTENTLANGUAGE', 'CONTENTLANG' ),
 	'pagesinnamespace'          => array( '1', 'Ä°SÄ°MALANINDAKÄ°SAYFALAR', 'Ä°ADAKÄ°SAYFALAR', 'PAGESINNAMESPACE:', 'PAGESINNS:' ),
 	'numberofadmins'            => array( '1', 'HÄ°ZMETLÄ°SAYISI', 'NUMBEROFADMINS' ),
+	'formatnum'                 => array( '0', 'BİÇİMNUM', 'FORMATNUM' ),
+	'padleft'                   => array( '0', 'DOLSOL', 'PADLEFT' ),
+	'padright'                  => array( '0', 'DOLSAĞ', 'PADRIGHT' ),
 	'special'                   => array( '0', 'özel', 'special' ),
+	'speciale'                  => array( '0', 'özelu', 'speciale' ),
 	'defaultsort'               => array( '1', 'VARSAYILANSIRALA:', 'VARSAYILANSIRALAMAANAHTARI:', 'VARSAYILANKATEGORÄ°SIRALA:', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:' ),
-	'filepath'                  => array( '0', 'DOSYA_YOLU:', 'FILEPATH:' ),
+	'filepath'                  => array( '0', 'DOSYAYOLU:', 'DOSYA_YOLU:', 'FILEPATH:' ),
 	'tag'                       => array( '0', 'etiket', 'tag' ),
 	'hiddencat'                 => array( '1', '__GÄ°ZLÄ°KAT__', '__GÄ°ZLÄ°KATEGORÄ°__', '__HIDDENCAT__' ),
 	'pagesincategory'           => array( '1', 'KATEGORÄ°DEKÄ°SAYFALAR', 'KATTAKÄ°SAYFALAR', 'PAGESINCATEGORY', 'PAGESINCAT' ),
@@ -315,8 +332,15 @@ $magicWords = array(
 	'numberingroup'             => array( '1', 'GRUPTAKÄ°SAYI', 'GRUBUNSAYISI', 'NUMBERINGROUP', 'NUMINGROUP' ),
 	'staticredirect'            => array( '1', '__STATİKYÖNLENDİRME__', '__SABİTYÖNLENDİRME__', '__STATICREDIRECT__' ),
 	'protectionlevel'           => array( '1', 'KORUMASEVÄ°YESÄ°', 'PROTECTIONLEVEL' ),
-	'formatdate'                => array( '0', 'formattarihi', 'tarihformatı', 'formatdate', 'dateformat' ),
+	'formatdate'                => array( '0', 'biçimtarih', 'tarihbiçimi', 'formattarihi', 'tarihformatı', 'formatdate', 'dateformat' ),
+	'url_path'                  => array( '0', 'YOL', 'PATH' ),
 	'url_wiki'                  => array( '0', 'VÄ°KÄ°', 'WIKI' ),
+	'url_query'                 => array( '0', 'SORGU', 'QUERY' ),
+	'defaultsort_noerror'       => array( '0', 'hatayok', 'hatasız', 'noerror' ),
+	'pagesincategory_all'       => array( '0', 'tüm', 'all' ),
+	'pagesincategory_pages'     => array( '0', 'sayfalar', 'pages' ),
+	'pagesincategory_subcats'   => array( '0', 'altkategoriler', 'subcats' ),
+	'pagesincategory_files'     => array( '0', 'dosyalar', 'files' ),
 );
 
 $separatorTransformTable = array( ',' => '.', '.' => ',' );
@@ -457,8 +481,8 @@ $messages = array(
 'newwindow' => '(yeni bir pencerede açılır)',
 'cancel' => 'Ä°ptal',
 'moredotdotdot' => 'Daha...',
-'mypage' => 'sayfam',
-'mytalk' => 'Mesaj sayfam',
+'mypage' => 'Sayfa',
+'mytalk' => 'Tartışma',
 'anontalk' => "Bu IP'nin iletileri",
 'navigation' => 'Gezinti',
 'and' => '&#32;ve',
@@ -480,7 +504,7 @@ $messages = array(
 'vector-action-protect' => 'Koru',
 'vector-action-undelete' => 'Silinmeyi geri al',
 'vector-action-unprotect' => 'Korumayı değiştir',
-'vector-simplesearch-preference' => 'Gelişmiş arama önerilerini getir (Sadece Vector görünümü için)',
+'vector-simplesearch-preference' => 'Gelişmiş arama önerilerini etkinleştir (Sadece Vector görünümü için)',
 'vector-view-create' => 'Oluştur',
 'vector-view-edit' => 'Düzenle',
 'vector-view-history' => 'Geçmişi gör',
@@ -491,7 +515,7 @@ $messages = array(
 'variants' => 'Türevler',
 
 'errorpagetitle' => 'Hata',
-'returnto' => '$1 sayfasına dön.',
+'returnto' => '$1 sayfasına geri dön.',
 'tagline' => '{{SITENAME}} sitesinden',
 'help' => 'Yardım',
 'search' => 'Ara',
@@ -503,7 +527,7 @@ $messages = array(
 'updatedmarker' => 'son ziyaretimden sonra güncellenmiş',
 'printableversion' => 'Yazdırılabilir sürüm',
 'permalink' => 'Kalıcı bağlantı',
-'print' => 'Bastır',
+'print' => 'Yazdır',
 'view' => 'Görüntüle',
 'edit' => 'Düzenle',
 'create' => 'Oluştur',
@@ -587,7 +611,9 @@ $1',
 'youhavenewmessages' => 'Yeni $1 var ($2).',
 'newmessageslink' => 'mesajınız',
 'newmessagesdifflink' => 'son değişiklik',
-'newmessageslinkplural' => 'mesajınız',
+'youhavenewmessagesfromusers' => '{{PLURAL:$3|Başka bir kullanıcıdan|$3 kullanıcıdan}} $1 var. ($2)',
+'youhavenewmessagesmanyusers' => 'Birçok kullanıcıdan $1 var. ($2)',
+'newmessageslinkplural' => '{{PLURAL:$1|yeni mesajınız|yeni mesajlarınız}}',
 'newmessagesdifflinkplural' => 'son {{PLURAL:$1|değişiklik|değişiklikler}}',
 'youhavenewmessagesmulti' => "$1'de yeni mesajınız var.",
 'editsection' => 'düzenle',
@@ -640,7 +666,7 @@ Bu, {{SITENAME}} sitesindeki bir hatayı da belirtebilir.",
 # General errors
 'error' => 'Hata',
 'databaseerror' => 'Veritabanı hatası',
-'dberrortext' => 'Veritabanı sorgu sözdizimi hatası oluştu.
+'dberrortext' => 'Bir veritabanı sorgusu sözdizimi hatası oluştu.
 Bu yazılımdaki bir hatadan kaynaklanabilir.
 "<tt>$2</tt>" işlevinden denenen son sorgulama:
 <blockquote><tt>$1</tt></blockquote>.
@@ -700,7 +726,7 @@ Lütfen birkaç dakika sonra yeniden deneyin.',
 'viewsourcetext' => 'Bu sayfanın kaynağını görebilir ve kopyalayabilirsiniz:',
 'viewyourtext' => "Bu sayfaya '''yaptığınız değişikliklerin''' kaynağını görünteleyip kopyalayabilirsiniz:",
 'protectedinterface' => "Bu sayfa yazılım için arayüz metni sağlamaktadır ve kötüye kullanımı önlemek için korumaya alınmıştır. Eklemek ya da bütün vikilerdeki çevirileri değiştirmek için lütfen MediaWiki yerelleştirme projesi [//translatewiki.net/ translatewiki.net]'i kullanın.",
-'editinginterface' => "'''UYARI:''' Yazılım için arayüz sağlamakta kullanılan bir sayfayı değiştirmektesiniz. Bu sayfadaki değişiklikler kullanıcı arayüzünü diğer kullanıcılar için de değiştirecektir. Çeviriler için, lütfen [//translatewiki.net/wiki/Main_Page?setlang=tr translatewiki.net]'yi kullanarak MediaWiki yerelleştirme projesini dikkate alınız.",
+'editinginterface' => "'''UYARI:''' Wiki yazılımı için arayüz sağlamakta kullanılan bir sayfayı değiştirmektesiniz. Bu sayfadaki değişiklikler kullanıcı arayüzünü diğer kullanıcılar için de değiştirecektir. Çeviriler için, lütfen [//translatewiki.net/wiki/Main_Page?setlang=tr translatewiki.net]'yi kullanarak MediaWiki yerelleştirme projesini dikkate alınız.",
 'sqlhidden' => '(SQL gizli sorgu)',
 'cascadeprotected' => 'Bu sayfa değişiklik yapılması engellenmiştir, çünkü  "kademeli" seçeneği aktif hale getirilerek koruma altına alınan {{PLURAL:$1|sayfada|sayfada}} kullanılmaktadır:
 $2',
@@ -973,9 +999,8 @@ Buraya yanlışlıkla geldiyseniz tarayıcınızın '''geri''' tuşuna tıklayı
 Bu başlığı [[Special:Search/{{PAGENAME}}|diğer sayfalarda arayabilir]],
 <span class="plainlinks">[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} ilgili kayıtları arayabilir],
 ya da bu sayfayı [{{fullurl:{{FULLPAGENAME}}|action=edit}} değiştirebilirsiniz]</span>.',
-'noarticletext-nopermission' => 'Bu sayfa şu anda boştur.
-Bu başlığı [[Special:Search/{{PAGENAME}}|diğer sayfalarda arayabilir]]
-ya da <span class="plainlinks">[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} ilgili kayıtları tarayabilirsiniz].</span>',
+'noarticletext-nopermission' => 'Bu sayfa şu anda boştur. 
+Bu başlığı [[Special:Search/{{PAGENAME}}|diğer sayfalarda arayabilir]] ya da <span class="plainlinks">[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} ilgili kayıtları tarayabilirsiniz].</span>',
 'userpage-userdoesnotexist' => '"<nowiki>$1</nowiki>" kullanıcı hesabı kayıtlı değil. Bu sayfayı oluşturmak/değiştirmek istiyorsanız lütfen kontrol edin.',
 'userpage-userdoesnotexist-view' => '"$1" kullanıcı hesabı kayıtlı değil.',
 'blocked-notice-logextract' => 'Bu kullanıcı şuanda engellenmiş.
@@ -984,7 +1009,6 @@ Son engelleme günlüğü girdisi referans için aşağıda sağlanmıştır:',
 * '''Firefox / Safari:''' ''Shift'' tuşuna basılıyken \"Yeniden yükle\"'ye tıklayın ya da \"Ctrl-F5\" ya da ''Ctrl-R'' yapın (Mac için '⌘-R'').
 * '''Google Chrome:''' ''Ctrl-Shift-R'''ye basın. (Mac için ''⌘-Shift-R'')
 * '''Internet Explorer:''' ''Ctrl'' basılıyken ''Yenile'''ye tıklayın ya da ''Ctrl-F5'' yapın.
-* '''Konqueror:''' 'Yeniden yükle'''ye ya da ''F5'''e basın.
 * '''Opera:''' ''Araçlar → Tercihler'''den önbelliği temizleyin.",
 'usercssyoucanpreview' => "'''İpucu:''' Kaydetmeden önce \"{{int:showpreview}}\"e tıklayarak yeni CSSinizi deneyin.",
 'userjsyoucanpreview' => "'''İpucu:''' Kaydetmeden önce \"{{int:showpreview}}\"e tıklayarak yeni JavaScript'inizi test edin.",
@@ -1076,9 +1100,14 @@ Silinmiş görünüyor.',
 'edit-already-exists' => 'Yeni sayfa oluşturulamıyor.
 Sayfa zaten mevcut.',
 'defaultmessagetext' => 'Varsayılan mesaj metni',
+'invalid-content-data' => 'Geçersiz içerik verisi',
+'content-not-allowed-here' => '"$1" içeriğine, [[$2]] sayfasında izin verilmemekte.',
 
 # Content models
+'content-model-wikitext' => 'vikimetin',
+'content-model-text' => 'düz metin',
 'content-model-javascript' => 'JavaScript',
+'content-model-css' => 'CSS',
 
 # Parser/template warnings
 'expensive-parserfunction-warning' => 'Uyarı: Bu sayfa çok fazla zengin derleyici fonksiyonu çağrısı içeriyor.
@@ -1094,6 +1123,11 @@ Bu değişkenler atlandı.",
 'parser-template-loop-warning' => 'Şablon düğümü tespit edildi: [[$1]]',
 'parser-template-recursion-depth-warning' => 'Şablon özyineleme yoğunluğu sınırı aşıldı ($1)',
 'language-converter-depth-warning' => 'Dil çevirici derinlik sınırı aşıldı ($1)',
+'node-count-exceeded-category' => 'Düğüm sayısı aşılan sayfalar',
+'node-count-exceeded-warning' => 'Sayfa düğüm sayımı aşıldı',
+'expansion-depth-exceeded-category' => 'Genişleme derinliği aşılan sayfalar',
+'expansion-depth-exceeded-warning' => 'Sayfa genişletme derinliği aşıldı',
+'parser-unstrip-loop-warning' => 'Yineleme döngüsü algılandı',
 
 # "Undo" feature
 'undo-success' => 'Bu değişiklik geri alınabilir. Lütfen aşağıdaki karşılaştırmayı kontrol edin, gerçekten bu değişikliği yapmak istediğinizden emin olun ve sayfayı kaydederek bir önceki değişikliği geriye alın.',
@@ -1225,9 +1259,11 @@ Erişiminiz yok.',
 'revdelete-concurrent-change' => '$2 $1 tarihli öğe değiştirilirken hata: öğenin durumu siz değiştirmeye çalışırken bir başkası tarafından değiştirilmiş görünüyor.
 Lütfen günlükleri kontrol edin.',
 'revdelete-only-restricted' => '$2 $1 tarihli öğe gizlenirken hata: Öğeleri, diğer gizleme seçeneklerinden birini seçmeden, hizmetli görünümden bastıramazsınız.',
-'revdelete-reason-dropdown' => '*Genel silme sebepleri
-** Telif ihlali
-** Uygunsuz kişisel bilgi',
+'revdelete-reason-dropdown' => '*Genel silme nedenleri
+** Telif hakkı ihlali
+** Sakıncalı yorum veya kişisel bilgi 
+** Sakıncalı kullanıcı adı
+** Muhtemel iftira niteliğinde bilgiler',
 'revdelete-otherreason' => 'Diğer/ek sebep:',
 'revdelete-reasonotherlist' => 'Diğer sebep',
 'revdelete-edit-reasonlist' => 'Silme nedenlerini değiştir',
@@ -1272,6 +1308,7 @@ Gezinti bağlantılarının bu sütunu sıfırlayacağını unutmayın.',
 # Diffs
 'history-title' => '"$1" sayfasının geçmişi',
 'difference-title' => '"$1" sayfasının sürümleri arasındaki fark',
+'difference-title-multipage' => '"$1" ile "$2" sayfaları arasındaki fark',
 'difference-multipage' => '(Sayfalar arasındaki fark)',
 'lineno' => '$1. satır:',
 'compareselectedversions' => 'Seçilen sürümleri karşılaştır',
@@ -1354,7 +1391,7 @@ Aramanızın başına '''all:''' önekini ekleyerek tüm içeriği aramayı (tar
 
 # Preferences page
 'preferences' => 'Tercihler',
-'mypreferences' => 'Tercihlerim',
+'mypreferences' => 'Tercihler',
 'prefs-edits' => 'Değişiklik sayısı:',
 'prefsnologin' => 'Oturum açık değil',
 'prefsnologintext' => 'Kullanıcı tercihlerinizi ayarlamak için <span class="plainlinks">[{{fullurl:{{#Special:UserLogin}}|returnto=$1}} giriş yapmalısınız]</span>.',
@@ -1417,7 +1454,7 @@ Kullanabileceğiniz rastgele-üretilmiş bir değer: $1',
 'timezoneregion-indian' => 'Hint Okyanusu',
 'timezoneregion-pacific' => 'Pasifik Okyanusu',
 'allowemail' => 'Diğer kullanıcılar bana e-posta atabilsin',
-'prefs-searchoptions' => 'Arama seçenekleri',
+'prefs-searchoptions' => 'Arama',
 'prefs-namespaces' => 'İsim alanları',
 'defaultns' => 'Aksi halde bu ad alanlarında ara:',
 'default' => 'varsayılan',
@@ -1816,9 +1853,15 @@ Eğer sorun tekrarlanırsa, bir [[Special:ListUsers/sysop|hizmetli]] ile temasa
 'upload-http-error' => 'Bir HTTP hatası oluştu: $1',
 
 # File backend
+'backend-fail-stream' => '$1 dosyası okunamadı.',
 'backend-fail-notexists' => '$1 dosyası mevcut değil.',
+'backend-fail-invalidpath' => '"$1" geçerli bir depolama yolu değil.',
 'backend-fail-delete' => '"$1" dosyası silinemedi.',
+'backend-fail-alreadyexists' => '"$1" dosyası zaten mevcut.',
+'backend-fail-copy' => '"$1" dosyası, "$2" dosyasına kopyalanamadı.',
+'backend-fail-move' => '"$1" dosyası, "$2" dosyasına taşınamadı.',
 'backend-fail-opentemp' => 'Geçici dosya açılamadı.',
+'backend-fail-writetemp' => 'Geçici dosya oluşturulamadı.',
 'backend-fail-closetemp' => 'Geçici dosya kapanamadı.',
 'backend-fail-read' => '$1 dosyası okunamadı.',
 'backend-fail-create' => '$1 dosyası yazılamadı.',
@@ -2065,6 +2108,7 @@ Her satırın içerdiği bağlantılar; birinci ve ikinci yönlendirme, ayrıca
 'mostlinkedtemplates' => 'En çok kullanılan şablonlar',
 'mostcategories' => 'En fazla kategoriye bağlanmış sayfalar',
 'mostimages' => 'En çok bağlantı verilmiş dosyalar',
+'mostinterwikis' => "En çok interwiki'ye sahip sayfalar",
 'mostrevisions' => 'En çok değişikliğe uğramış sayfalar',
 'prefixindex' => 'Önek ile tüm sayfalar',
 'shortpages' => 'Kısa sayfalar',
@@ -2136,6 +2180,9 @@ Günlük tipini, kullanıcı adını (büyük-küçük harf duyarlı), ya da etk
 'allpages-bad-ns' => '{{SITENAME}} sitesinde "$1" ad alanı yok.',
 'allpages-hide-redirects' => 'Yönlendirmeleri gizle',
 
+# SpecialCachedPage
+'cachedspecial-refresh-now' => 'En son görünüm.',
+
 # Special:Categories
 'categories' => 'Kategoriler',
 'categoriespagetext' => "Aşağıdaki {{PLURAL:$1|kategori|kategoriler}} sayfa veya ortam içerir.
@@ -2203,6 +2250,8 @@ Bireysel haklarla ilgili [[{{MediaWiki:Listgrouprights-helppage}}|daha fazla bil
 'mailnologin' => 'Gönderi adresi yok.',
 'mailnologintext' => 'Diğer kullanıcılara e-posta gönderebilmeniz için [[Special:UserLogin|oturum aç]]malısınız ve [[Special:Preferences|tercihler]] sayfasında geçerli bir e-posta adresiniz olmalı.',
 '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 kullanıcıya e-posta mesajı göndermek için aşağıdaki formu kullanabilirsiniz.
 [[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 direk cevap verebilecektir.',
@@ -2236,7 +2285,7 @@ Bireysel haklarla ilgili [[{{MediaWiki:Listgrouprights-helppage}}|daha fazla bil
 
 # Watchlist
 'watchlist' => 'Ä°zleme listem',
-'mywatchlist' => 'Ä°zleme listem',
+'mywatchlist' => 'Ä°zleme listesi',
 'watchlistfor2' => '$1 için $2',
 'nowatchlist' => 'İzleme listesinde hiçbir madde bulunmuyor.',
 'watchlistanontext' => 'Lütfen izleme listenizdeki maddeleri görmek ya da değiştirmek için $1.',
@@ -2476,6 +2525,7 @@ Revizyon onarılmış veya arşivden silinmiş olabilir ya da sahip olduğunuz b
 'undelete-cleanup-error' => 'Kullanılmayan "$1" arşiv dosyasını silerken hata.',
 'undelete-missing-filearchive' => 'Dosya arşiv IDsi $1 geri getirilemiyor çünkü veritabanında değil.
 Daha önceden silinmesi geri alınmış olabilir.',
+'undelete-error' => 'Sayfa silinemiyor hatası',
 'undelete-error-short' => 'Bu dosyanın silinmesini geri alırken hata çıktı: $1',
 'undelete-error-long' => 'Bu dosyanın silinmesini geri alırken hatalar çıktı:
 
@@ -2492,7 +2542,7 @@ $1',
 # Contributions
 'contributions' => 'Kullanıcının katkıları',
 'contributions-title' => '$1 için kullanıcı katkıları',
-'mycontris' => 'Katkılarım',
+'mycontris' => 'Katkılar',
 'contribsub2' => '$1 ($2)',
 'nocontribs' => 'Bu kriterlere uyan değişiklik bulunamadı',
 'uctop' => '(son)',
@@ -2831,6 +2881,7 @@ Bütün vikilerarası içe aktarım eylemleri [[Special:Log/import|içe aktarım
 'import-interwiki-templates' => 'Tüm şablonları içer',
 'import-interwiki-submit' => 'Import',
 'import-interwiki-namespace' => 'Hedef ad alanı:',
+'import-interwiki-rootpage' => 'Hedeflenen kaynak sayfası (isteğe bağlı):',
 'import-upload-filename' => 'Dosya adı:',
 'import-comment' => 'Yorum:',
 'importtext' => 'Lütfen dosyayı [[Special:Export|dışa aktarım yardımcı yazılımıyla]] kaynak vikiden dışa aktarın.
@@ -2974,21 +3025,39 @@ Geçici dosya kayıp.',
 
 # Info page
 'pageinfo-title' => 'Bilgi için "$1"',
-'pageinfo-header-edits' => 'Değişiklikler',
+'pageinfo-header-basic' => 'Temel bilgiler',
+'pageinfo-header-edits' => 'Düzenleme geçmişi',
 'pageinfo-header-restrictions' => 'Sayfa koruması',
 'pageinfo-header-properties' => 'Sayfa özellikleri',
 'pageinfo-display-title' => 'Görüntülenen başlık',
 'pageinfo-default-sort' => 'Varsayılan sıralama anahtarı',
+'pageinfo-length' => 'Sayfa uzunluğu (bayt cinsinden)',
 'pageinfo-article-id' => 'Sayfa ID',
 'pageinfo-robot-policy' => 'Arama motoru durumu',
 'pageinfo-robot-index' => 'Ä°ndekslenebilir',
 'pageinfo-robot-noindex' => 'Ä°ndekslenemez',
 'pageinfo-views' => 'Görüntülenme sayısı',
-'pageinfo-watchers' => 'İzleyen sayısı',
+'pageinfo-watchers' => 'Sayfanın izleyici sayısı',
+'pageinfo-redirects-name' => 'Bu sayfaya yönlendirmeler',
 'pageinfo-redirects-value' => '$1',
+'pageinfo-subpages-name' => 'Bu sayfanın alt sayfaları',
 'pageinfo-firstuser' => 'Sayfa oluşturucu',
-'pageinfo-edits' => 'Değişiklik sayısı',
+'pageinfo-firsttime' => 'Sayfa oluşturulma tarihi',
+'pageinfo-lastuser' => 'En son düzenleyici',
+'pageinfo-lasttime' => 'Son düzenleme tarihi',
+'pageinfo-edits' => 'Düzenleme sayısı',
+'pageinfo-authors' => 'Farklı yazar sayısı',
+'pageinfo-recent-edits' => 'Son zamanlardaki düzenlemeler (son $1)',
+'pageinfo-recent-authors' => 'Farklı yazarların son sayısı',
+'pageinfo-magic-words' => 'Sihirli {{PLURAL:$1|kelimeler|kelimeler}} ($1)',
+'pageinfo-hidden-categories' => 'Gizli {{PLURAL:$1|kategori|kategoriler}} ($1)',
+'pageinfo-templates' => 'Görüntülenen {{PLURAL:$1|şablon|şablonlar}} ($1)',
 'pageinfo-toolboxlink' => 'Sayfa bilgisi',
+'pageinfo-redirectsto' => 'Yönlendirilen',
+'pageinfo-redirectsto-info' => 'bilgi',
+'pageinfo-contentpage' => 'Bir içerik sayfası sayılır',
+'pageinfo-contentpage-yes' => 'Evet',
+'pageinfo-protect-cascading-yes' => 'Evet',
 
 # Skin names
 'skinname-standard' => 'Klasik',
@@ -3229,6 +3298,7 @@ Diğerleri varsayılan olarak gizlenecektir.
 'exif-objectname' => 'Kısa başlık',
 'exif-specialinstructions' => 'Özel talimatlar',
 'exif-headline' => 'Başlık',
+'exif-credit' => 'Sağlayıcı',
 'exif-source' => 'Kaynak',
 'exif-urgency' => 'Aciliyet',
 'exif-fixtureidentifier' => 'Fikstür adı',
@@ -3243,6 +3313,7 @@ Diğerleri varsayılan olarak gizlenecektir.
 'exif-serialnumber' => 'Kameranın seri numarası',
 'exif-cameraownername' => 'Kameranın sahibi',
 'exif-label' => 'Etiket',
+'exif-nickname' => 'Görüntünün resmî olmayan adı',
 'exif-rating' => 'Oylama (5 üzerinden)',
 'exif-copyrighted' => 'Telif hakkı durumu',
 'exif-copyrightowner' => 'Telif hakkı sahibi',
@@ -3250,12 +3321,15 @@ Diğerleri varsayılan olarak gizlenecektir.
 'exif-webstatement' => 'Çevrimiçi telif hakkı bildirimi',
 'exif-licenseurl' => 'Telif hakkı lisansı için URL',
 'exif-morepermissionsurl' => 'Alternatif lisans bilgileri',
+'exif-attributionurl' => 'Bu çalışmayı yeniden kullanırken lütfen bağlantı verin',
 'exif-pngfilecomment' => 'PNG dosyası yorumu',
 'exif-disclaimer' => 'Sorumluluk reddi',
 'exif-contentwarning' => 'İçerik uyarısı',
 'exif-giffilecomment' => 'GIF dosyası yorumu',
+'exif-intellectualgenre' => 'Öğe türü',
 'exif-subjectnewscode' => 'Konu kodu',
 'exif-event' => 'Adı geçen olay',
+'exif-organisationinimage' => 'Organizasyon gösterilmiştir',
 'exif-personinimage' => 'Adı geçen kişi',
 'exif-originalimageheight' => 'Resmin kırpılmadan önceki yükseliği',
 'exif-originalimagewidth' => 'Resmin kırpılmadan önceki genişliği',
@@ -3690,6 +3764,9 @@ Bu programla birlikte [{{SERVER}}{{SCRIPTPATH}}/COPYING GNU Genel Kamu Lisansın
 'version-software' => 'Yüklü yazılım',
 'version-software-product' => 'Ürün',
 'version-software-version' => 'Versiyon',
+'version-entrypoints' => "Giriş noktası URL'leri",
+'version-entrypoints-header-entrypoint' => 'Giriş noktası',
+'version-entrypoints-header-url' => 'URL',
 
 # Special:FilePath
 'filepath' => 'Dosyanın konumu',
@@ -3823,6 +3900,7 @@ Resimler tam çözünürlükte görüntülenir, diğer dosya tipleri ilgili prog
 'feedback-cancel' => 'Ä°ptal',
 'feedback-submit' => 'Geribildirimi Gönder',
 'feedback-adding' => 'Sayfaya geribildirim ekleniyor...',
+'feedback-error1' => 'Hata: Bilinmeyen API sonucu',
 'feedback-error2' => 'Hata: Düzenleme başarısız oldu',
 'feedback-error3' => "Hata: API'den yanıt yok",
 'feedback-thanks' => 'Teşekkürler! Görüşleriniz "[$2 $1]" sayfasında paylaşılmıştır.',
@@ -3840,20 +3918,28 @@ Resimler tam çözünürlükte görüntülenir, diğer dosya tipleri ilgili prog
 'api-error-duplicate-popup-title' => 'Çift {{PLURAL:$1|dosya|dosya}}',
 'api-error-empty-file' => 'Gönderdiğiniz dosya boş.',
 'api-error-emptypage' => 'Yeni, boş bir sayfa oluşturmaya izin verilmez.',
+'api-error-fetchfileerror' => 'İç hata: Dosya alınırken bir hata oluştu.',
+'api-error-fileexists-forbidden' => '"$1" adıyla bir dosya zaten mevcut dolayısıyla üzerine yazamazsınız.',
 'api-error-file-too-large' => 'Gönderdiğiniz dosya çok büyük.',
 'api-error-filename-tooshort' => 'Dosya adı çok kısa.',
 'api-error-filetype-banned' => 'Bu dosya biçimi yasaklanmıştır.',
 'api-error-filetype-banned-type' => '$1 {{PLURAL:$4|izin verilen bir dosya türü değil|izin verilen bir dosya türü değil}}. İzin verilen {{PLURAL:$3|dosya türü|dosya türleri}} $2.',
 'api-error-filetype-missing' => 'Dosya uzantısı eksik.',
+'api-error-hookaborted' => 'Yapmaya çalıştığınız değişiklik bir eklenti tarafından iptal edildi.',
 'api-error-http' => 'İç hata: sunucu ile bağlantı kurulamıyor.',
 'api-error-illegal-filename' => 'Bu dosya adına izin verilmiyor.',
+'api-error-internal-error' => "İç hata: Wiki'ye yükleme yapma işleminizde bir şeyler ters gitti.",
 'api-error-invalid-file-key' => 'İç hata: geçici depolama dosyası bulunamadı.',
+'api-error-missingparam' => 'İç hata: İstenilen parametreler eksik.',
+'api-error-missingresult' => 'İç hata: Kopyalamanın başarılı olup olmadığı belirlenemedi.',
 'api-error-mustbeloggedin' => 'Dosya yükleyebilmek için oturum açmanız gereklidir.',
 'api-error-mustbeposted' => 'İç hata: İstek HTTP POST gerektiriyor.',
+'api-error-noimageinfo' => 'Yükleme başarılı oldu, ancak sunucu, bize dosya hakkında herhangi bir bilgi vermedi.',
 'api-error-nomodule' => 'İç hata: Yükleme modülü ayarı yapılmadı.',
 'api-error-ok-but-empty' => 'İç hata: Sunucu yanıt vermiyor.',
 'api-error-overwrite' => 'Varolan dosyanın üzerine yazmaya izin verilmiyor.',
 'api-error-stashfailed' => 'İç hata: Sunucu, geçici dosyaları kaybetti.',
+'api-error-timeout' => 'Sunucu beklenen süre içinde yanıt vermedi.',
 'api-error-unclassified' => 'Bilinmeyen bir hata oluştu.',
 'api-error-unknown-code' => 'Bilinmeyen hata: "$1"',
 'api-error-unknown-error' => 'İç hata: Dosya yüklemeye çalışırken bir şeyler ters gitti.',
@@ -3862,4 +3948,15 @@ Resimler tam çözünürlükte görüntülenir, diğer dosya tipleri ilgili prog
 'api-error-uploaddisabled' => 'Yükleme bu vikide devre dışı bırakılmıştır.',
 'api-error-verification-error' => 'Dosya bozuk veya yanlış uzantıya sahip olabilir.',
 
+# Durations
+'duration-seconds' => '$1 {{PLURAL:$1|saniye|saniye}}',
+'duration-minutes' => '$1 {{PLURAL:$1|dakika|dakika}}',
+'duration-hours' => '$1 {{PLURAL:$1|saat|saat}}',
+'duration-days' => '$1 {{PLURAL:$1|gün|gün}}',
+'duration-weeks' => '$1 {{PLURAL:$1|hafta|hafta}}',
+'duration-years' => '$1 {{PLURAL:$1|yıl|yıl}}',
+'duration-decades' => '$1 {{PLURAL:$1|on yıl|on yıl}}',
+'duration-centuries' => '$1 {{PLURAL:$1|yüzyıl|yüzyıl}}',
+'duration-millennia' => '$1 {{PLURAL:$1|bin yıl|bin yıl}}',
+
 );
diff --git a/languages/messages/MessagesTs.php b/languages/messages/MessagesTs.php
index 45cecdad96..2ff42cea31 100644
--- a/languages/messages/MessagesTs.php
+++ b/languages/messages/MessagesTs.php
@@ -138,7 +138,6 @@ $messages = array(
 'qbfind' => 'Kuma',
 'qbedit' => 'Lulamisa',
 'qbpageoptions' => 'Tluka leri',
-'qbpageinfo' => 'mongo',
 'qbmyoptions' => 'Matluka ya mina',
 'qbspecialpages' => 'Matluka yohlawuleka',
 'faq' => 'FAQ',
diff --git a/languages/messages/MessagesTt_cyrl.php b/languages/messages/MessagesTt_cyrl.php
index ea2fc3747e..8c36d238fd 100644
--- a/languages/messages/MessagesTt_cyrl.php
+++ b/languages/messages/MessagesTt_cyrl.php
@@ -355,7 +355,6 @@ $messages = array(
 'qbbrowse' => 'Карау',
 'qbedit' => 'Үзгәртү',
 'qbpageoptions' => 'Бу бит',
-'qbpageinfo' => 'Бит турында мәгълүматлар',
 'qbmyoptions' => 'Битләрем',
 'qbspecialpages' => 'Махсус битләр',
 'faq' => 'ЕБС',
diff --git a/languages/messages/MessagesTt_latn.php b/languages/messages/MessagesTt_latn.php
index 57755f74ae..5967e9439f 100644
--- a/languages/messages/MessagesTt_latn.php
+++ b/languages/messages/MessagesTt_latn.php
@@ -237,7 +237,6 @@ $messages = array(
 'qbbrowse' => 'Qaraw',
 'qbedit' => 'Üzgärtü',
 'qbpageoptions' => 'Bu bit',
-'qbpageinfo' => 'Bit turında mäğlümatlar',
 'qbmyoptions' => 'Bitlärem',
 'qbspecialpages' => 'Maxsus bitlär',
 'faq' => 'YBS',
diff --git a/languages/messages/MessagesTyv.php b/languages/messages/MessagesTyv.php
index 92291c9c60..e490899d47 100644
--- a/languages/messages/MessagesTyv.php
+++ b/languages/messages/MessagesTyv.php
@@ -83,7 +83,7 @@ $messages = array(
 
 'underline-always' => 'Кезээде',
 'underline-never' => 'Кажан-даа',
-'underline-default' => 'Веб-браузерниң ниити үнези',
+'underline-default' => 'Кештиң азы веб-браузерниң ниити үнези',
 
 # Font style option in Special:Preferences
 'editfont-default' => 'Веб-браузерниң ниити үнези',
@@ -158,8 +158,8 @@ $messages = array(
 'newwindow' => '(чаа көзенээ ажыытынар)',
 'cancel' => 'Соксаары',
 'moredotdotdot' => 'Артык...',
-'mypage' => 'Мээң арыным',
-'mytalk' => 'Мээң чугаам',
+'mypage' => 'Арын',
+'mytalk' => 'Чугаа',
 'anontalk' => 'Бо ИП-адрестиң чугаазы',
 'navigation' => 'Навигация',
 'and' => '&#32;болгаш',
@@ -169,7 +169,6 @@ $messages = array(
 'qbbrowse' => 'Каралаары',
 'qbedit' => 'Өскертири',
 'qbpageoptions' => 'Бо арын',
-'qbpageinfo' => 'Арын дугайында медээ',
 'qbmyoptions' => 'Мээң арыннарым',
 'qbspecialpages' => 'Тускай арыннар',
 'faq' => 'Бо-ла салыр айтырыглар (БлСА)',
@@ -317,12 +316,13 @@ $messages = array(
 'databaseerror' => 'Медээ шыгжамыры алдаг',
 'laggedslavemode' => "'''Оваарымчалыг:''' Бо арында чаартыышкыннар чок болуп болур.",
 'readonly' => 'шоочалаарынга медээ шыгжамыры',
-'missing-article' => 'Медээ чыындызы did not find the арынның сөзүглели that it should have found, named "$1" $2.
+'missing-article' => 'Данныйлар базазында тывар ужурлуг «$1» $2 деп арынның негеттинип турар сөзүглели тывылбаан.
 
-This is usually caused by following an outdated diff or history link to a page that has been deleted.
+Нургулайында ындыг байдал эрги шөлүлге-биле казыттынган арынның өскерилге төөгүзүнче дамчып оралдажырга тыптыр.
 
-If this is not the case, you may have found a bug in the software.
-Please report this to an [[Special:ListUsers/sysop|administrator]], making note of the URL.',
+А шынында ындыг эвес болза, Силер программа хандырылгазының алдаанга душканыңар хөңнү.
+
+Ооң дугайында кайы-бир [[Special:ListUsers/sysop|удуртукчуларга]], мүн URL-ин айытпышаан, дамчыдыңарам.',
 'missingarticle-rev' => '(үндүрериниң саны: $1)',
 'missingarticle-diff' => '(Ылгал: $1, $2)',
 'internalerror' => 'Иштики алдаг',
@@ -331,6 +331,7 @@ Please report this to an [[Special:ListUsers/sysop|administrator]], making note
 'viewsource' => 'Дөзүн көөрү',
 'actionthrottled' => 'Шеглээн дүрген',
 'sqlhidden' => '(SQL айтырыгны чажырган)',
+'exception-nologin' => 'Кирбес',
 
 # Login and logout pages
 'welcomecreation' => '== Кирип моорлаңар, $1! ==
@@ -342,6 +343,7 @@ Do not forget to change your [[Special:Preferences|{{SITENAME}} preferences]].',
 'remembermypassword' => 'Мени бо компьютерде сактып алыры ($1 {{PLURAL:$1|хүн|хүн}}ге чедир)',
 'login' => 'Кирери',
 'nav-login-createaccount' => 'Кирери / бүрүткел бижикти чогаадыры',
+'loginprompt' => '{{SITENAME}} сайтче кирерде, баштай «cookies»-ти чөшпээрээр ужурлуг Силер.',
 'userlogin' => 'Кирери / бүрүткел бижикти чогаадыры',
 'userloginnocreate' => 'Кирери',
 'logout' => 'Үнери',
@@ -352,6 +354,7 @@ Do not forget to change your [[Special:Preferences|{{SITENAME}} preferences]].',
 'createaccount' => 'Бүрүткел бижикти бүдүрери',
 'gotaccount' => "Силер бүрүтекнип алдыңар де? '''$1'''.",
 'gotaccountlink' => 'Кирер',
+'userlogin-resetlink' => 'Кирер бижик-саныңар уттуп алдыңар бе?',
 'createaccountmail' => 'Э-чагаадан',
 'createaccountreason' => 'Чылдагаан:',
 'badretype' => 'Силерниң парлаан чажыт сөзүңер таарышпас.',
@@ -384,6 +387,7 @@ Do not forget to change your [[Special:Preferences|{{SITENAME}} preferences]].',
 'resetpass-temp-password' => 'Түр чажыт сөс:',
 
 # Special:PasswordReset
+'passwordreset' => 'Чажыт сөстү дүжүрү',
 'passwordreset-legend' => 'Чажыт атты дүжүр',
 'passwordreset-username' => 'Aжыглакчының ады:',
 'passwordreset-domain' => 'Домен:',
@@ -417,7 +421,7 @@ Do not forget to change your [[Special:Preferences|{{SITENAME}} preferences]].',
 'image_tip' => 'Киир туткан файл',
 'media_sample' => 'Чижек.ogg',
 'media_tip' => 'Файлдың холбаазы',
-'hr_tip' => 'Доора шугум (use sparingly)',
+'hr_tip' => 'Доора шугум (көвей ажыглаваңар)',
 
 # Edit pages
 'summary' => 'Түңнел:',
@@ -457,6 +461,12 @@ Please check if you want to create/edit this page.',
 'moveddeleted-notice' => 'Бо арын ап каавыткан.
 Адаанда ап каавыткан биле өскээр адаан бижиктер шынзылгазын көргүскен.',
 
+# Parser/template warnings
+'post-expand-template-inclusion-warning' => 'Сагындырыг: Кошкан майыктарның ниити хемчээли дендии улуг.
+Чамдык майыктар коштунмаан боор.',
+'post-expand-template-inclusion-category' => 'Кожар майыктарга чөшпээрээн хемчээлин ашкан арыннар',
+'post-expand-template-argument-category' => "Аргументилери салдынмаан майыктарлыг '''арыннар'''",
+
 # History pages
 'viewpagelogs' => 'Бо арынның журналын көргүзери',
 'nohistory' => 'Бо арынның өскерлиишкин төөгүзү чок.',
@@ -510,10 +520,11 @@ Please check if you want to create/edit this page.',
 'revertmerge' => 'Чарары',
 
 # Diffs
-'history-title' => '«$1» деп арынның үндүрери төөгүзү',
+'history-title' => '«$1» деп арынның эдилге төөгүзү',
 'lineno' => 'Одуруг $1:',
 'compareselectedversions' => 'Шилип алган хевирлери деңнээри',
 'editundo' => 'чөрчүүрү',
+'diff-multi' => '({{PLURAL:$2|$2 киржикчиниң}} {{PLURAL:$1|$1 түр хевирин көргүспээн}})',
 
 # Search results
 'searchresults' => 'Түңнелдер',
@@ -531,14 +542,15 @@ Please check if you want to create/edit this page.',
 'searchprofile-project' => 'Төлевилел биле дуза арыннары',
 'searchprofile-images' => 'Мультимедиа',
 'searchprofile-everything' => 'Бүгүде',
-'searchprofile-advanced' => 'Калбартыры',
+'searchprofile-advanced' => 'Калбайтыр',
 'searchprofile-articles-tooltip' => '$1 иштинден дилээри',
 'searchprofile-project-tooltip' => '$1 иштинде дилээри',
 'searchprofile-images-tooltip' => 'Файлдар дилээри',
 'searchprofile-everything-tooltip' => 'Шупту арыннардан дилээри (сумележиишкиннерден база)',
 'searchprofile-advanced-tooltip' => 'Айыткан аттар делгемнеринден дилээри',
 'search-result-size' => '$1 ({{PLURAL:$2|$2 сөс}})',
-'search-redirect' => '(шигледир $1)',
+'search-result-category-size' => '{{PLURAL:$1|1 кежигүн|$1 кежигүн}} ({{PLURAL:$2|1 aдаккы бөлүк|$2 aдаккы бөлүк}}, {{PLURAL:$3|1 файл|$3 файл}})',
+'search-redirect' => '($1-н шиглелге)',
 'search-section' => '(«$1» деп салбыр)',
 'search-suggest' => 'Силер «$1» деп бодадыңар чадавас',
 'search-interwiki-more' => '(артык)',
@@ -552,7 +564,7 @@ Please check if you want to create/edit this page.',
 
 # Preferences page
 'preferences' => 'Шилилгелер',
-'mypreferences' => 'Мээң шилилгелерим',
+'mypreferences' => 'Шилилгелер',
 'prefs-edits' => 'Өскерлиишкиннериңерниң саны:',
 'changepassword' => 'Чажыт сөстү өскертири',
 'prefs-skin' => 'Кеш',
@@ -602,6 +614,7 @@ It must not be more than $1 {{PLURAL:$1|character|characters}} long.',
 'gender-male' => 'Эр',
 'gender-female' => 'Кыс',
 'email' => 'Э-чагаа',
+'prefs-help-email' => 'Э-шуудаң адрезин айтыры албан эвес, ынчалза-даа, уруңуңар (парольуңар) чиде бээрге, ол херек апаар.',
 'prefs-info' => 'Кол медээлер',
 'prefs-signature' => 'Хол үжүү',
 'prefs-diffs' => 'Ылгалдар',
@@ -668,9 +681,11 @@ It must not be more than $1 {{PLURAL:$1|character|characters}} long.',
 'recentchanges-feed-description' => 'Бо агымда викиниң сөөлгү өскерлиишкиннерин көөрү.',
 'recentchanges-label-newpage' => 'Бо өскерлиишкин чаа арынны чогааткан.',
 'recentchanges-label-minor' => 'Бо өскерлиишкин бичии-дир',
-'recentchanges-label-bot' => 'Бо эдилгени робот күүсетти.',
-'recentchanges-label-unpatrolled' => 'Бо өскерлиишкин истенмейн каан',
-'rclistfrom' => 'Starting from $1 чаа өскерлиишкиннерни көргүзери',
+'recentchanges-label-bot' => 'Бо эдилгени робот күүсеткен.',
+'recentchanges-label-unpatrolled' => 'Бо өскертилге истетинмээн (патрульдаттынмаан)',
+'rcnote' => "$4 $5 өйде соңгу '''$2''' {{PLURAL:$2|хонуктуң}} {{PLURAL:$1|сөөлгү '''$1''' '''өскерилгелери'''}} .",
+'rcnotefrom' => 'Адаанда <strong>$2</strong> тура (<strong>$1</strong> чедир) өскертилгелерни санаан.',
+'rclistfrom' => '$1 тура чаа өскерилгелерни көргүзер',
 'rcshowhideminor' => 'Бичии өскерлиишкиннерни $1',
 'rcshowhidebots' => 'Роботтарну $1',
 'rcshowhideliu' => 'Кирер ажыглакчыларны $1',
@@ -695,6 +710,7 @@ It must not be more than $1 {{PLURAL:$1|character|characters}} long.',
 'recentchangeslinked-toolbox' => 'Хамааржыр өскерлиишкиннер',
 'recentchangeslinked-title' => '«$1» деп арынга хамаарыштырган өскерлиишкиннер',
 'recentchangeslinked-page' => 'Арынның ады:',
+'recentchangeslinked-to' => 'Айыткан арынче шөлүп турар арыннарга өскерилгелерни көргүзер',
 
 # Upload
 'upload' => 'Файлды салыры',
@@ -739,12 +755,13 @@ It must not be more than $1 {{PLURAL:$1|character|characters}} long.',
 'filehist-current' => 'амгы',
 'filehist-datetime' => 'Ай, Хүн/Шак',
 'filehist-thumb' => 'Бичии чурумал',
-'filehist-thumbtext' => 'Бичии чурумал for version as of $1',
+'filehist-thumbtext' => '$1 хамааржыр хевириниң биче чурумалы (миниатюразы)',
 'filehist-user' => 'Ажыглакчы',
 'filehist-dimensions' => 'Хемчээлдери',
 'filehist-filesize' => 'Файл хемчээли',
 'filehist-comment' => 'Тайылбыр',
 'imagelinks' => 'Файлдың ажыглаашкыны',
+'nolinkstoimage' => 'Бердинген файлче шөлүп турар арыннар чок.',
 
 # File reversion
 'filerevert' => '$1 эгидип тургузары',
@@ -817,6 +834,7 @@ It must not be more than $1 {{PLURAL:$1|character|characters}} long.',
 'protectedpages' => 'Камгалаган арыннар',
 'listusers' => 'Ажыглакчылар даңзызы',
 'usereditcount' => '$1 {{PLURAL:$1|эдилге}}',
+'usercreated' => '$1 хүнде $2 {{GENDER:$3|бүрүткенип алган}}',
 'newpages' => 'Чаа арыннар',
 'newpages-username' => 'Ажыглакчының ады:',
 'ancientpages' => 'Эң эрги арыннар',
@@ -883,15 +901,15 @@ It must not be more than $1 {{PLURAL:$1|character|characters}} long.',
 
 # Watchlist
 'watchlist' => 'Мээң хайгаарал даңзым',
-'mywatchlist' => 'Мээң хайгаарал даңзым',
+'mywatchlist' => 'Хайгаарал даңзы',
 'watchlistfor2' => '$1, силерге $2',
-'nowatchlist' => 'Чүү-даа силерниң хайгаарал даңзызында чок.',
+'nowatchlist' => 'Силерниң хайгаарал даңзыңар куруг.',
 'watchnologin' => 'Кирбес',
 'watch' => 'Хайгаараары',
 'watchthispage' => 'Бо арынны хайгаараары',
 'unwatch' => 'Хайгааравас',
 'unwatchthispage' => 'Бо арынны хайгаарабас',
-'watchlist-details' => 'Not counting talk pages, хайгаарал даңзыңарда {{PLURAL:$1|$1 арын}} бар.',
+'watchlist-details' => 'Чугаалажылга арыннарын санаваска, хайгаарал даңзыңарда {{PLURAL:$1|$1 арын}} бар.',
 'wlshowlast' => 'Сөөлү $1 шак болгаш $2 хүн иштинде $3 көргүзери',
 'watchlist-options' => 'Хайгаарал даңзының эдиглери',
 
@@ -950,7 +968,7 @@ It must not be more than $1 {{PLURAL:$1|character|characters}} long.',
 # Contributions
 'contributions' => 'Ажыглакчыниң салыышкыннары',
 'contributions-title' => '«$1» деп ажыглакчының салыышкыннары',
-'mycontris' => 'Мээң салыышкыннарым',
+'mycontris' => 'Салыышкыннар',
 'contribsub2' => '$1 ($2)',
 'uctop' => '(баш)',
 'month' => 'Айдан:',
@@ -963,13 +981,15 @@ It must not be more than $1 {{PLURAL:$1|character|characters}} long.',
 'sp-contributions-talk' => 'чугаалажыры',
 'sp-contributions-search' => 'Салыышкыннарын дилээри',
 'sp-contributions-username' => 'ИП-адрес азы ажыглачының ады:',
+'sp-contributions-toponly' => 'Чазалгаларның чүгле сөөлгү хевирлерин көргүзер',
 'sp-contributions-submit' => 'Дилээри',
 
 # What links here
 'whatlinkshere' => 'Шөлүлгелерни бээр',
 'whatlinkshere-title' => '«$1» деп арынга шөлүтген арыннар',
 'whatlinkshere-page' => 'Арын:',
-'nolinkshere' => "'''[[:$1]]''' деп арынга шөлүтген арыннар чок.",
+'linkshere' => "Адаандагы арыннар бээр «'''[[:$1]]'''» шөлүдүп турарлар:",
+'nolinkshere' => "'''[[:$1]]''' деп арынче шөлүтткен арыннар чок.",
 'isredirect' => 'шиглидер арын',
 'istemplate' => 'киирткен арыннар',
 'isimage' => 'файлдың холбаазы',
@@ -979,7 +999,7 @@ It must not be more than $1 {{PLURAL:$1|character|characters}} long.',
 'whatlinkshere-hideredirs' => '$1-че шиглиглер',
 'whatlinkshere-hidetrans' => '$1 даңзылааннар',
 'whatlinkshere-hidelinks' => 'холбааларны $1',
-'whatlinkshere-hideimages' => 'Чурумалдың холбааларын $1',
+'whatlinkshere-hideimages' => 'Файлдың холбааларын $1',
 'whatlinkshere-filters' => 'Шүүрлер',
 
 # Block/unblock
@@ -1042,7 +1062,7 @@ It must not be more than $1 {{PLURAL:$1|character|characters}} long.',
 
 # Thumbnails
 'thumbnail-more' => 'Улгаттыр',
-'thumbnail_error' => 'Error creating бичии чурумал: $1',
+'thumbnail_error' => 'Биче чурумал (миниатюра) чаяарының алдаа: $1',
 
 # Special:Import
 'import-comment' => 'Тайылбыр:',
@@ -1091,13 +1111,16 @@ It must not be more than $1 {{PLURAL:$1|character|characters}} long.',
 'tooltip-ca-nstab-main' => 'Допчы арынын көөрү',
 'tooltip-ca-nstab-user' => 'Ажыглакчының арынын көөрү',
 'tooltip-ca-nstab-media' => 'Медиа арынын көөрү',
+'tooltip-ca-nstab-special' => 'Бо бөлгээт арын-дыр (служебная страница), ооң эдери болдунмас.',
 'tooltip-ca-nstab-project' => 'Төлевилелдиң арынын көөрү',
 'tooltip-ca-nstab-image' => 'Файлдың арынын көөрү',
 'tooltip-ca-nstab-template' => 'Майыкты көөрү',
 'tooltip-ca-nstab-help' => 'Дуза арынын көөрү',
 'tooltip-ca-nstab-category' => 'Бөлүктүң арынын көөрү',
+'tooltip-minoredit' => 'Бо өскертилгени "биче" деп демдеглээр',
 'tooltip-save' => 'Силерниң өскерлиишкиннериңерни шыгжаары',
 'tooltip-preview' => 'Шыгжаар мурнунда силерниң өскерлиишкиннерин чижеглеп көрем!',
+'tooltip-compareselectedversions' => 'Бо арынның шилиттинген ийи хевиринниң ылгалын көөр.',
 'tooltip-watch' => 'Силерниң хайгаарал даңзызынга бо арынны немерелээри',
 'tooltip-rollback' => 'Сөөлгү киржикчиниң өскерилгелерин чаңгыс баскаш, ойталаар',
 'tooltip-summary' => 'Кысказы-биле бижиңер',
@@ -1149,8 +1172,8 @@ It must not be more than $1 {{PLURAL:$1|character|characters}} long.',
 
 # Metadata
 'metadata' => 'Чурумал дугайында медээлер',
-'metadata-fields' => 'Чурумал дугайында медээлер listed in this message will be included on image page display when the metadata table is collapsed.
-Others will be hidden by default.
+'metadata-fields' => 'Бо даңзыда айыткан чурумалдар метаданныйларның кезектери чурумалдың арынынга көстүп кээр, метаданныйлар таблицазын дүрүп каан болур. 
+Арткан кезектер аайлаан ёзугаар чажыт көстүр.
 * make
 * model
 * datetimeoriginal
@@ -1187,7 +1210,7 @@ Others will be hidden by default.
 'exif-iimcategory-wea' => 'Агаар',
 
 # External editor support
-'edit-externally' => 'Бо файлды даштыки application-биле эдер',
+'edit-externally' => 'Бо файлды даштыкы капсырылга-биле эдер',
 
 # 'all' in various places, this might be different for inflected languages
 'watchlistall2' => 'шупту',
@@ -1233,6 +1256,9 @@ Others will be hidden by default.
 'watchlisttools-edit' => 'Хайгаарал даңзыны көөрү/эдери',
 'watchlisttools-raw' => 'Чиг хайгаарал даңзыны өскертири',
 
+# Core parser functions
+'duplicate-defaultsort' => 'Кичээнгейлиг! Үндезин сорттаашкын дүлгүүрү «$2» биеэги үндезин сорттаашкын дүлгүүрүн «$1» ажыр тодарадып турар.',
+
 # Special:Version
 'version' => 'Үндүрери',
 'version-specialpages' => 'Тускай арыннар',
@@ -1258,7 +1284,7 @@ Others will be hidden by default.
 'blankpage' => 'Куруг арын',
 
 # Special:Tags
-'tag-filter' => '[[Special:Tags|Tag]] шүүр:',
+'tag-filter' => '[[Special:Tags|демдек]] шүүрү:',
 'tag-filter-submit' => 'Шүүрү',
 'tags-title' => 'Демдеглелдер',
 'tags-edit' => 'өскертири',
@@ -1290,4 +1316,6 @@ Others will be hidden by default.
 'duration-decades' => '$1 {{PLURAL:$1|он хонук|он хонук}}',
 'duration-centuries' => '$1 {{PLURAL:$1|чүс чыл|чүс чыл}}',
 
+# Unknown messages
+'mytalk-parenthetical' => 'чугаалажыры',
 );
diff --git a/languages/messages/MessagesUk.php b/languages/messages/MessagesUk.php
index 303be98229..b538baf0a4 100644
--- a/languages/messages/MessagesUk.php
+++ b/languages/messages/MessagesUk.php
@@ -206,7 +206,6 @@ $magicWords = array(
 	'forcetoc'                  => array( '0', '__ОБОВ_ЗМІСТ__', '__ОБЯЗАТЕЛЬНОЕ_ОГЛАВЛЕНИЕ__', '__ОБЯЗ_ОГЛ__', '__FORCETOC__' ),
 	'toc'                       => array( '0', '__ЗМІСТ__', '__ОГЛАВЛЕНИЕ__', '__ОГЛ__', '__TOC__' ),
 	'noeditsection'             => array( '0', '__БЕЗ_РЕДАГУВ_РОЗДІЛУ__', '__БЕЗ_РЕДАКТИРОВАНИЯ_РАЗДЕЛА__', '__NOEDITSECTION__' ),
-	'noheader'                  => array( '0', '__БЕЗ_ЗАГОЛОВКУ__', '__БЕЗ_ЗАГОЛОВКА__', '__NOHEADER__' ),
 	'currentmonth'              => array( '1', 'ПОТОЧНИЙ_МІСЯЦЬ', 'ПОТОЧНИЙ_МІСЯЦЬ_2', 'ТЕКУЩИЙ_МЕСЯЦ', 'ТЕКУЩИЙ_МЕСЯЦ_2', 'CURRENTMONTH', 'CURRENTMONTH2' ),
 	'currentmonth1'             => array( '1', 'ПОТОЧНИЙ_МІСЯЦЬ_1', 'ТЕКУЩИЙ_МЕСЯЦ_1', 'CURRENTMONTH1' ),
 	'currentmonthname'          => array( '1', 'НАЗВА_ПОТОЧНОГО_МІСЯЦЯ', 'НАЗВАНИЕ_ТЕКУЩЕГО_МЕСЯЦА', 'CURRENTMONTHNAME' ),
@@ -305,7 +304,7 @@ $magicWords = array(
 	'revisionmonth1'            => array( '1', 'МІСЯЦЬ_ВЕРСІЇ_1', 'МЕСЯЦ_ВЕРСИИ_1', 'REVISIONMONTH1' ),
 	'revisionyear'              => array( '1', 'РІК_ВЕРСІЇ', 'ГОД_ВЕРСИИ', 'REVISIONYEAR' ),
 	'revisiontimestamp'         => array( '1', 'МІТКА_ЧАСУ_ВЕРСІЇ', 'ОТМЕТКА_ВРЕМЕНИ_ВЕРСИИ', 'REVISIONTIMESTAMP' ),
-	'revisionuser'              => array( '1', 'ВЕРСІЯ_КОРИСТУВАЧА', 'ВЕРСИЯ_УЧАСНИКА', 'REVISIONUSER' ),
+	'revisionuser'              => array( '1', 'ВЕРСІЯ_КОРИСТУВАЧА', 'ВЕРСИЯ_УЧАСНИКА', 'ВЕРСИЯ_УЧАСТНИКА', 'REVISIONUSER' ),
 	'plural'                    => array( '0', 'МНОЖИНА:', 'МНОЖЕСТВЕННОЕ_ЧИСЛО:', 'PLURAL:' ),
 	'fullurl'                   => array( '0', 'ПОВНА_АДРЕСА:', 'ПОЛНЫЙ_АДРЕС:', 'FULLURL:' ),
 	'fullurle'                  => array( '0', 'ПОВНА_АДРЕСА_2:', 'ПОЛНЫЙ_АДРЕС_2:', 'FULLURLE:' ),
@@ -401,7 +400,7 @@ $messages = array(
 
 'underline-always' => 'Завжди',
 'underline-never' => 'Ніколи',
-'underline-default' => 'Використати налаштування браузера',
+'underline-default' => 'Використовувати налаштування браузера',
 
 # Font style option in Special:Preferences
 'editfont-style' => 'Тип шрифту в полі редагування:',
@@ -488,8 +487,8 @@ $messages = array(
 'newwindow' => '(відкривається в новому вікні)',
 'cancel' => 'Скасувати',
 'moredotdotdot' => 'Детальніше…',
-'mypage' => 'Моя особиста сторінка',
-'mytalk' => 'Моя сторінка обговорення',
+'mypage' => 'Сторінка',
+'mytalk' => 'Обговорення',
 'anontalk' => 'Обговорення для цієї IP-адреси',
 'navigation' => 'Навігація',
 'and' => '&#32;і',
@@ -511,7 +510,7 @@ $messages = array(
 'vector-action-protect' => 'Захистити',
 'vector-action-undelete' => 'Відновити',
 'vector-action-unprotect' => 'Зміна захисту',
-'vector-simplesearch-preference' => 'Увімкнути розширені пошукові підказки (лише для оформлення "Векторне")',
+'vector-simplesearch-preference' => 'Увімкнути спрощене поле пошуку (лише для оформлення "Векторне")',
 'vector-view-create' => 'Створити',
 'vector-view-edit' => 'Редагувати',
 'vector-view-history' => 'Переглянути історію',
@@ -680,9 +679,9 @@ $1',
 'dberrortext' => 'Знайдено синтаксичну помилку в запиті до бази даних.
 Це може вказувати на помилку в програмному забезпеченні.
 Останній запит до бази даних:
-<blockquote><tt>$1</tt></blockquote>
-відбувся з функції "<tt>$2</tt>".
-База даних виявила помилку "<tt>$3: $4</tt>".',
+<blockquote><code>$1</code></blockquote>
+відбувся з функції "<code>$2</code>".
+База даних виявила помилку "<samp>$3: $4</samp>".',
 'dberrortextcl' => 'Знайдено синтаксичну помилку в запиті до бази даних.
 Останній запит до бази даних:
 «$1»
@@ -737,7 +736,7 @@ $1',
 'protectedpagetext' => 'Ця сторінка закрита для редагування.',
 'viewsourcetext' => 'Ви можете переглянути та скопіювати початковий текст цієї сторінки:',
 'viewyourtext' => "Ви можете переглянути та скопіювати текст '''ваших редагувань''' на цій сторінці:",
-'protectedinterface' => 'Ця сторінка є частиною інтерфейсу програмного забезпечення і її можуть редагувати лише адміністратори проекту.',
+'protectedinterface' => 'Ця сторінка є частиною інтерфейсу програмного забезпечення цієї вікі і її можуть редагувати лише адміністратори проекту. Щоб додати або змінити переклади для усіх вікі, відвідайте [//translatewiki.net/ translatewiki.net], проект локалізації MediaWiki.',
 'editinginterface' => "'''Увага:''' Ви редагуєте сторінку, що є частиною текстового інтерфейсу. Зміни цієї сторінки спричинять зміну інтерфейсу для інших користувачів. Для перекладу повідомлення використовуйте [//translatewiki.net/wiki/Main_Page?setlang=uk translatewiki.net] — проект, що займається локалізацією MediaWiki.",
 'sqlhidden' => '(SQL запит приховано)',
 'cascadeprotected' => 'Сторінка захищена від змін, оскільки її включено до {{PLURAL:$1|сторінки, для якої|наступних сторінок, для яких}} установлено каскадний захист: $2',
@@ -1136,6 +1135,15 @@ $2
 'edit-already-exists' => 'Неможливо створити нову сторінку.
 Вона вже існує.',
 'defaultmessagetext' => 'Текст «за замовчування»',
+'content-failed-to-parse' => 'Не вдалось проаналізувати $2 як тип $1: $3',
+'invalid-content-data' => 'Неприпустимі дані',
+'content-not-allowed-here' => 'Вміст «$1» недопустимий на сторінці [[$2]]',
+
+# Content models
+'content-model-wikitext' => 'вікітекст',
+'content-model-text' => 'звичайний текст',
+'content-model-javascript' => 'JavaScript',
+'content-model-css' => 'CSS',
 
 # Parser/template warnings
 'expensive-parserfunction-warning' => 'Увага: Ця сторінка містить дуже багато викликів ресурсомістких функцій.
@@ -1157,6 +1165,7 @@ $2
 'expansion-depth-exceeded-warning' => 'На сторінці перевищено межу глибини вкладеності',
 'parser-unstrip-loop-warning' => 'Виявлено незакритий тег (такий, як <pre>)',
 'parser-unstrip-recursion-limit' => 'Перевищено межу вкладеної рекурсії ($1) для парсера.',
+'converter-manual-rule-error' => 'Помилка в ручному правилі перетворення мови',
 
 # "Undo" feature
 'undo-success' => 'Редагування може бути скасовано.
@@ -1291,9 +1300,11 @@ $1",
 'revdelete-concurrent-change' => 'Помилка редагування запису від $2, $1: його стан змінений кимось іншим, поки ви робили свої зміни.
 Будь ласка, перевірте журнал.',
 'revdelete-only-restricted' => 'Помилка приховання запису від $2, $1: ви не можете приховати записи від перегляду адміністраторів без одночасного вибору однієї з інших опцій приховання.',
-'revdelete-reason-dropdown' => '* Типові причини вилучення
+'revdelete-reason-dropdown' => "* Типові причини вилучення
 ** Порушення авторських прав
-** Недоречна особиста інформація',
+** Недоречна особиста інформація
+** Невідповідне ім'я користувача
+** Потенційно наклепна інформація",
 'revdelete-otherreason' => 'Інша/додаткова причина:',
 'revdelete-reasonotherlist' => 'Інша причина',
 'revdelete-edit-reasonlist' => 'Редагувати причини вилучень',
@@ -1344,9 +1355,9 @@ $1",
 'editundo' => 'скасувати',
 'diff-multi' => '({{PLURAL:$1|Одна проміжна версія одного користувача не показана|$1 проміжні версії {{PLURAL:$2|одного користувача|$2 користувачів}} не показані|$1 проміжних версій {{PLURAL:$2|одного користувача|$2 користувачів}} не показані}})',
 'diff-multi-manyusers' => '({{PLURAL:$1|не показана $1 проміжна я версія|не показані $1 проміжні версії|не показано $1 проміжних версій}}, зроблених більш, ніж {{PLURAL:$2|$1 користувачем|$2 користувачами}})',
-'difference-missing-revision' => '{{PLURAL:$2|$2 версія|$2 версії|$2 версій}} ($1), охоплені цим порівнянням, {{PLURAL:$2|не знайдене|не знайдені}}.
+'difference-missing-revision' => '{{PLURAL:$2|$2 версія|$2 версії|$2 версій}} для цього порівняння ($1) не {{PLURAL:$2|знайдене|знайдені}}.
 
-Імовірно, Ви перейшли за застарілим посиланням на порівняння версій вилученої сторінки.
+Імовірно, ви перейшли за застарілим посиланням на порівняння версій вилученої сторінки.
 Подробиці можна дізнатися з [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} журналу вилучень].',
 
 # Search results
@@ -1423,7 +1434,7 @@ $1",
 # Preferences page
 'preferences' => 'Налаштування',
 'mypreferences' => 'Налаштування',
-'prefs-edits' => 'Кількість редагувань:',
+'prefs-edits' => 'Число редагувань:',
 'prefsnologin' => 'Ви не ввійшли в систему',
 'prefsnologintext' => 'Щоб змінити налаштування користувача, ви повинні <span class="plainlinks">[{{fullurl:{{#Special:UserLogin}}|returnto=$1}} ввійти до системи]</span>.',
 'changepassword' => 'Змінити пароль',
@@ -1659,6 +1670,9 @@ $1",
 'rightslogtext' => 'Це протокол зміни прав користувачів.',
 'rightslogentry' => 'змінив права доступу для користувача $1 з $2 на $3',
 'rightslogentry-autopromote' => 'був автоматично переведений з $2 до $3',
+'logentry-rights-rights' => '$1 {{GENDER:$1|змінив|змінила}} членство в групах для $3 із $4 на $5',
+'logentry-rights-rights-legacy' => '$1 {{GENDER:$1|змінив|змінила}} членство в групах для $3',
+'logentry-rights-autopromote' => '$1 було автоматично переведено із $4 в $5',
 'rightsnone' => '(нема)',
 
 # Associated actions - in the sentence "You do not have permission to X"
@@ -2060,7 +2074,7 @@ $1',
 'shared-repo' => 'спільного сховища',
 'shared-repo-name-wikimediacommons' => 'Вікісховища',
 'filepage.css' => '/* Розміщений тут CSS-код розміщений на сторінці опису файла, також і для іноземних користувачів вікі */',
-'upload-disallowed-here' => 'На жаль, Ви не можете перезаписати це зображення',
+'upload-disallowed-here' => 'Ви не можете перезаписати цей файл',
 
 # File reversion
 'filerevert' => 'Повернення до старої версії $1',
@@ -2140,7 +2154,9 @@ $1',
 
 'disambiguations' => 'Сторінки, що посилаються на сторінки неоднозначності.',
 'disambiguationspage' => 'Template:disambig',
-'disambiguations-text' => "Наступні сторінки посилаються на '''багатозначні сторінки'''. Однак вони, ймовірно, повинні вказувати на відповідну конкретну статтю.<br />Сторінка вважається багатозначною, якщо на ній розміщений шаблон, назва якого є на сторінці [[MediaWiki:Disambiguationspage]].",
+'disambiguations-text' => "Наступні сторінки посилаються на '''багатозначні сторінки'''. 
+Ймовірно, вони повинні вказувати на відповідну конкретну статтю.<br />
+Сторінка вважається багатозначною, якщо на ній розміщений шаблон, назва якого є на сторінці [[MediaWiki:Disambiguationspage]].",
 
 'doubleredirects' => 'Подвійні перенаправлення',
 'doubleredirectstext' => 'На цій сторінці наведено список перенаправлень на інші перенаправлення.
@@ -2294,8 +2310,8 @@ $1',
 'linksearch-ns' => 'Простір назв:',
 'linksearch-ok' => 'Знайти',
 'linksearch-text' => 'Можна використовувати підстановочні символи (шаблони), наприклад, "*.wikipedia.org".
-Необхідний домен якнайменше верхнього рівня, наприклад "*.org"<br />
-Підтримувані протоколи: <code>$1</code> (не додавайте жоден з них у вашому пошуку)',
+Необхідний домен принаймні верхнього рівня, наприклад "*.org"<br />
+Підтримувані протоколи: <code>$1</code> (за замовчуванням http:// якщо жоден протокол не вказано)',
 'linksearch-line' => 'Посилання на $1 із $2',
 'linksearch-error' => 'Підстановочні знаки можуть використовуватися лише на початку адрес.',
 
@@ -2343,11 +2359,11 @@ $1',
 'mailnologin' => 'Відсутня адреса для відправки',
 'mailnologintext' => 'Ви повинні [[Special:UserLogin|ввійти до системи]] і мати підтверджену адресу електронної пошти у ваших [[Special:Preferences|налаштуваннях]], щоб мати змогу надсилати електронну пошту іншим користувачам.',
 'emailuser' => 'Надіслати листа',
-'emailuser-title-target' => 'Надіслати електронного листа користувачеві',
+'emailuser-title-target' => 'Надіслати електронного листа {{GENDER:$1|користувачеві|користувачці}}',
 'emailuser-title-notarget' => 'Надіслати електронного листа користувачеві',
 'emailpage' => 'Лист користувачеві',
-'emailpagetext' => 'Заповнивши наведену нижче форму, можна надіслати повідомлення цьому користувачу.
-Електронна адреса, яку ви зазначили у [[Special:Preferences|своїх налаштуваннях]], буде зазначена в полі «Від кого» листа, тому одержувач матиме можливість відповісти безпосередньо вам.',
+'emailpagetext' => 'Заповнивши наведену нижче форму, можна надіслати повідомлення {{GENDER:$1|цьому користувачу|цій користувачці}}.
+Електронна адреса, яку Ви зазначили у [[Special:Preferences|своїх налаштуваннях]], буде зазначена в полі «Від кого» листа, тому одержувач матиме можливість відповісти безпосередньо вам.',
 'usermailererror' => 'При відправці повідомлення електронної пошти сталася помилка:',
 'defemailsubject' => '{{SITENAME}} - електронний лист від користувача " $1 "',
 'usermaildisabled' => 'Електронне листування між користувачами вимкнене',
@@ -2601,7 +2617,8 @@ $UNWATCHURL
 'undeletedrevisions' => '$1 {{PLURAL:$1|редагування|редагування|редагувань}} відновлено',
 'undeletedrevisions-files' => '$1 {{PLURAL:$1|версія|версії|версій}} та $2 {{PLURAL:$2|файл|файли|файлів}} відновлено',
 'undeletedfiles' => '$1 {{PLURAL:$1|файл|файли|файлів}} відновлено',
-'cannotundelete' => 'Не вдалося скасувати видалення, хтось інший вже міг відмінити видалення сторінки.',
+'cannotundelete' => 'Помилка відновлення:
+$1',
 'undeletedpage' => "'''Сторінка «$1» відновлена'''
 
 Див. [[Special:Log/delete|список вилучень]], щоб дізнатися про останні вилучення та відновлення.",
@@ -2634,7 +2651,7 @@ $1',
 # Contributions
 'contributions' => 'Внесок користувача',
 'contributions-title' => 'Внесок користувача $1',
-'mycontris' => 'Мій внесок',
+'mycontris' => 'Внесок',
 'contribsub2' => 'Внесок $1 ($2)',
 'nocontribs' => 'Редагувань, що задовольняють заданим умовам не знайдено.',
 'uctop' => ' (остання)',
@@ -2902,6 +2919,7 @@ $1',
 'immobile-target-namespace-iw' => 'Інтервікі-посилання не підходить для перейменування сторінки.',
 'immobile-source-page' => 'Цю сторінку не можна перейменувати.',
 'immobile-target-page' => 'Не можна присвоїти сторінці цю назву.',
+'bad-target-model' => 'Неможливо перетворити $1 на $2: несумісні моделі даних.',
 'imagenocrossnamespace' => 'Неможливо дати файлові назву з іншого простору назв',
 'nonfile-cannot-move-to-file' => 'Не можна перейменовувати сторінки з інших просторів назв на файли',
 'imagetypemismatch' => 'Нове розширення файлу не співпадає з його типом',
@@ -2980,6 +2998,7 @@ $1',
 'import-interwiki-templates' => 'Включити всі шаблони',
 'import-interwiki-submit' => 'Імпортувати',
 'import-interwiki-namespace' => 'Цільовий простір назв:',
+'import-interwiki-rootpage' => "Коренева сторінка (необов'язково):",
 'import-upload-filename' => 'Назва файлу:',
 'import-comment' => 'Примітка:',
 'importtext' => 'Будь ласка, експортуйте сторінку з іншої вікі, використовуючи [[Special:Export|засіб експорту]], збережіть файл, а потім завантажте його сюди.',
@@ -3011,6 +3030,9 @@ $1',
 'import-error-interwiki' => 'Сторінку "$1" не імпортовано, оскільки її назва зарезервована для зовнішніх посилань (interwiki).',
 'import-error-special' => 'Сторінку "$1" не імпортовано, оскільки вона належить до особливого простору імен, що не дозволяє створення сторінок.',
 'import-error-invalid' => 'Сторінку "$1" не імпортовано, оскільки його ім\'я неприпустиме.',
+'import-options-wrong' => '{{PLURAL:$2|Неправильна опція|Неправильні опції}}: <nowiki>$1</nowiki>',
+'import-rootpage-invalid' => 'Вказана некоректна назва кореневої сторінки',
+'import-rootpage-nosubpage' => 'В просторі назв вказаної кореневої сторінки «$1» заборонені підсторінки',
 
 # Import log
 'importlogpage' => 'Журнал імпорту',
@@ -3174,14 +3196,43 @@ The wiki server can't provide data in a format your client can read.",
 
 # Info page
 'pageinfo-title' => 'Інформація про " $1 "',
+'pageinfo-not-current' => 'Вибачте, неможливо переглянути цю інформацію для старих версій.',
+'pageinfo-header-basic' => 'Основна інформація',
 'pageinfo-header-edits' => 'Історія редагувань',
+'pageinfo-header-restrictions' => 'Захист сторінки',
+'pageinfo-header-properties' => 'Властивості сторінки',
+'pageinfo-display-title' => 'Заголовок для відображення',
+'pageinfo-default-sort' => 'Ключ сортування за замовчуванням',
+'pageinfo-length' => 'Довжина сторінки (в байтах)',
+'pageinfo-article-id' => 'ID сторінки',
+'pageinfo-language' => 'Мова вмісту сторінки',
+'pageinfo-robot-policy' => 'Індексація пошуковими системами',
+'pageinfo-robot-index' => 'Індексується',
+'pageinfo-robot-noindex' => 'Не індексується',
 'pageinfo-views' => 'Кількість переглядів',
 'pageinfo-watchers' => 'Кількість спостерігачів',
+'pageinfo-redirects-name' => 'Перенаправлення на цю сторінку',
+'pageinfo-subpages-name' => 'Підсторінки цієї сторінки',
+'pageinfo-subpages-value' => '$1($2 {{PLURAL:$2|перенаправлення|перенаправлення|перенаправлень}}; $3 {{PLURAL:$3|не-перенаправлення|не-перенаправлення|не-перенаправлень}})',
+'pageinfo-firstuser' => 'Створив сторінку',
 'pageinfo-firsttime' => 'Дата створення сторінки',
 'pageinfo-lastuser' => 'Останній редактор',
 'pageinfo-lasttime' => 'Дата останньої правки',
 'pageinfo-edits' => 'Загальна кількість редагувань',
 'pageinfo-authors' => 'Загальна кількість унікальних авторів',
+'pageinfo-recent-edits' => 'Кількість поточних редагувань в історії (протягом $1)',
+'pageinfo-recent-authors' => 'Кількість авторів за останній час',
+'pageinfo-magic-words' => '{{PLURAL:$1|Магічне слово|Магічні слова}} ($1)',
+'pageinfo-hidden-categories' => '{{PLURAL:$1|Прихована категорія|Приховані категорії}} ($1)',
+'pageinfo-templates' => 'Включено {{PLURAL:$1|шаблон|шаблонів}} ($1)',
+'pageinfo-toolboxlink' => 'Інформація про сторінку',
+'pageinfo-redirectsto' => 'Перенаправляє на',
+'pageinfo-redirectsto-info' => 'інформація',
+'pageinfo-contentpage' => 'Рахується як стаття',
+'pageinfo-contentpage-yes' => 'Так',
+'pageinfo-protect-cascading' => 'Звідси розпочинається каскадний захист',
+'pageinfo-protect-cascading-yes' => 'Так',
+'pageinfo-protect-cascading-from' => 'Каскадний захист починається тут',
 
 # Skin names
 'skinname-standard' => 'Стандартне',
@@ -3236,6 +3287,7 @@ $1',
 'file-info-size-pages' => '$1 × $2 пікселів, розмір файлу: $3, MIME-тип: $4, $5 {{PLURAL:$5|сторінка|сторінки|сторінок}}',
 'file-nohires' => 'Нема версії з більшою роздільністю.',
 'svg-long-desc' => 'SVG-файл, номінально $1 × $2 пікселів, розмір файлу: $3',
+'svg-long-desc-animated' => 'Анімований SVG-файл, номінально $1 × $2 {{PLURAL:$2|піксель|пікселі|пікселів}}, розмір файлу: $3',
 'show-big-image' => 'Повна роздільність',
 'show-big-image-preview' => 'Розмір при попередньому перегляді: $1.',
 'show-big-image-other' => '{{PLURAL:$2|Інша роздільність|Інші роздільності}}: $1.',
@@ -3245,6 +3297,8 @@ $1',
 'file-info-png-looped' => 'закільцьований',
 'file-info-png-repeat' => 'продемонстрований $1 {{PLURAL:$1|раз|рази|разів}}',
 'file-info-png-frames' => '$1 {{PLURAL:$1|кадр|кадри|кадрів}}',
+'file-no-thumb-animation' => "'''Примітка. Через технічні обмеження, мініатюри цього файлу не будуть анімованими.'''",
+'file-no-thumb-animation-gif' => "'''Примітка. Через технічні обмеження, мініатюри GIF-зображень високої роздільності, як це, не анімуються.'''",
 
 # Special:NewFiles
 'newimages' => 'Галерея нових файлів',
@@ -3855,6 +3909,7 @@ $5
 # Scary transclusion
 'scarytranscludedisabled' => '[«Interwiki transcluding» вимкнено]',
 'scarytranscludefailed' => '[Помилка звертання до шаблону $1]',
+'scarytranscludefailed-httpstatus' => '[Не вдалось завантажити шаблон для $1: HTTP $2]',
 'scarytranscludetoolong' => '[URL дуже довгий]',
 
 # Delete conflict
@@ -4042,6 +4097,7 @@ $5
 'version-license' => 'Ліцензія',
 'version-poweredby-credits' => "Ця Вікі працює на системі управління вмістом '''[//www.mediawiki.org/ MediaWiki]''', copyright © 2001-$1 $2.",
 'version-poweredby-others' => 'інші',
+'version-credits-summary' => 'Нам хотілося б відзначити наступних осіб, що зробили внесок у [[Special:Version|MediaWiki]].',
 'version-license-info' => 'MediaWiki є вільним програмним забезпеченням, ви можете розповсюджувати та/або модифікувати його відповідно до умов GNU General Public License, яка опублікованя фондом вільного програмного забезпечення; або версії 2 Ліцензії, або (на Ваш розсуд) будь-якої наступної версії. 
 
 MediaWiki поширюється в надії, що вона буде корисною, але БЕЗ БУДЬ-ЯКИХ ГАРАНТІЙ, навіть без неявної гарантії КОМЕРЦІЙНОЇ ПРИДАТНОСТІ чи ПРИДАТНОСТІ ДЛЯ ПЕВНОЇ МЕТИ. Дивіться GNU General Public License для більш докладної інформації. 
@@ -4156,7 +4212,7 @@ MediaWiki поширюється в надії, що вона буде кори
 'sqlite-no-fts' => '$1 без підтримки повнотекстового пошуку',
 
 # New logging system
-'logentry-delete-delete' => '$1 вилучив сторінку $3',
+'logentry-delete-delete' => '$1 {{GENDER:$2|вилучив|вилучила}} сторінку $3',
 'logentry-delete-restore' => '$1 відновив сторінку $3',
 'logentry-delete-event' => '$1 змінив видимість {{PLURAL:$5 запису журнала|$5 записів журналу}} на $3: $4',
 'logentry-delete-revision' => '$1 змінив видимість {{PLURAL:$5 версії|$5 версій}} на сторінці $3: $4',
diff --git a/languages/messages/MessagesUr.php b/languages/messages/MessagesUr.php
index 0dbd2cd328..d6cf1bffdd 100644
--- a/languages/messages/MessagesUr.php
+++ b/languages/messages/MessagesUr.php
@@ -14,6 +14,7 @@
  * @author O.bangash
  * @author Rachitrali
  * @author Reedy
+ * @author Tahir mq
  * @author Wisesabre
  * @author ZxxZxxZ
  * @author לערי ריינהארט
@@ -184,7 +185,6 @@ $messages = array(
 'qbbrowse' => 'تصفّح',
 'qbedit' => 'ترمیم',
 'qbpageoptions' => 'صفحۂ ہٰذا',
-'qbpageinfo' => 'مفہوم',
 'qbmyoptions' => 'میرے صفحات',
 'qbspecialpages' => 'خاص صفحات',
 'faq' => 'معلوماتِ عامہ',
@@ -195,6 +195,7 @@ $messages = array(
 'vector-action-delete' => 'حذف کرو',
 'vector-action-move' => 'منتقل کرو',
 'vector-action-protect' => 'محفوظ کرو',
+'vector-action-undelete' => 'بحال',
 'vector-action-unprotect' => 'تحفظ میں تبدیلی',
 'vector-view-create' => 'تخلیق',
 'vector-view-edit' => 'ترمیم',
@@ -215,6 +216,7 @@ $messages = array(
 'searcharticle' => 'چلو',
 'history' => 'تاریخچہ ء صفحہ',
 'history_short' => 'تاریخچہ',
+'updatedmarker' => 'میری آخری آمد تک جدید',
 'printableversion' => 'قابل طبع نسخہ',
 'permalink' => 'مستقل کڑی',
 'print' => 'طباعت',
@@ -233,7 +235,7 @@ $messages = array(
 'unprotectthispage' => 'اِسے صفحے کی تحفظ تبدیل کریں',
 'newpage' => 'نیا صفحہ',
 'talkpage' => 'اس صفحہ پر تبادلۂ خیال کریں',
-'talkpagelinktext' => 'گفتگو',
+'talkpagelinktext' => 'تبادلۂ خیال',
 'specialpage' => 'خصوصی صفحہ',
 'personaltools' => 'ذاتی اوزار',
 'postcomment' => 'اگلا حصّہ',
@@ -263,6 +265,7 @@ $messages = array(
 برائے مہربانی! صفحہ دیکھنے کیلئے دوبارہ کوشش کرنے سے پہلے ذرا انتظار فرمالیجئے.
 
 $1',
+'pool-errorunknown' => 'نامعلوم خطا',
 
 # All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
 'aboutsite' => 'کا تعارف {{SITENAME}}',
@@ -300,6 +303,7 @@ $1',
 'youhavenewmessages' => 'آپکے لیۓ ایک $1 ہے۔ ($2)',
 'newmessageslink' => 'نئے پیغامات',
 'newmessagesdifflink' => 'تـجـدیـد مـاقـبل آخـر سے فـرق',
+'newmessagesdifflinkplural' => 'آخری {{PLURAL:$1|تبدیلی|تبدیلیاں}}',
 'youhavenewmessagesmulti' => 'ء$1 پر آپ کیلئے نئے پیغامات ہیں',
 'editsection' => 'ترمیم',
 'editsection-brackets' => '[$1]',
@@ -311,6 +315,7 @@ $1',
 'toc' => 'فہرست',
 'showtoc' => 'دکھائیں',
 'hidetoc' => 'چھپائیں',
+'collapsible-expand' => 'توسیع',
 'thisisdeleted' => 'دیکھیں یا بحال کریں $1؟',
 'viewdeleted' => 'دیکھیں $1؟',
 'restorelink' => '{{PLURAL:$1|ایک ترمیم حذف ہوچکی|$1 ترامیم حذف ہوچکیں}}',
@@ -320,10 +325,12 @@ $1',
 'site-rss-feed' => '$1 آر.ایس.ایس فیڈ',
 'site-atom-feed' => '$1 اٹوم فیڈ',
 'page-rss-feed' => '"$1" آر.ایس.ایس فیڈ',
-'page-atom-feed' => '"$1" اٹوم فیڈ',
+'page-atom-feed' => '"$1" اٹوم خورد',
 'feed-atom' => 'اٹوم',
 'feed-rss' => 'آر ایس ایس',
 'red-link-title' => '$1 (صفحہ موجود نہیں)',
+'sort-descending' => 'ترتیب نزولی',
+'sort-ascending' => 'ترتیب صعودی',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main' => 'صفحہ',
@@ -389,6 +396,7 @@ Warning: Page may not contain recent updates.',
 'badarticleerror' => 'اس صفحہ پر یہ عمل انجام نہیں دیا جاسکتا۔',
 'cannotdelete' => 'صفحہ یا ملف $1 کو حذف نہیں کیا جاسکتا.
 ہوسکتا ہے کہ اسے پہلے ہی کسی نے حذف کردیا ہو.',
+'cannotdelete-title' => 'صفحہ ھذف نہیں کیا جا سکتا "$1"',
 'badtitle' => 'خراب عنوان',
 'badtitletext' => 'درخواست شدہ صفحہ کا عنوان ناقص، خالی، یا کوئی غلط ربط شدہ بین لسانی یا بین ویکی عنوان ہے.
 شاید اِس میں ایک یا زیادہ ایسے حروف موجود ہوں جو عنوانات میں استعمال نہیں ہوسکتے.',
@@ -409,6 +417,7 @@ Warning: Page may not contain recent updates.',
 'ns-specialprotected' => 'خاص صفحات کی تدوین نہیں کی جاسکتی.',
 'titleprotected' => 'اس عنوان کو [[User:$1|$1]] نے تخلیق سے محفوظ کیا ہے.
 وجہ یہ بتائی گئی ہے: "\'\'$2\'\'"',
+'exception-nologin' => 'غیر داخل نوشتہ',
 
 # Virus scanner
 'virus-badscanner' => "خراب وضعیت: انجان وائرسی مفراس: ''$1''",
@@ -426,6 +435,7 @@ Warning: Page may not contain recent updates.',
 'yourpasswordagain' => 'کلمۂ شناخت دوبارہ لکھیں',
 'remembermypassword' => 'اِس متصفح پر میرے داخلِ نوشتگی معلومات یاد رکھو (زیادہ سے زیادہ $1 {{PLURAL:$1|دِن|ایام}} کیلئے)',
 'yourdomainname' => 'آپکا ڈومین',
+'password-change-forbidden' => 'آپ اس ویکی پر پارلفظ (پاس روڈ) تبدیل نہیں کر سکتے',
 'externaldberror' => 'یا تو توثیقی ڈیٹابیس میں خطا واقع ہوئی اور یا آپ کو بیرونی کھاتہ بتاریخ کرنے کی اِجازت نہیں ہے.',
 'login' => 'داخل ہوں',
 'nav-login-createaccount' => 'کھاتہ کھولیں یا اندراج کریں',
@@ -511,6 +521,9 @@ Warning: Page may not contain recent updates.',
 دوبارہ کوشش کرنے سے پہلے انتظار فرمائیے.',
 'loginlanguagelabel' => 'زبان: $1',
 
+# E-mail sending
+'user-mail-no-addy' => 'برقی ڈاک بھیجنے کی کوشش بغیر برقی ڈاک پتہ',
+
 # Change password dialog
 'resetpass' => 'پارلفظ تبدیل کریں',
 'resetpass_announce' => 'آپ ایک برقی ارسال کردہ عارضی رمز کے ساتھ داخل ہوئے ہیں.
@@ -533,6 +546,15 @@ Warning: Page may not contain recent updates.',
 # Special:PasswordReset
 'passwordreset' => 'پارلفظ کی بازتعینی',
 'passwordreset-username' => 'اسمِ صارف:',
+'passwordreset-domain' => 'ساحہ:',
+'passwordreset-email' => 'برقی ڈاک پتہ:',
+
+# Special:ChangeEmail
+'changeemail-oldemail' => 'حالیہ برقی ڈاک پتہ:',
+'changeemail-newemail' => 'نیا برقی ڈاک پتہ:',
+'changeemail-none' => '(کوئی نہیں)',
+'changeemail-submit' => 'برقی ڈاک تبدیل کریں',
+'changeemail-cancel' => 'منسوخ',
 
 # Edit page toolbar
 'bold_sample' => 'دبیز متن',
@@ -606,7 +628,7 @@ $1 نے پابندی لگائی تھی.
 'noarticletext' => 'اِس صفحہ میں فی الحال کوئی متن موجود نہیں ہے.
 آپ دیگں صفحات میں [[Special:Search/{{PAGENAME}}|اِس صفحہ کے عنوان کیلئے تلاش کرسکتے ہیں]]، <span class="plainlinks">[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} متعلقہ نوشتہ جات تلاش کرسکتے ہیں],
 یا [{{fullurl:{{FULLPAGENAME}}|action=edit}} اِس صفحہ میں ترمیم کرسکتے ہیں]</span>',
-'noarticletext-nopermission' => 'اِس صفحہ میں فی الحال کوئی متن موجود نہیں ہے.
+'noarticletext-nopermission' => 'اس صفحہ میں فی الحال کوئی متن موجود نہیں ہے.
 آپ دیگں صفحات میں [[Special:Search/{{PAGENAME}}|اِس صفحہ کے عنوان کیلئے]] یا <span class="plainlinks">[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} متعلقہ نوشتہ جات تلاش کرسکتے ہیں]</span>',
 'updated' => '(اپ ڈیٹڈ)',
 'note' => "'''نوٹ:'''",
@@ -625,6 +647,7 @@ $1 نے پابندی لگائی تھی.
 \"محفوظ\" کا بٹن ٹک کرنے سے '''صرف''' بالائی متن محفوظ ہوگا.",
 'yourtext' => 'آپ کی تحریر',
 'storedversion' => 'ذخیرہ شدہ نظرثانی',
+'nonunicodebrowser' => '"انتباہ: آپ کا براؤزر یونی کوڈ کے مطابق نہیں ہے."',
 'editingold' => "'''انتباہ: آپ اس صفحے کا ایک پرانا مسودہ مرتب کررہے ہیں۔ اگر آپ اسے محفوظ کرتے ہیں تو اس صفحے کے اس پرانے مسودے سے اب تک کی جانے والی تمام تدوین ضائع ہو جاۓ گی۔'''",
 'yourdiff' => 'تضادات',
 'copyrightwarning' => "یہ یادآوری کرلیجیۓ کہ {{SITENAME}} میں تمام تحریری شراکت جی این یو آزاد مسوداتی اجازہ ($2)کے تحت تصور کی جاتی ہے (مزید تفصیل کیلیۓ $1 دیکھیۓ)۔ اگر آپ اس بات سے متفق نہیں کہ آپکی تحریر میں ترمیمات کری جائیں اور اسے آزادانہ (جیسے ضرورت ہو) استعمال کیا جاۓ تو براۓ کرم اپنی تصانیف یہاں داخل نہ کیجیۓ۔ اگر آپ یہاں اپنی تحریر جمع کراتے ہیں تو آپ اس بات کا بھی اقرار کر رہے ہیں کہ، اسے آپ نے خود تصنیف کیا ہے یا دائرہ ءعام (پبلک ڈومین) سے حاصل کیا ہے یا اس جیسے کسی اور آذاد وسیلہ سے۔'''بلااجازت ایسا کام داخل نہ کیجیۓ جسکا حق ِطبع و نشر محفوظ ہو!'''",
@@ -655,6 +678,10 @@ $1 نے پابندی لگائی تھی.
 'edit-already-exists' => 'نیا صفحہ تخلیق نہیں کیا جاسکتا.
 یہ پہلے سے موجود ہے.',
 
+# Content models
+'content-model-text' => 'سادہ متن',
+'content-model-javascript' => 'جاوا اسکرپٹ',
+
 # History pages
 'viewpagelogs' => 'اس صفحہ کیلیے نوشتہ جات دیکھیے',
 'nohistory' => 'اِس صفحہ کیلئے کوئی تدوینی تاریخچہ موجود نہیں ہے.',
@@ -749,6 +776,7 @@ $1",
 
 # Diffs
 'history-title' => '"$1" کا نظرثانی تاریخچہ',
+'difference-multipage' => '(فرق مابین صفحات)',
 'lineno' => 'لکیر $1:',
 'compareselectedversions' => 'منتخب متـن کا موازنہ',
 'editundo' => 'استرجع',
@@ -802,6 +830,7 @@ $1",
 'powersearch-ns' => 'جائے نام میں تلاش:',
 'powersearch-redir' => 'فہرستِ رجوع مکرر',
 'powersearch-field' => 'تلاش برائے',
+'powersearch-togglelabel' => 'جانچ',
 'powersearch-toggleall' => 'تمام',
 'powersearch-togglenone' => 'کوئی نہیں',
 'search-external' => 'بیرونی تلاش',
@@ -824,6 +853,7 @@ $1",
 'skin-preview' => 'پیش منظر',
 'datedefault' => 'کوئی ترجیحات نہیں',
 'prefs-datetime' => 'تاریخ و وقت',
+'prefs-user-pages' => 'صارف صفحات',
 'prefs-personal' => 'نمایۂ صارف',
 'prefs-rc' => 'حالیہ تبدیلیاں',
 'prefs-watchlist' => 'زیرِنظر فہرست',
@@ -843,6 +873,7 @@ $1",
 'rows' => 'صفیں:',
 'columns' => 'قطاریں:',
 'searchresultshead' => 'تلاش',
+'stub-threshold-disabled' => 'غیر فعال',
 'recentchangesdays' => 'حالیہ تبدیلیوں میں دکھائی جانے والے ایّام:',
 'recentchangesdays-max' => '(زیادہ سے زیادہ $1 {{PLURAL:$1|دن|ایام}})',
 'recentchangescount' => 'دکھائی جانے والی ترامیم کی تعداد:',
@@ -898,6 +929,11 @@ HTML tags جانچئے.',
 'prefs-i18n' => 'بین الاقوامیت',
 'prefs-signature' => 'دستخط',
 'prefs-dateformat' => 'شکلبندِ تاریخ',
+'prefs-advancedediting' => 'اعلی اختیارات',
+'prefs-advancedrc' => 'اعلی اختیارات',
+'prefs-advancedrendering' => 'اعلی اختیارات',
+'prefs-advancedsearchoptions' => 'اعلی اختیارات',
+'prefs-advancedwatchlist' => 'اعلی اختیارات',
 'prefs-diffs' => 'فروق',
 
 # User rights
@@ -941,6 +977,11 @@ HTML tags جانچئے.',
 'grouppage-bot' => '{{ns:project}}:روبہ جات',
 'grouppage-sysop' => '{{ns:project}}:منتظمین',
 
+# Rights
+'right-upload' => 'ملفات زبراثقال (اپ لوڈ) کریں',
+'right-delete' => 'صفحات حذف کریں',
+'right-sendemail' => 'دیگر صارفین کو برقی ڈاک بھیجیں',
+
 # User rights log
 'rightslog' => 'نوشتہ صارفی اختیارات',
 'rightslogtext' => 'یہ صارفی اختیارات میں تبدیلیوں کا نوشتہ ہے۔',
@@ -977,7 +1018,7 @@ HTML tags جانچئے.',
 'minoreditletter' => 'م',
 'newpageletter' => 'نیا ..',
 'boteditletter' => ' خودکار',
-'rc-enhanced-expand' => 'تفصیلات دِکھاؤ (JavaScript چاہئے)',
+'rc-enhanced-expand' => 'تفصیلات دِکھائیں (JavaScript درکار)',
 'rc-enhanced-hide' => 'تفصیلات چھپائیے',
 
 # Recent changes linked
@@ -1084,6 +1125,7 @@ HTML tags جانچئے.',
 # Miscellaneous special pages
 'nbytes' => '$1 {{PLURAL:$1|لکمہ|لکمہ جات}}',
 'ncategories' => '{{PLURAL:$1|زمرہ|زمرہ جات}} $1',
+'nmembers' => '{{PLURAL:$1|رکن|اراکین}}',
 'lonelypages' => 'يتيم صفحات',
 'lonelypagestext' => 'مندرجہ ذیل صفحات وہ صفحات ہیں جنھیں اس وکی میں موجود صفحوں سے کوئی ربط حاصل نہیں ہوپارہا۔',
 'uncategorizedpages' => 'بے زمرہ صفحات',
@@ -1260,11 +1302,13 @@ Also see [[Special:WantedCategories|wanted categories]].',
 'linkshere' => "'''[[:$1]]''' سے درج ذیل صفحات مربوط ہیں:",
 'nolinkshere' => "'''[[:$1]]''' سے کوئی روابط نہیں۔",
 'isredirect' => 'لوٹایا گیا صفحہ',
+'istemplate' => 'شامل شدہ',
 'isimage' => 'ربطِ ملف',
 'whatlinkshere-links' => 'روابط',
 'whatlinkshere-hideredirs' => 'رجوع مکررات $1',
+'whatlinkshere-hidetrans' => 'تضمینات',
 'whatlinkshere-hidelinks' => 'روابط $1',
-'whatlinkshere-hideimages' => 'روابطِ تصویر $1',
+'whatlinkshere-hideimages' => 'روابطِ تصاویر $1',
 'whatlinkshere-filters' => 'فلٹرذ',
 
 # Block/unblock
@@ -1342,7 +1386,7 @@ Also see [[Special:WantedCategories|wanted categories]].',
 'tooltip-pt-mytalk' => 'آپ کا صفحۂ گفتگو',
 'tooltip-pt-preferences' => 'آپ کی ترجیحات',
 'tooltip-pt-watchlist' => 'اُن صفحات کی فہرست جن کی تبدیلیاں آپ کی زیرِنظر ہیں',
-'tooltip-pt-mycontris' => 'آپ کے مساہمات کی فہرست',
+'tooltip-pt-mycontris' => 'آپ کی شراکت کی فہرست',
 'tooltip-pt-login' => 'آپ کیلئے داخلِ نوشتہ ہونا اچھا ہے؛ تاہم، یہ ضروری نہیں',
 'tooltip-pt-logout' => 'خارجِ نوشتہ ہوجائیں',
 'tooltip-ca-talk' => 'مضمون بارے تبادلۂ خیال',
@@ -1409,6 +1453,8 @@ Also see [[Special:WantedCategories|wanted categories]].',
 'nextdiff' => 'صفحہ کا نام:',
 
 # Media information
+'file-info-size' => '
+$1 × $2 عکصر (پکسلز)، حجم ملف: $3، MIME قسم: $4',
 'file-nohires' => 'اس سے بڑی تصمیم دستیاب نہیں۔',
 'show-big-image' => 'مکمل تصمیم',
 
diff --git a/languages/messages/MessagesUz.php b/languages/messages/MessagesUz.php
index e1f0178a3d..73f891ab25 100644
--- a/languages/messages/MessagesUz.php
+++ b/languages/messages/MessagesUz.php
@@ -167,7 +167,7 @@ $messages = array(
 'newwindow' => '(yangi oynada ochiladi)',
 'cancel' => 'Bekor qilish',
 'moredotdotdot' => 'Batafsil...',
-'mypage' => 'Shaxsiy sahifa',
+'mypage' => 'Sahifa',
 'mytalk' => 'Suhbatim',
 'anontalk' => 'Bu IP uchun suhbat',
 'navigation' => 'Saytda harakatlanish',
@@ -510,6 +510,7 @@ Agar bu sahifaga xatolik sabab kelgan bo'lsangiz brauzeringizning '''orqaga''' t
 'note' => "'''Izoh:'''",
 'previewnote' => "'''Bu shunchaki ko‘rib chiqish. O‘zgartirishlar hali saqlangani yo‘q!'''",
 'editing' => '$1 tahrirlanmoqda',
+'creating' => '«$1» sahifasini yaratish',
 'editingsection' => '$1 (boʻlim) tahrirlanmoqda',
 'copyrightwarning' => "Iltimos, {{SITENAME}}ga yuklangan har qanday axborot $2 ostida tarqatilishiga diqqat qiling (batafsil ma'lumot uchun $1ni ko'ring).
 Agar yozganlaringiz keyinchalik tahrir qilinishi va qayta tarqatilishiga rozi bo'lmasangiz, u holda bu yerga yozmang.<br />
@@ -1228,7 +1229,7 @@ Yaqinda sodir etilgan yoʻqotishlar uchun $2ni koʻring.',
 'whatlinkshere-hideredirs' => "$1 qayta yo'naltirishlar",
 'whatlinkshere-hidetrans' => '$1 kiritmalar',
 'whatlinkshere-hidelinks' => '$1 havolalar',
-'whatlinkshere-hideimages' => '$1 rasmlar uchun havolalar',
+'whatlinkshere-hideimages' => '$1 fayllar uchun havolalar',
 'whatlinkshere-filters' => 'Filtrlar',
 
 # Block/unblock
diff --git a/languages/messages/MessagesVec.php b/languages/messages/MessagesVec.php
index 607c442e88..966eabb33e 100644
--- a/languages/messages/MessagesVec.php
+++ b/languages/messages/MessagesVec.php
@@ -119,7 +119,6 @@ $specialPageAliases = array(
 	'Recentchanges'             => array( 'ÙltimiCanbiamenti' ),
 	'Recentchangeslinked'       => array( 'CanbiamentiLigà' ),
 	'Revisiondelete'            => array( 'ScancelaRevision' ),
-	'RevisionMove'              => array( 'SpostaRevision' ),
 	'Search'                    => array( 'Serca' ),
 	'Shortpages'                => array( 'PaginePiCurte' ),
 	'Specialpages'              => array( 'PagineSpeciali' ),
diff --git a/languages/messages/MessagesVi.php b/languages/messages/MessagesVi.php
index 5345d61b4d..a7654c3aeb 100644
--- a/languages/messages/MessagesVi.php
+++ b/languages/messages/MessagesVi.php
@@ -124,7 +124,6 @@ $specialPageAliases = array(
 	'Recentchanges'             => array( 'Thay_đổi_gần_đây' ),
 	'Recentchangeslinked'       => array( 'Thay_đổi_liên_quan' ),
 	'Revisiondelete'            => array( 'Xóa_phiên_bản' ),
-	'RevisionMove'              => array( 'Di_chuyển_phiên_bản' ),
 	'Search'                    => array( 'Tìm_kiếm' ),
 	'Shortpages'                => array( 'Trang_ngắn' ),
 	'Specialpages'              => array( 'Trang_đặc_biệt' ),
@@ -345,7 +344,7 @@ $messages = array(
 
 'underline-always' => 'Luôn luôn',
 'underline-never' => 'Không bao giờ',
-'underline-default' => 'Mặc định của trình duyệt',
+'underline-default' => 'Mặc định của hình dạng hoặc trình duyệt',
 
 # Font style option in Special:Preferences
 'editfont-style' => 'Kiểu phông chữ trong khung sửa đổi:',
@@ -430,8 +429,8 @@ $messages = array(
 'newwindow' => '(mở cửa sổ mới)',
 'cancel' => 'Hủy bỏ',
 'moredotdotdot' => 'Thêm nữa…',
-'mypage' => 'Trang của tôi',
-'mytalk' => 'Thảo luận với tôi',
+'mypage' => 'Trang cá nhân',
+'mytalk' => 'Thảo luận',
 'anontalk' => 'Thảo luận với IP này',
 'navigation' => 'Xem nhanh',
 'and' => '&#32;và',
@@ -977,7 +976,7 @@ Nó chưa được lưu!'''",
 'note' => "'''Ghi chú:'''",
 'previewnote' => "'''Đây chỉ mới là xem thử.'''
 Các thay đổi của bạn vẫn chưa được lưu!",
-'continue-editing' => 'Sửa tiếp',
+'continue-editing' => 'Đi đến hộp sửa đổi',
 'previewconflict' => 'Phần xem thử này là kết quả của văn bản trong vùng soạn thảo phía trên và nó sẽ xuất hiện như vậy nếu bạn chọn lưu trang.',
 'session_fail_preview' => "'''Những sửa đổi của bạn chưa được lưu giữ do mất dữ liệu về phiên làm việc.
 Xin hãy thử lần nữa.
@@ -1585,8 +1584,11 @@ Nếu bạn đồng ý cung cấp, nó sẽ dùng để ghi nhận công lao c
 # User rights log
 'rightslog' => 'Nhật trình cấp quyền thành viên',
 'rightslogtext' => 'Đây là nhật trình lưu những thay đổi đối với các quyền hạn thành viên.',
-'rightslogentry' => 'đã đổi cấp của thành viên $1 từ $2 thành $3',
+'rightslogentry' => 'đã đổi các nhóm liên kết của thành viên $1 từ $2 thành $3',
 'rightslogentry-autopromote' => 'được tự động phong cấp từ $2 đến $3',
+'logentry-rights-rights' => '$1 đã đổi các nhóm liên kết của $3 từ $4 đến $5',
+'logentry-rights-rights-legacy' => '$1 đã đổi các nhóm liên kết của $3',
+'logentry-rights-autopromote' => '$1 đã được tự động phong cấp từ $4 đến $5',
 'rightsnone' => '(không có)',
 
 # Associated actions - in the sentence "You do not have permission to X"
@@ -1977,7 +1979,7 @@ Có lẽ bạn muốn miêu tả nó trên [$2 trang miêu tả tập tin] tại
 'shared-repo-from' => 'tại $1',
 'shared-repo' => 'kho lưu trữ dùng chung',
 'filepage.css' => '/* Mã CSS tại đây sẽ ảnh hướng đến trang miêu tả tập tin, cũng như các wiki khách bên ngoài dựa trên wiki này */',
-'upload-disallowed-here' => 'Rất tiếc, bạn không có thể ghi đè lên hình ảnh này.',
+'upload-disallowed-here' => 'Bạn không có thể ghi đè lên tập tin này.',
 
 # File reversion
 'filerevert' => 'Lùi lại phiên bản của $1',
@@ -2211,7 +2213,7 @@ Xem thêm [[Special:WantedCategories|thể loại cần thiết]].',
 'linksearch-pat' => 'Mẫu liên kết:',
 'linksearch-ns' => 'Không gian tên:',
 'linksearch-ok' => 'Tìm kiếm',
-'linksearch-text' => "Bạn có thể sử dụng ký tự đại diện (''wildcard''), ví dụ “*.wikipedia.org”; ít nhất phải có tên miền cấp cao nhất, thí dụ “*.org”.<br />Các giao thức này được hỗ trợ: <code>$1</code>; vui lòng không đưa giao thức vào truy vấn.",
+'linksearch-text' => "Bạn có thể sử dụng ký tự đại diện (''wildcard''), ví dụ “*.wikipedia.org”; ít nhất phải có tên miền cấp cao nhất, thí dụ “*.org”.<br />Các giao thức này được hỗ trợ: <code>$1</code>; mặc định là <code>http://</code> nếu không định rõ giao thức trong truy vấn.",
 'linksearch-line' => '$1 được liên kết từ $2',
 'linksearch-error' => "Chỉ được sử dụng ký tự đại diện (''wildcard'') vào đầu tên miền (''hostname'').",
 
@@ -2260,7 +2262,7 @@ Có [[{{MediaWiki:Listgrouprights-helppage}}|thông tin thêm]] về từng nhó
 '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' => 'Mẫu dưới đây sẽ gửi một bức thư điện tử tới người dùng này.
+'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.
 Đị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.',
 'usermailererror' => 'Lỗi gửi thư:',
 'defemailsubject' => 'Thư của người dùng "$1" tại {{SITENAME}}',
@@ -2292,7 +2294,7 @@ Có [[{{MediaWiki:Listgrouprights-helppage}}|thông tin thêm]] về từng nhó
 
 # Watchlist
 'watchlist' => 'Trang tôi theo dõi',
-'mywatchlist' => 'Trang tôi theo dõi',
+'mywatchlist' => 'Trang theo dõi',
 'watchlistfor2' => 'Của $1 $2',
 'nowatchlist' => 'Danh sách theo dõi của bạn không có gì.',
 'watchlistanontext' => 'Xin hãy $1 để xem hay sửa đổi các trang được theo dõi.',
@@ -2551,7 +2553,7 @@ $1',
 # Contributions
 'contributions' => 'Đóng góp của thành viên',
 'contributions-title' => 'Đóng góp của thành viên $1',
-'mycontris' => 'Đóng góp của tôi',
+'mycontris' => 'Đóng góp',
 'contribsub2' => 'Của $1 ($2)',
 'nocontribs' => 'Không tìm thấy thay đổi nào khớp với yêu cầu.',
 'uctop' => '(mới nhất)',
@@ -2590,7 +2592,7 @@ $1',
 'whatlinkshere-hideredirs' => '$1 trang đổi hướng',
 'whatlinkshere-hidetrans' => '$1 trang nhúng',
 'whatlinkshere-hidelinks' => '$1 liên kết',
-'whatlinkshere-hideimages' => '$1 liên kết hình',
+'whatlinkshere-hideimages' => '$1 liên kết tập tin',
 'whatlinkshere-filters' => 'Bộ lọc',
 
 # Block/unblock
@@ -3084,7 +3086,7 @@ Lưu nó vào máy tính của bạn rồi tải nó lên đây.',
 
 # Info page
 'pageinfo-title' => 'Thông tin về “$1”',
-'pageinfo-not-current' => 'Thông tin được hiển thị có thể chỉ có liên quan đến phiên bản hiện hành.',
+'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',
 'pageinfo-header-edits' => 'Lịch sử sửa đổi',
 'pageinfo-header-restrictions' => 'Mức khóa trang',
@@ -3093,6 +3095,7 @@ Lưu nó vào máy tính của bạn rồi tải nó lên đây.',
 'pageinfo-default-sort' => 'Từ khóa sắp xếp mặc định',
 'pageinfo-length' => 'Chiều dài của trang (byte)',
 'pageinfo-article-id' => 'Mã số trang',
+'pageinfo-language' => 'Ngôn ngữ nội dung trang',
 'pageinfo-robot-policy' => 'Trạng thái công cụ tìm kiếm',
 'pageinfo-robot-index' => 'Có thể ghi chỉ mục',
 'pageinfo-robot-noindex' => 'Không thể ghi chỉ mục',
@@ -3114,6 +3117,13 @@ Lưu nó vào máy tính của bạn rồi tải nó lên đây.',
 'pageinfo-hidden-categories' => 'Thể loại ẩn ($1)',
 'pageinfo-templates' => 'Bản mẫu được nhúng ($1)',
 'pageinfo-toolboxlink' => 'Thông tin trang',
+'pageinfo-redirectsto' => 'Đổi hướng đến',
+'pageinfo-redirectsto-info' => 'thông tin',
+'pageinfo-contentpage' => 'Tính là một trang nội dung',
+'pageinfo-contentpage-yes' => 'Có',
+'pageinfo-protect-cascading' => 'Khóa theo tầng từ đây',
+'pageinfo-protect-cascading-yes' => 'Có',
+'pageinfo-protect-cascading-from' => 'Khóa theo tầng từ',
 
 # Skin names
 'skinname-standard' => 'Cổ điển',
@@ -3459,6 +3469,7 @@ Những thông tin khác mặc định sẽ được ẩn đi.
 'exif-compression-3' => 'CCITT Nhóm 3: mã hóa fax',
 'exif-compression-4' => 'CCITT Nhóm 4: mã hóa fax',
 'exif-compression-6' => 'JPEG (cũ)',
+'exif-compression-34712' => 'JPEG 2000',
 
 'exif-copyrighted-true' => 'Dưới bản quyền',
 'exif-copyrighted-false' => 'Phạm vi công cộng',
@@ -3917,6 +3928,7 @@ Bạn cũng có thể [[Special:EditWatchlist|dùng trang sửa đổi bình th
 'version-license' => 'Giấy phép bản quyền',
 'version-poweredby-credits' => "Wiki này chạy trên '''[//www.mediawiki.org/ MediaWiki]''', bản quyền © 2001–$1 $2.",
 'version-poweredby-others' => 'những người khác',
+'version-credits-summary' => 'Chúng tôi muốn công nhận những người sau đã đóng góp vào [[Special:Version|MediaWiki]].',
 'version-license-info' => "MediaWiki là phần mềm tự do; bạn được phép tái phân phối và/hoặc sửa đổi nó theo những điều khoản của Giấy phép Công cộng GNU do Quỹ Phần mềm Tự do xuất bản; phiên bản 2 hay bất kỳ phiên bản nào mới hơn nào của Giấy phép.
 
 MediaWiki được phân phối với hy vọng rằng nó sẽ hữu ích, nhưng '''không có bất kỳ một bảo đảm nào cả''', ngay cả những bảo đảm ngụ ý cho '''các mục đích thương mại''' hoặc cho '''một mục đích đặc biệt nào đó'''. Xem Giấy phép Công cộng GNU để biết thêm chi tiết.
diff --git a/languages/messages/MessagesWar.php b/languages/messages/MessagesWar.php
index f14bb4e52f..3100c9b889 100644
--- a/languages/messages/MessagesWar.php
+++ b/languages/messages/MessagesWar.php
@@ -457,7 +457,7 @@ An magdudurmara nga nagtrangka hini in naghatag hini nga eksplenasyon: "$3".',
 'exception-nologin-text' => 'Ini nga pakli o pagbuhat in nagkikinahanglan nga ikaw in mag-log-in ha dinhi nga wiki.',
 
 # Virus scanner
-'virus-scanfailed' => 'Nagpalya an pag-scan (kodigo $1)',
+'virus-scanfailed' => 'Pakyas an pag-scan (kodigo $1)',
 'virus-unknownscanner' => 'diri-nasasabtan nga antivirus:',
 
 # Login and logout pages
@@ -555,7 +555,7 @@ Ikaw in naglalog-in yana...',
 Temporaryo nga tigaman han pagsakob: $2',
 'passwordreset-emailsent' => 'Ginpadara hin usa ka pahinumdom nga e-mail.',
 'passwordreset-emailsent-capture' => 'Mayda pahinumdom nga ginpadangat ha im e-mail, kun diin ini in ginpapakita ha ubos.',
-'passwordreset-emailerror-capture' => 'Mayda pahinumdom nga e-mail han nahimo, kun diin ini in ginpapakita ha ubos, pero an pagpadangat ngada ha gumaramit in nagpalya: $1',
+'passwordreset-emailerror-capture' => 'Mayda pahinumdom nga e-mail han nahimo, kun diin ini in ginpapakita ha ubos, pero pakyas an pagpadangat ngada ha gumaramit: $1',
 
 # Special:ChangeEmail
 'changeemail' => 'Igliwan an e-mail address',
@@ -1469,7 +1469,7 @@ Kitaa an $2 para hin talaan han mga gibag-ohi nga mga ginpamara.',
 'undeletelink' => 'igpakita/igbalik',
 'undeleteviewlink' => 'kitaa',
 'undeletecomment' => 'Katadungan:',
-'cannotundelete' => 'Nagpalya an pabalik han pinara:
+'cannotundelete' => 'Pakyas an pagpabalik han pinara:
 $1',
 'undelete-search-title' => 'Pamiling hin mga ginpara nga mga pakli',
 'undelete-search-box' => 'Pamiling hin mga ginpara nga mga pakli',
@@ -2212,7 +2212,7 @@ An iba in daan nakatago.
 'feedback-subject' => 'Himangrawon:',
 'feedback-message' => 'Mensahe:',
 'feedback-cancel' => 'Pasagdi',
-'feedback-error2' => 'Sayop: Nagpalya an pagliwat',
+'feedback-error2' => 'Sayop: Pakyas an pagliwat',
 'feedback-close' => 'Human na.',
 
 # Search suggestions
diff --git a/languages/messages/MessagesWuu.php b/languages/messages/MessagesWuu.php
index 0b31e31e6c..24212b36b8 100644
--- a/languages/messages/MessagesWuu.php
+++ b/languages/messages/MessagesWuu.php
@@ -159,7 +159,6 @@ $messages = array(
 'qbbrowse' => '浏览',
 'qbedit' => '编辑',
 'qbpageoptions' => '迭只页面',
-'qbpageinfo' => '上下文',
 'qbmyoptions' => '我个选项',
 'qbspecialpages' => '特殊页面',
 'faq' => 'FAQs',
diff --git a/languages/messages/MessagesXal.php b/languages/messages/MessagesXal.php
index c5ef036878..1af4da66e4 100644
--- a/languages/messages/MessagesXal.php
+++ b/languages/messages/MessagesXal.php
@@ -199,7 +199,6 @@ $messages = array(
 'qbbrowse' => 'Гүүһәд хәләх',
 'qbedit' => 'Чиклх',
 'qbpageoptions' => 'Тер халх',
-'qbpageinfo' => 'Халхин туск',
 'qbmyoptions' => 'Тана халхс',
 'qbspecialpages' => 'Көдлхнә халхс',
 'faq' => 'Юм би',
diff --git a/languages/messages/MessagesXmf.php b/languages/messages/MessagesXmf.php
index ae6ff8ead5..d15992ae67 100644
--- a/languages/messages/MessagesXmf.php
+++ b/languages/messages/MessagesXmf.php
@@ -126,7 +126,6 @@ $messages = array(
 'qbfind' => 'დოგორი',
 'qbedit' => 'რედაქტირება',
 'qbpageoptions' => 'თე ხასჷლა',
-'qbpageinfo' => 'კონტექსტი',
 'qbmyoptions' => 'ჩქიმი ხასჷლეფი',
 'qbspecialpages' => 'გჷშაკერძაფილი ხასჷლეფი',
 'faq' => 'ბხშირი კითხვეფი',
diff --git a/languages/messages/MessagesYi.php b/languages/messages/MessagesYi.php
index 15a3e4161d..e68ad032c4 100644
--- a/languages/messages/MessagesYi.php
+++ b/languages/messages/MessagesYi.php
@@ -146,7 +146,6 @@ $magicWords = array(
 	'nogallery'                 => array( '0', '__קיין_גאלעריע__', '__ללא_גלריה__', '__NOGALLERY__' ),
 	'toc'                       => array( '0', '__אינהאלט__', '__תוכן_עניינים__', '__תוכן__', '__TOC__' ),
 	'noeditsection'             => array( '0', '__נישט_רעדאקטירן__', '__ללא_עריכה__', '__NOEDITSECTION__' ),
-	'noheader'                  => array( '0', '__קיינקעפל__', '__ללא_כותרת__', '__NOHEADER__' ),
 	'currentday'                => array( '1', 'לויפיקער_טאג', 'יום נוכחי', 'CURRENTDAY' ),
 	'numberofpages'             => array( '1', 'צאל_בלעטער', 'מספר דפים כולל', 'מספר דפים', 'NUMBEROFPAGES' ),
 	'numberofarticles'          => array( '1', 'צאל_ארטיקלען', 'מספר ערכים', 'NUMBEROFARTICLES' ),
@@ -318,7 +317,7 @@ $messages = array(
 'cancel' => 'זיי מבטל',
 'moredotdotdot' => 'נאך…',
 'mypage' => 'מײַן בלאט',
-'mytalk' => 'מײַן שמועס',
+'mytalk' => 'שמועס',
 'anontalk' => 'דאס רעדן פון דעם IP',
 'navigation' => 'נאַוויגאַציע',
 'and' => '&#32;און',
@@ -888,7 +887,7 @@ $2
 'note' => "'''באמערקונג:'''",
 'previewnote' => "'''געדענקט אז דאס איז נאָר אין אַ פֿאָרויסיקע ווייזונג.'''
 אייערע ענדערונגען זענען נאָך נישט געהיט!",
-'continue-editing' => 'רעדאקטירן ווײַטער',
+'continue-editing' => 'אריבער צום רעדאקטירן פֿעלד',
 'previewconflict' => 'די פֿאראויסיגע ווייזונג רעפלעקטירט דעם טעקסט און דער אויבערשטע טעקסט ענדערונג אָפטיילונג וויאזוי דאס וועט אויסזען אויב וועט איר דאס אָפהיטן.',
 'session_fail_preview' => "'''אנטשולדיגט! מען האט נישט געקענט פראצעסירן אייער ענדערונג צוליב א פארלוסט פון סעסיע דאטע. ביטע פרובירט נאכאמאל. אויב ס'ארבעט נאך אלס ניט, פרובירט [[Special:UserLogout|ארויסלאגירן]] און זיך צוריק אריינלאגירן.",
 'session_fail_preview_html' => "''''''אַנטשולדיקט! מיר קענען נישט פּראָצעסירן אײַער ענדערונג צוליב א פֿאַרלוסט פֿון סעסיע דאַטע.''''''
@@ -2070,8 +2069,8 @@ $1",
 'emailuser-title-target' => 'שיקן {{GENDER:$1|דעם באניצער|די באניצערין}} ע־פאסט',
 'emailuser-title-notarget' => 'שיקן א באניצער ע־פאסט',
 'emailpage' => 'שיקן ע-פאסט צו באַניצער',
-'emailpagetext' => 'איר קענט ניצן דעם פֿארעם אונטן צו שיקן אן בליצבריוו צו דעם דאזיגן באַניצער.
-דער ע-פאסט אדרעס וואס איר האט אריינגעלייגט אין [[Special:Preferences| אייערע באניצער פרעפערנעצן]] וועט זיך ווייזן כאילו דאס איז געקומען פון דארטן, בכדי צו דערמעגלעכן א תשובה.',
+'emailpagetext' => 'איר קענט ניצן די פֿארעם אונטן צו שיקן א בליצבריוו צו {{GENDER:$1|דעם דאזיגן באַניצער|דער דאזיגער באַניצערין}}.
+דער ע-פאסט אדרעס וואס איר האט אריינגעלייגט אין [[Special:Preferences| אייערע באַניצער פרעפערנעצן]] וועט זיך ווײַזן כאילו דאס איז געקומען פון דארטן, בכדי צו דערמעגלעכן א תשובה.',
 'usermailererror' => 'בליצבריוו האט צוריקגעשיקט א טעות:',
 'defemailsubject' => 'ע-פאסט פון באַניצער "$1" {{SITENAME}}',
 'usermaildisabled' => 'באַניצער ע־פאסט אומאַקטיוויזירט',
@@ -2103,7 +2102,7 @@ $1",
 
 # Watchlist
 'watchlist' => 'מיין אויפפַּאסונג ליסטע',
-'mywatchlist' => 'מיין אויפפַּאסונג ליסטע',
+'mywatchlist' => 'אויפפַּאסונג ליסטע',
 'watchlistfor2' => 'פֿאַר $1 $2',
 'nowatchlist' => 'איר האט נישט קיין שום בלעטער אין אייער אויפפַּאסונג ליסטע.',
 'watchlistanontext' => 'ביטע $1 כדי צו זען אדער ענדערן בלעטער אין אייער אַכטגעבן ליסטע.',
@@ -2353,7 +2352,7 @@ $1',
 # Contributions
 'contributions' => "באניצער'ס בײַשטײַערונגען",
 'contributions-title' => 'בײַשטײַערונגען פֿון באַניצער $1',
-'mycontris' => 'מײַנע בײַשטײַערונגען',
+'mycontris' => 'בײַשטײַערונגען',
 'contribsub2' => 'וועגן $1 ($2)',
 'nocontribs' => 'נישט געטראפן קיין ענדערונגען צוזאמעגעפאסט מיט די קריטעריעס.',
 'uctop' => '(לעצטע)',
@@ -2393,7 +2392,7 @@ $1',
 'whatlinkshere-hideredirs' => '$1 ווײַטערפֿירונגען',
 'whatlinkshere-hidetrans' => '$1 אַריבערשליסונגען',
 'whatlinkshere-hidelinks' => '$1 פֿאַרבינדונגען',
-'whatlinkshere-hideimages' => '$1 בילדער פֿאַרבינדונגען',
+'whatlinkshere-hideimages' => '$1 טעקע פֿאַרבינדונגען',
 'whatlinkshere-filters' => 'פֿילטערס',
 
 # Block/unblock
@@ -2863,6 +2862,7 @@ $1',
 
 # Info page
 'pageinfo-title' => 'אינפֿאָרמאַציע פֿאַר "$1"',
+'pageinfo-not-current' => 'קען ווייזן אינפארמאציע נאר פאר דער לויפיקער רעוויזיע.',
 'pageinfo-header-basic' => 'גרונטלעכע אינפֿארמאַציע',
 'pageinfo-header-edits' => '!רעדאַקטירן היסטאריע',
 'pageinfo-header-restrictions' => 'בלאט באַשיצונג',
@@ -2872,6 +2872,8 @@ $1',
 'pageinfo-length' => 'בלאט לענג (אין בייטן)',
 'pageinfo-article-id' => 'בלאט נומער',
 'pageinfo-robot-policy' => 'זוכמאשין סטאטוס',
+'pageinfo-robot-index' => 'אינדעקסירבאר',
+'pageinfo-robot-noindex' => 'נישט אינדעקסירבאר',
 'pageinfo-views' => 'צאַל קוקן',
 'pageinfo-watchers' => '!צאָל בלאט אויפֿפאַסער',
 'pageinfo-redirects-name' => 'ווײַטערפירונגען צו דעם בלאט',
@@ -3016,6 +3018,11 @@ $1',
 'exif-orientation' => 'אריענטאַציע',
 'exif-samplesperpixel' => 'צאל קאמאפאנענטן',
 'exif-planarconfiguration' => 'דאטן איינארדנונג',
+'exif-xresolution' => 'האריזאנטאלע רעזאלוציע',
+'exif-yresolution' => 'ווערטיקאלע רעזאלוציע',
+'exif-stripoffsets' => 'בילדדאטן פלאציר',
+'exif-rowsperstrip' => 'צאל שורות אין א שטרייף',
+'exif-stripbytecounts' => 'בייטן אין א קאמפרימירטן שטרייף',
 'exif-jpeginterchangeformatlength' => 'בייטן פון JPEG דאטן',
 'exif-datetime' => 'טעקע ענדערונג דאטע און צײַט',
 'exif-imagedescription' => 'בילד טיטל',
diff --git a/languages/messages/MessagesYue.php b/languages/messages/MessagesYue.php
index 528bbbee73..bbb69e19e7 100644
--- a/languages/messages/MessagesYue.php
+++ b/languages/messages/MessagesYue.php
@@ -157,7 +157,6 @@ $specialPageAliases = array(
 	'Recentchanges'             => array( '最近修改' ),
 	'Recentchangeslinked'       => array( '外鏈修改' ),
 	'Revisiondelete'            => array( '修訂版本刪除' ),
-	'RevisionMove'              => array( '修訂版本移動' ),
 	'Search'                    => array( '搜索' ),
 	'Shortpages'                => array( '短版' ),
 	'Specialpages'              => array( '特別頁' ),
diff --git a/languages/messages/MessagesZh_hans.php b/languages/messages/MessagesZh_hans.php
index 44bcc30f73..536ad49217 100644
--- a/languages/messages/MessagesZh_hans.php
+++ b/languages/messages/MessagesZh_hans.php
@@ -178,7 +178,6 @@ $specialPageAliases = array(
 	'Recentchanges'             => array( '最近更改' ),
 	'Recentchangeslinked'       => array( '链出更改' ),
 	'Revisiondelete'            => array( '删除或恢复修订' ),
-	'RevisionMove'              => array( '修订版本移动' ),
 	'Search'                    => array( '搜索' ),
 	'Shortpages'                => array( '短页面' ),
 	'Specialpages'              => array( '特殊页面' ),
@@ -233,7 +232,20 @@ $magicWords = array(
 	'numberofedits'             => array( '1', '编辑数', 'NUMBEROFEDITS' ),
 	'numberofviews'             => array( '1', '访问数', 'NUMBEROFVIEWS' ),
 	'pagename'                  => array( '1', '页面名', 'PAGENAME' ),
+	'pagenamee'                 => array( '1', '页面名E', 'PAGENAMEE' ),
+	'namespace'                 => array( '1', '名字空间', 'NAMESPACE' ),
+	'namespacee'                => array( '1', '名字空间E', 'NAMESPACEE' ),
+	'namespacenumber'           => array( '1', '名字空间编号', 'NAMESPACENUMBER' ),
+	'talkspace'                 => array( '1', '讨论名字空间', 'TALKSPACE' ),
+	'talkspacee'                => array( '1', '讨论名字空间E', 'TALKSPACEE' ),
 	'fullpagename'              => array( '1', '完整页面名', 'FULLPAGENAME' ),
+	'fullpagenamee'             => array( '1', '完整页面名E', 'FULLPAGENAMEE' ),
+	'subpagename'               => array( '1', '子页面名', 'SUBPAGENAME' ),
+	'subpagenamee'              => array( '1', '子页面名E', 'SUBPAGENAMEE' ),
+	'talkpagename'              => array( '1', '讨论页面名', 'TALKPAGENAME' ),
+	'talkpagenamee'             => array( '1', '讨论页面名E', 'TALKPAGENAMEE' ),
+	'subst'                     => array( '0', '替代:', 'SUBST:' ),
+	'safesubst'                 => array( '0', '安全替代:', 'SAFESUBST:' ),
 	'img_thumbnail'             => array( '1', '缩略图', 'thumbnail', 'thumb' ),
 	'img_manualthumb'           => array( '1', '缩略图=$1', 'thumbnail=$1', 'thumb=$1' ),
 	'img_right'                 => array( '1', '右', 'right' ),
@@ -241,14 +253,65 @@ $magicWords = array(
 	'img_none'                  => array( '1', '无', 'none' ),
 	'img_width'                 => array( '1', '$1像素', '$1px' ),
 	'img_center'                => array( '1', '居中', 'center', 'centre' ),
+	'img_framed'                => array( '1', '有框', 'framed', 'enframed', 'frame' ),
+	'img_frameless'             => array( '1', '无框', 'frameless' ),
 	'img_page'                  => array( '1', '页数=$1', '$1页', 'page=$1', 'page $1' ),
+	'img_border'                => array( '1', '有边', 'border' ),
 	'img_link'                  => array( '1', '链接=$1', 'link=$1' ),
 	'img_alt'                   => array( '1', '替代文本=$1', 'alt=$1' ),
+	'img_class'                 => array( '1', 'ç±»=$1', 'class=$1' ),
+	'int'                       => array( '0', '界面:', 'INT:' ),
+	'sitename'                  => array( '1', '站点名称', 'SITENAME' ),
+	'ns'                        => array( '0', '名字空间:', 'NS:' ),
+	'nse'                       => array( '0', '名字空间E:', 'NSE:' ),
+	'localurl'                  => array( '0', '本地URL:', 'LOCALURL:' ),
+	'localurle'                 => array( '0', '本地URLE:', 'LOCALURLE:' ),
+	'articlepath'               => array( '0', '条目路径', 'ARTICLEPATH' ),
+	'pageid'                    => array( '0', '页面ID', 'PAGEID' ),
+	'server'                    => array( '0', '服务器', 'SERVER' ),
+	'servername'                => array( '0', '服务器名', 'SERVERNAME' ),
+	'scriptpath'                => array( '0', '脚本路径', 'SCRIPTPATH' ),
+	'stylepath'                 => array( '0', '样式路径', 'STYLEPATH' ),
+	'grammar'                   => array( '0', '语法:', 'GRAMMAR:' ),
+	'gender'                    => array( '0', '性别:', 'GENDER:' ),
+	'notitleconvert'            => array( '0', '__不转换标题__', '__NOTITLECONVERT__', '__NOTC__' ),
+	'nocontentconvert'          => array( '0', '__不转换内容__', '__NOCONTENTCONVERT__', '__NOCC__' ),
+	'lcfirst'                   => array( '0', '小写首字:', 'LCFIRST:' ),
+	'ucfirst'                   => array( '0', '大写首字:', 'UCFIRST:' ),
+	'lc'                        => array( '0', '小写:', 'LC:' ),
+	'uc'                        => array( '0', '大写:', 'UC:' ),
+	'displaytitle'              => array( '1', '显示标题', 'DISPLAYTITLE' ),
 	'newsectionlink'            => array( '1', '__新段落链接__', '__NEWSECTIONLINK__' ),
 	'nonewsectionlink'          => array( '1', '__无新段落链接__', '__NONEWSECTIONLINK__' ),
+	'currentversion'            => array( '1', '当前版本', 'CURRENTVERSION' ),
+	'urlencode'                 => array( '0', 'URL编码:', 'URLENCODE:' ),
+	'anchorencode'              => array( '0', '锚编码', 'ANCHORENCODE' ),
+	'currenttimestamp'          => array( '1', '当前时间戳', 'CURRENTTIMESTAMP' ),
+	'localtimestamp'            => array( '1', '本地时间戳', 'LOCALTIMESTAMP' ),
+	'directionmark'             => array( '1', '方向标记', 'DIRECTIONMARK', 'DIRMARK' ),
 	'language'                  => array( '0', '#语言:', '#LANGUAGE:' ),
+	'contentlanguage'           => array( '1', '内容语言', 'CONTENTLANGUAGE', 'CONTENTLANG' ),
+	'pagesinnamespace'          => array( '1', '名字空间中页面数:', 'PAGESINNAMESPACE:', 'PAGESINNS:' ),
+	'numberofadmins'            => array( '1', '管理员数', 'NUMBEROFADMINS' ),
+	'formatnum'                 => array( '0', '格式化数字', 'FORMATNUM' ),
+	'padleft'                   => array( '0', '左填充', 'PADLEFT' ),
+	'padright'                  => array( '0', '右填充', 'PADRIGHT' ),
+	'special'                   => array( '0', '特殊', 'special' ),
+	'speciale'                  => array( '0', '特殊e', 'speciale' ),
+	'defaultsort'               => array( '1', '默认排序:', '默认排序关键字:', '默认分类排序:', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:' ),
+	'filepath'                  => array( '0', '文件路径:', 'FILEPATH:' ),
 	'tag'                       => array( '0', '标记', 'tag' ),
+	'hiddencat'                 => array( '1', '__隐藏分类__', '__HIDDENCAT__' ),
+	'pagesincategory'           => array( '1', '分类中页面数', 'PAGESINCATEGORY', 'PAGESINCAT' ),
 	'pagesize'                  => array( '1', '页面大小', 'PAGESIZE' ),
+	'index'                     => array( '1', '__索引__', '__INDEX__' ),
+	'noindex'                   => array( '1', '__不索引__', '__NOINDEX__' ),
+	'numberingroup'             => array( '1', '组中用户数', 'NUMBERINGROUP', 'NUMINGROUP' ),
+	'staticredirect'            => array( '1', '__静态重定向__', '__STATICREDIRECT__' ),
+	'protectionlevel'           => array( '1', '保护级别', 'PROTECTIONLEVEL' ),
+	'formatdate'                => array( '0', '格式化日期', '日期格式化', 'formatdate', 'dateformat' ),
+	'defaultsort_noerror'       => array( '0', '不报错', 'noerror' ),
+	'defaultsort_noreplace'     => array( '0', '不替换', 'noreplace' ),
 );
 
 $linkTrail = '/^()(.*)$/sD';
@@ -412,8 +475,8 @@ $messages = array(
 'newwindow' => '（将于新窗口中打开）',
 'cancel' => '取消',
 'moredotdotdot' => '更多',
-'mypage' => '我的页面',
-'mytalk' => '我的讨论',
+'mypage' => '页面',
+'mytalk' => '讨论页',
 'anontalk' => '该IP地址的讨论',
 'navigation' => '导航',
 'and' => '和',
@@ -595,12 +658,12 @@ $1',
 # General errors
 'error' => '错误',
 'databaseerror' => '数据库错误',
-'dberrortext' => '发生资料库查询语法错误。
-可能是由于软体自身的错误所引起。
-最后一次资料库查询指令是:
+'dberrortext' => '发生数据库查询语法错误。
+可能是由于软件自身的错误所引起。
+最后一次数据库查询指令是：
 <blockquote><code>$1</code></blockquote>
-来自于函数 "<code>$2</code>"。
-数据库返回错误 "<samp>$3: $4</samp>"。',
+来自于函数“<code>$2</code>”。
+数据库返回错误“<samp>$3: $4</samp>”。',
 'dberrortextcl' => '发生了数据库查询语法错误。最后一次数据库查询指令是：
 “$1”
 来自函数“$2”内。数据库返回错误“$3: $4”。',
@@ -927,7 +990,7 @@ $2
 'updated' => '（已更新）',
 'note' => "'''注意：'''",
 'previewnote' => "'''请记住这仅为预览。'''您的更改还未保存！",
-'continue-editing' => '继续编辑',
+'continue-editing' => '往编辑框',
 'previewconflict' => '这个预览显示了上面文字编辑区中的内容。它将在你选择保存后出现。',
 'session_fail_preview' => "'''抱歉！由于会话数据丢失，我们不能处理你的编辑。'''请重试。如果再次失败，请尝试[[Special:UserLogout|退出]]后重新登录。",
 'session_fail_preview_html' => "'''抱歉！我们不能处理你在进程数据丢失时的编辑。'''
@@ -1002,6 +1065,15 @@ $2
 'edit-already-exists' => '不可以建立一个新页面。
 它已经存在。',
 'defaultmessagetext' => '默认消息文本',
+'content-failed-to-parse' => '未能将 $2 内容转换为 $1：$3',
+'invalid-content-data' => '无效的内容数据',
+'content-not-allowed-here' => '[[$2]]页面上不允许“$1”内容',
+
+# Content models
+'content-model-wikitext' => 'wiki语法',
+'content-model-text' => '纯文本',
+'content-model-javascript' => 'JavaScript',
+'content-model-css' => 'CSS',
 
 # Parser/template warnings
 'expensive-parserfunction-warning' => '警告：这个页面有太多高昂的语法功能调用。
@@ -1270,7 +1342,7 @@ $1",
 
 # Preferences page
 'preferences' => '系统设置',
-'mypreferences' => '我的设置',
+'mypreferences' => '参数设置',
 'prefs-edits' => '编辑数量：',
 'prefsnologin' => '尚未登录',
 'prefsnologintext' => '您必须先<span class="plainlinks">[{{fullurl:{{#Special:UserLogin}}|returnto=$1}} 登录]</span>才能设置个人参数。',
@@ -2415,7 +2487,7 @@ $1',
 # Contributions
 'contributions' => '用户贡献',
 'contributions-title' => '$1的用户贡献',
-'mycontris' => '我的贡献',
+'mycontris' => '贡献记录',
 'contribsub2' => '$1的贡献（$2）',
 'nocontribs' => '没有找到符合特征的更改。',
 'uctop' => '（最后更改）',
@@ -2456,7 +2528,7 @@ $1',
 'whatlinkshere-hideredirs' => '$1重定向',
 'whatlinkshere-hidetrans' => '$1包含',
 'whatlinkshere-hidelinks' => '$1链接',
-'whatlinkshere-hideimages' => '$1文件链接',
+'whatlinkshere-hideimages' => '$1个文件链接',
 'whatlinkshere-filters' => '过滤器',
 
 # Block/unblock
@@ -2938,6 +3010,7 @@ $1被封禁的理由是：“$2”',
 
 # Info page
 'pageinfo-title' => '“$1”的信息',
+'pageinfo-not-current' => '只能显示当前修订版本的信息。',
 'pageinfo-header-basic' => '基本信息',
 'pageinfo-header-edits' => '编辑历史',
 'pageinfo-header-restrictions' => '页面保护',
@@ -2946,6 +3019,7 @@ $1被封禁的理由是：“$2”',
 'pageinfo-default-sort' => '默认排序键',
 'pageinfo-length' => '页面长度（字节）',
 'pageinfo-article-id' => '页面ID',
+'pageinfo-language' => '页面内容语言',
 'pageinfo-robot-policy' => '搜索引擎状态',
 'pageinfo-robot-index' => '可索引',
 'pageinfo-robot-noindex' => '不可索引',
@@ -2966,6 +3040,12 @@ $1被封禁的理由是：“$2”',
 'pageinfo-hidden-categories' => '隐藏分类（$1）',
 'pageinfo-templates' => '使用的模板（$1）',
 'pageinfo-toolboxlink' => '页面信息',
+'pageinfo-redirectsto' => '重定向到',
+'pageinfo-redirectsto-info' => '信息',
+'pageinfo-contentpage' => '计算为内容页',
+'pageinfo-contentpage-yes' => '是',
+'pageinfo-protect-cascading' => '从这里开始连锁保护',
+'pageinfo-protect-cascading-yes' => '是',
 
 # Skin names
 'skinname-standard' => '标准',
@@ -3563,6 +3643,7 @@ $5
 # Scary transclusion
 'scarytranscludedisabled' => '[跨网站的编码转换不可用]',
 'scarytranscludefailed' => '[提取$1失败]',
+'scarytranscludefailed-httpstatus' => '[模板$1读取失败：HTTP $2]',
 'scarytranscludetoolong' => '[URL过长]',
 
 # Delete conflict
@@ -3678,6 +3759,7 @@ $5
 'version-license' => '授权协议',
 'version-poweredby-credits' => "本Wiki由'''[//www.mediawiki.org/ MediaWiki]'''驱动，版权所有 © 2001-$1 $2。",
 'version-poweredby-others' => '其他',
+'version-credits-summary' => '我们感谢下列人士为[[Special:Version|MediaWiki]]作出的贡献。',
 'version-license-info' => 'MediaWiki为自由软件；您可依据自由软件基金会所发表的GNU通用公共授权条款规定，就本程序再为发布与／或修改；无论您依据的是本授权的第二版或（您自行选择的）任一日后发行的版本。
 
 MediaWiki是基于使用目的而加以发布，然而不负任何担保责任；亦无对适售性或特定目的适用性所为的默示性担保。详情请参照GNU通用公共授权。
diff --git a/languages/messages/MessagesZh_hant.php b/languages/messages/MessagesZh_hant.php
index a6194f8e8b..6b4df4ad44 100644
--- a/languages/messages/MessagesZh_hant.php
+++ b/languages/messages/MessagesZh_hant.php
@@ -170,7 +170,6 @@ $specialPageAliases = array(
 	'Recentchanges'             => array( '最近更改' ),
 	'Recentchangeslinked'       => array( '鏈出更改' ),
 	'Revisiondelete'            => array( '刪除或恢復版本' ),
-	'RevisionMove'              => array( '版本移動' ),
 	'Search'                    => array( '搜索' ),
 	'Shortpages'                => array( '短頁面' ),
 	'Specialpages'              => array( '特殊頁面' ),
@@ -259,7 +258,7 @@ $messages = array(
 
 'underline-always' => '總是使用',
 'underline-never' => '從不使用',
-'underline-default' => '瀏覽器預設',
+'underline-default' => '外觀或瀏覽器預設',
 
 # Font style option in Special:Preferences
 'editfont-style' => '編輯區字型樣式：',
@@ -344,8 +343,8 @@ $messages = array(
 'newwindow' => '（以新視窗開啟）',
 'cancel' => '取消',
 'moredotdotdot' => '更多...',
-'mypage' => '我的頁面',
-'mytalk' => '我的對話頁',
+'mypage' => '頁面',
+'mytalk' => '對話頁',
 'anontalk' => '該IP的對話頁',
 'navigation' => '導覽',
 'and' => '和',
@@ -531,10 +530,10 @@ $1',
 'databaseerror' => '資料庫錯誤',
 'dberrortext' => '發生資料庫查詢語法錯誤。
 可能是由於軟體自身的錯誤所引起。
-最後一次資料庫查詢指令是:
+最後一次資料庫查詢指令是：
 <blockquote><code>$1</code></blockquote>
-來自於函數 "<code>$2</code>"。
-數據庫返回錯誤 "<samp>$3: $4</samp>"。',
+來自於函數“<code>$2</code>”。
+資料庫返回錯誤“<samp>$3: $4</samp>”。',
 'dberrortextcl' => '發生資料庫查詢語法錯誤。
 最後一次的資料庫查詢是:
 「$1」
@@ -883,7 +882,7 @@ $2
 'updated' => '（已更新）',
 'note' => "'''注意:'''",
 'previewnote' => "'''請記住這只是預覽，內容尚未儲存！'''",
-'continue-editing' => '繼續編輯',
+'continue-editing' => '往編輯框',
 'previewconflict' => '這個預覽顯示了上面文字編輯區中的內容。它將在{{GENDER:|你|妳|你}}選擇保存後出現。',
 'session_fail_preview' => "'''很抱歉！由於部份資料遺失，我們無法處理您的編輯。'''
 請再試一次。
@@ -969,6 +968,7 @@ $2
 'content-not-allowed-here' => '[[$2]]不允許"$1"頁上的內容',
 
 # Content models
+'content-model-wikitext' => 'wiki語法',
 'content-model-text' => '純文字',
 'content-model-javascript' => 'JavaScript',
 'content-model-css' => 'CSS',
@@ -1242,7 +1242,7 @@ $1",
 
 # Preferences page
 'preferences' => '偏好設定',
-'mypreferences' => '我的偏好設定',
+'mypreferences' => '偏好設定',
 'prefs-edits' => '編輯數量：',
 'prefsnologin' => '還未登入',
 'prefsnologintext' => '您必須先<span class="plainlinks">[{{fullurl:{{#Special:UserLogin}}|returnto=$1}} 登入]</span>才能設置個人參數。',
@@ -1473,6 +1473,9 @@ $1",
 'rightslogtext' => '以下記錄了用戶權限的更改記錄。',
 'rightslogentry' => '將 $1 的權限從 $2 改為 $3',
 'rightslogentry-autopromote' => '自動由$2晉升至$3',
+'logentry-rights-rights' => '$1將$3的權限從$4改為$5',
+'logentry-rights-rights-legacy' => '$1更改$3的權限',
+'logentry-rights-autopromote' => '$1的權限自動從$4改為$5',
 'rightsnone' => '無',
 
 # Associated actions - in the sentence "You do not have permission to X"
@@ -2080,8 +2083,8 @@ Template:消除歧義',
 'linksearch-pat' => '搜尋網址:',
 'linksearch-ns' => '名字空間：',
 'linksearch-ok' => '搜尋',
-'linksearch-text' => '製作可以使用類似“*.wikipedia.org”的通配符。必須至少是頂級域名，例如“*.org”。<br />
-支持的協議：<code>$1</code>（不要包含在搜索中）。',
+'linksearch-text' => '可使用通配符，如“*.wikipedia.org”。至少需要一個頂級域名，例如“*.org”。<br />
+支持的協議：<code>$1</code>（若沒有指定協議，預設為http://）。',
 'linksearch-line' => '$1 連自 $2',
 'linksearch-error' => '萬用字元僅可在主機名稱的開頭使用。',
 
@@ -2132,7 +2135,7 @@ Template:消除歧義',
 'emailuser-title-target' => '電郵這位{{GENDER:$1|用戶}}',
 'emailuser-title-notarget' => 'E-mail用戶',
 'emailpage' => 'E-mail用戶',
-'emailpagetext' => '您可以用下面的表格去寄一封電郵給這位用戶。
+'emailpagetext' => '您可以用下面的表格去寄一封電郵給這位{{Gender:$1|用戶}}。
 您在[[Special:Preferences|您的參數設置]]中所輸入的電子郵件地址將出現在郵件「發件人」一欄中，這樣該用戶就可以回覆您。',
 'usermailererror' => '目標郵件地址返回錯誤：',
 'defemailsubject' => '{{SITENAME}}來自用戶“$1”的電子郵件',
@@ -2164,7 +2167,7 @@ Template:消除歧義',
 
 # Watchlist
 'watchlist' => '監視列表',
-'mywatchlist' => '我的監視列表',
+'mywatchlist' => '監視列表',
 'watchlistfor2' => '$1的監視列表 $2',
 'nowatchlist' => '您的監視列表為空。',
 'watchlistanontext' => '請$1以檢視或編輯您的監視列表。',
@@ -2418,7 +2421,7 @@ $1',
 # Contributions
 'contributions' => '用戶貢獻',
 'contributions-title' => '$1的用戶貢獻',
-'mycontris' => '我的貢獻',
+'mycontris' => '貢獻',
 'contribsub2' => '$1的貢獻 （$2）',
 'nocontribs' => '沒有找到符合特徵的更改。',
 'uctop' => '（最新修改）',
@@ -2951,7 +2954,7 @@ $1被封禁的理由是“$2”',
 
 # Info page
 'pageinfo-title' => '“$1”的信息',
-'pageinfo-not-current' => '資訊可能只顯示在當前的修訂版本。',
+'pageinfo-not-current' => '抱歉，無法提供之前修訂版本的資訊。',
 'pageinfo-header-basic' => '基本資料',
 'pageinfo-header-edits' => '編輯歷史',
 'pageinfo-header-restrictions' => '保護頁面',
@@ -2960,6 +2963,7 @@ $1被封禁的理由是“$2”',
 'pageinfo-default-sort' => '預設排序字：',
 'pageinfo-length' => '頁面長度 （以位元組為單位）',
 'pageinfo-article-id' => '頁面編號',
+'pageinfo-language' => '頁面內容語言',
 'pageinfo-robot-policy' => '搜尋引擎狀態',
 'pageinfo-robot-index' => '可索引',
 'pageinfo-robot-noindex' => '不可索引',
@@ -2974,7 +2978,7 @@ $1被封禁的理由是“$2”',
 'pageinfo-lasttime' => '最新編輯日期',
 'pageinfo-edits' => '編輯總次數',
 'pageinfo-authors' => '作者總數',
-'pageinfo-recent-edits' => '最近編輯次數 (過去 $1 內)',
+'pageinfo-recent-edits' => '最近編輯次數 (過去$1內)',
 'pageinfo-recent-authors' => '最近作者數目',
 'pageinfo-magic-words' => '魔術{{PLURAL:$1|字|字}}（$1）',
 'pageinfo-hidden-categories' => '隱藏{{PLURAL:$1|分類|分類}}（$1）',
@@ -3698,6 +3702,7 @@ $5
 'version-license' => '授權',
 'version-poweredby-credits' => "這個 Wiki 由 '''[//www.mediawiki.org/ MediaWiki]''' 驅動，版權所有 © 2001-$1 $2。",
 'version-poweredby-others' => '其他',
+'version-credits-summary' => '我們感謝以下人士為[[Special:Version|MediaWiki]]作出的貢獻。',
 'version-license-info' => 'MediaWiki為自由軟件；您可依據自由軟件基金會所發表的GNU通用公共授權條款規定，就本程式再為發佈與／或修改；無論您依據的是本授權的第二版或（您自行選擇的）任一日後發行的版本。
 
 MediaWiki是基於使用目的而加以發佈，然而不負任何擔保責任；亦無對適售性或特定目的適用性所為的默示性擔保。詳情請參照GNU通用公共授權。
diff --git a/languages/messages/MessagesZh_hk.php b/languages/messages/MessagesZh_hk.php
index 91be2ec6f5..dc28646bd6 100644
--- a/languages/messages/MessagesZh_hk.php
+++ b/languages/messages/MessagesZh_hk.php
@@ -24,7 +24,6 @@ $fallback8bitEncoding = 'Big5-HKSCS';
 
 $specialPageAliases = array(
 	'ComparePages'              => array( '頁面比較' ),
-	'RevisionMove'              => array( '移動版本' ),
 	'Unblock'                   => array( '解除封禁' ),
 );
 
diff --git a/languages/messages/MessagesZh_tw.php b/languages/messages/MessagesZh_tw.php
index 1fbc4344f9..7d984604b2 100644
--- a/languages/messages/MessagesZh_tw.php
+++ b/languages/messages/MessagesZh_tw.php
@@ -25,6 +25,20 @@
 
 $fallback = 'zh-hant, zh-hans';
 
+$namespaceNames = array(
+	NS_USER             => '使用者',
+	NS_USER_TALK        => '使用者討論',
+	NS_HELP             => '使用說明',
+	NS_HELP_TALK        => '使用說明討論',
+);
+
+$namespaceAliases = array(
+	'Image' => NS_FILE,
+	'Image_talk' => NS_FILE_TALK,
+	"圖片" => NS_FILE,
+	"圖片討論" => NS_FILE_TALK,
+);
+
 $specialPageAliases = array(
 	'Ancientpages'              => array( '最舊頁面' ),
 	'Block'                     => array( '查封用戶' ),
@@ -46,20 +60,6 @@ $specialPageAliases = array(
 	'Withoutinterwiki'          => array( '沒有跨語言鏈接的頁面' ),
 );
 
-$namespaceNames = array(
-	NS_USER             => '使用者',
-	NS_USER_TALK        => '使用者討論',
-	NS_HELP             => '使用說明',
-	NS_HELP_TALK        => '使用說明討論',
-);
-
-$namespaceAliases = array(
-	'Image' => NS_FILE,
-	'Image_talk' => NS_FILE_TALK,
-	"圖片" => NS_FILE,
-	"圖片討論" => NS_FILE_TALK,
-);
-
 $datePreferences = array(
 	'default',
 	'minguo',
diff --git a/maintenance/archives/patch-config.sql b/maintenance/archives/patch-config.sql
deleted file mode 100644
index 791015e92b..0000000000
--- a/maintenance/archives/patch-config.sql
+++ /dev/null
@@ -1,9 +0,0 @@
--- Table for holding configuration changes
-CREATE TABLE /*_*/config (
-  -- Config var name
-  cf_name varbinary(255) NOT NULL PRIMARY KEY,
-  -- Config var value
-  cf_value blob NOT NULL
-) /*$wgDBTableOptions*/;
--- Should cover *most* configuration - strings, ints, bools, etc.
-CREATE INDEX /*i*/cf_name_value ON /*_*/config (cf_name,cf_value(255));
diff --git a/maintenance/archives/patch-uploadstash.sql b/maintenance/archives/patch-uploadstash.sql
index 556d6b2877..14eaeab082 100644
--- a/maintenance/archives/patch-uploadstash.sql
+++ b/maintenance/archives/patch-uploadstash.sql
@@ -33,7 +33,7 @@ CREATE TABLE /*_*/uploadstash (
 	us_sha1 varchar(31) NOT NULL,
 	us_mime varchar(255),
 	-- Media type as defined by the MEDIATYPE_xxx constants, should duplicate definition in the image table
-  	us_media_type ENUM("UNKNOWN", "BITMAP", "DRAWING", "AUDIO", "VIDEO", "MULTIMEDIA", "OFFICE", "TEXT", "EXECUTABLE", "ARCHIVE") default NULL,
+	us_media_type ENUM("UNKNOWN", "BITMAP", "DRAWING", "AUDIO", "VIDEO", "MULTIMEDIA", "OFFICE", "TEXT", "EXECUTABLE", "ARCHIVE") default NULL,
 	-- image-specific properties
 	us_image_width int unsigned,
 	us_image_height int unsigned,
diff --git a/maintenance/ibm_db2/tables.sql b/maintenance/ibm_db2/tables.sql
index 6fd7a831e2..2edb7f0178 100644
--- a/maintenance/ibm_db2/tables.sql
+++ b/maintenance/ibm_db2/tables.sql
@@ -927,13 +927,3 @@ CREATE TABLE user_former_groups (
 );
 CREATE UNIQUE INDEX ufg_user_group
   ON user_former_groups (ufg_user, ufg_group);
-
-
-
--- Table for holding configuration changes
-CREATE TABLE config (
-  cf_name   VARCHAR(255) NOT NULL
-    PRIMARY KEY,
-  cf_value  CLOB(64K) INLINE LENGTH 4096 NOT NULL
-);
-
diff --git a/maintenance/importImages.php b/maintenance/importImages.php
index a8cd2ff959..d94b948576 100644
--- a/maintenance/importImages.php
+++ b/maintenance/importImages.php
@@ -326,7 +326,7 @@ USAGE: php importImages.php [options] <dir>
 <dir> : Path to the directory containing images to be imported
 
 Options:
---extensions=<exts>	Comma-separated list of allowable extensions, defaults to \$wgFileExtensions
+--extensions=<exts>     Comma-separated list of allowable extensions, defaults to \$wgFileExtensions
 --overwrite             Overwrite existing images with the same name (default is to skip them)
 --limit=<num>           Limit the number of images to process. Ignored or skipped images are not counted.
 --from=<name>           Ignore all files until the one with the given name. Useful for resuming
diff --git a/maintenance/language/messageTypes.inc b/maintenance/language/messageTypes.inc
index ce1dbb9b5b..d22070f446 100644
--- a/maintenance/language/messageTypes.inc
+++ b/maintenance/language/messageTypes.inc
@@ -467,6 +467,7 @@ $wgOptionalMessages = array(
 	'backlinksubtitle',
 	'prefs-registration-date-time',
 	'prefs-memberingroups-type',
+	'userrights-groupsmember-type',
 	'shared-repo-name-wikimediacommons',
 	'usermessage-template',
 	'filepage.css',
diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index 08a7e264e1..eee979946e 100644
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -137,18 +137,6 @@ $wgMessageStructure = array(
 		'nov',
 		'dec',
 	),
-	'pretty-timestamps' => array(
-		'monday-at',
-		'tuesday-at',
-		'wednesday-at',
-		'thursday-at',
-		'friday-at',
-		'saturday-at',
-		'sunday-at',
-		'today-at',
-		'yesterday-at',
-		'just-now',
-	),
 	'categorypages' => array(
 		'pagecategories',
 		'pagecategorieslink',
@@ -1099,6 +1087,7 @@ $wgMessageStructure = array(
 		'saveusergroups',
 		'userrights-groupsmember',
 		'userrights-groupsmember-auto',
+		'userrights-groupsmember-type',
 		'userrights-groups-help',
 		'userrights-reason',
 		'userrights-no-interwiki',
@@ -1202,6 +1191,9 @@ $wgMessageStructure = array(
 		'rightslogtext',
 		'rightslogentry',
 		'rightslogentry-autopromote',
+		'logentry-rights-rights',
+		'logentry-rights-rights-legacy',
+		'logentry-rights-autopromote',
 		'rightsnone',
 	),
 	'action' => array(
@@ -2693,6 +2685,7 @@ $wgMessageStructure = array(
 		'pageinfo-default-sort',
 		'pageinfo-length',
 		'pageinfo-article-id',
+		'pageinfo-language',
 		'pageinfo-robot-policy',
 		'pageinfo-robot-index',
 		'pageinfo-robot-noindex',
@@ -3581,6 +3574,7 @@ $wgMessageStructure = array(
 		'version-license',
 		'version-poweredby-credits',
 		'version-poweredby-others',
+		'version-credits-summary',
 		'version-license-info',
 		'version-software',
 		'version-software-product',
diff --git a/maintenance/nextJobDB.php b/maintenance/nextJobDB.php
index e66e981bb6..875b93d5b4 100644
--- a/maintenance/nextJobDB.php
+++ b/maintenance/nextJobDB.php
@@ -38,21 +38,31 @@ class nextJobDB extends Maintenance {
 
 	public function execute() {
 		global $wgMemc;
+
 		$type = $this->getOption( 'type', false );
 
-		$memcKey = 'jobqueue:dbs:v2';
-		$pendingDBs = $wgMemc->get( $memcKey );
+		$memcKey = 'jobqueue:dbs:v3';
+		$pendingDbInfo = $wgMemc->get( $memcKey );
 
 		// If the cache entry wasn't present, or in 1% of cases otherwise,
-		// regenerate the cache.
-		if ( !$pendingDBs || mt_rand( 0, 100 ) == 0 ) {
-			$pendingDBs = $this->getPendingDbs();
-			$wgMemc->set( $memcKey, $pendingDBs, 300 );
+		// regenerate the cache. Use any available stale cache if another
+		// process is currently regenerating the pending DB information.
+		if ( !$pendingDbInfo || mt_rand( 0, 100 ) == 0 ) {
+			$lock = $wgMemc->add( 'jobqueue:dbs:v3:lock', 1, 1800 ); // lock
+			if ( $lock ) {
+				$pendingDbInfo = array(
+					'pendingDBs' => $this->getPendingDbs(),
+					'timestamp'  => time()
+				);
+				$wgMemc->set( $memcKey, $pendingDbInfo );
+				$wgMemc->delete( 'jobqueue:dbs:v3:lock' ); // unlock
+			}
 		}
 
-		if ( !$pendingDBs ) {
-			return;
+		if ( !$pendingDbInfo || !$pendingDbInfo['pendingDBs'] ) {
+			return; // no DBs with jobs or cache is both empty and locked
 		}
+		$pendingDBs = $pendingDbInfo['pendingDBs'];
 
 		do {
 			$again = false;
@@ -97,18 +107,17 @@ class nextJobDB extends Maintenance {
 	 * @return bool
 	 */
 	function checkJob( $type, $dbName ) {
-		$lb = wfGetLB( $dbName );
-		$db = $lb->getConnection( DB_MASTER, array(), $dbName );
+		$group = JobQueueGroup::singleton( $dbName );
 		if ( $type === false ) {
-			$conds = Job::defaultQueueConditions( );
+			foreach ( $group->getDefaultQueueTypes() as $type ) {
+				if ( !$group->get( $type )->isEmpty() ) {
+					return true;
+				}
+			}
+			return false;
 		} else {
-			$conds = array( 'job_cmd' => $type );
+			return !$group->get( $type )->isEmpty();
 		}
-
-
-		$exists = (bool) $db->selectField( 'job', '1', $conds, __METHOD__ );
-		$lb->reuseConnection( $db );
-		return $exists;
 	}
 
 	/**
@@ -117,42 +126,15 @@ class nextJobDB extends Maintenance {
 	 */
 	private function getPendingDbs() {
 		global $wgLocalDatabases;
-		$pendingDBs = array();
-		# Cross-reference DBs by master DB server
-		$dbsByMaster = array();
-		foreach ( $wgLocalDatabases as $db ) {
-			$lb = wfGetLB( $db );
-			$dbsByMaster[$lb->getServerName( 0 )][] = $db;
-		}
 
-		foreach ( $dbsByMaster as $dbs ) {
-			$dbConn = wfGetDB( DB_MASTER, array(), $dbs[0] );
-
-			# Padding row for MySQL bug
-			$pad = str_repeat( '-', 40 );
-			$sql = "(SELECT '$pad' as db, '$pad' as job_cmd)";
-			foreach ( $dbs as $wikiId ) {
-				if ( $sql != '' ) {
-					$sql .= ' UNION ';
-				}
-
-				list( $dbName, $tablePrefix ) = wfSplitWikiID( $wikiId );
-				$dbConn->tablePrefix( $tablePrefix );
-				$jobTable = $dbConn->tableName( 'job' );
-
-				$sql .= "(SELECT DISTINCT '$wikiId' as db, job_cmd FROM $dbName.$jobTable GROUP BY job_cmd)";
-			}
-			$res = $dbConn->query( $sql, __METHOD__ );
-			$first = true;
-			foreach ( $res as $row ) {
-				if ( $first ) {
-					// discard padding row
-					$first = false;
-					continue;
-				}
-				$pendingDBs[$row->job_cmd][] = $row->db;
+		$pendingDBs = array(); // (job type => (db list))
+		foreach ( $wgLocalDatabases as $db ) {
+			$types = JobQueueGroup::singleton( $db )->getQueuesWithJobs();
+			foreach ( $types as $type ) {
+				$pendingDBs[$type][] = $db;
 			}
 		}
+
 		return $pendingDBs;
 	}
 }
diff --git a/maintenance/oracle/archives/patch-config.sql b/maintenance/oracle/archives/patch-config.sql
deleted file mode 100644
index 66714a73ea..0000000000
--- a/maintenance/oracle/archives/patch-config.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-define mw_prefix='{$wgDBprefix}';
-
-CREATE TABLE &mw_prefix.config (
-  cf_name VARCHAR2(255) NOT NULL,
-  cf_value blob NOT NULL
-);
-ALTER TABLE &mw_prefix.config ADD CONSTRAINT &mw_prefix.config_pk PRIMARY KEY (cf_name);
-
diff --git a/maintenance/oracle/tables.sql b/maintenance/oracle/tables.sql
index d0712e3de3..f28c61fe94 100644
--- a/maintenance/oracle/tables.sql
+++ b/maintenance/oracle/tables.sql
@@ -670,13 +670,6 @@ CREATE TABLE &mw_prefix.module_deps (
 );
 CREATE UNIQUE INDEX &mw_prefix.module_deps_u01 ON &mw_prefix.module_deps (md_module, md_skin);
 
-CREATE TABLE &mw_prefix.config (
-  cf_name VARCHAR2(255) NOT NULL,
-  cf_value blob NOT NULL
-);
-ALTER TABLE &mw_prefix.config ADD CONSTRAINT &mw_prefix.config_pk PRIMARY KEY (cf_name);
--- leaving index out for now ...
-
 -- do not prefix this table as it breaks parserTests
 CREATE TABLE wiki_field_info_full (
 table_name VARCHAR2(35) NOT NULL,
diff --git a/maintenance/populateFilearchiveSha1.php b/maintenance/populateFilearchiveSha1.php
index e9baef9aa0..6c57fde622 100644
--- a/maintenance/populateFilearchiveSha1.php
+++ b/maintenance/populateFilearchiveSha1.php
@@ -49,7 +49,7 @@ class PopulateFilearchiveSha1 extends LoggedUpdateMaintenance {
 		$table = 'filearchive';
 		$conds = array( 'fa_sha1' => '', 'fa_storage_key IS NOT NULL' );
 		$this->output( "Populating fa_sha1 field from fa_storage_key\n" );
-		$endId = $dbw->selectField( $table, 'MAX(fa_id)', false, __METHOD__ );
+		$endId = $dbw->selectField( $table, 'MAX(fa_id)', false, __METHOD__ );
 
 		$batchSize = $this->mBatchSize;
 		$done = 0;
@@ -65,6 +65,10 @@ class PopulateFilearchiveSha1 extends LoggedUpdateMaintenance {
 
 			$i = 0;
 			foreach ( $res as $row ) {
+				if ( $row->fa_storage_key == '' ) {
+					// Revision was missing pre-deletion
+					continue;
+				}
 				$sha1 = LocalRepo::getHashFromKey( $row->fa_storage_key );
 				$dbw->update( $table,
 					array( 'fa_sha1' => $sha1 ),
diff --git a/maintenance/postgres/archives/patch-config.sql b/maintenance/postgres/archives/patch-config.sql
deleted file mode 100644
index 2f39ff050a..0000000000
--- a/maintenance/postgres/archives/patch-config.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-CREATE TABLE config (
-  cf_name   TEXT  NOT NULL  PRIMARY KEY,
-  cf_value  TEXT  NOT NULL
-);
-CREATE INDEX cf_name_value ON config (cf_name, cf_value);
\ No newline at end of file
diff --git a/maintenance/postgres/tables.sql b/maintenance/postgres/tables.sql
index ec28716e60..845193da30 100644
--- a/maintenance/postgres/tables.sql
+++ b/maintenance/postgres/tables.sql
@@ -523,13 +523,19 @@ CREATE INDEX ls_log_id ON log_search (ls_log_id);
 
 CREATE SEQUENCE job_job_id_seq;
 CREATE TABLE job (
-  job_id         INTEGER   NOT NULL  PRIMARY KEY DEFAULT nextval('job_job_id_seq'),
-  job_cmd        TEXT      NOT NULL,
-  job_namespace  SMALLINT  NOT NULL,
-  job_title      TEXT      NOT NULL,
-  job_timestamp  TIMESTAMPTZ,
-  job_params     TEXT      NOT NULL
-);
+  job_id              INTEGER   NOT NULL  PRIMARY KEY DEFAULT nextval('job_job_id_seq'),
+  job_cmd             TEXT      NOT NULL,
+  job_namespace       SMALLINT  NOT NULL,
+  job_title           TEXT      NOT NULL,
+  job_timestamp       TIMESTAMPTZ,
+  job_params          TEXT      NOT NULL,
+  job_random          INTEGER   NOT NULL DEFAULT 0,
+  job_token           TEXT      NOT NULL DEFAULT '',
+  job_token_timestamp TIMESTAMPTZ,
+  job_sha1            TEXT NOT NULL DEFAULT ''
+);
+CREATE INDEX job_sha1 ON job (job_sha1);
+CREATE INDEX job_cmd_token ON job (job_cmd, job_token, job_random);
 CREATE INDEX job_cmd_namespace_title ON job (job_cmd, job_namespace, job_title);
 CREATE INDEX job_timestamp_idx ON job (job_timestamp);
 
@@ -691,9 +697,3 @@ CREATE TABLE module_deps (
   md_deps    TEXT  NOT NULL
 );
 CREATE UNIQUE INDEX md_module_skin ON module_deps (md_module, md_skin);
-
-CREATE TABLE config (
-  cf_name   TEXT  NOT NULL  PRIMARY KEY,
-  cf_value  TEXT  NOT NULL
-);
-CREATE INDEX cf_name_value ON config (cf_name, cf_value);
diff --git a/maintenance/refreshLinks.php b/maintenance/refreshLinks.php
index 535808d606..9ba8682666 100644
--- a/maintenance/refreshLinks.php
+++ b/maintenance/refreshLinks.php
@@ -206,8 +206,6 @@ class RefreshLinks extends Maintenance {
 	 * @param $id int The page_id
 	 */
 	public static function fixLinksFromArticle( $id ) {
-		global $wgParser, $wgContLang;
-
 		$page = WikiPage::newFromID( $id );
 
 		LinkCache::singleton()->clear();
@@ -216,7 +214,7 @@ class RefreshLinks extends Maintenance {
 			return;
 		}
 
-		$content = $page->getContent( REVISION::RAW );
+		$content = $page->getContent( Revision::RAW );
 		if ( null === false ) {
 			return;
 		}
diff --git a/maintenance/runJobs.php b/maintenance/runJobs.php
index 80a227810e..f06e6b0eac 100644
--- a/maintenance/runJobs.php
+++ b/maintenance/runJobs.php
@@ -91,10 +91,10 @@ class RunJobs extends Maintenance {
 				}
 				// Break out if we hit the job count or wall time limits...
 				if ( $maxJobs && ++$n >= $maxJobs ) {
-					break 2;
+					break;
 				}
 				if ( $maxTime && ( time() - $startTime ) > $maxTime ) {
-					break 2;
+					break;
 				}
 				// Don't let any slaves/backups fall behind...
 				$group->get( $type )->waitForBackups();
diff --git a/maintenance/sql.php b/maintenance/sql.php
index 04e98d918d..72e6775b7a 100644
--- a/maintenance/sql.php
+++ b/maintenance/sql.php
@@ -63,24 +63,36 @@ class MwSql extends Maintenance {
 		}
 
 		$wholeLine = '';
-		while ( ( $line = Maintenance::readconsole() ) !== false ) {
+		$newPrompt = '> ';
+		$prompt    = $newPrompt;
+		while ( ( $line = Maintenance::readconsole( $prompt ) ) !== false ) {
+			if( !$line ) {
+				# User simply pressed return key
+				continue;
+			}
 			$done = $dbw->streamStatementEnd( $wholeLine, $line );
 
 			$wholeLine .= $line;
 
 			if ( !$done ) {
+				$wholeLine .= ' ';
+				$prompt = '    -> ';
 				continue;
 			}
 			if ( $useReadline ) {
-				readline_add_history( $wholeLine );
+				# Delimiter is eated by streamStatementEnd, we add it
+				# up in the history (bug 37020)
+				readline_add_history( $wholeLine . $dbw->getDelimiter() );
 				readline_write_history( $historyFile );
 			}
 			try{
 				$res = $dbw->query( $wholeLine );
 				$this->sqlPrintResult( $res, $dbw );
+				$prompt    = $newPrompt;
 				$wholeLine = '';
 			} catch (DBQueryError $e) {
-				$this->error( $e, true );
+				$doDie = ! Maintenance::posix_isatty( 0 );
+				$this->error( $e, $doDie );
 			}
 		}
 	}
diff --git a/maintenance/tables.sql b/maintenance/tables.sql
index 197151b349..bdcd66eda5 100644
--- a/maintenance/tables.sql
+++ b/maintenance/tables.sql
@@ -1291,7 +1291,8 @@ CREATE TABLE /*_*/job (
   -- Stored as a PHP serialized array, or an empty string if there are no parameters
   job_params blob NOT NULL,
 
-  -- Random, non-unique, number used for concurrent job acquisition
+  -- Random, non-unique, number used for job acquisition
+  -- Either a simple timestamp or a totally random number (for lock concurrency)
   job_random integer unsigned NOT NULL default 0,
 
   -- Field that conveys process locks on rows via process UUIDs
@@ -1507,16 +1508,6 @@ CREATE TABLE /*_*/module_deps (
 ) /*$wgDBTableOptions*/;
 CREATE UNIQUE INDEX /*i*/md_module_skin ON /*_*/module_deps (md_module, md_skin);
 
--- Table for holding configuration changes
-CREATE TABLE /*_*/config (
-  -- Config var name
-  cf_name varbinary(255) NOT NULL PRIMARY KEY,
-  -- Config var value
-  cf_value blob NOT NULL
-) /*$wgDBTableOptions*/;
--- Should cover *most* configuration - strings, ints, bools, etc.
-CREATE INDEX /*i*/cf_name_value ON /*_*/config (cf_name,cf_value(255));
-
 -- Holds all the sites known to the wiki.
 CREATE TABLE /*_*/sites (
 -- Numeric id of the site
diff --git a/maintenance/update.php b/maintenance/update.php
index e3c993badc..cb6f06b2c2 100644
--- a/maintenance/update.php
+++ b/maintenance/update.php
@@ -118,9 +118,6 @@ class UpdateMediaWiki extends Maintenance {
 		$shared = $this->hasOption( 'doshared' );
 
 		$updates = array( 'core', 'extensions', 'stats' );
-		if( !$this->hasOption('nopurge') ) {
-			$updates[] = 'purge';
-		}
 
 		$updater = DatabaseUpdater::newForDb( $db, $shared, $this );
 		$updater->doUpdates( $updates );
@@ -140,6 +137,10 @@ class UpdateMediaWiki extends Maintenance {
 			}
 		}
 
+		if( !$this->hasOption('nopurge') ) {
+			$updater->purgeCache();
+		}
+
 		$this->output( "\nDone.\n" );
 	}
 
diff --git a/resources/jquery/jquery.badge.css b/resources/jquery/jquery.badge.css
index 92e72555b6..7dd2198e62 100644
--- a/resources/jquery/jquery.badge.css
+++ b/resources/jquery/jquery.badge.css
@@ -1,29 +1,23 @@
 .mw-badge {
-	min-width: 8px;
-	height: 14px;
-	border: 1px solid white;
-	-moz-border-radius: 8px;
-	-webkit-border-radius: 8px;
-	border-radius: 8px;
+	min-width: 7px;
+	-moz-border-radius: 2px;
+	-webkit-border-radius: 2px;
+	border-radius: 2px;
 	-moz-box-shadow: 0px 1px 4px #ccc;
 	-webkit-box-shadow: 0px 1px 4px #ccc;
 	box-shadow: 0px 1px 4px #ccc;
-	background-color: #b60a00;
-	background-image: -o-linear-gradient(bottom, #a70802 0%, #cf0e00 100%);
-	background-image: -moz-linear-gradient(bottom, #a70802 0%, #cf0e00 100%);
-	background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0, #a70802), color-stop(1, #cf0e00));
-	background-image: -webkit-linear-gradient(bottom, #a70802 0%, #cf0e00 100%);
-	background-image: -ms-linear-gradient(bottom, #a70802 0%, #cf0e00 100%);
-	background-image: linear-gradient(bottom, #a70802 0%, #cf0e00 100%);
+	background-color: #cc0000;
 	padding: 0 3px;
 	text-align: center;
+	font-size: 12px;
+	line-height: 12px;
 }
 
 .mw-badge-content {
-	font-size: 12px;
-	line-height: 14px;
+	font-weight: bold;
 	color: white;
-	vertical-align: top;
+	vertical-align: baseline;
+	text-shadow: 0 1px rgba(0, 0, 0, 0.4);
 }
 
 .mw-badge-inline {
diff --git a/resources/jquery/jquery.badge.js b/resources/jquery/jquery.badge.js
index 04495b7167..17b6b33ebf 100644
--- a/resources/jquery/jquery.badge.js
+++ b/resources/jquery/jquery.badge.js
@@ -1,8 +1,6 @@
 /**
  * jQuery Badge plugin
  *
- * Based on Badger plugin by Daniel Raftery (http://thrivingkings.com/badger).
- *
  * @license MIT
  */
 
@@ -24,94 +22,32 @@
  * This program is distributed WITHOUT ANY WARRANTY.
  */
 ( function ( $ ) {
-
 	/**
-	 * Allows you to put a numeric "badge" on an item on the page.
+	 * Allows you to put a "badge" on an item on the page. The badge container
+	 * will be appended to the selected element(s).
 	 * See mediawiki.org/wiki/ResourceLoader/Default_modules#jQuery.badge
 	 *
-	 * @param {string|number} badgeCount An explicit number, or "+n"/ "-n"
-	 *  to modify the existing value. If the new value is equal or lower than 0,
-	 *  any existing badge will be removed. The badge container will be appended
-	 *  to the selected element(s).
-	 * @param {Object} options Optional parameters specified below
-	 *   type: 'inline' or 'overlay' (default)
-	 *   callback: will be called with the number now shown on the badge as a parameter
+	 * @param text The value to display in the badge. If the value is falsey (0,
+	 *   null, false, '', etc.), any existing badge will be removed.
+	 * @param boolean inline True if the badge should be displayed inline, false
+	 *   if the badge should overlay the parent element (default is inline)
 	 */
-	$.fn.badge = function ( badgeCount, options ) {
-		var $badge,
-			oldBadgeCount,
-			newBadgeCount,
-			$existingBadge = this.find( '.mw-badge' );
-
-		options = $.extend( { type : 'overlay' }, options );
-
-		// If there is no existing badge, this will give an empty string
-		oldBadgeCount = Number( $existingBadge.text() );
-		if ( isNaN( oldBadgeCount ) ) {
-			oldBadgeCount = 0;
-		}
+	$.fn.badge = function ( text, inline ) {
+		var div, $badge = this.find( '.mw-badge' );
 
-		// If badgeCount is a number, use that as the new badge
-		if ( typeof badgeCount === 'number' ) {
-			newBadgeCount = badgeCount;
-		} else if ( typeof badgeCount === 'string' ) {
-			// If badgeCount is "+x", add x to the old badge
-			if ( badgeCount.charAt(0) === '+' ) {
-				newBadgeCount = oldBadgeCount + Number( badgeCount.substr(1) );
-			// If badgeCount is "-x", subtract x from the old badge
-			} else if ( badgeCount.charAt(0) === '-' ) {
-				newBadgeCount = oldBadgeCount - Number( badgeCount.substr(1) );
-			// If badgeCount can be converted into a number, convert it
-			} else if ( !isNaN( Number( badgeCount ) ) ) {
-				newBadgeCount = Number( badgeCount );
+		if ( text ) {
+			// If a badge already exists, reuse it
+			if ( $badge.length ) {
+				$badge.find( '.mw-badge-content' ).text( text );
 			} else {
-				newBadgeCount = 0;
+				// Otherwise, create a new badge with the specified text and style
+				$badge = $( '<div class="mw-badge mw-badge-' + ( inline ? 'inline' : 'overlay' ) + '"></div>' )
+					.append( $( '<span class="mw-badge-content"></span>' ).text ( text ) )
+					.appendTo( this );
 			}
-		// Other types are not supported, fall back to 0.
-		} else {
-			newBadgeCount = 0;
-		}
-
-		// Badge count must be a whole number
-		newBadgeCount = Math.round( newBadgeCount );
-
-		if ( newBadgeCount <= 0 ) {
-			// Badges should only exist for values > 0.
-			$existingBadge.remove();
 		} else {
-			// Don't add duplicates
-			if ( $existingBadge.length ) {
-				$badge = $existingBadge;
-				// Insert the new count into the badge
-				this.find( '.mw-badge-content' ).text( newBadgeCount );
-			} else {
-				// Contruct a new badge with the count
-				$badge = $( '<div>' )
-					.addClass( 'mw-badge' )
-					.append(
-						$( '<span>' )
-							.addClass( 'mw-badge-content' )
-							.text( newBadgeCount )
-					);
-				this.append( $badge );
-			}
-
-			if ( options.type === 'inline' ) {
-				$badge
-					.removeClass( 'mw-badge-overlay' )
-					.addClass( 'mw-badge-inline' );
-			// Default: overlay
-			} else {
-				$badge
-					.removeClass( 'mw-badge-inline' )
-					.addClass( 'mw-badge-overlay' );
-
-			}
-
-			// If a callback was specified, call it with the badge count
-			if ( $.isFunction( options.callback ) ) {
-				options.callback( newBadgeCount );
-			}
+			$badge.remove();
 		}
+		return this;
 	};
 }( jQuery ) );
diff --git a/resources/jquery/jquery.checkboxShiftClick.js b/resources/jquery/jquery.checkboxShiftClick.js
index 1990dc0d73..aced0633dc 100644
--- a/resources/jquery/jquery.checkboxShiftClick.js
+++ b/resources/jquery/jquery.checkboxShiftClick.js
@@ -1,14 +1,16 @@
 /**
  * jQuery checkboxShiftClick
  *
- * This will enable checkboxes to be checked or unchecked in a row by clicking one, holding shift and clicking another one
+ * This will enable checkboxes to be checked or unchecked in a row by clicking one,
+ * holding shift and clicking another one.
  *
- * @author Krinkle <krinklemail@gmail.com>
+ * @author Timo Tijhof, 2011 - 2012
  * @license GPL v2
  */
 ( function ( $ ) {
-	$.fn.checkboxShiftClick = function ( text ) {
-		var prevCheckbox = null, $box = this;
+	$.fn.checkboxShiftClick = function () {
+		var prevCheckbox = null,
+			$box = this;
 		// When our boxes are clicked..
 		$box.click( function ( e ) {
 			// And one has been clicked before...
diff --git a/resources/jquery/jquery.client.js b/resources/jquery/jquery.client.js
index 24f8959ee1..b35dbbbe1d 100644
--- a/resources/jquery/jquery.client.js
+++ b/resources/jquery/jquery.client.js
@@ -40,71 +40,74 @@
 			// Use the cached version if possible
 			if ( profileCache[nav.userAgent] === undefined ) {
 
-				/* Configuration */
-
-				// Name of browsers or layout engines we don't recognize
-				var uk = 'unknown';
-				// Generic version digit
-				var x = 'x';
-				// Strings found in user agent strings that need to be conformed
-				var wildUserAgents = ['Opera', 'Navigator', 'Minefield', 'KHTML', 'Chrome', 'PLAYSTATION 3'];
-				// Translations for conforming user agent strings
-				var userAgentTranslations = [
-					// Tons of browsers lie about being something they are not
-					[/(Firefox|MSIE|KHTML,\slike\sGecko|Konqueror)/, ''],
-					// Chrome lives in the shadow of Safari still
-					['Chrome Safari', 'Chrome'],
-					// KHTML is the layout engine not the browser - LIES!
-					['KHTML', 'Konqueror'],
-					// Firefox nightly builds
-					['Minefield', 'Firefox'],
-					// This helps keep differnt versions consistent
-					['Navigator', 'Netscape'],
-					// This prevents version extraction issues, otherwise translation would happen later
-					['PLAYSTATION 3', 'PS3']
-				];
-				// Strings which precede a version number in a user agent string - combined and used as match 1 in
-				// version detectection
-				var versionPrefixes = [
-					'camino', 'chrome', 'firefox', 'netscape', 'netscape6', 'opera', 'version', 'konqueror',
-					'lynx', 'msie', 'safari', 'ps3'
-				];
-				// Used as matches 2, 3 and 4 in version extraction - 3 is used as actual version number
-				var versionSuffix = '(\\/|\\;?\\s|)([a-z0-9\\.\\+]*?)(\\;|dev|rel|\\)|\\s|$)';
-				// Names of known browsers
-				var names = [
-					'camino', 'chrome', 'firefox', 'netscape', 'konqueror', 'lynx', 'msie', 'opera',
-					'safari', 'ipod', 'iphone', 'blackberry', 'ps3', 'rekonq'
-				];
-				// Tanslations for conforming browser names
-				var nameTranslations = [];
-				// Names of known layout engines
-				var layouts = ['gecko', 'konqueror', 'msie', 'opera', 'webkit'];
-				// Translations for conforming layout names
-				var layoutTranslations = [['konqueror', 'khtml'], ['msie', 'trident'], ['opera', 'presto']];
-				// Names of supported layout engines for version number
-				var layoutVersions = ['applewebkit', 'gecko'];
-				// Names of known operating systems
-				var platforms = ['win', 'mac', 'linux', 'sunos', 'solaris', 'iphone'];
-				// Translations for conforming operating system names
-				var platformTranslations = [['sunos', 'solaris']];
-
-				/* Methods */
-
-				/**
-				 * Performs multiple replacements on a string
-				 */
-				var translate = function ( source, translations ) {
-					var i;
-					for ( i = 0; i < translations.length; i++ ) {
-						source = source.replace( translations[i][0], translations[i][1] );
-					}
-					return source;
-				};
-
-				/* Pre-processing */
-
-				var	ua = nav.userAgent,
+				var
+					versionNumber,
+
+					/* Configuration */
+
+					// Name of browsers or layout engines we don't recognize
+					uk = 'unknown',
+					// Generic version digit
+					x = 'x',
+					// Strings found in user agent strings that need to be conformed
+					wildUserAgents = ['Opera', 'Navigator', 'Minefield', 'KHTML', 'Chrome', 'PLAYSTATION 3'],
+					// Translations for conforming user agent strings
+					userAgentTranslations = [
+						// Tons of browsers lie about being something they are not
+						[/(Firefox|MSIE|KHTML,\slike\sGecko|Konqueror)/, ''],
+						// Chrome lives in the shadow of Safari still
+						['Chrome Safari', 'Chrome'],
+						// KHTML is the layout engine not the browser - LIES!
+						['KHTML', 'Konqueror'],
+						// Firefox nightly builds
+						['Minefield', 'Firefox'],
+						// This helps keep differnt versions consistent
+						['Navigator', 'Netscape'],
+						// This prevents version extraction issues, otherwise translation would happen later
+						['PLAYSTATION 3', 'PS3']
+					],
+					// Strings which precede a version number in a user agent string - combined and used as match 1 in
+					// version detectection
+					versionPrefixes = [
+						'camino', 'chrome', 'firefox', 'netscape', 'netscape6', 'opera', 'version', 'konqueror',
+						'lynx', 'msie', 'safari', 'ps3'
+					],
+					// Used as matches 2, 3 and 4 in version extraction - 3 is used as actual version number
+					versionSuffix = '(\\/|\\;?\\s|)([a-z0-9\\.\\+]*?)(\\;|dev|rel|\\)|\\s|$)',
+					// Names of known browsers
+					names = [
+						'camino', 'chrome', 'firefox', 'netscape', 'konqueror', 'lynx', 'msie', 'opera',
+						'safari', 'ipod', 'iphone', 'blackberry', 'ps3', 'rekonq'
+					],
+					// Tanslations for conforming browser names
+					nameTranslations = [],
+					// Names of known layout engines
+					layouts = ['gecko', 'konqueror', 'msie', 'opera', 'webkit'],
+					// Translations for conforming layout names
+					layoutTranslations = [ ['konqueror', 'khtml'], ['msie', 'trident'], ['opera', 'presto'] ],
+					// Names of supported layout engines for version number
+					layoutVersions = ['applewebkit', 'gecko'],
+					// Names of known operating systems
+					platforms = ['win', 'mac', 'linux', 'sunos', 'solaris', 'iphone'],
+					// Translations for conforming operating system names
+					platformTranslations = [ ['sunos', 'solaris'] ],
+
+					/* Methods */
+
+					/**
+					 * Performs multiple replacements on a string
+					 */
+					translate = function ( source, translations ) {
+						var i;
+						for ( i = 0; i < translations.length; i++ ) {
+							source = source.replace( translations[i][0], translations[i][1] );
+						}
+						return source;
+					},
+
+					/* Pre-processing */
+
+					ua = nav.userAgent,
 					match,
 					name = uk,
 					layout = uk,
@@ -147,7 +150,7 @@
 				if ( name === 'opera' && version >= 9.8) {
 					version = ua.match( /version\/([0-9\.]*)/i )[1] || 10;
 				}
-				var versionNumber = parseFloat( version, 10 ) || 0.0;
+				versionNumber = parseFloat( version, 10 ) || 0.0;
 
 				/* Caching */
 
@@ -191,7 +194,7 @@
 		 * @return Boolean true if browser known or assumed to be supported, false if blacklisted
 		 */
 		test: function ( map, profile ) {
-			/*jshint evil:true */
+			/*jshint evil: true */
 
 			var conditions, dir, i, op, val;
 			profile = $.isPlainObject( profile ) ? profile : $.client.profile();
diff --git a/resources/jquery/jquery.collapsibleTabs.js b/resources/jquery/jquery.collapsibleTabs.js
index cb25796f83..9b8f8fc2a1 100644
--- a/resources/jquery/jquery.collapsibleTabs.js
+++ b/resources/jquery/jquery.collapsibleTabs.js
@@ -70,7 +70,10 @@
 			}
 			return $settings;
 		},
-		handleResize: function ( e ) {
+		/**
+		 * @param {jQuery.Event} e
+		 */
+		handleResize: function () {
 			$.collapsibleTabs.instances.each( function () {
 				var $el = $( this ),
 					data = $.collapsibleTabs.getSettings( $el );
diff --git a/resources/jquery/jquery.colorUtil.js b/resources/jquery/jquery.colorUtil.js
index c1fe7fe3f3..9c6f9ecbe1 100644
--- a/resources/jquery/jquery.colorUtil.js
+++ b/resources/jquery/jquery.colorUtil.js
@@ -113,17 +113,20 @@
 		 * @return	Array			The HSL representation
 		 */
 		rgbToHsl: function ( R, G, B ) {
-			var r = R / 255,
+			var d,
+				r = R / 255,
 				g = G / 255,
-				b = B / 255;
-			var max = Math.max( r, g, b ), min = Math.min( r, g, b );
-			var h, s, l = (max + min) / 2;
+				b = B / 255,
+				max = Math.max( r, g, b ), min = Math.min( r, g, b ),
+				h,
+				s,
+				l = (max + min) / 2;
 
 			if ( max === min ) {
 				// achromatic
 				h = s = 0;
 			} else {
-				var d = max - min;
+				d = max - min;
 				s = l > 0.5 ? d / (2 - max - min) : d / (max + min);
 				switch ( max ) {
 					case r:
@@ -155,12 +158,12 @@
 		 * @return	Array			The RGB representation
 		 */
 		hslToRgb: function ( h, s, l ) {
-			var r, g, b;
+			var r, g, b, hue2rgb, q, p;
 
 			if ( s === 0 ) {
 				r = g = b = l; // achromatic
 			} else {
-				var hue2rgb = function ( p, q, t ) {
+				hue2rgb = function ( p, q, t ) {
 					if ( t < 0 ) {
 						t += 1;
 					}
@@ -179,8 +182,8 @@
 					return p;
 				};
 
-				var q = l < 0.5 ? l * (1 + s) : l + s - l * s;
-				var p = 2 * l - q;
+				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 );
diff --git a/resources/jquery/jquery.expandableField.js b/resources/jquery/jquery.expandableField.js
index 063f260934..9e532e527a 100644
--- a/resources/jquery/jquery.expandableField.js
+++ b/resources/jquery/jquery.expandableField.js
@@ -67,16 +67,16 @@
 				context = {
 					config: {
 						// callback function for before collapse
-						beforeCondense: function ( context ) {},
+						beforeCondense: function () {},
 
 						// callback function for before expand
-						beforeExpand: function ( context ) {},
+						beforeExpand: function () {},
 
 						// callback function for after collapse
-						afterCondense: function ( context ) {},
+						afterCondense: function () {},
 
 						// callback function for after expand
-						afterExpand: function ( context ) {},
+						afterExpand: function () {},
 
 						// Whether the field should expand to the left or the right -- defaults to left
 						expandToLeft: true
diff --git a/resources/jquery/jquery.hidpi.js b/resources/jquery/jquery.hidpi.js
index b7335ffe86..70bfc4ea3c 100644
--- a/resources/jquery/jquery.hidpi.js
+++ b/resources/jquery/jquery.hidpi.js
@@ -105,9 +105,7 @@ $.matchSrcSet = function ( devicePixelRatio, srcset ) {
 		if ( bits.length > 1 && bits[1].charAt( bits[1].length - 1 ) === 'x' ) {
 			ratioStr = bits[1].substr( 0, bits[1].length - 1 );
 			ratio = parseFloat( ratioStr );
-			if ( ratio > devicePixelRatio ) {
-				// Too big, skip!
-			} else if ( ratio > selectedRatio ) {
+			if ( ratio <= devicePixelRatio && ratio > selectedRatio ) {
 				selectedRatio = ratio;
 				selectedSrc = src;
 			}
diff --git a/resources/jquery/jquery.highlightText.js b/resources/jquery/jquery.highlightText.js
index f720e07f0d..cda2765b78 100644
--- a/resources/jquery/jquery.highlightText.js
+++ b/resources/jquery/jquery.highlightText.js
@@ -29,7 +29,7 @@
 				// non latin characters can make regex think a new word has begun: do not use \b
 				// http://stackoverflow.com/questions/3787072/regex-wordwrap-with-utf8-characters-in-js
 				// look for an occurrence of our pattern and store the starting position
-				match = node.data.match( new RegExp( "(^|\\s)" + $.escapeRE( pat ), "i" ) );
+				match = node.data.match( new RegExp( '(^|\\s)' + $.escapeRE( pat ), 'i' ) );
 				if ( match ) {
 					pos = match.index + match[1].length; // include length of any matched spaces
 					// create the span wrapper for the matched text
diff --git a/resources/jquery/jquery.mw-jump.js b/resources/jquery/jquery.mw-jump.js
index 36b6690c28..e2868341ab 100644
--- a/resources/jquery/jquery.mw-jump.js
+++ b/resources/jquery/jquery.mw-jump.js
@@ -1,12 +1,12 @@
 /**
  * JavaScript to show jump links to motor-impaired users when they are focused.
  */
-jQuery( function( $ ) {
+jQuery( function ( $ ) {
 
-	$('.mw-jump').delegate( 'a', 'focus blur', function( e ) {
-		// Confusingly jQuery leaves e.type as "focusout" for delegated blur events
-		if ( e.type === "blur" || e.type === "focusout" ) {
-			$( this ).closest( '.mw-jump' ).css({ height: '0' });
+	$( '.mw-jump' ).on( 'focus blur', 'a', function ( e ) {
+		// Confusingly jQuery leaves e.type as focusout for delegated blur events
+		if ( e.type === 'blur' || e.type === 'focusout' ) {
+			$( this ).closest( '.mw-jump' ).css({ height: 0 });
 		} else {
 			$( this ).closest( '.mw-jump' ).css({ height: 'auto' });
 		}
diff --git a/resources/jquery/jquery.mwExtension.js b/resources/jquery/jquery.mwExtension.js
index bbffd7b7df..de399788a5 100644
--- a/resources/jquery/jquery.mwExtension.js
+++ b/resources/jquery/jquery.mwExtension.js
@@ -15,12 +15,13 @@
 			return str.charAt( 0 ).toUpperCase() + str.substr( 1 );
 		},
 		escapeRE: function ( str ) {
-			return str.replace ( /([\\{}()|.?*+\-\^$\[\]])/g, "\\$1" );
+			return str.replace ( /([\\{}()|.?*+\-\^$\[\]])/g, '\\$1' );
 		},
 		isDomElement: function ( el ) {
 			return !!el && !!el.nodeType;
 		},
 		isEmpty: function ( v ) {
+			var key;
 			if ( v === '' || v === 0 || v === '0' || v === null
 				|| v === false || v === undefined )
 			{
@@ -32,7 +33,7 @@
 				return true;
 			}
 			if ( typeof v === 'object' ) {
-				for ( var key in v ) {
+				for ( key in v ) {
 					return false;
 				}
 				return true;
diff --git a/resources/jquery/jquery.qunit.completenessTest.js b/resources/jquery/jquery.qunit.completenessTest.js
index 1475af2a2d..ef28948a36 100644
--- a/resources/jquery/jquery.qunit.completenessTest.js
+++ b/resources/jquery/jquery.qunit.completenessTest.js
@@ -15,7 +15,7 @@
 /*global jQuery, QUnit */
 /*jshint eqeqeq:false, eqnull:false, forin:false */
 ( function ( $ ) {
-	"use strict";
+	'use strict';
 
 	var util,
 		hasOwn = Object.prototype.hasOwnProperty,
diff --git a/resources/jquery/jquery.suggestions.js b/resources/jquery/jquery.suggestions.js
index d80680fcfc..edc18a7940 100644
--- a/resources/jquery/jquery.suggestions.js
+++ b/resources/jquery/jquery.suggestions.js
@@ -13,11 +13,11 @@
  *
  * Options:
  *
- * fetch(query): Callback that should fetch suggestions and set the suggestions property. Executed in the context of the
- *		textbox
+ * fetch(query): Callback that should fetch suggestions and set the suggestions property.
+ *      Executed in the context of the textbox
  *		Type: Function
- * cancel: Callback function to call when any pending asynchronous suggestions fetches should be canceled.
- *		Executed in the context of the textbox
+ * cancel: Callback function to call when any pending asynchronous suggestions fetches
+ *      should be canceled. Executed in the context of the textbox
  *		Type: Function
  * special: Set of callbacks for rendering and selecting
  *		Type: Object of Functions 'render' and 'select'
@@ -33,12 +33,12 @@
  *		Type: Number, Range: 0 - 1200, Default: 120
  * submitOnClick: Whether to submit the form containing the textbox when a suggestion is clicked
  *		Type: Boolean, Default: false
- * maxExpandFactor: Maximum suggestions box width relative to the textbox width. If set to e.g. 2, the suggestions box
- *		will never be grown beyond 2 times the width of the textbox.
+ * maxExpandFactor: Maximum suggestions box width relative to the textbox width. If set
+ *      to e.g. 2, the suggestions box will never be grown beyond 2 times the width of the textbox.
  *		Type: Number, Range: 1 - infinity, Default: 3
  * expandFrom: Which direction to offset the suggestion box from.
- *      Values 'start' and 'end' translate to left and right respectively depending on the directionality
- *      of the current document, according to $( 'html' ).css( 'direction' ).
+ *      Values 'start' and 'end' translate to left and right respectively depending on the
+ *      directionality of the current document, according to $( 'html' ).css( 'direction' ).
  *      Type: String, default: 'auto', options: 'left', 'right', 'start', 'end', 'auto'.
  * positionFromLeft: Sets expandFrom=left, for backwards compatibility
  *		Type: Boolean, Default: true
@@ -60,18 +60,22 @@ $.suggestions = {
 			context.config.cancel.call( context.data.$textbox );
 		}
 	},
+
 	/**
-	 * Restore the text the user originally typed in the textbox, before it was overwritten by highlight(). This
-	 * restores the value the currently displayed suggestions are based on, rather than the value just before
+	 * Restore the text the user originally typed in the textbox, before it
+	 * was overwritten by highlight(). This restores the value the currently
+	 * displayed suggestions are based on, rather than the value just before
 	 * highlight() overwrote it; the former is arguably slightly more sensible.
 	 */
 	restore: function ( context ) {
 		context.data.$textbox.val( context.data.prevText );
 	},
+
 	/**
-	 * Ask the user-specified callback for new suggestions. Any previous delayed 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.
+	 * Ask the user-specified callback for new suggestions. Any previous delayed
+	 * 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 ) {
@@ -101,6 +105,7 @@ $.suggestions = {
 		}
 		$.suggestions.special( context );
 	},
+
 	special: function ( context ) {
 		// Allow custom rendering - but otherwise don't do any rendering
 		if ( typeof context.config.special.render === 'function' ) {
@@ -112,13 +117,17 @@ $.suggestions = {
 			}, 1 );
 		}
 	},
+
 	/**
 	 * 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
 	 */
 	configure: function ( context, property, value ) {
-		var newCSS;
+		var newCSS,
+			$autoEllipseMe, $result, $results, $span,
+			i, expWidth, matchedText, maxWidth, text;
+
 		// Validate creation using fallback values
 		switch( property ) {
 			case 'fetch':
@@ -212,22 +221,24 @@ $.suggestions = {
 						}
 
 						context.data.$container.css( newCSS );
-						var $results = context.data.$container.children( '.suggestions-results' );
+						$results = context.data.$container.children( '.suggestions-results' );
 						$results.empty();
-						var expWidth = -1;
-						var $autoEllipseMe = $( [] );
-						var matchedText = null;
-						for ( var i = 0; i < context.config.suggestions.length; i++ ) {
+						expWidth = -1;
+						$autoEllipseMe = $( [] );
+						matchedText = null;
+						for ( i = 0; i < context.config.suggestions.length; i++ ) {
 							/*jshint loopfunc:true */
-							var text = context.config.suggestions[i];
-							var $result = $( '<div>' )
+							text = context.config.suggestions[i];
+							$result = $( '<div>' )
 								.addClass( 'suggestions-result' )
 								.attr( 'rel', i )
 								.data( 'text', context.config.suggestions[i] )
-								.mousemove( function ( e ) {
+								.mousemove( function () {
 									context.data.selectedWithMouse = true;
 									$.suggestions.highlight(
-										context, $(this).closest( '.suggestions-results div' ), false
+										context,
+										$(this).closest( '.suggestions-results div' ),
+										false
 									);
 								} )
 								.appendTo( $results );
@@ -246,7 +257,7 @@ $.suggestions = {
 
 								// Widen results box if needed
 								// New width is only calculated here, applied later
-								var $span = $result.children( 'span' );
+								$span = $result.children( 'span' );
 								if ( $span.outerWidth() > $result.width() && $span.outerWidth() > expWidth ) {
 									// factor in any padding, margin, or border space on the parent
 									expWidth = $span.outerWidth() + ( context.data.$container.width() - $span.parent().width());
@@ -256,11 +267,15 @@ $.suggestions = {
 						}
 						// Apply new width for results box, if any
 						if ( expWidth > context.data.$container.width() ) {
-							var maxWidth = context.config.maxExpandFactor*context.data.$textbox.width();
+							maxWidth = context.config.maxExpandFactor*context.data.$textbox.width();
 							context.data.$container.width( Math.min( expWidth, maxWidth ) );
 						}
 						// autoEllipse the results. Has to be done after changing the width
-						$autoEllipseMe.autoEllipsis( { hasSpan: true, tooltip: true, matchText: matchedText } );
+						$autoEllipseMe.autoEllipsis( {
+							hasSpan: true,
+							tooltip: true,
+							matchText: matchedText
+						} );
 					}
 				}
 				break;
@@ -280,6 +295,7 @@ $.suggestions = {
 				break;
 		}
 	},
+
 	/**
 	 * Highlight a result in the results table
 	 * @param result <tr> to highlight: jQuery object, or 'prev' or 'next'
@@ -338,13 +354,16 @@ $.suggestions = {
 			context.data.$textbox.trigger( 'change' );
 		}
 	},
+
 	/**
 	 * Respond to keypress event
 	 * @param key Integer Code of key pressed
 	 */
 	keypress: function ( e, context, key ) {
-		var wasVisible = context.data.$container.is( ':visible' ),
+		var selected,
+			wasVisible = context.data.$container.is( ':visible' ),
 			preventDefault = false;
+
 		switch ( key ) {
 			// Arrow down
 			case 40:
@@ -376,7 +395,7 @@ $.suggestions = {
 			case 13:
 				context.data.$container.hide();
 				preventDefault = wasVisible;
-				var selected = context.data.$container.find( '.suggestions-result-current' );
+				selected = context.data.$container.find( '.suggestions-result-current' );
 				if ( selected.length === 0 || context.data.selectedWithMouse ) {
 					// if nothing is selected OR if something was selected with the mouse,
 					// cancel any current requests and submit the form
@@ -420,18 +439,18 @@ $.fn.suggestions = function () {
 		if ( context === undefined || context === null ) {
 			context = {
 				config: {
-					'fetch' : function () {},
-					'cancel': function () {},
-					'special': {},
-					'result': {},
-					'$region': $(this),
-					'suggestions': [],
-					'maxRows': 7,
-					'delay': 120,
-					'submitOnClick': false,
-					'maxExpandFactor': 3,
-					'expandFrom': 'auto',
-					'highlightInput': false
+					fetch: function () {},
+					cancel: function () {},
+					special: {},
+					result: {},
+					$region: $(this),
+					suggestions: [],
+					maxRows: 7,
+					delay: 120,
+					submitOnClick: false,
+					maxExpandFactor: 3,
+					expandFrom: 'auto',
+					highlightInput: false
 				}
 			};
 		}
@@ -480,14 +499,16 @@ $.fn.suggestions = function () {
 				.addClass( 'suggestions' )
 				.append(
 					$( '<div>' ).addClass( 'suggestions-results' )
-						// Can't use click() because the container div is hidden when the textbox loses focus. Instead,
-						// listen for a mousedown followed by a mouseup on the same div
+						// Can't use click() because the container div is hidden when the
+						// textbox loses focus. Instead, listen for a mousedown followed
+						// by a mouseup on the same div.
 						.mousedown( function ( e ) {
 							context.data.mouseDownOn = $( e.target ).closest( '.suggestions-results div' );
 						} )
 						.mouseup( function ( e ) {
-							var $result = $( e.target ).closest( '.suggestions-results div' );
-							var $other = context.data.mouseDownOn;
+							var $result = $( e.target ).closest( '.suggestions-results div' ),
+								$other = context.data.mouseDownOn;
+
 							context.data.mouseDownOn = $( [] );
 							if ( $result.get( 0 ) !== $other.get( 0 ) ) {
 								return;
@@ -502,14 +523,16 @@ $.fn.suggestions = function () {
 				)
 				.append(
 					$( '<div>' ).addClass( 'suggestions-special' )
-						// Can't use click() because the container div is hidden when the textbox loses focus. Instead,
-						// listen for a mousedown followed by a mouseup on the same div
+						// Can't use click() because the container div is hidden when the
+						// textbox loses focus. Instead, listen for a mousedown followed
+						// by a mouseup on the same div.
 						.mousedown( function ( e ) {
 							context.data.mouseDownOn = $( e.target ).closest( '.suggestions-special' );
 						} )
 						.mouseup( function ( e ) {
-							var $special = $( e.target ).closest( '.suggestions-special' );
-							var $other = context.data.mouseDownOn;
+							var $special = $( e.target ).closest( '.suggestions-special' ),
+								$other = context.data.mouseDownOn;
+
 							context.data.mouseDownOn = $( [] );
 							if ( $special.get( 0 ) !== $other.get( 0 ) ) {
 								return;
diff --git a/resources/jquery/jquery.textSelection.js b/resources/jquery/jquery.textSelection.js
index abb0fa3f64..17fd0cd35f 100644
--- a/resources/jquery/jquery.textSelection.js
+++ b/resources/jquery/jquery.textSelection.js
@@ -25,6 +25,11 @@
 	}
 
 	$.fn.textSelection = function ( command, options ) {
+		var fn,
+			context,
+			hasIframe,
+			needSave,
+			retval;
 
 		/**
 		 * Helper function to get an IE TextRange object for an element
@@ -52,7 +57,7 @@
 			}
 		}
 
-		var fn = {
+		fn = {
 			/**
 			 * Get the contents of the textarea
 			 */
@@ -168,16 +173,16 @@
 							range2.collapse();
 							range2.moveStart( 'character', -1 );
 							// FIXME: Which check is correct?
-							if ( range2.text !== "\r" && range2.text !== "\n" && range2.text !== "" ) {
-								insertText = "\n" + insertText;
-								pre += "\n";
+							if ( range2.text !== '\r' && range2.text !== '\n' && range2.text !== '' ) {
+								insertText = '\n' + insertText;
+								pre += '\n';
 							}
 							range3 = document.selection.createRange();
 							range3.collapse( false );
 							range3.moveEnd( 'character', 1 );
-							if ( range3.text !== "\r" && range3.text !== "\n" && range3.text !== "" ) {
-								insertText += "\n";
-								post += "\n";
+							if ( range3.text !== '\r' && range3.text !== '\n' && range3.text !== '' ) {
+								insertText += '\n';
+								post += '\n';
 							}
 						}
 
@@ -216,13 +221,13 @@
 							insertText = doSplitLines( selText, pre, post );
 						}
 						if ( options.ownline ) {
-							if ( startPos !== 0 && this.value.charAt( startPos - 1 ) !== "\n" && this.value.charAt( startPos - 1 ) !== "\r" ) {
-								insertText = "\n" + insertText;
-								pre += "\n";
+							if ( startPos !== 0 && this.value.charAt( startPos - 1 ) !== '\n' && this.value.charAt( startPos - 1 ) !== '\r' ) {
+								insertText = '\n' + insertText;
+								pre += '\n';
 							}
-							if ( this.value.charAt( endPos ) !== "\n" && this.value.charAt( endPos ) !== "\r" ) {
-								insertText += "\n";
-								post += "\n";
+							if ( this.value.charAt( endPos ) !== '\n' && this.value.charAt( endPos ) !== '\r' ) {
+								insertText += '\n';
+								post += '\n';
 							}
 						}
 						this.value = this.value.substring( 0, startPos ) + insertText +
@@ -230,9 +235,9 @@
 						// Setting this.value scrolls the textarea to the top, restore the scroll position
 						this.scrollTop = scrollTop;
 						if ( window.opera ) {
-							pre = pre.replace( /\r?\n/g, "\r\n" );
-							selText = selText.replace( /\r?\n/g, "\r\n" );
-							post = post.replace( /\r?\n/g, "\r\n" );
+							pre = pre.replace( /\r?\n/g, '\r\n' );
+							selText = selText.replace( /\r?\n/g, '\r\n' );
+							post = post.replace( /\r?\n/g, '\r\n' );
 						}
 						if ( isSample && options.selectPeri && !options.splitlines ) {
 							this.selectionStart = startPos + pre.length;
@@ -261,7 +266,21 @@
 			 */
 			 getCaretPosition: function ( options ) {
 				function getCaret( e ) {
-					var caretPos = 0, endPos = 0;
+					var caretPos = 0,
+						endPos = 0,
+						preText, rawPreText, periText,
+						rawPeriText, postText, rawPostText,
+						// IE Support
+						preFinished,
+						periFinished,
+						postFinished,
+						// Range containing text in the selection
+						periRange,
+						// Range containing text before the selection
+						preRange,
+						// Range containing text after the selection
+						postRange;
+
 					if ( document.selection && document.selection.createRange ) {
 						// IE doesn't properly report non-selected caret position through
 						// the selection ranges when textarea isn't focused. This can
@@ -269,20 +288,10 @@
 						// whatever we do later (bug 31847).
 						activateElementOnIE( e );
 
-						var
-							preText, rawPreText, periText,
-							rawPeriText, postText, rawPostText,
-
-							// IE Support
-							preFinished = false,
-							periFinished = false,
-							postFinished = false,
-							// Range containing text in the selection
-							periRange = document.selection.createRange().duplicate(),
-							// Range containing text before the selection
-							preRange,
-							// Range containing text after the selection
-							postRange;
+						preFinished = false;
+						periFinished = false;
+						postFinished = false;
+						periRange = document.selection.createRange().duplicate();
 
 						preRange = rangeForElementIE( e ),
 						// Move the end where we need it
@@ -309,7 +318,7 @@
 								} else {
 									preRange.moveEnd( 'character', -1 );
 									if ( preRange.text === preText ) {
-										rawPreText += "\r\n";
+										rawPreText += '\r\n';
 									} else {
 										preFinished = true;
 									}
@@ -321,7 +330,7 @@
 								} else {
 									periRange.moveEnd( 'character', -1 );
 									if ( periRange.text === periText ) {
-										rawPeriText += "\r\n";
+										rawPeriText += '\r\n';
 									} else {
 										periFinished = true;
 									}
@@ -333,15 +342,15 @@
 								} else {
 									postRange.moveEnd( 'character', -1 );
 									if ( postRange.text === postText ) {
-										rawPostText += "\r\n";
+										rawPostText += '\r\n';
 									} else {
 										postFinished = true;
 									}
 								}
 							}
 						} while ( ( !preFinished || !periFinished || !postFinished ) );
-						caretPos = rawPreText.replace( /\r\n/g, "\n" ).length;
-						endPos = caretPos + rawPeriText.replace( /\r\n/g, "\n" ).length;
+						caretPos = rawPreText.replace( /\r\n/g, '\n' ).length;
+						endPos = caretPos + rawPeriText.replace( /\r\n/g, '\n' ).length;
 					} else if ( e.selectionStart || e.selectionStart === 0 ) {
 						// Firefox support
 						caretPos = e.selectionStart;
@@ -405,20 +414,22 @@
 					return Math.floor( e.scrollWidth / ( $.client.profile().platform === 'linux' ? 7 : 8 ) );
 				}
 				function getCaretScrollPosition( e ) {
-					var i, j;
 					// FIXME: This functions sucks and is off by a few lines most
 					// of the time. It should be replaced by something decent.
-					var text = e.value.replace( /\r/g, '' );
-					var caret = $( e ).textSelection( 'getCaretPosition' );
-					var lineLength = getLineLength( e );
-					var row = 0;
-					var charInLine = 0;
-					var lastSpaceInLine = 0;
+					var i, j,
+						nextSpace,
+						text = e.value.replace( /\r/g, '' ),
+						caret = $( e ).textSelection( 'getCaretPosition' ),
+						lineLength = getLineLength( e ),
+						row = 0,
+						charInLine = 0,
+						lastSpaceInLine = 0;
+
 					for ( i = 0; i < caret; i++ ) {
 						charInLine++;
 						if ( text.charAt( i ) === ' ' ) {
 							lastSpaceInLine = charInLine;
-						} else if ( text.charAt( i ) === "\n" ) {
+						} else if ( text.charAt( i ) === '\n' ) {
 							lastSpaceInLine = 0;
 							charInLine = 0;
 							row++;
@@ -431,11 +442,11 @@
 							}
 						}
 					}
-					var nextSpace = 0;
+					nextSpace = 0;
 					for ( j = caret; j < caret + lineLength; j++ ) {
 						if (
 							text.charAt( j ) === ' ' ||
-							text.charAt( j ) === "\n" ||
+							text.charAt( j ) === '\n' ||
 							caret === text.length
 						) {
 							nextSpace = j;
@@ -542,16 +553,16 @@
 				break;
 		}
 
-		var context = $(this).data( 'wikiEditor-context' );
-		var hasIframe = typeof context !== 'undefined' && context && typeof context.$iframe !== 'undefined';
+		context = $(this).data( 'wikiEditor-context' );
+		hasIframe = context !== undefined && context && context.$iframe !== undefined;
 
 		// IE selection restore voodoo
-		var needSave = false;
+		needSave = false;
 		if ( hasIframe && context.savedSelection !== null ) {
 			context.fn.restoreSelection();
 			needSave = true;
 		}
-		var retval = ( hasIframe ? context.fn : fn )[command].call( this, options );
+		retval = ( hasIframe ? context.fn : fn )[command].call( this, options );
 		if ( hasIframe && needSave ) {
 			context.fn.saveSelection();
 		}
diff --git a/resources/mediawiki.action/mediawiki.action.edit.js b/resources/mediawiki.action/mediawiki.action.edit.js
index 1c51c97483..2835c9cccf 100644
--- a/resources/mediawiki.action/mediawiki.action.edit.js
+++ b/resources/mediawiki.action/mediawiki.action.edit.js
@@ -71,7 +71,7 @@
 		 * Apply tagOpen/tagClose to selection in textarea,
 		 * use sampleText instead of selection if there is none.
 		 */
-		insertTags: function ( tagOpen, tagClose, sampleText, selectText ) {
+		insertTags: function ( tagOpen, tagClose, sampleText ) {
 			if ( currentFocused && currentFocused.length ) {
 				currentFocused.textSelection(
 					'encapsulateSelection', {
diff --git a/resources/mediawiki.action/mediawiki.action.history.diff.css b/resources/mediawiki.action/mediawiki.action.history.diff.css
index 10473be779..31ca10781c 100644
--- a/resources/mediawiki.action/mediawiki.action.history.diff.css
+++ b/resources/mediawiki.action/mediawiki.action.history.diff.css
@@ -1,8 +1,36 @@
 /*
 ** Diff rendering
 */
-table.diff, td.diff-otitle, td.diff-ntitle {
+table.diff {
 	background-color: white;
+	border: none;
+	border-spacing: 4px;
+	margin: 0;
+	width: 100%;
+	/* Ensure that colums are of equal width */
+	table-layout: fixed;
+}
+
+table.diff td {
+	padding: 0.33em 0.5em;
+}
+
+table.diff td.diff-marker {
+	/* Compensate padding for increased font-size */
+	padding: 0.25em;
+}
+
+table.diff col.diff-marker {
+	width: 2%;
+}
+
+table.diff col.diff-content {
+	width: 48%;
+}
+
+table.diff td div {
+	/* Force-wrap very long lines such as URLs or page-widening char strings */
+	word-wrap: break-word;
 }
 
 td.diff-otitle,
@@ -10,14 +38,14 @@ td.diff-ntitle {
 	text-align: center;
 }
 
-td.diff-marker {
-	text-align: right;
+td.diff-lineno {
 	font-weight: bold;
-	font-size: 1.25em;
 }
 
-td.diff-lineno {
+td.diff-marker {
+	text-align: right;
 	font-weight: bold;
+	font-size: 1.25em;
 }
 
 td.diff-addedline,
@@ -27,10 +55,6 @@ td.diff-context {
 	vertical-align: top;
 	white-space: -moz-pre-wrap;
 	white-space: pre-wrap;
-}
-
-td.diff-addedline,
-td.diff-deletedline {
 	border-style: solid;
 	border-width: 1px 1px 1px 4px;
 	border-radius: 0.33em;
@@ -45,12 +69,9 @@ td.diff-deletedline {
 }
 
 td.diff-context {
-	background: #f3f3f3;
-	color: #333333;
-	border-style: solid;
-	border-width: 1px 1px 1px 4px;
+	background: #f9f9f9;
 	border-color: #e6e6e6;
-	border-radius: 0.33em;
+	color: #333333;
 }
 
 .diffchange {
@@ -58,15 +79,6 @@ td.diff-context {
 	text-decoration: none;
 }
 
-table.diff {
-	border: none;
-	width: 98%;
-	border-spacing: 4px;
-
-	/* Ensure that colums are of equal width */
-	table-layout: fixed;
-}
-
 td.diff-addedline .diffchange,
 td.diff-deletedline .diffchange {
 	border-radius: 0.33em;
@@ -80,25 +92,3 @@ td.diff-addedline .diffchange {
 td.diff-deletedline .diffchange {
 	background: #feeec8;
 }
-
-table.diff td {
-	padding: 0.33em 0.66em;
-}
-
-table.diff col.diff-marker {
-	width: 2%;
-}
-
-table.diff col.diff-content {
-	width: 48%;
-}
-
-table.diff td div {
-	/* Force-wrap very long lines such as URLs or page-widening char strings.*/
-	word-wrap: break-word;
-
-	/* As fallback (FF<3.5, Opera <10.5), scrollbars will be added for very wide cells
-	   instead of text overflowing or widening
-	*/
-	overflow: auto;
-}
diff --git a/resources/mediawiki.language/mediawiki.cldr.js b/resources/mediawiki.language/mediawiki.cldr.js
index 6660eca4f2..c3023cd5a0 100644
--- a/resources/mediawiki.language/mediawiki.cldr.js
+++ b/resources/mediawiki.language/mediawiki.cldr.js
@@ -1,8 +1,8 @@
 /**
- *  CLDR related utility methods
+ *  CLDR related utility methods.
  */
-( function( mw ) {
-	"use strict";
+( function ( mw ) {
+	'use strict';
 
 	var cldr = {
 		/**
@@ -10,19 +10,20 @@
 		 * In case none of the rules passed, we return pluralRules.length
 		 * That means it is the "other" form.
 		 * @param number
-		 * @param pluralRules
-		 * @return plural form index
+		 * @param {Array} pluralRules
+		 * @return {number} plural form index
 		 */
-		getPluralForm: function( number, pluralRules ) {
-			var pluralFormIndex = 0;
-			for ( pluralFormIndex = 0; pluralFormIndex < pluralRules.length; pluralFormIndex++ ) {
-				if ( mw.libs.pluralRuleParser( pluralRules[pluralFormIndex], number ) ) {
+		getPluralForm: function ( number, pluralRules ) {
+			var i;
+			for ( i = 0; i < pluralRules.length; i++ ) {
+				if ( mw.libs.pluralRuleParser( pluralRules[i], number ) ) {
 					break;
 				}
 			}
-			return pluralFormIndex;
+			return i;
 		}
 	};
 
 	mw.cldr = cldr;
-} )( mediaWiki );
+
+}( mediaWiki ) );
diff --git a/resources/mediawiki.language/mediawiki.language.init.js b/resources/mediawiki.language/mediawiki.language.init.js
index 30307a37de..937b89bb17 100644
--- a/resources/mediawiki.language/mediawiki.language.init.js
+++ b/resources/mediawiki.language/mediawiki.language.init.js
@@ -2,7 +2,7 @@
  * Base language object with methods for storing and getting
  * language data.
  */
-( function ( mw, $ ) {
+( function ( mw ) {
 
 	var language = {
 		/**
@@ -58,4 +58,4 @@
 
 	mw.language = language;
 
-}( mediaWiki, jQuery ) );
+}( mediaWiki ) );
diff --git a/resources/mediawiki.language/mediawiki.language.js b/resources/mediawiki.language/mediawiki.language.js
index 935d4ff6e6..514dbd5ef8 100644
--- a/resources/mediawiki.language/mediawiki.language.js
+++ b/resources/mediawiki.language/mediawiki.language.js
@@ -43,12 +43,14 @@ var language = {
 	 * @param forms array List of plural forms
 	 * @return string Correct form for quantifier in this language
 	 */
-	convertPlural: function( count, forms ) {
-		var pluralFormIndex = 0;
+	convertPlural: function ( count, forms ) {
+		var pluralRules,
+			pluralFormIndex = 0;
+
 		if ( !forms || forms.length === 0 ) {
 			return '';
 		}
-		var pluralRules = mw.language.getData( mw.config.get( 'wgUserLanguage' ), 'pluralRules' );
+		pluralRules = mw.language.getData( mw.config.get( 'wgUserLanguage' ), 'pluralRules' );
 		if ( !pluralRules ) {
 			// default fallback.
 			return ( count === 1 ) ? forms[0] : forms[1];
@@ -78,8 +80,8 @@ var language = {
 	 * @param {num} number Value to be converted
 	 * @param {boolean} integer Convert the return value to an integer
 	 */
-	convertNumber: function( num, integer ) {
-		var i, tmp, transformTable;
+	convertNumber: function ( num, integer ) {
+		var i, tmp, transformTable, numberString, convertedNumber;
 
 		if ( !mw.language.digitTransformTable ) {
 			return num;
@@ -97,8 +99,8 @@ var language = {
 			}
 			transformTable = tmp;
 		}
-		var numberString = '' + num;
-		var convertedNumber = '';
+		numberString = '' + num;
+		convertedNumber = '';
 		for ( i = 0; i < numberString.length; i++ ) {
 			if ( transformTable[ numberString[i] ] ) {
 				convertedNumber += transformTable[numberString[i]];
@@ -121,7 +123,7 @@ var language = {
 	 *
 	 * @return string
 	 */
-	gender: function( gender, forms ) {
+	gender: function ( gender, forms ) {
 		if ( !forms || forms.length === 0 ) {
 			return '';
 		}
diff --git a/resources/mediawiki.page/mediawiki.page.ready.js b/resources/mediawiki.page/mediawiki.page.ready.js
index 370c3a19c2..684f582f2f 100644
--- a/resources/mediawiki.page/mediawiki.page.ready.js
+++ b/resources/mediawiki.page/mediawiki.page.ready.js
@@ -1,24 +1,28 @@
-jQuery( document ).ready( function( $ ) {
+( function ( mw, $ ) {
+	$( function () {
+		var $sortableTables;
 
-	/* Emulate placeholder if not supported by browser */
-	if ( !( 'placeholder' in document.createElement( 'input' ) ) ) {
-		$( 'input[placeholder]' ).placeholder();
-	}
+		/* Emulate placeholder if not supported by browser */
+		if ( !( 'placeholder' in document.createElement( 'input' ) ) ) {
+			$( 'input[placeholder]' ).placeholder();
+		}
 
-	/* Enable makeCollapsible */
-	$( '.mw-collapsible' ).makeCollapsible();
+		/* Enable makeCollapsible */
+		$( '.mw-collapsible' ).makeCollapsible();
 
-	/* Lazy load jquery.tablesorter */
-	if ( $( 'table.sortable' ).length ) {
-		mw.loader.using( 'jquery.tablesorter', function() {
-			$( 'table.sortable' ).tablesorter();
-		});
-	}
+		/* Lazy load jquery.tablesorter */
+		$sortableTables = $( 'table.sortable' );
+		if ( $sortableTables.length ) {
+			mw.loader.using( 'jquery.tablesorter', function () {
+				$sortableTables.tablesorter();
+			});
+		}
 
-	/* Enable CheckboxShiftClick */
-	$( 'input[type=checkbox]:not(.noshiftselect)' ).checkboxShiftClick();
+		/* Enable CheckboxShiftClick */
+		$( 'input[type=checkbox]:not(.noshiftselect)' ).checkboxShiftClick();
 
-	/* Add accesskey hints to the tooltips */
-	mw.util.updateTooltipAccessKeys();
+		/* Add accesskey hints to the tooltips */
+		mw.util.updateTooltipAccessKeys();
 
-} );
+	} );
+}( mediaWiki, jQuery ) );
diff --git a/resources/mediawiki.page/mediawiki.page.watch.ajax.js b/resources/mediawiki.page/mediawiki.page.watch.ajax.js
index a7e059c419..39574939ff 100644
--- a/resources/mediawiki.page/mediawiki.page.watch.ajax.js
+++ b/resources/mediawiki.page/mediawiki.page.watch.ajax.js
@@ -24,13 +24,14 @@
 		otherAction = action === 'watch' ? 'unwatch' : 'watch';
 		accesskeyTip = $link.attr( 'title' ).match( mw.util.tooltipAccessKeyRegexp );
 		$li = $link.closest( 'li' );
+
 		/**
 		 * Trigger a 'watchpage' event for this List item.
 		 * Announce the otherAction value as the first param.
 		 * Used to monitor the state of watch link.
 		 * TODO: Revise when system wide hooks are implemented
 		 */
-		if( state === undefined ) {
+		if ( state === undefined ) {
 			$li.trigger( 'watchpage.mw', otherAction );
 		}
 
@@ -96,7 +97,7 @@
 
 	// Expose local methods
 	mw.page.watch = {
-		'updateWatchLink': updateWatchLink
+		updateWatchLink: updateWatchLink
 	};
 
 	$( document ).ready( function () {
@@ -134,7 +135,9 @@
 					otherAction = action === 'watch' ? 'unwatch' : 'watch';
 					$li = $link.closest( 'li' );
 
-					mw.notify( $.parseHTML( watchResponse.message ), { tag: 'watch-self' } );
+					mw.notify( $.parseHTML( watchResponse.message ), {
+						tag: 'watch-self'
+					} );
 
 					// Set link to opposite
 					updateWatchLink( $link, otherAction );
@@ -144,7 +147,7 @@
 					if ( watchResponse.watched !== undefined ) {
 						$( '#wpWatchthis' ).prop( 'checked', true );
 					} else {
-						$( '#wpWatchthis' ).removeProp( 'checked' );
+						$( '#wpWatchthis' ).prop( 'checked', false );
 					}
 				},
 				// Error
@@ -169,7 +172,7 @@
 
 				}
 			);
-		});
-	});
+		} );
+	} );
 
 }( mediaWiki, jQuery ) );
diff --git a/resources/mediawiki.special/mediawiki.special.block.js b/resources/mediawiki.special/mediawiki.special.block.js
index 6f79929b5d..077adcdbb6 100644
--- a/resources/mediawiki.special/mediawiki.special.block.js
+++ b/resources/mediawiki.special/mediawiki.special.block.js
@@ -1,46 +1,49 @@
-/* JavaScript for Special:Block */
+/**
+ * JavaScript for Special:Block
+ */
+( function ( mw, $ ) {
+	$( function ( $ ) {
 
-jQuery( function( $ ) {
+		var $blockTarget = $( '#mw-bi-target' ),
+			$anonOnlyRow = $( '#mw-input-wpHardBlock' ).closest( 'tr' ),
+			$enableAutoblockRow = $( '#mw-input-wpAutoBlock' ).closest( 'tr' ),
+			$hideUser = $( '#mw-input-wpHideUser' ).closest( 'tr' ),
+			$watchUser = $( '#mw-input-wpWatch' ).closest( 'tr' );
 
-	var	DO_INSTANT = true,
-		$blockTarget = $( '#mw-bi-target' ),
-		$anonOnlyRow = $( '#mw-input-wpHardBlock' ).closest( 'tr' ),
-		$enableAutoblockRow = $( '#mw-input-wpAutoBlock' ).closest( 'tr' ),
-		$hideUser = $( '#mw-input-wpHideUser' ).closest( 'tr' ),
-		$watchUser = $( '#mw-input-wpWatch' ).closest( 'tr' );
+		function updateBlockOptions( instant ) {
+			if ( !$blockTarget.length ) {
+				return;
+			}
 
-	var updateBlockOptions = function( instant ) {
-		if ( !$blockTarget.length ) {
-			return;
-		}
-
-		var blocktarget = $.trim( $blockTarget.val() );
-		var isEmpty = ( blocktarget === '' );
-		var isIp = mw.util.isIPv4Address( blocktarget, true ) || mw.util.isIPv6Address( blocktarget, true );
-		var isIpRange = isIp && blocktarget.match( /\/\d+$/ );
+			var blocktarget = $.trim( $blockTarget.val() ),
+				isEmpty = blocktarget === '',
+				isIp = mw.util.isIPv4Address( blocktarget, true ) || mw.util.isIPv6Address( blocktarget, true ),
+				isIpRange = isIp && blocktarget.match( /\/\d+$/ );
 
-		if ( isIp && !isEmpty ) {
-			$enableAutoblockRow.goOut( instant );
-			$hideUser.goOut( instant );
-		} else {
-			$enableAutoblockRow.goIn( instant );
-			$hideUser.goIn( instant );
-		}
-		if ( !isIp && !isEmpty ) {
-			$anonOnlyRow.goOut( instant );
-		} else {
-			$anonOnlyRow.goIn( instant );
+			if ( isIp && !isEmpty ) {
+				$enableAutoblockRow.goOut( instant );
+				$hideUser.goOut( instant );
+			} else {
+				$enableAutoblockRow.goIn( instant );
+				$hideUser.goIn( instant );
+			}
+			if ( !isIp && !isEmpty ) {
+				$anonOnlyRow.goOut( instant );
+			} else {
+				$anonOnlyRow.goIn( instant );
+			}
+			if ( isIpRange && !isEmpty ) {
+				$watchUser.goOut( instant );
+			} else {
+				$watchUser.goIn( instant );
+			}
 		}
-		if ( isIpRange && !isEmpty ) {
-			$watchUser.goOut( instant );
-		} else {
-			$watchUser.goIn( instant );
-		}
-	};
 
-	// Bind functions so they're checked whenever stuff changes
-	$blockTarget.keyup( updateBlockOptions );
+		// Bind functions so they're checked whenever stuff changes
+		$blockTarget.keyup( updateBlockOptions );
+
+		// Call them now to set initial state (ie. Special:Block/Foobar?wpBlockExpiry=2+hours)
+		updateBlockOptions( /* instant= */ true );
+	} );
+}( mediaWiki, jQuery ) );
 
-	// Call them now to set initial state (ie. Special:Block/Foobar?wpBlockExpiry=2+hours)
-	updateBlockOptions( DO_INSTANT );
-});
diff --git a/resources/mediawiki.special/mediawiki.special.javaScriptTest.js b/resources/mediawiki.special/mediawiki.special.javaScriptTest.js
index 808d5fe89f..a560ca95aa 100644
--- a/resources/mediawiki.special/mediawiki.special.javaScriptTest.js
+++ b/resources/mediawiki.special/mediawiki.special.javaScriptTest.js
@@ -8,7 +8,7 @@
 		// (only if a framework was found, not on error pages).
 		$( '#mw-javascripttest-summary.mw-javascripttest-frameworkfound' ).append( function () {
 
-			var	$html = $( '<p><label for="useskin">'
+			var $html = $( '<p><label for="useskin">'
 					+ mw.message( 'javascripttest-pagetext-skins' ).escaped()
 					+ ' '
 					+ '</label></p>' ),
diff --git a/resources/mediawiki.special/mediawiki.special.js b/resources/mediawiki.special/mediawiki.special.js
index 3526cef413..8edb1cbe25 100644
--- a/resources/mediawiki.special/mediawiki.special.js
+++ b/resources/mediawiki.special/mediawiki.special.js
@@ -1 +1,5 @@
-mw.special = {};
+/*
+ * Namespace for mediawiki.special.* modules
+ */
+
+mediaWiki.special = {};
diff --git a/resources/mediawiki.special/mediawiki.special.movePage.js b/resources/mediawiki.special/mediawiki.special.movePage.js
index 68c2ed078e..7a55806607 100644
--- a/resources/mediawiki.special/mediawiki.special.movePage.js
+++ b/resources/mediawiki.special/mediawiki.special.movePage.js
@@ -1,5 +1,7 @@
-/* JavaScript for Special:MovePage */
+/**
+ * JavaScript for Special:MovePage
+ */
 
 jQuery( function( $ ) {
 	$( '#wpReason, #wpNewTitleMain' ).byteLimit();
-});
+} );
diff --git a/resources/mediawiki.special/mediawiki.special.preferences.js b/resources/mediawiki.special/mediawiki.special.preferences.js
index 0804825089..989a986b22 100644
--- a/resources/mediawiki.special/mediawiki.special.preferences.js
+++ b/resources/mediawiki.special/mediawiki.special.preferences.js
@@ -2,174 +2,180 @@
  * JavaScript for Special:Preferences
  */
 jQuery( document ).ready( function ( $ ) {
-$( '#prefsubmit' ).attr( 'id', 'prefcontrol' );
-var $preftoc = $('<ul id="preftoc"></ul>');
-var $preferences = $( '#preferences' )
-	.addClass( 'jsprefs' )
-	.before( $preftoc );
-
-var $fieldsets = $preferences.children( 'fieldset' )
-	.hide()
-	.addClass( 'prefsection' );
-
-var $legends = $fieldsets.children( 'legend' )
-	.addClass( 'mainLegend' );
-
-/**
- * It uses document.getElementById for security reasons (html injections in
- * jQuery()).
- *
- * @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
- * open section. Set mode 'noHash' to surpress this.
- */
-function switchPrefTab( name, mode ) {
-	var $tab, scrollTop;
-	// Handle hash manually to prevent jumping,
-	// therefore save and restore scrollTop to prevent jumping.
-	scrollTop = $( window ).scrollTop();
-	if ( mode !== 'noHash' ) {
-		window.location.hash = '#mw-prefsection-' + name;
-	}
-	$( window ).scrollTop( scrollTop );
-
-	$preftoc.find( 'li' ).removeClass( 'selected' );
-	$tab = $( document.getElementById( 'preftab-' + name ) );
-	if ( $tab.length ) {
-		$tab.parent().addClass( 'selected' );
-		$preferences.children( 'fieldset' ).hide();
-		$( document.getElementById( 'mw-prefsection-' + name ) ).show();
+	var $preftoc, $preferences, $fieldsets, $legends,
+		hash,
+		$tzSelect, $tzTextbox, $localtimeHolder, servertime;
+
+	$( '#prefsubmit' ).attr( 'id', 'prefcontrol' );
+
+		$preftoc = $('<ul id="preftoc"></ul>'),
+		$preferences = $( '#preferences' )
+			.addClass( 'jsprefs' )
+			.before( $preftoc ),
+		$fieldsets = $preferences.children( 'fieldset' )
+			.hide()
+			.addClass( 'prefsection' ),
+		$legends = $fieldsets
+			.children( 'legend' )
+			.addClass( 'mainLegend' );
+
+	/**
+	 * It uses document.getElementById for security reasons (html injections in
+	 * jQuery()).
+	 *
+	 * @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
+	 * open section. Set mode 'noHash' to surpress this.
+	 */
+	function switchPrefTab( name, mode ) {
+		var $tab, scrollTop;
+		// Handle hash manually to prevent jumping,
+		// therefore save and restore scrollTop to prevent jumping.
+		scrollTop = $( window ).scrollTop();
+		if ( mode !== 'noHash' ) {
+			window.location.hash = '#mw-prefsection-' + name;
+		}
+		$( window ).scrollTop( scrollTop );
+
+		$preftoc.find( 'li' ).removeClass( 'selected' );
+		$tab = $( document.getElementById( 'preftab-' + name ) );
+		if ( $tab.length ) {
+			$tab.parent().addClass( 'selected' );
+			$preferences.children( 'fieldset' ).hide();
+			$( document.getElementById( 'mw-prefsection-' + name ) ).show();
+		}
 	}
-}
 
-// Populate the prefToc
-$legends.each( function ( i, legend ) {
-	var $legend = $(legend);
-	if ( i === 0 ) {
-		$legend.parent().show();
+	// Populate the prefToc
+	$legends.each( function ( i, legend ) {
+		var $legend = $(legend),
+			ident, $li, $a;
+		if ( i === 0 ) {
+			$legend.parent().show();
+		}
+		ident = $legend.parent().attr( 'id' );
+
+		$li = $( '<li>' )
+			.addClass( i === 0 ? 'selected' : '' );
+		$a = $( '<a>' )
+			.attr( {
+				id: ident.replace( 'mw-prefsection', 'preftab' ),
+				href: '#' + ident
+			} )
+			.text( $legend.text() );
+		$li.append( $a );
+		$preftoc.append( $li );
+	} );
+
+	// If we've reloaded the page or followed an open-in-new-window,
+	// make the selected tab visible.
+	hash = window.location.hash;
+	if ( hash.match( /^#mw-prefsection-[\w\-]+/ ) ) {
+		switchPrefTab( hash.replace( '#mw-prefsection-' , '' ) );
 	}
-	var ident = $legend.parent().attr( 'id' );
-
-	var $li = $( '<li/>', {
-		'class' : ( i === 0 ) ? 'selected' : null
-	});
-	var $a = $( '<a/>', {
-		text : $legend.text(),
-		id : ident.replace( 'mw-prefsection', 'preftab' ),
-		href : '#' + ident
-	});
-	$li.append( $a );
-	$preftoc.append( $li );
-} );
 
-// If we've reloaded the page or followed an open-in-new-window,
-// make the selected tab visible.
-var hash = window.location.hash;
-if ( hash.match( /^#mw-prefsection-[\w-]+/ ) ) {
-	switchPrefTab( hash.replace( '#mw-prefsection-' , '' ) );
-}
-
-// In browsers that support the onhashchange event we will not bind click
-// handlers and instead let the browser do the default behavior (clicking the
-// <a href="#.."> will naturally set the hash, handled by onhashchange.
-// But other things that change the hash will also be catched (e.g. using
-// the Back and Forward browser navigation).
-if ( 'onhashchange' in window ) {
-	$(window).on( 'hashchange' , function () {
-		var hash = window.location.hash;
-		if ( hash.match( /^#mw-prefsection-[\w-]+/ ) ) {
-			switchPrefTab( hash.replace( '#mw-prefsection-', '' ) );
-		} else if ( hash === '' ) {
-			switchPrefTab( 'personal', 'noHash' );
-		}
-	});
-// In older browsers we'll bind a click handler as fallback.
-// We must not have onhashchange *and* the click handlers, other wise
-// the click handler calls switchPrefTab() which sets the hash value,
-// which triggers onhashcange and calls switchPrefTab() again.
-} else {
-	$preftoc.on( 'click', 'li a', function ( e ) {
-		switchPrefTab( $( this ).attr( 'href' ).replace( '#mw-prefsection-', '' ) );
-		e.preventDefault();
-	});
-}
-
-/**
-* Timezone functions.
-* Guesses Timezone from browser and updates fields onchange
-*/
-
-var $tzSelect = $( '#mw-input-wptimecorrection' );
-var $tzTextbox = $( '#mw-input-wptimecorrection-other' );
-
-var $localtimeHolder = $( '#wpLocalTime' );
-var servertime = parseInt( $( 'input[name=wpServerTime]' ).val(), 10 );
-var minuteDiff = 0;
-
-var minutesToHours = function ( min ) {
-	var tzHour = Math.floor( Math.abs( min ) / 60 );
-	var tzMin = Math.abs( min ) % 60;
-	var tzString = ( ( min >= 0 ) ? '' : '-' ) + ( ( tzHour < 10 ) ? '0' : '' ) + tzHour +
-		':' + ( ( tzMin < 10 ) ? '0' : '' ) + tzMin;
-	return tzString;
-};
-
-var hoursToMinutes = function ( hour ) {
-	var arr = hour.split( ':' );
-	arr[0] = parseInt( arr[0], 10 );
-
-	var minutes;
-	if ( arr.length == 1 ) {
-		// Specification is of the form [-]XX
-		minutes = arr[0] * 60;
+	// In browsers that support the onhashchange event we will not bind click
+	// handlers and instead let the browser do the default behavior (clicking the
+	// <a href="#.."> will naturally set the hash, handled by onhashchange.
+	// But other things that change the hash will also be catched (e.g. using
+	// the Back and Forward browser navigation).
+	if ( 'onhashchange' in window ) {
+		$(window).on( 'hashchange' , function () {
+			var hash = window.location.hash;
+			if ( hash.match( /^#mw-prefsection-[\w\-]+/ ) ) {
+				switchPrefTab( hash.replace( '#mw-prefsection-', '' ) );
+			} else if ( hash === '' ) {
+				switchPrefTab( 'personal', 'noHash' );
+			}
+		});
+	// In older browsers we'll bind a click handler as fallback.
+	// We must not have onhashchange *and* the click handlers, other wise
+	// the click handler calls switchPrefTab() which sets the hash value,
+	// which triggers onhashcange and calls switchPrefTab() again.
 	} else {
-		// Specification is of the form [-]XX:XX
-		minutes = Math.abs( arr[0] ) * 60 + parseInt( arr[1], 10 );
-		if ( arr[0] < 0 ) {
-			minutes *= -1;
-		}
+		$preftoc.on( 'click', 'li a', function ( e ) {
+			switchPrefTab( $( this ).attr( 'href' ).replace( '#mw-prefsection-', '' ) );
+			e.preventDefault();
+		});
 	}
-	// Gracefully handle non-numbers.
-	if ( isNaN( minutes ) ) {
-		return 0;
-	} else {
-		return minutes;
+
+	/**
+	* Timezone functions.
+	* Guesses Timezone from browser and updates fields onchange
+	*/
+
+	$tzSelect = $( '#mw-input-wptimecorrection' );
+	$tzTextbox = $( '#mw-input-wptimecorrection-other' );
+	$localtimeHolder = $( '#wpLocalTime' );
+	servertime = parseInt( $( 'input[name="wpServerTime"]' ).val(), 10 );
+
+	function minutesToHours( min ) {
+		var tzHour = Math.floor( Math.abs( min ) / 60 ),
+			tzMin = Math.abs( min ) % 60,
+			tzString = ( ( min >= 0 ) ? '' : '-' ) + ( ( tzHour < 10 ) ? '0' : '' ) + tzHour +
+				':' + ( ( tzMin < 10 ) ? '0' : '' ) + tzMin;
+		return tzString;
 	}
-};
-
-var updateTimezoneSelection = function () {
-	var type = $tzSelect.val();
-	if ( type == 'guess' ) {
-		// Get browser timezone & fill it in
-		minuteDiff = -new Date().getTimezoneOffset();
-		$tzTextbox.val( minutesToHours( minuteDiff ) );
-		$tzSelect.val( 'other' );
-		$tzTextbox.get( 0 ).disabled = false;
-	} else if ( type == 'other' ) {
-		// Grab data from the textbox, parse it.
-		minuteDiff = hoursToMinutes( $tzTextbox.val() );
-	} else {
-		// Grab data from the $tzSelect value
-		minuteDiff = parseInt( type.split( '|' )[1], 10 ) || 0;
-		$tzTextbox.val( minutesToHours( minuteDiff ) );
+
+	function hoursToMinutes( hour ) {
+		var minutes,
+			arr = hour.split( ':' );
+
+		arr[0] = parseInt( arr[0], 10 );
+
+		if ( arr.length === 1 ) {
+			// Specification is of the form [-]XX
+			minutes = arr[0] * 60;
+		} else {
+			// Specification is of the form [-]XX:XX
+			minutes = Math.abs( arr[0] ) * 60 + parseInt( arr[1], 10 );
+			if ( arr[0] < 0 ) {
+				minutes *= -1;
+			}
+		}
+		// Gracefully handle non-numbers.
+		if ( isNaN( minutes ) ) {
+			return 0;
+		} else {
+			return minutes;
+		}
 	}
 
-	// Determine local time from server time and minutes difference, for display.
-	var localTime = servertime + minuteDiff;
+	function updateTimezoneSelection () {
+		var minuteDiff, localTime,
+			type = $tzSelect.val();
+
+		if ( type === 'guess' ) {
+			// Get browser timezone & fill it in
+			minuteDiff = -( new Date().getTimezoneOffset() );
+			$tzTextbox.val( minutesToHours( minuteDiff ) );
+			$tzSelect.val( 'other' );
+			$tzTextbox.prop( 'disabled', false );
+		} else if ( type === 'other' ) {
+			// Grab data from the textbox, parse it.
+			minuteDiff = hoursToMinutes( $tzTextbox.val() );
+		} else {
+			// Grab data from the $tzSelect value
+			minuteDiff = parseInt( type.split( '|' )[1], 10 ) || 0;
+			$tzTextbox.val( minutesToHours( minuteDiff ) );
+		}
 
-	// Bring time within the [0,1440) range.
-	while ( localTime < 0 ) {
-		localTime += 1440;
+		// Determine local time from server time and minutes difference, for display.
+		localTime = servertime + minuteDiff;
+
+		// Bring time within the [0,1440) range.
+		while ( localTime < 0 ) {
+			localTime += 1440;
+		}
+		while ( localTime >= 1440 ) {
+			localTime -= 1440;
+		}
+		$localtimeHolder.text( minutesToHours( localTime ) );
 	}
-	while ( localTime >= 1440 ) {
-		localTime -= 1440;
+
+	if ( $tzSelect.length && $tzTextbox.length ) {
+		$tzSelect.change( updateTimezoneSelection );
+		$tzTextbox.blur( updateTimezoneSelection );
+		updateTimezoneSelection();
 	}
-	$localtimeHolder.text( minutesToHours( localTime ) );
-};
-
-if ( $tzSelect.length && $tzTextbox.length ) {
-	$tzSelect.change( function () { updateTimezoneSelection(); } );
-	$tzTextbox.blur( function () { updateTimezoneSelection(); } );
-	updateTimezoneSelection();
-}
 } );
diff --git a/resources/mediawiki.special/mediawiki.special.recentchanges.js b/resources/mediawiki.special/mediawiki.special.recentchanges.js
index 7996d935bd..3cba9d3972 100644
--- a/resources/mediawiki.special/mediawiki.special.recentchanges.js
+++ b/resources/mediawiki.special/mediawiki.special.recentchanges.js
@@ -1,14 +1,12 @@
-/* JavaScript for Special:RecentChanges */
+/**
+ * JavaScript for Special:RecentChanges
+ */
 ( function ( mw, $ ) {
+	var rc,
+		$checkboxes,
+		$select;
 
-	var checkboxes = [ 'nsassociated', 'nsinvert' ];
-
-	/**
-	 * @var select {jQuery}
-	 */
-	var $select = null;
-
-	var rc = mw.special.recentchanges = {
+	rc = {
 
 		/**
 		 * Handler to disable/enable the namespace selector checkboxes when the
@@ -16,24 +14,24 @@
 		 */
 		updateCheckboxes: function () {
 			// The option element for the 'all' namespace has an empty value
-			var isAllNS = $select.find('option:selected').val() === '';
+			var isAllNS = $select.find( 'option:selected' ).val() === '';
 
 			// Iterates over checkboxes and propagate the selected option
-			$.each( checkboxes, function ( i, id ) {
-				$( '#' + id ).prop( 'disabled', isAllNS );
-			});
+			$checkboxes.prop( 'disabled', isAllNS );
 		},
 
 		init: function () {
-			// Populate
 			$select = $( '#namespace' );
+			$checkboxes = $( '#nsassociated, #nsinvert' );
 
 			// Bind to change event, and trigger once to set the initial state of the checkboxes.
-			$select.change( rc.updateCheckboxes ).change();
+			rc.updateCheckboxes();
+			$select.change( rc.updateCheckboxes );
 		}
 	};
 
-	// Run when document is ready
 	$( rc.init );
 
+	mw.special.recentchanges = rc;
+
 }( mediaWiki, jQuery ) );
diff --git a/resources/mediawiki.special/mediawiki.special.search.js b/resources/mediawiki.special/mediawiki.special.search.js
index 04954e8dc1..0cca26dba4 100644
--- a/resources/mediawiki.special/mediawiki.special.search.js
+++ b/resources/mediawiki.special/mediawiki.special.search.js
@@ -1,49 +1,53 @@
 /*
  * JavaScript for Special:Search
  */
-( function( $, mw ) { $( function() {
+( function ( $, mw ) {
+	$( function () {
+		var $checkboxes, $headerLinks;
 
-// Emulate HTML5 autofocus behavior in non HTML5 compliant browsers
-if ( !( 'autofocus' in document.createElement( 'input' ) ) ) {
-	$( 'input[autofocus]:first' ).focus();
-}
+		// Emulate HTML5 autofocus behavior in non HTML5 compliant browsers
+		if ( !( 'autofocus' in document.createElement( 'input' ) ) ) {
+			$( 'input[autofocus]' ).eq( 0 ).focus();
+		}
 
-// Create check all/none button
-var $checkboxes = $('#powersearch input[id^=mw-search-ns]');
-$('#mw-search-togglebox').append(
-	$('<label />')
-		.text(mw.msg('powersearch-togglelabel'))
-).append(
-	$('<input type="button" />')
-		.attr('id', 'mw-search-toggleall')
-		.attr('value', mw.msg('powersearch-toggleall'))
-		.click( function() {
-			$checkboxes.prop('checked', true);
-		} )
-).append(
-	$('<input type="button" />')
-		.attr('id', 'mw-search-togglenone')
-		.attr('value', mw.msg('powersearch-togglenone'))
-		.click( function() {
-			$checkboxes.prop('checked', false);
-		} )
-);
+		// Create check all/none button
+		$checkboxes = $('#powersearch input[id^=mw-search-ns]');
+		$('#mw-search-togglebox').append(
+			$('<label>')
+				.text(mw.msg('powersearch-togglelabel'))
+		).append(
+			$('<input type="button" />')
+				.attr( 'id', 'mw-search-toggleall' )
+				.prop( 'value', mw.msg('powersearch-toggleall' ) )
+				.click( function () {
+					$checkboxes.prop('checked', true);
+				} )
+		).append(
+			$('<input type="button" />')
+				.attr( 'id', 'mw-search-togglenone' )
+				.prop( 'value', mw.msg('powersearch-togglenone' ) )
+				.click( function() {
+					$checkboxes.prop( 'checked', false );
+				} )
+		);
 
-// Change the header search links to what user entered
-var headerLinks = $('.search-types a');
-$('#searchText, #powerSearchText').change(function() {
-	var searchterm = $(this).val();
-	headerLinks.each( function() {
-		var parts = $(this).attr('href').split( 'search=' );
-		var lastpart = '';
-		var prefix = 'search=';
-		if( parts.length > 1 && parts[1].indexOf('&') >= 0 ) {
-			lastpart = parts[1].substring( parts[1].indexOf('&') );
-		} else {
-			prefix = '&search=';
-		}
-		this.href = parts[0] + prefix + encodeURIComponent( searchterm ) + lastpart;
-	});
-}).trigger('change');
+		// Change the header search links to what user entered
+		$headerLinks = $( '.search-types a' );
+		$( '#searchText, #powerSearchText' ).change( function () {
+			var searchterm = $(this).val();
+			$headerLinks.each( function () {
+				var parts = $(this).attr('href').split( 'search=' ),
+					lastpart = '',
+					prefix = 'search=';
+				if ( parts.length > 1 && parts[1].indexOf('&') >= 0 ) {
+					lastpart = parts[1].substring( parts[1].indexOf('&') );
+				} else {
+					prefix = '&search=';
+				}
+				this.href = parts[0] + prefix + encodeURIComponent( searchterm ) + lastpart;
+			});
+		}).trigger( 'change' );
+
+	} );
 
-} ); } )( jQuery, mediaWiki );
+}( jQuery, mediaWiki ) );
diff --git a/resources/mediawiki.special/mediawiki.special.undelete.js b/resources/mediawiki.special/mediawiki.special.undelete.js
index 33b802754d..c6e5d614ec 100644
--- a/resources/mediawiki.special/mediawiki.special.undelete.js
+++ b/resources/mediawiki.special/mediawiki.special.undelete.js
@@ -1,10 +1,11 @@
 /*
  * JavaScript for Specical:Undelete
  */
-jQuery( document ).ready( function( $ ) {
-	$( '#mw-undelete-invert' ).click( function( e ) {
+jQuery( document ).ready( function ( $ ) {
+	$( '#mw-undelete-invert' ).click( function ( e ) {
 		e.preventDefault();
-		$( '#undelete' ).find( 'input:checkbox' )
-			.prop( 'checked', function( i, val ) { return !val; } );
+		$( '#undelete input[type="checkbox"]' ).prop( 'checked', function ( i, val ) {
+			return !val;
+		} );
 	} );
 } );
diff --git a/resources/mediawiki.special/mediawiki.special.upload.js b/resources/mediawiki.special/mediawiki.special.upload.js
index 63e8971308..b05fd71a47 100644
--- a/resources/mediawiki.special/mediawiki.special.upload.js
+++ b/resources/mediawiki.special/mediawiki.special.upload.js
@@ -11,7 +11,7 @@
 		 * Is the FileAPI available with sufficient functionality?
 		 */
 		function hasFileAPI() {
-			return typeof window.FileReader !== 'undefined';
+			return window.FileReader !== undefined;
 		}
 
 		/**
@@ -43,22 +43,25 @@
 		 * @param {File} file
 		 */
 		function showPreview( file ) {
-			var	previewSize = 180,
+			var $canvas,
+				ctx,
+				meta,
+				previewSize = 180,
 				thumb = $( '<div id="mw-upload-thumbnail" class="thumb tright">' +
 							'<div class="thumbinner">' +
 								'<div class="mw-small-spinner" style="width: 180px; height: 180px"></div>' +
 								'<div class="thumbcaption"><div class="filename"></div><div class="fileinfo"></div></div>' +
 							'</div>' +
 						'</div>' );
+
 			thumb.find( '.filename' ).text( file.name ).end()
 				.find( '.fileinfo' ).text( prettySize( file.size ) ).end();
 
-			var	$canvas = $('<canvas width="' + previewSize + '" height="' + previewSize + '" ></canvas>'),
-				ctx = $canvas[0].getContext( '2d' );
+			$canvas = $('<canvas width="' + previewSize + '" height="' + previewSize + '" ></canvas>');
+			ctx = $canvas[0].getContext( '2d' );
 			$( '#mw-htmlform-source' ).parent().prepend( thumb );
 
-			var meta;
-			fetchPreview( file, function( dataURL ) {
+			fetchPreview( file, function ( dataURL ) {
 				var	img = new Image(),
 					rotation = 0;
 
@@ -79,7 +82,8 @@
 				}
 
 				img.onload = function () {
-					var width, height, x, y, dx, dy, logicalWidth, logicalHeight;
+					var info, width, height, x, y, dx, dy, logicalWidth, logicalHeight;
+
 					// Fit the image within the previewSizexpreviewSize box
 					if ( img.width > img.height ) {
 						width = previewSize;
@@ -129,12 +133,14 @@
 					thumb.find('.mw-small-spinner').replaceWith($canvas);
 
 					// Image size
-					var info = mw.msg( 'widthheight', logicalWidth, logicalHeight ) +
+					info = mw.msg( 'widthheight', logicalWidth, logicalHeight ) +
 						', ' + prettySize( file.size );
+
 					$( '#mw-upload-thumbnail .fileinfo' ).text( info );
 				};
 				img.src = dataURL;
 			}, mw.config.get( 'wgFileCanRotate' ) ? function ( data ) {
+				/*jshint camelcase: false, nomen: false */
 				try {
 					meta = mw.libs.jpegmeta( data, file.fileName );
 					meta._binary_data = null;
@@ -171,9 +177,10 @@
 				// However, our JPEG metadata library wants a string.
 				// So, this is going to be an ugly conversion.
 				reader.onload = function() {
-					var buffer = new Uint8Array( reader.result ),
+					var i,
+						buffer = new Uint8Array( reader.result ),
 						string = '';
-					for ( var i = 0; i < buffer.byteLength; i++ ) {
+					for ( i = 0; i < buffer.byteLength; i++ ) {
 						string += String.fromCharCode( buffer[i] );
 					}
 					callbackBinary( string );
@@ -196,7 +203,7 @@
 			} else {
 				// This ends up decoding the file to base-64 and back again, which
 				// feels horribly inefficient.
-				reader.onload = function() {
+				reader.onload = function () {
 					callback( reader.result );
 				};
 				reader.readAsDataURL( file );
@@ -230,22 +237,29 @@
 		 * Check if the file does not exceed the maximum size
 		 */
 		function checkMaxUploadSize( file ) {
+			var maxSize, $error;
+
 			function getMaxUploadSize( type ) {
 				var sizes = mw.config.get( 'wgMaxUploadSize' );
+
 				if ( sizes[type] !== undefined ) {
 					return sizes[type];
 				}
 				return sizes['*'];
 			}
+
 			$( '.mw-upload-source-error' ).remove();
 
-			var maxSize = getMaxUploadSize( 'file' );
+			maxSize = getMaxUploadSize( 'file' );
 			if ( file.size > maxSize ) {
-				var error = $( '<p class="error mw-upload-source-error" id="wpSourceTypeFile-error">' +
-						mw.message( 'largefileserver', file.size, maxSize ).escaped() + '</p>' );
-				$( '#wpUploadFile' ).after( error );
+				$error = $( '<p class="error mw-upload-source-error" id="wpSourceTypeFile-error">' +
+					mw.message( 'largefileserver', file.size, maxSize ).escaped() + '</p>' );
+
+				$( '#wpUploadFile' ).after( $error );
+
 				return false;
 			}
+
 			return true;
 		}
 
@@ -277,22 +291,29 @@
 	 * Disable all upload source fields except the selected one
 	 */
 	$( function ( $ ) {
-		var i, row,
-			rows = $( '.mw-htmlform-field-UploadSourceField' );
-		for ( i = rows.length; i; i-- ) {
-			row = rows[i - 1];
-			$( 'input[name="wpSourceType"]', row ).change( ( function () {
-				var currentRow = row; // Store current row in our own scope
-				return function () {
-					$( '.mw-upload-source-error' ).remove();
-					if ( this.checked ) {
-						// Disable all inputs
-						$( 'input[name!="wpSourceType"]', rows ).prop( 'disabled', true );
-						// Re-enable the current one
-						$( 'input', currentRow ).prop( 'disabled', false );
-					}
-				};
-			}() ) );
+		var i, $row,
+			$rows = $( '.mw-htmlform-field-UploadSourceField' );
+
+		function createHandler( $currentRow ) {
+			/**
+			 * @param {jQuery.Event}
+			 */
+			return function () {
+				$( '.mw-upload-source-error' ).remove();
+				if ( this.checked ) {
+					// Disable all inputs
+					$rows.find( 'input[name!="wpSourceType"]' ).prop( 'disabled', true );
+					// Re-enable the current one
+					$currentRow.find( 'input' ).prop( 'disabled', false );
+				}
+			};
+		}
+
+		for ( i = $rows.length; i; i-- ) {
+			$row = $rows.eq(i - 1);
+			$row
+				.find( 'input[name="wpSourceType"]' )
+				.change( createHandler( $row ) );
 		}
 	} );
 
diff --git a/resources/mediawiki/mediawiki.Title.js b/resources/mediawiki/mediawiki.Title.js
index 33cca585bf..dad6021906 100644
--- a/resources/mediawiki/mediawiki.Title.js
+++ b/resources/mediawiki/mediawiki.Title.js
@@ -133,11 +133,11 @@ var
 		// In normal browsers the match-array contains null/undefined if there's no match,
 		// IE returns an empty string.
 		var matches = s.match( /^(?:([^:]+):)?(.*?)(?:\.(\w+))?$/ ),
-			ns_match = getNsIdByName( matches[1] );
+			nsMatch = getNsIdByName( matches[1] );
 
 		// Namespace must be valid, and title must be a non-empty string.
-		if ( ns_match && typeof matches[2] === 'string' && matches[2] !== '' ) {
-			title.ns = ns_match;
+		if ( nsMatch && typeof matches[2] === 'string' && matches[2] !== '' ) {
+			title.ns = nsMatch;
 			title.name = fixName( matches[2] );
 			if ( typeof matches[3] === 'string' && matches[3] !== '' ) {
 				title.ext = fixExt( matches[3] );
diff --git a/resources/mediawiki/mediawiki.feedback.js b/resources/mediawiki/mediawiki.feedback.js
index 634d02b14f..1afe51eff6 100644
--- a/resources/mediawiki/mediawiki.feedback.js
+++ b/resources/mediawiki/mediawiki.feedback.js
@@ -1,5 +1,5 @@
 /**
- * mediawiki.Feedback
+ * mediawiki.feedback
  *
  * @author Ryan Kaldari, 2010
  * @author Neil Kandalgaonkar, 2010-11
@@ -68,17 +68,28 @@
 
 	mw.Feedback.prototype = {
 		setup: function () {
-			var fb = this;
+			var $feedbackPageLink,
+				$bugNoteLink,
+				$bugsListLink,
+				fb = this;
 
-			var $feedbackPageLink = $( '<a>' )
-				.attr( { 'href': fb.title.getUrl(), 'target': '_blank' } )
-				.css( { 'white-space': 'nowrap' } );
+			$feedbackPageLink = $( '<a>' )
+				.attr( {
+					href: fb.title.getUrl(),
+					target: '_blank'
+				} )
+				.css( {
+					whiteSpace: 'nowrap'
+				} );
 
-			var $bugNoteLink = $( '<a>' ).attr( { 'href': '#' } ).click( function () {
+			$bugNoteLink = $( '<a>' ).attr( { href: '#' } ).click( function () {
 				fb.displayBugs();
 			} );
 
-			var $bugsListLink = $( '<a>' ).attr( { 'href': fb.bugsListLink, 'target': '_blank' } );
+			$bugsListLink = $( '<a>' ).attr( {
+				href: fb.bugsListLink,
+				target: '_blank'
+			} );
 
 			// TODO: Use a stylesheet instead of these inline styles
 			this.$dialog =
@@ -108,7 +119,7 @@
 					),
 					$( '<div class="feedback-mode feedback-submitting" style="text-align: center; margin: 3em 0;"></div>' ).append(
 						mw.msg( 'feedback-adding' ),
-						$( '<br/>' ),
+						$( '<br>' ),
 						$( '<span class="feedback-spinner"></span>' )
 					),
 					$( '<div class="feedback-mode feedback-thanks" style="text-align: center; margin:1em"></div>' ).msg(
@@ -148,9 +159,9 @@
 		},
 
 		displayBugs: function () {
-			var fb = this;
+			var fb = this,
+				bugsButtons = {};
 			this.display( 'bugs' );
-			var bugsButtons = {};
 			bugsButtons[ mw.msg( 'feedback-bugnew' ) ] = function () {
 				window.open( fb.bugsLink, '_blank' );
 			};
@@ -163,9 +174,9 @@
 		},
 
 		displayThanks: function () {
-			var fb = this;
+			var fb = this,
+				closeButton = {};
 			this.display( 'thanks' );
-			var closeButton = {};
 			closeButton[ mw.msg( 'feedback-close' ) ] = function () {
 				fb.$dialog.dialog( 'close' );
 			};
@@ -181,14 +192,14 @@
 		 *	message: {String}
 		 */
 		displayForm: function ( contents ) {
-			var fb = this;
+			var fb = this,
+				formButtons = {};
 			this.subjectInput.value = ( contents && contents.subject ) ? contents.subject : '';
 			this.messageInput.value = ( contents && contents.message ) ? contents.message : '';
 
 			this.display( 'form' );
 
 			// Set up buttons for dialog box. We have to do it the hard way since the json keys are localized
-			var formButtons = {};
 			formButtons[ mw.msg( 'feedback-submit' ) ] = function () {
 				fb.submit();
 			};
@@ -199,10 +210,10 @@
 		},
 
 		displayError: function ( message ) {
-			var fb = this;
+			var fb = this,
+				closeButton = {};
 			this.display( 'error' );
 			this.$dialog.find( '.feedback-error-msg' ).msg( message );
-			var closeButton = {};
 			closeButton[ mw.msg( 'feedback-close' ) ] = function () {
 				fb.$dialog.dialog( 'close' );
 			};
@@ -231,7 +242,7 @@
 				}
 			}
 
-			function err( code, info ) {
+			function err() {
 				// ajax request failed
 				fb.displayError( 'feedback-error3' );
 			}
diff --git a/resources/mediawiki/mediawiki.hidpi.js b/resources/mediawiki/mediawiki.hidpi.js
index 1979573047..ecee450c85 100644
--- a/resources/mediawiki/mediawiki.hidpi.js
+++ b/resources/mediawiki/mediawiki.hidpi.js
@@ -1,5 +1,5 @@
-$( function() {
+jQuery( function ( $ ) {
 	// Apply hidpi images on DOM-ready
 	// Some may have already partly preloaded at low resolution.
 	$( 'body' ).hidpi();
-} );
\ No newline at end of file
+} );
diff --git a/resources/mediawiki/mediawiki.htmlform.js b/resources/mediawiki/mediawiki.htmlform.js
index a4753b992c..83bf2e3a2a 100644
--- a/resources/mediawiki/mediawiki.htmlform.js
+++ b/resources/mediawiki/mediawiki.htmlform.js
@@ -1,64 +1,62 @@
 /**
- * Utility functions for jazzing up HTMLForm elements
+ * Utility functions for jazzing up HTMLForm elements.
  */
 ( function ( $ ) {
 
-/**
- * jQuery plugin to fade or snap to visible state.
- *
- * @param boolean instantToggle (optional)
- * @return jQuery
- */
-$.fn.goIn = function ( instantToggle ) {
-	if ( instantToggle === true ) {
-		return $(this).show();
-	}
-	return $(this).stop( true, true ).fadeIn();
-};
-
-/**
- * jQuery plugin to fade or snap to hiding state.
- *
- * @param boolean instantToggle (optional)
- * @return jQuery
- */
-$.fn.goOut = function ( instantToggle ) {
-	if ( instantToggle === true ) {
-		return $(this).hide();
-	}
-	return $(this).stop( true, true ).fadeOut();
-};
-
-/**
- * Bind a function to the jQuery object via live(), and also immediately trigger
- * the function on the objects with an 'instant' parameter set to true
- * @param callback function taking one parameter, which is Bool true when the event
- *     is called immediately, and the EventArgs object when triggered from an event
- */
-$.fn.liveAndTestAtStart = function ( callback ){
-	$(this)
-		.live( 'change', callback )
-		.each( function ( index, element ){
-			callback.call( this, true );
-		} );
-};
-
-// Document ready:
-$( function () {
-
-	// Animate the SelectOrOther fields, to only show the text field when
-	// 'other' is selected.
-	$( '.mw-htmlform-select-or-other' ).liveAndTestAtStart( function ( instant ) {
-		var $other = $( '#' + $(this).attr( 'id' ) + '-other' );
-		$other = $other.add( $other.siblings( 'br' ) );
-		if ( $(this).val() === 'other' ) {
-			$other.goIn( instant );
-		} else {
-			$other.goOut( instant );
+	/**
+	 * jQuery plugin to fade or snap to visible state.
+	 *
+	 * @param {boolean} instantToggle [optional]
+	 * @return {jQuery}
+	 */
+	$.fn.goIn = function ( instantToggle ) {
+		if ( instantToggle === true ) {
+			return $(this).show();
 		}
-	});
-
-});
-
+		return $(this).stop( true, true ).fadeIn();
+	};
+
+	/**
+	 * jQuery plugin to fade or snap to hiding state.
+	 *
+	 * @param {boolean} instantToggle [optional]
+	 * @return jQuery
+	 */
+	$.fn.goOut = function ( instantToggle ) {
+		if ( instantToggle === true ) {
+			return $(this).hide();
+		}
+		return $(this).stop( true, true ).fadeOut();
+	};
+
+	/**
+	 * Bind a function to the jQuery object via live(), and also immediately trigger
+	 * the function on the objects with an 'instant' parameter set to true.
+	 * @param {Function} callback Takes one parameter, which is {true} when the
+	 *  event is called immediately, and {jQuery.Event} when triggered from an event.
+	 */
+	$.fn.liveAndTestAtStart = function ( callback ){
+		$(this)
+			.live( 'change', callback )
+			.each( function () {
+				callback.call( this, true );
+			} );
+	};
+
+	$( function () {
+
+		// Animate the SelectOrOther fields, to only show the text field when
+		// 'other' is selected.
+		$( '.mw-htmlform-select-or-other' ).liveAndTestAtStart( function ( instant ) {
+			var $other = $( '#' + $(this).attr( 'id' ) + '-other' );
+			$other = $other.add( $other.siblings( 'br' ) );
+			if ( $(this).val() === 'other' ) {
+				$other.goIn( instant );
+			} else {
+				$other.goOut( instant );
+			}
+		});
+
+	} );
 
 }( jQuery ) );
diff --git a/resources/mediawiki/mediawiki.jqueryMsg.js b/resources/mediawiki/mediawiki.jqueryMsg.js
index 86af31fffe..6e2d3b410b 100644
--- a/resources/mediawiki/mediawiki.jqueryMsg.js
+++ b/resources/mediawiki/mediawiki.jqueryMsg.js
@@ -5,7 +5,8 @@
 * @author neilk@wikimedia.org
 */
 ( function ( mw, $ ) {
-	var slice = Array.prototype.slice,
+	var oldParser,
+		slice = Array.prototype.slice,
 		parserDefaults = {
 			magic : {
 				'SITENAME' : mw.config.get( 'wgSiteName' )
@@ -30,8 +31,8 @@
 		 * @return {jQuery}
 		 */
 		return function ( args ) {
-			var key = args[0];
-			var argsArray = $.isArray( args[1] ) ? args[1] : slice.call( args, 1 );
+			var key = args[0],
+				argsArray = $.isArray( args[1] ) ? args[1] : slice.call( args, 1 );
 			try {
 				return parser.parse( key, argsArray );
 			} catch ( e ) {
@@ -63,11 +64,11 @@
 		 * is equivalent to
 		 *    somefunction(a, [b, c, d])
 		 *
-		 * @param {String} message key
-		 * @param {Array} optional replacements (can also specify variadically)
-		 * @return {String} rendered HTML as string
+		 * @param {string} key Message key.
+		 * @param {Array|mixed} replacements Optional variable replacements (variadically or an array).
+		 * @return {string} Rendered HTML.
 		 */
-		return function ( /* key, replacements */ ) {
+		return function () {
 			return failableParserFn( arguments ).html();
 		};
 	};
@@ -93,11 +94,11 @@
 		 *    somefunction(a, [b, c, d])
 		 *
 		 * We append to 'this', which in a jQuery plugin context will be the selected elements.
-		 * @param {String} message key
-		 * @param {Array} optional replacements (can also specify variadically)
+		 * @param {string} key Message key.
+		 * @param {Array|mixed} replacements Optional variable replacements (variadically or an array).
 		 * @return {jQuery} this
 		 */
-		return function ( /* key, replacements */ ) {
+		return function () {
 			var $target = this.empty();
 			$.each( failableParserFn( arguments ).contents(), function ( i, node ) {
 				$target.append( node );
@@ -125,8 +126,8 @@
 		 * 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} message key
-		 * @param {Array} replacements for $1, $2... $n
+		 * @param {String} key Message key.
+		 * @param {Array} replacements Variable replacements for $1, $2... $n
 		 * @return {jQuery}
 		 */
 		parse: function ( key, replacements ) {
@@ -142,7 +143,7 @@
 			if ( this.astCache[ key ] === undefined ) {
 				var wikiText = this.settings.messages.get( key );
 				if ( typeof wikiText !== 'string' ) {
-					wikiText = "\\[" + key + "\\]";
+					wikiText = '\\[' + key + '\\]';
 				}
 				this.astCache[ key ] = this.wikiTextToAst( wikiText );
 			}
@@ -159,18 +160,27 @@
 		 * @return {Mixed} abstract syntax tree
 		 */
 		wikiTextToAst: function ( input ) {
+			var pos,
+				regularLiteral, regularLiteralWithoutBar, regularLiteralWithoutSpace, backslash, anyCharacter,
+				escapedOrLiteralWithoutSpace, escapedOrLiteralWithoutBar, escapedOrRegularLiteral,
+				whitespace, dollar, digits,
+				openExtlink, closeExtlink, openLink, closeLink, templateName, pipe, colon,
+				templateContents, openTemplate, closeTemplate,
+				nonWhitespaceExpression, paramExpression, expression, result;
 
 			// Indicates current position in input as we parse through it.
 			// Shared among all parsing functions below.
-			var pos = 0;
+			pos = 0;
+
 			// =========================================================
 			// parsing combinators - could be a library on its own
 			// =========================================================
 			// Try parsers until one works, if none work return null
 			function choice( ps ) {
 				return function () {
-					for ( var i = 0; i < ps.length; i++ ) {
-						var result = ps[i]();
+					var i, result;
+					for ( i = 0; i < ps.length; i++ ) {
+						result = ps[i]();
 						if ( result !== null ) {
 							 return result;
 						}
@@ -181,10 +191,11 @@
 			// try several ps in a row, all must succeed or return null
 			// this is the only eager one
 			function sequence( ps ) {
-				var originalPos = pos;
-				var result = [];
-				for ( var i = 0; i < ps.length; i++ ) {
-					var res = ps[i]();
+				var i, res,
+					originalPos = pos,
+					result = [];
+				for ( i = 0; i < ps.length; i++ ) {
+					res = ps[i]();
 					if ( res === null ) {
 						pos = originalPos;
 						return null;
@@ -197,9 +208,9 @@
 			// must succeed a minimum of n times or return null
 			function nOrMore( n, p ) {
 				return function () {
-					var originalPos = pos;
-					var result = [];
-					var parsed = p();
+					var originalPos = pos,
+						result = [],
+						parsed = p();
 					while ( parsed !== null ) {
 						result.push( parsed );
 						parsed = p();
@@ -258,11 +269,11 @@
 			// but some debuggers can't tell you exactly where they come from. Also the mutually
 			// recursive functions seem not to work in all browsers then. (Tested IE6-7, Opera, Safari, FF)
 			// This may be because, to save code, memoization was removed
-			var regularLiteral = makeRegexParser( /^[^{}\[\]$\\]/ );
-			var regularLiteralWithoutBar = makeRegexParser(/^[^{}\[\]$\\|]/);
-			var regularLiteralWithoutSpace = makeRegexParser(/^[^{}\[\]$\s]/);
-			var backslash = makeStringParser( "\\" );
-			var anyCharacter = makeRegexParser( /^./ );
+			regularLiteral = makeRegexParser( /^[^{}\[\]$\\]/ );
+			regularLiteralWithoutBar = makeRegexParser(/^[^{}\[\]$\\|]/);
+			regularLiteralWithoutSpace = makeRegexParser(/^[^{}\[\]$\s]/);
+			backslash = makeStringParser( '\\' );
+			anyCharacter = makeRegexParser( /^./ );
 			function escapedLiteral() {
 				var result = sequence( [
 					backslash,
@@ -270,15 +281,15 @@
 				] );
 				return result === null ? null : result[1];
 			}
-			var escapedOrLiteralWithoutSpace = choice( [
+			escapedOrLiteralWithoutSpace = choice( [
 				escapedLiteral,
 				regularLiteralWithoutSpace
 			] );
-			var escapedOrLiteralWithoutBar = choice( [
+			escapedOrLiteralWithoutBar = choice( [
 				escapedLiteral,
 				regularLiteralWithoutBar
 			] );
-			var escapedOrRegularLiteral = choice( [
+			escapedOrRegularLiteral = choice( [
 				escapedLiteral,
 				regularLiteral
 			] );
@@ -297,9 +308,9 @@
 				 var result = nOrMore( 1, escapedOrRegularLiteral )();
 				 return result === null ? null : result.join('');
 			}
-			var whitespace = makeRegexParser( /^\s+/ );
-			var dollar = makeStringParser( '$' );
-			var digits = makeRegexParser( /^\d+/ );
+			whitespace = makeRegexParser( /^\s+/ );
+			dollar = makeStringParser( '$' );
+			digits = makeRegexParser( /^\d+/ );
 
 			function replacement() {
 				var result = sequence( [
@@ -311,12 +322,13 @@
 				}
 				return [ 'REPLACE', parseInt( result[1], 10 ) - 1 ];
 			}
-			var openExtlink = makeStringParser( '[' );
-			var closeExtlink = makeStringParser( ']' );
+			openExtlink = makeStringParser( '[' );
+			closeExtlink = makeStringParser( ']' );
 			// this extlink MUST have inner text, e.g. [foo] not allowed; [foo bar] is allowed
 			function extlink() {
-				var result = null;
-				var parsedResult = sequence( [
+				var result, parsedResult;
+				result = null;
+				parsedResult = sequence( [
 					openExtlink,
 					nonWhitespaceExpression,
 					whitespace,
@@ -343,11 +355,12 @@
 				}
 				return [ 'LINKPARAM', parseInt( result[2], 10 ) - 1, result[4] ];
 			}
-			var openLink = makeStringParser( '[[' );
-			var closeLink = makeStringParser( ']]' );
+			openLink = makeStringParser( '[[' );
+			closeLink = makeStringParser( ']]' );
 			function link() {
-				var result = null;
-				var parsedResult = sequence( [
+				var result, parsedResult;
+				result = null;
+				parsedResult = sequence( [
 					openLink,
 					expression,
 					closeLink
@@ -357,25 +370,26 @@
 				}
 				return result;
 			}
-			var templateName = transform(
+			templateName = transform(
 				// see $wgLegalTitleChars
 				// not allowing : due to the need to catch "PLURAL:$1"
 				makeRegexParser( /^[ !"$&'()*,.\/0-9;=?@A-Z\^_`a-z~\x80-\xFF+\-]+/ ),
 				function ( result ) { return result.toString(); }
 			);
 			function templateParam() {
-				var result = sequence( [
+				var expr, result;
+				result = sequence( [
 					pipe,
 					nOrMore( 0, paramExpression )
 				] );
 				if ( result === null ) {
 					return null;
 				}
-				var 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];
+				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];
 			}
-			var pipe = makeStringParser( '|' );
+			pipe = makeStringParser( '|' );
 			function templateWithReplacement() {
 				var result = sequence( [
 					templateName,
@@ -392,8 +406,8 @@
 				] );
 				return result === null ? null : [ result[0], result[2] ];
 			}
-			var colon = makeStringParser(':');
-			var templateContents = choice( [
+			colon = makeStringParser(':');
+			templateContents = choice( [
 				function () {
 					var res = sequence( [
 						// templates can have placeholders for dynamic replacement eg: {{PLURAL:$1|one car|$1 cars}}
@@ -414,8 +428,8 @@
 					return [ res[0] ].concat( res[1] );
 				}
 			] );
-			var openTemplate = makeStringParser('{{');
-			var closeTemplate = makeStringParser('}}');
+			openTemplate = makeStringParser('{{');
+			closeTemplate = makeStringParser('}}');
 			function template() {
 				var result = sequence( [
 					openTemplate,
@@ -424,7 +438,7 @@
 				] );
 				return result === null ? null : result[1];
 			}
-			var nonWhitespaceExpression = choice( [
+			nonWhitespaceExpression = choice( [
 				template,
 				link,
 				extLinkParam,
@@ -432,7 +446,7 @@
 				replacement,
 				literalWithoutSpace
 			] );
-			var paramExpression = choice( [
+			paramExpression = choice( [
 				template,
 				link,
 				extLinkParam,
@@ -440,7 +454,7 @@
 				replacement,
 				literalWithoutBar
 			] );
-			var expression = choice( [
+			expression = choice( [
 				template,
 				link,
 				extLinkParam,
@@ -453,20 +467,20 @@
 				if ( result === null ) {
 					return null;
 				}
-				return [ "CONCAT" ].concat( result );
+				return [ 'CONCAT' ].concat( result );
 			}
 			// everything above this point is supposed to be stateless/static, but
 			// I am deferring the work of turning it into prototypes & objects. It's quite fast enough
 			// finally let's do some actual work...
-			var result = start();
+			result = start();
 
 			/*
 			 * For success, the p must have gotten to the end of the input
 			 * and returned a non-null.
 			 * n.b. This is part of language infrastructure, so we do not throw an internationalizable message.
 			 */
-			if (result === null || pos !== input.length) {
-				throw new Error( "Parse error at position " + pos.toString() + " in input: " + input );
+			if ( result === null || pos !== input.length ) {
+				throw new Error( 'Parse error at position ' + pos.toString() + ' in input: ' + input );
 			}
 			return result;
 		}
@@ -491,18 +505,20 @@
 		 * @return {Mixed} single-string node or array of nodes suitable for jQuery appending
 		 */
 		this.emit = function ( node, replacements ) {
-			var ret = null;
-			var jmsg = this;
+			var ret, subnodes, operation,
+				jmsg = this;
 			switch ( typeof node ) {
 				case 'string':
 				case 'number':
 					ret = node;
 					break;
-				case 'object': // node is an array of nodes
-					var subnodes = $.map( node.slice( 1 ), function ( n ) {
+				// typeof returns object for arrays
+				case 'object':
+					// node is an array of nodes
+					subnodes = $.map( node.slice( 1 ), function ( n ) {
 						return jmsg.emit( n, replacements );
 					} );
-					var operation = node[0].toLowerCase();
+					operation = node[0].toLowerCase();
 					if ( typeof jmsg[operation] === 'function' ) {
 						ret = jmsg[ operation ]( subnodes, replacements );
 					} else {
@@ -579,8 +595,9 @@
 		/**
 		 * Transform wiki-link
 		 * TODO unimplemented
+		 * @param nodes
 		 */
-		wlink: function ( nodes ) {
+		wlink: function () {
 			return 'unimplemented';
 		},
 
@@ -594,9 +611,9 @@
 		 * @return {jQuery}
 		 */
 		link: function ( nodes ) {
-			var arg = nodes[0];
-			var contents = nodes[1];
-			var $el;
+			var $el,
+				arg = nodes[0],
+				contents = nodes[1];
 			if ( arg instanceof jQuery ) {
 				$el = arg;
 			} else {
@@ -639,25 +656,32 @@
 		 * @return {String} selected pluralized form according to current language
 		 */
 		plural: function ( nodes ) {
-			var count = parseFloat( this.language.convertNumber( nodes[0], true ) );
-			var forms = nodes.slice(1);
+			var forms, count;
+			count = parseFloat( this.language.convertNumber( nodes[0], true ) );
+			forms = nodes.slice(1);
 			return forms.length ? this.language.convertPlural( count, forms ) : '';
 		},
 
 		/**
-		 * Transform parsed structure into gender
-		 * Usage {{gender:[gender| mw.user object ] | masculine|feminine|neutral}}.
-		 * @param {Array} of nodes, [ {String|mw.User}, {String}, {String} , {String} ]
+		 * Transform parsed structure according to gender.
+		 * Usage {{gender:[ gender | mw.user object ] | masculine form|feminine form|neutral form}}.
+		 * The first node is either a string, which can be "male" or "female",
+		 * or a User object (not a username).
+		 *
+		 * @param {Array} of nodes, [ {String|mw.User}, {String}, {String}, {String} ]
 		 * @return {String} selected gender form according to current language
 		 */
 		gender: function ( nodes ) {
-			var gender;
-			if  ( nodes[0] && nodes[0].options instanceof mw.Map ){
+			var gender, forms;
+
+			if  ( nodes[0] && nodes[0].options instanceof mw.Map ) {
 				gender = nodes[0].options.get( 'gender' );
 			} else {
 				gender = nodes[0];
 			}
-			var forms = nodes.slice(1);
+
+			forms = nodes.slice( 1 );
+
 			return this.language.gender( gender, forms );
 		},
 
@@ -668,8 +692,8 @@
 		 * @return {String} selected grammatical form according to current language
 		 */
 		grammar: function ( nodes ) {
-			var form = nodes[0];
-			var word = nodes[1];
+			var form = nodes[0],
+				word = nodes[1];
 			return word && form && this.language.convertGrammar( word, form );
 		}
 	};
@@ -681,7 +705,7 @@
 	$.fn.msg = mw.jqueryMsg.getPlugin();
 
 	// Replace the default message parser with jqueryMsg
-	var oldParser = mw.Message.prototype.parser;
+	oldParser = mw.Message.prototype.parser;
 	mw.Message.prototype.parser = function () {
 		// TODO: should we cache the message function so we don't create a new one every time? Benchmark this maybe?
 		// Caching is somewhat problematic, because we do need different message functions for different maps, so
diff --git a/resources/mediawiki/mediawiki.js b/resources/mediawiki/mediawiki.js
index 1a72ed138f..b0abc9e6f6 100644
--- a/resources/mediawiki/mediawiki.js
+++ b/resources/mediawiki/mediawiki.js
@@ -3,7 +3,7 @@
  */
 
 var mw = ( function ( $, undefined ) {
-	"use strict";
+	'use strict';
 
 	/* Private Members */
 
@@ -290,14 +290,14 @@ var mw = ( function ( $, undefined ) {
 		 * Gets a message object, similar to wfMessage()
 		 *
 		 * @param key string Key of message to get
-		 * @param parameter_1 mixed First argument in a list of variadic arguments,
+		 * @param parameter1 mixed First argument in a list of variadic arguments,
 		 *  each a parameter for $N replacement in messages.
 		 * @return Message
 		 */
-		message: function ( key, parameter_1 /* [, parameter_2] */ ) {
+		message: function ( key, parameter1 ) {
 			var parameters;
 			// Support variadic arguments
-			if ( parameter_1 !== undefined ) {
+			if ( parameter1 !== undefined ) {
 				parameters = slice.call( arguments );
 				parameters.shift();
 			} else {
@@ -473,32 +473,14 @@ var mw = ( function ( $, undefined ) {
 				}
 			}
 
-			function compare( a, b ) {
-				var i;
-				if ( a.length !== b.length ) {
-					return false;
-				}
-				for ( i = 0; i < b.length; i += 1 ) {
-					if ( $.isArray( a[i] ) ) {
-						if ( !compare( a[i], b[i] ) ) {
-							return false;
-						}
-					}
-					if ( a[i] !== b[i] ) {
-						return false;
-					}
-				}
-				return true;
-			}
-
 			/**
 			 * Generates an ISO8601 "basic" string from a UNIX timestamp
 			 */
 			function formatVersionNumber( timestamp ) {
-				var	pad = function ( a, b, c ) {
-						return [a < 10 ? '0' + a : a, b < 10 ? '0' + b : b, c < 10 ? '0' + c : c].join( '' );
-					},
-					d = new Date();
+				var	d = new Date();
+				function pad( a, b, c ) {
+					return [a < 10 ? '0' + a : a, b < 10 ? '0' + b : b, c < 10 ? '0' + c : c].join( '' );
+				}
 				d.setTime( timestamp * 1000 );
 				return [
 					pad( d.getUTCFullYear(), d.getUTCMonth() + 1, d.getUTCDate() ), 'T',
@@ -712,7 +694,7 @@ var mw = ( function ( $, undefined ) {
 						j -= 1;
 						try {
 							if ( hasErrors ) {
-								throw new Error ("Module " + module + " failed.");
+								throw new Error( 'Module ' + module + ' failed.');
 							} else {
 								if ( $.isFunction( job.ready ) ) {
 									job.ready();
@@ -758,16 +740,20 @@ var mw = ( function ( $, undefined ) {
 				// Using isReady directly instead of storing it locally from
 				// a $.fn.ready callback (bug 31895).
 				if ( $.isReady || async ) {
-					// jQuery's getScript method is NOT better than doing this the old-fashioned way
-					// because jQuery will eval the script's code, and errors will not have sane
-					// line numbers.
+					// Can't use jQuery.getScript because that only uses <script> for cross-domain,
+					// it uses XHR and eval for same-domain scripts, which we don't want because it
+					// messes up line numbers.
+					// The below is based on jQuery ([jquery@1.8.2]/src/ajax/script.js)
+
+					// IE-safe way of getting the <head>. document.head isn't supported
+					// in old IE, and doesn't work when in the <head>.
+					head = document.getElementsByTagName( 'head' )[0] || document.body;
+
 					script = document.createElement( 'script' );
-					script.setAttribute( 'src', src );
-					script.setAttribute( 'type', 'text/javascript' );
+					script.async = true;
+					script.src = src;
 					if ( $.isFunction( callback ) ) {
-						// Attach handlers for all browsers (based on jQuery.ajax)
 						script.onload = script.onreadystatechange = function () {
-
 							if (
 								!done
 								&& (
@@ -775,24 +761,20 @@ var mw = ( function ( $, undefined ) {
 									|| /loaded|complete/.test( script.readyState )
 								)
 							) {
-
 								done = true;
 
-								callback();
+								// Handle memory leak in IE
+								script.onload = script.onreadystatechange = null;
 
-								// Handle memory leak in IE. This seems to fail in
-								// IE7 sometimes (Permission Denied error when
-								// accessing script.parentNode) so wrap it in
-								// a try catch.
-								try {
-									script.onload = script.onreadystatechange = null;
-									if ( script.parentNode ) {
-										script.parentNode.removeChild( script );
-									}
-
-									// Dereference the script
-									script = undefined;
-								} catch ( e ) { }
+								// Remove the script
+								if ( script.parentNode ) {
+									script.parentNode.removeChild( script );
+								}
+
+								// Dereference the script
+								script = undefined;
+
+								callback();
 							}
 						};
 					}
@@ -800,20 +782,17 @@ var mw = ( function ( $, undefined ) {
 					if ( window.opera ) {
 						// Appending to the <head> blocks rendering completely in Opera,
 						// so append to the <body> after document ready. This means the
-						// scripts only start loading after  the document has been rendered,
+						// scripts only start loading after the document has been rendered,
 						// but so be it. Opera users don't deserve faster web pages if their
-						// browser makes it impossible
-						$( function () { document.body.appendChild( script ); } );
+						// browser makes it impossible.
+						$( function () {
+							document.body.appendChild( script );
+						} );
 					} else {
-						// IE-safe way of getting the <head> . document.documentElement.head doesn't
-						// work in scripts that run in the <head>
-						head = document.getElementsByTagName( 'head' )[0];
-						( document.body || head ).appendChild( script );
+						head.appendChild( script );
 					}
 				} else {
-					document.write( mw.html.element(
-						'script', { 'type': 'text/javascript', 'src': src }, ''
-					) );
+					document.write( mw.html.element( 'script', { 'src': src }, '' ) );
 					if ( $.isFunction( callback ) ) {
 						// Document.write is synchronous, so this is called when it's done
 						// FIXME: that's a lie. doc.write isn't actually synchronous
@@ -960,7 +939,7 @@ var mw = ( function ( $, undefined ) {
 			 *  document ready has not yet occurred
 			 */
 			function request( dependencies, ready, error, async ) {
-				var regItemDeps, regItemDepLen, n;
+				var n;
 
 				// Allow calling by single module name
 				if ( typeof dependencies === 'string' ) {
@@ -1032,7 +1011,7 @@ var mw = ( function ( $, undefined ) {
 			 */
 			function doRequest( moduleMap, currReqBase, sourceLoadScript, async ) {
 				var request = $.extend(
-					{ 'modules': buildModulesString( moduleMap ) },
+					{ modules: buildModulesString( moduleMap ) },
 					currReqBase
 				);
 				request = sortQuery( request );
@@ -1127,9 +1106,9 @@ var mw = ( function ( $, undefined ) {
 								}
 							}
 
-							currReqBase = $.extend( { 'version': formatVersionNumber( maxVersion ) }, reqBase );
+							currReqBase = $.extend( { version: formatVersionNumber( maxVersion ) }, reqBase );
 							// For user modules append a user name to the request.
-							if ( group === "user" && mw.config.get( 'wgUserName' ) !== null ) {
+							if ( group === 'user' && mw.config.get( 'wgUserName' ) !== null ) {
 								currReqBase.user = mw.config.get( 'wgUserName' );
 							}
 							currReqBaseLength = $.param( currReqBase ).length;
@@ -1242,15 +1221,15 @@ var mw = ( function ( $, undefined ) {
 					}
 					// List the module as registered
 					registry[module] = {
-						'version': version !== undefined ? parseInt( version, 10 ) : 0,
-						'dependencies': [],
-						'group': typeof group === 'string' ? group : null,
-						'source': typeof source === 'string' ? source: 'local',
-						'state': 'registered'
+						version: version !== undefined ? parseInt( version, 10 ) : 0,
+						dependencies: [],
+						group: typeof group === 'string' ? group : null,
+						source: typeof source === 'string' ? source: 'local',
+						state: 'registered'
 					};
 					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
@@ -1331,7 +1310,7 @@ var mw = ( function ( $, undefined ) {
 					}
 					// Allow calling with a single dependency as a string
 					if ( tod === 'string' ) {
-						dependencies = [dependencies];
+						dependencies = [ dependencies ];
 					}
 					// Resolve entire dependency map
 					dependencies = resolve( dependencies );
@@ -1366,7 +1345,7 @@ var mw = ( function ( $, undefined ) {
 				 *  be assumed if loading a URL, and false will be assumed otherwise.
 				 */
 				load: function ( modules, type, async ) {
-					var filtered, m, module;
+					var filtered, m, module, l;
 
 					// Validate input
 					if ( typeof modules !== 'object' && typeof modules !== 'string' ) {
@@ -1381,11 +1360,13 @@ var mw = ( function ( $, undefined ) {
 								async = true;
 							}
 							if ( type === 'text/css' ) {
-								$( 'head' ).append( $( '<link>', {
-									rel: 'stylesheet',
-									type: 'text/css',
-									href: modules
-								} ) );
+								// IE7-8 throws security warnings when inserting a <link> tag
+								// with a protocol-relative URL set though attributes (instead of
+								// properties) - when on HTTPS. See also bug #.
+								l = document.createElement( 'link' );
+								l.rel = 'stylesheet';
+								l.href = modules;
+								$( 'head' ).append( l );
 								return;
 							}
 							if ( type === 'text/javascript' || type === undefined ) {
@@ -1396,7 +1377,7 @@ var mw = ( function ( $, undefined ) {
 							throw new Error( 'invalid type for external url, must be text/css or text/javascript. not ' + type );
 						}
 						// Called with single module
-						modules = [modules];
+						modules = [ modules ];
 					}
 
 					// Filter out undefined modules, otherwise resolve() will throw
@@ -1448,7 +1429,7 @@ var mw = ( function ( $, undefined ) {
 					if ( registry[module] === undefined ) {
 						mw.loader.register( module );
 					}
-					if ( $.inArray(state, ['ready', 'error', 'missing']) !== -1
+					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!
@@ -1514,7 +1495,7 @@ var mw = ( function ( $, undefined ) {
 		html: ( function () {
 			function escapeCallback( s ) {
 				switch ( s ) {
-					case "'":
+					case '\'':
 						return '&#039;';
 					case '"':
 						return '&quot;';
diff --git a/resources/mediawiki/mediawiki.notification.js b/resources/mediawiki/mediawiki.notification.js
index 5bcbfcc9ea..35cc6d816e 100644
--- a/resources/mediawiki/mediawiki.notification.js
+++ b/resources/mediawiki/mediawiki.notification.js
@@ -4,7 +4,8 @@
 ( function ( mw, $ ) {
 	'use strict';
 
-	var isPageReady = false,
+	var notification,
+		isPageReady = false,
 		isInitialized = false,
 		preReadyNotifQueue = [],
 		/**
@@ -88,7 +89,9 @@
 			// Other notification elements matching the same tag
 			$tagMatches,
 			outerHeight,
-			placeholderHeight;
+			placeholderHeight,
+			autohideCount,
+			notif;
 
 		if ( this.isOpen ) {
 			return;
@@ -164,10 +167,11 @@
 						}
 					} );
 
+			notif = this;
+
 			// Create a clear placeholder we can use to make the notifications around the notification that is being
 			// replaced expand or contract gracefully to fit the height of the new notification.
-			var self = this;
-			self.$replacementPlaceholder = $( '<div>' )
+			notif.$replacementPlaceholder = $( '<div>' )
 				// Set the height to the space the previous notification or placeholder took
 				.css( 'height', outerHeight )
 				// Make sure that this placeholder is at the very end of this tagged notification group
@@ -181,7 +185,7 @@
 							// Reset the notification position after we've finished the space animation
 							// However do not do it if the placeholder was removed because another tagged
 							// notification went and closed this one.
-							if ( self.$replacementPlaceholder ) {
+							if ( notif.$replacementPlaceholder ) {
 								$notification.css( 'position', '' );
 							}
 							// Finally, remove the placeholder from the DOM
@@ -206,7 +210,7 @@
 		// By default a notification is paused.
 		// If this notification is within the first {autoHideLimit} notifications then
 		// start the auto-hide timer as soon as it's created.
-		var autohideCount = $area.find( '.mw-notification-autohide' ).length;
+		autohideCount = $area.find( '.mw-notification-autohide' ).length;
 		if ( autohideCount <= notification.autoHideLimit ) {
 			this.resume();
 		}
@@ -291,8 +295,19 @@
 			} )
 			// Fix the top/left position to the current computed position from which we
 			// can animate upwards.
-			.css( this.$notification.position() )
-			// Animate opacity and top to create fade upwards animation for notification closing
+			.css( this.$notification.position() );
+
+		// This needs to be done *after* notification's position has been made absolute.
+		if ( options.placeholder ) {
+			// Insert a placeholder with a height equal to the height of the
+			// notification plus it's vertical margins in place of the notification
+			var $placeholder = $( '<div>' )
+				.css( 'height', this.$notification.outerHeight( true ) )
+				.insertBefore( this.$notification );
+		}
+
+		// Animate opacity and top to create fade upwards animation for notification closing
+		this.$notification
 			.animate( {
 				opacity: 0,
 				top: '-=35'
@@ -311,14 +326,6 @@
 					}
 				}
 			} );
-
-		if ( options.placeholder ) {
-			// Insert a placeholder with a height equal to the height of the
-			// notification plus it's vertical margins in place of the notification
-			var $placeholder = $( '<div>' )
-				.css( 'height', this.$notification.outerHeight( true ) )
-				.insertBefore( this.$notification );
-		}
 	};
 
 	/**
@@ -368,7 +375,7 @@
 		}
 	}
 
-	var notification = {
+	notification = {
 		/**
 		 * Pause auto-hide timers for all notifications.
 		 * Notifications will not auto-hide until resume is called.
diff --git a/resources/mediawiki/mediawiki.util.js b/resources/mediawiki/mediawiki.util.js
index 4e515bc518..4bb004a31c 100644
--- a/resources/mediawiki/mediawiki.util.js
+++ b/resources/mediawiki/mediawiki.util.js
@@ -62,7 +62,8 @@
 
 			/* Fill $content var */
 			util.$content = ( function () {
-				var $content, selectors = [
+				var i, l, $content, selectors;
+				selectors = [
 					// The preferred standard for setting $content (class="mw-body")
 					// You may also use (class="mw-body mw-body-primary") if you use
 					// mw-body in multiple locations.
@@ -94,7 +95,7 @@
 					// not inserted bodytext yet. But in any case <body> should always exist
 					'body'
 				];
-				for ( var i = 0, l = selectors.length; i < l; i++ ) {
+				for ( i = 0, l = selectors.length; i < l; i++ ) {
 					$content = $( selectors[i] ).first();
 					if ( $content.length ) {
 						return $content;
@@ -484,7 +485,7 @@
 		 * is determined by validation.
 		 */
 		validateEmail: function ( mailtxt ) {
-			var rfc5322_atext, rfc1034_ldh_str, HTML5_email_regexp;
+			var rfc5322Atext, rfc1034LdhStr, html5EmailRegexp;
 
 			if ( mailtxt === '' ) {
 				return null;
@@ -515,7 +516,7 @@
 						 "|" / "}" /
 						 "~"
 			*/
-			rfc5322_atext = "a-z0-9!#$%&'*+\\-/=?^_`{|}~";
+			rfc5322Atext = 'a-z0-9!#$%&\'*+\\-/=?^_`{|}~';
 
 			/**
 			 * Next define the RFC 1034 'ldh-str'
@@ -526,30 +527,30 @@
 			 *	<let-dig-hyp> ::= <let-dig> | "-"
 			 *	<let-dig> ::= <letter> | <digit>
 			 */
-			rfc1034_ldh_str = "a-z0-9\\-";
+			rfc1034LdhStr = 'a-z0-9\\-';
 
-			HTML5_email_regexp = new RegExp(
+			html5EmailRegexp = new RegExp(
 				// start of string
 				'^'
 				+
 				// User part which is liberal :p
-				'[' + rfc5322_atext + '\\.]+'
+				'[' + rfc5322Atext + '\\.]+'
 				+
 				// 'at'
 				'@'
 				+
 				// Domain first part
-				'[' + rfc1034_ldh_str + ']+'
+				'[' + rfc1034LdhStr + ']+'
 				+
 				// Optional second part and following are separated by a dot
-				'(?:\\.[' + rfc1034_ldh_str + ']+)*'
+				'(?:\\.[' + rfc1034LdhStr + ']+)*'
 				+
 				// End of string
 				'$',
 				// RegExp is case insensitive
 				'i'
 			);
-			return (null !== mailtxt.match( HTML5_email_regexp ) );
+			return (null !== mailtxt.match( html5EmailRegexp ) );
 		},
 
 		/**
diff --git a/resources/startup.js b/resources/startup.js
index 7951af06b8..deff7e6eff 100644
--- a/resources/startup.js
+++ b/resources/startup.js
@@ -3,19 +3,22 @@
  * continue loading the jquery and mediawiki modules. This code should work on
  * even the most ancient of browsers, so be very careful when editing.
  */
+
 /**
  * Returns false when run in a black-listed browser
  *
  * This function will be deleted after it's used, so do not expand it to be
- * generally useful beyond startup
+ * generally useful beyond startup.
  *
- * jQuery has minimum requirements of:
- * * Internet Explorer 6.0+
- * * Firefox 3.6+
- * * Safari 5.0+
- * * Opera 11+
- * * Chrome
+ * MediaWiki & jQuery compatibility:
+ * - Internet Explorer 6.0+
+ * - Firefox 10+
+ * - Safari 5.0+
+ * - Opera 11+
+ * - Chrome
  */
+
+/*jshint unused: false */
 function isCompatible() {
 	// IE < 6.0
 	if ( navigator.appVersion.indexOf( 'MSIE' ) !== -1
@@ -23,11 +26,9 @@ function isCompatible() {
 	{
 		return false;
 	}
-	// @todo FIXME: Firefox < 3.6
-	// @todo FIXME: Safari < 5.0
-	// @todo FIXME: Opera < 11
 	return true;
 }
+
 /**
- * The startUp() function will be generated and added here (at the bottom)
+ * The startUp() function will be auto-generated and added below.
  */
diff --git a/skins/CologneBlue.php b/skins/CologneBlue.php
index 32aa9024cc..84042c3dc9 100644
--- a/skins/CologneBlue.php
+++ b/skins/CologneBlue.php
@@ -122,223 +122,79 @@ class CologneBlueTemplate extends BaseTemplate {
 		return $this->getSkin()->getLanguage()->pipeList( $s );
 	}
 
-	function bottomLinks() {
-		$sep = wfMessage( 'pipe-separator' )->escaped() . "\n";
-
-		$s = '';
-		if ( $this->getSkin()->getOutput()->isArticleRelated() ) {
-			$element[] = '<strong>' . $this->editThisPage() . '</strong>';
-
-			if ( $this->getSkin()->getUser()->isLoggedIn() ) {
-				$element[] = $this->watchThisPage();
-			}
-
-			$element[] = $this->talkLink();
-			$element[] = $this->historyLink();
-			$element[] = $this->whatLinksHere();
-			$element[] = $this->watchPageLinksLink();
-
-			$title = $this->getSkin()->getTitle();
-
-			if (
-				$title->getNamespace() == NS_USER ||
-				$title->getNamespace() == NS_USER_TALK
-			) {
-				$id = User::idFromName( $title->getText() );
-				$ip = User::isIP( $title->getText() );
-
-				# Both anons and non-anons have contributions list
-				if ( $id || $ip ) {
-					$element[] = $this->userContribsLink();
-				}
-
-				if ( $this->getSkin()->showEmailUser( $id ) ) {
-					$element[] = $this->emailUserLink();
-				}
-			}
-
-			$s = implode( $element, $sep );
-
-			if ( $title->getArticleID() ) {
-				$s .= "\n<br />";
-
-				// Delete/protect/move links for privileged users
-				if ( $this->getSkin()->getUser()->isAllowed( 'delete' ) ) {
-					$s .= $this->deleteThisPage();
-				}
-
-				if ( $this->getSkin()->getUser()->isAllowed( 'protect' ) ) {
-					$s .= $sep . $this->protectThisPage();
-				}
-
-				if ( $this->getSkin()->getUser()->isAllowed( 'move' ) ) {
-					$s .= $sep . $this->moveThisPage();
-				}
-			}
-
-			$s .= "<br />\n" . $this->otherLanguages();
+	/**
+	 * Used in bottomLinks() to eliminate repetitive code.
+	 *
+	 * @param $key string Key to be passed to makeListItem()
+	 * @param $navlink array Navlink suitable for processNavlinkForDocument()
+	 * @param $message string Key of the message to use in place of standard text
+	 *
+	 * @return string
+	 * @fixed
+	 */
+	function processBottomLink( $key, $navlink, $message=null ) {
+		if ( !$navlink ) {
+			// Empty navlinks might be passed.
+			return null;
 		}
 
-		return $s;
-	}
-
-	function editThisPage() {
-		if ( !$this->getSkin()->getOutput()->isArticleRelated() ) {
-			$s = wfMessage( 'protectedpage' )->text();
-		} else {
-			$title = $this->getSkin()->getTitle();
-			if ( $title->quickUserCan( 'edit' ) && $title->exists() ) {
-				$t = wfMessage( 'editthispage' )->text();
-			} elseif ( $title->quickUserCan( 'create' ) && !$title->exists() ) {
-				$t = wfMessage( 'create-this-page' )->text();
-			} else {
-				$t = wfMessage( 'viewsource' )->text();
-			}
-
-			$s = Linker::linkKnown(
-				$title,
-				$t,
-				array(),
-				$this->getSkin()->editUrlOptions()
-			);
+		if ( $message ) {
+			$navlink['text'] = wfMessage( $message )->escaped();
 		}
 
-		return $s;
+		return $this->makeListItem( $key, $this->processNavlinkForDocument( $navlink ), array( 'tag' => 'span' ) );
 	}
 
-	function deleteThisPage() {
-		$diff = $this->getSkin()->getRequest()->getVal( 'diff' );
-		$title = $this->getSkin()->getTitle();
+	// @fixed
+	function bottomLinks() {
+		$toolbox = $this->getToolbox();
+		$content_nav = $this->data['content_navigation'];
 
-		if ( $title->getArticleID() && ( !$diff ) && $this->getSkin()->getUser()->isAllowed( 'delete' ) ) {
-			$t = wfMessage( 'deletethispage' )->text();
+		$lines = array();
 
-			$s = Linker::linkKnown(
-				$title,
-				$t,
-				array(),
-				array( 'action' => 'delete' )
-			);
-		} else {
-			$s = '';
-		}
-
-		return $s;
-	}
+		if ( $this->getSkin()->getOutput()->isArticleRelated() ) {
+			// First row. Regular actions.
+			$element = array();
 
-	function protectThisPage() {
-		$diff = $this->getSkin()->getRequest()->getVal( 'diff' );
-		$title = $this->getSkin()->getTitle();
+			$editLinkMessage = $this->getSkin()->getTitle()->exists() ? 'editthispage' : 'create-this-page';
+			$element[] = $this->processBottomLink( 'edit', $content_nav['views']['edit'], $editLinkMessage );
+			$element[] = $this->processBottomLink( 'viewsource', $content_nav['views']['viewsource'], 'viewsource' );
 
-		if ( $title->getArticleID() && ( ! $diff ) && $this->getSkin()->getUser()->isAllowed( 'protect' ) ) {
-			if ( $title->isProtected() ) {
-				$text = wfMessage( 'unprotectthispage' )->text();
-				$query = array( 'action' => 'unprotect' );
-			} else {
-				$text = wfMessage( 'protectthispage' )->text();
-				$query = array( 'action' => 'protect' );
-			}
+			$element[] = $this->processBottomLink( 'watch', $content_nav['actions']['watch'], 'watchthispage' );
+			$element[] = $this->processBottomLink( 'unwatch', $content_nav['actions']['unwatch'], 'unwatchthispage' );
 
-			$s = Linker::linkKnown(
-				$title,
-				$text,
-				array(),
-				$query
-			);
-		} else {
-			$s = '';
-		}
+			$element[] = $this->talkLink();
 
-		return $s;
-	}
+			$element[] = $this->processBottomLink( 'history', $content_nav['views']['history'], 'history' );
+			$element[] = $this->processBottomLink( 'info', $toolbox['info'] );
+			$element[] = $this->processBottomLink( 'whatlinkshere', $toolbox['whatlinkshere'] );
+			$element[] = $this->processBottomLink( 'recentchangeslinked', $toolbox['recentchangeslinked'] );
 
-	function watchThisPage() {
-		// Cache
-		$title = $this->getSkin()->getTitle();
+			$element[] = $this->processBottomLink( 'contributions', $toolbox['contributions'] );
+			$element[] = $this->processBottomLink( 'emailuser', $toolbox['emailuser'] );
 
-		if ( $this->getSkin()->getOutput()->isArticleRelated() ) {
-			if ( $this->getSkin()->getUser()->isWatched( $title ) ) {
-				$text = wfMessage( 'unwatchthispage' )->text();
-				$query = array(
-					'action' => 'unwatch',
-					'token' => UnwatchAction::getUnwatchToken( $title, $this->getSkin()->getUser() ),
-				);
-				$id = 'mw-unwatch-link';
-			} else {
-				$text = wfMessage( 'watchthispage' )->text();
-				$query = array(
-					'action' => 'watch',
-					'token' => WatchAction::getWatchToken( $title, $this->getSkin()->getUser() ),
-				);
-				$id = 'mw-watch-link';
-			}
+			$lines[] = $this->getSkin()->getLanguage()->pipeList( array_filter( $element ) );
 
-			$s = Linker::linkKnown(
-				$title,
-				$text,
-				array( 'id' => $id ),
-				$query
-			);
-		} else {
-			$s = wfMessage( 'notanarticle' )->text();
-		}
 
-		return $s;
-	}
+			// Second row. Privileged actions.
+			$element = array();
 
-	function moveThisPage() {
-		if ( $this->getSkin()->getTitle()->quickUserCan( 'move' ) ) {
-			return Linker::linkKnown(
-				SpecialPage::getTitleFor( 'Movepage' ),
-				wfMessage( 'movethispage' )->text(),
-				array(),
-				array( 'target' => $this->getSkin()->getTitle()->getPrefixedDBkey() )
-			);
-		} else {
-			// no message if page is protected - would be redundant
-			return '';
-		}
-	}
+			$element[] = $this->processBottomLink( 'delete', $content_nav['actions']['delete'], 'deletethispage' );
+			$element[] = $this->processBottomLink( 'undelete', $content_nav['actions']['undelete'], 'undeletethispage' );
 
-	function historyLink() {
-		return Linker::link(
-			$this->getSkin()->getTitle(),
-			wfMessage( 'history' )->escaped(),
-			array( 'rel' => 'archives' ),
-			array( 'action' => 'history' )
-		);
-	}
+			$element[] = $this->processBottomLink( 'protect', $content_nav['actions']['protect'], 'protectthispage' );
+			$element[] = $this->processBottomLink( 'unprotect', $content_nav['actions']['unprotect'], 'unprotectthispage' );
 
-	function whatLinksHere() {
-		return Linker::linkKnown(
-			SpecialPage::getTitleFor( 'Whatlinkshere', $this->getSkin()->getTitle()->getPrefixedDBkey() ),
-			wfMessage( 'whatlinkshere' )->escaped()
-		);
-	}
+			$element[] = $this->processBottomLink( 'move', $content_nav['actions']['move'], 'movethispage' );
 
-	function userContribsLink() {
-		return Linker::linkKnown(
-			SpecialPage::getTitleFor( 'Contributions', $this->getSkin()->getTitle()->getDBkey() ),
-			wfMessage( 'contributions' )->escaped()
-		);
-	}
+			$lines[] = $this->getSkin()->getLanguage()->pipeList( array_filter( $element ) );
 
-	function emailUserLink() {
-		return Linker::linkKnown(
-			SpecialPage::getTitleFor( 'Emailuser', $this->getSkin()->getTitle()->getDBkey() ),
-			wfMessage( 'emailuser' )->escaped()
-		);
-	}
 
-	function watchPageLinksLink() {
-		if ( !$this->getSkin()->getOutput()->isArticleRelated() ) {
-			return wfMessage( 'parentheses', wfMessage( 'notanarticle' )->text() )->escaped();
-		} else {
-			return Linker::linkKnown(
-				SpecialPage::getTitleFor( 'Recentchangeslinked', $this->getSkin()->getTitle()->getPrefixedDBkey() ),
-				wfMessage( 'recentchangeslinked-toolbox' )->escaped()
-			);
+			// Third row. Language links.
+			$lines[] = $this->otherLanguages();
 		}
+
+		return implode( array_filter( $lines ), "<br />\n" ) . "<br />\n";
 	}
 
 	// @fixed
@@ -385,10 +241,7 @@ class CologneBlueTemplate extends BaseTemplate {
 
 		// Use the regular navigational link, but replace its text. Everything else stays unmodified.
 		$namespacesLinks = $this->data['content_navigation']['namespaces'];
-		$link = $this->processNavlinkForDocument( $namespacesLinks[ $key ] );
-		$link['text'] = wfMessage( $message )->text();
-
-		return $this->makeListItem( $message, $link, array( 'tag' => 'span' ) );
+		return $this->processBottomLink( $message,  $namespacesLinks[$key], $message );
 	}
 
 	/**
@@ -540,13 +393,48 @@ class CologneBlueTemplate extends BaseTemplate {
 	}
 
 	/**
-	 * @param $heading string
-	 * @return string
+	 * Adds CologneBlue-specific items to the sidebar: qbedit, qbpageoptions and qbmyoptions menus.
+	 *
+	 * @param $bar sidebar data
+	 * @return array modified sidebar data
 	 *
 	 * @fixed
 	 */
-	function menuHead( $heading ) {
-		return "\n<h6>" . htmlspecialchars( $heading ) . "</h6>";
+	function sidebarAdditions( $bar ) {
+		// "This page" and "Edit" menus
+		// We need to do some massaging here... we reuse all of the items, except for $...['views']['view'],
+		// as $...['namespaces']['main'] and $...['namespaces']['talk'] together serve the same purpose.
+		// We also don't use $...['variants'], these are displayed in the top menu.
+		$content_navigation = $this->data['content_navigation'];
+		$qbpageoptions = array_merge(
+			$content_navigation['namespaces'],
+			array(
+				'history' => $content_navigation['views']['history'],
+				'watch' => $content_navigation['actions']['watch'],
+				'unwatch' => $content_navigation['actions']['unwatch'],
+			)
+		);
+		$content_navigation['actions']['watch'] = null;
+		$content_navigation['actions']['unwatch'] = null;
+		$qbedit = array_merge(
+			array(
+				'edit' => $content_navigation['views']['edit'],
+				'addsection' => $content_navigation['views']['addsection'],
+			),
+			$content_navigation['actions']
+		);
+
+		// Personal tools ("My pages")
+		$qbmyoptions = $this->getPersonalTools();
+		foreach ( array ( 'logout', 'createaccount', 'login', 'anonlogin' ) as $key ) {
+			$qbmyoptions[$key] = null;
+		}
+
+		$bar['qbedit'] = $qbedit;
+		$bar['qbpageoptions'] = $qbpageoptions;
+		$bar['qbmyoptions'] = $qbmyoptions;
+
+		return $bar;
 	}
 
 	/**
@@ -557,117 +445,83 @@ class CologneBlueTemplate extends BaseTemplate {
 	 *
 	 * @fixed
 	 */
-	function quickBar(){
-		$s = "\n<div id='quickbar'>";
-
-		$sep = "<br />\n";
-
-		$plain_bar = $this->data['sidebar'];
+	function quickBar() {
+		// Massage the sidebar. We want to:
+		// * place SEARCH at the beginning
+		// * add new portlets before TOOLBOX (or at the end, if it's missing)
+		// * remove LANGUAGES (langlinks are displayed elsewhere)
+		$orig_bar = $this->data['sidebar'];
 		$bar = array();
-
-		// Massage the sidebar
-		// We want to place SEARCH at the beginning and a lot of stuff before TOOLBOX (or at the end, if it's missing)
-		$additions_done = false;
-		while ( !$additions_done ) {
-			$bar = array(); // Empty it out
-
-			// Always display search on top
-			$bar['SEARCH'] = true;
-
-			foreach ( $plain_bar as $heading => $links ) {
-				if ( $heading == 'TOOLBOX' ) {
-					if( $links !== NULL ) {
-						// If this is not a toolbox prosthetic we inserted outselves, fill it out
-						$plain_bar['TOOLBOX'] = $this->getToolbox();
-					}
-
-					// And insert the stuff
-
-					// "This page" and "Edit" menus
-					// We need to do some massaging here... we reuse all of the items, except for $...['views']['view'],
-					// as $...['namespaces']['main'] and $...['namespaces']['talk'] together serve the same purpose.
-					// We also don't use $...['variants'], these are displayed in the top menu.
-					$content_navigation = $this->data['content_navigation'];
-					$qbpageoptions = array_merge(
-						$content_navigation['namespaces'],
-						array(
-							'history' => $content_navigation['views']['history'],
-							'watch' => $content_navigation['actions']['watch'],
-							'unwatch' => $content_navigation['actions']['unwatch'],
-						)
-					);
-					$content_navigation['actions']['watch'] = null;
-					$content_navigation['actions']['unwatch'] = null;
-					$qbedit = array_merge(
-						array(
-							'edit' => $content_navigation['views']['edit'],
-							'addsection' => $content_navigation['views']['addsection'],
-						),
-						$content_navigation['actions']
-					);
-					$bar['qbedit'] = $qbedit;
-					$bar['qbpageoptions'] = $qbpageoptions;
-
-					// Personal tools ("My pages")
-					$bar['qbmyoptions'] = $this->getPersonalTools();
-					foreach ( array ( 'logout', 'createaccount', 'login', 'anonlogin' ) as $key ) {
-						$bar['qbmyoptions'][$key] = null;
-					}
-
-					$additions_done = true;
-				}
-
-				// Re-insert current heading, unless it's SEARCH
-				if ( $heading != 'SEARCH' ) {
-					$bar[$heading] = $plain_bar[$heading];
-				}
+		$hasToolbox = false;
+
+		// Always display search first
+		$bar['SEARCH'] = true;
+		// Copy everything except for langlinks, inserting new items before toolbox
+		foreach ( $orig_bar as $heading => $data ) {
+			if ( $heading == 'TOOLBOX' ) {
+				// Insert the stuff
+				$bar = $this->sidebarAdditions( $bar );
+				$hasToolbox = true;
 			}
 
-			// If TOOLBOX is missing, $additions_done is still false
-			if ( !$additions_done ) {
-				$plain_bar['TOOLBOX'] = false;
+			if ( $heading != 'LANGUAGES' ) {
+				$bar[$heading] = $data;
 			}
 		}
+		// If toolbox is missing, add our items at the end
+		if ( !$hasToolbox ) {
+			$bar = $this->sidebarAdditions( $bar );
+		}
 
-		foreach ( $bar as $heading => $links ) {
+
+		// Fill out special sidebar items with content
+		$orig_bar = $bar;
+		$bar = array();
+		foreach ( $orig_bar as $heading => $data ) {
 			if ( $heading == 'SEARCH' ) {
-				$s .= $this->menuHead( wfMessage( 'qbfind' )->text() );
-				$s .= $this->searchForm( 'sidebar' );
-			} elseif ( $heading == 'LANGUAGES' ) {
-				// discard these; we display languages below page content
-			} elseif ( $links ) {
-				if ( is_array( $links ) ) {
-					// Use the navigation heading from standard sidebar as the "browse" section
-					if ( $heading == 'navigation' ) {
-						$heading = 'qbbrowse';
-					}
-					if ( $heading == 'TOOLBOX' ) {
-						$heading = 'toolbox';
-					}
+				$bar['qbfind'] = $this->searchForm( 'sidebar' );
+			} elseif ( $heading == 'TOOLBOX' ) {
+				$bar['toolbox'] = $this->getToolbox();
+			} elseif ( $heading == 'navigation' ) {
+				// Use the navigation heading from standard sidebar as the "browse" section
+				$bar['qbbrowse'] = $data;
+			} else {
+				$bar[$heading] = $data;
+			}
+		}
 
-					$headingMsg = wfMessage( $heading );
-					$any_link = false;
-					$t = $this->menuHead( $headingMsg->exists() ? $headingMsg->text() : $heading );
 
-					foreach ( $links as $key => $link ) {
-						// Can be empty due to rampant sidebar massaging we're doing above
-						if ( $link ) {
-							$any_link = true;
-							$t .= $this->makeListItem( $key, $link, array( 'tag' => 'span' ) ) . $sep;
-						}
-					}
+		// Output the sidebar
+		$s = "<div id='quickbar'>\n";
+
+		foreach ( $bar as $heading => $data ) {
+			$headingMsg = wfMessage( $heading );
+			$headingHTML = "<h6>" . ( $headingMsg->exists() ? $headingMsg->escaped() : htmlspecialchars( $heading ) ) . "</h6>";
+			$portletId = Sanitizer::escapeId( "p-$heading" );
+			$listHTML = "";
 
-					if ( $any_link ) {
-						$s .= $t;
+			if ( is_array( $data ) ) {
+				// $data is an array of links
+				foreach ( $data as $key => $link ) {
+					// Can be empty due to how the sidebar additions are done
+					if ( $link ) {
+						$listHTML .= $this->makeListItem( $key, $link );
 					}
-				} else {
-					// $links can be a HTML string
-					$s .= $links;
 				}
+				if ( $listHTML ) {
+					$listHTML = "<ul>$listHTML</ul>";
+				}
+			} else {
+				// $data is a HTML <ul>-list string
+				$listHTML = $data;
+			}
+
+			if ( $listHTML ) {
+				$s .= "<div class=\"portlet\" id=\"$portletId\">\n$headingHTML\n$listHTML\n</div>\n";
 			}
 		}
 
-		$s .= $sep . "\n</div>\n";
+		$s .= "</div>\n";
 		return $s;
 	}
 
diff --git a/skins/Vector.php b/skins/Vector.php
index 7fbca414b3..227d18d80f 100644
--- a/skins/Vector.php
+++ b/skins/Vector.php
@@ -361,7 +361,7 @@ class VectorTemplate extends BaseTemplate {
 	 * @param $elements array
 	 */
 	protected function renderNavigation( $elements ) {
-		global $wgVectorUseSimpleSearch;
+		global $wgVectorUseSimpleSearch, $wgVectorCombineUserTalk;
 
 		// If only one element was given, wrap it in an array, allowing more
 		// flexible arguments
@@ -444,10 +444,26 @@ class VectorTemplate extends BaseTemplate {
 <div id="p-personal" class="<?php if ( count( $this->data['personal_urls'] ) == 0 ) echo ' emptyPortlet'; ?>">
 	<h5><?php $this->msg( 'personaltools' ) ?></h5>
 	<ul<?php $this->html( 'userlangattributes' ) ?>>
-<?php			foreach( $this->getPersonalTools() as $key => $item ) { ?>
-		<?php echo $this->makeListItem( $key, $item ); ?>
-
-<?php			} ?>
+<?php
+					$personalTools = $this->getPersonalTools();
+					if ( $wgVectorCombineUserTalk && isset( $personalTools['userpage'] ) ) {
+?>
+		<li>
+<?php
+						echo $this->makeListItem( 'userpage', $personalTools['userpage'], array( 'tag' => 'span' ) );
+?> <?php
+						$personalTools['mytalk']['links'][0]['text'] = $this->getMsg( 'mytalk-parenthetical' )->text();
+						$talkItem = $this->makeListItem( 'mytalk', $personalTools['mytalk'], array( 'tag' => 'span' ) );
+						echo $this->getMsg( 'parentheses' )->rawParams( $talkItem )->escaped();
+						unset( $personalTools['userpage'], $personalTools['mytalk'] );
+?>
+		</li>
+<?php
+					}
+					foreach ( $personalTools as $key => $item ) {
+						echo $this->makeListItem( $key, $item );
+					}
+?>
 	</ul>
 </div>
 <?php
diff --git a/skins/cologneblue/screen.css b/skins/cologneblue/screen.css
index aac786d5ef..0d9615f745 100644
--- a/skins/cologneblue/screen.css
+++ b/skins/cologneblue/screen.css
@@ -70,6 +70,10 @@ textarea {
 	display: inline;
 }
 
+#cb-ca-edit {
+	font-weight: bold;
+}
+
 #pagestats {
 	font-family: Verdana, Arial, sans-serif;
 	color: black;
@@ -110,6 +114,14 @@ textarea {
 	margin-top: 0;
 }
 
+#quickbar .portlet ul,
+#quickbar .portlet li {
+	list-style-type: none;
+	margin: 0;
+	padding: 0;
+	line-height: inherit;
+}
+
 h1 {
 	color: #666666;
 	font-family: Verdana, Arial, sans-serif;
@@ -156,7 +168,7 @@ a.stub, #quickbar a.stub {
 	text-decoration: none;
 }
 
-a.new, #quickbar a.new {
+a.new, #quickbar span.new a, #footer span.new a {
 	color: #CC2200;
 }
 
diff --git a/skins/common/commonContent.css b/skins/common/commonContent.css
index 20182b4052..a550d97a84 100644
--- a/skins/common/commonContent.css
+++ b/skins/common/commonContent.css
@@ -112,6 +112,16 @@ img.thumbborder {
 	border: 1px solid #dddddd;
 }
 
+/**
+ * Edit forms
+ */
+#editform textarea {
+	display: block;
+	-moz-box-sizing: border-box;
+	-webkit-box-sizing: border-box;
+	box-sizing: border-box;
+}
+
 /**
  * Basic styles for the user login and create account forms
  */
diff --git a/skins/common/shared.css b/skins/common/shared.css
index 8f771e9a8a..ed4e8c55a1 100644
--- a/skins/common/shared.css
+++ b/skins/common/shared.css
@@ -448,6 +448,11 @@ th.mw-revdel-checkbox {
 	text-align: center;
 }
 
+/* red links; see bug 36276 */
+a.new {
+	color: #BA0000;
+}
+
 /* feed links */
 a.feedlink {
 	/* @embed */
diff --git a/skins/common/wikibits.js b/skins/common/wikibits.js
index cae08af95f..c2c00db972 100644
--- a/skins/common/wikibits.js
+++ b/skins/common/wikibits.js
@@ -91,10 +91,9 @@ window.importStylesheet = function( page ) {
 
 window.importStylesheetURI = function( url, media ) {
 	var l = document.createElement( 'link' );
-	l.type = 'text/css';
 	l.rel = 'stylesheet';
 	l.href = url;
-	if( media ) {
+	if ( media ) {
 		l.media = media;
 	}
 	document.getElementsByTagName('head')[0].appendChild( l );
diff --git a/skins/modern/main.css b/skins/modern/main.css
index 7149551f2b..80cdcdadf8 100644
--- a/skins/modern/main.css
+++ b/skins/modern/main.css
@@ -150,6 +150,11 @@ textarea {
 	width: 100%;
 	padding: .1em;
 }
+#editform textarea {
+	-moz-box-sizing: border-box;
+	-webkit-box-sizing: border-box;
+	box-sizing: border-box;
+}
 
 #searchBody {
 	text-align: center;
diff --git a/tests/TestsAutoLoader.php b/tests/TestsAutoLoader.php
index 2fc89074f5..7a835d6c66 100644
--- a/tests/TestsAutoLoader.php
+++ b/tests/TestsAutoLoader.php
@@ -43,6 +43,9 @@ $wgAutoloadClasses += array(
 	'RandomImageGenerator' => "$testFolder/phpunit/includes/api/RandomImageGenerator.php",
 	'UserWrapper' => "$testFolder/phpunit/includes/api/ApiTestCase.php",
 
+	//db
+	'ORMTableTest' => "$testFolder/phpunit/includes/db/ORMTableTest.php",
+
 	//Selenium
 	'SeleniumTestConstants' => "$testFolder/selenium/SeleniumTestConstants.php",
 
@@ -50,6 +53,9 @@ $wgAutoloadClasses += array(
 	'DumpTestCase' => "$testFolder/phpunit/maintenance/DumpTestCase.php",
 	'BackupDumper' => "$testFolder/../maintenance/backup.inc",
 
+	//language
+	'LanguageClassesTestCase' => "$testFolder/phpunit/languages/LanguageClassesTestCase.php",
+
 	//Generic providers
 	'MediaWikiProvide' => "$testFolder/phpunit/includes/Providers.php",
 );
diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt
index dbbcd478cf..4690e1a88e 100644
--- a/tests/parser/parserTests.txt
+++ b/tests/parser/parserTests.txt
@@ -48,7 +48,7 @@ Template:Blank
 !! endarticle
 
 !! article
-Template:!
+Template:pipe
 !! text
 |
 !! endarticle
@@ -65,6 +65,12 @@ Template:inner list
 * item 1
 !! endarticle
 
+!! article
+Template:!
+!! text
+|
+!! endarticle
+
 !! article
 Template:echo
 !! text
@@ -89,6 +95,13 @@ Template:attr_str
 {{{1}}}="{{{2}}}"
 !! endarticle
 
+!! article
+Template:table_attribs
+!! text
+<noinclude>
+|</noinclude>style="color: red"| Foo
+!! endarticle
+
 ###
 ### Basic tests
 ###
@@ -908,6 +921,15 @@ Bug 6200: Preformatted in <blockquote>
 </p>
 !! end
 
+!! test
+</pre> inside nowiki
+!! input
+<nowiki></pre></nowiki>
+!! result
+<p>&lt;/pre&gt;
+</p>
+!! end
+
 !!test
 Templates: Pre: 1a. Templates that break a line should suppress <pre>
 !!input
@@ -964,6 +986,8 @@ Templates: Pre: 1e. Wrapping should be based on expanded content
 !!input
 {{echo| foo}}
 
+{{echo| foo}}{{echo| bar}}
+
 {{echo| foo}}
 {{echo| bar}}
 
@@ -975,6 +999,8 @@ Templates: Pre: 1e. Wrapping should be based on expanded content
 !!result
 <pre>foo
 </pre>
+<pre>foo bar
+</pre>
 <pre>foo
 bar
 </pre>
@@ -986,6 +1012,92 @@ bar
 </pre>
 !!end
 
+!! test
+Templates: Pre: 1f: Wrapping should be based on expanded content
+!! input
+{{echo| }}a
+
+{{echo|
+ }}a
+
+{{echo|
+ b}}
+
+{{echo|a
+ }}b
+
+{{echo|a
+}} b
+!!result
+<pre>a
+</pre>
+<p><br />
+</p>
+<pre>a
+</pre>
+<p><br />
+</p>
+<pre>b
+</pre>
+<p>a
+</p>
+<pre>b
+</pre>
+<p>a
+</p>
+<pre>b
+</pre>
+!!end
+
+!! test
+Templates: Single-line variant of parameter whitespace stripping test
+!! input
+{{echo| a}}
+
+{{echo|1= a}}
+
+{{echo|{{echo| a}}}}
+
+{{echo|1={{echo| a}}}}
+!! result
+<pre>a
+</pre>
+<p>a
+</p>
+<pre>a
+</pre>
+<p>a
+</p>
+!! end
+
+!! test
+Templates: Strip whitespace from named parameters, but not positional ones
+!! input
+{{echo|
+ foo}}
+
+{{echo|
+* foo}}
+
+{{echo| 1 =
+ foo}}
+
+{{echo| 1 =
+* foo}}
+!! result
+<pre>foo
+</pre>
+<p><br />
+</p>
+<ul><li> foo
+</li></ul>
+<p>foo
+</p>
+<ul><li> foo
+</li></ul>
+
+!! end
+
 ###
 ### Parsoid-centric tests for testing RT edge cases for pre
 ###
@@ -1067,7 +1179,7 @@ c
 !!end
 
 !!test
-3. Pre and block tags
+3a. Pre and block tags (single-line html)
 !!input
  <p> foo </p>
  <div> foo </div>
@@ -1079,6 +1191,58 @@ c
 </pre>
 !!end
 
+!!test
+3b. Pre and block tags (pre-content on separate line)
+!!input
+<p>
+ foo
+</p>
+
+<div>
+ foo
+</div>
+
+<center>
+ foo
+</center>
+
+<blockquote>
+ foo
+</blockquote>
+
+<table><tr><td>
+ foo
+</td></tr></table>
+
+<ul><li>
+  foo
+</li></ul>
+
+!!result
+<p>
+ foo
+</p>
+<div>
+<pre>foo
+</pre>
+</div>
+<center>
+<pre>foo
+</pre>
+</center>
+<blockquote>
+ foo
+</blockquote>
+<table><tr><td>
+<pre>foo
+</pre>
+</td></tr></table>
+<ul><li>
+  foo
+</li></ul>
+
+!!end
+
 !!test
 4. Multiple spaces at start-of-line
 !!input
@@ -1202,7 +1366,6 @@ Definition lists: colon in HTML attribute
 
 !! end
 
-
 !! test
 Definition lists: self-closed tag
 !! input
@@ -1215,8 +1378,6 @@ Definition lists: self-closed tag
 
 !! test
 Bug 11748: Literal closing tags
-!! options
-disabled
 !! input
 <dl>
 <dt>test 1</dt>
@@ -1231,19 +1392,20 @@ disabled
 <dt>test 2</dt>
 <dd>test test test test test</dd>
 </dl>
+
 !! end
 
 !! test
 Definition and unordered list using wiki syntax nested in unordered list using html tags.
 !! input
 <ul><li>
-; term : description 
+; term : description
 * unordered
 </li>
 </ul>
 !! result
 <ul><li>
-<dl><dt> term&#160;</dt><dd> description 
+<dl><dt> term&#160;</dt><dd> description
 </dd></dl>
 <ul><li> unordered
 </li></ul>
@@ -1253,6 +1415,7 @@ Definition and unordered list using wiki syntax nested in unordered list using h
 !! end
 
 !! test
+
 Definition list with empty definition and following paragraph
 !! input
 ; term:
@@ -1264,6 +1427,23 @@ Paragraph text
 </p>
 !! end
 
+!! test
+Nested definition lists using html syntax
+!! input
+<dl><dd>
+<dl>
+<dd>Foo</dd>
+</dl>
+</dd></dl>
+!! result
+<dl><dd>
+<dl>
+<dd>Foo</dd>
+</dl>
+</dd></dl>
+
+!! end
+
 !! test
 Definition Lists: No nesting: Multiple dd's
 !! input
@@ -2089,6 +2269,15 @@ http:/example.com
 </p>
 !! end
 
+!! test
+Bracketed external links with template-generated invalid target
+!! input
+[{{echo|http:/example.com}} title]
+!! result
+<p>[http:/example.com title]
+</p>
+!! end
+
 !! test
 Bug 2702: Mismatched <i>, <b> and <a> tags are invalid
 !! input
@@ -2348,9 +2537,9 @@ A table with nothing but a caption
 !! test
 Simple table
 !! input
-{| 
+{|
 | 1 || 2
-|- 
+|-
 | 3 || 4
 |}
 !! result
@@ -2369,7 +2558,7 @@ Simple table
 !! test
 Simple table but with multiple dashes for row wikitext
 !! input
-{| 
+{|
 | foo
 |-----
 | bar
@@ -2482,12 +2671,12 @@ Allow +/- in 2nd and later cells in a row
 Table rowspan
 !! input
 {| border=1
-| Cell 1, row 1 
-|rowspan=2| Cell 2, row 1 (and 2) 
-| Cell 3, row 1 
-|- 
-| Cell 1, row 2 
-| Cell 3, row 2 
+| Cell 1, row 1
+|rowspan=2| Cell 2, row 1 (and 2)
+| Cell 3, row 1
+|-
+| Cell 1, row 2
+| Cell 3, row 2
 |}
 !! result
 <table border="1">
@@ -2592,6 +2781,19 @@ Indented table markup mixed with indented pre content (proposed in bug 6200)
 
 !! end
 
+!! test
+Template-generated table cell attributes and cell content
+!! input
+{|
+|{{table_attribs}}
+|}
+!! result
+<table>
+<tr>
+<td style="color: red"> Foo
+</td></tr></table>
+
+!! end
 
 ###
 ### Internal links
@@ -3139,6 +3341,15 @@ language=ln
 </p>
 !! end
 
+!! test
+Broken br tag sanitization
+!! input
+</br>
+!! result
+<p>&lt;/br&gt;
+</p>
+!! end
+
 !! test
 Incorrecly removing closing slashes from correctly formed XHTML
 !! input
@@ -4183,7 +4394,7 @@ Template with complex arguments
 !! test
 BUG 553: link with two variables in a piped link
 !! input
-{| 
+{|
 |[[{{{1}}}|{{{2}}}]]
 |}
 !! result
@@ -4291,9 +4502,9 @@ Template from main namespace
 !! article
 Template:table
 !! text
-{| 
+{|
 | 1 || 2
-|- 
+|-
 | 3 || 4
 |}
 !! endarticle
@@ -4785,7 +4996,7 @@ Templates: HTML Tag: 6. Generation of end piece of HTML attr value
 !!end
 
 !!test
-Templates: Tables: 1. Generating start of a HTML table
+Templates: HTML Tables: 1. Generating start of a HTML table
 !!input
 {{echo|<table><tr><td>foo</td>}}</tr></table>
 !!result
@@ -4794,7 +5005,7 @@ Templates: Tables: 1. Generating start of a HTML table
 !!end
 
 !!test
-Templates: Tables: 2a. Generating middle of a HTML table
+Templates: HTML Tables: 2a. Generating middle of a HTML table
 !!input
 <table><tr>{{echo|<td>foo</td>}}</tr></table>
 !!result
@@ -4803,7 +5014,7 @@ Templates: Tables: 2a. Generating middle of a HTML table
 !!end
 
 !!test
-Templates: Tables: 2b. Generating middle of a HTML table
+Templates: HTML Tables: 2b. Generating middle of a HTML table
 !!input
 <table>{{echo|<tr><td>foo</td></tr>}}</table>
 !!result
@@ -4812,7 +5023,7 @@ Templates: Tables: 2b. Generating middle of a HTML table
 !!end
 
 !!test
-Templates: Tables: 3. Generating end of a HTML table
+Templates: HTML Tables: 3. Generating end of a HTML table
 !!input
 <table><tr>{{echo|<td>foo</td></tr></table>}}
 !!result
@@ -4821,7 +5032,7 @@ Templates: Tables: 3. Generating end of a HTML table
 !!end
 
 !!test
-Templates: Tables: 4a. Generating a single tag of a HTML table
+Templates: HTML Tables: 4a. Generating a single tag of a HTML table
 !!input
 {{echo|<table>}}<tr><td>foo</td></tr></table>
 !!result
@@ -4830,7 +5041,7 @@ Templates: Tables: 4a. Generating a single tag of a HTML table
 !!end
 
 !!test
-Templates: Tables: 4b. Generating a single tag of a HTML table
+Templates: HTML Tables: 4b. Generating a single tag of a HTML table
 !!input
 <table>{{echo|<tr>}}<td>foo</td></tr></table>
 !!result
@@ -4839,7 +5050,7 @@ Templates: Tables: 4b. Generating a single tag of a HTML table
 !!end
 
 !!test
-Templates: Tables: 4c. Generating a single tag of a HTML table
+Templates: HTML Tables: 4c. Generating a single tag of a HTML table
 !!input
 <table><tr>{{echo|<td>}}foo</td></tr></table>
 !!result
@@ -4848,7 +5059,7 @@ Templates: Tables: 4c. Generating a single tag of a HTML table
 !!end
 
 !!test
-Templates: Tables: 4d. Generating a single tag of a HTML table
+Templates: HTML Tables: 4d. Generating a single tag of a HTML table
 !!input
 <table><tr><td>foo{{echo|</td>}}</tr></table>
 !!result
@@ -4857,7 +5068,7 @@ Templates: Tables: 4d. Generating a single tag of a HTML table
 !!end
 
 !!test
-Templates: Tables: 4e. Generating a single tag of a HTML table
+Templates: HTML Tables: 4e. Generating a single tag of a HTML table
 !!input
 <table><tr><td>foo</td>{{echo|</tr>}}</table>
 !!result
@@ -4866,7 +5077,7 @@ Templates: Tables: 4e. Generating a single tag of a HTML table
 !!end
 
 !!test
-Templates: Tables: 4f. Generating a single tag of a HTML table
+Templates: HTML Tables: 4f. Generating a single tag of a HTML table
 !!input
 <table><tr><td>foo</td></tr>{{echo|</table>}}
 !!result
@@ -4874,6 +5085,62 @@ Templates: Tables: 4f. Generating a single tag of a HTML table
 
 !!end
 
+!!test
+Templates: Wiki Tables: 1. Fostering of entire template content
+!!input
+{|
+{{echo|a}}
+|}
+!!result
+<table>
+a
+<tr><td></td></tr></table>
+
+!!end
+
+!!test
+Templates: Wiki Tables: 2. Fostering of partial template content
+!!input
+{|
+{{echo|a
+<div>b</div>}}
+|}
+!!result
+<table>
+a
+<div>b</div>
+<tr><td></td></tr></table>
+
+!!end
+
+!!test
+Templates: Wiki Tables: 3. td-content via multiple templates
+!!input
+{|
+{{echo|{{pipe}}a}}{{echo|b}}
+|}
+!!result
+<table>
+<tr>
+<td>ab
+</td></tr></table>
+
+!!end
+
+!!test
+Templates: Lists: Multi-line list-items via templates
+!!input
+*{{echo|a {{nonexistent|
+unused}}}}
+*{{echo|b {{nonexistent|
+unused}}}}
+!!result
+<ul><li>a <a href="/index.php?title=Template:Nonexistent&amp;action=edit&amp;redlink=1" class="new" title="Template:Nonexistent (page does not exist)">Template:Nonexistent</a>
+</li><li>b <a href="/index.php?title=Template:Nonexistent&amp;action=edit&amp;redlink=1" class="new" title="Template:Nonexistent (page does not exist)">Template:Nonexistent</a>
+</li></ul>
+
+!!end
+
 !!test
 Templates: Ugly nesting: 1. Quotes opened/closed across templates (echo)
 !!input
@@ -6201,6 +6468,46 @@ pst
 [[Category:{{echo|Foo}}|{{echo|Bar}}]]
 !! end
 
+!! test
+Category / paragraph interactions
+!! input
+Foo [[Category:Baz]] Bar
+
+Foo [[Category:Baz]]
+Bar
+
+Foo
+[[Category:Baz]]
+Bar
+
+Foo
+[[Category:Baz]] Bar
+
+Foo
+[[Category:Baz]]
+ [[Category:Baz]]
+[[Category:Baz]]
+Bar
+
+[[Category:Baz]]
+ [[Category:Baz]]
+[[Category:Baz]]
+
+[[Category:Baz]]
+ {{echo|[[Category:Baz]]}}
+[[Category:Baz]]
+!! result
+<p>Foo Bar
+</p><p>Foo
+Bar
+</p><p>Foo
+Bar
+</p><p>Foo Bar
+</p><p>Foo
+Bar
+</p>
+!! end
+
 ###
 ### Inter-language links
 ###
@@ -10120,6 +10427,29 @@ Bug 529: Uncovered bullet
 
 !! end
 
+# Plain MediaWiki does not remove empty lists, but tidy actually does.
+# Templates in Wikipedia rely on this behavior, as tidy has always been
+# enabled there. These tests are normally run *without* tidy, so specify the
+# full output here. 
+# To test realistic parsing behavior, apply a tidy-like transformation to both
+# the expected output and your parser's output.
+!! test
+Bug 529: Uncovered bullet leaving empty list, normally removed by tidy
+!! input
+******* Foo {{bullet}}
+!! result
+<ul><li><ul><li><ul><li><ul><li><ul><li><ul><li><ul><li> Foo 
+</li></ul>
+</li></ul>
+</li></ul>
+</li></ul>
+</li></ul>
+</li></ul>
+</li><li> Bar
+</li></ul>
+
+!! end
+
 !! test
 Bug 529: Uncovered table already at line-start
 !! input
@@ -11501,6 +11831,740 @@ disabled
 </p>
 !!end
 
+#### The following section of tests are primarily to test
+#### wikitext escaping capabilities of Parsoid.
+#### A lot of the tests are disabled for the PHP parser either
+#### because of minor newline diffs or other reasons.
+#### As Parsoid serializer can handle newlines and other HTML
+#### more robustly, some of these tests might get reenabled
+#### for the PHP parser.
+
+#### --------------- Headings ---------------
+#### 0. Unnested
+#### 1. Nested inside html <h1>=foo=</h1>
+#### 2. Outside heading nest on a single line <h1>foo</h1>*bar
+#### 3. Nested inside html with wikitext split by html tags
+#### 4. No escape needed
+#### 5. Empty headings <h1></h1>
+#### 6. Heading chars in SOL context
+#### ----------------------------------------
+!! test
+Headings: 0. Unnested
+!! input
+<nowiki>=foo=</nowiki>
+
+<nowiki>=foo</nowiki>''a''=
+!! result
+<p>=foo=
+</p><p>=foo<i>a</i>=
+</p>
+!!end
+
+!! test
+Headings: 1. Nested inside html
+!! options
+disabled
+!! input
+=<nowiki>=foo=</nowiki>=
+==<nowiki>=foo=</nowiki>==
+===<nowiki>=foo=</nowiki>===
+====<nowiki>=foo=</nowiki>====
+=====<nowiki>=foo=</nowiki>=====
+======<nowiki>=foo=</nowiki>======
+!! result
+<h1>=foo=</h1>
+<h2>=foo=</h2>
+<h3>=foo=</h3>
+<h4>=foo=</h4>
+<h5>=foo=</h5>
+<h6>=foo=</h6>
+!!end
+
+!! test
+Headings: 2. Outside heading nest on a single line <h1>foo</h1>*bar
+!! options
+disabled
+!! input
+=foo=
+<nowiki>*bar</nowiki>
+=foo=
+=bar
+=foo=
+<nowiki>=bar=</nowiki>
+!! result
+<h1>foo</h1>*bar
+<h1>foo</h1>=bar
+<h1>foo</h1>=bar=
+!!end
+
+!! test
+Headings: 3. Nested inside html with wikitext split by html tags
+!! options
+disabled
+!! input
+=<nowiki>=</nowiki>'''bold'''foo==
+!! result
+<h1>=<b>bold</b>foo=</h1>
+!!end
+
+!! test
+Headings: 4. No escaping needed (testing just h1 and h2)
+!! options
+disabled
+!! input
+==foo=
+=foo==
+===foo==
+==foo===
+=''=''foo==
+===
+!! result
+<h1>=foo</h1>
+<h1>foo=</h1>
+<h2>=foo</h2>
+<h2>foo=</h2>
+<h1><i>=</i>foo=</h1>
+<h1>=</h1>
+!!end
+
+!! test
+Headings: 5. Empty headings
+!! options
+disabled
+!! input
+=<nowiki></nowiki>=
+==<nowiki></nowiki>==
+===<nowiki></nowiki>===
+====<nowiki></nowiki>====
+=====<nowiki></nowiki>=====
+======<nowiki></nowiki>======
+!! result
+<h1></h1>
+<h2></h2>
+<h3></h3>
+<h4></h4>
+<h5></h5>
+<h6></h6>
+!!end
+
+!! test
+Headings: 6. Heading chars in SOL context
+!! options
+disabled
+!! input
+<!--cmt--><nowiki>=h1=</nowiki>
+!! result
+<p><!--cmt-->=h1=
+</p>
+!!end
+
+#### --------------- Lists ---------------
+#### 0. Outside nests (*foo, etc.)
+#### 1. Nested inside html <ul><li>*foo</li></ul>
+#### 2. Inside definition lists
+#### 3. Only bullets at start should be escaped
+#### 4. No escapes needed
+#### 5. No unnecessary escapes
+#### 6. Escape bullets in SOL position
+#### 7. Escape bullets in a multi-line context
+#### ----------------------------------------
+
+!! test
+Lists: 0. Outside nests
+!! input
+<nowiki>*foo</nowiki>
+
+<nowiki>#foo</nowiki>
+!! result
+<p>*foo
+</p><p>#foo
+</p>
+!!end
+
+!! test
+Lists: 1. Nested inside html
+!! input
+*<nowiki>*foo</nowiki>
+
+*<nowiki>#foo</nowiki>
+
+*<nowiki>:foo</nowiki>
+
+*<nowiki>;foo</nowiki>
+
+#<nowiki>*foo</nowiki>
+
+#<nowiki>#foo</nowiki>
+
+#<nowiki>:foo</nowiki>
+
+#<nowiki>;foo</nowiki>
+!! result
+<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
+!! input
+;<nowiki>;foo</nowiki>
+
+;<nowiki>:foo</nowiki>
+
+;<nowiki>:foo</nowiki>
+:bar
+
+:<nowiki>:foo</nowiki>
+!! result
+<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
+!! input
+*<nowiki>*foo*bar</nowiki>
+
+*<nowiki>*foo</nowiki>''it''*bar
+!! result
+<ul><li>*foo*bar
+</li></ul>
+<ul><li>*foo<i>it</i>*bar
+</li></ul>
+
+!!end
+
+!! test
+Lists: 4. No escapes needed
+!! options
+disabled
+!! input
+*foo*bar
+
+*''foo''*bar
+
+*[[Foo]]: bar
+!! result
+<ul><li>foo*bar
+</li></ul>
+<ul><li><i>foo</i>*bar
+</li></ul>
+<ul><li><a href="Foo" rel="mw:WikiLink">Foo</a>: bar
+</li></ul>
+!!end
+
+!! test
+Lists: 5. No unnecessary escapes
+!! input
+* bar <span><nowiki>[[foo]]</nowiki></span>
+
+*=bar <span><nowiki>[[foo]]</nowiki></span>
+
+*[[bar <span><nowiki>[[foo]]</nowiki></span>
+
+*<nowiki>]]bar </nowiki><span><nowiki>[[foo]]</nowiki></span>
+
+*=bar <span>foo]]</span>=
+!! result
+<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>
+
+!!end
+
+!! test
+Lists: 6. Escape bullets in SOL position
+!! options
+disabled
+!! input
+<!--cmt--><nowiki>*foo</nowiki>
+!! result
+<p><!--cmt-->*foo
+</p>
+!!end
+
+!! test
+Lists: 7. Escape bullets in a multi-line context
+!! input
+<nowiki>a
+*b</nowiki>
+!! result
+<p>a
+*b
+</p>
+!!end
+
+#### --------------- HRs ---------------
+#### 1. Single line
+#### -----------------------------------
+
+!! test
+HRs: 1. Single line
+!! options
+disabled
+!! input
+----
+<nowiki>----</nowiki>
+----
+<nowiki>=foo=</nowiki>
+----
+<nowiki>*foo</nowiki>
+!! result
+<hr/>----
+<hr/>=foo=
+<hr/>*foo
+!! end
+
+#### --------------- Tables ---------------
+#### 1a. Simple example
+#### 1b. No escaping needed (!foo)
+#### 1c. No escaping needed (|foo)
+#### 1d. No escaping needed (|}foo)
+####
+#### 2a. Nested in td (<td>foo|bar</td>)
+#### 2b. Nested in td (<td>foo||bar</td>)
+#### 2c. Nested in td -- no escaping needed(<td>foo!!bar</td>)
+####
+#### 3a. Nested in th (<th>foo!bar</th>)
+#### 3b. Nested in th (<th>foo!!bar</th>)
+#### 3c. Nested in th -- no escaping needed(<th>foo||bar</th>)
+####
+#### 4a. Escape -
+#### 4b. Escape +
+#### 4c. No escaping needed
+#### --------------------------------------
+
+!! test
+Tables: 1a. Simple example
+!! input
+<nowiki>{|
+|}</nowiki>
+!! result
+<p>{|
+|}
+</p>
+!! end
+
+!! test
+Tables: 1b. No escaping needed
+!! input
+!foo
+!! result
+<p>!foo
+</p>
+!! end
+
+!! test
+Tables: 1c. No escaping needed
+!! input
+|foo
+!! result
+<p>|foo
+</p>
+!! end
+
+!! test
+Tables: 1d. No escaping needed
+!! input
+|}foo
+!! result
+<p>|}foo
+</p>
+!! end
+
+!! test
+Tables: 2a. Nested in td
+!! options
+disabled
+!! input
+{|
+|<nowiki>foo|bar</nowiki>
+|}
+!! result
+<table>
+<tr><td>foo|bar
+</td></tr></table>
+
+!! end
+
+!! test
+Tables: 2b. Nested in td
+!! options
+disabled
+!! input
+{|
+|<nowiki>foo||bar</nowiki>
+|''it''<nowiki>foo||bar</nowiki>
+|}
+!! result
+<table>
+<tr><td>foo||bar
+</td><td><i>it</i>foo||bar
+</td></tr></table>
+
+!! end
+
+!! test
+Tables: 2c. Nested in td -- no escaping needed
+!! options
+disabled
+!! input
+{|
+|foo!!bar
+|}
+!! result
+<table>
+<tr><td>foo!!bar
+</td></tr></table>
+
+!! end
+
+!! test
+Tables: 3a. Nested in th
+!! options
+disabled
+!! input
+{|
+!foo!bar
+|}
+!! result
+<table>
+<tr><th>foo!bar
+</th></tr></table>
+
+!! end
+
+!! test
+Tables: 3b. Nested in th
+!! options
+disabled
+!! input
+{|
+!<nowiki>foo!!bar</nowiki>
+|}
+!! result
+<table>
+<tr><th>foo!!bar
+</th></tr></table>
+
+!! end
+
+!! test
+Tables: 3c. Nested in th -- no escaping needed
+!! options
+disabled
+!! input
+{|
+!foo||bar
+|}
+!! result
+<table>
+<tr><th>foo||bar
+</th></tr></table>
+
+!! end
+
+!! test
+Tables: 4a. Escape -
+!! options
+disabled
+!! input
+{|
+|-
+!-bar
+|-
+|<nowiki>-bar</nowiki>
+|}
+!! result
+<table><tbody>
+<tr><th>-bar</th></tr>
+<tr><td>-bar</td></tr>
+</tbody></table>
+!! end
+
+!! test
+Tables: 4b. Escape +
+!! options
+disabled
+!! input
+{|
+|-
+!+bar
+|-
+|<nowiki>+bar</nowiki>
+|}
+!! result
+<table><tbody>
+<tr><th>+bar</th></tr>
+<tr><td>+bar</td></tr>
+</tbody></table>
+!! end
+
+!! test
+Tables: 4c. No escaping needed
+!! options
+disabled
+!! input
+{|
+|-
+|foo-bar
+|foo+bar
+|-
+|''foo''-bar
+|''foo''+bar
+|}
+!! result
+<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>
+</tbody></table>
+!! end
+
+#### --------------- Links ---------------
+#### 1. Quote marks in link text
+#### 2. Wikilinks: Escapes needed
+#### 3. Wikilinks: No escapes needed
+#### 4. Extlinks: Escapes needed
+#### 5. Extlinks: No escapes needed
+#### --------------------------------------
+!! test
+Links 1. Quote marks in link text
+!! options
+disabled
+!! input
+[[Foo|<nowiki>Foo''boo''</nowiki>]]
+!! result
+<a rel="mw:WikiLink" href="Foo" data-parsoid="{&quot;tsr&quot;:[0,7],&quot;contentPos&quot;:[5,5],&quot;src&quot;:&quot;[[Foo]]&quot;,&quot;bsp&quot;:[0,7],&quot;stx&quot;:&quot;simple&quot;}">Foo''boo''</a>
+!! end
+
+!! test
+Links 2. WikiLinks: Escapes needed
+!! options
+disabled
+!! input
+[[Foo|<nowiki>[Foobar]</nowiki>]]
+[[Foo|<nowiki>Foobar]</nowiki>]]
+[[Foo|<nowiki>x [Foobar] x</nowiki>]]
+[[Foo|<nowiki>x [http://google.com g] x</nowiki>]]
+[[Foo|<nowiki>[[Bar]]</nowiki>]]
+[[Foo|<nowiki>x [[Bar]] x</nowiki>]]
+[[Foo|<nowiki>|Bar</nowiki>]]
+!! result
+<a href="Foo" rel="mw:WikiLink">[Foobar]</a>
+<a href="Foo" rel="mw:WikiLink">Foobar]</a>
+<a href="Foo" rel="mw:WikiLink">x [Foobar] x</a>
+<a href="Foo" rel="mw:WikiLink">x [http://google.com g] x</a>
+<a href="Foo" rel="mw:WikiLink">[[Bar]]</a>
+<a href="Foo" rel="mw:WikiLink">x [[Bar]] x</a>
+<a href="Foo" rel="mw:WikiLink">|Bar</a>
+!! end
+
+!! test
+Links 3. WikiLinks: No escapes needed
+!! options
+disabled
+!! input
+[[Foo|[Foobar]]
+[[Foo|foo|bar]]
+!! result
+<a href="Foo" rel="mw:WikiLink">[Foobar</a>
+<a href="Foo" rel="mw:WikiLink">foo|bar</a>
+!! end
+
+!! test
+Links 4. ExtLinks: Escapes needed
+!! options
+disabled
+!! input
+[http://google.com <nowiki>[google]</nowiki>]
+[http://google.com <nowiki>google]</nowiki>]
+!! result
+<a href="http://google.com" rel="mw:ExtLink">[google]</a>
+<a href="http://google.com" rel="mw:ExtLink">google]</a>
+!! end
+
+!! test
+Links 5. ExtLinks: No escapes needed
+!! options
+disabled
+!! input
+[http://google.com [google]
+!! result
+<a href="http://google.com" rel="mw:ExtLink">[google</a>
+!! end
+
+#### --------------- Quotes ---------------
+#### 1. Quotes inside <b> and <i>
+#### 2. Link fragments separated by <i> and <b> tags
+#### 3. Link fragments inside <i> and <b>
+#### --------------------------------------
+!! test
+1. Quotes inside <b> and <i>
+!! input
+''<nowiki>'foo'</nowiki>''
+''<nowiki>''foo''</nowiki>''
+''<nowiki>'''foo'''</nowiki>''
+'''<nowiki>'foo'</nowiki>'''
+'''<nowiki>''foo''</nowiki>'''
+'''<nowiki>'''foo'''</nowiki>'''
+'''<nowiki>foo'</nowiki>''<nowiki>bar'</nowiki>''baz'''
+!! result
+<p><i>'foo'</i>
+<i>''foo''</i>
+<i>'''foo'''</i>
+<b>'foo'</b>
+<b>''foo''</b>
+<b>'''foo'''</b>
+<b>foo'<i>bar'</i>baz</b>
+</p>
+!! end
+
+!! test
+2. Link fragments separated by <i> and <b> tags
+!! input
+[[''foo''<nowiki>hello]]</nowiki>
+
+[['''foo'''<nowiki>hello]]</nowiki>
+!! result
+<p>[[<i>foo</i>hello]]
+</p><p>[[<b>foo</b>hello]]
+</p>
+!! end
+
+!! test
+2. Link fragments inside <i> and <b>
+(FIXME: Escaping one or both of [[ and ]] is also acceptable --
+ this is one of the shortcomings of this format)
+!! input
+''[[foo''<nowiki>]]</nowiki>
+
+'''[[foo'''<nowiki>]]</nowiki>
+!! result
+<p><i>[[foo</i>]]
+</p><p><b>[[foo</b>]]
+</p>
+!! end
+
+#### --------------- Paragraphs ---------------
+#### 1. No unnecessary escapes
+#### --------------------------------------
+
+!! test
+1. No unnecessary escapes
+!! input
+bar <span><nowiki>[[foo]]</nowiki></span>
+
+=bar <span><nowiki>[[foo]]</nowiki></span>
+
+[[bar <span><nowiki>[[foo]]</nowiki></span>
+
+<nowiki>]]bar </nowiki><span><nowiki>[[foo]]</nowiki></span>
+
+<nowiki>=bar </nowiki><span>foo]]</span>=
+!! result
+<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 ------------------
+#### 1. Leading space in SOL context should be escaped
+#### --------------------------------------
+!! test
+1. Leading space in SOL context should be escaped
+!! options
+disabled
+!! input
+<nowiki> foo</nowiki>
+<!--cmt--><nowiki> foo</nowiki>
+!! result
+<p> foo
+<!--cmt--> foo
+</p>
+!! end
+
+#### --------------- HTML tags ---------------
+#### 1. a tags
+#### 2. other tags
+#### 3. multi-line html tag
+#### --------------------------------------
+!! test
+1. a tags
+!! options
+disabled
+!! input
+<a href="http://google.com">google</a>
+!! result
+&lt;a href=&quot;http://google.com&quot;&gt;google&lt;/a&gt;
+!! end
+
+!! test
+2. other tags
+!! input
+<nowiki><div>foo</div>
+<div style="color:red">foo</div></nowiki>
+!! result
+<p>&lt;div&gt;foo&lt;/div&gt;
+&lt;div style=&quot;color:red&quot;&gt;foo&lt;/div&gt;
+</p>
+!! end
+
+!! test
+3. multi-line html tag
+!! input
+<nowiki><div
+>foo</div
+></nowiki>
+!! result
+<p>&lt;div
+&gt;foo&lt;/div
+&gt;
+</p>
+!! end
+
+#### --------------- Others ---------------
+!! test
+Escaping nowikis
+!! input
+&lt;nowiki&gt;foo&lt;/nowiki&gt;
+!! result
+<p>&lt;nowiki&gt;foo&lt;/nowiki&gt;
+</p>
+!! end
+
 TODO:
 more images
 more tables
diff --git a/tests/phpunit/MediaWikiTestCase.php b/tests/phpunit/MediaWikiTestCase.php
index 25ae32d5d7..db41a4d8ab 100644
--- a/tests/phpunit/MediaWikiTestCase.php
+++ b/tests/phpunit/MediaWikiTestCase.php
@@ -257,7 +257,7 @@ abstract class MediaWikiTestCase extends PHPUnit_Framework_TestCase {
 				throw new MWException( "MW global $name is not an array." );
 			}
 
-			//NOTE: do not use array_merge, it screws up for numeric keys.
+			// NOTE: do not use array_merge, it screws up for numeric keys.
 			$merged = $GLOBALS[$name];
 			foreach ( $values as $k => $v ) {
 				$merged[$k] = $v;
diff --git a/tests/phpunit/data/db/sqlite/tables-1.18.sql b/tests/phpunit/data/db/sqlite/tables-1.18.sql
index bedf6c3345..b106d2b7ef 100644
--- a/tests/phpunit/data/db/sqlite/tables-1.18.sql
+++ b/tests/phpunit/data/db/sqlite/tables-1.18.sql
@@ -296,7 +296,7 @@ CREATE TABLE /*_*/uploadstash (
 	us_size int unsigned NOT NULL,
 	us_sha1 varchar(31) NOT NULL,
 	us_mime varchar(255),
-  	us_media_type ENUM("UNKNOWN", "BITMAP", "DRAWING", "AUDIO", "VIDEO", "MULTIMEDIA", "OFFICE", "TEXT", "EXECUTABLE", "ARCHIVE") default NULL,
+	us_media_type ENUM("UNKNOWN", "BITMAP", "DRAWING", "AUDIO", "VIDEO", "MULTIMEDIA", "OFFICE", "TEXT", "EXECUTABLE", "ARCHIVE") default NULL,
 	us_image_width int unsigned,
 	us_image_height int unsigned,
 	us_image_bits smallint unsigned
diff --git a/tests/phpunit/docs/ExportDemoTest.php b/tests/phpunit/docs/ExportDemoTest.php
index ce65d494b5..211de261e6 100644
--- a/tests/phpunit/docs/ExportDemoTest.php
+++ b/tests/phpunit/docs/ExportDemoTest.php
@@ -26,6 +26,9 @@ class ExportDemoTest extends DumpTestCase {
 		$dom = new DomDocument();
 		$dom->load( $fname );
 
+		// Ensure, the demo is for the current version
+		$this->assertEquals( $dom->documentElement->getAttribute( 'version' ), $version, 'export-demo.xml should have the current version' );
+
 		try {
 			$this->assertTrue( $dom->schemaValidate( "../../docs/export-" . $version . ".xsd" ),
 				"schemaValidate has found an error" );
diff --git a/tests/phpunit/includes/CdbTest.php b/tests/phpunit/includes/CdbTest.php
index 7db8c8c8b3..32c84ef6f8 100644
--- a/tests/phpunit/includes/CdbTest.php
+++ b/tests/phpunit/includes/CdbTest.php
@@ -19,8 +19,11 @@ class CdbTest extends MediaWikiTestCase {
 			$this->markTestSkipped( "Temp dir isn't writable" );
 		}
 
-		$w1 = new CdbWriter_PHP( "$dir/php.cdb" );
-		$w2 = new CdbWriter_DBA( "$dir/dba.cdb" );
+		$phpcdbfile = $this->getNewTempFile();
+		$dbacdbfile = $this->getNewTempFile();
+
+		$w1 = new CdbWriter_PHP( $phpcdbfile );
+		$w2 = new CdbWriter_DBA( $dbacdbfile );
 
 		$data = array();
 		for ( $i = 0; $i < 1000; $i++ ) {
@@ -38,13 +41,13 @@ class CdbTest extends MediaWikiTestCase {
 		$w2->close();
 
 		$this->assertEquals(
-			md5_file( "$dir/dba.cdb" ),
-			md5_file( "$dir/php.cdb" ),
+			md5_file( $phpcdbfile ),
+			md5_file( $dbacdbfile ),
 			'same hash'
 		);
 
-		$r1 = new CdbReader_PHP( "$dir/php.cdb" );
-		$r2 = new CdbReader_DBA( "$dir/dba.cdb" );
+		$r1 = new CdbReader_PHP( $phpcdbfile );
+		$r2 = new CdbReader_DBA( $dbacdbfile );
 
 		foreach ( $data as $key => $value ) {
 			if ( $key === '' ) {
@@ -62,8 +65,6 @@ class CdbTest extends MediaWikiTestCase {
 			$this->cdbAssert( "DBA error", $key, $v2, $value );
 		}
 
-		unlink( "$dir/dba.cdb" );
-		unlink( "$dir/php.cdb" );
 	}
 
 	private function randomString() {
diff --git a/tests/phpunit/includes/ContentHandlerTest.php b/tests/phpunit/includes/ContentHandlerTest.php
deleted file mode 100644
index 797a3eedd8..0000000000
--- a/tests/phpunit/includes/ContentHandlerTest.php
+++ /dev/null
@@ -1,410 +0,0 @@
-<?php
-
-/**
- * @group ContentHandler
- *
- * @note: Declare that we are using the database, because otherwise we'll fail in the "databaseless" test run.
- * This is because the LinkHolderArray used by the parser needs database access.
- *
- * @group Database
- */
-class ContentHandlerTest extends MediaWikiTestCase {
-
-	public function setup() {
-		parent::setup();
-
-		global $wgExtraNamespaces, $wgNamespaceContentModels, $wgContentHandlers, $wgContLang;
-
-		$wgExtraNamespaces[ 12312 ] = 'Dummy';
-		$wgExtraNamespaces[ 12313 ] = 'Dummy_talk';
-
-		$wgNamespaceContentModels[ 12312 ] = "testing";
-		$wgContentHandlers[ "testing" ] = 'DummyContentHandlerForTesting';
-
-		MWNamespace::getCanonicalNamespaces( true ); # reset namespace cache
-		$wgContLang->resetNamespaces(); # reset namespace cache
-	}
-
-	public function teardown() {
-		global $wgExtraNamespaces, $wgNamespaceContentModels, $wgContentHandlers, $wgContLang;
-
-		unset( $wgExtraNamespaces[ 12312 ] );
-		unset( $wgExtraNamespaces[ 12313 ] );
-
-		unset( $wgNamespaceContentModels[ 12312 ] );
-		unset( $wgContentHandlers[ "testing" ] );
-
-		MWNamespace::getCanonicalNamespaces( true ); # reset namespace cache
-		$wgContLang->resetNamespaces(); # reset namespace cache
-
-		parent::teardown();
-	}
-
-	public function dataGetDefaultModelFor() {
-		//NOTE: assume that the Help namespace default to wikitext content
-		return array(
-			array( 'Help:Foo', CONTENT_MODEL_WIKITEXT ),
-			array( 'Help:Foo.js', CONTENT_MODEL_WIKITEXT ),
-			array( 'Help:Foo/bar.js', CONTENT_MODEL_WIKITEXT ),
-			array( 'User:Foo', CONTENT_MODEL_WIKITEXT ),
-			array( 'User:Foo.js', CONTENT_MODEL_WIKITEXT ),
-			array( 'User:Foo/bar.js', CONTENT_MODEL_JAVASCRIPT ),
-			array( 'User:Foo/bar.css', CONTENT_MODEL_CSS ),
-			array( 'User talk:Foo/bar.css', CONTENT_MODEL_WIKITEXT ),
-			array( 'User:Foo/bar.js.xxx', CONTENT_MODEL_WIKITEXT ),
-			array( 'User:Foo/bar.xxx', CONTENT_MODEL_WIKITEXT ),
-			array( 'MediaWiki:Foo.js', CONTENT_MODEL_JAVASCRIPT ),
-			array( 'MediaWiki:Foo.css', CONTENT_MODEL_CSS ),
-			array( 'MediaWiki:Foo.JS', CONTENT_MODEL_WIKITEXT ),
-			array( 'MediaWiki:Foo.CSS', CONTENT_MODEL_WIKITEXT ),
-			array( 'MediaWiki:Foo.css.xxx', CONTENT_MODEL_WIKITEXT ),
-		);
-	}
-
-	/**
-	 * @dataProvider dataGetDefaultModelFor
-	 */
-	public function testGetDefaultModelFor( $title, $expectedModelId ) {
-		$title = Title::newFromText( $title );
-		$this->assertEquals( $expectedModelId, ContentHandler::getDefaultModelFor( $title ) );
-	}
-	/**
-	 * @dataProvider dataGetDefaultModelFor
-	 */
-	public function testGetForTitle( $title, $expectedContentModel ) {
-		$title = Title::newFromText( $title );
-		$handler = ContentHandler::getForTitle( $title );
-		$this->assertEquals( $expectedContentModel, $handler->getModelID() );
-	}
-
-	public function dataGetLocalizedName() {
-		return array(
-			array( null, null ),
-			array( "xyzzy", null ),
-
-			array( CONTENT_MODEL_JAVASCRIPT, '/javascript/i' ), //XXX: depends on content language
-		);
-	}
-
-	/**
-	 * @dataProvider dataGetLocalizedName
-	 */
-	public function testGetLocalizedName( $id, $expected ) {
-		$name = ContentHandler::getLocalizedName( $id );
-
-		if ( $expected ) {
-			$this->assertNotNull( $name, "no name found for content model $id" );
-			$this->assertTrue( preg_match( $expected, $name ) > 0 ,
-								"content model name for #$id did not match pattern $expected" );
-		} else {
-			$this->assertEquals( $id, $name, "localization of unknown model $id should have "
-											. "fallen back to use the model id directly." );
-		}
-	}
-
-	public function dataGetPageLanguage() {
-		global $wgLanguageCode;
-
-		return array(
-			array( "Main", $wgLanguageCode ),
-			array( "Dummy:Foo", $wgLanguageCode ),
-			array( "MediaWiki:common.js", 'en' ),
-			array( "User:Foo/common.js", 'en' ),
-			array( "MediaWiki:common.css", 'en' ),
-			array( "User:Foo/common.css", 'en' ),
-			array( "User:Foo", $wgLanguageCode ),
-
-			array( CONTENT_MODEL_JAVASCRIPT, 'javascript' ),
-		);
-	}
-
-	/**
-	 * @dataProvider dataGetPageLanguage
-	 */
-	public function testGetPageLanguage( $title, $expected ) {
-		if ( is_string( $title ) ) {
-			$title = Title::newFromText( $title );
-		}
-
-		$expected = wfGetLangObj( $expected );
-
-		$handler = ContentHandler::getForTitle( $title );
-		$lang = $handler->getPageLanguage( $title );
-
-		$this->assertEquals( $expected->getCode(), $lang->getCode() );
-	}
-
-	public function testGetContentText_Null( ) {
-		global $wgContentHandlerTextFallback;
-
-		$content = null;
-
-		$wgContentHandlerTextFallback = 'fail';
-		$text = ContentHandler::getContentText( $content );
-		$this->assertEquals( '', $text );
-
-		$wgContentHandlerTextFallback = 'serialize';
-		$text = ContentHandler::getContentText( $content );
-		$this->assertEquals( '', $text );
-
-		$wgContentHandlerTextFallback = 'ignore';
-		$text = ContentHandler::getContentText( $content );
-		$this->assertEquals( '', $text );
-	}
-
-	public function testGetContentText_TextContent( ) {
-		global $wgContentHandlerTextFallback;
-
-		$content = new WikitextContent( "hello world" );
-
-		$wgContentHandlerTextFallback = 'fail';
-		$text = ContentHandler::getContentText( $content );
-		$this->assertEquals( $content->getNativeData(), $text );
-
-		$wgContentHandlerTextFallback = 'serialize';
-		$text = ContentHandler::getContentText( $content );
-		$this->assertEquals( $content->serialize(), $text );
-
-		$wgContentHandlerTextFallback = 'ignore';
-		$text = ContentHandler::getContentText( $content );
-		$this->assertEquals( $content->getNativeData(), $text );
-	}
-
-	public function testGetContentText_NonTextContent( ) {
-		global $wgContentHandlerTextFallback;
-
-		$content = new DummyContentForTesting( "hello world" );
-
-		$wgContentHandlerTextFallback = 'fail';
-
-		try {
-			$text = ContentHandler::getContentText( $content );
-
-			$this->fail( "ContentHandler::getContentText should have thrown an exception for non-text Content object" );
-		} catch (MWException $ex) {
-			// as expected
-		}
-
-		$wgContentHandlerTextFallback = 'serialize';
-		$text = ContentHandler::getContentText( $content );
-		$this->assertEquals( $content->serialize(), $text );
-
-		$wgContentHandlerTextFallback = 'ignore';
-		$text = ContentHandler::getContentText( $content );
-		$this->assertNull( $text );
-	}
-
-	#public static function makeContent( $text, Title $title, $modelId = null, $format = null )
-
-	public function dataMakeContent() {
-		//NOTE: assume the Help namespace defaults to wikitext content
-		return array(
-			array( 'hallo', 'Help:Test', null, null, CONTENT_MODEL_WIKITEXT, 'hallo', false ),
-			array( 'hallo', 'MediaWiki:Test.js', null, null, CONTENT_MODEL_JAVASCRIPT, 'hallo', false ),
-			array( serialize('hallo'), 'Dummy:Test', null, null, "testing", 'hallo', false ),
-
-			array( 'hallo', 'Help:Test', null, CONTENT_FORMAT_WIKITEXT, CONTENT_MODEL_WIKITEXT, 'hallo', false ),
-			array( 'hallo', 'MediaWiki:Test.js', null, CONTENT_FORMAT_JAVASCRIPT, CONTENT_MODEL_JAVASCRIPT, 'hallo', false ),
-			array( serialize('hallo'), 'Dummy:Test', null, "testing", "testing", 'hallo', false ),
-
-			array( 'hallo', 'Help:Test', CONTENT_MODEL_CSS, null, CONTENT_MODEL_CSS, 'hallo', false ),
-			array( 'hallo', 'MediaWiki:Test.js', CONTENT_MODEL_CSS, null, CONTENT_MODEL_CSS, 'hallo', false ),
-			array( serialize('hallo'), 'Dummy:Test', CONTENT_MODEL_CSS, null, CONTENT_MODEL_CSS, serialize('hallo'), false ),
-
-			array( 'hallo', 'Help:Test', CONTENT_MODEL_WIKITEXT, "testing", null, null, true ),
-			array( 'hallo', 'MediaWiki:Test.js', CONTENT_MODEL_CSS, "testing", null, null, true ),
-			array( 'hallo', 'Dummy:Test', CONTENT_MODEL_JAVASCRIPT, "testing", null, null, true ),
-		);
-	}
-
-	/**
-	 * @dataProvider dataMakeContent
-	 */
-	public function testMakeContent( $data, $title, $modelId, $format, $expectedModelId, $expectedNativeData, $shouldFail ) {
-		global $wgExtraNamespaces, $wgNamespaceContentModels, $wgContentHandlers;
-
-		$title = Title::newFromText( $title );
-
-		try {
-			$content = ContentHandler::makeContent( $data, $title, $modelId, $format );
-
-			if ( $shouldFail ) $this->fail( "ContentHandler::makeContent should have failed!" );
-
-			$this->assertEquals( $expectedModelId, $content->getModel(), 'bad model id' );
-			$this->assertEquals( $expectedNativeData, $content->getNativeData(), 'bads native data' );
-		} catch ( MWException $ex ) {
-			if ( !$shouldFail ) $this->fail( "ContentHandler::makeContent failed unexpectedly: " . $ex->getMessage() );
-			else $this->assertTrue( true ); // dummy, so we don't get the "test did not perform any assertions" message.
-		}
-
-	}
-
-	public function testSupportsSections() {
-		$this->markTestIncomplete( "not yet implemented" );
-	}
-
-	public function testRunLegacyHooks() {
-		Hooks::register( 'testRunLegacyHooks', __CLASS__ . '::dummyHookHandler' );
-
-		$content = new WikitextContent( 'test text' );
-		$ok = ContentHandler::runLegacyHooks( 'testRunLegacyHooks', array( 'foo', &$content, 'bar' ), false );
-
-		$this->assertTrue( $ok, "runLegacyHooks should have returned true" );
-		$this->assertEquals( "TEST TEXT", $content->getNativeData() );
-	}
-
-	public static function dummyHookHandler( $foo, &$text, $bar ) {
-		if ( $text === null || $text === false ) {
-			return false;
-		}
-
-		$text = strtoupper( $text );
-
-		return true;
-	}
-}
-
-class DummyContentHandlerForTesting extends ContentHandler {
-
-	public function __construct( $dataModel ) {
-		parent::__construct( $dataModel, array( "testing" ) );
-	}
-
-	/**
-	 * Serializes Content object of the type supported by this ContentHandler.
-	 *
-	 * @param Content $content the Content object to serialize
-	 * @param null $format the desired serialization format
-	 * @return String serialized form of the content
-	 */
-	public function serializeContent( Content $content, $format = null )
-	{
-	   return $content->serialize();
-	}
-
-	/**
-	 * Unserializes a Content object of the type supported by this ContentHandler.
-	 *
-	 * @param $blob String serialized form of the content
-	 * @param null $format the format used for serialization
-	 * @return Content the Content object created by deserializing $blob
-	 */
-	public function unserializeContent( $blob, $format = null )
-	{
-		$d = unserialize( $blob );
-		return new DummyContentForTesting( $d );
-	}
-
-	/**
-	 * Creates an empty Content object of the type supported by this ContentHandler.
-	 *
-	 */
-	public function makeEmptyContent()
-	{
-		return new DummyContentForTesting( '' );
-	}
-}
-
-class DummyContentForTesting extends AbstractContent {
-
-	public function __construct( $data ) {
-		parent::__construct( "testing" );
-
-		$this->data = $data;
-	}
-
-	public function serialize( $format = null ) {
-		return serialize( $this->data );
-	}
-
-	/**
-	 * @return String a string representing the content in a way useful for building a full text search index.
-	 *         If no useful representation exists, this method returns an empty string.
-	 */
-	public function getTextForSearchIndex() {
-		return '';
-	}
-
-	/**
-	 * @return String the wikitext to include when another page includes this  content, or false if the content is not
-	 *         includable in a wikitext page.
-	 */
-	public function getWikitextForTransclusion() {
-		return false;
-	}
-
-	/**
-	 * Returns a textual representation of the content suitable for use in edit summaries and log messages.
-	 *
-	 * @param int $maxlength maximum length of the summary text
-	 * @return String the summary text
-	 */
-	public function getTextForSummary( $maxlength = 250 ) {
-		return '';
-	}
-
-	/**
-	 * Returns native represenation of the data. Interpretation depends on the data model used,
-	 * as given by getDataModel().
-	 *
-	 * @return mixed the native representation of the content. Could be a string, a nested array
-	 *         structure, an object, a binary blob... anything, really.
-	 */
-	public function getNativeData()
-	{
-		return $this->data;
-	}
-
-	/**
-	 * returns the content's nominal size in bogo-bytes.
-	 *
-	 * @return int
-	 */
-	public function getSize() {
-		return strlen( $this->data );
-	}
-
-	/**
-	 * Return a copy of this Content object. The following must be true for the object returned
-	 * if $copy = $original->copy()
-	 *
-	 * * get_class($original) === get_class($copy)
-	 * * $original->getModel() === $copy->getModel()
-	 * * $original->equals( $copy )
-	 *
-	 * If and only if the Content object is imutable, the copy() method can and should
-	 * return $this. That is,  $copy === $original may be true, but only for imutable content
-	 * objects.
-	 *
-	 * @return Content. A copy of this object
-	 */
-	public function copy() {
-		return $this;
-	}
-
-	/**
-	 * Returns true if this content is countable as a "real" wiki page, provided
-	 * that it's also in a countable location (e.g. a current revision in the main namespace).
-	 *
-	 * @param $hasLinks Bool: if it is known whether this content contains links, provide this information here,
-	 *                        to avoid redundant parsing to find out.
-	 * @return boolean
-	 */
-	public function isCountable( $hasLinks = null ) {
-		return false;
-	}
-
-	/**
-	 * @param Title $title
-	 * @param null $revId
-	 * @param null|ParserOptions $options
-	 * @param Boolean $generateHtml whether to generate Html (default: true). If false,
-	 *        the result of calling getText() on the ParserOutput object returned by
-	 *        this method is undefined.
-	 *
-	 * @return ParserOutput
-	 */
-	public function getParserOutput( Title $title, $revId = null, ParserOptions $options = NULL, $generateHtml = true ) {
-		return new ParserOutput( $this->getNativeData() );
-	}
-}
diff --git a/tests/phpunit/includes/CssContentTest.php b/tests/phpunit/includes/CssContentTest.php
deleted file mode 100644
index b6e8d293c5..0000000000
--- a/tests/phpunit/includes/CssContentTest.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-
-/**
- * @group ContentHandler
- *
- * @group Database
- *        ^--- needed, because we do need the database to test link updates
- */
-class CssContentTest extends JavascriptContentTest {
-
-	public function newContent( $text ) {
-		return new CssContent( $text );
-	}
-
-
-	public function dataGetParserOutput() {
-		return array(
-			array(
-				"MediaWiki:Test.css",
-				null,
-				"hello <world>\n",
-				"<pre class=\"mw-code mw-css\" dir=\"ltr\">\nhello &lt;world&gt;\n\n</pre>" ),
-
-			array(
-				"MediaWiki:Test.css",
-				null,
-				"/* hello [[world]] */\n",
-				"<pre class=\"mw-code mw-css\" dir=\"ltr\">\n/* hello [[world]] */\n\n</pre>",
-				array( 'Links' => array( // NOTE: assumes default settings for $wgTextModelsToParse
-					array( 'World' => 0 ) ) ) ),
-
-			// @todo: more...?
-		);
-	}
-
-
-	# =================================================================================================================
-
-	public function testGetModel() {
-		$content = $this->newContent( "hello world." );
-
-		$this->assertEquals( CONTENT_MODEL_CSS, $content->getModel() );
-	}
-
-	public function testGetContentHandler() {
-		$content = $this->newContent( "hello world." );
-
-		$this->assertEquals( CONTENT_MODEL_CSS, $content->getContentHandler()->getModelID() );
-	}
-
-	public function dataEquals( ) {
-		return array(
-			array( new CssContent( "hallo" ), null, false ),
-			array( new CssContent( "hallo" ), new CssContent( "hallo" ), true ),
-			array( new CssContent( "hallo" ), new WikitextContent( "hallo" ), false ),
-			array( new CssContent( "hallo" ), new CssContent( "HALLO" ), false ),
-		);
-	}
-
-}
diff --git a/tests/phpunit/includes/GlobalFunctions/wfBCP47Test.php b/tests/phpunit/includes/GlobalFunctions/wfBCP47Test.php
index f4ec7a5f89..4a0f406854 100644
--- a/tests/phpunit/includes/GlobalFunctions/wfBCP47Test.php
+++ b/tests/phpunit/includes/GlobalFunctions/wfBCP47Test.php
@@ -7,7 +7,7 @@ class wfBCP47 extends MediaWikiTestCase {
 	 * test @see wfBCP47().
 	 * Please note the BCP explicitly state that language codes are case
 	 * insensitive, there are some exceptions to the rule :)
-   	 * This test is used to verify our formatting against all lower and
+	 * This test is used to verify our formatting against all lower and
 	 * all upper cases language code.
 	 *
 	 * @see http://tools.ietf.org/html/bcp47
diff --git a/tests/phpunit/includes/JavascriptContentTest.php b/tests/phpunit/includes/JavascriptContentTest.php
deleted file mode 100644
index d3810afd6d..0000000000
--- a/tests/phpunit/includes/JavascriptContentTest.php
+++ /dev/null
@@ -1,272 +0,0 @@
-<?php
-
-/**
- * @group ContentHandler
- *
- * @group Database
- *        ^--- needed, because we do need the database to test link updates
- */
-class JavascriptContentTest extends TextContentTest {
-
-	public function newContent( $text ) {
-		return new JavascriptContent( $text );
-	}
-
-
-	public function dataGetParserOutput() {
-		return array(
-			array(
-				"MediaWiki:Test.js",
-				null,
-				"hello <world>\n",
-				"<pre class=\"mw-code mw-js\" dir=\"ltr\">\nhello &lt;world&gt;\n\n</pre>" ),
-
-			array(
-				"MediaWiki:Test.js",
-				null,
-				"hello(); // [[world]]\n",
-				"<pre class=\"mw-code mw-js\" dir=\"ltr\">\nhello(); // [[world]]\n\n</pre>",
-				array( 'Links' => array( // NOTE: assumes default settings for $wgTextModelsToParse
-							array( 'World' => 0 ) ) ) ),
-
-			// @todo: more...?
-		);
-	}
-
-	public function dataGetSection() {
-		return array(
-			array( WikitextContentTest::$sections,
-			       "0",
-			       null
-			),
-			array( WikitextContentTest::$sections,
-			       "2",
-			       null
-			),
-			array( WikitextContentTest::$sections,
-			       "8",
-			       null
-			),
-		);
-	}
-
-	public function dataReplaceSection() {
-		return array(
-			array( WikitextContentTest::$sections,
-			       "0",
-			       "No more",
-			       null,
-			       null
-			),
-			array( WikitextContentTest::$sections,
-			       "",
-			       "No more",
-			       null,
-			       null
-			),
-			array( WikitextContentTest::$sections,
-			       "2",
-			       "== TEST ==\nmore fun",
-			       null,
-			       null
-			),
-			array( WikitextContentTest::$sections,
-			       "8",
-			       "No more",
-			       null,
-			       null
-			),
-			array( WikitextContentTest::$sections,
-			       "new",
-			       "No more",
-			       "New",
-			       null
-			),
-		);
-	}
-
-	public function testAddSectionHeader( ) {
-		$content = $this->newContent( 'hello world' );
-		$c = $content->addSectionHeader( 'test' );
-
-		$this->assertTrue( $content->equals( $c ) );
-	}
-
-	// XXX: currently, preSaveTransform is applied to scripts. this may change or become optional.
-	public function dataPreSaveTransform() {
-		return array(
-			array( 'hello this is ~~~',
-				"hello this is [[Special:Contributions/127.0.0.1|127.0.0.1]]",
-			),
-			array( 'hello \'\'this\'\' is <nowiki>~~~</nowiki>',
-				'hello \'\'this\'\' is <nowiki>~~~</nowiki>',
-			),
-			array( " Foo \n ",
-				" Foo",
-			),
-		);
-	}
-
-	public function dataPreloadTransform() {
-		return array(
-			array( 'hello this is ~~~',
-			       "hello this is ~~~",
-			),
-			array( 'hello \'\'this\'\' is <noinclude>foo</noinclude><includeonly>bar</includeonly>',
-			       'hello \'\'this\'\' is <noinclude>foo</noinclude><includeonly>bar</includeonly>',
-			),
-		);
-	}
-
-	public function dataGetRedirectTarget() {
-		return array(
-			array( '#REDIRECT [[Test]]',
-			       null,
-			),
-			array( '#REDIRECT Test',
-			       null,
-			),
-			array( '* #REDIRECT [[Test]]',
-			       null,
-			),
-		);
-	}
-
-	/**
-	 * @todo: test needs database!
-	 */
-	/*
-	public function getRedirectChain() {
-		$text = $this->getNativeData();
-		return Title::newFromRedirectArray( $text );
-	}
-	*/
-
-	/**
-	 * @todo: test needs database!
-	 */
-	/*
-	public function getUltimateRedirectTarget() {
-		$text = $this->getNativeData();
-		return Title::newFromRedirectRecurse( $text );
-	}
-	*/
-
-
-	public function dataIsCountable() {
-		return array(
-			array( '',
-			       null,
-			       'any',
-			       true
-			),
-			array( 'Foo',
-			       null,
-			       'any',
-			       true
-			),
-			array( 'Foo',
-			       null,
-			       'comma',
-			       false
-			),
-			array( 'Foo, bar',
-			       null,
-			       'comma',
-			       false
-			),
-			array( 'Foo',
-			       null,
-			       'link',
-			       false
-			),
-			array( 'Foo [[bar]]',
-			       null,
-			       'link',
-			       false
-			),
-			array( 'Foo',
-			       true,
-			       'link',
-			       false
-			),
-			array( 'Foo [[bar]]',
-			       false,
-			       'link',
-			       false
-			),
-			array( '#REDIRECT [[bar]]',
-			       true,
-			       'any',
-			       true
-			),
-			array( '#REDIRECT [[bar]]',
-			       true,
-			       'comma',
-			       false
-			),
-			array( '#REDIRECT [[bar]]',
-			       true,
-			       'link',
-			       false
-			),
-		);
-	}
-
-	public function dataGetTextForSummary() {
-		return array(
-			array( "hello\nworld.",
-			       16,
-			       'hello world.',
-			),
-			array( 'hello world.',
-			       8,
-			       'hello...',
-			),
-			array( '[[hello world]].',
-			       8,
-			       '[[hel...',
-			),
-		);
-	}
-
-	public function testMatchMagicWord( ) {
-		$mw = MagicWord::get( "staticredirect" );
-
-		$content = $this->newContent( "#REDIRECT [[FOO]]\n__STATICREDIRECT__" );
-		$this->assertFalse( $content->matchMagicWord( $mw ), "should not have matched magic word, since it's not wikitext" );
-	}
-
-	public function testUpdateRedirect( ) {
-		$target = Title::newFromText( "testUpdateRedirect_target" );
-
-		$content = $this->newContent( "#REDIRECT [[Someplace]]" );
-		$newContent = $content->updateRedirect( $target );
-
-		$this->assertTrue( $content->equals( $newContent ), "content should be unchanged since it's not wikitext" );
-	}
-
-	# =================================================================================================================
-
-	public function testGetModel() {
-		$content = $this->newContent( "hello world." );
-
-		$this->assertEquals( CONTENT_MODEL_JAVASCRIPT, $content->getModel() );
-	}
-
-	public function testGetContentHandler() {
-		$content = $this->newContent( "hello world." );
-
-		$this->assertEquals( CONTENT_MODEL_JAVASCRIPT, $content->getContentHandler()->getModelID() );
-	}
-
-	public function dataEquals( ) {
-		return array(
-			array( new JavascriptContent( "hallo" ), null, false ),
-			array( new JavascriptContent( "hallo" ), new JavascriptContent( "hallo" ), true ),
-			array( new JavascriptContent( "hallo" ), new CssContent( "hallo" ), false ),
-			array( new JavascriptContent( "hallo" ), new JavascriptContent( "HALLO" ), false ),
-		);
-	}
-
-}
diff --git a/tests/phpunit/includes/MWNamespaceTest.php b/tests/phpunit/includes/MWNamespaceTest.php
index 5de5cc95da..01d406a0d0 100644
--- a/tests/phpunit/includes/MWNamespaceTest.php
+++ b/tests/phpunit/includes/MWNamespaceTest.php
@@ -449,7 +449,7 @@ class MWNamespaceTest extends MediaWikiTestCase {
 	 *   $wgCapitalLinkOverrides = array(); by default
 	 *   $wgCapitalLinks = true; by default
 	 * This function test $wgCapitalLinks
- 	 *
+	 *
 	 * Global setting correctness is tested against the NS_PROJECT and
 	 * NS_PROJECT_TALK namespaces since they are not hardcoded nor specials
 	 */
diff --git a/tests/phpunit/includes/RequestContextTest.php b/tests/phpunit/includes/RequestContextTest.php
new file mode 100644
index 0000000000..48cf6dc650
--- /dev/null
+++ b/tests/phpunit/includes/RequestContextTest.php
@@ -0,0 +1,28 @@
+<?php
+
+class RequestContextTest extends MediaWikiTestCase {
+
+	/**
+	 * Test the relationship between title and wikipage in RequestContext
+	 */
+	public function testWikiPageTitle() {
+		$context = new RequestContext();
+
+		$curTitle = Title::newFromText( "A" );
+		$context->setTitle( $curTitle );
+		$this->assertTrue( $curTitle->equals( $context->getWikiPage()->getTitle() ),
+			"When a title is first set WikiPage should be created on-demand for that title." );
+
+		$curTitle = Title::newFromText( "B" );
+		$context->setWikiPage( WikiPage::factory( $curTitle ) );
+		$this->assertTrue( $curTitle->equals( $context->getTitle() ),
+			"Title must be updated when a new WikiPage is provided." );
+
+		$curTitle = Title::newFromText( "C" );
+		$context->setTitle( $curTitle );
+		$this->assertTrue( $curTitle->equals( $context->getWikiPage()->getTitle() ),
+			"When a title is updated the WikiPage should be purged and recreated on-demand with the new title." );
+
+	}
+
+}
diff --git a/tests/phpunit/includes/RevisionStorageTest.php b/tests/phpunit/includes/RevisionStorageTest.php
index fbaa34cee2..4fa42f35a2 100644
--- a/tests/phpunit/includes/RevisionStorageTest.php
+++ b/tests/phpunit/includes/RevisionStorageTest.php
@@ -268,6 +268,25 @@ class RevisionStorageTest extends MediaWikiTestCase {
 		$this->assertEquals( 'hello hello.', $rev->getText() );
 	}
 
+	/**
+	 * @covers Revision::getContent
+	 */
+	public function testGetContent_failure()
+	{
+		$rev = new Revision( array(
+			'page'       =>  $this->the_page->getId(),
+			'content_model' => $this->the_page->getContentModel(),
+			'text_id' => 123456789, // not in the test DB
+		) );
+
+		$this->assertNull( $rev->getContent(),
+			"getContent() should return null if the revision's text blob could not be loaded." );
+
+		//NOTE: check this twice, once for lazy initialization, and once with the cached value.
+		$this->assertNull( $rev->getContent(),
+			"getContent() should return null if the revision's text blob could not be loaded." );
+	}
+
 	/**
 	 * @covers Revision::getContent
 	 */
diff --git a/tests/phpunit/includes/SanitizerTest.php b/tests/phpunit/includes/SanitizerTest.php
index c593d2f1bf..dc672ba534 100644
--- a/tests/phpunit/includes/SanitizerTest.php
+++ b/tests/phpunit/includes/SanitizerTest.php
@@ -194,6 +194,9 @@ class SanitizerTest extends MediaWikiTestCase {
 			array( '/* insecure input */', 'background-image: image(asdf.png);'),
 			array( '/* insecure input */', 'background-image: -webkit-image(asdf.png);'),
 			array( '/* insecure input */', 'background-image: -moz-image(asdf.png);'),
+			array( '/* insecure input */', 'background-image: image-set("asdf.png" 1x, "asdf.png" 2x);'),
+			array( '/* insecure input */', 'background-image: -webkit-image-set("asdf.png" 1x, "asdf.png" 2x);'),
+			array( '/* insecure input */', 'background-image: -moz-image-set("asdf.png" 1x, "asdf.png" 2x);'),
 		);
 	}
 }
diff --git a/tests/phpunit/includes/TextContentTest.php b/tests/phpunit/includes/TextContentTest.php
deleted file mode 100644
index b80af298d6..0000000000
--- a/tests/phpunit/includes/TextContentTest.php
+++ /dev/null
@@ -1,373 +0,0 @@
-<?php
-
-/**
- * @group ContentHandler
- *
- * @group Database
- *        ^--- needed, because we do need the database to test link updates
- */
-class TextContentTest extends MediaWikiTestCase {
-
-	public function setup() {
-		global $wgUser;
-
-		parent::setUp();
-
-		// anon user
-		$wgUser = new User();
-		$wgUser->setName( '127.0.0.1' );
-
-		$this->context = new RequestContext( new FauxRequest() );
-		$this->context->setTitle( Title::newFromText( "Test" ) );
-		$this->context->setUser( $wgUser );
-	}
-
-	public function newContent( $text ) {
-		return new TextContent( $text );
-	}
-
-
-	public function dataGetParserOutput() {
-		return array(
-			array(
-				"TextContentTest_testGetParserOutput",
-				CONTENT_MODEL_TEXT,
-				"hello ''world'' & [[stuff]]\n", "hello ''world'' &amp; [[stuff]]",
-				array( 'Links' => array() ) ),
-			// @todo: more...?
-		);
-	}
-
-	/**
-	 * @dataProvider dataGetParserOutput
-	 */
-	public function testGetParserOutput( $title, $model, $text, $expectedHtml, $expectedFields = null ) {
-		$title = Title::newFromText( $title );
-		$content = ContentHandler::makeContent( $text, $title, $model );
-
-		$po = $content->getParserOutput( $title );
-
-		$html = $po->getText();
-		$html = preg_replace( '#<!--.*?-->#sm', '', $html ); // strip comments
-
-		$this->assertEquals( $expectedHtml, trim( $html ) );
-
-		if ( $expectedFields ) {
-			foreach ( $expectedFields as $field => $exp ) {
-				$f = 'get' . ucfirst( $field );
-				$v = call_user_func( array( $po, $f ) );
-
-				if ( is_array( $exp ) ) {
-					$this->assertArrayEquals( $exp, $v );
-				} else {
-					$this->assertEquals( $exp, $v );
-				}
-			}
-		}
-
-		// @todo: assert more properties
-	}
-
-	public function dataPreSaveTransform() {
-		return array(
-			array( #0: no signature resolution
-				"hello this is ~~~",
-				"hello this is ~~~",
-			),
-			array( #1: rtrim
-				" Foo \n ",
-				" Foo",
-			),
-		);
-	}
-
-	/**
-	 * @dataProvider dataPreSaveTransform
-	 */
-	public function testPreSaveTransform( $text, $expected ) {
-		global $wgContLang;
-
-		$options = ParserOptions::newFromUserAndLang( $this->context->getUser(), $wgContLang );
-
-		$content = $this->newContent( $text );
-		$content = $content->preSaveTransform( $this->context->getTitle(), $this->context->getUser(), $options );
-
-		$this->assertEquals( $expected, $content->getNativeData() );
-	}
-
-	public function dataPreloadTransform() {
-		return array(
-			array( 'hello this is ~~~',
-			       "hello this is ~~~",
-			),
-		);
-	}
-
-	/**
-	 * @dataProvider dataPreloadTransform
-	 */
-	public function testPreloadTransform( $text, $expected ) {
-		global $wgContLang;
-		$options = ParserOptions::newFromUserAndLang( $this->context->getUser(), $wgContLang );
-
-		$content = $this->newContent( $text );
-		$content = $content->preloadTransform( $this->context->getTitle(), $options );
-
-		$this->assertEquals( $expected, $content->getNativeData() );
-	}
-
-	public function dataGetRedirectTarget() {
-		return array(
-			array( '#REDIRECT [[Test]]',
-				null,
-			),
-		);
-	}
-
-	/**
-	 * @dataProvider dataGetRedirectTarget
-	 */
-	public function testGetRedirectTarget( $text, $expected ) {
-		$content = $this->newContent( $text );
-		$t = $content->getRedirectTarget( );
-
-		if ( is_null( $expected ) ) {
-			$this->assertNull( $t, "text should not have generated a redirect target: $text" );
-		} else {
-			$this->assertEquals( $expected, $t->getPrefixedText() );
-		}
-	}
-
-	/**
-	 * @dataProvider dataGetRedirectTarget
-	 */
-	public function isRedirect( $text, $expected ) {
-		$content = $this->newContent( $text );
-
-		$this->assertEquals( !is_null($expected), $content->isRedirect() );
-	}
-
-
-	/**
-	 * @todo: test needs database! Should be done by a test class in the Database group.
-	 */
-	/*
-	public function getRedirectChain() {
-		$text = $this->getNativeData();
-		return Title::newFromRedirectArray( $text );
-	}
-	*/
-
-	/**
-	 * @todo: test needs database! Should be done by a test class in the Database group.
-	 */
-	/*
-	public function getUltimateRedirectTarget() {
-		$text = $this->getNativeData();
-		return Title::newFromRedirectRecurse( $text );
-	}
-	*/
-
-
-	public function dataIsCountable() {
-		return array(
-			array( '',
-			       null,
-			       'any',
-			       true
-			),
-			array( 'Foo',
-			       null,
-			       'any',
-			       true
-			),
-			array( 'Foo',
-			       null,
-			       'comma',
-			       false
-			),
-			array( 'Foo, bar',
-			       null,
-			       'comma',
-			       false
-			),
-		);
-	}
-
-
-	/**
-	 * @dataProvider dataIsCountable
-	 * @group Database
-	 */
-	public function testIsCountable( $text, $hasLinks, $mode, $expected ) {
-		global $wgArticleCountMethod;
-
-		$old = $wgArticleCountMethod;
-		$wgArticleCountMethod = $mode;
-
-		$content = $this->newContent( $text );
-
-		$v = $content->isCountable( $hasLinks, $this->context->getTitle() );
-		$wgArticleCountMethod = $old;
-
-		$this->assertEquals( $expected, $v, "isCountable() returned unexpected value " . var_export( $v, true )
-		                                    . " instead of " . var_export( $expected, true ) . " in mode `$mode` for text \"$text\"" );
-	}
-
-	public function dataGetTextForSummary() {
-		return array(
-			array( "hello\nworld.",
-			       16,
-			       'hello world.',
-			),
-			array( 'hello world.',
-			       8,
-			       'hello...',
-			),
-			array( '[[hello world]].',
-			       8,
-			       '[[hel...',
-			),
-		);
-	}
-
-	/**
-	 * @dataProvider dataGetTextForSummary
-	 */
-	public function testGetTextForSummary( $text, $maxlength, $expected ) {
-		$content = $this->newContent( $text );
-
-		$this->assertEquals( $expected, $content->getTextForSummary( $maxlength ) );
-	}
-
-
-	public function testGetTextForSearchIndex( ) {
-		$content = $this->newContent( "hello world." );
-
-		$this->assertEquals( "hello world.", $content->getTextForSearchIndex() );
-	}
-
-	public function testCopy() {
-		$content = $this->newContent( "hello world." );
-		$copy = $content->copy();
-
-		$this->assertTrue( $content->equals( $copy ), "copy must be equal to original" );
-		$this->assertEquals( "hello world.", $copy->getNativeData() );
-	}
-
-	public function testGetSize( ) {
-		$content = $this->newContent( "hello world." );
-
-		$this->assertEquals( 12, $content->getSize() );
-	}
-
-	public function testGetNativeData( ) {
-		$content = $this->newContent( "hello world." );
-
-		$this->assertEquals( "hello world.", $content->getNativeData() );
-	}
-
-	public function testGetWikitextForTransclusion( ) {
-		$content = $this->newContent( "hello world." );
-
-		$this->assertEquals( "hello world.", $content->getWikitextForTransclusion() );
-	}
-
-	# =================================================================================================================
-
-	public function testGetModel() {
-		$content = $this->newContent( "hello world." );
-
-		$this->assertEquals( CONTENT_MODEL_TEXT, $content->getModel() );
-	}
-
-	public function testGetContentHandler() {
-		$content = $this->newContent( "hello world." );
-
-		$this->assertEquals( CONTENT_MODEL_TEXT, $content->getContentHandler()->getModelID() );
-	}
-
-	public function dataIsEmpty( ) {
-		return array(
-			array( '', true ),
-			array( '  ', false ),
-			array( '0', false ),
-			array( 'hallo welt.', false ),
-		);
-	}
-
-	/**
-	 * @dataProvider dataIsEmpty
-	 */
-	public function testIsEmpty( $text, $empty ) {
-		$content = $this->newContent( $text );
-
-		$this->assertEquals( $empty, $content->isEmpty() );
-	}
-
-	public function dataEquals( ) {
-		return array(
-			array( new TextContent( "hallo" ), null, false ),
-			array( new TextContent( "hallo" ), new TextContent( "hallo" ), true ),
-			array( new TextContent( "hallo" ), new JavascriptContent( "hallo" ), false ),
-			array( new TextContent( "hallo" ), new WikitextContent( "hallo" ), false ),
-			array( new TextContent( "hallo" ), new TextContent( "HALLO" ), false ),
-		);
-	}
-
-	/**
-	 * @dataProvider dataEquals
-	 */
-	public function testEquals( Content $a, Content $b = null, $equal = false ) {
-		$this->assertEquals( $equal, $a->equals( $b ) );
-	}
-
-	public function dataGetDeletionUpdates() {
-		return array(
-			array("TextContentTest_testGetSecondaryDataUpdates_1",
-				CONTENT_MODEL_TEXT, "hello ''world''\n",
-				array( )
-			),
-			array("TextContentTest_testGetSecondaryDataUpdates_2",
-				CONTENT_MODEL_TEXT, "hello [[world test 21344]]\n",
-				array( )
-			),
-			// @todo: more...?
-		);
-	}
-
-	/**
-	 * @dataProvider dataGetDeletionUpdates
-	 */
-	public function testDeletionUpdates( $title, $model, $text, $expectedStuff ) {
-		$title = Title::newFromText( $title );
-		$title->resetArticleID( 2342 ); //dummy id. fine as long as we don't try to execute the updates!
-
-		$content = ContentHandler::makeContent( $text, $title, $model );
-
-		$updates = $content->getDeletionUpdates( WikiPage::factory( $title ) );
-
-		// make updates accessible by class name
-		foreach ( $updates as $update ) {
-			$class = get_class( $update );
-			$updates[ $class ] = $update;
-		}
-
-		if ( !$expectedStuff ) {
-			$this->assertTrue( true ); // make phpunit happy
-			return;
-		}
-
-		foreach ( $expectedStuff as $class => $fieldValues ) {
-			$this->assertArrayHasKey( $class, $updates, "missing an update of type $class" );
-
-			$update = $updates[ $class ];
-
-			foreach ( $fieldValues as $field => $value ) {
-				$v = $update->$field; #if the field doesn't exist, just crash and burn
-				$this->assertEquals( $value, $v, "unexpected value for field $field in instance of $class" );
-			}
-		}
-	}
-
-}
diff --git a/tests/phpunit/includes/TitleTest.php b/tests/phpunit/includes/TitleTest.php
index 0a3f6f6f86..86479540d8 100644
--- a/tests/phpunit/includes/TitleTest.php
+++ b/tests/phpunit/includes/TitleTest.php
@@ -126,11 +126,11 @@ class TitleTest extends MediaWikiTestCase {
 		# - wgDefaultLanguageVariant
 		# - Optional message
 		return array(
-			array( 'fr', 'Main_page', 'fr', 'fr', false ),
-			array( 'es', 'Main_page', 'es', 'zh-tw', false ),
-			array( 'zh', 'Main_page', 'zh', 'zh-tw', false ),
+			array( 'fr', 'Help:I_need_somebody', 'fr', 'fr', false ),
+			array( 'es', 'Help:I_need_somebody', 'es', 'zh-tw', false ),
+			array( 'zh', 'Help:I_need_somebody', 'zh', 'zh-tw', false ),
 
-			array( 'es',    'Main_page',                 'es', 'zh-tw', 'zh-cn' ),
+			array( 'es',    'Help:I_need_somebody',      'es', 'zh-tw', 'zh-cn' ),
 			array( 'es',    'MediaWiki:About',           'es', 'zh-tw', 'zh-cn' ),
 			array( 'es',    'MediaWiki:About/',          'es', 'zh-tw', 'zh-cn' ),
 			array( 'de',    'MediaWiki:About/de',        'es', 'zh-tw', 'zh-cn' ),
@@ -139,7 +139,7 @@ class TitleTest extends MediaWikiTestCase {
 			array( 'en',    'User:JohnDoe/Common.js',    'es', 'zh-tw', 'zh-cn' ),
 			array( 'en',    'User:JohnDoe/Monobook.css', 'es', 'zh-tw', 'zh-cn' ),
 
-			array( 'zh-cn', 'Main_page',                 'zh', 'zh-tw', 'zh-cn' ),
+			array( 'zh-cn', 'Help:I_need_somebody',      'zh', 'zh-tw', 'zh-cn' ),
 			array( 'zh',    'MediaWiki:About',           'zh', 'zh-tw', 'zh-cn' ),
 			array( 'zh',    'MediaWiki:About/',          'zh', 'zh-tw', 'zh-cn' ),
 			array( 'de',    'MediaWiki:About/de',        'zh', 'zh-tw', 'zh-cn' ),
diff --git a/tests/phpunit/includes/UserTest.php b/tests/phpunit/includes/UserTest.php
index a788253297..e5a014d21c 100644
--- a/tests/phpunit/includes/UserTest.php
+++ b/tests/phpunit/includes/UserTest.php
@@ -165,25 +165,53 @@ class UserTest extends MediaWikiTestCase {
 
 	/**
 	 * Test User::editCount
+	 * @group medium
 	 */
 	public function testEditCount() {
 		$user = User::newFromName( 'UnitTestUser' );
 		$user->loadDefaults();
 		$user->addToDatabase();
 
-		// let the user have a few (10) edits
-		$page = WikiPage::factory( Title::newFromText( 'UserTest_EditCount' ) );
-		for( $i = 0; $i < 10; $i++ ) {
+		// let the user have a few (3) edits
+		$page = WikiPage::factory( Title::newFromText( 'Help:UserTest_EditCount' ) );
+		for( $i = 0; $i < 3; $i++ ) {
 			$page->doEdit( (string) $i, 'test', 0, false, $user );
 		}
 
 		$user->clearInstanceCache();
-		$this->assertEquals( 10, $user->getEditCount(), 'After ten edits, the user edit count should be 10' );
+		$this->assertEquals( 3, $user->getEditCount(), 'After three edits, the user edit count should be 3' );
 
 		// increase the edit count and clear the cache
 		$user->incEditCount();
 
 		$user->clearInstanceCache();
-		$this->assertEquals( 11, $user->getEditCount(), 'After increasing the edit count manually, the user edit count should be 11' );
+		$this->assertEquals( 4, $user->getEditCount(), 'After increasing the edit count manually, the user edit count should be 4' );
+	}
+
+	/**
+	 * Test changing user options.
+	 */
+	public function testOptions() {
+		$user = User::newFromName( 'UnitTestUser' );
+		$user->addToDatabase();
+
+		$user->setOption( 'someoption', 'test' );
+		$user->setOption( 'cols', 200 );
+		$user->saveSettings();
+
+		$user = User::newFromName( 'UnitTestUser' );
+		$this->assertEquals( 'test', $user->getOption( 'someoption' ) );
+		$this->assertEquals( 200, $user->getOption( 'cols' ) );
+	}
+
+	/**
+	 * Bug 37963
+	 * Make sure defaults are loaded when setOption is called.
+	 */
+	public function testAnonOptions() {
+		global $wgDefaultUserOptions;
+		$this->user->setOption( 'someoption', 'test' );
+		$this->assertEquals( $wgDefaultUserOptions['cols'], $this->user->getOption( 'cols' ) );
+		$this->assertEquals( 'test', $this->user->getOption( 'someoption' ) );
 	}
 }
diff --git a/tests/phpunit/includes/WikiPageTest.php b/tests/phpunit/includes/WikiPageTest.php
index 6dc1568397..fb20ce667d 100644
--- a/tests/phpunit/includes/WikiPageTest.php
+++ b/tests/phpunit/includes/WikiPageTest.php
@@ -3,6 +3,7 @@
 * @group ContentHandler
 * @group Database
 * ^--- important, causes temporary tables to be used instead of the real database
+* @group medium
 **/
 
 class WikiPageTest extends MediaWikiLangTestCase {
@@ -60,7 +61,8 @@ class WikiPageTest extends MediaWikiLangTestCase {
 	 */
 	protected function newPage( $title, $model = null ) {
 		if ( is_string( $title ) ) {
-			$title = Title::newFromText( $title );
+			$ns = $this->getDefaultWikitextNS();
+			$title = Title::newFromText( $title, $ns );
 		}
 
 		$p = new WikiPage( $title );
@@ -79,11 +81,7 @@ class WikiPageTest extends MediaWikiLangTestCase {
 	 * @return WikiPage
 	 */
 	protected function createPage( $page, $text, $model = null ) {
-		if ( is_string( $page ) ) {
-			$page = Title::newFromText( $page );
-		}
-
-		if ( $page instanceof Title ) {
+		if ( is_string( $page ) || $page instanceof Title ) {
 			$page = $this->newPage( $page, $model );
 		}
 
@@ -94,9 +92,8 @@ class WikiPageTest extends MediaWikiLangTestCase {
 	}
 
 	public function testDoEditContent() {
-		$title = Title::newFromText( "WikiPageTest_testDoEditContent" );
-
-		$page = $this->newPage( $title );
+		$page = $this->newPage( "WikiPageTest_testDoEditContent" );
+		$title = $page->getTitle();
 
 		$content = ContentHandler::makeContent( "[[Lorem ipsum]] dolor sit amet, consetetur sadipscing elitr, sed diam "
 						. " nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat.",
@@ -543,10 +540,16 @@ class WikiPageTest extends MediaWikiLangTestCase {
 	 * @dataProvider provideIsCountable
 	 */
 	public function testIsCountable( $title, $model, $text, $mode, $expected ) {
-		global $wgArticleCountMethod;
+		global $wgContentHandlerUseDB;
 
-		$oldArticleCountMethod = $wgArticleCountMethod;
-		$wgArticleCountMethod = $mode;
+		$this->setMwGlobals( 'wgArticleCountMethod', $mode );
+
+		$title = Title::newFromText( $title );
+
+		if ( !$wgContentHandlerUseDB && ContentHandler::getDefaultModelFor( $title ) != $model ) {
+			$this->markTestSkipped( "Can not use non-default content model $model for "
+				. $title->getPrefixedDBkey() . " with \wgArticleCountMethod disabled." );
+		}
 
 		$page = $this->createPage( $title, $text, $model );
 		$hasLinks = wfGetDB( DB_SLAVE )->selectField( 'pagelinks', 1,
@@ -557,8 +560,6 @@ class WikiPageTest extends MediaWikiLangTestCase {
 		$v = $page->isCountable();
 		$w = $page->isCountable( $editInfo );
 
-		$wgArticleCountMethod = $oldArticleCountMethod;
-
 		$this->assertEquals( $expected, $v, "isCountable( null ) returned unexpected value " . var_export( $v, true )
 											. " instead of " . var_export( $expected, true ) . " in mode `$mode` for text \"$text\"" );
 
diff --git a/tests/phpunit/includes/WikitextContentHandlerTest.php b/tests/phpunit/includes/WikitextContentHandlerTest.php
deleted file mode 100644
index 8db96d1b56..0000000000
--- a/tests/phpunit/includes/WikitextContentHandlerTest.php
+++ /dev/null
@@ -1,197 +0,0 @@
-<?php
-
-/**
- * @group ContentHandler
- */
-class WikitextContentHandlerTest extends MediaWikiTestCase {
-
-	/**
-	 * @var ContentHandler
-	 */
-	var $handler;
-
-	public function setup() {
-		parent::setUp();
-		$this->handler = ContentHandler::getForModelID( CONTENT_MODEL_WIKITEXT );
-	}
-
-	public function testSerializeContent( ) {
-		$content = new WikitextContent( 'hello world' );
-
-		$this->assertEquals( 'hello world', $this->handler->serializeContent( $content ) );
-		$this->assertEquals( 'hello world', $this->handler->serializeContent( $content, CONTENT_FORMAT_WIKITEXT ) );
-
-		try {
-			$this->handler->serializeContent( $content, 'dummy/foo' );
-			$this->fail( "serializeContent() should have failed on unknown format" );
-		} catch ( MWException $e ) {
-			// ok, as expected
-		}
-	}
-
-	public function testUnserializeContent( ) {
-		$content = $this->handler->unserializeContent( 'hello world' );
-		$this->assertEquals( 'hello world', $content->getNativeData() );
-
-		$content = $this->handler->unserializeContent( 'hello world', CONTENT_FORMAT_WIKITEXT );
-		$this->assertEquals( 'hello world', $content->getNativeData() );
-
-		try {
-			$this->handler->unserializeContent( 'hello world', 'dummy/foo' );
-			$this->fail( "unserializeContent() should have failed on unknown format" );
-		} catch ( MWException $e ) {
-			// ok, as expected
-		}
-	}
-
-	public function testMakeEmptyContent() {
-		$content = $this->handler->makeEmptyContent();
-
-		$this->assertTrue( $content->isEmpty() );
-		$this->assertEquals( '', $content->getNativeData() );
-	}
-
-	public function dataIsSupportedFormat( ) {
-		return array(
-			array( null, true ),
-			array( CONTENT_FORMAT_WIKITEXT, true ),
-			array( 99887766, false ),
-		);
-	}
-
-	/**
-	 * @dataProvider dataIsSupportedFormat
-	 */
-	public function testIsSupportedFormat( $format, $supported ) {
-		$this->assertEquals( $supported, $this->handler->isSupportedFormat( $format ) );
-	}
-
-	public function dataMerge3( ) {
-		return array(
-			array( "first paragraph
-
-					second paragraph\n",
-
-					"FIRST paragraph
-
-					second paragraph\n",
-
-					"first paragraph
-
-					SECOND paragraph\n",
-
-					"FIRST paragraph
-
-					SECOND paragraph\n",
-			),
-
-			array( "first paragraph
-					second paragraph\n",
-
-				   "Bla bla\n",
-
-				   "Blubberdibla\n",
-
-				   false,
-			),
-
-		);
-	}
-
-	/**
-	 * @dataProvider dataMerge3
-	 */
-	public function testMerge3( $old, $mine, $yours, $expected ) {
-		global $wgDiff3;
-
-		if ( !$wgDiff3 ) {
-			$this->markTestSkipped( "Can't test merge3(), since \$wgDiff3 is not configured" );
-		}
-
-		if ( !file_exists( $wgDiff3 ) ) {
-			#XXX: this sucks, since it uses arcane internal knowledge about TextContentHandler::merge3 and wfMerge.
-			$this->markTestSkipped( "Can't test merge3(), since \$wgDiff3 is misconfigured: can't find $wgDiff3" );
-		}
-
-		// test merge
-		$oldContent = new WikitextContent( $old );
-		$myContent = new WikitextContent( $mine );
-		$yourContent = new WikitextContent( $yours );
-
-		$merged = $this->handler->merge3( $oldContent, $myContent, $yourContent );
-
-		$this->assertEquals( $expected, $merged ? $merged->getNativeData() : $merged );
-	}
-
-	public function dataGetAutosummary( ) {
-		return array(
-			array(
-				'Hello there, world!',
-				'#REDIRECT [[Foo]]',
-				0,
-				'/^Redirected page .*Foo/'
-			),
-
-			array(
-				null,
-				'Hello world!',
-				EDIT_NEW,
-				'/^Created page .*Hello/'
-			),
-
-			array(
-				'Hello there, world!',
-				'',
-				0,
-				'/^Blanked/'
-			),
-
-			array(
-				'Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut
-				labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et
-				ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.',
-				'Hello world!',
-				0,
-				'/^Replaced .*Hello/'
-			),
-
-			array(
-				'foo',
-				'bar',
-				0,
-				'/^$/'
-			),
-		);
-	}
-
-	/**
-	 * @dataProvider dataGetAutoSummary
-	 */
-	public function testGetAutosummary( $old, $new, $flags, $expected ) {
-		global $wgLanguageCode, $wgContLang;
-
-		$oldContent = is_null( $old ) ? null : new WikitextContent( $old );
-		$newContent = is_null( $new ) ? null : new WikitextContent( $new );
-
-		$summary = $this->handler->getAutosummary( $oldContent, $newContent, $flags );
-
-		$this->assertTrue( (bool)preg_match( $expected, $summary ), "Autosummary didn't match expected pattern $expected: $summary" );
-	}
-
-	/**
-	 * @todo Text case requires database, should be done by a test class in the Database group
-	 */
-	/*
-	public function testGetAutoDeleteReason( Title $title, &$hasHistory ) {
-	}
-	*/
-
-	/**
-	 * @todo Text case requires database, should be done by a test class in the Database group
-	 */
-	/*
-	public function testGetUndoContent( Revision $current, Revision $undo, Revision $undoafter = null ) {
-	}
-	*/
-
-}
diff --git a/tests/phpunit/includes/WikitextContentTest.php b/tests/phpunit/includes/WikitextContentTest.php
deleted file mode 100644
index c1332a6052..0000000000
--- a/tests/phpunit/includes/WikitextContentTest.php
+++ /dev/null
@@ -1,374 +0,0 @@
-<?php
-
-/**
- * @group ContentHandler
- *
- * @group Database
- *        ^--- needed, because we do need the database to test link updates
- */
-class WikitextContentTest extends TextContentTest {
-
-	public function newContent( $text ) {
-		return new WikitextContent( $text );
-	}
-
-	public function dataGetParserOutput() {
-		return array(
-			array("WikitextContentTest_testGetParserOutput", CONTENT_MODEL_WIKITEXT, "hello ''world''\n", "<p>hello <i>world</i>\n</p>"),
-			// @todo: more...?
-		);
-	}
-
-	public function dataGetSecondaryDataUpdates() {
-		return array(
-			array( "WikitextContentTest_testGetSecondaryDataUpdates_1",
-				CONTENT_MODEL_WIKITEXT, "hello ''world''\n",
-				array( 'LinksUpdate' => array(  'mRecursive' => true,
-				                                'mLinks' => array() ) )
-			),
-			array( "WikitextContentTest_testGetSecondaryDataUpdates_2",
-				CONTENT_MODEL_WIKITEXT, "hello [[world test 21344]]\n",
-				array( 'LinksUpdate' => array(  'mRecursive' => true,
-				                                'mLinks' => array( array( 'World_test_21344' => 0 ) ) ) )
-			),
-			// @todo: more...?
-		);
-	}
-
-	/**
-	 * @dataProvider dataGetSecondaryDataUpdates
-	 * @group Database
-	 */
-	public function testGetSecondaryDataUpdates( $title, $model, $text, $expectedStuff ) {
-		$title = Title::newFromText( $title );
-		$title->resetArticleID( 2342 ); //dummy id. fine as long as we don't try to execute the updates!
-
-		$content = ContentHandler::makeContent( $text, $title, $model );
-
-		$updates = $content->getSecondaryDataUpdates( $title );
-
-		// make updates accessible by class name
-		foreach ( $updates as $update ) {
-			$class = get_class( $update );
-			$updates[$class] = $update;
-		}
-
-		foreach ( $expectedStuff as $class => $fieldValues ) {
-			$this->assertArrayHasKey( $class, $updates, "missing an update of type $class" );
-
-			$update = $updates[$class];
-
-			foreach ( $fieldValues as $field => $value ) {
-				$v = $update->$field; #if the field doesn't exist, just crash and burn
-				$this->assertEquals( $value, $v, "unexpected value for field $field in instance of $class" );
-			}
-		}
-	}
-
-
-	static $sections =
-
-"Intro
-
-== stuff ==
-hello world
-
-== test ==
-just a test
-
-== foo ==
-more stuff
-";
-
-	public function dataGetSection() {
-		return array(
-			array( WikitextContentTest::$sections,
-					"0",
-					"Intro"
-			),
-			array( WikitextContentTest::$sections,
-					"2",
-"== test ==
-just a test"
-			),
-			array( WikitextContentTest::$sections,
-					"8",
-					false
-			),
-		);
-	}
-
-	/**
-	 * @dataProvider dataGetSection
-	 */
-	public function testGetSection( $text, $sectionId, $expectedText ) {
-		$content = $this->newContent( $text );
-
-		$sectionContent = $content->getSection( $sectionId );
-		if ( is_object( $sectionContent ) ) {
-			$sectionText = $sectionContent->getNativeData();
-		} else {
-			$sectionText = $sectionContent;
-		}
-
-		$this->assertEquals( $expectedText, $sectionText );
-	}
-
-	public function dataReplaceSection() {
-		return array(
-			array( WikitextContentTest::$sections,
-			       "0",
-			       "No more",
-			       null,
-			       trim( preg_replace( '/^Intro/sm', 'No more', WikitextContentTest::$sections ) )
-			),
-			array( WikitextContentTest::$sections,
-			       "",
-			       "No more",
-			       null,
-			       "No more"
-			),
-			array( WikitextContentTest::$sections,
-			       "2",
-			       "== TEST ==\nmore fun",
-			       null,
-			       trim( preg_replace( '/^== test ==.*== foo ==/sm', "== TEST ==\nmore fun\n\n== foo ==", WikitextContentTest::$sections ) )
-			),
-			array( WikitextContentTest::$sections,
-			       "8",
-			       "No more",
-			       null,
-			       WikitextContentTest::$sections
-			),
-			array( WikitextContentTest::$sections,
-			       "new",
-			       "No more",
-			       "New",
-			       trim( WikitextContentTest::$sections ) . "\n\n\n== New ==\n\nNo more"
-			),
-		);
-	}
-
-	/**
-	 * @dataProvider dataReplaceSection
-	 */
-	public function testReplaceSection( $text, $section, $with, $sectionTitle, $expected ) {
-		$content = $this->newContent( $text );
-		$c = $content->replaceSection( $section, $this->newContent( $with ), $sectionTitle );
-
-		$this->assertEquals( $expected, is_null( $c ) ? null : $c->getNativeData() );
-	}
-
-	public function testAddSectionHeader( ) {
-		$content = $this->newContent( 'hello world' );
-		$content = $content->addSectionHeader( 'test' );
-
-		$this->assertEquals( "== test ==\n\nhello world", $content->getNativeData() );
-	}
-
-	public function dataPreSaveTransform() {
-		return array(
-			array( 'hello this is ~~~',
-			       "hello this is [[Special:Contributions/127.0.0.1|127.0.0.1]]",
-			),
-			array( 'hello \'\'this\'\' is <nowiki>~~~</nowiki>',
-			       'hello \'\'this\'\' is <nowiki>~~~</nowiki>',
-			),
-			array( // rtrim
-				" Foo \n ",
-				" Foo",
-			),
-		);
-	}
-
-	public function dataPreloadTransform() {
-		return array(
-			array( 'hello this is ~~~',
-			       "hello this is ~~~",
-			),
-			array( 'hello \'\'this\'\' is <noinclude>foo</noinclude><includeonly>bar</includeonly>',
-			       'hello \'\'this\'\' is bar',
-			),
-		);
-	}
-
-	public function dataGetRedirectTarget() {
-		return array(
-			array( '#REDIRECT [[Test]]',
-			       'Test',
-			),
-			array( '#REDIRECT Test',
-			       null,
-			),
-			array( '* #REDIRECT [[Test]]',
-			       null,
-			),
-		);
-	}
-
-	public function dataGetTextForSummary() {
-		return array(
-			array( "hello\nworld.",
-				16,
-				'hello world.',
-			),
-			array( 'hello world.',
-				8,
-				'hello...',
-			),
-			array( '[[hello world]].',
-				8,
-				'hel...',
-			),
-		);
-	}
-
-	/**
-	 * @todo: test needs database! Should be done by a test class in the Database group.
-	 */
-	/*
-	public function getRedirectChain() {
-		$text = $this->getNativeData();
-		return Title::newFromRedirectArray( $text );
-	}
-	*/
-
-	/**
-	 * @todo: test needs database! Should be done by a test class in the Database group.
-	 */
-	/*
-	public function getUltimateRedirectTarget() {
-		$text = $this->getNativeData();
-		return Title::newFromRedirectRecurse( $text );
-	}
-	*/
-
-
-	public function dataIsCountable() {
-		return array(
-			array( '',
-			       null,
-			       'any',
-			       true
-			),
-			array( 'Foo',
-			       null,
-			       'any',
-			       true
-			),
-			array( 'Foo',
-			       null,
-			       'comma',
-			       false
-			),
-			array( 'Foo, bar',
-			       null,
-			       'comma',
-			       true
-			),
-			array( 'Foo',
-			       null,
-			       'link',
-			       false
-			),
-			array( 'Foo [[bar]]',
-			       null,
-			       'link',
-			       true
-			),
-			array( 'Foo',
-			       true,
-			       'link',
-			       true
-			),
-			array( 'Foo [[bar]]',
-			       false,
-			       'link',
-			       false
-			),
-			array( '#REDIRECT [[bar]]',
-			       true,
-			       'any',
-			       false
-			),
-			array( '#REDIRECT [[bar]]',
-			       true,
-			       'comma',
-			       false
-			),
-			array( '#REDIRECT [[bar]]',
-			       true,
-			       'link',
-			       false
-			),
-		);
-	}
-
-	public function testMatchMagicWord( ) {
-		$mw = MagicWord::get( "staticredirect" );
-
-		$content = $this->newContent( "#REDIRECT [[FOO]]\n__STATICREDIRECT__" );
-		$this->assertTrue( $content->matchMagicWord( $mw ), "should have matched magic word" );
-
-		$content = $this->newContent( "#REDIRECT [[FOO]]" );
-		$this->assertFalse( $content->matchMagicWord( $mw ), "should not have matched magic word" );
-	}
-
-	public function testUpdateRedirect( ) {
-		$target = Title::newFromText( "testUpdateRedirect_target" );
-
-		// test with non-redirect page
-		$content = $this->newContent( "hello world." );
-		$newContent = $content->updateRedirect( $target );
-
-		$this->assertTrue( $content->equals( $newContent ), "content should be unchanged" );
-
-		// test with actual redirect
-		$content = $this->newContent( "#REDIRECT [[Someplace]]" );
-		$newContent = $content->updateRedirect( $target );
-
-		$this->assertFalse( $content->equals( $newContent ), "content should have changed" );
-		$this->assertTrue( $newContent->isRedirect(), "new content should be a redirect" );
-
-		$this->assertEquals( $target->getFullText(), $newContent->getRedirectTarget()->getFullText() );
-	}
-
-	# =================================================================================================================
-
-	public function testGetModel() {
-		$content = $this->newContent( "hello world." );
-
-		$this->assertEquals( CONTENT_MODEL_WIKITEXT, $content->getModel() );
-	}
-
-	public function testGetContentHandler() {
-		$content = $this->newContent( "hello world." );
-
-		$this->assertEquals( CONTENT_MODEL_WIKITEXT, $content->getContentHandler()->getModelID() );
-	}
-
-	public function dataEquals( ) {
-		return array(
-			array( new WikitextContent( "hallo" ), null, false ),
-			array( new WikitextContent( "hallo" ), new WikitextContent( "hallo" ), true ),
-			array( new WikitextContent( "hallo" ), new JavascriptContent( "hallo" ), false ),
-			array( new WikitextContent( "hallo" ), new TextContent( "hallo" ), false ),
-			array( new WikitextContent( "hallo" ), new WikitextContent( "HALLO" ), false ),
-		);
-	}
-
-	public function dataGetDeletionUpdates() {
-		return array(
-			array("WikitextContentTest_testGetSecondaryDataUpdates_1",
-				CONTENT_MODEL_WIKITEXT, "hello ''world''\n",
-				array( 'LinksDeletionUpdate' => array( ) )
-			),
-			array("WikitextContentTest_testGetSecondaryDataUpdates_2",
-				CONTENT_MODEL_WIKITEXT, "hello [[world test 21344]]\n",
-				array( 'LinksDeletionUpdate' => array( ) )
-			),
-			// @todo: more...?
-		);
-	}
-
-}
diff --git a/tests/phpunit/includes/api/ApiParseTest.php b/tests/phpunit/includes/api/ApiParseTest.php
new file mode 100644
index 0000000000..b5dabf0c66
--- /dev/null
+++ b/tests/phpunit/includes/api/ApiParseTest.php
@@ -0,0 +1,29 @@
+<?php
+
+/**
+ * @group API
+ * @group Database
+ */
+class ApiParseTest extends ApiTestCase {
+
+	protected function setUp() {
+		parent::setUp();
+		$this->doLogin();
+	}
+
+	function testParseNonexistentPage() {
+		$somePage = mt_rand();
+
+		try {
+			$data = $this->doApiRequest( array(
+				'action' => 'parse',
+				'page' => $somePage ) );
+
+			$this->fail( "API did not return an error when parsing a nonexistent page" );
+		} catch(UsageException $ex){
+			$this->assertEquals( 'missingtitle', $ex->getCodeString(),
+				"Parse request for nonexistent page must give 'missingtitle' error: " . var_export( $ex->getMessageArray(), true ) );
+		}
+	}
+
+}
diff --git a/tests/phpunit/includes/api/ApiTestCase.php b/tests/phpunit/includes/api/ApiTestCase.php
index de521752c1..7e054a4663 100644
--- a/tests/phpunit/includes/api/ApiTestCase.php
+++ b/tests/phpunit/includes/api/ApiTestCase.php
@@ -41,15 +41,31 @@ abstract class ApiTestCase extends MediaWikiLangTestCase {
 
 	}
 
+	/**
+	 * Does the API request and returns the result.
+	 *
+	 * The returned value is an array containing
+	 * - the result data (array)
+	 * - the request (WebRequest)
+	 * - the session data of the request (array)
+	 * - if $appendModule is true, the Api module $module
+	 *
+	 * @param array $params
+	 * @param array|null $session
+	 * @param bool $appendModule
+	 * @param User|null $user
+	 *
+	 * @return array
+	 */
 	protected function doApiRequest( array $params, array $session = null, $appendModule = false, User $user = null ) {
 		global $wgRequest, $wgUser;
 
 		if ( is_null( $session ) ) {
-			# re-use existing global session by default
+			// re-use existing global session by default
 			$session = $wgRequest->getSessionArray();
 		}
 
-		# set up global environment
+		// set up global environment
 		if ( $user ) {
 			$wgUser = $user;
 		}
@@ -57,21 +73,22 @@ abstract class ApiTestCase extends MediaWikiLangTestCase {
 		$wgRequest = new FauxRequest( $params, true, $session );
 		RequestContext::getMain()->setRequest( $wgRequest );
 
-		# set up local environment
+		// set up local environment
 		$context = $this->apiContext->newTestContext( $wgRequest, $wgUser );
 
 		$module = new ApiMain( $context, true );
 
-		# run it!
+		// run it!
 		$module->execute();
 
-		# construct result
+		// construct result
 		$results = array(
 			$module->getResultData(),
 			$context->getRequest(),
 			$context->getRequest()->getSessionArray()
 		);
-		if( $appendModule ) {
+
+		if ( $appendModule ) {
 			$results[] = $module;
 		}
 
diff --git a/tests/phpunit/includes/content/ContentHandlerTest.php b/tests/phpunit/includes/content/ContentHandlerTest.php
new file mode 100644
index 0000000000..60baedc614
--- /dev/null
+++ b/tests/phpunit/includes/content/ContentHandlerTest.php
@@ -0,0 +1,423 @@
+<?php
+
+/**
+ * @group ContentHandler
+ * @group Database
+ *
+ * @note Declare that we are using the database, because otherwise we'll fail in the "databaseless" test run.
+ * This is because the LinkHolderArray used by the parser needs database access.
+ *
+ */
+class ContentHandlerTest extends MediaWikiTestCase {
+
+	public function setup() {
+		global $wgContLang;
+		parent::setup();
+
+		$this->setMwGlobals( array(
+			'wgExtraNamespaces' => array(
+				12312 => 'Dummy',
+				12313 => 'Dummy_talk',
+			),
+			// The below tests assume that namespaces not mentioned here (Help, User, MediaWiki, ..)
+			// default to CONTENT_MODEL_WIKITEXT.
+			'wgNamespaceContentModels' => array(
+				12312 => 'testing',
+			),
+			'wgContentHandlers' => array(
+				CONTENT_MODEL_WIKITEXT => 'WikitextContentHandler',
+				CONTENT_MODEL_JAVASCRIPT => 'JavaScriptContentHandler',
+				CONTENT_MODEL_CSS => 'CssContentHandler',
+				CONTENT_MODEL_TEXT => 'TextContentHandler',
+				'testing' => 'DummyContentHandlerForTesting',
+			),
+		) );
+
+		// Reset namespace cache
+		MWNamespace::getCanonicalNamespaces( true );
+		$wgContLang->resetNamespaces();
+	}
+
+	public function tearDown() {
+		global $wgContLang;
+
+		// Reset namespace cache
+		MWNamespace::getCanonicalNamespaces( true );
+		$wgContLang->resetNamespaces();
+
+		parent::tearDown();
+	}
+
+	public static function dataGetDefaultModelFor() {
+		return array(
+			array( 'Help:Foo', CONTENT_MODEL_WIKITEXT ),
+			array( 'Help:Foo.js', CONTENT_MODEL_WIKITEXT ),
+			array( 'Help:Foo/bar.js', CONTENT_MODEL_WIKITEXT ),
+			array( 'User:Foo', CONTENT_MODEL_WIKITEXT ),
+			array( 'User:Foo.js', CONTENT_MODEL_WIKITEXT ),
+			array( 'User:Foo/bar.js', CONTENT_MODEL_JAVASCRIPT ),
+			array( 'User:Foo/bar.css', CONTENT_MODEL_CSS ),
+			array( 'User talk:Foo/bar.css', CONTENT_MODEL_WIKITEXT ),
+			array( 'User:Foo/bar.js.xxx', CONTENT_MODEL_WIKITEXT ),
+			array( 'User:Foo/bar.xxx', CONTENT_MODEL_WIKITEXT ),
+			array( 'MediaWiki:Foo.js', CONTENT_MODEL_JAVASCRIPT ),
+			array( 'MediaWiki:Foo.css', CONTENT_MODEL_CSS ),
+			array( 'MediaWiki:Foo.JS', CONTENT_MODEL_WIKITEXT ),
+			array( 'MediaWiki:Foo.CSS', CONTENT_MODEL_WIKITEXT ),
+			array( 'MediaWiki:Foo.css.xxx', CONTENT_MODEL_WIKITEXT ),
+		);
+	}
+
+	/**
+	 * @dataProvider dataGetDefaultModelFor
+	 */
+	public function testGetDefaultModelFor( $title, $expectedModelId ) {
+		$title = Title::newFromText( $title );
+		$this->assertEquals( $expectedModelId, ContentHandler::getDefaultModelFor( $title ) );
+	}
+
+	/**
+	 * @dataProvider dataGetDefaultModelFor
+	 */
+	public function testGetForTitle( $title, $expectedContentModel ) {
+		$title = Title::newFromText( $title );
+		$handler = ContentHandler::getForTitle( $title );
+		$this->assertEquals( $expectedContentModel, $handler->getModelID() );
+	}
+
+	public static function dataGetLocalizedName() {
+		return array(
+			array( null, null ),
+			array( "xyzzy", null ),
+
+			// XXX: depends on content language
+			array( CONTENT_MODEL_JAVASCRIPT, '/javascript/i' ),
+		);
+	}
+
+	/**
+	 * @dataProvider dataGetLocalizedName
+	 */
+	public function testGetLocalizedName( $id, $expected ) {
+		$name = ContentHandler::getLocalizedName( $id );
+
+		if ( $expected ) {
+			$this->assertNotNull( $name, "no name found for content model $id" );
+			$this->assertTrue( preg_match( $expected, $name ) > 0 ,
+				"content model name for #$id did not match pattern $expected"
+			);
+		} else {
+			$this->assertEquals( $id, $name, "localization of unknown model $id should have "
+				. "fallen back to use the model id directly."
+			);
+		}
+	}
+
+	public static function dataGetPageLanguage() {
+		global $wgLanguageCode;
+
+		return array(
+			array( "Main", $wgLanguageCode ),
+			array( "Dummy:Foo", $wgLanguageCode ),
+			array( "MediaWiki:common.js", 'en' ),
+			array( "User:Foo/common.js", 'en' ),
+			array( "MediaWiki:common.css", 'en' ),
+			array( "User:Foo/common.css", 'en' ),
+			array( "User:Foo", $wgLanguageCode ),
+
+			array( CONTENT_MODEL_JAVASCRIPT, 'javascript' ),
+		);
+	}
+
+	/**
+	 * @dataProvider dataGetPageLanguage
+	 */
+	public function testGetPageLanguage( $title, $expected ) {
+		if ( is_string( $title ) ) {
+			$title = Title::newFromText( $title );
+		}
+
+		$expected = wfGetLangObj( $expected );
+
+		$handler = ContentHandler::getForTitle( $title );
+		$lang = $handler->getPageLanguage( $title );
+
+		$this->assertEquals( $expected->getCode(), $lang->getCode() );
+	}
+
+	public function testGetContentText_Null( ) {
+		global $wgContentHandlerTextFallback;
+
+		$content = null;
+
+		$wgContentHandlerTextFallback = 'fail';
+		$text = ContentHandler::getContentText( $content );
+		$this->assertEquals( '', $text );
+
+		$wgContentHandlerTextFallback = 'serialize';
+		$text = ContentHandler::getContentText( $content );
+		$this->assertEquals( '', $text );
+
+		$wgContentHandlerTextFallback = 'ignore';
+		$text = ContentHandler::getContentText( $content );
+		$this->assertEquals( '', $text );
+	}
+
+	public function testGetContentText_TextContent( ) {
+		global $wgContentHandlerTextFallback;
+
+		$content = new WikitextContent( "hello world" );
+
+		$wgContentHandlerTextFallback = 'fail';
+		$text = ContentHandler::getContentText( $content );
+		$this->assertEquals( $content->getNativeData(), $text );
+
+		$wgContentHandlerTextFallback = 'serialize';
+		$text = ContentHandler::getContentText( $content );
+		$this->assertEquals( $content->serialize(), $text );
+
+		$wgContentHandlerTextFallback = 'ignore';
+		$text = ContentHandler::getContentText( $content );
+		$this->assertEquals( $content->getNativeData(), $text );
+	}
+
+	public function testGetContentText_NonTextContent( ) {
+		global $wgContentHandlerTextFallback;
+
+		$content = new DummyContentForTesting( "hello world" );
+
+		$wgContentHandlerTextFallback = 'fail';
+
+		try {
+			$text = ContentHandler::getContentText( $content );
+
+			$this->fail( "ContentHandler::getContentText should have thrown an exception for non-text Content object" );
+		} catch ( MWException $ex ) {
+			// as expected
+		}
+
+		$wgContentHandlerTextFallback = 'serialize';
+		$text = ContentHandler::getContentText( $content );
+		$this->assertEquals( $content->serialize(), $text );
+
+		$wgContentHandlerTextFallback = 'ignore';
+		$text = ContentHandler::getContentText( $content );
+		$this->assertNull( $text );
+	}
+
+	/*
+	public static function makeContent( $text, Title $title, $modelId = null, $format = null ) {}
+	*/
+
+	public static function dataMakeContent() {
+		return array(
+			array( 'hallo', 'Help:Test', null, null, CONTENT_MODEL_WIKITEXT, 'hallo', false ),
+			array( 'hallo', 'MediaWiki:Test.js', null, null, CONTENT_MODEL_JAVASCRIPT, 'hallo', false ),
+			array( serialize('hallo'), 'Dummy:Test', null, null, "testing", 'hallo', false ),
+
+			array( 'hallo', 'Help:Test', null, CONTENT_FORMAT_WIKITEXT, CONTENT_MODEL_WIKITEXT, 'hallo', false ),
+			array( 'hallo', 'MediaWiki:Test.js', null, CONTENT_FORMAT_JAVASCRIPT, CONTENT_MODEL_JAVASCRIPT, 'hallo', false ),
+			array( serialize('hallo'), 'Dummy:Test', null, "testing", "testing", 'hallo', false ),
+
+			array( 'hallo', 'Help:Test', CONTENT_MODEL_CSS, null, CONTENT_MODEL_CSS, 'hallo', false ),
+			array( 'hallo', 'MediaWiki:Test.js', CONTENT_MODEL_CSS, null, CONTENT_MODEL_CSS, 'hallo', false ),
+			array( serialize('hallo'), 'Dummy:Test', CONTENT_MODEL_CSS, null, CONTENT_MODEL_CSS, serialize('hallo'), false ),
+
+			array( 'hallo', 'Help:Test', CONTENT_MODEL_WIKITEXT, "testing", null, null, true ),
+			array( 'hallo', 'MediaWiki:Test.js', CONTENT_MODEL_CSS, "testing", null, null, true ),
+			array( 'hallo', 'Dummy:Test', CONTENT_MODEL_JAVASCRIPT, "testing", null, null, true ),
+		);
+	}
+
+	/**
+	 * @dataProvider dataMakeContent
+	 */
+	public function testMakeContent( $data, $title, $modelId, $format, $expectedModelId, $expectedNativeData, $shouldFail ) {
+		global $wgExtraNamespaces, $wgNamespaceContentModels, $wgContentHandlers;
+
+		$title = Title::newFromText( $title );
+
+		try {
+			$content = ContentHandler::makeContent( $data, $title, $modelId, $format );
+
+			if ( $shouldFail ) {
+				$this->fail( "ContentHandler::makeContent should have failed!" );
+			}
+
+			$this->assertEquals( $expectedModelId, $content->getModel(), 'bad model id' );
+			$this->assertEquals( $expectedNativeData, $content->getNativeData(), 'bads native data' );
+		} catch ( MWException $ex ) {
+			if ( !$shouldFail ) $this->fail( "ContentHandler::makeContent failed unexpectedly: " . $ex->getMessage() );
+			else $this->assertTrue( true ); // dummy, so we don't get the "test did not perform any assertions" message.
+		}
+
+	}
+
+	/*
+	public function testSupportsSections() {
+		$this->markTestIncomplete( "not yet implemented" );
+	}
+	*/
+
+	public function testRunLegacyHooks() {
+		Hooks::register( 'testRunLegacyHooks', __CLASS__ . '::dummyHookHandler' );
+
+		$content = new WikitextContent( 'test text' );
+		$ok = ContentHandler::runLegacyHooks( 'testRunLegacyHooks', array( 'foo', &$content, 'bar' ), false );
+
+		$this->assertTrue( $ok, "runLegacyHooks should have returned true" );
+		$this->assertEquals( "TEST TEXT", $content->getNativeData() );
+	}
+
+	public static function dummyHookHandler( $foo, &$text, $bar ) {
+		if ( $text === null || $text === false ) {
+			return false;
+		}
+
+		$text = strtoupper( $text );
+
+		return true;
+	}
+}
+
+class DummyContentHandlerForTesting extends ContentHandler {
+
+	public function __construct( $dataModel ) {
+		parent::__construct( $dataModel, array( "testing" ) );
+	}
+
+	/**
+	 * Serializes Content object of the type supported by this ContentHandler.
+	 *
+	 * @param Content $content the Content object to serialize
+	 * @param null $format the desired serialization format
+	 * @return String serialized form of the content
+	 */
+	public function serializeContent( Content $content, $format = null ) {
+	   return $content->serialize();
+	}
+
+	/**
+	 * Unserializes a Content object of the type supported by this ContentHandler.
+	 *
+	 * @param $blob String serialized form of the content
+	 * @param null $format the format used for serialization
+	 * @return Content the Content object created by deserializing $blob
+	 */
+	public function unserializeContent( $blob, $format = null ) {
+		$d = unserialize( $blob );
+		return new DummyContentForTesting( $d );
+	}
+
+	/**
+	 * Creates an empty Content object of the type supported by this ContentHandler.
+	 *
+	 */
+	public function makeEmptyContent() {
+		return new DummyContentForTesting( '' );
+	}
+}
+
+class DummyContentForTesting extends AbstractContent {
+
+	public function __construct( $data ) {
+		parent::__construct( "testing" );
+
+		$this->data = $data;
+	}
+
+	public function serialize( $format = null ) {
+		return serialize( $this->data );
+	}
+
+	/**
+	 * @return String a string representing the content in a way useful for building a full text search index.
+	 *         If no useful representation exists, this method returns an empty string.
+	 */
+	public function getTextForSearchIndex() {
+		return '';
+	}
+
+	/**
+	 * @return String the wikitext to include when another page includes this  content, or false if the content is not
+	 *  includable in a wikitext page.
+	 */
+	public function getWikitextForTransclusion() {
+		return false;
+	}
+
+	/**
+	 * Returns a textual representation of the content suitable for use in edit summaries and log messages.
+	 *
+	 * @param int $maxlength Maximum length of the summary text.
+	 * @return string The summary text.
+	 */
+	public function getTextForSummary( $maxlength = 250 ) {
+		return '';
+	}
+
+	/**
+	 * Returns native represenation of the data. Interpretation depends on the data model used,
+	 * as given by getDataModel().
+	 *
+	 * @return mixed the native representation of the content. Could be a string, a nested array
+	 *  structure, an object, a binary blob... anything, really.
+	 */
+	public function getNativeData()
+	{
+		return $this->data;
+	}
+
+	/**
+	 * returns the content's nominal size in bogo-bytes.
+	 *
+	 * @return int
+	 */
+	public function getSize() {
+		return strlen( $this->data );
+	}
+
+	/**
+	 * Return a copy of this Content object. The following must be true for the object returned
+	 * if $copy = $original->copy()
+	 *
+	 * * get_class($original) === get_class($copy)
+	 * * $original->getModel() === $copy->getModel()
+	 * * $original->equals( $copy )
+	 *
+	 * If and only if the Content object is imutable, the copy() method can and should
+	 * return $this. That is,  $copy === $original may be true, but only for imutable content
+	 * objects.
+	 *
+	 * @return Content. A copy of this object.
+	 */
+	public function copy() {
+		return $this;
+	}
+
+	/**
+	 * Returns true if this content is countable as a "real" wiki page, provided
+	 * that it's also in a countable location (e.g. a current revision in the main namespace).
+	 *
+	 * @param boolean $hasLinks if it is known whether this content contains links, provide this information here,
+	 *  to avoid redundant parsing to find out.
+	 * @return boolean
+	 */
+	public function isCountable( $hasLinks = null ) {
+		return false;
+	}
+
+	/**
+	 * @param Title $title
+	 * @param null $revId
+	 * @param null|ParserOptions $options
+	 * @param boolean $generateHtml whether to generate Html (default: true). If false,
+	 *  the result of calling getText() on the ParserOutput object returned by
+	 *   this method is undefined.
+	 *
+	 * @return ParserOutput
+	 */
+	public function getParserOutput( Title $title, $revId = null, ParserOptions $options = NULL, $generateHtml = true ) {
+		return new ParserOutput( $this->getNativeData() );
+	}
+}
diff --git a/tests/phpunit/includes/content/CssContentTest.php b/tests/phpunit/includes/content/CssContentTest.php
new file mode 100644
index 0000000000..b08a468b51
--- /dev/null
+++ b/tests/phpunit/includes/content/CssContentTest.php
@@ -0,0 +1,81 @@
+<?php
+
+/**
+ * @group ContentHandler
+ * @group Database
+ *        ^--- needed, because we do need the database to test link updates
+ */
+class CssContentTest extends MediaWikiTestCase {
+
+	protected function setUp() {
+		parent::setUp();
+
+		// Anon user
+		$user = new User();
+		$user->setName( '127.0.0.1' );
+
+		$this->setMwGlobals( array(
+			'wgUser' => $user,
+			'wgTextModelsToParse' => array(
+				CONTENT_MODEL_CSS,
+			)
+		) );
+	}
+
+	public function newContent( $text ) {
+		return new CssContent( $text );
+	}
+
+	public static function dataGetParserOutput() {
+		return array(
+			array(
+				'MediaWiki:Test.css',
+				null,
+				"hello <world>\n",
+				"<pre class=\"mw-code mw-css\" dir=\"ltr\">\nhello &lt;world&gt;\n\n</pre>"
+			),
+			array(
+				'MediaWiki:Test.css',
+				null,
+				"/* hello [[world]] */\n",
+				"<pre class=\"mw-code mw-css\" dir=\"ltr\">\n/* hello [[world]] */\n\n</pre>",
+				array(
+					'Links' => array(
+						array( 'World' => 0 )
+					)
+				)
+			),
+
+			// TODO: more...?
+		);
+	}
+
+	public function testGetModel() {
+		$content = $this->newContent( 'hello world.' );
+
+		$this->assertEquals( CONTENT_MODEL_CSS, $content->getModel() );
+	}
+
+	public function testGetContentHandler() {
+		$content = $this->newContent( 'hello world.' );
+
+		$this->assertEquals( CONTENT_MODEL_CSS, $content->getContentHandler()->getModelID() );
+	}
+
+	public static function dataEquals( ) {
+		return array(
+			array( new CssContent( 'hallo' ), null, false ),
+			array( new CssContent( 'hallo' ), new CssContent( 'hallo' ), true ),
+			array( new CssContent( 'hallo' ), new WikitextContent( 'hallo' ), false ),
+			array( new CssContent( 'hallo' ), new CssContent( 'HALLO' ), false ),
+		);
+	}
+
+	/**
+	 * @dataProvider dataEquals
+	 */
+	public function testEquals( Content $a, Content $b = null, $equal = false ) {
+		$this->assertEquals( $equal, $a->equals( $b ) );
+	}
+
+}
diff --git a/tests/phpunit/includes/content/JavascriptContentTest.php b/tests/phpunit/includes/content/JavascriptContentTest.php
new file mode 100644
index 0000000000..e08252c5bd
--- /dev/null
+++ b/tests/phpunit/includes/content/JavascriptContentTest.php
@@ -0,0 +1,273 @@
+<?php
+
+/**
+ * @group ContentHandler
+ * @group Database
+ *        ^--- needed, because we do need the database to test link updates
+ */
+class JavascriptContentTest extends TextContentTest {
+
+	public function newContent( $text ) {
+		return new JavascriptContent( $text );
+	}
+
+	public static function dataGetParserOutput() {
+		return array(
+			array(
+				'MediaWiki:Test.js',
+				null,
+				"hello <world>\n",
+				"<pre class=\"mw-code mw-js\" dir=\"ltr\">\nhello &lt;world&gt;\n\n</pre>"
+			),
+			array(
+				'MediaWiki:Test.js',
+				null,
+				"hello(); // [[world]]\n",
+				"<pre class=\"mw-code mw-js\" dir=\"ltr\">\nhello(); // [[world]]\n\n</pre>",
+				array(
+					'Links' => array(
+						array( 'World' => 0 )
+					)
+				)
+			),
+
+			// TODO: more...?
+		);
+	}
+
+	// XXX: Unused function
+	public static function dataGetSection() {
+		return array(
+			array( WikitextContentTest::$sections,
+			       '0',
+			       null
+			),
+			array( WikitextContentTest::$sections,
+			       '2',
+			       null
+			),
+			array( WikitextContentTest::$sections,
+			       '8',
+			       null
+			),
+		);
+	}
+
+	// XXX: Unused function
+	public static function dataReplaceSection() {
+		return array(
+			array( WikitextContentTest::$sections,
+			       '0',
+			       'No more',
+			       null,
+			       null
+			),
+			array( WikitextContentTest::$sections,
+			       '',
+			       'No more',
+			       null,
+			       null
+			),
+			array( WikitextContentTest::$sections,
+			       '2',
+			       "== TEST ==\nmore fun",
+			       null,
+			       null
+			),
+			array( WikitextContentTest::$sections,
+			       '8',
+			       'No more',
+			       null,
+			       null
+			),
+			array( WikitextContentTest::$sections,
+			       'new',
+			       'No more',
+			       'New',
+			       null
+			),
+		);
+	}
+
+	public function testAddSectionHeader( ) {
+		$content = $this->newContent( 'hello world' );
+		$c = $content->addSectionHeader( 'test' );
+
+		$this->assertTrue( $content->equals( $c ) );
+	}
+
+	// XXX: currently, preSaveTransform is applied to scripts. this may change or become optional.
+	public static function dataPreSaveTransform() {
+		return array(
+			array( 'hello this is ~~~',
+				"hello this is [[Special:Contributions/127.0.0.1|127.0.0.1]]",
+			),
+			array( 'hello \'\'this\'\' is <nowiki>~~~</nowiki>',
+				'hello \'\'this\'\' is <nowiki>~~~</nowiki>',
+			),
+			array( " Foo \n ",
+				" Foo",
+			),
+		);
+	}
+
+	public static function dataPreloadTransform() {
+		return array(
+			array( 'hello this is ~~~',
+			       'hello this is ~~~',
+			),
+			array( 'hello \'\'this\'\' is <noinclude>foo</noinclude><includeonly>bar</includeonly>',
+			       'hello \'\'this\'\' is <noinclude>foo</noinclude><includeonly>bar</includeonly>',
+			),
+		);
+	}
+
+	public static function dataGetRedirectTarget() {
+		return array(
+			array( '#REDIRECT [[Test]]',
+			       null,
+			),
+			array( '#REDIRECT Test',
+			       null,
+			),
+			array( '* #REDIRECT [[Test]]',
+			       null,
+			),
+		);
+	}
+
+	/**
+	 * @todo: test needs database!
+	 */
+	/*
+	public function getRedirectChain() {
+		$text = $this->getNativeData();
+		return Title::newFromRedirectArray( $text );
+	}
+	*/
+
+	/**
+	 * @todo: test needs database!
+	 */
+	/*
+	public function getUltimateRedirectTarget() {
+		$text = $this->getNativeData();
+		return Title::newFromRedirectRecurse( $text );
+	}
+	*/
+
+	public static function dataIsCountable() {
+		return array(
+			array( '',
+			       null,
+			       'any',
+			       true
+			),
+			array( 'Foo',
+			       null,
+			       'any',
+			       true
+			),
+			array( 'Foo',
+			       null,
+			       'comma',
+			       false
+			),
+			array( 'Foo, bar',
+			       null,
+			       'comma',
+			       false
+			),
+			array( 'Foo',
+			       null,
+			       'link',
+			       false
+			),
+			array( 'Foo [[bar]]',
+			       null,
+			       'link',
+			       false
+			),
+			array( 'Foo',
+			       true,
+			       'link',
+			       false
+			),
+			array( 'Foo [[bar]]',
+			       false,
+			       'link',
+			       false
+			),
+			array( '#REDIRECT [[bar]]',
+			       true,
+			       'any',
+			       true
+			),
+			array( '#REDIRECT [[bar]]',
+			       true,
+			       'comma',
+			       false
+			),
+			array( '#REDIRECT [[bar]]',
+			       true,
+			       'link',
+			       false
+			),
+		);
+	}
+
+	public static function dataGetTextForSummary() {
+		return array(
+			array( "hello\nworld.",
+			       16,
+			       'hello world.',
+			),
+			array( 'hello world.',
+			       8,
+			       'hello...',
+			),
+			array( '[[hello world]].',
+			       8,
+			       '[[hel...',
+			),
+		);
+	}
+
+	public function testMatchMagicWord( ) {
+		$mw = MagicWord::get( "staticredirect" );
+
+		$content = $this->newContent( "#REDIRECT [[FOO]]\n__STATICREDIRECT__" );
+		$this->assertFalse( $content->matchMagicWord( $mw ), "should not have matched magic word, since it's not wikitext" );
+	}
+
+	public function testUpdateRedirect( ) {
+		$target = Title::newFromText( "testUpdateRedirect_target" );
+
+		$content = $this->newContent( "#REDIRECT [[Someplace]]" );
+		$newContent = $content->updateRedirect( $target );
+
+		$this->assertTrue( $content->equals( $newContent ), "content should be unchanged since it's not wikitext" );
+	}
+
+	public function testGetModel() {
+		$content = $this->newContent( "hello world." );
+
+		$this->assertEquals( CONTENT_MODEL_JAVASCRIPT, $content->getModel() );
+	}
+
+	public function testGetContentHandler() {
+		$content = $this->newContent( "hello world." );
+
+		$this->assertEquals( CONTENT_MODEL_JAVASCRIPT, $content->getContentHandler()->getModelID() );
+	}
+
+	public static function dataEquals( ) {
+		return array(
+			array( new JavascriptContent( "hallo" ), null, false ),
+			array( new JavascriptContent( "hallo" ), new JavascriptContent( "hallo" ), true ),
+			array( new JavascriptContent( "hallo" ), new CssContent( "hallo" ), false ),
+			array( new JavascriptContent( "hallo" ), new JavascriptContent( "HALLO" ), false ),
+		);
+	}
+
+}
diff --git a/tests/phpunit/includes/content/TextContentTest.php b/tests/phpunit/includes/content/TextContentTest.php
new file mode 100644
index 0000000000..52e168b3ff
--- /dev/null
+++ b/tests/phpunit/includes/content/TextContentTest.php
@@ -0,0 +1,427 @@
+<?php
+
+/**
+ * @group ContentHandler
+ * @group Database
+ *        ^--- needed, because we do need the database to test link updates
+ */
+class TextContentTest extends MediaWikiTestCase {
+	protected $context;
+
+	protected function setUp() {
+		parent::setUp();
+
+		// Anon user
+		$user = new User();
+		$user->setName( '127.0.0.1' );
+
+		$this->setMwGlobals( array(
+			'wgUser' => $user,
+			'wgTextModelsToParse' => array(
+				CONTENT_MODEL_WIKITEXT,
+				CONTENT_MODEL_CSS,
+				CONTENT_MODEL_JAVASCRIPT,
+			),
+			'wgAlwaysUseTidy' => false,
+		) );
+
+		$this->context = new RequestContext( new FauxRequest() );
+		$this->context->setTitle( Title::newFromText( 'Test' ) );
+		$this->context->setUser( $user );
+	}
+
+	public function newContent( $text ) {
+		return new TextContent( $text );
+	}
+
+	public static function dataGetParserOutput() {
+		return array(
+			array(
+				'TextContentTest_testGetParserOutput',
+				CONTENT_MODEL_TEXT,
+				"hello ''world'' & [[stuff]]\n", "hello ''world'' &amp; [[stuff]]",
+				array(
+					'Links' => array()
+				)
+			),
+			// TODO: more...?
+		);
+	}
+
+	/**
+	 * @dataProvider dataGetParserOutput
+	 */
+	public function testGetParserOutput( $title, $model, $text, $expectedHtml, $expectedFields = null ) {
+		$title = Title::newFromText( $title );
+		$content = ContentHandler::makeContent( $text, $title, $model );
+
+		$po = $content->getParserOutput( $title );
+
+		$html = $po->getText();
+		$html = preg_replace( '#<!--.*?-->#sm', '', $html ); // strip comments
+
+		$this->assertEquals( $expectedHtml, trim( $html ) );
+
+		if ( $expectedFields ) {
+			foreach ( $expectedFields as $field => $exp ) {
+				$f = 'get' . ucfirst( $field );
+				$v = call_user_func( array( $po, $f ) );
+
+				if ( is_array( $exp ) ) {
+					$this->assertArrayEquals( $exp, $v );
+				} else {
+					$this->assertEquals( $exp, $v );
+				}
+			}
+		}
+
+		// TODO: assert more properties
+	}
+
+	public static function dataPreSaveTransform() {
+		return array(
+			array(
+				#0: no signature resolution
+				'hello this is ~~~',
+				'hello this is ~~~',
+			),
+			array(
+				#1: rtrim
+				" Foo \n ",
+				' Foo',
+			),
+		);
+	}
+
+	/**
+	 * @dataProvider dataPreSaveTransform
+	 */
+	public function testPreSaveTransform( $text, $expected ) {
+		global $wgContLang;
+
+		$options = ParserOptions::newFromUserAndLang( $this->context->getUser(), $wgContLang );
+
+		$content = $this->newContent( $text );
+		$content = $content->preSaveTransform( $this->context->getTitle(), $this->context->getUser(), $options );
+
+		$this->assertEquals( $expected, $content->getNativeData() );
+	}
+
+	public static function dataPreloadTransform() {
+		return array(
+			array(
+				'hello this is ~~~',
+				'hello this is ~~~',
+			),
+		);
+	}
+
+	/**
+	 * @dataProvider dataPreloadTransform
+	 */
+	public function testPreloadTransform( $text, $expected ) {
+		global $wgContLang;
+		$options = ParserOptions::newFromUserAndLang( $this->context->getUser(), $wgContLang );
+
+		$content = $this->newContent( $text );
+		$content = $content->preloadTransform( $this->context->getTitle(), $options );
+
+		$this->assertEquals( $expected, $content->getNativeData() );
+	}
+
+	public static function dataGetRedirectTarget() {
+		return array(
+			array( '#REDIRECT [[Test]]',
+				null,
+			),
+		);
+	}
+
+	/**
+	 * @dataProvider dataGetRedirectTarget
+	 */
+	public function testGetRedirectTarget( $text, $expected ) {
+		$content = $this->newContent( $text );
+		$t = $content->getRedirectTarget( );
+
+		if ( is_null( $expected ) ) {
+			$this->assertNull( $t, "text should not have generated a redirect target: $text" );
+		} else {
+			$this->assertEquals( $expected, $t->getPrefixedText() );
+		}
+	}
+
+	/**
+	 * @dataProvider dataGetRedirectTarget
+	 */
+	public function testIsRedirect( $text, $expected ) {
+		$content = $this->newContent( $text );
+
+		$this->assertEquals( !is_null($expected), $content->isRedirect() );
+	}
+
+	/**
+	 * @todo: test needs database! Should be done by a test class in the Database group.
+	 */
+	/*
+	public function getRedirectChain() {
+		$text = $this->getNativeData();
+		return Title::newFromRedirectArray( $text );
+	}
+	*/
+
+	/**
+	 * @todo: test needs database! Should be done by a test class in the Database group.
+	 */
+	/*
+	public function getUltimateRedirectTarget() {
+		$text = $this->getNativeData();
+		return Title::newFromRedirectRecurse( $text );
+	}
+	*/
+
+	public static function dataIsCountable() {
+		return array(
+			array( '',
+			       null,
+			       'any',
+			       true
+			),
+			array( 'Foo',
+			       null,
+			       'any',
+			       true
+			),
+			array( 'Foo',
+			       null,
+			       'comma',
+			       false
+			),
+			array( 'Foo, bar',
+			       null,
+			       'comma',
+			       false
+			),
+		);
+	}
+
+
+	/**
+	 * @dataProvider dataIsCountable
+	 * @group Database
+	 */
+	public function testIsCountable( $text, $hasLinks, $mode, $expected ) {
+		global $wgArticleCountMethod;
+
+		$old = $wgArticleCountMethod;
+		$wgArticleCountMethod = $mode;
+
+		$content = $this->newContent( $text );
+
+		$v = $content->isCountable( $hasLinks, $this->context->getTitle() );
+		$wgArticleCountMethod = $old;
+
+		$this->assertEquals( $expected, $v, 'isCountable() returned unexpected value ' . var_export( $v, true )
+		                                    . ' instead of ' . var_export( $expected, true ) . " in mode `$mode` for text \"$text\"" );
+	}
+
+	public static function dataGetTextForSummary() {
+		return array(
+			array( "hello\nworld.",
+			       16,
+			       'hello world.',
+			),
+			array( 'hello world.',
+			       8,
+			       'hello...',
+			),
+			array( '[[hello world]].',
+			       8,
+			       '[[hel...',
+			),
+		);
+	}
+
+	/**
+	 * @dataProvider dataGetTextForSummary
+	 */
+	public function testGetTextForSummary( $text, $maxlength, $expected ) {
+		$content = $this->newContent( $text );
+
+		$this->assertEquals( $expected, $content->getTextForSummary( $maxlength ) );
+	}
+
+
+	public function testGetTextForSearchIndex( ) {
+		$content = $this->newContent( 'hello world.' );
+
+		$this->assertEquals( 'hello world.', $content->getTextForSearchIndex() );
+	}
+
+	public function testCopy() {
+		$content = $this->newContent( 'hello world.' );
+		$copy = $content->copy();
+
+		$this->assertTrue( $content->equals( $copy ), 'copy must be equal to original' );
+		$this->assertEquals( 'hello world.', $copy->getNativeData() );
+	}
+
+	public function testGetSize( ) {
+		$content = $this->newContent( 'hello world.' );
+
+		$this->assertEquals( 12, $content->getSize() );
+	}
+
+	public function testGetNativeData( ) {
+		$content = $this->newContent( 'hello world.' );
+
+		$this->assertEquals( 'hello world.', $content->getNativeData() );
+	}
+
+	public function testGetWikitextForTransclusion( ) {
+		$content = $this->newContent( 'hello world.' );
+
+		$this->assertEquals( 'hello world.', $content->getWikitextForTransclusion() );
+	}
+
+	public function testGetModel() {
+		$content = $this->newContent( "hello world." );
+
+		$this->assertEquals( CONTENT_MODEL_TEXT, $content->getModel() );
+	}
+
+	public function testGetContentHandler() {
+		$content = $this->newContent( "hello world." );
+
+		$this->assertEquals( CONTENT_MODEL_TEXT, $content->getContentHandler()->getModelID() );
+	}
+
+	public static function dataIsEmpty( ) {
+		return array(
+			array( '', true ),
+			array( '  ', false ),
+			array( '0', false ),
+			array( 'hallo welt.', false ),
+		);
+	}
+
+	/**
+	 * @dataProvider dataIsEmpty
+	 */
+	public function testIsEmpty( $text, $empty ) {
+		$content = $this->newContent( $text );
+
+		$this->assertEquals( $empty, $content->isEmpty() );
+	}
+
+	public static function dataEquals( ) {
+		return array(
+			array( new TextContent( "hallo" ), null, false ),
+			array( new TextContent( "hallo" ), new TextContent( "hallo" ), true ),
+			array( new TextContent( "hallo" ), new JavascriptContent( "hallo" ), false ),
+			array( new TextContent( "hallo" ), new WikitextContent( "hallo" ), false ),
+			array( new TextContent( "hallo" ), new TextContent( "HALLO" ), false ),
+		);
+	}
+
+	/**
+	 * @dataProvider dataEquals
+	 */
+	public function testEquals( Content $a, Content $b = null, $equal = false ) {
+		$this->assertEquals( $equal, $a->equals( $b ) );
+	}
+
+	public static function dataGetDeletionUpdates() {
+		return array(
+			array("TextContentTest_testGetSecondaryDataUpdates_1",
+				CONTENT_MODEL_TEXT, "hello ''world''\n",
+				array( )
+			),
+			array("TextContentTest_testGetSecondaryDataUpdates_2",
+				CONTENT_MODEL_TEXT, "hello [[world test 21344]]\n",
+				array( )
+			),
+			// TODO: more...?
+		);
+	}
+
+	/**
+	 * @dataProvider dataGetDeletionUpdates
+	 */
+	public function testDeletionUpdates( $title, $model, $text, $expectedStuff ) {
+		$title = Title::newFromText( $title );
+		$title->resetArticleID( 2342 ); //dummy id. fine as long as we don't try to execute the updates!
+
+		$content = ContentHandler::makeContent( $text, $title, $model );
+
+		$updates = $content->getDeletionUpdates( WikiPage::factory( $title ) );
+
+		// make updates accessible by class name
+		foreach ( $updates as $update ) {
+			$class = get_class( $update );
+			$updates[ $class ] = $update;
+		}
+
+		if ( !$expectedStuff ) {
+			$this->assertTrue( true ); // make phpunit happy
+			return;
+		}
+
+		foreach ( $expectedStuff as $class => $fieldValues ) {
+			$this->assertArrayHasKey( $class, $updates, "missing an update of type $class" );
+
+			$update = $updates[ $class ];
+
+			foreach ( $fieldValues as $field => $value ) {
+				$v = $update->$field; #if the field doesn't exist, just crash and burn
+				$this->assertEquals( $value, $v, "unexpected value for field $field in instance of $class" );
+			}
+		}
+	}
+
+	public static function provideConvert() {
+		return array(
+			array( // #0
+				'Hallo Welt',
+				CONTENT_MODEL_WIKITEXT,
+				'lossless',
+				'Hallo Welt'
+			),
+			array( // #1
+				'Hallo Welt',
+				CONTENT_MODEL_WIKITEXT,
+				'lossless',
+				'Hallo Welt'
+			),
+			array( // #1
+				'Hallo Welt',
+				CONTENT_MODEL_CSS,
+				'lossless',
+				'Hallo Welt'
+			),
+			array( // #1
+				'Hallo Welt',
+				CONTENT_MODEL_JAVASCRIPT,
+				'lossless',
+				'Hallo Welt'
+			),
+		);
+	}
+
+	/**
+	 * @dataProvider provideConvert
+	 */
+	public function testConvert( $text, $model, $lossy, $expectedNative ) {
+		$content = $this->newContent( $text );
+
+		$converted = $content->convert( $model, $lossy );
+
+		if ( $expectedNative === false ) {
+			$this->assertFalse( $converted, "conversion to $model was expected to fail!" );
+		} else {
+			$this->assertInstanceOf( 'Content', $converted );
+			$this->assertEquals( $expectedNative, $converted->getNativeData() );
+		}
+	}
+
+}
diff --git a/tests/phpunit/includes/content/WikitextContentHandlerTest.php b/tests/phpunit/includes/content/WikitextContentHandlerTest.php
new file mode 100644
index 0000000000..d68c3e5438
--- /dev/null
+++ b/tests/phpunit/includes/content/WikitextContentHandlerTest.php
@@ -0,0 +1,196 @@
+<?php
+
+/**
+ * @group ContentHandler
+ */
+class WikitextContentHandlerTest extends MediaWikiLangTestCase {
+
+	/**
+	 * @var ContentHandler
+	 */
+	var $handler;
+
+	public function setUp() {
+		parent::setUp();
+
+		$this->handler = ContentHandler::getForModelID( CONTENT_MODEL_WIKITEXT );
+	}
+
+	public function testSerializeContent( ) {
+		$content = new WikitextContent( 'hello world' );
+
+		$this->assertEquals( 'hello world', $this->handler->serializeContent( $content ) );
+		$this->assertEquals( 'hello world', $this->handler->serializeContent( $content, CONTENT_FORMAT_WIKITEXT ) );
+
+		try {
+			$this->handler->serializeContent( $content, 'dummy/foo' );
+			$this->fail( "serializeContent() should have failed on unknown format" );
+		} catch ( MWException $e ) {
+			// ok, as expected
+		}
+	}
+
+	public function testUnserializeContent( ) {
+		$content = $this->handler->unserializeContent( 'hello world' );
+		$this->assertEquals( 'hello world', $content->getNativeData() );
+
+		$content = $this->handler->unserializeContent( 'hello world', CONTENT_FORMAT_WIKITEXT );
+		$this->assertEquals( 'hello world', $content->getNativeData() );
+
+		try {
+			$this->handler->unserializeContent( 'hello world', 'dummy/foo' );
+			$this->fail( "unserializeContent() should have failed on unknown format" );
+		} catch ( MWException $e ) {
+			// ok, as expected
+		}
+	}
+
+	public function testMakeEmptyContent() {
+		$content = $this->handler->makeEmptyContent();
+
+		$this->assertTrue( $content->isEmpty() );
+		$this->assertEquals( '', $content->getNativeData() );
+	}
+
+	public static function dataIsSupportedFormat( ) {
+		return array(
+			array( null, true ),
+			array( CONTENT_FORMAT_WIKITEXT, true ),
+			array( 99887766, false ),
+		);
+	}
+
+	/**
+	 * @dataProvider dataIsSupportedFormat
+	 */
+	public function testIsSupportedFormat( $format, $supported ) {
+		$this->assertEquals( $supported, $this->handler->isSupportedFormat( $format ) );
+	}
+
+	public static function dataMerge3( ) {
+		return array(
+			array( "first paragraph
+
+					second paragraph\n",
+
+					"FIRST paragraph
+
+					second paragraph\n",
+
+					"first paragraph
+
+					SECOND paragraph\n",
+
+					"FIRST paragraph
+
+					SECOND paragraph\n",
+			),
+
+			array( "first paragraph
+					second paragraph\n",
+
+				   "Bla bla\n",
+
+				   "Blubberdibla\n",
+
+				   false,
+			),
+
+		);
+	}
+
+	/**
+	 * @dataProvider dataMerge3
+	 */
+	public function testMerge3( $old, $mine, $yours, $expected ) {
+		global $wgDiff3;
+
+		if ( !$wgDiff3 ) {
+			$this->markTestSkipped( "Can't test merge3(), since \$wgDiff3 is not configured" );
+		}
+
+		if ( !file_exists( $wgDiff3 ) ) {
+			#XXX: this sucks, since it uses arcane internal knowledge about TextContentHandler::merge3 and wfMerge.
+			$this->markTestSkipped( "Can't test merge3(), since \$wgDiff3 is misconfigured: can't find $wgDiff3" );
+		}
+
+		// test merge
+		$oldContent = new WikitextContent( $old );
+		$myContent = new WikitextContent( $mine );
+		$yourContent = new WikitextContent( $yours );
+
+		$merged = $this->handler->merge3( $oldContent, $myContent, $yourContent );
+
+		$this->assertEquals( $expected, $merged ? $merged->getNativeData() : $merged );
+	}
+
+	public static function dataGetAutosummary( ) {
+		return array(
+			array(
+				'Hello there, world!',
+				'#REDIRECT [[Foo]]',
+				0,
+				'/^Redirected page .*Foo/'
+			),
+
+			array(
+				null,
+				'Hello world!',
+				EDIT_NEW,
+				'/^Created page .*Hello/'
+			),
+
+			array(
+				'Hello there, world!',
+				'',
+				0,
+				'/^Blanked/'
+			),
+
+			array(
+				'Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut
+				labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et
+				ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.',
+				'Hello world!',
+				0,
+				'/^Replaced .*Hello/'
+			),
+
+			array(
+				'foo',
+				'bar',
+				0,
+				'/^$/'
+			),
+		);
+	}
+
+	/**
+	 * @dataProvider dataGetAutosummary
+	 */
+	public function testGetAutosummary( $old, $new, $flags, $expected ) {
+		global $wgLanguageCode, $wgContLang;
+
+		$oldContent = is_null( $old ) ? null : new WikitextContent( $old );
+		$newContent = is_null( $new ) ? null : new WikitextContent( $new );
+
+		$summary = $this->handler->getAutosummary( $oldContent, $newContent, $flags );
+
+		$this->assertTrue( (bool)preg_match( $expected, $summary ), "Autosummary didn't match expected pattern $expected: $summary" );
+	}
+
+	/**
+	 * @todo Text case requires database, should be done by a test class in the Database group
+	 */
+	/*
+	public function testGetAutoDeleteReason( Title $title, &$hasHistory ) {}
+	*/
+
+	/**
+	 * @todo Text case requires database, should be done by a test class in the Database group
+	 */
+	/*
+	public function testGetUndoContent( Revision $current, Revision $undo, Revision $undoafter = null ) {}
+	*/
+
+}
diff --git a/tests/phpunit/includes/content/WikitextContentTest.php b/tests/phpunit/includes/content/WikitextContentTest.php
new file mode 100644
index 0000000000..ceb6d485f9
--- /dev/null
+++ b/tests/phpunit/includes/content/WikitextContentTest.php
@@ -0,0 +1,385 @@
+<?php
+
+/**
+ * @group ContentHandler
+ *
+ * @group Database
+ *        ^--- needed, because we do need the database to test link updates
+ */
+class WikitextContentTest extends TextContentTest {
+
+	static $sections =
+
+"Intro
+
+== stuff ==
+hello world
+
+== test ==
+just a test
+
+== foo ==
+more stuff
+";
+
+	public function newContent( $text ) {
+		return new WikitextContent( $text );
+	}
+
+	public static function dataGetParserOutput() {
+		return array(
+			array(
+				"WikitextContentTest_testGetParserOutput",
+				CONTENT_MODEL_WIKITEXT,
+				"hello ''world''\n",
+				"<p>hello <i>world</i>\n</p>"
+			),
+			// TODO: more...?
+		);
+	}
+
+	public static function dataGetSecondaryDataUpdates() {
+		return array(
+			array( "WikitextContentTest_testGetSecondaryDataUpdates_1",
+				CONTENT_MODEL_WIKITEXT, "hello ''world''\n",
+				array(
+					'LinksUpdate' => array(
+						'mRecursive' => true,
+						'mLinks' => array()
+					)
+				)
+			),
+			array( "WikitextContentTest_testGetSecondaryDataUpdates_2",
+				CONTENT_MODEL_WIKITEXT, "hello [[world test 21344]]\n",
+				array(
+					'LinksUpdate' => array(
+						'mRecursive' => true,
+						'mLinks' => array(
+							array( 'World_test_21344' => 0 )
+						)
+					)
+				)
+			),
+			// TODO: more...?
+		);
+	}
+
+	/**
+	 * @dataProvider dataGetSecondaryDataUpdates
+	 * @group Database
+	 */
+	public function testGetSecondaryDataUpdates( $title, $model, $text, $expectedStuff ) {
+		$title = Title::newFromText( $title );
+		$title->resetArticleID( 2342 ); //dummy id. fine as long as we don't try to execute the updates!
+
+		$content = ContentHandler::makeContent( $text, $title, $model );
+
+		$updates = $content->getSecondaryDataUpdates( $title );
+
+		// make updates accessible by class name
+		foreach ( $updates as $update ) {
+			$class = get_class( $update );
+			$updates[$class] = $update;
+		}
+
+		foreach ( $expectedStuff as $class => $fieldValues ) {
+			$this->assertArrayHasKey( $class, $updates, "missing an update of type $class" );
+
+			$update = $updates[$class];
+
+			foreach ( $fieldValues as $field => $value ) {
+				$v = $update->$field; #if the field doesn't exist, just crash and burn
+				$this->assertEquals( $value, $v, "unexpected value for field $field in instance of $class" );
+			}
+		}
+	}
+
+	public static function dataGetSection() {
+		return array(
+			array( WikitextContentTest::$sections,
+					"0",
+					"Intro"
+			),
+			array( WikitextContentTest::$sections,
+					"2",
+"== test ==
+just a test"
+			),
+			array( WikitextContentTest::$sections,
+					"8",
+					false
+			),
+		);
+	}
+
+	/**
+	 * @dataProvider dataGetSection
+	 */
+	public function testGetSection( $text, $sectionId, $expectedText ) {
+		$content = $this->newContent( $text );
+
+		$sectionContent = $content->getSection( $sectionId );
+		if ( is_object( $sectionContent ) ) {
+			$sectionText = $sectionContent->getNativeData();
+		} else {
+			$sectionText = $sectionContent;
+		}
+
+		$this->assertEquals( $expectedText, $sectionText );
+	}
+
+	public static function dataReplaceSection() {
+		return array(
+			array( WikitextContentTest::$sections,
+			       "0",
+			       "No more",
+			       null,
+			       trim( preg_replace( '/^Intro/sm', 'No more', WikitextContentTest::$sections ) )
+			),
+			array( WikitextContentTest::$sections,
+			       "",
+			       "No more",
+			       null,
+			       "No more"
+			),
+			array( WikitextContentTest::$sections,
+			       "2",
+			       "== TEST ==\nmore fun",
+			       null,
+			       trim( preg_replace( '/^== test ==.*== foo ==/sm', "== TEST ==\nmore fun\n\n== foo ==", WikitextContentTest::$sections ) )
+			),
+			array( WikitextContentTest::$sections,
+			       "8",
+			       "No more",
+			       null,
+			       WikitextContentTest::$sections
+			),
+			array( WikitextContentTest::$sections,
+			       "new",
+			       "No more",
+			       "New",
+			       trim( WikitextContentTest::$sections ) . "\n\n\n== New ==\n\nNo more"
+			),
+		);
+	}
+
+	/**
+	 * @dataProvider dataReplaceSection
+	 */
+	public function testReplaceSection( $text, $section, $with, $sectionTitle, $expected ) {
+		$content = $this->newContent( $text );
+		$c = $content->replaceSection( $section, $this->newContent( $with ), $sectionTitle );
+
+		$this->assertEquals( $expected, is_null( $c ) ? null : $c->getNativeData() );
+	}
+
+	public function testAddSectionHeader( ) {
+		$content = $this->newContent( 'hello world' );
+		$content = $content->addSectionHeader( 'test' );
+
+		$this->assertEquals( "== test ==\n\nhello world", $content->getNativeData() );
+	}
+
+	public static function dataPreSaveTransform() {
+		return array(
+			array( 'hello this is ~~~',
+			       "hello this is [[Special:Contributions/127.0.0.1|127.0.0.1]]",
+			),
+			array( 'hello \'\'this\'\' is <nowiki>~~~</nowiki>',
+			       'hello \'\'this\'\' is <nowiki>~~~</nowiki>',
+			),
+			array( // rtrim
+				" Foo \n ",
+				" Foo",
+			),
+		);
+	}
+
+	public static function dataPreloadTransform() {
+		return array(
+			array( 'hello this is ~~~',
+			       "hello this is ~~~",
+			),
+			array( 'hello \'\'this\'\' is <noinclude>foo</noinclude><includeonly>bar</includeonly>',
+			       'hello \'\'this\'\' is bar',
+			),
+		);
+	}
+
+	public static function dataGetRedirectTarget() {
+		return array(
+			array( '#REDIRECT [[Test]]',
+			       'Test',
+			),
+			array( '#REDIRECT Test',
+			       null,
+			),
+			array( '* #REDIRECT [[Test]]',
+			       null,
+			),
+		);
+	}
+
+	public static function dataGetTextForSummary() {
+		return array(
+			array( "hello\nworld.",
+				16,
+				'hello world.',
+			),
+			array( 'hello world.',
+				8,
+				'hello...',
+			),
+			array( '[[hello world]].',
+				8,
+				'hel...',
+			),
+		);
+	}
+
+	/**
+	 * @todo: test needs database! Should be done by a test class in the Database group.
+	 */
+	/*
+	public function getRedirectChain() {
+		$text = $this->getNativeData();
+		return Title::newFromRedirectArray( $text );
+	}
+	*/
+
+	/**
+	 * @todo: test needs database! Should be done by a test class in the Database group.
+	 */
+	/*
+	public function getUltimateRedirectTarget() {
+		$text = $this->getNativeData();
+		return Title::newFromRedirectRecurse( $text );
+	}
+	*/
+
+	public static function dataIsCountable() {
+		return array(
+			array( '',
+			       null,
+			       'any',
+			       true
+			),
+			array( 'Foo',
+			       null,
+			       'any',
+			       true
+			),
+			array( 'Foo',
+			       null,
+			       'comma',
+			       false
+			),
+			array( 'Foo, bar',
+			       null,
+			       'comma',
+			       true
+			),
+			array( 'Foo',
+			       null,
+			       'link',
+			       false
+			),
+			array( 'Foo [[bar]]',
+			       null,
+			       'link',
+			       true
+			),
+			array( 'Foo',
+			       true,
+			       'link',
+			       true
+			),
+			array( 'Foo [[bar]]',
+			       false,
+			       'link',
+			       false
+			),
+			array( '#REDIRECT [[bar]]',
+			       true,
+			       'any',
+			       false
+			),
+			array( '#REDIRECT [[bar]]',
+			       true,
+			       'comma',
+			       false
+			),
+			array( '#REDIRECT [[bar]]',
+			       true,
+			       'link',
+			       false
+			),
+		);
+	}
+
+	public function testMatchMagicWord( ) {
+		$mw = MagicWord::get( "staticredirect" );
+
+		$content = $this->newContent( "#REDIRECT [[FOO]]\n__STATICREDIRECT__" );
+		$this->assertTrue( $content->matchMagicWord( $mw ), "should have matched magic word" );
+
+		$content = $this->newContent( "#REDIRECT [[FOO]]" );
+		$this->assertFalse( $content->matchMagicWord( $mw ), "should not have matched magic word" );
+	}
+
+	public function testUpdateRedirect( ) {
+		$target = Title::newFromText( "testUpdateRedirect_target" );
+
+		// test with non-redirect page
+		$content = $this->newContent( "hello world." );
+		$newContent = $content->updateRedirect( $target );
+
+		$this->assertTrue( $content->equals( $newContent ), "content should be unchanged" );
+
+		// test with actual redirect
+		$content = $this->newContent( "#REDIRECT [[Someplace]]" );
+		$newContent = $content->updateRedirect( $target );
+
+		$this->assertFalse( $content->equals( $newContent ), "content should have changed" );
+		$this->assertTrue( $newContent->isRedirect(), "new content should be a redirect" );
+
+		$this->assertEquals( $target->getFullText(), $newContent->getRedirectTarget()->getFullText() );
+	}
+
+	public function testGetModel() {
+		$content = $this->newContent( "hello world." );
+
+		$this->assertEquals( CONTENT_MODEL_WIKITEXT, $content->getModel() );
+	}
+
+	public function testGetContentHandler() {
+		$content = $this->newContent( "hello world." );
+
+		$this->assertEquals( CONTENT_MODEL_WIKITEXT, $content->getContentHandler()->getModelID() );
+	}
+
+	public static function dataEquals( ) {
+		return array(
+			array( new WikitextContent( "hallo" ), null, false ),
+			array( new WikitextContent( "hallo" ), new WikitextContent( "hallo" ), true ),
+			array( new WikitextContent( "hallo" ), new JavascriptContent( "hallo" ), false ),
+			array( new WikitextContent( "hallo" ), new TextContent( "hallo" ), false ),
+			array( new WikitextContent( "hallo" ), new WikitextContent( "HALLO" ), false ),
+		);
+	}
+
+	public static function dataGetDeletionUpdates() {
+		return array(
+			array("WikitextContentTest_testGetSecondaryDataUpdates_1",
+				CONTENT_MODEL_WIKITEXT, "hello ''world''\n",
+				array( 'LinksDeletionUpdate' => array( ) )
+			),
+			array("WikitextContentTest_testGetSecondaryDataUpdates_2",
+				CONTENT_MODEL_WIKITEXT, "hello [[world test 21344]]\n",
+				array( 'LinksDeletionUpdate' => array( ) )
+			),
+			// @todo: more...?
+		);
+	}
+
+}
diff --git a/tests/phpunit/includes/db/DatabaseSqliteTest.php b/tests/phpunit/includes/db/DatabaseSqliteTest.php
index 216de8424f..faa9abd986 100644
--- a/tests/phpunit/includes/db/DatabaseSqliteTest.php
+++ b/tests/phpunit/includes/db/DatabaseSqliteTest.php
@@ -54,6 +54,52 @@ class DatabaseSqliteTest extends MediaWikiTestCase {
 		$this->assertEquals( count( $expected ), $i, 'Unexpected number of rows' );
 	}
 
+	public static function provideAddQuotes() {
+		return array(
+			array( // #0: empty
+				'', "''"
+			),
+			array( // #1: simple
+				'foo bar', "'foo bar'"
+			),
+			array( // #2: including quote
+				'foo\'bar', "'foo''bar'"
+			),
+			array( // #3: including \0 (must be represented as hex, per https://bugs.php.net/bug.php?id=63419)
+				"x\0y",
+				"x'780079'",
+			),
+			array( // #4: blob object (must be represented as hex)
+				new Blob( "hello" ),
+				"x'68656c6c6f'",
+			),
+		);
+	}
+
+	/**
+	 * @dataProvider provideAddQuotes()
+	 */
+	public function testAddQuotes( $value, $expected ) {
+		// check quoting
+		$db = new DatabaseSqliteStandalone( ':memory:' );
+		$this->assertEquals( $expected, $db->addQuotes( $value ), 'string not quoted as expected' );
+
+		// ok, quoting works as expected, now try a round trip.
+		$re = $db->query( 'select ' . $db->addQuotes( $value ) );
+
+		$this->assertTrue( $re !== false, 'query failed' );
+
+		if ( $row = $re->fetchRow() ) {
+			if ( $value instanceof Blob ) {
+				$value = $value->fetch();
+			}
+
+			$this->assertEquals( $value, $row[0], 'string mangled by the database' );
+		} else {
+			$this->fail( 'query returned no result' );
+		}
+	}
+
 	public function testReplaceVars() {
 		$this->assertEquals( 'foo', $this->replaceVars( 'foo' ), "Don't break anything accidentally" );
 
diff --git a/tests/phpunit/includes/db/ORMRowTest.php b/tests/phpunit/includes/db/ORMRowTest.php
index 9dcaf2b372..cd970b3d1a 100644
--- a/tests/phpunit/includes/db/ORMRowTest.php
+++ b/tests/phpunit/includes/db/ORMRowTest.php
@@ -155,12 +155,11 @@ abstract class ORMRowTest extends \MediaWikiTestCase {
 
 	/**
 	 * @dataProvider constructorTestProvider
+	 * @depends testSave()
 	 */
 	public function testRemove( array $data, $loadDefaults ) {
 		$item = $this->getRowInstance( $data, $loadDefaults );
 
-		$this->assertTrue( $item->save() );
-
 		$this->assertTrue( $item->remove() );
 
 		$this->assertFalse( $item->hasIdField() );
diff --git a/tests/phpunit/includes/db/ORMTableTest.php b/tests/phpunit/includes/db/ORMTableTest.php
new file mode 100644
index 0000000000..2ed3dd3a13
--- /dev/null
+++ b/tests/phpunit/includes/db/ORMTableTest.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * Abstract class to construct tests for ORMTable deriving classes.
+ *
+ * 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
+ * @since 1.21
+ *
+ * @ingroup Test
+ *
+ * @group ORM
+ *
+ * @licence GNU GPL v2+
+ * @author Jeroen De Dauw < jeroendedauw@gmail.com >
+ */
+abstract class ORMTableTest extends MediaWikiTestCase {
+
+	/**
+	 * @since 1.21
+	 * @return string
+	 */
+	protected abstract function getTableClass();
+
+	/**
+	 * @since 1.21
+	 * @return IORMTable
+	 */
+	public function getTable() {
+		$class = $this->getTableClass();
+		return $class::singleton();
+	}
+
+	/**
+	 * @since 1.21
+	 * @return string
+	 */
+	public function getRowClass() {
+		return $this->getTable()->getRowClass();
+	}
+
+	/**
+	 * @since 1.21
+	 */
+	public function testSingleton() {
+		$class = $this->getTableClass();
+
+		$this->assertInstanceOf( $class, $class::singleton() );
+		$this->assertTrue( $class::singleton() === $class::singleton() );
+	}
+
+}
diff --git a/tests/phpunit/includes/db/TestORMRowTest.php b/tests/phpunit/includes/db/TestORMRowTest.php
index c7bea3bbc2..e33ae0181d 100644
--- a/tests/phpunit/includes/db/TestORMRowTest.php
+++ b/tests/phpunit/includes/db/TestORMRowTest.php
@@ -87,6 +87,7 @@ class TestORMRowTest extends ORMRowTest {
 			array(
 				array(
 					'name' => 'Foobar',
+					'time' => '20120101020202',
 					'age' => 42,
 					'height' => 9000.1,
 					'awesome' => true,
diff --git a/tests/phpunit/includes/filebackend/FileBackendTest.php b/tests/phpunit/includes/filebackend/FileBackendTest.php
new file mode 100644
index 0000000000..b6d44fd5ed
--- /dev/null
+++ b/tests/phpunit/includes/filebackend/FileBackendTest.php
@@ -0,0 +1,2039 @@
+<?php
+
+/**
+ * @group FileRepo
+ * @group FileBackend
+ * @group medium
+ */
+class FileBackendTest extends MediaWikiTestCase {
+	private $backend, $multiBackend;
+	private $filesToPrune = array();
+	private static $backendToUse;
+
+	protected function setUp() {
+		global $wgFileBackends;
+		parent::setUp();
+		$tmpPrefix = wfTempDir() . '/filebackend-unittest-' . time() . '-' . mt_rand();
+		if ( $this->getCliArg( 'use-filebackend=' ) ) {
+			if ( self::$backendToUse ) {
+				$this->singleBackend = self::$backendToUse;
+			} else {
+				$name = $this->getCliArg( 'use-filebackend=' );
+				$useConfig = array();
+				foreach ( $wgFileBackends as $conf ) {
+					if ( $conf['name'] == $name ) {
+						$useConfig = $conf;
+						break;
+					}
+				}
+				$useConfig['name'] = 'localtesting'; // swap name
+				$useConfig['shardViaHashLevels'] = array( // test sharding
+					'unittest-cont1' => array( 'levels' => 1, 'base' => 16, 'repeat' => 1 )
+				);
+				$class = $useConfig['class'];
+				self::$backendToUse = new $class( $useConfig );
+				$this->singleBackend = self::$backendToUse;
+			}
+		} else {
+			$this->singleBackend = new FSFileBackend( array(
+				'name'        => 'localtesting',
+				'lockManager' => 'fsLockManager',
+				#'parallelize' => 'implicit',
+				'containerPaths' => array(
+					'unittest-cont1' => "{$tmpPrefix}-localtesting-cont1",
+					'unittest-cont2' => "{$tmpPrefix}-localtesting-cont2" )
+			) );
+		}
+		$this->multiBackend = new FileBackendMultiWrite( array(
+			'name'        => 'localtesting',
+			'lockManager' => 'fsLockManager',
+			'parallelize' => 'implicit',
+			'backends'    => array(
+				array(
+					'name'          => 'localmultitesting1',
+					'class'         => 'FSFileBackend',
+					'lockManager'   => 'nullLockManager',
+					'containerPaths' => array(
+						'unittest-cont1' => "{$tmpPrefix}-localtestingmulti1-cont1",
+						'unittest-cont2' => "{$tmpPrefix}-localtestingmulti1-cont2" ),
+					'isMultiMaster' => false
+				),
+				array(
+					'name'          => 'localmultitesting2',
+					'class'         => 'FSFileBackend',
+					'lockManager'   => 'nullLockManager',
+					'containerPaths' => array(
+						'unittest-cont1' => "{$tmpPrefix}-localtestingmulti2-cont1",
+						'unittest-cont2' => "{$tmpPrefix}-localtestingmulti2-cont2" ),
+					'isMultiMaster' => true
+				)
+			)
+		) );
+		$this->filesToPrune = array();
+	}
+
+	private static function baseStorePath() {
+		return 'mwstore://localtesting';
+	}
+
+	private function backendClass() {
+		return get_class( $this->backend );
+	}
+
+	/**
+	 * @dataProvider provider_testIsStoragePath
+	 */
+	public function testIsStoragePath( $path, $isStorePath ) {
+		$this->assertEquals( $isStorePath, FileBackend::isStoragePath( $path ),
+			"FileBackend::isStoragePath on path '$path'" );
+	}
+
+	function provider_testIsStoragePath() {
+		return array(
+			array( 'mwstore://', true ),
+			array( 'mwstore://backend', true ),
+			array( 'mwstore://backend/container', true ),
+			array( 'mwstore://backend/container/', true ),
+			array( 'mwstore://backend/container/path', true ),
+			array( 'mwstore://backend//container/', true ),
+			array( 'mwstore://backend//container//', true ),
+			array( 'mwstore://backend//container//path', true ),
+			array( 'mwstore:///', true ),
+			array( 'mwstore:/', false ),
+			array( 'mwstore:', false ),
+		);
+	}
+
+	/**
+	 * @dataProvider provider_testSplitStoragePath
+	 */
+	public function testSplitStoragePath( $path, $res ) {
+		$this->assertEquals( $res, FileBackend::splitStoragePath( $path ),
+			"FileBackend::splitStoragePath on path '$path'" );
+	}
+
+	function provider_testSplitStoragePath() {
+		return array(
+			array( 'mwstore://backend/container', array( 'backend', 'container', '' ) ),
+			array( 'mwstore://backend/container/', array( 'backend', 'container', '' ) ),
+			array( 'mwstore://backend/container/path', array( 'backend', 'container', 'path' ) ),
+			array( 'mwstore://backend/container//path', array( 'backend', 'container', '/path' ) ),
+			array( 'mwstore://backend//container/path', array( null, null, null ) ),
+			array( 'mwstore://backend//container//path', array( null, null, null ) ),
+			array( 'mwstore://', array( null, null, null ) ),
+			array( 'mwstore://backend', array( null, null, null ) ),
+			array( 'mwstore:///', array( null, null, null ) ),
+			array( 'mwstore:/', array( null, null, null ) ),
+			array( 'mwstore:', array( null, null, null ) )
+		);
+	}
+
+	/**
+	 * @dataProvider provider_normalizeStoragePath
+	 */
+	public function testNormalizeStoragePath( $path, $res ) {
+		$this->assertEquals( $res, FileBackend::normalizeStoragePath( $path ),
+			"FileBackend::normalizeStoragePath on path '$path'" );
+	}
+
+	function provider_normalizeStoragePath() {
+		return array(
+			array( 'mwstore://backend/container', 'mwstore://backend/container' ),
+			array( 'mwstore://backend/container/', 'mwstore://backend/container' ),
+			array( 'mwstore://backend/container/path', 'mwstore://backend/container/path' ),
+			array( 'mwstore://backend/container//path', 'mwstore://backend/container/path' ),
+			array( 'mwstore://backend/container///path', 'mwstore://backend/container/path' ),
+			array( 'mwstore://backend/container///path//to///obj', 'mwstore://backend/container/path/to/obj',
+			array( 'mwstore://', null ),
+			array( 'mwstore://backend', null ),
+			array( 'mwstore://backend//container/path', null ),
+			array( 'mwstore://backend//container//path', null ),
+			array( 'mwstore:///', null ),
+			array( 'mwstore:/', null ),
+			array( 'mwstore:', null ), )
+		);
+	}
+
+	/**
+	 * @dataProvider provider_testParentStoragePath
+	 */
+	public function testParentStoragePath( $path, $res ) {
+		$this->assertEquals( $res, FileBackend::parentStoragePath( $path ),
+			"FileBackend::parentStoragePath on path '$path'" );
+	}
+
+	function provider_testParentStoragePath() {
+		return array(
+			array( 'mwstore://backend/container/path/to/obj', 'mwstore://backend/container/path/to' ),
+			array( 'mwstore://backend/container/path/to', 'mwstore://backend/container/path' ),
+			array( 'mwstore://backend/container/path', 'mwstore://backend/container' ),
+			array( 'mwstore://backend/container', null ),
+			array( 'mwstore://backend/container/path/to/obj/', 'mwstore://backend/container/path/to' ),
+			array( 'mwstore://backend/container/path/to/', 'mwstore://backend/container/path' ),
+			array( 'mwstore://backend/container/path/', 'mwstore://backend/container' ),
+			array( 'mwstore://backend/container/', null ),
+		);
+	}
+
+	/**
+	 * @dataProvider provider_testExtensionFromPath
+	 */
+	public function testExtensionFromPath( $path, $res ) {
+		$this->assertEquals( $res, FileBackend::extensionFromPath( $path ),
+			"FileBackend::extensionFromPath on path '$path'" );
+	}
+
+	public static function provider_testExtensionFromPath() {
+		return array(
+			array( 'mwstore://backend/container/path.txt', 'txt' ),
+			array( 'mwstore://backend/container/path.svg.png', 'png' ),
+			array( 'mwstore://backend/container/path', '' ),
+			array( 'mwstore://backend/container/path.', '' ),
+		);
+	}
+
+	/**
+	 * @dataProvider provider_testStore
+	 */
+	public function testStore( $op ) {
+		$this->filesToPrune[] = $op['src'];
+
+		$this->backend = $this->singleBackend;
+		$this->tearDownFiles();
+		$this->doTestStore( $op );
+		$this->tearDownFiles();
+
+		$this->backend = $this->multiBackend;
+		$this->tearDownFiles();
+		$this->doTestStore( $op );
+		$this->filesToPrune[] = $op['src']; # avoid file leaking
+		$this->tearDownFiles();
+	}
+
+	private function doTestStore( $op ) {
+		$backendName = $this->backendClass();
+
+		$source = $op['src'];
+		$dest = $op['dst'];
+		$this->prepare( array( 'dir' => dirname( $dest ) ) );
+
+		file_put_contents( $source, "Unit test file" );
+
+		if ( isset( $op['overwrite'] ) || isset( $op['overwriteSame'] ) ) {
+			$this->backend->store( $op );
+		}
+
+		$status = $this->backend->doOperation( $op );
+
+		$this->assertGoodStatus( $status,
+			"Store from $source to $dest succeeded without warnings ($backendName)." );
+		$this->assertEquals( true, $status->isOK(),
+			"Store from $source to $dest succeeded ($backendName)." );
+		$this->assertEquals( array( 0 => true ), $status->success,
+			"Store from $source to $dest has proper 'success' field in Status ($backendName)." );
+		$this->assertEquals( true, file_exists( $source ),
+			"Source file $source still exists ($backendName)." );
+		$this->assertEquals( true, $this->backend->fileExists( array( 'src' => $dest ) ),
+			"Destination file $dest exists ($backendName)." );
+
+		$this->assertEquals( filesize( $source ),
+			$this->backend->getFileSize( array( 'src' => $dest ) ),
+			"Destination file $dest has correct size ($backendName)." );
+
+		$props1 = FSFile::getPropsFromPath( $source );
+		$props2 = $this->backend->getFileProps( array( 'src' => $dest ) );
+		$this->assertEquals( $props1, $props2,
+			"Source and destination have the same props ($backendName)." );
+
+		$this->assertBackendPathsConsistent( array( $dest ) );
+	}
+
+	public static function provider_testStore() {
+		$cases = array();
+
+		$tmpName = TempFSFile::factory( "unittests_", 'txt' )->getPath();
+		$toPath = self::baseStorePath() . '/unittest-cont1/e/fun/obj1.txt';
+		$op = array( 'op' => 'store', 'src' => $tmpName, 'dst' => $toPath );
+		$cases[] = array(
+			$op, // operation
+			$tmpName, // source
+			$toPath, // dest
+		);
+
+		$op2 = $op;
+		$op2['overwrite'] = true;
+		$cases[] = array(
+			$op2, // operation
+			$tmpName, // source
+			$toPath, // dest
+		);
+
+		$op2 = $op;
+		$op2['overwriteSame'] = true;
+		$cases[] = array(
+			$op2, // operation
+			$tmpName, // source
+			$toPath, // dest
+		);
+
+		return $cases;
+	}
+
+	/**
+	 * @dataProvider provider_testCopy
+	 */
+	public function testCopy( $op ) {
+		$this->backend = $this->singleBackend;
+		$this->tearDownFiles();
+		$this->doTestCopy( $op );
+		$this->tearDownFiles();
+
+		$this->backend = $this->multiBackend;
+		$this->tearDownFiles();
+		$this->doTestCopy( $op );
+		$this->tearDownFiles();
+	}
+
+	private function doTestCopy( $op ) {
+		$backendName = $this->backendClass();
+
+		$source = $op['src'];
+		$dest = $op['dst'];
+		$this->prepare( array( 'dir' => dirname( $source ) ) );
+		$this->prepare( array( 'dir' => dirname( $dest ) ) );
+
+		if ( isset( $op['ignoreMissingSource'] ) ) {
+			$status = $this->backend->doOperation( $op );
+			$this->assertGoodStatus( $status,
+				"Move from $source to $dest succeeded without warnings ($backendName)." );
+			$this->assertEquals( array( 0 => true ), $status->success,
+				"Move from $source to $dest has proper 'success' field in Status ($backendName)." );
+			$this->assertEquals( false, $this->backend->fileExists( array( 'src' => $source ) ),
+				"Source file $source does not exist ($backendName)." );
+			$this->assertEquals( false, $this->backend->fileExists( array( 'src' => $dest ) ),
+				"Destination file $dest does not exist ($backendName)." );
+			return; // done
+		}
+
+		$status = $this->backend->doOperation(
+			array( 'op' => 'create', 'content' => 'blahblah', 'dst' => $source ) );
+		$this->assertGoodStatus( $status,
+			"Creation of file at $source succeeded ($backendName)." );
+
+		if ( isset( $op['overwrite'] ) || isset( $op['overwriteSame'] ) ) {
+			$this->backend->copy( $op );
+		}
+
+		$status = $this->backend->doOperation( $op );
+
+		$this->assertGoodStatus( $status,
+			"Copy from $source to $dest succeeded without warnings ($backendName)." );
+		$this->assertEquals( true, $status->isOK(),
+			"Copy from $source to $dest succeeded ($backendName)." );
+		$this->assertEquals( array( 0 => true ), $status->success,
+			"Copy from $source to $dest has proper 'success' field in Status ($backendName)." );
+		$this->assertEquals( true, $this->backend->fileExists( array( 'src' => $source ) ),
+			"Source file $source still exists ($backendName)." );
+		$this->assertEquals( true, $this->backend->fileExists( array( 'src' => $dest ) ),
+			"Destination file $dest exists after copy ($backendName)." );
+
+		$this->assertEquals(
+			$this->backend->getFileSize( array( 'src' => $source ) ),
+			$this->backend->getFileSize( array( 'src' => $dest ) ),
+			"Destination file $dest has correct size ($backendName)." );
+
+		$props1 = $this->backend->getFileProps( array( 'src' => $source ) );
+		$props2 = $this->backend->getFileProps( array( 'src' => $dest ) );
+		$this->assertEquals( $props1, $props2,
+			"Source and destination have the same props ($backendName)." );
+
+		$this->assertBackendPathsConsistent( array( $source, $dest ) );
+	}
+
+	public static function provider_testCopy() {
+		$cases = array();
+
+		$source = self::baseStorePath() . '/unittest-cont1/e/file.txt';
+		$dest = self::baseStorePath() . '/unittest-cont2/a/fileMoved.txt';
+
+		$op = array( 'op' => 'copy', 'src' => $source, 'dst' => $dest );
+		$cases[] = array(
+			$op, // operation
+			$source, // source
+			$dest, // dest
+		);
+
+		$op2 = $op;
+		$op2['overwrite'] = true;
+		$cases[] = array(
+			$op2, // operation
+			$source, // source
+			$dest, // dest
+		);
+
+		$op2 = $op;
+		$op2['overwriteSame'] = true;
+		$cases[] = array(
+			$op2, // operation
+			$source, // source
+			$dest, // dest
+		);
+
+		$op2 = $op;
+		$op2['ignoreMissingSource'] = true;
+		$cases[] = array(
+			$op2, // operation
+			$source, // source
+			$dest, // dest
+		);
+
+		return $cases;
+	}
+
+	/**
+	 * @dataProvider provider_testMove
+	 */
+	public function testMove( $op ) {
+		$this->backend = $this->singleBackend;
+		$this->tearDownFiles();
+		$this->doTestMove( $op );
+		$this->tearDownFiles();
+
+		$this->backend = $this->multiBackend;
+		$this->tearDownFiles();
+		$this->doTestMove( $op );
+		$this->tearDownFiles();
+	}
+
+	private function doTestMove( $op ) {
+		$backendName = $this->backendClass();
+
+		$source = $op['src'];
+		$dest = $op['dst'];
+		$this->prepare( array( 'dir' => dirname( $source ) ) );
+		$this->prepare( array( 'dir' => dirname( $dest ) ) );
+
+		if ( isset( $op['ignoreMissingSource'] ) ) {
+			$status = $this->backend->doOperation( $op );
+			$this->assertGoodStatus( $status,
+				"Move from $source to $dest succeeded without warnings ($backendName)." );
+			$this->assertEquals( array( 0 => true ), $status->success,
+				"Move from $source to $dest has proper 'success' field in Status ($backendName)." );
+			$this->assertEquals( false, $this->backend->fileExists( array( 'src' => $source ) ),
+				"Source file $source does not exist ($backendName)." );
+			$this->assertEquals( false, $this->backend->fileExists( array( 'src' => $dest ) ),
+				"Destination file $dest does not exist ($backendName)." );
+			return; // done
+		}
+
+		$status = $this->backend->doOperation(
+			array( 'op' => 'create', 'content' => 'blahblah', 'dst' => $source ) );
+		$this->assertGoodStatus( $status,
+			"Creation of file at $source succeeded ($backendName)." );
+
+		if ( isset( $op['overwrite'] ) || isset( $op['overwriteSame'] ) ) {
+			$this->backend->copy( $op );
+		}
+
+		$status = $this->backend->doOperation( $op );
+		$this->assertGoodStatus( $status,
+			"Move from $source to $dest succeeded without warnings ($backendName)." );
+		$this->assertEquals( true, $status->isOK(),
+			"Move from $source to $dest succeeded ($backendName)." );
+		$this->assertEquals( array( 0 => true ), $status->success,
+			"Move from $source to $dest has proper 'success' field in Status ($backendName)." );
+		$this->assertEquals( false, $this->backend->fileExists( array( 'src' => $source ) ),
+			"Source file $source does not still exists ($backendName)." );
+		$this->assertEquals( true, $this->backend->fileExists( array( 'src' => $dest ) ),
+			"Destination file $dest exists after move ($backendName)." );
+
+		$this->assertNotEquals(
+			$this->backend->getFileSize( array( 'src' => $source ) ),
+			$this->backend->getFileSize( array( 'src' => $dest ) ),
+			"Destination file $dest has correct size ($backendName)." );
+
+		$props1 = $this->backend->getFileProps( array( 'src' => $source ) );
+		$props2 = $this->backend->getFileProps( array( 'src' => $dest ) );
+		$this->assertEquals( false, $props1['fileExists'],
+			"Source file does not exist accourding to props ($backendName)." );
+		$this->assertEquals( true, $props2['fileExists'],
+			"Destination file exists accourding to props ($backendName)." );
+
+		$this->assertBackendPathsConsistent( array( $source, $dest ) );
+	}
+
+	public static function provider_testMove() {
+		$cases = array();
+
+		$source = self::baseStorePath() . '/unittest-cont1/e/file.txt';
+		$dest = self::baseStorePath() . '/unittest-cont2/a/fileMoved.txt';
+
+		$op = array( 'op' => 'move', 'src' => $source, 'dst' => $dest );
+		$cases[] = array(
+			$op, // operation
+			$source, // source
+			$dest, // dest
+		);
+
+		$op2 = $op;
+		$op2['overwrite'] = true;
+		$cases[] = array(
+			$op2, // operation
+			$source, // source
+			$dest, // dest
+		);
+
+		$op2 = $op;
+		$op2['overwriteSame'] = true;
+		$cases[] = array(
+			$op2, // operation
+			$source, // source
+			$dest, // dest
+		);
+
+		$op2 = $op;
+		$op2['ignoreMissingSource'] = true;
+		$cases[] = array(
+			$op2, // operation
+			$source, // source
+			$dest, // dest
+		);
+
+		return $cases;
+	}
+
+	/**
+	 * @dataProvider provider_testDelete
+	 */
+	public function testDelete( $op, $withSource, $okStatus ) {
+		$this->backend = $this->singleBackend;
+		$this->tearDownFiles();
+		$this->doTestDelete( $op, $withSource, $okStatus );
+		$this->tearDownFiles();
+
+		$this->backend = $this->multiBackend;
+		$this->tearDownFiles();
+		$this->doTestDelete( $op, $withSource, $okStatus );
+		$this->tearDownFiles();
+	}
+
+	private function doTestDelete( $op, $withSource, $okStatus ) {
+		$backendName = $this->backendClass();
+
+		$source = $op['src'];
+		$this->prepare( array( 'dir' => dirname( $source ) ) );
+
+		if ( $withSource ) {
+			$status = $this->backend->doOperation(
+				array( 'op' => 'create', 'content' => 'blahblah', 'dst' => $source ) );
+			$this->assertGoodStatus( $status,
+				"Creation of file at $source succeeded ($backendName)." );
+		}
+
+		$status = $this->backend->doOperation( $op );
+		if ( $okStatus ) {
+			$this->assertGoodStatus( $status,
+				"Deletion of file at $source succeeded without warnings ($backendName)." );
+			$this->assertEquals( true, $status->isOK(),
+				"Deletion of file at $source succeeded ($backendName)." );
+			$this->assertEquals( array( 0 => true ), $status->success,
+				"Deletion of file at $source has proper 'success' field in Status ($backendName)." );
+		} else {
+			$this->assertEquals( false, $status->isOK(),
+				"Deletion of file at $source failed ($backendName)." );
+		}
+
+		$this->assertEquals( false, $this->backend->fileExists( array( 'src' => $source ) ),
+			"Source file $source does not exist after move ($backendName)." );
+
+		$this->assertFalse(
+			$this->backend->getFileSize( array( 'src' => $source ) ),
+			"Source file $source has correct size (false) ($backendName)." );
+
+		$props1 = $this->backend->getFileProps( array( 'src' => $source ) );
+		$this->assertFalse( $props1['fileExists'],
+			"Source file $source does not exist according to props ($backendName)." );
+
+		$this->assertBackendPathsConsistent( array( $source ) );
+	}
+
+	public static function provider_testDelete() {
+		$cases = array();
+
+		$source = self::baseStorePath() . '/unittest-cont1/e/myfacefile.txt';
+
+		$op = array( 'op' => 'delete', 'src' => $source );
+		$cases[] = array(
+			$op, // operation
+			true, // with source
+			true // succeeds
+		);
+
+		$cases[] = array(
+			$op, // operation
+			false, // without source
+			false // fails
+		);
+
+		$op['ignoreMissingSource'] = true;
+		$cases[] = array(
+			$op, // operation
+			false, // without source
+			true // succeeds
+		);
+
+		return $cases;
+	}
+
+	/**
+	 * @dataProvider provider_testCreate
+	 */
+	public function testCreate( $op, $alreadyExists, $okStatus, $newSize ) {
+		$this->backend = $this->singleBackend;
+		$this->tearDownFiles();
+		$this->doTestCreate( $op, $alreadyExists, $okStatus, $newSize );
+		$this->tearDownFiles();
+
+		$this->backend = $this->multiBackend;
+		$this->tearDownFiles();
+		$this->doTestCreate( $op, $alreadyExists, $okStatus, $newSize );
+		$this->tearDownFiles();
+	}
+
+	private function doTestCreate( $op, $alreadyExists, $okStatus, $newSize ) {
+		$backendName = $this->backendClass();
+
+		$dest = $op['dst'];
+		$this->prepare( array( 'dir' => dirname( $dest ) ) );
+
+		$oldText = 'blah...blah...waahwaah';
+		if ( $alreadyExists ) {
+			$status = $this->backend->doOperation(
+				array( 'op' => 'create', 'content' => $oldText, 'dst' => $dest ) );
+			$this->assertGoodStatus( $status,
+				"Creation of file at $dest succeeded ($backendName)." );
+		}
+
+		$status = $this->backend->doOperation( $op );
+		if ( $okStatus ) {
+			$this->assertGoodStatus( $status,
+				"Creation of file at $dest succeeded without warnings ($backendName)." );
+			$this->assertEquals( true, $status->isOK(),
+				"Creation of file at $dest succeeded ($backendName)." );
+			$this->assertEquals( array( 0 => true ), $status->success,
+				"Creation of file at $dest has proper 'success' field in Status ($backendName)." );
+		} else {
+			$this->assertEquals( false, $status->isOK(),
+				"Creation of file at $dest failed ($backendName)." );
+		}
+
+		$this->assertEquals( true, $this->backend->fileExists( array( 'src' => $dest ) ),
+			"Destination file $dest exists after creation ($backendName)." );
+
+		$props1 = $this->backend->getFileProps( array( 'src' => $dest ) );
+		$this->assertEquals( true, $props1['fileExists'],
+			"Destination file $dest exists according to props ($backendName)." );
+		if ( $okStatus ) { // file content is what we saved
+			$this->assertEquals( $newSize, $props1['size'],
+				"Destination file $dest has expected size according to props ($backendName)." );
+			$this->assertEquals( $newSize,
+				$this->backend->getFileSize( array( 'src' => $dest ) ),
+				"Destination file $dest has correct size ($backendName)." );
+		} else { // file content is some other previous text
+			$this->assertEquals( strlen( $oldText ), $props1['size'],
+				"Destination file $dest has original size according to props ($backendName)." );
+			$this->assertEquals( strlen( $oldText ),
+				$this->backend->getFileSize( array( 'src' => $dest ) ),
+				"Destination file $dest has original size according to props ($backendName)." );
+		}
+
+		$this->assertBackendPathsConsistent( array( $dest ) );
+	}
+
+	/**
+	 * @dataProvider provider_testCreate
+	 */
+	public static function provider_testCreate() {
+		$cases = array();
+
+		$dest = self::baseStorePath() . '/unittest-cont2/a/myspacefile.txt';
+
+		$op = array( 'op' => 'create', 'content' => 'test test testing', 'dst' => $dest );
+		$cases[] = array(
+			$op, // operation
+			false, // no dest already exists
+			true, // succeeds
+			strlen( $op['content'] )
+		);
+
+		$op2 = $op;
+		$op2['content'] = "\n";
+		$cases[] = array(
+			$op2, // operation
+			false, // no dest already exists
+			true, // succeeds
+			strlen( $op2['content'] )
+		);
+
+		$op2 = $op;
+		$op2['content'] = "fsf\n waf 3kt";
+		$cases[] = array(
+			$op2, // operation
+			true, // dest already exists
+			false, // fails
+			strlen( $op2['content'] )
+		);
+
+		$op2 = $op;
+		$op2['content'] = "egm'g gkpe gpqg eqwgwqg";
+		$op2['overwrite'] = true;
+		$cases[] = array(
+			$op2, // operation
+			true, // dest already exists
+			true, // succeeds
+			strlen( $op2['content'] )
+		);
+
+		$op2 = $op;
+		$op2['content'] = "39qjmg3-qg";
+		$op2['overwriteSame'] = true;
+		$cases[] = array(
+			$op2, // operation
+			true, // dest already exists
+			false, // succeeds
+			strlen( $op2['content'] )
+		);
+
+		return $cases;
+	}
+
+	public function testDoQuickOperations() {
+		$this->backend = $this->singleBackend;
+		$this->doTestDoQuickOperations();
+		$this->tearDownFiles();
+
+		$this->backend = $this->multiBackend;
+		$this->doTestDoQuickOperations();
+		$this->tearDownFiles();
+	}
+
+	private function doTestDoQuickOperations() {
+		$backendName = $this->backendClass();
+
+		$base = self::baseStorePath();
+		$files = array(
+			"$base/unittest-cont1/e/fileA.a",
+			"$base/unittest-cont1/e/fileB.a",
+			"$base/unittest-cont1/e/fileC.a"
+		);
+		$ops = array();
+		$purgeOps = array();
+		foreach ( $files as $path ) {
+			$status = $this->prepare( array( 'dir' => dirname( $path ) ) );
+			$this->assertGoodStatus( $status,
+				"Preparing $path succeeded without warnings ($backendName)." );
+			$ops[] = array( 'op' => 'create', 'dst' => $path, 'content' => mt_rand(0,50000) );
+			$purgeOps[] = array( 'op' => 'delete', 'src' => $path );
+		}
+		$purgeOps[] = array( 'op' => 'null' );
+		$status = $this->backend->doQuickOperations( $ops );
+		$this->assertGoodStatus( $status,
+			"Creation of source files succeeded ($backendName)." );
+
+		foreach ( $files as $file ) {
+			$this->assertTrue( $this->backend->fileExists( array( 'src' => $file ) ),
+				"File $file exists." );
+		}
+
+		$status = $this->backend->doQuickOperations( $purgeOps );
+		$this->assertGoodStatus( $status,
+			"Quick deletion of source files succeeded ($backendName)." );
+
+		foreach ( $files as $file ) {
+			$this->assertFalse( $this->backend->fileExists( array( 'src' => $file ) ),
+				"File $file purged." );
+		}
+	}
+
+	/**
+	 * @dataProvider provider_testConcatenate
+	 */
+	public function testConcatenate( $op, $srcs, $srcsContent, $alreadyExists, $okStatus ) {
+		$this->filesToPrune[] = $op['dst'];
+
+		$this->backend = $this->singleBackend;
+		$this->tearDownFiles();
+		$this->doTestConcatenate( $op, $srcs, $srcsContent, $alreadyExists, $okStatus );
+		$this->tearDownFiles();
+
+		$this->backend = $this->multiBackend;
+		$this->tearDownFiles();
+		$this->doTestConcatenate( $op, $srcs, $srcsContent, $alreadyExists, $okStatus );
+		$this->filesToPrune[] = $op['dst']; # avoid file leaking
+		$this->tearDownFiles();
+	}
+
+	private function doTestConcatenate( $params, $srcs, $srcsContent, $alreadyExists, $okStatus ) {
+		$backendName = $this->backendClass();
+
+		$expContent = '';
+		// Create sources
+		$ops = array();
+		foreach ( $srcs as $i => $source ) {
+			$this->prepare( array( 'dir' => dirname( $source ) ) );
+			$ops[] = array(
+				'op'      => 'create', // operation
+				'dst'     => $source, // source
+				'content' => $srcsContent[$i]
+			);
+			$expContent .= $srcsContent[$i];
+		}
+		$status = $this->backend->doOperations( $ops );
+
+		$this->assertGoodStatus( $status,
+			"Creation of source files succeeded ($backendName)." );
+
+		$dest = $params['dst'];
+		if ( $alreadyExists ) {
+			$ok = file_put_contents( $dest, 'blah...blah...waahwaah' ) !== false;
+			$this->assertEquals( true, $ok,
+				"Creation of file at $dest succeeded ($backendName)." );
+		} else {
+			$ok = file_put_contents( $dest, '' ) !== false;
+			$this->assertEquals( true, $ok,
+				"Creation of 0-byte file at $dest succeeded ($backendName)." );
+		}
+
+		// Combine the files into one
+		$status = $this->backend->concatenate( $params );
+		if ( $okStatus ) {
+			$this->assertGoodStatus( $status,
+				"Creation of concat file at $dest succeeded without warnings ($backendName)." );
+			$this->assertEquals( true, $status->isOK(),
+				"Creation of concat file at $dest succeeded ($backendName)." );
+		} else {
+			$this->assertEquals( false, $status->isOK(),
+				"Creation of concat file at $dest failed ($backendName)." );
+		}
+
+		if ( $okStatus ) {
+			$this->assertEquals( true, is_file( $dest ),
+				"Dest concat file $dest exists after creation ($backendName)." );
+		} else {
+			$this->assertEquals( true, is_file( $dest ),
+				"Dest concat file $dest exists after failed creation ($backendName)." );
+		}
+
+		$contents = file_get_contents( $dest );
+		$this->assertNotEquals( false, $contents, "File at $dest exists ($backendName)." );
+
+		if ( $okStatus ) {
+			$this->assertEquals( $expContent, $contents,
+				"Concat file at $dest has correct contents ($backendName)." );
+		} else {
+			$this->assertNotEquals( $expContent, $contents,
+				"Concat file at $dest has correct contents ($backendName)." );
+		}
+	}
+
+	function provider_testConcatenate() {
+		$cases = array();
+
+		$rand = mt_rand( 0, 2000000000 ) . time();
+		$dest = wfTempDir() . "/randomfile!$rand.txt";
+		$srcs = array(
+			self::baseStorePath() . '/unittest-cont1/e/file1.txt',
+			self::baseStorePath() . '/unittest-cont1/e/file2.txt',
+			self::baseStorePath() . '/unittest-cont1/e/file3.txt',
+			self::baseStorePath() . '/unittest-cont1/e/file4.txt',
+			self::baseStorePath() . '/unittest-cont1/e/file5.txt',
+			self::baseStorePath() . '/unittest-cont1/e/file6.txt',
+			self::baseStorePath() . '/unittest-cont1/e/file7.txt',
+			self::baseStorePath() . '/unittest-cont1/e/file8.txt',
+			self::baseStorePath() . '/unittest-cont1/e/file9.txt',
+			self::baseStorePath() . '/unittest-cont1/e/file10.txt'
+		);
+		$content = array(
+			'egfage',
+			'ageageag',
+			'rhokohlr',
+			'shgmslkg',
+			'kenga',
+			'owagmal',
+			'kgmae',
+			'g eak;g',
+			'lkaem;a',
+			'legma'
+		);
+		$params = array( 'srcs' => $srcs, 'dst' => $dest );
+
+		$cases[] = array(
+			$params, // operation
+			$srcs, // sources
+			$content, // content for each source
+			false, // no dest already exists
+			true, // succeeds
+		);
+
+		$cases[] = array(
+			$params, // operation
+			$srcs, // sources
+			$content, // content for each source
+			true, // dest already exists
+			false, // succeeds
+		);
+
+		return $cases;
+	}
+
+	/**
+	 * @dataProvider provider_testGetFileStat
+	 */
+	public function testGetFileStat( $path, $content, $alreadyExists ) {
+		$this->backend = $this->singleBackend;
+		$this->tearDownFiles();
+		$this->doTestGetFileStat( $path, $content, $alreadyExists );
+		$this->tearDownFiles();
+
+		$this->backend = $this->multiBackend;
+		$this->tearDownFiles();
+		$this->doTestGetFileStat( $path, $content, $alreadyExists );
+		$this->tearDownFiles();
+	}
+
+	private function doTestGetFileStat( $path, $content, $alreadyExists ) {
+		$backendName = $this->backendClass();
+
+		if ( $alreadyExists ) {
+			$this->prepare( array( 'dir' => dirname( $path ) ) );
+			$status = $this->create( array( 'dst' => $path, 'content' => $content ) );
+			$this->assertGoodStatus( $status,
+				"Creation of file at $path succeeded ($backendName)." );
+
+			$size = $this->backend->getFileSize( array( 'src' => $path ) );
+			$time = $this->backend->getFileTimestamp( array( 'src' => $path ) );
+			$stat = $this->backend->getFileStat( array( 'src' => $path ) );
+
+			$this->assertEquals( strlen( $content ), $size,
+				"Correct file size of '$path'" );
+			$this->assertTrue( abs( time() - wfTimestamp( TS_UNIX, $time ) ) < 10,
+				"Correct file timestamp of '$path'" );
+
+			$size = $stat['size'];
+			$time = $stat['mtime'];
+			$this->assertEquals( strlen( $content ), $size,
+				"Correct file size of '$path'" );
+			$this->assertTrue( abs( time() - wfTimestamp( TS_UNIX, $time ) ) < 10,
+				"Correct file timestamp of '$path'" );
+
+			$this->backend->clearCache( array( $path ) );
+
+			$size = $this->backend->getFileSize( array( 'src' => $path ) );
+
+			$this->assertEquals( strlen( $content ), $size,
+				"Correct file size of '$path'" );
+
+			$this->backend->preloadCache( array( $path ) );
+
+			$size = $this->backend->getFileSize( array( 'src' => $path ) );
+
+			$this->assertEquals( strlen( $content ), $size,
+				"Correct file size of '$path'" );
+		} else {
+			$size = $this->backend->getFileSize( array( 'src' => $path ) );
+			$time = $this->backend->getFileTimestamp( array( 'src' => $path ) );
+			$stat = $this->backend->getFileStat( array( 'src' => $path ) );
+
+			$this->assertFalse( $size, "Correct file size of '$path'" );
+			$this->assertFalse( $time, "Correct file timestamp of '$path'" );
+			$this->assertFalse( $stat, "Correct file stat of '$path'" );
+		}
+	}
+
+	function provider_testGetFileStat() {
+		$cases = array();
+
+		$base = self::baseStorePath();
+		$cases[] = array( "$base/unittest-cont1/e/b/z/some_file.txt", "some file contents", true );
+		$cases[] = array( "$base/unittest-cont1/e/b/some-other_file.txt", "", true );
+		$cases[] = array( "$base/unittest-cont1/e/b/some-diff_file.txt", null, false );
+
+		return $cases;
+	}
+
+	/**
+	 * @dataProvider provider_testGetFileContents
+	 */
+	public function testGetFileContents( $source, $content ) {
+		$this->backend = $this->singleBackend;
+		$this->tearDownFiles();
+		$this->doTestGetFileContents( $source, $content );
+		$this->tearDownFiles();
+
+		$this->backend = $this->multiBackend;
+		$this->tearDownFiles();
+		$this->doTestGetFileContents( $source, $content );
+		$this->tearDownFiles();
+	}
+
+	private function doTestGetFileContents( $source, $content ) {
+		$backendName = $this->backendClass();
+
+		$srcs = (array)$source;
+		$content = (array)$content;
+		foreach ( $srcs as $i => $src ) {
+			$this->prepare( array( 'dir' => dirname( $src ) ) );
+			$status = $this->backend->doOperation(
+				array( 'op' => 'create', 'content' => $content[$i], 'dst' => $src ) );
+			$this->assertGoodStatus( $status,
+				"Creation of file at $src succeeded ($backendName)." );
+		}
+
+		if ( is_array( $source ) ) {
+			$contents = $this->backend->getFileContentsMulti( array( 'srcs' => $source ) );
+			foreach ( $contents as $path => $data ) {
+				$this->assertNotEquals( false, $data, "Contents of $path exists ($backendName)." );
+				$this->assertEquals( current( $content ), $data, "Contents of $path is correct ($backendName)." );
+				next( $content );
+			}
+			$this->assertEquals( $source, array_keys( $contents ), "Contents in right order ($backendName)." );
+			$this->assertEquals( count( $source ), count( $contents ), "Contents array size correct ($backendName)." );
+		} else {
+			$data = $this->backend->getFileContents( array( 'src' => $source ) );
+			$this->assertNotEquals( false, $data, "Contents of $source exists ($backendName)." );
+			$this->assertEquals( $content[0], $data, "Contents of $source is correct ($backendName)." );
+		}
+	}
+
+	function provider_testGetFileContents() {
+		$cases = array();
+
+		$base = self::baseStorePath();
+		$cases[] = array( "$base/unittest-cont1/e/b/z/some_file.txt", "some file contents" );
+		$cases[] = array( "$base/unittest-cont1/e/b/some-other_file.txt", "more file contents" );
+		$cases[] = array(
+			array( "$base/unittest-cont1/e/a/x.txt", "$base/unittest-cont1/e/a/y.txt",
+				 "$base/unittest-cont1/e/a/z.txt" ),
+			array( "contents xx", "contents xy", "contents xz" )
+		);
+
+		return $cases;
+	}
+
+	/**
+	 * @dataProvider provider_testGetLocalCopy
+	 */
+	public function testGetLocalCopy( $source, $content ) {
+		$this->backend = $this->singleBackend;
+		$this->tearDownFiles();
+		$this->doTestGetLocalCopy( $source, $content );
+		$this->tearDownFiles();
+
+		$this->backend = $this->multiBackend;
+		$this->tearDownFiles();
+		$this->doTestGetLocalCopy( $source, $content );
+		$this->tearDownFiles();
+	}
+
+	private function doTestGetLocalCopy( $source, $content ) {
+		$backendName = $this->backendClass();
+
+		$srcs = (array)$source;
+		$content = (array)$content;
+		foreach ( $srcs as $i => $src ) {
+			$this->prepare( array( 'dir' => dirname( $src ) ) );
+			$status = $this->backend->doOperation(
+				array( 'op' => 'create', 'content' => $content[$i], 'dst' => $src ) );
+			$this->assertGoodStatus( $status,
+				"Creation of file at $src succeeded ($backendName)." );
+		}
+
+		if ( is_array( $source ) ) {
+			$tmpFiles = $this->backend->getLocalCopyMulti( array( 'srcs' => $source ) );
+			foreach ( $tmpFiles as $path => $tmpFile ) {
+				$this->assertNotNull( $tmpFile,
+					"Creation of local copy of $path succeeded ($backendName)." );
+				$contents = file_get_contents( $tmpFile->getPath() );
+				$this->assertNotEquals( false, $contents, "Local copy of $path exists ($backendName)." );
+				$this->assertEquals( current( $content ), $contents, "Local copy of $path is correct ($backendName)." );
+				next( $content );
+			}
+			$this->assertEquals( $source, array_keys( $tmpFiles ), "Local copies in right order ($backendName)." );
+			$this->assertEquals( count( $source ), count( $tmpFiles ), "Local copies array size correct ($backendName)." );
+		} else {
+			$tmpFile = $this->backend->getLocalCopy( array( 'src' => $source ) );
+			$this->assertNotNull( $tmpFile,
+				"Creation of local copy of $source succeeded ($backendName)." );
+			$contents = file_get_contents( $tmpFile->getPath() );
+			$this->assertNotEquals( false, $contents, "Local copy of $source exists ($backendName)." );
+			$this->assertEquals( $content[0], $contents, "Local copy of $source is correct ($backendName)." );
+		}
+
+		$obj = new stdClass();
+		$tmpFile->bind( $obj );
+	}
+
+	function provider_testGetLocalCopy() {
+		$cases = array();
+
+		$base = self::baseStorePath();
+		$cases[] = array( "$base/unittest-cont1/e/a/z/some_file.txt", "some file contents" );
+		$cases[] = array( "$base/unittest-cont1/e/a/some-other_file.txt", "more file contents" );
+		$cases[] = array( "$base/unittest-cont1/e/a/\$odd&.txt", "test file contents" );
+		$cases[] = array(
+			array( "$base/unittest-cont1/e/a/x.txt", "$base/unittest-cont1/e/a/y.txt",
+				 "$base/unittest-cont1/e/a/z.txt" ),
+			array( "contents xx", "contents xy", "contents xz" )
+		);
+
+		return $cases;
+	}
+
+	/**
+	 * @dataProvider provider_testGetLocalReference
+	 */
+	public function testGetLocalReference( $source, $content ) {
+		$this->backend = $this->singleBackend;
+		$this->tearDownFiles();
+		$this->doTestGetLocalReference( $source, $content );
+		$this->tearDownFiles();
+
+		$this->backend = $this->multiBackend;
+		$this->tearDownFiles();
+		$this->doTestGetLocalReference( $source, $content );
+		$this->tearDownFiles();
+	}
+
+	private function doTestGetLocalReference( $source, $content ) {
+		$backendName = $this->backendClass();
+
+		$srcs = (array)$source;
+		$content = (array)$content;
+		foreach ( $srcs as $i => $src ) {
+			$this->prepare( array( 'dir' => dirname( $src ) ) );
+			$status = $this->backend->doOperation(
+				array( 'op' => 'create', 'content' => $content[$i], 'dst' => $src ) );
+			$this->assertGoodStatus( $status,
+				"Creation of file at $src succeeded ($backendName)." );
+		}
+
+		if ( is_array( $source ) ) {
+			$tmpFiles = $this->backend->getLocalReferenceMulti( array( 'srcs' => $source ) );
+			foreach ( $tmpFiles as $path => $tmpFile ) {
+				$this->assertNotNull( $tmpFile,
+					"Creation of local copy of $path succeeded ($backendName)." );
+				$contents = file_get_contents( $tmpFile->getPath() );
+				$this->assertNotEquals( false, $contents, "Local ref of $path exists ($backendName)." );
+				$this->assertEquals( current( $content ), $contents, "Local ref of $path is correct ($backendName)." );
+				next( $content );
+			}
+			$this->assertEquals( $source, array_keys( $tmpFiles ), "Local refs in right order ($backendName)." );
+			$this->assertEquals( count( $source ), count( $tmpFiles ), "Local refs array size correct ($backendName)." );
+		} else {
+			$tmpFile = $this->backend->getLocalReference( array( 'src' => $source ) );
+			$this->assertNotNull( $tmpFile,
+				"Creation of local copy of $source succeeded ($backendName)." );
+			$contents = file_get_contents( $tmpFile->getPath() );
+			$this->assertNotEquals( false, $contents, "Local ref of $source exists ($backendName)." );
+			$this->assertEquals( $content[0], $contents, "Local ref of $source is correct ($backendName)." );
+		}
+	}
+
+	function provider_testGetLocalReference() {
+		$cases = array();
+
+		$base = self::baseStorePath();
+		$cases[] = array( "$base/unittest-cont1/e/a/z/some_file.txt", "some file contents" );
+		$cases[] = array( "$base/unittest-cont1/e/a/some-other_file.txt", "more file contents" );
+		$cases[] = array( "$base/unittest-cont1/e/a/\$odd&.txt", "test file contents" );
+		$cases[] = array(
+			array( "$base/unittest-cont1/e/a/x.txt", "$base/unittest-cont1/e/a/y.txt",
+				 "$base/unittest-cont1/e/a/z.txt" ),
+			array( "contents xx", "contents xy", "contents xz" )
+		);
+
+		return $cases;
+	}
+
+	public function testGetLocalCopyAndReference404() {
+		$this->backend = $this->singleBackend;
+		$this->tearDownFiles();
+		$this->doTestGetLocalCopyAndReference404();
+		$this->tearDownFiles();
+
+		$this->backend = $this->multiBackend;
+		$this->tearDownFiles();
+		$this->doTestGetLocalCopyAndReference404();
+		$this->tearDownFiles();
+	}
+
+	public function doTestGetLocalCopyAndReference404() {
+		$backendName = $this->backendClass();
+
+		$base = self::baseStorePath();
+
+		$tmpFile = $this->backend->getLocalCopy( array(
+			'src' => "$base/unittest-cont1/not-there" ) );
+		$this->assertEquals( null, $tmpFile, "Local copy of not existing file is null ($backendName)." );
+
+		$tmpFile = $this->backend->getLocalReference( array(
+			'src' => "$base/unittest-cont1/not-there" ) );
+		$this->assertEquals( null, $tmpFile, "Local ref of not existing file is null ($backendName)." );
+	}
+
+	/**
+	 * @dataProvider provider_testGetFileHttpUrl
+	 */
+	public function testGetFileHttpUrl( $source, $content ) {
+		$this->backend = $this->singleBackend;
+		$this->tearDownFiles();
+		$this->doTestGetFileHttpUrl( $source, $content );
+		$this->tearDownFiles();
+
+		$this->backend = $this->multiBackend;
+		$this->tearDownFiles();
+		$this->doTestGetFileHttpUrl( $source, $content );
+		$this->tearDownFiles();
+	}
+
+	private function doTestGetFileHttpUrl( $source, $content ) {
+		$backendName = $this->backendClass();
+
+		$this->prepare( array( 'dir' => dirname( $source ) ) );
+		$status = $this->backend->doOperation(
+			array( 'op' => 'create', 'content' => $content, 'dst' => $source ) );
+		$this->assertGoodStatus( $status,
+			"Creation of file at $source succeeded ($backendName)." );
+
+		$url = $this->backend->getFileHttpUrl( array( 'src' => $source ) );
+
+		if ( $url !== null ) { // supported
+			$data = Http::request( "GET", $url );
+			$this->assertEquals( $content, $data,
+				"HTTP GET of URL has right contents ($backendName)." );
+		}
+	}
+
+	function provider_testGetFileHttpUrl() {
+		$cases = array();
+
+		$base = self::baseStorePath();
+		$cases[] = array( "$base/unittest-cont1/e/a/z/some_file.txt", "some file contents" );
+		$cases[] = array( "$base/unittest-cont1/e/a/some-other_file.txt", "more file contents" );
+		$cases[] = array( "$base/unittest-cont1/e/a/\$odd&.txt", "test file contents" );
+
+		return $cases;
+	}
+
+	/**
+	 * @dataProvider provider_testPrepareAndClean
+	 */
+	public function testPrepareAndClean( $path, $isOK ) {
+		$this->backend = $this->singleBackend;
+		$this->doTestPrepareAndClean( $path, $isOK );
+		$this->tearDownFiles();
+
+		$this->backend = $this->multiBackend;
+		$this->doTestPrepareAndClean( $path, $isOK );
+		$this->tearDownFiles();
+	}
+
+	function provider_testPrepareAndClean() {
+		$base = self::baseStorePath();
+		return array(
+			array( "$base/unittest-cont1/e/a/z/some_file1.txt", true ),
+			array( "$base/unittest-cont2/a/z/some_file2.txt", true ),
+			# Specific to FS backend with no basePath field set
+			#array( "$base/unittest-cont3/a/z/some_file3.txt", false ),
+		);
+	}
+
+	private function doTestPrepareAndClean( $path, $isOK ) {
+		$backendName = $this->backendClass();
+
+		$status = $this->prepare( array( 'dir' => dirname( $path ) ) );
+		if ( $isOK ) {
+			$this->assertGoodStatus( $status,
+				"Preparing dir $path succeeded without warnings ($backendName)." );
+			$this->assertEquals( true, $status->isOK(),
+				"Preparing dir $path succeeded ($backendName)." );
+		} else {
+			$this->assertEquals( false, $status->isOK(),
+				"Preparing dir $path failed ($backendName)." );
+		}
+
+		$status = $this->backend->clean( array( 'dir' => dirname( $path ) ) );
+		if ( $isOK ) {
+			$this->assertGoodStatus( $status,
+				"Cleaning dir $path succeeded without warnings ($backendName)." );
+			$this->assertEquals( true, $status->isOK(),
+				"Cleaning dir $path succeeded ($backendName)." );
+		} else {
+			$this->assertEquals( false, $status->isOK(),
+				"Cleaning dir $path failed ($backendName)." );
+		}
+	}
+
+	public function testRecursiveClean() {
+		$this->backend = $this->singleBackend;
+		$this->doTestRecursiveClean();
+		$this->tearDownFiles();
+
+		$this->backend = $this->multiBackend;
+		$this->doTestRecursiveClean();
+		$this->tearDownFiles();
+	}
+
+	private function doTestRecursiveClean() {
+		$backendName = $this->backendClass();
+
+		$base = self::baseStorePath();
+		$dirs = array(
+			"$base/unittest-cont1/e/a",
+			"$base/unittest-cont1/e/a/b",
+			"$base/unittest-cont1/e/a/b/c",
+			"$base/unittest-cont1/e/a/b/c/d0",
+			"$base/unittest-cont1/e/a/b/c/d1",
+			"$base/unittest-cont1/e/a/b/c/d2",
+			"$base/unittest-cont1/e/a/b/c/d0/1",
+			"$base/unittest-cont1/e/a/b/c/d0/2",
+			"$base/unittest-cont1/e/a/b/c/d1/3",
+			"$base/unittest-cont1/e/a/b/c/d1/4",
+			"$base/unittest-cont1/e/a/b/c/d2/5",
+			"$base/unittest-cont1/e/a/b/c/d2/6"
+		);
+		foreach ( $dirs as $dir ) {
+			$status = $this->prepare( array( 'dir' => $dir ) );
+			$this->assertGoodStatus( $status,
+				"Preparing dir $dir succeeded without warnings ($backendName)." );
+		}
+
+		if ( $this->backend instanceof FSFileBackend ) {
+			foreach ( $dirs as $dir ) {
+				$this->assertEquals( true, $this->backend->directoryExists( array( 'dir' => $dir ) ),
+					"Dir $dir exists ($backendName)." );
+			}
+		}
+
+		$status = $this->backend->clean(
+			array( 'dir' => "$base/unittest-cont1", 'recursive' => 1 ) );
+		$this->assertGoodStatus( $status,
+			"Recursive cleaning of dir $dir succeeded without warnings ($backendName)." );
+
+		foreach ( $dirs as $dir ) {
+			$this->assertEquals( false, $this->backend->directoryExists( array( 'dir' => $dir ) ),
+				"Dir $dir no longer exists ($backendName)." );
+		}
+	}
+
+	// @TODO: testSecure
+
+	public function testDoOperations() {
+		$this->backend = $this->singleBackend;
+		$this->tearDownFiles();
+		$this->doTestDoOperations();
+		$this->tearDownFiles();
+
+		$this->backend = $this->multiBackend;
+		$this->tearDownFiles();
+		$this->doTestDoOperations();
+		$this->tearDownFiles();
+	}
+
+	private function doTestDoOperations() {
+		$base = self::baseStorePath();
+
+		$fileA = "$base/unittest-cont1/e/a/b/fileA.txt";
+		$fileAContents = '3tqtmoeatmn4wg4qe-mg3qt3 tq';
+		$fileB = "$base/unittest-cont1/e/a/b/fileB.txt";
+		$fileBContents = 'g-jmq3gpqgt3qtg q3GT ';
+		$fileC = "$base/unittest-cont1/e/a/b/fileC.txt";
+		$fileCContents = 'eigna[ogmewt 3qt g3qg flew[ag';
+		$fileD = "$base/unittest-cont1/e/a/b/fileD.txt";
+
+		$this->prepare( array( 'dir' => dirname( $fileA ) ) );
+		$this->create( array( 'dst' => $fileA, 'content' => $fileAContents ) );
+		$this->prepare( array( 'dir' => dirname( $fileB ) ) );
+		$this->create( array( 'dst' => $fileB, 'content' => $fileBContents ) );
+		$this->prepare( array( 'dir' => dirname( $fileC ) ) );
+		$this->create( array( 'dst' => $fileC, 'content' => $fileCContents ) );
+		$this->prepare( array( 'dir' => dirname( $fileD ) ) );
+
+		$status = $this->backend->doOperations( array(
+			array( 'op' => 'copy', 'src' => $fileA, 'dst' => $fileC, 'overwrite' => 1 ),
+			// Now: A:<A>, B:<B>, C:<A>, D:<empty> (file:<orginal contents>)
+			array( 'op' => 'copy', 'src' => $fileC, 'dst' => $fileA, 'overwriteSame' => 1 ),
+			// Now: A:<A>, B:<B>, C:<A>, D:<empty>
+			array( 'op' => 'move', 'src' => $fileC, 'dst' => $fileD, 'overwrite' => 1 ),
+			// Now: A:<A>, B:<B>, C:<empty>, D:<A>
+			array( 'op' => 'move', 'src' => $fileB, 'dst' => $fileC ),
+			// Now: A:<A>, B:<empty>, C:<B>, D:<A>
+			array( 'op' => 'move', 'src' => $fileD, 'dst' => $fileA, 'overwriteSame' => 1 ),
+			// Now: A:<A>, B:<empty>, C:<B>, D:<empty>
+			array( 'op' => 'move', 'src' => $fileC, 'dst' => $fileA, 'overwrite' => 1 ),
+			// Now: A:<B>, B:<empty>, C:<empty>, D:<empty>
+			array( 'op' => 'copy', 'src' => $fileA, 'dst' => $fileC ),
+			// Now: A:<B>, B:<empty>, C:<B>, D:<empty>
+			array( 'op' => 'move', 'src' => $fileA, 'dst' => $fileC, 'overwriteSame' => 1 ),
+			// Now: A:<empty>, B:<empty>, C:<B>, D:<empty>
+			array( 'op' => 'copy', 'src' => $fileC, 'dst' => $fileC, 'overwrite' => 1 ),
+			// Does nothing
+			array( 'op' => 'copy', 'src' => $fileC, 'dst' => $fileC, 'overwriteSame' => 1 ),
+			// Does nothing
+			array( 'op' => 'move', 'src' => $fileC, 'dst' => $fileC, 'overwrite' => 1 ),
+			// Does nothing
+			array( 'op' => 'move', 'src' => $fileC, 'dst' => $fileC, 'overwriteSame' => 1 ),
+			// Does nothing
+			array( 'op' => 'null' ),
+			// Does nothing
+		) );
+
+		$this->assertGoodStatus( $status, "Operation batch succeeded" );
+		$this->assertEquals( true, $status->isOK(), "Operation batch succeeded" );
+		$this->assertEquals( 13, count( $status->success ),
+			"Operation batch has correct success array" );
+
+		$this->assertEquals( false, $this->backend->fileExists( array( 'src' => $fileA ) ),
+			"File does not exist at $fileA" );
+		$this->assertEquals( false, $this->backend->fileExists( array( 'src' => $fileB ) ),
+			"File does not exist at $fileB" );
+		$this->assertEquals( false, $this->backend->fileExists( array( 'src' => $fileD ) ),
+			"File does not exist at $fileD" );
+
+		$this->assertEquals( true, $this->backend->fileExists( array( 'src' => $fileC ) ),
+			"File exists at $fileC" );
+		$this->assertEquals( $fileBContents,
+			$this->backend->getFileContents( array( 'src' => $fileC ) ),
+			"Correct file contents of $fileC" );
+		$this->assertEquals( strlen( $fileBContents ),
+			$this->backend->getFileSize( array( 'src' => $fileC ) ),
+			"Correct file size of $fileC" );
+		$this->assertEquals( wfBaseConvert( sha1( $fileBContents ), 16, 36, 31 ),
+			$this->backend->getFileSha1Base36( array( 'src' => $fileC ) ),
+			"Correct file SHA-1 of $fileC" );
+	}
+
+	public function testDoOperationsPipeline() {
+		$this->backend = $this->singleBackend;
+		$this->tearDownFiles();
+		$this->doTestDoOperationsPipeline();
+		$this->tearDownFiles();
+
+		$this->backend = $this->multiBackend;
+		$this->tearDownFiles();
+		$this->doTestDoOperationsPipeline();
+		$this->tearDownFiles();
+	}
+
+	// concurrency orientated
+	private function doTestDoOperationsPipeline() {
+		$base = self::baseStorePath();
+
+		$fileAContents = '3tqtmoeatmn4wg4qe-mg3qt3 tq';
+		$fileBContents = 'g-jmq3gpqgt3qtg q3GT ';
+		$fileCContents = 'eigna[ogmewt 3qt g3qg flew[ag';
+
+		$tmpNameA = TempFSFile::factory( "unittests_", 'txt' )->getPath();
+		file_put_contents( $tmpNameA, $fileAContents );
+		$tmpNameB = TempFSFile::factory( "unittests_", 'txt' )->getPath();
+		file_put_contents( $tmpNameB, $fileBContents );
+		$tmpNameC = TempFSFile::factory( "unittests_", 'txt' )->getPath();
+		file_put_contents( $tmpNameC, $fileCContents );
+
+		$this->filesToPrune[] = $tmpNameA; # avoid file leaking
+		$this->filesToPrune[] = $tmpNameB; # avoid file leaking
+		$this->filesToPrune[] = $tmpNameC; # avoid file leaking
+
+		$fileA = "$base/unittest-cont1/e/a/b/fileA.txt";
+		$fileB = "$base/unittest-cont1/e/a/b/fileB.txt";
+		$fileC = "$base/unittest-cont1/e/a/b/fileC.txt";
+		$fileD = "$base/unittest-cont1/e/a/b/fileD.txt";
+
+		$this->prepare( array( 'dir' => dirname( $fileA ) ) );
+		$this->create( array( 'dst' => $fileA, 'content' => $fileAContents ) );
+		$this->prepare( array( 'dir' => dirname( $fileB ) ) );
+		$this->prepare( array( 'dir' => dirname( $fileC ) ) );
+		$this->prepare( array( 'dir' => dirname( $fileD ) ) );
+
+		$status = $this->backend->doOperations( array(
+			array( 'op' => 'store', 'src' => $tmpNameA, 'dst' => $fileA, 'overwriteSame' => 1 ),
+			array( 'op' => 'store', 'src' => $tmpNameB, 'dst' => $fileB, 'overwrite' => 1 ),
+			array( 'op' => 'store', 'src' => $tmpNameC, 'dst' => $fileC, 'overwrite' => 1 ),
+			array( 'op' => 'copy', 'src' => $fileA, 'dst' => $fileC, 'overwrite' => 1 ),
+			// Now: A:<A>, B:<B>, C:<A>, D:<empty> (file:<orginal contents>)
+			array( 'op' => 'copy', 'src' => $fileC, 'dst' => $fileA, 'overwriteSame' => 1 ),
+			// Now: A:<A>, B:<B>, C:<A>, D:<empty>
+			array( 'op' => 'move', 'src' => $fileC, 'dst' => $fileD, 'overwrite' => 1 ),
+			// Now: A:<A>, B:<B>, C:<empty>, D:<A>
+			array( 'op' => 'move', 'src' => $fileB, 'dst' => $fileC ),
+			// Now: A:<A>, B:<empty>, C:<B>, D:<A>
+			array( 'op' => 'move', 'src' => $fileD, 'dst' => $fileA, 'overwriteSame' => 1 ),
+			// Now: A:<A>, B:<empty>, C:<B>, D:<empty>
+			array( 'op' => 'move', 'src' => $fileC, 'dst' => $fileA, 'overwrite' => 1 ),
+			// Now: A:<B>, B:<empty>, C:<empty>, D:<empty>
+			array( 'op' => 'copy', 'src' => $fileA, 'dst' => $fileC ),
+			// Now: A:<B>, B:<empty>, C:<B>, D:<empty>
+			array( 'op' => 'move', 'src' => $fileA, 'dst' => $fileC, 'overwriteSame' => 1 ),
+			// Now: A:<empty>, B:<empty>, C:<B>, D:<empty>
+			array( 'op' => 'copy', 'src' => $fileC, 'dst' => $fileC, 'overwrite' => 1 ),
+			// Does nothing
+			array( 'op' => 'copy', 'src' => $fileC, 'dst' => $fileC, 'overwriteSame' => 1 ),
+			// Does nothing
+			array( 'op' => 'move', 'src' => $fileC, 'dst' => $fileC, 'overwrite' => 1 ),
+			// Does nothing
+			array( 'op' => 'move', 'src' => $fileC, 'dst' => $fileC, 'overwriteSame' => 1 ),
+			// Does nothing
+			array( 'op' => 'null' ),
+			// Does nothing
+		) );
+
+		$this->assertGoodStatus( $status, "Operation batch succeeded" );
+		$this->assertEquals( true, $status->isOK(), "Operation batch succeeded" );
+		$this->assertEquals( 16, count( $status->success ),
+			"Operation batch has correct success array" );
+
+		$this->assertEquals( false, $this->backend->fileExists( array( 'src' => $fileA ) ),
+			"File does not exist at $fileA" );
+		$this->assertEquals( false, $this->backend->fileExists( array( 'src' => $fileB ) ),
+			"File does not exist at $fileB" );
+		$this->assertEquals( false, $this->backend->fileExists( array( 'src' => $fileD ) ),
+			"File does not exist at $fileD" );
+
+		$this->assertEquals( true, $this->backend->fileExists( array( 'src' => $fileC ) ),
+			"File exists at $fileC" );
+		$this->assertEquals( $fileBContents,
+			$this->backend->getFileContents( array( 'src' => $fileC ) ),
+			"Correct file contents of $fileC" );
+		$this->assertEquals( strlen( $fileBContents ),
+			$this->backend->getFileSize( array( 'src' => $fileC ) ),
+			"Correct file size of $fileC" );
+		$this->assertEquals( wfBaseConvert( sha1( $fileBContents ), 16, 36, 31 ),
+			$this->backend->getFileSha1Base36( array( 'src' => $fileC ) ),
+			"Correct file SHA-1 of $fileC" );
+	}
+
+	public function testDoOperationsFailing() {
+		$this->backend = $this->singleBackend;
+		$this->tearDownFiles();
+		$this->doTestDoOperationsFailing();
+		$this->tearDownFiles();
+
+		$this->backend = $this->multiBackend;
+		$this->tearDownFiles();
+		$this->doTestDoOperationsFailing();
+		$this->tearDownFiles();
+	}
+
+	private function doTestDoOperationsFailing() {
+		$base = self::baseStorePath();
+
+		$fileA = "$base/unittest-cont2/a/b/fileA.txt";
+		$fileAContents = '3tqtmoeatmn4wg4qe-mg3qt3 tq';
+		$fileB = "$base/unittest-cont2/a/b/fileB.txt";
+		$fileBContents = 'g-jmq3gpqgt3qtg q3GT ';
+		$fileC = "$base/unittest-cont2/a/b/fileC.txt";
+		$fileCContents = 'eigna[ogmewt 3qt g3qg flew[ag';
+		$fileD = "$base/unittest-cont2/a/b/fileD.txt";
+
+		$this->prepare( array( 'dir' => dirname( $fileA ) ) );
+		$this->create( array( 'dst' => $fileA, 'content' => $fileAContents ) );
+		$this->prepare( array( 'dir' => dirname( $fileB ) ) );
+		$this->create( array( 'dst' => $fileB, 'content' => $fileBContents ) );
+		$this->prepare( array( 'dir' => dirname( $fileC ) ) );
+		$this->create( array( 'dst' => $fileC, 'content' => $fileCContents ) );
+
+		$status = $this->backend->doOperations( array(
+			array( 'op' => 'copy', 'src' => $fileA, 'dst' => $fileC, 'overwrite' => 1 ),
+			// Now: A:<A>, B:<B>, C:<A>, D:<empty> (file:<orginal contents>)
+			array( 'op' => 'copy', 'src' => $fileC, 'dst' => $fileA, 'overwriteSame' => 1 ),
+			// Now: A:<A>, B:<B>, C:<A>, D:<empty>
+			array( 'op' => 'copy', 'src' => $fileB, 'dst' => $fileD, 'overwrite' => 1 ),
+			// Now: A:<A>, B:<B>, C:<A>, D:<B>
+			array( 'op' => 'move', 'src' => $fileC, 'dst' => $fileD ),
+			// Now: A:<A>, B:<B>, C:<A>, D:<empty> (failed)
+			array( 'op' => 'move', 'src' => $fileB, 'dst' => $fileC, 'overwriteSame' => 1 ),
+			// Now: A:<A>, B:<B>, C:<A>, D:<empty> (failed)
+			array( 'op' => 'move', 'src' => $fileB, 'dst' => $fileA, 'overwrite' => 1 ),
+			// Now: A:<B>, B:<empty>, C:<A>, D:<empty>
+			array( 'op' => 'delete', 'src' => $fileD ),
+			// Now: A:<B>, B:<empty>, C:<A>, D:<empty>
+			array( 'op' => 'null' ),
+			// Does nothing
+		), array( 'force' => 1 ) );
+
+		$this->assertNotEquals( array(), $status->errors, "Operation had warnings" );
+		$this->assertEquals( true, $status->isOK(), "Operation batch succeeded" );
+		$this->assertEquals( 8, count( $status->success ),
+			"Operation batch has correct success array" );
+
+		$this->assertEquals( false, $this->backend->fileExists( array( 'src' => $fileB ) ),
+			"File does not exist at $fileB" );
+		$this->assertEquals( false, $this->backend->fileExists( array( 'src' => $fileD ) ),
+			"File does not exist at $fileD" );
+
+		$this->assertEquals( true, $this->backend->fileExists( array( 'src' => $fileA ) ),
+			"File does not exist at $fileA" );
+		$this->assertEquals( true, $this->backend->fileExists( array( 'src' => $fileC ) ),
+			"File exists at $fileC" );
+		$this->assertEquals( $fileBContents,
+			$this->backend->getFileContents( array( 'src' => $fileA ) ),
+			"Correct file contents of $fileA" );
+		$this->assertEquals( strlen( $fileBContents ),
+			$this->backend->getFileSize( array( 'src' => $fileA ) ),
+			"Correct file size of $fileA" );
+		$this->assertEquals( wfBaseConvert( sha1( $fileBContents ), 16, 36, 31 ),
+			$this->backend->getFileSha1Base36( array( 'src' => $fileA ) ),
+			"Correct file SHA-1 of $fileA" );
+	}
+
+	public function testGetFileList() {
+		$this->backend = $this->singleBackend;
+		$this->tearDownFiles();
+		$this->doTestGetFileList();
+		$this->tearDownFiles();
+
+		$this->backend = $this->multiBackend;
+		$this->tearDownFiles();
+		$this->doTestGetFileList();
+		$this->tearDownFiles();
+	}
+
+	private function doTestGetFileList() {
+		$backendName = $this->backendClass();
+		$base = self::baseStorePath();
+
+		// Should have no errors
+		$iter = $this->backend->getFileList( array( 'dir' => "$base/unittest-cont-notexists" ) );
+
+		$files = array(
+			"$base/unittest-cont1/e/test1.txt",
+			"$base/unittest-cont1/e/test2.txt",
+			"$base/unittest-cont1/e/test3.txt",
+			"$base/unittest-cont1/e/subdir1/test1.txt",
+			"$base/unittest-cont1/e/subdir1/test2.txt",
+			"$base/unittest-cont1/e/subdir2/test3.txt",
+			"$base/unittest-cont1/e/subdir2/test4.txt",
+			"$base/unittest-cont1/e/subdir2/subdir/test1.txt",
+			"$base/unittest-cont1/e/subdir2/subdir/test2.txt",
+			"$base/unittest-cont1/e/subdir2/subdir/test3.txt",
+			"$base/unittest-cont1/e/subdir2/subdir/test4.txt",
+			"$base/unittest-cont1/e/subdir2/subdir/test5.txt",
+			"$base/unittest-cont1/e/subdir2/subdir/sub/test0.txt",
+			"$base/unittest-cont1/e/subdir2/subdir/sub/120-px-file.txt",
+		);
+
+		// Add the files
+		$ops = array();
+		foreach ( $files as $file ) {
+			$this->prepare( array( 'dir' => dirname( $file ) ) );
+			$ops[] = array( 'op' => 'create', 'content' => 'xxy', 'dst' => $file );
+		}
+		$status = $this->backend->doQuickOperations( $ops );
+		$this->assertGoodStatus( $status,
+			"Creation of files succeeded ($backendName)." );
+		$this->assertEquals( true, $status->isOK(),
+			"Creation of files succeeded with OK status ($backendName)." );
+
+		// Expected listing
+		$expected = array(
+			"e/test1.txt",
+			"e/test2.txt",
+			"e/test3.txt",
+			"e/subdir1/test1.txt",
+			"e/subdir1/test2.txt",
+			"e/subdir2/test3.txt",
+			"e/subdir2/test4.txt",
+			"e/subdir2/subdir/test1.txt",
+			"e/subdir2/subdir/test2.txt",
+			"e/subdir2/subdir/test3.txt",
+			"e/subdir2/subdir/test4.txt",
+			"e/subdir2/subdir/test5.txt",
+			"e/subdir2/subdir/sub/test0.txt",
+			"e/subdir2/subdir/sub/120-px-file.txt",
+		);
+		sort( $expected );
+
+		// Actual listing (no trailing slash)
+		$list = array();
+		$iter = $this->backend->getFileList( array( 'dir' => "$base/unittest-cont1" ) );
+		foreach ( $iter as $file ) {
+			$list[] = $file;
+		}
+		sort( $list );
+
+		$this->assertEquals( $expected, $list, "Correct file listing ($backendName)." );
+
+		// Actual listing (with trailing slash)
+		$list = array();
+		$iter = $this->backend->getFileList( array( 'dir' => "$base/unittest-cont1/" ) );
+		foreach ( $iter as $file ) {
+			$list[] = $file;
+		}
+		sort( $list );
+
+		$this->assertEquals( $expected, $list, "Correct file listing ($backendName)." );
+
+		// Expected listing
+		$expected = array(
+			"test1.txt",
+			"test2.txt",
+			"test3.txt",
+			"test4.txt",
+			"test5.txt",
+			"sub/test0.txt",
+			"sub/120-px-file.txt",
+		);
+		sort( $expected );
+
+		// Actual listing (no trailing slash)
+		$list = array();
+		$iter = $this->backend->getFileList( array( 'dir' => "$base/unittest-cont1/e/subdir2/subdir" ) );
+		foreach ( $iter as $file ) {
+			$list[] = $file;
+		}
+		sort( $list );
+
+		$this->assertEquals( $expected, $list, "Correct file listing ($backendName)." );
+
+		// Actual listing (with trailing slash)
+		$list = array();
+		$iter = $this->backend->getFileList( array( 'dir' => "$base/unittest-cont1/e/subdir2/subdir/" ) );
+		foreach ( $iter as $file ) {
+			$list[] = $file;
+		}
+		sort( $list );
+
+		$this->assertEquals( $expected, $list, "Correct file listing ($backendName)." );
+
+		// Actual listing (using iterator second time)
+		$list = array();
+		foreach ( $iter as $file ) {
+			$list[] = $file;
+		}
+		sort( $list );
+
+		$this->assertEquals( $expected, $list, "Correct file listing ($backendName), second iteration." );
+
+		// Expected listing (top files only)
+		$expected = array(
+			"test1.txt",
+			"test2.txt",
+			"test3.txt",
+			"test4.txt",
+			"test5.txt"
+		);
+		sort( $expected );
+
+		// Actual listing (top files only)
+		$list = array();
+		$iter = $this->backend->getTopFileList( array( 'dir' => "$base/unittest-cont1/e/subdir2/subdir" ) );
+		foreach ( $iter as $file ) {
+			$list[] = $file;
+		}
+		sort( $list );
+
+		$this->assertEquals( $expected, $list, "Correct top file listing ($backendName)." );
+
+		foreach ( $files as $file ) { // clean up
+			$this->backend->doOperation( array( 'op' => 'delete', 'src' => $file ) );
+		}
+
+		$iter = $this->backend->getFileList( array( 'dir' => "$base/unittest-cont1/not/exists" ) );
+		foreach ( $iter as $iter ) {} // no errors
+	}
+
+	public function testGetDirectoryList() {
+		$this->backend = $this->singleBackend;
+		$this->tearDownFiles();
+		$this->doTestGetDirectoryList();
+		$this->tearDownFiles();
+
+		$this->backend = $this->multiBackend;
+		$this->tearDownFiles();
+		$this->doTestGetDirectoryList();
+		$this->tearDownFiles();
+	}
+
+	private function doTestGetDirectoryList() {
+		$backendName = $this->backendClass();
+
+		$base = self::baseStorePath();
+		$files = array(
+			"$base/unittest-cont1/e/test1.txt",
+			"$base/unittest-cont1/e/test2.txt",
+			"$base/unittest-cont1/e/test3.txt",
+			"$base/unittest-cont1/e/subdir1/test1.txt",
+			"$base/unittest-cont1/e/subdir1/test2.txt",
+			"$base/unittest-cont1/e/subdir2/test3.txt",
+			"$base/unittest-cont1/e/subdir2/test4.txt",
+			"$base/unittest-cont1/e/subdir2/subdir/test1.txt",
+			"$base/unittest-cont1/e/subdir3/subdir/test2.txt",
+			"$base/unittest-cont1/e/subdir4/subdir/test3.txt",
+			"$base/unittest-cont1/e/subdir4/subdir/test4.txt",
+			"$base/unittest-cont1/e/subdir4/subdir/test5.txt",
+			"$base/unittest-cont1/e/subdir4/subdir/sub/test0.txt",
+			"$base/unittest-cont1/e/subdir4/subdir/sub/120-px-file.txt",
+		);
+
+		// Add the files
+		$ops = array();
+		foreach ( $files as $file ) {
+			$this->prepare( array( 'dir' => dirname( $file ) ) );
+			$ops[] = array( 'op' => 'create', 'content' => 'xxy', 'dst' => $file );
+		}
+		$status = $this->backend->doQuickOperations( $ops );
+		$this->assertGoodStatus( $status,
+			"Creation of files succeeded ($backendName)." );
+		$this->assertEquals( true, $status->isOK(),
+			"Creation of files succeeded with OK status ($backendName)." );
+
+		$this->assertEquals( true,
+			$this->backend->directoryExists( array( 'dir' => "$base/unittest-cont1/e/subdir1" ) ),
+			"Directory exists in ($backendName)." );
+		$this->assertEquals( true,
+			$this->backend->directoryExists( array( 'dir' => "$base/unittest-cont1/e/subdir2/subdir" ) ),
+			"Directory exists in ($backendName)." );
+		$this->assertEquals( false,
+			$this->backend->directoryExists( array( 'dir' => "$base/unittest-cont1/e/subdir2/test1.txt" ) ),
+			"Directory does not exists in ($backendName)." );
+
+		// Expected listing
+		$expected = array(
+			"e",
+		);
+		sort( $expected );
+
+		// Actual listing (no trailing slash)
+		$list = array();
+		$iter = $this->backend->getTopDirectoryList( array( 'dir' => "$base/unittest-cont1" ) );
+		foreach ( $iter as $file ) {
+			$list[] = $file;
+		}
+		sort( $list );
+
+		$this->assertEquals( $expected, $list, "Correct top dir listing ($backendName)." );
+
+		// Expected listing
+		$expected = array(
+			"subdir1",
+			"subdir2",
+			"subdir3",
+			"subdir4",
+		);
+		sort( $expected );
+
+		// Actual listing (no trailing slash)
+		$list = array();
+		$iter = $this->backend->getTopDirectoryList( array( 'dir' => "$base/unittest-cont1/e" ) );
+		foreach ( $iter as $file ) {
+			$list[] = $file;
+		}
+		sort( $list );
+
+		$this->assertEquals( $expected, $list, "Correct top dir listing ($backendName)." );
+
+		// Actual listing (with trailing slash)
+		$list = array();
+		$iter = $this->backend->getTopDirectoryList( array( 'dir' => "$base/unittest-cont1/e/" ) );
+		foreach ( $iter as $file ) {
+			$list[] = $file;
+		}
+		sort( $list );
+
+		$this->assertEquals( $expected, $list, "Correct top dir listing ($backendName)." );
+
+		// Expected listing
+		$expected = array(
+			"subdir",
+		);
+		sort( $expected );
+
+		// Actual listing (no trailing slash)
+		$list = array();
+		$iter = $this->backend->getTopDirectoryList( array( 'dir' => "$base/unittest-cont1/e/subdir2" ) );
+		foreach ( $iter as $file ) {
+			$list[] = $file;
+		}
+		sort( $list );
+
+		$this->assertEquals( $expected, $list, "Correct top dir listing ($backendName)." );
+
+		// Actual listing (with trailing slash)
+		$list = array();
+		$iter = $this->backend->getTopDirectoryList( array( 'dir' => "$base/unittest-cont1/e/subdir2/" ) );
+		foreach ( $iter as $file ) {
+			$list[] = $file;
+		}
+		sort( $list );
+
+		$this->assertEquals( $expected, $list, "Correct top dir listing ($backendName)." );
+
+		// Actual listing (using iterator second time)
+		$list = array();
+		foreach ( $iter as $file ) {
+			$list[] = $file;
+		}
+		sort( $list );
+
+		$this->assertEquals( $expected, $list, "Correct top dir listing ($backendName), second iteration." );
+
+		// Expected listing (recursive)
+		$expected = array(
+			"e",
+			"e/subdir1",
+			"e/subdir2",
+			"e/subdir3",
+			"e/subdir4",
+			"e/subdir2/subdir",
+			"e/subdir3/subdir",
+			"e/subdir4/subdir",
+			"e/subdir4/subdir/sub",
+		);
+		sort( $expected );
+
+		// Actual listing (recursive)
+		$list = array();
+		$iter = $this->backend->getDirectoryList( array( 'dir' => "$base/unittest-cont1/" ) );
+		foreach ( $iter as $file ) {
+			$list[] = $file;
+		}
+		sort( $list );
+
+		$this->assertEquals( $expected, $list, "Correct dir listing ($backendName)." );
+
+		// Expected listing (recursive)
+		$expected = array(
+			"subdir",
+			"subdir/sub",
+		);
+		sort( $expected );
+
+		// Actual listing (recursive)
+		$list = array();
+		$iter = $this->backend->getDirectoryList( array( 'dir' => "$base/unittest-cont1/e/subdir4" ) );
+		foreach ( $iter as $file ) {
+			$list[] = $file;
+		}
+		sort( $list );
+
+		$this->assertEquals( $expected, $list, "Correct dir listing ($backendName)." );
+
+		// Actual listing (recursive, second time)
+		$list = array();
+		foreach ( $iter as $file ) {
+			$list[] = $file;
+		}
+		sort( $list );
+
+		$this->assertEquals( $expected, $list, "Correct dir listing ($backendName)." );
+
+		foreach ( $files as $file ) { // clean up
+			$this->backend->doOperation( array( 'op' => 'delete', 'src' => $file ) );
+		}
+
+		$iter = $this->backend->getDirectoryList( array( 'dir' => "$base/unittest-cont1/not/exists" ) );
+		foreach ( $iter as $iter ) {} // no errors
+	}
+
+	public function testLockCalls() {
+		$this->backend = $this->singleBackend;
+		$this->doTestLockCalls();
+	}
+
+	private function doTestLockCalls() {
+		$backendName = $this->backendClass();
+
+		for ( $i=0; $i<50; $i++ ) {
+			$paths = array(
+				"test1.txt",
+				"test2.txt",
+				"test3.txt",
+				"subdir1",
+				"subdir1", // duplicate
+				"subdir1/test1.txt",
+				"subdir1/test2.txt",
+				"subdir2",
+				"subdir2", // duplicate
+				"subdir2/test3.txt",
+				"subdir2/test4.txt",
+				"subdir2/subdir",
+				"subdir2/subdir/test1.txt",
+				"subdir2/subdir/test2.txt",
+				"subdir2/subdir/test3.txt",
+				"subdir2/subdir/test4.txt",
+				"subdir2/subdir/test5.txt",
+				"subdir2/subdir/sub",
+				"subdir2/subdir/sub/test0.txt",
+				"subdir2/subdir/sub/120-px-file.txt",
+			);
+
+			$status = $this->backend->lockFiles( $paths, LockManager::LOCK_EX );
+			$this->assertEquals( array(), $status->errors,
+				"Locking of files succeeded ($backendName)." );
+			$this->assertEquals( true, $status->isOK(),
+				"Locking of files succeeded with OK status ($backendName)." );
+
+			$status = $this->backend->lockFiles( $paths, LockManager::LOCK_SH );
+			$this->assertEquals( array(), $status->errors,
+				"Locking of files succeeded ($backendName)." );
+			$this->assertEquals( true, $status->isOK(),
+				"Locking of files succeeded with OK status ($backendName)." );
+
+			$status = $this->backend->unlockFiles( $paths, LockManager::LOCK_SH );
+			$this->assertEquals( array(), $status->errors,
+				"Locking of files succeeded ($backendName)." );
+			$this->assertEquals( true, $status->isOK(),
+				"Locking of files succeeded with OK status ($backendName)." );
+
+			$status = $this->backend->unlockFiles( $paths, LockManager::LOCK_EX );
+			$this->assertEquals( array(), $status->errors,
+				"Locking of files succeeded ($backendName)." );
+			$this->assertEquals( true, $status->isOK(),
+				"Locking of files succeeded with OK status ($backendName)." );
+		}
+	}
+
+	// test helper wrapper for backend prepare() function
+	private function prepare( array $params ) {
+		return $this->backend->prepare( $params );
+	}
+
+	// test helper wrapper for backend prepare() function
+	private function create( array $params ) {
+		$params['op'] = 'create';
+		return $this->backend->doQuickOperations( array( $params ) );
+	}
+
+	function tearDownFiles() {
+		foreach ( $this->filesToPrune as $file ) {
+			@unlink( $file );
+		}
+		$containers = array( 'unittest-cont1', 'unittest-cont2' );
+		foreach ( $containers as $container ) {
+			$this->deleteFiles( $container );
+		}
+		$this->filesToPrune = array();
+	}
+
+	private function deleteFiles( $container ) {
+		$base = self::baseStorePath();
+		$iter = $this->backend->getFileList( array( 'dir' => "$base/$container" ) );
+		if ( $iter ) {
+			foreach ( $iter as $file ) {
+				$this->backend->quickDelete( array( 'src' => "$base/$container/$file" ) );
+			}
+		}
+		$this->backend->clean( array( 'dir' => "$base/$container", 'recursive' => 1 ) );
+	}
+
+	function assertBackendPathsConsistent( array $paths ) {
+		if ( $this->backend instanceof FileBackendMultiWrite ) {
+			$status = $this->backend->consistencyCheck( $paths );
+			$this->assertGoodStatus( $status, "Files synced: " . implode( ',', $paths ) );
+		}
+	}
+
+	function assertGoodStatus( $status, $msg ) {
+		$this->assertEquals( print_r( array(), 1 ), print_r( $status->errors, 1 ), $msg );
+	}
+}
diff --git a/tests/phpunit/includes/filerepo/FileBackendTest.php b/tests/phpunit/includes/filerepo/FileBackendTest.php
deleted file mode 100644
index 7201eec3f1..0000000000
--- a/tests/phpunit/includes/filerepo/FileBackendTest.php
+++ /dev/null
@@ -1,1953 +0,0 @@
-<?php
-
-/**
- * @group FileRepo
- * @group FileBackend
- * @group medium
- */
-class FileBackendTest extends MediaWikiTestCase {
-	private $backend, $multiBackend;
-	private $filesToPrune = array();
-	private static $backendToUse;
-
-	protected function setUp() {
-		global $wgFileBackends;
-		parent::setUp();
-		$tmpPrefix = wfTempDir() . '/filebackend-unittest-' . time() . '-' . mt_rand();
-		if ( $this->getCliArg( 'use-filebackend=' ) ) {
-			if ( self::$backendToUse ) {
-				$this->singleBackend = self::$backendToUse;
-			} else {
-				$name = $this->getCliArg( 'use-filebackend=' );
-				$useConfig = array();
-				foreach ( $wgFileBackends as $conf ) {
-					if ( $conf['name'] == $name ) {
-						$useConfig = $conf;
-						break;
-					}
-				}
-				$useConfig['name'] = 'localtesting'; // swap name
-				$useConfig['shardViaHashLevels'] = array( // test sharding
-					'unittest-cont1' => array( 'levels' => 1, 'base' => 16, 'repeat' => 1 )
-				);
-				$class = $useConfig['class'];
-				self::$backendToUse = new $class( $useConfig );
-				$this->singleBackend = self::$backendToUse;
-			}
-		} else {
-			$this->singleBackend = new FSFileBackend( array(
-				'name'        => 'localtesting',
-				'lockManager' => 'fsLockManager',
-				#'parallelize' => 'implicit',
-				'containerPaths' => array(
-					'unittest-cont1' => "{$tmpPrefix}-localtesting-cont1",
-					'unittest-cont2' => "{$tmpPrefix}-localtesting-cont2" )
-			) );
-		}
-		$this->multiBackend = new FileBackendMultiWrite( array(
-			'name'        => 'localtesting',
-			'lockManager' => 'fsLockManager',
-			'parallelize' => 'implicit',
-			'backends'    => array(
-				array(
-					'name'          => 'localmultitesting1',
-					'class'         => 'FSFileBackend',
-					'lockManager'   => 'nullLockManager',
-					'containerPaths' => array(
-						'unittest-cont1' => "{$tmpPrefix}-localtestingmulti1-cont1",
-						'unittest-cont2' => "{$tmpPrefix}-localtestingmulti1-cont2" ),
-					'isMultiMaster' => false
-				),
-				array(
-					'name'          => 'localmultitesting2',
-					'class'         => 'FSFileBackend',
-					'lockManager'   => 'nullLockManager',
-					'containerPaths' => array(
-						'unittest-cont1' => "{$tmpPrefix}-localtestingmulti2-cont1",
-						'unittest-cont2' => "{$tmpPrefix}-localtestingmulti2-cont2" ),
-					'isMultiMaster' => true
-				)
-			)
-		) );
-		$this->filesToPrune = array();
-	}
-
-	private static function baseStorePath() {
-		return 'mwstore://localtesting';
-	}
-
-	private function backendClass() {
-		return get_class( $this->backend );
-	}
-
-	/**
-	 * @dataProvider provider_testIsStoragePath
-	 */
-	public function testIsStoragePath( $path, $isStorePath ) {
-		$this->assertEquals( $isStorePath, FileBackend::isStoragePath( $path ),
-			"FileBackend::isStoragePath on path '$path'" );
-	}
-
-	function provider_testIsStoragePath() {
-		return array(
-			array( 'mwstore://', true ),
-			array( 'mwstore://backend', true ),
-			array( 'mwstore://backend/container', true ),
-			array( 'mwstore://backend/container/', true ),
-			array( 'mwstore://backend/container/path', true ),
-			array( 'mwstore://backend//container/', true ),
-			array( 'mwstore://backend//container//', true ),
-			array( 'mwstore://backend//container//path', true ),
-			array( 'mwstore:///', true ),
-			array( 'mwstore:/', false ),
-			array( 'mwstore:', false ),
-		);
-	}
-
-	/**
-	 * @dataProvider provider_testSplitStoragePath
-	 */
-	public function testSplitStoragePath( $path, $res ) {
-		$this->assertEquals( $res, FileBackend::splitStoragePath( $path ),
-			"FileBackend::splitStoragePath on path '$path'" );
-	}
-
-	function provider_testSplitStoragePath() {
-		return array(
-			array( 'mwstore://backend/container', array( 'backend', 'container', '' ) ),
-			array( 'mwstore://backend/container/', array( 'backend', 'container', '' ) ),
-			array( 'mwstore://backend/container/path', array( 'backend', 'container', 'path' ) ),
-			array( 'mwstore://backend/container//path', array( 'backend', 'container', '/path' ) ),
-			array( 'mwstore://backend//container/path', array( null, null, null ) ),
-			array( 'mwstore://backend//container//path', array( null, null, null ) ),
-			array( 'mwstore://', array( null, null, null ) ),
-			array( 'mwstore://backend', array( null, null, null ) ),
-			array( 'mwstore:///', array( null, null, null ) ),
-			array( 'mwstore:/', array( null, null, null ) ),
-			array( 'mwstore:', array( null, null, null ) )
-		);
-	}
-
-	/**
-	 * @dataProvider provider_normalizeStoragePath
-	 */
-	public function testNormalizeStoragePath( $path, $res ) {
-		$this->assertEquals( $res, FileBackend::normalizeStoragePath( $path ),
-			"FileBackend::normalizeStoragePath on path '$path'" );
-	}
-
-	function provider_normalizeStoragePath() {
-		return array(
-			array( 'mwstore://backend/container', 'mwstore://backend/container' ),
-			array( 'mwstore://backend/container/', 'mwstore://backend/container' ),
-			array( 'mwstore://backend/container/path', 'mwstore://backend/container/path' ),
-			array( 'mwstore://backend/container//path', 'mwstore://backend/container/path' ),
-			array( 'mwstore://backend/container///path', 'mwstore://backend/container/path' ),
-			array( 'mwstore://backend/container///path//to///obj', 'mwstore://backend/container/path/to/obj',
-			array( 'mwstore://', null ),
-			array( 'mwstore://backend', null ),
-			array( 'mwstore://backend//container/path', null ),
-			array( 'mwstore://backend//container//path', null ),
-			array( 'mwstore:///', null ),
-			array( 'mwstore:/', null ),
-			array( 'mwstore:', null ), )
-		);
-	}
-
-	/**
-	 * @dataProvider provider_testParentStoragePath
-	 */
-	public function testParentStoragePath( $path, $res ) {
-		$this->assertEquals( $res, FileBackend::parentStoragePath( $path ),
-			"FileBackend::parentStoragePath on path '$path'" );
-	}
-
-	function provider_testParentStoragePath() {
-		return array(
-			array( 'mwstore://backend/container/path/to/obj', 'mwstore://backend/container/path/to' ),
-			array( 'mwstore://backend/container/path/to', 'mwstore://backend/container/path' ),
-			array( 'mwstore://backend/container/path', 'mwstore://backend/container' ),
-			array( 'mwstore://backend/container', null ),
-			array( 'mwstore://backend/container/path/to/obj/', 'mwstore://backend/container/path/to' ),
-			array( 'mwstore://backend/container/path/to/', 'mwstore://backend/container/path' ),
-			array( 'mwstore://backend/container/path/', 'mwstore://backend/container' ),
-			array( 'mwstore://backend/container/', null ),
-		);
-	}
-
-	/**
-	 * @dataProvider provider_testExtensionFromPath
-	 */
-	public function testExtensionFromPath( $path, $res ) {
-		$this->assertEquals( $res, FileBackend::extensionFromPath( $path ),
-			"FileBackend::extensionFromPath on path '$path'" );
-	}
-
-	public static function provider_testExtensionFromPath() {
-		return array(
-			array( 'mwstore://backend/container/path.txt', 'txt' ),
-			array( 'mwstore://backend/container/path.svg.png', 'png' ),
-			array( 'mwstore://backend/container/path', '' ),
-			array( 'mwstore://backend/container/path.', '' ),
-		);
-	}
-
-	/**
-	 * @dataProvider provider_testStore
-	 */
-	public function testStore( $op ) {
-		$this->filesToPrune[] = $op['src'];
-
-		$this->backend = $this->singleBackend;
-		$this->tearDownFiles();
-		$this->doTestStore( $op );
-		$this->tearDownFiles();
-
-		$this->backend = $this->multiBackend;
-		$this->tearDownFiles();
-		$this->doTestStore( $op );
-		$this->filesToPrune[] = $op['src']; # avoid file leaking
-		$this->tearDownFiles();
-	}
-
-	private function doTestStore( $op ) {
-		$backendName = $this->backendClass();
-
-		$source = $op['src'];
-		$dest = $op['dst'];
-		$this->prepare( array( 'dir' => dirname( $dest ) ) );
-
-		file_put_contents( $source, "Unit test file" );
-
-		if ( isset( $op['overwrite'] ) || isset( $op['overwriteSame'] ) ) {
-			$this->backend->store( $op );
-		}
-
-		$status = $this->backend->doOperation( $op );
-
-		$this->assertGoodStatus( $status,
-			"Store from $source to $dest succeeded without warnings ($backendName)." );
-		$this->assertEquals( true, $status->isOK(),
-			"Store from $source to $dest succeeded ($backendName)." );
-		$this->assertEquals( array( 0 => true ), $status->success,
-			"Store from $source to $dest has proper 'success' field in Status ($backendName)." );
-		$this->assertEquals( true, file_exists( $source ),
-			"Source file $source still exists ($backendName)." );
-		$this->assertEquals( true, $this->backend->fileExists( array( 'src' => $dest ) ),
-			"Destination file $dest exists ($backendName)." );
-
-		$this->assertEquals( filesize( $source ),
-			$this->backend->getFileSize( array( 'src' => $dest ) ),
-			"Destination file $dest has correct size ($backendName)." );
-
-		$props1 = FSFile::getPropsFromPath( $source );
-		$props2 = $this->backend->getFileProps( array( 'src' => $dest ) );
-		$this->assertEquals( $props1, $props2,
-			"Source and destination have the same props ($backendName)." );
-
-		$this->assertBackendPathsConsistent( array( $dest ) );
-	}
-
-	public static function provider_testStore() {
-		$cases = array();
-
-		$tmpName = TempFSFile::factory( "unittests_", 'txt' )->getPath();
-		$toPath = self::baseStorePath() . '/unittest-cont1/e/fun/obj1.txt';
-		$op = array( 'op' => 'store', 'src' => $tmpName, 'dst' => $toPath );
-		$cases[] = array(
-			$op, // operation
-			$tmpName, // source
-			$toPath, // dest
-		);
-
-		$op2 = $op;
-		$op2['overwrite'] = true;
-		$cases[] = array(
-			$op2, // operation
-			$tmpName, // source
-			$toPath, // dest
-		);
-
-		$op2 = $op;
-		$op2['overwriteSame'] = true;
-		$cases[] = array(
-			$op2, // operation
-			$tmpName, // source
-			$toPath, // dest
-		);
-
-		return $cases;
-	}
-
-	/**
-	 * @dataProvider provider_testCopy
-	 */
-	public function testCopy( $op ) {
-		$this->backend = $this->singleBackend;
-		$this->tearDownFiles();
-		$this->doTestCopy( $op );
-		$this->tearDownFiles();
-
-		$this->backend = $this->multiBackend;
-		$this->tearDownFiles();
-		$this->doTestCopy( $op );
-		$this->tearDownFiles();
-	}
-
-	private function doTestCopy( $op ) {
-		$backendName = $this->backendClass();
-
-		$source = $op['src'];
-		$dest = $op['dst'];
-		$this->prepare( array( 'dir' => dirname( $source ) ) );
-		$this->prepare( array( 'dir' => dirname( $dest ) ) );
-
-		$status = $this->backend->doOperation(
-			array( 'op' => 'create', 'content' => 'blahblah', 'dst' => $source ) );
-		$this->assertGoodStatus( $status,
-			"Creation of file at $source succeeded ($backendName)." );
-
-		if ( isset( $op['overwrite'] ) || isset( $op['overwriteSame'] ) ) {
-			$this->backend->copy( $op );
-		}
-
-		$status = $this->backend->doOperation( $op );
-
-		$this->assertGoodStatus( $status,
-			"Copy from $source to $dest succeeded without warnings ($backendName)." );
-		$this->assertEquals( true, $status->isOK(),
-			"Copy from $source to $dest succeeded ($backendName)." );
-		$this->assertEquals( array( 0 => true ), $status->success,
-			"Copy from $source to $dest has proper 'success' field in Status ($backendName)." );
-		$this->assertEquals( true, $this->backend->fileExists( array( 'src' => $source ) ),
-			"Source file $source still exists ($backendName)." );
-		$this->assertEquals( true, $this->backend->fileExists( array( 'src' => $dest ) ),
-			"Destination file $dest exists after copy ($backendName)." );
-
-		$this->assertEquals(
-			$this->backend->getFileSize( array( 'src' => $source ) ),
-			$this->backend->getFileSize( array( 'src' => $dest ) ),
-			"Destination file $dest has correct size ($backendName)." );
-
-		$props1 = $this->backend->getFileProps( array( 'src' => $source ) );
-		$props2 = $this->backend->getFileProps( array( 'src' => $dest ) );
-		$this->assertEquals( $props1, $props2,
-			"Source and destination have the same props ($backendName)." );
-
-		$this->assertBackendPathsConsistent( array( $source, $dest ) );
-	}
-
-	public static function provider_testCopy() {
-		$cases = array();
-
-		$source = self::baseStorePath() . '/unittest-cont1/e/file.txt';
-		$dest = self::baseStorePath() . '/unittest-cont2/a/fileMoved.txt';
-
-		$op = array( 'op' => 'copy', 'src' => $source, 'dst' => $dest );
-		$cases[] = array(
-			$op, // operation
-			$source, // source
-			$dest, // dest
-		);
-
-		$op2 = $op;
-		$op2['overwrite'] = true;
-		$cases[] = array(
-			$op2, // operation
-			$source, // source
-			$dest, // dest
-		);
-
-		$op2 = $op;
-		$op2['overwriteSame'] = true;
-		$cases[] = array(
-			$op2, // operation
-			$source, // source
-			$dest, // dest
-		);
-
-		return $cases;
-	}
-
-	/**
-	 * @dataProvider provider_testMove
-	 */
-	public function testMove( $op ) {
-		$this->backend = $this->singleBackend;
-		$this->tearDownFiles();
-		$this->doTestMove( $op );
-		$this->tearDownFiles();
-
-		$this->backend = $this->multiBackend;
-		$this->tearDownFiles();
-		$this->doTestMove( $op );
-		$this->tearDownFiles();
-	}
-
-	private function doTestMove( $op ) {
-		$backendName = $this->backendClass();
-
-		$source = $op['src'];
-		$dest = $op['dst'];
-		$this->prepare( array( 'dir' => dirname( $source ) ) );
-		$this->prepare( array( 'dir' => dirname( $dest ) ) );
-
-		$status = $this->backend->doOperation(
-			array( 'op' => 'create', 'content' => 'blahblah', 'dst' => $source ) );
-		$this->assertGoodStatus( $status,
-			"Creation of file at $source succeeded ($backendName)." );
-
-		if ( isset( $op['overwrite'] ) || isset( $op['overwriteSame'] ) ) {
-			$this->backend->copy( $op );
-		}
-
-		$status = $this->backend->doOperation( $op );
-		$this->assertGoodStatus( $status,
-			"Move from $source to $dest succeeded without warnings ($backendName)." );
-		$this->assertEquals( true, $status->isOK(),
-			"Move from $source to $dest succeeded ($backendName)." );
-		$this->assertEquals( array( 0 => true ), $status->success,
-			"Move from $source to $dest has proper 'success' field in Status ($backendName)." );
-		$this->assertEquals( false, $this->backend->fileExists( array( 'src' => $source ) ),
-			"Source file $source does not still exists ($backendName)." );
-		$this->assertEquals( true, $this->backend->fileExists( array( 'src' => $dest ) ),
-			"Destination file $dest exists after move ($backendName)." );
-
-		$this->assertNotEquals(
-			$this->backend->getFileSize( array( 'src' => $source ) ),
-			$this->backend->getFileSize( array( 'src' => $dest ) ),
-			"Destination file $dest has correct size ($backendName)." );
-
-		$props1 = $this->backend->getFileProps( array( 'src' => $source ) );
-		$props2 = $this->backend->getFileProps( array( 'src' => $dest ) );
-		$this->assertEquals( false, $props1['fileExists'],
-			"Source file does not exist accourding to props ($backendName)." );
-		$this->assertEquals( true, $props2['fileExists'],
-			"Destination file exists accourding to props ($backendName)." );
-
-		$this->assertBackendPathsConsistent( array( $source, $dest ) );
-	}
-
-	public static function provider_testMove() {
-		$cases = array();
-
-		$source = self::baseStorePath() . '/unittest-cont1/e/file.txt';
-		$dest = self::baseStorePath() . '/unittest-cont2/a/fileMoved.txt';
-
-		$op = array( 'op' => 'move', 'src' => $source, 'dst' => $dest );
-		$cases[] = array(
-			$op, // operation
-			$source, // source
-			$dest, // dest
-		);
-
-		$op2 = $op;
-		$op2['overwrite'] = true;
-		$cases[] = array(
-			$op2, // operation
-			$source, // source
-			$dest, // dest
-		);
-
-		$op2 = $op;
-		$op2['overwriteSame'] = true;
-		$cases[] = array(
-			$op2, // operation
-			$source, // source
-			$dest, // dest
-		);
-
-		return $cases;
-	}
-
-	/**
-	 * @dataProvider provider_testDelete
-	 */
-	public function testDelete( $op, $withSource, $okStatus ) {
-		$this->backend = $this->singleBackend;
-		$this->tearDownFiles();
-		$this->doTestDelete( $op, $withSource, $okStatus );
-		$this->tearDownFiles();
-
-		$this->backend = $this->multiBackend;
-		$this->tearDownFiles();
-		$this->doTestDelete( $op, $withSource, $okStatus );
-		$this->tearDownFiles();
-	}
-
-	private function doTestDelete( $op, $withSource, $okStatus ) {
-		$backendName = $this->backendClass();
-
-		$source = $op['src'];
-		$this->prepare( array( 'dir' => dirname( $source ) ) );
-
-		if ( $withSource ) {
-			$status = $this->backend->doOperation(
-				array( 'op' => 'create', 'content' => 'blahblah', 'dst' => $source ) );
-			$this->assertGoodStatus( $status,
-				"Creation of file at $source succeeded ($backendName)." );
-		}
-
-		$status = $this->backend->doOperation( $op );
-		if ( $okStatus ) {
-			$this->assertGoodStatus( $status,
-				"Deletion of file at $source succeeded without warnings ($backendName)." );
-			$this->assertEquals( true, $status->isOK(),
-				"Deletion of file at $source succeeded ($backendName)." );
-			$this->assertEquals( array( 0 => true ), $status->success,
-				"Deletion of file at $source has proper 'success' field in Status ($backendName)." );
-		} else {
-			$this->assertEquals( false, $status->isOK(),
-				"Deletion of file at $source failed ($backendName)." );
-		}
-
-		$this->assertEquals( false, $this->backend->fileExists( array( 'src' => $source ) ),
-			"Source file $source does not exist after move ($backendName)." );
-
-		$this->assertFalse(
-			$this->backend->getFileSize( array( 'src' => $source ) ),
-			"Source file $source has correct size (false) ($backendName)." );
-
-		$props1 = $this->backend->getFileProps( array( 'src' => $source ) );
-		$this->assertFalse( $props1['fileExists'],
-			"Source file $source does not exist according to props ($backendName)." );
-
-		$this->assertBackendPathsConsistent( array( $source ) );
-	}
-
-	public static function provider_testDelete() {
-		$cases = array();
-
-		$source = self::baseStorePath() . '/unittest-cont1/e/myfacefile.txt';
-
-		$op = array( 'op' => 'delete', 'src' => $source );
-		$cases[] = array(
-			$op, // operation
-			true, // with source
-			true // succeeds
-		);
-
-		$cases[] = array(
-			$op, // operation
-			false, // without source
-			false // fails
-		);
-
-		$op['ignoreMissingSource'] = true;
-		$cases[] = array(
-			$op, // operation
-			false, // without source
-			true // succeeds
-		);
-
-		return $cases;
-	}
-
-	/**
-	 * @dataProvider provider_testCreate
-	 */
-	public function testCreate( $op, $alreadyExists, $okStatus, $newSize ) {
-		$this->backend = $this->singleBackend;
-		$this->tearDownFiles();
-		$this->doTestCreate( $op, $alreadyExists, $okStatus, $newSize );
-		$this->tearDownFiles();
-
-		$this->backend = $this->multiBackend;
-		$this->tearDownFiles();
-		$this->doTestCreate( $op, $alreadyExists, $okStatus, $newSize );
-		$this->tearDownFiles();
-	}
-
-	private function doTestCreate( $op, $alreadyExists, $okStatus, $newSize ) {
-		$backendName = $this->backendClass();
-
-		$dest = $op['dst'];
-		$this->prepare( array( 'dir' => dirname( $dest ) ) );
-
-		$oldText = 'blah...blah...waahwaah';
-		if ( $alreadyExists ) {
-			$status = $this->backend->doOperation(
-				array( 'op' => 'create', 'content' => $oldText, 'dst' => $dest ) );
-			$this->assertGoodStatus( $status,
-				"Creation of file at $dest succeeded ($backendName)." );
-		}
-
-		$status = $this->backend->doOperation( $op );
-		if ( $okStatus ) {
-			$this->assertGoodStatus( $status,
-				"Creation of file at $dest succeeded without warnings ($backendName)." );
-			$this->assertEquals( true, $status->isOK(),
-				"Creation of file at $dest succeeded ($backendName)." );
-			$this->assertEquals( array( 0 => true ), $status->success,
-				"Creation of file at $dest has proper 'success' field in Status ($backendName)." );
-		} else {
-			$this->assertEquals( false, $status->isOK(),
-				"Creation of file at $dest failed ($backendName)." );
-		}
-
-		$this->assertEquals( true, $this->backend->fileExists( array( 'src' => $dest ) ),
-			"Destination file $dest exists after creation ($backendName)." );
-
-		$props1 = $this->backend->getFileProps( array( 'src' => $dest ) );
-		$this->assertEquals( true, $props1['fileExists'],
-			"Destination file $dest exists according to props ($backendName)." );
-		if ( $okStatus ) { // file content is what we saved
-			$this->assertEquals( $newSize, $props1['size'],
-				"Destination file $dest has expected size according to props ($backendName)." );
-			$this->assertEquals( $newSize,
-				$this->backend->getFileSize( array( 'src' => $dest ) ),
-				"Destination file $dest has correct size ($backendName)." );
-		} else { // file content is some other previous text
-			$this->assertEquals( strlen( $oldText ), $props1['size'],
-				"Destination file $dest has original size according to props ($backendName)." );
-			$this->assertEquals( strlen( $oldText ),
-				$this->backend->getFileSize( array( 'src' => $dest ) ),
-				"Destination file $dest has original size according to props ($backendName)." );
-		}
-
-		$this->assertBackendPathsConsistent( array( $dest ) );
-	}
-
-	/**
-	 * @dataProvider provider_testCreate
-	 */
-	public static function provider_testCreate() {
-		$cases = array();
-
-		$dest = self::baseStorePath() . '/unittest-cont2/a/myspacefile.txt';
-
-		$op = array( 'op' => 'create', 'content' => 'test test testing', 'dst' => $dest );
-		$cases[] = array(
-			$op, // operation
-			false, // no dest already exists
-			true, // succeeds
-			strlen( $op['content'] )
-		);
-
-		$op2 = $op;
-		$op2['content'] = "\n";
-		$cases[] = array(
-			$op2, // operation
-			false, // no dest already exists
-			true, // succeeds
-			strlen( $op2['content'] )
-		);
-
-		$op2 = $op;
-		$op2['content'] = "fsf\n waf 3kt";
-		$cases[] = array(
-			$op2, // operation
-			true, // dest already exists
-			false, // fails
-			strlen( $op2['content'] )
-		);
-
-		$op2 = $op;
-		$op2['content'] = "egm'g gkpe gpqg eqwgwqg";
-		$op2['overwrite'] = true;
-		$cases[] = array(
-			$op2, // operation
-			true, // dest already exists
-			true, // succeeds
-			strlen( $op2['content'] )
-		);
-
-		$op2 = $op;
-		$op2['content'] = "39qjmg3-qg";
-		$op2['overwriteSame'] = true;
-		$cases[] = array(
-			$op2, // operation
-			true, // dest already exists
-			false, // succeeds
-			strlen( $op2['content'] )
-		);
-
-		return $cases;
-	}
-
-	public function testDoQuickOperations() {
-		$this->backend = $this->singleBackend;
-		$this->doTestDoQuickOperations();
-		$this->tearDownFiles();
-
-		$this->backend = $this->multiBackend;
-		$this->doTestDoQuickOperations();
-		$this->tearDownFiles();
-	}
-
-	private function doTestDoQuickOperations() {
-		$backendName = $this->backendClass();
-
-		$base = self::baseStorePath();
-		$files = array(
-			"$base/unittest-cont1/e/fileA.a",
-			"$base/unittest-cont1/e/fileB.a",
-			"$base/unittest-cont1/e/fileC.a"
-		);
-		$ops = array();
-		$purgeOps = array();
-		foreach ( $files as $path ) {
-			$status = $this->prepare( array( 'dir' => dirname( $path ) ) );
-			$this->assertGoodStatus( $status,
-				"Preparing $path succeeded without warnings ($backendName)." );
-			$ops[] = array( 'op' => 'create', 'dst' => $path, 'content' => mt_rand(0,50000) );
-			$purgeOps[] = array( 'op' => 'delete', 'src' => $path );
-		}
-		$purgeOps[] = array( 'op' => 'null' );
-		$status = $this->backend->doQuickOperations( $ops );
-		$this->assertGoodStatus( $status,
-			"Creation of source files succeeded ($backendName)." );
-
-		foreach ( $files as $file ) {
-			$this->assertTrue( $this->backend->fileExists( array( 'src' => $file ) ),
-				"File $file exists." );
-		}
-
-		$status = $this->backend->doQuickOperations( $purgeOps );
-		$this->assertGoodStatus( $status,
-			"Quick deletion of source files succeeded ($backendName)." );
-
-		foreach ( $files as $file ) {
-			$this->assertFalse( $this->backend->fileExists( array( 'src' => $file ) ),
-				"File $file purged." );
-		}
-	}
-
-	/**
-	 * @dataProvider provider_testConcatenate
-	 */
-	public function testConcatenate( $op, $srcs, $srcsContent, $alreadyExists, $okStatus ) {
-		$this->filesToPrune[] = $op['dst'];
-
-		$this->backend = $this->singleBackend;
-		$this->tearDownFiles();
-		$this->doTestConcatenate( $op, $srcs, $srcsContent, $alreadyExists, $okStatus );
-		$this->tearDownFiles();
-
-		$this->backend = $this->multiBackend;
-		$this->tearDownFiles();
-		$this->doTestConcatenate( $op, $srcs, $srcsContent, $alreadyExists, $okStatus );
-		$this->filesToPrune[] = $op['dst']; # avoid file leaking
-		$this->tearDownFiles();
-	}
-
-	private function doTestConcatenate( $params, $srcs, $srcsContent, $alreadyExists, $okStatus ) {
-		$backendName = $this->backendClass();
-
-		$expContent = '';
-		// Create sources
-		$ops = array();
-		foreach ( $srcs as $i => $source ) {
-			$this->prepare( array( 'dir' => dirname( $source ) ) );
-			$ops[] = array(
-				'op'      => 'create', // operation
-				'dst'     => $source, // source
-				'content' => $srcsContent[$i]
-			);
-			$expContent .= $srcsContent[$i];
-		}
-		$status = $this->backend->doOperations( $ops );
-
-		$this->assertGoodStatus( $status,
-			"Creation of source files succeeded ($backendName)." );
-
-		$dest = $params['dst'];
-		if ( $alreadyExists ) {
-			$ok = file_put_contents( $dest, 'blah...blah...waahwaah' ) !== false;
-			$this->assertEquals( true, $ok,
-				"Creation of file at $dest succeeded ($backendName)." );
-		} else {
-			$ok = file_put_contents( $dest, '' ) !== false;
-			$this->assertEquals( true, $ok,
-				"Creation of 0-byte file at $dest succeeded ($backendName)." );
-		}
-
-		// Combine the files into one
-		$status = $this->backend->concatenate( $params );
-		if ( $okStatus ) {
-			$this->assertGoodStatus( $status,
-				"Creation of concat file at $dest succeeded without warnings ($backendName)." );
-			$this->assertEquals( true, $status->isOK(),
-				"Creation of concat file at $dest succeeded ($backendName)." );
-		} else {
-			$this->assertEquals( false, $status->isOK(),
-				"Creation of concat file at $dest failed ($backendName)." );
-		}
-
-		if ( $okStatus ) {
-			$this->assertEquals( true, is_file( $dest ),
-				"Dest concat file $dest exists after creation ($backendName)." );
-		} else {
-			$this->assertEquals( true, is_file( $dest ),
-				"Dest concat file $dest exists after failed creation ($backendName)." );
-		}
-
-		$contents = file_get_contents( $dest );
-		$this->assertNotEquals( false, $contents, "File at $dest exists ($backendName)." );
-
-		if ( $okStatus ) {
-			$this->assertEquals( $expContent, $contents,
-				"Concat file at $dest has correct contents ($backendName)." );
-		} else {
-			$this->assertNotEquals( $expContent, $contents,
-				"Concat file at $dest has correct contents ($backendName)." );
-		}
-	}
-
-	function provider_testConcatenate() {
-		$cases = array();
-
-		$rand = mt_rand( 0, 2000000000 ) . time();
-		$dest = wfTempDir() . "/randomfile!$rand.txt";
-		$srcs = array(
-			self::baseStorePath() . '/unittest-cont1/e/file1.txt',
-			self::baseStorePath() . '/unittest-cont1/e/file2.txt',
-			self::baseStorePath() . '/unittest-cont1/e/file3.txt',
-			self::baseStorePath() . '/unittest-cont1/e/file4.txt',
-			self::baseStorePath() . '/unittest-cont1/e/file5.txt',
-			self::baseStorePath() . '/unittest-cont1/e/file6.txt',
-			self::baseStorePath() . '/unittest-cont1/e/file7.txt',
-			self::baseStorePath() . '/unittest-cont1/e/file8.txt',
-			self::baseStorePath() . '/unittest-cont1/e/file9.txt',
-			self::baseStorePath() . '/unittest-cont1/e/file10.txt'
-		);
-		$content = array(
-			'egfage',
-			'ageageag',
-			'rhokohlr',
-			'shgmslkg',
-			'kenga',
-			'owagmal',
-			'kgmae',
-			'g eak;g',
-			'lkaem;a',
-			'legma'
-		);
-		$params = array( 'srcs' => $srcs, 'dst' => $dest );
-
-		$cases[] = array(
-			$params, // operation
-			$srcs, // sources
-			$content, // content for each source
-			false, // no dest already exists
-			true, // succeeds
-		);
-
-		$cases[] = array(
-			$params, // operation
-			$srcs, // sources
-			$content, // content for each source
-			true, // dest already exists
-			false, // succeeds
-		);
-
-		return $cases;
-	}
-
-	/**
-	 * @dataProvider provider_testGetFileStat
-	 */
-	public function testGetFileStat( $path, $content, $alreadyExists ) {
-		$this->backend = $this->singleBackend;
-		$this->tearDownFiles();
-		$this->doTestGetFileStat( $path, $content, $alreadyExists );
-		$this->tearDownFiles();
-
-		$this->backend = $this->multiBackend;
-		$this->tearDownFiles();
-		$this->doTestGetFileStat( $path, $content, $alreadyExists );
-		$this->tearDownFiles();
-	}
-
-	private function doTestGetFileStat( $path, $content, $alreadyExists ) {
-		$backendName = $this->backendClass();
-
-		if ( $alreadyExists ) {
-			$this->prepare( array( 'dir' => dirname( $path ) ) );
-			$status = $this->create( array( 'dst' => $path, 'content' => $content ) );
-			$this->assertGoodStatus( $status,
-				"Creation of file at $path succeeded ($backendName)." );
-
-			$size = $this->backend->getFileSize( array( 'src' => $path ) );
-			$time = $this->backend->getFileTimestamp( array( 'src' => $path ) );
-			$stat = $this->backend->getFileStat( array( 'src' => $path ) );
-
-			$this->assertEquals( strlen( $content ), $size,
-				"Correct file size of '$path'" );
-			$this->assertTrue( abs( time() - wfTimestamp( TS_UNIX, $time ) ) < 10,
-				"Correct file timestamp of '$path'" );
-
-			$size = $stat['size'];
-			$time = $stat['mtime'];
-			$this->assertEquals( strlen( $content ), $size,
-				"Correct file size of '$path'" );
-			$this->assertTrue( abs( time() - wfTimestamp( TS_UNIX, $time ) ) < 10,
-				"Correct file timestamp of '$path'" );
-
-			$this->backend->clearCache( array( $path ) );
-
-			$size = $this->backend->getFileSize( array( 'src' => $path ) );
-
-			$this->assertEquals( strlen( $content ), $size,
-				"Correct file size of '$path'" );
-
-			$this->backend->preloadCache( array( $path ) );
-
-			$size = $this->backend->getFileSize( array( 'src' => $path ) );
-
-			$this->assertEquals( strlen( $content ), $size,
-				"Correct file size of '$path'" );
-		} else {
-			$size = $this->backend->getFileSize( array( 'src' => $path ) );
-			$time = $this->backend->getFileTimestamp( array( 'src' => $path ) );
-			$stat = $this->backend->getFileStat( array( 'src' => $path ) );
-
-			$this->assertFalse( $size, "Correct file size of '$path'" );
-			$this->assertFalse( $time, "Correct file timestamp of '$path'" );
-			$this->assertFalse( $stat, "Correct file stat of '$path'" );
-		}
-	}
-
-	function provider_testGetFileStat() {
-		$cases = array();
-
-		$base = self::baseStorePath();
-		$cases[] = array( "$base/unittest-cont1/e/b/z/some_file.txt", "some file contents", true );
-		$cases[] = array( "$base/unittest-cont1/e/b/some-other_file.txt", "", true );
-		$cases[] = array( "$base/unittest-cont1/e/b/some-diff_file.txt", null, false );
-
-		return $cases;
-	}
-
-	/**
-	 * @dataProvider provider_testGetFileContents
-	 */
-	public function testGetFileContents( $source, $content ) {
-		$this->backend = $this->singleBackend;
-		$this->tearDownFiles();
-		$this->doTestGetFileContents( $source, $content );
-		$this->tearDownFiles();
-
-		$this->backend = $this->multiBackend;
-		$this->tearDownFiles();
-		$this->doTestGetFileContents( $source, $content );
-		$this->tearDownFiles();
-	}
-
-	private function doTestGetFileContents( $source, $content ) {
-		$backendName = $this->backendClass();
-
-		$srcs = (array)$source;
-		$content = (array)$content;
-		foreach ( $srcs as $i => $src ) {
-			$this->prepare( array( 'dir' => dirname( $src ) ) );
-			$status = $this->backend->doOperation(
-				array( 'op' => 'create', 'content' => $content[$i], 'dst' => $src ) );
-			$this->assertGoodStatus( $status,
-				"Creation of file at $src succeeded ($backendName)." );
-		}
-
-		if ( is_array( $source ) ) {
-			$contents = $this->backend->getFileContentsMulti( array( 'srcs' => $source ) );
-			foreach ( $contents as $path => $data ) {
-				$this->assertNotEquals( false, $data, "Contents of $path exists ($backendName)." );
-				$this->assertEquals( current( $content ), $data, "Contents of $path is correct ($backendName)." );
-				next( $content );
-			}
-			$this->assertEquals( $source, array_keys( $contents ), "Contents in right order ($backendName)." );
-			$this->assertEquals( count( $source ), count( $contents ), "Contents array size correct ($backendName)." );
-		} else {
-			$data = $this->backend->getFileContents( array( 'src' => $source ) );
-			$this->assertNotEquals( false, $data, "Contents of $source exists ($backendName)." );
-			$this->assertEquals( $content[0], $data, "Contents of $source is correct ($backendName)." );
-		}
-	}
-
-	function provider_testGetFileContents() {
-		$cases = array();
-
-		$base = self::baseStorePath();
-		$cases[] = array( "$base/unittest-cont1/e/b/z/some_file.txt", "some file contents" );
-		$cases[] = array( "$base/unittest-cont1/e/b/some-other_file.txt", "more file contents" );
-		$cases[] = array(
-			array( "$base/unittest-cont1/e/a/x.txt", "$base/unittest-cont1/e/a/y.txt",
-				 "$base/unittest-cont1/e/a/z.txt" ),
-			array( "contents xx", "contents xy", "contents xz" )
-		);
-
-		return $cases;
-	}
-
-	/**
-	 * @dataProvider provider_testGetLocalCopy
-	 */
-	public function testGetLocalCopy( $source, $content ) {
-		$this->backend = $this->singleBackend;
-		$this->tearDownFiles();
-		$this->doTestGetLocalCopy( $source, $content );
-		$this->tearDownFiles();
-
-		$this->backend = $this->multiBackend;
-		$this->tearDownFiles();
-		$this->doTestGetLocalCopy( $source, $content );
-		$this->tearDownFiles();
-	}
-
-	private function doTestGetLocalCopy( $source, $content ) {
-		$backendName = $this->backendClass();
-
-		$srcs = (array)$source;
-		$content = (array)$content;
-		foreach ( $srcs as $i => $src ) {
-			$this->prepare( array( 'dir' => dirname( $src ) ) );
-			$status = $this->backend->doOperation(
-				array( 'op' => 'create', 'content' => $content[$i], 'dst' => $src ) );
-			$this->assertGoodStatus( $status,
-				"Creation of file at $src succeeded ($backendName)." );
-		}
-
-		if ( is_array( $source ) ) {
-			$tmpFiles = $this->backend->getLocalCopyMulti( array( 'srcs' => $source ) );
-			foreach ( $tmpFiles as $path => $tmpFile ) {
-				$this->assertNotNull( $tmpFile,
-					"Creation of local copy of $path succeeded ($backendName)." );
-				$contents = file_get_contents( $tmpFile->getPath() );
-				$this->assertNotEquals( false, $contents, "Local copy of $path exists ($backendName)." );
-				$this->assertEquals( current( $content ), $contents, "Local copy of $path is correct ($backendName)." );
-				next( $content );
-			}
-			$this->assertEquals( $source, array_keys( $tmpFiles ), "Local copies in right order ($backendName)." );
-			$this->assertEquals( count( $source ), count( $tmpFiles ), "Local copies array size correct ($backendName)." );
-		} else {
-			$tmpFile = $this->backend->getLocalCopy( array( 'src' => $source ) );
-			$this->assertNotNull( $tmpFile,
-				"Creation of local copy of $source succeeded ($backendName)." );
-			$contents = file_get_contents( $tmpFile->getPath() );
-			$this->assertNotEquals( false, $contents, "Local copy of $source exists ($backendName)." );
-			$this->assertEquals( $content[0], $contents, "Local copy of $source is correct ($backendName)." );
-		}
-
-		$obj = new stdClass();
-		$tmpFile->bind( $obj );
-	}
-
-	function provider_testGetLocalCopy() {
-		$cases = array();
-
-		$base = self::baseStorePath();
-		$cases[] = array( "$base/unittest-cont1/e/a/z/some_file.txt", "some file contents" );
-		$cases[] = array( "$base/unittest-cont1/e/a/some-other_file.txt", "more file contents" );
-		$cases[] = array( "$base/unittest-cont1/e/a/\$odd&.txt", "test file contents" );
-		$cases[] = array(
-			array( "$base/unittest-cont1/e/a/x.txt", "$base/unittest-cont1/e/a/y.txt",
-				 "$base/unittest-cont1/e/a/z.txt" ),
-			array( "contents xx", "contents xy", "contents xz" )
-		);
-
-		return $cases;
-	}
-
-	/**
-	 * @dataProvider provider_testGetLocalReference
-	 */
-	public function testGetLocalReference( $source, $content ) {
-		$this->backend = $this->singleBackend;
-		$this->tearDownFiles();
-		$this->doTestGetLocalReference( $source, $content );
-		$this->tearDownFiles();
-
-		$this->backend = $this->multiBackend;
-		$this->tearDownFiles();
-		$this->doTestGetLocalReference( $source, $content );
-		$this->tearDownFiles();
-	}
-
-	private function doTestGetLocalReference( $source, $content ) {
-		$backendName = $this->backendClass();
-
-		$srcs = (array)$source;
-		$content = (array)$content;
-		foreach ( $srcs as $i => $src ) {
-			$this->prepare( array( 'dir' => dirname( $src ) ) );
-			$status = $this->backend->doOperation(
-				array( 'op' => 'create', 'content' => $content[$i], 'dst' => $src ) );
-			$this->assertGoodStatus( $status,
-				"Creation of file at $src succeeded ($backendName)." );
-		}
-
-		if ( is_array( $source ) ) {
-			$tmpFiles = $this->backend->getLocalReferenceMulti( array( 'srcs' => $source ) );
-			foreach ( $tmpFiles as $path => $tmpFile ) {
-				$this->assertNotNull( $tmpFile,
-					"Creation of local copy of $path succeeded ($backendName)." );
-				$contents = file_get_contents( $tmpFile->getPath() );
-				$this->assertNotEquals( false, $contents, "Local ref of $path exists ($backendName)." );
-				$this->assertEquals( current( $content ), $contents, "Local ref of $path is correct ($backendName)." );
-				next( $content );
-			}
-			$this->assertEquals( $source, array_keys( $tmpFiles ), "Local refs in right order ($backendName)." );
-			$this->assertEquals( count( $source ), count( $tmpFiles ), "Local refs array size correct ($backendName)." );
-		} else {
-			$tmpFile = $this->backend->getLocalReference( array( 'src' => $source ) );
-			$this->assertNotNull( $tmpFile,
-				"Creation of local copy of $source succeeded ($backendName)." );
-			$contents = file_get_contents( $tmpFile->getPath() );
-			$this->assertNotEquals( false, $contents, "Local ref of $source exists ($backendName)." );
-			$this->assertEquals( $content[0], $contents, "Local ref of $source is correct ($backendName)." );
-		}
-	}
-
-	function provider_testGetLocalReference() {
-		$cases = array();
-
-		$base = self::baseStorePath();
-		$cases[] = array( "$base/unittest-cont1/e/a/z/some_file.txt", "some file contents" );
-		$cases[] = array( "$base/unittest-cont1/e/a/some-other_file.txt", "more file contents" );
-		$cases[] = array( "$base/unittest-cont1/e/a/\$odd&.txt", "test file contents" );
-		$cases[] = array(
-			array( "$base/unittest-cont1/e/a/x.txt", "$base/unittest-cont1/e/a/y.txt",
-				 "$base/unittest-cont1/e/a/z.txt" ),
-			array( "contents xx", "contents xy", "contents xz" )
-		);
-
-		return $cases;
-	}
-
-	public function testGetLocalCopyAndReference404() {
-		$this->backend = $this->singleBackend;
-		$this->tearDownFiles();
-		$this->doTestGetLocalCopyAndReference404();
-		$this->tearDownFiles();
-
-		$this->backend = $this->multiBackend;
-		$this->tearDownFiles();
-		$this->doTestGetLocalCopyAndReference404();
-		$this->tearDownFiles();
-	}
-
-	public function doTestGetLocalCopyAndReference404() {
-		$backendName = $this->backendClass();
-
-		$base = self::baseStorePath();
-
-		$tmpFile = $this->backend->getLocalCopy( array(
-			'src' => "$base/unittest-cont1/not-there" ) );
-		$this->assertEquals( null, $tmpFile, "Local copy of not existing file is null ($backendName)." );
-
-		$tmpFile = $this->backend->getLocalReference( array(
-			'src' => "$base/unittest-cont1/not-there" ) );
-		$this->assertEquals( null, $tmpFile, "Local ref of not existing file is null ($backendName)." );
-	}
-
-	/**
-	 * @dataProvider provider_testPrepareAndClean
-	 */
-	public function testPrepareAndClean( $path, $isOK ) {
-		$this->backend = $this->singleBackend;
-		$this->doTestPrepareAndClean( $path, $isOK );
-		$this->tearDownFiles();
-
-		$this->backend = $this->multiBackend;
-		$this->doTestPrepareAndClean( $path, $isOK );
-		$this->tearDownFiles();
-	}
-
-	function provider_testPrepareAndClean() {
-		$base = self::baseStorePath();
-		return array(
-			array( "$base/unittest-cont1/e/a/z/some_file1.txt", true ),
-			array( "$base/unittest-cont2/a/z/some_file2.txt", true ),
-			# Specific to FS backend with no basePath field set
-			#array( "$base/unittest-cont3/a/z/some_file3.txt", false ),
-		);
-	}
-
-	private function doTestPrepareAndClean( $path, $isOK ) {
-		$backendName = $this->backendClass();
-
-		$status = $this->prepare( array( 'dir' => dirname( $path ) ) );
-		if ( $isOK ) {
-			$this->assertGoodStatus( $status,
-				"Preparing dir $path succeeded without warnings ($backendName)." );
-			$this->assertEquals( true, $status->isOK(),
-				"Preparing dir $path succeeded ($backendName)." );
-		} else {
-			$this->assertEquals( false, $status->isOK(),
-				"Preparing dir $path failed ($backendName)." );
-		}
-
-		$status = $this->backend->clean( array( 'dir' => dirname( $path ) ) );
-		if ( $isOK ) {
-			$this->assertGoodStatus( $status,
-				"Cleaning dir $path succeeded without warnings ($backendName)." );
-			$this->assertEquals( true, $status->isOK(),
-				"Cleaning dir $path succeeded ($backendName)." );
-		} else {
-			$this->assertEquals( false, $status->isOK(),
-				"Cleaning dir $path failed ($backendName)." );
-		}
-	}
-
-	public function testRecursiveClean() {
-		$this->backend = $this->singleBackend;
-		$this->doTestRecursiveClean();
-		$this->tearDownFiles();
-
-		$this->backend = $this->multiBackend;
-		$this->doTestRecursiveClean();
-		$this->tearDownFiles();
-	}
-
-	private function doTestRecursiveClean() {
-		$backendName = $this->backendClass();
-
-		$base = self::baseStorePath();
-		$dirs = array(
-			"$base/unittest-cont1/e/a",
-			"$base/unittest-cont1/e/a/b",
-			"$base/unittest-cont1/e/a/b/c",
-			"$base/unittest-cont1/e/a/b/c/d0",
-			"$base/unittest-cont1/e/a/b/c/d1",
-			"$base/unittest-cont1/e/a/b/c/d2",
-			"$base/unittest-cont1/e/a/b/c/d0/1",
-			"$base/unittest-cont1/e/a/b/c/d0/2",
-			"$base/unittest-cont1/e/a/b/c/d1/3",
-			"$base/unittest-cont1/e/a/b/c/d1/4",
-			"$base/unittest-cont1/e/a/b/c/d2/5",
-			"$base/unittest-cont1/e/a/b/c/d2/6"
-		);
-		foreach ( $dirs as $dir ) {
-			$status = $this->prepare( array( 'dir' => $dir ) );
-			$this->assertGoodStatus( $status,
-				"Preparing dir $dir succeeded without warnings ($backendName)." );
-		}
-
-		if ( $this->backend instanceof FSFileBackend ) {
-			foreach ( $dirs as $dir ) {
-				$this->assertEquals( true, $this->backend->directoryExists( array( 'dir' => $dir ) ),
-					"Dir $dir exists ($backendName)." );
-			}
-		}
-
-		$status = $this->backend->clean(
-			array( 'dir' => "$base/unittest-cont1", 'recursive' => 1 ) );
-		$this->assertGoodStatus( $status,
-			"Recursive cleaning of dir $dir succeeded without warnings ($backendName)." );
-
-		foreach ( $dirs as $dir ) {
-			$this->assertEquals( false, $this->backend->directoryExists( array( 'dir' => $dir ) ),
-				"Dir $dir no longer exists ($backendName)." );
-		}
-	}
-
-	// @TODO: testSecure
-
-	public function testDoOperations() {
-		$this->backend = $this->singleBackend;
-		$this->tearDownFiles();
-		$this->doTestDoOperations();
-		$this->tearDownFiles();
-
-		$this->backend = $this->multiBackend;
-		$this->tearDownFiles();
-		$this->doTestDoOperations();
-		$this->tearDownFiles();
-	}
-
-	private function doTestDoOperations() {
-		$base = self::baseStorePath();
-
-		$fileA = "$base/unittest-cont1/e/a/b/fileA.txt";
-		$fileAContents = '3tqtmoeatmn4wg4qe-mg3qt3 tq';
-		$fileB = "$base/unittest-cont1/e/a/b/fileB.txt";
-		$fileBContents = 'g-jmq3gpqgt3qtg q3GT ';
-		$fileC = "$base/unittest-cont1/e/a/b/fileC.txt";
-		$fileCContents = 'eigna[ogmewt 3qt g3qg flew[ag';
-		$fileD = "$base/unittest-cont1/e/a/b/fileD.txt";
-
-		$this->prepare( array( 'dir' => dirname( $fileA ) ) );
-		$this->create( array( 'dst' => $fileA, 'content' => $fileAContents ) );
-		$this->prepare( array( 'dir' => dirname( $fileB ) ) );
-		$this->create( array( 'dst' => $fileB, 'content' => $fileBContents ) );
-		$this->prepare( array( 'dir' => dirname( $fileC ) ) );
-		$this->create( array( 'dst' => $fileC, 'content' => $fileCContents ) );
-		$this->prepare( array( 'dir' => dirname( $fileD ) ) );
-
-		$status = $this->backend->doOperations( array(
-			array( 'op' => 'copy', 'src' => $fileA, 'dst' => $fileC, 'overwrite' => 1 ),
-			// Now: A:<A>, B:<B>, C:<A>, D:<empty> (file:<orginal contents>)
-			array( 'op' => 'copy', 'src' => $fileC, 'dst' => $fileA, 'overwriteSame' => 1 ),
-			// Now: A:<A>, B:<B>, C:<A>, D:<empty>
-			array( 'op' => 'move', 'src' => $fileC, 'dst' => $fileD, 'overwrite' => 1 ),
-			// Now: A:<A>, B:<B>, C:<empty>, D:<A>
-			array( 'op' => 'move', 'src' => $fileB, 'dst' => $fileC ),
-			// Now: A:<A>, B:<empty>, C:<B>, D:<A>
-			array( 'op' => 'move', 'src' => $fileD, 'dst' => $fileA, 'overwriteSame' => 1 ),
-			// Now: A:<A>, B:<empty>, C:<B>, D:<empty>
-			array( 'op' => 'move', 'src' => $fileC, 'dst' => $fileA, 'overwrite' => 1 ),
-			// Now: A:<B>, B:<empty>, C:<empty>, D:<empty>
-			array( 'op' => 'copy', 'src' => $fileA, 'dst' => $fileC ),
-			// Now: A:<B>, B:<empty>, C:<B>, D:<empty>
-			array( 'op' => 'move', 'src' => $fileA, 'dst' => $fileC, 'overwriteSame' => 1 ),
-			// Now: A:<empty>, B:<empty>, C:<B>, D:<empty>
-			array( 'op' => 'copy', 'src' => $fileC, 'dst' => $fileC, 'overwrite' => 1 ),
-			// Does nothing
-			array( 'op' => 'copy', 'src' => $fileC, 'dst' => $fileC, 'overwriteSame' => 1 ),
-			// Does nothing
-			array( 'op' => 'move', 'src' => $fileC, 'dst' => $fileC, 'overwrite' => 1 ),
-			// Does nothing
-			array( 'op' => 'move', 'src' => $fileC, 'dst' => $fileC, 'overwriteSame' => 1 ),
-			// Does nothing
-			array( 'op' => 'null' ),
-			// Does nothing
-		) );
-
-		$this->assertGoodStatus( $status, "Operation batch succeeded" );
-		$this->assertEquals( true, $status->isOK(), "Operation batch succeeded" );
-		$this->assertEquals( 13, count( $status->success ),
-			"Operation batch has correct success array" );
-
-		$this->assertEquals( false, $this->backend->fileExists( array( 'src' => $fileA ) ),
-			"File does not exist at $fileA" );
-		$this->assertEquals( false, $this->backend->fileExists( array( 'src' => $fileB ) ),
-			"File does not exist at $fileB" );
-		$this->assertEquals( false, $this->backend->fileExists( array( 'src' => $fileD ) ),
-			"File does not exist at $fileD" );
-
-		$this->assertEquals( true, $this->backend->fileExists( array( 'src' => $fileC ) ),
-			"File exists at $fileC" );
-		$this->assertEquals( $fileBContents,
-			$this->backend->getFileContents( array( 'src' => $fileC ) ),
-			"Correct file contents of $fileC" );
-		$this->assertEquals( strlen( $fileBContents ),
-			$this->backend->getFileSize( array( 'src' => $fileC ) ),
-			"Correct file size of $fileC" );
-		$this->assertEquals( wfBaseConvert( sha1( $fileBContents ), 16, 36, 31 ),
-			$this->backend->getFileSha1Base36( array( 'src' => $fileC ) ),
-			"Correct file SHA-1 of $fileC" );
-	}
-
-	public function testDoOperationsPipeline() {
-		$this->backend = $this->singleBackend;
-		$this->tearDownFiles();
-		$this->doTestDoOperationsPipeline();
-		$this->tearDownFiles();
-
-		$this->backend = $this->multiBackend;
-		$this->tearDownFiles();
-		$this->doTestDoOperationsPipeline();
-		$this->tearDownFiles();
-	}
-
-	// concurrency orientated
-	private function doTestDoOperationsPipeline() {
-		$base = self::baseStorePath();
-
-		$fileAContents = '3tqtmoeatmn4wg4qe-mg3qt3 tq';
-		$fileBContents = 'g-jmq3gpqgt3qtg q3GT ';
-		$fileCContents = 'eigna[ogmewt 3qt g3qg flew[ag';
-
-		$tmpNameA = TempFSFile::factory( "unittests_", 'txt' )->getPath();
-		file_put_contents( $tmpNameA, $fileAContents );
-		$tmpNameB = TempFSFile::factory( "unittests_", 'txt' )->getPath();
-		file_put_contents( $tmpNameB, $fileBContents );
-		$tmpNameC = TempFSFile::factory( "unittests_", 'txt' )->getPath();
-		file_put_contents( $tmpNameC, $fileCContents );
-
-		$this->filesToPrune[] = $tmpNameA; # avoid file leaking
-		$this->filesToPrune[] = $tmpNameB; # avoid file leaking
-		$this->filesToPrune[] = $tmpNameC; # avoid file leaking
-
-		$fileA = "$base/unittest-cont1/e/a/b/fileA.txt";
-		$fileB = "$base/unittest-cont1/e/a/b/fileB.txt";
-		$fileC = "$base/unittest-cont1/e/a/b/fileC.txt";
-		$fileD = "$base/unittest-cont1/e/a/b/fileD.txt";
-
-		$this->prepare( array( 'dir' => dirname( $fileA ) ) );
-		$this->create( array( 'dst' => $fileA, 'content' => $fileAContents ) );
-		$this->prepare( array( 'dir' => dirname( $fileB ) ) );
-		$this->prepare( array( 'dir' => dirname( $fileC ) ) );
-		$this->prepare( array( 'dir' => dirname( $fileD ) ) );
-
-		$status = $this->backend->doOperations( array(
-			array( 'op' => 'store', 'src' => $tmpNameA, 'dst' => $fileA, 'overwriteSame' => 1 ),
-			array( 'op' => 'store', 'src' => $tmpNameB, 'dst' => $fileB, 'overwrite' => 1 ),
-			array( 'op' => 'store', 'src' => $tmpNameC, 'dst' => $fileC, 'overwrite' => 1 ),
-			array( 'op' => 'copy', 'src' => $fileA, 'dst' => $fileC, 'overwrite' => 1 ),
-			// Now: A:<A>, B:<B>, C:<A>, D:<empty> (file:<orginal contents>)
-			array( 'op' => 'copy', 'src' => $fileC, 'dst' => $fileA, 'overwriteSame' => 1 ),
-			// Now: A:<A>, B:<B>, C:<A>, D:<empty>
-			array( 'op' => 'move', 'src' => $fileC, 'dst' => $fileD, 'overwrite' => 1 ),
-			// Now: A:<A>, B:<B>, C:<empty>, D:<A>
-			array( 'op' => 'move', 'src' => $fileB, 'dst' => $fileC ),
-			// Now: A:<A>, B:<empty>, C:<B>, D:<A>
-			array( 'op' => 'move', 'src' => $fileD, 'dst' => $fileA, 'overwriteSame' => 1 ),
-			// Now: A:<A>, B:<empty>, C:<B>, D:<empty>
-			array( 'op' => 'move', 'src' => $fileC, 'dst' => $fileA, 'overwrite' => 1 ),
-			// Now: A:<B>, B:<empty>, C:<empty>, D:<empty>
-			array( 'op' => 'copy', 'src' => $fileA, 'dst' => $fileC ),
-			// Now: A:<B>, B:<empty>, C:<B>, D:<empty>
-			array( 'op' => 'move', 'src' => $fileA, 'dst' => $fileC, 'overwriteSame' => 1 ),
-			// Now: A:<empty>, B:<empty>, C:<B>, D:<empty>
-			array( 'op' => 'copy', 'src' => $fileC, 'dst' => $fileC, 'overwrite' => 1 ),
-			// Does nothing
-			array( 'op' => 'copy', 'src' => $fileC, 'dst' => $fileC, 'overwriteSame' => 1 ),
-			// Does nothing
-			array( 'op' => 'move', 'src' => $fileC, 'dst' => $fileC, 'overwrite' => 1 ),
-			// Does nothing
-			array( 'op' => 'move', 'src' => $fileC, 'dst' => $fileC, 'overwriteSame' => 1 ),
-			// Does nothing
-			array( 'op' => 'null' ),
-			// Does nothing
-		) );
-
-		$this->assertGoodStatus( $status, "Operation batch succeeded" );
-		$this->assertEquals( true, $status->isOK(), "Operation batch succeeded" );
-		$this->assertEquals( 16, count( $status->success ),
-			"Operation batch has correct success array" );
-
-		$this->assertEquals( false, $this->backend->fileExists( array( 'src' => $fileA ) ),
-			"File does not exist at $fileA" );
-		$this->assertEquals( false, $this->backend->fileExists( array( 'src' => $fileB ) ),
-			"File does not exist at $fileB" );
-		$this->assertEquals( false, $this->backend->fileExists( array( 'src' => $fileD ) ),
-			"File does not exist at $fileD" );
-
-		$this->assertEquals( true, $this->backend->fileExists( array( 'src' => $fileC ) ),
-			"File exists at $fileC" );
-		$this->assertEquals( $fileBContents,
-			$this->backend->getFileContents( array( 'src' => $fileC ) ),
-			"Correct file contents of $fileC" );
-		$this->assertEquals( strlen( $fileBContents ),
-			$this->backend->getFileSize( array( 'src' => $fileC ) ),
-			"Correct file size of $fileC" );
-		$this->assertEquals( wfBaseConvert( sha1( $fileBContents ), 16, 36, 31 ),
-			$this->backend->getFileSha1Base36( array( 'src' => $fileC ) ),
-			"Correct file SHA-1 of $fileC" );
-	}
-
-	public function testDoOperationsFailing() {
-		$this->backend = $this->singleBackend;
-		$this->tearDownFiles();
-		$this->doTestDoOperationsFailing();
-		$this->tearDownFiles();
-
-		$this->backend = $this->multiBackend;
-		$this->tearDownFiles();
-		$this->doTestDoOperationsFailing();
-		$this->tearDownFiles();
-	}
-
-	private function doTestDoOperationsFailing() {
-		$base = self::baseStorePath();
-
-		$fileA = "$base/unittest-cont2/a/b/fileA.txt";
-		$fileAContents = '3tqtmoeatmn4wg4qe-mg3qt3 tq';
-		$fileB = "$base/unittest-cont2/a/b/fileB.txt";
-		$fileBContents = 'g-jmq3gpqgt3qtg q3GT ';
-		$fileC = "$base/unittest-cont2/a/b/fileC.txt";
-		$fileCContents = 'eigna[ogmewt 3qt g3qg flew[ag';
-		$fileD = "$base/unittest-cont2/a/b/fileD.txt";
-
-		$this->prepare( array( 'dir' => dirname( $fileA ) ) );
-		$this->create( array( 'dst' => $fileA, 'content' => $fileAContents ) );
-		$this->prepare( array( 'dir' => dirname( $fileB ) ) );
-		$this->create( array( 'dst' => $fileB, 'content' => $fileBContents ) );
-		$this->prepare( array( 'dir' => dirname( $fileC ) ) );
-		$this->create( array( 'dst' => $fileC, 'content' => $fileCContents ) );
-
-		$status = $this->backend->doOperations( array(
-			array( 'op' => 'copy', 'src' => $fileA, 'dst' => $fileC, 'overwrite' => 1 ),
-			// Now: A:<A>, B:<B>, C:<A>, D:<empty> (file:<orginal contents>)
-			array( 'op' => 'copy', 'src' => $fileC, 'dst' => $fileA, 'overwriteSame' => 1 ),
-			// Now: A:<A>, B:<B>, C:<A>, D:<empty>
-			array( 'op' => 'copy', 'src' => $fileB, 'dst' => $fileD, 'overwrite' => 1 ),
-			// Now: A:<A>, B:<B>, C:<A>, D:<B>
-			array( 'op' => 'move', 'src' => $fileC, 'dst' => $fileD ),
-			// Now: A:<A>, B:<B>, C:<A>, D:<empty> (failed)
-			array( 'op' => 'move', 'src' => $fileB, 'dst' => $fileC, 'overwriteSame' => 1 ),
-			// Now: A:<A>, B:<B>, C:<A>, D:<empty> (failed)
-			array( 'op' => 'move', 'src' => $fileB, 'dst' => $fileA, 'overwrite' => 1 ),
-			// Now: A:<B>, B:<empty>, C:<A>, D:<empty>
-			array( 'op' => 'delete', 'src' => $fileD ),
-			// Now: A:<B>, B:<empty>, C:<A>, D:<empty>
-			array( 'op' => 'null' ),
-			// Does nothing
-		), array( 'force' => 1 ) );
-
-		$this->assertNotEquals( array(), $status->errors, "Operation had warnings" );
-		$this->assertEquals( true, $status->isOK(), "Operation batch succeeded" );
-		$this->assertEquals( 8, count( $status->success ),
-			"Operation batch has correct success array" );
-
-		$this->assertEquals( false, $this->backend->fileExists( array( 'src' => $fileB ) ),
-			"File does not exist at $fileB" );
-		$this->assertEquals( false, $this->backend->fileExists( array( 'src' => $fileD ) ),
-			"File does not exist at $fileD" );
-
-		$this->assertEquals( true, $this->backend->fileExists( array( 'src' => $fileA ) ),
-			"File does not exist at $fileA" );
-		$this->assertEquals( true, $this->backend->fileExists( array( 'src' => $fileC ) ),
-			"File exists at $fileC" );
-		$this->assertEquals( $fileBContents,
-			$this->backend->getFileContents( array( 'src' => $fileA ) ),
-			"Correct file contents of $fileA" );
-		$this->assertEquals( strlen( $fileBContents ),
-			$this->backend->getFileSize( array( 'src' => $fileA ) ),
-			"Correct file size of $fileA" );
-		$this->assertEquals( wfBaseConvert( sha1( $fileBContents ), 16, 36, 31 ),
-			$this->backend->getFileSha1Base36( array( 'src' => $fileA ) ),
-			"Correct file SHA-1 of $fileA" );
-	}
-
-	public function testGetFileList() {
-		$this->backend = $this->singleBackend;
-		$this->tearDownFiles();
-		$this->doTestGetFileList();
-		$this->tearDownFiles();
-
-		$this->backend = $this->multiBackend;
-		$this->tearDownFiles();
-		$this->doTestGetFileList();
-		$this->tearDownFiles();
-	}
-
-	private function doTestGetFileList() {
-		$backendName = $this->backendClass();
-		$base = self::baseStorePath();
-
-		// Should have no errors
-		$iter = $this->backend->getFileList( array( 'dir' => "$base/unittest-cont-notexists" ) );
-
-		$files = array(
-			"$base/unittest-cont1/e/test1.txt",
-			"$base/unittest-cont1/e/test2.txt",
-			"$base/unittest-cont1/e/test3.txt",
-			"$base/unittest-cont1/e/subdir1/test1.txt",
-			"$base/unittest-cont1/e/subdir1/test2.txt",
-			"$base/unittest-cont1/e/subdir2/test3.txt",
-			"$base/unittest-cont1/e/subdir2/test4.txt",
-			"$base/unittest-cont1/e/subdir2/subdir/test1.txt",
-			"$base/unittest-cont1/e/subdir2/subdir/test2.txt",
-			"$base/unittest-cont1/e/subdir2/subdir/test3.txt",
-			"$base/unittest-cont1/e/subdir2/subdir/test4.txt",
-			"$base/unittest-cont1/e/subdir2/subdir/test5.txt",
-			"$base/unittest-cont1/e/subdir2/subdir/sub/test0.txt",
-			"$base/unittest-cont1/e/subdir2/subdir/sub/120-px-file.txt",
-		);
-
-		// Add the files
-		$ops = array();
-		foreach ( $files as $file ) {
-			$this->prepare( array( 'dir' => dirname( $file ) ) );
-			$ops[] = array( 'op' => 'create', 'content' => 'xxy', 'dst' => $file );
-		}
-		$status = $this->backend->doQuickOperations( $ops );
-		$this->assertGoodStatus( $status,
-			"Creation of files succeeded ($backendName)." );
-		$this->assertEquals( true, $status->isOK(),
-			"Creation of files succeeded with OK status ($backendName)." );
-
-		// Expected listing
-		$expected = array(
-			"e/test1.txt",
-			"e/test2.txt",
-			"e/test3.txt",
-			"e/subdir1/test1.txt",
-			"e/subdir1/test2.txt",
-			"e/subdir2/test3.txt",
-			"e/subdir2/test4.txt",
-			"e/subdir2/subdir/test1.txt",
-			"e/subdir2/subdir/test2.txt",
-			"e/subdir2/subdir/test3.txt",
-			"e/subdir2/subdir/test4.txt",
-			"e/subdir2/subdir/test5.txt",
-			"e/subdir2/subdir/sub/test0.txt",
-			"e/subdir2/subdir/sub/120-px-file.txt",
-		);
-		sort( $expected );
-
-		// Actual listing (no trailing slash)
-		$list = array();
-		$iter = $this->backend->getFileList( array( 'dir' => "$base/unittest-cont1" ) );
-		foreach ( $iter as $file ) {
-			$list[] = $file;
-		}
-		sort( $list );
-
-		$this->assertEquals( $expected, $list, "Correct file listing ($backendName)." );
-
-		// Actual listing (with trailing slash)
-		$list = array();
-		$iter = $this->backend->getFileList( array( 'dir' => "$base/unittest-cont1/" ) );
-		foreach ( $iter as $file ) {
-			$list[] = $file;
-		}
-		sort( $list );
-
-		$this->assertEquals( $expected, $list, "Correct file listing ($backendName)." );
-
-		// Expected listing
-		$expected = array(
-			"test1.txt",
-			"test2.txt",
-			"test3.txt",
-			"test4.txt",
-			"test5.txt",
-			"sub/test0.txt",
-			"sub/120-px-file.txt",
-		);
-		sort( $expected );
-
-		// Actual listing (no trailing slash)
-		$list = array();
-		$iter = $this->backend->getFileList( array( 'dir' => "$base/unittest-cont1/e/subdir2/subdir" ) );
-		foreach ( $iter as $file ) {
-			$list[] = $file;
-		}
-		sort( $list );
-
-		$this->assertEquals( $expected, $list, "Correct file listing ($backendName)." );
-
-		// Actual listing (with trailing slash)
-		$list = array();
-		$iter = $this->backend->getFileList( array( 'dir' => "$base/unittest-cont1/e/subdir2/subdir/" ) );
-		foreach ( $iter as $file ) {
-			$list[] = $file;
-		}
-		sort( $list );
-
-		$this->assertEquals( $expected, $list, "Correct file listing ($backendName)." );
-
-		// Actual listing (using iterator second time)
-		$list = array();
-		foreach ( $iter as $file ) {
-			$list[] = $file;
-		}
-		sort( $list );
-
-		$this->assertEquals( $expected, $list, "Correct file listing ($backendName), second iteration." );
-
-		// Expected listing (top files only)
-		$expected = array(
-			"test1.txt",
-			"test2.txt",
-			"test3.txt",
-			"test4.txt",
-			"test5.txt"
-		);
-		sort( $expected );
-
-		// Actual listing (top files only)
-		$list = array();
-		$iter = $this->backend->getTopFileList( array( 'dir' => "$base/unittest-cont1/e/subdir2/subdir" ) );
-		foreach ( $iter as $file ) {
-			$list[] = $file;
-		}
-		sort( $list );
-
-		$this->assertEquals( $expected, $list, "Correct top file listing ($backendName)." );
-
-		foreach ( $files as $file ) { // clean up
-			$this->backend->doOperation( array( 'op' => 'delete', 'src' => $file ) );
-		}
-
-		$iter = $this->backend->getFileList( array( 'dir' => "$base/unittest-cont1/not/exists" ) );
-		foreach ( $iter as $iter ) {} // no errors
-	}
-
-	public function testGetDirectoryList() {
-		$this->backend = $this->singleBackend;
-		$this->tearDownFiles();
-		$this->doTestGetDirectoryList();
-		$this->tearDownFiles();
-
-		$this->backend = $this->multiBackend;
-		$this->tearDownFiles();
-		$this->doTestGetDirectoryList();
-		$this->tearDownFiles();
-	}
-
-	private function doTestGetDirectoryList() {
-		$backendName = $this->backendClass();
-
-		$base = self::baseStorePath();
-		$files = array(
-			"$base/unittest-cont1/e/test1.txt",
-			"$base/unittest-cont1/e/test2.txt",
-			"$base/unittest-cont1/e/test3.txt",
-			"$base/unittest-cont1/e/subdir1/test1.txt",
-			"$base/unittest-cont1/e/subdir1/test2.txt",
-			"$base/unittest-cont1/e/subdir2/test3.txt",
-			"$base/unittest-cont1/e/subdir2/test4.txt",
-			"$base/unittest-cont1/e/subdir2/subdir/test1.txt",
-			"$base/unittest-cont1/e/subdir3/subdir/test2.txt",
-			"$base/unittest-cont1/e/subdir4/subdir/test3.txt",
-			"$base/unittest-cont1/e/subdir4/subdir/test4.txt",
-			"$base/unittest-cont1/e/subdir4/subdir/test5.txt",
-			"$base/unittest-cont1/e/subdir4/subdir/sub/test0.txt",
-			"$base/unittest-cont1/e/subdir4/subdir/sub/120-px-file.txt",
-		);
-
-		// Add the files
-		$ops = array();
-		foreach ( $files as $file ) {
-			$this->prepare( array( 'dir' => dirname( $file ) ) );
-			$ops[] = array( 'op' => 'create', 'content' => 'xxy', 'dst' => $file );
-		}
-		$status = $this->backend->doQuickOperations( $ops );
-		$this->assertGoodStatus( $status,
-			"Creation of files succeeded ($backendName)." );
-		$this->assertEquals( true, $status->isOK(),
-			"Creation of files succeeded with OK status ($backendName)." );
-
-		$this->assertEquals( true,
-			$this->backend->directoryExists( array( 'dir' => "$base/unittest-cont1/e/subdir1" ) ),
-			"Directory exists in ($backendName)." );
-		$this->assertEquals( true,
-			$this->backend->directoryExists( array( 'dir' => "$base/unittest-cont1/e/subdir2/subdir" ) ),
-			"Directory exists in ($backendName)." );
-		$this->assertEquals( false,
-			$this->backend->directoryExists( array( 'dir' => "$base/unittest-cont1/e/subdir2/test1.txt" ) ),
-			"Directory does not exists in ($backendName)." );
-
-		// Expected listing
-		$expected = array(
-			"e",
-		);
-		sort( $expected );
-
-		// Actual listing (no trailing slash)
-		$list = array();
-		$iter = $this->backend->getTopDirectoryList( array( 'dir' => "$base/unittest-cont1" ) );
-		foreach ( $iter as $file ) {
-			$list[] = $file;
-		}
-		sort( $list );
-
-		$this->assertEquals( $expected, $list, "Correct top dir listing ($backendName)." );
-
-		// Expected listing
-		$expected = array(
-			"subdir1",
-			"subdir2",
-			"subdir3",
-			"subdir4",
-		);
-		sort( $expected );
-
-		// Actual listing (no trailing slash)
-		$list = array();
-		$iter = $this->backend->getTopDirectoryList( array( 'dir' => "$base/unittest-cont1/e" ) );
-		foreach ( $iter as $file ) {
-			$list[] = $file;
-		}
-		sort( $list );
-
-		$this->assertEquals( $expected, $list, "Correct top dir listing ($backendName)." );
-
-		// Actual listing (with trailing slash)
-		$list = array();
-		$iter = $this->backend->getTopDirectoryList( array( 'dir' => "$base/unittest-cont1/e/" ) );
-		foreach ( $iter as $file ) {
-			$list[] = $file;
-		}
-		sort( $list );
-
-		$this->assertEquals( $expected, $list, "Correct top dir listing ($backendName)." );
-
-		// Expected listing
-		$expected = array(
-			"subdir",
-		);
-		sort( $expected );
-
-		// Actual listing (no trailing slash)
-		$list = array();
-		$iter = $this->backend->getTopDirectoryList( array( 'dir' => "$base/unittest-cont1/e/subdir2" ) );
-		foreach ( $iter as $file ) {
-			$list[] = $file;
-		}
-		sort( $list );
-
-		$this->assertEquals( $expected, $list, "Correct top dir listing ($backendName)." );
-
-		// Actual listing (with trailing slash)
-		$list = array();
-		$iter = $this->backend->getTopDirectoryList( array( 'dir' => "$base/unittest-cont1/e/subdir2/" ) );
-		foreach ( $iter as $file ) {
-			$list[] = $file;
-		}
-		sort( $list );
-
-		$this->assertEquals( $expected, $list, "Correct top dir listing ($backendName)." );
-
-		// Actual listing (using iterator second time)
-		$list = array();
-		foreach ( $iter as $file ) {
-			$list[] = $file;
-		}
-		sort( $list );
-
-		$this->assertEquals( $expected, $list, "Correct top dir listing ($backendName), second iteration." );
-
-		// Expected listing (recursive)
-		$expected = array(
-			"e",
-			"e/subdir1",
-			"e/subdir2",
-			"e/subdir3",
-			"e/subdir4",
-			"e/subdir2/subdir",
-			"e/subdir3/subdir",
-			"e/subdir4/subdir",
-			"e/subdir4/subdir/sub",
-		);
-		sort( $expected );
-
-		// Actual listing (recursive)
-		$list = array();
-		$iter = $this->backend->getDirectoryList( array( 'dir' => "$base/unittest-cont1/" ) );
-		foreach ( $iter as $file ) {
-			$list[] = $file;
-		}
-		sort( $list );
-
-		$this->assertEquals( $expected, $list, "Correct dir listing ($backendName)." );
-
-		// Expected listing (recursive)
-		$expected = array(
-			"subdir",
-			"subdir/sub",
-		);
-		sort( $expected );
-
-		// Actual listing (recursive)
-		$list = array();
-		$iter = $this->backend->getDirectoryList( array( 'dir' => "$base/unittest-cont1/e/subdir4" ) );
-		foreach ( $iter as $file ) {
-			$list[] = $file;
-		}
-		sort( $list );
-
-		$this->assertEquals( $expected, $list, "Correct dir listing ($backendName)." );
-
-		// Actual listing (recursive, second time)
-		$list = array();
-		foreach ( $iter as $file ) {
-			$list[] = $file;
-		}
-		sort( $list );
-
-		$this->assertEquals( $expected, $list, "Correct dir listing ($backendName)." );
-
-		foreach ( $files as $file ) { // clean up
-			$this->backend->doOperation( array( 'op' => 'delete', 'src' => $file ) );
-		}
-
-		$iter = $this->backend->getDirectoryList( array( 'dir' => "$base/unittest-cont1/not/exists" ) );
-		foreach ( $iter as $iter ) {} // no errors
-	}
-
-	public function testLockCalls() {
-		$this->backend = $this->singleBackend;
-		$this->doTestLockCalls();
-	}
-
-	private function doTestLockCalls() {
-		$backendName = $this->backendClass();
-
-		for ( $i=0; $i<50; $i++ ) {
-			$paths = array(
-				"test1.txt",
-				"test2.txt",
-				"test3.txt",
-				"subdir1",
-				"subdir1", // duplicate
-				"subdir1/test1.txt",
-				"subdir1/test2.txt",
-				"subdir2",
-				"subdir2", // duplicate
-				"subdir2/test3.txt",
-				"subdir2/test4.txt",
-				"subdir2/subdir",
-				"subdir2/subdir/test1.txt",
-				"subdir2/subdir/test2.txt",
-				"subdir2/subdir/test3.txt",
-				"subdir2/subdir/test4.txt",
-				"subdir2/subdir/test5.txt",
-				"subdir2/subdir/sub",
-				"subdir2/subdir/sub/test0.txt",
-				"subdir2/subdir/sub/120-px-file.txt",
-			);
-
-			$status = $this->backend->lockFiles( $paths, LockManager::LOCK_EX );
-			$this->assertEquals( array(), $status->errors,
-				"Locking of files succeeded ($backendName)." );
-			$this->assertEquals( true, $status->isOK(),
-				"Locking of files succeeded with OK status ($backendName)." );
-
-			$status = $this->backend->lockFiles( $paths, LockManager::LOCK_SH );
-			$this->assertEquals( array(), $status->errors,
-				"Locking of files succeeded ($backendName)." );
-			$this->assertEquals( true, $status->isOK(),
-				"Locking of files succeeded with OK status ($backendName)." );
-
-			$status = $this->backend->unlockFiles( $paths, LockManager::LOCK_SH );
-			$this->assertEquals( array(), $status->errors,
-				"Locking of files succeeded ($backendName)." );
-			$this->assertEquals( true, $status->isOK(),
-				"Locking of files succeeded with OK status ($backendName)." );
-
-			$status = $this->backend->unlockFiles( $paths, LockManager::LOCK_EX );
-			$this->assertEquals( array(), $status->errors,
-				"Locking of files succeeded ($backendName)." );
-			$this->assertEquals( true, $status->isOK(),
-				"Locking of files succeeded with OK status ($backendName)." );
-		}
-	}
-
-	// test helper wrapper for backend prepare() function
-	private function prepare( array $params ) {
-		return $this->backend->prepare( $params );
-	}
-
-	// test helper wrapper for backend prepare() function
-	private function create( array $params ) {
-		$params['op'] = 'create';
-		return $this->backend->doQuickOperations( array( $params ) );
-	}
-
-	function tearDownFiles() {
-		foreach ( $this->filesToPrune as $file ) {
-			@unlink( $file );
-		}
-		$containers = array( 'unittest-cont1', 'unittest-cont2' );
-		foreach ( $containers as $container ) {
-			$this->deleteFiles( $container );
-		}
-		$this->filesToPrune = array();
-	}
-
-	private function deleteFiles( $container ) {
-		$base = self::baseStorePath();
-		$iter = $this->backend->getFileList( array( 'dir' => "$base/$container" ) );
-		if ( $iter ) {
-			foreach ( $iter as $file ) {
-				$this->backend->quickDelete( array( 'src' => "$base/$container/$file" ) );
-			}
-		}
-		$this->backend->clean( array( 'dir' => "$base/$container", 'recursive' => 1 ) );
-	}
-
-	function assertBackendPathsConsistent( array $paths ) {
-		if ( $this->backend instanceof FileBackendMultiWrite ) {
-			$status = $this->backend->consistencyCheck( $paths );
-			$this->assertGoodStatus( $status, "Files synced: " . implode( ',', $paths ) );
-		}
-	}
-
-	function assertGoodStatus( $status, $msg ) {
-		$this->assertEquals( print_r( array(), 1 ), print_r( $status->errors, 1 ), $msg );
-	}
-}
diff --git a/tests/phpunit/includes/parser/TagHooksTest.php b/tests/phpunit/includes/parser/TagHooksTest.php
index d089affced..292f13ad1a 100644
--- a/tests/phpunit/includes/parser/TagHooksTest.php
+++ b/tests/phpunit/includes/parser/TagHooksTest.php
@@ -12,7 +12,13 @@ class TagHookTest extends MediaWikiTestCase {
 	public static function provideBadNames() {
 		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
 	 */
diff --git a/tests/phpunit/includes/site/SiteObjectTest.php b/tests/phpunit/includes/site/SiteObjectTest.php
index e8358f388e..207f46c080 100644
--- a/tests/phpunit/includes/site/SiteObjectTest.php
+++ b/tests/phpunit/includes/site/SiteObjectTest.php
@@ -25,6 +25,7 @@
  * @ingroup Test
  *
  * @group Site
+ * @group Database
  *
  * @licence GNU GPL v2+
  * @author Jeroen De Dauw < jeroendedauw@gmail.com >
@@ -57,9 +58,9 @@ class SiteObjectTest extends ORMRowTest {
 	public function constructorTestProvider() {
 		$argLists = array();
 
-		$argLists[] = array( 'global_key' => '42' );
+		$argLists[] = array( 'global_key' => 'foo' );
 
-		$argLists[] = array( 'global_key' => '42', 'type' => Site::TYPE_MEDIAWIKI );
+		$argLists[] = array( 'global_key' => 'bar', 'type' => Site::TYPE_MEDIAWIKI );
 
 		$constructorArgs = array();
 
@@ -229,6 +230,17 @@ class SiteObjectTest extends ORMRowTest {
 		$this->assertEquals( $path, $site->getPath( 'foo' ) );
 	}
 
+	public function testProtocolRelativePath() {
+		/* @var SiteObject $site */
+		$site = $this->getRowInstance( $this->getMockFields(), false );
+
+		$type = $site->getLinkPathType();
+		$path = '//acme.com/'; // protocol-relative URL
+		$site->setPath( $type, $path );
+
+		$this->assertEquals( '', $site->getProtocol() );
+	}
+
 	public function provideGetPageUrl() {
 		//NOTE: the assumption that the URL is built by replacing $1
 		//      with the urlencoded version of $page
diff --git a/tests/phpunit/languages/LanguageAmTest.php b/tests/phpunit/languages/LanguageAmTest.php
index 26790886b4..16215c5965 100644
--- a/tests/phpunit/languages/LanguageAmTest.php
+++ b/tests/phpunit/languages/LanguageAmTest.php
@@ -6,20 +6,12 @@
  */
 
 /** Tests for MediaWiki languages/LanguageAm.php */
-class LanguageAmTest extends MediaWikiTestCase {
-	private $lang;
-
-	protected function setUp() {
-		$this->lang = Language::factory( 'Am' );
-	}
-	protected function tearDown() {
-		unset( $this->lang );
-	}
+class LanguageAmTest extends LanguageClassesTestCase {
 
 	/** @dataProvider providePlural */
 	function testPlural( $result, $value ) {
 		$forms =  array( 'one', 'other' );
-		$this->assertEquals( $result, $this->lang->convertPlural( $value, $forms ) );
+		$this->assertEquals( $result, $this->getLang()->convertPlural( $value, $forms ) );
 	}
 
 	function providePlural() {
diff --git a/tests/phpunit/languages/LanguageArTest.php b/tests/phpunit/languages/LanguageArTest.php
index 84507c5da8..17f735290f 100644
--- a/tests/phpunit/languages/LanguageArTest.php
+++ b/tests/phpunit/languages/LanguageArTest.php
@@ -5,19 +5,11 @@
  */
 
 /** Tests for MediaWiki languages/LanguageAr.php */
-class LanguageArTest extends MediaWikiTestCase {
-	private $lang;
-
-	protected function setUp() {
-		$this->lang = Language::factory( 'Ar' );
-	}
-	protected function tearDown() {
-		unset( $this->lang );
-	}
+class LanguageArTest extends LanguageClassesTestCase {
 
 	function testFormatNum() {
-		$this->assertEquals( '١٬٢٣٤٬٥٦٧', $this->lang->formatNum( '1234567' ) );
-		$this->assertEquals( '-١٢٫٨٩', $this->lang->formatNum( -12.89 ) );
+		$this->assertEquals( '١٬٢٣٤٬٥٦٧', $this->getLang()->formatNum( '1234567' ) );
+		$this->assertEquals( '-١٢٫٨٩', $this->getLang()->formatNum( -12.89 ) );
 	}
 
 	/**
@@ -25,7 +17,7 @@ class LanguageArTest extends MediaWikiTestCase {
 	 * @dataProvider providerSprintfDate
 	 */
 	function testSprintfDate( $format, $date, $expected ) {
-		$this->assertEquals( $expected, $this->lang->sprintfDate( $format, $date ) );
+		$this->assertEquals( $expected, $this->getLang()->sprintfDate( $format, $date ) );
 	}
 
 	function providerSprintfDate() {
@@ -55,7 +47,7 @@ class LanguageArTest extends MediaWikiTestCase {
 	/** @dataProvider providePlural */
 	function testPlural( $result, $value ) {
 		$forms =  array( 'zero', 'one', 'two', 'few', 'many', 'other' );
-		$this->assertEquals( $result, $this->lang->convertPlural( $value, $forms ) );
+		$this->assertEquals( $result, $this->getLang()->convertPlural( $value, $forms ) );
 	}
 	function providePlural() {
 		return array (
diff --git a/tests/phpunit/languages/LanguageBeTest.php b/tests/phpunit/languages/LanguageBeTest.php
index 3135ca8b9a..06ee240f4b 100644
--- a/tests/phpunit/languages/LanguageBeTest.php
+++ b/tests/phpunit/languages/LanguageBeTest.php
@@ -6,20 +6,12 @@
  */
 
 /** Tests for MediaWiki languages/LanguageBe.php */
-class LanguageBeTest extends MediaWikiTestCase {
-	private $lang;
-
-	protected function setUp() {
-		$this->lang = Language::factory( 'Be' );
-	}
-	protected function tearDown() {
-		unset( $this->lang );
-	}
+class LanguageBeTest extends LanguageClassesTestCase {
 
 	/** @dataProvider providePlural */
 	function testPlural( $result, $value ) {
 		$forms =  array( 'one', 'few', 'many', 'other' );
-		$this->assertEquals( $result, $this->lang->convertPlural( $value, $forms ) );
+		$this->assertEquals( $result, $this->getLang()->convertPlural( $value, $forms ) );
 	}
 
 	function providePlural() {
diff --git a/tests/phpunit/languages/LanguageBe_taraskTest.php b/tests/phpunit/languages/LanguageBe_taraskTest.php
index 11aacb64c6..ad0ef43cb4 100644
--- a/tests/phpunit/languages/LanguageBe_taraskTest.php
+++ b/tests/phpunit/languages/LanguageBe_taraskTest.php
@@ -1,36 +1,39 @@
 <?php
 
-class LanguageBeTaraskTest extends MediaWikiTestCase {
-	private $lang;
+class LanguageBe_taraskTest extends LanguageClassesTestCase {
 
-	protected function setUp() {
-		$this->lang = Language::factory( 'Be-tarask' );
-	}
-	protected function tearDown() {
-		unset( $this->lang );
+	/**
+	 * Make sure the language code we are given is indeed
+	 * be-tarask. This is to ensure LanguageClassesTestCase
+	 * does not give us the wrong language.
+	 */
+	function testBeTaraskTestsUsesBeTaraskCode() {
+		$this->assertEquals( 'be-tarask',
+			$this->getLang()->getCode()
+		);
 	}
 
 	/** see bug 23156 & r64981 */
 	function testSearchRightSingleQuotationMarkAsApostroph() {
 		$this->assertEquals(
 			"'",
-			$this->lang->normalizeForSearch( '’' ),
+			$this->getLang()->normalizeForSearch( '’' ),
 			'bug 23156: U+2019 conversion to U+0027'
 		);
 	}
 	/** see bug 23156 & r64981 */
 	function testCommafy() {
-		$this->assertEquals( '1,234,567', $this->lang->commafy( '1234567' ) );
-		$this->assertEquals(    '12,345', $this->lang->commafy(   '12345' ) );
+		$this->assertEquals( '1,234,567', $this->getLang()->commafy( '1234567' ) );
+		$this->assertEquals(    '12,345', $this->getLang()->commafy(   '12345' ) );
 	}
 	/** see bug 23156 & r64981 */
 	function testDoesNotCommafyFourDigitsNumber() {
-		$this->assertEquals(      '1234', $this->lang->commafy(    '1234' ) );
+		$this->assertEquals(      '1234', $this->getLang()->commafy(    '1234' ) );
 	}
 	/** @dataProvider providePluralFourForms */
 	function testPluralFourForms( $result, $value ) {
 		$forms =  array( 'one', 'few', 'many', 'other' );
-		$this->assertEquals( $result, $this->lang->convertPlural( $value, $forms ) );
+		$this->assertEquals( $result, $this->getLang()->convertPlural( $value, $forms ) );
 	}
 
 	function providePluralFourForms() {
@@ -51,7 +54,7 @@ class LanguageBeTaraskTest extends MediaWikiTestCase {
 	/** @dataProvider providePluralTwoForms */
 	function testPluralTwoForms( $result, $value ) {
 		$forms =  array( 'one', 'several' );
-		$this->assertEquals( $result, $this->lang->convertPlural( $value, $forms ) );
+		$this->assertEquals( $result, $this->getLang()->convertPlural( $value, $forms ) );
 	}
 	function providePluralTwoForms() {
 		return array (
diff --git a/tests/phpunit/languages/LanguageBhTest.php b/tests/phpunit/languages/LanguageBhTest.php
index 00f4e13468..5af7adb278 100644
--- a/tests/phpunit/languages/LanguageBhTest.php
+++ b/tests/phpunit/languages/LanguageBhTest.php
@@ -6,20 +6,12 @@
  */
 
 /** Tests for MediaWiki languages/LanguageBh.php */
-class LanguageBhTest extends MediaWikiTestCase {
-	private $lang;
-
-	protected function setUp() {
-		$this->lang = Language::factory( 'Bh' );
-	}
-	protected function tearDown() {
-		unset( $this->lang );
-	}
+class LanguageBhTest extends LanguageClassesTestCase {
 
 	/** @dataProvider providePlural */
 	function testPlural( $result, $value ) {
 		$forms =  array( 'one', 'other' );
-		$this->assertEquals( $result, $this->lang->convertPlural( $value, $forms ) );
+		$this->assertEquals( $result, $this->getLang()->convertPlural( $value, $forms ) );
 	}
 
 	function providePlural() {
diff --git a/tests/phpunit/languages/LanguageBsTest.php b/tests/phpunit/languages/LanguageBsTest.php
index 39391af603..dd00428627 100644
--- a/tests/phpunit/languages/LanguageBsTest.php
+++ b/tests/phpunit/languages/LanguageBsTest.php
@@ -6,20 +6,12 @@
  */
 
 /** Tests for MediaWiki languages/LanguageBs.php */
-class LanguageBsTest extends MediaWikiTestCase {
-	private $lang;
-
-	protected function setUp() {
-		$this->lang = Language::factory( 'Bs' );
-	}
-	protected function tearDown() {
-		unset( $this->lang );
-	}
+class LanguageBsTest extends LanguageClassesTestCase {
 
 	/** @dataProvider providePlural */
 	function testPlural( $result, $value ) {
 		$forms =  array( 'one', 'few', 'many', 'other' );
-		$this->assertEquals( $result, $this->lang->convertPlural( $value, $forms ) );
+		$this->assertEquals( $result, $this->getLang()->convertPlural( $value, $forms ) );
 	}
 
 	function providePlural() {
diff --git a/tests/phpunit/languages/LanguageClassesTestCase.php b/tests/phpunit/languages/LanguageClassesTestCase.php
new file mode 100644
index 0000000000..4f0a37f1c7
--- /dev/null
+++ b/tests/phpunit/languages/LanguageClassesTestCase.php
@@ -0,0 +1,100 @@
+<?php
+/**
+ * Helping class to run tests using a clean language instance.
+ *
+ * This is intended for the MediaWiki language class tests under
+ * tests/phpunit/languages. You simply need to extends this test
+ * and set it up with a language code using setUpBeforeClass:
+ *
+ * @par Setting up a language:
+ * @code
+ * class LanguageFooTest extends LanguageClassesTestCase {
+ *   public static function setUpBeforeClass() {
+ *     self::setLang( 'Foo' );
+ *   }
+ * @endcode
+ *
+ * Before each tests, a new language object is build which you
+ * can retrieve in your test using the $this->getLang() method:
+ *
+ * @par Using the crafted language object:
+ * @code
+ * function testHasLanguageObject() {
+ *   $langObject = $this->getLang();
+ *   $this->assertInstanceOf( 'LanguageFoo',
+ *     $langObject
+ *   );
+ * }
+ * @endcode
+ */
+abstract class LanguageClassesTestCase extends MediaWikiTestCase {
+
+	/**
+	 * Regex used to find out the language code out of the class name
+	 * used by setUpBeforeClass
+	*/
+	private static $reExtractLangFromClass = '/Language(.*)Test/';
+
+	/**
+	 * Hold the language code we are going to use. This is extracted
+	 * directly from the extending class.
+	 */
+	private static $LanguageClassCode;
+
+	/**
+	 * Internal language object
+	 *
+	 * A new object is created before each tests thanks to PHPUnit
+	 * setUp() method, it is deleted after each test too. To get
+	 * this object you simply use the getLang method.
+	 *
+	 * You must have setup a language code first. See $LanguageClassCode
+	 * @code
+	 *  function testWeAreTheChampions() {
+	 *    $this->getLang();  # language object
+	 *  }
+	 * @endcode
+	 */
+	private $languageObject;
+
+	public static function setUpBeforeClass() {
+		$found = preg_match( self::$reExtractLangFromClass,
+			get_called_class(), $m );
+		if ( $found ) {
+			# Normalize language code since classes uses underscores
+			$m[1] = str_replace( '_', '-', $m[1] );
+		} else {
+			# Fallback to english language
+			$m[1] = 'en';
+			wfDebug(
+				__METHOD__ . " could not extract a language name "
+				. "out of " . get_called_class() . " failling back to 'en'\n"
+			);
+		}
+		// TODO: validate $m[1] which should be a valid language code
+		self::$LanguageClassCode = $m[1];
+	}
+
+	protected function getLang() {
+		return $this->languageObject;
+	}
+
+	/**
+	 * Create a new language object before each test.
+	 */
+	protected function setUp() {
+		parent::setUp();
+		$this->languageObject = Language::factory(
+			self::$LanguageClassCode );
+	}
+
+	/**
+	 * Delete the internal language object so each test start
+	 * out with a fresh language instance.
+	 */
+	protected function tearDown() {
+		unset( $this->languageObject );
+		parent::tearDown();
+	}
+
+}
diff --git a/tests/phpunit/languages/LanguageCsTest.php b/tests/phpunit/languages/LanguageCsTest.php
index 862de52513..72c9e79c4d 100644
--- a/tests/phpunit/languages/LanguageCsTest.php
+++ b/tests/phpunit/languages/LanguageCsTest.php
@@ -6,20 +6,12 @@
  */
 
 /** Tests for MediaWiki languages/classes/Languagecs.php */
-class LanguageCsTest extends MediaWikiTestCase {
-	private $lang;
-
-	protected function setUp() {
-		$this->lang = Language::factory( 'cs' );
-	}
-	protected function tearDown() {
-		unset( $this->lang );
-	}
+class LanguageCsTest extends LanguageClassesTestCase {
 
 	/** @dataProvider providerPlural */
 	function testPlural( $result, $value ) {
 		$forms =  array( 'one', 'few', 'other' );
-		$this->assertEquals( $result, $this->lang->convertPlural( $value, $forms ) );
+		$this->assertEquals( $result, $this->getLang()->convertPlural( $value, $forms ) );
 	}
 
 	function providerPlural() {
diff --git a/tests/phpunit/languages/LanguageCuTest.php b/tests/phpunit/languages/LanguageCuTest.php
index 5d5d60cd4c..95f8da7465 100644
--- a/tests/phpunit/languages/LanguageCuTest.php
+++ b/tests/phpunit/languages/LanguageCuTest.php
@@ -6,20 +6,12 @@
  */
 
 /** Tests for MediaWiki languages/LanguageCu.php */
-class LanguageCuTest extends MediaWikiTestCase {
-	private $lang;
-
-	protected function setUp() {
-		$this->lang = Language::factory( 'cu' );
-	}
-	protected function tearDown() {
-		unset( $this->lang );
-	}
+class LanguageCuTest extends LanguageClassesTestCase {
 
 	/** @dataProvider providerPlural */
 	function testPlural( $result, $value ) {
 		$forms =  array( 'one', 'few', 'many', 'other' );
-		$this->assertEquals( $result, $this->lang->convertPlural( $value, $forms ) );
+		$this->assertEquals( $result, $this->getLang()->convertPlural( $value, $forms ) );
 	}
 
 	function providerPlural() {
diff --git a/tests/phpunit/languages/LanguageCyTest.php b/tests/phpunit/languages/LanguageCyTest.php
index 406a943ee1..de6ba5c018 100644
--- a/tests/phpunit/languages/LanguageCyTest.php
+++ b/tests/phpunit/languages/LanguageCyTest.php
@@ -6,20 +6,12 @@
  */
 
 /** Tests for MediaWiki languages/classes/LanguageCy.php */
-class LanguageCyTest extends MediaWikiTestCase {
-	private $lang;
-
-	protected function setUp() {
-		$this->lang = Language::factory( 'cy' );
-	}
-	protected function tearDown() {
-		unset( $this->lang );
-	}
+class LanguageCyTest extends LanguageClassesTestCase {
 
 	/** @dataProvider providerPlural */
 	function testPlural( $result, $value ) {
 		$forms =  array( 'zero', 'one', 'two', 'few', 'many', 'other' );
-		$this->assertEquals( $result, $this->lang->convertPlural( $value, $forms ) );
+		$this->assertEquals( $result, $this->getLang()->convertPlural( $value, $forms ) );
 	}
 
 	function providerPlural() {
diff --git a/tests/phpunit/languages/LanguageDsbTest.php b/tests/phpunit/languages/LanguageDsbTest.php
index 516b9ee843..8fb6024ce0 100644
--- a/tests/phpunit/languages/LanguageDsbTest.php
+++ b/tests/phpunit/languages/LanguageDsbTest.php
@@ -6,20 +6,12 @@
  */
 
 /** Tests for MediaWiki languages/classes/LanguageDsb.php */
-class LanguageDsbTest extends MediaWikiTestCase {
-	private $lang;
-
-	protected function setUp() {
-		$this->lang = Language::factory( 'dsb' );
-	}
-	protected function tearDown() {
-		unset( $this->lang );
-	}
+class LanguageDsbTest extends LanguageClassesTestCase {
 
 	/** @dataProvider providePlural */
 	function testPlural( $result, $value ) {
 		$forms =  array( 'one', 'two', 'few', 'other' );
-		$this->assertEquals( $result, $this->lang->convertPlural( $value, $forms ) );
+		$this->assertEquals( $result, $this->getLang()->convertPlural( $value, $forms ) );
 	}
 
 	function providePlural() {
diff --git a/tests/phpunit/languages/LanguageFrTest.php b/tests/phpunit/languages/LanguageFrTest.php
index 0a290289c2..05de960646 100644
--- a/tests/phpunit/languages/LanguageFrTest.php
+++ b/tests/phpunit/languages/LanguageFrTest.php
@@ -6,20 +6,12 @@
  */
 
 /** Tests for MediaWiki languages/classes/LanguageFr.php */
-class LanguageFrTest extends MediaWikiTestCase {
-	private $lang;
-
-	protected function setUp() {
-		$this->lang = Language::factory( 'fr' );
-	}
-	protected function tearDown() {
-		unset( $this->lang );
-	}
+class LanguageFrTest extends LanguageClassesTestCase {
 
 	/** @dataProvider providePlural */
 	function testPlural( $result, $value ) {
 		$forms =  array( 'one', 'other' );
-		$this->assertEquals( $result, $this->lang->convertPlural( $value, $forms ) );
+		$this->assertEquals( $result, $this->getLang()->convertPlural( $value, $forms ) );
 	}
 
 	function providePlural() {
diff --git a/tests/phpunit/languages/LanguageGaTest.php b/tests/phpunit/languages/LanguageGaTest.php
index 9535cb1515..0a54592d77 100644
--- a/tests/phpunit/languages/LanguageGaTest.php
+++ b/tests/phpunit/languages/LanguageGaTest.php
@@ -6,20 +6,12 @@
  */
 
 /** Tests for MediaWiki languages/classes/LanguageGa.php */
-class LanguageGaTest extends MediaWikiTestCase {
-	private $lang;
-
-	protected function setUp() {
-		$this->lang = Language::factory( 'ga' );
-	}
-	protected function tearDown() {
-		unset( $this->lang );
-	}
+class LanguageGaTest extends LanguageClassesTestCase {
 
 	/** @dataProvider providerPlural */
 	function testPlural( $result, $value ) {
 		$forms =  array( 'one', 'two', 'other' );
-		$this->assertEquals( $result, $this->lang->convertPlural( $value, $forms ) );
+		$this->assertEquals( $result, $this->getLang()->convertPlural( $value, $forms ) );
 	}
 
 	function providerPlural() {
diff --git a/tests/phpunit/languages/LanguageGdTest.php b/tests/phpunit/languages/LanguageGdTest.php
index e6bfdd7996..7831cd200d 100644
--- a/tests/phpunit/languages/LanguageGdTest.php
+++ b/tests/phpunit/languages/LanguageGdTest.php
@@ -6,21 +6,13 @@
  */
 
 /** Tests for MediaWiki languages/classes/LanguageGd.php */
-class LanguageGdTest extends MediaWikiTestCase {
-	private $lang;
-
-	protected function setUp() {
-		$this->lang = Language::factory( 'gd' );
-	}
-	protected function tearDown() {
-		unset( $this->lang );
-	}
+class LanguageGdTest extends LanguageClassesTestCase {
 
 	/** @dataProvider providerPlural */
 	function testPlural( $result, $value ) {
 		// The CLDR ticket for this plural forms is not same as mw plural forms. See http://unicode.org/cldr/trac/ticket/2883
 		$forms =  array( 'Form 1', 'Form 2', 'Form 3', 'Form 4', 'Form 5', 'Form 6' );
-		$this->assertEquals( $result, $this->lang->convertPlural( $value, $forms ) );
+		$this->assertEquals( $result, $this->getLang()->convertPlural( $value, $forms ) );
 	}
 	function providerPlural() {
 		return array (
diff --git a/tests/phpunit/languages/LanguageGvTest.php b/tests/phpunit/languages/LanguageGvTest.php
index 18cf225670..0edff595e1 100644
--- a/tests/phpunit/languages/LanguageGvTest.php
+++ b/tests/phpunit/languages/LanguageGvTest.php
@@ -6,21 +6,13 @@
  */
 
 /** Tests for MediaWiki languages/classes/LanguageGv.php */
-class LanguageGvTest extends MediaWikiTestCase {
-	private $lang;
-
-	protected function setUp() {
-		$this->lang = Language::factory( 'gv' );
-	}
-	protected function tearDown() {
-		unset( $this->lang );
-	}
+class LanguageGvTest extends LanguageClassesTestCase {
 
 	/** @dataProvider providerPlural */
 	function testPlural( $result, $value ) {
 		// This is not compatible with CLDR plural rules http://unicode.org/repos/cldr-tmp/trunk/diff/supplemental/language_plural_rules.html#gv
 		$forms =  array( 'Form 1', 'Form 2', 'Form 3', 'Form 4' );
-		$this->assertEquals( $result, $this->lang->convertPlural( $value, $forms ) );
+		$this->assertEquals( $result, $this->getLang()->convertPlural( $value, $forms ) );
 	}
 	function providerPlural() {
 		return array (
diff --git a/tests/phpunit/languages/LanguageHeTest.php b/tests/phpunit/languages/LanguageHeTest.php
index 6205320f25..575b277e93 100644
--- a/tests/phpunit/languages/LanguageHeTest.php
+++ b/tests/phpunit/languages/LanguageHeTest.php
@@ -6,20 +6,12 @@
  */
 
 /** Tests for MediaWiki languages/classes/LanguageHe.php */
-class LanguageHeTest extends MediaWikiTestCase {
-	private $lang;
-
-	protected function setUp() {
-		$this->lang = Language::factory( 'he' );
-	}
-	protected function tearDown() {
-		unset( $this->lang );
-	}
+class LanguageHeTest extends LanguageClassesTestCase {
 
 	/** @dataProvider providerPluralDual */
 	function testPluralDual( $result, $value ) {
 		$forms = array( 'one', 'two', 'other' );
-		$this->assertEquals( $result, $this->lang->convertPlural( $value, $forms ) );
+		$this->assertEquals( $result, $this->getLang()->convertPlural( $value, $forms ) );
 	}
 
 	function providerPluralDual() {
@@ -34,7 +26,7 @@ class LanguageHeTest extends MediaWikiTestCase {
 	/** @dataProvider providerPlural */
 	function testPlural( $result, $value ) {
 		$forms = array( 'one', 'other' );
-		$this->assertEquals( $result, $this->lang->convertPlural( $value, $forms ) );
+		$this->assertEquals( $result, $this->getLang()->convertPlural( $value, $forms ) );
 	}
 
 	function providerPlural() {
@@ -45,4 +37,41 @@ class LanguageHeTest extends MediaWikiTestCase {
 			array( 'other', 3 ), // Plural
 		);
 	}
+
+	/** @dataProvider providerGrammar */
+	function testGrammar( $result, $word, $case ) {
+		$this->assertEquals( $result, $this->getLang()->convertGrammar( $word, $case ) );
+	}
+
+	// The comments in the beginning of the line help avoid RTL problems
+	// with text editors.
+	function providerGrammar() {
+		return array (
+			array(
+				/* result */ 'וויקיפדיה',
+				/* word   */ 'ויקיפדיה',
+				/* case   */ 'תחילית',
+			),
+			array(
+				/* result */ 'וולפגנג',
+				/* word   */ 'וולפגנג',
+				/* case   */ 'prefixed',
+			),
+			array(
+				/* result */ 'קובץ',
+				/* word   */ 'הקובץ',
+				/* case   */ 'תחילית',
+			),
+			array(
+				/* result */ 'Ö¾Wikipedia',
+				/* word   */ 'Wikipedia',
+				/* case   */ 'תחילית',
+			),
+			array(
+				/* result */ 'Ö¾1995',
+				/* word   */ '1995',
+				/* case   */ 'תחילית',
+			),
+		);
+	}
 }
diff --git a/tests/phpunit/languages/LanguageHiTest.php b/tests/phpunit/languages/LanguageHiTest.php
index bb3b5faf91..5a780a214e 100644
--- a/tests/phpunit/languages/LanguageHiTest.php
+++ b/tests/phpunit/languages/LanguageHiTest.php
@@ -6,20 +6,12 @@
  */
 
 /** Tests for MediaWiki languages/LanguageHi.php */
-class LanguageHiTest extends MediaWikiTestCase {
-	private $lang;
-
-	protected function setUp() {
-		$this->lang = Language::factory( 'Hi' );
-	}
-	protected function tearDown() {
-		unset( $this->lang );
-	}
+class LanguageHiTest extends LanguageClassesTestCase {
 
 	/** @dataProvider providePlural */
 	function testPlural( $result, $value ) {
 		$forms =  array( 'one', 'other' );
-		$this->assertEquals( $result, $this->lang->convertPlural( $value, $forms ) );
+		$this->assertEquals( $result, $this->getLang()->convertPlural( $value, $forms ) );
 	}
 
 	function providePlural() {
diff --git a/tests/phpunit/languages/LanguageHrTest.php b/tests/phpunit/languages/LanguageHrTest.php
index 6f0ca1b329..748aaf4242 100644
--- a/tests/phpunit/languages/LanguageHrTest.php
+++ b/tests/phpunit/languages/LanguageHrTest.php
@@ -6,20 +6,12 @@
  */
 
 /** Tests for MediaWiki languages/classes/LanguageHr.php */
-class LanguageHrTest extends MediaWikiTestCase {
-	private $lang;
-
-	protected function setUp() {
-		$this->lang = Language::factory( 'hr' );
-	}
-	protected function tearDown() {
-		unset( $this->lang );
-	}
+class LanguageHrTest extends LanguageClassesTestCase {
 
 	/** @dataProvider providerPlural */
 	function testPlural( $result, $value ) {
 		$forms =  array( 'one', 'few', 'many', 'other' );
-		$this->assertEquals( $result, $this->lang->convertPlural( $value, $forms ) );
+		$this->assertEquals( $result, $this->getLang()->convertPlural( $value, $forms ) );
 	}
 
 	function providerPlural() {
diff --git a/tests/phpunit/languages/LanguageHsbTest.php b/tests/phpunit/languages/LanguageHsbTest.php
index d336e8174a..2d90ef095a 100644
--- a/tests/phpunit/languages/LanguageHsbTest.php
+++ b/tests/phpunit/languages/LanguageHsbTest.php
@@ -6,20 +6,12 @@
  */
 
 /** Tests for MediaWiki languages/classes/LanguageHsb.php */
-class LanguageHsbTest extends MediaWikiTestCase {
-	private $lang;
-
-	protected function setUp() {
-		$this->lang = Language::factory( 'hsb' );
-	}
-	protected function tearDown() {
-		unset( $this->lang );
-	}
+class LanguageHsbTest extends LanguageClassesTestCase {
 
 	/** @dataProvider providePlural */
 	function testPlural( $result, $value ) {
 		$forms =  array( 'one', 'two', 'few', 'other' );
-		$this->assertEquals( $result, $this->lang->convertPlural( $value, $forms ) );
+		$this->assertEquals( $result, $this->getLang()->convertPlural( $value, $forms ) );
 	}
 
 	function providePlural() {
diff --git a/tests/phpunit/languages/LanguageHuTest.php b/tests/phpunit/languages/LanguageHuTest.php
index 31818687fe..e01278b2be 100644
--- a/tests/phpunit/languages/LanguageHuTest.php
+++ b/tests/phpunit/languages/LanguageHuTest.php
@@ -6,20 +6,12 @@
  */
 
 /** Tests for MediaWiki languages/LanguageHu.php */
-class LanguageHuTest extends MediaWikiTestCase {
-	private $lang;
-
-	protected function setUp() {
-		$this->lang = Language::factory( 'Hu' );
-	}
-	protected function tearDown() {
-		unset( $this->lang );
-	}
+class LanguageHuTest extends LanguageClassesTestCase {
 
 	/** @dataProvider providePlural */
 	function testPlural( $result, $value ) {
 		$forms = array( 'one', 'other' );
-		$this->assertEquals( $result, $this->lang->convertPlural( $value, $forms ) );
+		$this->assertEquals( $result, $this->getLang()->convertPlural( $value, $forms ) );
 	}
 
 	function providePlural() {
diff --git a/tests/phpunit/languages/LanguageHyTest.php b/tests/phpunit/languages/LanguageHyTest.php
index 2885707c6e..ea6e255642 100644
--- a/tests/phpunit/languages/LanguageHyTest.php
+++ b/tests/phpunit/languages/LanguageHyTest.php
@@ -6,20 +6,12 @@
  */
 
 /** Tests for MediaWiki languages/LanguageHy.php */
-class LanguageHyTest extends MediaWikiTestCase {
-	private $lang;
-
-	protected function setUp() {
-		$this->lang = Language::factory( 'hy' );
-	}
-	protected function tearDown() {
-		unset( $this->lang );
-	}
+class LanguageHyTest extends LanguageClassesTestCase {
 
 	/** @dataProvider providerPlural */
 	function testPlural( $result, $value ) {
 		$forms =  array( 'one', 'other' );
-		$this->assertEquals( $result, $this->lang->convertPlural( $value, $forms ) );
+		$this->assertEquals( $result, $this->getLang()->convertPlural( $value, $forms ) );
 	}
 
 	function providerPlural() {
diff --git a/tests/phpunit/languages/LanguageKshTest.php b/tests/phpunit/languages/LanguageKshTest.php
index 78ff4455ee..e92d264980 100644
--- a/tests/phpunit/languages/LanguageKshTest.php
+++ b/tests/phpunit/languages/LanguageKshTest.php
@@ -6,20 +6,12 @@
  */
 
 /** Tests for MediaWiki languages/classes/LanguageKsh.php */
-class LanguageKshTest extends MediaWikiTestCase {
-	private $lang;
-
-	protected function setUp() {
-		$this->lang = Language::factory( 'ksh' );
-	}
-	protected function tearDown() {
-		unset( $this->lang );
-	}
+class LanguageKshTest extends LanguageClassesTestCase {
 
 	/** @dataProvider providerPlural */
 	function testPlural( $result, $value ) {
 		$forms =  array(  'one', 'other', 'zero' );
-		$this->assertEquals( $result, $this->lang->convertPlural( $value, $forms ) );
+		$this->assertEquals( $result, $this->getLang()->convertPlural( $value, $forms ) );
 	}
 
 	function providerPlural() {
diff --git a/tests/phpunit/languages/LanguageLnTest.php b/tests/phpunit/languages/LanguageLnTest.php
index 60b4945128..8853caaa18 100644
--- a/tests/phpunit/languages/LanguageLnTest.php
+++ b/tests/phpunit/languages/LanguageLnTest.php
@@ -6,20 +6,12 @@
  */
 
 /** Tests for MediaWiki languages/classes/LanguageLn.php */
-class LanguageLnTest extends MediaWikiTestCase {
-	private $lang;
-
-	protected function setUp() {
-		$this->lang = Language::factory( 'ln' );
-	}
-	protected function tearDown() {
-		unset( $this->lang );
-	}
+class LanguageLnTest extends LanguageClassesTestCase {
 
 	/** @dataProvider providePlural */
 	function testPlural( $result, $value ) {
 		$forms =  array( 'one', 'other' );
-		$this->assertEquals( $result, $this->lang->convertPlural( $value, $forms ) );
+		$this->assertEquals( $result, $this->getLang()->convertPlural( $value, $forms ) );
 	}
 
 	function providePlural() {
diff --git a/tests/phpunit/languages/LanguageLtTest.php b/tests/phpunit/languages/LanguageLtTest.php
index 821e02888a..485a090d83 100644
--- a/tests/phpunit/languages/LanguageLtTest.php
+++ b/tests/phpunit/languages/LanguageLtTest.php
@@ -6,26 +6,18 @@
  */
 
 /** Tests for MediaWiki languages/LanguageLt.php */
-class LanguageLtTest extends MediaWikiTestCase {
-	private $lang;
-
-	protected function setUp() {
-		$this->lang = Language::factory( 'Lt' );
-	}
-	protected function tearDown() {
-		unset( $this->lang );
-	}
+class LanguageLtTest extends LanguageClassesTestCase {
 
 	/** @dataProvider provideOneFewOtherCases */
 	function testOneFewOtherPlural( $result, $value ) {
 		$forms =  array( 'one', 'few', 'other' );
-		$this->assertEquals( $result, $this->lang->convertPlural( $value, $forms ) );
+		$this->assertEquals( $result, $this->getLang()->convertPlural( $value, $forms ) );
 	}
 	
 	/** @dataProvider provideOneFewCases */
 	function testOneFewPlural( $result, $value ) {
 		$forms =  array( 'one', 'few' );
-		$this->assertEquals( $result, $this->lang->convertPlural( $value, $forms ) );
+		$this->assertEquals( $result, $this->getLang()->convertPlural( $value, $forms ) );
 	}
 
 	function provideOneFewOtherCases() {
diff --git a/tests/phpunit/languages/LanguageLvTest.php b/tests/phpunit/languages/LanguageLvTest.php
index bb0dc6c82e..bf4f793525 100644
--- a/tests/phpunit/languages/LanguageLvTest.php
+++ b/tests/phpunit/languages/LanguageLvTest.php
@@ -6,20 +6,12 @@
  */
 
 /** Tests for MediaWiki languages/classes/LanguageLv.php */
-class LanguageLvTest extends MediaWikiTestCase {
-	private $lang;
-
-	protected function setUp() {
-		$this->lang = Language::factory( 'lv' );
-	}
-	protected function tearDown() {
-		unset( $this->lang );
-	}
+class LanguageLvTest extends LanguageClassesTestCase {
 
 	/** @dataProvider providerPlural */
 	function testPlural( $result, $value ) {
 		$forms =  array( 'one', 'other' );
-		$this->assertEquals( $result, $this->lang->convertPlural( $value, $forms ) );
+		$this->assertEquals( $result, $this->getLang()->convertPlural( $value, $forms ) );
 	}
 
 	function providerPlural() {
diff --git a/tests/phpunit/languages/LanguageMgTest.php b/tests/phpunit/languages/LanguageMgTest.php
index d6ac643efb..d6d3de9942 100644
--- a/tests/phpunit/languages/LanguageMgTest.php
+++ b/tests/phpunit/languages/LanguageMgTest.php
@@ -6,20 +6,12 @@
  */
 
 /** Tests for MediaWiki languages/classes/LanguageMg.php */
-class LanguageMgTest extends MediaWikiTestCase {
-	private $lang;
-
-	protected function setUp() {
-		$this->lang = Language::factory( 'mg' );
-	}
-	protected function tearDown() {
-		unset( $this->lang );
-	}
+class LanguageMgTest extends LanguageClassesTestCase {
 
 	/** @dataProvider providePlural */
 	function testPlural( $result, $value ) {
 		$forms =  array( 'one', 'other' );
-		$this->assertEquals( $result, $this->lang->convertPlural( $value, $forms ) );
+		$this->assertEquals( $result, $this->getLang()->convertPlural( $value, $forms ) );
 	}
 
 	function providePlural() {
diff --git a/tests/phpunit/languages/LanguageMkTest.php b/tests/phpunit/languages/LanguageMkTest.php
index 21a9e41e01..8cd84b8317 100644
--- a/tests/phpunit/languages/LanguageMkTest.php
+++ b/tests/phpunit/languages/LanguageMkTest.php
@@ -6,20 +6,12 @@
  */
 
 /** Tests for MediaWiki languages/classes/LanguageMk.php */
-class LanguageMkTest extends MediaWikiTestCase {
-	private $lang;
-
-	protected function setUp() {
-		$this->lang = Language::factory( 'mk' );
-	}
-	protected function tearDown() {
-		unset( $this->lang );
-	}
+class LanguageMkTest extends LanguageClassesTestCase {
 
 	/** @dataProvider providerPlural */
 	function testPlural( $result, $value ) {
 		$forms =  array( 'one', 'other' );
-		$this->assertEquals( $result, $this->lang->convertPlural( $value, $forms ) );
+		$this->assertEquals( $result, $this->getLang()->convertPlural( $value, $forms ) );
 	}
 
 
diff --git a/tests/phpunit/languages/LanguageMlTest.php b/tests/phpunit/languages/LanguageMlTest.php
index 9af2389fd0..b7f6182bc4 100644
--- a/tests/phpunit/languages/LanguageMlTest.php
+++ b/tests/phpunit/languages/LanguageMlTest.php
@@ -6,20 +6,12 @@
  */
 
 /** Tests for MediaWiki languages/LanguageMl.php */
-class LanguageMlTest extends MediaWikiTestCase {
-	private $lang;
-
-	protected function setUp() {
-		$this->lang = Language::factory( 'Ml' );
-	}
-	protected function tearDown() {
-		unset( $this->lang );
-	}
+class LanguageMlTest extends LanguageClassesTestCase {
 
 	/** see bug 29495 */
 	/** @dataProvider providerFormatNum*/
 	function testFormatNum( $result, $value ) {
-		$this->assertEquals( $result,  $this->lang->formatNum( $value ) );
+		$this->assertEquals( $result,  $this->getLang()->formatNum( $value ) );
 	}
 
 	function providerFormatNum() {
diff --git a/tests/phpunit/languages/LanguageMoTest.php b/tests/phpunit/languages/LanguageMoTest.php
index 4f208d994e..491d8ac66f 100644
--- a/tests/phpunit/languages/LanguageMoTest.php
+++ b/tests/phpunit/languages/LanguageMoTest.php
@@ -6,20 +6,12 @@
  */
 
 /** Tests for MediaWiki languages/classes/LanguageMo.php */
-class LanguageMoTest extends MediaWikiTestCase {
-	private $lang;
-
-	protected function setUp() {
-		$this->lang = Language::factory( 'mo' );
-	}
-	protected function tearDown() {
-		unset( $this->lang );
-	}
+class LanguageMoTest extends LanguageClassesTestCase {
 
 	/** @dataProvider providerPlural */
 	function testPlural( $result, $value ) {
 		$forms =  array( 'one', 'few', 'other' );
-		$this->assertEquals( $result, $this->lang->convertPlural( $value, $forms ) );
+		$this->assertEquals( $result, $this->getLang()->convertPlural( $value, $forms ) );
 	}
 
 	function providerPlural() {
diff --git a/tests/phpunit/languages/LanguageMtTest.php b/tests/phpunit/languages/LanguageMtTest.php
index 4d25347d95..70cd93a640 100644
--- a/tests/phpunit/languages/LanguageMtTest.php
+++ b/tests/phpunit/languages/LanguageMtTest.php
@@ -6,20 +6,12 @@
  */
 
 /** Tests for MediaWiki languages/classes/LanguageMt.php */
-class LanguageMtTest extends MediaWikiTestCase {
-	private $lang;
-
-	protected function setUp() {
-		$this->lang = Language::factory( 'mt' );
-	}
-	protected function tearDown() {
-		unset( $this->lang );
-	}
+class LanguageMtTest extends LanguageClassesTestCase {
 
 	/** @dataProvider providerPluralAllForms */
 	function testPluralAllForms( $result, $value ) {
 		$forms = array( 'one', 'few', 'many', 'other' );
-		$this->assertEquals( $result, $this->lang->convertPlural( $value, $forms ) );
+		$this->assertEquals( $result, $this->getLang()->convertPlural( $value, $forms ) );
 	}
 
 	function providerPluralAllForms() {
@@ -46,7 +38,7 @@ class LanguageMtTest extends MediaWikiTestCase {
 	/** @dataProvider providerPluralTwoForms */
 	function testPluralTwoForms( $result, $value ) {
 		$forms = array( 'one', 'many' );
-		$this->assertEquals( $result, $this->lang->convertPlural( $value, $forms ) );
+		$this->assertEquals( $result, $this->getLang()->convertPlural( $value, $forms ) );
 	}
 
 	function providerPluralTwoForms() {
diff --git a/tests/phpunit/languages/LanguageNlTest.php b/tests/phpunit/languages/LanguageNlTest.php
index c8cfbb6674..f783f2c03f 100644
--- a/tests/phpunit/languages/LanguageNlTest.php
+++ b/tests/phpunit/languages/LanguageNlTest.php
@@ -6,23 +6,15 @@
  */
 
 /** Tests for MediaWiki languages/LanguageNl.php */
-class LanguageNlTest extends MediaWikiTestCase {
-	private $lang;
-
-	protected function setUp() {
-		$this->lang = Language::factory( 'Nl' );
-	}
-	protected function tearDown() {
-		unset( $this->lang );
-	}
+class LanguageNlTest extends LanguageClassesTestCase {
 
 	function testFormatNum() {
-		$this->assertEquals( '1.234.567', $this->lang->formatNum( '1234567' ) );
-		$this->assertEquals( '12.345', $this->lang->formatNum( '12345' ) );
-		$this->assertEquals( '1', $this->lang->formatNum( '1' ) );
-		$this->assertEquals( '123', $this->lang->formatNum( '123' ) );
-		$this->assertEquals( '1.234', $this->lang->formatNum( '1234' ) );
-		$this->assertEquals( '12.345,56', $this->lang->formatNum( '12345.56' ) );
-		$this->assertEquals( ',1234556', $this->lang->formatNum( '.1234556' ) );
+		$this->assertEquals( '1.234.567', $this->getLang()->formatNum( '1234567' ) );
+		$this->assertEquals( '12.345', $this->getLang()->formatNum( '12345' ) );
+		$this->assertEquals( '1', $this->getLang()->formatNum( '1' ) );
+		$this->assertEquals( '123', $this->getLang()->formatNum( '123' ) );
+		$this->assertEquals( '1.234', $this->getLang()->formatNum( '1234' ) );
+		$this->assertEquals( '12.345,56', $this->getLang()->formatNum( '12345.56' ) );
+		$this->assertEquals( ',1234556', $this->getLang()->formatNum( '.1234556' ) );
 	}
 }
diff --git a/tests/phpunit/languages/LanguageNsoTest.php b/tests/phpunit/languages/LanguageNsoTest.php
index 1e70997898..97146d34b0 100644
--- a/tests/phpunit/languages/LanguageNsoTest.php
+++ b/tests/phpunit/languages/LanguageNsoTest.php
@@ -6,20 +6,12 @@
  */
 
 /** Tests for MediaWiki languages/classes/LanguageNso.php */
-class LanguageNsoTest extends MediaWikiTestCase {
-	private $lang;
-
-	protected function setUp() {
-		$this->lang = Language::factory( 'nso' );
-	}
-	protected function tearDown() {
-		unset( $this->lang );
-	}
+class LanguageNsoTest extends LanguageClassesTestCase {
 
 	/** @dataProvider providerPlural */
 	function testPlural( $result, $value ) {
 		$forms = array( 'one', 'many' );
-		$this->assertEquals( $result, $this->lang->convertPlural( $value, $forms ) );
+		$this->assertEquals( $result, $this->getLang()->convertPlural( $value, $forms ) );
 	}
 
 	function providerPlural() {
diff --git a/tests/phpunit/languages/LanguagePlTest.php b/tests/phpunit/languages/LanguagePlTest.php
index a5436409c0..00b7e9e8aa 100644
--- a/tests/phpunit/languages/LanguagePlTest.php
+++ b/tests/phpunit/languages/LanguagePlTest.php
@@ -6,20 +6,12 @@
  */
 
 /** Tests for MediaWiki languages/classes/LanguagePl.php */
-class LanguagePlTest extends MediaWikiTestCase {
-	private $lang;
-
-	protected function setUp() {
-		$this->lang = Language::factory( 'pl' );
-	}
-	protected function tearDown() {
-		unset( $this->lang );
-	}
+class LanguagePlTest extends LanguageClassesTestCase {
 
 	/** @dataProvider providerPluralFourForms */
 	function testPluralFourForms( $result, $value ) {
 		$forms = array( 'one', 'few', 'many' );
-		$this->assertEquals( $result, $this->lang->convertPlural( $value, $forms ) );
+		$this->assertEquals( $result, $this->getLang()->convertPlural( $value, $forms ) );
 	}
 
 	function providerPluralFourForms() {
@@ -46,7 +38,7 @@ class LanguagePlTest extends MediaWikiTestCase {
 	/** @dataProvider providerPlural */
 	function testPlural( $result, $value ) {
 		$forms = array( 'one', 'many' );
-		$this->assertEquals( $result, $this->lang->convertPlural( $value, $forms ) );
+		$this->assertEquals( $result, $this->getLang()->convertPlural( $value, $forms ) );
 	}
 
 	function providerPlural() {
diff --git a/tests/phpunit/languages/LanguageRoTest.php b/tests/phpunit/languages/LanguageRoTest.php
index 9bf01a4906..61726bcbe1 100644
--- a/tests/phpunit/languages/LanguageRoTest.php
+++ b/tests/phpunit/languages/LanguageRoTest.php
@@ -6,20 +6,12 @@
  */
 
 /** Tests for MediaWiki languages/classes/LanguageRo.php */
-class LanguageRoTest extends MediaWikiTestCase {
-	private $lang;
-
-	protected function setUp() {
-		$this->lang = Language::factory( 'ro' );
-	}
-	protected function tearDown() {
-		unset( $this->lang );
-	}
+class LanguageRoTest extends LanguageClassesTestCase {
 
 	/** @dataProvider providerPlural */
 	function testPlural( $result, $value ) {
 		$forms =  array( 'one', 'few', 'other' );
-		$this->assertEquals( $result, $this->lang->convertPlural( $value, $forms ) );
+		$this->assertEquals( $result, $this->getLang()->convertPlural( $value, $forms ) );
 	}
 
 	function providerPlural() {
diff --git a/tests/phpunit/languages/LanguageRuTest.php b/tests/phpunit/languages/LanguageRuTest.php
index 189a96ce7c..f545a13648 100644
--- a/tests/phpunit/languages/LanguageRuTest.php
+++ b/tests/phpunit/languages/LanguageRuTest.php
@@ -7,20 +7,12 @@
  */
 
 /** Tests for MediaWiki languages/classes/LanguageRu.php */
-class LanguageRuTest extends MediaWikiTestCase {
-	private $lang;
-
-	protected function setUp() {
-		$this->lang = Language::factory( 'ru' );
-	}
-	protected function tearDown() {
-		unset( $this->lang );
-	}
+class LanguageRuTest extends LanguageClassesTestCase {
 
 	/** @dataProvider providePluralFourForms */
 	function testPluralFourForms( $result, $value ) {
 		$forms = array( 'one', 'few', 'many', 'other' );
-		$this->assertEquals( $result, $this->lang->convertPlural( $value, $forms ) );
+		$this->assertEquals( $result, $this->getLang()->convertPlural( $value, $forms ) );
 	}
 
 	function providePluralFourForms() {
@@ -41,7 +33,7 @@ class LanguageRuTest extends MediaWikiTestCase {
 	/** @dataProvider providePluralTwoForms */
 	function testPluralTwoForms( $result, $value ) {
 		$forms =  array( 'one', 'several' );
-		$this->assertEquals( $result, $this->lang->convertPlural( $value, $forms ) );
+		$this->assertEquals( $result, $this->getLang()->convertPlural( $value, $forms ) );
 	}
 	function providePluralTwoForms() {
 		return array (
diff --git a/tests/phpunit/languages/LanguageSeTest.php b/tests/phpunit/languages/LanguageSeTest.php
index 51cfd2f002..cf76353f3c 100644
--- a/tests/phpunit/languages/LanguageSeTest.php
+++ b/tests/phpunit/languages/LanguageSeTest.php
@@ -6,20 +6,12 @@
  */
 
 /** Tests for MediaWiki languages/classes/LanguageSe.php */
-class LanguageSeTest extends MediaWikiTestCase {
-	private $lang;
-
-	protected function setUp() {
-		$this->lang = Language::factory( 'se' );
-	}
-	protected function tearDown() {
-		unset( $this->lang );
-	}
+class LanguageSeTest extends LanguageClassesTestCase {
 
 	/** @dataProvider providerPluralThreeForms */
 	function testPluralThreeForms( $result, $value ) {
 		$forms = array( 'one', 'two', 'other' );
-		$this->assertEquals( $result, $this->lang->convertPlural( $value, $forms ) );
+		$this->assertEquals( $result, $this->getLang()->convertPlural( $value, $forms ) );
 	}
 
 	function providerPluralThreeForms() {
@@ -34,7 +26,7 @@ class LanguageSeTest extends MediaWikiTestCase {
 	/** @dataProvider providerPlural */
 	function testPlural( $result, $value ) {
 		$forms = array( 'one', 'other' );
-		$this->assertEquals( $result, $this->lang->convertPlural( $value, $forms ) );
+		$this->assertEquals( $result, $this->getLang()->convertPlural( $value, $forms ) );
 	}
 
 	function providerPlural() {
diff --git a/tests/phpunit/languages/LanguageSgsTest.php b/tests/phpunit/languages/LanguageSgsTest.php
index 62f2775491..e2a56caa38 100644
--- a/tests/phpunit/languages/LanguageSgsTest.php
+++ b/tests/phpunit/languages/LanguageSgsTest.php
@@ -6,20 +6,12 @@
  */
 
 /** Tests for MediaWiki languages/classes/LanguageSgs.php */
-class LanguageSgsTest extends MediaWikiTestCase {
-	private $lang;
-
-	protected function setUp() {
-		$this->lang = Language::factory( 'Sgs' );
-	}
-	protected function tearDown() {
-		unset( $this->lang );
-	}
+class LanguageSgsTest extends LanguageClassesTestCase {
 
 	/** @dataProvider providePluralAllForms */
 	function testPluralAllForms( $result, $value ) {
 		$forms = array( 'one', 'few', 'many', 'other' );
-		$this->assertEquals( $result, $this->lang->convertPlural( $value, $forms ) );
+		$this->assertEquals( $result, $this->getLang()->convertPlural( $value, $forms ) );
 	}
 
 	function providePluralAllForms() {
@@ -43,7 +35,7 @@ class LanguageSgsTest extends MediaWikiTestCase {
 	/** @dataProvider providePluralTwoForms */
 	function testPluralTwoForms( $result, $value ) {
 		$forms =  array( 'one', 'other' );
-		$this->assertEquals( $result, $this->lang->convertPlural( $value, $forms ) );
+		$this->assertEquals( $result, $this->getLang()->convertPlural( $value, $forms ) );
 	}
 
 	function providePluralTwoForms() {
diff --git a/tests/phpunit/languages/LanguageShTest.php b/tests/phpunit/languages/LanguageShTest.php
index 1d8ae7c316..25618c4ffd 100644
--- a/tests/phpunit/languages/LanguageShTest.php
+++ b/tests/phpunit/languages/LanguageShTest.php
@@ -6,20 +6,12 @@
  */
 
 /** Tests for MediaWiki languages/classes/LanguageSh.php */
-class LanguageShTest extends MediaWikiTestCase {
-	private $lang;
-
-	protected function setUp() {
-		$this->lang = Language::factory( 'sh' );
-	}
-	protected function tearDown() {
-		unset( $this->lang );
-	}
+class LanguageShTest extends LanguageClassesTestCase {
 
 	/** @dataProvider providerPlural */
 	function testPlural( $result, $value ) {
 		$forms = array( 'one', 'many' );
-		$this->assertEquals( $result, $this->lang->convertPlural( $value, $forms ) );
+		$this->assertEquals( $result, $this->getLang()->convertPlural( $value, $forms ) );
 	}
 
 	function providerPlural() {
diff --git a/tests/phpunit/languages/LanguageSkTest.php b/tests/phpunit/languages/LanguageSkTest.php
index 25823cf4b4..b50f7dfe7a 100644
--- a/tests/phpunit/languages/LanguageSkTest.php
+++ b/tests/phpunit/languages/LanguageSkTest.php
@@ -7,20 +7,12 @@
  */
 
 /** Tests for MediaWiki languages/classes/LanguageSk.php */
-class LanguageSkTest extends MediaWikiTestCase {
-	private $lang;
-
-	protected function setUp() {
-		$this->lang = Language::factory( 'sk' );
-	}
-	protected function tearDown() {
-		unset( $this->lang );
-	}
+class LanguageSkTest extends LanguageClassesTestCase {
 
 	/** @dataProvider providerPlural */
 	function testPlural( $result, $value ) {
 		$forms = array( 'one', 'few', 'other' );
-		$this->assertEquals( $result, $this->lang->convertPlural( $value, $forms ) );
+		$this->assertEquals( $result, $this->getLang()->convertPlural( $value, $forms ) );
 	}
 
 	function providerPlural() {
diff --git a/tests/phpunit/languages/LanguageSlTest.php b/tests/phpunit/languages/LanguageSlTest.php
index 76de0fcf4f..bfb7c7ee28 100644
--- a/tests/phpunit/languages/LanguageSlTest.php
+++ b/tests/phpunit/languages/LanguageSlTest.php
@@ -7,20 +7,12 @@
  */
 
 /** Tests for MediaWiki languages/classes/LanguageSl.php */
-class LanguageSlTest extends MediaWikiTestCase {
-	private $lang;
-
-	protected function setUp() {
-		$this->lang = Language::factory( 'sl' );
-	}
-	protected function tearDown() {
-		unset( $this->lang );
-	}
+class LanguageSlTest extends LanguageClassesTestCase {
 
 	/** @dataProvider providerPlural */
 	function testPlural( $result, $value ) {
 		$forms = array( 'one', 'two', 'few', 'other', 'zero' );
-		$this->assertEquals( $result, $this->lang->convertPlural( $value, $forms ) );
+		$this->assertEquals( $result, $this->getLang()->convertPlural( $value, $forms ) );
 	}
 
 	function providerPlural() {
diff --git a/tests/phpunit/languages/LanguageSmaTest.php b/tests/phpunit/languages/LanguageSmaTest.php
index cf1447757a..85fa9fbf55 100644
--- a/tests/phpunit/languages/LanguageSmaTest.php
+++ b/tests/phpunit/languages/LanguageSmaTest.php
@@ -6,20 +6,12 @@
  */
 
 /** Tests for MediaWiki languages/classes/LanguageSma.php */
-class LanguageSmaTest extends MediaWikiTestCase {
-	private $lang;
-
-	protected function setUp() {
-		$this->lang = Language::factory( 'sma' );
-	}
-	protected function tearDown() {
-		unset( $this->lang );
-	}
+class LanguageSmaTest extends LanguageClassesTestCase {
 
 	/** @dataProvider providerPluralThreeForms */
 	function testPluralThreeForms( $result, $value ) {
 		$forms = array( 'one', 'two', 'other' );
-		$this->assertEquals( $result, $this->lang->convertPlural( $value, $forms ) );
+		$this->assertEquals( $result, $this->getLang()->convertPlural( $value, $forms ) );
 	}
 
 	function providerPluralThreeForms() {
@@ -34,7 +26,7 @@ class LanguageSmaTest extends MediaWikiTestCase {
 	/** @dataProvider providerPlural */
 	function testPlural( $result, $value ) {
 		$forms = array( 'one', 'other' );
-		$this->assertEquals( $result, $this->lang->convertPlural( $value, $forms ) );
+		$this->assertEquals( $result, $this->getLang()->convertPlural( $value, $forms ) );
 	}
 
 	function providerPlural() {
diff --git a/tests/phpunit/languages/LanguageSrTest.php b/tests/phpunit/languages/LanguageSrTest.php
index 7be4589c03..c88115d212 100644
--- a/tests/phpunit/languages/LanguageSrTest.php
+++ b/tests/phpunit/languages/LanguageSrTest.php
@@ -15,16 +15,7 @@
 require_once dirname( __DIR__ ) . '/bootstrap.php';
 
 /** Tests for MediaWiki languages/LanguageSr.php */
-class LanguageSrTest extends MediaWikiTestCase {
-	/* Language object. Initialized before each test */
-	private $lang;
-
-	protected function setUp() {
-		$this->lang = Language::factory( 'sr' );
-	}
-	protected function tearDown() {
-		unset( $this->lang );
-	}
+class LanguageSrTest extends LanguageClassesTestCase {
 
 	##### TESTS #######################################################
 
@@ -125,7 +116,7 @@ class LanguageSrTest extends MediaWikiTestCase {
 	/** @dataProvider providePluralFourForms */
 	function testPluralFourForms( $result, $value ) {
 		$forms = array( 'one', 'few', 'many', 'other' );
-		$this->assertEquals( $result, $this->lang->convertPlural( $value, $forms ) );
+		$this->assertEquals( $result, $this->getLang()->convertPlural( $value, $forms ) );
 	}
 
 	function providePluralFourForms() {
@@ -146,7 +137,7 @@ class LanguageSrTest extends MediaWikiTestCase {
 	/** @dataProvider providePluralTwoForms */
 	function testPluralTwoForms( $result, $value ) {
 		$forms = array( 'one', 'several' );
-		$this->assertEquals( $result, $this->lang->convertPlural( $value, $forms ) );
+		$this->assertEquals( $result, $this->getLang()->convertPlural( $value, $forms ) );
 	}
 	function providePluralTwoForms() {
 		return array (
@@ -207,8 +198,7 @@ class LanguageSrTest extends MediaWikiTestCase {
 
 	/** Wrapper for converter::convertTo() method*/
 	function convertTo( $text, $variant ) {
-		return $this
-			->lang
+		return $this->getLang()
 			->mConverter
 			->convertTo(
 				$text, $variant
diff --git a/tests/phpunit/languages/LanguageTest.php b/tests/phpunit/languages/LanguageTest.php
index 30c0ce8235..c66df6985f 100644
--- a/tests/phpunit/languages/LanguageTest.php
+++ b/tests/phpunit/languages/LanguageTest.php
@@ -1,23 +1,11 @@
 <?php
 
-class LanguageTest extends MediaWikiTestCase {
-
-	/**
-	 * @var Language
-	 */
-	private $lang;
-
-	protected function setUp() {
-		$this->lang = Language::factory( 'en' );
-	}
-	protected function tearDown() {
-		unset( $this->lang );
-	}
+class LanguageTest extends LanguageClassesTestCase {
 
 	function testLanguageConvertDoubleWidthToSingleWidth() {
 		$this->assertEquals(
 			"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz",
-			$this->lang->normalizeForSearch(
+			$this->getLang()->normalizeForSearch(
 				"０１２３４５６７８９ＡＢＣＤＥＦＧＨＩＪＫＬＭＮＯＰＱＲＳＴＵＶＷＸＹＺａｂｃｄｅｆｇｈｉｊｋｌｍｎｏｐｑｒｓｔｕｖｗｘｙｚ"
 			),
 			'convertDoubleWidth() with the full alphabet and digits'
@@ -28,7 +16,7 @@ class LanguageTest extends MediaWikiTestCase {
 	 * @dataProvider provideFormattableTimes
 	 */
 	function testFormatTimePeriod( $seconds, $format, $expected, $desc ) {
-		$this->assertEquals( $expected, $this->lang->formatTimePeriod( $seconds, $format ), $desc );
+		$this->assertEquals( $expected, $this->getLang()->formatTimePeriod( $seconds, $format ), $desc );
 	}
 
 	function provideFormattableTimes() {
@@ -220,31 +208,31 @@ class LanguageTest extends MediaWikiTestCase {
 	function testTruncate() {
 		$this->assertEquals(
 			"XXX",
-			$this->lang->truncate( "1234567890", 0, 'XXX' ),
+			$this->getLang()->truncate( "1234567890", 0, 'XXX' ),
 			'truncate prefix, len 0, small ellipsis'
 		);
 
 		$this->assertEquals(
 			"12345XXX",
-			$this->lang->truncate( "1234567890", 8, 'XXX' ),
+			$this->getLang()->truncate( "1234567890", 8, 'XXX' ),
 			'truncate prefix, small ellipsis'
 		);
 
 		$this->assertEquals(
 			"123456789",
-			$this->lang->truncate( "123456789", 5, 'XXXXXXXXXXXXXXX' ),
+			$this->getLang()->truncate( "123456789", 5, 'XXXXXXXXXXXXXXX' ),
 			'truncate prefix, large ellipsis'
 		);
 
 		$this->assertEquals(
 			"XXX67890",
-			$this->lang->truncate( "1234567890", -8, 'XXX' ),
+			$this->getLang()->truncate( "1234567890", -8, 'XXX' ),
 			'truncate suffix, small ellipsis'
 		);
 
 		$this->assertEquals(
 			"123456789",
-			$this->lang->truncate( "123456789", -5, 'XXXXXXXXXXXXXXX' ),
+			$this->getLang()->truncate( "123456789", -5, 'XXXXXXXXXXXXXXX' ),
 			'truncate suffix, large ellipsis'
 		);
 	}
@@ -256,7 +244,7 @@ class LanguageTest extends MediaWikiTestCase {
 		// Actual HTML...
 		$this->assertEquals(
 			$expected,
-			$this->lang->truncateHTML( $input, $len, $ellipsis )
+			$this->getLang()->truncateHTML( $input, $len, $ellipsis )
 		);
 	}
 
@@ -355,7 +343,7 @@ class LanguageTest extends MediaWikiTestCase {
 	function testSprintfDate( $format, $ts, $expected, $msg ) {
 		$this->assertEquals(
 			$expected,
-			$this->lang->sprintfDate( $format, $ts ),
+			$this->getLang()->sprintfDate( $format, $ts ),
 			"sprintfDate('$format', '$ts'): $msg"
 		);
 	}
@@ -372,7 +360,7 @@ class LanguageTest extends MediaWikiTestCase {
 
 		$this->assertEquals(
 			$expected,
-			$this->lang->sprintfDate( $format, $ts ),
+			$this->getLang()->sprintfDate( $format, $ts ),
 			"sprintfDate('$format', '$ts'): $msg"
 		);
 
@@ -680,7 +668,7 @@ class LanguageTest extends MediaWikiTestCase {
 	function testFormatSize( $size, $expected, $msg ) {
 		$this->assertEquals(
 			$expected,
-			$this->lang->formatSize( $size ),
+			$this->getLang()->formatSize( $size ),
 			"formatSize('$size'): $msg"
 		);
 	}
@@ -742,7 +730,7 @@ class LanguageTest extends MediaWikiTestCase {
 	function testFormatBitrate( $bps, $expected, $msg ) {
 		$this->assertEquals(
 			$expected,
-			$this->lang->formatBitrate( $bps ),
+			$this->getLang()->formatBitrate( $bps ),
 			"formatBitrate('$bps'): $msg"
 		);
 	}
@@ -815,7 +803,7 @@ class LanguageTest extends MediaWikiTestCase {
 	function testFormatDuration( $duration, $expected, $intervals = array() ) {
 		$this->assertEquals(
 			$expected,
-			$this->lang->formatDuration( $duration, $intervals ),
+			$this->getLang()->formatDuration( $duration, $intervals ),
 			"formatDuration('$duration'): $expected"
 		);
 	}
@@ -950,7 +938,7 @@ class LanguageTest extends MediaWikiTestCase {
 	function testCheckTitleEncoding( $s ) {
 		$this->assertEquals(
 			$s,
-			$this->lang->checkTitleEncoding($s),
+			$this->getLang()->checkTitleEncoding($s),
 			"checkTitleEncoding('$s')"
 		);
 	}
@@ -1070,7 +1058,7 @@ class LanguageTest extends MediaWikiTestCase {
 	 * @dataProvider providePluralData
 	 */
 	function testConvertPlural( $expected, $number, $forms ) {
-		$chosen = $this->lang->convertPlural( $number, $forms );
+		$chosen = $this->getLang()->convertPlural( $number, $forms );
 		$this->assertEquals( $expected, $chosen );
 	}
 
@@ -1090,128 +1078,5 @@ class LanguageTest extends MediaWikiTestCase {
 			) ),
 		);
 	}
-
-	/**
-	 * @test
-	 * @dataProvider providePrettyTimestampTests
-	 */
-	public function testPrettyTimestamp(
-		$tsTime, // The timestamp to format
-		$currentTime, // The time to consider "now"
-		$timeCorrection, // The time offset to use
-		$dateFormat, // The date preference to use
-		$expectedOutput, // The expected output
-		$desc // Description
-	) {
-		$user = new User;
-		$user->setOption( 'timecorrection', $timeCorrection );
-		$user->setOption( 'date', $dateFormat );
-
-		$this->assertEquals(
-			$expectedOutput,
-			$this->lang->prettyTimestamp( $tsTime, $currentTime, $user ),
-			$desc
-		);
-	}
-
-	public function providePrettyTimestampTests() {
-		return array(
-			array(
-				'20111231170000',
-				'20120101000000',
-				'Offset|0',
-				'mdy',
-				'Yesterday at 17:00',
-				'"Yesterday" across years',
-			),
-			array(
-				'20120717190900',
-				'20120717190929',
-				'Offset|0',
-				'mdy',
-				'Just now',
-				'"Just now"',
-			),
-			array(
-				'20120717190900',
-				'20120717191530',
-				'Offset|0',
-				'mdy',
-				'6 minutes ago',
-				'X minutes ago',
-			),
-			array(
-				'20121006173100',
-				'20121006173200',
-				'Offset|0',
-				'mdy',
-				'1 minute ago',
-				'"1 minute ago"',
-			),
-			array(
-				'20120617190900',
-				'20120717190900',
-				'Offset|0',
-				'mdy',
-				'June 17',
-				'Another month'
-			),
-			array(
-				'19910130151500',
-				'20120716193700',
-				'Offset|0',
-				'mdy',
-				'January 30, 1991',
-				'Different year',
-			),
-			array(
-				'20120101050000',
-				'20120101080000',
-				'Offset|-360',
-				'mdy',
-				'Yesterday at 23:00',
-				'"Yesterday" across years with time correction',
-			),
-			array(
-				'20120714184300',
-				'20120716184300',
-				'Offset|-420',
-				'mdy',
-				'Saturday at 11:43',
-				'Recent weekday with time correction',
-			),
-			array(
-				'20120714184300',
-				'20120715040000',
-				'Offset|-420',
-				'mdy',
-				'11:43',
-				'Today at another time with time correction',
-			),
-			array(
-				'20120617190900',
-				'20120717190900',
-				'Offset|0',
-				'dmy',
-				'17 June',
-				'Another month with dmy'
-			),
-			array(
-				'20120617190900',
-				'20120717190900',
-				'Offset|0',
-				'ISO 8601',
-				'2012-06-17',
-				'Another month with ISO-8601'
-			),
-			array(
-				'19910130151500',
-				'20120716193700',
-				'Offset|0',
-				'ISO 8601',
-				'1991-01-30',
-				'Different year with ISO-8601',
-			),
-		);
-	}
 }
+
diff --git a/tests/phpunit/languages/LanguageTiTest.php b/tests/phpunit/languages/LanguageTiTest.php
index 175cdb97c0..259e0076cd 100644
--- a/tests/phpunit/languages/LanguageTiTest.php
+++ b/tests/phpunit/languages/LanguageTiTest.php
@@ -6,20 +6,12 @@
  */
 
 /** Tests for MediaWiki languages/classes/LanguageTi.php */
-class LanguageTiTest extends MediaWikiTestCase {
-	private $lang;
-
-	protected function setUp() {
-		$this->lang = Language::factory( 'Ti' );
-	}
-	protected function tearDown() {
-		unset( $this->lang );
-	}
+class LanguageTiTest extends LanguageClassesTestCase {
 
 	/** @dataProvider providerPlural */
 	function testPlural( $result, $value ) {
 		$forms = array( 'one', 'many' );
-		$this->assertEquals( $result, $this->lang->convertPlural( $value, $forms ) );
+		$this->assertEquals( $result, $this->getLang()->convertPlural( $value, $forms ) );
 	}
 
 	function providerPlural() {
diff --git a/tests/phpunit/languages/LanguageTlTest.php b/tests/phpunit/languages/LanguageTlTest.php
index e03531ffd0..bf3dafcbd7 100644
--- a/tests/phpunit/languages/LanguageTlTest.php
+++ b/tests/phpunit/languages/LanguageTlTest.php
@@ -6,20 +6,12 @@
  */
 
 /** Tests for MediaWiki languages/classes/LanguageTl.php */
-class LanguageTlTest extends MediaWikiTestCase {
-	private $lang;
-
-	protected function setUp() {
-		$this->lang = Language::factory( 'Tl' );
-	}
-	protected function tearDown() {
-		unset( $this->lang );
-	}
+class LanguageTlTest extends LanguageClassesTestCase {
 
 	/** @dataProvider providerPlural */
 	function testPlural( $result, $value ) {
 		$forms = array( 'one', 'many' );
-		$this->assertEquals( $result, $this->lang->convertPlural( $value, $forms ) );
+		$this->assertEquals( $result, $this->getLang()->convertPlural( $value, $forms ) );
 	}
 
 	function providerPlural() {
diff --git a/tests/phpunit/languages/LanguageTrTest.php b/tests/phpunit/languages/LanguageTrTest.php
index a3cacc2489..e4859df76b 100644
--- a/tests/phpunit/languages/LanguageTrTest.php
+++ b/tests/phpunit/languages/LanguageTrTest.php
@@ -6,15 +6,7 @@
  */
 
 /** Tests for MediaWiki languages/LanguageTr.php */
-class LanguageTrTest extends MediaWikiTestCase {
-	private $lang;
-
-	protected function setUp() {
-		$this->lang = Language::factory( 'Tr' );
-	}
-	protected function tearDown() {
-		unset( $this->lang );
-	}
+class LanguageTrTest extends LanguageClassesTestCase {
 
 	/**
 	 * See @bug 28040
@@ -27,9 +19,9 @@ class LanguageTrTest extends MediaWikiTestCase {
 	 */
 	function testDottedAndDotlessI( $func, $input, $inputCase, $expected ) {
 		if( $func == 'ucfirst' ) {
-			$res = $this->lang->ucfirst( $input );
+			$res = $this->getLang()->ucfirst( $input );
 		} elseif( $func == 'lcfirst' ) {
-			$res = $this->lang->lcfirst( $input );
+			$res = $this->getLang()->lcfirst( $input );
 		} else {
 			throw new MWException( __METHOD__ . " given an invalid function name '$func'" );
 		}
diff --git a/tests/phpunit/languages/LanguageUkTest.php b/tests/phpunit/languages/LanguageUkTest.php
index 2b6f707fba..f29b90ba17 100644
--- a/tests/phpunit/languages/LanguageUkTest.php
+++ b/tests/phpunit/languages/LanguageUkTest.php
@@ -7,20 +7,12 @@
  */
 
 /** Tests for MediaWiki languages/classes/LanguageUk.php */
-class LanguageUkTest extends MediaWikiTestCase {
-	private $lang;
-
-	protected function setUp() {
-		$this->lang = Language::factory( 'Uk' );
-	}
-	protected function tearDown() {
-		unset( $this->lang );
-	}
+class LanguageUkTest extends LanguageClassesTestCase {
 
 	/** @dataProvider providePluralFourForms */
 	function testPluralFourForms( $result, $value ) {
 		$forms = array( 'one', 'few', 'many', 'other' );
-		$this->assertEquals( $result, $this->lang->convertPlural( $value, $forms ) );
+		$this->assertEquals( $result, $this->getLang()->convertPlural( $value, $forms ) );
 	}
 
 	function providePluralFourForms() {
@@ -41,7 +33,7 @@ class LanguageUkTest extends MediaWikiTestCase {
 	/** @dataProvider providePluralTwoForms */
 	function testPluralTwoForms( $result, $value ) {
 		$forms = array( 'one', 'several' );
-		$this->assertEquals( $result, $this->lang->convertPlural( $value, $forms ) );
+		$this->assertEquals( $result, $this->getLang()->convertPlural( $value, $forms ) );
 	}
 	function providePluralTwoForms() {
 		return array (
diff --git a/tests/phpunit/languages/LanguageUzTest.php b/tests/phpunit/languages/LanguageUzTest.php
index 0314649107..99607d12b9 100644
--- a/tests/phpunit/languages/LanguageUzTest.php
+++ b/tests/phpunit/languages/LanguageUzTest.php
@@ -15,16 +15,7 @@
 require_once dirname( __DIR__ ) . '/bootstrap.php';
 
 /** Tests for MediaWiki languages/LanguageUz.php */
-class LanguageUzTest extends MediaWikiTestCase {
-	/* Language object. Initialized before each test */
-	private $lang;
-
-	protected function setUp() {
-		$this->lang = Language::factory( 'uz' );
-	}
-	protected function tearDown() {
-		unset( $this->lang );
-	}
+class LanguageUzTest extends LanguageClassesTestCase {
 
 	/**
 	 * @author Nikola Smolenski
@@ -109,7 +100,7 @@ class LanguageUzTest extends MediaWikiTestCase {
 
 	/** Wrapper for converter::convertTo() method*/
 	function convertTo( $text, $variant ) {
-		return $this->lang->mConverter->convertTo( $text, $variant );
+		return $this->getLang()->mConverter->convertTo( $text, $variant );
 	}
 	function convertToCyrillic( $text ) {
 		return $this->convertTo( $text, 'uz-cyrl' );
diff --git a/tests/phpunit/languages/LanguageWaTest.php b/tests/phpunit/languages/LanguageWaTest.php
index 08312ce943..4a1c0e728f 100644
--- a/tests/phpunit/languages/LanguageWaTest.php
+++ b/tests/phpunit/languages/LanguageWaTest.php
@@ -6,20 +6,12 @@
  */
 
 /** Tests for MediaWiki languages/classes/LanguageWa.php */
-class LanguageWaTest extends MediaWikiTestCase {
-	private $lang;
-
-	protected function setUp() {
-		$this->lang = Language::factory( 'Wa' );
-	}
-	protected function tearDown() {
-		unset( $this->lang );
-	}
+class LanguageWaTest extends LanguageClassesTestCase {
 
 	/** @dataProvider providerPlural */
 	function testPlural( $result, $value ) {
 		$forms = array( 'one', 'many' );
-		$this->assertEquals( $result, $this->lang->convertPlural( $value, $forms ) );
+		$this->assertEquals( $result, $this->getLang()->convertPlural( $value, $forms ) );
 	}
 
 	function providerPlural() {
diff --git a/tests/qunit/data/callMwLoaderTestCallback.js b/tests/qunit/data/callMwLoaderTestCallback.js
index 3f2ee92ffe..dd03411594 100644
--- a/tests/qunit/data/callMwLoaderTestCallback.js
+++ b/tests/qunit/data/callMwLoaderTestCallback.js
@@ -1 +1 @@
-mw.loader.testCallback();
+mediaWiki.loader.testCallback();
diff --git a/tests/qunit/data/generateJqueryMsgData.php b/tests/qunit/data/generateJqueryMsgData.php
index 7079e0e7d7..911dc3ac0c 100644
--- a/tests/qunit/data/generateJqueryMsgData.php
+++ b/tests/qunit/data/generateJqueryMsgData.php
@@ -135,6 +135,9 @@ class GenerateJqueryMsgData extends Maintenance {
 			. "// languages, and parser modes. Intended for use by a unit test framework by looping\n"
 			. "// through the object and comparing its parser return value with the 'result' property.\n"
 			. '// Last generated with ' . basename( __FILE__ ) . ' at ' . gmdate( 'r' ) . "\n"
+			// This file will contain unquoted JSON strings as javascript native object literals,
+			// flip the quotemark convention for this file.
+			. "/*jshint quotmark: double */\n"
 			. "\n"
 			. 'mediaWiki.libs.phpParserData = ' . FormatJson::encode( $phpParserData, true ) . ";\n";
 
diff --git a/tests/qunit/data/mediawiki.jqueryMsg.data.js b/tests/qunit/data/mediawiki.jqueryMsg.data.js
index 05bb5c8284..776ee24f03 100644
--- a/tests/qunit/data/mediawiki.jqueryMsg.data.js
+++ b/tests/qunit/data/mediawiki.jqueryMsg.data.js
@@ -1,7 +1,8 @@
 // This file stores the output from the PHP parser for various messages, arguments,
 // languages, and parser modes. Intended for use by a unit test framework by looping
 // through the object and comparing its parser return value with the 'result' property.
-// Last generated with generateJqueryMsgData.php at Sun, 07 Oct 2012 07:30:16 +0000
+// Last generated with generateJqueryMsgData.php at Sat, 03 Nov 2012 21:32:01 +0000
+/*jshint quotmark: double */
 
 mediaWiki.libs.phpParserData = {
 	"messages": {
diff --git a/tests/qunit/data/testrunner.js b/tests/qunit/data/testrunner.js
index efa6549379..0c3d364a18 100644
--- a/tests/qunit/data/testrunner.js
+++ b/tests/qunit/data/testrunner.js
@@ -1,266 +1,268 @@
-( function ( $, mw, QUnit, undefined ) {
 /*global CompletenessTest */
-/*jshint evil:true */
-'use strict';
-
-var mwTestIgnore, mwTester, addons;
-
-/**
- * Add bogus to url to prevent IE crazy caching
- *
- * @param value {String} 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 ) ? '&' : '?')
-		+ String( new Date().getTime() )
-		+ String( parseInt( Math.random() * 100000, 10 ) );
-};
-
-/**
- * Configuration
- */
-
-// When a test() indicates asynchronicity with stop(),
-// allow 10 seconds to pass before killing the test(),
-// and assuming failure.
-QUnit.config.testTimeout = 10 * 1000;
-
-// Add a checkbox to QUnit header to toggle MediaWiki ResourceLoader debug mode.
-QUnit.config.urlConfig.push( {
-	id: 'debug',
-	label: 'Enable ResourceLoaderDebug',
-	tooltip: 'Enable debug mode in ResourceLoader'
-} );
-
-/**
- * Load TestSwarm agent
- */
-// Only if the current url indicates that there is a TestSwarm instance watching us
-// (TestSwarm appends swarmURL to the test suites url it loads in iframes).
-// Otherwise this is just a simple view of Special:JavaScriptTest/qunit directly,
-// no point in loading inject.js in that case. Also, make sure that this instance
-// of MediaWiki has actually been configured with the required url to that inject.js
-// script. By default it is false.
-if ( QUnit.urlParams.swarmURL && mw.config.get( 'QUnitTestSwarmInjectJSPath' ) ) {
-	document.write( "<scr" + "ipt src='" + QUnit.fixurl( mw.config.get( 'QUnitTestSwarmInjectJSPath' ) ) + "'></scr" + "ipt>" );
-}
-
-/**
- * CompletenessTest
- */
-// Adds toggle checkbox to header
-QUnit.config.urlConfig.push( {
-	id: 'completenesstest',
-	label: 'Run CompletenessTest',
-	tooltip: 'Run the completeness test'
-} );
-
-// Initiate when enabled
-if ( QUnit.urlParams.completenesstest ) {
-
-	// Return true to ignore
-	mwTestIgnore = function ( val, tester, funcPath ) {
-
-		// Don't record methods of the properties of constructors,
-		// to avoid getting into a loop (prototype.constructor.prototype..).
-		// Since we're therefor skipping any injection for
-		// "new mw.Foo()", manually set it to true here.
-		if ( val instanceof mw.Map ) {
-			tester.methodCallTracker.Map = true;
-			return true;
-		}
-		if ( val instanceof mw.Title ) {
-			tester.methodCallTracker.Title = true;
-			return true;
-		}
-
-		// Don't record methods of the properties of a jQuery object
-		if ( val instanceof $ ) {
-			return true;
-		}
-
-		return false;
+/*jshint evil: true */
+( function ( $, mw, QUnit, undefined ) {
+	'use strict';
+
+	var mwTestIgnore, mwTester,
+		addons,
+		envExecCount;
+
+	/**
+	 * Add bogus to url to prevent IE crazy caching
+	 *
+	 * @param value {String} 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 ) ? '&' : '?')
+			+ String( new Date().getTime() )
+			+ String( parseInt( Math.random() * 100000, 10 ) );
 	};
 
-	mwTester = new CompletenessTest( mw, mwTestIgnore );
-}
-
-/**
- * Test environment recommended for all QUnit test modules
- */
-// Whether to log environment changes to the console
-QUnit.config.urlConfig.push( 'mwlogenv' );
-
-/**
- * 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]
- * @example (see test suite at the bottom of this file)
- * </code>
- */
-QUnit.newMwEnvironment = ( function () {
-	var log, liveConfig, liveMessages;
-
-	liveConfig = mw.config.values;
-	liveMessages = mw.messages.values;
-
-	function freshConfigCopy( custom ) {
-		// "deep=true" is important here.
-		// Otherwise we just create a new object with values referring to live config.
-		// e.g. mw.config.set( 'wgFileExtensions', [] ) would not effect liveConfig,
-		// but mw.config.get( 'wgFileExtensions' ).push( 'png' ) would as the array
-		// was passed by reference in $.extend's loop.
-		return $.extend( {}, liveConfig, custom, /*deep=*/true );
+	/**
+	 * Configuration
+	 */
+
+	// When a test() indicates asynchronicity with stop(),
+	// allow 10 seconds to pass before killing the test(),
+	// and assuming failure.
+	QUnit.config.testTimeout = 10 * 1000;
+
+	// Add a checkbox to QUnit header to toggle MediaWiki ResourceLoader debug mode.
+	QUnit.config.urlConfig.push( {
+		id: 'debug',
+		label: 'Enable ResourceLoaderDebug',
+		tooltip: 'Enable debug mode in ResourceLoader'
+	} );
+
+	/**
+	 * Load TestSwarm agent
+	 */
+	// Only if the current url indicates that there is a TestSwarm instance watching us
+	// (TestSwarm appends swarmURL to the test suites url it loads in iframes).
+	// Otherwise this is just a simple view of Special:JavaScriptTest/qunit directly,
+	// no point in loading inject.js in that case. Also, make sure that this instance
+	// of MediaWiki has actually been configured with the required url to that inject.js
+	// script. By default it is false.
+	if ( QUnit.urlParams.swarmURL && mw.config.get( 'QUnitTestSwarmInjectJSPath' ) ) {
+		document.write( '<scr' + 'ipt src="' + QUnit.fixurl( mw.config.get( 'QUnitTestSwarmInjectJSPath' ) ) + '"></scr' + 'ipt>' );
 	}
 
-	function freshMessagesCopy( custom ) {
-		return $.extend( {}, liveMessages, custom, /*deep=*/true );
+	/**
+	 * CompletenessTest
+	 */
+	// Adds toggle checkbox to header
+	QUnit.config.urlConfig.push( {
+		id: 'completenesstest',
+		label: 'Run CompletenessTest',
+		tooltip: 'Run the completeness test'
+	} );
+
+	// Initiate when enabled
+	if ( QUnit.urlParams.completenesstest ) {
+
+		// Return true to ignore
+		mwTestIgnore = function ( val, tester ) {
+
+			// Don't record methods of the properties of constructors,
+			// to avoid getting into a loop (prototype.constructor.prototype..).
+			// Since we're therefor skipping any injection for
+			// "new mw.Foo()", manually set it to true here.
+			if ( val instanceof mw.Map ) {
+				tester.methodCallTracker.Map = true;
+				return true;
+			}
+			if ( val instanceof mw.Title ) {
+				tester.methodCallTracker.Title = true;
+				return true;
+			}
+
+			// Don't record methods of the properties of a jQuery object
+			if ( val instanceof $ ) {
+				return true;
+			}
+
+			return false;
+		};
+
+		mwTester = new CompletenessTest( mw, mwTestIgnore );
 	}
 
-	log = QUnit.urlParams.mwlogenv ? mw.log : function () {};
+	/**
+	 * Test environment recommended for all QUnit test modules
+	 */
+	// Whether to log environment changes to the console
+	QUnit.config.urlConfig.push( 'mwlogenv' );
+
+	/**
+	 * 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]
+	 * @example (see test suite at the bottom of this file)
+	 * </code>
+	 */
+	QUnit.newMwEnvironment = ( function () {
+		var log, liveConfig, liveMessages;
+
+		liveConfig = mw.config.values;
+		liveMessages = mw.messages.values;
+
+		function freshConfigCopy( custom ) {
+			// "deep=true" is important here.
+			// Otherwise we just create a new object with values referring to live config.
+			// e.g. mw.config.set( 'wgFileExtensions', [] ) would not effect liveConfig,
+			// but mw.config.get( 'wgFileExtensions' ).push( 'png' ) would as the array
+			// was passed by reference in $.extend's loop.
+			return $.extend( {}, liveConfig, custom, /*deep=*/true );
+		}
 
-	return function ( localEnv ) {
-		localEnv = $.extend( {
-			// QUnit
-			setup: $.noop,
-			teardown: $.noop,
-			// MediaWiki
-			config: {},
-			messages: {}
-		}, localEnv );
+		function freshMessagesCopy( custom ) {
+			return $.extend( {}, liveMessages, custom, /*deep=*/true );
+		}
 
-		return {
-			setup: function () {
-				log( 'MwEnvironment> SETUP    for "' + QUnit.config.current.module
-					+ ': ' + QUnit.config.current.testName + '"' );
+		log = QUnit.urlParams.mwlogenv ? mw.log : function () {};
+
+		return function ( localEnv ) {
+			localEnv = $.extend( {
+				// QUnit
+				setup: $.noop,
+				teardown: $.noop,
+				// MediaWiki
+				config: {},
+				messages: {}
+			}, localEnv );
+
+			return {
+				setup: function () {
+					log( 'MwEnvironment> SETUP    for "' + QUnit.config.current.module
+						+ ': ' + QUnit.config.current.testName + '"' );
+
+					// Greetings, mock environment!
+					mw.config.values = freshConfigCopy( localEnv.config );
+					mw.messages.values = freshMessagesCopy( localEnv.messages );
+
+					localEnv.setup();
+				},
+
+				teardown: function () {
+					log( 'MwEnvironment> TEARDOWN for "' + QUnit.config.current.module
+						+ ': ' + QUnit.config.current.testName + '"' );
+
+					localEnv.teardown();
+
+					// Farewell, mock environment!
+					mw.config.values = liveConfig;
+					mw.messages.values = liveMessages;
+				}
+			};
+		};
+	}() );
 
-				// Greetings, mock environment!
-				mw.config.values = freshConfigCopy( localEnv.config );
-				mw.messages.values = freshMessagesCopy( localEnv.messages );
+	// $.when stops as soon as one fails, which makes sense in most
+	// practical scenarios, but not in a unit test where we really do
+	// need to wait until all of them are finished.
+	QUnit.whenPromisesComplete = function () {
+		var altPromises = [];
 
-				localEnv.setup();
-			},
+		$.each( arguments, function ( i, arg ) {
+			var alt = $.Deferred();
+			altPromises.push( alt );
 
-			teardown: function () {
-				log( 'MwEnvironment> TEARDOWN for "' + QUnit.config.current.module
-					+ ': ' + QUnit.config.current.testName + '"' );
+			// Whether this one fails or not, forwards it to
+			// the 'done' (resolve) callback of the alternative promise.
+			arg.always( alt.resolve );
+		});
 
-				localEnv.teardown();
+		return $.when.apply( $, altPromises );
+	};
 
-				// Farewell, mock environment!
-				mw.config.values = liveConfig;
-				mw.messages.values = liveMessages;
-			}
-		};
+	/**
+	 * Add-on assertion helpers
+	 */
+	// Define the add-ons
+	addons = {
+
+		// Expect boolean true
+		assertTrue: function ( actual, message ) {
+			QUnit.push( actual === true, actual, true, message );
+		},
+
+		// Expect boolean false
+		assertFalse: function ( actual, message ) {
+			QUnit.push( actual === false, actual, false, message );
+		},
+
+		// Expect numerical value less than X
+		lt: function ( actual, expected, message ) {
+			QUnit.push( actual < expected, actual, 'less than ' + expected, message );
+		},
+
+		// Expect numerical value less than or equal to X
+		ltOrEq: function ( actual, expected, message ) {
+			QUnit.push( actual <= expected, actual, 'less than or equal to ' + expected, message );
+		},
+
+		// Expect numerical value greater than X
+		gt: function ( actual, expected, message ) {
+			QUnit.push( actual > expected, actual, 'greater than ' + expected, message );
+		},
+
+		// Expect numerical value greater than or equal to X
+		gtOrEq: function ( actual, expected, message ) {
+			QUnit.push( actual >= expected, actual, 'greater than or equal to ' + expected, message );
+		}
 	};
-}() );
 
-// $.when stops as soon as one fails, which makes sense in most
-// practical scenarios, but not in a unit test where we really do
-// need to wait until all of them are finished.
-QUnit.whenPromisesComplete = function () {
-	var altPromises = [];
+	$.extend( QUnit.assert, addons );
+
+	/**
+	 * Small test suite to confirm proper functionality of the utilities and
+	 * initializations defined above in this file.
+	 */
+	envExecCount = 0;
+	QUnit.module( 'mediawiki.tests.qunit.testrunner', QUnit.newMwEnvironment({
+		setup: function () {
+			envExecCount += 1;
+			this.mwHtmlLive = mw.html;
+			mw.html = {
+				escape: function () {
+					return 'mocked-' + envExecCount;
+				}
+			};
+		},
+		teardown: function () {
+			mw.html = this.mwHtmlLive;
+		},
+		config: {
+			testVar: 'foo'
+		},
+		messages: {
+			testMsg: 'Foo.'
+		}
+	}) );
 
-	$.each( arguments, function ( i, arg ) {
-		var alt = $.Deferred();
-		altPromises.push( alt );
+	QUnit.test( 'Setup', 3, function ( assert ) {
+		assert.equal( mw.html.escape( 'foo' ), 'mocked-1', 'extra setup() callback was ran.' );
+		assert.equal( mw.config.get( 'testVar' ), 'foo', 'config object applied' );
+		assert.equal( mw.messages.get( 'testMsg' ), 'Foo.', 'messages object applied' );
 
-		// Whether this one fails or not, forwards it to
-		// the 'done' (resolve) callback of the alternative promise.
-		arg.always( alt.resolve );
+		mw.config.set( 'testVar', 'bar' );
+		mw.messages.set( 'testMsg', 'Bar.' );
 	});
 
-	return $.when.apply( $, altPromises );
-};
-
-/**
- * Add-on assertion helpers
- */
-// Define the add-ons
-addons = {
-
-	// Expect boolean true
-	assertTrue: function ( actual, message ) {
-		QUnit.push( actual === true, actual, true, message );
-	},
-
-	// Expect boolean false
-	assertFalse: function ( actual, message ) {
-		QUnit.push( actual === false, actual, false, message );
-	},
-
-	// Expect numerical value less than X
-	lt: function ( actual, expected, message ) {
-		QUnit.push( actual < expected, actual, 'less than ' + expected, message );
-	},
-
-	// Expect numerical value less than or equal to X
-	ltOrEq: function ( actual, expected, message ) {
-		QUnit.push( actual <= expected, actual, 'less than or equal to ' + expected, message );
-	},
-
-	// Expect numerical value greater than X
-	gt: function ( actual, expected, message ) {
-		QUnit.push( actual > expected, actual, 'greater than ' + expected, message );
-	},
-
-	// Expect numerical value greater than or equal to X
-	gtOrEq: function ( actual, expected, message ) {
-		QUnit.push( actual >= expected, actual, 'greater than or equal to ' + expected, message );
-	}
-};
-
-$.extend( QUnit.assert, addons );
-
-/**
- * Small test suite to confirm proper functionality of the utilities and
- * initializations in this file.
- */
-var envExecCount = 0;
-QUnit.module( 'mediawiki.tests.qunit.testrunner', QUnit.newMwEnvironment({
-	setup: function () {
-		envExecCount += 1;
-		this.mwHtmlLive = mw.html;
-		mw.html = {
-			escape: function () {
-				return 'mocked-' + envExecCount;
-			}
-		};
-	},
-	teardown: function () {
-		mw.html = this.mwHtmlLive;
-	},
-	config: {
-		testVar: 'foo'
-	},
-	messages: {
-		testMsg: 'Foo.'
-	}
-}) );
-
-QUnit.test( 'Setup', 3, function ( assert ) {
-	assert.equal( mw.html.escape( 'foo' ), 'mocked-1', 'extra setup() callback was ran.' );
-	assert.equal( mw.config.get( 'testVar' ), 'foo', 'config object applied' );
-	assert.equal( mw.messages.get( 'testMsg' ), 'Foo.', 'messages object applied' );
-
-	mw.config.set( 'testVar', 'bar' );
-	mw.messages.set( 'testMsg', 'Bar.' );
-});
-
-QUnit.test( 'Teardown', 3, function ( assert ) {
-	assert.equal( mw.html.escape( 'foo' ), 'mocked-2', 'extra setup() callback was re-ran.' );
-	assert.equal( mw.config.get( 'testVar' ), 'foo', 'config object restored and re-applied after test()' );
-	assert.equal( mw.messages.get( 'testMsg' ), 'Foo.', 'messages object restored and re-applied after test()' );
-});
-
-QUnit.module( 'mediawiki.tests.qunit.testrunner-after', QUnit.newMwEnvironment() );
-
-QUnit.test( 'Teardown', 3, function ( assert ) {
-	assert.equal( mw.html.escape( '<' ), '&lt;', 'extra teardown() callback was ran.' );
-	assert.equal( mw.config.get( 'testVar' ), null, 'config object restored to live in next module()' );
-	assert.equal( mw.messages.get( 'testMsg' ), null, 'messages object restored to live in next module()' );
-});
+	QUnit.test( 'Teardown', 3, function ( assert ) {
+		assert.equal( mw.html.escape( 'foo' ), 'mocked-2', 'extra setup() callback was re-ran.' );
+		assert.equal( mw.config.get( 'testVar' ), 'foo', 'config object restored and re-applied after test()' );
+		assert.equal( mw.messages.get( 'testMsg' ), 'Foo.', 'messages object restored and re-applied after test()' );
+	});
+
+	QUnit.module( 'mediawiki.tests.qunit.testrunner-after', QUnit.newMwEnvironment() );
+
+	QUnit.test( 'Teardown', 3, function ( assert ) {
+		assert.equal( mw.html.escape( '<' ), '&lt;', 'extra teardown() callback was ran.' );
+		assert.equal( mw.config.get( 'testVar' ), null, 'config object restored to live in next module()' );
+		assert.equal( mw.messages.get( 'testMsg' ), null, 'messages object restored to live in next module()' );
+	});
 
 }( jQuery, mediaWiki, QUnit ) );
diff --git a/tests/qunit/suites/resources/jquery/jquery.autoEllipsis.test.js b/tests/qunit/suites/resources/jquery/jquery.autoEllipsis.test.js
index 0dee2ef0ba..feeec559ad 100644
--- a/tests/qunit/suites/resources/jquery/jquery.autoEllipsis.test.js
+++ b/tests/qunit/suites/resources/jquery/jquery.autoEllipsis.test.js
@@ -1,52 +1,58 @@
-( function ( mw, $ ) {
+( function ( $ ) {
 
-QUnit.module( 'jquery.autoEllipsis', QUnit.newMwEnvironment() );
+	QUnit.module( 'jquery.autoEllipsis', QUnit.newMwEnvironment() );
 
-function createWrappedDiv( text, width ) {
-	var $wrapper = $( '<div>' ).css( 'width', width );
-	var $div = $( '<div>' ).text( text );
-	$wrapper.append( $div );
-	return $wrapper;
-}
-
-function findDivergenceIndex( a, b ) {
-	var i = 0;
-	while ( i < a.length && i < b.length && a[i] === b[i] ) {
-		i++;
+	function createWrappedDiv( text, width ) {
+		var $wrapper = $( '<div>' ).css( 'width', width ),
+			$div = $( '<div>' ).text( text );
+		$wrapper.append( $div );
+		return $wrapper;
 	}
-	return i;
-}
-
-QUnit.test( 'Position right', 4, function ( assert ) {
-	// We need this thing to be visible, so append it to the DOM
-	var origText = 'This is a really long random string and there is no way it fits in 100 pixels.';
-	var $wrapper = createWrappedDiv( origText, '100px' );
-	$( '#qunit-fixture' ).append( $wrapper );
-	$wrapper.autoEllipsis( { position: 'right' } );
-
-	// Verify that, and only one, span element was created
-	var $span = $wrapper.find( '> span' );
-	assert.strictEqual( $span.length, 1, 'autoEllipsis wrapped the contents in a span element' );
-
-	// Check that the text fits by turning on word wrapping
-	$span.css( 'whiteSpace', 'nowrap' );
-	assert.ltOrEq( $span.width(), $span.parent().width(), "Text fits (making the span 'white-space:nowrap' does not make it wider than its parent)" );
-
-	// Add two characters using scary black magic
-	var spanText = $span.text();
-	var d = findDivergenceIndex( origText, spanText );
-	var spanTextNew = spanText.substr( 0, d ) + origText[d] + origText[d] + '...';
-
-	assert.gt( spanTextNew.length, spanText.length, 'Verify that the new span-length is indeed greater' );
-
-	// Put this text in the span and verify it doesn't fit
-	$span.text( spanTextNew );
-	// In IE6 width works like min-width, allow IE6's width to be "equal to"
-	if ( $.browser.msie && Number( $.browser.version ) === 6 ) {
-		assert.gtOrEq( $span.width(), $span.parent().width(), 'Fit is maximal (adding two characters makes it not fit any more) - IE6: Maybe equal to as well due to width behaving like min-width in IE6' );
-	} else {
-		assert.gt( $span.width(), $span.parent().width(), 'Fit is maximal (adding two characters makes it not fit any more)' );
+
+	function findDivergenceIndex( a, b ) {
+		var i = 0;
+		while ( i < a.length && i < b.length && a[i] === b[i] ) {
+			i++;
+		}
+		return i;
 	}
-});
 
-}( mediaWiki, jQuery ) );
+	QUnit.test( 'Position right', 4, function ( assert ) {
+		// We need this thing to be visible, so append it to the DOM
+		var $span, spanText, d, spanTextNew,
+			origText = 'This is a really long random string and there is no way it fits in 100 pixels.',
+			$wrapper = createWrappedDiv( origText, '100px' );
+
+		$( '#qunit-fixture' ).append( $wrapper );
+		$wrapper.autoEllipsis( { position: 'right' } );
+
+		// Verify that, and only one, span element was created
+		$span = $wrapper.find( '> span' );
+		assert.strictEqual( $span.length, 1, 'autoEllipsis wrapped the contents in a span element' );
+
+		// Check that the text fits by turning on word wrapping
+		$span.css( 'whiteSpace', 'nowrap' );
+		assert.ltOrEq(
+			$span.width(),
+			$span.parent().width(),
+			'Text fits (making the span "white-space: nowrap" does not make it wider than its parent)'
+		);
+
+		// Add two characters using scary black magic
+		spanText = $span.text();
+		d = findDivergenceIndex( origText, spanText );
+		spanTextNew = spanText.substr( 0, d ) + origText[d] + origText[d] + '...';
+
+		assert.gt( spanTextNew.length, spanText.length, 'Verify that the new span-length is indeed greater' );
+
+		// Put this text in the span and verify it doesn't fit
+		$span.text( spanTextNew );
+		// In IE6 width works like min-width, allow IE6's width to be "equal to"
+		if ( $.browser.msie && Number( $.browser.version ) === 6 ) {
+			assert.gtOrEq( $span.width(), $span.parent().width(), 'Fit is maximal (adding two characters makes it not fit any more) - IE6: Maybe equal to as well due to width behaving like min-width in IE6' );
+		} else {
+			assert.gt( $span.width(), $span.parent().width(), 'Fit is maximal (adding two characters makes it not fit any more)' );
+		}
+	});
+
+}( jQuery ) );
diff --git a/tests/qunit/suites/resources/jquery/jquery.byteLength.test.js b/tests/qunit/suites/resources/jquery/jquery.byteLength.test.js
index 8d4ac034cc..378ea4b107 100644
--- a/tests/qunit/suites/resources/jquery/jquery.byteLength.test.js
+++ b/tests/qunit/suites/resources/jquery/jquery.byteLength.test.js
@@ -1,33 +1,35 @@
-QUnit.module( 'jquery.byteLength', QUnit.newMwEnvironment() );
+( function ( $ ) {
+	QUnit.module( 'jquery.byteLength', QUnit.newMwEnvironment() );
 
-QUnit.test( 'Simple text', 5, function ( assert ) {
-	var	azLc = 'abcdefghijklmnopqrstuvwxyz',
-		azUc = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ',
-		num = '0123456789',
-		x = '*',
-		space = '   ';
+	QUnit.test( 'Simple text', 5, function ( assert ) {
+		var	azLc = 'abcdefghijklmnopqrstuvwxyz',
+			azUc = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ',
+			num = '0123456789',
+			x = '*',
+			space = '   ';
 
-	assert.equal( $.byteLength( azLc ), 26, 'Lowercase a-z' );
-	assert.equal( $.byteLength( azUc ), 26, 'Uppercase A-Z' );
-	assert.equal( $.byteLength( num ), 10, 'Numbers 0-9' );
-	assert.equal( $.byteLength( x ), 1, 'An asterisk' );
-	assert.equal( $.byteLength( space ), 3, '3 spaces' );
+		assert.equal( $.byteLength( azLc ), 26, 'Lowercase a-z' );
+		assert.equal( $.byteLength( azUc ), 26, 'Uppercase A-Z' );
+		assert.equal( $.byteLength( num ), 10, 'Numbers 0-9' );
+		assert.equal( $.byteLength( x ), 1, 'An asterisk' );
+		assert.equal( $.byteLength( space ), 3, '3 spaces' );
 
-} );
+	} );
 
-QUnit.test( 'Special text', 5, function ( assert ) {
-	// http://en.wikipedia.org/wiki/UTF-8
-	var	U_0024 = '\u0024',
-		U_00A2 = '\u00A2',
-		U_20AC = '\u20AC',
-		U_024B62 = '\u024B62',
-		// The normal one doesn't display properly, try the below which is the same
-		// according to http://www.fileformat.info/info/unicode/char/24B62/index.htm
-		U_024B62_alt = '\uD852\uDF62';
+	QUnit.test( 'Special text', 5, function ( assert ) {
+		// http://en.wikipedia.org/wiki/UTF-8
+		var u0024 = '$',
+			u00A2 = '\u00A2',
+			u20AC = '\u20AC',
+			u024B62 = '\u024B62',
+			// The normal one doesn't display properly, try the below which is the same
+			// according to http://www.fileformat.info/info/unicode/char/24B62/index.htm
+			u024B62alt = '\uD852\uDF62';
 
-	assert.strictEqual( $.byteLength( U_0024 ), 1, 'U+0024: 1 byte. \u0024 (dollar sign)' );
-	assert.strictEqual( $.byteLength( U_00A2 ), 2, 'U+00A2: 2 bytes. \u00A2 (cent sign)' );
-	assert.strictEqual( $.byteLength( U_20AC ), 3, 'U+20AC: 3 bytes. \u20AC (euro sign)' );
-	assert.strictEqual( $.byteLength( U_024B62 ), 4, 'U+024B62: 4 bytes. \uD852\uDF62 (a Han character)' );
-	assert.strictEqual( $.byteLength( U_024B62_alt ), 4, 'U+024B62: 4 bytes. \uD852\uDF62 (a Han character) - alternative method' );
-} );
+		assert.strictEqual( $.byteLength( u0024 ), 1, 'U+0024: 1 byte. $ (dollar sign)' );
+		assert.strictEqual( $.byteLength( u00A2 ), 2, 'U+00A2: 2 bytes. \u00A2 (cent sign)' );
+		assert.strictEqual( $.byteLength( u20AC ), 3, 'U+20AC: 3 bytes. \u20AC (euro sign)' );
+		assert.strictEqual( $.byteLength( u024B62 ), 4, 'U+024B62: 4 bytes. \uD852\uDF62 (a Han character)' );
+		assert.strictEqual( $.byteLength( u024B62alt ), 4, 'U+024B62: 4 bytes. \uD852\uDF62 (a Han character) - alternative method' );
+	} );
+}( jQuery ) );
diff --git a/tests/qunit/suites/resources/jquery/jquery.byteLimit.test.js b/tests/qunit/suites/resources/jquery/jquery.byteLimit.test.js
index 4f86eb969a..4fe6770296 100644
--- a/tests/qunit/suites/resources/jquery/jquery.byteLimit.test.js
+++ b/tests/qunit/suites/resources/jquery/jquery.byteLimit.test.js
@@ -15,12 +15,13 @@
 	// Basic sendkey-implementation
 	function addChars( $input, charstr ) {
 		var c, len;
+		function x( $input, i ) {
+			// Add character to the value
+			return $input.val() + charstr.charAt( i );
+		}
 		for ( c = 0, len = charstr.length; c < len; c += 1 ) {
 			$input
-				.val( function ( i, val ) {
-					// Add character to the value
-					return val + charstr.charAt( c );
-				} )
+				.val( x( $input, c ) )
 				.trigger( 'change' );
 		}
 	}
diff --git a/tests/qunit/suites/resources/jquery/jquery.client.test.js b/tests/qunit/suites/resources/jquery/jquery.client.test.js
index bf62b39ab4..bbc88525a5 100644
--- a/tests/qunit/suites/resources/jquery/jquery.client.test.js
+++ b/tests/qunit/suites/resources/jquery/jquery.client.test.js
@@ -1,317 +1,321 @@
-QUnit.module( 'jquery.client', QUnit.newMwEnvironment() );
+( function ( $ ) {
+	var uacount, uas, testMap;
 
-/** Number of user-agent defined */
-var uacount = 0;
+	QUnit.module( 'jquery.client', QUnit.newMwEnvironment() );
 
-var uas = (function () {
+	/** Number of user-agent defined */
+	uacount = 0;
 
-	// Object keyed by userAgent. Value is an array (human-readable name, client-profile object, navigator.platform value)
-	// Info based on results from http://toolserver.org/~krinkle/testswarm/job/174/
-	var uas = {
-		// Internet Explorer 6
-		// Internet Explorer 7
-		'Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1)': {
-			title: 'Internet Explorer 7',
-			platform: 'Win32',
-			profile: {
-				"name": "msie",
-				"layout": "trident",
-				"layoutVersion": "unknown",
-				"platform": "win",
-				"version": "7.0",
-				"versionBase": "7",
-				"versionNumber": 7
-			},
-			wikiEditor: {
-				ltr: true,
-				rtl: false
-			}
-		},
-		// Internet Explorer 8
-		// Internet Explorer 9
-		// Internet Explorer 10
-		'Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.1; Trident/6.0)': {
-			title: 'Internet Explorer 10',
-			platform: 'Win32',
-			profile: {
-				"name": "msie",
-				"layout": "trident",
-				"layoutVersion": "unknown", // should be able to report 6?
-				"platform": "win",
-				"version": "10.0",
-				"versionBase": "10",
-				"versionNumber": 10
+	uas = ( function () {
+
+		// Object keyed by userAgent. Value is an array (human-readable name, client-profile object, navigator.platform value)
+		// Info based on results from http://toolserver.org/~krinkle/testswarm/job/174/
+		var uas = {
+			// Internet Explorer 6
+			// Internet Explorer 7
+			'Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1)': {
+				title: 'Internet Explorer 7',
+				platform: 'Win32',
+				profile: {
+					name: 'msie',
+					layout: 'trident',
+					layoutVersion: 'unknown',
+					platform: 'win',
+					version: '7.0',
+					versionBase: '7',
+					versionNumber: 7
+				},
+				wikiEditor: {
+					ltr: true,
+					rtl: false
+				}
 			},
-			wikiEditor: {
-				ltr: true,
-				rtl: true
-			}
-		},
-		// Firefox 2
-		// Firefox 3.5
-		'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.5; en-US; rv:1.9.1.19) Gecko/20110420 Firefox/3.5.19': {
-			title: 'Firefox 3.5',
-			platform: 'MacIntel',
-			profile: {
-				"name": "firefox",
-				"layout": "gecko",
-				"layoutVersion": 20110420,
-				"platform": "mac",
-				"version": "3.5.19",
-				"versionBase": "3",
-				"versionNumber": 3.5
+			// Internet Explorer 8
+			// Internet Explorer 9
+			// Internet Explorer 10
+			'Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.1; Trident/6.0)': {
+				title: 'Internet Explorer 10',
+				platform: 'Win32',
+				profile: {
+					name: 'msie',
+					layout: 'trident',
+					layoutVersion: 'unknown', // should be able to report 6?
+					platform: 'win',
+					version: '10.0',
+					versionBase: '10',
+					versionNumber: 10
+				},
+				wikiEditor: {
+					ltr: true,
+					rtl: true
+				}
 			},
-			wikiEditor: {
-				ltr: true,
-				rtl: true
-			}
-		},
-		// Firefox 3.6
-		'Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.17) Gecko/20110422 Ubuntu/10.10 (maverick) Firefox/3.6.17': {
-			title: 'Firefox 3.6',
-			platform: 'Linux i686',
-			profile: {
-				"name": "firefox",
-				"layout": "gecko",
-				"layoutVersion": 20110422,
-				"platform": "linux",
-				"version": "3.6.17",
-				"versionBase": "3",
-				"versionNumber": 3.6
+			// Firefox 2
+			// Firefox 3.5
+			'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.5; en-US; rv:1.9.1.19) Gecko/20110420 Firefox/3.5.19': {
+				title: 'Firefox 3.5',
+				platform: 'MacIntel',
+				profile: {
+					name: 'firefox',
+					layout: 'gecko',
+					layoutVersion: 20110420,
+					platform: 'mac',
+					version: '3.5.19',
+					versionBase: '3',
+					versionNumber: 3.5
+				},
+				wikiEditor: {
+					ltr: true,
+					rtl: true
+				}
 			},
-			wikiEditor: {
-				ltr: true,
-				rtl: true
-			}
-		},
-		// Firefox 4
-		'Mozilla/5.0 (Windows NT 6.0; rv:2.0.1) Gecko/20100101 Firefox/4.0.1': {
-			title: 'Firefox 4',
-			platform: 'Win32',
-			profile: {
-				"name": "firefox",
-				"layout": "gecko",
-				"layoutVersion": 20100101,
-				"platform": "win",
-				"version": "4.0.1",
-				"versionBase": "4",
-				"versionNumber": 4
+			// Firefox 3.6
+			'Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.17) Gecko/20110422 Ubuntu/10.10 (maverick) Firefox/3.6.17': {
+				title: 'Firefox 3.6',
+				platform: 'Linux i686',
+				profile: {
+					name: 'firefox',
+					layout: 'gecko',
+					layoutVersion: 20110422,
+					platform: 'linux',
+					version: '3.6.17',
+					versionBase: '3',
+					versionNumber: 3.6
+				},
+				wikiEditor: {
+					ltr: true,
+					rtl: true
+				}
 			},
-			wikiEditor: {
-				ltr: true,
-				rtl: true
-			}
-		},
-		// Firefox 10 nightly build
-		'Mozilla/5.0 (X11; Linux x86_64; rv:10.0a1) Gecko/20111103 Firefox/10.0a1': {
-			title: 'Firefox 10 nightly',
-			platform: 'Linux',
-			profile: {
-				"name": "firefox",
-				"layout": "gecko",
-				"layoutVersion": 20111103,
-				"platform": "linux",
-				"version": "10.0a1",
-				"versionBase": "10",
-				"versionNumber": 10
+			// Firefox 4
+			'Mozilla/5.0 (Windows NT 6.0; rv:2.0.1) Gecko/20100101 Firefox/4.0.1': {
+				title: 'Firefox 4',
+				platform: 'Win32',
+				profile: {
+					name: 'firefox',
+					layout: 'gecko',
+					layoutVersion: 20100101,
+					platform: 'win',
+					version: '4.0.1',
+					versionBase: '4',
+					versionNumber: 4
+				},
+				wikiEditor: {
+					ltr: true,
+					rtl: true
+				}
 			},
-			wikiEditor: {
-				ltr: true,
-				rtl: true
-			}
-		},
-		// Firefox 5
-		// Safari 3
-		// Safari 4
-		'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': {
-			title: 'Safari 4',
-			platform: 'MacIntel',
-			profile: {
-				"name": "safari",
-				"layout": "webkit",
-				"layoutVersion": 531,
-				"platform": "mac",
-				"version": "4.0.5",
-				"versionBase": "4",
-				"versionNumber": 4
+			// Firefox 10 nightly build
+			'Mozilla/5.0 (X11; Linux x86_64; rv:10.0a1) Gecko/20111103 Firefox/10.0a1': {
+				title: 'Firefox 10 nightly',
+				platform: 'Linux',
+				profile: {
+					name: 'firefox',
+					layout: 'gecko',
+					layoutVersion: 20111103,
+					platform: 'linux',
+					version: '10.0a1',
+					versionBase: '10',
+					versionNumber: 10
+				},
+				wikiEditor: {
+					ltr: true,
+					rtl: true
+				}
 			},
-			wikiEditor: {
-				ltr: true,
-				rtl: true
-			}
-		},
-		'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': {
-			title: 'Safari 4',
-			platform: 'Win32',
-			profile: {
-				"name": "safari",
-				"layout": "webkit",
-				"layoutVersion": 533,
-				"platform": "win",
-				"version": "4.0.5",
-				"versionBase": "4",
-				"versionNumber": 4
+			// Firefox 5
+			// Safari 3
+			// Safari 4
+			'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': {
+				title: 'Safari 4',
+				platform: 'MacIntel',
+				profile: {
+					name: 'safari',
+					layout: 'webkit',
+					layoutVersion: 531,
+					platform: 'mac',
+					version: '4.0.5',
+					versionBase: '4',
+					versionNumber: 4
+				},
+				wikiEditor: {
+					ltr: true,
+					rtl: true
+				}
 			},
-			wikiEditor: {
-				ltr: true,
-				rtl: true
-			}
-		},
-		// Safari 5
-		// Opera 10
-		// Chrome 5
-		// Chrome 6
-		// Chrome 7
-		// Chrome 8
-		// Chrome 9
-		// Chrome 10
-		// Chrome 11
-		// Chrome 12
-		'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': {
-			title: 'Chrome 12',
-			platform: 'MacIntel',
-			profile: {
-				"name": "chrome",
-				"layout": "webkit",
-				"layoutVersion": 534,
-				"platform": "mac",
-				"version": "12.0.742.112",
-				"versionBase": "12",
-				"versionNumber": 12
+			'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': {
+				title: 'Safari 4',
+				platform: 'Win32',
+				profile: {
+					name: 'safari',
+					layout: 'webkit',
+					layoutVersion: 533,
+					platform: 'win',
+					version: '4.0.5',
+					versionBase: '4',
+					versionNumber: 4
+				},
+				wikiEditor: {
+					ltr: true,
+					rtl: true
+				}
 			},
-			wikiEditor: {
-				ltr: true,
-				rtl: true
-			}
-		},
-		'Mozilla/5.0 (X11; Linux i686) AppleWebKit/534.30 (KHTML, like Gecko) Chrome/12.0.742.68 Safari/534.30': {
-			title: 'Chrome 12',
-			platform: 'Linux i686',
-			profile: {
-				"name": "chrome",
-				"layout": "webkit",
-				"layoutVersion": 534,
-				"platform": "linux",
-				"version": "12.0.742.68",
-				"versionBase": "12",
-				"versionNumber": 12
+			// Safari 5
+			// Opera 10
+			// Chrome 5
+			// Chrome 6
+			// Chrome 7
+			// Chrome 8
+			// Chrome 9
+			// Chrome 10
+			// Chrome 11
+			// Chrome 12
+			'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': {
+				title: 'Chrome 12',
+				platform: 'MacIntel',
+				profile: {
+					name: 'chrome',
+					layout: 'webkit',
+					layoutVersion: 534,
+					platform: 'mac',
+					version: '12.0.742.112',
+					versionBase: '12',
+					versionNumber: 12
+				},
+				wikiEditor: {
+					ltr: true,
+					rtl: true
+				}
 			},
-			wikiEditor: {
-				ltr: true,
-				rtl: true
-			}
-		},
-		// Bug #34924
-		'Mozilla/5.0 (X11; Linux i686) AppleWebKit/534.34 (KHTML, like Gecko) rekonq Safari/534.34': {
-			title: 'Rekonq',
-			platform: 'Linux i686',
-			profile: {
-				"name": "rekonq",
-				"layout": "webkit",
-				"layoutVersion": 534,
-				"platform": "linux",
-				"version": "534.34",
-				"versionBase": "534",
-				"versionNumber": 534.34
+			'Mozilla/5.0 (X11; Linux i686) AppleWebKit/534.30 (KHTML, like Gecko) Chrome/12.0.742.68 Safari/534.30': {
+				title: 'Chrome 12',
+				platform: 'Linux i686',
+				profile: {
+					name: 'chrome',
+					layout: 'webkit',
+					layoutVersion: 534,
+					platform: 'linux',
+					version: '12.0.742.68',
+					versionBase: '12',
+					versionNumber: 12
+				},
+				wikiEditor: {
+					ltr: true,
+					rtl: true
+				}
 			},
-			wikiEditor: {
-				ltr: true,
-				rtl: true
+			// Bug #34924
+			'Mozilla/5.0 (X11; Linux i686) AppleWebKit/534.34 (KHTML, like Gecko) rekonq Safari/534.34': {
+				title: 'Rekonq',
+				platform: 'Linux i686',
+				profile: {
+					name: 'rekonq',
+					layout: 'webkit',
+					layoutVersion: 534,
+					platform: 'linux',
+					version: '534.34',
+					versionBase: '534',
+					versionNumber: 534.34
+				},
+				wikiEditor: {
+					ltr: true,
+					rtl: true
+				}
 			}
-		}
-	};
-	$.each( uas, function () {
-		uacount++;
-	});
-	return uas;
-}());
+		};
+		$.each( uas, function () {
+			uacount++;
+		});
+		return uas;
+	}() );
 
-QUnit.test( 'profile userAgent support', uacount, function ( assert ) {
-	// Generate a client profile object and compare recursively
-	var uaTest = function( rawUserAgent, data ) {
-		var ret = $.client.profile( {
-			userAgent: rawUserAgent,
-			platform: data.platform
-		} );
-		assert.deepEqual( ret, data.profile, 'Client profile support check for ' + data.title + ' (' + data.platform + '): ' + rawUserAgent );
-	};
+	QUnit.test( 'profile userAgent support', uacount, function ( assert ) {
+		// Generate a client profile object and compare recursively
+		var uaTest = function( rawUserAgent, data ) {
+			var ret = $.client.profile( {
+				userAgent: rawUserAgent,
+				platform: data.platform
+			} );
+			assert.deepEqual( ret, data.profile, 'Client profile support check for ' + data.title + ' (' + data.platform + '): ' + rawUserAgent );
+		};
 
-	// Loop through and run tests
-	$.each( uas, uaTest );
-} );
+		// Loop through and run tests
+		$.each( uas, uaTest );
+	} );
 
-QUnit.test( 'profile return validation for current user agent', 7, function ( assert ) {
-	var p = $.client.profile();
-	function unknownOrType( val, type, summary ) {
-		assert.ok( typeof val === type || val === 'unknown', summary );
-	}
+	QUnit.test( 'profile return validation for current user agent', 7, function ( assert ) {
+		var p = $.client.profile();
+		function unknownOrType( val, type, summary ) {
+			assert.ok( typeof val === type || val === 'unknown', summary );
+		}
 
-	assert.equal( typeof p, 'object', 'profile returns an object' );
-	unknownOrType( p.layout, 'string', 'p.layout is a string (or "unknown")' );
-	unknownOrType( p.layoutVersion, 'number', 'p.layoutVersion is a number (or "unknown")' );
-	unknownOrType( p.platform, 'string', 'p.platform is a string (or "unknown")' );
-	unknownOrType( p.version, 'string', 'p.version is a string (or "unknown")' );
-	unknownOrType( p.versionBase, 'string', 'p.versionBase is a string (or "unknown")' );
-	assert.equal( typeof p.versionNumber, 'number', 'p.versionNumber is a number' );
-});
+		assert.equal( typeof p, 'object', 'profile returns an object' );
+		unknownOrType( p.layout, 'string', 'p.layout is a string (or "unknown")' );
+		unknownOrType( p.layoutVersion, 'number', 'p.layoutVersion is a number (or "unknown")' );
+		unknownOrType( p.platform, 'string', 'p.platform is a string (or "unknown")' );
+		unknownOrType( p.version, 'string', 'p.version is a string (or "unknown")' );
+		unknownOrType( p.versionBase, 'string', 'p.versionBase is a string (or "unknown")' );
+		assert.equal( typeof p.versionNumber, 'number', 'p.versionNumber is a number' );
+	});
 
-// Example from WikiEditor
-// Make sure to use raw numbers, a string like "7.0" would fail on a
-// version 10 browser since in string comparaison "10" is before "7.0" :)
-var testMap = {
-	'ltr': {
-		'msie': [['>=', 7.0]],
-		'firefox': [['>=', 2]],
-		'opera': [['>=', 9.6]],
-		'safari': [['>=', 3]],
-		'chrome': [['>=', 3]],
-		'netscape': [['>=', 9]],
-		'blackberry': false,
-		'ipod': false,
-		'iphone': false
-	},
-	'rtl': {
-		'msie': [['>=', 8]],
-		'firefox': [['>=', 2]],
-		'opera': [['>=', 9.6]],
-		'safari': [['>=', 3]],
-		'chrome': [['>=', 3]],
-		'netscape': [['>=', 9]],
-		'blackberry': false,
-		'ipod': false,
-		'iphone': false
-	}
-};
+	// Example from WikiEditor
+	// Make sure to use raw numbers, a string like "7.0" would fail on a
+	// version 10 browser since in string comparaison "10" is before "7.0" :)
+	testMap = {
+		'ltr': {
+			'msie': [['>=', 7.0]],
+			'firefox': [['>=', 2]],
+			'opera': [['>=', 9.6]],
+			'safari': [['>=', 3]],
+			'chrome': [['>=', 3]],
+			'netscape': [['>=', 9]],
+			'blackberry': false,
+			'ipod': false,
+			'iphone': false
+		},
+		'rtl': {
+			'msie': [['>=', 8]],
+			'firefox': [['>=', 2]],
+			'opera': [['>=', 9.6]],
+			'safari': [['>=', 3]],
+			'chrome': [['>=', 3]],
+			'netscape': [['>=', 9]],
+			'blackberry': false,
+			'ipod': false,
+			'iphone': false
+		}
+	};
 
-QUnit.test( 'test', 1, function ( assert ) {
-	// .test() uses eval, make sure no exceptions are thrown
-	// then do a basic return value type check
-	var testMatch = $.client.test( testMap );
+	QUnit.test( 'test', 1, function ( assert ) {
+		// .test() uses eval, make sure no exceptions are thrown
+		// then do a basic return value type check
+		var testMatch = $.client.test( testMap );
 
-	assert.equal( typeof testMatch, 'boolean', 'test returns a boolean value' );
+		assert.equal( typeof testMatch, 'boolean', 'test returns a boolean value' );
 
-});
+	});
 
-QUnit.test( 'User-agent matches against WikiEditor\'s compatibility map', uacount * 2, function ( assert ) {
-	var	$body = $( 'body' ),
-		bodyClasses = $body.attr( 'class' );
+	QUnit.test( 'User-agent matches against WikiEditor\'s compatibility map', uacount * 2, function ( assert ) {
+		var	$body = $( 'body' ),
+			bodyClasses = $body.attr( 'class' );
 
-	// Loop through and run tests
-	$.each( uas, function ( agent, data ) {
-		$.each( ['ltr', 'rtl'], function ( i, dir ) {
-			$body.removeClass( 'ltr rtl' ).addClass( dir );
-			var profile = $.client.profile( {
-				userAgent: agent,
-				platform: data.platform
-			} );
-			var testMatch = $.client.test( testMap, profile );
-			$body.removeClass( dir );
+		// Loop through and run tests
+		$.each( uas, function ( agent, data ) {
+			$.each( ['ltr', 'rtl'], function ( i, dir ) {
+				var profile, testMatch;
+				$body.removeClass( 'ltr rtl' ).addClass( dir );
+				profile = $.client.profile( {
+					userAgent: agent,
+					platform: data.platform
+				} );
+				testMatch = $.client.test( testMap, profile );
+				$body.removeClass( dir );
 
-			assert.equal( testMatch, data.wikiEditor[dir], 'testing comparison based on ' + dir + ', ' + agent );
+				assert.equal( testMatch, data.wikiEditor[dir], 'testing comparison based on ' + dir + ', ' + agent );
+			});
 		});
-	});
-
-	// Restore body classes
-	$body.attr( 'class', bodyClasses );
-});
 
+		// Restore body classes
+		$body.attr( 'class', bodyClasses );
+	});
+}( jQuery ) );
diff --git a/tests/qunit/suites/resources/jquery/jquery.colorUtil.test.js b/tests/qunit/suites/resources/jquery/jquery.colorUtil.test.js
index 7b37f5a059..51a892ed84 100644
--- a/tests/qunit/suites/resources/jquery/jquery.colorUtil.test.js
+++ b/tests/qunit/suites/resources/jquery/jquery.colorUtil.test.js
@@ -1,58 +1,62 @@
-QUnit.module( 'jquery.colorUtil', QUnit.newMwEnvironment() );
-
-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)' );
-
-	// Perhaps this is a bug in colorUtil, but it is the current behaviour 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.strictEqual( $.colorUtil.getRGB( 'mediaWiki' ), undefined, 'Inexisting color name' );
-});
-
-QUnit.test( 'rgbToHsl', 1, function ( assert ) {
-	var hsl = $.colorUtil.rgbToHsl( 144, 238, 144 );
-
-	// Cross-browser differences in decimals...
-	// Round to two decimals so they can be more reliably checked.
-	var dualDecimals = function(a,b){
-		return Math.round(a*100)/100;
-	};
-	// Re-create the rgbToHsl return array items, limited to two decimals.
-	var 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)' );
-});
-
-QUnit.test( 'hslToRgb', 1, function ( assert ) {
-	var rgb = $.colorUtil.hslToRgb( 0.3, 0.7, 0.8 );
-
-	// Cross-browser differences in decimals...
-	// Re-create the hslToRgb return array items, rounded to whole numbers.
-	var 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)' );
-});
-
-QUnit.test( 'getColorBrightness', 2, function ( assert ) {
-	var a = $.colorUtil.getColorBrightness( 'red', +0.1 );
-	assert.equal( a, 'rgb(255,50,50)', 'Start with named color "red", brighten 10%' );
-
-	var b = $.colorUtil.getColorBrightness( 'rgb(200,50,50)', -0.2 );
-	assert.equal( b, 'rgb(118,29,29)', 'Start with rgb string "rgb(200,50,50)", darken 20%' );
-});
+( function ( $ ) {
+	QUnit.module( 'jquery.colorUtil', QUnit.newMwEnvironment() );
+
+	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)' );
+
+		// Perhaps this is a bug in colorUtil, but it is the current behaviour 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.strictEqual( $.colorUtil.getRGB( 'mediaWiki' ), undefined, 'Inexisting color name' );
+	});
+
+	QUnit.test( 'rgbToHsl', 1, function ( assert ) {
+		var hsl, ret;
+
+		// Cross-browser differences in decimals...
+		// Round to two decimals so they can be more reliably checked.
+		function dualDecimals( a ) {
+			return Math.round( a * 100 ) / 100;
+		}
+		// 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] ) ];
+
+		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 ) {
+		var rgb, ret;
+		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]) ];
+
+		assert.deepEqual( ret ,[183, 240, 168], 'hsl(0.3, 0.7, 0.8): rgb(183, 240, 168)' );
+	});
+
+	QUnit.test( 'getColorBrightness', 2, function ( assert ) {
+		var a, b;
+		a = $.colorUtil.getColorBrightness( 'red', +0.1 );
+		assert.equal( a, 'rgb(255,50,50)', 'Start with named color "red", brighten 10%' );
+
+		b = $.colorUtil.getColorBrightness( 'rgb(200,50,50)', -0.2 );
+		assert.equal( b, 'rgb(118,29,29)', 'Start with rgb string "rgb(200,50,50)", darken 20%' );
+	});
+}( jQuery ) );
diff --git a/tests/qunit/suites/resources/jquery/jquery.delayedBind.test.js b/tests/qunit/suites/resources/jquery/jquery.delayedBind.test.js
index a307983557..3e7d5ffce9 100644
--- a/tests/qunit/suites/resources/jquery/jquery.delayedBind.test.js
+++ b/tests/qunit/suites/resources/jquery/jquery.delayedBind.test.js
@@ -1,35 +1,37 @@
-QUnit.asyncTest('jquery.delayedBind with data option', 2, function ( assert ) {
-	var $fixture = $('<div>').appendTo('#qunit-fixture'),
-		data = { magic: "beeswax" },
-		delay = 50;
+( function ( $ ) {
+	QUnit.asyncTest('jquery.delayedBind with data option', 2, function ( assert ) {
+		var $fixture = $('<div>').appendTo('#qunit-fixture'),
+			data = {
+				magic: 'beeswax'
+			},
+			delay = 50;
 
-	$fixture.delayedBind(delay, 'testevent', data, function ( e ) {
-		QUnit.start(); // continue!
-		assert.ok( true, 'testevent fired');
-		assert.ok( e.data === data, 'data is passed through delayedBind');
+		$fixture.delayedBind(delay, 'testevent', data, function ( e ) {
+			assert.ok( true, 'testevent fired');
+			assert.ok( e.data === data, 'data is passed through delayedBind');
+			QUnit.start();
+		});
+
+		// We'll trigger it thrice, but it should only happen once.
+		$fixture.trigger( 'testevent', {} );
+		$fixture.trigger( 'testevent', {} );
+		$fixture.trigger( 'testevent', {} );
+		$fixture.trigger( 'testevent', {} );
 	});
 
-	// We'll trigger it thrice, but it should only happen once.
-	$fixture.trigger( 'testevent', {} );
-	$fixture.trigger( 'testevent', {} );
-	$fixture.trigger( 'testevent', {} );
-	$fixture.trigger( 'testevent', {} );
-});
+	QUnit.asyncTest('jquery.delayedBind without data option', 1, function ( assert ) {
+		var $fixture = $('<div>').appendTo('#qunit-fixture'),
+			delay = 50;
 
-QUnit.asyncTest('jquery.delayedBind without data option', 1, function ( assert ) {
-	var $fixture = $('<div>').appendTo('#qunit-fixture'),
-		data = { magic: "beeswax" },
-		delay = 50;
+		$fixture.delayedBind(delay, 'testevent', function () {
+			assert.ok(true, 'testevent fired');
+			QUnit.start();
+		});
 
-	$fixture.delayedBind(delay, 'testevent', function ( e ) {
-		QUnit.start(); // continue!
-		assert.ok(true, 'testevent fired');
+		// We'll trigger it thrice, but it should only happen once.
+		$fixture.trigger( 'testevent', {} );
+		$fixture.trigger( 'testevent', {} );
+		$fixture.trigger( 'testevent', {} );
+		$fixture.trigger( 'testevent', {} );
 	});
-
-	// We'll trigger it thrice, but it should only happen once.
-	$fixture.trigger( 'testevent', {} );
-	$fixture.trigger( 'testevent', {} );
-	$fixture.trigger( 'testevent', {} );
-	$fixture.trigger( 'testevent', {} );
-});
-
+}( jQuery ) );
diff --git a/tests/qunit/suites/resources/jquery/jquery.getAttrs.test.js b/tests/qunit/suites/resources/jquery/jquery.getAttrs.test.js
index 6eef1abba1..82566c2cb3 100644
--- a/tests/qunit/suites/resources/jquery/jquery.getAttrs.test.js
+++ b/tests/qunit/suites/resources/jquery/jquery.getAttrs.test.js
@@ -1,11 +1,13 @@
-QUnit.module( 'jquery.getAttrs', QUnit.newMwEnvironment() );
+( function ( $ ) {
+	QUnit.module( 'jquery.getAttrs', QUnit.newMwEnvironment() );
 
-QUnit.test( 'Check', 1, function ( assert ) {
-	var	attrs = {
-			foo: 'bar',
-			'class': 'lorem'
-		},
-		$el = jQuery( '<div>', attrs );
+	QUnit.test( 'Check', 1, function ( assert ) {
+		var	attrs = {
+				foo: 'bar',
+				'class': 'lorem'
+			},
+			$el = $( '<div>' ).attr( attrs );
 
-	assert.deepEqual( $el.getAttrs(), attrs, 'getAttrs() return object should match the attributes set, no more, no less' );
-} );
+		assert.deepEqual( $el.getAttrs(), attrs, 'getAttrs() return object should match the attributes set, no more, no less' );
+	} );
+}( jQuery ) );
diff --git a/tests/qunit/suites/resources/jquery/jquery.hidpi.test.js b/tests/qunit/suites/resources/jquery/jquery.hidpi.test.js
index cf309df800..d75c3789a6 100644
--- a/tests/qunit/suites/resources/jquery/jquery.hidpi.test.js
+++ b/tests/qunit/suites/resources/jquery/jquery.hidpi.test.js
@@ -1,20 +1,22 @@
-QUnit.module( 'jquery.hidpi', QUnit.newMwEnvironment() );
+( function ( $ ) {
+	QUnit.module( 'jquery.hidpi', QUnit.newMwEnvironment() );
 
-QUnit.test( 'devicePixelRatio', function ( assert ) {
-	var devicePixelRatio = $.devicePixelRatio();
-	assert.equal( typeof devicePixelRatio, 'number', '$.devicePixelRatio() returns a number' );
-});
+	QUnit.test( 'devicePixelRatio', function ( assert ) {
+		var devicePixelRatio = $.devicePixelRatio();
+		assert.equal( typeof devicePixelRatio, 'number', '$.devicePixelRatio() returns a number' );
+	});
 
-QUnit.test( 'matchSrcSet', function ( assert ) {
-	var srcset = 'onefive.png 1.5x, two.png 2x';
+	QUnit.test( 'matchSrcSet', function ( assert ) {
+		var srcset = 'onefive.png 1.5x, two.png 2x';
 
-	// Nice exact matches
-	assert.equal( $.matchSrcSet( 1, srcset ), null, '1.0 gives no match' );
-	assert.equal( $.matchSrcSet( 1.5, srcset ), 'onefive.png', '1.5 gives match' );
-	assert.equal( $.matchSrcSet( 2, srcset ), 'two.png', '2 gives match' );
+		// Nice exact matches
+		assert.equal( $.matchSrcSet( 1, srcset ), null, '1.0 gives no match' );
+		assert.equal( $.matchSrcSet( 1.5, srcset ), 'onefive.png', '1.5 gives match' );
+		assert.equal( $.matchSrcSet( 2, srcset ), 'two.png', '2 gives match' );
 
-	// Non-exact matches; should return the next-biggest specified
-	assert.equal( $.matchSrcSet( 1.25, srcset ), null, '1.25 gives no match' );
-	assert.equal( $.matchSrcSet( 1.75, srcset ), 'onefive.png', '1.75 gives match to 1.5' );
-	assert.equal( $.matchSrcSet( 2.25, srcset ), 'two.png', '2.25 gives match to 2' );
-});
+		// Non-exact matches; should return the next-biggest specified
+		assert.equal( $.matchSrcSet( 1.25, srcset ), null, '1.25 gives no match' );
+		assert.equal( $.matchSrcSet( 1.75, srcset ), 'onefive.png', '1.75 gives match to 1.5' );
+		assert.equal( $.matchSrcSet( 2.25, srcset ), 'two.png', '2.25 gives match to 2' );
+	});
+}( jQuery ) );
diff --git a/tests/qunit/suites/resources/jquery/jquery.highlightText.test.js b/tests/qunit/suites/resources/jquery/jquery.highlightText.test.js
index a94dca313a..e1fb96dceb 100644
--- a/tests/qunit/suites/resources/jquery/jquery.highlightText.test.js
+++ b/tests/qunit/suites/resources/jquery/jquery.highlightText.test.js
@@ -1,232 +1,235 @@
-QUnit.module( 'jquery.highlightText', QUnit.newMwEnvironment() );
+( function ( $ ) {
+	QUnit.module( 'jquery.highlightText', QUnit.newMwEnvironment() );
 
-QUnit.test( 'Check', function ( assert ) {
-	var $fixture, cases = [
-		{
-		        desc: 'Test 001',
-			text: 'Blue Öyster Cult',
-			highlight: 'Blue',
-			expected: '<span class="highlight">Blue</span> Öyster Cult'
-		},
-		{
-		        desc: 'Test 002',
-			text: 'Blue Öyster Cult',
-			highlight: 'Blue ',
-			expected: '<span class="highlight">Blue</span> Öyster Cult'
-		},
-		{
-			desc: 'Test 003',
-			text: 'Blue Öyster Cult',
-			highlight: 'Blue Ö',
-			expected: '<span class="highlight">Blue</span> <span class="highlight">Ö</span>yster Cult'
-		},
-		{
-			desc: 'Test 004',
-			text: 'Blue Öyster Cult',
-			highlight: 'Blue Öy',
-			expected: '<span class="highlight">Blue</span> <span class="highlight">Öy</span>ster Cult'
-		},
-		{
-			desc: 'Test 005',
-			text: 'Blue Öyster Cult',
-			highlight: ' Blue',
-			expected: '<span class="highlight">Blue</span> Öyster Cult'
-		},
-		{
-			desc: 'Test 006',
-			text: 'Blue Öyster Cult',
-			highlight: ' Blue ',
-			expected: '<span class="highlight">Blue</span> Öyster Cult'
-		},
-		{
-			desc: 'Test 007',
-			text: 'Blue Öyster Cult',
-			highlight: ' Blue Ö',
-			expected: '<span class="highlight">Blue</span> <span class="highlight">Ö</span>yster Cult'
-		},
-		{
-			desc: 'Test 008',
-			text: 'Blue Öyster Cult',
-			highlight: ' Blue Öy',
-			expected: '<span class="highlight">Blue</span> <span class="highlight">Öy</span>ster Cult'
-		},
-		{
-			desc: 'Test 009: Highlighter broken on starting Umlaut?',
-			text: 'Österreich',
-			highlight: 'Österreich',
-			expected: '<span class="highlight">Österreich</span>'
-		},
-		{
-			desc: 'Test 010: Highlighter broken on starting Umlaut?',
-			text: 'Österreich',
-			highlight: 'Ö',
-			expected: '<span class="highlight">Ö</span>sterreich'
-		},
-		{
-			desc: 'Test 011: Highlighter broken on starting Umlaut?',
-			text: 'Österreich',
-			highlight: 'Öst',
-			expected: '<span class="highlight">Öst</span>erreich'
-		},
-		{
-			desc: 'Test 012: Highlighter broken on starting Umlaut?',
-			text: 'Österreich',
-			highlight: 'Oe',
-			expected: 'Österreich'
-		},
-		{
-			desc: 'Test 013: Highlighter broken on punctuation mark?',
-			text: 'So good. To be there',
-			highlight: 'good',
-			expected: 'So <span class="highlight">good</span>. To be there'
-		},
-		{
-			desc: 'Test 014: Highlighter broken on space?',
-			text: 'So good. To be there',
-			highlight: 'be',
-			expected: 'So good. To <span class="highlight">be</span> there'
-		},
-		{
-			desc: 'Test 015: Highlighter broken on space?',
-			text: 'So good. To be there',
-			highlight: ' be',
-			expected: 'So good. To <span class="highlight">be</span> there'
-		},
-		{
-			desc: 'Test 016: Highlighter broken on space?',
-			text: 'So good. To be there',
-			highlight: 'be ',
-			expected: 'So good. To <span class="highlight">be</span> there'
-		},
-		{
-			desc: 'Test 017: Highlighter broken on space?',
-			text: 'So good. To be there',
-			highlight: ' be ',
-			expected: 'So good. To <span class="highlight">be</span> there'
-		},
-		{
-			desc: 'Test 018: en de Highlighter broken on special character at the end?',
-			text: 'So good. xbß',
-			highlight: 'xbß',
-			expected: 'So good. <span class="highlight">xbß</span>'
-		},
-		{
-			desc: 'Test 019: en de Highlighter broken on special character at the end?',
-			text: 'So good. xbß.',
-			highlight: 'xbß.',
-			expected: 'So good. <span class="highlight">xbß.</span>'
-		},
-		{
-			desc: 'Test 020: RTL he Hebrew',
-			text: 'חסיד אומות העולם',
-			highlight: 'חסיד אומות העולם',
-			expected: '<span class="highlight">חסיד</span> <span class="highlight">אומות</span> <span class="highlight">העולם</span>'
-		},
-		{
-			desc: 'Test 021: RTL he Hebrew',
-			text: 'חסיד אומות העולם',
-			highlight: 'חסי',
-			expected: '<span class="highlight">חסי</span>ד אומות העולם'
-		},
-		{
-			desc: 'Test 022: ja Japanese',
-			text: '諸国民の中の正義の人',
-			highlight: '諸国民の中の正義の人',
-			expected: '<span class="highlight">諸国民の中の正義の人</span>'
-		},
-		{
-			desc: 'Test 023: ja Japanese',
-			text: '諸国民の中の正義の人',
-			highlight: '諸国',
-			expected: '<span class="highlight">諸国</span>民の中の正義の人'
-		},
-		{
-			desc: 'Test 024: fr French text and « french quotes » (guillemets)',
-			text: "« L'oiseau est sur l’île »",
-			highlight: "« L'oiseau est sur l’île »",
-			expected: '<span class="highlight">«</span> <span class="highlight">L\'oiseau</span> <span class="highlight">est</span> <span class="highlight">sur</span> <span class="highlight">l’île</span> <span class="highlight">»</span>'
-		},
-		{
-			desc: 'Test 025: fr French text and « french quotes » (guillemets)',
-			text: "« L'oiseau est sur l’île »",
-			highlight: "« L'oise",
-			expected: '<span class="highlight">«</span> <span class="highlight">L\'oise</span>au est sur l’île »'
-		},
-		{
-			desc: 'Test 025a: fr French text and « french quotes » (guillemets) - does it match the single strings "«" and "L" separately?',
-			text: "« L'oiseau est sur l’île »",
-			highlight: "« L",
-			expected: '<span class="highlight">«</span> <span class="highlight">L</span>\'oiseau est sur <span class="highlight">l</span>’île »'
-		},
-		{
-			desc: 'Test 026: ru Russian',
-			text: 'Праведники мира',
-			highlight: 'Праведники мира',
-			expected: '<span class="highlight">Праведники</span> <span class="highlight">мира</span>'
-		},
-		{
-			desc: 'Test 027: ru Russian',
-			text: 'Праведники мира',
-			highlight: 'Праве',
-			expected: '<span class="highlight">Праве</span>дники мира'
-		},
-		{
-			desc: 'Test 028 ka Georgian',
-			text: 'მთავარი გვერდი',
-			highlight: 'მთავარი გვერდი',
-			expected: '<span class="highlight">მთავარი</span> <span class="highlight">გვერდი</span>'
-		},
-		{
-			desc: 'Test 029 ka Georgian',
-			text: 'მთავარი გვერდი',
-			highlight: 'მთა',
-			expected: '<span class="highlight">მთა</span>ვარი გვერდი'
-		},
-		{
-			desc: 'Test 030 hy Armenian',
-			text: 'Նոնա Գափրինդաշվիլի',
-			highlight: 'Նոնա Գափրինդաշվիլի',
-			expected: '<span class="highlight">Նոնա</span> <span class="highlight">Գափրինդաշվիլի</span>'
-		},
-		{
-			desc: 'Test 031 hy Armenian',
-			text: 'Նոնա Գափրինդաշվիլի',
-			highlight: 'Նոն',
-			expected: '<span class="highlight">Նոն</span>ա Գափրինդաշվիլի'
-		},
-		{
-			desc: 'Test 032: th Thai',
-			text: 'พอล แอร์ดิช',
-			highlight: 'พอล แอร์ดิช',
-			expected: '<span class="highlight">พอล</span> <span class="highlight">แอร์ดิช</span>'
-		},
-		{
-			desc: 'Test 033: th Thai',
-			text: 'พอล แอร์ดิช',
-			highlight: 'พอ',
-			expected: '<span class="highlight">พอ</span>ล แอร์ดิช'
-		},
-		{
-			desc: 'Test 034: RTL ar Arabic',
-			text: 'بول إيردوس',
-			highlight: 'بول إيردوس',
-			expected: '<span class="highlight">بول</span> <span class="highlight">إيردوس</span>'
-		},
-		{
-			desc: 'Test 035: RTL ar Arabic',
-			text: 'بول إيردوس',
-			highlight: 'بو',
-			expected: '<span class="highlight">بو</span>ل إيردوس'
-		}
-	];
-	QUnit.expect( cases.length );
+	QUnit.test( 'Check', function ( assert ) {
+		var $fixture, cases = [
+			{
+				desc: 'Test 001',
+				text: 'Blue Öyster Cult',
+				highlight: 'Blue',
+				expected: '<span class="highlight">Blue</span> Öyster Cult'
+			},
+			{
+				desc: 'Test 002',
+				text: 'Blue Öyster Cult',
+				highlight: 'Blue ',
+				expected: '<span class="highlight">Blue</span> Öyster Cult'
+			},
+			{
+				desc: 'Test 003',
+				text: 'Blue Öyster Cult',
+				highlight: 'Blue Ö',
+				expected: '<span class="highlight">Blue</span> <span class="highlight">Ö</span>yster Cult'
+			},
+			{
+				desc: 'Test 004',
+				text: 'Blue Öyster Cult',
+				highlight: 'Blue Öy',
+				expected: '<span class="highlight">Blue</span> <span class="highlight">Öy</span>ster Cult'
+			},
+			{
+				desc: 'Test 005',
+				text: 'Blue Öyster Cult',
+				highlight: ' Blue',
+				expected: '<span class="highlight">Blue</span> Öyster Cult'
+			},
+			{
+				desc: 'Test 006',
+				text: 'Blue Öyster Cult',
+				highlight: ' Blue ',
+				expected: '<span class="highlight">Blue</span> Öyster Cult'
+			},
+			{
+				desc: 'Test 007',
+				text: 'Blue Öyster Cult',
+				highlight: ' Blue Ö',
+				expected: '<span class="highlight">Blue</span> <span class="highlight">Ö</span>yster Cult'
+			},
+			{
+				desc: 'Test 008',
+				text: 'Blue Öyster Cult',
+				highlight: ' Blue Öy',
+				expected: '<span class="highlight">Blue</span> <span class="highlight">Öy</span>ster Cult'
+			},
+			{
+				desc: 'Test 009: Highlighter broken on starting Umlaut?',
+				text: 'Österreich',
+				highlight: 'Österreich',
+				expected: '<span class="highlight">Österreich</span>'
+			},
+			{
+				desc: 'Test 010: Highlighter broken on starting Umlaut?',
+				text: 'Österreich',
+				highlight: 'Ö',
+				expected: '<span class="highlight">Ö</span>sterreich'
+			},
+			{
+				desc: 'Test 011: Highlighter broken on starting Umlaut?',
+				text: 'Österreich',
+				highlight: 'Öst',
+				expected: '<span class="highlight">Öst</span>erreich'
+			},
+			{
+				desc: 'Test 012: Highlighter broken on starting Umlaut?',
+				text: 'Österreich',
+				highlight: 'Oe',
+				expected: 'Österreich'
+			},
+			{
+				desc: 'Test 013: Highlighter broken on punctuation mark?',
+				text: 'So good. To be there',
+				highlight: 'good',
+				expected: 'So <span class="highlight">good</span>. To be there'
+			},
+			{
+				desc: 'Test 014: Highlighter broken on space?',
+				text: 'So good. To be there',
+				highlight: 'be',
+				expected: 'So good. To <span class="highlight">be</span> there'
+			},
+			{
+				desc: 'Test 015: Highlighter broken on space?',
+				text: 'So good. To be there',
+				highlight: ' be',
+				expected: 'So good. To <span class="highlight">be</span> there'
+			},
+			{
+				desc: 'Test 016: Highlighter broken on space?',
+				text: 'So good. To be there',
+				highlight: 'be ',
+				expected: 'So good. To <span class="highlight">be</span> there'
+			},
+			{
+				desc: 'Test 017: Highlighter broken on space?',
+				text: 'So good. To be there',
+				highlight: ' be ',
+				expected: 'So good. To <span class="highlight">be</span> there'
+			},
+			{
+				desc: 'Test 018: en de Highlighter broken on special character at the end?',
+				text: 'So good. xbß',
+				highlight: 'xbß',
+				expected: 'So good. <span class="highlight">xbß</span>'
+			},
+			{
+				desc: 'Test 019: en de Highlighter broken on special character at the end?',
+				text: 'So good. xbß.',
+				highlight: 'xbß.',
+				expected: 'So good. <span class="highlight">xbß.</span>'
+			},
+			{
+				desc: 'Test 020: RTL he Hebrew',
+				text: 'חסיד אומות העולם',
+				highlight: 'חסיד אומות העולם',
+				expected: '<span class="highlight">חסיד</span> <span class="highlight">אומות</span> <span class="highlight">העולם</span>'
+			},
+			{
+				desc: 'Test 021: RTL he Hebrew',
+				text: 'חסיד אומות העולם',
+				highlight: 'חסי',
+				expected: '<span class="highlight">חסי</span>ד אומות העולם'
+			},
+			{
+				desc: 'Test 022: ja Japanese',
+				text: '諸国民の中の正義の人',
+				highlight: '諸国民の中の正義の人',
+				expected: '<span class="highlight">諸国民の中の正義の人</span>'
+			},
+			{
+				desc: 'Test 023: ja Japanese',
+				text: '諸国民の中の正義の人',
+				highlight: '諸国',
+				expected: '<span class="highlight">諸国</span>民の中の正義の人'
+			},
+			{
+				desc: 'Test 024: fr French text and « french quotes » (guillemets)',
+				text: '« L\'oiseau est sur l’île »',
+				highlight: '« L\'oiseau est sur l’île »',
+				expected: '<span class="highlight">«</span> <span class="highlight">L\'oiseau</span> <span class="highlight">est</span> <span class="highlight">sur</span> <span class="highlight">l’île</span> <span class="highlight">»</span>'
+			},
+			{
+				desc: 'Test 025: fr French text and « french quotes » (guillemets)',
+				text: '« L\'oiseau est sur l’île »',
+				highlight: '« L\'oise',
+				expected: '<span class="highlight">«</span> <span class="highlight">L\'oise</span>au est sur l’île »'
+			},
+			{
+				desc: 'Test 025a: fr French text and « french quotes » (guillemets) - does it match the single strings "«" and "L" separately?',
+				text: '« L\'oiseau est sur l’île »',
+				highlight: '« L',
+				expected: '<span class="highlight">«</span> <span class="highlight">L</span>\'oiseau est sur <span class="highlight">l</span>’île »'
+			},
+			{
+				desc: 'Test 026: ru Russian',
+				text: 'Праведники мира',
+				highlight: 'Праведники мира',
+				expected: '<span class="highlight">Праведники</span> <span class="highlight">мира</span>'
+			},
+			{
+				desc: 'Test 027: ru Russian',
+				text: 'Праведники мира',
+				highlight: 'Праве',
+				expected: '<span class="highlight">Праве</span>дники мира'
+			},
+			{
+				desc: 'Test 028 ka Georgian',
+				text: 'მთავარი გვერდი',
+				highlight: 'მთავარი გვერდი',
+				expected: '<span class="highlight">მთავარი</span> <span class="highlight">გვერდი</span>'
+			},
+			{
+				desc: 'Test 029 ka Georgian',
+				text: 'მთავარი გვერდი',
+				highlight: 'მთა',
+				expected: '<span class="highlight">მთა</span>ვარი გვერდი'
+			},
+			{
+				desc: 'Test 030 hy Armenian',
+				text: 'Նոնա Գափրինդաշվիլի',
+				highlight: 'Նոնա Գափրինդաշվիլի',
+				expected: '<span class="highlight">Նոնա</span> <span class="highlight">Գափրինդաշվիլի</span>'
+			},
+			{
+				desc: 'Test 031 hy Armenian',
+				text: 'Նոնա Գափրինդաշվիլի',
+				highlight: 'Նոն',
+				expected: '<span class="highlight">Նոն</span>ա Գափրինդաշվիլի'
+			},
+			{
+				desc: 'Test 032: th Thai',
+				text: 'พอล แอร์ดิช',
+				highlight: 'พอล แอร์ดิช',
+				expected: '<span class="highlight">พอล</span> <span class="highlight">แอร์ดิช</span>'
+			},
+			{
+				desc: 'Test 033: th Thai',
+				text: 'พอล แอร์ดิช',
+				highlight: 'พอ',
+				expected: '<span class="highlight">พอ</span>ล แอร์ดิช'
+			},
+			{
+				desc: 'Test 034: RTL ar Arabic',
+				text: 'بول إيردوس',
+				highlight: 'بول إيردوس',
+				expected: '<span class="highlight">بول</span> <span class="highlight">إيردوس</span>'
+			},
+			{
+				desc: 'Test 035: RTL ar Arabic',
+				text: 'بول إيردوس',
+				highlight: 'بو',
+				expected: '<span class="highlight">بو</span>ل إيردوس'
+			}
+		];
+		QUnit.expect( cases.length );
 
-	$.each( cases, function ( i, item ) {
-		$fixture = $( '<p>' ).text( item.text ).highlightText( item.highlight );
-		assert.equal(
-			$fixture.html(),
-			$( '<p>' ).html( item.expected ).html(), // re-parse to normalize!
-			item.desc || undefined
-		);
+		$.each( cases, function ( i, item ) {
+			$fixture = $( '<p>' ).text( item.text ).highlightText( item.highlight );
+			assert.equal(
+				$fixture.html(),
+				// Re-parse to normalize
+				$( '<p>' ).html( item.expected ).html(),
+				item.desc || undefined
+			);
+		} );
 	} );
-} );
+}( jQuery ) );
diff --git a/tests/qunit/suites/resources/jquery/jquery.localize.test.js b/tests/qunit/suites/resources/jquery/jquery.localize.test.js
index c8e1d9f9a9..3810a042d0 100644
--- a/tests/qunit/suites/resources/jquery/jquery.localize.test.js
+++ b/tests/qunit/suites/resources/jquery/jquery.localize.test.js
@@ -1,133 +1,135 @@
-QUnit.module( 'jquery.localize', QUnit.newMwEnvironment() );
+( function ( $, mw ) {
+	QUnit.module( 'jquery.localize', QUnit.newMwEnvironment() );
 
-QUnit.test( 'Handle basic replacements', 4, function ( assert ) {
-	var html, $lc;
-	mw.messages.set( 'basic', 'Basic stuff' );
+	QUnit.test( 'Handle basic replacements', 4, function ( assert ) {
+		var html, $lc;
+		mw.messages.set( 'basic', 'Basic stuff' );
 
-	// Tag: html:msg
-	html = '<div><span><html:msg key="basic" /></span></div>';
-	$lc = $( html ).localize().find( 'span' );
+		// Tag: html:msg
+		html = '<div><span><html:msg key="basic" /></span></div>';
+		$lc = $( html ).localize().find( 'span' );
 
-	assert.strictEqual( $lc.text(), 'Basic stuff', 'Tag: html:msg' );
+		assert.strictEqual( $lc.text(), 'Basic stuff', 'Tag: html:msg' );
 
-	// Attribute: title-msg
-	html = '<div><span title-msg="basic"></span></div>';
-	$lc = $( html ).localize().find( 'span' );
+		// Attribute: title-msg
+		html = '<div><span title-msg="basic"></span></div>';
+		$lc = $( html ).localize().find( 'span' );
 
-	assert.strictEqual( $lc.attr( 'title' ), 'Basic stuff', 'Attribute: title-msg' );
+		assert.strictEqual( $lc.attr( 'title' ), 'Basic stuff', 'Attribute: title-msg' );
 
-	// Attribute: alt-msg
-	html = '<div><span alt-msg="basic"></span></div>';
-	$lc = $( html ).localize().find( 'span' );
+		// Attribute: alt-msg
+		html = '<div><span alt-msg="basic"></span></div>';
+		$lc = $( html ).localize().find( 'span' );
 
-	assert.strictEqual( $lc.attr( 'alt' ), 'Basic stuff', 'Attribute: alt-msg' );
+		assert.strictEqual( $lc.attr( 'alt' ), 'Basic stuff', 'Attribute: alt-msg' );
 
-	// Attribute: placeholder-msg
-	html = '<div><input placeholder-msg="basic" /></div>';
-	$lc = $( html ).localize().find( 'input' );
+		// Attribute: placeholder-msg
+		html = '<div><input placeholder-msg="basic" /></div>';
+		$lc = $( html ).localize().find( 'input' );
 
-	assert.strictEqual( $lc.attr( 'placeholder' ), 'Basic stuff', 'Attribute: placeholder-msg' );
-} );
+		assert.strictEqual( $lc.attr( 'placeholder' ), 'Basic stuff', 'Attribute: placeholder-msg' );
+	} );
+
+	QUnit.test( 'Proper escaping', 2, function ( assert ) {
+		var html, $lc;
+		mw.messages.set( 'properfoo', '<proper esc="test">' );
+
+		// This is handled by jQuery inside $.fn.localize, just a simple sanity checked
+		// making sure it is actually using text() and attr() (or something with the same effect)
 
-QUnit.test( 'Proper escaping', 2, function ( assert ) {
-	var html, $lc;
-	mw.messages.set( 'properfoo', '<proper esc="test">' );
+		// Text escaping
+		html = '<div><span><html:msg key="properfoo"></span></div>';
+		$lc = $( html ).localize().find( 'span' );
 
-	// This is handled by jQuery inside $.fn.localize, just a simple sanity checked
-	// making sure it is actually using text() and attr() (or something with the same effect)
+		assert.strictEqual( $lc.text(), mw.msg( 'properfoo' ), 'Content is inserted as text, not as html.' );
 
-	// Text escaping
-	html = '<div><span><html:msg key="properfoo"></span></div>';
-	$lc = $( html ).localize().find( 'span' );
+		// Attribute escaping
+		html = '<div><span title-msg="properfoo"></span></div>';
+		$lc = $( html ).localize().find( 'span' );
 
-	assert.strictEqual( $lc.text(), mw.msg( 'properfoo' ), 'Content is inserted as text, not as html.' );
+		assert.strictEqual( $lc.attr( 'title' ), mw.msg( 'properfoo' ), 'Attributes are not inserted raw.' );
+	} );
 
-	// Attribute escaping
-	html = '<div><span title-msg="properfoo"></span></div>';
-	$lc = $( html ).localize().find( 'span' );
+	QUnit.test( 'Options', 7, function ( assert ) {
+		mw.messages.set( {
+			'foo-lorem': 'Lorem',
+			'foo-ipsum': 'Ipsum',
+			'foo-bar-title': 'Read more about bars',
+			'foo-bar-label': 'The Bars',
+			'foo-bazz-title': 'Read more about bazz at $1 (last modified: $2)',
+			'foo-bazz-label': 'The Bazz ($1)',
+			'foo-welcome': 'Welcome to $1! (last visit: $2)'
+		} );
+		var html, $lc, x, sitename = 'Wikipedia';
+
+		// Message key prefix
+		html = '<div><span title-msg="lorem"><html:msg key="ipsum"></span></div>';
+		$lc = $( html ).localize( {
+			prefix: 'foo-'
+		} ).find( 'span' );
+
+		assert.strictEqual( $lc.attr( 'title' ), 'Lorem', 'Message key prefix - attr' );
+		assert.strictEqual( $lc.text(), 'Ipsum', 'Message key prefix - text' );
+
+		// Variable keys mapping
+		x = 'bar';
+		html = '<div><span title-msg="title"><html:msg key="label"></span></div>';
+		$lc = $( html ).localize( {
+			keys: {
+				'title': 'foo-' + x + '-title',
+				'label': 'foo-' + x + '-label'
+			}
+		} ).find( 'span' );
+
+		assert.strictEqual( $lc.attr( 'title' ), 'Read more about bars', 'Variable keys mapping - attr' );
+		assert.strictEqual( $lc.text(), 'The Bars', 'Variable keys mapping - text' );
+
+		// Passing parameteters to mw.msg
+		html = '<div><span><html:msg key="foo-welcome"></span></div>';
+		$lc = $( html ).localize( {
+			params: {
+				'foo-welcome': [sitename, 'yesterday']
+			}
+		} ).find( 'span' );
+
+		assert.strictEqual( $lc.text(), 'Welcome to Wikipedia! (last visit: yesterday)', 'Passing parameteters to mw.msg' );
+
+		// Combination of options prefix, params and keys
+		x = 'bazz';
+		html = '<div><span title-msg="title"><html:msg key="label"></span></div>';
+		$lc = $( html ).localize( {
+			prefix: 'foo-',
+			keys: {
+				'title': x + '-title',
+				'label': x + '-label'
+			},
+			params: {
+				'title': [sitename, '3 minutes ago'],
+				'label': [sitename, '3 minutes ago']
+
+			}
+		} ).find( 'span' );
+
+		assert.strictEqual( $lc.text(), 'The Bazz (Wikipedia)', 'Combination of options prefix, params and keys - text' );
+		assert.strictEqual( $lc.attr( 'title' ), 'Read more about bazz at Wikipedia (last modified: 3 minutes ago)', 'Combination of options prefix, params and keys - attr' );
+	} );
 
-	assert.strictEqual( $lc.attr( 'title' ), mw.msg( 'properfoo' ), 'Attributes are not inserted raw.' );
-} );
+	QUnit.test( 'Handle data text', 2, function ( assert ) {
+		var html, $lc;
+		mw.messages.set( 'option-one', 'Item 1' );
+		mw.messages.set( 'option-two', 'Item 2' );
+		html = '<select><option data-msg-text="option-one"></option><option data-msg-text="option-two"></option></select>';
+		$lc = $( html ).localize().find( 'option' );
+		assert.strictEqual( $lc.eq( 0 ).text(), mw.msg( 'option-one' ), 'data-msg-text becomes text of options' );
+		assert.strictEqual( $lc.eq( 1 ).text(), mw.msg( 'option-two' ), 'data-msg-text becomes text of options' );
+	} );
 
-QUnit.test( 'Options', 7, function ( assert ) {
-	mw.messages.set( {
-		'foo-lorem': 'Lorem',
-		'foo-ipsum': 'Ipsum',
-		'foo-bar-title': 'Read more about bars',
-		'foo-bar-label': 'The Bars',
-		'foo-bazz-title': 'Read more about bazz at $1 (last modified: $2)',
-		'foo-bazz-label': 'The Bazz ($1)',
-		'foo-welcome': 'Welcome to $1! (last visit: $2)'
+	QUnit.test( 'Handle data html', 2, function ( assert ) {
+		var html, $lc;
+		mw.messages.set( 'html', 'behold... there is a <a>link</a> here!!' );
+		html = '<div><div data-msg-html="html"></div></div>';
+		$lc = $( html ).localize().find( 'a' );
+		assert.strictEqual( $lc.length, 1, 'link is created' );
+		assert.strictEqual( $lc.text(), 'link', 'the link text got added' );
 	} );
-	var html, $lc, attrs, x, sitename = 'Wikipedia';
-
-	// Message key prefix
-	html = '<div><span title-msg="lorem"><html:msg key="ipsum"></span></div>';
-	$lc = $( html ).localize( {
-		prefix: 'foo-'
-	} ).find( 'span' );
-
-	assert.strictEqual( $lc.attr( 'title' ), 'Lorem', 'Message key prefix - attr' );
-	assert.strictEqual( $lc.text(), 'Ipsum', 'Message key prefix - text' );
-
-	// Variable keys mapping
-	x = 'bar';
-	html = '<div><span title-msg="title"><html:msg key="label"></span></div>';
-	$lc = $( html ).localize( {
-		keys: {
-			'title': 'foo-' + x + '-title',
-			'label': 'foo-' + x + '-label'
-		}
-	} ).find( 'span' );
-
-	assert.strictEqual( $lc.attr( 'title' ), 'Read more about bars', 'Variable keys mapping - attr' );
-	assert.strictEqual( $lc.text(), 'The Bars', 'Variable keys mapping - text' );
-
-	// Passing parameteters to mw.msg
-	html = '<div><span><html:msg key="foo-welcome"></span></div>';
-	$lc = $( html ).localize( {
-		params: {
-			'foo-welcome': [sitename, 'yesterday']
-		}
-	} ).find( 'span' );
-
-	assert.strictEqual( $lc.text(), 'Welcome to Wikipedia! (last visit: yesterday)', 'Passing parameteters to mw.msg' );
-
-	// Combination of options prefix, params and keys
-	x = 'bazz';
-	html = '<div><span title-msg="title"><html:msg key="label"></span></div>';
-	$lc = $( html ).localize( {
-		prefix: 'foo-',
-		keys: {
-			'title': x + '-title',
-			'label': x + '-label'
-		},
-		params: {
-			'title': [sitename, '3 minutes ago'],
-			'label': [sitename, '3 minutes ago']
-
-		}
-	} ).find( 'span' );
-
-	assert.strictEqual( $lc.text(), 'The Bazz (Wikipedia)', 'Combination of options prefix, params and keys - text' );
-	assert.strictEqual( $lc.attr( 'title' ), 'Read more about bazz at Wikipedia (last modified: 3 minutes ago)', 'Combination of options prefix, params and keys - attr' );
-} );
-
-QUnit.test( 'Handle data text', 2, function ( assert ) {
-	var html, $lc;
-	mw.messages.set( 'option-one', 'Item 1' );
-	mw.messages.set( 'option-two', 'Item 2' );
-	html = '<select><option data-msg-text="option-one"></option><option data-msg-text="option-two"></option></select>';
-	$lc = $( html ).localize().find( 'option' );
-	assert.strictEqual( $lc.eq( 0 ).text(), mw.msg( 'option-one' ), 'data-msg-text becomes text of options' );
-	assert.strictEqual( $lc.eq( 1 ).text(), mw.msg( 'option-two' ), 'data-msg-text becomes text of options' );
-} );
-
-QUnit.test( 'Handle data html', 2, function ( assert ) {
-	var html, $lc;
-	mw.messages.set( 'html', 'behold... there is a <a>link</a> here!!' );
-	html = '<div><div data-msg-html="html"></div></div>';
-	$lc = $( html ).localize().find( 'a' );
-	assert.strictEqual( $lc.length, 1, 'link is created' );
-	assert.strictEqual( $lc.text(), 'link', 'the link text got added' );
-} );
+}( jQuery, mediaWiki ) ) ;
diff --git a/tests/qunit/suites/resources/jquery/jquery.mwExtension.test.js b/tests/qunit/suites/resources/jquery/jquery.mwExtension.test.js
index 5b566ae0e8..3ffcbf5741 100644
--- a/tests/qunit/suites/resources/jquery/jquery.mwExtension.test.js
+++ b/tests/qunit/suites/resources/jquery/jquery.mwExtension.test.js
@@ -1,58 +1,60 @@
-QUnit.module( 'jquery.mwExtension', QUnit.newMwEnvironment() );
-
-QUnit.test( 'String functions', function ( assert ) {
-
-	assert.equal( $.trimLeft( '  foo bar  ' ), 'foo bar  ', 'trimLeft' );
-	assert.equal( $.trimRight( '  foo bar  ' ), '  foo bar', 'trimRight' );
-	assert.equal( $.ucFirst( 'foo' ), 'Foo', 'ucFirst' );
-
-	assert.equal( $.escapeRE( '<!-- ([{+mW+}]) $^|?>' ),
-	 '<!\\-\\- \\(\\[\\{\\+mW\\+\\}\\]\\) \\$\\^\\|\\?>', 'escapeRE - Escape specials' );
-	assert.equal( $.escapeRE( 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' ),
-	 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 'escapeRE - Leave uppercase alone' );
-	assert.equal( $.escapeRE( 'abcdefghijklmnopqrstuvwxyz' ),
-	 'abcdefghijklmnopqrstuvwxyz', 'escapeRE - Leave lowercase alone' );
-	assert.equal( $.escapeRE( '0123456789' ), '0123456789', 'escapeRE - Leave numbers alone' );
-});
-
-QUnit.test( 'Is functions', function ( assert ) {
-
-	assert.strictEqual( $.isDomElement( document.getElementById( 'qunit-header' ) ), true,
-	 'isDomElement: #qunit-header Node' );
-	assert.strictEqual( $.isDomElement( document.getElementById( 'random-name' ) ), false,
-	 'isDomElement: #random-name (null)' );
-	assert.strictEqual( $.isDomElement( document.getElementsByTagName( 'div' ) ), false,
-	 'isDomElement: getElementsByTagName Array' );
-	assert.strictEqual( $.isDomElement( document.getElementsByTagName( 'div' )[0] ), true,
-	 'isDomElement: getElementsByTagName(..)[0] Node' );
-	assert.strictEqual( $.isDomElement( $( 'div' ) ), false,
-	 'isDomElement: jQuery object' );
-	assert.strictEqual( $.isDomElement( $( 'div' ).get(0) ), true,
-	 'isDomElement: jQuery object > Get node' );
-	assert.strictEqual( $.isDomElement( document.createElement( 'div' ) ), true,
-	 'isDomElement: createElement' );
-	assert.strictEqual( $.isDomElement( { foo: 1 } ), false,
-	 'isDomElement: Object' );
-
-	assert.strictEqual( $.isEmpty( 'string' ), false, 'isEmptry: "string"' );
-	assert.strictEqual( $.isEmpty( '0' ), true, 'isEmptry: "0"' );
-	assert.strictEqual( $.isEmpty( '' ), true, 'isEmptry: ""' );
-	assert.strictEqual( $.isEmpty( 1 ), false, 'isEmptry: 1' );
-	assert.strictEqual( $.isEmpty( [] ), true, 'isEmptry: []' );
-	assert.strictEqual( $.isEmpty( {} ), true, 'isEmptry: {}' );
-
-	// Documented behaviour
-	assert.strictEqual( $.isEmpty( { length: 0 } ), true, 'isEmptry: { length: 0 }' );
-});
-
-QUnit.test( 'Comparison functions', function ( assert ) {
-
-	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( $.compareObject( {}, {} ), 'compareObject: Two empty objects' );
-	assert.ok( $.compareObject( { foo: 1 }, { foo: 1 } ), 'compareObject: Two the same objects' );
-	assert.ok( !$.compareObject( { bar: true }, { baz: false } ),
-	 'compareObject: Two different objects (false)' );
-});
+( function ( $ ) {
+	QUnit.module( 'jquery.mwExtension', QUnit.newMwEnvironment() );
+
+	QUnit.test( 'String functions', function ( assert ) {
+
+		assert.equal( $.trimLeft( '  foo bar  ' ), 'foo bar  ', 'trimLeft' );
+		assert.equal( $.trimRight( '  foo bar  ' ), '  foo bar', 'trimRight' );
+		assert.equal( $.ucFirst( 'foo' ), 'Foo', 'ucFirst' );
+
+		assert.equal( $.escapeRE( '<!-- ([{+mW+}]) $^|?>' ),
+		 '<!\\-\\- \\(\\[\\{\\+mW\\+\\}\\]\\) \\$\\^\\|\\?>', 'escapeRE - Escape specials' );
+		assert.equal( $.escapeRE( 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' ),
+		 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 'escapeRE - Leave uppercase alone' );
+		assert.equal( $.escapeRE( 'abcdefghijklmnopqrstuvwxyz' ),
+		 'abcdefghijklmnopqrstuvwxyz', 'escapeRE - Leave lowercase alone' );
+		assert.equal( $.escapeRE( '0123456789' ), '0123456789', 'escapeRE - Leave numbers alone' );
+	});
+
+	QUnit.test( 'Is functions', function ( assert ) {
+
+		assert.strictEqual( $.isDomElement( document.getElementById( 'qunit-header' ) ), true,
+		 'isDomElement: #qunit-header Node' );
+		assert.strictEqual( $.isDomElement( document.getElementById( 'random-name' ) ), false,
+		 'isDomElement: #random-name (null)' );
+		assert.strictEqual( $.isDomElement( document.getElementsByTagName( 'div' ) ), false,
+		 'isDomElement: getElementsByTagName Array' );
+		assert.strictEqual( $.isDomElement( document.getElementsByTagName( 'div' )[0] ), true,
+		 'isDomElement: getElementsByTagName(..)[0] Node' );
+		assert.strictEqual( $.isDomElement( $( 'div' ) ), false,
+		 'isDomElement: jQuery object' );
+		assert.strictEqual( $.isDomElement( $( 'div' ).get(0) ), true,
+		 'isDomElement: jQuery object > Get node' );
+		assert.strictEqual( $.isDomElement( document.createElement( 'div' ) ), true,
+		 'isDomElement: createElement' );
+		assert.strictEqual( $.isDomElement( { foo: 1 } ), false,
+		 'isDomElement: Object' );
+
+		assert.strictEqual( $.isEmpty( 'string' ), false, 'isEmptry: "string"' );
+		assert.strictEqual( $.isEmpty( '0' ), true, 'isEmptry: "0"' );
+		assert.strictEqual( $.isEmpty( '' ), true, 'isEmptry: ""' );
+		assert.strictEqual( $.isEmpty( 1 ), false, 'isEmptry: 1' );
+		assert.strictEqual( $.isEmpty( [] ), true, 'isEmptry: []' );
+		assert.strictEqual( $.isEmpty( {} ), true, 'isEmptry: {}' );
+
+		// Documented behaviour
+		assert.strictEqual( $.isEmpty( { length: 0 } ), true, 'isEmptry: { length: 0 }' );
+	});
+
+	QUnit.test( 'Comparison functions', function ( assert ) {
+
+		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( $.compareObject( {}, {} ), 'compareObject: Two empty objects' );
+		assert.ok( $.compareObject( { foo: 1 }, { foo: 1 } ), 'compareObject: Two the same objects' );
+		assert.ok( !$.compareObject( { bar: true }, { baz: false } ),
+		 'compareObject: Two different objects (false)' );
+	});
+}( jQuery ) );
diff --git a/tests/qunit/suites/resources/jquery/jquery.tabIndex.test.js b/tests/qunit/suites/resources/jquery/jquery.tabIndex.test.js
index 161f0cd148..e31fc63937 100644
--- a/tests/qunit/suites/resources/jquery/jquery.tabIndex.test.js
+++ b/tests/qunit/suites/resources/jquery/jquery.tabIndex.test.js
@@ -1,33 +1,37 @@
-QUnit.module( 'jquery.tabIndex', QUnit.newMwEnvironment() );
+( function ( $ ) {
+	QUnit.module( 'jquery.tabIndex', QUnit.newMwEnvironment() );
 
-QUnit.test( 'firstTabIndex', 2, function ( assert ) {
-	var testEnvironment =
-'<form>' +
-	'<input tabindex="7" />' +
-	'<input tabindex="9" />' +
-	'<textarea tabindex="2">Foobar</textarea>' +
-	'<textarea tabindex="5">Foobar</textarea>' +
-'</form>';
+	QUnit.test( 'firstTabIndex', 2, function ( assert ) {
+		var html, $testA, $testB;
+		html =
+	'<form>' +
+		'<input tabindex="7" />' +
+		'<input tabindex="9" />' +
+		'<textarea tabindex="2">Foobar</textarea>' +
+		'<textarea tabindex="5">Foobar</textarea>' +
+	'</form>';
 
-	var $testA = $( '<div>' ).html( testEnvironment ).appendTo( '#qunit-fixture' );
-	assert.strictEqual( $testA.firstTabIndex(), 2, 'First tabindex should be 2 within this context.' );
+		$testA = $( '<div>' ).html( html ).appendTo( '#qunit-fixture' );
+		assert.strictEqual( $testA.firstTabIndex(), 2, 'First tabindex should be 2 within this context.' );
 
-	var $testB = $( '<div>' );
-	assert.strictEqual( $testB.firstTabIndex(), null, 'Return null if none available.' );
-});
+		$testB = $( '<div>' );
+		assert.strictEqual( $testB.firstTabIndex(), null, 'Return null if none available.' );
+	});
 
-QUnit.test( 'lastTabIndex', 2, function ( assert ) {
-	var testEnvironment =
-'<form>' +
-	'<input tabindex="7" />' +
-	'<input tabindex="9" />' +
-	'<textarea tabindex="2">Foobar</textarea>' +
-	'<textarea tabindex="5">Foobar</textarea>' +
-'</form>';
+	QUnit.test( 'lastTabIndex', 2, function ( assert ) {
+		var html, $testA, $testB;
+		html =
+	'<form>' +
+		'<input tabindex="7" />' +
+		'<input tabindex="9" />' +
+		'<textarea tabindex="2">Foobar</textarea>' +
+		'<textarea tabindex="5">Foobar</textarea>' +
+	'</form>';
 
-	var $testA = $( '<div>' ).html( testEnvironment ).appendTo( '#qunit-fixture' );
-	assert.strictEqual( $testA.lastTabIndex(), 9, 'Last tabindex should be 9 within this context.' );
+		$testA = $( '<div>' ).html( html ).appendTo( '#qunit-fixture' );
+		assert.strictEqual( $testA.lastTabIndex(), 9, 'Last tabindex should be 9 within this context.' );
 
-	var $testB = $( '<div>' );
-	assert.strictEqual( $testB.lastTabIndex(), null, 'Return null if none available.' );
-});
+		$testB = $( '<div>' );
+		assert.strictEqual( $testB.lastTabIndex(), null, 'Return null if none available.' );
+	});
+}( jQuery ) );
diff --git a/tests/qunit/suites/resources/jquery/jquery.tablesorter.test.js b/tests/qunit/suites/resources/jquery/jquery.tablesorter.test.js
index 291c6b8d5f..b04a21316f 100644
--- a/tests/qunit/suites/resources/jquery/jquery.tablesorter.test.js
+++ b/tests/qunit/suites/resources/jquery/jquery.tablesorter.test.js
@@ -1,824 +1,827 @@
 ( function ( $, mw ) {
-
-var config = {
-	wgMonthNames: ['', 'January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'],
-	wgMonthNamesShort: ['', 'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'],
-	wgDefaultDateFormat: 'dmy',
-	wgContentLanguage: 'en'
-};
-
-QUnit.module( 'jquery.tablesorter', QUnit.newMwEnvironment({ config: config }) );
-
-/**
- * Create an HTML table from an array of row arrays containing text strings.
- * First row will be header row. No fancy rowspan/colspan stuff.
- *
- * @param {String[]} header
- * @param {String[][]} data
- * @return jQuery
- */
-function tableCreate(  header, data ) {
-	var i,
-		$table = $( '<table class="sortable"><thead></thead><tbody></tbody></table>' ),
-		$thead = $table.find( 'thead' ),
-		$tbody = $table.find( 'tbody' ),
-		$tr = $( '<tr>' );
-
-	$.each( header, function ( i, str ) {
-		var $th = $( '<th>' );
-		$th.text( str ).appendTo( $tr );
-	});
-	$tr.appendTo( $thead );
-
-	for ( i = 0; i < data.length; i++ ) {
-		$tr = $( '<tr>' );
-		$.each( data[i], function ( j, str ) {
-			var $td = $( '<td>' );
-			$td.text( str ).appendTo( $tr );
+	/*jshint onevar: false */
+
+	var config = {
+		wgMonthNames: ['', 'January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'],
+		wgMonthNamesShort: ['', 'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'],
+		wgDefaultDateFormat: 'dmy',
+		wgContentLanguage: 'en'
+	};
+
+	QUnit.module( 'jquery.tablesorter', QUnit.newMwEnvironment({ config: config }) );
+
+	/**
+	 * Create an HTML table from an array of row arrays containing text strings.
+	 * First row will be header row. No fancy rowspan/colspan stuff.
+	 *
+	 * @param {String[]} header
+	 * @param {String[][]} data
+	 * @return jQuery
+	 */
+	function tableCreate(  header, data ) {
+		var i,
+			$table = $( '<table class="sortable"><thead></thead><tbody></tbody></table>' ),
+			$thead = $table.find( 'thead' ),
+			$tbody = $table.find( 'tbody' ),
+			$tr = $( '<tr>' );
+
+		$.each( header, function ( i, str ) {
+			var $th = $( '<th>' );
+			$th.text( str ).appendTo( $tr );
 		});
-		$tr.appendTo( $tbody );
+		$tr.appendTo( $thead );
+
+		for ( i = 0; i < data.length; i++ ) {
+			/*jshint loopfunc: true */
+			$tr = $( '<tr>' );
+			$.each( data[i], function ( j, str ) {
+				var $td = $( '<td>' );
+				$td.text( str ).appendTo( $tr );
+			});
+			$tr.appendTo( $tbody );
+		}
+		return $table;
 	}
-	return $table;
-}
-
-/**
- * Extract text from table.
- *
- * @param {jQuery} $table
- * @return String[][]
- */
-function tableExtract( $table ) {
-	var data = [];
-
-	$table.find( 'tbody' ).find( 'tr' ).each( function( i, tr ) {
-		var row = [];
-		$( tr ).find( 'td,th' ).each( function( i, td ) {
-			row.push( $( td ).text() );
+
+	/**
+	 * Extract text from table.
+	 *
+	 * @param {jQuery} $table
+	 * @return String[][]
+	 */
+	function tableExtract( $table ) {
+		var data = [];
+
+		$table.find( 'tbody' ).find( 'tr' ).each( function( i, tr ) {
+			var row = [];
+			$( tr ).find( 'td,th' ).each( function( i, td ) {
+				row.push( $( td ).text() );
+			});
+			data.push( row );
 		});
-		data.push( row );
-	});
-	return data;
-}
-
-/**
- * Run a table test by building a table with the given data,
- * running some callback on it, then checking the results.
- *
- * @param {String} msg text to pass on to qunit for the comparison
- * @param {String[]} header cols to make the table
- * @param {String[][]} data rows/cols to make the table
- * @param {String[][]} expected rows/cols to compare against at end
- * @param {function($table)} callback something to do with the table before we compare
- */
-function tableTest( msg, header, data, expected, callback ) {
-	QUnit.test( msg, 1, function ( assert ) {
-		var $table = tableCreate( header, data );
-
-		// Give caller a chance to set up sorting and manipulate the table.
-		callback( $table );
-
-		// Table sorting is done synchronously; if it ever needs to change back
-		// to asynchronous, we'll need a timeout or a callback here.
-		var extracted = tableExtract( $table );
-		assert.deepEqual( extracted, expected, msg );
-	});
-}
-
-function reversed(arr) {
-	// Clone array
-	var arr2 = arr.slice(0);
-
-	arr2.reverse();
-
-	return arr2;
-}
-
-// Sample data set using planets named and their radius
-var header  = [ 'Planet' , 'Radius (km)'],
-	mercury = [ 'Mercury', '2439.7' ],
-	venus   = [ 'Venus'  , '6051.8' ],
-	earth   = [ 'Earth'  , '6371.0' ],
-	mars    = [ 'Mars'   , '3390.0' ],
-	jupiter = [ 'Jupiter',  '69911' ],
-	saturn  = [ 'Saturn' ,  '58232' ];
-
-// Initial data set
-var planets         = [mercury, venus, earth, mars, jupiter, saturn];
-var ascendingName   = [earth, jupiter, mars, mercury, saturn, venus];
-var ascendingRadius = [mercury, mars, venus, earth, saturn, jupiter];
-
-tableTest(
-	'Basic planet table: sorting initially - ascending by name',
-	header,
-	planets,
-	ascendingName,
-	function ( $table ) {
-		$table.tablesorter( { sortList: [ { 0: 'asc' } ] } );
-	}
-);
-tableTest(
-	'Basic planet table: sorting initially - descending by radius',
-	header,
-	planets,
-	reversed(ascendingRadius),
-	function ( $table ) {
-		$table.tablesorter( { sortList: [ { 1: 'desc' } ] } );
-	}
-);
-tableTest(
-	'Basic planet table: ascending by name',
-	header,
-	planets,
-	ascendingName,
-	function ( $table ) {
-		$table.tablesorter();
-		$table.find( '.headerSort:eq(0)' ).click();
-	}
-);
-tableTest(
-	'Basic planet table: ascending by name a second time',
-	header,
-	planets,
-	ascendingName,
-	function ( $table ) {
-		$table.tablesorter();
-		$table.find( '.headerSort:eq(0)' ).click();
-	}
-);
-tableTest(
-	'Basic planet table: descending by name',
-	header,
-	planets,
-	reversed(ascendingName),
-	function ( $table ) {
-		$table.tablesorter();
-		$table.find( '.headerSort:eq(0)' ).click().click();
+		return data;
 	}
-);
-tableTest(
-	'Basic planet table: ascending radius',
-	header,
-	planets,
-	ascendingRadius,
-	function ( $table ) {
-		$table.tablesorter();
-		$table.find( '.headerSort:eq(1)' ).click();
+
+	/**
+	 * Run a table test by building a table with the given data,
+	 * running some callback on it, then checking the results.
+	 *
+	 * @param {String} msg text to pass on to qunit for the comparison
+	 * @param {String[]} header cols to make the table
+	 * @param {String[][]} data rows/cols to make the table
+	 * @param {String[][]} expected rows/cols to compare against at end
+	 * @param {function($table)} callback something to do with the table before we compare
+	 */
+	function tableTest( msg, header, data, expected, callback ) {
+		QUnit.test( msg, 1, function ( assert ) {
+			var $table = tableCreate( header, data );
+
+			// Give caller a chance to set up sorting and manipulate the table.
+			callback( $table );
+
+			// Table sorting is done synchronously; if it ever needs to change back
+			// to asynchronous, we'll need a timeout or a callback here.
+			var extracted = tableExtract( $table );
+			assert.deepEqual( extracted, expected, msg );
+		});
 	}
-);
-tableTest(
-	'Basic planet table: descending radius',
-	header,
-	planets,
-	reversed(ascendingRadius),
-	function ( $table ) {
-		$table.tablesorter();
-		$table.find( '.headerSort:eq(1)' ).click().click();
+
+	function reversed(arr) {
+		// Clone array
+		var arr2 = arr.slice(0);
+
+		arr2.reverse();
+
+		return arr2;
 	}
-);
-
-// Sample data set to test multiple column sorting
-var header  = [ 'column1' , 'column2'],
-	a1 = [ 'A', '1' ],
-	a2 = [ 'A', '2' ],
-	a3 = [ 'A', '3' ],
-	b1 = [ 'B', '1' ],
-	b2 = [ 'B', '2' ],
-	b3 = [ 'B', '3' ];
-var initial = [a2, b3, a1, a3, b2, b1];
-var asc = [a1, a2, a3, b1, b2, b3];
-var descasc = [b1, b2, b3, a1, a2, a3];
-
-tableTest(
-	'Sorting multiple columns by passing sort list',
-	header,
-	initial,
-	asc,
-	function ( $table ) {
+
+	// Sample data set using planets named and their radius
+	var header  = [ 'Planet' , 'Radius (km)'],
+		mercury = [ 'Mercury', '2439.7' ],
+		venus   = [ 'Venus'  , '6051.8' ],
+		earth   = [ 'Earth'  , '6371.0' ],
+		mars    = [ 'Mars'   , '3390.0' ],
+		jupiter = [ 'Jupiter',  '69911' ],
+		saturn  = [ 'Saturn' ,  '58232' ];
+
+	// Initial data set
+	var planets         = [mercury, venus, earth, mars, jupiter, saturn];
+	var ascendingName   = [earth, jupiter, mars, mercury, saturn, venus];
+	var ascendingRadius = [mercury, mars, venus, earth, saturn, jupiter];
+
+	tableTest(
+		'Basic planet table: sorting initially - ascending by name',
+		header,
+		planets,
+		ascendingName,
+		function ( $table ) {
+			$table.tablesorter( { sortList: [ { 0: 'asc' } ] } );
+		}
+	);
+	tableTest(
+		'Basic planet table: sorting initially - descending by radius',
+		header,
+		planets,
+		reversed(ascendingRadius),
+		function ( $table ) {
+			$table.tablesorter( { sortList: [ { 1: 'desc' } ] } );
+		}
+	);
+	tableTest(
+		'Basic planet table: ascending by name',
+		header,
+		planets,
+		ascendingName,
+		function ( $table ) {
+			$table.tablesorter();
+			$table.find( '.headerSort:eq(0)' ).click();
+		}
+	);
+	tableTest(
+		'Basic planet table: ascending by name a second time',
+		header,
+		planets,
+		ascendingName,
+		function ( $table ) {
+			$table.tablesorter();
+			$table.find( '.headerSort:eq(0)' ).click();
+		}
+	);
+	tableTest(
+		'Basic planet table: descending by name',
+		header,
+		planets,
+		reversed(ascendingName),
+		function ( $table ) {
+			$table.tablesorter();
+			$table.find( '.headerSort:eq(0)' ).click().click();
+		}
+	);
+	tableTest(
+		'Basic planet table: ascending radius',
+		header,
+		planets,
+		ascendingRadius,
+		function ( $table ) {
+			$table.tablesorter();
+			$table.find( '.headerSort:eq(1)' ).click();
+		}
+	);
+	tableTest(
+		'Basic planet table: descending radius',
+		header,
+		planets,
+		reversed(ascendingRadius),
+		function ( $table ) {
+			$table.tablesorter();
+			$table.find( '.headerSort:eq(1)' ).click().click();
+		}
+	);
+
+	// Sample data set to test multiple column sorting
+	header = [ 'column1' , 'column2'];
+	var
+		a1 = [ 'A', '1' ],
+		a2 = [ 'A', '2' ],
+		a3 = [ 'A', '3' ],
+		b1 = [ 'B', '1' ],
+		b2 = [ 'B', '2' ],
+		b3 = [ 'B', '3' ];
+	var initial = [a2, b3, a1, a3, b2, b1];
+	var asc = [a1, a2, a3, b1, b2, b3];
+	var descasc = [b1, b2, b3, a1, a2, a3];
+
+	tableTest(
+		'Sorting multiple columns by passing sort list',
+		header,
+		initial,
+		asc,
+		function ( $table ) {
+			$table.tablesorter(
+				{ sortList: [ { 0: 'asc' }, { 1: 'asc' } ] }
+			);
+		}
+	);
+	tableTest(
+		'Sorting multiple columns by programmatically triggering sort()',
+		header,
+		initial,
+		descasc,
+		function ( $table ) {
+			$table.tablesorter();
+			$table.data( 'tablesorter' ).sort(
+				[ { 0: 'desc' }, { 1: 'asc' } ]
+			);
+		}
+	);
+	tableTest(
+		'Reset to initial sorting by triggering sort() without any parameters',
+		header,
+		initial,
+		asc,
+		function ( $table ) {
+			$table.tablesorter(
+				{ sortList: [ { 0: 'asc' }, { 1: 'asc' } ] }
+			);
+			$table.data( 'tablesorter' ).sort(
+				[ { 0: 'desc' }, { 1: 'asc' } ]
+			);
+			$table.data( 'tablesorter' ).sort();
+		}
+	);
+	QUnit.test( 'Reset sorting making table appear unsorted', 3, function ( assert ) {
+		var $table = tableCreate( header, initial );
 		$table.tablesorter(
-			{ sortList: [ { 0: 'asc' }, { 1: 'asc' } ] }
+			{ sortList: [ { 0: 'desc' }, { 1: 'asc' } ] }
 		);
-	}
-);
-tableTest(
-	'Sorting multiple columns by programmatically triggering sort()',
-	header,
-	initial,
-	descasc,
-	function ( $table ) {
-		$table.tablesorter();
-		$table.data( 'tablesorter' ).sort(
-			[ { 0: 'desc' }, { 1: 'asc' } ]
+		$table.data( 'tablesorter' ).sort( [] );
+
+		assert.equal(
+			$table.find( 'th.headerSortUp' ).length + $table.find( 'th.headerSortDown' ).length,
+			0,
+			'No sort specific sort classes addign to header cells'
 		);
-	}
-);
-tableTest(
-	'Reset to initial sorting by triggering sort() without any parameters',
-	header,
-	initial,
-	asc,
-	function ( $table ) {
-		$table.tablesorter(
-			{ sortList: [ { 0: 'asc' }, { 1: 'asc' } ] }
+
+		assert.equal(
+			$table.find( 'th' ).first().attr( 'title' ),
+			mw.msg( 'sort-ascending' ),
+			'First header cell has default title'
 		);
-		$table.data( 'tablesorter' ).sort(
-			[ { 0: 'desc' }, { 1: 'asc' } ]
+
+		assert.equal(
+			$table.find( 'th' ).first().attr( 'title' ),
+			$table.find( 'th' ).last().attr( 'title' ),
+			'Both header cells\' titles match'
 		);
-		$table.data( 'tablesorter' ).sort();
-	}
-);
-QUnit.test( 'Reset sorting making table appear unsorted', 3, function ( assert ) {
-	var $table = tableCreate( header, initial );
-	$table.tablesorter(
-		{ sortList: [ { 0: 'desc' }, { 1: 'asc' } ] }
+	} );
+
+	// Regression tests!
+	tableTest(
+		'Bug 28775: German-style (dmy) short numeric dates',
+		['Date'],
+		[ // German-style dates are day-month-year
+			['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']
+		],
+		function ( $table ) {
+			mw.config.set( 'wgDefaultDateFormat', 'dmy' );
+			mw.config.set( 'wgContentLanguage', 'de' );
+
+			$table.tablesorter();
+			$table.find( '.headerSort:eq(0)' ).click();
+		}
 	);
-	$table.data( 'tablesorter' ).sort( [] );
 
-	assert.equal(
-		$table.find( 'th.headerSortUp' ).length + $table.find( 'th.headerSortDown' ).length,
-		0,
-		'No sort specific sort classes addign to header cells'
+	tableTest(
+		'Bug 28775: American-style (mdy) short numeric dates',
+		['Date'],
+		[ // American-style dates are month-day-year
+			['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']
+		],
+		function ( $table ) {
+			mw.config.set( 'wgDefaultDateFormat', 'mdy' );
+
+			$table.tablesorter();
+			$table.find( '.headerSort:eq(0)' ).click();
+		}
 	);
 
-	assert.equal(
-		$table.find( 'th' ).first().attr( 'title' ),
-		mw.msg( 'sort-ascending' ),
-		'First header cell has default title'
+	var 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']
+	];
+	var 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']
+	];
+
+	tableTest(
+		'Bug 17141: IPv4 address sorting',
+		['IP'],
+		ipv4,
+		ipv4Sorted,
+		function ( $table ) {
+			$table.tablesorter();
+			$table.find( '.headerSort:eq(0)' ).click();
+		}
 	);
-
-	assert.equal(
-		$table.find( 'th' ).first().attr( 'title' ),
-		$table.find( 'th' ).last().attr( 'title' ),
-		'Both header cells\' titles match'
+	tableTest(
+		'Bug 17141: IPv4 address sorting (reverse)',
+		['IP'],
+		ipv4,
+		reversed(ipv4Sorted),
+		function ( $table ) {
+			$table.tablesorter();
+			$table.find( '.headerSort:eq(0)' ).click().click();
+		}
 	);
-} );
-
-// Regression tests!
-tableTest(
-	'Bug 28775: German-style (dmy) short numeric dates',
-	['Date'],
-	[ // German-style dates are day-month-year
-		['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']
-	],
-	function ( $table ) {
-		mw.config.set( 'wgDefaultDateFormat', 'dmy' );
-		mw.config.set( 'wgContentLanguage', 'de' );
 
-		$table.tablesorter();
-		$table.find( '.headerSort:eq(0)' ).click();
-	}
-);
-
-tableTest(
-	'Bug 28775: American-style (mdy) short numeric dates',
-	['Date'],
-	[ // American-style dates are month-day-year
-		['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']
-	],
-	function ( $table ) {
-		mw.config.set( 'wgDefaultDateFormat', 'mdy' );
-
-		$table.tablesorter();
-		$table.find( '.headerSort:eq(0)' ).click();
-	}
-);
-
-var 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']
-];
-var 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']
-];
-
-tableTest(
-	'Bug 17141: IPv4 address sorting',
-	['IP'],
-	ipv4,
-	ipv4Sorted,
-	function ( $table ) {
-		$table.tablesorter();
-		$table.find( '.headerSort:eq(0)' ).click();
-	}
-);
-tableTest(
-	'Bug 17141: IPv4 address sorting (reverse)',
-	['IP'],
-	ipv4,
-	reversed(ipv4Sorted),
-	function ( $table ) {
-		$table.tablesorter();
-		$table.find( '.headerSort:eq(0)' ).click().click();
-	}
-);
-
-var umlautWords = [
-	// Some words with Umlauts
-	['Günther'],
-	['Peter'],
-	['Björn'],
-	['Bjorn'],
-	['Apfel'],
-	['Äpfel'],
-	['Strasse'],
-	['Sträßschen']
-];
-
-var umlautWordsSorted = [
-	// Some words with Umlauts
-	['Äpfel'],
-	['Apfel'],
-	['Björn'],
-	['Bjorn'],
-	['Günther'],
-	['Peter'],
-	['Sträßschen'],
-	['Strasse']
-];
-
-tableTest(
-	'Accented Characters with custom collation',
-	['Name'],
-	umlautWords,
-	umlautWordsSorted,
-	function ( $table ) {
-		mw.config.set( 'tableSorterCollation', {
-			'ä': 'ae',
-			'ö': 'oe',
-			'ß': 'ss',
-			'ü':'ue'
-		} );
-
-		$table.tablesorter();
-		$table.find( '.headerSort:eq(0)' ).click();
-	}
-);
-
-var planetsRowspan = [["Earth","6051.8"], jupiter, ["Mars","6051.8"], mercury, saturn, venus];
-var planetsRowspanII = [jupiter, mercury, saturn, venus, ['Venus', '6371.0'], ['Venus', '3390.0']];
-
-tableTest(
-	'Basic planet table: same value for multiple rows via rowspan',
-	header,
-	planets,
-	planetsRowspan,
-	function ( $table ) {
-		// Modify the table to have a multiple-row-spanning cell:
-		// - Remove 2nd cell of 4th row, and, 2nd cell or 5th row.
-		$table.find( 'tr:eq(3) td:eq(1), tr:eq(4) td:eq(1)' ).remove();
-		// - Set rowspan for 2nd cell of 3rd row to 3.
-		//   This covers the removed cell in the 4th and 5th row.
-		$table.find( 'tr:eq(2) td:eq(1)' ).prop( 'rowspan', '3' );
-
-		$table.tablesorter();
-		$table.find( '.headerSort:eq(0)' ).click();
-	}
-);
-tableTest(
-	'Basic planet table: same value for multiple rows via rowspan (sorting initially)',
-	header,
-	planets,
-	planetsRowspan,
-	function ( $table ) {
-		// Modify the table to have a multiple-row-spanning cell:
-		// - Remove 2nd cell of 4th row, and, 2nd cell or 5th row.
-		$table.find( 'tr:eq(3) td:eq(1), tr:eq(4) td:eq(1)' ).remove();
-		// - Set rowspan for 2nd cell of 3rd row to 3.
-		//   This covers the removed cell in the 4th and 5th row.
-		$table.find( 'tr:eq(2) td:eq(1)' ).prop( 'rowspan', '3' );
-
-		$table.tablesorter( { sortList: [ { 0: 'asc' } ] } );
-	}
-);
-tableTest(
-	'Basic planet table: Same value for multiple rows via rowspan II',
-	header,
-	planets,
-	planetsRowspanII,
-	function ( $table ) {
-		// Modify the table to have a multiple-row-spanning cell:
-		// - Remove 1st cell of 4th row, and, 1st cell or 5th row.
-		$table.find( 'tr:eq(3) td:eq(0), tr:eq(4) td:eq(0)' ).remove();
-		// - Set rowspan for 1st cell of 3rd row to 3.
-		//   This covers the removed cell in the 4th and 5th row.
-		$table.find( 'tr:eq(2) td:eq(0)' ).prop( 'rowspan', '3' );
-
-		$table.tablesorter();
-		$table.find( '.headerSort:eq(0)' ).click();
-	}
-);
-
-var complexMDYDates = [
-	// Some words with Umlauts
-	['January, 19 2010'],
-	['April 21 1991'],
-	['04 22 1991'],
-	['5.12.1990'],
-	['December 12 \'10']
-];
-
-var complexMDYSorted = [
-	['5.12.1990'],
-	['April 21 1991'],
-	['04 22 1991'],
-	['January, 19 2010'],
-	['December 12 \'10']
-];
-
-tableTest(
-	'Complex date parsing I',
-	['date'],
-	complexMDYDates,
-	complexMDYSorted,
-	function ( $table ) {
-		mw.config.set( 'wgDefaultDateFormat', 'mdy' );
+	var umlautWords = [
+		// Some words with Umlauts
+		['Günther'],
+		['Peter'],
+		['Björn'],
+		['Bjorn'],
+		['Apfel'],
+		['Äpfel'],
+		['Strasse'],
+		['Sträßschen']
+	];
+
+	var umlautWordsSorted = [
+		// Some words with Umlauts
+		['Äpfel'],
+		['Apfel'],
+		['Björn'],
+		['Bjorn'],
+		['Günther'],
+		['Peter'],
+		['Sträßschen'],
+		['Strasse']
+	];
+
+	tableTest(
+		'Accented Characters with custom collation',
+		['Name'],
+		umlautWords,
+		umlautWordsSorted,
+		function ( $table ) {
+			mw.config.set( 'tableSorterCollation', {
+				'ä': 'ae',
+				'ö': 'oe',
+				'ß': 'ss',
+				'ü':'ue'
+			} );
 
-		$table.tablesorter();
-		$table.find( '.headerSort:eq(0)' ).click();
-	}
-);
-
-var currencyUnsorted = [
-	['1.02 $'],
-	['$ 3.00'],
-	['€ 2,99'],
-	['$ 1.00'],
-	['$3.50'],
-	['$ 1.50'],
-	['€ 0.99']
-];
-
-var currencySorted = [
-	['€ 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']
-];
-
-tableTest(
-	'Currency parsing I',
-	['currency'],
-	currencyUnsorted,
-	currencySorted,
-	function ( $table ) {
-		$table.tablesorter();
-		$table.find( '.headerSort:eq(0)' ).click();
-	}
-);
-
-var ascendingNameLegacy = ascendingName.slice(0);
-ascendingNameLegacy[4] = ascendingNameLegacy[5];
-ascendingNameLegacy.pop();
-
-tableTest(
-	'Legacy compat with .sortbottom',
-	header,
-	planets,
-	ascendingNameLegacy,
-	function( $table ) {
-		$table.find( 'tr:last' ).addClass( 'sortbottom' );
-		$table.tablesorter();
-		$table.find( '.headerSort:eq(0)' ).click();
-	}
-);
-
-QUnit.test( 'Test detection routine', function ( assert ) {
-	var $table;
-	$table = $(
-		'<table class="sortable">' +
-		'<caption>CAPTION</caption>' +
-		'<tr><th>THEAD</th></tr>' +
-		'<tr><td>1</td></tr>' +
-		'<tr class="sortbottom"><td>text</td></tr>' +
-		'</table>'
+			$table.tablesorter();
+			$table.find( '.headerSort:eq(0)' ).click();
+		}
 	);
-	$table.tablesorter();
 
-	assert.equal(
-		$table.data( 'tablesorter' ).config.parsers[0].id,
-		'number',
-		'Correctly detected column content skipping sortbottom'
+	var planetsRowspan = [ [ 'Earth', '6051.8' ], jupiter, [ 'Mars', '6051.8' ], mercury, saturn, venus ];
+	var planetsRowspanII = [ jupiter, mercury, saturn, venus, [ 'Venus', '6371.0' ], [ 'Venus', '3390.0' ] ];
+
+	tableTest(
+		'Basic planet table: same value for multiple rows via rowspan',
+		header,
+		planets,
+		planetsRowspan,
+		function ( $table ) {
+			// Modify the table to have a multiple-row-spanning cell:
+			// - Remove 2nd cell of 4th row, and, 2nd cell or 5th row.
+			$table.find( 'tr:eq(3) td:eq(1), tr:eq(4) td:eq(1)' ).remove();
+			// - Set rowspan for 2nd cell of 3rd row to 3.
+			//   This covers the removed cell in the 4th and 5th row.
+			$table.find( 'tr:eq(2) td:eq(1)' ).prop( 'rowspan', '3' );
+
+			$table.tablesorter();
+			$table.find( '.headerSort:eq(0)' ).click();
+		}
 	);
-} );
-
-/** FIXME: the diff output is not very readeable. */
-QUnit.test( 'bug 32047 - caption must be before thead', function ( assert ) {
-	var $table;
-	$table = $(
-		'<table class="sortable">' +
-		'<caption>CAPTION</caption>' +
-		'<tr><th>THEAD</th></tr>' +
-		'<tr><td>A</td></tr>' +
-		'<tr><td>B</td></tr>' +
-		'<tr class="sortbottom"><td>TFOOT</td></tr>' +
-		'</table>'
-		);
-	$table.tablesorter();
-
-	assert.equal(
-		$table.children( ).get( 0 ).nodeName,
-		'CAPTION',
-		'First element after <thead> must be <caption> (bug 32047)'
+	tableTest(
+		'Basic planet table: same value for multiple rows via rowspan (sorting initially)',
+		header,
+		planets,
+		planetsRowspan,
+		function ( $table ) {
+			// Modify the table to have a multiple-row-spanning cell:
+			// - Remove 2nd cell of 4th row, and, 2nd cell or 5th row.
+			$table.find( 'tr:eq(3) td:eq(1), tr:eq(4) td:eq(1)' ).remove();
+			// - Set rowspan for 2nd cell of 3rd row to 3.
+			//   This covers the removed cell in the 4th and 5th row.
+			$table.find( 'tr:eq(2) td:eq(1)' ).prop( 'rowspan', '3' );
+
+			$table.tablesorter( { sortList: [ { 0: 'asc' } ] } );
+		}
 	);
-});
-
-QUnit.test( 'data-sort-value attribute, when available, should override sorting position', function ( assert ) {
-	var $table, data;
-
-	// Example 1: All cells except one cell without data-sort-value,
-	// which should be sorted at it's text content value.
-	$table = $(
-		'<table class="sortable"><thead><tr><th>Data</th></tr></thead>' +
-			'<tbody>' +
-			'<tr><td>Cheetah</td></tr>' +
-			'<tr><td data-sort-value="Apple">Bird</td></tr>' +
-			'<tr><td data-sort-value="Bananna">Ferret</td></tr>' +
-			'<tr><td data-sort-value="Drupe">Elephant</td></tr>' +
-			'<tr><td data-sort-value="Cherry">Dolphin</td></tr>' +
-		'</tbody></table>'
+	tableTest(
+		'Basic planet table: Same value for multiple rows via rowspan II',
+		header,
+		planets,
+		planetsRowspanII,
+		function ( $table ) {
+			// Modify the table to have a multiple-row-spanning cell:
+			// - Remove 1st cell of 4th row, and, 1st cell or 5th row.
+			$table.find( 'tr:eq(3) td:eq(0), tr:eq(4) td:eq(0)' ).remove();
+			// - Set rowspan for 1st cell of 3rd row to 3.
+			//   This covers the removed cell in the 4th and 5th row.
+			$table.find( 'tr:eq(2) td:eq(0)' ).prop( 'rowspan', '3' );
+
+			$table.tablesorter();
+			$table.find( '.headerSort:eq(0)' ).click();
+		}
 	);
-	$table.tablesorter().find( '.headerSort:eq(0)' ).click();
-
-	data = [];
-	$table.find( 'tbody > tr' ).each( function( i, tr ) {
-		$( tr ).find( 'td' ).each( function( i, td ) {
-			data.push( {
-				data: $( td ).data( 'sortValue' ),
-				text: $( td ).text()
-			} );
-		});
-	});
 
-	assert.deepEqual( data, [
-		{
-			data: 'Apple',
-			text: 'Bird'
-		}, {
-			data: 'Bananna',
-			text: 'Ferret'
-		}, {
-			data: undefined,
-			text: 'Cheetah'
-		}, {
-			data: 'Cherry',
-			text: 'Dolphin'
-		}, {
-			data: 'Drupe',
-			text: 'Elephant'
+	var complexMDYDates = [
+		// Some words with Umlauts
+		['January, 19 2010'],
+		['April 21 1991'],
+		['04 22 1991'],
+		['5.12.1990'],
+		['December 12 \'10']
+	];
+
+	var complexMDYSorted = [
+		['5.12.1990'],
+		['April 21 1991'],
+		['04 22 1991'],
+		['January, 19 2010'],
+		['December 12 \'10']
+	];
+
+	tableTest(
+		'Complex date parsing I',
+		['date'],
+		complexMDYDates,
+		complexMDYSorted,
+		function ( $table ) {
+			mw.config.set( 'wgDefaultDateFormat', 'mdy' );
+
+			$table.tablesorter();
+			$table.find( '.headerSort:eq(0)' ).click();
 		}
-	], 'Order matches expected order (based on data-sort-value attribute values)' );
-
-	// Example 2
-	$table = $(
-		'<table class="sortable"><thead><tr><th>Data</th></tr></thead>' +
-			'<tbody>' +
-			'<tr><td>D</td></tr>' +
-			'<tr><td data-sort-value="E">A</td></tr>' +
-			'<tr><td>B</td></tr>' +
-			'<tr><td>G</td></tr>' +
-			'<tr><td data-sort-value="F">C</td></tr>' +
-		'</tbody></table>'
 	);
-	$table.tablesorter().find( '.headerSort:eq(0)' ).click();
-
-	data = [];
-	$table.find( 'tbody > tr' ).each( function ( i, tr ) {
-		$( tr ).find( 'td' ).each( function ( i, td ) {
-			data.push( {
-				data: $( td ).data( 'sortValue' ),
-				text: $( td ).text()
-			} );
-		});
-	});
 
-	assert.deepEqual( data, [
-		{
-			data: undefined,
-			text: 'B'
-		}, {
-			data: undefined,
-			text: 'D'
-		}, {
-			data: 'E',
-			text: 'A'
-		}, {
-			data: 'F',
-			text: 'C'
-		}, {
-			data: undefined,
-			text: 'G'
+	var currencyUnsorted = [
+		['1.02 $'],
+		['$ 3.00'],
+		['€ 2,99'],
+		['$ 1.00'],
+		['$3.50'],
+		['$ 1.50'],
+		['€ 0.99']
+	];
+
+	var currencySorted = [
+		['€ 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']
+	];
+
+	tableTest(
+		'Currency parsing I',
+		['currency'],
+		currencyUnsorted,
+		currencySorted,
+		function ( $table ) {
+			$table.tablesorter();
+			$table.find( '.headerSort:eq(0)' ).click();
 		}
-	], 'Order matches expected order (based on data-sort-value attribute values)' );
-
-	// Example 3: Test that live changes are used from data-sort-value,
-	// even if they change after the tablesorter is constructed (bug 38152).
-	$table = $(
-		'<table class="sortable"><thead><tr><th>Data</th></tr></thead>' +
-			'<tbody>' +
-			'<tr><td>D</td></tr>' +
-			'<tr><td data-sort-value="1">A</td></tr>' +
-			'<tr><td>B</td></tr>' +
-			'<tr><td data-sort-value="2">G</td></tr>' +
-			'<tr><td>C</td></tr>' +
-		'</tbody></table>'
 	);
-	// initialize table sorter and sort once
-	$table
-		.tablesorter()
-		.find( '.headerSort:eq(0)' ).click();
-
-	// Change the sortValue data properties (bug 38152)
-	// - change data
-	$table.find( 'td:contains(A)' ).data( 'sortValue', 3 );
-	// - add data
-	$table.find( 'td:contains(B)' ).data( 'sortValue', 1 );
-	// - remove data, bring back attribute: 2
-	$table.find( 'td:contains(G)' ).removeData( 'sortValue' );
-
-	// Now sort again (twice, so it is back at Ascending)
-	$table.find( '.headerSort:eq(0)' ).click();
-	$table.find( '.headerSort:eq(0)' ).click();
-
-	data = [];
-	$table.find( 'tbody > tr' ).each( function( i, tr ) {
-		$( tr ).find( 'td' ).each( function( i, td ) {
-			data.push( {
-				data: $( td ).data( 'sortValue' ),
-				text: $( td ).text()
-			} );
-		});
-	});
 
-	assert.deepEqual( data, [
-		{
-			data: 1,
-			text: "B"
-		}, {
-			data: 2,
-			text: "G"
-		}, {
-			data: 3,
-			text: "A"
-		}, {
-			data: undefined,
-			text: "C"
-		}, {
-			data: undefined,
-			text: "D"
+	var ascendingNameLegacy = ascendingName.slice(0);
+	ascendingNameLegacy[4] = ascendingNameLegacy[5];
+	ascendingNameLegacy.pop();
+
+	tableTest(
+		'Legacy compat with .sortbottom',
+		header,
+		planets,
+		ascendingNameLegacy,
+		function( $table ) {
+			$table.find( 'tr:last' ).addClass( 'sortbottom' );
+			$table.tablesorter();
+			$table.find( '.headerSort:eq(0)' ).click();
 		}
-	], 'Order matches expected order, using the current sortValue in $.data()' );
-
-});
-
-var numbers = [
-	[ '12'    ],
-	[  '7'    ],
-	[ '13,000'],
-	[  '9'    ],
-	[ '14'    ],
-	[  '8.0'  ]
-];
-var numbersAsc = [
-	[  '7'    ],
-	[  '8.0'  ],
-	[  '9'    ],
-	[ '12'    ],
-	[ '14'    ],
-	[ '13,000']
-];
-
-tableTest( 'bug 8115: sort numbers with commas (ascending)',
-	['Numbers'], numbers, numbersAsc,
-	function( $table ) {
+	);
+
+	QUnit.test( 'Test detection routine', function ( assert ) {
+		var $table;
+		$table = $(
+			'<table class="sortable">' +
+			'<caption>CAPTION</caption>' +
+			'<tr><th>THEAD</th></tr>' +
+			'<tr><td>1</td></tr>' +
+			'<tr class="sortbottom"><td>text</td></tr>' +
+			'</table>'
+		);
 		$table.tablesorter();
-		$table.find( '.headerSort:eq(0)' ).click();
-	}
-);
 
-tableTest( 'bug 8115: sort numbers with commas (descending)',
-	['Numbers'], numbers, reversed(numbersAsc),
-	function( $table ) {
+		assert.equal(
+			$table.data( 'tablesorter' ).config.parsers[0].id,
+			'number',
+			'Correctly detected column content skipping sortbottom'
+		);
+	} );
+
+	/** FIXME: the diff output is not very readeable. */
+	QUnit.test( 'bug 32047 - caption must be before thead', function ( assert ) {
+		var $table;
+		$table = $(
+			'<table class="sortable">' +
+			'<caption>CAPTION</caption>' +
+			'<tr><th>THEAD</th></tr>' +
+			'<tr><td>A</td></tr>' +
+			'<tr><td>B</td></tr>' +
+			'<tr class="sortbottom"><td>TFOOT</td></tr>' +
+			'</table>'
+			);
 		$table.tablesorter();
-		$table.find( '.headerSort:eq(0)' ).click().click();
-	}
-);
-// TODO add numbers sorting tests for bug 8115 with a different language
-
-QUnit.test( 'bug 32888 - Tables inside a tableheader cell', 2, function ( assert ) {
-	var $table;
-	$table = $(
-		'<table class="sortable" id="mw-bug-32888">' +
-		'<tr><th>header<table id="mw-bug-32888-2">'+
-			'<tr><th>1</th><th>2</th></tr>' +
-		'</table></th></tr>' +
-		'<tr><td>A</td></tr>' +
-		'<tr><td>B</td></tr>' +
-		'</table>'
+
+		assert.equal(
+			$table.children( ).get( 0 ).nodeName,
+			'CAPTION',
+			'First element after <thead> must be <caption> (bug 32047)'
 		);
-	$table.tablesorter();
+	});
 
-	assert.equal(
-		$table.find('> thead:eq(0) > tr > th.headerSort').length,
-		1,
-		'Child tables inside a headercell should not interfere with sortable headers (bug 32888)'
-	);
-	assert.equal(
-		$( '#mw-bug-32888-2' ).find('th.headerSort').length,
-		0,
-		'The headers of child tables inside a headercell should not be sortable themselves (bug 32888)'
-	);
-});
+	QUnit.test( 'data-sort-value attribute, when available, should override sorting position', function ( assert ) {
+		var $table, data;
+
+		// Example 1: All cells except one cell without data-sort-value,
+		// which should be sorted at it's text content value.
+		$table = $(
+			'<table class="sortable"><thead><tr><th>Data</th></tr></thead>' +
+				'<tbody>' +
+				'<tr><td>Cheetah</td></tr>' +
+				'<tr><td data-sort-value="Apple">Bird</td></tr>' +
+				'<tr><td data-sort-value="Bananna">Ferret</td></tr>' +
+				'<tr><td data-sort-value="Drupe">Elephant</td></tr>' +
+				'<tr><td data-sort-value="Cherry">Dolphin</td></tr>' +
+			'</tbody></table>'
+		);
+		$table.tablesorter().find( '.headerSort:eq(0)' ).click();
+
+		data = [];
+		$table.find( 'tbody > tr' ).each( function( i, tr ) {
+			$( tr ).find( 'td' ).each( function( i, td ) {
+				data.push( {
+					data: $( td ).data( 'sortValue' ),
+					text: $( td ).text()
+				} );
+			});
+		});
 
+		assert.deepEqual( data, [
+			{
+				data: 'Apple',
+				text: 'Bird'
+			}, {
+				data: 'Bananna',
+				text: 'Ferret'
+			}, {
+				data: undefined,
+				text: 'Cheetah'
+			}, {
+				data: 'Cherry',
+				text: 'Dolphin'
+			}, {
+				data: 'Drupe',
+				text: 'Elephant'
+			}
+		], 'Order matches expected order (based on data-sort-value attribute values)' );
+
+		// Example 2
+		$table = $(
+			'<table class="sortable"><thead><tr><th>Data</th></tr></thead>' +
+				'<tbody>' +
+				'<tr><td>D</td></tr>' +
+				'<tr><td data-sort-value="E">A</td></tr>' +
+				'<tr><td>B</td></tr>' +
+				'<tr><td>G</td></tr>' +
+				'<tr><td data-sort-value="F">C</td></tr>' +
+			'</tbody></table>'
+		);
+		$table.tablesorter().find( '.headerSort:eq(0)' ).click();
+
+		data = [];
+		$table.find( 'tbody > tr' ).each( function ( i, tr ) {
+			$( tr ).find( 'td' ).each( function ( i, td ) {
+				data.push( {
+					data: $( td ).data( 'sortValue' ),
+					text: $( td ).text()
+				} );
+			});
+		});
 
-var correctDateSorting1 = [
-	['01 January 2010'],
-	['05 February 2010'],
-	['16 January 2010']
-];
+		assert.deepEqual( data, [
+			{
+				data: undefined,
+				text: 'B'
+			}, {
+				data: undefined,
+				text: 'D'
+			}, {
+				data: 'E',
+				text: 'A'
+			}, {
+				data: 'F',
+				text: 'C'
+			}, {
+				data: undefined,
+				text: 'G'
+			}
+		], 'Order matches expected order (based on data-sort-value attribute values)' );
+
+		// Example 3: Test that live changes are used from data-sort-value,
+		// even if they change after the tablesorter is constructed (bug 38152).
+		$table = $(
+			'<table class="sortable"><thead><tr><th>Data</th></tr></thead>' +
+				'<tbody>' +
+				'<tr><td>D</td></tr>' +
+				'<tr><td data-sort-value="1">A</td></tr>' +
+				'<tr><td>B</td></tr>' +
+				'<tr><td data-sort-value="2">G</td></tr>' +
+				'<tr><td>C</td></tr>' +
+			'</tbody></table>'
+		);
+		// initialize table sorter and sort once
+		$table
+			.tablesorter()
+			.find( '.headerSort:eq(0)' ).click();
+
+		// Change the sortValue data properties (bug 38152)
+		// - change data
+		$table.find( 'td:contains(A)' ).data( 'sortValue', 3 );
+		// - add data
+		$table.find( 'td:contains(B)' ).data( 'sortValue', 1 );
+		// - remove data, bring back attribute: 2
+		$table.find( 'td:contains(G)' ).removeData( 'sortValue' );
+
+		// Now sort again (twice, so it is back at Ascending)
+		$table.find( '.headerSort:eq(0)' ).click();
+		$table.find( '.headerSort:eq(0)' ).click();
 
-var correctDateSortingSorted1 = [
-	['01 January 2010'],
-	['16 January 2010'],
-	['05 February 2010']
-];
+		data = [];
+		$table.find( 'tbody > tr' ).each( function( i, tr ) {
+			$( tr ).find( 'td' ).each( function( i, td ) {
+				data.push( {
+					data: $( td ).data( 'sortValue' ),
+					text: $( td ).text()
+				} );
+			});
+		});
 
-tableTest(
-	'Correct date sorting I',
-	['date'],
-	correctDateSorting1,
-	correctDateSortingSorted1,
-	function ( $table ) {
-		mw.config.set( 'wgDefaultDateFormat', 'mdy' );
+		assert.deepEqual( data, [
+			{
+				data: 1,
+				text: 'B'
+			}, {
+				data: 2,
+				text: 'G'
+			}, {
+				data: 3,
+				text: 'A'
+			}, {
+				data: undefined,
+				text: 'C'
+			}, {
+				data: undefined,
+				text: 'D'
+			}
+		], 'Order matches expected order, using the current sortValue in $.data()' );
 
-		$table.tablesorter();
-		$table.find( '.headerSort:eq(0)' ).click();
-	}
-);
-
-var correctDateSorting2 = [
-	['January 01 2010'],
-	['February 05 2010'],
-	['January 16 2010']
-];
-
-var correctDateSortingSorted2 = [
-	['January 01 2010'],
-	['January 16 2010'],
-	['February 05 2010']
-];
-
-tableTest(
-	'Correct date sorting II',
-	['date'],
-	correctDateSorting2,
-	correctDateSortingSorted2,
-	function ( $table ) {
-		mw.config.set( 'wgDefaultDateFormat', 'dmy' );
+	});
 
+	var numbers = [
+		[ '12'    ],
+		[  '7'    ],
+		[ '13,000'],
+		[  '9'    ],
+		[ '14'    ],
+		[  '8.0'  ]
+	];
+	var numbersAsc = [
+		[  '7'    ],
+		[  '8.0'  ],
+		[  '9'    ],
+		[ '12'    ],
+		[ '14'    ],
+		[ '13,000']
+	];
+
+	tableTest( 'bug 8115: sort numbers with commas (ascending)',
+		['Numbers'], numbers, numbersAsc,
+		function( $table ) {
+			$table.tablesorter();
+			$table.find( '.headerSort:eq(0)' ).click();
+		}
+	);
+
+	tableTest( 'bug 8115: sort numbers with commas (descending)',
+		['Numbers'], numbers, reversed(numbersAsc),
+		function( $table ) {
+			$table.tablesorter();
+			$table.find( '.headerSort:eq(0)' ).click().click();
+		}
+	);
+	// TODO add numbers sorting tests for bug 8115 with a different language
+
+	QUnit.test( 'bug 32888 - Tables inside a tableheader cell', 2, function ( assert ) {
+		var $table;
+		$table = $(
+			'<table class="sortable" id="mw-bug-32888">' +
+			'<tr><th>header<table id="mw-bug-32888-2">'+
+				'<tr><th>1</th><th>2</th></tr>' +
+			'</table></th></tr>' +
+			'<tr><td>A</td></tr>' +
+			'<tr><td>B</td></tr>' +
+			'</table>'
+			);
 		$table.tablesorter();
-		$table.find( '.headerSort:eq(0)' ).click();
-	}
-);
+
+		assert.equal(
+			$table.find('> thead:eq(0) > tr > th.headerSort').length,
+			1,
+			'Child tables inside a headercell should not interfere with sortable headers (bug 32888)'
+		);
+		assert.equal(
+			$( '#mw-bug-32888-2' ).find('th.headerSort').length,
+			0,
+			'The headers of child tables inside a headercell should not be sortable themselves (bug 32888)'
+		);
+	});
+
+
+	var correctDateSorting1 = [
+		['01 January 2010'],
+		['05 February 2010'],
+		['16 January 2010']
+	];
+
+	var correctDateSortingSorted1 = [
+		['01 January 2010'],
+		['16 January 2010'],
+		['05 February 2010']
+	];
+
+	tableTest(
+		'Correct date sorting I',
+		['date'],
+		correctDateSorting1,
+		correctDateSortingSorted1,
+		function ( $table ) {
+			mw.config.set( 'wgDefaultDateFormat', 'mdy' );
+
+			$table.tablesorter();
+			$table.find( '.headerSort:eq(0)' ).click();
+		}
+	);
+
+	var correctDateSorting2 = [
+		['January 01 2010'],
+		['February 05 2010'],
+		['January 16 2010']
+	];
+
+	var correctDateSortingSorted2 = [
+		['January 01 2010'],
+		['January 16 2010'],
+		['February 05 2010']
+	];
+
+	tableTest(
+		'Correct date sorting II',
+		['date'],
+		correctDateSorting2,
+		correctDateSortingSorted2,
+		function ( $table ) {
+			mw.config.set( 'wgDefaultDateFormat', 'dmy' );
+
+			$table.tablesorter();
+			$table.find( '.headerSort:eq(0)' ).click();
+		}
+	);
 
 }( 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 f0a210f56b..1795b95a6b 100644
--- a/tests/qunit/suites/resources/jquery/jquery.textSelection.test.js
+++ b/tests/qunit/suites/resources/jquery/jquery.textSelection.test.js
@@ -1,275 +1,282 @@
-QUnit.module( 'jquery.textSelection', QUnit.newMwEnvironment() );
-
-/**
- * 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' )
- */
-function encapsulateTest( options ) {
-	var opt = $.extend({
-		description: '',
-		before: {},
-		after: {},
-		replace: {}
-	}, options);
-
-	opt.before = $.extend({
-		text: '',
-		start: 0,
-		end: 0
-	}, opt.before);
-	opt.after = $.extend({
-		text: '',
-		selected: null
-	}, opt.after);
-
-	QUnit.test( opt.description, function ( assert ) {
-		var tests = 1;
-		if ( opt.after.selected !== null ) {
-			tests++;
-		}
-		QUnit.expect( tests );
-
-		var $textarea = $( '<textarea>' );
-
-		$( '#qunit-fixture' ).append( $textarea );
-
-		//$textarea.textSelection( 'setContents', opt.before.text); // this method is actually missing atm...
-		$textarea.val( opt.before.text ); // won't work with the WikiEditor iframe?
-
-		var	start = opt.before.start,
-			end = opt.before.end;
-		if ( window.opera ) {
-			// Compensate for Opera's craziness converting "\n" to "\r\n" and counting that as two chars
-			var	newLinesBefore = opt.before.text.substring( 0, start ).split( "\n" ).length - 1,
-				newLinesInside = opt.before.text.substring( start, end ).split( "\n" ).length - 1;
-			start += newLinesBefore;
-			end += newLinesBefore + newLinesInside;
-		}
-
-		var options = $.extend( {}, opt.replace ); // Clone opt.replace
-		options.selectionStart = start;
-		options.selectionEnd = end;
-		$textarea.textSelection( 'encapsulateSelection', options );
-
-		var text = $textarea.textSelection( 'getContents' ).replace( /\r\n/g, "\n" );
-
-		assert.equal( text, opt.after.text, 'Checking full text after encapsulation' );
-
-		if (opt.after.selected !== null) {
-			var selected = $textarea.textSelection( 'getSelection' );
-			assert.equal( selected, opt.after.selected, 'Checking selected text after encapsulation.' );
-		}
-
-	} );
-}
-
-var sig = {
-	'pre': "--~~~~"
-}, bold = {
-	pre: "'''",
-	peri: 'Bold text',
-	post: "'''"
-}, h2 = {
-	'pre': '== ',
-	'peri': 'Heading 2',
-	'post': ' ==',
-	'regex': /^(\s*)(={1,6})(.*?)\2(\s*)$/,
-	'regexReplace': "$1==$3==$4",
-	'ownline': true
-}, ulist = {
-	'pre': "* ",
-	'peri': 'Bulleted list item',
-	'post': "",
-	'ownline': true,
-	'splitlines': true
-};
-
-encapsulateTest({
-	description: "Adding sig to end of text",
-	before: {
-		text: "Wikilove dude! ",
-		start: 15,
-		end: 15
-	},
-	after: {
-		text: "Wikilove dude! --~~~~",
-		selected: ""
-	},
-	replace: sig
-});
-
-encapsulateTest({
-	description: "Adding bold to empty",
-	before: {
-		text: "",
-		start: 0,
-		end: 0
-	},
-	after: {
-		text: "'''Bold text'''",
-		selected: "Bold text" // selected because it's the default
-	},
-	replace: bold
-});
-
-encapsulateTest({
-	description: "Adding bold to existing text",
-	before: {
-		text: "Now is the time for all good men to come to the aid of their country",
-		start: 20,
-		end: 32
-	},
-	after: {
-		text: "Now is the time for '''all good men''' to come to the aid of their country",
-		selected: "" // empty because it's not the default'
-	},
-	replace: bold
-});
-
-encapsulateTest({
-	description: "ownline option: adding new h2",
-	before: {
-		text:"Before\nAfter",
-		start: 7,
-		end: 7
-	},
-	after: {
-		text: "Before\n== Heading 2 ==\nAfter",
-		selected: "Heading 2"
-	},
-	replace: h2
-});
-
-encapsulateTest({
-	description: "ownline option: turn a whole line into new h2",
-	before: {
-		text:"Before\nMy heading\nAfter",
-		start: 7,
-		end: 17
-	},
-	after: {
-		text: "Before\n== My heading ==\nAfter",
-		selected: ""
-	},
-	replace: h2
-});
-
-
-encapsulateTest({
-	description: "ownline option: turn a partial line into new h2",
-	before: {
-		text:"BeforeMy headingAfter",
-		start: 6,
-		end: 16
-	},
-	after: {
-		text: "Before\n== My heading ==\nAfter",
-		selected: ""
-	},
-	replace: h2
-});
-
-
-encapsulateTest({
-	description: "splitlines option: no selection, insert new list item",
-	before: {
-		text: "Before\nAfter",
-		start: 7,
-		end: 7
-	},
-	after: {
-		text: "Before\n* Bulleted list item\nAfter"
-	},
-	replace: ulist
-});
-
-encapsulateTest({
-	description: "splitlines option: single partial line selection, insert new list item",
-	before: {
-		text: "BeforeMy List ItemAfter",
-		start: 6,
-		end: 18
-	},
-	after: {
-		text: "Before\n* My List Item\nAfter"
-	},
-	replace: ulist
-});
-
-encapsulateTest({
-	description: "splitlines option: multiple lines",
-	before: {
-		text: "Before\nFirst\nSecond\nThird\nAfter",
-		start: 7,
-		end: 25
-	},
-	after: {
-		text: "Before\n* First\n* Second\n* Third\nAfter"
-	},
-	replace: ulist
-});
-
-
-function caretTest( options ) {
-	QUnit.test( options.description, 2, function ( assert ) {
-		var $textarea = $( '<textarea>' ).text( options.text );
-
-		$( '#qunit-fixture' ).append( $textarea );
-
-		if ( options.mode === 'set' ) {
-			$textarea.textSelection('setSelection', {
-				start: options.start,
-				end: options.end
-			});
-		}
-
-		function among( actual, expected, message ) {
-			if ( $.isArray( expected ) ) {
-				assert.ok( $.inArray( actual, expected ) !== -1 , message + ' (got ' + actual + '; expected one of ' + expected.join(', ') + ')' );
-			} else {
-				assert.equal( actual, expected, message );
+( function ( $ ) {
+
+	QUnit.module( 'jquery.textSelection', QUnit.newMwEnvironment() );
+
+	/**
+	 * 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' )
+	 */
+	function encapsulateTest( options ) {
+		var opt = $.extend({
+			description: '',
+			before: {},
+			after: {},
+			replace: {}
+		}, options);
+
+		opt.before = $.extend({
+			text: '',
+			start: 0,
+			end: 0
+		}, opt.before);
+		opt.after = $.extend({
+			text: '',
+			selected: null
+		}, opt.after);
+
+		QUnit.test( opt.description, function ( assert ) {
+			/*jshint onevar: false */
+			var tests = 1;
+			if ( opt.after.selected !== null ) {
+				tests++;
+			}
+			QUnit.expect( tests );
+
+			var $textarea = $( '<textarea>' );
+
+			$( '#qunit-fixture' ).append( $textarea );
+
+			//$textarea.textSelection( 'setContents', opt.before.text); // this method is actually missing atm...
+			$textarea.val( opt.before.text ); // won't work with the WikiEditor iframe?
+
+			var	start = opt.before.start,
+				end = opt.before.end;
+			if ( window.opera ) {
+				// Compensate for Opera's craziness converting \n to \r\n and counting that as two chars
+				var	newLinesBefore = opt.before.text.substring( 0, start ).split( '\n' ).length - 1,
+					newLinesInside = opt.before.text.substring( start, end ).split( '\n' ).length - 1;
+				start += newLinesBefore;
+				end += newLinesBefore + newLinesInside;
+			}
+
+			var options = $.extend( {}, opt.replace ); // Clone opt.replace
+			options.selectionStart = start;
+			options.selectionEnd = end;
+			$textarea.textSelection( 'encapsulateSelection', options );
+
+			var text = $textarea.textSelection( 'getContents' ).replace( /\r\n/g, '\n' );
+
+			assert.equal( text, opt.after.text, 'Checking full text after encapsulation' );
+
+			if ( opt.after.selected !== null ) {
+				var selected = $textarea.textSelection( 'getSelection' );
+				assert.equal( selected, opt.after.selected, 'Checking selected text after encapsulation.' );
+			}
+
+		} );
+	}
+
+	var caretSample,
+		sig = {
+			pre: '--~~~~'
+		},
+		bold = {
+			pre: '\'\'\'',
+			peri: 'Bold text',
+			post: '\'\'\''
+		},
+		h2 = {
+			pre: '== ',
+			peri: 'Heading 2',
+			post: ' ==',
+			regex: /^(\s*)(={1,6})(.*?)\2(\s*)$/,
+			regexReplace: '$1==$3==$4',
+			ownline: true
+		},
+		ulist = {
+			pre: '* ',
+			peri: 'Bulleted list item',
+			post: '',
+			ownline: true,
+			splitlines: true
+		};
+
+	encapsulateTest({
+		description: 'Adding sig to end of text',
+		before: {
+			text: 'Wikilove dude! ',
+			start: 15,
+			end: 15
+		},
+		after: {
+			text: 'Wikilove dude! --~~~~',
+			selected: ''
+		},
+		replace: sig
+	});
+
+	encapsulateTest({
+		description: 'Adding bold to empty',
+		before: {
+			text: '',
+			start: 0,
+			end: 0
+		},
+		after: {
+			text: '\'\'\'Bold text\'\'\'',
+			selected: 'Bold text' // selected because it's the default
+		},
+		replace: bold
+	});
+
+	encapsulateTest({
+		description: 'Adding bold to existing text',
+		before: {
+			text: 'Now is the time for all good men to come to the aid of their country',
+			start: 20,
+			end: 32
+		},
+		after: {
+			text: 'Now is the time for \'\'\'all good men\'\'\' to come to the aid of their country',
+			selected: '' // empty because it's not the default'
+		},
+		replace: bold
+	});
+
+	encapsulateTest({
+		description: 'ownline option: adding new h2',
+		before: {
+			text:'Before\nAfter',
+			start: 7,
+			end: 7
+		},
+		after: {
+			text: 'Before\n== Heading 2 ==\nAfter',
+			selected: 'Heading 2'
+		},
+		replace: h2
+	});
+
+	encapsulateTest({
+		description: 'ownline option: turn a whole line into new h2',
+		before: {
+			text:'Before\nMy heading\nAfter',
+			start: 7,
+			end: 17
+		},
+		after: {
+			text: 'Before\n== My heading ==\nAfter',
+			selected: ''
+		},
+		replace: h2
+	});
+
+
+	encapsulateTest({
+		description: 'ownline option: turn a partial line into new h2',
+		before: {
+			text:'BeforeMy headingAfter',
+			start: 6,
+			end: 16
+		},
+		after: {
+			text: 'Before\n== My heading ==\nAfter',
+			selected: ''
+		},
+		replace: h2
+	});
+
+
+	encapsulateTest({
+		description: 'splitlines option: no selection, insert new list item',
+		before: {
+			text: 'Before\nAfter',
+			start: 7,
+			end: 7
+		},
+		after: {
+			text: 'Before\n* Bulleted list item\nAfter'
+		},
+		replace: ulist
+	});
+
+	encapsulateTest({
+		description: 'splitlines option: single partial line selection, insert new list item',
+		before: {
+			text: 'BeforeMy List ItemAfter',
+			start: 6,
+			end: 18
+		},
+		after: {
+			text: 'Before\n* My List Item\nAfter'
+		},
+		replace: ulist
+	});
+
+	encapsulateTest({
+		description: 'splitlines option: multiple lines',
+		before: {
+			text: 'Before\nFirst\nSecond\nThird\nAfter',
+			start: 7,
+			end: 25
+		},
+		after: {
+			text: 'Before\n* First\n* Second\n* Third\nAfter'
+		},
+		replace: ulist
+	});
+
+
+	function caretTest( options ) {
+		QUnit.test( options.description, 2, function ( assert ) {
+			var pos, $textarea = $( '<textarea>' ).text( options.text );
+
+			$( '#qunit-fixture' ).append( $textarea );
+
+			if ( options.mode === 'set' ) {
+				$textarea.textSelection('setSelection', {
+					start: options.start,
+					end: options.end
+				});
+			}
+
+			function among( actual, expected, message ) {
+				if ( $.isArray( expected ) ) {
+					assert.ok( $.inArray( actual, expected ) !== -1 , message + ' (got ' + actual + '; expected one of ' + expected.join(', ') + ')' );
+				} else {
+					assert.equal( actual, expected, message );
+				}
 			}
-		}
 
-		var 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.');
+			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.');
+		});
+	}
+
+	caretSample = 'Some big text that we like to work with. Nothing fancy... you know what I mean?';
+
+	/*
+	// @broken: Disabled per bug 34820
+	caretTest({
+		description: 'getCaretPosition with original/empty selection - bug 31847 with IE 6/7/8',
+		text: caretSample,
+		start: [0, caretSample.length], // Opera and Firefox (prior to FF 6.0) default caret to the end of the box (caretSample.length)
+		end: [0, caretSample.length], // Other browsers default it to the beginning (0), so check both.
+		mode: 'get'
+	});
+	*/
+
+	caretTest({
+		description: 'set/getCaretPosition with forced empty selection',
+		text: caretSample,
+		start: 7,
+		end: 7,
+		mode: 'set'
 	});
-}
-
-var caretSample = "Some big text that we like to work with. Nothing fancy... you know what I mean?";
-
-/*
- // @broken: Disabled per bug 34820
-caretTest({
-	description: 'getCaretPosition with original/empty selection - bug 31847 with IE 6/7/8',
-	text: caretSample,
-	start: [0, caretSample.length], // Opera and Firefox (prior to FF 6.0) default caret to the end of the box (caretSample.length)
-	end: [0, caretSample.length], // Other browsers default it to the beginning (0), so check both.
-	mode: 'get'
-});
-*/
-
-caretTest({
-	description: 'set/getCaretPosition with forced empty selection',
-	text: caretSample,
-	start: 7,
-	end: 7,
-	mode: 'set'
-});
-
-caretTest({
-	description: 'set/getCaretPosition with small selection',
-	text: caretSample,
-	start: 6,
-	end: 11,
-	mode: 'set'
-});
 
+	caretTest({
+		description: 'set/getCaretPosition with small selection',
+		text: caretSample,
+		start: 6,
+		end: 11,
+		mode: 'set'
+	});
+}( jQuery ) );
diff --git a/tests/qunit/suites/resources/mediawiki.api/mediawiki.api.parse.test.js b/tests/qunit/suites/resources/mediawiki.api/mediawiki.api.parse.test.js
index 3d3f630f60..ec7179e8bc 100644
--- a/tests/qunit/suites/resources/mediawiki.api/mediawiki.api.parse.test.js
+++ b/tests/qunit/suites/resources/mediawiki.api/mediawiki.api.parse.test.js
@@ -1,26 +1,28 @@
-QUnit.module( 'mediawiki.api.parse', QUnit.newMwEnvironment() );
+( function ( mw, $ ) {
+	QUnit.module( 'mediawiki.api.parse', QUnit.newMwEnvironment() );
 
-QUnit.asyncTest( 'Hello world', function ( assert ) {
-	var api;
-	QUnit.expect( 6 );
+	QUnit.asyncTest( 'Hello world', function ( assert ) {
+		var api;
+		QUnit.expect( 6 );
 
-	api = new mw.Api();
+		api = new mw.Api();
 
-	api.parse( "'''Hello world'''" )
-		.done( function ( html ) {
-			// Parse into a document fragment instead of comparing HTML, due to
-			// presence of Tidy influencing whitespace.
-			// Html also contains "NewPP report" comment.
-			var $res = $( '<div>' ).html( html ).children(),
-				res = $res.get( 0 );
-			assert.equal( $res.length, 1, 'Response contains 1 element' );
-			assert.equal( res.nodeName.toLowerCase(), 'p', 'Response is a paragraph' );
-			assert.equal( $res.children().length, 1, 'Response has 1 child element' );
-			assert.equal( $res.children().get( 0 ).nodeName.toLowerCase(), 'b', 'Child element is a bold tag' );
-			// Trim since Tidy may or may not mess with the spacing here
-			assert.equal( $.trim( $res.text() ), 'Hello world', 'Response contains given text' );
-			assert.equal( $res.find( 'b' ).text(), 'Hello world', 'Bold tag wraps the entire, same, text' );
+		api.parse( '\'\'\'Hello world\'\'\'' )
+			.done( function ( html ) {
+				// Parse into a document fragment instead of comparing HTML, due to
+				// presence of Tidy influencing whitespace.
+				// Html also contains "NewPP report" comment.
+				var $res = $( '<div>' ).html( html ).children(),
+					res = $res.get( 0 );
+				assert.equal( $res.length, 1, 'Response contains 1 element' );
+				assert.equal( res.nodeName.toLowerCase(), 'p', 'Response is a paragraph' );
+				assert.equal( $res.children().length, 1, 'Response has 1 child element' );
+				assert.equal( $res.children().get( 0 ).nodeName.toLowerCase(), 'b', 'Child element is a bold tag' );
+				// Trim since Tidy may or may not mess with the spacing here
+				assert.equal( $.trim( $res.text() ), 'Hello world', 'Response contains given text' );
+				assert.equal( $res.find( 'b' ).text(), 'Hello world', 'Bold tag wraps the entire, same, text' );
 
-			QUnit.start();
-		});
-});
+				QUnit.start();
+			});
+	});
+}( mediaWiki, jQuery ) );
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 79bd730654..50bbfd7c7e 100644
--- a/tests/qunit/suites/resources/mediawiki.api/mediawiki.api.test.js
+++ b/tests/qunit/suites/resources/mediawiki.api/mediawiki.api.test.js
@@ -1,59 +1,61 @@
-QUnit.module( 'mediawiki.api', QUnit.newMwEnvironment() );
+( function ( mw ) {
+	QUnit.module( 'mediawiki.api', QUnit.newMwEnvironment() );
+
+	QUnit.asyncTest( 'Basic functionality', function ( assert ) {
+		var api, d1, d2, d3;
+		QUnit.expect( 3 );
+
+		api = new mw.Api();
+
+		d1 = api.get( {} )
+			.done( function ( data ) {
+				assert.deepEqual( data, [], 'If request succeeds without errors, resolve deferred' );
+			});
+
+		d2 = api.get({
+				action: 'doesntexist'
+			})
+			.fail( function ( errorCode ) {
+				assert.equal( errorCode, 'unknown_action', 'API error (e.g. "unknown_action") should reject the deferred' );
+			});
+
+		d3 = api.post( {} )
+			.done( function ( data ) {
+				assert.deepEqual( data, [], 'Simple POST request' );
+			});
+
+		// After all are completed, continue the test suite.
+		QUnit.whenPromisesComplete( d1, d2, d3 ).always( function () {
+			QUnit.start();
+		});
+	});
 
-QUnit.asyncTest( 'Basic functionality', function ( assert ) {
-	var api, d1, d2, d3;
-	QUnit.expect( 3 );
+	QUnit.asyncTest( 'Deprecated callback methods', function ( assert ) {
+		var api, d1, d2, d3;
+		QUnit.expect( 3 );
 
-	api = new mw.Api();
+		api = new mw.Api();
 
-	d1 = api.get( {} )
-		.done( function ( data ) {
-			assert.deepEqual( data, [], 'If request succeeds without errors, resolve deferred' );
+		d1 = api.get( {}, function () {
+			assert.ok( true, 'Function argument treated as success callback.' );
 		});
 
-	d2 = api.get({
-			action: 'doesntexist'
-		})
-		.fail( function ( errorCode, details ) {
-			assert.equal( errorCode, 'unknown_action', 'API error (e.g. "unknown_action") should reject the deferred' );
+		d2 = api.get( {}, {
+			ok: function () {
+				assert.ok( true, '"ok" property treated as success callback.' );
+			}
 		});
 
-	d3 = api.post( {} )
-		.done( function ( data ) {
-			assert.deepEqual( data, [], 'Simple POST request' );
+		d3 = api.get({
+				action: 'doesntexist'
+			}, {
+			err: function () {
+				assert.ok( true, '"err" property treated as error callback.' );
+			}
 		});
 
-	// After all are completed, continue the test suite.
-	QUnit.whenPromisesComplete( d1, d2, d3 ).always( function () {
-		QUnit.start();
-	});
-});
-
-QUnit.asyncTest( 'Deprecated callback methods', function ( assert ) {
-	var api, d1, d2, d3;
-	QUnit.expect( 3 );
-
-	api = new mw.Api();
-
-	d1 = api.get( {}, function () {
-		assert.ok( true, 'Function argument treated as success callback.' );
-	});
-
-	d2 = api.get( {}, {
-		ok: function ( data ) {
-			assert.ok( true, '"ok" property treated as success callback.' );
-		}
-	});
-
-	d3 = api.get({
-			action: 'doesntexist'
-		}, {
-		err: function ( data ) {
-			assert.ok( true, '"err" property treated as error callback.' );
-		}
-	});
-
-	QUnit.whenPromisesComplete( d1, d2, d3 ).always( function () {
-		QUnit.start();
+		QUnit.whenPromisesComplete( d1, d2, d3 ).always( function () {
+			QUnit.start();
+		});
 	});
-});
+}( mediaWiki ) );
diff --git a/tests/qunit/suites/resources/mediawiki.special/mediawiki.special.recentchanges.test.js b/tests/qunit/suites/resources/mediawiki.special/mediawiki.special.recentchanges.test.js
index 7fe7baf861..d7b0cb71c0 100644
--- a/tests/qunit/suites/resources/mediawiki.special/mediawiki.special.recentchanges.test.js
+++ b/tests/qunit/suites/resources/mediawiki.special/mediawiki.special.recentchanges.test.js
@@ -1,62 +1,65 @@
-QUnit.module( 'mediawiki.special.recentchanges', QUnit.newMwEnvironment() );
-
-// TODO: verify checkboxes == [ 'nsassociated', 'nsinvert' ]
-
-QUnit.test( '"all" namespace disable checkboxes', function ( assert ) {
-
-	// from Special:Recentchanges
-	var select =
-	'<select id="namespace" name="namespace" class="namespaceselector">'
-	+ '<option value="" selected="selected">all</option>'
-	+ '<option value="0">(Main)</option>'
-	+ '<option value="1">Talk</option>'
-	+ '<option value="2">User</option>'
-	+ '<option value="3">User talk</option>'
-	+ '<option value="4">ProjectName</option>'
-	+ '<option value="5">ProjectName talk</option>'
-	+ '</select>'
-	+ '<input name="invert" type="checkbox" value="1" id="nsinvert" title="no title" />'
-	+ '<label for="nsinvert" title="no title">Invert selection</label>'
-	+ '<input name="associated" type="checkbox" value="1" id="nsassociated" title="no title" />'
-	+ '<label for="nsassociated" title="no title">Associated namespace</label>'
-	+ '<input type="submit" value="Go" />'
-	+ '<input type="hidden" value="Special:RecentChanges" name="title" />'
-	;
-
-	var $env = $( '<div>' ).html( select ).appendTo( 'body' );
-
-	// TODO abstract the double strictEquals
-
-	// At first checkboxes are enabled
-	assert.strictEqual( $( '#nsinvert' ).prop( 'disabled' ), false );
-	assert.strictEqual( $( '#nsassociated' ).prop( 'disabled' ), false );
-
-	// Initiate the recentchanges module
-	mw.special.recentchanges.init();
-
-	// By default
-	assert.strictEqual( $( '#nsinvert' ).prop( 'disabled' ), true );
-	assert.strictEqual( $( '#nsassociated' ).prop( 'disabled' ), true );
-
-	// select second option...
-	var $options = $( '#namespace' ).find( 'option' );
-	$options.eq(0).removeProp( 'selected' );
-	$options.eq(1).prop( 'selected', true );
-	$( '#namespace' ).change();
-
-	// ... and checkboxes should be enabled again
-	assert.strictEqual( $( '#nsinvert' ).prop( 'disabled' ), false );
-	assert.strictEqual( $( '#nsassociated' ).prop( 'disabled' ), false );
-
-	// select first option ( 'all' namespace)...
-	$options.eq(1).removeProp( 'selected' );
-	$options.eq(0).prop( 'selected', true );
-	$( '#namespace' ).change();
-
-	// ... and checkboxes should now be disabled
-	assert.strictEqual( $( '#nsinvert' ).prop( 'disabled' ), true );
-	assert.strictEqual( $( '#nsassociated' ).prop( 'disabled' ), true );
-
-	// DOM cleanup
-	$env.remove();
-});
+( function ( mw, $ ) {
+	QUnit.module( 'mediawiki.special.recentchanges', QUnit.newMwEnvironment() );
+
+	// TODO: verify checkboxes == [ 'nsassociated', 'nsinvert' ]
+
+	QUnit.test( '"all" namespace disable checkboxes', function ( assert ) {
+		var selectHtml, $env, $options;
+
+		// from Special:Recentchanges
+		selectHtml =
+		'<select id="namespace" name="namespace" class="namespaceselector">'
+		+ '<option value="" selected="selected">all</option>'
+		+ '<option value="0">(Main)</option>'
+		+ '<option value="1">Talk</option>'
+		+ '<option value="2">User</option>'
+		+ '<option value="3">User talk</option>'
+		+ '<option value="4">ProjectName</option>'
+		+ '<option value="5">ProjectName talk</option>'
+		+ '</select>'
+		+ '<input name="invert" type="checkbox" value="1" id="nsinvert" title="no title" />'
+		+ '<label for="nsinvert" title="no title">Invert selection</label>'
+		+ '<input name="associated" type="checkbox" value="1" id="nsassociated" title="no title" />'
+		+ '<label for="nsassociated" title="no title">Associated namespace</label>'
+		+ '<input type="submit" value="Go" />'
+		+ '<input type="hidden" value="Special:RecentChanges" name="title" />'
+		;
+
+		$env = $( '<div>' ).html( selectHtml ).appendTo( 'body' );
+
+		// TODO abstract the double strictEquals
+
+		// At first checkboxes are enabled
+		assert.strictEqual( $( '#nsinvert' ).prop( 'disabled' ), false );
+		assert.strictEqual( $( '#nsassociated' ).prop( 'disabled' ), false );
+
+		// Initiate the recentchanges module
+		mw.special.recentchanges.init();
+
+		// By default
+		assert.strictEqual( $( '#nsinvert' ).prop( 'disabled' ), true );
+		assert.strictEqual( $( '#nsassociated' ).prop( 'disabled' ), true );
+
+		// select second option...
+		$options = $( '#namespace' ).find( 'option' );
+		$options.eq(0).removeProp( 'selected' );
+		$options.eq(1).prop( 'selected', true );
+		$( '#namespace' ).change();
+
+		// ... and checkboxes should be enabled again
+		assert.strictEqual( $( '#nsinvert' ).prop( 'disabled' ), false );
+		assert.strictEqual( $( '#nsassociated' ).prop( 'disabled' ), false );
+
+		// select first option ( 'all' namespace)...
+		$options.eq(1).removeProp( 'selected' );
+		$options.eq(0).prop( 'selected', true );
+		$( '#namespace' ).change();
+
+		// ... and checkboxes should now be disabled
+		assert.strictEqual( $( '#nsinvert' ).prop( 'disabled' ), true );
+		assert.strictEqual( $( '#nsassociated' ).prop( 'disabled' ), true );
+
+		// DOM cleanup
+		$env.remove();
+	});
+}( mediaWiki, jQuery ) );
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.Title.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.Title.test.js
index a736e121b0..52f05388fc 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.Title.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.Title.test.js
@@ -1,58 +1,59 @@
-( function () {
+( function ( mw ) {
 
 // mw.Title relies on these three config vars
 // Restore them after each test run
 var config = {
-	"wgFormattedNamespaces": {
-		"-2": "Media",
-		"-1": "Special",
-		"0": "",
-		"1": "Talk",
-		"2": "User",
-		"3": "User talk",
-		"4": "Wikipedia",
-		"5": "Wikipedia talk",
-		"6": "File",
-		"7": "File talk",
-		"8": "MediaWiki",
-		"9": "MediaWiki talk",
-		"10": "Template",
-		"11": "Template talk",
-		"12": "Help",
-		"13": "Help talk",
-		"14": "Category",
-		"15": "Category talk",
+	wgFormattedNamespaces: {
+		'-2': 'Media',
+		'-1': 'Special',
+		0: '',
+		1: 'Talk',
+		2: 'User',
+		3: 'User talk',
+		4: 'Wikipedia',
+		5: 'Wikipedia talk',
+		6: 'File',
+		7: 'File talk',
+		8: 'MediaWiki',
+		9: 'MediaWiki talk',
+		10: 'Template',
+		11: 'Template talk',
+		12: 'Help',
+		13: 'Help talk',
+		14: 'Category',
+		15: 'Category talk',
 		// testing custom / localized namespace
-		"100": "Penguins"
+		100: 'Penguins'
 	},
-	"wgNamespaceIds": {
-		"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,
+	wgNamespaceIds: {
+		/*jshint camelcase: false */
+		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,
 		/* testing custom / alias */
-		"penguins": 100,
-		"antarctic_waterfowl": 100
+		penguins: 100,
+		antarctic_waterfowl: 100
 	},
-	"wgCaseSensitiveNamespaces": []
+	wgCaseSensitiveNamespaces: []
 };
 
 QUnit.module( 'mediawiki.Title', QUnit.newMwEnvironment({ config: config }) );
@@ -78,7 +79,7 @@ QUnit.test( 'Transformation', 8, function ( assert ) {
 
 	title = new mw.Title( '   MediaWiki:  Foo   bar   .js   ' );
 	// Don't ask why, it's the way the backend works. One space is kept of each set
-	assert.equal( title.getName(), 'Foo_bar_.js', "Merge multiple spaces to a single space." );
+	assert.equal( title.getName(), 'Foo_bar_.js', 'Merge multiple spaces to a single space.' );
 });
 
 QUnit.test( 'Main text for filename', 8, function ( assert ) {
@@ -116,7 +117,7 @@ QUnit.test( 'Namespace detection and conversion', 6, function ( assert ) {
 
 QUnit.test( 'Throw error on invalid title', 1, function ( assert ) {
 	assert.throws(function () {
-		var title = new mw.Title( '' );
+		return new mw.Title( '' );
 	}, 'Throw error on empty string' );
 });
 
@@ -197,4 +198,4 @@ QUnit.test( 'getUrl', 2, function ( assert ) {
 	assert.equal( title.getUrl(), '/wiki/User_talk:John_Doe', 'Escaping in title and namespace for urls' );
 });
 
-}() );
\ No newline at end of file
+}( mediaWiki ) );
\ No newline at end of file
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.Uri.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.Uri.test.js
index b2026c1b56..f9927f0fe9 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.Uri.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.Uri.test.js
@@ -1,388 +1,390 @@
-QUnit.module( 'mediawiki.Uri', QUnit.newMwEnvironment({
-	setup: function () {
-		this.mwUriOrg = mw.Uri;
-		mw.Uri = mw.UriRelative( 'http://example.org/w/index.php' );
-	},
-	teardown: function () {
-		mw.Uri = this.mwUriOrg;
-		delete this.mwUriOrg;
-	}
-}) );
-
-$.each( [true, false], function ( i, strictMode ) {
-	QUnit.test( 'Basic mw.Uri object test in ' + ( strictMode ? '' : 'non-' ) + 'strict mode for a simple HTTP URI', 2, function ( assert ) {
-		var uriString, uri;
-		uriString = 'http://www.ietf.org/rfc/rfc2396.txt';
-		uri = new mw.Uri( uriString, {
-			strictMode: strictMode
+( function ( mw, $ ) {
+	QUnit.module( 'mediawiki.Uri', QUnit.newMwEnvironment({
+		setup: function () {
+			this.mwUriOrg = mw.Uri;
+			mw.Uri = mw.UriRelative( 'http://example.org/w/index.php' );
+		},
+		teardown: function () {
+			mw.Uri = this.mwUriOrg;
+			delete this.mwUriOrg;
+		}
+	}) );
+
+	$.each( [true, false], function ( i, strictMode ) {
+		QUnit.test( 'Basic mw.Uri object test in ' + ( strictMode ? '' : 'non-' ) + 'strict mode for a simple HTTP URI', 2, function ( assert ) {
+			var uriString, uri;
+			uriString = 'http://www.ietf.org/rfc/rfc2396.txt';
+			uri = new mw.Uri( uriString, {
+				strictMode: strictMode
+			});
+
+			assert.deepEqual(
+				{
+					protocol: uri.protocol,
+					host: uri.host,
+					port: uri.port,
+					path: uri.path,
+					query: uri.query,
+					fragment: uri.fragment
+				}, {
+					protocol: 'http',
+					host: 'www.ietf.org',
+					port: undefined,
+					path: '/rfc/rfc2396.txt',
+					query: {},
+					fragment: undefined
+				},
+				'basic object properties'
+			);
+
+			assert.deepEqual(
+				{
+					userInfo: uri.getUserInfo(),
+					authority: uri.getAuthority(),
+					hostPort: uri.getHostPort(),
+					queryString: uri.getQueryString(),
+					relativePath: uri.getRelativePath(),
+					toString: uri.toString()
+				},
+				{
+					userInfo: '',
+					authority: 'www.ietf.org',
+					hostPort: 'www.ietf.org',
+					queryString: '',
+					relativePath: '/rfc/rfc2396.txt',
+					toString: uriString
+				},
+				'construct composite components of URI on request'
+			);
+
 		});
+	});
+
+	QUnit.test( 'Parse an ftp URI correctly with user and password', 1, function ( assert ) {
+		var uri = new mw.Uri( 'ftp://usr:pwd@192.0.2.16/' );
 
 		assert.deepEqual(
 			{
 				protocol: uri.protocol,
+				user: uri.user,
+				password: uri.password,
 				host: uri.host,
 				port: uri.port,
 				path: uri.path,
 				query: uri.query,
 				fragment: uri.fragment
-			}, {
-				protocol: 'http',
-				host: 'www.ietf.org',
+			},
+			{
+				protocol: 'ftp',
+				user: 'usr',
+				password: 'pwd',
+				host: '192.0.2.16',
 				port: undefined,
-				path: '/rfc/rfc2396.txt',
+				path: '/',
 				query: {},
 				fragment: undefined
 			},
 			'basic object properties'
 		);
+	} );
+
+	QUnit.test( 'Parse a uri with simple querystring', 1, function ( assert ) {
+		var uri = new mw.Uri( 'http://www.google.com/?q=uri' );
 
 		assert.deepEqual(
 			{
-				userInfo: uri.getUserInfo(),
-				authority: uri.getAuthority(),
-				hostPort: uri.getHostPort(),
-				queryString: uri.getQueryString(),
-				relativePath: uri.getRelativePath(),
-				toString: uri.toString()
+				protocol: uri.protocol,
+				host: uri.host,
+				port: uri.port,
+				path: uri.path,
+				query: uri.query,
+				fragment: uri.fragment,
+				queryString: uri.getQueryString()
 			},
 			{
-				userInfo: '',
-				authority: 'www.ietf.org',
-				hostPort: 'www.ietf.org',
-				queryString: '',
-				relativePath: '/rfc/rfc2396.txt',
-				toString: uriString
+				protocol: 'http',
+				host: 'www.google.com',
+				port: undefined,
+				path: '/',
+				query: { q: 'uri' },
+				fragment: undefined,
+				queryString: 'q=uri'
 			},
-			'construct composite components of URI on request'
+			'basic object properties'
 		);
+	} );
 
-	});
-});
-
-QUnit.test( 'Parse an ftp URI correctly with user and password', 1, function ( assert ) {
-	var uri = new mw.Uri( 'ftp://usr:pwd@192.0.2.16/' );
-
-	assert.deepEqual(
-		{
-			protocol: uri.protocol,
-			user: uri.user,
-			password: uri.password,
-			host: uri.host,
-			port: uri.port,
-			path: uri.path,
-			query: uri.query,
-			fragment: uri.fragment
-		},
-		{
-			protocol: 'ftp',
-			user: 'usr',
-			password: 'pwd',
-			host: '192.0.2.16',
-			port: undefined,
-			path: '/',
-			query: {},
-			fragment: undefined
-		},
-		'basic object properties'
-	);
-} );
-
-QUnit.test( 'Parse a uri with simple querystring', 1, function ( assert ) {
-	var uri = new mw.Uri( 'http://www.google.com/?q=uri' );
-
-	assert.deepEqual(
-		{
-			protocol: uri.protocol,
-			host: uri.host,
-			port: uri.port,
-			path: uri.path,
-			query: uri.query,
-			fragment: uri.fragment,
-			queryString: uri.getQueryString()
-		},
-		{
-			protocol: 'http',
-			host: 'www.google.com',
-			port: undefined,
-			path: '/',
-			query: { q: 'uri' },
-			fragment: undefined,
-			queryString: 'q=uri'
-		},
-		'basic object properties'
-	);
-} );
+	QUnit.test( 'Handle multiple query parameter (overrideKeys on)', 5, function ( assert ) {
+		var uri = new mw.Uri( 'http://www.example.com/dir/?m=foo&m=bar&n=1', {
+			overrideKeys: true
+		});
 
-QUnit.test( 'Handle multiple query parameter (overrideKeys on)', 5, function ( assert ) {
-	var uri = new mw.Uri( 'http://www.example.com/dir/?m=foo&m=bar&n=1', {
-		overrideKeys: true
-	});
+		assert.equal( uri.query.n, '1', 'multiple parameters are parsed' );
+		assert.equal( uri.query.m, 'bar', 'last key overrides earlier keys' );
 
-	assert.equal( uri.query.n, '1', 'multiple parameters are parsed' );
-	assert.equal( uri.query.m, 'bar', 'last key overrides earlier keys' );
+		uri.query.n = [ 'x', 'y', 'z' ];
 
-	uri.query.n = [ 'x', 'y', 'z' ];
+		// Verify parts and total length instead of entire string because order
+		// of iteration can vary.
+		assert.ok( uri.toString().indexOf( 'm=bar' ), 'toString preserves other values' );
+		assert.ok( uri.toString().indexOf( 'n=x&n=y&n=z' ), 'toString parameter includes all values of an array query parameter' );
+		assert.equal( uri.toString().length, 'http://www.example.com/dir/?m=bar&n=x&n=y&n=z'.length, 'toString matches expected string' );
+	} );
 
-	// Verify parts and total length instead of entire string because order
-	// of iteration can vary.
-	assert.ok( uri.toString().indexOf( 'm=bar' ), 'toString preserves other values' );
-	assert.ok( uri.toString().indexOf( 'n=x&n=y&n=z' ), 'toString parameter includes all values of an array query parameter' );
-	assert.equal( uri.toString().length, 'http://www.example.com/dir/?m=bar&n=x&n=y&n=z'.length, 'toString matches expected string' );
-} );
+	QUnit.test( 'Handle multiple query parameter (overrideKeys off)', 9, function ( assert ) {
+		var uri = new mw.Uri( 'http://www.example.com/dir/?m=foo&m=bar&n=1', {
+			overrideKeys: false
+		});
 
-QUnit.test( 'Handle multiple query parameter (overrideKeys off)', 9, function ( assert ) {
-	var uri = new mw.Uri( 'http://www.example.com/dir/?m=foo&m=bar&n=1', {
-		overrideKeys: false
-	});
+		// Strict comparison so that types are also verified (n should be string '1')
+		assert.strictEqual( uri.query.m.length, 2, 'multi-value query should be an array with 2 items' );
+		assert.strictEqual( uri.query.m[0], 'foo', 'order and value is correct' );
+		assert.strictEqual( uri.query.m[1], 'bar', 'order and value is correct' );
+		assert.strictEqual( uri.query.n, '1', 'n=1 is parsed with the correct value of the expected type' );
 
-	// Strict comparison so that types are also verified (n should be string '1')
-	assert.strictEqual( uri.query.m.length, 2, 'multi-value query should be an array with 2 items' );
-	assert.strictEqual( uri.query.m[0], 'foo', 'order and value is correct' );
-	assert.strictEqual( uri.query.m[1], 'bar', 'order and value is correct' );
-	assert.strictEqual( uri.query.n, '1', 'n=1 is parsed with the correct value of the expected type' );
-
-	// Change query values
-	uri.query.n = [ 'x', 'y', 'z' ];
-
-	// Verify parts and total length instead of entire string because order
-	// of iteration can vary.
-	assert.ok( uri.toString().indexOf( 'm=foo&m=bar' ) >= 0, 'toString preserves other values' );
-	assert.ok( uri.toString().indexOf( 'n=x&n=y&n=z' ) >= 0, 'toString parameter includes all values of an array query parameter' );
-	assert.equal( uri.toString().length, 'http://www.example.com/dir/?m=foo&m=bar&n=x&n=y&n=z'.length, 'toString matches expected string' );
-
-	// Remove query values
-	uri.query.m.splice( 0, 1 );
-	delete uri.query.n;
-
-	assert.equal( uri.toString(), 'http://www.example.com/dir/?m=bar', 'deletion properties' );
-
-	// Remove more query values, leaving an empty array
-	uri.query.m.splice( 0, 1 );
-	assert.equal( uri.toString(), 'http://www.example.com/dir/', 'empty array value is ommitted' );
-} );
-
-QUnit.test( 'All-dressed URI with everything', 11, function ( assert ) {
-	var uri, queryString, relativePath;
-
-	uri = new mw.Uri( 'http://auth@www.example.com:81/dir/dir.2/index.htm?q1=0&&test1&test2=value+%28escaped%29#top' );
-
-	assert.deepEqual(
-		{
-			protocol: uri.protocol,
-			user: uri.user,
-			password: uri.password,
-			host: uri.host,
-			port: uri.port,
-			path: uri.path,
-			query: uri.query,
-			fragment: uri.fragment
-		},
-		{
-			protocol: 'http',
-			user: 'auth',
-			password: undefined,
-			host: 'www.example.com',
-			port: '81',
-			path: '/dir/dir.2/index.htm',
-			query: { q1: '0', test1: null, test2: 'value (escaped)' },
-			fragment: 'top'
-		},
-		'basic object properties'
-	);
+		// Change query values
+		uri.query.n = [ 'x', 'y', 'z' ];
 
-	assert.equal( uri.getUserInfo(), 'auth', 'user info' );
+		// Verify parts and total length instead of entire string because order
+		// of iteration can vary.
+		assert.ok( uri.toString().indexOf( 'm=foo&m=bar' ) >= 0, 'toString preserves other values' );
+		assert.ok( uri.toString().indexOf( 'n=x&n=y&n=z' ) >= 0, 'toString parameter includes all values of an array query parameter' );
+		assert.equal( uri.toString().length, 'http://www.example.com/dir/?m=foo&m=bar&n=x&n=y&n=z'.length, 'toString matches expected string' );
 
-	assert.equal( uri.getAuthority(), 'auth@www.example.com:81', 'authority equal to auth@hostport' );
+		// Remove query values
+		uri.query.m.splice( 0, 1 );
+		delete uri.query.n;
 
-	assert.equal( uri.getHostPort(), 'www.example.com:81', 'hostport equal to host:port' );
+		assert.equal( uri.toString(), 'http://www.example.com/dir/?m=bar', 'deletion properties' );
 
-	queryString = uri.getQueryString();
-	assert.ok( queryString.indexOf( 'q1=0' ) >= 0, 'query param with numbers' );
-	assert.ok( queryString.indexOf( 'test1' ) >= 0, 'query param with null value is included' );
-	assert.ok( queryString.indexOf( 'test1=' ) === -1, 'query param with null value does not generate equals sign' );
-	assert.ok( queryString.indexOf( 'test2=value+%28escaped%29' ) >= 0, 'query param is url escaped' );
+		// Remove more query values, leaving an empty array
+		uri.query.m.splice( 0, 1 );
+		assert.equal( uri.toString(), 'http://www.example.com/dir/', 'empty array value is ommitted' );
+	} );
 
-	relativePath = uri.getRelativePath();
-	assert.ok( relativePath.indexOf( uri.path ) >= 0, 'path in relative path' );
-	assert.ok( relativePath.indexOf( uri.getQueryString() ) >= 0, 'query string in relative path' );
-	assert.ok( relativePath.indexOf( uri.fragment ) >= 0, 'fragement in relative path' );
-} );
+	QUnit.test( 'All-dressed URI with everything', 11, function ( assert ) {
+		var uri, queryString, relativePath;
 
-QUnit.test( 'Cloning', 6, function ( assert ) {
-	var original, clone;
+		uri = new mw.Uri( 'http://auth@www.example.com:81/dir/dir.2/index.htm?q1=0&&test1&test2=value+%28escaped%29#top' );
 
-	original = new mw.Uri( 'http://foo.example.org/index.php?one=1&two=2' );
-	clone = original.clone();
+		assert.deepEqual(
+			{
+				protocol: uri.protocol,
+				user: uri.user,
+				password: uri.password,
+				host: uri.host,
+				port: uri.port,
+				path: uri.path,
+				query: uri.query,
+				fragment: uri.fragment
+			},
+			{
+				protocol: 'http',
+				user: 'auth',
+				password: undefined,
+				host: 'www.example.com',
+				port: '81',
+				path: '/dir/dir.2/index.htm',
+				query: { q1: '0', test1: null, test2: 'value (escaped)' },
+				fragment: 'top'
+			},
+			'basic object properties'
+		);
 
-	assert.deepEqual( clone, original, 'clone has equivalent properties' );
-	assert.equal( original.toString(), clone.toString(), 'toString matches original' );
+		assert.equal( uri.getUserInfo(), 'auth', 'user info' );
 
-	assert.notStrictEqual( clone, original, 'clone is a different object when compared by reference' );
+		assert.equal( uri.getAuthority(), 'auth@www.example.com:81', 'authority equal to auth@hostport' );
 
-	clone.host = 'bar.example.org';
-	assert.notEqual( original.host, clone.host, 'manipulating clone did not effect original' );
-	assert.notEqual( original.toString(), clone.toString(), 'Stringified url no longer matches original' );
+		assert.equal( uri.getHostPort(), 'www.example.com:81', 'hostport equal to host:port' );
 
-	clone.query.three = 3;
+		queryString = uri.getQueryString();
+		assert.ok( queryString.indexOf( 'q1=0' ) >= 0, 'query param with numbers' );
+		assert.ok( queryString.indexOf( 'test1' ) >= 0, 'query param with null value is included' );
+		assert.ok( queryString.indexOf( 'test1=' ) === -1, 'query param with null value does not generate equals sign' );
+		assert.ok( queryString.indexOf( 'test2=value+%28escaped%29' ) >= 0, 'query param is url escaped' );
 
-	assert.deepEqual(
-		original.query,
-		{ 'one': '1', 'two': '2' },
-		'Properties is deep cloned (bug 37708)'
-	);
-} );
+		relativePath = uri.getRelativePath();
+		assert.ok( relativePath.indexOf( uri.path ) >= 0, 'path in relative path' );
+		assert.ok( relativePath.indexOf( uri.getQueryString() ) >= 0, 'query string in relative path' );
+		assert.ok( relativePath.indexOf( uri.fragment ) >= 0, 'fragement in relative path' );
+	} );
 
-QUnit.test( 'Constructing mw.Uri from plain object', 3, function ( assert ) {
-	var uri = new mw.Uri({
-		protocol: 'http',
-		host: 'www.foo.local',
-		path: '/this'
-	});
-	assert.equal( uri.toString(), 'http://www.foo.local/this', 'Basic properties' );
-
-	uri = new mw.Uri({
-		protocol: 'http',
-		host: 'www.foo.local',
-		path: '/this',
-		query: { hi: 'there' },
-		fragment: 'blah'
-	});
-	assert.equal( uri.toString(), 'http://www.foo.local/this?hi=there#blah', 'More complex properties' );
+	QUnit.test( 'Cloning', 6, function ( assert ) {
+		var original, clone;
 
-	assert.throws(
-		function () {
-			var uri = new mw.Uri({
-				protocol: 'http',
-				host: 'www.foo.local'
-			});
-		},
-		function ( e ) {
-			return e.message === 'Bad constructor arguments';
-		},
-		'Construction failed when missing required properties'
-	);
-} );
+		original = new mw.Uri( 'http://foo.example.org/index.php?one=1&two=2' );
+		clone = original.clone();
 
-QUnit.test( 'Manipulate properties', 8, function ( assert ) {
-	var uriBase, uri;
+		assert.deepEqual( clone, original, 'clone has equivalent properties' );
+		assert.equal( original.toString(), clone.toString(), 'toString matches original' );
 
-	uriBase = new mw.Uri( 'http://en.wiki.local/w/api.php' );
+		assert.notStrictEqual( clone, original, 'clone is a different object when compared by reference' );
 
-	uri = uriBase.clone();
-	uri.fragment = 'frag';
-	assert.equal( uri.toString(), 'http://en.wiki.local/w/api.php#frag', 'add a fragment' );
+		clone.host = 'bar.example.org';
+		assert.notEqual( original.host, clone.host, 'manipulating clone did not effect original' );
+		assert.notEqual( original.toString(), clone.toString(), 'Stringified url no longer matches original' );
 
-	uri = uriBase.clone();
-	uri.host = 'fr.wiki.local';
-	uri.port = '8080';
-	assert.equal( uri.toString(), 'http://fr.wiki.local:8080/w/api.php', 'change host and port' );
+		clone.query.three = 3;
 
-	uri = uriBase.clone();
-	uri.query.foo = 'bar';
-	assert.equal( uri.toString(), 'http://en.wiki.local/w/api.php?foo=bar', 'add query arguments' );
+		assert.deepEqual(
+			original.query,
+			{ 'one': '1', 'two': '2' },
+			'Properties is deep cloned (bug 37708)'
+		);
+	} );
 
-	delete uri.query.foo;
-	assert.equal( uri.toString(), 'http://en.wiki.local/w/api.php', 'delete query arguments' );
+	QUnit.test( 'Constructing mw.Uri from plain object', 3, function ( assert ) {
+		var uri = new mw.Uri({
+			protocol: 'http',
+			host: 'www.foo.local',
+			path: '/this'
+		});
+		assert.equal( uri.toString(), 'http://www.foo.local/this', 'Basic properties' );
 
-	uri = uriBase.clone();
-	uri.query.foo = 'bar';
-	assert.equal( uri.toString(), 'http://en.wiki.local/w/api.php?foo=bar', 'extend query arguments' );
-	uri.extend({
-		foo: 'quux',
-		pif: 'paf'
-	});
-	assert.ok( uri.toString().indexOf( 'foo=quux' ) >= 0, 'extend query arguments' );
-	assert.ok( uri.toString().indexOf( 'foo=bar' ) === -1, 'extend query arguments' );
-	assert.ok( uri.toString().indexOf( 'pif=paf' ) >= 0 , 'extend query arguments' );
-} );
+		uri = new mw.Uri({
+			protocol: 'http',
+			host: 'www.foo.local',
+			path: '/this',
+			query: { hi: 'there' },
+			fragment: 'blah'
+		});
+		assert.equal( uri.toString(), 'http://www.foo.local/this?hi=there#blah', 'More complex properties' );
+
+		assert.throws(
+			function () {
+				return new mw.Uri({
+					protocol: 'http',
+					host: 'www.foo.local'
+				});
+			},
+			function ( e ) {
+				return e.message === 'Bad constructor arguments';
+			},
+			'Construction failed when missing required properties'
+		);
+	} );
 
-QUnit.test( 'Handle protocol-relative URLs', 5, function ( assert ) {
-	var UriRel, uri;
+	QUnit.test( 'Manipulate properties', 8, function ( assert ) {
+		var uriBase, uri;
 
-	UriRel = mw.UriRelative( 'glork://en.wiki.local/foo.php' );
+		uriBase = new mw.Uri( 'http://en.wiki.local/w/api.php' );
 
-	uri = new UriRel( '//en.wiki.local/w/api.php' );
-	assert.equal( uri.protocol, 'glork', 'create protocol-relative URLs with same protocol as document' );
+		uri = uriBase.clone();
+		uri.fragment = 'frag';
+		assert.equal( uri.toString(), 'http://en.wiki.local/w/api.php#frag', 'add a fragment' );
 
-	uri = new UriRel( '/foo.com' );
-	assert.equal( uri.toString(), 'glork://en.wiki.local/foo.com', 'handle absolute paths by supplying protocol and host from document in loose mode' );
+		uri = uriBase.clone();
+		uri.host = 'fr.wiki.local';
+		uri.port = '8080';
+		assert.equal( uri.toString(), 'http://fr.wiki.local:8080/w/api.php', 'change host and port' );
 
-	uri = new UriRel( 'http:/foo.com' );
-	assert.equal( uri.toString(), 'http://en.wiki.local/foo.com', 'handle absolute paths by supplying host from document in loose mode' );
+		uri = uriBase.clone();
+		uri.query.foo = 'bar';
+		assert.equal( uri.toString(), 'http://en.wiki.local/w/api.php?foo=bar', 'add query arguments' );
 
-	uri = new UriRel( '/foo.com', true );
-	assert.equal( uri.toString(), 'glork://en.wiki.local/foo.com', 'handle absolute paths by supplying protocol and host from document in strict mode' );
+		delete uri.query.foo;
+		assert.equal( uri.toString(), 'http://en.wiki.local/w/api.php', 'delete query arguments' );
 
-	uri = new UriRel( 'http:/foo.com', true );
-	assert.equal( uri.toString(), 'http://en.wiki.local/foo.com', 'handle absolute paths by supplying host from document in strict mode' );
-} );
+		uri = uriBase.clone();
+		uri.query.foo = 'bar';
+		assert.equal( uri.toString(), 'http://en.wiki.local/w/api.php?foo=bar', 'extend query arguments' );
+		uri.extend({
+			foo: 'quux',
+			pif: 'paf'
+		});
+		assert.ok( uri.toString().indexOf( 'foo=quux' ) >= 0, 'extend query arguments' );
+		assert.ok( uri.toString().indexOf( 'foo=bar' ) === -1, 'extend query arguments' );
+		assert.ok( uri.toString().indexOf( 'pif=paf' ) >= 0 , 'extend query arguments' );
+	} );
 
-QUnit.test( 'Bad calls', 3, function ( assert ) {
-	var uri;
+	QUnit.test( 'Handle protocol-relative URLs', 5, function ( assert ) {
+		var UriRel, uri;
 
-	assert.throws(
-		function () {
-			new mw.Uri( 'glaswegian penguins' );
-		},
-		function ( e ) {
-			return e.message === 'Bad constructor arguments';
-		},
-		'throw error on non-URI as argument to constructor'
-	);
+		UriRel = mw.UriRelative( 'glork://en.wiki.local/foo.php' );
 
-	assert.throws(
-		function () {
-			new mw.Uri( 'foo.com/bar/baz', {
-				strictMode: true
-			});
-		},
-		function ( e ) {
-			return e.message === 'Bad constructor arguments';
-		},
-		'throw error on URI without protocol or // or leading / in strict mode'
-	);
+		uri = new UriRel( '//en.wiki.local/w/api.php' );
+		assert.equal( uri.protocol, 'glork', 'create protocol-relative URLs with same protocol as document' );
+
+		uri = new UriRel( '/foo.com' );
+		assert.equal( uri.toString(), 'glork://en.wiki.local/foo.com', 'handle absolute paths by supplying protocol and host from document in loose mode' );
+
+		uri = new UriRel( 'http:/foo.com' );
+		assert.equal( uri.toString(), 'http://en.wiki.local/foo.com', 'handle absolute paths by supplying host from document in loose mode' );
+
+		uri = new UriRel( '/foo.com', true );
+		assert.equal( uri.toString(), 'glork://en.wiki.local/foo.com', 'handle absolute paths by supplying protocol and host from document in strict mode' );
+
+		uri = new UriRel( 'http:/foo.com', true );
+		assert.equal( uri.toString(), 'http://en.wiki.local/foo.com', 'handle absolute paths by supplying host from document in strict mode' );
+	} );
 
-	uri = new mw.Uri( 'foo.com/bar/baz', {
-		strictMode: false
+	QUnit.test( 'Bad calls', 3, function ( assert ) {
+		var uri;
+
+		assert.throws(
+			function () {
+				return new mw.Uri( 'glaswegian penguins' );
+			},
+			function ( e ) {
+				return e.message === 'Bad constructor arguments';
+			},
+			'throw error on non-URI as argument to constructor'
+		);
+
+		assert.throws(
+			function () {
+				return new mw.Uri( 'foo.com/bar/baz', {
+					strictMode: true
+				});
+			},
+			function ( e ) {
+				return e.message === 'Bad constructor arguments';
+			},
+			'throw error on URI without protocol or // or leading / in strict mode'
+		);
+
+		uri = new mw.Uri( 'foo.com/bar/baz', {
+			strictMode: false
+		});
+		assert.equal( uri.toString(), 'http://foo.com/bar/baz', 'normalize URI without protocol or // in loose mode' );
 	});
-	assert.equal( uri.toString(), 'http://foo.com/bar/baz', 'normalize URI without protocol or // in loose mode' );
-});
 
-QUnit.test( 'bug 35658', 2, function ( assert ) {
-	var testProtocol, testServer, testPort, testPath, UriClass, uri, href;
+	QUnit.test( 'bug 35658', 2, function ( assert ) {
+		var testProtocol, testServer, testPort, testPath, UriClass, uri, href;
 
-	testProtocol = 'https://';
-	testServer = 'foo.example.org';
-	testPort = '3004';
-	testPath = '/!1qy';
+		testProtocol = 'https://';
+		testServer = 'foo.example.org';
+		testPort = '3004';
+		testPath = '/!1qy';
 
-	UriClass = mw.UriRelative( testProtocol + testServer + '/some/path/index.html' );
-	uri = new UriClass( testPath );
-	href = uri.toString();
-	assert.equal( href, testProtocol + testServer + testPath, 'Root-relative URL gets host & protocol supplied' );
+		UriClass = mw.UriRelative( testProtocol + testServer + '/some/path/index.html' );
+		uri = new UriClass( testPath );
+		href = uri.toString();
+		assert.equal( href, testProtocol + testServer + testPath, 'Root-relative URL gets host & protocol supplied' );
 
-	UriClass = mw.UriRelative( testProtocol + testServer + ':' + testPort + '/some/path.php' );
-	uri = new UriClass( testPath );
-	href = uri.toString();
-	assert.equal( href, testProtocol + testServer + ':' + testPort + testPath, 'Root-relative URL gets host, protocol, and port supplied' );
+		UriClass = mw.UriRelative( testProtocol + testServer + ':' + testPort + '/some/path.php' );
+		uri = new UriClass( testPath );
+		href = uri.toString();
+		assert.equal( href, testProtocol + testServer + ':' + testPort + testPath, 'Root-relative URL gets host, protocol, and port supplied' );
 
-} );
+	} );
 
-QUnit.test( 'Constructor falls back to default location', 4, function ( assert ) {
-	var testuri, MyUri, uri;
+	QUnit.test( 'Constructor falls back to default location', 4, function ( assert ) {
+		var testuri, MyUri, uri;
 
-	testuri = 'http://example.org/w/index.php';
-	MyUri = mw.UriRelative( testuri );
+		testuri = 'http://example.org/w/index.php';
+		MyUri = mw.UriRelative( testuri );
 
-	uri = new MyUri();
-	assert.equal( uri.toString(), testuri, 'no arguments' );
+		uri = new MyUri();
+		assert.equal( uri.toString(), testuri, 'no arguments' );
 
-	uri = new MyUri( undefined );
-	assert.equal( uri.toString(), testuri, 'undefined' );
+		uri = new MyUri( undefined );
+		assert.equal( uri.toString(), testuri, 'undefined' );
 
-	uri = new MyUri( null );
-	assert.equal( uri.toString(), testuri, 'null' );
+		uri = new MyUri( null );
+		assert.equal( uri.toString(), testuri, 'null' );
 
-	uri = new MyUri( '' );
-	assert.equal( uri.toString(), testuri, 'empty string' );
-} );
+		uri = new MyUri( '' );
+		assert.equal( uri.toString(), testuri, 'empty string' );
+	} );
+}( mediaWiki, jQuery ) );
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.cldr.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.cldr.test.js
index e2c66685d8..b745fb44c6 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.cldr.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.cldr.test.js
@@ -1,74 +1,76 @@
-QUnit.module( 'mediawiki.cldr', QUnit.newMwEnvironment() );
+( function ( mw, $ ) {
+	QUnit.module( 'mediawiki.cldr', QUnit.newMwEnvironment() );
 
-var pluralTestcases = {
-	/*
-	 * Sample:
-	 * "languagecode" : [
-	 *   [ number, [ "form1", "form2", ... ],  "expected", "description" ]
-	 * ];
-	 */
-	"en": [
-		[ 0, [ "one", "other" ], "other", "English plural test- 0 is other" ],
-		[ 1, [ "one", "other" ], "one", "English plural test- 1 is one" ]
-	],
-	"fa": [
-		[ 0, [ "one", "other" ], "other", "Persian plural test- 0 is other" ],
-		[ 1, [ "one", "other" ], "one", "Persian plural test- 1 is one" ],
-		[ 2, [ "one", "other" ], "other", "Persian plural test- 2 is other" ]
-	],
-	"fr": [
-		[ 0, [ "one", "other" ], "other", "French plural test- 0 is other" ],
-		[ 1, [ "one", "other" ], "one", "French plural test- 1 is one" ]
-	],
-	"hi": [
-		[ 0, [ "one", "other" ], "one", "Hindi plural test- 0 is one" ],
-		[ 1, [ "one", "other" ], "one", "Hindi plural test- 1 is one" ],
-		[ 2, [ "one", "other" ], "other", "Hindi plural test- 2 is other" ]
-	],
-	"he": [
-		[ 0, [ "one", "other" ], "other", "Hebrew plural test- 0 is other" ],
-		[ 1, [ "one", "other" ], "one", "Hebrew plural test- 1 is one" ],
-		[ 2, [ "one", "other" ], "other", "Hebrew plural test- 2 is other with 2 forms" ],
-		[ 2, [ "one", "dual", "other" ], "dual", "Hebrew plural test- 2 is dual with 3 forms" ]
-	],
-	"hu": [
-		[ 0, [ "one", "other" ], "other", "Hungarian plural test- 0 is other" ],
-		[ 1, [ "one", "other" ], "one", "Hungarian plural test- 1 is one" ],
-		[ 2, [ "one", "other" ], "other", "Hungarian plural test- 2 is other" ]
-	],
-	"ar": [
-		[ 0, [ "zero", "one", "two", "few", "many", "other" ], "zero", "Arabic plural test - 0 is zero" ],
-		[ 1, [ "zero", "one", "two", "few", "many", "other" ], "one", "Arabic plural test - 1 is one" ],
-		[ 2, [ "zero", "one", "two", "few", "many", "other" ], "two", "Arabic plural test - 2 is two" ],
-		[ 3, [ "zero", "one", "two", "few", "many", "other" ], "few", "Arabic plural test - 3 is few" ],
-		[ 9, [ "zero", "one", "two", "few", "many", "other" ], "few", "Arabic plural test - 9 is few" ],
-		[ "9", [ "zero", "one", "two", "few", "many", "other" ], "few", "Arabic plural test - 9 is few" ],
-		[ 110, [ "zero", "one", "two", "few", "many", "other" ], "few", "Arabic plural test - 110 is few" ],
-		[ 11, [ "zero", "one", "two", "few", "many", "other" ], "many", "Arabic plural test - 11 is many" ],
-		[ 15, [ "zero", "one", "two", "few", "many", "other" ], "many", "Arabic plural test - 15 is many" ],
-		[ 99, [ "zero", "one", "two", "few", "many", "other" ], "many", "Arabic plural test - 99 is many" ],
-		[ 9999, [ "zero", "one", "two", "few", "many", "other" ], "many", "Arabic plural test - 9999 is many" ],
-		[ 100, [ "zero", "one", "two", "few", "many", "other" ], "other", "Arabic plural test - 100 is other" ],
-		[ 102, [ "zero", "one", "two", "few", "many", "other" ], "other", "Arabic plural test - 102 is other" ],
-		[ 1000, [ "zero", "one", "two", "few", "many", "other" ], "other", "Arabic plural test - 1000 is other" ],
-		[ 1.7, [ "zero", "one", "two", "few", "many", "other" ], "other", "Arabic plural test - 1.7 is other" ]
-	]
-};
+	var pluralTestcases = {
+		/*
+		 * Sample:
+		 * languagecode : [
+		 *   [ number, [ 'form1', 'form2', ... ],  'expected', 'description' ]
+		 * ];
+		 */
+		en: [
+			[ 0, [ 'one', 'other' ], 'other', 'English plural test- 0 is other' ],
+			[ 1, [ 'one', 'other' ], 'one', 'English plural test- 1 is one' ]
+		],
+		fa: [
+			[ 0, [ 'one', 'other' ], 'other', 'Persian plural test- 0 is other' ],
+			[ 1, [ 'one', 'other' ], 'one', 'Persian plural test- 1 is one' ],
+			[ 2, [ 'one', 'other' ], 'other', 'Persian plural test- 2 is other' ]
+		],
+		fr: [
+			[ 0, [ 'one', 'other' ], 'other', 'French plural test- 0 is other' ],
+			[ 1, [ 'one', 'other' ], 'one', 'French plural test- 1 is one' ]
+		],
+		hi: [
+			[ 0, [ 'one', 'other' ], 'one', 'Hindi plural test- 0 is one' ],
+			[ 1, [ 'one', 'other' ], 'one', 'Hindi plural test- 1 is one' ],
+			[ 2, [ 'one', 'other' ], 'other', 'Hindi plural test- 2 is other' ]
+		],
+		he: [
+			[ 0, [ 'one', 'other' ], 'other', 'Hebrew plural test- 0 is other' ],
+			[ 1, [ 'one', 'other' ], 'one', 'Hebrew plural test- 1 is one' ],
+			[ 2, [ 'one', 'other' ], 'other', 'Hebrew plural test- 2 is other with 2 forms' ],
+			[ 2, [ 'one', 'dual', 'other' ], 'dual', 'Hebrew plural test- 2 is dual with 3 forms' ]
+		],
+		hu: [
+			[ 0, [ 'one', 'other' ], 'other', 'Hungarian plural test- 0 is other' ],
+			[ 1, [ 'one', 'other' ], 'one', 'Hungarian plural test- 1 is one' ],
+			[ 2, [ 'one', 'other' ], 'other', 'Hungarian plural test- 2 is other' ]
+		],
+		ar: [
+			[ 0, [ 'zero', 'one', 'two', 'few', 'many', 'other' ], 'zero', 'Arabic plural test - 0 is zero' ],
+			[ 1, [ 'zero', 'one', 'two', 'few', 'many', 'other' ], 'one', 'Arabic plural test - 1 is one' ],
+			[ 2, [ 'zero', 'one', 'two', 'few', 'many', 'other' ], 'two', 'Arabic plural test - 2 is two' ],
+			[ 3, [ 'zero', 'one', 'two', 'few', 'many', 'other' ], 'few', 'Arabic plural test - 3 is few' ],
+			[ 9, [ 'zero', 'one', 'two', 'few', 'many', 'other' ], 'few', 'Arabic plural test - 9 is few' ],
+			[ '9', [ 'zero', 'one', 'two', 'few', 'many', 'other' ], 'few', 'Arabic plural test - 9 is few' ],
+			[ 110, [ 'zero', 'one', 'two', 'few', 'many', 'other' ], 'few', 'Arabic plural test - 110 is few' ],
+			[ 11, [ 'zero', 'one', 'two', 'few', 'many', 'other' ], 'many', 'Arabic plural test - 11 is many' ],
+			[ 15, [ 'zero', 'one', 'two', 'few', 'many', 'other' ], 'many', 'Arabic plural test - 15 is many' ],
+			[ 99, [ 'zero', 'one', 'two', 'few', 'many', 'other' ], 'many', 'Arabic plural test - 99 is many' ],
+			[ 9999, [ 'zero', 'one', 'two', 'few', 'many', 'other' ], 'many', 'Arabic plural test - 9999 is many' ],
+			[ 100, [ 'zero', 'one', 'two', 'few', 'many', 'other' ], 'other', 'Arabic plural test - 100 is other' ],
+			[ 102, [ 'zero', 'one', 'two', 'few', 'many', 'other' ], 'other', 'Arabic plural test - 102 is other' ],
+			[ 1000, [ 'zero', 'one', 'two', 'few', 'many', 'other' ], 'other', 'Arabic plural test - 1000 is other' ],
+			[ 1.7, [ 'zero', 'one', 'two', 'few', 'many', 'other' ], 'other', 'Arabic plural test - 1.7 is other' ]
+		]
+	};
 
-function pluralTest( langCode, tests ) {
-	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]
-			);
+	function pluralTest( langCode, tests ) {
+		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]
+				);
+			}
+		} );
+	}
+
+	$.each( pluralTestcases, function ( langCode, tests ) {
+		if ( langCode === mw.config.get( 'wgUserLanguage' ) ) {
+			pluralTest( langCode, tests );
 		}
 	} );
-}
-
-$.each( pluralTestcases, function ( langCode, tests ) {
-	if ( langCode === mw.config.get( 'wgUserLanguage' ) ) {
-		pluralTest( langCode, tests );
-	}
-} );
+}( mediaWiki, jQuery ) );
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.jscompat.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.jscompat.test.js
index 2baa4f3778..bc6fafeef3 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.jscompat.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.jscompat.test.js
@@ -1,62 +1,70 @@
-/* Some misc JavaScript compatibility tests, just to make sure the environments we run in are consistent */
-
-QUnit.module( 'mediawiki.jscompat', QUnit.newMwEnvironment() );
-
-QUnit.test( 'Variable with Unicode letter in name', 3, function ( assert ) {
-	var orig = "some token";
-	var ŝablono = orig;
-
-	assert.deepEqual( ŝablono, orig, 'ŝablono' );
-	assert.deepEqual( \u015dablono, orig, '\\u015dablono' );
-	assert.deepEqual( \u015Dablono, orig, '\\u015Dablono' );
-});
-
-/*
-// Not that we need this. ;)
-// This fails on IE 6-8
-// Works on IE 9, Firefox 6, Chrome 14
-QUnit.test( 'Keyword workaround: "if" as variable name using Unicode escapes', function ( assert ) {
-	var orig = "another token";
-	\u0069\u0066 = orig;
-	assert.deepEqual( \u0069\u0066, orig, '\\u0069\\u0066' );
-});
-*/
-
-/*
-// Not that we need this. ;)
-// This fails on IE 6-9
-// Works on Firefox 6, Chrome 14
-QUnit.test( 'Keyword workaround: "if" as member variable name using Unicode escapes', function ( assert ) {
-	var orig = "another token";
-	var foo = {};
-	foo.\u0069\u0066 = orig;
-	assert.deepEqual( foo.\u0069\u0066, orig, 'foo.\\u0069\\u0066' );
-});
-*/
-
-QUnit.test( 'Stripping of single initial newline from textarea\'s literal contents (bug 12130)', function ( assert ) {
-	var maxn = 4;
-	QUnit.expect( maxn * 2 );
-
-	function repeat( str, n ) {
-		if ( n <= 0 ) {
-			return '';
-		} else {
-			var out = new Array(n);
-			for ( var i = 0; i < n; i++ ) {
-				out[i] = str;
+/**
+ * Some misc JavaScript compatibility tests,
+ * just to make sure the environments we run in are consistent.
+ */
+( function ( $ ) {
+	QUnit.module( 'mediawiki.jscompat', QUnit.newMwEnvironment() );
+
+	QUnit.test( 'Variable with Unicode letter in name', 3, function ( assert ) {
+		var orig, ŝablono;
+
+		orig = 'some token';
+		ŝablono = orig;
+
+		assert.deepEqual( ŝablono, orig, 'ŝablono' );
+		assert.deepEqual( \u015dablono, orig, '\\u015dablono' );
+		assert.deepEqual( \u015Dablono, orig, '\\u015Dablono' );
+	});
+
+	/*
+	// Not that we need this. ;)
+	// This fails on IE 6-8
+	// Works on IE 9, Firefox 6, Chrome 14
+	QUnit.test( 'Keyword workaround: "if" as variable name using Unicode escapes', function ( assert ) {
+		var orig = "another token";
+		\u0069\u0066 = orig;
+		assert.deepEqual( \u0069\u0066, orig, '\\u0069\\u0066' );
+	});
+	*/
+
+	/*
+	// Not that we need this. ;)
+	// This fails on IE 6-9
+	// Works on Firefox 6, Chrome 14
+	QUnit.test( 'Keyword workaround: "if" as member variable name using Unicode escapes', function ( assert ) {
+		var orig = "another token";
+		var foo = {};
+		foo.\u0069\u0066 = orig;
+		assert.deepEqual( foo.\u0069\u0066, orig, 'foo.\\u0069\\u0066' );
+	});
+	*/
+
+	QUnit.test( 'Stripping of single initial newline from textarea\'s literal contents (bug 12130)', function ( assert ) {
+		var maxn, n,
+			expected, $textarea;
+
+		maxn = 4;
+		QUnit.expect( maxn * 2 );
+
+		function repeat( str, n ) {
+			var out;
+			if ( n <= 0 ) {
+				return '';
+			} else {
+				out = [];
+				out.length = n + 1;
+				return out.join( str );
 			}
-			return out.join('');
 		}
-	}
 
-	for ( var n = 0; n < maxn; n++ ) {
-		var expected = repeat('\n', n) + 'some text';
+		for ( n = 0; n < maxn; n++ ) {
+			expected = repeat('\n', n) + 'some text';
 
-		var $textarea = $('<textarea>\n' + expected + '</textarea>');
-		assert.equal( $textarea.val(), expected, 'Expecting ' + n + ' newlines (HTML contained ' + (n + 1) + ')' );
+			$textarea = $('<textarea>\n' + expected + '</textarea>');
+			assert.equal( $textarea.val(), expected, 'Expecting ' + n + ' newlines (HTML contained ' + (n + 1) + ')' );
 
-		var $textarea2 = $('<textarea>').val(expected);
-		assert.equal( $textarea2.val(), expected, 'Expecting ' + n + ' newlines (from DOM set with ' + n + ')' );
-	}
-});
+			$textarea = $('<textarea>').val( expected );
+			assert.equal( $textarea.val(), expected, 'Expecting ' + n + ' newlines (from DOM set with ' + n + ')' );
+		}
+	});
+}( jQuery ) );
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.language.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.language.test.js
index 3fa2b0997d..869ebe455b 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.language.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.language.test.js
@@ -1,394 +1,394 @@
-QUnit.module( 'mediawiki.language', QUnit.newMwEnvironment({
-	setup: function () {
-		this.liveLangData = mw.language.data.values;
-		mw.language.data.values = $.extend( true, {}, this.liveLangData );
-	},
-	teardown: function () {
-		// Restore
-		mw.language.data.values = this.liveLangData;
-	}
-}) );
+( function ( mw, $ ) {
 
-QUnit.test( 'mw.language getData and setData', function ( assert ) {
-	QUnit.expect( 2 );
+	QUnit.module( 'mediawiki.language', QUnit.newMwEnvironment({
+		setup: function () {
+			this.liveLangData = mw.language.data.values;
+			mw.language.data.values = $.extend( true, {}, this.liveLangData );
+		},
+		teardown: function () {
+			mw.language.data.values = this.liveLangData;
+		}
+	}) );
 
-	mw.language.setData( 'en', 'testkey', 'testvalue' );
-	assert.equal(  mw.language.getData( 'en', 'testkey' ), 'testvalue', 'Getter setter test for mw.language' );
-	assert.equal(  mw.language.getData( 'en', 'invalidkey' ), undefined, 'Getter setter test for mw.language with invalid key' );
-} );
+	QUnit.test( 'mw.language getData and setData', 2, function ( assert ) {
+		mw.language.setData( 'en', 'testkey', 'testvalue' );
+		assert.equal(  mw.language.getData( 'en', 'testkey' ), 'testvalue', 'Getter setter test for mw.language' );
+		assert.equal(  mw.language.getData( 'en', 'invalidkey' ), undefined, 'Getter setter test for mw.language with invalid key' );
+	} );
 
-function grammarTest( langCode, test ) {
-	// The test works only if the content language is opt.language
-	// because it requires [lang].js to be loaded.
-	QUnit.test( 'Grammar test for lang=' + langCode, function ( assert ) {
-		QUnit.expect( test.length );
+	function grammarTest( langCode, test ) {
+		// The test works only if the content language is opt.language
+		// because it requires [lang].js to be loaded.
+		QUnit.test( 'Grammar test for lang=' + langCode, function ( assert ) {
+			QUnit.expect( test.length );
 
-		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
-			);
-		}
-	});
-}
+			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
+				);
+			}
+		});
+	}
 
-var grammarTests = {
-	bs: [
-		{
-			word: 'word',
-			grammarForm: 'instrumental',
-			expected: 's word',
-			description: 'Grammar test for instrumental case'
-		},
-		{
-			word: 'word',
-			grammarForm: 'lokativ',
-			expected: 'o word',
-			description: 'Grammar test for lokativ case'
-		}
-	],
+	var grammarTests = {
+		bs: [
+			{
+				word: 'word',
+				grammarForm: 'instrumental',
+				expected: 's word',
+				description: 'Grammar test for instrumental case'
+			},
+			{
+				word: 'word',
+				grammarForm: 'lokativ',
+				expected: 'o word',
+				description: 'Grammar test for lokativ case'
+			}
+		],
 
-	he: [
-		{
-			word: "ויקיפדיה",
-			grammarForm: 'prefixed',
-			expected: "וויקיפדיה",
-			description: 'Duplicate the "Waw" if prefixed'
-		},
-		{
-			word: "וולפגנג",
-			grammarForm: 'prefixed',
-			expected: "וולפגנג",
-			description: 'Duplicate the "Waw" if prefixed, but not if it is already duplicated.'
-		},
-		{
-			word: "הקובץ",
-			grammarForm: 'prefixed',
-			expected: "קובץ",
-			description: 'Remove the "He" if prefixed'
-		},
-		{
-			word: 'Wikipedia',
-			grammarForm: 'תחילית',
-			expected: 'Ö¾Wikipedia',
-			description: 'GAdd a hyphen (maqaf) before non-Hebrew letters'
-		},
-		{
-			word: '1995',
-			grammarForm: 'תחילית',
-			expected: 'Ö¾1995',
-			description: 'Add a hyphen (maqaf) before numbers'
-		}
-	],
+		he: [
+			{
+				word: 'ויקיפדיה',
+				grammarForm: 'prefixed',
+				expected: 'וויקיפדיה',
+				description: 'Duplicate the "Waw" if prefixed'
+			},
+			{
+				word: 'וולפגנג',
+				grammarForm: 'prefixed',
+				expected: 'וולפגנג',
+				description: 'Duplicate the "Waw" if prefixed, but not if it is already duplicated.'
+			},
+			{
+				word: 'הקובץ',
+				grammarForm: 'prefixed',
+				expected: 'קובץ',
+				description: 'Remove the "He" if prefixed'
+			},
+			{
+				word: 'Wikipedia',
+				grammarForm: 'תחילית',
+				expected: 'Ö¾Wikipedia',
+				description: 'GAdd a hyphen (maqaf) before non-Hebrew letters'
+			},
+			{
+				word: '1995',
+				grammarForm: 'תחילית',
+				expected: 'Ö¾1995',
+				description: 'Add a hyphen (maqaf) before numbers'
+			}
+		],
 
-	hsb: [
-		{
-			word: 'word',
-			grammarForm: 'instrumental',
-			expected: 'z word',
-			description: 'Grammar test for instrumental case'
-		},
-		{
-			word: 'word',
-			grammarForm: 'lokatiw',
-			expected: 'wo word',
-			description: 'Grammar test for lokatiw case'
-		}
-	],
+		hsb: [
+			{
+				word: 'word',
+				grammarForm: 'instrumental',
+				expected: 'z word',
+				description: 'Grammar test for instrumental case'
+			},
+			{
+				word: 'word',
+				grammarForm: 'lokatiw',
+				expected: 'wo word',
+				description: 'Grammar test for lokatiw case'
+			}
+		],
 
-	dsb: [
-		{
-			word: 'word',
-			grammarForm: 'instrumental',
-			expected: 'z word',
-			description: 'Grammar test for instrumental case'
-		},
-		{
-			word: 'word',
-			grammarForm: 'lokatiw',
-			expected: 'wo word',
-			description: 'Grammar test for lokatiw case'
-		}
-	],
+		dsb: [
+			{
+				word: 'word',
+				grammarForm: 'instrumental',
+				expected: 'z word',
+				description: 'Grammar test for instrumental case'
+			},
+			{
+				word: 'word',
+				grammarForm: 'lokatiw',
+				expected: 'wo word',
+				description: 'Grammar test for lokatiw case'
+			}
+		],
 
-	hy: [
-		{
-			word: 'Մաունա',
-			grammarForm: 'genitive',
-			expected: 'Մաունայի',
-			description: 'Grammar test for genitive case'
-		},
-		{
-			word: 'Õ°Õ¥Õ¿Õ¸',
-			grammarForm: 'genitive',
-			expected: 'Õ°Õ¥Õ¿Õ¸ÕµÕ«',
-			description: 'Grammar test for genitive case'
-		},
-		{
-			word: 'գիրք',
-			grammarForm: 'genitive',
-			expected: 'գրքի',
-			description: 'Grammar test for genitive case'
-		},
-		{
-			word: 'ÕªÕ¡Õ´Õ¡Õ¶Õ¡Õ¯Õ«',
-			grammarForm: 'genitive',
-			expected: 'ÕªÕ¡Õ´Õ¡Õ¶Õ¡Õ¯Õ«Õ«',
-			description: 'Grammar test for genitive case'
-		}
-	],
+		hy: [
+			{
+				word: 'Մաունա',
+				grammarForm: 'genitive',
+				expected: 'Մաունայի',
+				description: 'Grammar test for genitive case'
+			},
+			{
+				word: 'Õ°Õ¥Õ¿Õ¸',
+				grammarForm: 'genitive',
+				expected: 'Õ°Õ¥Õ¿Õ¸ÕµÕ«',
+				description: 'Grammar test for genitive case'
+			},
+			{
+				word: 'գիրք',
+				grammarForm: 'genitive',
+				expected: 'գրքի',
+				description: 'Grammar test for genitive case'
+			},
+			{
+				word: 'ÕªÕ¡Õ´Õ¡Õ¶Õ¡Õ¯Õ«',
+				grammarForm: 'genitive',
+				expected: 'ÕªÕ¡Õ´Õ¡Õ¶Õ¡Õ¯Õ«Õ«',
+				description: 'Grammar test for genitive case'
+			}
+		],
 
-	fi: [
-		{
-			word: 'talo',
-			grammarForm: 'genitive',
-			expected: 'talon',
-			description: 'Grammar test for genitive case'
-		},
-		{
-			word: 'linux',
-			grammarForm: 'genitive',
-			expected: 'linuxin',
-			description: 'Grammar test for genitive case'
-		},
-		{
-			word: 'talo',
-			grammarForm: 'elative',
-			expected: 'talosta',
-			description: 'Grammar test for elative case'
-		},
-		{
-			word: 'pastöroitu',
-			grammarForm: 'partitive',
-			expected: 'pastöroitua',
-			description: 'Grammar test for partitive case'
-		},
-		{
-			word: 'talo',
-			grammarForm: 'partitive',
-			expected: 'taloa',
-			description: 'Grammar test for partitive case'
-		},
-		{
-			word: 'talo',
-			grammarForm: 'illative',
-			expected: 'taloon',
-			description: 'Grammar test for illative case'
-		},
-		{
-			word: 'linux',
-			grammarForm: 'inessive',
-			expected: 'linuxissa',
-			description: 'Grammar test for inessive case'
-		}
-	],
+		fi: [
+			{
+				word: 'talo',
+				grammarForm: 'genitive',
+				expected: 'talon',
+				description: 'Grammar test for genitive case'
+			},
+			{
+				word: 'linux',
+				grammarForm: 'genitive',
+				expected: 'linuxin',
+				description: 'Grammar test for genitive case'
+			},
+			{
+				word: 'talo',
+				grammarForm: 'elative',
+				expected: 'talosta',
+				description: 'Grammar test for elative case'
+			},
+			{
+				word: 'pastöroitu',
+				grammarForm: 'partitive',
+				expected: 'pastöroitua',
+				description: 'Grammar test for partitive case'
+			},
+			{
+				word: 'talo',
+				grammarForm: 'partitive',
+				expected: 'taloa',
+				description: 'Grammar test for partitive case'
+			},
+			{
+				word: 'talo',
+				grammarForm: 'illative',
+				expected: 'taloon',
+				description: 'Grammar test for illative case'
+			},
+			{
+				word: 'linux',
+				grammarForm: 'inessive',
+				expected: 'linuxissa',
+				description: 'Grammar test for inessive case'
+			}
+		],
 
-	ru: [
-		{
-			word: 'тесть',
-			grammarForm: 'genitive',
-			expected: 'тестя',
-			description: 'Grammar test for genitive case'
-		},
-		{
-			word: 'привилегия',
-			grammarForm: 'genitive',
-			expected: 'привилегии',
-			description: 'Grammar test for genitive case'
-		},
-		{
-			word: 'установка',
-			grammarForm: 'genitive',
-			expected: 'установки',
-			description: 'Grammar test for genitive case'
-		},
-		{
-			word: 'похоти',
-			grammarForm: 'genitive',
-			expected: 'похотей',
-			description: 'Grammar test for genitive case'
-		},
-		{
-			word: 'доводы',
-			grammarForm: 'genitive',
-			expected: 'доводов',
-			description: 'Grammar test for genitive case'
-		},
-		{
-			word: 'песчаник',
-			grammarForm: 'genitive',
-			expected: 'песчаника',
-			description: 'Grammar test for genitive case'
-		}
-	],
+		ru: [
+			{
+				word: 'тесть',
+				grammarForm: 'genitive',
+				expected: 'тестя',
+				description: 'Grammar test for genitive case'
+			},
+			{
+				word: 'привилегия',
+				grammarForm: 'genitive',
+				expected: 'привилегии',
+				description: 'Grammar test for genitive case'
+			},
+			{
+				word: 'установка',
+				grammarForm: 'genitive',
+				expected: 'установки',
+				description: 'Grammar test for genitive case'
+			},
+			{
+				word: 'похоти',
+				grammarForm: 'genitive',
+				expected: 'похотей',
+				description: 'Grammar test for genitive case'
+			},
+			{
+				word: 'доводы',
+				grammarForm: 'genitive',
+				expected: 'доводов',
+				description: 'Grammar test for genitive case'
+			},
+			{
+				word: 'песчаник',
+				grammarForm: 'genitive',
+				expected: 'песчаника',
+				description: 'Grammar test for genitive case'
+			}
+		],
 
 
-	hu: [
-		{
-			word: 'Wikipédiá',
-			grammarForm: 'rol',
-			expected: 'Wikipédiáról',
-			description: 'Grammar test for rol case'
-		},
-		{
-			word: 'Wikipédiá',
-			grammarForm: 'ba',
-			expected: 'Wikipédiába',
-			description: 'Grammar test for ba case'
-		},
-		{
-			word: 'Wikipédiá',
-			grammarForm: 'k',
-			expected: 'Wikipédiák',
-			description: 'Grammar test for k case'
-		}
-	],
+		hu: [
+			{
+				word: 'Wikipédiá',
+				grammarForm: 'rol',
+				expected: 'Wikipédiáról',
+				description: 'Grammar test for rol case'
+			},
+			{
+				word: 'Wikipédiá',
+				grammarForm: 'ba',
+				expected: 'Wikipédiába',
+				description: 'Grammar test for ba case'
+			},
+			{
+				word: 'Wikipédiá',
+				grammarForm: 'k',
+				expected: 'Wikipédiák',
+				description: 'Grammar test for k case'
+			}
+		],
 
-	ga: [
-		{
-			word: 'an Domhnach',
-			grammarForm: 'ainmlae',
-			expected: 'Dé Domhnaigh',
-			description: 'Grammar test for ainmlae case'
-		},
-		{
-			word: 'an Luan',
-			grammarForm: 'ainmlae',
-			expected: 'Dé Luain',
-			description: 'Grammar test for ainmlae case'
-		},
-		{
-			word: 'an Satharn',
-			grammarForm: 'ainmlae',
-			expected: 'Dé Sathairn',
-			description: 'Grammar test for ainmlae case'
-		}
-	],
+		ga: [
+			{
+				word: 'an Domhnach',
+				grammarForm: 'ainmlae',
+				expected: 'Dé Domhnaigh',
+				description: 'Grammar test for ainmlae case'
+			},
+			{
+				word: 'an Luan',
+				grammarForm: 'ainmlae',
+				expected: 'Dé Luain',
+				description: 'Grammar test for ainmlae case'
+			},
+			{
+				word: 'an Satharn',
+				grammarForm: 'ainmlae',
+				expected: 'Dé Sathairn',
+				description: 'Grammar test for ainmlae case'
+			}
+		],
 
-	uk: [
-		{
-			word: 'тесть',
-			grammarForm: 'genitive',
-			expected: 'тестя',
-			description: 'Grammar test for genitive case'
-		},
-		{
-			word: 'Вікіпедія',
-			grammarForm: 'genitive',
-			expected: 'Вікіпедії',
-			description: 'Grammar test for genitive case'
-		},
-		{
-			word: 'установка',
-			grammarForm: 'genitive',
-			expected: 'установки',
-			description: 'Grammar test for genitive case'
-		},
-		{
-			word: 'похоти',
-			grammarForm: 'genitive',
-			expected: 'похотей',
-			description: 'Grammar test for genitive case'
-		},
-		{
-			word: 'доводы',
-			grammarForm: 'genitive',
-			expected: 'доводов',
-			description: 'Grammar test for genitive case'
-		},
-		{
-			word: 'песчаник',
-			grammarForm: 'genitive',
-			expected: 'песчаника',
-			description: 'Grammar test for genitive case'
-		},
-		{
-			word: 'Вікіпедія',
-			grammarForm: 'accusative',
-			expected: 'Вікіпедію',
-			description: 'Grammar test for accusative case'
-		}
-	],
+		uk: [
+			{
+				word: 'тесть',
+				grammarForm: 'genitive',
+				expected: 'тестя',
+				description: 'Grammar test for genitive case'
+			},
+			{
+				word: 'Вікіпедія',
+				grammarForm: 'genitive',
+				expected: 'Вікіпедії',
+				description: 'Grammar test for genitive case'
+			},
+			{
+				word: 'установка',
+				grammarForm: 'genitive',
+				expected: 'установки',
+				description: 'Grammar test for genitive case'
+			},
+			{
+				word: 'похоти',
+				grammarForm: 'genitive',
+				expected: 'похотей',
+				description: 'Grammar test for genitive case'
+			},
+			{
+				word: 'доводы',
+				grammarForm: 'genitive',
+				expected: 'доводов',
+				description: 'Grammar test for genitive case'
+			},
+			{
+				word: 'песчаник',
+				grammarForm: 'genitive',
+				expected: 'песчаника',
+				description: 'Grammar test for genitive case'
+			},
+			{
+				word: 'Вікіпедія',
+				grammarForm: 'accusative',
+				expected: 'Вікіпедію',
+				description: 'Grammar test for accusative case'
+			}
+		],
 
-	sl: [
-		{
-			word: 'word',
-			grammarForm: 'orodnik',
-			expected: 'z word',
-			description: 'Grammar test for orodnik case'
-		},
-		{
-			word: 'word',
-			grammarForm: 'mestnik',
-			expected: 'o word',
-			description: 'Grammar test for mestnik case'
-		}
-	],
+		sl: [
+			{
+				word: 'word',
+				grammarForm: 'orodnik',
+				expected: 'z word',
+				description: 'Grammar test for orodnik case'
+			},
+			{
+				word: 'word',
+				grammarForm: 'mestnik',
+				expected: 'o word',
+				description: 'Grammar test for mestnik case'
+			}
+		],
 
-	os: [
-		{
-			word: 'бæстæ',
-			grammarForm: 'genitive',
-			expected: 'бæсты',
-			description: 'Grammar test for genitive case'
-		},
-		{
-			word: 'бæстæ',
-			grammarForm: 'allative',
-			expected: 'бæстæм',
-			description: 'Grammar test for allative case'
-		},
-		{
-			word: 'Тигр',
-			grammarForm: 'dative',
-			expected: 'Тигрæн',
-			description: 'Grammar test for dative case'
-		},
-		{
-			word: 'цъити',
-			grammarForm: 'dative',
-			expected: 'цъитийæн',
-			description: 'Grammar test for dative case'
-		},
-		{
-			word: 'лæппу',
-			grammarForm: 'genitive',
-			expected: 'лæппуйы',
-			description: 'Grammar test for genitive case'
-		},
-		{
-			word: '2011',
-			grammarForm: 'equative',
-			expected: '2011-ау',
-			description: 'Grammar test for equative case'
-		}
-	],
+		os: [
+			{
+				word: 'бæстæ',
+				grammarForm: 'genitive',
+				expected: 'бæсты',
+				description: 'Grammar test for genitive case'
+			},
+			{
+				word: 'бæстæ',
+				grammarForm: 'allative',
+				expected: 'бæстæм',
+				description: 'Grammar test for allative case'
+			},
+			{
+				word: 'Тигр',
+				grammarForm: 'dative',
+				expected: 'Тигрæн',
+				description: 'Grammar test for dative case'
+			},
+			{
+				word: 'цъити',
+				grammarForm: 'dative',
+				expected: 'цъитийæн',
+				description: 'Grammar test for dative case'
+			},
+			{
+				word: 'лæппу',
+				grammarForm: 'genitive',
+				expected: 'лæппуйы',
+				description: 'Grammar test for genitive case'
+			},
+			{
+				word: '2011',
+				grammarForm: 'equative',
+				expected: '2011-ау',
+				description: 'Grammar test for equative case'
+			}
+		],
 
-	la: [
-		{
-			word: 'Translatio',
-			grammarForm: 'genitive',
-			expected: 'Translationis',
-			description: 'Grammar test for genitive case'
-		},
-		{
-			word: 'Translatio',
-			grammarForm: 'accusative',
-			expected: 'Translationem',
-			description: 'Grammar test for accusative case'
-		},
-		{
-			word: 'Translatio',
-			grammarForm: 'ablative',
-			expected: 'Translatione',
-			description: 'Grammar test for ablative case'
-		}
-	]
-};
+		la: [
+			{
+				word: 'Translatio',
+				grammarForm: 'genitive',
+				expected: 'Translationis',
+				description: 'Grammar test for genitive case'
+			},
+			{
+				word: 'Translatio',
+				grammarForm: 'accusative',
+				expected: 'Translationem',
+				description: 'Grammar test for accusative case'
+			},
+			{
+				word: 'Translatio',
+				grammarForm: 'ablative',
+				expected: 'Translatione',
+				description: 'Grammar test for ablative case'
+			}
+		]
+	};
 
-$.each( grammarTests, function ( langCode, test ) {
-	if ( langCode === mw.config.get( 'wgUserLanguage' ) ) {
-		grammarTest( langCode, test );
-	}
-});
+	$.each( grammarTests, function ( langCode, test ) {
+		if ( langCode === mw.config.get( 'wgUserLanguage' ) ) {
+			grammarTest( langCode, test );
+		}
+	});
+}( mediaWiki, jQuery ) );
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.test.js
index be59f1adb1..9286558127 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.test.js
@@ -1,4 +1,4 @@
-( function ( mw ) {
+( function ( mw, $ ) {
 
 QUnit.module( 'mediawiki', QUnit.newMwEnvironment() );
 
@@ -215,7 +215,7 @@ QUnit.asyncTest( 'mw.loader', 2, function ( assert ) {
 
 		// /sample/awesome.js declares the "mw.loader.testCallback" function
 		// which contains a call to start() and ok()
-		assert.strictEqual( isAwesomeDone, true, "test.callback module should've caused isAwesomeDone to be true" );
+		assert.strictEqual( isAwesomeDone, true, 'test.callback module should\'ve caused isAwesomeDone to be true' );
 		delete mw.loader.testCallback;
 
 	}, function () {
@@ -481,8 +481,8 @@ QUnit.test( 'mw.loader missing dependency', 13, function ( assert ) {
 	mw.loader.using(
 		['test.module7'],
 		function () {
-			assert.ok( false, "Success fired despite missing dependency" );
-			assert.ok( true , "QUnit expected() count dummy" );
+			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' );
@@ -492,8 +492,8 @@ QUnit.test( 'mw.loader missing dependency', 13, function ( assert ) {
 	mw.loader.using(
 		['test.module9'],
 		function () {
-			assert.ok( false, "Success fired despite missing dependency" );
-			assert.ok( true , "QUnit expected() count dummy" );
+			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' );
@@ -646,4 +646,4 @@ QUnit.test( 'mw.html', 13, function ( assert ) {
 
 });
 
-}( mediaWiki ) );
+}( mediaWiki, jQuery ) );
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.user.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.user.test.js
index 16c97dff63..a9bbbf7c0d 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.user.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.user.test.js
@@ -1,4 +1,4 @@
-( function ( mw ) {
+( function ( mw, $ ) {
 
 QUnit.module( 'mediawiki.user', QUnit.newMwEnvironment() );
 
@@ -47,10 +47,9 @@ QUnit.asyncTest( 'getGroups', 3, function ( assert ) {
 
 QUnit.asyncTest( 'getRights', 1, function ( assert ) {
 	mw.user.getRights( function ( rights ) {
-		// First group should always be '*'
 		assert.equal( $.type( rights ), 'array', 'Callback gets an array' );
 		QUnit.start();
 	});
 });
 
-}( mediaWiki ) );
+}( mediaWiki, jQuery ) );
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.util.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.util.test.js
index ababa8d9ed..c4212dff6e 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.util.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.util.test.js
@@ -1,288 +1,303 @@
-QUnit.module( 'mediawiki.util', QUnit.newMwEnvironment() );
-
-QUnit.test( 'rawurlencode', 1, function ( assert ) {
-	assert.equal( mw.util.rawurlencode( 'Test:A & B/Here' ), 'Test%3AA%20%26%20B%2FHere' );
-});
-
-QUnit.test( 'wikiUrlencode', 1, function ( assert ) {
-	assert.equal( mw.util.wikiUrlencode( 'Test:A & B/Here' ), 'Test:A_%26_B/Here' );
-});
-
-QUnit.test( 'wikiGetlink', 3, function ( assert ) {
-	// Not part of startUp module
-	mw.config.set( 'wgArticlePath', '/wiki/$1' );
-	mw.config.set( 'wgPageName', 'Foobar' );
-
-	var hrefA = mw.util.wikiGetlink( 'Sandbox' );
-	assert.equal( hrefA, '/wiki/Sandbox', 'Simple title; Get link for "Sandbox"' );
-
-	var hrefB = mw.util.wikiGetlink( 'Foo:Sandbox ? 5+5=10 ! (test)/subpage' );
-	assert.equal( hrefB, '/wiki/Foo:Sandbox_%3F_5%2B5%3D10_%21_%28test%29/subpage',
-		'Advanced title; Get link for "Foo:Sandbox ? 5+5=10 ! (test)/subpage"' );
-
-	var hrefC = mw.util.wikiGetlink();
-	assert.equal( hrefC, '/wiki/Foobar', 'Default title; Get link for current page ("Foobar")' );
-});
-
-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'
+( function ( mw, $ ) {
+	QUnit.module( 'mediawiki.util', QUnit.newMwEnvironment() );
+
+	QUnit.test( 'rawurlencode', 1, function ( assert ) {
+		assert.equal( mw.util.rawurlencode( 'Test:A & B/Here' ), 'Test%3AA%20%26%20B%2FHere' );
+	});
+
+	QUnit.test( 'wikiUrlencode', 1, function ( assert ) {
+		assert.equal( mw.util.wikiUrlencode( 'Test:A & B/Here' ), 'Test:A_%26_B/Here' );
 	});
 
-	assert.equal( mw.util.wikiScript(), mw.config.get( 'wgScript' ), 'wikiScript() returns wgScript' );
-	assert.equal( mw.util.wikiScript( 'index' ), mw.config.get( 'wgScript' ), "wikiScript( 'index' ) returns wgScript" );
-	assert.equal( mw.util.wikiScript( 'load' ), mw.config.get( 'wgLoadScript' ), "wikiScript( 'load' ) returns wgLoadScript" );
-	assert.equal( mw.util.wikiScript( 'api' ), '/w/api.php', 'API path' );
-});
-
-QUnit.test( 'addCSS', 3, function ( assert ) {
-	var $testEl = $( '<div>' ).attr( 'id', 'mw-addcsstest' ).appendTo( '#qunit-fixture' );
-
-	var style = mw.util.addCSS( '#mw-addcsstest { visibility: hidden; }' );
-	assert.equal( typeof style, 'object', 'addCSS returned an object' );
-	assert.strictEqual( style.disabled, false, 'property "disabled" is available and set to false' );
-
-	assert.equal( $testEl.css( 'visibility' ), 'hidden', 'Added style properties are in effect' );
-
-	// Clean up
-	$( style.ownerNode ).remove();
-});
-
-QUnit.asyncTest( 'toggleToc', 4, function ( assert ) {
-	assert.strictEqual( mw.util.toggleToc(), null, 'Return null if there is no table of contents on the page.' );
-
-	var	tocHtml =
-	'<table id="toc" class="toc"><tr><td>' +
-		'<div id="toctitle">' +
-			'<h2>Contents</h2>' +
-			'<span class="toctoggle">&nbsp;[<a href="#" class="internal" id="togglelink">Hide</a>&nbsp;]</span>' +
-		'</div>' +
-		'<ul><li></li></ul>' +
-	'</td></tr></table>',
-		$toc = $(tocHtml).appendTo( '#qunit-fixture' ),
+	QUnit.test( 'wikiGetlink', 3, function ( assert ) {
+		// Not part of startUp module
+		mw.config.set( 'wgArticlePath', '/wiki/$1' );
+		mw.config.set( 'wgPageName', 'Foobar' );
+
+		var href = mw.util.wikiGetlink( 'Sandbox' );
+		assert.equal( href, '/wiki/Sandbox', 'Simple title; Get link for "Sandbox"' );
+
+		href = mw.util.wikiGetlink( 'Foo:Sandbox ? 5+5=10 ! (test)/subpage' );
+		assert.equal( href, '/wiki/Foo:Sandbox_%3F_5%2B5%3D10_%21_%28test%29/subpage',
+			'Advanced title; Get link for "Foo:Sandbox ? 5+5=10 ! (test)/subpage"' );
+
+		href = mw.util.wikiGetlink();
+		assert.equal( href, '/wiki/Foobar', 'Default title; Get link for current page ("Foobar")' );
+	});
+
+	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'
+		});
+
+		assert.equal( mw.util.wikiScript(), mw.config.get( 'wgScript' ),
+			'wikiScript() returns wgScript'
+		);
+		assert.equal( mw.util.wikiScript( 'index' ), mw.config.get( 'wgScript' ),
+			'wikiScript( index ) returns wgScript'
+		);
+		assert.equal( mw.util.wikiScript( 'load' ), mw.config.get( 'wgLoadScript' ),
+			'wikiScript( load ) returns wgLoadScript'
+		);
+		assert.equal( mw.util.wikiScript( 'api' ), '/w/api.php', 'API path' );
+	});
+
+	QUnit.test( 'addCSS', 3, function ( assert ) {
+		var $el, style;
+		$el = $( '<div>' ).attr( 'id', 'mw-addcsstest' ).appendTo( '#qunit-fixture' );
+
+		style = mw.util.addCSS( '#mw-addcsstest { visibility: hidden; }' );
+		assert.equal( typeof style, 'object', 'addCSS returned an object' );
+		assert.strictEqual( style.disabled, false, 'property "disabled" is available and set to false' );
+
+		assert.equal( $el.css( 'visibility' ), 'hidden', 'Added style properties are in effect' );
+
+		// Clean up
+		$( style.ownerNode ).remove();
+	});
+
+	QUnit.asyncTest( 'toggleToc', 4, function ( assert ) {
+		var tocHtml, $toggleLink;
+
+		function actionC() {
+			QUnit.start();
+		}
+
+		function actionB() {
+			assert.strictEqual( mw.util.toggleToc( $toggleLink, actionC ), true, 'Return boolean true if the TOC is now visible.' );
+		}
+
+		function actionA() {
+			assert.strictEqual( mw.util.toggleToc( $toggleLink, actionB ), false, 'Return boolean false if the TOC is now hidden.' );
+		}
+
+		assert.strictEqual( mw.util.toggleToc(), null, 'Return null if there is no table of contents on the page.' );
+
+		tocHtml =
+			'<table id="toc" class="toc"><tr><td>' +
+				'<div id="toctitle">' +
+					'<h2>Contents</h2>' +
+					'<span class="toctoggle">&nbsp;[<a href="#" class="internal" id="togglelink">Hide</a>&nbsp;]</span>' +
+				'</div>' +
+				'<ul><li></li></ul>' +
+			'</td></tr></table>';
+		$(tocHtml).appendTo( '#qunit-fixture' ),
 		$toggleLink = $( '#togglelink' );
 
-	assert.strictEqual( $toggleLink.length, 1, 'Toggle link is appended to the page.' );
-
-	var actionC = function() {
-		QUnit.start();
-	};
-	var actionB = function() {
-		assert.strictEqual( mw.util.toggleToc( $toggleLink, actionC ), true, 'Return boolean true if the TOC is now visible.' );
-	};
-	var actionA = function() {
-		assert.strictEqual( mw.util.toggleToc( $toggleLink, actionB ), false, 'Return boolean false if the TOC is now hidden.' );
-	};
-
-	actionA();
-});
-
-QUnit.test( 'getParamValue', 5, function ( assert ) {
-	var	url1 = 'http://example.org/?foo=wrong&foo=right#&foo=bad';
-
-	assert.equal( mw.util.getParamValue( 'foo', url1 ), 'right', 'Use latest one, ignore hash' );
-	assert.strictEqual( mw.util.getParamValue( 'bar', url1 ), null, 'Return null when not found' );
-
-	var url2 = 'http://example.org/#&foo=bad';
-	assert.strictEqual( mw.util.getParamValue( 'foo', url2 ), null, 'Ignore hash if param is not in querystring but in hash (bug 27427)' );
-
-	var url3 = 'example.org?' + $.param({ 'TEST': 'a b+c' });
-	assert.strictEqual( mw.util.getParamValue( 'TEST', url3 ), 'a b+c', 'Bug 30441: getParamValue must understand "+" encoding of space' );
-
-	var url4 = 'example.org?' + $.param({ 'TEST': 'a b+c d' }); // check for sloppy code from r95332 :)
-	assert.strictEqual( mw.util.getParamValue( 'TEST', url4 ), 'a b+c d', 'Bug 30441: getParamValue must understand "+" encoding of space (multiple spaces)' );
-});
-
-QUnit.test( 'tooltipAccessKey', 3, function ( assert ) {
-	assert.equal( typeof mw.util.tooltipAccessKeyPrefix, 'string', 'mw.util.tooltipAccessKeyPrefix must be a string' );
-	assert.ok( mw.util.tooltipAccessKeyRegexp instanceof RegExp, 'mw.util.tooltipAccessKeyRegexp instance of RegExp' );
-	assert.ok( mw.util.updateTooltipAccessKeys, 'mw.util.updateTooltipAccessKeys' );
-});
-
-QUnit.test( '$content', 2, function ( assert ) {
-	assert.ok( mw.util.$content instanceof jQuery, 'mw.util.$content instance of jQuery' );
-	assert.strictEqual( mw.util.$content.length, 1, 'mw.util.$content must have length of 1' );
-});
-
-
-/**
- * Portlet names are prefixed with 'p-test' to avoid conflict with core
- * when running the test suite under a wiki page.
- * Previously, test elements where invisible to the selector since only
- * one element can have a given id.
- */
-QUnit.test( 'addPortletLink', 8, function ( assert ) {
-	var pTestTb, pCustom, vectorTabs, tbRL, cuQuux, $cuQuux, tbMW, $tbMW, tbRLDM, caFoo;
-	pTestTb = '\
-	<div class="portlet" id="p-test-tb">\
-		<h5>Toolbox</h5>\
-		<ul class="body"></ul>\
-	</div>';
-	pCustom = '\
-	<div class="portlet" id="p-test-custom">\
-		<h5>Views</h5>\
-		<ul class="body">\
-			<li id="c-foo"><a href="#">Foo</a></li>\
-			<li id="c-barmenu">\
-				<ul>\
-					<li id="c-bar-baz"><a href="#">Baz</a></a>\
-				</ul>\
-			</li>\
-		</ul>\
-	</div>';
-	vectorTabs = '\
-	<div id="p-test-views" class="vectorTabs">\
-		<h5>Views</h5>\
-		<ul></ul>\
-	</div>';
-
-	$( '#qunit-fixture' ).append( pTestTb, pCustom, vectorTabs );
-
-	tbRL = mw.util.addPortletLink( 'p-test-tb', '//mediawiki.org/wiki/ResourceLoader',
-		'ResourceLoader', 't-rl', 'More info about ResourceLoader on MediaWiki.org ', 'l' );
-
-	assert.ok( $.isDomElement( tbRL ), 'addPortletLink returns a valid DOM Element according to $.isDomElement' );
-
-	tbMW = mw.util.addPortletLink( 'p-test-tb', '//mediawiki.org/',
-		'MediaWiki.org', 't-mworg', 'Go to MediaWiki.org ', 'm', tbRL );
-	$tbMW = $( tbMW );
-
-
-	assert.equal( $tbMW.attr( 'id' ), 't-mworg', 'Link has correct ID set' );
-	assert.equal( $tbMW.closest( '.portlet' ).attr( 'id' ), 'p-test-tb', 'Link was inserted within correct portlet' );
-	assert.equal( $tbMW.next().attr( 'id' ), 't-rl', 'Link is in the correct position (by passing nextnode)' );
-
-	cuQuux = mw.util.addPortletLink( 'p-test-custom', '#', 'Quux' );
-	$cuQuux = $(cuQuux);
-
-	assert.equal(
-		$( '#p-test-custom #c-barmenu ul li' ).length,
-		1,
-		'addPortletLink did not add the item to all <ul> elements in the portlet (bug 35082)'
-	);
-
-	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.equal( $( tbRLDM ).next().attr( 'id' ), 't-rl', 'Link is in the correct position (by passing CSS selector)' );
-
-	caFoo = mw.util.addPortletLink( 'p-test-views', '#', 'Foo' );
-
-	assert.strictEqual( $tbMW.find( 'span').length, 0, 'No <span> element should be added for porlets without vectorTabs class.' );
-	assert.strictEqual( $( caFoo ).find( 'span').length, 1, 'A <span> element should be added for porlets with vectorTabs class.' );
-});
-
-QUnit.test( 'jsMessage', 1, function ( assert ) {
-	var a = mw.util.jsMessage( "MediaWiki is <b>Awesome</b>." );
-	assert.ok( a, 'Basic checking of return value' );
-
-	// Clean up
-	$( '#mw-js-message' ).remove();
-});
-
-QUnit.test( 'validateEmail', 6, function ( assert ) {
-	assert.strictEqual( mw.util.validateEmail( "" ), null, 'Should return null for empty string ' );
-	assert.strictEqual( mw.util.validateEmail( "user@localhost" ), true, 'Return true for a valid e-mail address' );
-
-	// testEmailWithCommasAreInvalids
-	assert.strictEqual( mw.util.validateEmail( "user,foo@example.org" ), false, 'Emails with commas are invalid' );
-	assert.strictEqual( mw.util.validateEmail( "userfoo@ex,ample.org" ), false, 'Emails with commas are invalid' );
-
-	// testEmailWithHyphens
-	assert.strictEqual( mw.util.validateEmail( "user-foo@example.org" ), true, 'Emails may contain a hyphen' );
-	assert.strictEqual( mw.util.validateEmail( "userfoo@ex-ample.org" ), true, 'Emails may contain a hyphen' );
-});
-
-QUnit.test( 'isIPv6Address', 40, function ( assert ) {
-	// Shortcuts
-	function assertFalseIPv6( addy, summary ) {
-		return assert.strictEqual( mw.util.isIPv6Address( addy ), false, summary );
-	}
-	function assertTrueIPv6( addy, summary ) {
-		return assert.strictEqual( mw.util.isIPv6Address( addy ), true, summary );
-	}
-
-	// Based on IPTest.php > testisIPv6
-	assertFalseIPv6( ':fc:100::', 'IPv6 starting with lone ":"' );
-	assertFalseIPv6( 'fc:100:::', 'IPv6 ending with a ":::"' );
-	assertFalseIPv6( 'fc:300', 'IPv6 with only 2 words' );
-	assertFalseIPv6( 'fc:100:300', 'IPv6 with only 3 words' );
-
-	$.each(
-	['fc:100::',
-	'fc:100:a::',
-	'fc:100:a:d::',
-	'fc:100:a:d:1::',
-	'fc:100:a:d:1:e::',
-	'fc:100:a:d:1:e:ac::'], function ( i, addy ){
-		assertTrueIPv6( addy, addy + ' is a valid IP' );
+		assert.strictEqual( $toggleLink.length, 1, 'Toggle link is appended to the page.' );
+
+		actionA();
 	});
 
-	assertFalseIPv6( 'fc:100:a:d:1:e:ac:0::', 'IPv6 with 8 words ending with "::"' );
-	assertFalseIPv6( 'fc:100:a:d:1:e:ac:0:1::', 'IPv6 with 9 words ending with "::"' );
-
-	assertFalseIPv6( ':::' );
-	assertFalseIPv6( '::0:', 'IPv6 ending in a lone ":"' );
-
-	assertTrueIPv6( '::', 'IPv6 zero address' );
-	$.each(
-	['::0',
-	'::fc',
-	'::fc:100',
-	'::fc:100:a',
-	'::fc:100:a:d',
-	'::fc:100:a:d:1',
-	'::fc:100:a:d:1:e',
-	'::fc:100:a:d:1:e:ac',
-
-	'fc:100:a:d:1:e:ac:0'], function ( i, addy ){
-		assertTrueIPv6( addy, addy + ' is a valid IP' );
+	QUnit.test( 'getParamValue', 5, function ( assert ) {
+		var	url;
+
+		url = 'http://example.org/?foo=wrong&foo=right#&foo=bad';
+		assert.equal( mw.util.getParamValue( 'foo', url ), 'right', 'Use latest one, ignore hash' );
+		assert.strictEqual( mw.util.getParamValue( 'bar', url ), null, 'Return null when not found' );
+
+		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' });
+		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 :)
+		assert.strictEqual( mw.util.getParamValue( 'TEST', url ), 'a b+c d', 'Bug 30441: getParamValue must understand "+" encoding of space (multiple spaces)' );
+	});
+
+	QUnit.test( 'tooltipAccessKey', 3, function ( assert ) {
+		assert.equal( typeof mw.util.tooltipAccessKeyPrefix, 'string', 'mw.util.tooltipAccessKeyPrefix must be a string' );
+		assert.ok( mw.util.tooltipAccessKeyRegexp instanceof RegExp, 'mw.util.tooltipAccessKeyRegexp instance of RegExp' );
+		assert.ok( mw.util.updateTooltipAccessKeys, 'mw.util.updateTooltipAccessKeys' );
+	});
+
+	QUnit.test( '$content', 2, function ( assert ) {
+		assert.ok( mw.util.$content instanceof jQuery, 'mw.util.$content instance of jQuery' );
+		assert.strictEqual( mw.util.$content.length, 1, 'mw.util.$content must have length of 1' );
+	});
+
+
+	/**
+	 * Portlet names are prefixed with 'p-test' to avoid conflict with core
+	 * when running the test suite under a wiki page.
+	 * Previously, test elements where invisible to the selector since only
+	 * one element can have a given id.
+	 */
+	QUnit.test( 'addPortletLink', 8, function ( assert ) {
+		var pTestTb, pCustom, vectorTabs, tbRL, cuQuux, $cuQuux, tbMW, $tbMW, tbRLDM, caFoo;
+
+		pTestTb = '\
+		<div class="portlet" id="p-test-tb">\
+			<h5>Toolbox</h5>\
+			<ul class="body"></ul>\
+		</div>';
+		pCustom = '\
+		<div class="portlet" id="p-test-custom">\
+			<h5>Views</h5>\
+			<ul class="body">\
+				<li id="c-foo"><a href="#">Foo</a></li>\
+				<li id="c-barmenu">\
+					<ul>\
+						<li id="c-bar-baz"><a href="#">Baz</a></a>\
+					</ul>\
+				</li>\
+			</ul>\
+		</div>';
+		vectorTabs = '\
+		<div id="p-test-views" class="vectorTabs">\
+			<h5>Views</h5>\
+			<ul></ul>\
+		</div>';
+
+		$( '#qunit-fixture' ).append( pTestTb, pCustom, vectorTabs );
+
+		tbRL = mw.util.addPortletLink( 'p-test-tb', '//mediawiki.org/wiki/ResourceLoader',
+			'ResourceLoader', 't-rl', 'More info about ResourceLoader on MediaWiki.org ', 'l' );
+
+		assert.ok( $.isDomElement( tbRL ), 'addPortletLink returns a valid DOM Element according to $.isDomElement' );
+
+		tbMW = mw.util.addPortletLink( 'p-test-tb', '//mediawiki.org/',
+			'MediaWiki.org', 't-mworg', 'Go to MediaWiki.org ', 'm', tbRL );
+		$tbMW = $( tbMW );
+
+
+		assert.equal( $tbMW.attr( 'id' ), 't-mworg', 'Link has correct ID set' );
+		assert.equal( $tbMW.closest( '.portlet' ).attr( 'id' ), 'p-test-tb', 'Link was inserted within correct portlet' );
+		assert.equal( $tbMW.next().attr( 'id' ), 't-rl', 'Link is in the correct position (by passing nextnode)' );
+
+		cuQuux = mw.util.addPortletLink( 'p-test-custom', '#', 'Quux' );
+		$cuQuux = $(cuQuux);
+
+		assert.equal(
+			$( '#p-test-custom #c-barmenu ul li' ).length,
+			1,
+			'addPortletLink did not add the item to all <ul> elements in the portlet (bug 35082)'
+		);
+
+		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.equal( $( tbRLDM ).next().attr( 'id' ), 't-rl', 'Link is in the correct position (by passing CSS selector)' );
+
+		caFoo = mw.util.addPortletLink( 'p-test-views', '#', 'Foo' );
+
+		assert.strictEqual( $tbMW.find( 'span').length, 0, 'No <span> element should be added for porlets without vectorTabs class.' );
+		assert.strictEqual( $( caFoo ).find( 'span').length, 1, 'A <span> element should be added for porlets with vectorTabs class.' );
 	});
 
-	assertFalseIPv6( '::fc:100:a:d:1:e:ac:0', 'IPv6 with "::" and 8 words' );
-	assertFalseIPv6( '::fc:100:a:d:1:e:ac:0:1', 'IPv6 with 9 words' );
-
-	assertFalseIPv6( ':fc::100', 'IPv6 starting with lone ":"' );
-	assertFalseIPv6( 'fc::100:', 'IPv6 ending with lone ":"' );
-	assertFalseIPv6( 'fc:::100', 'IPv6 with ":::" in the middle' );
-
-	assertTrueIPv6( 'fc::100', 'IPv6 with "::" and 2 words' );
-	assertTrueIPv6( 'fc::100:a', 'IPv6 with "::" and 3 words' );
-	assertTrueIPv6( 'fc::100:a:d', 'IPv6 with "::" and 4 words' );
-	assertTrueIPv6( 'fc::100:a:d:1', 'IPv6 with "::" and 5 words' );
-	assertTrueIPv6( 'fc::100:a:d:1:e', 'IPv6 with "::" and 6 words' );
-	assertTrueIPv6( 'fc::100:a:d:1:e:ac', 'IPv6 with "::" and 7 words' );
-	assertTrueIPv6( '2001::df', 'IPv6 with "::" and 2 words' );
-	assertTrueIPv6( '2001:5c0:1400:a::df', 'IPv6 with "::" and 5 words' );
-	assertTrueIPv6( '2001:5c0:1400:a::df:2', 'IPv6 with "::" and 6 words' );
-
-	assertFalseIPv6( 'fc::100:a:d:1:e:ac:0', 'IPv6 with "::" and 8 words' );
-	assertFalseIPv6( 'fc::100:a:d:1:e:ac:0:1', 'IPv6 with 9 words' );
-});
-
-QUnit.test( 'isIPv4Address', 11, function ( assert ) {
-	// Shortcuts
-	function assertFalseIPv4( addy, summary ) {
-		assert.strictEqual( mw.util.isIPv4Address( addy ), false, summary );
-	}
-	function assertTrueIPv4( addy, summary ) {
-		assert.strictEqual( mw.util.isIPv4Address( addy ), true, summary );
-	}
-
-	// Based on IPTest.php > testisIPv4
-	assertFalseIPv4( false, 'Boolean false is not an IP' );
-	assertFalseIPv4( true, 'Boolean true is not an IP' );
-	assertFalseIPv4( '', 'Empty string is not an IP' );
-	assertFalseIPv4( 'abc', '"abc" is not an IP' );
-	assertFalseIPv4( ':', 'Colon is not an IP' );
-	assertFalseIPv4( '124.24.52', 'IPv4 not enough quads' );
-	assertFalseIPv4( '24.324.52.13', 'IPv4 out of range' );
-	assertFalseIPv4( '.24.52.13', 'IPv4 starts with period' );
-
-	assertTrueIPv4( '124.24.52.13', '124.24.52.134 is a valid IP' );
-	assertTrueIPv4( '1.24.52.13', '1.24.52.13 is a valid IP' );
-	assertFalseIPv4( '74.24.52.13/20', 'IPv4 ranges are not recogzized as valid IPs' );
-});
+	QUnit.test( 'jsMessage', 1, function ( assert ) {
+		var a = mw.util.jsMessage( 'MediaWiki is <b>Awesome</b>.' );
+		assert.ok( a, 'Basic checking of return value' );
+
+		// Clean up
+		$( '#mw-js-message' ).remove();
+	});
+
+	QUnit.test( 'validateEmail', 6, function ( assert ) {
+		assert.strictEqual( mw.util.validateEmail( '' ), null, 'Should return null for empty string ' );
+		assert.strictEqual( mw.util.validateEmail( 'user@localhost' ), true, 'Return true for a valid e-mail address' );
+
+		// testEmailWithCommasAreInvalids
+		assert.strictEqual( mw.util.validateEmail( 'user,foo@example.org' ), false, 'Emails with commas are invalid' );
+		assert.strictEqual( mw.util.validateEmail( 'userfoo@ex,ample.org' ), false, 'Emails with commas are invalid' );
+
+		// testEmailWithHyphens
+		assert.strictEqual( mw.util.validateEmail( 'user-foo@example.org' ), true, 'Emails may contain a hyphen' );
+		assert.strictEqual( mw.util.validateEmail( 'userfoo@ex-ample.org' ), true, 'Emails may contain a hyphen' );
+	});
+
+	QUnit.test( 'isIPv6Address', 40, function ( assert ) {
+		// Shortcuts
+		function assertFalseIPv6( addy, summary ) {
+			return assert.strictEqual( mw.util.isIPv6Address( addy ), false, summary );
+		}
+		function assertTrueIPv6( addy, summary ) {
+			return assert.strictEqual( mw.util.isIPv6Address( addy ), true, summary );
+		}
+
+		// Based on IPTest.php > testisIPv6
+		assertFalseIPv6( ':fc:100::', 'IPv6 starting with lone ":"' );
+		assertFalseIPv6( 'fc:100:::', 'IPv6 ending with a ":::"' );
+		assertFalseIPv6( 'fc:300', 'IPv6 with only 2 words' );
+		assertFalseIPv6( 'fc:100:300', 'IPv6 with only 3 words' );
+
+		$.each(
+		['fc:100::',
+		'fc:100:a::',
+		'fc:100:a:d::',
+		'fc:100:a:d:1::',
+		'fc:100:a:d:1:e::',
+		'fc:100:a:d:1:e:ac::'], function ( i, addy ){
+			assertTrueIPv6( addy, addy + ' is a valid IP' );
+		});
+
+		assertFalseIPv6( 'fc:100:a:d:1:e:ac:0::', 'IPv6 with 8 words ending with "::"' );
+		assertFalseIPv6( 'fc:100:a:d:1:e:ac:0:1::', 'IPv6 with 9 words ending with "::"' );
+
+		assertFalseIPv6( ':::' );
+		assertFalseIPv6( '::0:', 'IPv6 ending in a lone ":"' );
+
+		assertTrueIPv6( '::', 'IPv6 zero address' );
+		$.each(
+		['::0',
+		'::fc',
+		'::fc:100',
+		'::fc:100:a',
+		'::fc:100:a:d',
+		'::fc:100:a:d:1',
+		'::fc:100:a:d:1:e',
+		'::fc:100:a:d:1:e:ac',
+
+		'fc:100:a:d:1:e:ac:0'], function ( i, addy ){
+			assertTrueIPv6( addy, addy + ' is a valid IP' );
+		});
+
+		assertFalseIPv6( '::fc:100:a:d:1:e:ac:0', 'IPv6 with "::" and 8 words' );
+		assertFalseIPv6( '::fc:100:a:d:1:e:ac:0:1', 'IPv6 with 9 words' );
+
+		assertFalseIPv6( ':fc::100', 'IPv6 starting with lone ":"' );
+		assertFalseIPv6( 'fc::100:', 'IPv6 ending with lone ":"' );
+		assertFalseIPv6( 'fc:::100', 'IPv6 with ":::" in the middle' );
+
+		assertTrueIPv6( 'fc::100', 'IPv6 with "::" and 2 words' );
+		assertTrueIPv6( 'fc::100:a', 'IPv6 with "::" and 3 words' );
+		assertTrueIPv6( 'fc::100:a:d', 'IPv6 with "::" and 4 words' );
+		assertTrueIPv6( 'fc::100:a:d:1', 'IPv6 with "::" and 5 words' );
+		assertTrueIPv6( 'fc::100:a:d:1:e', 'IPv6 with "::" and 6 words' );
+		assertTrueIPv6( 'fc::100:a:d:1:e:ac', 'IPv6 with "::" and 7 words' );
+		assertTrueIPv6( '2001::df', 'IPv6 with "::" and 2 words' );
+		assertTrueIPv6( '2001:5c0:1400:a::df', 'IPv6 with "::" and 5 words' );
+		assertTrueIPv6( '2001:5c0:1400:a::df:2', 'IPv6 with "::" and 6 words' );
+
+		assertFalseIPv6( 'fc::100:a:d:1:e:ac:0', 'IPv6 with "::" and 8 words' );
+		assertFalseIPv6( 'fc::100:a:d:1:e:ac:0:1', 'IPv6 with 9 words' );
+	});
+
+	QUnit.test( 'isIPv4Address', 11, function ( assert ) {
+		// Shortcuts
+		function assertFalseIPv4( addy, summary ) {
+			assert.strictEqual( mw.util.isIPv4Address( addy ), false, summary );
+		}
+		function assertTrueIPv4( addy, summary ) {
+			assert.strictEqual( mw.util.isIPv4Address( addy ), true, summary );
+		}
+
+		// Based on IPTest.php > testisIPv4
+		assertFalseIPv4( false, 'Boolean false is not an IP' );
+		assertFalseIPv4( true, 'Boolean true is not an IP' );
+		assertFalseIPv4( '', 'Empty string is not an IP' );
+		assertFalseIPv4( 'abc', '"abc" is not an IP' );
+		assertFalseIPv4( ':', 'Colon is not an IP' );
+		assertFalseIPv4( '124.24.52', 'IPv4 not enough quads' );
+		assertFalseIPv4( '24.324.52.13', 'IPv4 out of range' );
+		assertFalseIPv4( '.24.52.13', 'IPv4 starts with period' );
+
+		assertTrueIPv4( '124.24.52.13', '124.24.52.134 is a valid IP' );
+		assertTrueIPv4( '1.24.52.13', '1.24.52.13 is a valid IP' );
+		assertFalseIPv4( '74.24.52.13/20', 'IPv4 ranges are not recogzized as valid IPs' );
+	});
+}( mediaWiki, jQuery ) );
diff --git a/thumb.php b/thumb.php
index 362f304b62..15fbf07392 100644
--- a/thumb.php
+++ b/thumb.php
@@ -38,6 +38,7 @@ if ( defined( 'THUMB_HANDLER' ) ) {
 	// Called directly, use $_REQUEST params
 	wfThumbHandleRequest();
 }
+
 wfLogProfilingData();
 
 //--------------------------------------------------------------------------
@@ -61,28 +62,21 @@ function wfThumbHandleRequest() {
  * @return void
  */
 function wfThumbHandle404() {
-	# lighttpd puts the original request in REQUEST_URI, while sjs sets
-	# that to the 404 handler, and puts the original request in REDIRECT_URL.
-	if ( isset( $_SERVER['REDIRECT_URL'] ) ) {
-		# The URL is un-encoded, so put it back how it was
-		$uriPath = str_replace( "%2F", "/", urlencode( $_SERVER['REDIRECT_URL'] ) );
-	} else {
-		$uriPath = $_SERVER['REQUEST_URI'];
-	}
-	# Just get the URI path (REDIRECT_URL/REQUEST_URI is either a full URL or a path)
-	if ( substr( $uriPath, 0, 1 ) !== '/' ) {
-		$bits = wfParseUrl( $uriPath );
-		if ( $bits && isset( $bits['path'] ) ) {
-			$uriPath = $bits['path'];
-		} else {
-			wfThumbError( 404, 'The source file for the specified thumbnail does not exist.' );
-			return;
-		}
+	global $wgArticlePath;
+
+	# Set action base paths so that WebRequest::getPathInfo()
+	# recognizes the "X" as the 'title' in ../thumb_handler.php/X urls.
+	$wgArticlePath = false; # Don't let a "/*" article path clober our action path
+
+	$matches = WebRequest::getPathInfo();
+	if ( !isset( $matches['title'] ) ) {
+		wfThumbError( 404, 'Could not determine the name of the requested thumbnail.' );
+		return;
 	}
 
-	$params = wfExtractThumbParams( $uriPath ); // basic wiki URL param extracting
+	$params = wfExtractThumbParams( $matches['title'] ); // basic wiki URL param extracting
 	if ( $params == null ) {
-		wfThumbError( 404, 'The source file for the specified thumbnail does not exist.' );
+		wfThumbError( 400, 'The specified thumbnail parameters are not recognized.' );
 		return;
 	}
 
@@ -299,43 +293,28 @@ function wfStreamThumb( array $params ) {
  * Extract the required params for thumb.php from the thumbnail request URI.
  * At least 'width' and 'f' should be set if the result is an array.
  *
- * @param $uriPath String Thumbnail request URI path
+ * @param $thumbRel String Thumbnail path relative to the thumb zone
  * @return Array|null associative params array or null
  */
-function wfExtractThumbParams( $uriPath ) {
+function wfExtractThumbParams( $thumbRel ) {
 	$repo = RepoGroup::singleton()->getLocalRepo();
 
-	// Zone URL might be relative ("/images") or protocol-relative ("//lang.site/image")
-	$zoneUriPath = $repo->getZoneHandlerUrl( 'thumb' )
-		? $repo->getZoneHandlerUrl( 'thumb' ) // custom URL
-		: $repo->getZoneUrl( 'thumb' ); // default to main URL
-	$bits = wfParseUrl( wfExpandUrl( $zoneUriPath, PROTO_INTERNAL ) );
-	if ( $bits && isset( $bits['path'] ) ) {
-		$zoneUriPath = $bits['path'];
-	} else {
-		return null; // not a valid thumbnail URL
-	}
-
 	$hashDirReg = $subdirReg = '';
 	for ( $i = 0; $i < $repo->getHashLevels(); $i++ ) {
 		$subdirReg .= '[0-9a-f]';
 		$hashDirReg .= "$subdirReg/";
 	}
-	$zoneReg = preg_quote( $zoneUriPath ); // regex for thumb zone URI
 
 	// Check if this is a thumbnail of an original in the local file repo
-	if ( preg_match( "!^$zoneReg/((archive/)?$hashDirReg([^/]*)/([^/]*))$!", $uriPath, $m ) ) {
+	if ( preg_match( "!^((archive/)?$hashDirReg([^/]*)/([^/]*))$!", $thumbRel, $m ) ) {
 		list( /*all*/, $rel, $archOrTemp, $filename, $thumbname ) = $m;
 	// Check if this is a thumbnail of an temp file in the local file repo
-	} elseif ( preg_match( "!^$zoneReg/(temp/)($hashDirReg([^/]*)/([^/]*))$!", $uriPath, $m ) ) {
+	} elseif ( preg_match( "!^(temp/)($hashDirReg([^/]*)/([^/]*))$!", $thumbRel, $m ) ) {
 		list( /*all*/, $archOrTemp, $rel, $filename, $thumbname ) = $m;
 	} else {
 		return null; // not a valid looking thumbnail request
 	}
 
-	$filename = urldecode( $filename );
-	$thumbname = urldecode( $thumbname );
-
 	$params = array( 'f' => $filename, 'rel404' => $rel );
 	if ( $archOrTemp === 'archive/' ) {
 		$params['archived'] = 1;
@@ -343,17 +322,18 @@ function wfExtractThumbParams( $uriPath ) {
 		$params['temp'] = 1;
 	}
 
+	// Check hooks if parameters can be extracted
+	// Hooks return false if they manage to *resolve* the parameters
+	if ( !wfRunHooks( 'ExtractThumbParameters', array( $thumbname, &$params ) ) ) {
+		return $params; // valid thumbnail URL (via extension or config)
 	// Check if the parameters can be extracted from the thumbnail name...
-	if ( preg_match( '!^(page(\d*)-)*(\d*)px-[^/]*$!', $thumbname, $matches ) ) {
+	} elseif ( preg_match( '!^(page(\d*)-)*(\d*)px-[^/]*$!', $thumbname, $matches ) ) {
 		list( /* all */, $pagefull, $pagenum, $size ) = $matches;
 		$params['width'] = $size;
 		if ( $pagenum ) {
 			$params['page'] = $pagenum;
 		}
 		return $params; // valid thumbnail URL
-	// Hooks return false if they manage to *resolve* the parameters
-	} elseif ( !wfRunHooks( 'ExtractThumbParameters', array( $thumbname, &$params ) ) ) {
-		return $params; // valid thumbnail URL (via extension or config)
 	}
 
 	return null; // not a valid thumbnail URL