From: Siebrand <siebrand@wikimedia.org>
Date: Wed, 29 Aug 2012 17:48:44 +0000 (+0000)
Subject: Merge "Revert "Revert "jQuery 1.8"""
X-Git-Tag: 1.31.0-rc.0~22548
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22suivi_revisions%22%29%20.%20%22?a=commitdiff_plain;h=1cf83c086d2139619992175442085d5b7cd76bf4;hp=a7b4d7fd903a0343d79fc93e25a49029196d174e;p=lhc%2Fweb%2Fwiklou.git

Merge "Revert "Revert "jQuery 1.8"""
---

diff --git a/.jshintignore b/.jshintignore
index 9534f97715..45f2da7f1f 100644
--- a/.jshintignore
+++ b/.jshintignore
@@ -8,6 +8,7 @@ resources/jquery/jquery.form.js
 resources/jquery/jquery.hoverIntent.js
 resources/jquery/jquery.js
 resources/jquery/jquery.json.js
+resources/jquery/jquery.jStorage.js
 resources/jquery/jquery.mockjax.js
 resources/jquery/jquery.qunit.js
 resources/jquery/jquery.validate.js
diff --git a/RELEASE-NOTES-1.20 b/RELEASE-NOTES-1.20
index 759e19f24d..cdd27072ec 100644
--- a/RELEASE-NOTES-1.20
+++ b/RELEASE-NOTES-1.20
@@ -131,6 +131,9 @@ upgrade PHP if you have not done so prior to upgrading MediaWiki.
 * (bug 23226) Add |class= parameter to image links in order to add class(es) to HTML img tag.
 * (bug 39431) SVG animated status is now shown in long description
 * (bug 39376) jquery.form upgraded to 3.14
+* SVG files will now show the actual width in the SVG's specified units
+  in the metadata box.
+* Added ResourceLoader module "jquery.jStorage".
 
 === Bug fixes in 1.20 ===
 * (bug 30245) Use the correct way to construct a log page title.
@@ -204,7 +207,7 @@ upgrade PHP if you have not done so prior to upgrading MediaWiki.
 * (bug 37331) ResourceLoader modules sometimes execute twice in Firefox
 * (bug 31644) GlobalUsage, CentralAuth and AbuseLog extensions should not use
   insecure links to foreign wikis in the WikiMap.
-* (bug 36073) Avoid duplicate element IDs on File pages
+* (bug 36073) Avoid duplicate element IDs on File pages.
 * (bug 25095) Special:Categories should also include the first relevant item
   when "from" is filled.
 * (bug 35526) jquery.tablesorter now uses a stable sort.
@@ -213,10 +216,15 @@ upgrade PHP if you have not done so prior to upgrading MediaWiki.
   are returned, like in previous versions.
 * (bug 36524) "Show" options on Special:RecentChanges and Special:RecentChangesLinked
   are now remembered between successive clicks.
-* (bug 26069) Page title is no longer "Error" for all error pages
+* (bug 26069) Page title is no longer "Error" for all error pages.
 * (bug 39297) Show warning if thumbnail of animated image will not be animated.
 * (bug 38249) Parser will throw an exception instead of outputting gibberish if
   PCRE is compiled without support for unicode properties.
+* (bug 30390) Suggested file name on Special:Upload should not contain
+  illegal characters.
+* (bug 27111) Cascading foreign file repos now fetch shared descriptions properly.
+* EXIF below sea level GPS altitude data is now shown correctly.
+* (bug 39284) jquery.tablesorter should not consider "."" or "?"" to be a currency.
 
 === API changes in 1.20 ===
 * (bug 34316) Add ability to retrieve maximum upload size from MediaWiki API.
@@ -253,6 +261,7 @@ upgrade PHP if you have not done so prior to upgrading MediaWiki.
 * (bug 38904) prop=revisions&rvstart=... no longer blows up when continuing.
 * (bug 39032) ApiQuery generates help in constructor.
 * (bug 11142) Improve file extension blacklist error reporting in API upload
+* (bug 39635) PostgreSQL LOCK IN SHARE MODE option is a syntax error
 
 === Languages updated in 1.20 ===
 
@@ -286,6 +295,7 @@ changes to languages because of Bugzilla reports.
 * Deprecated mw.user.anonymous in favour of mw.user.isAnon.
 * Deprecated DatabaseBase functions newFromParams(), newFromType(), set(),
   quote_ident(), and escapeLike() were removed.
+* Use of __DIR__ instead of dirname( __FILE__ ).
 
 == Compatibility ==
 
diff --git a/api.php b/api.php
index 9e1f5dd334..7fae373102 100644
--- a/api.php
+++ b/api.php
@@ -35,6 +35,7 @@ define( 'MW_API', true );
 
 // Bail if PHP is too low
 if ( !function_exists( 'version_compare' ) || version_compare( phpversion(), '5.3.2' ) < 0 ) {
+	// We need to use dirname( __FILE__ ) here cause __DIR__ is PHP5.3+
 	require( dirname( __FILE__ ) . '/includes/PHPVersionError.php' );
 	wfPHPVersionError( 'api.php' );
 }
@@ -43,7 +44,7 @@ if ( !function_exists( 'version_compare' ) || version_compare( phpversion(), '5.
 if ( isset( $_SERVER['MW_COMPILED'] ) ) {
 	require ( 'core/includes/WebStart.php' );
 } else {
-	require ( dirname( __FILE__ ) . '/includes/WebStart.php' );
+	require ( __DIR__ . '/includes/WebStart.php' );
 }
 
 wfProfileIn( 'api.php' );
diff --git a/docs/hooks.txt b/docs/hooks.txt
index 2862d1ba87..7844aaf48c 100644
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -397,6 +397,11 @@ is the User object. In the hook, just add your callback to the
 $tokenFunctions array and return true (returning false makes no sense)
 $tokenFunctions: array(action => callback)
 
+'ApiMain::onException': Called by ApiMain::executeActionWithErrorHandling()
+when an exception is thrown during API action execution.
+$apiMain: Calling ApiMain instance.
+$e: Exception object.
+
 'ApiRsdServiceApis': Add or remove APIs from the RSD services list.
 Each service should have its own entry in the $apis array and have a
 unique name, passed as key for the array that represents the service data.
@@ -763,11 +768,11 @@ $title: Title object for the title being linked to (may not be the same as
   $wgTitle, if the section is included from a template)
 $section: The designation of the section being pointed to, to be included in
   the link, like "&section=$section"
-$tooltip: The default tooltip.  Escape with htmlspecialchars() before using.
+$tooltip: The default tooltip.  Escape before using.
   By default, this is wrapped in the 'editsectionhint' message.
 &$result: The HTML to return, prefilled with the default plus whatever other
   changes earlier hooks have made
-$lang: The language code to use for the link in the wfMsg* functions
+$lang: The language code to use for the link in the wfMessage function
 
 'EditFilter': Perform checks on an edit
 $editor: Edit form (see includes/EditPage.php)
@@ -868,7 +873,7 @@ $title: Title being linked to
 $section: Section to link to
 $link: Default link
 &$result: Result (alter this to override the generated links)
-$lang: The language code to use for the link in the wfMsg* functions
+$lang: The language code to use for the link in the wfMessage function
 
 'EmailConfirmed': When checking that the user's email address is "confirmed"
 $user: User being checked
@@ -1283,7 +1288,7 @@ $param: Associative Array with the following additional options:
  - lim Integer Limit of items to show, default is 50
  - conds Array Extra conditions for the query (e.g. "log_action != 'revision'")
  - showIfEmpty boolean Set to false if you don't want any output in case the loglist is empty if set to true (default), "No matching items in log" is displayed if loglist is empty
- - msgKey Array If you want a nice box with a message, set this to the key of the message. First element is the message key, additional optional elements are parameters for the key that are processed with wfMsgExt and option 'parse'
+ - msgKey Array If you want a nice box with a message, set this to the key of the message. First element is the message key, additional optional elements are parameters for the key that are processed with wfMessage()->params()->parseAsBlock()
  - offset Set to overwrite offset parameter in $wgRequest set to '' to unset offset
  - wrap String Wrap the message in html (usually something like "&lt;div ...>$1&lt;/div>").
  - flags Integer display flags (NO_ACTION_LINK,NO_EXTRA_USER_LINKS)
@@ -1592,7 +1597,7 @@ Return false and put the merged text into $text to override the default behavior
 'PreferencesGetLegend': Override the text used for the <legend> of a preferences section
 $form: the PreferencesForm object. This is a ContextSource as well
 $key: the section name
-&$legend: the legend text. Defaults to wfMsg( "prefs-$key" ) but may be overridden
+&$legend: the legend text. Defaults to wfMessage( "prefs-$key" )->text() but may be overridden
 
 'PrefixSearchBackend': Override the title prefix search used for OpenSearch and
 AJAX search suggestions. Put results into &$results outparam and return false.
diff --git a/docs/magicword.txt b/docs/magicword.txt
index ceae026295..1d9bf7d466 100644
--- a/docs/magicword.txt
+++ b/docs/magicword.txt
@@ -40,7 +40,7 @@ $magicWords['es'] = array(
 );
 ----
 
-$wgExtensionMessagesFiles['ExtensionNameMagic'] = dirname( __FILE__ ) . '/ExtensionName.i18n.magic.php';
+$wgExtensionMessagesFiles['ExtensionNameMagic'] = __DIR__ . '/ExtensionName.i18n.magic.php';
 $wgHooks['MagicWordwgVariableIDs'][] = 'wfAddCustomMagicWordID';
 $wgHooks['ParserGetVariableValueSwitch'][] = 'wfGetCustomMagicWordValue';
 
@@ -74,7 +74,7 @@ $magicWords['es'] = array(
 );
 ----
 
-$wgExtensionMessagesFiles['ExtensionNameMagic'] = dirname( __FILE__ ) . '/ExtensionName.i18n.magic.php';
+$wgExtensionMessagesFiles['ExtensionNameMagic'] = __DIR__ . '/ExtensionName.i18n.magic.php';
 $wgHooks['ParserFirstCallInit'][] = 'wfRegisterCustomMagicWord';
 
 function wfRegisterCustomMagicWord( &$parser ){
diff --git a/docs/memcached.txt b/docs/memcached.txt
index f5384f9d75..3872edc830 100644
--- a/docs/memcached.txt
+++ b/docs/memcached.txt
@@ -138,7 +138,7 @@ Message Cache:
 	key: $wgDBname:messages, $wgDBname:messages-hash, $wgDBname:messages-status
 	ex: wikidb:messages, wikidb:messages-hash, wikidb:messages-status
 	stores: an array where the keys are DB keys and the values are messages
-	set in: wfMsg(), Article::editUpdates() and Title::moveTo()
+	set in: wfMessage(), Article::editUpdates() and Title::moveTo()
 	expriy: $wgMsgCacheExpiry
 	cleared by: nothing
 
diff --git a/extensions/README b/extensions/README
index 22f4710513..66236e8514 100644
--- a/extensions/README
+++ b/extensions/README
@@ -21,10 +21,10 @@ Please note that under POSIX systems (Linux...), parent of a symbolic path
 refers to the link source, NOT to the target! You should check the env
 variable MW_INSTALL_PATH in case the extension is not in the default location.
 
-The following code snippet let you override the default path: 
+The following code snippet lets you override the default path:
 
  $IP = getenv( 'MW_INSTALL_PATH' );
  if( $IP === false ) {
-	$IP = dirname( __FILE__ ) . '/../..';
+	$IP = __DIR__ . '/../..';
  }
  require_once( "$IP/maintenance/Maintenance.php" ); // a MediaWiki core file
diff --git a/img_auth.php b/img_auth.php
index d7125897c5..b3a34955de 100644
--- a/img_auth.php
+++ b/img_auth.php
@@ -43,7 +43,7 @@ define( 'MW_NO_OUTPUT_COMPRESSION', 1 );
 if ( isset( $_SERVER['MW_COMPILED'] ) ) {
 	require ( 'core/includes/WebStart.php' );
 } else {
-	require ( dirname( __FILE__ ) . '/includes/WebStart.php' );
+	require ( __DIR__ . '/includes/WebStart.php' );
 }
 wfProfileIn( 'img_auth.php' );
 
@@ -148,13 +148,13 @@ function wfForbidden( $msg1, $msg2 ) {
 	array_shift( $args );
 	array_shift( $args );
 
-	$msgHdr = htmlspecialchars( wfMsg( $msg1 ) );
+	$msgHdr = wfMessage( $msg1 )->escaped();
 	$detailMsgKey = $wgImgAuthDetails ? $msg2 : 'badaccess-group0';
-	$detailMsg = htmlspecialchars( wfMsg( $detailMsgKey, $args ) );
+	$detailMsg = wfMessage( $detailMsgKey, $args )->escaped();
 
 	wfDebugLog( 'img_auth',
-		"wfForbidden Hdr:" . wfMsgExt( $msg1, array( 'language' => 'en' ) ). " Msg: ".
-		wfMsgExt( $msg2, array( 'language' => 'en' ), $args )
+		"wfForbidden Hdr:" . wfMessage( $msg1 )->inLanguage( 'en' )->text() . " Msg: ".
+		wfMessage( $msg2, $args )->inLanguage( 'en' )->text()
 	);
 
 	header( 'HTTP/1.0 403 Forbidden' );
diff --git a/includes/Article.php b/includes/Article.php
index 5a8bbeb2dc..a3fb747176 100644
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -1532,11 +1532,10 @@ class Article extends Page {
 		} else {
 			$outputPage->setPageTitle( wfMessage( 'cannotdelete-title', $this->getTitle()->getPrefixedText() ) );
 			if ( $error == '' ) {
-				$errors = $status->getErrorsArray();
-				$deleteLogPage = new LogPage( 'delete' );
-				$outputPage->wrapWikiMsg( "<div class=\"error mw-error-cannotdelete\">\n$1\n</div>",
-					$errors[0]
+				$outputPage->addWikiText(
+					"<div class=\"error mw-error-cannotdelete\">\n" . $status->getWikiText() . "\n</div>"
 				);
+				$deleteLogPage = new LogPage( 'delete' );
 				$outputPage->addHTML( Xml::element( 'h2', null, $deleteLogPage->getName()->text() ) );
 
 				LogEventsList::showLogExtract(
diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index 1b46c6ae6b..9d78dbdc38 100644
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -252,7 +252,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',
@@ -1007,6 +1006,8 @@ $wgAutoloadLocalClasses = array(
 	'FakeConverter' => 'languages/Language.php',
 	'Language' => 'languages/Language.php',
 	'LanguageConverter' => 'languages/LanguageConverter.php',
+	'CLDRPluralRuleEvaluator' => 'languages/utils/CLDRPluralRuleEvaluator.php',
+	'CLDRPluralRuleError' => 'languages/utils/CLDRPluralRuleEvaluator.php',
 
 	# maintenance
 	'ConvertLinks' => 'maintenance/convertLinks.php',
diff --git a/includes/Category.php b/includes/Category.php
index d9ca234ef8..b7b12e8a31 100644
--- a/includes/Category.php
+++ b/includes/Category.php
@@ -297,8 +297,8 @@ class Category {
 			'IGNORE'
 		);
 
-		$cond1 = $dbw->conditional( 'page_namespace=' . NS_CATEGORY, 1, 'NULL' );
-		$cond2 = $dbw->conditional( 'page_namespace=' . NS_FILE, 1, 'NULL' );
+		$cond1 = $dbw->conditional( array( 'page_namespace' => NS_CATEGORY ), 1, 'NULL' );
+		$cond2 = $dbw->conditional( array( 'page_namespace' => NS_FILE ), 1, 'NULL' );
 		$result = $dbw->selectRow(
 			array( 'categorylinks', 'page' ),
 			array( 'pages' => 'COUNT(*)',
diff --git a/includes/CategoryViewer.php b/includes/CategoryViewer.php
index 4e4f311a0a..5f4aaeaa01 100644
--- a/includes/CategoryViewer.php
+++ b/includes/CategoryViewer.php
@@ -504,7 +504,7 @@ class CategoryViewer extends ContextSource {
 		# Split into three columns
 		$columns = array_chunk( $columns, ceil( count( $columns ) / 3 ), true /* preserve keys */ );
 
-		$ret = '<table width="100%"><tr valign="top">';
+		$ret = '<table width="100%"><tr style="vertical-align: top;">';
 		$prevchar = null;
 
 		foreach ( $columns as $column ) {
diff --git a/includes/CryptRand.php b/includes/CryptRand.php
index bb80eeb3a5..858eebf205 100644
--- a/includes/CryptRand.php
+++ b/includes/CryptRand.php
@@ -83,8 +83,8 @@ class MWCryptRand {
 		$files[] = __FILE__;
 
 		// We must also have a parent folder, and with the usual file structure, a grandparent
-		$files[] = dirname( __FILE__ );
-		$files[] = dirname( dirname( __FILE__ ) );
+		$files[] = __DIR__;
+		$files[] = dirname( __DIR__ );
 
 		// The config file is likely the most often edited file we know should be around
 		// so include its stat info into the state.
diff --git a/includes/DataUpdate.php b/includes/DataUpdate.php
index 793d335b2a..377b64c0cf 100644
--- a/includes/DataUpdate.php
+++ b/includes/DataUpdate.php
@@ -84,8 +84,8 @@ abstract class DataUpdate implements DeferrableUpdate {
 		$exception = null;
 
 		/**
-		 * @var $update StorageUpdate
-		 * @var $trans StorageUpdate
+		 * @var $update DataUpdate
+		 * @var $trans DataUpdate
 		 */
 
 		try {
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 3ea35d53fc..045eb98607 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -2760,7 +2760,7 @@ $wgShowRollbackEditCount = 10;
  *      'scripts' => 'myExtension.js',
  *      'styles' => 'myExtension.css',
  *      'dependencies' => array( 'jquery.cookie', 'jquery.tabIndex' ),
- *      'localBasePath' => dirname( __FILE__ ),
+ *      'localBasePath' => __DIR__,
  *      'remoteExtPath' => 'MyExtension',
  *   );
  * @endcode
@@ -5212,7 +5212,7 @@ $wgExtensionFunctions = array();
  *
  * @par Example:
  * @code
- *    $wgExtensionMessagesFiles['ConfirmEdit'] = dirname(__FILE__).'/ConfirmEdit.i18n.php';
+ *    $wgExtensionMessagesFiles['ConfirmEdit'] = __DIR__.'/ConfirmEdit.i18n.php';
  * @endcode
  */
 $wgExtensionMessagesFiles = array();
diff --git a/includes/Defines.php b/includes/Defines.php
index 55d9a7a238..be9f981602 100644
--- a/includes/Defines.php
+++ b/includes/Defines.php
@@ -205,7 +205,7 @@ define( 'LIST_SET_PREPARED', 8);  // List of (?, ?, ?) for DatabaseIbm_db2
 /**
  * Unicode and normalisation related
  */
-require_once dirname(__FILE__).'/normal/UtfNormalDefines.php';
+require_once __DIR__.'/normal/UtfNormalDefines.php';
 
 /**@{
  * Hook support constants
diff --git a/includes/EditPage.php b/includes/EditPage.php
index b958f1766e..038916861e 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -2102,8 +2102,11 @@ class EditPage {
 				);
 			}
 		}
+		# Add header copyright warning
+		$this->showHeaderCopyrightWarning();
 	}
 
+
 	/**
 	 * Standard summary input and label (wgSummary), abstracted so EditPage
 	 * subclasses may reorganize the form.
@@ -2399,6 +2402,18 @@ HTML
 		$wgOut->addHTML( '<div id="wikiDiff">' . $difftext . '</div>' );
 	}
 
+	/**
+	 * Show the header copyright warning.
+	 */
+	protected function showHeaderCopyrightWarning() {
+		$msg = 'editpage-head-copy-warn';
+		if ( !wfMessage( $msg )->isDisabled() ) {
+			global $wgOut;
+			$wgOut->wrapWikiMsg( "<div class='editpage-head-copywarn'>\n$1\n</div>",
+				'editpage-head-copy-warn' );
+		}
+	}
+
 	/**
 	 * Give a chance for site and per-namespace customizations of
 	 * terms of service summary link that might exist separately
@@ -2614,14 +2629,14 @@ HTML
 
 		if ( $this->mTriedSave && !$this->mTokenOk ) {
 			if ( $this->mTokenOkExceptSuffix ) {
-				$note = wfMessage( 'token_suffix_mismatch' )->text();
+				$note = wfMessage( 'token_suffix_mismatch' )->plain();
 			} else {
-				$note = wfMessage( 'session_fail_preview' )->text();
+				$note = wfMessage( 'session_fail_preview' )->plain();
 			}
 		} elseif ( $this->incompleteForm ) {
-			$note = wfMessage( 'edit_form_incomplete' )->text();
+			$note = wfMessage( 'edit_form_incomplete' )->plain();
 		} else {
-			$note = wfMessage( 'previewnote' ) .
+			$note = wfMessage( 'previewnote' )->plain() .
 				' [[#' . self::EDITFORM_ID . '|' . $wgLang->getArrow() . ' ' . wfMessage( 'continue-editing' )->text() . ']]';
 		}
 
diff --git a/includes/Exception.php b/includes/Exception.php
index 25f90e6183..a131cca26e 100644
--- a/includes/Exception.php
+++ b/includes/Exception.php
@@ -319,13 +319,11 @@ class ErrorPageError extends MWException {
 	public $title, $msg, $params;
 
 	/**
-	 * @todo document
+	 * Note: these arguments are keys into wfMessage(), not text!
 	 *
-	 * Note: these arguments are keys into wfMsg(), not text!
-	 *
-	 * @param $title A title
-	 * @param $msg String|Message . In string form, should be a message key
-	 * @param $params Array Array to wfMessage()
+	 * @param $title string|Message Message key (string) for page title, or a Message object
+	 * @param $msg string|Message Message key (string) for error text, or a Message object
+	 * @param $params array with parameters to wfMessage()
 	 */
 	function __construct( $title, $msg, $params = null ) {
 		$this->title = $title;
@@ -356,9 +354,8 @@ class ErrorPageError extends MWException {
  * @ingroup Exception
  */
 class BadTitleError extends ErrorPageError {
-
 	/**
-	 * @param $msg string A message key (default: 'badtitletext')
+	 * @param $msg string|Message A message key (default: 'badtitletext')
 	 * @param $params Array parameter to wfMessage()
 	 */
 	function __construct( $msg = 'badtitletext', $params = null ) {
diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 4252f55aa9..4ff258d2d5 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -391,7 +391,7 @@ function wfArrayToCgi( $array1, $array2 = null, $prefix = '' ) {
 
 	$cgi = '';
 	foreach ( $array1 as $key => $value ) {
-		if ( $value !== false ) {
+		if ( !is_null($value) && $value !== false ) {
 			if ( $cgi != '' ) {
 				$cgi .= '&';
 			}
@@ -412,11 +412,8 @@ function wfArrayToCgi( $array1, $array2 = null, $prefix = '' ) {
 			} else {
 				if ( is_object( $value ) ) {
 					$value = $value->__toString();
-				} elseif( !is_null( $value ) ) {
-					$cgi .= urlencode( $key ) . '=' . urlencode( $value );
-				} else {
-					$cgi .= urlencode( $key );
 				}
+				$cgi .= urlencode( $key ) . '=' . urlencode( $value );
 			}
 		}
 	}
@@ -443,15 +440,14 @@ function wfCgiToArray( $query ) {
 			continue;
 		}
 		if ( strpos( $bit, '=' ) === false ) {
-			// Pieces like &qwerty become 'qwerty' => null
-			$key = urldecode( $bit );
-			$value = null;
+			// Pieces like &qwerty become 'qwerty' => '' (at least this is what php does)
+			$key = $bit;
+			$value = '';
 		} else {
 			list( $key, $value ) = explode( '=', $bit );
-			$key = urldecode( $key );
-			$value = urldecode( $value );
 		}
-
+		$key = urldecode( $key );
+		$value = urldecode( $value );
 		if ( strpos( $key, '[' ) !== false ) {
 			$keys = array_reverse( explode( '[', $key ) );
 			$key = array_pop( $keys );
@@ -476,15 +472,23 @@ function wfCgiToArray( $query ) {
  * Append a query string to an existing URL, which may or may not already
  * have query string parameters already. If so, they will be combined.
  *
- * @deprecated in 1.20. Use Uri class.
  * @param $url String
  * @param $query Mixed: string or associative array
  * @return string
  */
 function wfAppendQuery( $url, $query ) {
-	$obj = new Uri( $url );
-	$obj->extendQuery( $query );
-	return $obj->toString();
+	if ( is_array( $query ) ) {
+		$query = wfArrayToCgi( $query );
+	}
+	if( $query != '' ) {
+		if( false === strpos( $url, '?' ) ) {
+			$url .= '?';
+		} else {
+			$url .= '&';
+		}
+		$url .= $query;
+	}
+	return $url;
 }
 
 /**
@@ -572,13 +576,49 @@ function wfExpandUrl( $url, $defaultProto = PROTO_CURRENT ) {
  * @todo Need to integrate this into wfExpandUrl (bug 32168)
  *
  * @since 1.19
- * @deprecated
  * @param $urlParts Array URL parts, as output from wfParseUrl
  * @return string URL assembled from its component parts
  */
 function wfAssembleUrl( $urlParts ) {
-	$obj = new Uri( $urlParts );
-	return $obj->toString();
+	$result = '';
+
+	if ( isset( $urlParts['delimiter'] ) ) {
+		if ( isset( $urlParts['scheme'] ) ) {
+			$result .= $urlParts['scheme'];
+		}
+
+		$result .= $urlParts['delimiter'];
+	}
+
+	if ( isset( $urlParts['host'] ) ) {
+		if ( isset( $urlParts['user'] ) ) {
+			$result .= $urlParts['user'];
+			if ( isset( $urlParts['pass'] ) ) {
+				$result .= ':' . $urlParts['pass'];
+			}
+			$result .= '@';
+		}
+
+		$result .= $urlParts['host'];
+
+		if ( isset( $urlParts['port'] ) ) {
+			$result .= ':' . $urlParts['port'];
+		}
+	}
+
+	if ( isset( $urlParts['path'] ) ) {
+		$result .= $urlParts['path'];
+	}
+
+	if ( isset( $urlParts['query'] ) ) {
+		$result .= '?' . $urlParts['query'];
+	}
+
+	if ( isset( $urlParts['fragment'] ) ) {
+		$result .= '#' . $urlParts['fragment'];
+	}
+
+	return $result;
 }
 
 /**
@@ -725,13 +765,58 @@ function wfUrlProtocolsWithoutProtRel() {
  * 2) Handles protocols that don't use :// (e.g., mailto: and news: , as well as protocol-relative URLs) correctly
  * 3) Adds a "delimiter" element to the array, either '://', ':' or '//' (see (2))
  *
- * @deprecated
  * @param $url String: a URL to parse
  * @return Array: bits of the URL in an associative array, per PHP docs
  */
 function wfParseUrl( $url ) {
-	$obj = new Uri( $url );
-	return $obj->getComponents();
+	global $wgUrlProtocols; // Allow all protocols defined in DefaultSettings/LocalSettings.php
+
+	// Protocol-relative URLs are handled really badly by parse_url(). It's so bad that the easiest
+	// way to handle them is to just prepend 'http:' and strip the protocol out later
+	$wasRelative = substr( $url, 0, 2 ) == '//';
+	if ( $wasRelative ) {
+		$url = "http:$url";
+	}
+	wfSuppressWarnings();
+	$bits = parse_url( $url );
+	wfRestoreWarnings();
+	// parse_url() returns an array without scheme for some invalid URLs, e.g.
+	// parse_url("%0Ahttp://example.com") == array( 'host' => '%0Ahttp', 'path' => 'example.com' )
+	if ( !$bits || !isset( $bits['scheme'] ) ) {
+		return false;
+	}
+
+	// most of the protocols are followed by ://, but mailto: and sometimes news: not, check for it
+	if ( in_array( $bits['scheme'] . '://', $wgUrlProtocols ) ) {
+		$bits['delimiter'] = '://';
+	} elseif ( in_array( $bits['scheme'] . ':', $wgUrlProtocols ) ) {
+		$bits['delimiter'] = ':';
+		// parse_url detects for news: and mailto: the host part of an url as path
+		// We have to correct this wrong detection
+		if ( isset( $bits['path'] ) ) {
+			$bits['host'] = $bits['path'];
+			$bits['path'] = '';
+		}
+	} else {
+		return false;
+	}
+
+	/* Provide an empty host for eg. file:/// urls (see bug 28627) */
+	if ( !isset( $bits['host'] ) ) {
+		$bits['host'] = '';
+
+		/* parse_url loses the third / for file:///c:/ urls (but not on variants) */
+		if ( substr( $bits['path'], 0, 1 ) !== '/' ) {
+			$bits['path'] = '/' . $bits['path'];
+		}
+	}
+
+	// If the URL was protocol-relative, fix scheme and delimiter
+	if ( $wasRelative ) {
+		$bits['scheme'] = '';
+		$bits['delimiter'] = '//';
+	}
+	return $bits;
 }
 
 /**
@@ -847,10 +932,7 @@ function wfMatchesDomainList( $url, $domains ) {
  * @param $logonly Bool: set true to avoid appearing in HTML when $wgDebugComments is set
  */
 function wfDebug( $text, $logonly = false ) {
-	global $wgOut, $wgDebugLogFile, $wgDebugComments, $wgProfileOnly, $wgDebugRawPage;
-	global $wgDebugLogPrefix, $wgShowDebug;
-
-	static $cache = array(); // Cache of unoutputted messages
+	global $wgDebugLogFile, $wgProfileOnly, $wgDebugRawPage, $wgDebugLogPrefix;
 
 	if ( !$wgDebugRawPage && wfIsDebugRawPage() ) {
 		return;
@@ -861,15 +943,10 @@ function wfDebug( $text, $logonly = false ) {
 		$text = preg_replace( '/[^\n]/', $timer . '\0', $text, 1 );
 	}
 
-	if ( ( $wgDebugComments || $wgShowDebug ) && !$logonly ) {
-		$cache[] = $text;
-
-		if ( isset( $wgOut ) && is_object( $wgOut ) ) {
-			// add the message and any cached messages to the output
-			array_map( array( $wgOut, 'debug' ), $cache );
-			$cache = array();
-		}
+	if ( !$logonly ) {
+		MWDebug::debugMsg( $text );
 	}
+
 	if ( wfRunHooks( 'Debug', array( $text, null /* no log group */ ) ) ) {
 		if ( $wgDebugLogFile != '' && !$wgProfileOnly ) {
 			# Strip unprintables; they can switch terminal modes when binary data
@@ -879,8 +956,6 @@ function wfDebug( $text, $logonly = false ) {
 			wfErrorLog( $text, $wgDebugLogFile );
 		}
 	}
-
-	MWDebug::debugMsg( $text );
 }
 
 /**
@@ -1007,35 +1082,7 @@ function wfLogDBError( $text ) {
  * @return null
  */
 function wfDeprecated( $function, $version = false, $component = false, $callerOffset = 2 ) {
-	static $functionsWarned = array();
-
-	MWDebug::deprecated( $function, $version, $component );
-
-	if ( !isset( $functionsWarned[$function] ) ) {
-		$functionsWarned[$function] = true;
-
-		if ( $version ) {
-			global $wgDeprecationReleaseLimit;
-
-			if ( $wgDeprecationReleaseLimit && $component === false ) {
-				# Strip -* off the end of $version so that branches can use the
-				# format #.##-branchname to avoid issues if the branch is merged into
-				# a version of MediaWiki later than what it was branched from
-				$comparableVersion = preg_replace( '/-.*$/', '', $version );
-
-				# If the comparableVersion is larger than our release limit then
-				# skip the warning message for the deprecation
-				if ( version_compare( $wgDeprecationReleaseLimit, $comparableVersion, '<' ) ) {
-					return;
-				}
-			}
-
-			$component = $component === false ? 'MediaWiki' : $component;
-			wfWarn( "Use of $function was deprecated in $component $version.", $callerOffset );
-		} else {
-			wfWarn( "Use of $function is deprecated.", $callerOffset );
-		}
-	}
+	MWDebug::deprecated( $function, $version, $component, $callerOffset + 1 );
 }
 
 /**
@@ -1049,34 +1096,7 @@ function wfDeprecated( $function, $version = false, $component = false, $callerO
  *        is true
  */
 function wfWarn( $msg, $callerOffset = 1, $level = E_USER_NOTICE ) {
-	global $wgDevelopmentWarnings;
-
-	MWDebug::warning( $msg, $callerOffset + 2 );
-
-	$callers = wfDebugBacktrace();
-	if ( isset( $callers[$callerOffset + 1] ) ) {
-		$callerfunc = $callers[$callerOffset + 1];
-		$callerfile = $callers[$callerOffset];
-		if ( isset( $callerfile['file'] ) && isset( $callerfile['line'] ) ) {
-			$file = $callerfile['file'] . ' at line ' . $callerfile['line'];
-		} else {
-			$file = '(internal function)';
-		}
-		$func = '';
-		if ( isset( $callerfunc['class'] ) ) {
-			$func .= $callerfunc['class'] . '::';
-		}
-		if ( isset( $callerfunc['function'] ) ) {
-			$func .= $callerfunc['function'];
-		}
-		$msg .= " [Called from $func in $file]";
-	}
-
-	if ( $wgDevelopmentWarnings ) {
-		trigger_error( $msg, $level );
-	} else {
-		wfDebug( "$msg\n" );
-	}
+	MWDebug::warning( $msg, $callerOffset + 1, $level );
 }
 
 /**
@@ -2308,11 +2328,7 @@ function wfSuppressWarnings( $end = false ) {
 		}
 	} else {
 		if ( !$suppressCount ) {
-			// E_DEPRECATED is undefined in PHP 5.2
-			if( !defined( 'E_DEPRECATED' ) ) {
-				define( 'E_DEPRECATED', 8192 );
-			}
-			$originalLevel = error_reporting( E_ALL & ~( E_WARNING | E_NOTICE | E_USER_WARNING | E_USER_NOTICE | E_DEPRECATED ) );
+			$originalLevel = error_reporting( E_ALL & ~( E_WARNING | E_NOTICE | E_USER_WARNING | E_USER_NOTICE | E_DEPRECATED | E_USER_DEPRECATED ) );
 		}
 		++$suppressCount;
 	}
@@ -2607,7 +2623,7 @@ function wfMkdirParents( $dir, $mode = null, $caller = null ) {
 	global $wgDirectoryMode;
 
 	if ( FileBackend::isStoragePath( $dir ) ) { // sanity
-		throw new MWException( __FUNCTION__ . " given storage path `$dir`.");
+		throw new MWException( __FUNCTION__ . " given storage path '$dir'." );
 	}
 
 	if ( !is_null( $caller ) ) {
diff --git a/includes/HTMLForm.php b/includes/HTMLForm.php
index 4fc43389e0..5c00b9f6e7 100644
--- a/includes/HTMLForm.php
+++ b/includes/HTMLForm.php
@@ -1100,6 +1100,28 @@ abstract class HTMLFormField {
 	 */
 	abstract function getInputHTML( $value );
 
+	/**
+	 * Get a translated interface message
+	 *
+	 * This is a wrapper arround $this->mParent->msg() if $this->mParent is set
+	 * and wfMessage() otherwise.
+	 *
+	 * Parameters are the same as wfMessage().
+	 *
+	 * @return Message object
+	 */
+	function msg() {
+		$args = func_get_args();
+
+		if ( $this->mParent ) {
+			$callback = array( $this->mParent, 'msg' );
+		} else {
+			$callback = 'wfMessage';
+		}
+
+		return call_user_func_array( $callback, $args );
+	}
+
 	/**
 	 * Override this function to add specific validation checks on the
 	 * field input.  Don't forget to call parent::validate() to ensure
@@ -1110,7 +1132,7 @@ abstract class HTMLFormField {
 	 */
 	function validate( $value, $alldata ) {
 		if ( isset( $this->mParams['required'] ) && $this->mParams['required'] !== false && $value === '' ) {
-			return $this->mParent->msg( 'htmlform-required' )->parse();
+			return $this->msg( 'htmlform-required' )->parse();
 		}
 
 		if ( isset( $this->mValidationCallback ) ) {
@@ -1371,13 +1393,13 @@ abstract class HTMLFormField {
 		if ( isset( $this->mParams['help-messages'] ) ) {
 			foreach ( $this->mParams['help-messages'] as $name ) {
 				$helpMessage = (array)$name;
-				$msg = $this->mParent->msg( array_shift( $helpMessage ), $helpMessage );
+				$msg = $this->msg( array_shift( $helpMessage ), $helpMessage );
 
 				if ( $msg->exists() ) {
 					if ( is_null( $helptext ) ) {
 						$helptext = '';
 					} else {
-						$helptext .= $this->mParent->msg( 'word-separator' )->escaped(); // some space
+						$helptext .= $this->msg( 'word-separator' )->escaped(); // some space
 					}
 					$helptext .= $msg->parse(); // Append message
 				}
@@ -1642,7 +1664,7 @@ class HTMLFloatField extends HTMLTextField {
 		# http://dev.w3.org/html5/spec/common-microsyntaxes.html#real-numbers
 		# with the addition that a leading '+' sign is ok.
 		if ( !preg_match( '/^((\+|\-)?\d+(\.\d+)?(E(\+|\-)?\d+)?)?$/i', $value ) ) {
-			return $this->mParent->msg( 'htmlform-float-invalid' )->parseAsBlock();
+			return $this->msg( 'htmlform-float-invalid' )->parseAsBlock();
 		}
 
 		# The "int" part of these message names is rather confusing.
@@ -1651,7 +1673,7 @@ class HTMLFloatField extends HTMLTextField {
 			$min = $this->mParams['min'];
 
 			if ( $min > $value ) {
-				return $this->mParent->msg( 'htmlform-int-toolow', $min )->parseAsBlock();
+				return $this->msg( 'htmlform-int-toolow', $min )->parseAsBlock();
 			}
 		}
 
@@ -1659,7 +1681,7 @@ class HTMLFloatField extends HTMLTextField {
 			$max = $this->mParams['max'];
 
 			if ( $max < $value ) {
-				return $this->mParent->msg( 'htmlform-int-toohigh', $max )->parseAsBlock();
+				return $this->msg( 'htmlform-int-toohigh', $max )->parseAsBlock();
 			}
 		}
 
@@ -1686,7 +1708,7 @@ class HTMLIntField extends HTMLFloatField {
 		# value to, eg, save in the DB, clean it up with intval().
 		if ( !preg_match( '/^((\+|\-)?\d+)?$/', trim( $value ) )
 		) {
-			return $this->mParent->msg( 'htmlform-int-invalid' )->parseAsBlock();
+			return $this->msg( 'htmlform-int-invalid' )->parseAsBlock();
 		}
 
 		return true;
@@ -1770,7 +1792,7 @@ class HTMLSelectField extends HTMLFormField {
 		if ( in_array( $value, $validOptions ) )
 			return true;
 		else
-			return $this->mParent->msg( 'htmlform-select-badoption' )->parse();
+			return $this->msg( 'htmlform-select-badoption' )->parse();
 	}
 
 	function getInputHTML( $value ) {
@@ -1914,7 +1936,7 @@ class HTMLMultiSelectField extends HTMLFormField {
 		if ( count( $validValues ) == count( $value ) ) {
 			return true;
 		} else {
-			return $this->mParent->msg( 'htmlform-select-badoption' )->parse();
+			return $this->msg( 'htmlform-select-badoption' )->parse();
 		}
 	}
 
@@ -2116,7 +2138,7 @@ class HTMLSelectAndOtherField extends HTMLSelectField {
 			} elseif ( $text == '' ) {
 				$final = $list;
 			} else {
-				$final = $list . $this->mParent->msg( 'colon-separator' )->inContentLanguage()->text() . $text;
+				$final = $list . $this->msg( 'colon-separator' )->inContentLanguage()->text() . $text;
 			}
 
 		} else {
@@ -2125,7 +2147,7 @@ class HTMLSelectAndOtherField extends HTMLSelectField {
 			$list = 'other';
 			$text = $final;
 			foreach ( $this->mFlatOptions as $option ) {
-				$match = $option . $this->mParent->msg( 'colon-separator' )->inContentLanguage()->text();
+				$match = $option . $this->msg( 'colon-separator' )->inContentLanguage()->text();
 				if ( strpos( $text, $match ) === 0 ) {
 					$list = $option;
 					$text = substr( $text, strlen( $match ) );
@@ -2153,7 +2175,7 @@ class HTMLSelectAndOtherField extends HTMLSelectField {
 		}
 
 		if ( isset( $this->mParams['required'] ) && $this->mParams['required'] !== false && $value[1] === '' ) {
-			return $this->mParent->msg( 'htmlform-required' )->parse();
+			return $this->msg( 'htmlform-required' )->parse();
 		}
 
 		return true;
@@ -2182,7 +2204,7 @@ class HTMLRadioField extends HTMLFormField {
 		if ( in_array( $value, $validOptions ) ) {
 			return true;
 		} else {
-			return $this->mParent->msg( 'htmlform-select-badoption' )->parse();
+			return $this->msg( 'htmlform-select-badoption' )->parse();
 		}
 	}
 
@@ -2392,11 +2414,11 @@ class HTMLEditTools extends HTMLFormField {
 
 	protected function formatMsg() {
 		if ( empty( $this->mParams['message'] ) ) {
-			$msg = $this->mParent->msg( 'edittools' );
+			$msg = $this->msg( 'edittools' );
 		} else {
-			$msg = $this->mParent->msg( $this->mParams['message'] );
+			$msg = $this->msg( $this->mParams['message'] );
 			if ( $msg->isDisabled() ) {
-				$msg = $this->mParent->msg( 'edittools' );
+				$msg = $this->msg( 'edittools' );
 			}
 		}
 		$msg->inContentLanguage();
diff --git a/includes/ImagePage.php b/includes/ImagePage.php
index da9d1ec5a3..fdc2061480 100644
--- a/includes/ImagePage.php
+++ b/includes/ImagePage.php
@@ -94,10 +94,47 @@ class ImagePage extends Article {
 	/**
 	 * Handler for action=render
 	 * Include body text only; none of the image extras
+	 * However, also include the shared description text
+	 * so that cascading ForeignAPIRepo's work.
+	 *
+	 * @note This uses a div with the class "mw-shared-image-desc"
+	 *    as opposed to the id "mw-shared-image-desc" since the text
+	 *    from here may be cascadingly transcluded to other shared
+	 *    repos, and we want all ids to be unique. On normal
+	 *    view, the outermost shared description will still have
+	 *    the id.
+	 *
+	 * This also differs from normal view in that "shareddescriptionfollows"
+	 * message is not shown. I was not sure if it was appropriate to
+	 * add that message here.
 	 */
 	public function render() {
-		$this->getContext()->getOutput()->setArticleBodyOnly( true );
-		parent::view();
+		$out = $this->getContext()->getOutput();
+                $this->loadFile();
+
+                $descText = $this->mPage->getFile()->getDescriptionText();
+
+		$out->setArticleBodyOnly( true );
+
+		if ( !$descText ) {
+			// If no description text, just do standard action=render
+			parent::view();
+		} else {
+			if ( $this->mPage->getID() !== 0 ) {
+				// Local description exists. We need to output both
+				parent::view();
+				$out->addHTML( '<div class="mw-shared-image-desc">' . $descText . "</div>\n" );
+			} else {
+				// We don't want to output both a "noarticletext" message and the shared
+				// description, so don't call parent::view().
+				$out->addHTML( '<div class="mw-shared-image-desc">' . $descText . "</div>\n" );
+				// Since we did not call parent::view(), have to call some methods it
+				// normally takes care of. (Not that it matters much since skin not displayed)
+				$out->setArticleFlag( true );
+				$out->setPageTitle( $this->getTitle()->getPrefixedText() );
+				$this->mPage->doViewUpdates( $this->getContext()->getUser() );
+			}
+		}
 	}
 
 	public function view() {
@@ -172,7 +209,7 @@ class ImagePage extends Article {
 			if ( !$fol->isDisabled() ) {
 				$out->addWikiText( $fol->plain() );
 			}
-			$out->addHTML( '<div id="shared-image-desc">' . $this->mExtraDescription . "</div>\n" );
+			$out->addHTML( '<div id="shared-image-desc" class="mw-shared-image-desc">' . $this->mExtraDescription . "</div>\n" );
 		}
 
 		$this->closeShowImage();
diff --git a/includes/Licenses.php b/includes/Licenses.php
index 0cfb047081..ba504a9942 100644
--- a/includes/Licenses.php
+++ b/includes/Licenses.php
@@ -120,7 +120,7 @@ class Licenses extends HTMLFormField {
 		foreach ( $tagset as $key => $val )
 			if ( is_array( $val ) ) {
 				$this->html .= $this->outputOption(
-					$this->msg( $key ), '',
+					$key, '',
 					array(
 						'disabled' => 'disabled',
 						'style' => 'color: GrayText', // for MSIE
@@ -130,7 +130,7 @@ class Licenses extends HTMLFormField {
 				$this->makeHtml( $val, $depth + 1 );
 			} else {
 				$this->html .= $this->outputOption(
-					$this->msg( $val->text ), $val->template,
+					$val->text, $val->template,
 					array( 'title' => '{{' . $val->template . '}}' ),
 					$depth
 				);
@@ -138,13 +138,15 @@ class Licenses extends HTMLFormField {
 	}
 
 	/**
-	 * @param $text
+	 * @param $message
 	 * @param $value
 	 * @param $attribs null
 	 * @param $depth int
 	 * @return string
 	 */
-	protected function outputOption( $text, $value, $attribs = null, $depth = 0 ) {
+	protected function outputOption( $message, $value, $attribs = null, $depth = 0 ) {
+		$msgObj = $this->msg( $message );
+		$text = $msgObj->exists() ? $msgObj->text() : $message;
 		$attribs['value'] = $value;
 		if ( $value === $this->selected )
 			$attribs['selected'] = 'selected';
@@ -152,15 +154,6 @@ class Licenses extends HTMLFormField {
 		return str_repeat( "\t", $depth ) . Xml::element( 'option', $attribs, $val ) . "\n";
 	}
 
-	/**
-	 * @param $str string
-	 * @return String
-	 */
-	protected function msg( $str ) {
-		$msg = wfMessage( $str );
-		return $msg->exists() ? $msg->text() : $str;
-	}
-
 	/**#@-*/
 
 	/**
diff --git a/includes/Linker.php b/includes/Linker.php
index 0b2deef78f..7aba444050 100644
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -1863,7 +1863,6 @@ class Linker {
 	 * @return String: HTML output
 	 */
 	public static function formatHiddenCategories( $hiddencats ) {
-		global $wgLang;
 		wfProfileIn( __METHOD__ );
 
 		$outText = '';
diff --git a/includes/LocalisationCache.php b/includes/LocalisationCache.php
index 9ce26d000b..d8e5d3a368 100644
--- a/includes/LocalisationCache.php
+++ b/includes/LocalisationCache.php
@@ -110,7 +110,7 @@ class LocalisationCache {
 		'dateFormats', 'datePreferences', 'datePreferenceMigrationMap',
 		'defaultDateFormat', 'extraUserToggles', 'specialPageAliases',
 		'imageFiles', 'preloadedMessages', 'namespaceGenderAliases',
-		'digitGroupingPattern'
+		'digitGroupingPattern', 'pluralRules', 'compiledPluralRules',
 	);
 
 	/**
@@ -118,7 +118,7 @@ class LocalisationCache {
 	 * by a fallback sequence.
 	 */
 	static public $mergeableMapKeys = array( 'messages', 'namespaceNames',
-		'dateFormats', 'imageFiles', 'preloadedMessages',
+		'dateFormats', 'imageFiles', 'preloadedMessages'
 	);
 
 	/**
@@ -154,6 +154,12 @@ class LocalisationCache {
 	 */
 	static public $preloadedKeys = array( 'dateFormats', 'namespaceNames' );
 
+	/**
+	 * Associative array of cached plural rules. The key is the language code,
+	 * the value is an array of plural rules for that language.
+	 */
+	var $pluralRules = null;
+
 	var $mergeableKeys = null;
 
 	/**
@@ -234,9 +240,9 @@ class LocalisationCache {
 	 */
 	public function getItem( $code, $key ) {
 		if ( !isset( $this->loadedItems[$code][$key] ) ) {
-			wfProfileIn( __METHOD__.'-load' );
+			wfProfileIn( __METHOD__ . '-load' );
 			$this->loadItem( $code, $key );
-			wfProfileOut( __METHOD__.'-load' );
+			wfProfileOut( __METHOD__ . '-load' );
 		}
 
 		if ( $key === 'fallback' && isset( $this->shallowFallbacks[$code] ) ) {
@@ -256,9 +262,9 @@ class LocalisationCache {
 	public function getSubitem( $code, $key, $subkey ) {
 		if ( !isset( $this->loadedSubitems[$code][$key][$subkey] ) &&
 			 !isset( $this->loadedItems[$code][$key] ) ) {
-			wfProfileIn( __METHOD__.'-load' );
+			wfProfileIn( __METHOD__ . '-load' );
 			$this->loadSubitem( $code, $key, $subkey );
-			wfProfileOut( __METHOD__.'-load' );
+			wfProfileOut( __METHOD__ . '-load' );
 		}
 
 		if ( isset( $this->data[$code][$key][$subkey] ) ) {
@@ -367,7 +373,7 @@ class LocalisationCache {
 	 */
 	public function isExpired( $code ) {
 		if ( $this->forceRecache && !isset( $this->recachedLangs[$code] ) ) {
-			wfDebug( __METHOD__."($code): forced reload\n" );
+			wfDebug( __METHOD__ . "($code): forced reload\n" );
 			return true;
 		}
 
@@ -376,7 +382,7 @@ class LocalisationCache {
 		$preload = $this->store->get( $code, 'preload' );
 		// Different keys may expire separately, at least in LCStore_Accel
 		if ( $deps === null || $keys === null || $preload === null ) {
-			wfDebug( __METHOD__."($code): cache missing, need to make one\n" );
+			wfDebug( __METHOD__ . "($code): cache missing, need to make one\n" );
 			return true;
 		}
 
@@ -386,7 +392,7 @@ class LocalisationCache {
 			// anymore (e.g. uninstalled extensions)
 			// When this happens, always expire the cache
 			if ( !$dep instanceof CacheDependency || $dep->isExpired() ) {
-				wfDebug( __METHOD__."($code): cache for $code expired due to " .
+				wfDebug( __METHOD__ . "($code): cache for $code expired due to " .
 					get_class( $dep ) . "\n" );
 				return true;
 			}
@@ -481,9 +487,95 @@ class LocalisationCache {
 		} elseif ( $_fileType == 'aliases' ) {
 			$data = compact( 'aliases' );
 		} else {
-			throw new MWException( __METHOD__.": Invalid file type: $_fileType" );
+			throw new MWException( __METHOD__ . ": Invalid file type: $_fileType" );
+		}
+		return $data;
+	}
+
+	/**
+	 * Get the compiled plural rules for a given language from the XML files.
+	 * @since 1.20
+	 */
+	public function getCompiledPluralRules( $code ) {
+		$rules = $this->getPluralRules( $code );
+		if ( $rules === null ) {
+			return null;
+		}
+		try {
+			$compiledRules = CLDRPluralRuleEvaluator::compile( $rules );
+		} catch( CLDRPluralRuleError $e ) {
+			wfDebugLog( 'l10n', $e->getMessage() . "\n" );
+			return array();
+		}
+		return $compiledRules;
+	}
+
+	/**
+	 * Get the plural rules for a given language from the XML files.
+	 * Cached.
+	 * @since 1.20
+	 */
+	public function getPluralRules( $code ) {
+		if ( $this->pluralRules === null ) {
+			$cldrPlural = __DIR__ . "/../languages/data/plurals.xml";
+			$mwPlural = __DIR__ . "/../languages/data/plurals-mediawiki.xml";
+			// Load CLDR plural rules
+			$this->loadPluralFile( $cldrPlural );
+			if ( file_exists( $mwPlural ) ) {
+				// Override or extend
+				$this->loadPluralFile( $mwPlural );
+			}
+		}
+		if ( !isset( $this->pluralRules[$code] ) ) {
+			return null;
+		} else {
+			return $this->pluralRules[$code];
+		}
+	}
+
+
+	/**
+	 * Load a plural XML file with the given filename, compile the relevant
+	 * rules, and save the compiled rules in a process-local cache.
+	 */
+	protected function loadPluralFile( $fileName ) {
+		$doc = new DOMDocument;
+		$doc->load( $fileName );
+		$rulesets = $doc->getElementsByTagName( "pluralRules" );
+		foreach ( $rulesets as $ruleset ) {
+			$codes = $ruleset->getAttribute( 'locales' );
+			$rules = array();
+			$ruleElements = $ruleset->getElementsByTagName( "pluralRule" );
+			foreach ( $ruleElements as $elt ) {
+				$rules[] = $elt->nodeValue;
+			}
+			foreach ( explode( ' ', $codes ) as $code ) {
+				$this->pluralRules[$code] = $rules;
+			}
+		}
+	}
+
+	/**
+	 * Read the data from the source files for a given language, and register
+	 * the relevant dependencies in the $deps array. If the localisation
+	 * exists, the data array is returned, otherwise false is returned.
+	 */
+	protected function readSourceFilesAndRegisterDeps( $code, &$deps ) {
+		$fileName = Language::getMessagesFileName( $code );
+		if ( !file_exists( $fileName ) ) {
+			return false;
 		}
 
+		$deps[] = new FileDependency( $fileName );
+		$data = $this->readPHPFile( $fileName, 'core' );
+
+		# Load CLDR plural rules for JavaScript
+		$data['pluralRules'] = $this->getPluralRules( $code );
+		# And for PHP
+		$data['compiledPluralRules'] = $this->getCompiledPluralRules( $code );
+
+		$deps['plurals'] = new FileDependency( __DIR__ . "/../languages/data/plurals.xml" );
+		$deps['plurals-mw'] = new FileDependency( __DIR__ . "/../languages/data/plurals-mediawiki.xml" );
 		return $data;
 	}
 
@@ -585,14 +677,12 @@ class LocalisationCache {
 		$deps = array();
 
 		# Load the primary localisation from the source file
-		$fileName = Language::getMessagesFileName( $code );
-		if ( !file_exists( $fileName ) ) {
-			wfDebug( __METHOD__.": no localisation file for $code, using fallback to en\n" );
+		$data = $this->readSourceFilesAndRegisterDeps( $code, $deps );
+		if ( $data === false ) {
+			wfDebug( __METHOD__ . ": no localisation file for $code, using fallback to en\n" );
 			$coreData['fallback'] = 'en';
 		} else {
-			$deps[] = new FileDependency( $fileName );
-			$data = $this->readPHPFile( $fileName, 'core' );
-			wfDebug( __METHOD__.": got localisation for $code from source\n" );
+			wfDebug( __METHOD__ . ": got localisation for $code from source\n" );
 
 			# Merge primary localisation
 			foreach ( $data as $key => $value ) {
@@ -605,7 +695,6 @@ class LocalisationCache {
 		if ( is_null( $coreData['fallback'] ) ) {
 			$coreData['fallback'] = $code === 'en' ? false : 'en';
 		}
-
 		if ( $coreData['fallback'] === false ) {
 			$coreData['fallbackSequence'] = array();
 		} else {
@@ -621,15 +710,11 @@ class LocalisationCache {
 			foreach ( $coreData['fallbackSequence'] as $fbCode ) {
 				# Load the secondary localisation from the source file to
 				# avoid infinite cycles on cyclic fallbacks
-				$fbFilename = Language::getMessagesFileName( $fbCode );
-
-				if ( !file_exists( $fbFilename ) ) {
+				$fbData = $this->readSourceFilesAndRegisterDeps( $fbCode, $deps );
+				if ( $fbData === false ) {
 					continue;
 				}
 
-				$deps[] = new FileDependency( $fbFilename );
-				$fbData = $this->readPHPFile( $fbFilename, 'core' );
-
 				foreach ( self::$allKeys as $key ) {
 					if ( !isset( $fbData[$key] ) ) {
 						continue;
@@ -654,7 +739,7 @@ class LocalisationCache {
 			$used = false;
 
 			foreach ( $data as $key => $item ) {
-				if( $this->mergeExtensionItem( $codeSequence, $key, $allData[$key], $item ) ) {
+				if ( $this->mergeExtensionItem( $codeSequence, $key, $allData[$key], $item ) ) {
 					$used = true;
 				}
 			}
@@ -684,19 +769,26 @@ class LocalisationCache {
 			$page = str_replace( ' ', '_', $page );
 		}
 		# Decouple the reference to prevent accidental damage
-		unset($page);
+		unset( $page );
+
+		# If there were no plural rules, return an empty array
+		if ( $allData['pluralRules'] === null ) {
+			$allData['pluralRules'] = array();
+		}
+		if ( $allData['compiledPluralRules'] === null ) {
+			$allData['compiledPluralRules'] = array();
+		}
 
 		# Set the list keys
 		$allData['list'] = array();
 		foreach ( self::$splitKeys as $key ) {
 			$allData['list'][$key] = array_keys( $allData[$key] );
 		}
-
 		# Run hooks
 		wfRunHooks( 'LocalisationCacheRecache', array( $this, $code, &$allData ) );
 
 		if ( is_null( $allData['namespaceNames'] ) ) {
-			throw new MWException( __METHOD__.': Localisation data failed sanity check! ' .
+			throw new MWException( __METHOD__ . ': Localisation data failed sanity check! ' .
 				'Check that your languages/messages/MessagesEn.php file is intact.' );
 		}
 
@@ -924,7 +1016,7 @@ class LCStore_DB implements LCStore {
 		}
 
 		if ( !$code ) {
-			throw new MWException( __METHOD__.": Invalid language \"$code\"" );
+			throw new MWException( __METHOD__ . ": Invalid language \"$code\"" );
 		}
 
 		$this->dbw = wfGetDB( DB_MASTER );
@@ -968,7 +1060,7 @@ class LCStore_DB implements LCStore {
 		}
 
 		if ( is_null( $this->currentLang ) ) {
-			throw new MWException( __CLASS__.': must call startWrite() before calling set()' );
+			throw new MWException( __CLASS__ . ': must call startWrite() before calling set()' );
 		}
 
 		$this->batch[] = array(
@@ -1040,7 +1132,7 @@ class LCStore_CDB implements LCStore {
 		}
 
 		// Close reader to stop permission errors on write
-		if( !empty($this->readers[$code]) ) {
+		if ( !empty( $this->readers[$code] ) ) {
 			$this->readers[$code]->close();
 		}
 
@@ -1058,14 +1150,14 @@ class LCStore_CDB implements LCStore {
 
 	public function set( $key, $value ) {
 		if ( is_null( $this->writer ) ) {
-			throw new MWException( __CLASS__.': must call startWrite() before calling set()' );
+			throw new MWException( __CLASS__ . ': must call startWrite() before calling set()' );
 		}
 		$this->writer->set( $key, serialize( $value ) );
 	}
 
 	protected function getFileName( $code ) {
 		if ( !$code || strpos( $code, '/' ) !== false ) {
-			throw new MWException( __METHOD__.": Invalid language \"$code\"" );
+			throw new MWException( __METHOD__ . ": Invalid language \"$code\"" );
 		}
 		return "{$this->directory}/l10n_cache-$code.cdb";
 	}
@@ -1181,8 +1273,9 @@ class LocalisationCache_BulkLoad extends LocalisationCache {
 		while ( count( $this->data ) > $this->maxLoadedLangs && count( $this->mruLangs ) ) {
 			reset( $this->mruLangs );
 			$code = key( $this->mruLangs );
-			wfDebug( __METHOD__.": unloading $code\n" );
+			wfDebug( __METHOD__ . ": unloading $code\n" );
 			$this->unload( $code );
 		}
 	}
+
 }
diff --git a/includes/Message.php b/includes/Message.php
index f559d304b4..776a52f677 100644
--- a/includes/Message.php
+++ b/includes/Message.php
@@ -209,6 +209,7 @@ class Message {
 
 	/**
 	 * Constructor.
+	 * @since 1.17
 	 * @param $key: message key, or array of message keys to try and use the first non-empty message for
 	 * @param $params Array message parameters
 	 * @return Message: $this
@@ -224,6 +225,7 @@ class Message {
 	 * Factory function that is just wrapper for the real constructor. It is
 	 * intented to be used instead of the real constructor, because it allows
 	 * chaining method calls, while new objects don't.
+	 * @since 1.17
 	 * @param $key String: message key
 	 * @param Varargs: parameters as Strings
 	 * @return Message: $this
@@ -238,6 +240,7 @@ class Message {
 	 * Factory function accepting multiple message keys and returning a message instance
 	 * for the first message which is non-empty. If all messages are empty then an
 	 * instance of the first message key is returned.
+	 * @since 1.18
 	 * @param Varargs: message keys (or first arg as an array of all the message keys)
 	 * @return Message: $this
 	 */
@@ -257,6 +260,7 @@ class Message {
 
 	/**
 	 * Adds parameters to the parameter list of this message.
+	 * @since 1.17
 	 * @param Varargs: parameters as Strings, or a single argument that is an array of Strings
 	 * @return Message: $this
 	 */
@@ -275,6 +279,7 @@ class Message {
 	 * In other words the parsing process cannot access the contents
 	 * of this type of parameter, and you need to make sure it is
 	 * sanitized beforehand.  The parser will see "$n", instead.
+	 * @since 1.17
 	 * @param Varargs: raw parameters as Strings (or single argument that is an array of raw parameters)
 	 * @return Message: $this
 	 */
@@ -292,6 +297,7 @@ class Message {
 	/**
 	 * Add parameters that are numeric and will be passed through
 	 * Language::formatNum before substitution
+	 * @since 1.18
 	 * @param Varargs: numeric parameters (or single argument that is array of numeric parameters)
 	 * @return Message: $this
 	 */
@@ -308,7 +314,7 @@ class Message {
 
 	/**
 	 * Set the language and the title from a context object
-	 *
+	 * @since 1.19
 	 * @param $context IContextSource
 	 * @return Message: $this
 	 */
@@ -378,6 +384,7 @@ class Message {
 
 	/**
 	 * Enable or disable database use.
+	 * @since 1.17
 	 * @param $value Boolean
 	 * @return Message: $this
 	 */
@@ -388,7 +395,7 @@ class Message {
 
 	/**
 	 * Set the Title object to use as context when transforming the message
-	 *
+	 * @since 1.18
 	 * @param $title Title object
 	 * @return Message: $this
 	 */
@@ -399,6 +406,7 @@ class Message {
 
 	/**
 	 * Returns the message parsed from wikitext to HTML.
+	 * @since 1.17
 	 * @return String: HTML
 	 */
 	public function toString() {
@@ -441,6 +449,7 @@ class Message {
 	 * Magic method implementation of the above (for PHP >= 5.2.0), so we can do, eg:
 	 *     $foo = Message::get($key);
 	 *     $string = "<abbr>$foo</abbr>";
+	 * @since 1.18
 	 * @return String
 	 */
 	public function __toString() {
@@ -449,6 +458,7 @@ class Message {
 
 	/**
 	 * Fully parse the text from wikitext to HTML
+	 * @since 1.17
 	 * @return String parsed HTML
 	 */
 	public function parse() {
@@ -458,6 +468,7 @@ class Message {
 
 	/**
 	 * Returns the message text. {{-transformation is done.
+	 * @since 1.17
 	 * @return String: Unescaped message text.
 	 */
 	public function text() {
@@ -467,6 +478,7 @@ class Message {
 
 	/**
 	 * Returns the message text as-is, only parameters are subsituted.
+	 * @since 1.17
 	 * @return String: Unescaped untransformed message text.
 	 */
 	public function plain() {
@@ -476,6 +488,7 @@ class Message {
 
 	/**
 	 * Returns the parsed message text which is always surrounded by a block element.
+	 * @since 1.17
 	 * @return String: HTML
 	 */
 	public function parseAsBlock() {
@@ -486,6 +499,7 @@ class Message {
 	/**
 	 * Returns the message text. {{-transformation is done and the result
 	 * is escaped excluding any raw parameters.
+	 * @since 1.17
 	 * @return String: Escaped message text.
 	 */
 	public function escaped() {
@@ -495,6 +509,7 @@ class Message {
 
 	/**
 	 * Check whether a message key has been defined currently.
+	 * @since 1.17
 	 * @return Bool: true if it is and false if not.
 	 */
 	public function exists() {
@@ -503,6 +518,7 @@ class Message {
 
 	/**
 	 * Check whether a message does not exist, or is an empty string
+	 * @since 1.18
 	 * @return Bool: true if is is and false if not
 	 * @todo FIXME: Merge with isDisabled()?
 	 */
@@ -513,6 +529,7 @@ class Message {
 
 	/**
 	 * Check whether a message does not exist, is an empty string, or is "-"
+	 * @since 1.18
 	 * @return Bool: true if is is and false if not
 	 */
 	public function isDisabled() {
@@ -521,6 +538,7 @@ class Message {
 	}
 
 	/**
+	 * @since 1.17
 	 * @param $value
 	 * @return array
 	 */
@@ -529,6 +547,7 @@ class Message {
 	}
 
 	/**
+	 * @since 1.18
 	 * @param $value
 	 * @return array
 	 */
@@ -538,6 +557,7 @@ class Message {
 
 	/**
 	 * Substitutes any paramaters into the message text.
+	 * @since 1.17
 	 * @param $message String: the message text
 	 * @param $type String: either before or after
 	 * @return String
@@ -556,6 +576,7 @@ class Message {
 
 	/**
 	 * Extracts the parameter type and preprocessed the value if needed.
+	 * @since 1.18
 	 * @param $param String|Array: Parameter as defined in this class.
 	 * @return Tuple(type, value)
 	 * @throws MWException
@@ -576,6 +597,7 @@ class Message {
 
 	/**
 	 * Wrapper for what ever method we use to parse wikitext.
+	 * @since 1.17
 	 * @param $string String: Wikitext message contents
 	 * @return string Wikitext parsed into HTML
 	 */
@@ -585,6 +607,7 @@ class Message {
 
 	/**
 	 * Wrapper for what ever method we use to {{-transform wikitext.
+	 * @since 1.17
 	 * @param $string String: Wikitext message contents
 	 * @return string Wikitext with {{-constructs replaced with their values.
 	 */
@@ -594,7 +617,7 @@ class Message {
 
 	/**
 	 * Wrapper for what ever method we use to get message contents
-	 *
+	 * @since 1.17
 	 * @return string
 	 */
 	protected function fetchMessage() {
diff --git a/includes/MessageBlobStore.php b/includes/MessageBlobStore.php
index 23955aee63..d112b2530b 100644
--- a/includes/MessageBlobStore.php
+++ b/includes/MessageBlobStore.php
@@ -299,7 +299,7 @@ class MessageBlobStore {
 	 */
 	private static function reencodeBlob( $blob, $key, $lang ) {
 		$decoded = FormatJson::decode( $blob, true );
-		$decoded[$key] = wfMsgExt( $key, array( 'language' => $lang ) );
+		$decoded[$key] = wfMessage( $key )->inLanguage( $lang )->text();
 
 		return FormatJson::encode( (object)$decoded );
 	}
@@ -353,7 +353,7 @@ class MessageBlobStore {
 		$messages = array();
 
 		foreach ( $module->getMessages() as $key ) {
-			$messages[$key] = wfMsgExt( $key, array( 'language' => $lang ) );
+			$messages[$key] = wfMessage( $key )->inLanguage( $lang )->text();
 		}
 
 		return FormatJson::encode( (object)$messages );
diff --git a/includes/Metadata.php b/includes/Metadata.php
index 229856defb..0ca153933a 100644
--- a/includes/Metadata.php
+++ b/includes/Metadata.php
@@ -60,7 +60,7 @@ abstract class RdfMetaData {
 		global $wgLanguageCode, $wgSitename;
 
 		$this->element( 'title', $this->mArticle->getTitle()->getText() );
-		$this->pageOrString( 'publisher', wfMsg( 'aboutpage' ), $wgSitename );
+		$this->pageOrString( 'publisher', wfMessage( 'aboutpage' )->text(), $wgSitename );
 		$this->element( 'language', $wgLanguageCode );
 		$this->element( 'type', 'Text' );
 		$this->element( 'format', 'text/html' );
@@ -117,14 +117,18 @@ abstract class RdfMetaData {
 
 	protected function person( $name, User $user ) {
 		if( $user->isAnon() ){
-			$this->element( $name, wfMsgExt( 'anonymous', array( 'parsemag' ), 1 ) );
+			$this->element( $name, wfMessage( 'anonymous' )->numParams( 1 )->text() );
 		} else {
 			$real = $user->getRealName();
 			if( $real ) {
 				$this->element( $name, $real );
 			} else {
 				$userName = $user->getName();
-				$this->pageOrString( $name, $user->getUserPage(), wfMsgExt( 'siteuser', 'parsemag', $userName, $userName ) );
+				$this->pageOrString(
+					$name,
+					$user->getUserPage(),
+					wfMessage( 'siteuser', $userName, $userName )->text()
+				);
 			}
 		}
 	}
diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index e9e2b6f3b2..bc9eaa9a0c 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -56,9 +56,9 @@ class OutputPage extends ContextSource {
 	/**
 	 * Holds the debug lines that will be output as comments in page source if
 	 * $wgDebugComments is enabled. See also $wgShowDebug.
-	 * TODO: make a getter method for this
+	 * @deprecated since 1.20; use MWDebug class instead.
 	 */
-	public $mDebugtext = ''; // TODO: we might want to replace it by wfDebug() wfDebugLog()
+	public $mDebugtext = '';
 
 	/// Should be private. Stores contents of "<title>" tag
 	var $mHTMLtitle = '';
@@ -1314,15 +1314,6 @@ class OutputPage extends ContextSource {
 		return $this->mBodytext;
 	}
 
-	/**
-	 * Add $text to the debug output
-	 *
-	 * @param $text String: debug text
-	 */
-	public function debug( $text ) {
-		$this->mDebugtext .= $text;
-	}
-
 	/**
 	 * Get/set the ParserOptions object to use for wikitext parsing
 	 *
@@ -2032,10 +2023,6 @@ class OutputPage extends ContextSource {
 	 *                   based on $pageTitle
 	 */
 	public function prepareErrorPage( $pageTitle, $htmlTitle = false ) {
-		if ( $this->getTitle() ) {
-			$this->mDebugtext .= 'Original title: ' . $this->getTitle()->getPrefixedText() . "\n";
-		}
-
 		$this->setPageTitle( $pageTitle );
 		if ( $htmlTitle !== false ) {
 			$this->setHTMLTitle( $htmlTitle );
diff --git a/includes/ProtectionForm.php b/includes/ProtectionForm.php
index caedb63d33..ce0e36b044 100644
--- a/includes/ProtectionForm.php
+++ b/includes/ProtectionForm.php
@@ -265,7 +265,7 @@ class ProtectionForm {
 		$reasonstr = $this->mReasonSelection;
 		if ( $reasonstr != 'other' && $this->mReason != '' ) {
 			// Entry from drop down menu + additional comment
-			$reasonstr .= wfMsgForContent( 'colon-separator' ) . $this->mReason;
+			$reasonstr .= wfMessage( 'colon-separator' )->text() . $this->mReason;
 		} elseif ( $reasonstr == 'other' ) {
 			$reasonstr = $this->mReason;
 		}
@@ -336,8 +336,14 @@ class ProtectionForm {
 	function buildForm() {
 		global $wgUser, $wgLang, $wgOut;
 
-		$mProtectreasonother = Xml::label( wfMsg( 'protectcomment' ), 'wpProtectReasonSelection' );
-		$mProtectreason = Xml::label( wfMsg( 'protect-otherreason' ), 'mwProtect-reason' );
+		$mProtectreasonother = Xml::label(
+			wfMessage( 'protectcomment' )->text(),
+			'wpProtectReasonSelection'
+		);
+		$mProtectreason = Xml::label(
+			wfMessage( 'protect-otherreason' )->text(),
+			'mwProtect-reason'
+		);
 
 		$out = '';
 		if( !$this->disabled ) {
@@ -348,7 +354,7 @@ class ProtectionForm {
 		}
 
 		$out .= Xml::openElement( 'fieldset' ) .
-			Xml::element( 'legend', null, wfMsg( 'protect-legend' ) ) .
+			Xml::element( 'legend', null, wfMessage( 'protect-legend' )->text() ) .
 			Xml::openElement( 'table', array( 'id' => 'mwProtectSet' ) ) .
 			Xml::openElement( 'tbody' );
 
@@ -362,16 +368,22 @@ class ProtectionForm {
 				"<tr><td>" . $this->buildSelector( $action, $selected ) . "</td></tr><tr><td>";
 
 			$reasonDropDown = Xml::listDropDown( 'wpProtectReasonSelection',
-				wfMsgForContent( 'protect-dropdown' ),
-				wfMsgForContent( 'protect-otherreason-op' ),
+				wfMessage( 'protect-dropdown' )->inContentLanguage()->text(),
+				wfMessage( 'protect-otherreason-op' )->inContentLanguage()->text(),
 				$this->mReasonSelection,
 				'mwProtect-reason', 4 );
-			$scExpiryOptions = wfMsgForContent( 'protect-expiry-options' );
+			$scExpiryOptions = wfMessage( 'protect-expiry-options' )->inContentLanguage()->text();
 
 			$showProtectOptions = ($scExpiryOptions !== '-' && !$this->disabled);
 
-			$mProtectexpiry = Xml::label( wfMsg( 'protectexpiry' ), "mwProtectExpirySelection-$action" );
-			$mProtectother = Xml::label( wfMsg( 'protect-othertime' ), "mwProtect-$action-expires" );
+			$mProtectexpiry = Xml::label(
+				wfMessage( 'protectexpiry' )->text(),
+				"mwProtectExpirySelection-$action"
+			);
+			$mProtectother = Xml::label(
+				wfMessage( 'protect-othertime' )->text(),
+				"mwProtect-$action-expires"
+			);
 
 			$expiryFormOptions = '';
 			if ( $this->mExistingExpiry[$action] && $this->mExistingExpiry[$action] != 'infinity' ) {
@@ -380,13 +392,16 @@ class ProtectionForm {
 				$t = $wgLang->time( $this->mExistingExpiry[$action], true );
 				$expiryFormOptions .=
 					Xml::option(
-						wfMsg( 'protect-existing-expiry', $timestamp, $d, $t ),
+						wfMessage( 'protect-existing-expiry', $timestamp, $d, $t )->text(),
 						'existing',
 						$this->mExpirySelection[$action] == 'existing'
 					) . "\n";
 			}
 
-			$expiryFormOptions .= Xml::option( wfMsg( 'protect-othertime-op' ), "othertime" ) . "\n";
+			$expiryFormOptions .= Xml::option(
+				wfMessage( 'protect-othertime-op' )->text(),
+				"othertime"
+			) . "\n";
 			foreach( explode(',', $scExpiryOptions) as $option ) {
 				if ( strpos($option, ":") === false ) {
 					$show = $value = $option;
@@ -444,8 +459,12 @@ class ProtectionForm {
 			$out .= '<tr>
 					<td></td>
 					<td class="mw-input">' .
-						Xml::checkLabel( wfMsg( 'protect-cascade' ), 'mwProtect-cascade', 'mwProtect-cascade',
-							$this->mCascade, $this->disabledAttrib ) .
+						Xml::checkLabel(
+							wfMessage( 'protect-cascade' )->text(),
+							'mwProtect-cascade',
+							'mwProtect-cascade',
+							$this->mCascade, $this->disabledAttrib
+						) .
 					"</td>
 				</tr>\n";
 			$out .= Xml::closeElement( 'tbody' ) . Xml::closeElement( 'table' );
@@ -482,7 +501,7 @@ class ProtectionForm {
 				<tr>
 					<td></td>
 					<td class='mw-input'>" .
-						Xml::checkLabel( wfMsg( 'watchthis' ),
+						Xml::checkLabel( wfMessage( 'watchthis' )->text(),
 							'mwProtectWatch', 'mwProtectWatch',
 							$this->mTitle->userIsWatching() || $wgUser->getOption( 'watchdefault' ) ) .
 					"</td>
@@ -492,7 +511,10 @@ class ProtectionForm {
 				<tr>
 					<td></td>
 					<td class='mw-submit'>" .
-						Xml::submitButton( wfMsg( 'confirm' ), array( 'id' => 'mw-Protect-submit' ) ) .
+						Xml::submitButton(
+							wfMessage( 'confirm' )->text(),
+							array( 'id' => 'mw-Protect-submit' )
+						) .
 					"</td>
 				</tr>\n";
 			$out .= Xml::closeElement( 'tbody' ) . Xml::closeElement( 'table' );
@@ -503,7 +525,7 @@ class ProtectionForm {
 			$title = Title::makeTitle( NS_MEDIAWIKI, 'Protect-dropdown' );
 			$link = Linker::link(
 				$title,
-				wfMsgHtml( 'protect-edit-reasonlist' ),
+				wfMessage( 'protect-edit-reasonlist' )->escaped(),
 				array(),
 				array( 'action' => 'edit' )
 			);
@@ -567,13 +589,13 @@ class ProtectionForm {
 	 */
 	private function getOptionLabel( $permission ) {
 		if( $permission == '' ) {
-			return wfMsg( 'protect-default' );
+			return wfMessage( 'protect-default' )->text();
 		} else {
 			$msg = wfMessage( "protect-level-{$permission}" );
 			if( $msg->exists() ) {
 				return $msg->text();
 			}
-			return wfMsg( 'protect-fallback', $permission );
+			return wfMessage( 'protect-fallback', $permission )->text();
 		}
 	}
 
diff --git a/includes/SiteStats.php b/includes/SiteStats.php
index 7f3f65556f..1c2c454d0d 100644
--- a/includes/SiteStats.php
+++ b/includes/SiteStats.php
@@ -347,8 +347,8 @@ class SiteStatsUpdate implements DeferrableUpdate {
 			array(
 				'rc_user != 0',
 				'rc_bot' => 0,
-				"rc_log_type != 'newusers' OR rc_log_type IS NULL",
-				"rc_timestamp >= '{$dbw->timestamp( wfTimestamp( TS_UNIX ) - $wgActiveUserDays*24*3600 )}'",
+				'rc_log_type != ' . $dbr->addQuotes( 'newusers' ) . ' OR rc_log_type IS NULL',
+				'rc_timestamp >= ' . $dbr->addQuotes( $dbr->timestamp( wfTimestamp( TS_UNIX ) - $wgActiveUserDays*24*3600 ) ),
 			),
 			__METHOD__
 		);
diff --git a/includes/Skin.php b/includes/Skin.php
index 3db4cf9440..00eb5e871d 100644
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -437,7 +437,7 @@ abstract class Skin extends ContextSource {
 		if ( !empty( $allCats['normal'] ) ) {
 			$t = $embed . implode( "{$pop}{$embed}" , $allCats['normal'] ) . $pop;
 
-			$msg = $this->msg( 'pagecategories', count( $allCats['normal'] ) )->escaped();
+			$msg = $this->msg( 'pagecategories' )->numParams( count( $allCats['normal'] ) )->escaped();
 			$linkPage = wfMessage( 'pagecategorieslink' )->inContentLanguage()->text();
 			$s .= '<div id="mw-normal-catlinks" class="mw-normal-catlinks">' .
 				Linker::link( Title::newFromText( $linkPage ), $msg )
@@ -455,7 +455,7 @@ abstract class Skin extends ContextSource {
 			}
 
 			$s .= "<div id=\"mw-hidden-catlinks\" class=\"mw-hidden-catlinks$class\">" .
-				$this->msg( 'hidden-categories', count( $allCats['hidden'] ) )->escaped() .
+				$this->msg( 'hidden-categories' )->numParams( count( $allCats['hidden'] ) )->escaped() .
 				$colon . '<ul>' . $embed . implode( "{$pop}{$embed}" , $allCats['hidden'] ) . $pop . '</ul>' .
 				'</div>';
 		}
@@ -568,71 +568,7 @@ abstract class Skin extends ContextSource {
 	 * @return String HTML containing debug data, if enabled (otherwise empty).
 	 */
 	protected function generateDebugHTML() {
-		global $wgShowDebug;
-
-		$html = MWDebug::getDebugHTML( $this->getContext() );
-
-		if ( $wgShowDebug ) {
-			$listInternals = $this->formatDebugHTML( $this->getOutput()->mDebugtext );
-			$html .= "\n<hr />\n<strong>Debug data:</strong><ul id=\"mw-debug-html\">" .
-				$listInternals . "</ul>\n";
-		}
-
-		return $html;
-	}
-
-	/**
-	 * @param $debugText string
-	 * @return string
-	 */
-	private function formatDebugHTML( $debugText ) {
-		global $wgDebugTimestamps;
-
-		$lines = explode( "\n", $debugText );
-		$curIdent = 0;
-		$ret = '<li>';
-
-		foreach ( $lines as $line ) {
-			$pre = '';
-			if ( $wgDebugTimestamps ) {
-				$matches = array();
-				if ( preg_match( '/^(\d+\.\d+ {1,3}\d+.\dM\s{2})/', $line, $matches ) ) {
-					$pre = $matches[1];
-					$line = substr( $line, strlen( $pre ) );
-				}
-			}
-			$display = ltrim( $line );
-			$ident = strlen( $line ) - strlen( $display );
-			$diff = $ident - $curIdent;
-
-			$display = $pre . $display;
-			if ( $display == '' ) {
-				$display = "\xc2\xa0";
-			}
-
-			if ( !$ident && $diff < 0 && substr( $display, 0, 9 ) != 'Entering ' && substr( $display, 0, 8 ) != 'Exiting ' ) {
-				$ident = $curIdent;
-				$diff = 0;
-				$display = '<span style="background:yellow;">' . htmlspecialchars( $display ) . '</span>';
-			} else {
-				$display = htmlspecialchars( $display );
-			}
-
-			if ( $diff < 0 ) {
-				$ret .= str_repeat( "</li></ul>\n", -$diff ) . "</li><li>\n";
-			} elseif ( $diff == 0 ) {
-				$ret .= "</li><li>\n";
-			} else {
-				$ret .= str_repeat( "<ul><li>\n", $diff );
-			}
-			$ret .= "<tt>$display</tt>\n";
-
-			$curIdent = $ident;
-		}
-
-		$ret .= str_repeat( '</li></ul>', $curIdent ) . '</li>';
-
-		return $ret;
+		return MWDebug::getHTMLDebugLog();
 	}
 
 	/**
@@ -899,7 +835,7 @@ abstract class Skin extends ContextSource {
 	 */
 	function logoText( $align = '' ) {
 		if ( $align != '' ) {
-			$a = " align='{$align}'";
+			$a = " style='float: {$align};'";
 		} else {
 			$a = '';
 		}
@@ -1103,7 +1039,7 @@ abstract class Skin extends ContextSource {
 	 * @return String
 	 */
 	static function makeI18nUrl( $name, $urlaction = '' ) {
-		$title = Title::newFromText( wfMsgForContent( $name ) );
+		$title = Title::newFromText( wfMessage( $name )->inContentLanguage()->text() );
 		self::checkTitle( $title, $name );
 		return $title->getLocalURL( $urlaction );
 	}
@@ -1235,7 +1171,7 @@ abstract class Skin extends ContextSource {
 	 * @param $message String
 	 */
 	function addToSidebar( &$bar, $message ) {
-		$this->addToSidebarPlain( $bar, wfMsgForContentNoTrans( $message ) );
+		$this->addToSidebarPlain( $bar, wfMessage( $message )->inContentLanguage()->plain() );
 	}
 
 	/**
@@ -1352,18 +1288,19 @@ abstract class Skin extends ContextSource {
 		$ntl = '';
 
 		if ( count( $newtalks ) == 1 && $newtalks[0]['wiki'] === wfWikiID() ) {
-			$userTalkTitle = $this->getUser()->getTalkPage();
+			$uTalkTitle = $this->getUser()->getTalkPage();
 
-			if ( !$userTalkTitle->equals( $out->getTitle() ) ) {
+			if ( !$uTalkTitle->equals( $out->getTitle() ) ) {
 				$lastSeenRev = isset( $newtalks[0]['rev'] ) ? $newtalks[0]['rev'] : null;
 				$nofAuthors = 0;
 				if ( $lastSeenRev !== null ) {
 					$plural = true; // Default if we have a last seen revision: if unknown, use plural
-					$latestRev = Revision::newFromTitle ($userTalkTitle);
+					$latestRev = Revision::newFromTitle( $uTalkTitle, false, Revision::READ_NORMAL );
 					if ( $latestRev !== null ) {
-						// Singular if only 1 unseen revision, plural if several unseen revisions.
-						$plural = $latestRev->getParentId() !== $lastSeenRev->getId();
-						$nofAuthors = $userTalkTitle->countAuthorsBetween( $lastSeenRev, $latestRev, 10, 'include_new' );
+						// Singular if only 1 unseen revision, plural if several unseen revisions.
+						$plural = $latestRev->getParentId() !== $lastSeenRev->getId();
+						$nofAuthors = $uTalkTitle->countAuthorsBetween(
+							$lastSeenRev, $latestRev, 10, 'include_new' );
 					}
 				} else {
 					// Singular if no revision -> diff link will show latest change only in any case
@@ -1374,14 +1311,14 @@ abstract class Skin extends ContextSource {
 				// the number of revisions or authors is not necessarily the same as the number of
 				// "messages".
 				$newMessagesLink = Linker::linkKnown(
-					$userTalkTitle,
+					$uTalkTitle,
 					$this->msg( 'newmessageslinkplural' )->params( $plural )->escaped(),
 					array(),
 					array( 'redirect' => 'no' )
 				);
 
 				$newMessagesDiffLink = Linker::linkKnown(
-					$userTalkTitle,
+					$uTalkTitle,
 					$this->msg( 'newmessagesdifflinkplural' )->params( $plural )->escaped(),
 					array(),
 					$lastSeenRev !== null
@@ -1547,13 +1484,17 @@ abstract class Skin extends ContextSource {
 	public function doEditSectionLink( Title $nt, $section, $tooltip = null, $lang = false ) {
 		// HTML generated here should probably have userlangattributes
 		// added to it for LTR text on RTL pages
+
+		$lang = wfGetLangObj( $lang );
+
 		$attribs = array();
 		if ( !is_null( $tooltip ) ) {
 			# Bug 25462: undo double-escaping.
 			$tooltip = Sanitizer::decodeCharReferences( $tooltip );
-			$attribs['title'] = wfMsgExt( 'editsectionhint', array( 'language' => $lang, 'parsemag', 'replaceafter' ), $tooltip );
+			$attribs['title'] = wfMessage( 'editsectionhint' )->rawParams( $tooltip )
+				->inLanguage( $lang )->text();
 		}
-		$link = Linker::link( $nt, wfMsgExt( 'editsection', array( 'language' => $lang ) ),
+		$link = Linker::link( $nt, wfMessage( 'editsection' )->inLanguage( $lang )->text(),
 			$attribs,
 			array( 'action' => 'edit', 'section' => $section ),
 			array( 'noclasses', 'known' )
@@ -1563,7 +1504,8 @@ abstract class Skin extends ContextSource {
 		# we can rid of it someday.
 		$attribs = '';
 		if ( $tooltip ) {
-			$attribs = wfMsgExt( 'editsectionhint', array( 'language' => $lang, 'parsemag', 'escape', 'replaceafter' ), $tooltip );
+			$attribs = wfMessage( 'editsectionhint' )->rawParams( $tooltip )
+				->inLanguage( $lang )->escaped();
 			$attribs = " title=\"$attribs\"";
 		}
 		$result = null;
@@ -1573,13 +1515,15 @@ abstract class Skin extends ContextSource {
 			# run, and even add them to hook-provided text.  (This is the main
 			# reason that the EditSectionLink hook is deprecated in favor of
 			# DoEditSectionLink: it can't change the brackets or the span.)
-			$result = wfMsgExt( 'editsection-brackets', array( 'escape', 'replaceafter', 'language' => $lang ), $result );
+			$result = wfMessage( 'editsection-brackets' )->rawParams( $result )
+				->inLanguage( $lang )->escaped();
 			return "<span class=\"editsection\">$result</span>";
 		}
 
 		# Add the brackets and the span, and *then* run the nice new hook, with
 		# clean and non-redundant arguments.
-		$result = wfMsgExt( 'editsection-brackets', array( 'escape', 'replaceafter', 'language' => $lang ), $link );
+		$result = wfMessage( 'editsection-brackets' )->rawParams( $link )
+			->inLanguage( $lang )->escaped();
 		$result = "<span class=\"editsection\">$result</span>";
 
 		wfRunHooks( 'DoEditSectionLink', array( $this, $nt, $section, $tooltip, &$result, $lang ) );
diff --git a/includes/SkinLegacy.php b/includes/SkinLegacy.php
index 4a1c699512..1ae1cb3cce 100644
--- a/includes/SkinLegacy.php
+++ b/includes/SkinLegacy.php
@@ -123,18 +123,18 @@ class LegacyTemplate extends BaseTemplate {
 		  "<table border='0' cellspacing='0' width='100%'>\n<tr>\n";
 
 		if ( $this->getSkin()->qbSetting() == 0 ) {
-			$s .= "<td class='top' align='left' valign='top' rowspan='{$rows}'>\n" .
+			$s .= "<td class='top' style='text-align: left; vertical-align: top;' rowspan='{$rows}'>\n" .
 				$this->getSkin()->logoText( $wgLang->alignStart() ) . '</td>';
 		}
 
 		$l = $wgLang->alignStart();
-		$s .= "<td {$borderhack} align='$l' valign='top'>\n";
+		$s .= "<td {$borderhack} style='text-align: $l; vertical-align: top;'>\n";
 
 		$s .= $this->topLinks();
 		$s .= '<p class="subtitle">' . $this->pageTitleLinks() . "</p>\n";
 
 		$r = $wgLang->alignEnd();
-		$s .= "</td>\n<td {$borderhack} valign='top' align='$r' nowrap='nowrap'>";
+		$s .= "</td>\n<td {$borderhack} style='text-align: $r; vertical-align: top;' nowrap='nowrap'>";
 		$s .= $this->nameAndLogin();
 		$s .= "\n<br />" . $this->searchForm() . '</td>';
 
@@ -182,12 +182,12 @@ class LegacyTemplate extends BaseTemplate {
 		  . $this->getSkin()->escapeSearchLink() . "\">\n"
 		  . '<input type="text" id="searchInput' . $this->searchboxes . '" name="search" size="19" value="'
 		  . htmlspecialchars( substr( $search, 0, 256 ) ) . "\" />\n"
-		  . '<input type="submit" name="go" value="' . wfMsg( 'searcharticle' ) . '" />';
+		  . '<input type="submit" name="go" value="' . wfMessage( 'searcharticle' )->text() . '" />';
 
 		if ( $wgUseTwoButtonsSearchForm ) {
-			$s .= '&#160;<input type="submit" name="fulltext" value="' . wfMsg( 'searchbutton' ) . "\" />\n";
+			$s .= '&#160;<input type="submit" name="fulltext" value="' . wfMessage( 'searchbutton' )->text() . "\" />\n";
 		} else {
-			$s .= ' <a href="' . $this->getSkin()->escapeSearchLink() . '" rel="search">' . wfMsg( 'powersearch-legend' ) . "</a>\n";
+			$s .= ' <a href="' . $this->getSkin()->escapeSearchLink() . '" rel="search">' . wfMessage( 'powersearch-legend' )->text() . "</a>\n";
 		}
 
 		$s .= '</form>';
@@ -236,7 +236,7 @@ class LegacyTemplate extends BaseTemplate {
 		}
 
 		// @todo FIXME: Is using Language::pipeList impossible here? Do not quite understand the use of the newline
-		return implode( $s, wfMsgExt( 'pipe-separator', 'escapenoentities' ) . "\n" );
+		return implode( $s, wfMessage( 'pipe-separator' )->escaped() . "\n" );
 	}
 
 	/**
@@ -292,7 +292,7 @@ class LegacyTemplate extends BaseTemplate {
 		if ( count( $s ) ) {
 			global $wgLang;
 
-			$out = wfMsgExt( 'pipe-separator' , 'escapenoentities' );
+			$out = wfMessage( 'pipe-separator' )->escaped();
 			$out .= $wgLang->pipeList( $s );
 		}
 
@@ -301,7 +301,7 @@ class LegacyTemplate extends BaseTemplate {
 
 	function bottomLinks() {
 		global $wgOut, $wgUser;
-		$sep = wfMsgExt( 'pipe-separator', 'escapenoentities' ) . "\n";
+		$sep = wfMessage( 'pipe-separator' )->escaped() . "\n";
 
 		$s = '';
 		if ( $wgOut->isArticleRelated() ) {
@@ -373,7 +373,7 @@ class LegacyTemplate extends BaseTemplate {
 			return '';
 		}
 
-		$s = wfMsg( 'otherlanguages' ) . wfMsg( 'colon-separator' );
+		$s = wfMessage( 'otherlanguages' )->text() . wfMessage( 'colon-separator' )->text();
 		$first = true;
 
 		if ( $wgLang->isRTL() ) {
@@ -382,7 +382,7 @@ class LegacyTemplate extends BaseTemplate {
 
 		foreach ( $a as $l ) {
 			if ( !$first ) {
-				$s .= wfMsgExt( 'pipe-separator', 'escapenoentities' );
+				$s .= wfMessage( 'pipe-separator' )->escaped();
 			}
 
 			$first = false;
@@ -417,8 +417,9 @@ class LegacyTemplate extends BaseTemplate {
 				$obj->getTitle()->getPrefixedDBkey() );
 		}
 
-		return Html::rawElement( 'form', array( 'id' => 'specialpages', 'method' => 'get',
-			'action' => $wgScript ), $select->getHTML() . Xml::submitButton( wfMsg( 'go' ) ) );
+		return Html::rawElement( 'form',
+			array( 'id' => 'specialpages', 'method' => 'get', 'action' => $wgScript ),
+			$select->getHTML() . Xml::submitButton( wfMessage( 'go' )->text() ) );
 	}
 
 	function pageTitleLinks() {
@@ -459,8 +460,8 @@ class LegacyTemplate extends BaseTemplate {
 
 		if ( 'history' == $action || isset( $diff ) || isset( $oldid ) ) {
 			$s[] .= Linker::linkKnown(
-					$title,
-					wfMsg( 'currentrev' )
+				$title,
+				wfMessage( 'currentrev' )->text()
 			);
 		}
 
@@ -470,18 +471,18 @@ class LegacyTemplate extends BaseTemplate {
 			if ( !$title->equals( $wgUser->getTalkPage() ) ) {
 				$tl = Linker::linkKnown(
 					$wgUser->getTalkPage(),
-					wfMsgHtml( 'newmessageslink' ),
+					wfMessage( 'newmessageslink' )->escaped(),
 					array(),
 					array( 'redirect' => 'no' )
 				);
 
 				$dl = Linker::linkKnown(
 					$wgUser->getTalkPage(),
-					wfMsgHtml( 'newmessagesdifflink' ),
+					wfMessage( 'newmessagesdifflink' )->escaped(),
 					array(),
 					array( 'diff' => 'cur' )
 				);
-				$s[] = '<strong>' . wfMsg( 'youhavenewmessages', $tl, $dl ) . '</strong>';
+				$s[] = '<strong>' . wfMessage( 'youhavenewmessages', $tl, $dl )->text() . '</strong>';
 				# disable caching
 				$wgOut->setSquidMaxage( 0 );
 				$wgOut->enableClientCache( false );
@@ -514,7 +515,7 @@ class LegacyTemplate extends BaseTemplate {
 
 		if ( $sub == '' ) {
 			global $wgExtraSubtitle;
-			$sub = wfMsgExt( 'tagline', 'parsemag' ) . $wgExtraSubtitle;
+			$sub = wfMessage( 'tagline' )->parse() . $wgExtraSubtitle;
 		}
 
 		$subpages = $this->getSkin()->subPageSubtitle();
@@ -532,14 +533,15 @@ class LegacyTemplate extends BaseTemplate {
 		if ( !$wgOut->isPrintable() ) {
 			$printurl = htmlspecialchars( $this->getSkin()->getTitle()->getLocalUrl(
 				$wgRequest->appendQueryValue( 'printable', 'yes', true ) ) );
-			$s[] = "<a href=\"$printurl\" rel=\"alternate\">" . wfMsg( 'printableversion' ) . '</a>';
+			$s[] = "<a href=\"$printurl\" rel=\"alternate\">"
+				. wfMessage( 'printableversion' )->text() . '</a>';
 		}
 
 		if ( $wgOut->isSyndicated() ) {
 			foreach ( $wgOut->getSyndicationLinks() as $format => $link ) {
 				$feedurl = htmlspecialchars( $link );
 				$s[] = "<a href=\"$feedurl\" rel=\"alternate\" type=\"application/{$format}+xml\""
-						. " class=\"feedlink\">" . wfMsgHtml( "feed-$format" ) . "</a>";
+						. " class=\"feedlink\">" . wfMessage( "feed-$format" )->escaped() . "</a>";
 			}
 		}
 		return $wgLang->pipeList( $s );
@@ -558,15 +560,15 @@ class LegacyTemplate extends BaseTemplate {
 		global $wgOut;
 
 		if ( !$wgOut->isArticleRelated() ) {
-			$s = wfMsg( 'protectedpage' );
+			$s = wfMessage( 'protectedpage' )->text();
 		} else {
 			$title = $this->getSkin()->getTitle();
 			if ( $title->quickUserCan( 'edit' ) && $title->exists() ) {
-				$t = wfMsg( 'editthispage' );
+				$t = wfMessage( 'editthispage' )->text();
 			} elseif ( $title->quickUserCan( 'create' ) && !$title->exists() ) {
-				$t = wfMsg( 'create-this-page' );
+				$t = wfMessage( 'create-this-page' )->text();
 			} else {
-				$t = wfMsg( 'viewsource' );
+				$t = wfMessage( 'viewsource' )->text();
 			}
 
 			$s = Linker::linkKnown(
@@ -587,7 +589,7 @@ class LegacyTemplate extends BaseTemplate {
 		$title = $this->getSkin()->getTitle();
 
 		if ( $title->getArticleID() && ( !$diff ) && $wgUser->isAllowed( 'delete' ) ) {
-			$t = wfMsg( 'deletethispage' );
+			$t = wfMessage( 'deletethispage' )->text();
 
 			$s = Linker::linkKnown(
 				$title,
@@ -610,10 +612,10 @@ class LegacyTemplate extends BaseTemplate {
 
 		if ( $title->getArticleID() && ( ! $diff ) && $wgUser->isAllowed( 'protect' ) ) {
 			if ( $title->isProtected() ) {
-				$text = wfMsg( 'unprotectthispage' );
+				$text = wfMessage( 'unprotectthispage' )->text();
 				$query = array( 'action' => 'unprotect' );
 			} else {
-				$text = wfMsg( 'protectthispage' );
+				$text = wfMessage( 'protectthispage' )->text();
 				$query = array( 'action' => 'protect' );
 			}
 
@@ -639,14 +641,14 @@ class LegacyTemplate extends BaseTemplate {
 
 		if ( $wgOut->isArticleRelated() ) {
 			if ( $wgUser->isWatched( $title ) ) {
-				$text = wfMsg( 'unwatchthispage' );
+				$text = wfMessage( 'unwatchthispage' )->text();
 				$query = array(
 					'action' => 'unwatch',
 					'token' => UnwatchAction::getUnwatchToken( $title, $wgUser ),
 				);
 				$id = 'mw-unwatch-link' . $this->mWatchLinkNum;
 			} else {
-				$text = wfMsg( 'watchthispage' );
+				$text = wfMessage( 'watchthispage' )->text();
 				$query = array(
 					'action' => 'watch',
 					'token' => WatchAction::getWatchToken( $title, $wgUser ),
@@ -661,7 +663,7 @@ class LegacyTemplate extends BaseTemplate {
 				$query
 			);
 		} else {
-			$s = wfMsg( 'notanarticle' );
+			$s = wfMessage( 'notanarticle' )->text();
 		}
 
 		return $s;
@@ -671,7 +673,7 @@ class LegacyTemplate extends BaseTemplate {
 		if ( $this->getSkin()->getTitle()->quickUserCan( 'move' ) ) {
 			return Linker::linkKnown(
 				SpecialPage::getTitleFor( 'Movepage' ),
-				wfMsg( 'movethispage' ),
+				wfMessage( 'movethispage' )->text(),
 				array(),
 				array( 'target' => $this->getSkin()->getTitle()->getPrefixedDBkey() )
 			);
@@ -684,7 +686,7 @@ class LegacyTemplate extends BaseTemplate {
 	function historyLink() {
 		return Linker::link(
 			$this->getSkin()->getTitle(),
-			wfMsgHtml( 'history' ),
+			wfMessage( 'history' )->escaped(),
 			array( 'rel' => 'archives' ),
 			array( 'action' => 'history' )
 		);
@@ -693,21 +695,21 @@ class LegacyTemplate extends BaseTemplate {
 	function whatLinksHere() {
 		return Linker::linkKnown(
 			SpecialPage::getTitleFor( 'Whatlinkshere', $this->getSkin()->getTitle()->getPrefixedDBkey() ),
-			wfMsgHtml( 'whatlinkshere' )
+			wfMessage( 'whatlinkshere' )->escaped()
 		);
 	}
 
 	function userContribsLink() {
 		return Linker::linkKnown(
 			SpecialPage::getTitleFor( 'Contributions', $this->getSkin()->getTitle()->getDBkey() ),
-			wfMsgHtml( 'contributions' )
+			wfMessage( 'contributions' )->escaped()
 		);
 	}
 
 	function emailUserLink() {
 		return Linker::linkKnown(
 			SpecialPage::getTitleFor( 'Emailuser', $this->getSkin()->getTitle()->getDBkey() ),
-			wfMsgHtml( 'emailuser' )
+			wfMessage( 'emailuser' )->escaped()
 		);
 	}
 
@@ -719,7 +721,7 @@ class LegacyTemplate extends BaseTemplate {
 		} else {
 			return Linker::linkKnown(
 				SpecialPage::getTitleFor( 'Recentchangeslinked', $this->getSkin()->getTitle()->getPrefixedDBkey() ),
-				wfMsgHtml( 'recentchangeslinked-toolbox' )
+				wfMessage( 'recentchangeslinked-toolbox' )->escaped()
 			);
 		}
 	}
@@ -737,41 +739,41 @@ class LegacyTemplate extends BaseTemplate {
 			$link = $title->getSubjectPage();
 			switch( $link->getNamespace() ) {
 				case NS_MAIN:
-					$text = wfMsg( 'articlepage' );
+					$text = wfMessage( 'articlepage' );
 					break;
 				case NS_USER:
-					$text = wfMsg( 'userpage' );
+					$text = wfMessage( 'userpage' );
 					break;
 				case NS_PROJECT:
-					$text = wfMsg( 'projectpage' );
+					$text = wfMessage( 'projectpage' );
 					break;
 				case NS_FILE:
-					$text = wfMsg( 'imagepage' );
+					$text = wfMessage( 'imagepage' );
 					# Make link known if image exists, even if the desc. page doesn't.
 					if ( wfFindFile( $link ) )
 						$linkOptions[] = 'known';
 					break;
 				case NS_MEDIAWIKI:
-					$text = wfMsg( 'mediawikipage' );
+					$text = wfMessage( 'mediawikipage' );
 					break;
 				case NS_TEMPLATE:
-					$text = wfMsg( 'templatepage' );
+					$text = wfMessage( 'templatepage' );
 					break;
 				case NS_HELP:
-					$text = wfMsg( 'viewhelppage' );
+					$text = wfMessage( 'viewhelppage' );
 					break;
 				case NS_CATEGORY:
-					$text = wfMsg( 'categorypage' );
+					$text = wfMessage( 'categorypage' );
 					break;
 				default:
-					$text = wfMsg( 'articlepage' );
+					$text = wfMessage( 'articlepage' );
 			}
 		} else {
 			$link = $title->getTalkPage();
-			$text = wfMsg( 'talkpage' );
+			$text = wfMessage( 'talkpage' );
 		}
 
-		$s = Linker::link( $link, $text, array(), array(), $linkOptions );
+		$s = Linker::link( $link, $text->text(), array(), array(), $linkOptions );
 
 		return $s;
 	}
@@ -793,7 +795,7 @@ class LegacyTemplate extends BaseTemplate {
 
 		return Linker::linkKnown(
 			$title,
-			wfMsg( 'postcomment' ),
+			wfMessage( 'postcomment' )->text(),
 			array(),
 			array(
 				'action' => 'edit',
@@ -807,11 +809,13 @@ class LegacyTemplate extends BaseTemplate {
 
 		if ( $wgUploadNavigationUrl ) {
 			# Using an empty class attribute to avoid automatic setting of "external" class
-			return Linker::makeExternalLink( $wgUploadNavigationUrl, wfMsgHtml( 'upload' ), false, null, array( 'class' => '' ) );
+			return Linker::makeExternalLink( $wgUploadNavigationUrl,
+				wfMessage( 'upload' )->escaped(),
+				false, null, array( 'class' => '' ) );
 		} else {
 			return Linker::linkKnown(
 				SpecialPage::getTitleFor( 'Upload' ),
-				wfMsgHtml( 'upload' )
+				wfMessage( 'upload' )->escaped()
 			);
 		}
 	}
@@ -832,7 +836,7 @@ class LegacyTemplate extends BaseTemplate {
 
 				$ret .= "$name $talkLink";
 			} else {
-				$ret .= wfMsg( 'notloggedin' );
+				$ret .= wfMessage( 'notloggedin' )->text();
 			}
 
 			$query = array();
@@ -846,7 +850,7 @@ class LegacyTemplate extends BaseTemplate {
 				: 'login';
 			$ret .= "\n<br />" . Linker::link(
 				SpecialPage::getTitleFor( 'Userlogin' ),
-				wfMsg( $loginlink ), array(), $query
+				wfMessage( $loginlink )->text(), array(), $query
 			);
 		} else {
 			$talkLink = Linker::link( $wgUser->getTalkPage(),
@@ -858,7 +862,7 @@ class LegacyTemplate extends BaseTemplate {
 			$ret .= " $talkLink<br />";
 			$ret .= $wgLang->pipeList( array(
 				Linker::link(
-					SpecialPage::getTitleFor( 'Userlogout' ), wfMsg( 'logout' ),
+					SpecialPage::getTitleFor( 'Userlogout' ), wfMessage( 'logout' )->text(),
 					array(), array( 'returnto' => $returnTo->getPrefixedDBkey() )
 				),
 				Linker::specialLink( 'Preferences' ),
@@ -868,8 +872,8 @@ class LegacyTemplate extends BaseTemplate {
 		$ret = $wgLang->pipeList( array(
 			$ret,
 			Linker::link(
-				Title::newFromText( wfMsgForContent( 'helppage' ) ),
-				wfMsg( 'help' )
+				Title::newFromText( wfMessage( 'helppage' )->inContentLanguage()->text() ),
+				wfMessage( 'help' )->text()
 			),
 		) );
 
diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index 3c5a263c0d..d3502e92ff 100644
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -40,7 +40,7 @@ class MediaWiki_I18N {
 		// Hack for i18n:attributes in PHPTAL 1.0.0 dev version as of 2004-10-23
 		$value = preg_replace( '/^string:/', '', $value );
 
-		$value = wfMsg( $value );
+		$value = wfMessage( $value )->text();
 		// interpolate variables
 		$m = array();
 		while( preg_match( '/\$([0-9]*?)/sm', $value, $m ) ) {
@@ -135,7 +135,6 @@ class SkinTemplate extends Skin {
 		global $wgDisableCounters, $wgSitename, $wgLogo, $wgHideInterlanguageLinks;
 		global $wgMaxCredits, $wgShowCreditsIfMax;
 		global $wgPageShowWatchingUsers;
-		global $wgDebugComments;
 		global $wgArticlePath, $wgScriptPath, $wgServer;
 
 		wfProfileIn( __METHOD__ );
@@ -387,12 +386,6 @@ class SkinTemplate extends Skin {
 			}
 		}
 
-		if ( $wgDebugComments ) {
-			$tpl->setRef( 'debug', $out->mDebugtext );
-		} else {
-			$tpl->set( 'debug', '' );
-		}
-
 		$tpl->set( 'sitenotice', $this->getSiteNotice() );
 		$tpl->set( 'bottomscripts', $this->bottomScripts() );
 		$tpl->set( 'printfooter', $this->printSource() );
@@ -468,6 +461,7 @@ class SkinTemplate extends Skin {
 			$tpl->set( 'headscripts', $out->getHeadScripts() . $out->getHeadItems() );
 		}
 
+		$tpl->set( 'debug', '' );
 		$tpl->set( 'debughtml', $this->generateDebugHTML() );
 		$tpl->set( 'reporttime', wfReportTime() );
 
@@ -629,6 +623,7 @@ class SkinTemplate extends Skin {
 			global $wgSecureLogin;
 			$proto = $wgSecureLogin ? PROTO_HTTPS : null;
 
+			$login_id = $this->showIPinHeader() ? 'anonlogin' : 'login';
 			$login_url = array(
 				'text' => $this->msg( $loginlink )->text(),
 				'href' => self::makeSpecialUrl( 'Userlogin', $returnto, $proto ),
@@ -642,10 +637,6 @@ class SkinTemplate extends Skin {
 				'class' => $wgSecureLogin ? 'link-https' : ''
 			);
 
-			if ( $this->getUser()->isAllowed( 'createaccount' ) && !$useCombinedLoginLink ) {
-				$personal_urls['createaccount'] = $createaccount_url;
-			}
-
 			if( $this->showIPinHeader() ) {
 				$href = &$this->userpageUrlDetails['href'];
 				$personal_urls['anonuserpage'] = array(
@@ -662,10 +653,13 @@ class SkinTemplate extends Skin {
 					'class' => $usertalkUrlDetails['exists'] ? false : 'new',
 					'active' => ( $pageurl == $href )
 				);
-				$personal_urls['anonlogin'] = $login_url;
-			} else {
-				$personal_urls['login'] = $login_url;
 			}
+
+			if ( $this->getUser()->isAllowed( 'createaccount' ) && !$useCombinedLoginLink ) {
+				$personal_urls['createaccount'] = $createaccount_url;
+			}
+
+			$personal_urls[$login_id] = $login_url;
 		}
 
 		wfRunHooks( 'PersonalUrls', array( &$personal_urls, &$title ) );
@@ -1886,13 +1880,7 @@ abstract class BaseTemplate extends QuickTemplate {
 	function printTrail() { ?>
 <?php $this->html( 'bottomscripts' ); /* JS call to runBodyOnloadHook */ ?>
 <?php $this->html( 'reporttime' ) ?>
-<?php if ( $this->data['debug'] ): ?>
-<!-- Debug output:
-<?php $this->text( 'debug' ); ?>
-
--->
-<?php endif;
+<?php echo MWDebug::getDebugHTML( $this->getSkin()->getContext() );
 	}
 
 }
-
diff --git a/includes/SpecialPage.php b/includes/SpecialPage.php
index e2932e1254..2e5e02b0fc 100644
--- a/includes/SpecialPage.php
+++ b/includes/SpecialPage.php
@@ -351,7 +351,7 @@ class SpecialPage {
 			$this->mFunction = $function;
 		}
 		if ( $file === 'default' ) {
-			$this->mFile = dirname( __FILE__ ) . "/specials/Special$name.php";
+			$this->mFile = __DIR__ . "/specials/Special$name.php";
 		} else {
 			$this->mFile = $file;
 		}
diff --git a/includes/StreamFile.php b/includes/StreamFile.php
index 6539e08c99..e7f7811731 100644
--- a/includes/StreamFile.php
+++ b/includes/StreamFile.php
@@ -31,7 +31,7 @@ class StreamFile {
 	 * Stream a file to the browser, adding all the headings and fun stuff.
 	 * Headers sent include: Content-type, Content-Length, Last-Modified,
 	 * and Content-Disposition.
-	 * 
+	 *
 	 * @param $fname string Full name and path of the file to stream
 	 * @param $headers array Any additional headers to send
 	 * @param $sendErrors bool Send error messages if errors occur (like 404)
@@ -40,6 +40,10 @@ class StreamFile {
 	public static function stream( $fname, $headers = array(), $sendErrors = true ) {
 		wfProfileIn( __METHOD__ );
 
+		if ( FileBackend::isStoragePath( $fname ) ) { // sanity
+			throw new MWException( __FUNCTION__ . " given storage path '$fname'." );
+		}
+
 		wfSuppressWarnings();
 		$stat = stat( $fname );
 		wfRestoreWarnings();
@@ -142,7 +146,7 @@ class StreamFile {
 
 	/**
 	 * Determine the file type of a file based on the path
-	 * 
+	 *
 	 * @param $filename string Storage path or file system path
 	 * @param $safe bool Whether to do retroactive upload blacklist checks
 	 * @return null|string
diff --git a/includes/Uri.php b/includes/Uri.php
deleted file mode 100644
index f6cf06f03f..0000000000
--- a/includes/Uri.php
+++ /dev/null
@@ -1,335 +0,0 @@
-<?php
-/**
- * Class for simple URI parsing and manipulation.
- * Intended to simplify things that were using wfParseUrl and
- * had to do manual concatenation for various needs.
- * Built to match our JS mw.Uri in naming patterns.
- * @file
- * @author Daniel Friesen
- * @since 1.20
- */
-
-class Uri {
-
-	/**
-	 * The parsed components of the URI
-	 */
-	protected $components;
-
-	protected static $validComponents = array( 'scheme', 'delimiter', 'host', 'port', 'user', 'pass', 'path', 'query', 'fragment' );
-	protected static $componentAliases = array( 'protocol' => 'scheme', 'password' => 'pass' );
-
-	/**
-	 * parse_url() work-alike, but non-broken.  Differences:
-	 *
-	 * 1) Does not raise warnings on bad URLs (just returns false)
-	 * 2) Handles protocols that don't use :// (e.g., mailto: and news: , as well as protocol-relative URLs) correctly
-	 * 3) Adds a "delimiter" element to the array, either '://', ':' or '//' (see (2))
-	 *
-	 * @param $url String: a URL to parse
-	 * @return Array: bits of the URL in an associative array, per PHP docs
-	 */
-	protected static function parseUri( $url ) {
-		global $wgUrlProtocols; // Allow all protocols defined in DefaultSettings/LocalSettings.php
-
-		// Protocol-relative URLs are handled really badly by parse_url(). It's so bad that the easiest
-		// way to handle them is to just prepend 'http:' and strip the protocol out later
-		$wasRelative = substr( $url, 0, 2 ) == '//';
-		if ( $wasRelative ) {
-			$url = "http:$url";
-		}
-		wfSuppressWarnings();
-		$bits = parse_url( $url );
-		wfRestoreWarnings();
-		// parse_url() returns an array without scheme for some invalid URLs, e.g.
-		// parse_url("%0Ahttp://example.com") == array( 'host' => '%0Ahttp', 'path' => 'example.com' )
-		if ( !$bits ||
-		     !isset( $bits['scheme'] ) && strpos( $url, "://" ) !== false ) {
-			wfDebug( __METHOD__ . ": Invalid URL: $url" );
-			return false;
-		} else {
-			$scheme = isset( $bits['scheme'] ) ? $bits['scheme'] : null;
-		}
-
-		// most of the protocols are followed by ://, but mailto: and sometimes news: not, check for it
-		if ( in_array( $scheme . '://', $wgUrlProtocols ) ) {
-			$bits['delimiter'] = '://';
-		} elseif ( !is_null( $scheme ) && !in_array( $scheme . ':', $wgUrlProtocols ) ) {
-			wfDebug( __METHOD__ . ": Invalid scheme in URL: $scheme" );
-			return false;
-		} elseif( !is_null( $scheme ) ) {
-			if( !in_array( $scheme . ':', $wgUrlProtocols ) ) {
-				// For URLs that don't have a scheme, but do have a user:password, parse_url
-				// detects the user as the scheme.
-				unset( $bits['scheme'] );
-				$bits['user'] = $scheme;
-			} else {
-				$bits['delimiter'] = ':';
-				// parse_url detects for news: and mailto: the host part of an url as path
-				// We have to correct this wrong detection
-				if ( isset( $bits['path'] ) ) {
-					$bits['host'] = $bits['path'];
-					$bits['path'] = '';
-				}
-			}
-		}
-
-		/* Provide an empty host for eg. file:/// urls (see bug 28627) */
-		if ( !isset( $bits['host'] ) && $scheme == "file" ) {
-			$bits['host'] = '';
-
-			/* parse_url loses the third / for file:///c:/ urls (but not on variants) */
-			if ( isset( $bits['path'] ) && substr( $bits['path'], 0, 1 ) !== '/' ) {
-				$bits['path'] = '/' . $bits['path'];
-			}
-		}
-
-		// If the URL was protocol-relative, fix scheme and delimiter
-		if ( $wasRelative ) {
-			$bits['scheme'] = '';
-			$bits['delimiter'] = '//';
-		}
-		return $bits;
-	}
-
-	/**
-	 *
-	 * @param $uri mixed URI string or array
-	 */
-	public function __construct( $uri ) {
-		$this->components = array();
-		$this->setUri( $uri );
-	}
-
-	/**
-	 * Set the Uri to the value of some other URI.
-	 *
-	 * @param $uri mixed URI string or array
-	 */
-	public function setUri( $uri ) {
-		if ( is_string( $uri ) ) {
-			$parsed = self::parseUri( $uri );
-			if( $parsed === false ) {
-				return false;
-			}
-			$this->setComponents( $parsed );
-		} elseif ( is_array( $uri ) ) {
-			$this->setComponents( $uri );
-		} elseif ( $uri instanceof Uri ) {
-			$this->setComponents( $uri->getComponents() );
-		} else {
-			throw new MWException( __METHOD__ . ': $uri is not of a valid type.' );
-		}
-	}
-
-	/**
-	 * Set the components of this array.
-	 * Will output warnings when invalid components or aliases are found.
-	 *
-	 * @param $components Array The components to set on this Uri.
-	 */
-	public function setComponents( array $components ) {
-		foreach ( $components as $name => $value ) {
-			if ( isset( self::$componentAliases[$name] ) ) {
-				$canonical = self::$componentAliases[$name];
-				wfDebug( __METHOD__ . ": Converting alias $name to canonical $canonical." );
-				$components[$canonical] = $value;
-				unset( $components[$name] );
-			} elseif ( !in_array( $name, self::$validComponents ) ) {
-				throw new MWException( __METHOD__ . ": $name is not a valid component." );
-			}
-		}
-
-		$this->components = $components;
-	}
-
-	/**
-	 * Return the components for this Uri
-	 * @return Array
-	 */
-	public function getComponents() {
-		return $this->components;
-	}
-
-	/**
-	 * Return the value of a specific component
-	 *
-	 * @param $name string The name of the component to return
-	 * @param string|null
-	 */
-	public function getComponent( $name ) {
-		if ( isset( self::$componentAliases[$name] ) ) {
-			// Component is an alias. Get the actual name.
-			$alias = $name;
-			$name = self::$componentAliases[$name];
-			wfDebug( __METHOD__ . ": Converting alias $alias to canonical $name." );
-		}
-
-		if( !in_array( $name, self::$validComponents ) ) {
-			// Component is invalid
-			throw new MWException( __METHOD__ . ": $name is not a valid component." );
-		} elseif( !empty( $this->components[$name] ) ) {
-			// Component is valid and has a value.
-			return $this->components[$name];
-		} else {
-			// Component is empty
-			return null;
-		}
-	}
-
-	/**
-	 * Set a component for this Uri
-	 * @param $name string The name of the component to set
-	 * @param $value string|null The value to set
-	 */
-	public function setComponent( $name, $value ) {
-		if ( isset( self::$componentAliases[$name] ) ) {
-			$alias = $name;
-			$name = self::$componentAliases[$name];
-			wfDebug( __METHOD__ . ": Converting alias $alias to canonical $name." );
-		} elseif ( !in_array( $name, self::$validComponents ) ) {
-			throw new MWException( __METHOD__ . ": $name is not a valid component." );
-		}
-		$this->components[$name] = $value;
-	}
-
-	public function getProtocol() { return $this->getComponent( 'scheme' ); }
-	public function getUser() { return $this->getComponent( 'user' ); }
-	public function getPassword() { return $this->getComponent( 'pass' ); }
-	public function getHost() { return $this->getComponent( 'host' ); }
-	public function getPort() { return $this->getComponent( 'port' ); }
-	public function getPath() { return $this->getComponent( 'path' ); }
-	public function getQueryString() { return $this->getComponent( 'query' ); }
-	public function getFragment() { return $this->getComponent( 'fragment' ); }
-
-	public function setProtocol( $scheme ) { $this->setComponent( 'scheme', $scheme ); }
-	public function setUser( $user ) { $this->setComponent( 'user', $user ); }
-	public function setPassword( $pass ) { $this->setComponent( 'pass', $pass ); }
-	public function setHost( $host ) { $this->setComponent( 'host', $host ); }
-	public function setPort( $port ) { $this->setComponent( 'port', $port ); }
-	public function setPath( $path ) { $this->setComponent( 'path', $path ); }
-	public function setFragment( $fragment ) { $this->setComponent( 'fragment', $fragment ); }
-
-	/**
-	 * Gets the protocol-authority delimiter of a URI (:// or //).
-	 * @return string|null
-	 */
-	public function getDelimiter() {
-		$delimiter = $this->getComponent( 'delimiter' );
-		if ( $delimiter ) {
-			// A specific delimiter is set, so return it.
-			return $delimiter;
-		}
-		if ( $this->getAuthority() && $this->getProtocol() ) {
-			// If the URI has a protocol and a body (i.e., some sort of host, etc.)
-			// the default delimiter is "://", e.g., "http://test.com".
-			return '://';
-		}
-		return null;
-	}
-
-	/**
-	 * Gets query portion of a URI in array format.
-	 * @return string
-	 */
-	public function getQuery() {
-		return wfCgiToArray( $this->getQueryString() );
-	}
-
-	/**
-	 * Gets query portion of a URI.
-	 * @param string|array $query
-	 */
-	public function setQuery( $query ) {
-		if ( is_array( $query ) ) {
-			$query = wfArrayToCGI( $query );
-		}
-		$this->setComponent( 'query', $query );
-	}
-
-	/**
-	 * Extend the query -- supply query parameters to override or add to ours
-	 * @param Array|string $parameters query parameters to override or add
-	 * @return Uri this URI object
-	 */
-	public function extendQuery( $parameters ) {
-		if ( !is_array( $parameters ) ) {
-			$parameters = wfCgiToArray( $parameters );
-		}
-
-		$query = $this->getQuery();
-		foreach( $parameters as $key => $value ) {
-			$query[$key] = $value;
-		}
-
-		$this->setQuery( $query );
-		return $this;
-	}
-
-	/**
-	 * Returns user and password portion of a URI.
-	 * @return string
-	 */
-	public function getUserInfo() {
-		$user = $this->getComponent( 'user' );
-		$pass = $this->getComponent( 'pass' );
-		return $pass ? "$user:$pass" : $user;
-	}
-
-	/**
-	 * Gets host and port portion of a URI.
-	 * @return string
-	 */
-	public function getHostPort() {
-		$host = $this->getComponent( 'host' );
-		$port = $this->getComponent( 'port' );
-		return $port ? "$host:$port" : $host;
-	}
-
-	/**
-	 * Returns the userInfo and host and port portion of the URI.
-	 * In most real-world URLs, this is simply the hostname, but it is more general.
-	 * @return string
-	 */
-	public function getAuthority() {
-		$userinfo = $this->getUserInfo();
-		$hostinfo = $this->getHostPort();
-		return $userinfo ? "$userinfo@$hostinfo" : $hostinfo;
-	}
-
-	/**
-	 * Returns everything after the authority section of the URI
-	 * @return String
-	 */
-	public function getRelativePath() {
-		$path = $this->getComponent( 'path' );
-		$query = $this->getComponent( 'query' );
-		$fragment = $this->getComponent( 'fragment' );
-
-		$retval = $path;
-		if( $query ) {
-			$retval .= "?$query";
-		}
-		if( $fragment ) {
-			$retval .= "#$fragment";
-		}
-		return $retval;
-	}
-
-	/**
-	 * Gets the entire URI string. May not be precisely the same as input due to order of query arguments.
-	 * @return String the URI string
-	 */
-	public function toString() {
-		return $this->getComponent( 'scheme' ) . $this->getDelimiter() . $this->getAuthority() . $this->getRelativePath();
-	}
-
-	/**
-	 * Gets the entire URI string. May not be precisely the same as input due to order of query arguments.
-	 * @return String the URI string
-	 */
-	public function __toString() {
-		return $this->toString();
-	}
-
-}
diff --git a/includes/WebStart.php b/includes/WebStart.php
index 17f8216bab..01c5eea846 100644
--- a/includes/WebStart.php
+++ b/includes/WebStart.php
@@ -81,7 +81,7 @@ define( 'MEDIAWIKI', true );
 # Full path to working directory.
 # Makes it possible to for example to have effective exclude path in apc.
 # Also doesn't break installations using symlinked includes, like
-# dirname( __FILE__ ) would do.
+# __DIR__ would do.
 $IP = getenv( 'MW_INSTALL_PATH' );
 if ( $IP === false ) {
 	$IP = realpath( '.' );
diff --git a/includes/WikiPage.php b/includes/WikiPage.php
index 5ec58191d1..a4e1d8d94b 100644
--- a/includes/WikiPage.php
+++ b/includes/WikiPage.php
@@ -2383,7 +2383,7 @@ class WikiPage extends Page implements IDBAccessObject {
 				array( /* WHERE */
 					'rc_cur_id' => $current->getPage(),
 					'rc_user_text' => $current->getUserText(),
-					"rc_timestamp > '{$s->rev_timestamp}'",
+					'rc_timestamp > ' . $dbw->addQuotes( $s->rev_timestamp ),
 				), __METHOD__
 			);
 		}
@@ -2406,6 +2406,9 @@ class WikiPage extends Page implements IDBAccessObject {
 		);
 		$summary = wfMsgReplaceArgs( $summary, $args );
 
+		# Truncate for whole multibyte characters.
+		$summary = $wgContLang->truncate( $summary, 255 );
+
 		# Save
 		$flags = EDIT_UPDATE;
 
diff --git a/includes/ZipDirectoryReader.php b/includes/ZipDirectoryReader.php
index 5b96b409f9..0e84583f58 100644
--- a/includes/ZipDirectoryReader.php
+++ b/includes/ZipDirectoryReader.php
@@ -696,10 +696,10 @@ class ZipDirectoryReader {
  * Internal exception class. Will be caught by private code.
  */
 class ZipDirectoryReaderError extends Exception {
-	var $code;
+	var $errorCode;
 
 	function __construct( $code ) {
-		$this->code = $code;
+		$this->errorCode = $code;
 		parent::__construct( "ZipDirectoryReader error: $code" );
 	}
 
@@ -707,6 +707,6 @@ class ZipDirectoryReaderError extends Exception {
 	 * @return mixed
 	 */
 	function getErrorCode() {
-		return $this->code;
+		return $this->errorCode;
 	}
 }
diff --git a/includes/actions/InfoAction.php b/includes/actions/InfoAction.php
index 19a0b06ea4..6c213068fb 100644
--- a/includes/actions/InfoAction.php
+++ b/includes/actions/InfoAction.php
@@ -84,6 +84,11 @@ class InfoAction extends FormlessAction {
 		$content = '';
 		$table = '';
 
+		// Header
+		if ( !$this->msg( 'pageinfo-header' )->isDisabled() ) {
+			$content .= $this->msg( 'pageinfo-header ' )->parse();
+		}
+
 		// Basic information
 		$content = $this->addHeader( $content, $this->msg( 'pageinfo-header-basic' )->text() );
 
@@ -304,6 +309,11 @@ class InfoAction extends FormlessAction {
 			$content = $this->addTable( $content, $table );
 		}
 
+		// Footer
+		if ( !$this->msg( 'pageinfo-footer' )->isDisabled() ) {
+			$content .= $this->msg( 'pageinfo-footer' )->parse();
+		}
+
 		return $content;
 	}
 
diff --git a/includes/api/ApiMain.php b/includes/api/ApiMain.php
index 420acd3d9e..2a94a65f4f 100644
--- a/includes/api/ApiMain.php
+++ b/includes/api/ApiMain.php
@@ -368,6 +368,9 @@ class ApiMain extends ApiBase {
 		try {
 			$this->executeAction();
 		} catch ( Exception $e ) {
+			// Allow extra cleanup and logging
+			wfRunHooks( 'ApiMain::onException', array( $this, $e ) );
+
 			// Log it
 			if ( !( $e instanceof UsageException ) ) {
 				wfDebugLog( 'exception', $e->getLogMessage() );
diff --git a/includes/db/Database.php b/includes/db/Database.php
index 61061b2012..ae5335b63a 100644
--- a/includes/db/Database.php
+++ b/includes/db/Database.php
@@ -2621,12 +2621,15 @@ abstract class DatabaseBase implements DatabaseType {
 	 * Returns an SQL expression for a simple conditional.  This doesn't need
 	 * to be overridden unless CASE isn't supported in your DBMS.
 	 *
-	 * @param $cond String: SQL expression which will result in a boolean value
+	 * @param $cond string|array SQL expression which will result in a boolean value
 	 * @param $trueVal String: SQL expression to return if true
 	 * @param $falseVal String: SQL expression to return if false
 	 * @return String: SQL fragment
 	 */
 	public function conditional( $cond, $trueVal, $falseVal ) {
+		if ( is_array( $cond ) ) {
+			$cond = $this->makeList( $cond, LIST_AND );
+		}
 		return " (CASE WHEN $cond THEN $trueVal ELSE $falseVal END) ";
 	}
 
diff --git a/includes/db/DatabasePostgres.php b/includes/db/DatabasePostgres.php
index 8f8f5e83e4..457bf384a8 100644
--- a/includes/db/DatabasePostgres.php
+++ b/includes/db/DatabasePostgres.php
@@ -1406,9 +1406,6 @@ SQL;
 		if ( isset( $noKeyOptions['FOR UPDATE'] ) ) {
 			$postLimitTail .= ' FOR UPDATE';
 		}
-		if ( isset( $noKeyOptions['LOCK IN SHARE MODE'] ) ) {
-			$postLimitTail .= ' LOCK IN SHARE MODE';
-		}
 		if ( isset( $noKeyOptions['DISTINCT'] ) || isset( $noKeyOptions['DISTINCTROW'] ) ) {
 			$startOpts .= 'DISTINCT';
 		}
diff --git a/includes/debug/Debug.php b/includes/debug/Debug.php
index 1ad25aece2..d02bcf53b5 100644
--- a/includes/debug/Debug.php
+++ b/includes/debug/Debug.php
@@ -133,70 +133,156 @@ class MWDebug {
 	 * Adds a warning entry to the log
 	 *
 	 * @since 1.19
-	 * @param $msg
-	 * @param int $callerOffset
+	 * @param $msg string
+	 * @param $callerOffset int
 	 * @return mixed
 	 */
-	public static function warning( $msg, $callerOffset = 1 ) {
-		if ( !self::$enabled ) {
-			return;
-		}
+	public static function warning( $msg, $callerOffset = 1, $level = E_USER_NOTICE ) {
+		$callerDescription = self::getCallerDescription( $callerOffset );
 
-		// Check to see if there was already a deprecation notice, so not to
-		// get a duplicate warning
-		$logCount = count( self::$log );
-		$caller = wfGetCaller( $callerOffset + 1 );
-		if ( $logCount ) {
-			$lastLog = self::$log[ $logCount - 1 ];
-			if ( $lastLog['type'] == 'deprecated' && $lastLog['caller'] == $caller ) {
-				return;
-			}
-		}
+		self::sendWarning( $msg, $callerDescription, $level );
 
-		self::$log[] = array(
-			'msg' => htmlspecialchars( $msg ),
-			'type' => 'warn',
-			'caller' => $caller,
-		);
+		if ( self::$enabled ) {
+			self::$log[] = array(
+				'msg' => htmlspecialchars( $msg ),
+				'type' => 'warn',
+				'caller' => $callerDescription['func'],
+			);
+		}
 	}
 
 	/**
-	 * Adds a depreciation entry to the log, along with a backtrace
+	 * Show a warning that $function is deprecated.
+	 * This will send it to the following locations:
+	 * - Debug toolbar, with one item per function and caller, if $wgDebugToolbar
+	 *   is set to true.
+	 * - PHP's error log, with level E_USER_DEPRECATED, if $wgDevelopmentWarnings
+	 *   is set to true.
+	 * - MediaWiki's debug log, if $wgDevelopmentWarnings is set to false.
 	 *
 	 * @since 1.19
-	 * @param $function
-	 * @param $version
-	 * @param $component
+	 * @param $function string: Function that is deprecated.
+	 * @param $version string|bool: Version in which the function was deprecated.
+	 * @param $component string|bool: Component to which the function belongs.
+	 *     If false, it is assumbed the function is in MediaWiki core.
+	 * @param $callerOffset integer: How far up the callstack is the original
+	 *    caller. 2 = function that called the function that called
+	 *    MWDebug::deprecated() (Added in 1.20).
 	 * @return mixed
 	 */
-	public static function deprecated( $function, $version, $component ) {
-		if ( !self::$enabled ) {
-			return;
-		}
+	public static function deprecated( $function, $version = false, $component = false, $callerOffset = 2 ) {
+		$callerDescription = self::getCallerDescription( $callerOffset );
+		$callerFunc = $callerDescription['func'];
 
-		// Chain: This function -> wfDeprecated -> deprecatedFunction -> caller
-		$caller = wfGetCaller( 4 );
+		$sendToLog = true;
 
 		// Check to see if there already was a warning about this function
-		$functionString = "$function-$caller";
-		if ( in_array( $functionString, self::$deprecationWarnings ) ) {
+		if ( isset( self::$deprecationWarnings[$function][$callerFunc] ) ) {
 			return;
+		} elseif ( isset( self::$deprecationWarnings[$function] ) ) {
+			if ( self::$enabled ) {
+				$sendToLog = false;
+			} else {
+				return;
+			}
 		}
 
-		$version = $version === false ? '(unknown version)' : $version;
-		$component = $component === false ? 'MediaWiki' : $component;
-		$msg = htmlspecialchars( "Use of function $function was deprecated in $component $version" );
-		$msg .= Html::rawElement( 'div', array( 'class' => 'mw-debug-backtrace' ),
-			Html::element( 'span', array(), 'Backtrace:' )
-			 . wfBacktrace()
-		);
+		self::$deprecationWarnings[$function][$callerFunc] = true;
 
-		self::$deprecationWarnings[] = $functionString;
-		self::$log[] = array(
-			'msg' => $msg,
-			'type' => 'deprecated',
-			'caller' => $caller,
-		);
+		if ( $version ) {
+			global $wgDeprecationReleaseLimit;
+			if ( $wgDeprecationReleaseLimit && $component === false ) {
+				# Strip -* off the end of $version so that branches can use the
+				# format #.##-branchname to avoid issues if the branch is merged into
+				# a version of MediaWiki later than what it was branched from
+				$comparableVersion = preg_replace( '/-.*$/', '', $version );
+
+				# If the comparableVersion is larger than our release limit then
+				# skip the warning message for the deprecation
+				if ( version_compare( $wgDeprecationReleaseLimit, $comparableVersion, '<' ) ) {
+					$sendToLog = false;
+				}
+			}
+
+			$component = $component === false ? 'MediaWiki' : $component;
+			$msg = "Use of $function was deprecated in $component $version.";
+		} else {
+			$msg = "Use of $function is deprecated.";
+		}
+
+		if ( $sendToLog ) {
+			self::sendWarning( $msg, $callerDescription, E_USER_DEPRECATED );
+		}
+
+		if ( self::$enabled ) {
+			$logMsg = htmlspecialchars( $msg ) .
+				Html::rawElement( 'div', array( 'class' => 'mw-debug-backtrace' ),
+					Html::element( 'span', array(), 'Backtrace:' ) . wfBacktrace()
+				);
+
+			self::$log[] = array(
+				'msg' => $logMsg,
+				'type' => 'deprecated',
+				'caller' => $callerFunc,
+			);
+		}
+	}
+
+	/**
+	 * Get an array describing the calling function at a specified offset.
+	 *
+	 * @param $callerOffset integer: How far up the callstack is the original
+	 *    caller. 0 = function that called getCallerDescription()
+	 * @return array with two keys: 'file' and 'func'
+	 */
+	private static function getCallerDescription( $callerOffset ) {
+		$callers = wfDebugBacktrace();
+
+		if ( isset( $callers[$callerOffset] ) ) {
+			$callerfile = $callers[$callerOffset];
+			if ( isset( $callerfile['file'] ) && isset( $callerfile['line'] ) ) {
+				$file = $callerfile['file'] . ' at line ' . $callerfile['line'];
+			} else {
+				$file = '(internal function)';
+			}
+		} else {
+			$file = '(unknown location)';
+		}
+
+		if ( isset( $callers[$callerOffset + 1] ) ) {
+			$callerfunc = $callers[$callerOffset + 1];
+			$func = '';
+			if ( isset( $callerfunc['class'] ) ) {
+				$func .= $callerfunc['class'] . '::';
+			}
+			if ( isset( $callerfunc['function'] ) ) {
+				$func .= $callerfunc['function'];
+			}
+		} else {
+			$func = 'unknown';
+		}
+
+		return array( 'file' => $file, 'func' => $func );
+	}
+
+	/**
+	 * Send a warning either to the debug log or by triggering an user PHP
+	 * error depending on $wgDevelopmentWarnings.
+	 *
+	 * @param $msg string Message to send
+	 * @param $caller array caller description get from getCallerDescription()
+	 * @param $level error level to use if $wgDevelopmentWarnings is true
+	 */
+	private static function sendWarning( $msg, $caller, $level ) {
+		global $wgDevelopmentWarnings;
+
+		$msg .= ' [Called from ' . $caller['func'] . ' in ' . $caller['file'] . ']';
+
+		if ( $wgDevelopmentWarnings ) {
+			trigger_error( $msg, $level );
+		} else {
+			wfDebug( "$msg\n" );
+		}
 	}
 
 	/**
@@ -207,11 +293,11 @@ class MWDebug {
 	 * @param $str string
 	 */
 	public static function debugMsg( $str ) {
-		if ( !self::$enabled ) {
-			return;
-		}
+		global $wgDebugComments, $wgShowDebug;
 
-		self::$debug[] = trim( $str );
+		if ( self::$enabled || $wgDebugComments || $wgShowDebug ) {
+			self::$debug[] = rtrim( $str );
+		}
 	}
 
 	/**
@@ -283,22 +369,91 @@ class MWDebug {
 	 * @return string
 	 */
 	public static function getDebugHTML( IContextSource $context ) {
-		if ( !self::$enabled ) {
+		global $wgDebugComments;
+
+		$html = '';
+
+		if ( self::$enabled ) {
+			MWDebug::log( 'MWDebug output complete' );
+			$debugInfo = self::getDebugInfo( $context );
+
+			// Cannot use OutputPage::addJsConfigVars because those are already outputted
+			// by the time this method is called.
+			$html = Html::inlineScript(
+				ResourceLoader::makeLoaderConditionalScript(
+					ResourceLoader::makeConfigSetScript( array( 'debugInfo' => $debugInfo ) )
+				)
+			);
+		}
+
+		if ( $wgDebugComments ) {
+			$html .= "<!-- Debug output:\n" .
+				htmlspecialchars( implode( "\n", self::$debug ) ) .
+				"\n\n-->";
+		}
+
+		return $html;
+	}
+
+	/**
+	 * Generate debug log in HTML for displaying at the bottom of the main
+	 * content area.
+	 * If $wgShowDebug is false, an empty string is always returned.
+	 *
+	 * @since 1.20
+	 * @return string HTML fragment
+	 */
+	public static function getHTMLDebugLog() {
+		global $wgDebugTimestamps, $wgShowDebug;
+
+		if ( !$wgShowDebug ) {
 			return '';
 		}
 
-		MWDebug::log( 'MWDebug output complete' );
-		$debugInfo = self::getDebugInfo( $context );
+		$curIdent = 0;
+		$ret = "\n<hr />\n<strong>Debug data:</strong><ul id=\"mw-debug-html\">\n<li>";
 
-		// Cannot use OutputPage::addJsConfigVars because those are already outputted
-		// by the time this method is called.
-		$html = Html::inlineScript(
-			ResourceLoader::makeLoaderConditionalScript(
-				ResourceLoader::makeConfigSetScript( array( 'debugInfo' => $debugInfo ) )
-			)
-		);
+		foreach ( self::$debug as $line ) {
+			$pre = '';
+			if ( $wgDebugTimestamps ) {
+				$matches = array();
+				if ( preg_match( '/^(\d+\.\d+ {1,3}\d+.\dM\s{2})/', $line, $matches ) ) {
+					$pre = $matches[1];
+					$line = substr( $line, strlen( $pre ) );
+				}
+			}
+			$display = ltrim( $line );
+			$ident = strlen( $line ) - strlen( $display );
+			$diff = $ident - $curIdent;
 
-		return $html;
+			$display = $pre . $display;
+			if ( $display == '' ) {
+				$display = "\xc2\xa0";
+			}
+
+			if ( !$ident && $diff < 0 && substr( $display, 0, 9 ) != 'Entering ' && substr( $display, 0, 8 ) != 'Exiting ' ) {
+				$ident = $curIdent;
+				$diff = 0;
+				$display = '<span style="background:yellow;">' . nl2br( htmlspecialchars( $display ) ) . '</span>';
+			} else {
+				$display = nl2br( htmlspecialchars( $display ) );
+			}
+
+			if ( $diff < 0 ) {
+				$ret .= str_repeat( "</li></ul>\n", -$diff ) . "</li><li>\n";
+			} elseif ( $diff == 0 ) {
+				$ret .= "</li><li>\n";
+			} else {
+				$ret .= str_repeat( "<ul><li>\n", $diff );
+			}
+			$ret .= "<tt>$display</tt>\n";
+
+			$curIdent = $ident;
+		}
+
+		$ret .= str_repeat( '</li></ul>', $curIdent ) . "</li>\n</ul>\n";
+
+		return $ret;
 	}
 
 	/**
diff --git a/includes/diff/DifferenceEngine.php b/includes/diff/DifferenceEngine.php
index d9092da863..3846473a59 100644
--- a/includes/diff/DifferenceEngine.php
+++ b/includes/diff/DifferenceEngine.php
@@ -917,7 +917,7 @@ class DifferenceEngine extends ContextSource {
 
 		if ( !$diff && !$otitle ) {
 			$header .= "
-			<tr valign='top'>
+			<tr style='vertical-align: top;'>
 			<td class='diff-ntitle'>{$ntitle}</td>
 			</tr>";
 			$multiColspan = 1;
@@ -935,17 +935,17 @@ class DifferenceEngine extends ContextSource {
 				$multiColspan = 2;
 			}
 			$header .= "
-			<tr valign='top'>
+			<tr style='vertical-align: top;'>
 			<td colspan='$colspan' class='diff-otitle'>{$otitle}</td>
 			<td colspan='$colspan' class='diff-ntitle'>{$ntitle}</td>
 			</tr>";
 		}
 
 		if ( $multi != '' ) {
-			$header .= "<tr><td colspan='{$multiColspan}' align='center' class='diff-multi'>{$multi}</td></tr>";
+			$header .= "<tr><td colspan='{$multiColspan}' style='text-align: center;' class='diff-multi'>{$multi}</td></tr>";
 		}
 		if ( $notice != '' ) {
-			$header .= "<tr><td colspan='{$multiColspan}' align='center'>{$notice}</td></tr>";
+			$header .= "<tr><td colspan='{$multiColspan}' style='text-align: center;'>{$notice}</td></tr>";
 		}
 
 		return $header . $diff . "</table>";
diff --git a/includes/filebackend/FileBackend.php b/includes/filebackend/FileBackend.php
index 4b707fc331..cb2433aea2 100644
--- a/includes/filebackend/FileBackend.php
+++ b/includes/filebackend/FileBackend.php
@@ -242,6 +242,9 @@ abstract class FileBackend {
 	 *   - allowStale          : Don't require the latest available data.
 	 *                           This can increase performance for non-critical writes.
 	 *                           This has no effect unless the 'force' flag is set.
+	 *   - preserveCache       : Don't clear the process cache before checking files.
+	 *                           This should only be used if all entries in the process
+	 *                           cache were added after the files were already locked.
 	 *   - nonJournaled        : Don't log this operation batch in the file journal.
 	 *                           This limits the ability of recovery scripts.
 	 *   - parallelize         : Try to do operations in parallel when possible.
@@ -899,7 +902,16 @@ abstract class FileBackend {
 	}
 
 	/**
-	 * Invalidate any in-process file existence and property cache.
+	 * Preload persistent file stat and property cache into in-process cache.
+	 * This should be used when stat calls will be made on a known list of a many files.
+	 *
+	 * @param $paths Array Storage paths
+	 * @return void
+	 */
+	public function preloadCache( array $paths ) {}
+
+	/**
+	 * Invalidate any in-process file stat and property cache.
 	 * If $paths is given, then only the cache for those files will be cleared.
 	 *
 	 * @param $paths Array Storage paths (optional)
diff --git a/includes/filebackend/FileBackendMultiWrite.php b/includes/filebackend/FileBackendMultiWrite.php
index f4a7eac00c..59392f6162 100644
--- a/includes/filebackend/FileBackendMultiWrite.php
+++ b/includes/filebackend/FileBackendMultiWrite.php
@@ -43,7 +43,10 @@ class FileBackendMultiWrite extends FileBackend {
 	/** @var Array Prioritized list of FileBackendStore objects */
 	protected $backends = array(); // array of (backend index => backends)
 	protected $masterIndex = -1; // integer; index of master backend
-	protected $syncChecks = 0; // integer bitfield
+	protected $syncChecks = 0; // integer; bitfield
+	/** @var Array */
+	protected $noPushDirConts = array();
+	protected $noPushQuickOps = false; // boolean
 
 	/* Possible internal backend consistency checks */
 	const CHECK_SIZE = 1;
@@ -55,18 +58,21 @@ class FileBackendMultiWrite extends FileBackend {
 	 * Locking, journaling, and read-only checks are handled by the proxy backend.
 	 *
 	 * Additional $config params include:
-	 *   - backends   : Array of backend config and multi-backend settings.
-	 *                  Each value is the config used in the constructor of a
-	 *                  FileBackendStore class, but with these additional settings:
-	 *                    - class         : The name of the backend class
-	 *                    - isMultiMaster : This must be set for one backend.
-	 *                    - template:     : If given a backend name, this will use
-	 *                                      the config of that backend as a template.
-	 *                                      Values specified here take precedence.
-	 *   - syncChecks : Integer bitfield of internal backend sync checks to perform.
-	 *                  Possible bits include the FileBackendMultiWrite::CHECK_* constants.
-	 *                  There are constants for SIZE, TIME, and SHA1.
-	 *                  The checks are done before allowing any file operations.
+	 *   - backends       : Array of backend config and multi-backend settings.
+	 *                      Each value is the config used in the constructor of a
+	 *                          FileBackendStore class, but with these additional settings:
+	 *                        - class         : The name of the backend class
+	 *                        - isMultiMaster : This must be set for one backend.
+	 *                        - template:     : If given a backend name, this will use
+	 *                                          the config of that backend as a template.
+	 *                                          Values specified here take precedence.
+	 *   - syncChecks     : Integer bitfield of internal backend sync checks to perform.
+	 *                      Possible bits include the FileBackendMultiWrite::CHECK_* constants.
+	 *                      There are constants for SIZE, TIME, and SHA1.
+	 *                      The checks are done before allowing any file operations.
+	 *   - noPushQuickOps : (hack) Only apply doQuickOperations() to the master backend.
+	 *   - noPushDirConts : (hack) Only apply directory functions to the master backend.
+	 *
 	 * @param $config Array
 	 * @throws MWException
 	 */
@@ -75,6 +81,12 @@ class FileBackendMultiWrite extends FileBackend {
 		$this->syncChecks = isset( $config['syncChecks'] )
 			? $config['syncChecks']
 			: self::CHECK_SIZE;
+		$this->noPushQuickOps = isset( $config['noPushQuickOps'] )
+			? $config['noPushQuickOps']
+			: false;
+		$this->noPushDirConts = isset( $config['noPushDirConts'] )
+			? $config['noPushDirConts']
+			: array();
 		// Construct backends here rather than via registration
 		// to keep these backends hidden from outside the proxy.
 		$namesUsed = array();
@@ -139,6 +151,7 @@ class FileBackendMultiWrite extends FileBackend {
 		}
 		// Clear any cache entries (after locks acquired)
 		$this->clearCache();
+		$opts['preserveCache'] = true; // only locked files are cached
 		// Do a consistency check to see if the backends agree
 		$status->merge( $this->consistencyCheck( $this->fileStoragePathsForOps( $ops ) ) );
 		if ( !$status->isOK() ) {
@@ -368,10 +381,12 @@ class FileBackendMultiWrite extends FileBackend {
 		$masterStatus = $this->backends[$this->masterIndex]->doQuickOperations( $realOps );
 		$status->merge( $masterStatus );
 		// Propagate the operations to the clone backends...
-		foreach ( $this->backends as $index => $backend ) {
-			if ( $index !== $this->masterIndex ) { // not done already
-				$realOps = $this->substOpBatchPaths( $ops, $backend );
-				$status->merge( $backend->doQuickOperations( $realOps ) );
+		if ( !$this->noPushQuickOps ) {
+			foreach ( $this->backends as $index => $backend ) {
+				if ( $index !== $this->masterIndex ) { // not done already
+					$realOps = $this->substOpBatchPaths( $ops, $backend );
+					$status->merge( $backend->doQuickOperations( $realOps ) );
+				}
 			}
 		}
 		// Make 'success', 'successCount', and 'failCount' fields reflect
@@ -383,15 +398,27 @@ class FileBackendMultiWrite extends FileBackend {
 		return $status;
 	}
 
+	/**
+	 * @param $path string Storage path
+	 * @return bool Path container should have dir changes pushed to all backends
+	 */
+	protected function replicateContainerDirChanges( $path ) {
+		list( $b, $shortCont, $r ) = self::splitStoragePath( $path );
+		return !in_array( $shortCont, $this->noPushDirConts );
+	}
+
 	/**
 	 * @see FileBackend::doPrepare()
 	 * @return Status
 	 */
 	protected function doPrepare( array $params ) {
 		$status = Status::newGood();
-		foreach ( $this->backends as $backend ) {
-			$realParams = $this->substOpPaths( $params, $backend );
-			$status->merge( $backend->doPrepare( $realParams ) );
+		$replicate = $this->replicateContainerDirChanges( $params['dir'] );
+		foreach ( $this->backends as $index => $backend ) {
+			if ( $replicate || $index == $this->masterIndex ) {
+				$realParams = $this->substOpPaths( $params, $backend );
+				$status->merge( $backend->doPrepare( $realParams ) );
+			}
 		}
 		return $status;
 	}
@@ -403,9 +430,12 @@ class FileBackendMultiWrite extends FileBackend {
 	 */
 	protected function doSecure( array $params ) {
 		$status = Status::newGood();
-		foreach ( $this->backends as $backend ) {
-			$realParams = $this->substOpPaths( $params, $backend );
-			$status->merge( $backend->doSecure( $realParams ) );
+		$replicate = $this->replicateContainerDirChanges( $params['dir'] );
+		foreach ( $this->backends as $index => $backend ) {
+			if ( $replicate || $index == $this->masterIndex ) {
+				$realParams = $this->substOpPaths( $params, $backend );
+				$status->merge( $backend->doSecure( $realParams ) );
+			}
 		}
 		return $status;
 	}
@@ -417,9 +447,12 @@ class FileBackendMultiWrite extends FileBackend {
 	 */
 	protected function doPublish( array $params ) {
 		$status = Status::newGood();
-		foreach ( $this->backends as $backend ) {
-			$realParams = $this->substOpPaths( $params, $backend );
-			$status->merge( $backend->doPublish( $realParams ) );
+		$replicate = $this->replicateContainerDirChanges( $params['dir'] );
+		foreach ( $this->backends as $index => $backend ) {
+			if ( $replicate || $index == $this->masterIndex ) {
+				$realParams = $this->substOpPaths( $params, $backend );
+				$status->merge( $backend->doPublish( $realParams ) );
+			}
 		}
 		return $status;
 	}
@@ -431,9 +464,12 @@ class FileBackendMultiWrite extends FileBackend {
 	 */
 	protected function doClean( array $params ) {
 		$status = Status::newGood();
-		foreach ( $this->backends as $backend ) {
-			$realParams = $this->substOpPaths( $params, $backend );
-			$status->merge( $backend->doClean( $realParams ) );
+		$replicate = $this->replicateContainerDirChanges( $params['dir'] );
+		foreach ( $this->backends as $index => $backend ) {
+			if ( $replicate || $index == $this->masterIndex ) {
+				$realParams = $this->substOpPaths( $params, $backend );
+				$status->merge( $backend->doClean( $realParams ) );
+			}
 		}
 		return $status;
 	}
diff --git a/includes/filebackend/FileBackendStore.php b/includes/filebackend/FileBackendStore.php
index 852a6538db..9bec145d29 100644
--- a/includes/filebackend/FileBackendStore.php
+++ b/includes/filebackend/FileBackendStore.php
@@ -989,7 +989,9 @@ abstract class FileBackendStore extends FileBackend {
 		}
 
 		// Clear any file cache entries (after locks acquired)
-		$this->clearCache();
+		if ( empty( $opts['preserveCache'] ) ) {
+			$this->clearCache();
+		}
 
 		// Load from the persistent file and container caches
 		$this->primeFileCache( $performOps );
@@ -1106,6 +1108,20 @@ abstract class FileBackendStore extends FileBackend {
 		return array();
 	}
 
+	/**
+	 * @see FileBackend::preloadCache()
+	 */
+	final public function preloadCache( array $paths ) {
+		$fullConts = array(); // full container names
+		foreach ( $paths as $path ) {
+			list( $fullCont, $r, $s ) = $this->resolveStoragePath( $path );
+			$fullConts[] = $fullCont;
+		}
+		// Load from the persistent file and container caches
+		$this->primeContainerCache( $fullConts );
+		$this->primeFileCache( $paths );
+	}
+
 	/**
 	 * @see FileBackend::clearCache()
 	 */
diff --git a/includes/filebackend/SwiftFileBackend.php b/includes/filebackend/SwiftFileBackend.php
index f54f6667fe..9c111c9eea 100644
--- a/includes/filebackend/SwiftFileBackend.php
+++ b/includes/filebackend/SwiftFileBackend.php
@@ -111,7 +111,7 @@ class SwiftFileBackend extends FileBackendStore {
 			: false;
 		$this->swiftCDNExpiry = isset( $config['swiftCDNExpiry'] )
 			? $config['swiftCDNExpiry']
-			: 3600; // hour
+			: 12*3600; // 12 hours is safe (tokens last 24 hours per http://docs.openstack.org)
 		$this->swiftCDNPurgable = isset( $config['swiftCDNPurgable'] )
 			? $config['swiftCDNPurgable']
 			: true;
@@ -852,13 +852,13 @@ class SwiftFileBackend extends FileBackendStore {
 						// See function "create_container_table" in common/db.py.
 						// If a directory is not "greater" than the last one,
 						// then it was already listed by the calling iterator.
-						if ( $objectDir > $lastDir ) {
+						if ( strcmp( $objectDir, $lastDir ) > 0 ) {
 							$pDir = $objectDir;
 							do { // add dir and all its parent dirs
 								$dirs[] = "{$pDir}/";
 								$pDir = $this->getParentDir( $pDir );
 							} while ( $pDir !== false // sanity
-								&& $pDir > $lastDir // not done already
+								&& strcmp( $pDir, $lastDir ) > 0 // not done already
 								&& strlen( $pDir ) > strlen( $dir ) // within $dir
 							);
 						}
@@ -1297,6 +1297,9 @@ class SwiftFileBackend extends FileBackendStore {
 		if ( $e->getMessage() ) {
 			trigger_error( "$func: " . $e->getMessage(), E_USER_WARNING );
 		}
+		if ( $e instanceof InvalidResponseException ) { // possibly a stale token
+			$this->srvCache->delete( $this->getCredsCacheKey( $this->auth->username ) );
+		}
 		wfDebugLog( 'SwiftBackend',
 			get_class( $e ) . " in '{$func}' (given '" . FormatJson::encode( $params ) . "')" .
 			( $e->getMessage() ? ": {$e->getMessage()}" : "" )
diff --git a/includes/filebackend/filejournal/DBFileJournal.php b/includes/filebackend/filejournal/DBFileJournal.php
index 8fa4c6f0b5..f6268c258f 100644
--- a/includes/filebackend/filejournal/DBFileJournal.php
+++ b/includes/filebackend/filejournal/DBFileJournal.php
@@ -27,6 +27,9 @@
  * @since 1.20
  */
 class DBFileJournal extends FileJournal {
+	/** @var DatabaseBase */
+	protected $dbw;
+
 	protected $wiki = false; // string; wiki DB name
 
 	/**
@@ -71,9 +74,7 @@ class DBFileJournal extends FileJournal {
 		}
 
 		try {
-			$dbw->begin();
 			$dbw->insert( 'filejournal', $data, __METHOD__ );
-			$dbw->commit();
 		} catch ( DBError $e ) {
 			$status->fatal( 'filejournal-fail-dbquery', $this->backend );
 			return $status;
@@ -125,12 +126,10 @@ class DBFileJournal extends FileJournal {
 		$dbw = $this->getMasterDB();
 		$dbCutoff = $dbw->timestamp( time() - 86400 * $this->ttlDays );
 
-		$dbw->begin();
 		$dbw->delete( 'filejournal',
 			array( 'fj_timestamp < ' . $dbw->addQuotes( $dbCutoff ) ),
 			__METHOD__
 		);
-		$dbw->commit();
 
 		return $status;
 	}
@@ -142,7 +141,12 @@ class DBFileJournal extends FileJournal {
 	 * @throws DBError
 	 */
 	protected function getMasterDB() {
-		$lb = wfGetLBFactory()->newMainLB();
-		return $lb->getConnection( DB_MASTER, array(), $this->wiki );
+		if ( !$this->dbw ) {
+			// Get a separate connection in autocommit mode
+			$lb = wfGetLBFactory()->newMainLB();
+			$this->dbw = $lb->getConnection( DB_MASTER, array(), $this->wiki );
+			$this->dbw->clearFlag( DBO_TRX );
+		}
+		return $this->dbw;
 	}
 }
diff --git a/includes/installer/DatabaseUpdater.php b/includes/installer/DatabaseUpdater.php
index d411a272b6..ff0a99e9ff 100644
--- a/includes/installer/DatabaseUpdater.php
+++ b/includes/installer/DatabaseUpdater.php
@@ -21,7 +21,7 @@
  * @ingroup Deployment
  */
 
-require_once( dirname(__FILE__) . '/../../maintenance/Maintenance.php' );
+require_once( __DIR__ . '/../../maintenance/Maintenance.php' );
 
 /**
  * Class for handling database updates. Roughly based off of updaters.inc, with
@@ -558,13 +558,28 @@ abstract class DatabaseUpdater {
 	}
 
 	/**
+	 * If the specified table exists, drop it, or execute the
+	 * patch if one is provided.
+	 *
+	 * Public @since 1.20
+	 *
 	 * @param $table string
-	 * @param $patch string
+	 * @param $patch string|false
 	 * @param $fullpath bool
 	 */
-	protected function dropTable( $table, $patch, $fullpath = false ) {
+	public function dropTable( $table, $patch = false, $fullpath = false ) {
 		if ( $this->db->tableExists( $table, __METHOD__ ) ) {
-			$this->applyPatch( $patch, $fullpath, "Dropping table $table" );
+			$msg = "Dropping table $table";
+
+			if ( $patch === false ) {
+				$this->output( "$msg ..." );
+				$this->db->dropTable( $table, __METHOD__ );
+				$this->output( "done.\n" );
+			}
+			else {
+				$this->applyPatch( $patch, $fullpath, $msg );
+			}
+
 		} else {
 			$this->output( "...$table doesn't exist.\n" );
 		}
diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php
index caf7b69647..ac5dbd747c 100644
--- a/includes/installer/Installer.php
+++ b/includes/installer/Installer.php
@@ -339,7 +339,7 @@ abstract class Installer {
 
 		// Load the installer's i18n file.
 		$wgExtensionMessagesFiles['MediawikiInstaller'] =
-			dirname( __FILE__ ) . '/Installer.i18n.php';
+			__DIR__ . '/Installer.i18n.php';
 
 		// Having a user with id = 0 safeguards us from DB access via User::loadOptions().
 		$wgUser = User::newFromId( 0 );
@@ -935,7 +935,7 @@ abstract class Installer {
 	 */
 	protected function envCheckPath() {
 		global $IP;
-		$IP = dirname( dirname( dirname( __FILE__ ) ) );
+		$IP = dirname( dirname( __DIR__ ) );
 		$this->setVar( 'IP', $IP );
 
 		$this->showMessage( 'config-using-uri', $this->getVar( 'wgServer' ), $this->getVar( 'wgScriptPath' ) );
diff --git a/includes/installer/WebInstaller.php b/includes/installer/WebInstaller.php
index e1c5c29961..0d5ea576a6 100644
--- a/includes/installer/WebInstaller.php
+++ b/includes/installer/WebInstaller.php
@@ -362,7 +362,7 @@ class WebInstaller extends Installer {
 			$url = $m[1];
 		}
 		return md5( serialize( array(
-			'local path' => dirname( dirname( __FILE__ ) ),
+			'local path' => dirname( __DIR__ ),
 			'url' => $url,
 			'version' => $GLOBALS['wgVersion']
 		) ) );
diff --git a/includes/installer/WebInstallerOutput.php b/includes/installer/WebInstallerOutput.php
index 9a516a65b7..e440c6bdb7 100644
--- a/includes/installer/WebInstallerOutput.php
+++ b/includes/installer/WebInstallerOutput.php
@@ -108,7 +108,7 @@ class WebInstallerOutput {
 	 * @return String
 	 */
 	public function getCSS( $dir ) {
-		$skinDir = dirname( dirname( dirname( __FILE__ ) ) ) . '/skins';
+		$skinDir = dirname( dirname( __DIR__ ) ) . '/skins';
 
 		// All these files will be concatenated in sequence and loaded
 		// as one file.
diff --git a/includes/installer/WebInstallerPage.php b/includes/installer/WebInstallerPage.php
index a7ec2dffc6..a193afb714 100644
--- a/includes/installer/WebInstallerPage.php
+++ b/includes/installer/WebInstallerPage.php
@@ -1269,7 +1269,7 @@ abstract class WebInstaller_Document extends WebInstallerPage {
 	}
 
 	public function getFileContents() {
-		$file = dirname( __FILE__ ) . '/../../' . $this->getFileName();
+		$file = __DIR__ . '/../../' . $this->getFileName();
 		if( ! file_exists( $file ) ) {
 			return wfMessage( 'config-nofile', $file )->plain();
 		}
diff --git a/includes/job/Job.php b/includes/job/Job.php
index d7c95632fe..45f057062c 100644
--- a/includes/job/Job.php
+++ b/includes/job/Job.php
@@ -153,7 +153,6 @@ abstract class Job {
 		$dbw = wfGetDB( DB_MASTER );
 		$dbw->delete( 'job', array( 'job_id' => $row->job_id ), __METHOD__ );
 		$affected = $dbw->affectedRows();
-		$dbw->commit( __METHOD__ );
 
 		if ( !$affected ) {
 			// Failed, someone else beat us to it
@@ -177,7 +176,6 @@ abstract class Job {
 			// Delete the random row
 			$dbw->delete( 'job', array( 'job_id' => $row->job_id ), __METHOD__ );
 			$affected = $dbw->affectedRows();
-			$dbw->commit( __METHOD__ );
 
 			if ( !$affected ) {
 				// Random job gone before we exclusively deleted it
diff --git a/includes/job/RefreshLinksJob.php b/includes/job/RefreshLinksJob.php
index 6b8dede820..b23951c6f5 100644
--- a/includes/job/RefreshLinksJob.php
+++ b/includes/job/RefreshLinksJob.php
@@ -55,7 +55,7 @@ class RefreshLinksJob extends Job {
 			wfGetLB()->waitFor( $this->params['masterPos'] );
 		}
 
-		$revision = Revision::newFromTitle( $this->title, 0, Revision::READ_NORMAL );
+		$revision = Revision::newFromTitle( $this->title, false, Revision::READ_NORMAL );
 		if ( !$revision ) {
 			$this->error = 'refreshLinks: Article not found "' .
 				$this->title->getPrefixedDBkey() . '"';
@@ -185,7 +185,7 @@ class RefreshLinksJob2 extends Job {
 			}
 			# Re-parse each page that transcludes this page and update their tracking links...
 			foreach ( $titles as $title ) {
-				$revision = Revision::newFromTitle( $title, 0, Revision::READ_NORMAL );
+				$revision = Revision::newFromTitle( $title, false, Revision::READ_NORMAL );
 				if ( !$revision ) {
 					$this->error = 'refreshLinks: Article not found "' .
 						$title->getPrefixedDBkey() . '"';
diff --git a/includes/json/FormatJson.php b/includes/json/FormatJson.php
index aa60fbdcc0..f67700c94f 100644
--- a/includes/json/FormatJson.php
+++ b/includes/json/FormatJson.php
@@ -20,7 +20,7 @@
  * @file
  */
 
-require_once dirname( __FILE__ ) . '/Services_JSON.php';
+require_once __DIR__ . '/Services_JSON.php';
 
 /**
  * JSON formatter wrapper class
diff --git a/includes/libs/CSSJanus.php b/includes/libs/CSSJanus.php
index e6672b49ad..4ebbc49718 100644
--- a/includes/libs/CSSJanus.php
+++ b/includes/libs/CSSJanus.php
@@ -268,10 +268,17 @@ class CSSJanus {
 	 * @return string
 	 */
 	private static function fixBackgroundPosition( $css ) {
-		$css = preg_replace_callback( self::$patterns['bg_horizontal_percentage'],
+		$replaced = preg_replace_callback( self::$patterns['bg_horizontal_percentage'],
 			array( 'self', 'calculateNewBackgroundPosition' ), $css );
-		$css = preg_replace_callback( self::$patterns['bg_horizontal_percentage_x'],
+		if ( $replaced !== null ) {
+			// Check for null; sometimes preg_replace_callback() returns null here for some weird reason
+			$css = $replaced;
+		}
+		$replaced = preg_replace_callback( self::$patterns['bg_horizontal_percentage_x'],
 			array( 'self', 'calculateNewBackgroundPosition' ), $css );
+		if ( $replaced !== null ) {
+			$css = $replaced;
+		}
 
 		return $css;
 	}
diff --git a/includes/libs/GenericArrayObject.php b/includes/libs/GenericArrayObject.php
index d4cc5253db..b4b9d6108a 100644
--- a/includes/libs/GenericArrayObject.php
+++ b/includes/libs/GenericArrayObject.php
@@ -142,11 +142,11 @@ abstract class GenericArrayObject extends ArrayObject {
 	 * @param mixed $index
 	 * @param mixed $value
 	 *
-	 * @throws Exception
+	 * @throws InvalidArgumentException
 	 */
 	protected function setElement( $index, $value ) {
 		if ( !$this->hasValidType( $value ) ) {
-			throw new Exception(
+			throw new InvalidArgumentException(
 				'Can only add ' . $this->getObjectType() . ' implementing objects to ' . get_called_class() . '.'
 			);
 		}
diff --git a/includes/media/Exif.php b/includes/media/Exif.php
index f5dc020c8d..784a6018c0 100644
--- a/includes/media/Exif.php
+++ b/includes/media/Exif.php
@@ -370,6 +370,12 @@ class Exif {
 		$this->exifGPStoNumber( 'GPSDestLongitude' );
 
 		if ( isset( $this->mFilteredExifData['GPSAltitude'] ) && isset( $this->mFilteredExifData['GPSAltitudeRef'] ) ) {
+
+			// We know altitude data is a <num>/<denom> from the validation functions ran earlier.
+			// But multiplying such a string by -1 doesn't work well, so convert.
+			list( $num, $denom ) = explode( '/', $this->mFilteredExifData['GPSAltitude'] );
+			$this->mFilteredExifData['GPSAltitude'] = $num / $denom;
+
 			if ( $this->mFilteredExifData['GPSAltitudeRef'] === "\1" ) {
 				$this->mFilteredExifData['GPSAltitude'] *= - 1;
 			}
diff --git a/includes/media/MediaTransformOutput.php b/includes/media/MediaTransformOutput.php
index 80766bb3b9..cee5bbf23a 100644
--- a/includes/media/MediaTransformOutput.php
+++ b/includes/media/MediaTransformOutput.php
@@ -157,7 +157,14 @@ abstract class MediaTransformOutput {
 	 * @return Bool success
 	 */
 	public function streamFile( $headers = array() ) {
-		return $this->path && StreamFile::stream( $this->getLocalCopyPath(), $headers );
+		if ( !$this->path ) {
+			return false;
+		} elseif ( FileBackend::isStoragePath( $this->path ) ) {
+			$be = $this->file->getRepo()->getBackend();
+			return $be->streamFile( array( 'src' => $this->path, 'headers' => $headers ) )->isOK();
+		} else { // FS-file
+			return StreamFile::stream( $this->getLocalCopyPath(), $headers );
+		}
 	}
 
 	/**
diff --git a/includes/media/SVG.php b/includes/media/SVG.php
index a5ce1fa6cd..a9d1758b32 100644
--- a/includes/media/SVG.php
+++ b/includes/media/SVG.php
@@ -275,7 +275,15 @@ class SvgHandler extends ImageHandler {
 	}
 
 	function isMetadataValid( $image, $metadata ) {
-		return $this->unpackMetadata( $metadata ) !== false;
+		$meta = $this->unpackMetadata( $metadata );
+		if ( $meta === false ) {
+			return self::METADATA_BAD;
+		}
+		if ( !isset( $meta['originalWidth'] ) ) {
+			// Old but compatible
+			return self::METADATA_COMPATIBLE;
+		}
+		return self::METADATA_GOOD;
 	}
 
 	function visibleMetadataFields() {
@@ -312,8 +320,8 @@ class SvgHandler extends ImageHandler {
 		// Rename fields to be compatible with exif, so that
 		// the labels for these fields work and reuse existing messages.
 		$conversion = array(
-			'width' => 'imagewidth',
-			'height' => 'imagelength',
+			'originalwidth' => 'imagewidth',
+			'originalheight' => 'imagelength',
 			'description' => 'imagedescription',
 			'title' => 'objectname',
 		);
diff --git a/includes/media/SVGMetadataExtractor.php b/includes/media/SVGMetadataExtractor.php
index 89e1e0c14b..851fe428a6 100644
--- a/includes/media/SVGMetadataExtractor.php
+++ b/includes/media/SVGMetadataExtractor.php
@@ -83,6 +83,12 @@ class SVGReader {
 		$this->metadata['width'] = self::DEFAULT_WIDTH;
 		$this->metadata['height'] = self::DEFAULT_HEIGHT;
 
+		// The size in the units specified by the SVG file
+		// (for the metadata box)
+		// Per the SVG spec, if unspecified, default to '100%'
+		$this->metadata['originalWidth'] = '100%';
+		$this->metadata['originalHeight'] = '100%';
+
 		// Because we cut off the end of the svg making an invalid one. Complicated
 		// try catch thing to make sure warnings get restored. Seems like there should
 		// be a better way.
@@ -90,6 +96,8 @@ class SVGReader {
 		try {
 			$this->read();
 		} catch( Exception $e ) {
+			// Note, if this happens, the width/height will be taken to be 0x0.
+			// Should we consider it the default 512x512 instead?
 			wfRestoreWarnings();
 			throw $e;
 		}
@@ -288,9 +296,11 @@ class SVGReader {
 		}
 		if( $this->reader->getAttribute('width') ) {
 			$width = $this->scaleSVGUnit( $this->reader->getAttribute('width'), $defaultWidth );
+			$this->metadata['originalWidth'] = $this->reader->getAttribute( 'width' );
 		}
 		if( $this->reader->getAttribute('height') ) {
 			$height = $this->scaleSVGUnit( $this->reader->getAttribute('height'), $defaultHeight );
+			$this->metadata['originalHeight'] = $this->reader->getAttribute( 'height' );
 		}
 
 		if( !isset( $width ) && !isset( $height ) ) {
diff --git a/includes/media/XMP.php b/includes/media/XMP.php
index 75fdd96dff..36660b3dcc 100644
--- a/includes/media/XMP.php
+++ b/includes/media/XMP.php
@@ -213,10 +213,16 @@ class XMPReader {
 		unset( $data['xmp-special'] );
 
 		// Convert GPSAltitude to negative if below sea level.
-		if ( isset( $data['xmp-exif']['GPSAltitudeRef'] ) ) {
-			if ( $data['xmp-exif']['GPSAltitudeRef'] == '1'
-				&& isset( $data['xmp-exif']['GPSAltitude'] )
-			) {
+		if ( isset( $data['xmp-exif']['GPSAltitudeRef'] )
+			&& isset( $data['xmp-exif']['GPSAltitude'] )
+		) {
+
+			// Must convert to a real before multiplying by -1
+			// XMPValidate guarantees there will always be a '/' in this value.
+			list( $nom, $denom ) = explode( '/', $data['xmp-exif']['GPSAltitude'] );
+			$data['xmp-exif']['GPSAltitude'] = $nom / $denom;
+
+			if ( $data['xmp-exif']['GPSAltitudeRef'] == '1' ) {
 				$data['xmp-exif']['GPSAltitude'] *= -1;
 			}
 			unset( $data['xmp-exif']['GPSAltitudeRef'] );
diff --git a/includes/normal/UtfNormal.php b/includes/normal/UtfNormal.php
index 2b400e5a85..08f85bd342 100644
--- a/includes/normal/UtfNormal.php
+++ b/includes/normal/UtfNormal.php
@@ -190,7 +190,7 @@ class UtfNormal {
 	 */
 	static function loadData() {
 		if( !isset( self::$utfCombiningClass ) ) {
-			require_once( dirname(__FILE__) . '/UtfNormalData.inc' );
+			require_once( __DIR__ . '/UtfNormalData.inc' );
 		}
 	}
 
diff --git a/includes/parser/CoreParserFunctions.php b/includes/parser/CoreParserFunctions.php
index 4c6a22f740..8917b6d06b 100644
--- a/includes/parser/CoreParserFunctions.php
+++ b/includes/parser/CoreParserFunctions.php
@@ -342,6 +342,7 @@ class CoreParserFunctions {
 	static function plural( $parser, $text = '' ) {
 		$forms = array_slice( func_get_args(), 2 );
 		$text = $parser->getFunctionLang()->parseFormattedNumber( $text );
+		settype( $text, ctype_digit( $text ) ? 'int' : 'float' );
 		return $parser->getFunctionLang()->convertPlural( $text, $forms );
 	}
 
@@ -660,7 +661,7 @@ class CoreParserFunctions {
 		if( isset( $cache[$page] ) ) {
 			$length = $cache[$page];
 		} elseif( $parser->incrementExpensiveFunctionCount() ) {
-			$rev = Revision::newFromTitle( $title );
+			$rev = Revision::newFromTitle( $title, false, Revision::READ_NORMAL );
 			$id = $rev ? $rev->getPage() : 0;
 			$length = $cache[$page] = $rev ? $rev->getSize() : 0;
 
diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index 489451a2ef..8e9444a2bd 100644
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -3086,7 +3086,7 @@ class Parser {
 	 * @param $max int|null Maximum allowed, when an explicit limit has been
 	 *	 exceeded, provide the values (optional)
 	 */
-	function limitationWarn( $limitationType, $current = null, $max = null) {
+	function limitationWarn( $limitationType, $current = '', $max = '' ) {
 		# does no harm if $current and $max are present but are unnecessary for the message
 		$warning = wfMessage( "$limitationType-warning" )->numParams( $current, $max )
 			->inContentLanguage()->escaped();
@@ -3565,7 +3565,7 @@ class Parser {
 			# Get the revision
 			$rev = $id
 				? Revision::newFromId( $id )
-				: Revision::newFromTitle( $title, 0, Revision::READ_NORMAL );
+				: Revision::newFromTitle( $title, false, Revision::READ_NORMAL );
 			$rev_id = $rev ? $rev->getId() : 0;
 			# If there is no current revision, there is no page
 			if ( $id === false && !$rev ) {
diff --git a/includes/resourceloader/ResourceLoaderLanguageDataModule.php b/includes/resourceloader/ResourceLoaderLanguageDataModule.php
index a36aaec49b..c916c4a59d 100644
--- a/includes/resourceloader/ResourceLoaderLanguageDataModule.php
+++ b/includes/resourceloader/ResourceLoaderLanguageDataModule.php
@@ -29,7 +29,7 @@ class ResourceLoaderLanguageDataModule extends ResourceLoaderModule {
 
 	protected $language;
 	/**
-	 * Get the grammer forms for the site content language.
+	 * Get the grammar forms for the site content language.
 	 *
 	 * @return array
 	 */
@@ -37,6 +37,15 @@ class ResourceLoaderLanguageDataModule extends ResourceLoaderModule {
 		return $this->language->getGrammarForms();
 	}
 
+	/**
+	 * Get the plural forms for the site content language.
+	 *
+	 * @return array
+	 */
+	protected function getPluralRules() {
+		return $this->language->getPluralRules();
+	}
+
 	/**
 	 * Get the digit transform table for the content language
 	 * Seperator transform table also required here to convert
@@ -61,17 +70,19 @@ class ResourceLoaderLanguageDataModule extends ResourceLoaderModule {
 	 * @return array
 	 */
 	protected function getData() {
-		return array( 'grammarForms' => $this->getSiteLangGrammarForms(),
-				'digitTransformTable' => $this->getDigitTransformTable()
-			);
+		return array(
+			'digitTransformTable' => $this->getDigitTransformTable(),
+			'grammarForms' => $this->getSiteLangGrammarForms(),
+			'pluralRules' => $this->getPluralRules(),
+		);
 	}
 
 	/**
 	 * @param $context ResourceLoaderContext
-	 * @return string: Javascript code
+	 * @return string: JavaScript code
 	 */
 	public function getScript( ResourceLoaderContext $context ) {
-		$this->language = Language::factory( $context ->getLanguage() );
+		$this->language = Language::factory( $context->getLanguage() );
 		return Xml::encodeJsCall( 'mw.language.setData', array(
 			$this->language->getCode(),
 			$this->getData()
diff --git a/includes/specials/SpecialDeletedContributions.php b/includes/specials/SpecialDeletedContributions.php
index ff2a901db5..991e7a2c24 100644
--- a/includes/specials/SpecialDeletedContributions.php
+++ b/includes/specials/SpecialDeletedContributions.php
@@ -94,17 +94,17 @@ class DeletedContribsPager extends IndexPager {
 		if ( isset( $this->mNavigationBar ) ) {
 			return $this->mNavigationBar;
 		}
-		$lang = $this->getLanguage();
-		$fmtLimit = $lang->formatNum( $this->mLimit );
+
 		$linkTexts = array(
-			'prev' => $this->msg( 'pager-newer-n', $fmtLimit )->escaped(),
-			'next' => $this->msg( 'pager-older-n', $fmtLimit )->escaped(),
+			'prev' => $this->msg( 'pager-newer-n' )->numParams( $this->mLimit )->escaped(),
+			'next' => $this->msg( 'pager-older-n' )->numParams( $this->mLimit )->escaped(),
 			'first' => $this->msg( 'histlast' )->escaped(),
 			'last' => $this->msg( 'histfirst' )->escaped()
 		);
 
 		$pagingLinks = $this->getPagingLinks( $linkTexts );
 		$limitLinks = $this->getLimitLinks();
+		$lang = $this->getLanguage();
 		$limits = $lang->pipeList( $limitLinks );
 
 		$this->mNavigationBar = "(" . $lang->pipeList( array( $pagingLinks['first'], $pagingLinks['last'] ) ) . ") " .
diff --git a/includes/specials/SpecialEditWatchlist.php b/includes/specials/SpecialEditWatchlist.php
index 2bea3a3b88..23cd9aa679 100644
--- a/includes/specials/SpecialEditWatchlist.php
+++ b/includes/specials/SpecialEditWatchlist.php
@@ -510,7 +510,7 @@ class SpecialEditWatchlist extends UnlistedSpecialPage {
 				$this->toc .= Linker::tocLine( "editwatchlist-{$data['section']}", $nsText,
 					$this->getLanguage()->formatNum( ++$tocLength ), 1 ) . Linker::tocLineEnd();
 			}
-			$this->toc = Linker::tocList( $this->toc, $this->getLanguage()->getCode() );
+			$this->toc = Linker::tocList( $this->toc );
 		} else {
 			$this->toc = false;
 		}
diff --git a/includes/specials/SpecialSearch.php b/includes/specials/SpecialSearch.php
index 3344436ac3..85365f5dd9 100644
--- a/includes/specials/SpecialSearch.php
+++ b/includes/specials/SpecialSearch.php
@@ -667,10 +667,10 @@ class SpecialSearch extends SpecialPage {
 					return "<li>" .
 						'<table class="searchResultImage">' .
 						'<tr>' .
-						'<td width="120" align="center" valign="top">' .
+						'<td width="120" style="text-align: center; vertical-align: top;">' .
 						$thumb->toHtml( array( 'desc-link' => true ) ) .
 						'</td>' .
-						'<td valign="top">' .
+						'<td style="vertical-align: top;">' .
 						$link .
 						$extract .
 						"<div class='mw-search-result-data'>{$score}{$desc} - {$date}{$related}</div>" .
diff --git a/includes/specials/SpecialUndelete.php b/includes/specials/SpecialUndelete.php
index b1555c6dee..6dde6b9a58 100644
--- a/includes/specials/SpecialUndelete.php
+++ b/includes/specials/SpecialUndelete.php
@@ -120,7 +120,7 @@ class PageArchive {
 			),
 			array( 'ar_namespace' => $this->title->getNamespace(),
 				   'ar_title' => $this->title->getDBkey() ),
-			'PageArchive::listRevisions',
+			__METHOD__,
 			array( 'ORDER BY' => 'ar_timestamp DESC' ) );
 		$ret = $dbr->resultObject( $res );
 		return $ret;
@@ -308,7 +308,9 @@ class PageArchive {
 		$dbr = wfGetDB( DB_SLAVE );
 		$n = $dbr->selectField( 'archive', 'COUNT(ar_title)',
 			array( 'ar_namespace' => $this->title->getNamespace(),
-				   'ar_title' => $this->title->getDBkey() ) );
+				   'ar_title' => $this->title->getDBkey() ),
+			__METHOD__
+		);
 		return ( $n > 0 );
 	}
 
@@ -327,7 +329,7 @@ class PageArchive {
 	 * on success, false on failure
 	 */
 	function undelete( $timestamps, $comment = '', $fileVersions = array(), $unsuppress = false, User $user = null ) {
-		global $wgContLang, $wgUser;
+		global $wgUser;
 
 		// If both the set of text revisions and file revisions are empty,
 		// restore everything. Otherwise, just restore the requested items.
@@ -912,10 +914,10 @@ class SpecialUndelete extends SpecialPage {
 			"<col class='diff-marker' />" .
 			"<col class='diff-content' />" .
 			"<tr>" .
-				"<td colspan='2' width='50%' align='center' class='diff-otitle'>" .
+				"<td colspan='2' width='50%' style='text-align: center' class='diff-otitle'>" .
 				$this->diffHeader( $previousRev, 'o' ) .
 				"</td>\n" .
-				"<td colspan='2' width='50%' align='center' class='diff-ntitle'>" .
+				"<td colspan='2' width='50%' style='text-align: center' class='diff-ntitle'>" .
 				$this->diffHeader( $currentRev, 'n' ) .
 				"</td>\n" .
 			"</tr>" .
diff --git a/includes/specials/SpecialUpload.php b/includes/specials/SpecialUpload.php
index d1a9b160c9..43ea345b74 100644
--- a/includes/specials/SpecialUpload.php
+++ b/includes/specials/SpecialUpload.php
@@ -702,21 +702,18 @@ class SpecialUpload extends SpecialPage {
 	 * @return string
 	 */
 	public static function getDupeWarning( $dupes ) {
-		global $wgOut;
-		if( $dupes ) {
-			$msg = '<gallery>';
-			foreach( $dupes as $file ) {
-				$title = $file->getTitle();
-				$msg .= $title->getPrefixedText() .
-					'|' . $title->getText() . "\n";
-			}
-			$msg .= '</gallery>';
-			return '<li>' .
-				wfMessage( 'file-exists-duplicate' )->numParams( count( $dupes ) )->parse() .
-				$wgOut->parse( $msg ) . "</li>\n";
-		} else {
+		if ( !$dupes ) {
 			return '';
 		}
+
+		$gallery = new ImageGallery;
+		$gallery->setShowBytes( false );
+		foreach( $dupes as $file ) {
+			$gallery->add( $file->getTitle() );
+		}
+		return '<li>' .
+			wfMessage( 'file-exists-duplicate' )->numParams( count( $dupes ) )->parse() .
+			$gallery->toHtml() . "</li>\n";
 	}
 
 }
diff --git a/includes/tidy.conf b/includes/tidy.conf
index 479083eca3..aa333fcbe3 100644
--- a/includes/tidy.conf
+++ b/includes/tidy.conf
@@ -16,4 +16,4 @@ quiet: yes
 quote-nbsp: yes
 fix-backslash: no
 fix-uri: no
-new-inline-tags: video,audio,source,track
+new-inline-tags: video,audio,source,track,bdi
diff --git a/includes/upload/UploadFromUrl.php b/includes/upload/UploadFromUrl.php
index fdd2b1ae0b..c11d7192a4 100644
--- a/includes/upload/UploadFromUrl.php
+++ b/includes/upload/UploadFromUrl.php
@@ -70,14 +70,13 @@ class UploadFromUrl extends UploadBase {
 		if ( !count( $wgCopyUploadsDomains ) ) {
 			return true;
 		}
-		$uri = new Uri( $url );
-		$parsedDomain = $uri->getHost();
-		if ( $parsedDomain === null ) {
+		$parsedUrl = wfParseUrl( $url );
+		if ( !$parsedUrl ) {
 			return false;
 		}
 		$valid = false;
 		foreach( $wgCopyUploadsDomains as $domain ) {
-			if ( $parsedDomain === $domain ) {
+			if ( $parsedUrl['host'] === $domain ) {
 				$valid = true;
 				break;
 			}
diff --git a/index.php b/index.php
index 201087847a..0e9676da29 100644
--- a/index.php
+++ b/index.php
@@ -41,6 +41,7 @@
 # PHP 4. Setup.php and ObjectCache.php have structures invalid in PHP 5.0 and
 # 5.1, respectively.
 if ( !function_exists( 'version_compare' ) || version_compare( phpversion(), '5.3.2' ) < 0 ) {
+	// We need to use dirname( __FILE__ ) here cause __DIR__ is PHP5.3+
 	require( dirname( __FILE__ ) . '/includes/PHPVersionError.php' );
 	wfPHPVersionError( 'index.php' );
 }
@@ -51,7 +52,7 @@ if ( !function_exists( 'version_compare' ) || version_compare( phpversion(), '5.
 if ( isset( $_SERVER['MW_COMPILED'] ) ) {
 	require ( 'phase3/includes/WebStart.php' );
 } else {
-	require ( dirname( __FILE__ ) . '/includes/WebStart.php' );
+	require ( __DIR__ . '/includes/WebStart.php' );
 }
 
 $mediaWiki = new MediaWiki();
diff --git a/languages/Language.php b/languages/Language.php
index ae66d7c84c..1edca80469 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -32,7 +32,7 @@ if ( !defined( 'MEDIAWIKI' ) ) {
 
 # Read language names
 global $wgLanguageNames;
-require_once( dirname( __FILE__ ) . '/Names.php' );
+require_once( __DIR__ . '/Names.php' );
 
 if ( function_exists( 'mb_strtoupper' ) ) {
 	mb_internal_encoding( 'UTF-8' );
@@ -266,9 +266,9 @@ class Language {
 	 */
 	public static function isValidBuiltInCode( $code ) {
 
-		if( !is_string($code) ) {
+		if ( !is_string( $code ) ) {
 			$type = gettype( $code );
-			if( $type === 'object' ) {
+			if ( $type === 'object' ) {
 				$addmsg = " of class " . get_class( $code );
 			} else {
 				$addmsg = '';
@@ -742,7 +742,7 @@ class Language {
 
 		$names = array();
 
-		if( $inLanguage ) {
+		if ( $inLanguage ) {
 			# TODO: also include when $inLanguage is null, when this code is more efficient
 			wfRunHooks( 'LanguageGetTranslatedLanguageNames', array( &$names, $inLanguage ) );
 		}
@@ -762,11 +762,11 @@ class Language {
 
 		$returnMw = array();
 		$coreCodes = array_keys( $mwNames );
-		foreach( $coreCodes as $coreCode ) {
+		foreach ( $coreCodes as $coreCode ) {
 			$returnMw[$coreCode] = $names[$coreCode];
 		}
 
-		if( $include === 'mwfile' ) {
+		if ( $include === 'mwfile' ) {
 			$namesMwFile = array();
 			# We do this using a foreach over the codes instead of a directory
 			# loop so that messages files in extensions will work correctly.
@@ -3409,9 +3409,9 @@ class Language {
 		if ( !count( $forms ) ) {
 			return '';
 		}
-		$forms = $this->preConvertPlural( $forms, 2 );
-
-		return ( $count == 1 ) ? $forms[0] : $forms[1];
+		$pluralForm = $this->getPluralForm( $count );
+		$pluralForm = min( $pluralForm, count( $forms ) - 1 );
+		return $forms[$pluralForm];
 	}
 
 	/**
@@ -4180,4 +4180,34 @@ class Language {
 	public function getConvRuleTitle() {
 		return $this->mConverter->getConvRuleTitle();
 	}
+
+	/**
+	 * Get the compiled plural rules for the language
+	 * @since 1.20
+	 * @return array Associative array with plural form, and plural rule as key-value pairs
+	 */
+	public function getCompiledPluralRules() {
+		return self::$dataCache->getItem( strtolower( $this->mCode ), 'compiledPluralRules' );
+	}
+
+	/**
+	 * Get the plural rules for the language
+	 * @since 1.20
+	 * @return array Associative array with plural form, and plural rule as key-value pairs
+	 */
+	public function getPluralRules() {
+		return self::$dataCache->getItem( strtolower( $this->mCode ), 'pluralRules' );
+	}
+
+	/**
+	 * Find the plural form matching to the given number
+	 * It return the form index.
+	 * @return int The index of the plural form
+	 */
+	private function getPluralForm( $number ) {
+		$pluralRules = $this->getCompiledPluralRules();
+		$form = CLDRPluralRuleEvaluator::evaluateCompiled( $number, $pluralRules );
+		return $form;
+	}
+
 }
diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php
index cbd5d9ae9d..8b7d6cbec0 100644
--- a/languages/LanguageConverter.php
+++ b/languages/LanguageConverter.php
@@ -295,7 +295,7 @@ class LanguageConverter {
 			// We record these fallback variants, and process
 			// them later.
 			$fallbacks = $this->getVariantFallbacks( $language );
-			if ( is_string( $fallbacks ) ) {
+			if ( is_string( $fallbacks ) && $fallbacks !== $this->mMainLanguageCode ) {
 				$fallbackLanguages[] = $fallbacks;
 			} elseif ( is_array( $fallbacks ) ) {
 				$fallbackLanguages =
diff --git a/languages/classes/LanguageAm.php b/languages/classes/LanguageAm.php
deleted file mode 100644
index 4c39c26f78..0000000000
--- a/languages/classes/LanguageAm.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-/**
- * Amharic (አማርኛ) specific code.
- *
- * 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 Language
- */
-
-/**
- * Amharic (አማርኛ)
- *
- * @ingroup Language
- */
-class LanguageAm extends Language {
-	/**
-	 * Use singular form for zero
-	 *
-	 * @param $count int
-	 * @param $forms array
-	 *
-	 * @return string
-	 */
-	function convertPlural( $count, $forms ) {
-		if ( !count( $forms ) ) { return ''; }
-		$forms = $this->preConvertPlural( $forms, 2 );
-
-		return ( $count <= 1 ) ? $forms[0] : $forms[1];
-	}
-}
diff --git a/languages/classes/LanguageAr.php b/languages/classes/LanguageAr.php
index cc6b85c3f7..553ff077cd 100644
--- a/languages/classes/LanguageAr.php
+++ b/languages/classes/LanguageAr.php
@@ -29,31 +29,6 @@
  */
 class LanguageAr extends Language {
 
-	/**
-	 * @param $count int
-	 * @param $forms array
-	 * @return string
-	 */
-	function convertPlural( $count, $forms ) {
-		if ( !count( $forms ) ) { return ''; }
-		$forms = $this->preConvertPlural( $forms, 6 );
-
-		if ( $count == 0 ) {
-			$index = 0;
-		} elseif ( $count == 1 ) {
-			$index = 1;
-		} elseif ( $count == 2 ) {
-			$index = 2;
-		} elseif ( $count % 100 >= 3 && $count % 100 <= 10 ) {
-			$index = 3;
-		} elseif ( $count % 100 >= 11 && $count % 100 <= 99 ) {
-			$index = 4;
-		} else {
-			$index = 5;
-		}
-		return $forms[$index];
-	}
-
 	/**
 	 * Temporary hack for bug 9413: replace Arabic presentation forms with their
 	 * standard equivalents.
diff --git a/languages/classes/LanguageBe.php b/languages/classes/LanguageBe.php
deleted file mode 100644
index b5b5966556..0000000000
--- a/languages/classes/LanguageBe.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-/**
- * Belarusian normative (Беларуская мова) specific code.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- * http://www.gnu.org/copyleft/gpl.html
- *
- * @file
- * @author Ævar Arnfjörð Bjarmason <avarab@gmail.com>
- * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License
- * @license http://www.gnu.org/copyleft/fdl.html GNU Free Documentation License
- * @ingroup Language
- */
-
-/**
- * Belarusian normative (Беларуская мова)
- *
- * This is still the version from Be-x-old, only duplicated for consistency of
- * plural and grammar functions. If there are errors please send a patch.
- *
- * @ingroup Language
- * @see http://be.wikipedia.org/wiki/Talk:LanguageBe.php
- */
-class LanguageBe extends Language {
-
-	/**
-	 * @param $count int
-	 * @param $forms array
-	 *
-	 * @return string
-	 */
-	function convertPlural( $count, $forms ) {
-		if ( !count( $forms ) ) { return ''; }
-		// @todo FIXME: CLDR defines 4 plural forms instead of 3
-		//        http://unicode.org/repos/cldr-tmp/trunk/diff/supplemental/language_plural_rules.html
-		$forms = $this->preConvertPlural( $forms, 3 );
-
-		if ( $count > 10 && floor( ( $count % 100 ) / 10 ) == 1 ) {
-			return $forms[2];
-		} else {
-			switch ( $count % 10 ) {
-				case 1:  return $forms[0];
-				case 2:
-				case 3:
-				case 4:  return $forms[1];
-				default: return $forms[2];
-			}
-		}
-	}
-}
diff --git a/languages/classes/LanguageBh.php b/languages/classes/LanguageBh.php
deleted file mode 100644
index 0eaf2ff5c5..0000000000
--- a/languages/classes/LanguageBh.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-/**
- * Bihari (भोजपुरी) specific code.
- *
- * 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 Language
- */
-
-/**
- * Bihari (भोजपुरी)
- *
- * @ingroup Language
- */
-class LanguageBh extends Language {
-	/**
-	 * Use singular form for zero
-	 *
-	 * @param $count int
-	 * @param $forms array
-	 *
-	 * @return string
-	 */
-	function convertPlural( $count, $forms ) {
-		if ( !count( $forms ) ) { return ''; }
-		$forms = $this->preConvertPlural( $forms, 2 );
-
-		return ( $count <= 1 ) ? $forms[0] : $forms[1];
-	}
-}
diff --git a/languages/classes/LanguageBs.php b/languages/classes/LanguageBs.php
index 0929641c8b..3da7711e8f 100644
--- a/languages/classes/LanguageBs.php
+++ b/languages/classes/LanguageBs.php
@@ -28,29 +28,6 @@
  */
 class LanguageBs extends Language {
 
-	/**
-	 * @param $count int
-	 * @param $forms array
-	 * @return string
-	 */
-	function convertPlural( $count, $forms ) {
-		if ( !count( $forms ) ) { return ''; }
-		$forms = $this->preConvertPlural( $forms, 3 );
-
-		// @todo FIXME: CLDR defines 4 plural forms instead of 3. Plural for decimals is missing.
-		//        http://unicode.org/repos/cldr-tmp/trunk/diff/supplemental/language_plural_rules.html
-		if ( $count > 10 && floor( ( $count % 100 ) / 10 ) == 1 ) {
-			return $forms[2];
-		} else {
-			switch ( $count % 10 ) {
-				case 1:  return $forms[0];
-				case 2:
-				case 3:
-				case 4:  return $forms[1];
-				default: return $forms[2];
-			}
-		}
-	}
 
 	/**
 	 * Convert from the nominative form of a noun to some other case
diff --git a/languages/classes/LanguageCs.php b/languages/classes/LanguageCs.php
deleted file mode 100644
index 49c4756c57..0000000000
--- a/languages/classes/LanguageCs.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-/**
- * Czech (čeština [subst.], český [adj.], česky [adv.]) specific code.
- *
- * 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 Language
- */
-
-/**
- * Czech (čeština [subst.], český [adj.], česky [adv.])
- *
- * @ingroup Language
- */
-class LanguageCs extends Language {
-
-	/**
-	 * Plural transformations
-	 * Invoked by putting
-	 * {{plural:count|form1|form2-4|form0,5+}} for two forms plurals
-	 * {{plural:count|form1|form0,2+}} for single form plurals
-	 * in a message
-	 * @param $count int
-	 * @param $forms array
-	 * @return string
-	 */
-	function convertPlural( $count, $forms ) {
-		if ( !count( $forms ) ) { return ''; }
-		$forms = $this->preConvertPlural( $forms, 3 );
-
-		switch ( $count ) {
-			case 1:
-				return $forms[0];
-			case 2:
-			case 3:
-			case 4:
-				return $forms[1];
-			default:
-				return $forms[2];
-		}
-	}
-}
diff --git a/languages/classes/LanguageCu.php b/languages/classes/LanguageCu.php
index bfa95cfb57..2016a43cce 100644
--- a/languages/classes/LanguageCu.php
+++ b/languages/classes/LanguageCu.php
@@ -20,7 +20,7 @@
  * @file
  * @ingroup Language
  */
- 
+
 /**
  * Old Church Slavonic (Ѩзыкъ словѣньскъ)
  *
diff --git a/languages/classes/LanguageCy.php b/languages/classes/LanguageCy.php
deleted file mode 100644
index 9c28279de8..0000000000
--- a/languages/classes/LanguageCy.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-/**
- * Welsh (Cymraeg) specific code.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- * http://www.gnu.org/copyleft/gpl.html
- *
- * @file
- * @author Niklas Laxström
- * @ingroup Language
- */
-
-/**
- * Welsh (Cymraeg)
- *
- * @ingroup Language
- */
-class LanguageCy extends Language {
-
-	/**
-	 * @param $count int
-	 * @param $forms array
-	 * @return string
-	 */
-	function convertPlural( $count, $forms ) {
-		if ( !count( $forms ) ) { return ''; }
-
-		$forms = $this->preConvertPlural( $forms, 6 );
-		$count = abs( $count );
-		if ( $count >= 0 && $count <= 3 ) {
-			return $forms[$count];
-		} elseif ( $count == 6 ) {
-			return $forms[4];
-		} else {
-			return $forms[5];
-		}
-	}
-}
diff --git a/languages/classes/LanguageDsb.php b/languages/classes/LanguageDsb.php
index b8ed7fcb32..975157f41e 100644
--- a/languages/classes/LanguageDsb.php
+++ b/languages/classes/LanguageDsb.php
@@ -54,21 +54,4 @@ class LanguageDsb extends Language {
 		return $word; # this will return the original value for 'nominatiw' (nominativ) and all undefined case values
 	}
 
-	/**
-	 * @param $count int
-	 * @param $forms array
-	 * @return string
-	 */
-	function convertPlural( $count, $forms ) {
-		if ( !count( $forms ) ) { return ''; }
-		$forms = $this->preConvertPlural( $forms, 4 );
-
-		switch ( abs( $count ) % 100 ) {
-			case 1:  return $forms[0]; // singular
-			case 2:  return $forms[1]; // dual
-			case 3:
-			case 4:  return $forms[2]; // plural
-			default: return $forms[3]; // pluralgen
-		}
-	}
 }
diff --git a/languages/classes/LanguageFr.php b/languages/classes/LanguageFr.php
deleted file mode 100644
index edbe1fbc47..0000000000
--- a/languages/classes/LanguageFr.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-/**
- * French (Français) specific code.
- *
- * 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 Language
- */
-
-/**
- * French (Français)
- *
- * @ingroup Language
- */
-class LanguageFr extends Language {
-	/**
-	 * Use singular form for zero (see bug 7309)
-	 *
-	 * @param $count int
-	 * @param $forms array
-	 *
-	 * @return string
-	 */
-	function convertPlural( $count, $forms ) {
-		if ( !count( $forms ) ) { return ''; }
-		$forms = $this->preConvertPlural( $forms, 2 );
-
-		return ( $count <= 1 ) ? $forms[0] : $forms[1];
-	}
-}
diff --git a/languages/classes/LanguageGa.php b/languages/classes/LanguageGa.php
index cb9fa046d0..2f58384a6a 100644
--- a/languages/classes/LanguageGa.php
+++ b/languages/classes/LanguageGa.php
@@ -64,24 +64,4 @@ class LanguageGa extends Language {
 		return $word;
 	}
 
-	/**
-	 * @param $count int
-	 * @param $forms array
-	 * @return string
-	 */
-	function convertPlural( $count, $forms ) {
-		if ( !count( $forms ) ) { return ''; }
-
-		// plural forms per http://unicode.org/repos/cldr-tmp/trunk/diff/supplemental/language_plural_rules.html#ga
-		$forms = $this->preConvertPlural( $forms, 3 );
-
-		if ( $count == 1 ) {
-			$index = 0;
-		} elseif ( $count == 2 ) {
-			$index = 1;
-		} else {
-			$index = 2;
-		}
-		return $forms[$index];
-	}
 }
diff --git a/languages/classes/LanguageGan.php b/languages/classes/LanguageGan.php
index 4fd41cf978..14fe92824d 100644
--- a/languages/classes/LanguageGan.php
+++ b/languages/classes/LanguageGan.php
@@ -21,8 +21,8 @@
  * @ingroup Language
  */
 
-require_once( dirname( __FILE__ ) . '/../LanguageConverter.php' );
-require_once( dirname( __FILE__ ) . '/LanguageZh.php' );
+require_once( __DIR__ . '/../LanguageConverter.php' );
+require_once( __DIR__ . '/LanguageZh.php' );
 
 /**
  * @ingroup Language
@@ -58,7 +58,7 @@ class GanConverter extends LanguageConverter {
 	}
 
 	function loadDefaultTables() {
-		require( dirname( __FILE__ ) . "/../../includes/ZhConversion.php" );
+		require( __DIR__ . "/../../includes/ZhConversion.php" );
 		$this->mTables = array(
 			'gan-hans' => new ReplacementArray( $zh2Hans ),
 			'gan-hant' => new ReplacementArray( $zh2Hant ),
diff --git a/languages/classes/LanguageGd.php b/languages/classes/LanguageGd.php
deleted file mode 100644
index f042b02772..0000000000
--- a/languages/classes/LanguageGd.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-/**
- * Scots Gaelic (Gàidhlig) specific code.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- * http://www.gnu.org/copyleft/gpl.html
- *
- * @file
- * @author Raimond Spekking
- * @author Niklas Laxström
- * @ingroup Language
- */
-
-/**
- * Scots Gaelic (Gàidhlig)
- *
- * @ingroup Language
- */
-class LanguageGd extends Language {
-
-	/**
-	 * Plural form transformations
-	 * Based on this discussion: http://translatewiki.net/wiki/Thread:Support/New_plural_rules_for_Scots_Gaelic_(gd)
-	 *
-	 * $forms[0] - 1
-	 * $forms[1] - 2
-	 * $forms[2] - 11
-	 * $forms[3] - 12
-	 * $forms[4] - 3-10, 13-19
-	 * $forms[5] - 0, 20, rest
-	 *
-	 * @param $count int
-	 * @param $forms array
-	 *
-	 * @return string
-	 */
-	function convertPlural( $count, $forms ) {
-		if ( !count( $forms ) ) { return ''; }
-		$forms = $this->preConvertPlural( $forms, 6 );
-
-		$count = abs( $count );
-		if ( $count == 1 ) {
-			return $forms[0];
-		} elseif ( $count == 2 ) {
-			return $forms[1];
-		} elseif ( $count == 11 ) {
-			return $forms[2];
-		} elseif ( $count == 12 ) {
-			return $forms[3];
-		} elseif ( ($count >= 3 && $count <= 10) || ($count >= 13 && $count <= 19) ) {
-			return $forms[4];
-		} else {
-			return $forms[5];
-		}
-	}
-}
diff --git a/languages/classes/LanguageHe.php b/languages/classes/LanguageHe.php
index 22be1dec25..48c0c05712 100644
--- a/languages/classes/LanguageHe.php
+++ b/languages/classes/LanguageHe.php
@@ -68,23 +68,4 @@ class LanguageHe extends Language {
 		return $word;
 	}
 
-	/**
-	 * Gets a number and uses the suited form of the word.
-	 *
-	 * @param $count Integer: the number of items
-	 * @param $forms Array with 3 items: the three plural forms
-	 * @return String: the suited form of word
-	 */
-	function convertPlural( $count, $forms ) {
-		if ( !count( $forms ) ) { return ''; }
-		$forms = $this->preConvertPlural( $forms, 3 );
-
-		if ( $count == 1 ) {
-			return $forms[0]; // Singular
-		} elseif ( $count == 2 ) {
-			return $forms[2]; // Dual or plural if dual is not provided (filled in preConvertPlural)
-		} else {
-			return $forms[1]; // Plural
-		}
-	}
 }
diff --git a/languages/classes/LanguageIu.php b/languages/classes/LanguageIu.php
index 090d626fae..9bac5d73ff 100644
--- a/languages/classes/LanguageIu.php
+++ b/languages/classes/LanguageIu.php
@@ -21,7 +21,7 @@
  * @ingroup Language
  */
 
-require_once( dirname( __FILE__ ) . '/../LanguageConverter.php' );
+require_once( __DIR__ . '/../LanguageConverter.php' );
 
 /**
  * Conversion script between Latin and Syllabics for Inuktitut.
diff --git a/languages/classes/LanguageKk.php b/languages/classes/LanguageKk.php
index 7eb0b6c009..de0f4ff703 100644
--- a/languages/classes/LanguageKk.php
+++ b/languages/classes/LanguageKk.php
@@ -21,8 +21,8 @@
  * @ingroup Language
  */
 
-require_once( dirname( __FILE__ ) . '/../LanguageConverter.php' );
-require_once( dirname( __FILE__ ) . '/LanguageKk_cyrl.php' );
+require_once( __DIR__ . '/../LanguageConverter.php' );
+require_once( __DIR__ . '/LanguageKk_cyrl.php' );
 
 define( 'KK_C_UC', 'АӘБВГҒДЕЁЖЗИЙКҚЛМНҢОӨПРСТУҰҮФХҺЦЧШЩЪЫІЬЭЮЯ' ); # Kazakh Cyrillic uppercase
 define( 'KK_C_LC', 'аәбвгғдеёжзийкқлмнңоөпрстуұүфхһцчшщъыіьэюя' ); # Kazakh Cyrillic lowercase
@@ -62,7 +62,7 @@ class KkConverter extends LanguageConverter {
 	}
 
 	function loadDefaultTables() {
-		// require( dirname(__FILE__)."/../../includes/KkConversion.php" );
+		// require( __DIR__."/../../includes/KkConversion.php" );
 		// Placeholder for future implementing. Remove variables declarations
 		// after generating KkConversion.php
 		$kk2Cyrl = array();
diff --git a/languages/classes/LanguageKu.php b/languages/classes/LanguageKu.php
index 18c856442d..02ec648282 100644
--- a/languages/classes/LanguageKu.php
+++ b/languages/classes/LanguageKu.php
@@ -21,8 +21,8 @@
  * @ingroup Language
  */
 
-require_once( dirname( __FILE__ ) . '/../LanguageConverter.php' );
-require_once( dirname( __FILE__ ) . '/LanguageKu_ku.php' );
+require_once( __DIR__ . '/../LanguageConverter.php' );
+require_once( __DIR__ . '/LanguageKu_ku.php' );
 
 /**
  * Kurdish converter routines
diff --git a/languages/classes/LanguageShi.php b/languages/classes/LanguageShi.php
index ab34440a5e..27c5d64f15 100644
--- a/languages/classes/LanguageShi.php
+++ b/languages/classes/LanguageShi.php
@@ -21,7 +21,7 @@
  * @ingroup Language
  */
 
-require_once( dirname( __FILE__ ) . '/../LanguageConverter.php' );
+require_once( __DIR__ . '/../LanguageConverter.php' );
 
 /**
  * Conversion script between Latin and Tifinagh for Tachelhit.
diff --git a/languages/classes/LanguageSr.php b/languages/classes/LanguageSr.php
index 26d68531f7..4b799f2838 100644
--- a/languages/classes/LanguageSr.php
+++ b/languages/classes/LanguageSr.php
@@ -21,9 +21,9 @@
  * @ingroup Language
  */
 
-require_once( dirname( __FILE__ ) . '/../LanguageConverter.php' );
-require_once( dirname( __FILE__ ) . '/LanguageSr_ec.php' );
-require_once( dirname( __FILE__ ) . '/LanguageSr_el.php' );
+require_once( __DIR__ . '/../LanguageConverter.php' );
+require_once( __DIR__ . '/LanguageSr_ec.php' );
+require_once( __DIR__ . '/LanguageSr_el.php' );
 
 /**
  * There are two levels of conversion for Serbian: the script level
diff --git a/languages/classes/LanguageTg.php b/languages/classes/LanguageTg.php
index 90d57617c3..3ec14763c3 100644
--- a/languages/classes/LanguageTg.php
+++ b/languages/classes/LanguageTg.php
@@ -21,7 +21,7 @@
  * @ingroup Language
  */
 
-require_once( dirname( __FILE__ ) . '/../LanguageConverter.php' );
+require_once( __DIR__ . '/../LanguageConverter.php' );
 
 /**
  * Converts Tajiki to latin orthography
diff --git a/languages/classes/LanguageUz.php b/languages/classes/LanguageUz.php
index e0f45cd63b..bd69e3077f 100644
--- a/languages/classes/LanguageUz.php
+++ b/languages/classes/LanguageUz.php
@@ -21,7 +21,7 @@
  * @ingroup Language
  */
 
-require_once( dirname( __FILE__ ) . '/../LanguageConverter.php' );
+require_once( __DIR__ . '/../LanguageConverter.php' );
 
 /**
  * @ingroup Language
diff --git a/languages/classes/LanguageZh.php b/languages/classes/LanguageZh.php
index 96eea7c23e..63f90fd9c0 100644
--- a/languages/classes/LanguageZh.php
+++ b/languages/classes/LanguageZh.php
@@ -21,8 +21,8 @@
  * @ingroup Language
  */
 
-require_once( dirname( __FILE__ ) . '/../LanguageConverter.php' );
-require_once( dirname( __FILE__ ) . '/LanguageZh_hans.php' );
+require_once( __DIR__ . '/../LanguageConverter.php' );
+require_once( __DIR__ . '/LanguageZh_hans.php' );
 
 /**
  * @ingroup Language
@@ -64,7 +64,7 @@ class ZhConverter extends LanguageConverter {
 	}
 
 	function loadDefaultTables() {
-		require( dirname( __FILE__ ) . "/../../includes/ZhConversion.php" );
+		require( __DIR__ . "/../../includes/ZhConversion.php" );
 		$this->mTables = array(
 			'zh-hans' => new ReplacementArray( $zh2Hans ),
 			'zh-hant' => new ReplacementArray( $zh2Hant ),
diff --git a/languages/data/plurals-mediawiki.xml b/languages/data/plurals-mediawiki.xml
new file mode 100644
index 0000000000..fe9e03186c
--- /dev/null
+++ b/languages/data/plurals-mediawiki.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE supplementalData SYSTEM "../../common/dtd/ldmlSupplemental.dtd">
+<supplementalData>
+	<plurals>
+		<pluralRules locales="he">
+			<pluralRule count="one">n is 1</pluralRule>
+			<pluralRule count="two">n is 2</pluralRule>
+		</pluralRules>
+	</plurals>
+	<pluralRules locales="dsb">
+		<pluralRule count="one">n mod 100 is 1</pluralRule>
+		<pluralRule count="two">n mod 100 is 2</pluralRule>
+		<pluralRule count="few">n mod 100 in 3..4</pluralRule>
+	</pluralRules>
+	<pluralRules locales="cu">
+		<pluralRule count="one">n mod 10 is 1</pluralRule>
+		<pluralRule count="two">n mod 10 is 2</pluralRule>
+		<pluralRule count="few">n mod 10 in 3..4</pluralRule>
+	</pluralRules>
+	<!-- Plural form transformations
+	Based on this discussion: http://translatewiki.net/wiki/Thread:Support/New_plural_rules_for_Scots_Gaelic_(gd)
+	$forms[0] - 1
+	$forms[1] - 2
+	$forms[2] - 11
+	$forms[3] - 12
+	$forms[4] - 3-10, 13-19
+	$forms[5] - 0, 20, rest -->
+	<pluralRules locales="gd">
+		<pluralRule count="one">n is 1</pluralRule>
+		<pluralRule count="two">n is 2</pluralRule>
+		<pluralRule count="elevan">n is 11</pluralRule>
+		<pluralRule count="twelve">n is 12</pluralRule>
+		<pluralRule count="few">n in 3..10 or n in 13..19</pluralRule>
+	</pluralRules>
+</supplementalData>
diff --git a/languages/data/plurals.xml b/languages/data/plurals.xml
new file mode 100644
index 0000000000..8432df44f3
--- /dev/null
+++ b/languages/data/plurals.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE supplementalData SYSTEM "../../common/dtd/ldmlSupplemental.dtd">
+<supplementalData>
+    <version number="$Revision: 6155 $"/>
+    <generation date="$Date: 2011-09-21 23:51:12 +0530 (ബു, 21 സെപ് 2011) $"/>
+    <plurals>
+        <!-- if locale is known to have no plurals, there are no rules -->
+        <pluralRules locales="az bm bo dz fa id ig ii hu ja jv ka kde kea km kn ko lo ms my sah ses sg th to tr vi wo yo zh"/>
+        <pluralRules locales="ar">
+            <pluralRule count="zero">n is 0</pluralRule>
+            <pluralRule count="one">n is 1</pluralRule>
+            <pluralRule count="two">n is 2</pluralRule>
+            <pluralRule count="few">n mod 100 in 3..10</pluralRule>
+            <pluralRule count="many">n mod 100 in 11..99</pluralRule>
+        </pluralRules>
+        <pluralRules locales="asa af bem bez bg bn brx ca cgg chr da de dv ee el en eo es et eu fi fo fur fy gl gsw gu ha haw he is it jmc kaj kcg kk kl ksb ku lb lg mas ml mn mr nah nb nd ne nl nn no nr ny nyn om or pa pap ps pt rof rm rwk saq seh sn so sq ss ssy st sv sw syr ta te teo tig tk tn ts ur wae ve vun xh xog zu">
+            <pluralRule count="one">n is 1</pluralRule>
+        </pluralRules>
+        <pluralRules locales="ak am bh fil tl guw hi ln mg nso ti wa">
+            <pluralRule count="one">n in 0..1</pluralRule>
+        </pluralRules>
+        <pluralRules locales="ff fr kab">
+            <pluralRule count="one">n within 0..2 and n is not 2</pluralRule>
+        </pluralRules>
+        <pluralRules locales="lv">
+            <pluralRule count="zero">n is 0</pluralRule>
+            <pluralRule count="one">n mod 10 is 1 and n mod 100 is not 11</pluralRule>
+        </pluralRules>
+        <pluralRules locales="iu kw naq se sma smi smj smn sms">
+            <pluralRule count="one">n is 1</pluralRule>
+            <pluralRule count="two">n is 2</pluralRule>
+        </pluralRules>
+        <pluralRules locales="ga"> <!-- http://unicode.org/cldr/trac/ticket/3915 -->
+            <pluralRule count="one">n is 1</pluralRule>
+            <pluralRule count="two">n is 2</pluralRule>
+            <pluralRule count="few">n in 3..6</pluralRule>
+            <pluralRule count="many">n in 7..10</pluralRule>
+        </pluralRules>
+        <pluralRules locales="ro mo">
+            <pluralRule count="one">n is 1</pluralRule>
+            <pluralRule count="few">n is 0 OR n is not 1 AND n mod 100 in 1..19</pluralRule>
+        </pluralRules>
+        <pluralRules locales="lt">
+            <pluralRule count="one">n mod 10 is 1 and n mod 100 not in 11..19</pluralRule>
+            <pluralRule count="few">n mod 10 in 2..9 and n mod 100 not in 11..19</pluralRule>
+        </pluralRules>
+        <pluralRules locales="be bs hr ru sh sr uk">
+            <pluralRule count="one">n mod 10 is 1 and n mod 100 is not 11</pluralRule>
+            <pluralRule count="few">n mod 10 in 2..4 and n mod 100 not in 12..14</pluralRule>
+            <pluralRule count="many">n mod 10 is 0 or n mod 10 in 5..9 or n mod 100 in 11..14</pluralRule>
+            <!-- others are fractions -->
+        </pluralRules>
+        <pluralRules locales="cs sk">
+            <pluralRule count="one">n is 1</pluralRule>
+            <pluralRule count="few">n in 2..4</pluralRule>
+        </pluralRules>
+        <pluralRules locales="pl">
+            <pluralRule count="one">n is 1</pluralRule>
+            <pluralRule count="few">n mod 10 in 2..4 and n mod 100 not in 12..14</pluralRule>
+            <pluralRule count="many">n is not 1 and n mod 10 in 0..1 or n mod 10 in 5..9 or n mod 100 in 12..14</pluralRule>
+            <!-- others are fractions -->
+            <!-- and n mod 100 not in 22..24 from Tamplin -->
+        </pluralRules>
+        <pluralRules locales="sl">
+            <pluralRule count="one">n mod 100 is 1</pluralRule>
+            <pluralRule count="two">n mod 100 is 2</pluralRule>
+            <pluralRule count="few">n mod 100 in 3..4</pluralRule>
+        </pluralRules>
+        <pluralRules locales="mt"> <!-- from Tamplin's data -->
+            <pluralRule count="one">n is 1</pluralRule>
+            <pluralRule count="few">n is 0 or n mod 100 in 2..10</pluralRule>
+            <pluralRule count="many">n mod 100 in 11..19</pluralRule>
+        </pluralRules>
+        <pluralRules locales="mk"> <!-- from Tamplin's data -->
+            <pluralRule count="one">n mod 10 is 1 and n is not 11</pluralRule>
+        </pluralRules>
+        <pluralRules locales="cy"> <!-- from http://www.saltcymru.org/wordpress/?p=99&lang=en -->
+            <pluralRule count="zero">n is 0</pluralRule>
+            <pluralRule count="one">n is 1</pluralRule>
+            <pluralRule count="two">n is 2</pluralRule>
+            <pluralRule count="few">n is 3</pluralRule>
+            <pluralRule count="many">n is 6</pluralRule>
+        </pluralRules>
+        <pluralRules locales="lag">
+            <pluralRule count="zero">n is 0</pluralRule>
+            <pluralRule count="one">n within 0..2 and n is not 0 and n is not 2</pluralRule>
+        </pluralRules>
+        <pluralRules locales="shi">
+            <pluralRule count="one">n within 0..1</pluralRule>
+            <pluralRule count="few">n in 2..10</pluralRule>
+        </pluralRules>
+        <pluralRules locales="br"> <!-- from http://unicode.org/cldr/trac/ticket/2886 -->
+            <pluralRule count="one">n mod 10 is 1 and n mod 100 not in 11,71,91</pluralRule>
+            <pluralRule count="two">n mod 10 is 2 and n mod 100 not in 12,72,92</pluralRule>
+            <pluralRule count="few">n mod 10 in 3..4,9 and n mod 100 not in 10..19,70..79,90..99</pluralRule>
+            <pluralRule count="many">n mod 1000000 is 0 and n is not 0</pluralRule>
+        </pluralRules>
+        <pluralRules locales="ksh">
+            <pluralRule count="zero">n is 0</pluralRule>
+            <pluralRule count="one">n is 1</pluralRule>
+        </pluralRules>
+        <pluralRules locales="tzm">
+            <pluralRule count="one">n in 0..1 or n in 11..99</pluralRule>
+        </pluralRules>
+        <pluralRules locales="gv">
+            <pluralRule count="one">n mod 10 in 1..2 or n mod 20 is 0</pluralRule>
+        </pluralRules>
+        <pluralRules locales="gd">
+            <pluralRule count="one">n in 1,11</pluralRule>
+            <pluralRule count="two">n in 2,12</pluralRule>
+            <pluralRule count="few">n in 3..10,13..19</pluralRule>
+        </pluralRules>
+    </plurals>
+</supplementalData>
diff --git a/languages/messages/MessagesAb.php b/languages/messages/MessagesAb.php
index d177278bd8..c6be096b3e 100644
--- a/languages/messages/MessagesAb.php
+++ b/languages/messages/MessagesAb.php
@@ -74,9 +74,9 @@ $specialPageAliases = array(
 );
 
 $magicWords = array(
-	'language'                => array( '0', '#АБЫЗШӘА:', '#ЯЗЫК:', '#LANGUAGE:' ),
-	'special'                 => array( '0', 'цастәи', 'служебная', 'special' ),
-	'index'                   => array( '1', '__АИНДЕКС__', '__ИНДЕКС__', '__INDEX__' ),
+	'language'                  => array( '0', '#АБЫЗШӘА:', '#ЯЗЫК:', '#LANGUAGE:' ),
+	'special'                   => array( '0', 'цастәи', 'служебная', 'special' ),
+	'index'                     => array( '1', '__АИНДЕКС__', '__ИНДЕКС__', '__INDEX__' ),
 );
 
 $messages = array(
diff --git a/languages/messages/MessagesAf.php b/languages/messages/MessagesAf.php
index fbb4d25259..3756dfd994 100644
--- a/languages/messages/MessagesAf.php
+++ b/languages/messages/MessagesAf.php
@@ -48,65 +48,65 @@ $namespaceAliases = array(
 );
 
 $magicWords = array(
-	'redirect'                => array( '0', '#AANSTUUR', '#REDIRECT' ),
-	'notoc'                   => array( '0', '__GEENIO__', '__NOTOC__' ),
-	'nogallery'               => array( '0', '__GEENGALERY__', '__NOGALLERY__' ),
-	'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' ),
-	'currentmonthabbrev'      => array( '1', 'HUIDIGEMAANDAFK', 'CURRENTMONTHABBREV' ),
-	'currentday'              => array( '1', 'HUIDIGEDAG', 'CURRENTDAY' ),
-	'currentday2'             => array( '1', 'HUIDIGEDAG2', 'CURRENTDAY2' ),
-	'currentdayname'          => array( '1', 'HUIDIGEDAGNAAM', 'CURRENTDAYNAME' ),
-	'currentyear'             => array( '1', 'HUIDIGEJAAR', 'CURRENTYEAR' ),
-	'currenttime'             => array( '1', 'HUIDIGETYD', 'CURRENTTIME' ),
-	'currenthour'             => array( '1', 'HUIDIGEUUR', 'CURRENTHOUR' ),
-	'numberofpages'           => array( '1', 'AANTALBLADSYE', 'NUMBEROFPAGES' ),
-	'numberofarticles'        => array( '1', 'AANTALARTIKELS', 'NUMBEROFARTICLES' ),
-	'numberoffiles'           => array( '1', 'AANTALLêERS', 'NUMBEROFFILES' ),
-	'numberofusers'           => array( '1', 'AANTALGEBRUIKERS', 'NUMBEROFUSERS' ),
-	'numberofactiveusers'     => array( '1', 'AANTALAKTIEWEGEBRUIKERS', 'NUMBEROFACTIVEUSERS' ),
-	'numberofedits'           => array( '1', 'AANTALWYSIGINGS', 'NUMBEROFEDITS' ),
-	'numberofviews'           => array( '1', 'AANTALKEERGESIEN', 'NUMBEROFVIEWS' ),
-	'pagename'                => array( '1', 'BLADSYNAAM', 'PAGENAME' ),
-	'namespace'               => array( '1', 'NAAMSPASIE', 'NAMESPACE' ),
-	'talkspace'               => array( '1', 'BESPREKINGSBLADSY', 'TALKSPACE' ),
-	'fullpagename'            => array( '1', 'VOLBLADSYNAAM', 'FULLPAGENAME' ),
-	'img_thumbnail'           => array( '1', 'duimnael', 'thumbnail', 'thumb' ),
-	'img_right'               => array( '1', 'regs', 'right' ),
-	'img_left'                => array( '1', 'links', 'left' ),
-	'img_none'                => array( '1', 'geen', 'none' ),
-	'img_center'              => array( '1', 'senter', 'center', 'centre' ),
-	'img_framed'              => array( '1', 'omraam', 'framed', 'enframed', 'frame' ),
-	'img_frameless'           => array( '1', 'raamloos', 'frameless' ),
-	'img_border'              => array( '1', 'raam', 'border' ),
-	'img_top'                 => array( '1', 'bo', 'top' ),
-	'img_text_top'            => array( '1', 'teks-bo', 'text-top' ),
-	'img_middle'              => array( '1', 'middel', 'middle' ),
-	'img_bottom'              => array( '1', 'onder', 'bottom' ),
-	'img_text_bottom'         => array( '1', 'teks-onder', 'text-bottom' ),
-	'img_link'                => array( '1', 'skakel=$1', 'link=$1' ),
-	'sitename'                => array( '1', 'WERFNAAM', 'SITENAME' ),
-	'server'                  => array( '0', 'BEDIENER', 'SERVER' ),
-	'servername'              => array( '0', 'BEDIENERNAAM', 'SERVERNAME' ),
-	'gender'                  => array( '0', 'GESLAG:', 'GENDER:' ),
-	'localweek'               => array( '1', 'HUIDIGEWEEK', 'LOCALWEEK' ),
-	'plural'                  => array( '0', 'MEERVOUD', 'PLURAL:' ),
-	'fullurl'                 => array( '0', 'VOLURL', 'FULLURL:' ),
-	'displaytitle'            => array( '1', 'VERTOONTITEL', 'DISPLAYTITLE' ),
-	'currentversion'          => array( '1', 'HUIDIGEWEERGAWE', 'CURRENTVERSION' ),
-	'language'                => array( '0', '#TAAL:', '#LANGUAGE:' ),
-	'special'                 => array( '0', 'spesiaal', 'special' ),
-	'filepath'                => array( '0', 'LêERPAD:', 'FILEPATH:' ),
-	'tag'                     => array( '0', 'etiket', 'tag' ),
-	'pagesize'                => array( '1', 'BLADSYGROOTTE', 'PAGESIZE' ),
-	'index'                   => array( '1', '__INDEKS__', '__INDEX__' ),
-	'noindex'                 => array( '1', '__GEENINDEKS__', '__NOINDEX__' ),
-	'url_path'                => array( '0', 'PAD', 'PATH' ),
+	'redirect'                  => array( '0', '#AANSTUUR', '#REDIRECT' ),
+	'notoc'                     => array( '0', '__GEENIO__', '__NOTOC__' ),
+	'nogallery'                 => array( '0', '__GEENGALERY__', '__NOGALLERY__' ),
+	'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' ),
+	'currentmonthabbrev'        => array( '1', 'HUIDIGEMAANDAFK', 'CURRENTMONTHABBREV' ),
+	'currentday'                => array( '1', 'HUIDIGEDAG', 'CURRENTDAY' ),
+	'currentday2'               => array( '1', 'HUIDIGEDAG2', 'CURRENTDAY2' ),
+	'currentdayname'            => array( '1', 'HUIDIGEDAGNAAM', 'CURRENTDAYNAME' ),
+	'currentyear'               => array( '1', 'HUIDIGEJAAR', 'CURRENTYEAR' ),
+	'currenttime'               => array( '1', 'HUIDIGETYD', 'CURRENTTIME' ),
+	'currenthour'               => array( '1', 'HUIDIGEUUR', 'CURRENTHOUR' ),
+	'numberofpages'             => array( '1', 'AANTALBLADSYE', 'NUMBEROFPAGES' ),
+	'numberofarticles'          => array( '1', 'AANTALARTIKELS', 'NUMBEROFARTICLES' ),
+	'numberoffiles'             => array( '1', 'AANTALLêERS', 'NUMBEROFFILES' ),
+	'numberofusers'             => array( '1', 'AANTALGEBRUIKERS', 'NUMBEROFUSERS' ),
+	'numberofactiveusers'       => array( '1', 'AANTALAKTIEWEGEBRUIKERS', 'NUMBEROFACTIVEUSERS' ),
+	'numberofedits'             => array( '1', 'AANTALWYSIGINGS', 'NUMBEROFEDITS' ),
+	'numberofviews'             => array( '1', 'AANTALKEERGESIEN', 'NUMBEROFVIEWS' ),
+	'pagename'                  => array( '1', 'BLADSYNAAM', 'PAGENAME' ),
+	'namespace'                 => array( '1', 'NAAMSPASIE', 'NAMESPACE' ),
+	'talkspace'                 => array( '1', 'BESPREKINGSBLADSY', 'TALKSPACE' ),
+	'fullpagename'              => array( '1', 'VOLBLADSYNAAM', 'FULLPAGENAME' ),
+	'img_thumbnail'             => array( '1', 'duimnael', 'thumbnail', 'thumb' ),
+	'img_right'                 => array( '1', 'regs', 'right' ),
+	'img_left'                  => array( '1', 'links', 'left' ),
+	'img_none'                  => array( '1', 'geen', 'none' ),
+	'img_center'                => array( '1', 'senter', 'center', 'centre' ),
+	'img_framed'                => array( '1', 'omraam', 'framed', 'enframed', 'frame' ),
+	'img_frameless'             => array( '1', 'raamloos', 'frameless' ),
+	'img_border'                => array( '1', 'raam', 'border' ),
+	'img_top'                   => array( '1', 'bo', 'top' ),
+	'img_text_top'              => array( '1', 'teks-bo', 'text-top' ),
+	'img_middle'                => array( '1', 'middel', 'middle' ),
+	'img_bottom'                => array( '1', 'onder', 'bottom' ),
+	'img_text_bottom'           => array( '1', 'teks-onder', 'text-bottom' ),
+	'img_link'                  => array( '1', 'skakel=$1', 'link=$1' ),
+	'sitename'                  => array( '1', 'WERFNAAM', 'SITENAME' ),
+	'server'                    => array( '0', 'BEDIENER', 'SERVER' ),
+	'servername'                => array( '0', 'BEDIENERNAAM', 'SERVERNAME' ),
+	'gender'                    => array( '0', 'GESLAG:', 'GENDER:' ),
+	'localweek'                 => array( '1', 'HUIDIGEWEEK', 'LOCALWEEK' ),
+	'plural'                    => array( '0', 'MEERVOUD', 'PLURAL:' ),
+	'fullurl'                   => array( '0', 'VOLURL', 'FULLURL:' ),
+	'displaytitle'              => array( '1', 'VERTOONTITEL', 'DISPLAYTITLE' ),
+	'currentversion'            => array( '1', 'HUIDIGEWEERGAWE', 'CURRENTVERSION' ),
+	'language'                  => array( '0', '#TAAL:', '#LANGUAGE:' ),
+	'special'                   => array( '0', 'spesiaal', 'special' ),
+	'filepath'                  => array( '0', 'LêERPAD:', 'FILEPATH:' ),
+	'tag'                       => array( '0', 'etiket', 'tag' ),
+	'pagesize'                  => array( '1', 'BLADSYGROOTTE', 'PAGESIZE' ),
+	'index'                     => array( '1', '__INDEKS__', '__INDEX__' ),
+	'noindex'                   => array( '1', '__GEENINDEKS__', '__NOINDEX__' ),
+	'url_path'                  => array( '0', 'PAD', 'PATH' ),
 );
 
 $specialPageAliases = array(
@@ -526,12 +526,12 @@ Dit kan ook dui op 'n fout in die sagteware van {{SITENAME}}.",
 # General errors
 'error' => 'Fout',
 'databaseerror' => 'Databasisfout',
-'dberrortext' => 'Sintaksisfout in databasisnavraag.
+'dberrortext' => 'Daar was \'n sintaksisfout in die databasisnavraag.
 Dit kan moontlik dui op \'n fout in die sagteware.
 Die laaste navraag was:
-<blockquote><tt>$1</tt></blockquote>
-vanuit funksie "<tt>$2</tt>".
-Databasis gee foutboodskap "<tt>$3: $4</tt>".',
+<blockquote><code>$1</code></blockquote>
+vanuit funksie "<code>$2</code>".
+Databasis gee foutboodskap "<samp>$3: $4</samp>".',
 'dberrortextcl' => 'Sintaksisfout in databasisnavraag.
 Die laaste navraag was:
 "$1"
@@ -880,7 +880,6 @@ Die laaste inskrywing in die blokkeerlogboek word hieronder vertoon:',
 * '''Firefox / Safari:''' hou ''Shift'' en kliek ''Reload'', of druk ''Ctrl-F5'' of ''Ctrl-R'' (''⌘-R'' op 'n Mac)
 * '''Google Chrome:''' druk ''Ctrl-Shift-R'' (''⌘-Shift-R'' op 'n Mac)
 * '''Internet Explorer:''' hou ''Ctrl'' en kliek ''Refresh'', of druk ''Ctrl-F5''
-* '''Konqueror:''' kliek ''Reload'' of druk ''F5''
 * '''Opera:''' maak die kas skoon by ''Tools → Preferences''",
 'usercssyoucanpreview' => "'''Wenk:''' Gebruik die \"{{int:showpreview}}\"-knoppie om u nuwe CSS te toets voor u dit stoor.",
 'userjsyoucanpreview' => "'''Wenk:''' Gebruik die \"{{int:showpreview}}\"-knoppie om u nuwe JS te toets voor u dit stoor.",
@@ -2976,11 +2975,11 @@ Hierdie situasie was waarskynlik deur 'n skakel na 'n eksterne webtuiste op ons
 
 # Info page
 'pageinfo-title' => 'Inligting oor "$1"',
-'pageinfo-header-edits' => 'Wysigings',
+'pageinfo-header-edits' => 'Wysigingsgeskiedenis',
 'pageinfo-views' => 'Aantal kere gewys',
 'pageinfo-watchers' => 'Aantal dophouers',
-'pageinfo-edits' => 'Aantal wysigings',
-'pageinfo-authors' => 'Aantal verskillende outeurs',
+'pageinfo-edits' => 'Totale aantal wysigings',
+'pageinfo-authors' => 'Totale aantal verskillende outeurs',
 
 # Skin names
 'skinname-standard' => 'Standaard',
diff --git a/languages/messages/MessagesAk.php b/languages/messages/MessagesAk.php
index 0c96ecb939..f59821a080 100644
--- a/languages/messages/MessagesAk.php
+++ b/languages/messages/MessagesAk.php
@@ -12,6 +12,25 @@
  * @author Paa.kwesi
  */
 
+$namespaceNames = array(
+	NS_MEDIA            => 'Medya',
+	NS_SPECIAL          => 'Spesial',
+	NS_TALK             => 'Nkɔmbɔ',
+	NS_USER             => 'User',
+	NS_USER_TALK        => 'User_nkɔmbɔ',
+	NS_PROJECT_TALK     => '$1_nkɔmbɔ',
+	NS_FILE             => 'Fayl',
+	NS_FILE_TALK        => 'Fayl_nkɔmbɔ',
+	NS_MEDIAWIKI        => 'MediaWiki',
+	NS_MEDIAWIKI_TALK   => 'MediaWiki_nkɔmbɔ',
+	NS_TEMPLATE         => 'Şablon',
+	NS_TEMPLATE_TALK    => 'Şablon_nkɔmbɔ',
+	NS_HELP             => 'Help',
+	NS_HELP_TALK        => 'Help_nkɔmbɔ',
+	NS_CATEGORY         => 'Kategori',
+	NS_CATEGORY_TALK    => 'Kategori_nkɔmbɔ',
+);
+
 $messages = array(
 # User preference toggles
 'tog-underline'             => 'Twa lenk nyina ase:',
diff --git a/languages/messages/MessagesAln.php b/languages/messages/MessagesAln.php
index 688a1799a9..9a1f89d088 100644
--- a/languages/messages/MessagesAln.php
+++ b/languages/messages/MessagesAln.php
@@ -54,16 +54,16 @@ $specialPageAliases = array(
 );
 
 $magicWords = array(
-	'currentmonth'            => array( '1', 'MUEJIAKTUAL', 'MUEJIAKTUAL2', 'MUAJIMOMENTAL', 'MUAJIMOMENTAL2', 'CURRENTMONTH', 'CURRENTMONTH2' ),
-	'currentmonth1'           => array( '1', 'MUEJIAKTUAL1', 'MUAJIMOMENTAL1', 'CURRENTMONTH1' ),
-	'currentmonthname'        => array( '1', 'EMNIMUEJITAKTUAL', 'EMRIIMUAJITMOMENTAL', 'CURRENTMONTHNAME' ),
-	'currenttime'             => array( '1', 'KOHATASH', 'KOHATANI', 'CURRENTTIME' ),
-	'currenthour'             => array( '1', 'ORATASH', 'ORATANI', 'CURRENTHOUR' ),
-	'localmonth'              => array( '1', 'MUEJILOKAL', 'MUAJILOKAL', 'LOCALMONTH', 'LOCALMONTH2' ),
-	'img_center'              => array( '1', 'qendër', 'qendrore', 'qëndër', 'qëndrore', 'center', 'centre' ),
-	'img_baseline'            => array( '1', 'vijabazë', 'linjabazë', 'baseline' ),
-	'servername'              => array( '0', 'EMNISERVERIT', 'EMRIISERVERIT', 'SERVERNAME' ),
-	'currentweek'             => array( '1', 'JAVAAKTUALE', 'JAVAMOMENTALE', 'CURRENTWEEK' ),
+	'currentmonth'              => array( '1', 'MUEJIAKTUAL', 'MUEJIAKTUAL2', 'MUAJIMOMENTAL', 'MUAJIMOMENTAL2', 'CURRENTMONTH', 'CURRENTMONTH2' ),
+	'currentmonth1'             => array( '1', 'MUEJIAKTUAL1', 'MUAJIMOMENTAL1', 'CURRENTMONTH1' ),
+	'currentmonthname'          => array( '1', 'EMNIMUEJITAKTUAL', 'EMRIIMUAJITMOMENTAL', 'CURRENTMONTHNAME' ),
+	'currenttime'               => array( '1', 'KOHATASH', 'KOHATANI', 'CURRENTTIME' ),
+	'currenthour'               => array( '1', 'ORATASH', 'ORATANI', 'CURRENTHOUR' ),
+	'localmonth'                => array( '1', 'MUEJILOKAL', 'MUAJILOKAL', 'LOCALMONTH', 'LOCALMONTH2' ),
+	'img_center'                => array( '1', 'qendër', 'qendrore', 'qëndër', 'qëndrore', 'center', 'centre' ),
+	'img_baseline'              => array( '1', 'vijabazë', 'linjabazë', 'baseline' ),
+	'servername'                => array( '0', 'EMNISERVERIT', 'EMRIISERVERIT', 'SERVERNAME' ),
+	'currentweek'               => array( '1', 'JAVAAKTUALE', 'JAVAMOMENTALE', 'CURRENTWEEK' ),
 );
 
 $messages = array(
diff --git a/languages/messages/MessagesAn.php b/languages/messages/MessagesAn.php
index ad39818856..293616ccb6 100644
--- a/languages/messages/MessagesAn.php
+++ b/languages/messages/MessagesAn.php
@@ -47,16 +47,16 @@ $namespaceAliases = array(
 $namespaceGenderAliases = array();
 
 $magicWords = array(
-	'redirect'                => array( '0', '#ENDRECERA', '#REENDRECERA', '#REDIRECCIÓN', '#REDIRECCION', '#REDIRECT' ),
-	'namespace'               => array( '1', 'ESPACIODENOMBRES', 'ESPACIODENOMBRE', 'NAMESPACE' ),
-	'namespacee'              => array( '1', 'ESPACIODENOMBRESE', 'ESPACIODENOMBREC', 'NAMESPACEE' ),
-	'img_right'               => array( '1', 'dreita', 'derecha', 'dcha', 'der', 'right' ),
-	'img_left'                => array( '1', 'cucha', 'zurda', 'izquierda', 'izda', 'izq', 'left' ),
-	'ns'                      => array( '0', 'EN:', 'EDN:', 'NS:' ),
-	'displaytitle'            => array( '1', 'TÍTOL', 'MOSTRARTÍTULO', 'MOSTRARTITULO', 'DISPLAYTITLE' ),
-	'currentversion'          => array( '1', 'BERSIÓNAUTUAL', 'BERSIONAUTUAL', 'REVISIÓNACTUAL', 'VERSIONACTUAL', 'VERSIÓNACTUAL', 'CURRENTVERSION' ),
-	'language'                => array( '0', '#LUENGA:', '#IDIOMA:', '#LANGUAGE:' ),
-	'special'                 => array( '0', 'especial', 'espezial', 'special' ),
+	'redirect'                  => array( '0', '#ENDRECERA', '#REENDRECERA', '#REDIRECCIÓN', '#REDIRECCION', '#REDIRECT' ),
+	'namespace'                 => array( '1', 'ESPACIODENOMBRES', 'ESPACIODENOMBRE', 'NAMESPACE' ),
+	'namespacee'                => array( '1', 'ESPACIODENOMBRESE', 'ESPACIODENOMBREC', 'NAMESPACEE' ),
+	'img_right'                 => array( '1', 'dreita', 'derecha', 'dcha', 'der', 'right' ),
+	'img_left'                  => array( '1', 'cucha', 'zurda', 'izquierda', 'izda', 'izq', 'left' ),
+	'ns'                        => array( '0', 'EN:', 'EDN:', 'NS:' ),
+	'displaytitle'              => array( '1', 'TÍTOL', 'MOSTRARTÍTULO', 'MOSTRARTITULO', 'DISPLAYTITLE' ),
+	'currentversion'            => array( '1', 'BERSIÓNAUTUAL', 'BERSIONAUTUAL', 'REVISIÓNACTUAL', 'VERSIONACTUAL', 'VERSIÓNACTUAL', 'CURRENTVERSION' ),
+	'language'                  => array( '0', '#LUENGA:', '#IDIOMA:', '#LANGUAGE:' ),
+	'special'                   => array( '0', 'especial', 'espezial', 'special' ),
 );
 
 $specialPageAliases = array(
diff --git a/languages/messages/MessagesAr.php b/languages/messages/MessagesAr.php
index f18996b486..b85ee8c292 100644
--- a/languages/messages/MessagesAr.php
+++ b/languages/messages/MessagesAr.php
@@ -187,158 +187,166 @@ $namespaceGenderAliases = 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__' ),
-	'noheader'                => array( '0', '__لاعنوان__', '__NOHEADER__' ),
-	'currentmonth'            => array( '1', 'شهر_حالي', 'شهر_حالي2', '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' ),
-	'localmonth'              => array( '1', 'شهر_محلي', 'شهر_محلي2', 'LOCALMONTH', 'LOCALMONTH2' ),
-	'localmonth1'             => array( '1', 'شهر_محلي1', 'LOCALMONTH1' ),
-	'localmonthname'          => array( '1', 'اسم_الشهر_المحلي', 'LOCALMONTHNAME' ),
-	'localmonthnamegen'       => array( '1', 'اسم_الشهر_المحلي_المولد', 'LOCALMONTHNAMEGEN' ),
-	'localmonthabbrev'        => array( '1', 'اختصار_الشهر_المحلي', 'LOCALMONTHABBREV' ),
-	'localday'                => array( '1', 'يوم_محلي', 'LOCALDAY' ),
-	'localday2'               => array( '1', 'يوم_محلي2', 'LOCALDAY2' ),
-	'localdayname'            => array( '1', 'اسم_اليوم_المحلي', 'LOCALDAYNAME' ),
-	'localyear'               => array( '1', 'عام_محلي', 'LOCALYEAR' ),
-	'localtime'               => array( '1', 'وقت_محلي', 'LOCALTIME' ),
-	'localhour'               => array( '1', 'ساعة_محلية', 'LOCALHOUR' ),
-	'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' ),
-	'talkspace'               => array( '1', 'نطاق_النقاش', 'TALKSPACE' ),
-	'talkspacee'              => array( '1', 'عنوان_النقاش', 'TALKSPACEE' ),
-	'subjectspace'            => array( '1', 'نطاق_الموضوع', 'نطاق_المقالة', 'SUBJECTSPACE', 'ARTICLESPACE' ),
-	'subjectspacee'           => array( '1', 'عنوان_نطاق_الموضوع', 'عنوان_نطاق_المقالة', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
-	'fullpagename'            => array( '1', 'اسم_الصفحة_الكامل', 'اسم_صفحة_كامل', 'اسم_كامل', 'FULLPAGENAME' ),
-	'fullpagenamee'           => array( '1', 'عنوان_الصفحة_الكامل', 'عنوان_صفحة_كامل', 'عنوان_كامل', 'FULLPAGENAMEE' ),
-	'subpagename'             => array( '1', 'اسم_الصفحة_الفرعي', 'SUBPAGENAME' ),
-	'subpagenamee'            => array( '1', 'عنوان_الصفحة_الفرعي', 'SUBPAGENAMEE' ),
-	'basepagename'            => array( '1', 'اسم_الصفحة_الأساسي', 'BASEPAGENAME' ),
-	'basepagenamee'           => array( '1', 'عنوان_الصفحة_الأساسي', 'BASEPAGENAMEE' ),
-	'talkpagename'            => array( '1', 'اسم_صفحة_النقاش', 'TALKPAGENAME' ),
-	'talkpagenamee'           => array( '1', 'عنوان_صفحة_النقاش', 'TALKPAGENAMEE' ),
-	'subjectpagename'         => array( '1', 'اسم_صفحة_الموضوع', 'اسم_صفحة_المقالة', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
-	'subjectpagenamee'        => array( '1', 'عنوان_صفحة_الموضوع', 'عنوان_صفحة_المقالة', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
-	'msg'                     => array( '0', 'رسالة:', 'MSG:' ),
-	'subst'                   => array( '0', 'نسخ:', 'SUBST:' ),
-	'safesubst'               => array( '0', 'نسخ_آمن:', 'SAFESUBST:' ),
-	'msgnw'                   => array( '0', 'رسالة_بدون_تهيئة:', 'MSGNW:' ),
-	'img_thumbnail'           => array( '1', 'تصغير', 'thumbnail', 'thumb' ),
-	'img_manualthumb'         => array( '1', 'تصغير=$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_page'                => array( '1', 'صفحة=$1', 'صفحة_$1', 'page=$1', 'page $1' ),
-	'img_upright'             => array( '1', 'معدول', 'معدول=$1', 'معدول_$1', 'upright', 'upright=$1', 'upright $1' ),
-	'img_border'              => array( '1', 'حدود', 'border' ),
-	'img_baseline'            => array( '1', 'خط_أساسي', 'baseline' ),
-	'img_sub'                 => array( '1', 'فرعي', 'sub' ),
-	'img_super'               => array( '1', 'سوبر', 'سب', 'super', 'sup' ),
-	'img_top'                 => array( '1', 'أعلى', 'top' ),
-	'img_text_top'            => array( '1', 'نص_أعلى', 'text-top' ),
-	'img_middle'              => array( '1', 'وسط', 'middle' ),
-	'img_bottom'              => array( '1', 'أسفل', 'bottom' ),
-	'img_text_bottom'         => array( '1', 'نص_أسفل', 'text-bottom' ),
-	'img_link'                => array( '1', 'وصلة=$1', 'رابط=$1', 'link=$1' ),
-	'img_alt'                 => array( '1', 'بديل=$1', 'alt=$1' ),
-	'int'                     => array( '0', 'محتوى:', 'INT:' ),
-	'sitename'                => array( '1', 'اسم_الموقع', 'SITENAME' ),
-	'ns'                      => array( '0', 'نط:', 'NS:' ),
-	'nse'                     => array( '0', 'نطم:', 'NSE:' ),
-	'localurl'                => array( '0', 'مسار_محلي:', 'LOCALURL:' ),
-	'localurle'               => array( '0', 'عنوان_المسار_المحلي:', 'LOCALURLE:' ),
-	'articlepath'             => array( '0', 'مسار_المقالة', 'ARTICLEPATH' ),
-	'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__' ),
-	'currentweek'             => array( '1', 'أسبوع_حالي', 'CURRENTWEEK' ),
-	'currentdow'              => array( '1', 'يوم_حالي_مأ', 'CURRENTDOW' ),
-	'localweek'               => array( '1', 'أسبوع_محلي', 'LOCALWEEK' ),
-	'localdow'                => array( '1', 'يوم_محلي_مأ', 'LOCALDOW' ),
-	'revisionid'              => array( '1', 'رقم_المراجعة', 'REVISIONID' ),
-	'revisionday'             => array( '1', 'يوم_المراجعة', 'REVISIONDAY' ),
-	'revisionday2'            => array( '1', 'يوم_المراجعة2', 'REVISIONDAY2' ),
-	'revisionmonth'           => array( '1', 'شهر_المراجعة', 'REVISIONMONTH' ),
-	'revisionmonth1'          => array( '1', 'شهر_المراجعة1', 'REVISIONMONTH1' ),
-	'revisionyear'            => array( '1', 'عام_المراجعة', 'REVISIONYEAR' ),
-	'revisiontimestamp'       => array( '1', 'طابع_وقت_المراجعة', 'REVISIONTIMESTAMP' ),
-	'revisionuser'            => array( '1', 'مستخدم_المراجعة', 'REVISIONUSER' ),
-	'plural'                  => array( '0', 'جمع:', 'PLURAL:' ),
-	'fullurl'                 => array( '0', 'عنوان_كامل:', 'FULLURL:' ),
-	'fullurle'                => array( '0', 'مسار_كامل:', 'FULLURLE:' ),
-	'canonicalurl'            => array( '0', 'عنوان_قاعدة:', 'CANONICALURL:' ),
-	'canonicalurle'           => array( '0', 'مسار_قاعدة:', 'CANONICALURLE:' ),
-	'lcfirst'                 => array( '0', 'عنوان_كبير:', 'LCFIRST:' ),
-	'ucfirst'                 => array( '0', 'عنوان_صغير:', 'UCFIRST:' ),
-	'lc'                      => array( '0', 'صغير:', 'LC:' ),
-	'uc'                      => array( '0', 'كبير:', 'UC:' ),
-	'raw'                     => array( '0', 'خام:', 'RAW:' ),
-	'displaytitle'            => array( '1', 'عرض_العنوان', 'DISPLAYTITLE' ),
-	'rawsuffix'               => array( '1', 'أر', 'آر', 'R' ),
-	'newsectionlink'          => array( '1', '__وصلة_قسم_جديد__', '__NEWSECTIONLINK__' ),
-	'nonewsectionlink'        => array( '1', 'لا_وصلة_قسم_جديد__', '__NONEWSECTIONLINK__' ),
-	'currentversion'          => array( '1', 'نسخة_حالية', 'CURRENTVERSION' ),
-	'urlencode'               => array( '0', 'كود_المسار:', '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' ),
-	'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' ),
-	'url_path'                => array( '0', 'مسار', 'PATH' ),
-	'url_wiki'                => array( '0', 'ويكي', 'WIKI' ),
-	'url_query'               => array( '0', 'استعلام', 'QUERY' ),
-	'defaultsort_noerror'     => array( '0', 'لاخطأ', 'noerror' ),
-	'defaultsort_noreplace'   => array( '0', 'لاتستبدل', 'noreplace' ),
+	'redirect'                  => array( '0', '#تحويل', '#REDIRECT' ),
+	'notoc'                     => array( '0', '__لافهرس__', '__NOTOC__' ),
+	'nogallery'                 => array( '0', '__لامعرض__', '__NOGALLERY__' ),
+	'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' ),
+	'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' ),
+	'localmonth'                => array( '1', 'شهر_محلي', 'شهر_محلي2', 'LOCALMONTH', 'LOCALMONTH2' ),
+	'localmonth1'               => array( '1', 'شهر_محلي1', 'LOCALMONTH1' ),
+	'localmonthname'            => array( '1', 'اسم_الشهر_المحلي', 'LOCALMONTHNAME' ),
+	'localmonthnamegen'         => array( '1', 'اسم_الشهر_المحلي_المولد', 'LOCALMONTHNAMEGEN' ),
+	'localmonthabbrev'          => array( '1', 'اختصار_الشهر_المحلي', 'LOCALMONTHABBREV' ),
+	'localday'                  => array( '1', 'يوم_محلي', 'LOCALDAY' ),
+	'localday2'                 => array( '1', 'يوم_محلي2', 'LOCALDAY2' ),
+	'localdayname'              => array( '1', 'اسم_اليوم_المحلي', 'LOCALDAYNAME' ),
+	'localyear'                 => array( '1', 'عام_محلي', 'LOCALYEAR' ),
+	'localtime'                 => array( '1', 'وقت_محلي', 'LOCALTIME' ),
+	'localhour'                 => array( '1', 'ساعة_محلية', 'LOCALHOUR' ),
+	'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' ),
+	'namespacenumber'           => array( '1', 'عدد_نطاق', 'NAMESPACENUMBER' ),
+	'talkspace'                 => array( '1', 'نطاق_النقاش', 'TALKSPACE' ),
+	'talkspacee'                => array( '1', 'عنوان_النقاش', 'TALKSPACEE' ),
+	'subjectspace'              => array( '1', 'نطاق_الموضوع', 'نطاق_المقالة', 'SUBJECTSPACE', 'ARTICLESPACE' ),
+	'subjectspacee'             => array( '1', 'عنوان_نطاق_الموضوع', 'عنوان_نطاق_المقالة', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
+	'fullpagename'              => array( '1', 'اسم_الصفحة_الكامل', 'اسم_صفحة_كامل', 'اسم_كامل', 'FULLPAGENAME' ),
+	'fullpagenamee'             => array( '1', 'عنوان_الصفحة_الكامل', 'عنوان_صفحة_كامل', 'FULLPAGENAMEE' ),
+	'subpagename'               => array( '1', 'اسم_الصفحة_الفرعي', 'SUBPAGENAME' ),
+	'subpagenamee'              => array( '1', 'عنوان_الصفحة_الفرعي', 'SUBPAGENAMEE' ),
+	'basepagename'              => array( '1', 'اسم_الصفحة_الأساسي', 'BASEPAGENAME' ),
+	'basepagenamee'             => array( '1', 'عنوان_الصفحة_الأساسي', 'BASEPAGENAMEE' ),
+	'talkpagename'              => array( '1', 'اسم_صفحة_النقاش', 'TALKPAGENAME' ),
+	'talkpagenamee'             => array( '1', 'عنوان_صفحة_النقاش', 'TALKPAGENAMEE' ),
+	'subjectpagename'           => array( '1', 'اسم_صفحة_الموضوع', 'اسم_صفحة_المقالة', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
+	'subjectpagenamee'          => array( '1', 'عنوان_صفحة_الموضوع', 'عنوان_صفحة_المقالة', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
+	'msg'                       => array( '0', 'رسالة:', 'MSG:' ),
+	'subst'                     => array( '0', 'نسخ:', 'SUBST:' ),
+	'safesubst'                 => array( '0', 'نسخ_آمن:', 'SAFESUBST:' ),
+	'msgnw'                     => array( '0', 'رسالة_بدون_تهيئة:', 'MSGNW:' ),
+	'img_thumbnail'             => array( '1', 'تصغير', 'thumbnail', 'thumb' ),
+	'img_manualthumb'           => array( '1', 'تصغير=$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_page'                  => array( '1', 'صفحة=$1', 'صفحة_$1', 'page=$1', 'page $1' ),
+	'img_upright'               => array( '1', 'معدول', 'معدول=$1', 'معدول_$1', 'upright', 'upright=$1', 'upright $1' ),
+	'img_border'                => array( '1', 'حدود', 'border' ),
+	'img_baseline'              => array( '1', 'خط_أساسي', 'baseline' ),
+	'img_sub'                   => array( '1', 'فرعي', 'sub' ),
+	'img_super'                 => array( '1', 'سوبر', 'سب', 'super', 'sup' ),
+	'img_top'                   => array( '1', 'أعلى', 'top' ),
+	'img_text_top'              => array( '1', 'نص_أعلى', 'text-top' ),
+	'img_middle'                => array( '1', 'وسط', 'middle' ),
+	'img_bottom'                => array( '1', 'أسفل', 'bottom' ),
+	'img_text_bottom'           => array( '1', 'نص_أسفل', 'text-bottom' ),
+	'img_link'                  => array( '1', 'وصلة=$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', 'نطم:', 'NSE:' ),
+	'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' ),
+	'stylepath'                 => array( '0', 'مسار_الهيئة', 'STYLEPATH' ),
+	'grammar'                   => array( '0', 'قواعد_اللغة:', 'GRAMMAR:' ),
+	'gender'                    => array( '0', 'نوع:', 'GENDER:' ),
+	'notitleconvert'            => array( '0', '__لاتحويل_عنوان__', '__لاتع__', '__NOTITLECONVERT__', '__NOTC__' ),
+	'nocontentconvert'          => array( '0', '__لاتحويل_محتوى__', '__لاتم__', '__NOCONTENTCONVERT__', '__NOCC__' ),
+	'currentweek'               => array( '1', 'أسبوع_حالي', 'CURRENTWEEK' ),
+	'currentdow'                => array( '1', 'يوم_حالي_مأ', 'CURRENTDOW' ),
+	'localweek'                 => array( '1', 'أسبوع_محلي', 'LOCALWEEK' ),
+	'localdow'                  => array( '1', 'يوم_محلي_مأ', 'LOCALDOW' ),
+	'revisionid'                => array( '1', 'رقم_المراجعة', 'REVISIONID' ),
+	'revisionday'               => array( '1', 'يوم_المراجعة', 'REVISIONDAY' ),
+	'revisionday2'              => array( '1', 'يوم_المراجعة2', 'REVISIONDAY2' ),
+	'revisionmonth'             => array( '1', 'شهر_المراجعة', 'REVISIONMONTH' ),
+	'revisionmonth1'            => array( '1', 'شهر_المراجعة1', 'REVISIONMONTH1' ),
+	'revisionyear'              => array( '1', 'عام_المراجعة', 'REVISIONYEAR' ),
+	'revisiontimestamp'         => array( '1', 'طابع_وقت_المراجعة', 'REVISIONTIMESTAMP' ),
+	'revisionuser'              => array( '1', 'مستخدم_المراجعة', 'REVISIONUSER' ),
+	'plural'                    => array( '0', 'جمع:', 'PLURAL:' ),
+	'fullurl'                   => array( '0', 'عنوان_كامل:', 'FULLURL:' ),
+	'fullurle'                  => array( '0', 'مسار_كامل:', 'FULLURLE:' ),
+	'canonicalurl'              => array( '0', 'عنوان_قاعدة:', 'CANONICALURL:' ),
+	'canonicalurle'             => array( '0', 'مسار_قاعدة:', 'CANONICALURLE:' ),
+	'lcfirst'                   => array( '0', 'عنوان_كبير:', 'LCFIRST:' ),
+	'ucfirst'                   => array( '0', 'عنوان_صغير:', 'UCFIRST:' ),
+	'lc'                        => array( '0', 'صغير:', 'LC:' ),
+	'uc'                        => array( '0', 'كبير:', 'UC:' ),
+	'raw'                       => array( '0', 'خام:', 'RAW:' ),
+	'displaytitle'              => array( '1', 'عرض_العنوان', 'DISPLAYTITLE' ),
+	'rawsuffix'                 => array( '1', 'أر', 'آر', 'R' ),
+	'newsectionlink'            => array( '1', '__وصلة_قسم_جديد__', '__NEWSECTIONLINK__' ),
+	'nonewsectionlink'          => array( '1', 'لا_وصلة_قسم_جديد__', '__NONEWSECTIONLINK__' ),
+	'currentversion'            => array( '1', 'نسخة_حالية', 'CURRENTVERSION' ),
+	'urlencode'                 => array( '0', 'كود_المسار:', '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', 'عنوان_خاص', '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' ),
+	'url_path'                  => array( '0', 'مسار', 'PATH' ),
+	'url_wiki'                  => array( '0', 'ويكي', 'WIKI' ),
+	'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' ),
 );
 
 $specialPageAliases = array(
@@ -388,6 +396,7 @@ $specialPageAliases = array(
 	'MIMEsearch'                => array( 'بحث_ميم' ),
 	'Mostcategories'            => array( 'الأكثر_تصنيفا' ),
 	'Mostimages'                => array( 'أكثر_الملفات_وصلا', 'أكثر_الملفات', 'أكثر_الصور' ),
+	'Mostinterwikis'            => array( 'الأكثر_إنترويكي' ),
 	'Mostlinked'                => array( 'أكثر_الصفحات_وصلا', 'الأكثر_وصلا' ),
 	'Mostlinkedcategories'      => array( 'أكثر_التصنيفات_وصلا', 'أكثر_التصنيفات_استخداما' ),
 	'Mostlinkedtemplates'       => array( 'أكثر_القوالب_وصلا', 'أكثر_القوالب_استخداما' ),
@@ -916,7 +925,7 @@ $2',
 تأكد من أن ملفات تعريف الارتباط (الكوكيز) مفعلة عندك، ثم أعد تحميل الصفحة وحاول مرة أخرى.',
 'noname' => 'لم تحدد اسم مستخدم صحيح.',
 'loginsuccesstitle' => 'تم الدخول بشكل صحيح',
-'loginsuccess' => "'''لقد قمت بتسجيل الدخول ل{{SITENAME}} باسم \"\$1\".'''",
+'loginsuccess' => "'''لقد سجلت الدخول ل{{SITENAME}} باسم \"\$1\".'''",
 'nosuchuser' => 'لا يوجد مستخدم بالاسم "$1".
 أسماء المستخدمين حساسة لحالة الحروف.
 تأكد من إملاء الاسم، أو [[Special:UserLogin/signup|قم بإنشاء حساب جديد]].',
@@ -1760,7 +1769,7 @@ $1",
 'right-noratelimit' => 'غير متأثر بحدود المعدل',
 'right-import' => 'استيراد الصفحات من ويكيات أخرى',
 'right-importupload' => 'استيراد الصفحات من ملف مرفوع',
-'right-patrol' => 'التعليم على تعديلات الآخرين كمراجعة',
+'right-patrol' => 'تعليم تعديلات الآخرين بعلامة المراجعة',
 'right-autopatrol' => 'علم تعديلات المستخدم مراجعة تلقائيا',
 'right-patrolmarks' => 'رؤية علامات المراجعة في أحدث التغييرات',
 'right-unwatchedpages' => 'رؤية قائمة بالصفحات غير المراقبة',
@@ -1807,7 +1816,7 @@ $1",
 'action-rollback' => 'استرجاع تعديلات آخر مستخدم عدل صفحة معينة سريعا',
 'action-import' => 'استيراد هذه الصفحة من ويكي آخر',
 'action-importupload' => 'استيراد هذه الصفحة من ملف مرفوع',
-'action-patrol' => 'التعليم على تعديلات الآخرين كمراجعة',
+'action-patrol' => 'تعليم تعديلات الآخرين بعلامة المراجعة',
 'action-autopatrol' => 'جعل تعديلك معلم عليه كمراجع',
 'action-unwatchedpages' => 'رؤية قائمة الصفحات غير المراقبة',
 'action-mergehistory' => 'دمج تاريخ هذه الصفحة',
@@ -2315,6 +2324,7 @@ $1',
 'mostlinkedtemplates' => 'أكثر القوالب وصلا',
 'mostcategories' => 'أكثر الصفحات تصنيفا',
 'mostimages' => 'أكثر الملفات ارتباطا',
+'mostinterwikis' => 'الصفحات التي تحتوي على أغلب وصلات الإنترويكي',
 'mostrevisions' => 'أكثر الصفحات تعديلا',
 'prefixindex' => 'كل الصفحات بالبادئة',
 'prefixindex-namespace' => 'كل الصفحات مع بادئة ($1 مساحة الأسم)',
@@ -2462,6 +2472,8 @@ $1',
 'mailnologin' => 'لا يوجد عنوان للإرسال',
 'mailnologintext' => 'يجب أن تقوم [[Special:UserLogin|بتسجيل الدخول]] وإدخال بريد إلكتروني صالح في صفحة [[Special:Preferences|التفضيلات]] لتتمكن من إرسال الرسائل لمستخدمين آخرين.',
 'emailuser' => 'إرسال رسالة لهذا المستخدم',
+'emailuser-title-target' => 'راسل بالبريد الإلكتروني هذا  {{GENDER:$1| المستخدم}}',
+'emailuser-title-notarget' => 'مراسلة المستخدم',
 'emailpage' => 'إرسال رسالة للمستخدم',
 'emailpagetext' => 'يمكنك استخدام الاستمارة بالأسفل لإرسال رسالة بريد إلكتروني إلى هذا المستخدم.
 سيظهر عنوان البريد الإلكتروني الذي أدخلته في [[Special:Preferences|تفضيلاتك]] كعنوان المرسل في البريد الإلكتروني، كي يستطيع المتلقي الرد عليك مباشرة.',
@@ -3304,11 +3316,34 @@ $1',
 
 # 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' => 'معرف الصفحة (ID)',
+'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-restriction' => 'حماية الصفحة (<code>$1</code>)',
+'pageinfo-magic-words' => 'السحرية {{PLURAL:$1|الكلمة|الكلمات}} ($1)',
+'pageinfo-hidden-categories' => 'مخفية {{PLURAL:$1|فئة|فئات}} ($1)',
+'pageinfo-templates' => 'متضمنة {{PLURAL:$1|قالب|قوالب}} ($1)',
 
 # Skin names
 'skinname-standard' => 'كلاسيك',
@@ -3322,15 +3357,15 @@ $1',
 'skinname-vector' => 'فكتور',
 
 # Patrolling
-'markaspatrolleddiff' => 'علم كمراجعة',
-'markaspatrolledtext' => 'علم على هذه الصفحة كمراجعة',
-'markedaspatrolled' => 'تم التعليم كمراجعة',
-'markedaspatrolledtext' => 'المراجعة المختارة من [[:$1]] تم التعليم عليها كمراجعة.',
+'markaspatrolleddiff' => 'علم بعلامة المراجعة',
+'markaspatrolledtext' => 'علم هذه الصفحة بعلامة المراجعة',
+'markedaspatrolled' => 'علمت بعلامة المراجعة',
+'markedaspatrolledtext' => 'المراجعة المختارة من [[:$1]] علمت بعلامة المراجعة.',
 'rcpatroldisabled' => 'مراجعة أحدث التغييرات معطلة',
 'rcpatroldisabledtext' => 'خاصية مراجعة أحدث التغييرات معطلة حاليا',
 'markedaspatrollederror' => 'لا يمكن التعليم بالمراجعة',
 'markedaspatrollederrortext' => 'يجب عليك اختيار المراجعة التي تريد أن تشير أنها مراجعة',
-'markedaspatrollederror-noautopatrol' => 'من غير المسموح لك التعليم على تغييراتك الشخصية كمراجعة.',
+'markedaspatrollederror-noautopatrol' => 'لا يجوز لك تعليم تغييراتك الشخصية بعلامة المراجعة.',
 
 # Patrol log
 'patrol-log-page' => 'سجل الخفر',
@@ -3362,6 +3397,7 @@ $1',
 'file-info-size-pages' => '$1 × $2 بكسل, حجم الملف  : $3 ، نوع الملف : $4 ، $5 {{PLURAL:$5| صفحة | صفحات}}',
 '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.',
@@ -3371,6 +3407,8 @@ $1',
 'file-info-png-looped' => 'ملفوف',
 'file-info-png-repeat' => 'عرضت {{PLURAL:$1||مرة واحدة|مرتين|$1 مرات|$1 مرة}}',
 'file-info-png-frames' => '{{PLURAL:$1||إطار واحد|إطاران|$1 إطارات|$1 إطارًا|$1 إطار}}',
+'file-no-thumb-animation' => "'' 'ملاحظة: نظراً للقيود التقنية، فإن الصورة المصغرة لهذا الملف ستكون غير متحركة. '''",
+'file-no-thumb-animation-gif' => "'' 'ملاحظة: نظراً للقيود التقنية، فإن الصورة المصغرة لهذا الملف GIF عالي الدقة ستكون غير متحركة. '''",
 
 # Special:NewFiles
 'newimages' => 'معرض الملفات الجديدة',
diff --git a/languages/messages/MessagesArc.php b/languages/messages/MessagesArc.php
index d020c8e459..e11d9024d1 100644
--- a/languages/messages/MessagesArc.php
+++ b/languages/messages/MessagesArc.php
@@ -78,30 +78,30 @@ $specialPageAliases = array(
 );
 
 $magicWords = array(
-	'redirect'                => array( '0', '#ܨܘܝܒܐ', '#REDIRECT' ),
-	'numberofpages'           => array( '1', 'ܡܢܝܢܐ_ܕܦܐܬܬ̈ܐ', 'NUMBEROFPAGES' ),
-	'numberofarticles'        => array( '1', 'ܡܢܝܢܐ_ܕܡܠܘܐ̈ܐ', 'NUMBEROFARTICLES' ),
-	'numberoffiles'           => array( '1', 'ܡܢܝܢܐ_ܕܠܦܦ̈ܐ', 'NUMBEROFFILES' ),
-	'pagename'                => array( '1', 'ܫܡܐ_ܕܦܐܬܐ', 'PAGENAME' ),
-	'pagenamee'               => array( '1', 'ܟܘܢܝܐ_ܕܦܐܬܐ', 'PAGENAMEE' ),
-	'namespace'               => array( '1', 'ܚܩܠܐ', 'NAMESPACE' ),
-	'msg'                     => array( '0', 'ܐܓܪܬܐ:', 'MSG:' ),
-	'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_center'              => array( '1', 'ܡܨܥܐ', 'center', 'centre' ),
-	'img_page'                => array( '1', 'ܦܐܬܐ=$1', 'ܦܐܬܐ $1', 'page=$1', 'page $1' ),
-	'img_border'              => array( '1', 'ܬܚܘܡܐ', 'border' ),
-	'img_baseline'            => array( '1', 'ܣܪܛܐ_ܫܪܫܝܐ', 'baseline' ),
-	'img_sub'                 => array( '1', 'ܦܪܥܝܐ', 'sub' ),
-	'grammar'                 => array( '0', 'ܬܘܪܨ_ܡܡܠܠܐ:', 'GRAMMAR:' ),
-	'gender'                  => array( '0', 'ܓܢܣܐ:', 'GENDER:' ),
-	'language'                => array( '0', '#ܠܫܢܐ:', '#LANGUAGE:' ),
-	'special'                 => array( '0', 'ܕܝܠܢܝܐ', 'special' ),
-	'url_path'                => array( '0', 'ܫܒܝܠܐ', 'PATH' ),
-	'url_wiki'                => array( '0', 'ܘܝܩܝ', 'WIKI' ),
+	'redirect'                  => array( '0', '#ܨܘܝܒܐ', '#REDIRECT' ),
+	'numberofpages'             => array( '1', 'ܡܢܝܢܐ_ܕܦܐܬܬ̈ܐ', 'NUMBEROFPAGES' ),
+	'numberofarticles'          => array( '1', 'ܡܢܝܢܐ_ܕܡܠܘܐ̈ܐ', 'NUMBEROFARTICLES' ),
+	'numberoffiles'             => array( '1', 'ܡܢܝܢܐ_ܕܠܦܦ̈ܐ', 'NUMBEROFFILES' ),
+	'pagename'                  => array( '1', 'ܫܡܐ_ܕܦܐܬܐ', 'PAGENAME' ),
+	'pagenamee'                 => array( '1', 'ܟܘܢܝܐ_ܕܦܐܬܐ', 'PAGENAMEE' ),
+	'namespace'                 => array( '1', 'ܚܩܠܐ', 'NAMESPACE' ),
+	'msg'                       => array( '0', 'ܐܓܪܬܐ:', 'MSG:' ),
+	'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_center'                => array( '1', 'ܡܨܥܐ', 'center', 'centre' ),
+	'img_page'                  => array( '1', 'ܦܐܬܐ=$1', 'ܦܐܬܐ $1', 'page=$1', 'page $1' ),
+	'img_border'                => array( '1', 'ܬܚܘܡܐ', 'border' ),
+	'img_baseline'              => array( '1', 'ܣܪܛܐ_ܫܪܫܝܐ', 'baseline' ),
+	'img_sub'                   => array( '1', 'ܦܪܥܝܐ', 'sub' ),
+	'grammar'                   => array( '0', 'ܬܘܪܨ_ܡܡܠܠܐ:', 'GRAMMAR:' ),
+	'gender'                    => array( '0', 'ܓܢܣܐ:', 'GENDER:' ),
+	'language'                  => array( '0', '#ܠܫܢܐ:', '#LANGUAGE:' ),
+	'special'                   => array( '0', 'ܕܝܠܢܝܐ', 'special' ),
+	'url_path'                  => array( '0', 'ܫܒܝܠܐ', 'PATH' ),
+	'url_wiki'                  => array( '0', 'ܘܝܩܝ', 'WIKI' ),
 );
 
 $messages = array(
diff --git a/languages/messages/MessagesArz.php b/languages/messages/MessagesArz.php
index 8fe762b639..ec11637881 100644
--- a/languages/messages/MessagesArz.php
+++ b/languages/messages/MessagesArz.php
@@ -59,153 +59,153 @@ $namespaceAliases = 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__' ),
-	'noheader'                => array( '0', '__لاعنوان__', '__NOHEADER__' ),
-	'currentmonth'            => array( '1', 'شهر_حالى', 'شهر_حالي2', 'شهر_حالي', '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', 'يوم_حالي2', 'CURRENTDAY2' ),
-	'currentdayname'          => array( '1', 'اسم_اليوم_الحالى', 'اسم_اليوم_الحالي', 'CURRENTDAYNAME' ),
-	'currentyear'             => array( '1', 'عام_حالى', 'عام_حالي', 'CURRENTYEAR' ),
-	'currenttime'             => array( '1', 'وقت_حالى', 'وقت_حالي', 'CURRENTTIME' ),
-	'currenthour'             => array( '1', 'ساعة_حالية', 'CURRENTHOUR' ),
-	'localmonth'              => array( '1', 'شهر_محلى', 'شهر_محلي2', 'شهر_محلي', 'LOCALMONTH', 'LOCALMONTH2' ),
-	'localmonth1'             => array( '1', 'شهر_محلى1', 'شهر_محلي1', 'LOCALMONTH1' ),
-	'localmonthname'          => array( '1', 'اسم_الشهر_المحلى', 'اسم_شهر_محلى', 'اسم_الشهر_المحلي', 'اسم_شهر_محلي', 'LOCALMONTHNAME' ),
-	'localmonthnamegen'       => array( '1', 'اسم_الشهر_المحلى_المولد', 'اسم_شهر_محلى_مولد', 'اسم_الشهر_المحلي_المولد', 'اسم_شهر_محلي_مولد', 'LOCALMONTHNAMEGEN' ),
-	'localmonthabbrev'        => array( '1', 'اختصار_الشهر_المحلى', 'اختصار_شهر_محلى', 'اختصار_الشهر_المحلي', 'اختصار_شهر_محلي', 'LOCALMONTHABBREV' ),
-	'localday'                => array( '1', 'يوم_محلى', 'يوم_محلي', 'LOCALDAY' ),
-	'localday2'               => array( '1', 'يوم_محلى2', 'يوم_محلي2', 'LOCALDAY2' ),
-	'localdayname'            => array( '1', 'اسم_اليوم_المحلى', 'اسم_يوم_محلى', 'اسم_اليوم_المحلي', 'اسم_يوم_محلي', 'LOCALDAYNAME' ),
-	'localyear'               => array( '1', 'عام_محلى', 'عام_محلي', 'LOCALYEAR' ),
-	'localtime'               => array( '1', 'وقت_محلى', 'وقت_محلي', 'LOCALTIME' ),
-	'localhour'               => array( '1', 'ساعة_محلية', 'LOCALHOUR' ),
-	'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' ),
-	'talkspace'               => array( '1', 'نطاق_النقاش', 'TALKSPACE' ),
-	'talkspacee'              => array( '1', 'عنوان_النقاش', 'TALKSPACEE' ),
-	'subjectspace'            => array( '1', 'نطاق_الموضوع', 'نطاق_المقالة', 'SUBJECTSPACE', 'ARTICLESPACE' ),
-	'subjectspacee'           => array( '1', 'عنوان_نطاق_الموضوع', 'عنوان_نطاق_المقالة', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
-	'fullpagename'            => array( '1', 'اسم_الصفحة_الكامل', 'اسم_صفحة_كامل', 'اسم_كامل', 'FULLPAGENAME' ),
-	'fullpagenamee'           => array( '1', 'عنوان_الصفحة_الكامل', 'عنوان_صفحة_كامل', 'عنوان_كامل', 'FULLPAGENAMEE' ),
-	'subpagename'             => array( '1', 'اسم_الصفحة_الفرعي', 'SUBPAGENAME' ),
-	'subpagenamee'            => array( '1', 'عنوان_الصفحة_الفرعى', 'عنوان_الصفحة_الفرعي', 'SUBPAGENAMEE' ),
-	'basepagename'            => array( '1', 'اسم_الصفحة_الأساسى', 'اسم_الصفحة_الأساسي', 'BASEPAGENAME' ),
-	'basepagenamee'           => array( '1', 'عنوان_الصفحة_الأساسى', 'عنوان_الصفحة_الأساسي', 'BASEPAGENAMEE' ),
-	'talkpagename'            => array( '1', 'اسم_صفحة_النقاش', 'TALKPAGENAME' ),
-	'talkpagenamee'           => array( '1', 'عنوان_صفحة_النقاش', 'TALKPAGENAMEE' ),
-	'subjectpagename'         => array( '1', 'اسم_صفحة_الموضوع', 'اسم_صفحة_المقالة', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
-	'subjectpagenamee'        => array( '1', 'عنوان_صفحة_الموضوع', 'عنوان_صفحة_المقالة', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
-	'msg'                     => array( '0', 'رسالة:', 'MSG:' ),
-	'subst'                   => array( '0', 'نسخ:', 'إحلال:', 'SUBST:' ),
-	'safesubst'               => array( '0', 'نسخ_آمن:', 'SAFESUBST:' ),
-	'msgnw'                   => array( '0', 'مصدر:', 'مصدر_قالب:', 'رسالة_بدون_تهيئة:', 'MSGNW:' ),
-	'img_thumbnail'           => array( '1', 'تصغير', 'مصغر', 'thumbnail', 'thumb' ),
-	'img_manualthumb'         => array( '1', 'تصغير=$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_page'                => array( '1', 'صفحة=$1', 'صفحة $1', 'صفحة_$1', 'page=$1', 'page $1' ),
-	'img_upright'             => array( '1', 'معدول', 'معدول=$1', 'معدول $1', 'معدول_$1', 'upright', 'upright=$1', 'upright $1' ),
-	'img_border'              => array( '1', 'حد', 'حدود', 'border' ),
-	'img_baseline'            => array( '1', 'خط_أساسى', 'خط_أساسي', 'baseline' ),
-	'img_sub'                 => array( '1', 'فرعى', 'فرعي', 'sub' ),
-	'img_super'               => array( '1', 'سوبر', 'سب', 'super', 'sup' ),
-	'img_top'                 => array( '1', 'أعلى', 'top' ),
-	'img_text_top'            => array( '1', 'نص_أعلى', 'text-top' ),
-	'img_middle'              => array( '1', 'وسط', 'middle' ),
-	'img_bottom'              => array( '1', 'أسفل', 'bottom' ),
-	'img_text_bottom'         => array( '1', 'نص_أسفل', 'text-bottom' ),
-	'img_link'                => array( '1', 'وصلة=$1', 'رابط=$1', 'link=$1' ),
-	'img_alt'                 => array( '1', 'بديل=$1', 'alt=$1' ),
-	'int'                     => array( '0', 'محتوى:', 'INT:' ),
-	'sitename'                => array( '1', 'اسم_الموقع', 'اسم_موقع', 'SITENAME' ),
-	'ns'                      => array( '0', 'نط:', 'NS:' ),
-	'nse'                     => array( '0', 'نطم:', 'NSE:' ),
-	'localurl'                => array( '0', 'مسار_محلى:', 'مسار_محلي:', 'LOCALURL:' ),
-	'localurle'               => array( '0', 'عنوان_المسار_المحلى:', 'عنوان_المسار_المحلي:', 'LOCALURLE:' ),
-	'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__' ),
-	'currentweek'             => array( '1', 'أسبوع_حالى', 'أسبوع_حالي', 'CURRENTWEEK' ),
-	'currentdow'              => array( '1', 'يوم_حالى_مأ', 'يوم_حالي_مأ', 'CURRENTDOW' ),
-	'localweek'               => array( '1', 'أسبوع_محلى', 'أسبوع_محلي', 'LOCALWEEK' ),
-	'localdow'                => array( '1', 'يوم_محلى_مأ', 'يوم_محلي_مأ', 'LOCALDOW' ),
-	'revisionid'              => array( '1', 'رقم_المراجعة', 'REVISIONID' ),
-	'revisionday'             => array( '1', 'يوم_المراجعة', 'REVISIONDAY' ),
-	'revisionday2'            => array( '1', 'يوم_المراجعة2', 'REVISIONDAY2' ),
-	'revisionmonth'           => array( '1', 'شهر_المراجعة', 'REVISIONMONTH' ),
-	'revisionmonth1'          => array( '1', 'شهر_المراجعة1', 'REVISIONMONTH1' ),
-	'revisionyear'            => array( '1', 'عام_المراجعة', 'REVISIONYEAR' ),
-	'revisiontimestamp'       => array( '1', 'طابع_وقت_المراجعة', 'REVISIONTIMESTAMP' ),
-	'revisionuser'            => array( '1', 'مستخدم_المراجعة', 'REVISIONUSER' ),
-	'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' ),
-	'rawsuffix'               => array( '1', 'أر', 'آر', 'R' ),
-	'newsectionlink'          => array( '1', '__وصلة_قسم_جديد__', '__NEWSECTIONLINK__' ),
-	'nonewsectionlink'        => array( '1', '__لا_وصلة_قسم_جديد__', 'لا_وصلة_قسم_جديد__', '__NONEWSECTIONLINK__' ),
-	'currentversion'          => array( '1', 'نسخة_حالية', 'CURRENTVERSION' ),
-	'urlencode'               => array( '0', 'كود_المسار:', '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' ),
-	'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' ),
-	'url_path'                => array( '0', 'مسار', 'PATH' ),
-	'url_wiki'                => array( '0', 'ويكى', 'ويكي', 'WIKI' ),
-	'url_query'               => array( '0', 'استعلام', 'QUERY' ),
+	'redirect'                  => array( '0', '#تحويل', '#REDIRECT' ),
+	'notoc'                     => array( '0', '__لافهرس__', '__NOTOC__' ),
+	'nogallery'                 => array( '0', '__لامعرض__', '__NOGALLERY__' ),
+	'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' ),
+	'currentmonthnamegen'       => array( '1', 'اسم_الشهر_الحالى_المولد', 'اسم_الشهر_الحالي_المولد', 'CURRENTMONTHNAMEGEN' ),
+	'currentmonthabbrev'        => array( '1', 'اختصار_الشهر_الحالى', 'اختصار_الشهر_الحالي', 'CURRENTMONTHABBREV' ),
+	'currentday'                => array( '1', 'يوم_حالى', 'يوم_حالي', 'CURRENTDAY' ),
+	'currentday2'               => array( '1', 'يوم_حالى2', 'يوم_حالي2', 'CURRENTDAY2' ),
+	'currentdayname'            => array( '1', 'اسم_اليوم_الحالى', 'اسم_اليوم_الحالي', 'CURRENTDAYNAME' ),
+	'currentyear'               => array( '1', 'عام_حالى', 'عام_حالي', 'CURRENTYEAR' ),
+	'currenttime'               => array( '1', 'وقت_حالى', 'وقت_حالي', 'CURRENTTIME' ),
+	'currenthour'               => array( '1', 'ساعة_حالية', 'CURRENTHOUR' ),
+	'localmonth'                => array( '1', 'شهر_محلى', 'شهر_محلي2', 'شهر_محلي', 'LOCALMONTH', 'LOCALMONTH2' ),
+	'localmonth1'               => array( '1', 'شهر_محلى1', 'شهر_محلي1', 'LOCALMONTH1' ),
+	'localmonthname'            => array( '1', 'اسم_الشهر_المحلى', 'اسم_شهر_محلى', 'اسم_الشهر_المحلي', 'اسم_شهر_محلي', 'LOCALMONTHNAME' ),
+	'localmonthnamegen'         => array( '1', 'اسم_الشهر_المحلى_المولد', 'اسم_شهر_محلى_مولد', 'اسم_الشهر_المحلي_المولد', 'اسم_شهر_محلي_مولد', 'LOCALMONTHNAMEGEN' ),
+	'localmonthabbrev'          => array( '1', 'اختصار_الشهر_المحلى', 'اختصار_شهر_محلى', 'اختصار_الشهر_المحلي', 'اختصار_شهر_محلي', 'LOCALMONTHABBREV' ),
+	'localday'                  => array( '1', 'يوم_محلى', 'يوم_محلي', 'LOCALDAY' ),
+	'localday2'                 => array( '1', 'يوم_محلى2', 'يوم_محلي2', 'LOCALDAY2' ),
+	'localdayname'              => array( '1', 'اسم_اليوم_المحلى', 'اسم_يوم_محلى', 'اسم_اليوم_المحلي', 'اسم_يوم_محلي', 'LOCALDAYNAME' ),
+	'localyear'                 => array( '1', 'عام_محلى', 'عام_محلي', 'LOCALYEAR' ),
+	'localtime'                 => array( '1', 'وقت_محلى', 'وقت_محلي', 'LOCALTIME' ),
+	'localhour'                 => array( '1', 'ساعة_محلية', 'LOCALHOUR' ),
+	'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' ),
+	'talkspace'                 => array( '1', 'نطاق_النقاش', 'TALKSPACE' ),
+	'talkspacee'                => array( '1', 'عنوان_النقاش', 'TALKSPACEE' ),
+	'subjectspace'              => array( '1', 'نطاق_الموضوع', 'نطاق_المقالة', 'SUBJECTSPACE', 'ARTICLESPACE' ),
+	'subjectspacee'             => array( '1', 'عنوان_نطاق_الموضوع', 'عنوان_نطاق_المقالة', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
+	'fullpagename'              => array( '1', 'اسم_الصفحة_الكامل', 'اسم_صفحة_كامل', 'اسم_كامل', 'FULLPAGENAME' ),
+	'fullpagenamee'             => array( '1', 'عنوان_الصفحة_الكامل', 'عنوان_صفحة_كامل', 'عنوان_كامل', 'FULLPAGENAMEE' ),
+	'subpagename'               => array( '1', 'اسم_الصفحة_الفرعي', 'SUBPAGENAME' ),
+	'subpagenamee'              => array( '1', 'عنوان_الصفحة_الفرعى', 'عنوان_الصفحة_الفرعي', 'SUBPAGENAMEE' ),
+	'basepagename'              => array( '1', 'اسم_الصفحة_الأساسى', 'اسم_الصفحة_الأساسي', 'BASEPAGENAME' ),
+	'basepagenamee'             => array( '1', 'عنوان_الصفحة_الأساسى', 'عنوان_الصفحة_الأساسي', 'BASEPAGENAMEE' ),
+	'talkpagename'              => array( '1', 'اسم_صفحة_النقاش', 'TALKPAGENAME' ),
+	'talkpagenamee'             => array( '1', 'عنوان_صفحة_النقاش', 'TALKPAGENAMEE' ),
+	'subjectpagename'           => array( '1', 'اسم_صفحة_الموضوع', 'اسم_صفحة_المقالة', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
+	'subjectpagenamee'          => array( '1', 'عنوان_صفحة_الموضوع', 'عنوان_صفحة_المقالة', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
+	'msg'                       => array( '0', 'رسالة:', 'MSG:' ),
+	'subst'                     => array( '0', 'نسخ:', 'إحلال:', 'SUBST:' ),
+	'safesubst'                 => array( '0', 'نسخ_آمن:', 'SAFESUBST:' ),
+	'msgnw'                     => array( '0', 'مصدر:', 'مصدر_قالب:', 'رسالة_بدون_تهيئة:', 'MSGNW:' ),
+	'img_thumbnail'             => array( '1', 'تصغير', 'مصغر', 'thumbnail', 'thumb' ),
+	'img_manualthumb'           => array( '1', 'تصغير=$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_page'                  => array( '1', 'صفحة=$1', 'صفحة $1', 'صفحة_$1', 'page=$1', 'page $1' ),
+	'img_upright'               => array( '1', 'معدول', 'معدول=$1', 'معدول $1', 'معدول_$1', 'upright', 'upright=$1', 'upright $1' ),
+	'img_border'                => array( '1', 'حد', 'حدود', 'border' ),
+	'img_baseline'              => array( '1', 'خط_أساسى', 'خط_أساسي', 'baseline' ),
+	'img_sub'                   => array( '1', 'فرعى', 'فرعي', 'sub' ),
+	'img_super'                 => array( '1', 'سوبر', 'سب', 'super', 'sup' ),
+	'img_top'                   => array( '1', 'أعلى', 'top' ),
+	'img_text_top'              => array( '1', 'نص_أعلى', 'text-top' ),
+	'img_middle'                => array( '1', 'وسط', 'middle' ),
+	'img_bottom'                => array( '1', 'أسفل', 'bottom' ),
+	'img_text_bottom'           => array( '1', 'نص_أسفل', 'text-bottom' ),
+	'img_link'                  => array( '1', 'وصلة=$1', 'رابط=$1', 'link=$1' ),
+	'img_alt'                   => array( '1', 'بديل=$1', 'alt=$1' ),
+	'int'                       => array( '0', 'محتوى:', 'INT:' ),
+	'sitename'                  => array( '1', 'اسم_الموقع', 'اسم_موقع', 'SITENAME' ),
+	'ns'                        => array( '0', 'نط:', 'NS:' ),
+	'nse'                       => array( '0', 'نطم:', 'NSE:' ),
+	'localurl'                  => array( '0', 'مسار_محلى:', 'مسار_محلي:', 'LOCALURL:' ),
+	'localurle'                 => array( '0', 'عنوان_المسار_المحلى:', 'عنوان_المسار_المحلي:', 'LOCALURLE:' ),
+	'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__' ),
+	'currentweek'               => array( '1', 'أسبوع_حالى', 'أسبوع_حالي', 'CURRENTWEEK' ),
+	'currentdow'                => array( '1', 'يوم_حالى_مأ', 'يوم_حالي_مأ', 'CURRENTDOW' ),
+	'localweek'                 => array( '1', 'أسبوع_محلى', 'أسبوع_محلي', 'LOCALWEEK' ),
+	'localdow'                  => array( '1', 'يوم_محلى_مأ', 'يوم_محلي_مأ', 'LOCALDOW' ),
+	'revisionid'                => array( '1', 'رقم_المراجعة', 'REVISIONID' ),
+	'revisionday'               => array( '1', 'يوم_المراجعة', 'REVISIONDAY' ),
+	'revisionday2'              => array( '1', 'يوم_المراجعة2', 'REVISIONDAY2' ),
+	'revisionmonth'             => array( '1', 'شهر_المراجعة', 'REVISIONMONTH' ),
+	'revisionmonth1'            => array( '1', 'شهر_المراجعة1', 'REVISIONMONTH1' ),
+	'revisionyear'              => array( '1', 'عام_المراجعة', 'REVISIONYEAR' ),
+	'revisiontimestamp'         => array( '1', 'طابع_وقت_المراجعة', 'REVISIONTIMESTAMP' ),
+	'revisionuser'              => array( '1', 'مستخدم_المراجعة', 'REVISIONUSER' ),
+	'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' ),
+	'rawsuffix'                 => array( '1', 'أر', 'آر', 'R' ),
+	'newsectionlink'            => array( '1', '__وصلة_قسم_جديد__', '__NEWSECTIONLINK__' ),
+	'nonewsectionlink'          => array( '1', '__لا_وصلة_قسم_جديد__', 'لا_وصلة_قسم_جديد__', '__NONEWSECTIONLINK__' ),
+	'currentversion'            => array( '1', 'نسخة_حالية', 'CURRENTVERSION' ),
+	'urlencode'                 => array( '0', 'كود_المسار:', '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' ),
+	'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' ),
+	'url_path'                  => array( '0', 'مسار', 'PATH' ),
+	'url_wiki'                  => array( '0', 'ويكى', 'ويكي', 'WIKI' ),
+	'url_query'                 => array( '0', 'استعلام', 'QUERY' ),
 );
 
 $specialPageAliases = array(
diff --git a/languages/messages/MessagesAs.php b/languages/messages/MessagesAs.php
index fea431a183..2e86ea2cbe 100644
--- a/languages/messages/MessagesAs.php
+++ b/languages/messages/MessagesAs.php
@@ -30,8 +30,8 @@ $namespaceNames = array(
 	NS_PROJECT_TALK     => '$1_বাৰ্তা',
 	NS_FILE             => 'চিত্ৰ',
 	NS_FILE_TALK        => 'চিত্ৰ_বাৰ্তা',
-	NS_MEDIAWIKI        => 'মেডিয়াৱিকি',
-	NS_MEDIAWIKI_TALK   => 'মেডিয়াৱিকি_বাৰ্তা',
+	NS_MEDIAWIKI        => 'মিডিয়াৱিকি',
+	NS_MEDIAWIKI_TALK   => 'মিডিয়াৱিকি_আলোচনা',
 	NS_TEMPLATE         => 'সাঁচ',
 	NS_TEMPLATE_TALK    => 'সাঁচ_বাৰ্তা',
 	NS_HELP             => 'সহায়',
@@ -53,6 +53,8 @@ $namespaceAliases = array(
 	'चित्र_वार्ता' => NS_FILE_TALK,
 	'চিত্র' => NS_FILE,
 	'চিত্র বার্তা' => NS_FILE_TALK,
+	'মেডিয়াৱিকি' => NS_MEDIAWIKI,
+	'মেডিয়াৱিকি_বাৰ্তা' => NS_MEDIAWIKI_TALK,
 	'MediaWiki বার্তা' => NS_MEDIAWIKI_TALK,
 	'साँचा' => NS_TEMPLATE,
 	'साँचा_वार्ता' => NS_TEMPLATE_TALK,
@@ -65,35 +67,104 @@ $namespaceAliases = array(
 );
 
 $specialPageAliases = array(
+	'Activeusers'               => array( 'সক্ৰিয়_সদস্যসকল' ),
+	'Allmessages'               => array( 'সকলোবোৰ_বাৰ্তা' ),
 	'Allpages'                  => array( 'সকলোবোৰ_পৃষ্ঠা' ),
-	'Contributions'             => 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( 'সদস্যভুক্তি' ),
+	'DeletedContributions'      => array( 'বিলোপ_কৰা_বৰঙনিসমূহ' ),
+	'Disambiguations'           => array( 'দ্ব্যৰ্থতা_দূৰীকৰণসমূহ' ),
+	'DoubleRedirects'           => array( 'দ্বি_পুণঃনিৰ্দেশনাসমূহ' ),
+	'EditWatchlist'             => array( 'লক্ষ্যতালিকা_সম্পাদনা_কৰক' ),
+	'Emailuser'                 => array( 'সদস্যলৈ_ই-মেইল_পঠিয়াওক' ),
+	'Export'                    => array( 'ৰপ্তানি' ),
+	'Fewestrevisions'           => array( 'নূন্যতম_সংস্কৰণসমূহ' ),
+	'FileDuplicateSearch'       => array( 'প্ৰতিলিপি_সনিবিষ্ট_নথি_অনুসন্ধান' ),
+	'Filepath'                  => array( 'ফাইলৰ_পথ' ),
+	'Import'                    => array( 'আমদানি' ),
+	'Invalidateemail'           => array( 'অবৈধ_ই-মেইল' ),
+	'JavaScriptTest'            => array( 'জাভাস্ক্ৰীপ্ত_পৰীক্ষা' ),
+	'BlockList'                 => array( 'অৱৰোধৰ_তালিকা' ),
+	'LinkSearch'                => array( 'সংযোগ_সন্ধান' ),
+	'Listadmins'                => array( 'প্ৰশাসকৰ_তালিকা' ),
+	'Listbots'                  => array( 'বটৰ_তালিকা' ),
 	'Listfiles'                 => array( 'চিত্ৰ-তালিকা' ),
 	'Listgrouprights'           => array( 'গোটৰ_অধিকাৰসমূহ' ),
+	'Listredirects'             => array( 'পুণঃনিৰ্দেশনাসমূহৰ_তালিকা' ),
 	'Listusers'                 => array( 'সদস্য-তালিকা' ),
+	'Lockdb'                    => array( 'তথ্যকোষ_বন্ধ_কৰক' ),
+	'Log'                       => array( 'অভিলেখ', 'অভিলেখসমূহ' ),
 	'Lonelypages'               => array( 'অকলশৰীয়া_পৃষ্ঠা' ),
-	'Mycontributions'           => array( 'মোৰ_অৱদান' ),
+	'Longpages'                 => array( 'দীঘলীয়া_পৃষ্ঠাসমূহ' ),
+	'MergeHistory'              => array( 'একত্ৰীকৰণ_ইতিহাস' ),
+	'MIMEsearch'                => array( 'MIME_অনুসন্ধান' ),
+	'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( 'শেহতীয়া_কাম' ),
-	'Specialpages'              => 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( 'অবিন্যস্ত_চিত্ৰবোৰ' ),
+	'Uncategorizedimages'       => array( 'অবিন্যস্ত_চিত্ৰসমূহ' ),
 	'Uncategorizedpages'        => array( 'অবিন্যস্ত_পৃষ্ঠাসমূহ' ),
-	'Uncategorizedtemplates'    => array( 'অবিন্যস্ত_সাঁচবোৰ' ),
+	'Uncategorizedtemplates'    => array( 'অবিন্যস্ত_সাঁচসমূহ' ),
+	'Undelete'                  => array( 'বিলোপ_ঘূৰাই_আনক' ),
+	'Unlockdb'                  => array( 'তথ্যকোষ_খোলক' ),
 	'Unusedcategories'          => array( 'অব্যৱহৃত_শ্ৰেণীসমূহ' ),
-	'Unusedimages'              => array( 'অব্যৱহৃত_চিত্ৰবোৰ' ),
-	'Upload'                    => array( 'বোজাই' ),
-	'Userlogin'                 => array( 'সদস্যৰ_প্ৰবেশ' ),
+	'Unusedimages'              => array( 'অব্যৱহৃত_চিত্ৰসমূহ' ),
+	'Unusedtemplates'           => array( 'অব্যৱহৃত_সাঁচসমূহ' ),
+	'Unwatchedpages'            => array( 'লক্ষ্য_নৰখা_পৃষ্ঠাসমূহ' ),
+	'Upload'                    => array( 'আপল’ড', 'বোজাই' ),
+	'Userlogin'                 => array( 'সদস্যৰ_প্ৰৱেশ' ),
 	'Userlogout'                => array( 'সদস্যৰ_প্ৰস্থান' ),
+	'Userrights'                => array( 'সদস্যৰ_অধিকাৰ', 'প্ৰশাসক_সৃষ্টি', 'বট_সৃষ্টি' ),
+	'Version'                   => array( 'সংস্কৰণ' ),
 	'Wantedcategories'          => array( 'আকাংক্ষিত_শ্ৰেণীসমূহ' ),
-	'Wantedpages'               => array( 'আকাংক্ষিত_পৃষ্ঠাসমূহ' ),
+	'Wantedfiles'               => array( 'কাম্য_ফাইলসমূহ' ),
+	'Wantedpages'               => array( 'কাম্য_পৃষ্ঠাসমূহ', 'ভগা_সংযোগসমূহ' ),
+	'Wantedtemplates'           => array( 'কাম্য_সাঁচসমূহ' ),
 	'Watchlist'                 => array( 'লক্ষ্যতালিকা' ),
+	'Whatlinkshere'             => array( 'পৃষ্ঠালৈ_থকা_সংযোগসমূহ' ),
+	'Withoutinterwiki'          => array( 'আন্তঃৱিকিবিহীন' ),
+);
+
+$magicWords = array(
+	'redirect'                  => array( '0', 'পুণঃনিৰ্দেশ', '#REDIRECT' ),
+	'special'                   => array( '0', 'বিশেষ', 'special' ),
+	'hiddencat'                 => array( '1', '__গোপন_শ্ৰেণী__', '__HIDDENCAT__' ),
+	'pagesize'                  => array( '1', 'পৃষ্ঠাৰ_আকাৰ', 'PAGESIZE' ),
+	'index'                     => array( '1', '__সূচী__', '__INDEX__' ),
 );
 
 $digitTransformTable = array(
diff --git a/languages/messages/MessagesAst.php b/languages/messages/MessagesAst.php
index 20630b63fb..44d6deed87 100644
--- a/languages/messages/MessagesAst.php
+++ b/languages/messages/MessagesAst.php
@@ -1778,6 +1778,7 @@ Seique quieras camudar la descripción de la so [páxina de descripción de fich
 'shared-repo-from' => 'de $1',
 'shared-repo' => 'un repositoriu compartíu',
 'filepage.css' => "/* El CSS allugáu equí s'incluye na páxina de descripción del ficheru, que tamién s'incluye nes wikis clientes foriates */",
+'upload-disallowed-here' => 'Por desgracia nun pues sobrescribir esta imaxe.',
 
 # File reversion
 'filerevert' => 'Revertir $1',
@@ -2061,7 +2062,9 @@ Pue haber [[{{MediaWiki:Listgrouprights-helppage}}|información adicional]] toca
 y tener una direición de corréu válida nes tos [[Special:Preferences|preferencies]]
 pa poder unviar correos a otros usuarios.',
 'emailuser' => 'Manda-y un corréu a esti usuariu',
-'emailpage' => "Corréu d'usuariu",
+'emailuser-title-target' => 'Unviar un corréu electrónicu a {{GENDER:$1|esti usuariu|esta usuaria}}',
+'emailuser-title-notarget' => 'Unviar un corréu electrónicu a un usuariu',
+'emailpage' => 'Envigar un corréu electrónicu a un usuariu',
 'emailpagetext' => "Pues usar el formulariu 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.",
 'usermailererror' => "L'operador de corréu devolvió un error:",
@@ -2890,11 +2893,34 @@ Probablemente tea causao por un enllaz a un sitiu esternu de la llista prieta.',
 
 # Info page
 'pageinfo-title' => 'Información sobro "$1"',
-'pageinfo-header-edits' => 'Ediciones',
+'pageinfo-header-basic' => 'Información básica',
+'pageinfo-header-edits' => "Historial d'ediciones",
+'pageinfo-header-restrictions' => 'Proteición de páxina',
+'pageinfo-header-properties' => 'Propiedaes de la páxina',
+'pageinfo-display-title' => 'Amosar el títulu',
+'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-robot-policy' => 'Estáu del motor de gueta',
+'pageinfo-robot-index' => 'Pue ser índiz',
+'pageinfo-robot-noindex' => 'Nun pue ser índiz',
 'pageinfo-views' => 'Númberu de visites',
-'pageinfo-watchers' => 'Númberu de vixilantes',
-'pageinfo-edits' => "Númberu d'ediciones",
-'pageinfo-authors' => "Númberu d'autores distintos",
+'pageinfo-watchers' => 'Númberu de vixilantes de la páxina',
+'pageinfo-redirects-name' => 'Redireiciones a esta páxina',
+'pageinfo-subpages-name' => "Subpáxines d'esta páxina",
+'pageinfo-subpages-value' => '$1 ($2 {{PLURAL:$2|redireición|redireiciones}}; $3 {{PLURAL:$3|non-redireición|non-redireiciones}})',
+'pageinfo-firstuser' => 'Creador de la páxina',
+'pageinfo-firsttime' => 'Data de creación de la páxina',
+'pageinfo-lastuser' => 'Caberu editor',
+'pageinfo-lasttime' => 'Data de la cabera edición',
+'pageinfo-edits' => "Númberu total d'ediciones",
+'pageinfo-authors' => "Númberu total d'autores distintos",
+'pageinfo-recent-edits' => "Númberu d'ediciones recientes (nos caberos $1)",
+'pageinfo-recent-authors' => "Númberu d'autores distintos recientes",
+'pageinfo-restriction' => 'Proteición de la páxina (<code>{{lcfirst:$1}}</code>)',
+'pageinfo-magic-words' => '{{PLURAL:$1|Pallabra máxica|Pallabres máxiques}} ($1)',
+'pageinfo-hidden-categories' => '{{PLURAL:$1|Categoría anubrida|Categoríes anubríes}} ($1)',
+'pageinfo-templates' => '{{PLURAL:$1|Plantía incluída|Plantíes incluíes}} ($1)',
 
 # Skin names
 'skinname-standard' => 'Clásicu',
@@ -2945,6 +2971,7 @@ Al executalu pues comprometer el to sistema.",
 'file-info-size-pages' => '$1 × $2 pixels, tamañu del ficheru: $3, triba MIME: $4, $5 {{PLURAL:$5|páxina|páxines}}',
 'file-nohires' => 'Nun ta disponible con mayor resolución.',
 'svg-long-desc' => 'ficheru SVG, $1 × $2 píxels nominales, tamañu de ficheru: $3',
+'svg-long-desc-animated' => 'Ficheru SVG animáu; nominalmente de $1 × $2 pixels; tamañu del ficheru: $3',
 'show-big-image' => 'Resolución completa',
 'show-big-image-preview' => "Tamañu d'esta previsualización: $1.",
 'show-big-image-other' => '{{PLURAL:$2|Otra resolución|Otres resoluciones}}: $1.',
@@ -2954,6 +2981,8 @@ Al executalu pues comprometer el to sistema.",
 'file-info-png-looped' => 'animáu',
 'file-info-png-repeat' => 'reproducíu $1 {{PLURAL:$1|vez|veces}}',
 'file-info-png-frames' => '$1 {{PLURAL:$1|cuadru|cuadros}}',
+'file-no-thumb-animation' => "'''Nota: pola mor de llímites téunicos, les miniatures d'esti ficheru nun tan animaes.'''",
+'file-no-thumb-animation-gif' => "'''Nota: pola mor de llímites téunicos, les miniatures d'imaxes GIF d'alta resolución como esta nun tan animaes.'''",
 
 # Special:NewFiles
 'newimages' => "Galería d'imáxenes nueves",
diff --git a/languages/messages/MessagesAz.php b/languages/messages/MessagesAz.php
index 6ad1280cf6..0ff447d6e4 100644
--- a/languages/messages/MessagesAz.php
+++ b/languages/messages/MessagesAz.php
@@ -68,9 +68,9 @@ $specialPageAliases = array(
 );
 
 $magicWords = array(
-	'redirect'                => array( '0', '#İSTİQAMƏTLƏNDİRMƏ', '#İSTİQAMƏTLƏNDİR', '#REDIRECT' ),
-	'notoc'                   => array( '0', '__MÜNDƏRİCATYOX__', '__NOTOC__' ),
-	'nogallery'               => array( '0', '__QALEREYAYOX__', '__NOGALLERY__' ),
+	'redirect'                  => array( '0', '#İSTİQAMƏTLƏNDİRMƏ', '#İSTİQAMƏTLƏNDİR', '#REDIRECT' ),
+	'notoc'                     => array( '0', '__MÜNDƏRİCATYOX__', '__NOTOC__' ),
+	'nogallery'                 => array( '0', '__QALEREYAYOX__', '__NOGALLERY__' ),
 );
 
 $separatorTransformTable = array( ',' => '.', '.' => ',' );
diff --git a/languages/messages/MessagesBa.php b/languages/messages/MessagesBa.php
index 3ec45e145c..77b913b75b 100644
--- a/languages/messages/MessagesBa.php
+++ b/languages/messages/MessagesBa.php
@@ -37,19 +37,20 @@ $namespaceNames = array(
 	NS_TEMPLATE_TALK    => 'Ҡалып_буйынса_фекерләшеү',
 	NS_HELP             => 'Белешмә',
 	NS_HELP_TALK        => 'Белешмә_буйынса_фекерләшеү',
-	NS_CATEGORY         => 'Төркөм',
-	NS_CATEGORY_TALK    => 'Төркөм_буйынса_фекерләшеү',
+	NS_CATEGORY         => 'Категория',
+	NS_CATEGORY_TALK    => 'Категория_буйынса_фекерләшеү',
 );
 
 $namespaceAliases = array(
-	'Фекер_алышыу' => NS_TALK,
+	'Фекер_алышыу'                => NS_TALK,
 	'Ҡатнашыусы_м-н_фекер_алышыу' => NS_USER_TALK,
-	'$1_б-са_фекер_алышыу' => NS_PROJECT_TALK,
-	'Рәсем_б-са_фекер_алышыу' => NS_FILE_TALK,
+	'$1_б-са_фекер_алышыу'        => NS_PROJECT_TALK,
+	'Рәсем_б-са_фекер_алышыу'     => NS_FILE_TALK,
 	'MediaWiki_б-са_фекер_алышыу' => NS_MEDIAWIKI_TALK,
-	'Ҡалып_б-са_фекер_алышыу' => NS_TEMPLATE_TALK,
-	'Белешмә_б-са_фекер_алышыу' => NS_HELP_TALK,
-	'Категория' => NS_CATEGORY,
+	'Ҡалып_б-са_фекер_алышыу'     => NS_TEMPLATE_TALK,
+	'Белешмә_б-са_фекер_алышыу'   => NS_HELP_TALK,
+	'Төркөм'                      => NS_CATEGORY,
+	'Төркөм_буйынса_фекерләшеү'   => NS_CATEGORY_TALK,
 	'Категория_б-са_фекер_алышыу' => NS_CATEGORY_TALK,
 );
 
diff --git a/languages/messages/MessagesBcl.php b/languages/messages/MessagesBcl.php
index 9a40ea3d08..f10677271e 100644
--- a/languages/messages/MessagesBcl.php
+++ b/languages/messages/MessagesBcl.php
@@ -34,59 +34,59 @@ $namespaceNames = array(
 );
 
 $magicWords = array(
-	'currentmonth'            => array( '1', 'BULANNGONYAN', 'CURRENTMONTH', 'CURRENTMONTH2' ),
-	'currentmonthname'        => array( '1', 'NGARANBULANNGONYAN', 'CURRENTMONTHNAME' ),
-	'currentday'              => array( '1', 'ALDAWNGONYAN', 'CURRENTDAY' ),
-	'currentyear'             => array( '1', 'TAONNGONYAN', 'CURRENTYEAR' ),
-	'currenttime'             => array( '1', 'PANAHONNGONYAN', 'CURRENTTIME' ),
-	'currenthour'             => array( '1', 'ORASNGONYAN', 'CURRENTHOUR' ),
-	'localmonth'              => array( '1', 'LOKALBULAN', 'LOCALMONTH', 'LOCALMONTH2' ),
-	'localmonthname'          => array( '1', 'NGARANLOKALBULAN', 'LOCALMONTHNAME' ),
-	'localday'                => array( '1', 'LOKALALDAW', 'LOCALDAY' ),
-	'localday2'               => array( '1', 'LOKALALDAW2', 'LOCALDAY2' ),
-	'localdayname'            => array( '1', 'NGARANLOKALALDAW', 'LOCALDAYNAME' ),
-	'localyear'               => array( '1', 'LOKALTAON', 'LOCALYEAR' ),
-	'localtime'               => array( '1', 'LOKALPANAHON', 'LOCALTIME' ),
-	'localhour'               => array( '1', 'LOKALORAS', 'LOCALHOUR' ),
-	'numberofpages'           => array( '1', 'NUMEROKANPAHINA', 'NUMBEROFPAGES' ),
-	'numberofarticles'        => array( '1', 'NUMEROKANARTIKULO', 'NUMBEROFARTICLES' ),
-	'numberoffiles'           => array( '1', 'NUMEROKANDOKUMENTO', 'NUMBEROFFILES' ),
-	'numberofusers'           => array( '1', 'NUMEROKANPARAGAMIT', 'NUMBEROFUSERS' ),
-	'numberofedits'           => array( '1', 'NUMEROKANLIGWAT', 'NUMBEROFEDITS' ),
-	'pagename'                => array( '1', 'NGARANKANPAHINA', 'PAGENAME' ),
-	'pagenamee'               => array( '1', 'KAGNGARANKANPAHINA', 'PAGENAMEE' ),
-	'namespace'               => array( '1', 'NGARANESPASYO', 'NAMESPACE' ),
-	'namespacee'              => array( '1', 'KAGNGARANESPASYO', 'NAMESPACEE' ),
-	'talkspace'               => array( '1', 'OLAYESPASYO', 'TALKSPACE' ),
-	'talkspacee'              => array( '1', 'KAGOLAYESPASYO', 'TALKSPACEE' ),
-	'fullpagename'            => array( '1', 'TODONGNGARANKANPAHINA', 'FULLPAGENAME' ),
-	'fullpagenamee'           => array( '1', 'KAGNGARANKANTODONGNGARANKANPAHINA', 'FULLPAGENAMEE' ),
-	'talkpagename'            => array( '1', 'NGARANKANPAHINANINOLAY', 'TALKPAGENAME' ),
-	'talkpagenamee'           => array( '1', 'KAGNGARANKANPAHINANINOLAY', 'TALKPAGENAMEE' ),
-	'msg'                     => array( '0', 'MSH', 'MSG:' ),
-	'img_right'               => array( '1', 'too', 'right' ),
-	'img_left'                => array( '1', 'wala', 'left' ),
-	'img_none'                => array( '1', 'mayò', 'none' ),
-	'img_center'              => array( '1', 'sentro', 'tangâ', 'center', 'centre' ),
-	'img_framed'              => array( '1', 'nakakawadro', 'kwadro', 'framed', 'enframed', 'frame' ),
-	'img_frameless'           => array( '1', 'daing kwadro', 'frameless' ),
-	'img_page'                => array( '1', 'pahina=$1', 'pahina $1', 'page=$1', 'page $1' ),
-	'localurl'                => array( '0', 'LOKALURL', 'LOCALURL:' ),
-	'localurle'               => array( '0', 'LOKALURLE', 'LOCALURLE:' ),
-	'currentweek'             => array( '1', 'SEMANANGONYAN', 'CURRENTWEEK' ),
-	'localweek'               => array( '1', 'LOKALSEMANA', 'LOCALWEEK' ),
-	'plural'                  => array( '0', 'DAKOL:', 'PLURAL:' ),
-	'fullurl'                 => array( '0', 'TODONGURL:', 'FULLURL:' ),
-	'fullurle'                => array( '0', 'TODONGURLE:', 'FULLURLE:' ),
-	'language'                => array( '0', '#TATARAMON', '#LANGUAGE:' ),
-	'contentlanguage'         => array( '1', 'TATARAMONKANLAOG', 'TATARAMONLAOG', 'CONTENTLANGUAGE', 'CONTENTLANG' ),
-	'numberofadmins'          => array( '1', 'NUMEROKANTAGAMATO', 'NUMBEROFADMINS' ),
-	'padleft'                 => array( '0', 'PADWALA', 'PADLEFT' ),
-	'padright'                => array( '0', 'PADTOO', 'PADRIGHT' ),
-	'filepath'                => array( '0', 'FILEDALAN', 'FILEPATH:' ),
-	'hiddencat'               => array( '1', '__NAKATAGONGKAT__', '__HIDDENCAT__' ),
-	'pagesincategory'         => array( '1', 'PAHINASAKATEGORYA', 'PAHINASAKAT', 'PAGESINCATEGORY', 'PAGESINCAT' ),
-	'pagesize'                => array( '1', 'PAHINASOKOL', 'PAGESIZE' ),
+	'currentmonth'              => array( '1', 'BULANNGONYAN', 'CURRENTMONTH', 'CURRENTMONTH2' ),
+	'currentmonthname'          => array( '1', 'NGARANBULANNGONYAN', 'CURRENTMONTHNAME' ),
+	'currentday'                => array( '1', 'ALDAWNGONYAN', 'CURRENTDAY' ),
+	'currentyear'               => array( '1', 'TAONNGONYAN', 'CURRENTYEAR' ),
+	'currenttime'               => array( '1', 'PANAHONNGONYAN', 'CURRENTTIME' ),
+	'currenthour'               => array( '1', 'ORASNGONYAN', 'CURRENTHOUR' ),
+	'localmonth'                => array( '1', 'LOKALBULAN', 'LOCALMONTH', 'LOCALMONTH2' ),
+	'localmonthname'            => array( '1', 'NGARANLOKALBULAN', 'LOCALMONTHNAME' ),
+	'localday'                  => array( '1', 'LOKALALDAW', 'LOCALDAY' ),
+	'localday2'                 => array( '1', 'LOKALALDAW2', 'LOCALDAY2' ),
+	'localdayname'              => array( '1', 'NGARANLOKALALDAW', 'LOCALDAYNAME' ),
+	'localyear'                 => array( '1', 'LOKALTAON', 'LOCALYEAR' ),
+	'localtime'                 => array( '1', 'LOKALPANAHON', 'LOCALTIME' ),
+	'localhour'                 => array( '1', 'LOKALORAS', 'LOCALHOUR' ),
+	'numberofpages'             => array( '1', 'NUMEROKANPAHINA', 'NUMBEROFPAGES' ),
+	'numberofarticles'          => array( '1', 'NUMEROKANARTIKULO', 'NUMBEROFARTICLES' ),
+	'numberoffiles'             => array( '1', 'NUMEROKANDOKUMENTO', 'NUMBEROFFILES' ),
+	'numberofusers'             => array( '1', 'NUMEROKANPARAGAMIT', 'NUMBEROFUSERS' ),
+	'numberofedits'             => array( '1', 'NUMEROKANLIGWAT', 'NUMBEROFEDITS' ),
+	'pagename'                  => array( '1', 'NGARANKANPAHINA', 'PAGENAME' ),
+	'pagenamee'                 => array( '1', 'KAGNGARANKANPAHINA', 'PAGENAMEE' ),
+	'namespace'                 => array( '1', 'NGARANESPASYO', 'NAMESPACE' ),
+	'namespacee'                => array( '1', 'KAGNGARANESPASYO', 'NAMESPACEE' ),
+	'talkspace'                 => array( '1', 'OLAYESPASYO', 'TALKSPACE' ),
+	'talkspacee'                => array( '1', 'KAGOLAYESPASYO', 'TALKSPACEE' ),
+	'fullpagename'              => array( '1', 'TODONGNGARANKANPAHINA', 'FULLPAGENAME' ),
+	'fullpagenamee'             => array( '1', 'KAGNGARANKANTODONGNGARANKANPAHINA', 'FULLPAGENAMEE' ),
+	'talkpagename'              => array( '1', 'NGARANKANPAHINANINOLAY', 'TALKPAGENAME' ),
+	'talkpagenamee'             => array( '1', 'KAGNGARANKANPAHINANINOLAY', 'TALKPAGENAMEE' ),
+	'msg'                       => array( '0', 'MSH', 'MSG:' ),
+	'img_right'                 => array( '1', 'too', 'right' ),
+	'img_left'                  => array( '1', 'wala', 'left' ),
+	'img_none'                  => array( '1', 'mayò', 'none' ),
+	'img_center'                => array( '1', 'sentro', 'tangâ', 'center', 'centre' ),
+	'img_framed'                => array( '1', 'nakakawadro', 'kwadro', 'framed', 'enframed', 'frame' ),
+	'img_frameless'             => array( '1', 'daing kwadro', 'frameless' ),
+	'img_page'                  => array( '1', 'pahina=$1', 'pahina $1', 'page=$1', 'page $1' ),
+	'localurl'                  => array( '0', 'LOKALURL', 'LOCALURL:' ),
+	'localurle'                 => array( '0', 'LOKALURLE', 'LOCALURLE:' ),
+	'currentweek'               => array( '1', 'SEMANANGONYAN', 'CURRENTWEEK' ),
+	'localweek'                 => array( '1', 'LOKALSEMANA', 'LOCALWEEK' ),
+	'plural'                    => array( '0', 'DAKOL:', 'PLURAL:' ),
+	'fullurl'                   => array( '0', 'TODONGURL:', 'FULLURL:' ),
+	'fullurle'                  => array( '0', 'TODONGURLE:', 'FULLURLE:' ),
+	'language'                  => array( '0', '#TATARAMON', '#LANGUAGE:' ),
+	'contentlanguage'           => array( '1', 'TATARAMONKANLAOG', 'TATARAMONLAOG', 'CONTENTLANGUAGE', 'CONTENTLANG' ),
+	'numberofadmins'            => array( '1', 'NUMEROKANTAGAMATO', 'NUMBEROFADMINS' ),
+	'padleft'                   => array( '0', 'PADWALA', 'PADLEFT' ),
+	'padright'                  => array( '0', 'PADTOO', 'PADRIGHT' ),
+	'filepath'                  => array( '0', 'FILEDALAN', 'FILEPATH:' ),
+	'hiddencat'                 => array( '1', '__NAKATAGONGKAT__', '__HIDDENCAT__' ),
+	'pagesincategory'           => array( '1', 'PAHINASAKATEGORYA', 'PAHINASAKAT', 'PAGESINCATEGORY', 'PAGESINCAT' ),
+	'pagesize'                  => array( '1', 'PAHINASOKOL', 'PAGESIZE' ),
 );
 
 $specialPageAliases = array(
@@ -110,22 +110,23 @@ $messages = array(
 'tog-editsectiononrightclick' => 'Paganaha an paghihirá kan seksyon sa paagi kan patoong pagpindot sa mga titulo kan seksyon (minakaipo nin JavaScript)',
 'tog-showtoc' => 'Ihayag an taytayan nin mga laog (para sa mga pahinang igwang sobra sa 3 pamayohan)',
 'tog-rememberpassword' => 'Giromdoma an sakong paglaóg sa kilyaw (browser) na ini (para sa maximum na $1 {{PLURAL:$1|aldaw|mga aldaw}})',
-'tog-watchcreations' => 'Idagdag sa mga pahina na ako an nagmukna sa sakong bantay-listahan',
-'tog-watchdefault' => 'Idagdag an mga pahina na ako an nagliwat sa sakong bantay-listahan',
-'tog-watchmoves' => 'Idagdag an mga pahina na ako an nagbalyo sa sakong bantay-listahan',
-'tog-watchdeletion' => 'Idagdag an mga pahina na ako an nagpura sa sakong bantay-listahan',
+'tog-watchcreations' => 'Idagdag an mga pahina na ako an nagmukna asin an mga sagunson na ako an nagkarga sa sakong bantay-listahan',
+'tog-watchdefault' => 'Idagdag an mga pahina asin mga sagunson na ako an nagliwat sa sakong bantay-listahan',
+'tog-watchmoves' => 'Idagdag an mga pahina asin mga sagunson na ako an nagbalyo sa sakong bantay-listahan',
+'tog-watchdeletion' => 'Idagdag an mga pahina asin mga sagunson na ako an nagpura sa sakong bantay-listahan',
 'tog-minordefault' => 'Markahán gabos na saradit na pagliwat sa paaging panugmad',
 'tog-previewontop' => 'Ipahilíng an patànaw bàgo an kahon nin paghirá',
 'tog-previewonfirst' => 'Ipahilíng an patànaw sa enot na paghirá',
 'tog-nocache' => 'Pundoha an pagsaray nin mga pahina sa kilyaw (browser)',
-'tog-enotifwatchlistpages' => 'E-koreohan ako kunsoarin an sarong pahina sa sakong bantay-listahan (watchlist) pinagribayan',
+'tog-enotifwatchlistpages' => 'E-suratan mo ako kunsoarin an sarong pahina o sagunson na yaon sa sakong bantay-listahan pinagliwat',
 'tog-enotifusertalkpages' => 'E-koreohan ako pag pigribáyan an pahina kan sakóng olay',
-'tog-enotifminoredits' => 'E-koreohan man giraray ako para sa saradit na paghirá kan mga pahina',
+'tog-enotifminoredits' => 'E-suratan man ako para sa saraditon na mga pagliwat kan mga pahina asin mga sagunson',
 'tog-enotifrevealaddr' => 'Ibuyágyag an sakong e-koreong address sa pan-abisong mga e-koreo',
 'tog-shownumberswatching' => 'Ihayag an numero kan nagbabantay na mga parágamit',
 'tog-oldsig' => 'Tugmadong pirma',
 'tog-fancysig' => 'Trataron an pirma na wiki-teksto (mayo nin awtomatikong kilyaw)',
-'tog-externaleditor' => 'Gamíta nguna an panluwas na editor (para sa mga eksperto sana, minakaipo nin espesyal na mga panuytoy (settings) sa saimong kompyuter.',
+'tog-externaleditor' => 'Gamiton an pirmihan na panluwas na editor (para sa mga eksperto sana, minakaipo nin espesyal na mga panuytoy sa saimong kompyuter.
+[//www.mediawiki.org/wiki/Manual:External_editors Mga dagdag na impormasyon.])',
 'tog-externaldiff' => 'Gamíta an panluwas na diff nguna (para sa mga eksperto sana, minakaipo nin espesyal na mga panuytoy (settings) sa saimong kompyuter.
 [//www.mediawiki.org/wiki/Manual:External_editors Kadagdagang impormasyon.])',
 'tog-showjumplinks' => 'Paganaha an "luksó sa" kilyaw nin kalangkayan',
@@ -359,6 +360,10 @@ $1',
 'youhavenewmessages' => 'Igwa ka nin $1 ($2).',
 'newmessageslink' => 'mga bàgong mensahe',
 'newmessagesdifflink' => 'huring pagbàgo',
+'youhavenewmessagesfromusers' => 'Ika igwa nin $1 gikan sa {{PLURAL:$3|ibang paragamit|$3 mga paragamit}} ($2).',
+'youhavenewmessagesmanyusers' => 'Ika igwa nin $1 gikan sa kadakol na mga paragamit ($2).',
+'newmessageslinkplural' => '{{PLURAL:$1|sarong bagong mensahe|bagong mga mensahe}}',
+'newmessagesdifflinkplural' => 'huring {{PLURAL:$1|kaliwatan|mga kaliwatan}}',
 'youhavenewmessagesmulti' => 'Igwa ka nin mga bàgong mensahe sa $1',
 'editsection' => 'liwatón',
 'editold' => 'Liwatón',
@@ -411,12 +416,12 @@ Pwede mong mahiling an lista nin mga marhay na pahina sa [[Special:SpecialPages|
 # General errors
 'error' => 'Salâ',
 'databaseerror' => 'Salâ sa base nin datos',
-'dberrortext' => 'Sarong datos-sarayan na may napasalang sintaks an nangyari.
-Ini puwedeng minapanungod nin sarong kubol (bug) sa software.
+'dberrortext' => 'May kahaputan sa datos-sarayan sa napasalang sintaks an nangyari.
+Ini puwedeng minapanungod nin sarong kubol na yaon sa kasungatan .
 An pinakahuring pagprubar sa datos-sarayan naghahapot nin:
 <blockquote><tt>$1</tt></blockquote>
-hale sa laog kan punksyon na "<tt>$2</tt>".
-An datos-sarayan nagbalik nin sala na "<tt>$3: $4</tt>".',
+gikan sa laog kan punksyon na "<tt>$2</tt>".
+An pinagbalik na kasalaan sa datos-sarayan "<tt>$3: $4</tt>".',
 'dberrortextcl' => 'Sarong datos-sarayan na may napasalang sintaks an nangyari.
 An pinakahuring pagprubar sa datos-sarayan naghahapot nin:
 "$1"
@@ -428,11 +433,11 @@ An datos-sarayan nagbalik nin sala na "<tt>$3: $4</tt>".',
 'readonlytext' => 'Sarado mùna an base nin datos sa mga bàgong entrada asin iba pang mga pagribay, pwede gayod sa rutinang pagmantenir kan base nin datos, despues, mabalik na ini sa normal.
 
 Ini an eksplikasyon kan tagamató na nagkandado kaini: $1',
-'missing-article' => 'An datos-sarayan dae nakanagbo kan teksto nin sarong pahina na dapat kuta nang managboan, pinagngaran na "$1" S2.
+'missing-article' => 'An datos-sarayan dae nakanagbo nin teksto kan sarong pahina na dapat kuta nang managboan, pinagngaran na "$1" $2.
 
-Ini pirmeng pinagkakausa sa paagi nin pagsusunod nin sarong lumang diff o historiyang kilyawan na yaon sa sarong pahinang pinagpura na.
+Ini pirmeng pinagkakausa sa paagi nin pagsusunod nin sarong lumaon na diff o historiyang kasugpunan na yaon sa sarong pahinang pinagpura na.
 
-Kun iyo ini an kaso, ika nakanagbo nin sarong kubol (bug) sa software.
+Kun bako ini an kaso, ika nakanagbo nin sarong kubol sa kasungatan.
 Pakireport tabi ini sa [[Special:ListUsers/sysop|administrador]], na naka-antabay sa kilyawan.',
 'missingarticle-rev' => '(pagbàgo#: $1)',
 'missingarticle-diff' => '(Kaibhán: $1, $2)',
@@ -511,6 +516,7 @@ Dae ka man tabi malingaw na ribayan an saimong [[Special:Preferences|{{SITENAME}
 'remembermypassword' => 'Giromdoma an sakong paglaog sa kilyaw (browser) na ini (para sa maksimum na $1 {{PLURAL:$1|aldaw|mga aldaw}})',
 'securelogin-stick-https' => 'Magpirmeng konektado sa HTTPS matapos kang maglaog',
 'yourdomainname' => 'An saimong kasakupan:',
+'password-change-forbidden' => 'Ika dae makapagliwat nin sekretong panlaog sa wiking ini.',
 'externaldberror' => 'Igwa gayod sala sa arinman kan patunay sa datos-sarayan o ika dae pinagtugutan na bâgohon an saimong panluwas na panindog.',
 'login' => 'Maglaog',
 'nav-login-createaccount' => 'Maglaog / magmukna nin panindog',
@@ -715,7 +721,7 @@ Ika dae makakagamit kan 'e-koreo kaining paragamit' na panuytuyan laen lang na m
 An saimong presenteng IP address iyo $3, asin an kubkob ID iyo #$5.
 Pakibale na lang tabi an gabos na mga detalye sa itaas sa anuman na mga kahaputan na saimong himoon.",
 'autoblockedtext' => 'An saimong IP address awtomatikong pinagkubkob nin huli ta ini pinaggamit kan ibang paragamit, na pinagkubkob ni $1.
-An rason na ipinagtao iyo:
+An rason na ipinagtao iyo na:
 
 :\'\'$2\'\'
 
@@ -723,12 +729,12 @@ An rason na ipinagtao iyo:
 * Pagpasó kan pagkubkob: $6
 * Katuyuhan kan parakubkob: $7
 
-Puwede mong kontakon si $1 o saro sa [[{{MediaWiki:Grouppage-sysop}}|mga administrador] tanganing pag-orolayan an kubkob.
+Puwede mong kontakon si $1 o saro sa [[{{MediaWiki:Grouppage-sysop}}|mga administrador]] tanganing pag-orolayan an kubkob.
 
 Patanid tabi dae mo puwedeng gamiton an "e-koreo kaining paragamit" estima laen lang kun ika igwa nin sarong balidong e-koreo address na rehistrado sa saimong [[Special:Preferences|paragamit na mga kabotan]] asin ika dae pinagkubkob para sa paggamit kaini.
 
 An saimong presenteng IP address iyo an $3, asin and Kubkob ID iyo an #$5.
-Pakibale tabi an gabos na mga detalye sa itaas sa anuman na mga kahaputan na saimong himoon.',
+Pakibale tabi an gabos na mga detalye sa itaas sa arinman na mga kahaputan na saimong himoon.',
 'blockednoreason' => 'mayong itinaong rason',
 'whitelistedittext' => 'Kaipuhan mong $1 tangarig makahirá nin mga páhina.',
 'confirmedittext' => "Kaipuhan mong kompirmaron an saimong ''e''-surat. Ipwesto tabî asin patunayan an saimong ''e''-surat sa [[Special:Preferences|mga kabôtan kan parágamit]].",
@@ -758,17 +764,20 @@ o [{{fullurl:{{FULLPAGENAME}}|action=edit}} liwaton ining pahina]</span>.',
 'noarticletext-nopermission' => 'Mayo tabi sa presente nin teksto sa pahinang ini.
 Ika mapuwedeng [[Special:Search/{{PAGENAME}}|maghanap para sa titulo kan pahinang ini]] sa iba pang mga pahina,
 o <span class="plainlinks">[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} maghanap sa magkasurundong mga talaan]</span>.',
+'missing-revision' => 'An rebisyon #$1 kan pahina pinagngaranan na "{{PAGENAME}}" bakong eksistido.
+
+Ini pirmihan na pinagkakausa sa paagi nin pagsusunod nin luwas na petsang historiya nin kasugpunan pasiring sa sarong pahinang pinagpura na.
+An mga detalye matatagboan sa [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} pinagpura na talaan].',
 'userpage-userdoesnotexist' => 'Paragamit na panindog "$1" bako tabing rehistrado.
 Paki-tsek kun ika magustong magmukna/magliwat kaining pahina.',
 'userpage-userdoesnotexist-view' => 'Paragamit na panindog "$1" bako tabing rehistrado.',
 'blocked-notice-logextract' => 'Ining paragamit sa presente nakakubkob.
 An pinakahuring entrada kan pagkubkob nakahaya sa ibaba bilang reperensiya:',
-'clearyourcache' => "'''Note:''' Matapos maitagama, ika mapuwedeng makaluktos sa tagoan kan saimong kilyaw tanganing mahiling an mga naribayan.
-* '''Firefox / Safari:''' Pauntok na duon sa ''Shift'' habang pinipindot an ''Ikarga otro'', o pinduton as maski arin sa ''Ctrl-F5'' o ''Ctrl-R'' (''⌘-R'' para sa Mac)
+'clearyourcache' => "'''Antabay:''' Matapos maitagama, ika mapuwedeng magsalimbaw sa sarayan kan saimong kilyaw tanganing hilingon an mga naribayan.
+* '''Firefox / Safari:''' Pauntok na duon ''Shift'' habang pig-klik an ''Ikarga otro'', o pinduton an maski arin ''Ctrl-F5'' o ''Ctrl-R'' (''⌘-R'' para sa Mac)
 * '''Google Chrome:''' Pinduton ''Ctrl-Shift-R'' (''⌘-Shift-R'' para sa Mac)
-* '''Internet Explorer:''' Pauntok na duon sa ''Ctrl'' habang pinipindot an ''Ipresko otro'', o pinduton an ''Ctrl-F5''
-* '''Konqueror:''' Ipindot an ''Ikarga otro'' o pinduton an ''F5''
-* '''Opera:''' Linigan an tagoan sa ''Tools → Mga Kabotan''",
+* '''Internet Explorer:''' Pauntok na duon ''Ctrl'' habang pig-klik an ''Ipresko otro'', o pinduton ''Ctrl-F5''
+* '''Opera:''' Linigan an sarayan sa ''Mga Kagamitan → Mga Kabotan''",
 'usercssyoucanpreview' => "'''Tip:''' Gamita an \"{{int:showpreview}}\" na pindutan tanganing prubaran an saimong baguhong CSS bago ipagtagama.",
 'userjsyoucanpreview' => "'''Tip:''' Gamita an \"{{int:showpreview}}\" na pindutan tanganing prubaran an saimong baguhong JavaScript bago ipagtagama.",
 'usercsspreview' => "'''Giromdoma baya na ika nagtatanaw pa sana kan saimong paragamit sa CSS.'''
@@ -884,12 +893,13 @@ Ining mga argumento tabi pinagharali na.",
 'expansion-depth-exceeded-warning' => 'An pahina nagsobra sa panrarom na kalakbangan',
 'parser-unstrip-loop-warning' => 'Panul-ot na kaluktusan namansayan',
 'parser-unstrip-recursion-limit' => 'Panul-ot na rekusyong kasagkodan nagsobra ($1)',
+'converter-manual-rule-error' => 'Kasalaan detektado sa manwal na konbersyon kan pinapasunod sa lengguwahe',
 
 # "Undo" feature
 'undo-success' => 'Pwedeng bawion an paghirá. Sosogon tabì an pagkakaiba sa babâ tangarig maberipikár kun ini an boot mong gibohon, dangan itagama an mga pagbabàgo sa babâ tangarig tapuson an pagbawì sa paghirá.',
 'undo-failure' => 'Dai napogol an paghirá ta igwa pang ibang paghirá sa tahaw na nagkokomplikto.',
 'undo-norev' => 'An pagliwat dae tabi magigibo nin huli ta ini bakong eksistido o pinagpura na.',
-'undo-summary' => 'Ibalik tabi an pinagbabago $1 sa paagi [[Special:Contributions/$2|$2]] ([[Paragamit na Olay:$2|olay]])',
+'undo-summary' => 'Dae idagos an rebisyon $1 sa [[Special:Contributions/$2|$2]] ([[User talk:$2|olay]])',
 
 # Account creation failure
 'cantcreateaccounttitle' => 'Dai makagibo nin account',
@@ -934,7 +944,7 @@ Probaran tabì an [[Special:Search|pighahanap sa wiki]] para sa mga pahinang dap
 'rev-deleted-comment' => '(pagliwat na sumaryo pinaghale)',
 'rev-deleted-user' => '(hinalì an parágamit)',
 'rev-deleted-event' => '(talaan kan aksyon pinaghale)',
-'rev-deleted-user-contribs' => 'Paragamit na ngaran o IP address pinaghale - an pigliwat pinagtago gikan sa mga kontribusyon]',
+'rev-deleted-user-contribs' => '[Ngaran nin paragamit o IP address pinaghale - an pigliwat pinagtago gikan sa mga kontribusyon]',
 'rev-deleted-text-permission' => "An pinagbago tabi kaining pahina '''pinagpura'''.
 An mga detalye mananagboan sa [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} talaan kan pinagpura].",
 'rev-deleted-text-unhide' => "An pagbabago tabi kaining pahina '''pinagpura'''.
@@ -953,9 +963,9 @@ Mga detalye puwedeng managboan sa [{{fullurl:{{#Special:Log}}/delete|page={{FULL
 'rev-deleted-unhide-diff' => "Saro sa mga pagbabago kaining diff '''pinagpura'''.
 Mga detalye mapuwedeng managboan sa [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} talaan kan pinuraan].
 Ika mapuwede pa [$1 magtanaw kaining diff] kun ika nagmawot na magpadagos.",
-'rev-suppressed-unhide-diff' => "Saro sa mga pagbabago kaining diff '''pinaglubog'''.
-Mga detalye mapuwedeng managboan sa [{{fullurl:{{#Special:Log}}/suppress|page={{FULLPAGENAMEE}}}} talaan kan pinaglubog].
-Ika mapuwede pa man na [$1 matanaw ining diff] kun ika mawot na magdagos.",
+'rev-suppressed-unhide-diff' => "Saro sa mga rebisyon kaining diff '''pinaglubog'''.
+Mga detalye mapuwedeng managboan sa [{{fullurl:{{#Special:Log}}/suppress|page={{FULLPAGENAMEE}}}} pinaglubog na talaan].
+Ika mapuwede man na [$1 tanawon ining diff] kun ika mawot na magpadagos.",
 'rev-deleted-diff-view' => "Saro sa mga pinagbago kaining diff '''pinagpura'''.
 Ika makakapagtanaw kaining diff; mga detalye puwedeng mananagboan sa [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} talaan kan pinuraan].",
 'rev-suppressed-diff-view' => "Saro sa mga pinagbago kaining diff '''pinaglubog'''.
@@ -1039,9 +1049,9 @@ Himoon mong segurado na ining pagbabago makapagtala nin historikal na kapadagusa
 'mergehistory-from' => 'Gikanang pahina:',
 'mergehistory-into' => 'Destinasyong pahina:',
 'mergehistory-list' => 'Puwedeng maitiripon na historiya kan pagliwat',
-'mergehistory-merge' => 'An mga minasunod na mga pagbabago sa [[:$1]] mapuwedeng pagtiriponon na magin [[:$2]].
-Gamita an radyong pindutan sa kolum tanganing tiriponon sana an mga pagbabagong pinagmukna asin bago pa man an pinaghahayag na oras.
-Tandaan na an paggagamit kan nabigasyong kilyawan makakapaglapat giraray kaining kolum.',
+'mergehistory-merge' => 'An mga minasunod na mga rebisyon kan [[:$1]] mapuwedeng pagkasararoon na magin [[:$2]].
+Gamita an radyong pindutan sa kolum tanganing sararoon sana an mga rebisyon na pinagmukna sa asin bago pa man an pinagsambit na oras.
+Tandaan na an paggagamit kan nabigasyong nin mga kasurugponan makakapagliwat kaining kolum.',
 'mergehistory-go' => 'Ipahayag an mapuwedeng matiripon na mga pagliwat',
 'mergehistory-submit' => 'Tiripona an mga pagbabago',
 'mergehistory-empty' => 'Mayong mga pagbabago na puwedeng mapagtiripon.',
@@ -1073,6 +1083,10 @@ Tandaan na an paggagamit kan nabigasyong kilyawan makakapaglapat giraray kaining
 'editundo' => 'isulít',
 'diff-multi' => '({{PLURAL:$1|Saro intermediate na pagbabago|$1 mga intermediate na mga pagbabago}} by {{PLURAL:$2|sarong paragamit|$2 mga paragamit}} dae pinaghahayag)',
 'diff-multi-manyusers' => '({{PLURAL:$1|Sarong intermediate na pagbabago|$1 mga intermediate na mga pagbabago}} na sobra sa $2 {{PLURAL:$2|paragamit|mga paragamit}} dae pinaghahayag)',
+'difference-missing-revision' => '{{PLURAL:$2|sarong rebisyon|$2 mga rebisyon}} kaining diperensiya ($1) {{PLURAL:$2|na iyo an|kaidto na iyo an}} dae nanagboan.
+
+Ini pirmihan na pinagkakausa sa paagi nin pagsusunod nin luwas sa petsang diff na kasugponan pasiring sa sarong pahina na pinagpura na.
+An mga detalye mapuwedeng matatagboan sa [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} talaan kan pinagpuraan].',
 
 # Search results
 'searchresults' => 'Resulta kan paghánap',
@@ -1087,21 +1101,56 @@ Tandaan na an paggagamit kan nabigasyong kilyawan makakapaglapat giraray kaining
 'notextmatches' => 'Mayong ángay na teksto nin páhina',
 'prevn' => 'dating {{PLURAL:$1|$1}}',
 'nextn' => 'sunód na {{PLURAL:$1|$1}}',
+'prevn-title' => 'Dati $1 {{PLURAL:$1|resulta|mga resulta}}',
+'nextn-title' => 'Sunod $1  {{PLURAL:$1|resulta|mga resulta}}',
+'shown-title' => 'Ipahiling $1  {{PLURAL:$1|resulta|mga resulta}} sa kada pahina',
 'viewprevnext' => 'Hilingón ($1 {{int:pipe-separator}} $2) ($3)',
+'searchmenu-legend' => 'Opsyon sa paghahanap',
+'searchmenu-exists' => "'''Igwa nin sarong pahina na pinagngaranan na \"[[:\$1]]\" sa wiking ini.'''",
+'searchmenu-new' => "'''Muknaon an pahina \"[[:\$1]]\" sa wiking ini!'''",
 'searchhelp-url' => 'Help:Mga laog',
+'searchmenu-prefix' => '[[Special:PrefixIndex/$1|Kilyawon an mga pahina sa paagi kainin enotang panigmit]]',
+'searchprofile-articles' => 'Mga pahina nin laog',
+'searchprofile-project' => 'Mga pahina nin Tabang asin Proyekto',
+'searchprofile-images' => 'Multimidya',
 'searchprofile-everything' => 'Gabós',
+'searchprofile-advanced' => 'Adbansiyado',
 'searchprofile-articles-tooltip' => 'Hanapon sa $1',
+'searchprofile-project-tooltip' => 'Maghanap sa $1',
+'searchprofile-images-tooltip' => 'Maghanap nin mga sagunson',
+'searchprofile-everything-tooltip' => 'Maghanap nin gabos na laog (kabali an mga pahina nin olay)',
+'searchprofile-advanced-tooltip' => 'Maghanap nin pankustombreng espasyong-ngaran',
 'search-result-size' => '$1 ({{PLURAL:$2|1 tatarámon|$2 mga tatarámon}})',
+'search-result-category-size' => '{{PLURAL:$1|1 miyembro|$1 mga miyembro}} ({{PLURAL:$2|1 subkategorya|$2 mga subkategorya}}, {{PLURAL:$3|1 sagunson|$3 mga sagunson}})',
+'search-result-score' => 'Relebansiya: $1%',
+'search-redirect' => '(Panukdong otro $1)',
+'search-section' => '(Seksyon $1)',
 'search-suggest' => 'Boót mo iyó: $1',
+'search-interwiki-caption' => 'Tugang na mga proyekto',
+'search-interwiki-default' => '$1 na mga resulta:',
 'search-interwiki-more' => '(dakol pa)',
 'search-mwsuggest-enabled' => 'igwang mga suhestyon',
 'search-mwsuggest-disabled' => 'mayong suhestyon',
+'search-relatedarticle' => 'Kauyon',
+'mwsuggest-disable' => 'Pundohon an AJAX na mga suhestiyon',
+'searcheverything-enable' => 'Maghanap sa gabos na mga espasyong-ngaran',
+'searchrelated' => 'kauyon',
 'searchall' => 'gabós',
 'showingresults' => "Pigpapahiling sa babâ sagkod sa {{PLURAL:$1|'''1''' resulta|'''$1''' mga resulta}} poon sa #'''$2'''.",
 'showingresultsnum' => "Pigpapahiling sa babâ {{PLURAL:$3|'''1''' resulta|'''$3''' mga resulta}} poon sa #'''$2'''.",
-'nonefound' => "'''Pagiromdom''': An mga prakasong paghanap pirmeng kawsa kan paghanap kan mga tataramon na komún arog kan \"may\" asin \"sa\", huli ta an mga ini dai nakaíndise, o sa pagpili kan sobra sa sarong tataramon (an mga páhina sana na igwá kan gabos na pighahanap na tataramon an maipapahiling sa resulta).",
-'powersearch' => 'Pinaoróg na paghánap',
+'showingresultsheader' => "{{PLURAL:$5|Resulta '''$1''' kan '''$3'''|Mga Resulta '''$1 - $2''' kan '''$3'''}} para sa '''$4'''",
+'nonefound' => "'''Notang Antabay''': An ibang espasyong-ngaran sana an pirmihang pinaghahanap.
+Prubaran na panigmitan an saimong kahaputan nin ''all:'' sa paghanap kan gabos na laog (kabali an mga pahina nin olay, mga templato, etc), o gamiton an pinagmawot na espasyong ngaran bilang enotang panigmit.",
+'search-nonefound' => 'Mayo nin mga resulta na panampok sa kahaputan.',
+'powersearch' => 'Adbansiyadong paghahanap',
+'powersearch-legend' => 'Adbansiyadong paghahanap',
+'powersearch-ns' => 'Maghanap sa mga espasyong-ngaran:',
+'powersearch-redir' => 'Listahan kan mga panukdong otro',
 'powersearch-field' => 'Hanápon an',
+'powersearch-togglelabel' => 'Pamili:',
+'powersearch-toggleall' => 'Gabos',
+'powersearch-togglenone' => 'Wara',
+'search-external' => 'Panluwas na paghahanap',
 'searchdisabled' => 'Pigpopogolan mûna an paghanap sa {{SITENAME}}. Mientras tanto, pwede ka man maghanap sa Google. Giromdomon tabî na an mga indise kan laog ninda sa {{SITENAME}} pwede ser na lumâ na.',
 
 # Quickbar
@@ -1111,37 +1160,57 @@ Tandaan na an paggagamit kan nabigasyong kilyawan makakapaglapat giraray kaining
 'qbsettings-fixedright' => 'Nakatakód sa tûo',
 'qbsettings-floatingleft' => 'Naglálatáw sa walá',
 'qbsettings-floatingright' => 'Naglálatáw sa tûo',
+'qbsettings-directionality' => 'Nakadukot, minadepende sa skrip panukdoan kan saimong lengguwahe',
 
 # Preferences page
 'preferences' => 'Mga kabòtan',
 'mypreferences' => 'Mga kabòtan ko',
 'prefs-edits' => 'Bilang kan mga hirá:',
 'prefsnologin' => 'Dai nakalaog',
-'prefsnologintext' => 'Ika dapat si [[Special:UserLogin|nakalaog]] para makapwesto nin mga kabôtan nin parágamit.',
+'prefsnologintext' => 'Ika dapat na magin <span class="plainlinks">[{{fullurl:{{#Special:UserLogin}}|returnto=$1}} nakalaog na]</span> tanganing tuytuyon an mga kabotan nin paragamit.',
 'changepassword' => 'Ribayan an sekretong panlaog',
 'prefs-skin' => "''Skin''",
 'skin-preview' => 'Tânawon',
 'datedefault' => 'Mayong kabôtan',
+'prefs-beta' => 'Mga posturang yaon sa beta',
 'prefs-datetime' => 'Petsa asin oras',
+'prefs-labs' => 'Mga posturang yaon sa Labs',
+'prefs-user-pages' => 'Paragamit na mga pahina',
 'prefs-personal' => 'Pambisto nin parágamit',
 'prefs-rc' => 'Mga kaaagi pa sanang pagribay',
 'prefs-watchlist' => 'Pigbabantayan',
-'prefs-watchlist-days' => 'Máximong número nin mga aldaw na ipapahiling sa lista nin mga pigbabantayan:',
+'prefs-watchlist-days' => 'Mga aldaw na ipahiling sa batay-listahan:',
+'prefs-watchlist-days-max' => 'Maksimum $1 {{PLURAL:$1|aldaw|mga aldaw}}',
 'prefs-watchlist-edits' => 'Máximong número nin pagbabâgo na ipapahiling sa pinadakulang lista nin pigbabantayan:',
+'prefs-watchlist-edits-max' => 'Maksimum na numero: 1000',
+'prefs-watchlist-token' => 'Token sa Bantay-listahan:',
 'prefs-misc' => 'Lain',
+'prefs-resetpass' => 'Liwaton an sekretong panlaog',
+'prefs-changeemail' => 'Liwaton an e-surat na adres',
+'prefs-setemail' => 'Tuytuyon an e-surat na adres',
+'prefs-email' => 'E-surat na mga pagpipilian',
+'prefs-rendering' => 'Hitsurahon',
 'saveprefs' => 'Itagama',
-'resetprefs' => 'Ipwesto giraray',
+'resetprefs' => 'Linigan an dae naitagamang mga kaliwatan',
+'restoreprefs' => 'Ibalik an gabos na pirmihang mga panuytoy',
 'prefs-editing' => 'Pighihira',
+'prefs-edit-boxsize' => 'Sukol kan bintana sa pagliwat.',
 'rows' => 'Mga hilera:',
 'columns' => 'Mga taytay:',
 'searchresultshead' => 'Hanápon',
 'resultsperpage' => 'Mga tamà kada pahina:',
 'stub-threshold' => 'Kasagkoran kan <a href="#" class="stub">takod kan tambô</a> pigpopormato:',
+'stub-threshold-disabled' => 'Pinagpundo',
 'recentchangesdays' => 'Mga aldáw na ipapahilíng sa mga nakakaági pa sanáng pagbabàgó:',
-'recentchangescount' => 'Bilang nin mga paghirá na ipapahilíng sa mga nakakaági pa sanáng pagbabàgó:',
+'recentchangesdays-max' => 'Maksimum $1 {{PLURAL:$1|aldaw|mga aldaw}}',
+'recentchangescount' => 'Numero kan mga pagliliwat na ipapahiling na pirmihan:',
+'prefs-help-recentchangescount' => 'Kabali kaini an dae pa nahaloy na mga kaliwatan, mga historiyang pahina, asin mga talaan.',
+'prefs-help-watchlist-token' => 'An pagpapano sa parteng ini nin sarong sekretong susi magbubuswang nin RSS feed para sa saimong bantay-listahan.
+Siisay man na nakakaaram kan suri sa parteng ini makakabasa kan saimong bantay-listahan, kaya magpili nin sarong seguradong halaga.
+Uya an halaga sa random na pagbuswang na puwede mong magamit: $1',
 'savedprefs' => 'Itinagama na an mga kabôtan mo.',
-'timezonelegend' => 'Zona nin oras',
-'localtime' => 'Lokal na oras',
+'timezonelegend' => 'Pan-oras na sona:',
+'localtime' => 'Panlokal na oras:',
 'timezoneuseserverdefault' => 'Gamita an panugmad sa wiki ($1)',
 'timezoneuseoffset' => 'Iba pa (ihayag an pambawi)',
 'timezoneoffset' => 'Bawia¹:',
@@ -1169,22 +1238,38 @@ Tandaan na an paggagamit kan nabigasyong kilyawan makakapaglapat giraray kaining
 'prefs-reset-intro' => 'Ika makakagamit kaining pahina tanganing ilapat giraray an saimong mga kabotan sa panugmad kan sayt.
 Ini dae tabi matitingkog.',
 'prefs-emailconfirm-label' => 'Kumpirmasyon sa E-koreo',
+'prefs-textboxsize' => 'Sukol kan bintana sa pagliliwat',
 'youremail' => 'E-koreo:',
 'username' => 'Pangaran kan parágamit:',
 'uid' => 'ID kan parágamit:',
 'prefs-memberingroups' => 'Miembro kan {{PLURAL:$1|grupo|grupos}}:',
+'prefs-registration' => 'Rehistrasyong oras:',
 'yourrealname' => 'Totoong pangaran:',
 'yourlanguage' => 'Tataramon:',
-'yourvariant' => 'Bariante:',
-'yournick' => 'Gahâ:',
+'yourvariant' => 'Panlaog na lengguwaheng kairibanhan:',
+'prefs-help-variant' => 'Saimong pinagpiling kairibanhan o ortograpiya tanganing ipahiling an laog kaining mga pahina sa wiking ini.',
+'yournick' => 'Panibagong pirma:',
+'prefs-help-signature' => 'Mga komentaryo sa mga pahina nin olay dapat pirmado nin "<nowiki>~~~~</nowiki>" na pagriribayon na magin saimong pirma asin sarong panimbreng oras.',
 'badsig' => 'Dai pwede an bâgong pirmang ini; isúsog an mga HTML na takód.',
-'badsiglength' => 'Halabâon an gahâ; kaipuhan dai mababà sa $1 na mga karakter.',
+'badsiglength' => 'An saimong pirma grabe kahalabaon.
+Ini dapat dae magsobra sa $1 {{PLURAL:$1|karakter|mga karakter}} an laba.',
+'yourgender' => 'Pagkatawo:',
+'gender-unknown' => 'Dae nakasambit',
 'gender-male' => 'Lalaki',
 'gender-female' => 'Babai',
+'prefs-help-gender' => 'Opsyonal: Ginagamit para sa pagkatawong pag-apod sa paagi nin kasungatan.
+Ining impormasyon magigin pampubliko.',
 'email' => 'E-koreo',
 'prefs-help-realname' => 'Opsyonal an totoong pangaran asin kun itatao mo ini, gagamiton ini yangarig an mga sinurat mo maatribuir saimo.',
-'prefs-help-email' => 'Opsyonal an e-koreo, alagad pwede ka na masosog kan iba sa paagi kan saimong pahina o pahina nin olay na dai kinakaipuhan na ipabisto an identidad mo.',
+'prefs-help-email' => 'An e-surat na adres sarong opsyonal, alagad ini kinakaipohan para sa pagtuytoy otro kan sekretong panlaog, kun ika malingaw kan saimong sekretong panlaog.',
+'prefs-help-email-others' => 'Ika kan man pumili na magtugot sa iba na makontak ka sa e-surat sa paagi nin sarong kasugponan na yaon sa saimong pahina nin paragamit o olay.
+An saimong e-surat na adres dae ipagbuyagyag kunsoarin na an ibang paragamit makontak saimo.',
 'prefs-help-email-required' => 'Kaipuhan an e-koreo.',
+'prefs-info' => 'Panuntong na impormasyon',
+'prefs-i18n' => 'Internasyonalisasyon',
+'prefs-signature' => 'Pirma',
+'prefs-dateformat' => 'Pampetsang pormat',
+'prefs-timeoffset' => 'Pan-oras na tapal',
 'prefs-advancedrc' => 'Pangenot na mga pagpipilian',
 'prefs-advancedrendering' => 'Abantidong mga pagpipilian',
 'prefs-advancedsearchoptions' => 'Abantidong mga pagpipilian',
@@ -2529,7 +2614,7 @@ Please visit [//www.mediawiki.org/wiki/Localisation MediaWiki Localisation] and
 'import-invalid-interwiki' => 'Dae makakapag-importa gikan sa pinagsambit na wiki.',
 'import-error-edit' => 'An pahina "$1" bakong importado nin huli ta ika dae tinutugutan na magliliwat kaini.',
 'import-error-create' => 'An pahina "$1" bakong importado nin huli ta ika dae tinutugutan na magmumukna kaini.',
-'import-error-interwiki' => 'An pahina "$!" bakong importado nin huli ta an ngaran kaini reserbado para sa panluwas na kasugponan (interwiki).',
+'import-error-interwiki' => 'An pahina "$1" bakong importado nin huli ta an ngaran kaini reserbado para sa panluwas na kasugponan (interwiki).',
 'import-error-special' => 'An pahina "$1" bakong importado nin huli ta ini kabali sa espesyal an espasyong-ngaran na dae nagtutugot nin mga pahina.',
 'import-error-invalid' => 'An pahina "$1" bakong importado nin huli ta an ngaran kaini imbalido.',
 'import-options-wrong' => 'Salang {{PLURAL:$2|pagpipilian|mga pagpipilian}}: <nowiki>$1</nowiki>',
@@ -2659,7 +2744,10 @@ Ini hurot na pinagkausa nin sarong sugpunan pasiring sa sarong pinagbawal na pan
 
 # Info page
 'pageinfo-title' => 'Impormasyon para sa "$1"',
-'pageinfo-header-edits' => 'Mga pagliliwat',
+'pageinfo-header-basic' => 'Panuntungang impormasyon',
+'pageinfo-header-edits' => 'Pagliwat na historiya',
+'pageinfo-header-restrictions' => 'Pampahinang proteksyon',
+'pageinfo-header-properties' => 'Pampahinang propriyedades',
 'pageinfo-views' => 'Numero kan mga patanaw',
 'pageinfo-watchers' => 'Numero kan mga parabantay',
 'pageinfo-edits' => 'Numero kan mga pagliliwat',
@@ -2807,94 +2895,402 @@ An mga iba pagtatagoon sa paagi nin pirmehan.
 'exif-contrast' => 'Kontraste',
 'exif-imageuniqueid' => 'Unikong ID kan ladawan',
 'exif-gpstrack' => 'Direksyon kan paghirô',
+'exif-gpsimgdirectionref' => 'Reperensiya para sa direksyon kan imahe',
 'exif-gpsimgdirection' => 'Direksyon kan ladáwan',
+'exif-gpsmapdatum' => 'Heodetikong surbey an datos na pinaggamit',
+'exif-gpsdestlatituderef' => 'Reperensiya para sa panlatitud na destinasyon',
+'exif-gpsdestlatitude' => 'Panlatitud na destinasyon',
+'exif-gpsdestlongituderef' => 'Reperensiya para sa panlongitud na destination',
+'exif-gpsdestlongitude' => 'Panlongitud na destinasyon',
+'exif-gpsdestbearingref' => 'Reperensiya para sa pandireksyon na destinasyon',
+'exif-gpsdestbearing' => 'Pandireksyon na destinasyon',
+'exif-gpsdestdistanceref' => 'Reperensiya para sa pandistansiya na destinasyon',
 'exif-gpsdestdistance' => 'Distansya sa destinasyon',
+'exif-gpsprocessingmethod' => 'Ngaran kan GPS na pamprosesong kapaagihan',
+'exif-gpsareainformation' => 'Ngaran nin lugar kan GPS',
+'exif-gpsdatestamp' => 'Petsa kan GPS',
+'exif-gpsdifferential' => 'Diperensiyal na koreksyon kan GPS',
+'exif-jpegfilecomment' => 'Komentaryo sa JPEG na sagunson',
+'exif-keywords' => 'Mga Susing taramon',
+'exif-worldregioncreated' => 'Rehiyon kan kinaban na pinagkuanan kan litrato',
+'exif-countrycreated' => 'Nasyon na pinagkuanan kan litrato',
+'exif-countrycodecreated' => 'Koda para sa nasyon na pinagkuanan kan litrato',
+'exif-provinceorstatecreated' => 'Probinsiya o estado na pinagkuanan kan litratro',
+'exif-citycreated' => 'Siyudad na pinagkuanan kan litrato',
+'exif-sublocationcreated' => 'Sublokasyon kan siyudad na pinagkuanan kan litrato',
+'exif-worldregiondest' => 'Rehiyon kan kinaban pinapahiling',
+'exif-countrydest' => 'Nasyon ipinapahiling',
+'exif-countrycodedest' => 'Koda para sa nasyon na ipinahiling',
+'exif-provinceorstatedest' => 'Probinsiya o estadong ipinapahiling',
+'exif-citydest' => 'Siyudad ipinahiling',
+'exif-sublocationdest' => '
+Sublokas kan siyudad na ipinahiling',
+'exif-objectname' => 'Halipot na titulo',
+'exif-specialinstructions' => 'Espesyal na mga instruksyon',
+'exif-headline' => 'Pamayuhang-linya',
+'exif-credit' => 'Pautang/Tagapagtao',
+'exif-source' => 'Pinaggikanan',
+'exif-editstatus' => 'Editoryal na kamugtakan kan imahe',
+'exif-urgency' => 'Kahidalian',
+'exif-fixtureidentifier' => 'Ngaran kan agwerto',
+'exif-locationdest' => 'Lokasyon pinagbiklad',
+'exif-locationdestcode' => 'Koda kan lokasyon pinagbiklad',
+'exif-objectcycle' => 'Oras kan aldaw na an midya pinagtuyuhan',
+'exif-contact' => 'Impormasyon kan kontak',
+'exif-writer' => 'Parasurat',
+'exif-languagecode' => 'Lengguwahe',
+'exif-iimversion' => 'IIM bersyon',
+'exif-iimcategory' => 'Kategoriya',
+'exif-iimsupplementalcategory' => 'Pansuplementong mga kategoriya',
+'exif-datetimeexpires' => 'Dae gamiton pagkatapos',
+'exif-datetimereleased' => 'Pinaluwas kan',
+'exif-originaltransmissionref' => 'Orihinal na transmisyon sa koda nin lokasyon',
+'exif-identifier' => 'Tagapagpamidbid',
+'exif-lens' => 'Lenteng pinaggamit',
+'exif-serialnumber' => 'Seryal na numero kan kamera',
+'exif-cameraownername' => 'Kagsadire kan kamera',
+'exif-label' => 'Tatak',
+'exif-datetimemetadata' => 'Petsa kan metadata na huring pinagbago',
+'exif-nickname' => 'Impormal na ngaran kan imahe',
+'exif-rating' => 'Kamarkahan (luwas sa lima)',
+'exif-rightscertificate' => 'Sertipiko kan manihamento nin mga karapatan',
+'exif-copyrighted' => 'Estado sa karapatan nin panurat',
+'exif-copyrightowner' => 'Kagsadire sa karapatan nin panurat',
+'exif-usageterms' => 'Mga Terminong Ginagamit',
+'exif-webstatement' => 'Online na testamento sa karapatan nin panurat',
+'exif-originaldocumentid' => 'Unikong ID kan orihinal na dokumento',
+'exif-licenseurl' => 'Kilyawan para sa lisensiya nin karapatan sa panurat',
+'exif-morepermissionsurl' => 'Alternatibong impormasyon sa paglilisensiya',
+'exif-attributionurl' => 'Kunsoarin gagamiton otro ining gibo, pakisugpon sa',
+'exif-preferredattributionname' => 'Kunsoarin gagamiton otro ining gibo, sabihon tabi an kredito',
+'exif-pngfilecomment' => 'Komentaryo sa PNG na sagunson',
+'exif-disclaimer' => 'Pagpapasimuya',
+'exif-contentwarning' => 'Patanid kan laog',
+'exif-giffilecomment' => 'Komentary sa GIF na sagunson',
+'exif-intellectualgenre' => 'Tipo kan Aytem',
+'exif-subjectnewscode' => 'Koda kan subheto',
+'exif-scenecode' => 'IPTC pan-eksenang koda',
+'exif-event' => 'Panyayaring pinagbiklad',
+'exif-organisationinimage' => 'Organisasyon pinagbiklad',
+'exif-personinimage' => 'Persona pinagbiklad',
+'exif-originalimageheight' => 'Langkaw kan imahe bago ini pinagkrap',
+'exif-originalimagewidth' => 'Lakbang kan imahe bago ini pinagkrap',
+
+# EXIF attributes
+'exif-compression-1' => 'Pinaghalugaan',
+'exif-compression-2' => 'CCITT Grupong 3 1-Dimensyonal na pagbabago ni Huffman nagdadalagan nin halawig na pag-enkod',
+'exif-compression-3' => 'CCITT Grupong 3 pinag-enkod sa fax',
+'exif-compression-4' => 'CCITT Grupong 3 pinag-enkod sa fax',
+
+'exif-copyrighted-true' => 'Nakatagamang karapatan sa panurat',
+'exif-copyrighted-false' => 'Pampublikong Kinasakupan',
 
 'exif-unknowndate' => 'Daí aram an petsa',
 
+'exif-orientation-1' => 'Normalon',
+'exif-orientation-2' => 'Pahigdang pinagbuklat',
+'exif-orientation-3' => 'Pinag-ikot nin 180 grado',
+'exif-orientation-4' => 'Patindog na pinagbuklot',
+'exif-orientation-5' => 'Pinag-ikot nin 90 grade asin patindog na pinagbuklat',
+'exif-orientation-6' => 'Pinag-ikot nin 90 grado sa CCW',
+'exif-orientation-7' => 'Pinag-ikot nin 90 grade CW asin patindog na pinagbuklat',
+'exif-orientation-8' => 'Pinag-ikot nin 90 grado sa CW',
+
+'exif-planarconfiguration-1' => 'Patingi na pormat',
+'exif-planarconfiguration-2' => 'Planar na pormat',
+
+'exif-colorspace-65535' => 'Bakong kalibrado',
+
 'exif-componentsconfiguration-0' => 'mayô man ini',
 
+'exif-exposureprogram-0' => 'Mayong pinagkahulugan',
+'exif-exposureprogram-1' => 'Manwal',
+'exif-exposureprogram-2' => 'Normal na programa',
+'exif-exposureprogram-3' => 'Apertoryong Prayoridad',
+'exif-exposureprogram-4' => 'Panseradong Prayoridad',
+'exif-exposureprogram-5' => 'Pangmuknaon na programa (minapabor sa hararomon na kinasakupan)',
+'exif-exposureprogram-6' => 'Pamprogramang Aksyon (minauyon sa mabilison pampundong buklos)',
+'exif-exposureprogram-7' => 'Modong patindog (para haranihang mga litrato na igwang kalikudan na luwas sa pokus)',
+'exif-exposureprogram-8' => 'Modong pahigda ( para sa pahigdang mga litrato na igwang kalikudan na nakapokus)',
+
 'exif-subjectdistance-value' => '$1 metros',
 
 'exif-meteringmode-0' => 'Dai aram',
+'exif-meteringmode-1' => 'Kagtahawan',
+'exif-meteringmode-2' => 'Sentrong pinaggabatan na kagtahawan',
+'exif-meteringmode-3' => 'Kaghilngan',
+'exif-meteringmode-4' => 'Pandakol na kaghilngan',
+'exif-meteringmode-5' => 'Pangarugan',
+'exif-meteringmode-6' => 'Parsyal',
 'exif-meteringmode-255' => 'Iba pa',
 
+'exif-lightsource-0' => 'Bakong bistado',
+'exif-lightsource-1' => 'Maliwanagong aldaw',
+'exif-lightsource-2' => 'Kalaadan',
+'exif-lightsource-3' => 'Tungsten (mainitong liwanag)',
 'exif-lightsource-4' => 'Kitkilát',
 'exif-lightsource-9' => 'Magayón na panahón',
+'exif-lightsource-10' => 'Mapanginurong panahon',
+'exif-lightsource-11' => 'Lindong',
+'exif-lightsource-12' => 'Pan-agang kalaadan (D 5700 - 7100K)',
+'exif-lightsource-13' => 'Pan-agang mapution na kalaadan (N 4600 - 5400K)',
+'exif-lightsource-14' => 'Malipotong mapution na kalaadan (W 3900 - 4500K)',
+'exif-lightsource-15' => 'Maputiong kalaadan (WW 3200 - 3700K)',
+'exif-lightsource-17' => 'Estandarteng Laad A',
+'exif-lightsource-18' => 'Estandarteng Laad B',
+'exif-lightsource-19' => 'Estandarteng Laad C',
+'exif-lightsource-24' => 'ISO estudyong tungsten',
 'exif-lightsource-255' => 'Mga ibang ginikanan nin ilaw',
 
+# Flash modes
+'exif-flash-fired-0' => 'An flash dae nagsindi',
+'exif-flash-fired-1' => 'An flash nagsindi',
+'exif-flash-return-0' => 'mayong estrobo sa pambalik na punksyon sa deteksyon',
+'exif-flash-return-2' => 'estrobong pambalik liwanag bakong detektado',
+'exif-flash-return-3' => 'estrobong pambalik na liwanag detektado',
+'exif-flash-mode-1' => 'kompulsaryong flash nagsindi',
+'exif-flash-mode-2' => 'kompulsaryong flash pinupugulan',
+'exif-flash-mode-3' => 'automatikong modo',
+'exif-flash-function-1' => 'Mayong naggaganang flash',
+'exif-flash-redeye-1' => 'mapulang-mata modong pambawas',
+
 'exif-focalplaneresolutionunit-2' => 'pulgada',
 
+'exif-sensingmethod-1' => 'Mayong pakahulugan',
+'exif-sensingmethod-2' => 'Tagahimate kan solong pinyero nin pankolor sa erya',
+'exif-sensingmethod-3' => 'Tagahimate kan panduwahang pinyero nin pankolor sa erya',
+'exif-sensingmethod-4' => 'Tagahimate kan pantolohang pinyero nin pankolor sa erya',
+'exif-sensingmethod-5' => 'Tagahimate kan pasurunod na pankolor sa erya',
+'exif-sensingmethod-7' => 'Pantolohang linya na tagahimate',
+'exif-sensingmethod-8' => 'Pankolor na pasurunod kan panlinyang tagahimate',
+
+'exif-filesource-3' => 'Nakauntok na kamerang digital',
+
 'exif-scenetype-1' => 'Direktong naretratong ladawan',
 
+'exif-customrendered-0' => 'Normal na proseso',
+'exif-customrendered-1' => 'Pambagong proseso',
+
+'exif-exposuremode-0' => 'Awto na pamburiyas',
+'exif-exposuremode-1' => 'Manwal na pamburiyas',
+'exif-exposuremode-2' => 'Awto na pankorda',
+
+'exif-whitebalance-0' => 'Awto pambalanse kan puti',
+'exif-whitebalance-1' => 'Manwal na pambalanse kan puti',
+
+'exif-scenecapturetype-0' => 'Estandarte',
+'exif-scenecapturetype-1' => 'Pahigda',
 'exif-scenecapturetype-2' => 'Retrato',
 'exif-scenecapturetype-3' => 'Eksenang banggi',
 
+'exif-gaincontrol-0' => 'Mayo',
+'exif-gaincontrol-1' => 'Hababaong pampalangkaw',
+'exif-gaincontrol-2' => 'Paitaas na pampalangkaw',
+'exif-gaincontrol-3' => 'Hababaong pampababa',
+'exif-gaincontrol-4' => 'Paitaas na pampababa',
+
+'exif-contrast-0' => 'Normal',
+'exif-contrast-1' => 'Malumoy',
+'exif-contrast-2' => 'Matagas',
+
+'exif-saturation-0' => 'Normal',
+'exif-saturation-1' => 'Hababaon na satyurasyon',
+'exif-saturation-2' => 'Halangkawon na satyurasyon',
+
+'exif-sharpness-0' => 'Normal',
+'exif-sharpness-1' => 'Malumoy',
+'exif-sharpness-2' => 'Matagas',
+
+'exif-subjectdistancerange-0' => 'Bakong bisto',
+'exif-subjectdistancerange-1' => 'Makro',
+'exif-subjectdistancerange-2' => 'Haranihon pagtanaw',
+'exif-subjectdistancerange-3' => 'Harayoong pagtanaw',
+
+# Pseudotags used for GPSLatitudeRef and GPSDestLatitudeRef
+'exif-gpslatitude-n' => 'Norteng kasalungaan',
+'exif-gpslatitude-s' => 'Sur na kasalungaan',
+
+# Pseudotags used for GPSLongitudeRef and GPSDestLongitudeRef
+'exif-gpslongitude-e' => 'Esteng kahalungaan',
+'exif-gpslongitude-w' => 'Westeng kahalungaan',
+
+# Pseudotags used for GPSAltitudeRef
+'exif-gpsaltitude-above-sealevel' => '$1 {{PLURAL:$1|metro|metros}} ibabaw sa kaabtangan nin dagat',
+'exif-gpsaltitude-below-sealevel' => '$1 {{PLURAL:$1|metro|metros}} ibaba sa kaabtangan nin dagat',
+
+'exif-gpsstatus-a' => 'Kasukolan yaon sa progreso',
+'exif-gpsstatus-v' => 'Kasukolan yaon sa panlaog na operabilidad',
+
+'exif-gpsmeasuremode-2' => 'Duwahang dimensyon na kasukolan',
+'exif-gpsmeasuremode-3' => 'Pantolohang dimensyon na kasukolan',
+
 # Pseudotags used for GPSSpeedRef
 'exif-gpsspeed-k' => 'Kilometros kada oras',
 'exif-gpsspeed-m' => 'Milya kada oras',
+'exif-gpsspeed-n' => 'kanukso',
+
+# Pseudotags used for GPSDestDistanceRef
+'exif-gpsdestdistance-k' => 'kilometros',
+'exif-gpsdestdistance-m' => 'Milyas',
+'exif-gpsdestdistance-n' => 'Milya nautikal',
+
+'exif-gpsdop-excellent' => 'Ekselente ($1)',
+'exif-gpsdop-good' => 'Marahayon ($1)',
+'exif-gpsdop-moderate' => 'Moderato ($1)',
+'exif-gpsdop-fair' => 'Marahay-rahay ($1)',
+'exif-gpsdop-poor' => 'Maluyahon ($1)',
+
+'exif-objectcycle-a' => 'Pan-aga sana',
+'exif-objectcycle-p' => 'Panbanggi sana',
+'exif-objectcycle-b' => 'Pareho sa pagka-aga asin pagkabanggi',
 
 # Pseudotags used for GPSTrackRef, GPSImgDirectionRef and GPSDestBearingRef
 'exif-gpsdirection-t' => 'Tunay na direksyon',
 'exif-gpsdirection-m' => 'Direksyón nin batobalani',
 
+'exif-ycbcrpositioning-1' => 'Pinagpatahaw',
+'exif-ycbcrpositioning-2' => 'Katampad-sityo',
+
+'exif-dc-contributor' => 'Mga Tagapag-ambag',
+'exif-dc-coverage' => 'Espasyal o temporal tungkos kan midya',
+'exif-dc-date' => 'Petsa (s)',
+'exif-dc-publisher' => 'Publikador',
+'exif-dc-relation' => 'Kaampad na midya',
+'exif-dc-rights' => 'Mga karapatan',
+'exif-dc-source' => 'Ginikanang midya',
+'exif-dc-type' => 'Tipo kan midya',
+
+'exif-rating-rejected' => 'Dinihado',
+
+'exif-isospeedratings-overflow' => 'Halangkawon kesa 65535',
+
+'exif-iimcategory-ace' => 'Mga arte, kultura asin kasalingayan',
+'exif-iimcategory-clj' => 'Krimen asin ley',
+'exif-iimcategory-dis' => 'Mga destroso asin aksidente',
+'exif-iimcategory-fin' => 'Ekonomiya asin negosyo',
+'exif-iimcategory-edu' => 'Edukasyon',
+'exif-iimcategory-evn' => 'Kapalibutan',
+'exif-iimcategory-hth' => 'Salud',
+'exif-iimcategory-hum' => 'Pantawong interes',
+'exif-iimcategory-lab' => 'Trabaho',
+'exif-iimcategory-pol' => 'Mga Pulitika',
+'exif-iimcategory-rel' => 'Relihiyon asin paniniwala',
+'exif-iimcategory-sci' => 'Siyensiya asin teknolohiya',
+'exif-iimcategory-soi' => 'Mga pansosyal na mga isyu',
+'exif-iimcategory-spo' => 'Mga Pakawat',
+'exif-iimcategory-war' => 'Giyera, iriwal asin daeng-kahingaloan',
+'exif-iimcategory-wea' => 'Panahon',
+
+'exif-urgency-normal' => 'Normalon ($1)',
+'exif-urgency-low' => 'Hababaon ($1)',
+'exif-urgency-high' => 'Halangkawon ($1)',
+'exif-urgency-other' => 'Prayoridad na pakahulugan nin paragamit ($1)',
+
 # External editor support
 'edit-externally' => 'Hirahón an file gamit an panluwas na aplikasyon',
-'edit-externally-help' => 'Hilingón an  [//www.mediawiki.org/wiki/Manual:External_editors setup instructions] para sa iba pang mga impormasyon.',
+'edit-externally-help' => '(Hilngon an [//www.mediawiki.org/wiki/Manual:External_editors setup instructions] para sa kadagdagang impormasyon)',
 
 # 'all' in various places, this might be different for inflected languages
 'watchlistall2' => 'gabos',
 'namespacesall' => 'gabós',
 'monthsall' => 'gabos',
+'limitall' => 'gabos',
 
 # E-mail address confirmation
 'confirmemail' => "Kompirmaron an ''e''-surat",
 'confirmemail_noemail' => "Mayô kang pigkaag na marhay na ''e''-surat sa saimong [[Special:Preferences|mga kabôtan nin parágamit]].",
-'confirmemail_text' => "Kaipuhan an pag-''validate'' kan saimong e-koreo bago ka makagamit nin ''features'' na e-koreo. Pindoton an butones sa babâ tangarig magpadara nin kompirmasyon sa saimong e-koreo. An surat igwang takod na may koda; ikarga an takod sa browser para makompirmar na valido an saimong e-koreo.",
+'confirmemail_text' => '{{SITENAME}} minakaipo na balidaron an saimong e-surat na adres bago mo gagamiton an mga estima kan e-surat.
+Aktibaron an tipahan sa ibaba tanganing ipadara an pankumpirmang surat sa saimong adres.
+An surat igwa nin sarong kasugpunan na kinaagan nin sarong koda;
+ikarga an kasugpunan sa saimong kilyaw tanganing makumpirma na an saimong e-surat na adres balido.',
 'confirmemail_pending' => "May pigpadara nang kompirmasyon sa ''e''-surat mo; kun kagigibo mo pa sana kan saimong ''account'', maghalat ka nin mga dikit na minutos bago ka maghagad giraray nin bâgong ''code''.",
 'confirmemail_send' => 'Magpadará nin kompirmasyon',
 'confirmemail_sent' => "Napadará na an kompirmasyon sa ''e''-surat.",
 'confirmemail_oncreate' => "May pigpadara nang kompirmasyon sa saimong ''e''-surat.
 Dai man kaipuhan ini para makalaog, pero kaipuhan mong itao ini bago
 ka makagamit nin ''features'' na basado sa ''e''-surat sa wiki.",
-'confirmemail_sendfailed' => "Dai napadará an kompirmasyon kan ''e''-surat. Seguradohon tabî kun igwang sala.
+'confirmemail_sendfailed' => '{{SITENAME}} dae nakapadara kan saimong pankumpirmang surat.
+Pakihiling tabi sa saimong e-surat na adress para sa imbalidong mga karakter.
 
-Pigbalik: $1",
+Paradarang surat pinagbalik: $1',
 'confirmemail_invalid' => 'Salâ an kódigo nin konpirmasyon. Puede ser napasó na an kódigo.',
 'confirmemail_needlogin' => "Kaipuhan tabi $1 ikompirmar an saimong ''e''-surat.",
-'confirmemail_success' => "Nakompirmar na an saimong ''e''-surat. Pwede ka nang maglaog asin mag-ogma sa wiki.",
+'confirmemail_success' => 'An saimong e-surat na adres kumpirmado na.
+Puwede ka na ngunyan [[Special:UserLogin|maglaog]] asin maogmang maggamit kan wiki.',
 'confirmemail_loggedin' => "Nakompirmar na an saimong ''e''-surat.",
 'confirmemail_error' => 'May nasalâ sa pagtagama kan saimong kompirmasyon.',
 'confirmemail_subject' => "kompirmasyón {{SITENAME}} kan direksyón nin ''e''-surat",
-'confirmemail_body' => 'May paragamit, pwedeng ika, halì sa IP na $1, na nagrehistro nin account na
-"$2" na igwang e-koreo sa {{SITENAME}}.
+'confirmemail_body' => 'Sarong tawo, mapuwedeng ika, gikan sa IP adres na $1,
+nagrehistro nin sarong panindog "$2" na igwa kaining e-surat na adres sa {{SITENAME}}.
+
+Tanganing kumpirmaron na ining panindog talagang pagsadire mo asin aktibaron an e-surat na mga estima sa {{SITENAME}}, bukasi tabi ining kasugpunan sa saimong kilyaw:
+
+$3
+
+Kun ika *dae* nagrehistro kan panindog, sunuda ining sugpon
+tanganing kanselaron an e-surat na adres na pankumpirma:
+
+$5
 
-Tangarig makompirmar na talagang saimo ining account asin makagamit nin e-koreo sa {{SITENAME}}, bukasán ining takod sa saimong browser:
+Ining pankumpirmang koda mapalso sa $4.',
+'confirmemail_body_changed' => 'Sarong tawo, mapuwedeng ika, gikan sa IP adres na $1,
+nagrehistro nin sarong panindog "$2" na igwa kaining e-surat na adres sa {{SITENAME}}.
+
+Tanganing kumpirmaron na ining panindog talagang pagsadire mo asin aktibaron an e-surat na mga estima sa {{SITENAME}}, bukasi tabi ining kasugpunan sa saimong kilyaw:
 
 $3
 
-Kun *bakô* ka ini, dai sunodón an takod. Mapaso sa $4 inning koda nin kompirmasyon.',
+Kun an panindog *bakong* saimo, sunuda ining sugpon
+tanganing kanselaron an e-surat na adres na pankumpirma:
+
+$5
+
+Ining pankumpirmang koda mapalso sa $4.',
+'confirmemail_body_set' => 'Sarong tawo, mapuwedeng ika, gikan sa IP adres na $1,
+nagrehistro nin sarong panindog "$2" na igwa kaining e-surat na adres sa {{SITENAME}}.
+
+Tanganing kumpirmaron na ining panindog talagang pagsadire mo asin re-aktibaron an e-surat na mga estima sa {{SITENAME}}, bukasi tabi ining kasugpunan sa saimong kilyaw:
+
+$3
+
+Kun an panindog *bakong* saimo, sunuda ining sugpon
+tanganing kanselaron an e-surat na adres na pankumpirma:
+
+$5
+
+Ining pankumpirmang koda mapalso sa $4.',
+'confirmemail_invalidated' => 'An e-surat na adres na pankumpirma kanselado na',
+'invalidateemail' => 'Kanselaron an e-surat na pankumpirmasyon',
 
 # Scary transclusion
 'scarytranscludedisabled' => '[Pigpopogolan an transcluding na Interwiki]',
-'scarytranscludefailed' => '[Nabigô an pagkua kan templato para sa $1; despensa]',
-'scarytranscludetoolong' => '[halabaon an URL; despensa]',
+'scarytranscludefailed' => '[Templatong panakdo nagpalya para sa $1]',
+'scarytranscludetoolong' => '[An kilyawan grabe kahalaba]',
 
 # Delete conflict
-'deletedwhileediting' => 'Patanid: Pigparâ na an pahinang ini antes na nagpoon kan maghirá!',
+'deletedwhileediting' => "'''Patanid tabi''': Ining pahina pinagpura matapos na ika nagpoon na magliliwat!",
 'confirmrecreate' => "Si [[User:$1|$1]] ([[User talk:$1|olay]]) pigparâ ining páhina pagkatapos mong magpoon kan paghira ta:
 : ''$2''
 Ikonpirmar tabi na talagang gusto mong gibohon giraray ining pahina.",
+'confirmrecreate-noreason' => 'Paragamit [[User:$1|$1]] ([[User talk:$1|Olay]]) an nagpura kaining pahina matapos na ika nagpoon na magliliwat. Pakikumpirma tabi na ika boot na muknaon otro ining pahina.',
 'recreate' => 'Gibohón giraray',
 
 # action=purge
 'confirm_purge_button' => 'Sige',
 'confirm-purge-top' => 'Halîon an an aliho kaining páhina?',
+'confirm-purge-bottom' => 'Pagpupurga nin sarong pahina minalinig kan sarayan asin minapuwersa sa pinakahuring rebisyon na magtunga.',
+
+# action=watch/unwatch
+'confirm-watch-button' => 'OK tabi',
+'confirm-watch-top' => 'Idadagdag ining pahina sa saimong bantay-listahan?',
+'confirm-unwatch-button' => 'OK tabi',
+'confirm-unwatch-top' => 'Haleon ining pahina gikan sa saimong bantay-listahan?',
 
 # Multipage image navigation
 'imgmultipageprev' => '← nakaaging pahina',
 'imgmultipagenext' => 'sunod na pahina →',
 'imgmultigo' => 'Dumanán!',
+'imgmultigoto' => 'Magpasiring sa pahina $1',
 
 # Table pager
 'ascending_abbrev' => 'skt',
@@ -2904,14 +3300,15 @@ Ikonpirmar tabi na talagang gusto mong gibohon giraray ining pahina.",
 'table_pager_first' => 'Enot na páhina',
 'table_pager_last' => 'Huring páhina',
 'table_pager_limit' => 'Ipahiling an $1 na aytem kada páhina',
+'table_pager_limit_label' => 'Mga aytem kada pahina:',
 'table_pager_limit_submit' => 'Dumanán',
 'table_pager_empty' => 'Mayong resulta',
 
 # Auto-summaries
-'autosumm-blank' => 'Pighahalî an gabos na laog sa páhina',
+'autosumm-blank' => 'Pinagblangko an pahina',
 'autosumm-replace' => "Pigriribayan an páhina nin '$1'",
 'autoredircomment' => 'Piglilikay sa [[$1]]',
-'autosumm-new' => 'Bâgong páhina: $1',
+'autosumm-new' => 'Pinagmukna an pahina kaining "$1"',
 
 # Live preview
 'livepreview-loading' => 'Pigkakarga…',
@@ -2920,16 +3317,17 @@ Ikonpirmar tabi na talagang gusto mong gibohon giraray ining pahina.",
 'livepreview-error' => 'Dai nakakabit: $1 "$2". Hilingón tabî an normal na patânaw.',
 
 # Friendlier slave lag warnings
-'lag-warn-normal' => 'An mga pagbalyó na mas bâgo sa $1 na segundo pwedeng dai pa mahiling sa listang ini.',
-'lag-warn-high' => "Nin huli sa ''high database server lag'', an mga pagbabâgo na mas bâgo sa $1 na segundo pwedeng dai pa ipahiling sa listang ini.",
+'lag-warn-normal' => 'Mga pagliliwat na baguhon pa sana nin $1 {{PLURAL:$1|segundo|segundos}} puwedeng dae maipapahiling sa listahang ini.',
+'lag-warn-high' => 'Nin huli sa halangkawon na kaabalahan sa serbidor kan datos-sarayan, mga pagliliwat na baguhon pa sana nin $1 {{PLURAL:$1|segundo|segundos}} puwedeng dae maipapahiling sa listahang ini.',
 
 # Watchlist editor
 'watchlistedit-numitems' => 'An saimong pigbabantayan igwang {{PLURAL:$1|1 titulo|$1 mga titulo}}, apwera kan mga páhina kan olay.',
 'watchlistedit-noitems' => 'Mayong mga titulo an pigbabantayan mo.',
 'watchlistedit-normal-title' => 'Hirahón an pigbabantayan',
 'watchlistedit-normal-legend' => 'Halion an mga titulo sa pigbabantayan',
-'watchlistedit-normal-explain' => 'Mahihiling sa babâ an mga titulo na nasa pigbabantayan mo.
-Tangarig maghalì nin titulo, markahan an kahon sa gilid kaini, dangan pindotón an Tangkasón an mga Titulo. Pwede mo man na [[Special:EditWatchlist/raw|hirahón an bàgong lista]].',
+'watchlistedit-normal-explain' => 'Mga sa saimong bantay-listahan ipinapahiling sa ibaba.
+Sa paghali nin sarong titutlo, -tsek an kahon kasunod kaini, asin i-klik an "{{int:Watchlistedit-normal-submit}}".
+Puwede ka man na [[Special:EditWatchlist/raw|magliwat kan temporaryong listahan]].',
 'watchlistedit-normal-submit' => 'Tangkasón an mga Titulo',
 'watchlistedit-normal-done' => 'Pigtangkas an {{PLURAL:$1|1 an titulo|$1 mga titulo}} sa saimong pigbabantayan:',
 'watchlistedit-raw-title' => 'Hirahón an bàgong pigbabantayan',
@@ -2949,20 +3347,139 @@ Pwede mo man [[Special:EditWatchlist|gamiton an standard editor]].',
 'watchlisttools-edit' => 'Hilingón asin ligwatón an pigbabantayan',
 'watchlisttools-raw' => 'Hirahón an bàgong pigbabantayan',
 
+# Signatures
+'signature' => '[[{{ns:user}}:$1|$2]] ([[{{ns:user_talk}}:$1|olay]])',
+
+# Core parser functions
+'unknown_extension_tag' => 'Bakong bistadong ekstensyon nin pagmarka "$1"',
+'duplicate-defaultsort' => '\'\'\'Patanid tabi:\'\'\' An susing panugmad kan salansan na "$2" minasalimbaw sa dating susing panugmad kan salansan na "$1".',
+
 # Special:Version
 'version' => 'Bersyon',
+'version-extensions' => 'Instaladong mga ekstensyon',
+'version-specialpages' => 'Espesyal na mga pahina',
+'version-parserhooks' => 'Mga pangawil kan parser',
+'version-variables' => 'Mga kabalanggayahan',
+'version-antispam' => 'Pan-spam na pangataman',
+'version-skins' => 'Mga kublit',
+'version-other' => 'An iba pa',
+'version-mediahandlers' => 'Mga Midyang Tagakapot',
+'version-hooks' => 'Mga pangawil',
+'version-extension-functions' => 'Mga punksyon kan ekstensyon',
+'version-parser-extensiontags' => 'Mga ekstensyong panmarka kan Parser',
+'version-parser-function-hooks' => 'Mga panpunksyong pangawil kan Parser',
+'version-hook-name' => 'Ngaran kan pangawil',
+'version-hook-subscribedby' => 'Pinaghaguhot ni',
+'version-version' => '(Bersyon na $1)',
+'version-license' => 'Lisensiya',
+'version-poweredby-credits' => "An wiking ini pinagpagana kan '''[//www.mediawiki.org/ MediaWiki]''', copyright © 2001-$1 $2.",
+'version-poweredby-others' => '[{{SERVER}}{{SCRIPTPATH}}/CREDITS mga iba pa]',
+'version-license-info' => 'An MediaWiki sarong libreng kasungatan; puwede mong ipanao ini asin/o baguhon ini sa irarom kan termino nin HNU (Heneral na Pampublikong Lisensiya) bilang publisado kan Free Software Foundation; maski sa arin na bersyon 2 kan lisensiya, o (saimong pansadireng pagpipilian) arinman na huring bersyon.
+
+An MediaWiki ipinagpanao sa paglaom na ini magigin kapakinabangan, pero MAYO NIN ANUMAN NA WARANTIYA; mayo dawa ngani nin pinaghuhurot na warantiya kan MERKANTIBILIDAD o KAUYUGAN PARA SA SARONG PARTIKULAR NA KATUYUHAN. Hilngon an HNU (Heneral na Pampublikong Lisensiya) para sa kadagdagang mga detalye.
+
+Ika dapat na nakapagresibe na kan [{{SERVER}}{{SCRIPTPATH}}/COPYING sarong kopya nin HNU Heneral na Pampublikong Lisensiya] na kaiba kaining programa; kun dae, surati an Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA o baya [//www.gnu.org/licenses/old-licenses/gpl-2.0.html online ining basahon].',
+'version-software' => 'Instalyadong kasungatan',
+'version-software-product' => 'Produkto',
+'version-software-version' => 'Bersyon',
+'version-entrypoints' => 'Puntong pan-entrada sa mga kilyawan',
+'version-entrypoints-header-entrypoint' => 'Puntong pan-entrada',
+'version-entrypoints-header-url' => 'Kilyawan',
+
+# Special:FilePath
+'filepath' => 'Pansagunsong agihan',
+'filepath-page' => 'Sagunson:',
+'filepath-submit' => 'Magduman',
+'filepath-summary' => 'Ining espesyal na pahina minapabalik kan kumpletong agihan para sa sarong sagunson.
+Mga imahe ipinapahiling sa bilog na resolusyon, an iba pang tipo nin mga sagunson pinagpapoon nin direkta kan saindang asosyadong programa.',
+
+# Special:FileDuplicateSearch
+'fileduplicatesearch' => 'Maghanap kan duplikadong mga sagunson',
+'fileduplicatesearch-summary' => 'Maghanap kan duplikadong mga sagunson na pinagbasihan an mga kahalagahan nin hash.',
+'fileduplicatesearch-legend' => 'Maghanap kan sarong duplikado',
+'fileduplicatesearch-filename' => 'Ngaran nin sagunson:',
+'fileduplicatesearch-submit' => 'Maghanap',
+'fileduplicatesearch-info' => '$1 × $2 piksel<br />Sukol nin sagunson: $3<br />MIME tipo: $4',
+'fileduplicatesearch-result-1' => 'An sagunson "$1" mayo nin kaparehong duplikasyon.',
+'fileduplicatesearch-result-n' => 'An sagunson "$1" igwa nin {{PLURAL:$2|1 kaparehong duplikasyon|$2 mga kaparehong duplikasyon}}.',
+'fileduplicatesearch-noresults' => 'Mayong sagunson na pinagngaranan na "$1" an nanagboan.',
 
 # Special:SpecialPages
 'specialpages' => 'Mga espesyal na pahina',
+'specialpages-note' => '----
+* Normal espesyal na mga pahina.
+* <span class="mw-specialpagerestricted">Restriktadong espesyal na mga pahina.</span>',
+'specialpages-group-maintenance' => 'Mga talaan nin pagpangataman',
 'specialpages-group-other' => 'Iba pang mga espesyal na pahina',
-'specialpages-group-login' => 'Maglaóg/ maggíbo',
+'specialpages-group-login' => 'Maglaog / magmukna nin panindog',
 'specialpages-group-changes' => 'Nakakaági pa sanáng mga pagbàgo asín laóg',
+'specialpages-group-media' => 'Mga talaan sa midya asin mga ikinarga',
+'specialpages-group-users' => 'Mga paragamit asin mga karapatan',
+'specialpages-group-highuse' => 'Halangkawong gamit na mga pahina',
+'specialpages-group-pages' => 'Mga listahan kan mga pahina',
+'specialpages-group-pagetools' => 'Mga kagamitan sa pahina',
+'specialpages-group-wiki' => 'Wiking datos asin mga kagamitan',
+'specialpages-group-redirects' => 'Panukdo sa espesyal na mga pahina',
+'specialpages-group-spam' => 'Pan-spam na mga kagamitan',
 
 # Special:BlankPage
 'blankpage' => 'Blangkong pahina',
 'intentionallyblankpage' => 'Pigtuyong blangko an pahinang ini',
 
+# External image whitelist
+'external_image_whitelist' => '#Bayai ining linya eksaktong siring man sana kaini<pre>
+#Magkaag nin regular na mga panambitong parasa (idto sanang parte na minauyon sa tahaw kan //) na yaon sa ibaba
+#An mga ini paglalangkapon kaiba an mga kilyawan kan panluwas (hotlinked) na mga imahe
+#Idtong nagkaralangkap ipagpapahiling bilang mga imahe, o baya an sarong sugpon sana pasiring sa imahe an ipagpapahiling
+#Mga linya na nagpopoon sa # pagtatrataron bilang mga komento
+#Ini baya bakong sensitibo sa tipahan
+
+#Ikaag an gabos na parasang regex sa ibabaw kaining linya. Bayai ining linya eksaktong siring man sana kaini.</pre>',
+
 # Special:Tags
+'tags' => 'Balidong mga marka nin kaliwatan',
+'tag-filter' => '[[Special:Tags|Tag]] saraon:',
+'tag-filter-submit' => 'Saraan',
+'tags-title' => 'Mga marka',
+'tags-intro' => 'Ining pahina minalista kan mga marka na an kasungatan mapuwedeng maimarka an pagliwat kaini, asin an saindang mga kahulugan.',
+'tags-tag' => 'Ngarang panmarka',
+'tags-display-header' => 'Kinaluwasan sa listahan nin kaliwatan',
+'tags-description-header' => 'Bilog na deskripsyon nin kahulugan',
+'tags-hitcount-header' => 'Pinagmarkahan na mga kaliwatan',
 'tags-edit' => 'liwatón',
+'tags-hitcount' => '$1 {{PLURAL:$1|kaliwatan|mga kaliwatan}}',
+
+# Special:ComparePages
+'comparepages' => 'Ikumpara an mga pahina',
+'compare-selector' => 'Ikumpara an mga rebisyon nin pahina',
+'compare-page1' => 'Pahina 1',
+'compare-page2' => 'Pahina 2',
+'compare-rev1' => 'Rebisyon 1',
+'compare-rev2' => 'Rebisyon 2',
+'compare-submit' => 'Ikumpara',
+'compare-invalid-title' => 'An titulo na saimong pinagsambit sarong imbalido.',
+'compare-title-not-exists' => 'An titulo na saimong pinagsambit bakong eksistido.',
+'compare-revision-not-exists' => 'An rebisyon na saimong pinagsambit bakong eksistido.',
+
+# Database error messages
+'dberr-header' => 'Ining wiki igwa nin sarong problema',
+'dberr-problems' => 'Sori!
+Ining sityo igwang naeksperiyensiyahan na mga kakundian sa teknikal.',
+'dberr-again' => 'Prubaring maghalat tabi nin nagkapirang minutos asin otrohon ikarga.',
+'dberr-info' => '(Dae makakontak sa serbidor kan datos-sarayan: $1)',
+'dberr-usegoogle' => 'Ika puwedeng magprubar na maghanap sa Google nguna.',
+'dberr-outofdate' => 'Pasinon mo tabi na an saindang mga indekso kan satuyang laog puwedeng luwas na sa petsa.',
+'dberr-cachederror' => 'Ini sarong nakasaray na kopya kan pinaghahagad na pahina, asin puwedeng bakong angat sa petsa.',
+
+# HTML forms
+'htmlform-invalid-input' => 'Igwa nin mga problema an iba sa saimong pinaglaog',
+'htmlform-select-badoption' => 'An halaga na saimong pinagsambit bakong saro sa balidong pagpipilian.',
+'htmlform-int-invalid' => 'An halaga na saimong pinagsambit bako na sarong integer.',
+'htmlform-float-invalid' => 'An halaga na saimong pinagsamit bako na sarong numero.',
+'htmlform-int-toolow' => 'An halaga na saimong pinagsambit hababaon sa minimum na $1',
+'htmlform-int-toohigh' => 'An halaga na saimong pinagsambit halangkawon sa maksimum na $1',
+'htmlform-required' => 'Ining halaga pinaghahagad',
+'htmlform-submit' => 'Sumitiron',
+'htmlform-reset' => 'Dae idagos an mga kaliwatan',
 
 );
diff --git a/languages/messages/MessagesBe.php b/languages/messages/MessagesBe.php
index 90649107a3..69f28532be 100644
--- a/languages/messages/MessagesBe.php
+++ b/languages/messages/MessagesBe.php
@@ -68,14 +68,14 @@ $namespaceAliases = array(
 );
 
 $magicWords = array(
-	'img_thumbnail'           => array( '1', 'міні', 'мініяцюра', 'thumbnail', 'thumb' ),
-	'img_manualthumb'         => array( '1', 'міні=$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пкс', '$1px' ),
-	'img_center'              => array( '1', 'цэнтр', 'center', 'centre' ),
-	'img_framed'              => array( '1', 'безрамкі', 'framed', 'enframed', 'frame' ),
+	'img_thumbnail'             => array( '1', 'міні', 'мініяцюра', 'thumbnail', 'thumb' ),
+	'img_manualthumb'           => array( '1', 'міні=$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пкс', '$1px' ),
+	'img_center'                => array( '1', 'цэнтр', 'center', 'centre' ),
+	'img_framed'                => array( '1', 'безрамкі', 'framed', 'enframed', 'frame' ),
 );
 
 # Per discussion on http://translatewiki.net/wiki/Thread:Support/Customization_of number format
diff --git a/languages/messages/MessagesBe_tarask.php b/languages/messages/MessagesBe_tarask.php
index 35efe99995..de1217d9fc 100644
--- a/languages/messages/MessagesBe_tarask.php
+++ b/languages/messages/MessagesBe_tarask.php
@@ -39,121 +39,121 @@ $dateFormats = 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' ),
-	'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' ),
-	'localmonth'              => array( '1', 'ЛЯКАЛЬНЫ_МЕСЯЦ', 'LOCALMONTH', 'LOCALMONTH2' ),
-	'localmonthname'          => array( '1', 'НАЗВА_ЛЯКАЛЬНАГА_МЕСЯЦА', 'LOCALMONTHNAME' ),
-	'localmonthnamegen'       => array( '1', 'НАЗВА_ЛЯКАЛЬНАГА_МЕСЯЦА_Ў_РОДНЫМ_СКЛОНЕ', 'LOCALMONTHNAMEGEN' ),
-	'localmonthabbrev'        => array( '1', 'СКАРОЧАНАЯ_НАЗВА_ЛЯКАЛЬНАГА_МЕСЯЦА', 'LOCALMONTHABBREV' ),
-	'localday'                => array( '1', 'ЛЯКАЛЬНЫ_ДЗЕНЬ', 'LOCALDAY' ),
-	'localday2'               => array( '1', 'ЛЯКАЛЬНЫ_ДЗЕНЬ_2', 'LOCALDAY2' ),
-	'localdayname'            => array( '1', 'НАЗВА_ЛЯКАЛЬНАГА_ДНЯ', 'LOCALDAYNAME' ),
-	'localyear'               => array( '1', 'ЛЯКАЛЬНЫ_ГОД', 'LOCALYEAR' ),
-	'localtime'               => array( '1', 'ЛЯКАЛЬНЫ_ЧАС', 'LOCALTIME' ),
-	'localhour'               => array( '1', 'ЛЯКАЛЬНАЯ_ГАДЗІНА', 'LOCALHOUR' ),
-	'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', 'НАЗВА_СТАРОНКІ_2', 'PAGENAMEE' ),
-	'namespace'               => array( '1', 'ПРАСТОРА_НАЗВАЎ', 'NAMESPACE' ),
-	'namespacee'              => array( '1', 'ПРАСТОРА_НАЗВАЎ_2', 'NAMESPACEE' ),
-	'talkspace'               => array( '1', 'ПРАСТОРА_НАЗВАЎ_АБМЕРКАВАНЬНЯ', 'TALKSPACE' ),
-	'talkspacee'              => array( '1', 'ПРАСТОРА_НАЗВАЎ_АБМЕРКАВАНЬНЯ_2', 'TALKSPACEE' ),
-	'subjectspace'            => array( '1', 'ПРАСТОРА_НАЗВАЎ_ПРАДМЕТУ', 'ПРАСТОРА_НАЗВАЎ_АРТЫКУЛА', 'SUBJECTSPACE', 'ARTICLESPACE' ),
-	'subjectspacee'           => array( '1', 'ПРАСТОРА_НАЗВАЎ_ПРАДМЕТУ_2', 'ПРАСТОРА_НАЗВАЎ_АРТЫКУЛА_2', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
-	'fullpagename'            => array( '1', 'ПОЎНАЯ_НАЗВА_СТАРОНКІ', 'FULLPAGENAME' ),
-	'fullpagenamee'           => array( '1', 'ПОЎНАЯ_НАЗВА_СТАРОНКІ_2', 'FULLPAGENAMEE' ),
-	'subpagename'             => array( '1', 'НАЗВА_ПАДСТАРОНКІ', 'SUBPAGENAME' ),
-	'subpagenamee'            => array( '1', 'НАЗВА_ПАДСТАРОНКІ_2', 'SUBPAGENAMEE' ),
-	'basepagename'            => array( '1', 'НАЗВА_БАЗАВАЙ_СТАРОНКІ', 'BASEPAGENAME' ),
-	'basepagenamee'           => array( '1', 'НАЗВА_БАЗАВАЙ_СТАРОНКІ_2', 'BASEPAGENAMEE' ),
-	'talkpagename'            => array( '1', 'НАЗВА_СТАРОНКІ_АБМЕРКАВАНЬНЯ', 'TALKPAGENAME' ),
-	'talkpagenamee'           => array( '1', 'НАЗВА_СТАРОНКІ_АБМЕРКАВАНЬНЯ_2', 'TALKPAGENAMEE' ),
-	'subjectpagename'         => array( '1', 'НАЗВА_СТАРОНКІ_ПРАДМЕТУ', 'НАЗВА_СТАРОНКІ_АРТЫКУЛА', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
-	'subjectpagenamee'        => array( '1', 'НАЗВА_СТАРОНКІ_ПРАДМЕТУ_2', 'НАЗВА_СТАРОНКІ_АРТЫКУЛА_2', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
-	'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_right'               => array( '1', 'справа', 'right' ),
-	'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_page'                => array( '1', 'старонка=$1', 'старонка $1', 'page=$1', 'page $1' ),
-	'img_top'                 => array( '1', 'зьверху', 'top' ),
-	'img_middle'              => array( '1', 'пасярэдзіне', 'middle' ),
-	'img_bottom'              => array( '1', 'зьнізу', 'bottom' ),
-	'img_link'                => array( '1', 'спасылка=$1', 'link=$1' ),
-	'sitename'                => array( '1', 'НАЗВА_САЙТУ', 'SITENAME' ),
-	'ns'                      => array( '0', 'ПН:', 'NS:' ),
-	'localurl'                => array( '0', 'ЛЯКАЛЬНЫ_АДРАС:', 'LOCALURL:' ),
-	'localurle'               => array( '0', 'ЛЯКАЛЬНЫ_АДРАС_2:', 'LOCALURLE:' ),
-	'server'                  => array( '0', 'СЭРВЭР', 'SERVER' ),
-	'servername'              => array( '0', 'НАЗВА_СЭРВЭРА', 'SERVERNAME' ),
-	'scriptpath'              => array( '0', 'ШЛЯХ_ДА_СКРЫПТА', 'SCRIPTPATH' ),
-	'grammar'                 => array( '0', 'ГРАМАТЫКА:', 'GRAMMAR:' ),
-	'gender'                  => array( '0', 'ПОЛ:', 'GENDER:' ),
-	'notitleconvert'          => array( '0', '__НЕ_КАНВЭРТАВАЦЬ_НАЗВУ__', '__NOTITLECONVERT__', '__NOTC__' ),
-	'nocontentconvert'        => array( '0', '__НЕ_КАНВЭРТАВАЦЬ_ТЭКСТ__', '__NOCONTENTCONVERT__', '__NOCC__' ),
-	'currentweek'             => array( '1', 'БЯГУЧЫ_ТЫДЗЕНЬ', 'CURRENTWEEK' ),
-	'currentdow'              => array( '1', 'БЯГУЧЫ_ДЗЕНЬ_ТЫДНЯ', 'CURRENTDOW' ),
-	'localweek'               => array( '1', 'ЛЯКАЛЬНЫ_ТЫДЗЕНЬ', 'LOCALWEEK' ),
-	'localdow'                => array( '1', 'ЛЯКАЛЬНЫ_ДЗЕНЬ_ТЫДНЯ', 'LOCALDOW' ),
-	'revisionid'              => array( '1', 'ID_ВЭРСІІ', 'REVISIONID' ),
-	'revisionday'             => array( '1', 'ДЗЕНЬ_ВЭРСІІ', 'REVISIONDAY' ),
-	'revisionday2'            => array( '1', 'ДЗЕНЬ_ВЭРСІІ_2', 'REVISIONDAY2' ),
-	'revisionmonth'           => array( '1', 'МЕСЯЦ_ВЭРСІІ', 'REVISIONMONTH' ),
-	'revisionyear'            => array( '1', 'ГОД_ВЭРСІІ', 'REVISIONYEAR' ),
-	'revisiontimestamp'       => array( '1', 'МОМАНТ_ЧАСУ_ВЭРСІІ', 'REVISIONTIMESTAMP' ),
-	'plural'                  => array( '0', 'МНОЖНЫ_ЛІК:', 'PLURAL:' ),
-	'fullurl'                 => array( '0', 'ПОЎНЫ_АДРАС:', 'FULLURL:' ),
-	'fullurle'                => array( '0', 'ПОЎНЫ_АДРАС_2:', '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' ),
-	'rawsuffix'               => array( '1', 'Н', 'R' ),
-	'newsectionlink'          => array( '1', '__СПАСЫЛКА_НА_НОВУЮ_СЭКЦЫЮ__', '__NEWSECTIONLINK__' ),
-	'currentversion'          => array( '1', 'БЯГУЧАЯ_ВЭРСІЯ', 'CURRENTVERSION' ),
-	'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' ),
-	'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' ),
-	'staticredirect'          => array( '1', '__СТАТЫЧНАЕ_ПЕРАНАКІРАВАНЬНЕ__', '__STATICREDIRECT__' ),
+	'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' ),
+	'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' ),
+	'localmonth'                => array( '1', 'ЛЯКАЛЬНЫ_МЕСЯЦ', 'LOCALMONTH', 'LOCALMONTH2' ),
+	'localmonthname'            => array( '1', 'НАЗВА_ЛЯКАЛЬНАГА_МЕСЯЦА', 'LOCALMONTHNAME' ),
+	'localmonthnamegen'         => array( '1', 'НАЗВА_ЛЯКАЛЬНАГА_МЕСЯЦА_Ў_РОДНЫМ_СКЛОНЕ', 'LOCALMONTHNAMEGEN' ),
+	'localmonthabbrev'          => array( '1', 'СКАРОЧАНАЯ_НАЗВА_ЛЯКАЛЬНАГА_МЕСЯЦА', 'LOCALMONTHABBREV' ),
+	'localday'                  => array( '1', 'ЛЯКАЛЬНЫ_ДЗЕНЬ', 'LOCALDAY' ),
+	'localday2'                 => array( '1', 'ЛЯКАЛЬНЫ_ДЗЕНЬ_2', 'LOCALDAY2' ),
+	'localdayname'              => array( '1', 'НАЗВА_ЛЯКАЛЬНАГА_ДНЯ', 'LOCALDAYNAME' ),
+	'localyear'                 => array( '1', 'ЛЯКАЛЬНЫ_ГОД', 'LOCALYEAR' ),
+	'localtime'                 => array( '1', 'ЛЯКАЛЬНЫ_ЧАС', 'LOCALTIME' ),
+	'localhour'                 => array( '1', 'ЛЯКАЛЬНАЯ_ГАДЗІНА', 'LOCALHOUR' ),
+	'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', 'НАЗВА_СТАРОНКІ_2', 'PAGENAMEE' ),
+	'namespace'                 => array( '1', 'ПРАСТОРА_НАЗВАЎ', 'NAMESPACE' ),
+	'namespacee'                => array( '1', 'ПРАСТОРА_НАЗВАЎ_2', 'NAMESPACEE' ),
+	'talkspace'                 => array( '1', 'ПРАСТОРА_НАЗВАЎ_АБМЕРКАВАНЬНЯ', 'TALKSPACE' ),
+	'talkspacee'                => array( '1', 'ПРАСТОРА_НАЗВАЎ_АБМЕРКАВАНЬНЯ_2', 'TALKSPACEE' ),
+	'subjectspace'              => array( '1', 'ПРАСТОРА_НАЗВАЎ_ПРАДМЕТУ', 'ПРАСТОРА_НАЗВАЎ_АРТЫКУЛА', 'SUBJECTSPACE', 'ARTICLESPACE' ),
+	'subjectspacee'             => array( '1', 'ПРАСТОРА_НАЗВАЎ_ПРАДМЕТУ_2', 'ПРАСТОРА_НАЗВАЎ_АРТЫКУЛА_2', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
+	'fullpagename'              => array( '1', 'ПОЎНАЯ_НАЗВА_СТАРОНКІ', 'FULLPAGENAME' ),
+	'fullpagenamee'             => array( '1', 'ПОЎНАЯ_НАЗВА_СТАРОНКІ_2', 'FULLPAGENAMEE' ),
+	'subpagename'               => array( '1', 'НАЗВА_ПАДСТАРОНКІ', 'SUBPAGENAME' ),
+	'subpagenamee'              => array( '1', 'НАЗВА_ПАДСТАРОНКІ_2', 'SUBPAGENAMEE' ),
+	'basepagename'              => array( '1', 'НАЗВА_БАЗАВАЙ_СТАРОНКІ', 'BASEPAGENAME' ),
+	'basepagenamee'             => array( '1', 'НАЗВА_БАЗАВАЙ_СТАРОНКІ_2', 'BASEPAGENAMEE' ),
+	'talkpagename'              => array( '1', 'НАЗВА_СТАРОНКІ_АБМЕРКАВАНЬНЯ', 'TALKPAGENAME' ),
+	'talkpagenamee'             => array( '1', 'НАЗВА_СТАРОНКІ_АБМЕРКАВАНЬНЯ_2', 'TALKPAGENAMEE' ),
+	'subjectpagename'           => array( '1', 'НАЗВА_СТАРОНКІ_ПРАДМЕТУ', 'НАЗВА_СТАРОНКІ_АРТЫКУЛА', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
+	'subjectpagenamee'          => array( '1', 'НАЗВА_СТАРОНКІ_ПРАДМЕТУ_2', 'НАЗВА_СТАРОНКІ_АРТЫКУЛА_2', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
+	'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_right'                 => array( '1', 'справа', 'right' ),
+	'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_page'                  => array( '1', 'старонка=$1', 'старонка $1', 'page=$1', 'page $1' ),
+	'img_top'                   => array( '1', 'зьверху', 'top' ),
+	'img_middle'                => array( '1', 'пасярэдзіне', 'middle' ),
+	'img_bottom'                => array( '1', 'зьнізу', 'bottom' ),
+	'img_link'                  => array( '1', 'спасылка=$1', 'link=$1' ),
+	'sitename'                  => array( '1', 'НАЗВА_САЙТУ', 'SITENAME' ),
+	'ns'                        => array( '0', 'ПН:', 'NS:' ),
+	'localurl'                  => array( '0', 'ЛЯКАЛЬНЫ_АДРАС:', 'LOCALURL:' ),
+	'localurle'                 => array( '0', 'ЛЯКАЛЬНЫ_АДРАС_2:', 'LOCALURLE:' ),
+	'server'                    => array( '0', 'СЭРВЭР', 'SERVER' ),
+	'servername'                => array( '0', 'НАЗВА_СЭРВЭРА', 'SERVERNAME' ),
+	'scriptpath'                => array( '0', 'ШЛЯХ_ДА_СКРЫПТА', 'SCRIPTPATH' ),
+	'grammar'                   => array( '0', 'ГРАМАТЫКА:', 'GRAMMAR:' ),
+	'gender'                    => array( '0', 'ПОЛ:', 'GENDER:' ),
+	'notitleconvert'            => array( '0', '__НЕ_КАНВЭРТАВАЦЬ_НАЗВУ__', '__NOTITLECONVERT__', '__NOTC__' ),
+	'nocontentconvert'          => array( '0', '__НЕ_КАНВЭРТАВАЦЬ_ТЭКСТ__', '__NOCONTENTCONVERT__', '__NOCC__' ),
+	'currentweek'               => array( '1', 'БЯГУЧЫ_ТЫДЗЕНЬ', 'CURRENTWEEK' ),
+	'currentdow'                => array( '1', 'БЯГУЧЫ_ДЗЕНЬ_ТЫДНЯ', 'CURRENTDOW' ),
+	'localweek'                 => array( '1', 'ЛЯКАЛЬНЫ_ТЫДЗЕНЬ', 'LOCALWEEK' ),
+	'localdow'                  => array( '1', 'ЛЯКАЛЬНЫ_ДЗЕНЬ_ТЫДНЯ', 'LOCALDOW' ),
+	'revisionid'                => array( '1', 'ID_ВЭРСІІ', 'REVISIONID' ),
+	'revisionday'               => array( '1', 'ДЗЕНЬ_ВЭРСІІ', 'REVISIONDAY' ),
+	'revisionday2'              => array( '1', 'ДЗЕНЬ_ВЭРСІІ_2', 'REVISIONDAY2' ),
+	'revisionmonth'             => array( '1', 'МЕСЯЦ_ВЭРСІІ', 'REVISIONMONTH' ),
+	'revisionyear'              => array( '1', 'ГОД_ВЭРСІІ', 'REVISIONYEAR' ),
+	'revisiontimestamp'         => array( '1', 'МОМАНТ_ЧАСУ_ВЭРСІІ', 'REVISIONTIMESTAMP' ),
+	'plural'                    => array( '0', 'МНОЖНЫ_ЛІК:', 'PLURAL:' ),
+	'fullurl'                   => array( '0', 'ПОЎНЫ_АДРАС:', 'FULLURL:' ),
+	'fullurle'                  => array( '0', 'ПОЎНЫ_АДРАС_2:', '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' ),
+	'rawsuffix'                 => array( '1', 'Н', 'R' ),
+	'newsectionlink'            => array( '1', '__СПАСЫЛКА_НА_НОВУЮ_СЭКЦЫЮ__', '__NEWSECTIONLINK__' ),
+	'currentversion'            => array( '1', 'БЯГУЧАЯ_ВЭРСІЯ', 'CURRENTVERSION' ),
+	'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' ),
+	'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' ),
+	'staticredirect'            => array( '1', '__СТАТЫЧНАЕ_ПЕРАНАКІРАВАНЬНЕ__', '__STATICREDIRECT__' ),
 );
 
 $namespaceNames = array(
@@ -3012,10 +3012,31 @@ $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-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-restriction' => 'Стан аховы (<code>{{lcfirst:$1}}</code>)',
+'pageinfo-magic-words' => '{{PLURAL:$1|Магічнае слова|Магічныя словы}} ($1)',
+'pageinfo-hidden-categories' => '{{PLURAL:$1|Схаваная катэгорыя|Схаваныя катэгорыі}} ($1)',
+'pageinfo-templates' => '{{PLURAL:$1|Шаблён|Шаблёны}} ($1)',
 
 # Skin names
 'skinname-standard' => 'Клясычнае',
@@ -3068,7 +3089,8 @@ $1',
 'file-info-size' => '$1 × $2 {{PLURAL:$2|піксэль|піксэлі|піксэляў}}, памер файла: $3, тып MIME: $4',
 'file-info-size-pages' => '$1 × $2 піксэлаў, памер файла: $3, MIME-тып: $4, $5 {{PLURAL:$5|старонка|старонкі|старонак}}',
 'file-nohires' => 'Няма вэрсіі зь лепшым разрозьненьнем.',
-'svg-long-desc' => 'SVG-файл, намінальна $1 × $2 {{PLURAL:$2|піксэль|піксэлі|піксэляў}}, памер файла: $3.',
+'svg-long-desc' => 'SVG-файл, намінальна $1 × $2 {{PLURAL:$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.',
@@ -3078,6 +3100,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' => 'Галерэя новых файлаў',
diff --git a/languages/messages/MessagesBg.php b/languages/messages/MessagesBg.php
index 123ba4c8e7..79348e733f 100644
--- a/languages/messages/MessagesBg.php
+++ b/languages/messages/MessagesBg.php
@@ -58,86 +58,86 @@ $bookstoreList = 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__' ),
+	'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(
diff --git a/languages/messages/MessagesBr.php b/languages/messages/MessagesBr.php
index 04fcaeda33..fabcfde765 100644
--- a/languages/messages/MessagesBr.php
+++ b/languages/messages/MessagesBr.php
@@ -120,43 +120,43 @@ $specialPageAliases = array(
 );
 
 $magicWords = array(
-	'redirect'                => array( '0', '#ADKAS', '#REDIRECT' ),
-	'numberofpages'           => array( '1', 'NIVERABAJENNOU', 'NUMBEROFPAGES' ),
-	'numberofarticles'        => array( '1', 'NIVERABENNADOU', 'NUMBEROFARTICLES' ),
-	'numberoffiles'           => array( '1', 'NIVERARESTROU', 'NUMBEROFFILES' ),
-	'numberofusers'           => array( '1', 'NIVERAIMPLIJERIEN', 'NUMBEROFUSERS' ),
-	'numberofactiveusers'     => array( '1', 'NIVERAIMPLIJERIENOBERIANT', 'NUMBEROFACTIVEUSERS' ),
-	'numberofedits'           => array( '1', 'NIVERAZEGASEDENNOU', 'NUMBEROFEDITS' ),
-	'numberofviews'           => array( '1', 'NIVERALENNADENNOU', 'NUMBEROFVIEWS' ),
-	'pagename'                => array( '1', 'ANVPAJENN', 'PAGENAME' ),
-	'pagenamee'               => array( '1', 'ANVPAJENNSK', 'PAGENAMEE' ),
-	'namespace'               => array( '1', 'ESAOUENNANV', 'NAMESPACE' ),
-	'namespacee'              => array( '1', 'ESAOUENNANVSK', 'NAMESPACEE' ),
-	'fullpagename'            => array( '1', 'ANVPAJENNKLOK', 'FULLPAGENAME' ),
-	'fullpagenamee'           => array( '1', 'ANVPAJENNKLOKSK', 'FULLPAGENAMEE' ),
-	'subpagename'             => array( '1', 'ANVISPAJENN', 'SUBPAGENAME' ),
-	'img_right'               => array( '1', 'dehou', 'right' ),
-	'img_left'                => array( '1', 'kleiz', 'left' ),
-	'img_none'                => array( '1', 'netra', 'none' ),
-	'img_center'              => array( '1', 'kreizenn', 'center', 'centre' ),
-	'img_page'                => array( '1', 'pajenn=$1', 'pajenn $1', 'page=$1', 'page $1' ),
-	'img_sub'                 => array( '1', 'is', 'sub' ),
-	'img_top'                 => array( '1', 'krec\'h', 'top' ),
-	'img_middle'              => array( '1', 'kreiz', 'middle' ),
-	'img_bottom'              => array( '1', 'traoñ', 'bottom' ),
-	'img_link'                => array( '1', 'liamm=$1', 'link=$1' ),
-	'sitename'                => array( '1', 'ANVLEC\'HIENN', 'SITENAME' ),
-	'server'                  => array( '0', 'SERVIJER', 'SERVER' ),
-	'servername'              => array( '0', 'ANVSERVIJER', 'SERVERNAME' ),
-	'grammar'                 => array( '0', 'YEZHADUR:', 'GRAMMAR:' ),
-	'gender'                  => array( '0', 'JENER:', 'GENDER:' ),
-	'plural'                  => array( '0', 'LIESTER:', 'PLURAL:' ),
-	'fullurl'                 => array( '0', 'URLKLOK:', 'FULLURL:' ),
-	'currentversion'          => array( '1', 'STUMMRED', 'CURRENTVERSION' ),
-	'language'                => array( '0', '#YEZH:', '#LANGUAGE:' ),
-	'special'                 => array( '0', 'dibar', 'special' ),
-	'pagesize'                => array( '1', 'MENTPAJENN', 'PAGESIZE' ),
-	'url_path'                => array( '0', 'HENT', 'PATH' ),
+	'redirect'                  => array( '0', '#ADKAS', '#REDIRECT' ),
+	'numberofpages'             => array( '1', 'NIVERABAJENNOU', 'NUMBEROFPAGES' ),
+	'numberofarticles'          => array( '1', 'NIVERABENNADOU', 'NUMBEROFARTICLES' ),
+	'numberoffiles'             => array( '1', 'NIVERARESTROU', 'NUMBEROFFILES' ),
+	'numberofusers'             => array( '1', 'NIVERAIMPLIJERIEN', 'NUMBEROFUSERS' ),
+	'numberofactiveusers'       => array( '1', 'NIVERAIMPLIJERIENOBERIANT', 'NUMBEROFACTIVEUSERS' ),
+	'numberofedits'             => array( '1', 'NIVERAZEGASEDENNOU', 'NUMBEROFEDITS' ),
+	'numberofviews'             => array( '1', 'NIVERALENNADENNOU', 'NUMBEROFVIEWS' ),
+	'pagename'                  => array( '1', 'ANVPAJENN', 'PAGENAME' ),
+	'pagenamee'                 => array( '1', 'ANVPAJENNSK', 'PAGENAMEE' ),
+	'namespace'                 => array( '1', 'ESAOUENNANV', 'NAMESPACE' ),
+	'namespacee'                => array( '1', 'ESAOUENNANVSK', 'NAMESPACEE' ),
+	'fullpagename'              => array( '1', 'ANVPAJENNKLOK', 'FULLPAGENAME' ),
+	'fullpagenamee'             => array( '1', 'ANVPAJENNKLOKSK', 'FULLPAGENAMEE' ),
+	'subpagename'               => array( '1', 'ANVISPAJENN', 'SUBPAGENAME' ),
+	'img_right'                 => array( '1', 'dehou', 'right' ),
+	'img_left'                  => array( '1', 'kleiz', 'left' ),
+	'img_none'                  => array( '1', 'netra', 'none' ),
+	'img_center'                => array( '1', 'kreizenn', 'center', 'centre' ),
+	'img_page'                  => array( '1', 'pajenn=$1', 'pajenn $1', 'page=$1', 'page $1' ),
+	'img_sub'                   => array( '1', 'is', 'sub' ),
+	'img_top'                   => array( '1', 'krec\'h', 'top' ),
+	'img_middle'                => array( '1', 'kreiz', 'middle' ),
+	'img_bottom'                => array( '1', 'traoñ', 'bottom' ),
+	'img_link'                  => array( '1', 'liamm=$1', 'link=$1' ),
+	'sitename'                  => array( '1', 'ANVLEC\'HIENN', 'SITENAME' ),
+	'server'                    => array( '0', 'SERVIJER', 'SERVER' ),
+	'servername'                => array( '0', 'ANVSERVIJER', 'SERVERNAME' ),
+	'grammar'                   => array( '0', 'YEZHADUR:', 'GRAMMAR:' ),
+	'gender'                    => array( '0', 'JENER:', 'GENDER:' ),
+	'plural'                    => array( '0', 'LIESTER:', 'PLURAL:' ),
+	'fullurl'                   => array( '0', 'URLKLOK:', 'FULLURL:' ),
+	'currentversion'            => array( '1', 'STUMMRED', 'CURRENTVERSION' ),
+	'language'                  => array( '0', '#YEZH:', '#LANGUAGE:' ),
+	'special'                   => array( '0', 'dibar', 'special' ),
+	'pagesize'                  => array( '1', 'MENTPAJENN', 'PAGESIZE' ),
+	'url_path'                  => array( '0', 'HENT', 'PATH' ),
 );
 
 $bookstoreList = array(
diff --git a/languages/messages/MessagesBs.php b/languages/messages/MessagesBs.php
index cc8bc9028a..d0d6682aad 100644
--- a/languages/messages/MessagesBs.php
+++ b/languages/messages/MessagesBs.php
@@ -147,132 +147,132 @@ $specialPageAliases = array(
 );
 
 $magicWords = array(
-	'redirect'                => array( '0', '#PREUSMJERI', '#REDIRECT' ),
-	'notoc'                   => array( '0', '__BEZSADRŽAJA__', '__NOTOC__' ),
-	'nogallery'               => array( '0', '__BEZGALERIJE__', '__NOGALLERY__' ),
-	'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' ),
-	'currentmonthnamegen'     => array( '1', 'TRENUTNIMJESECROD', 'CURRENTMONTHNAMEGEN' ),
-	'currentmonthabbrev'      => array( '1', 'TRENUTNIMJESECSKR', 'CURRENTMONTHABBREV' ),
-	'currentday'              => array( '1', 'TRENUTNIDAN', 'CURRENTDAY' ),
-	'currentday2'             => array( '1', 'TRENUTNIDAN2', 'CURRENTDAY2' ),
-	'currentdayname'          => array( '1', 'TRENUTNIDANIME', 'CURRENTDAYNAME' ),
-	'currentyear'             => array( '1', 'TRENUTNAGODINA', 'CURRENTYEAR' ),
-	'currenttime'             => array( '1', 'TRENUTNOVRIJEME', 'CURRENTTIME' ),
-	'currenthour'             => array( '1', 'TRENUTNISAT', 'CURRENTHOUR' ),
-	'localmonth'              => array( '1', 'LOKALNIMJESEC', 'LOCALMONTH', 'LOCALMONTH2' ),
-	'localmonth1'             => array( '1', 'LOKALNIMJESEC1', 'LOCALMONTH1' ),
-	'localmonthname'          => array( '1', 'LOKALNIMJESECIME', 'LOCALMONTHNAME' ),
-	'localmonthnamegen'       => array( '1', 'LOKALNIMJESECIMEROD', 'LOCALMONTHNAMEGEN' ),
-	'localmonthabbrev'        => array( '1', 'LOKALNIMJESECSKR', 'LOCALMONTHABBREV' ),
-	'localday'                => array( '1', 'LOKALNIDAN', 'LOCALDAY' ),
-	'localday2'               => array( '1', 'LOKALNIDAN2', 'LOCALDAY2' ),
-	'localdayname'            => array( '1', 'LOKALNIDANIME', 'LOCALDAYNAME' ),
-	'localyear'               => array( '1', 'LOKALNAGODINA', 'LOCALYEAR' ),
-	'localtime'               => array( '1', 'LOKALNOVRIJEME', 'LOCALTIME' ),
-	'localhour'               => array( '1', 'LOKALNISAT', 'LOCALHOUR' ),
-	'numberofpages'           => array( '1', 'BROJSTRANICA', 'NUMBEROFPAGES' ),
-	'numberofarticles'        => array( '1', 'BROJČLANAKA', 'NUMBEROFARTICLES' ),
-	'numberoffiles'           => array( '1', 'BROJDATOTEKA', 'BROJFAJLOVA', 'NUMBEROFFILES' ),
-	'numberofusers'           => array( '1', 'BROJKORISNIKA', 'NUMBEROFUSERS' ),
-	'numberofactiveusers'     => array( '1', 'BROJAKTIVNIHKORISNIKA', 'NUMBEROFACTIVEUSERS' ),
-	'numberofedits'           => array( '1', 'BROJPROMJENA', 'NUMBEROFEDITS' ),
-	'numberofviews'           => array( '1', 'BROJPREGLEDA', 'NUMBEROFVIEWS' ),
-	'pagename'                => array( '1', 'STRANICA', 'PAGENAME' ),
-	'pagenamee'               => array( '1', 'STRANICE', 'PAGENAMEE' ),
-	'namespace'               => array( '1', 'IMENSKIPROSTOR', 'NAMESPACE' ),
-	'namespacee'              => array( '1', 'IMENSKIPROSTORI', 'NAMESPACEE' ),
-	'talkspace'               => array( '1', 'PROSTORZARAZGOVOR', 'TALKSPACE' ),
-	'talkspacee'              => array( '1', 'PROSTORIZARAZGOVOR', 'TALKSPACEE' ),
-	'subjectspace'            => array( '1', 'PROSTORSUBJEKTA', 'PROSTORCLANAKA', 'SUBJECTSPACE', 'ARTICLESPACE' ),
-	'subjectspacee'           => array( '1', 'PROSTORISUBJEKTA', 'PROSTORICLANKA', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
-	'fullpagename'            => array( '1', 'PUNOIMESTRANE', 'FULLPAGENAME' ),
-	'fullpagenamee'           => array( '1', 'PUNOIMESTRANEE', 'FULLPAGENAMEE' ),
-	'subpagename'             => array( '1', 'IMEPODSTRANICE', 'SUBPAGENAME' ),
-	'subpagenamee'            => array( '1', 'IMENAPODSTRANICE', 'SUBPAGENAMEE' ),
-	'basepagename'            => array( '1', 'IMEBAZNESTRANICE', 'BASEPAGENAME' ),
-	'basepagenamee'           => array( '1', 'IMENABAZNESTRANICE', 'BASEPAGENAMEE' ),
-	'talkpagename'            => array( '1', 'IMESTRANICERAZGOVORA', 'TALKPAGENAME' ),
-	'talkpagenamee'           => array( '1', 'IMENASTRANICERAZGOVORA', 'TALKPAGENAMEE' ),
-	'subjectpagename'         => array( '1', 'IMESTRANICESUBKJEKTA', 'IMESTRANICECLANKA', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
-	'subjectpagenamee'        => array( '1', 'IMENASTRANICESUBJEKTA', 'IMENASTRANICECLANAKA', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
-	'msg'                     => array( '0', 'POR:', 'MSG:' ),
-	'subst'                   => array( '0', 'ZAMJENI:', 'SUBST:' ),
-	'msgnw'                   => array( '0', 'NVPOR:', 'MSGNW:' ),
-	'img_thumbnail'           => array( '1', 'mini', 'thumbnail', 'thumb' ),
-	'img_manualthumb'         => array( '1', 'mini=$1', 'thumbnail=$1', 'thumb=$1' ),
-	'img_right'               => array( '1', 'desno', 'd', 'right' ),
-	'img_left'                => array( '1', 'lijevo', 'l', 'left' ),
-	'img_none'                => array( '1', 'n', 'bez', 'none' ),
-	'img_width'               => array( '1', '$1piksel', '$1p', '$1px' ),
-	'img_center'              => array( '1', 'centar', 'c', 'center', 'centre' ),
-	'img_framed'              => array( '1', 'okvir', 'ram', 'framed', 'enframed', 'frame' ),
-	'img_frameless'           => array( '1', 'bez_okvira', 'frameless' ),
-	'img_page'                => array( '1', 'stranica=$1', 'stranica $1', 'page=$1', 'page $1' ),
-	'img_upright'             => array( '1', 'na_gore', 'na_gore=$1', 'na_gore_$1', 'upright', 'upright=$1', 'upright $1' ),
-	'img_border'              => array( '1', 'granica', 'border' ),
-	'img_baseline'            => array( '1', 'pocetna_linija', 'baseline' ),
-	'img_sub'                 => array( '1', 'odjeljak', 'sub' ),
-	'img_top'                 => array( '1', 'vrh', 'top' ),
-	'img_text_top'            => array( '1', 'vrh_teksta', 'text-top' ),
-	'img_middle'              => array( '1', 'sredina', 'middle' ),
-	'img_bottom'              => array( '1', 'dugme', 'bottom' ),
-	'img_text_bottom'         => array( '1', 'tekst-dugme', 'text-bottom' ),
-	'sitename'                => array( '1', 'IMESAJTA', 'SITENAME' ),
-	'ns'                      => array( '0', 'IP:', 'NS:' ),
-	'localurl'                => array( '0', 'LOKALNAADRESA:', 'LOCALURL:' ),
-	'localurle'               => array( '0', 'LOKALNEADRESE:', 'LOCALURLE:' ),
-	'servername'              => array( '0', 'IMESERVERA', 'SERVERNAME' ),
-	'scriptpath'              => array( '0', 'SKRIPTA', 'SCRIPTPATH' ),
-	'grammar'                 => array( '0', 'GRAMATIKA:', 'GRAMMAR:' ),
-	'gender'                  => array( '0', 'POL:', 'GENDER:' ),
-	'notitleconvert'          => array( '0', '__BEZTC__', '__NOTITLECONVERT__', '__NOTC__' ),
-	'nocontentconvert'        => array( '0', '__BEZCC__', '__NOCONTENTCONVERT__', '__NOCC__' ),
-	'currentweek'             => array( '1', 'TRENUTNASEDMICA', 'CURRENTWEEK' ),
-	'currentdow'              => array( '1', 'TRENUTNIDOV', 'CURRENTDOW' ),
-	'localweek'               => array( '1', 'LOKALNASEDMICA', 'LOCALWEEK' ),
-	'revisionid'              => array( '1', 'IDREVIZIJE', 'REVISIONID' ),
-	'revisionday'             => array( '1', 'REVIZIJEDANA', 'REVISIONDAY' ),
-	'revisionday2'            => array( '1', 'REVIZIJEDANA2', 'REVISIONDAY2' ),
-	'revisionmonth'           => array( '1', 'REVIZIJAMJESECA', 'REVISIONMONTH' ),
-	'revisionyear'            => array( '1', 'REVIZIJAGODINE', 'REVISIONYEAR' ),
-	'revisiontimestamp'       => array( '1', 'REVIZIJAVREMENSKOGPECATA', 'REVISIONTIMESTAMP' ),
-	'plural'                  => array( '0', 'MNOŽINA:', 'PLURAL:' ),
-	'fullurl'                 => array( '0', 'PUNURL:', 'FULLURL:' ),
-	'fullurle'                => array( '0', 'PUNURLE:', 'FULLURLE:' ),
-	'lcfirst'                 => array( '0', 'LCPRVI:', 'LCFIRST:' ),
-	'ucfirst'                 => array( '0', 'UCPRVI:', 'UCFIRST:' ),
-	'displaytitle'            => array( '1', 'POKAZINASLOV', 'DISPLAYTITLE' ),
-	'newsectionlink'          => array( '1', '__LINKNOVESEKCIJE__', '__NEWSECTIONLINK__' ),
-	'currentversion'          => array( '1', 'SADASNJAVERZIJA', 'CURRENTVERSION' ),
-	'urlencode'               => array( '0', 'DEKODIRAJADRESU', 'URLENCODE:' ),
-	'currenttimestamp'        => array( '1', 'SADASNJIVREMENSKIPECAT', 'CURRENTTIMESTAMP' ),
-	'localtimestamp'          => array( '1', 'LOKALNIVREMENSKIPECAT', 'LOCALTIMESTAMP' ),
-	'language'                => array( '0', '#JEZIK:', '#LANGUAGE:' ),
-	'pagesinnamespace'        => array( '1', 'STRANICEUIMENSKOMPROSTORU:', 'PAGESINNAMESPACE:', 'PAGESINNS:' ),
-	'numberofadmins'          => array( '1', 'BROJADMINISTRATORA', 'NUMBEROFADMINS' ),
-	'formatnum'               => array( '0', 'NUMERICKIFORMAT', 'FORMATNUM' ),
-	'padleft'                 => array( '0', 'JASTUKLIJEVO', 'PADLEFT' ),
-	'padright'                => array( '0', 'JASTUKDESNO', 'PADRIGHT' ),
-	'special'                 => array( '0', 'specijalno', 'special' ),
-	'filepath'                => array( '0', 'STAZADATOTEKE:', 'FILEPATH:' ),
-	'tag'                     => array( '0', 'oznaka', 'tag' ),
-	'hiddencat'               => array( '1', '__SAKRIVENAKATEGORIJA__', '__HIDDENCAT__' ),
-	'pagesincategory'         => array( '1', 'STRANICEUKATEGORIJI', 'STRANICEUKAT', 'PAGESINCATEGORY', 'PAGESINCAT' ),
-	'pagesize'                => array( '1', 'VELICINASTRANICE', 'PAGESIZE' ),
-	'index'                   => array( '1', '__SADRZAJ__', '__INDEX__' ),
-	'noindex'                 => array( '1', '__BEZSADRZAJA__', '__NOINDEX__' ),
-	'numberingroup'           => array( '1', 'BROJUGRUPI', 'NUMBERINGROUP', 'NUMINGROUP' ),
-	'staticredirect'          => array( '1', '__STATISTICNOPREUSMJERENJE__', '__STATICREDIRECT__' ),
-	'protectionlevel'         => array( '1', 'NIVOZASTITE', 'PROTECTIONLEVEL' ),
-	'formatdate'              => array( '0', 'formatdatuma', 'formatdate', 'dateformat' ),
-	'url_path'                => array( '0', 'PUTANJA', 'PATH' ),
-	'url_query'               => array( '0', 'UPIT', 'QUERY' ),
+	'redirect'                  => array( '0', '#PREUSMJERI', '#REDIRECT' ),
+	'notoc'                     => array( '0', '__BEZSADRŽAJA__', '__NOTOC__' ),
+	'nogallery'                 => array( '0', '__BEZGALERIJE__', '__NOGALLERY__' ),
+	'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' ),
+	'currentmonthnamegen'       => array( '1', 'TRENUTNIMJESECROD', 'CURRENTMONTHNAMEGEN' ),
+	'currentmonthabbrev'        => array( '1', 'TRENUTNIMJESECSKR', 'CURRENTMONTHABBREV' ),
+	'currentday'                => array( '1', 'TRENUTNIDAN', 'CURRENTDAY' ),
+	'currentday2'               => array( '1', 'TRENUTNIDAN2', 'CURRENTDAY2' ),
+	'currentdayname'            => array( '1', 'TRENUTNIDANIME', 'CURRENTDAYNAME' ),
+	'currentyear'               => array( '1', 'TRENUTNAGODINA', 'CURRENTYEAR' ),
+	'currenttime'               => array( '1', 'TRENUTNOVRIJEME', 'CURRENTTIME' ),
+	'currenthour'               => array( '1', 'TRENUTNISAT', 'CURRENTHOUR' ),
+	'localmonth'                => array( '1', 'LOKALNIMJESEC', 'LOCALMONTH', 'LOCALMONTH2' ),
+	'localmonth1'               => array( '1', 'LOKALNIMJESEC1', 'LOCALMONTH1' ),
+	'localmonthname'            => array( '1', 'LOKALNIMJESECIME', 'LOCALMONTHNAME' ),
+	'localmonthnamegen'         => array( '1', 'LOKALNIMJESECIMEROD', 'LOCALMONTHNAMEGEN' ),
+	'localmonthabbrev'          => array( '1', 'LOKALNIMJESECSKR', 'LOCALMONTHABBREV' ),
+	'localday'                  => array( '1', 'LOKALNIDAN', 'LOCALDAY' ),
+	'localday2'                 => array( '1', 'LOKALNIDAN2', 'LOCALDAY2' ),
+	'localdayname'              => array( '1', 'LOKALNIDANIME', 'LOCALDAYNAME' ),
+	'localyear'                 => array( '1', 'LOKALNAGODINA', 'LOCALYEAR' ),
+	'localtime'                 => array( '1', 'LOKALNOVRIJEME', 'LOCALTIME' ),
+	'localhour'                 => array( '1', 'LOKALNISAT', 'LOCALHOUR' ),
+	'numberofpages'             => array( '1', 'BROJSTRANICA', 'NUMBEROFPAGES' ),
+	'numberofarticles'          => array( '1', 'BROJČLANAKA', 'NUMBEROFARTICLES' ),
+	'numberoffiles'             => array( '1', 'BROJDATOTEKA', 'BROJFAJLOVA', 'NUMBEROFFILES' ),
+	'numberofusers'             => array( '1', 'BROJKORISNIKA', 'NUMBEROFUSERS' ),
+	'numberofactiveusers'       => array( '1', 'BROJAKTIVNIHKORISNIKA', 'NUMBEROFACTIVEUSERS' ),
+	'numberofedits'             => array( '1', 'BROJPROMJENA', 'NUMBEROFEDITS' ),
+	'numberofviews'             => array( '1', 'BROJPREGLEDA', 'NUMBEROFVIEWS' ),
+	'pagename'                  => array( '1', 'STRANICA', 'PAGENAME' ),
+	'pagenamee'                 => array( '1', 'STRANICE', 'PAGENAMEE' ),
+	'namespace'                 => array( '1', 'IMENSKIPROSTOR', 'NAMESPACE' ),
+	'namespacee'                => array( '1', 'IMENSKIPROSTORI', 'NAMESPACEE' ),
+	'talkspace'                 => array( '1', 'PROSTORZARAZGOVOR', 'TALKSPACE' ),
+	'talkspacee'                => array( '1', 'PROSTORIZARAZGOVOR', 'TALKSPACEE' ),
+	'subjectspace'              => array( '1', 'PROSTORSUBJEKTA', 'PROSTORCLANAKA', 'SUBJECTSPACE', 'ARTICLESPACE' ),
+	'subjectspacee'             => array( '1', 'PROSTORISUBJEKTA', 'PROSTORICLANKA', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
+	'fullpagename'              => array( '1', 'PUNOIMESTRANE', 'FULLPAGENAME' ),
+	'fullpagenamee'             => array( '1', 'PUNOIMESTRANEE', 'FULLPAGENAMEE' ),
+	'subpagename'               => array( '1', 'IMEPODSTRANICE', 'SUBPAGENAME' ),
+	'subpagenamee'              => array( '1', 'IMENAPODSTRANICE', 'SUBPAGENAMEE' ),
+	'basepagename'              => array( '1', 'IMEBAZNESTRANICE', 'BASEPAGENAME' ),
+	'basepagenamee'             => array( '1', 'IMENABAZNESTRANICE', 'BASEPAGENAMEE' ),
+	'talkpagename'              => array( '1', 'IMESTRANICERAZGOVORA', 'TALKPAGENAME' ),
+	'talkpagenamee'             => array( '1', 'IMENASTRANICERAZGOVORA', 'TALKPAGENAMEE' ),
+	'subjectpagename'           => array( '1', 'IMESTRANICESUBKJEKTA', 'IMESTRANICECLANKA', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
+	'subjectpagenamee'          => array( '1', 'IMENASTRANICESUBJEKTA', 'IMENASTRANICECLANAKA', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
+	'msg'                       => array( '0', 'POR:', 'MSG:' ),
+	'subst'                     => array( '0', 'ZAMJENI:', 'SUBST:' ),
+	'msgnw'                     => array( '0', 'NVPOR:', 'MSGNW:' ),
+	'img_thumbnail'             => array( '1', 'mini', 'thumbnail', 'thumb' ),
+	'img_manualthumb'           => array( '1', 'mini=$1', 'thumbnail=$1', 'thumb=$1' ),
+	'img_right'                 => array( '1', 'desno', 'd', 'right' ),
+	'img_left'                  => array( '1', 'lijevo', 'l', 'left' ),
+	'img_none'                  => array( '1', 'n', 'bez', 'none' ),
+	'img_width'                 => array( '1', '$1piksel', '$1p', '$1px' ),
+	'img_center'                => array( '1', 'centar', 'c', 'center', 'centre' ),
+	'img_framed'                => array( '1', 'okvir', 'ram', 'framed', 'enframed', 'frame' ),
+	'img_frameless'             => array( '1', 'bez_okvira', 'frameless' ),
+	'img_page'                  => array( '1', 'stranica=$1', 'stranica $1', 'page=$1', 'page $1' ),
+	'img_upright'               => array( '1', 'na_gore', 'na_gore=$1', 'na_gore_$1', 'upright', 'upright=$1', 'upright $1' ),
+	'img_border'                => array( '1', 'granica', 'border' ),
+	'img_baseline'              => array( '1', 'pocetna_linija', 'baseline' ),
+	'img_sub'                   => array( '1', 'odjeljak', 'sub' ),
+	'img_top'                   => array( '1', 'vrh', 'top' ),
+	'img_text_top'              => array( '1', 'vrh_teksta', 'text-top' ),
+	'img_middle'                => array( '1', 'sredina', 'middle' ),
+	'img_bottom'                => array( '1', 'dugme', 'bottom' ),
+	'img_text_bottom'           => array( '1', 'tekst-dugme', 'text-bottom' ),
+	'sitename'                  => array( '1', 'IMESAJTA', 'SITENAME' ),
+	'ns'                        => array( '0', 'IP:', 'NS:' ),
+	'localurl'                  => array( '0', 'LOKALNAADRESA:', 'LOCALURL:' ),
+	'localurle'                 => array( '0', 'LOKALNEADRESE:', 'LOCALURLE:' ),
+	'servername'                => array( '0', 'IMESERVERA', 'SERVERNAME' ),
+	'scriptpath'                => array( '0', 'SKRIPTA', 'SCRIPTPATH' ),
+	'grammar'                   => array( '0', 'GRAMATIKA:', 'GRAMMAR:' ),
+	'gender'                    => array( '0', 'POL:', 'GENDER:' ),
+	'notitleconvert'            => array( '0', '__BEZTC__', '__NOTITLECONVERT__', '__NOTC__' ),
+	'nocontentconvert'          => array( '0', '__BEZCC__', '__NOCONTENTCONVERT__', '__NOCC__' ),
+	'currentweek'               => array( '1', 'TRENUTNASEDMICA', 'CURRENTWEEK' ),
+	'currentdow'                => array( '1', 'TRENUTNIDOV', 'CURRENTDOW' ),
+	'localweek'                 => array( '1', 'LOKALNASEDMICA', 'LOCALWEEK' ),
+	'revisionid'                => array( '1', 'IDREVIZIJE', 'REVISIONID' ),
+	'revisionday'               => array( '1', 'REVIZIJEDANA', 'REVISIONDAY' ),
+	'revisionday2'              => array( '1', 'REVIZIJEDANA2', 'REVISIONDAY2' ),
+	'revisionmonth'             => array( '1', 'REVIZIJAMJESECA', 'REVISIONMONTH' ),
+	'revisionyear'              => array( '1', 'REVIZIJAGODINE', 'REVISIONYEAR' ),
+	'revisiontimestamp'         => array( '1', 'REVIZIJAVREMENSKOGPECATA', 'REVISIONTIMESTAMP' ),
+	'plural'                    => array( '0', 'MNOŽINA:', 'PLURAL:' ),
+	'fullurl'                   => array( '0', 'PUNURL:', 'FULLURL:' ),
+	'fullurle'                  => array( '0', 'PUNURLE:', 'FULLURLE:' ),
+	'lcfirst'                   => array( '0', 'LCPRVI:', 'LCFIRST:' ),
+	'ucfirst'                   => array( '0', 'UCPRVI:', 'UCFIRST:' ),
+	'displaytitle'              => array( '1', 'POKAZINASLOV', 'DISPLAYTITLE' ),
+	'newsectionlink'            => array( '1', '__LINKNOVESEKCIJE__', '__NEWSECTIONLINK__' ),
+	'currentversion'            => array( '1', 'SADASNJAVERZIJA', 'CURRENTVERSION' ),
+	'urlencode'                 => array( '0', 'DEKODIRAJADRESU', 'URLENCODE:' ),
+	'currenttimestamp'          => array( '1', 'SADASNJIVREMENSKIPECAT', 'CURRENTTIMESTAMP' ),
+	'localtimestamp'            => array( '1', 'LOKALNIVREMENSKIPECAT', 'LOCALTIMESTAMP' ),
+	'language'                  => array( '0', '#JEZIK:', '#LANGUAGE:' ),
+	'pagesinnamespace'          => array( '1', 'STRANICEUIMENSKOMPROSTORU:', 'PAGESINNAMESPACE:', 'PAGESINNS:' ),
+	'numberofadmins'            => array( '1', 'BROJADMINISTRATORA', 'NUMBEROFADMINS' ),
+	'formatnum'                 => array( '0', 'NUMERICKIFORMAT', 'FORMATNUM' ),
+	'padleft'                   => array( '0', 'JASTUKLIJEVO', 'PADLEFT' ),
+	'padright'                  => array( '0', 'JASTUKDESNO', 'PADRIGHT' ),
+	'special'                   => array( '0', 'specijalno', 'special' ),
+	'filepath'                  => array( '0', 'STAZADATOTEKE:', 'FILEPATH:' ),
+	'tag'                       => array( '0', 'oznaka', 'tag' ),
+	'hiddencat'                 => array( '1', '__SAKRIVENAKATEGORIJA__', '__HIDDENCAT__' ),
+	'pagesincategory'           => array( '1', 'STRANICEUKATEGORIJI', 'STRANICEUKAT', 'PAGESINCATEGORY', 'PAGESINCAT' ),
+	'pagesize'                  => array( '1', 'VELICINASTRANICE', 'PAGESIZE' ),
+	'index'                     => array( '1', '__SADRZAJ__', '__INDEX__' ),
+	'noindex'                   => array( '1', '__BEZSADRZAJA__', '__NOINDEX__' ),
+	'numberingroup'             => array( '1', 'BROJUGRUPI', 'NUMBERINGROUP', 'NUMINGROUP' ),
+	'staticredirect'            => array( '1', '__STATISTICNOPREUSMJERENJE__', '__STATICREDIRECT__' ),
+	'protectionlevel'           => array( '1', 'NIVOZASTITE', 'PROTECTIONLEVEL' ),
+	'formatdate'                => array( '0', 'formatdatuma', 'formatdate', 'dateformat' ),
+	'url_path'                  => array( '0', 'PUTANJA', 'PATH' ),
+	'url_query'                 => array( '0', 'UPIT', 'QUERY' ),
 );
 
 $fallback8bitEncoding = "iso-8859-2";
diff --git a/languages/messages/MessagesCa.php b/languages/messages/MessagesCa.php
index f9eba2d9de..97ed470506 100644
--- a/languages/messages/MessagesCa.php
+++ b/languages/messages/MessagesCa.php
@@ -84,20 +84,20 @@ $dateFormats = array(
 );
 
 $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' ),
+	'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(
@@ -1994,7 +1994,7 @@ Les entrades <del>ratllades</del> s\'han resolt.',
 'listusers-editsonly' => 'Mostra només usuaris amb edicions',
 'listusers-creationsort' => 'Ordena per data de creació',
 'usereditcount' => '$1 {{PLURAL:$1|modificació|modificacions}}',
-'usercreated' => '{{GENDER:$3|Creat}} en  $1  a les$2',
+'usercreated' => '{{GENDER:$3|Creat}}: $1 a les $2',
 'newpages' => 'Pàgines noves',
 'newpages-username' => "Nom d'usuari:",
 'ancientpages' => 'Pàgines més antigues',
diff --git a/languages/messages/MessagesCe.php b/languages/messages/MessagesCe.php
index 37e16bfb5d..17545b0ccf 100644
--- a/languages/messages/MessagesCe.php
+++ b/languages/messages/MessagesCe.php
@@ -62,150 +62,150 @@ $namespaceAliases = array(
 $namespaceGenderAliases = array();
 
 $magicWords = array(
-	'redirect'                => array( '0', '#дlасахьажайар\'', '\'#хьажайо\'', '\'#REDIRECT', '#перенаправление', '#перенапр', '#REDIRECT' ),
-	'notoc'                   => array( '0', '__БАЦ_ЧУЛАЦАМ__', '__БАЦ_ЧУЛ__', '__БЕЗ_ОГЛАВЛЕНИЯ__', '__БЕЗ_ОГЛ__', '__NOTOC__' ),
-	'nogallery'               => array( '0', '__ЙАЦ_УЧЕ__', '__БЕЗ_ГАЛЕРЕИ__', '__NOGALLERY__' ),
-	'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' ),
-	'currentmonthnamegen'     => array( '1', 'КАРАРАЧУ_БЕТТА_ЦlЕ_МУХ', 'НАЗВАНИЕ_ТЕКУЩЕГО_МЕСЯЦА_РОД', 'CURRENTMONTHNAMEGEN' ),
-	'currentmonthabbrev'      => array( '1', 'КАРАРАЧУ_БЕТТА_ЦlЕ_АБР', 'НАЗВАНИЕ_ТЕКУЩЕГО_МЕСЯЦА_АБР', 'CURRENTMONTHABBREV' ),
-	'currentday'              => array( '1', 'КАРАРА_ДЕ', 'ТЕКУЩИЙ_ДЕНЬ', 'CURRENTDAY' ),
-	'currentday2'             => array( '1', 'КАРАРА_ДЕ_2', 'ТЕКУЩИЙ_ДЕНЬ_2', 'CURRENTDAY2' ),
-	'currentdayname'          => array( '1', 'КАРАРАЧУ_ДЕ_ЦlЕ', 'НАЗВАНИЕ_ТЕКУЩЕГО_ДНЯ', 'CURRENTDAYNAME' ),
-	'currentyear'             => array( '1', 'КАРАРА_ШО', 'ТЕКУЩИЙ_ГОД', 'CURRENTYEAR' ),
-	'currenttime'             => array( '1', 'КАРАРА_ХАН', 'ТЕКУЩЕЕ_ВРЕМЯ', 'CURRENTTIME' ),
-	'currenthour'             => array( '1', 'КАРАРА_САХЬТ', 'ТЕКУЩИЙ_ЧАС', 'CURRENTHOUR' ),
-	'localmonth'              => array( '1', 'МЕТТИГАН_БУТТ', 'МЕСТНЫЙ_МЕСЯЦ_2', 'МЕСТНЫЙ_МЕСЯЦ', 'LOCALMONTH', 'LOCALMONTH2' ),
-	'localmonth1'             => array( '1', 'МЕТТИГАН_БУТТ_1', 'МЕСТНЫЙ_МЕСЯЦ_1', 'LOCALMONTH1' ),
-	'localmonthname'          => array( '1', 'МЕТТИГАН_БЕТТА_ЦlЕ', 'НАЗВАНИЕ_МЕСТНОГО_МЕСЯЦА', 'LOCALMONTHNAME' ),
-	'localmonthnamegen'       => array( '1', 'МЕТТИГАН_БЕТТА_ЦlЕ_МУХ', 'НАЗВАНИЕ_МЕСТНОГО_МЕСЯЦА_РОД', 'LOCALMONTHNAMEGEN' ),
-	'localmonthabbrev'        => array( '1', 'МЕТТИГАН_БЕТТА_ЦlЕ_АБР', 'НАЗВАНИЕ_МЕСТНОГО_МЕСЯЦА_АБР', 'LOCALMONTHABBREV' ),
-	'localday'                => array( '1', 'МЕТТИГАН_ДЕ', 'МЕСТНЫЙ_ДЕНЬ', 'LOCALDAY' ),
-	'localday2'               => array( '1', 'МЕТТИГАН_ДЕ_2', 'МЕСТНЫЙ_ДЕНЬ_2', 'LOCALDAY2' ),
-	'localdayname'            => array( '1', 'МЕТТИГАН_ДЕ_ЦlЕ', 'НАЗВАНИЕ_МЕСТНОГО_ДНЯ', 'LOCALDAYNAME' ),
-	'localyear'               => array( '1', 'МЕТТИГАН_ШО', 'МЕСТНЫЙ_ГОД', 'LOCALYEAR' ),
-	'localtime'               => array( '1', 'МЕТТИГАН_ХАН', 'МЕСТНОЕ_ВРЕМЯ', 'LOCALTIME' ),
-	'localhour'               => array( '1', 'МЕТТИГАН_САХЬТ', 'МЕСТНЫЙ_ЧАС', 'LOCALHOUR' ),
-	'numberofpages'           => array( '1', 'АГlОНИЙ_ДУКХАЛЛА', 'КОЛИЧЕСТВО_СТРАНИЦ', 'NUMBEROFPAGES' ),
-	'numberofarticles'        => array( '1', 'ЯЗЗАМАШИ_ДУКХАЛЛА', 'КОЛИЧЕСТВО_СТАТЕЙ', 'NUMBEROFARTICLES' ),
-	'numberoffiles'           => array( '1', 'ХlУМНИЙ_ДУКХАЛЛА', 'КОЛИЧЕСТВО_ФАЙЛОВ', 'NUMBEROFFILES' ),
-	'numberofusers'           => array( '1', 'ДЕКЪАШХОЙ_ДУКХАЛЛА', 'КОЛИЧЕСТВО_УЧАСТНИКОВ', 'NUMBEROFUSERS' ),
-	'numberofactiveusers'     => array( '1', 'ДУКХАЛЛА_ЖИГАРА_ДЕКЪАШХОЙ', 'КОЛИЧЕСТВО_АКТИВНЫХ_УЧАСТНИКОВ', 'NUMBEROFACTIVEUSERS' ),
-	'numberofedits'           => array( '1', 'НИСДАРШИЙ_ДУКХАЛЛА', 'КОЛИЧЕСТВО_ПРАВОК', 'NUMBEROFEDITS' ),
-	'numberofviews'           => array( '1', 'ХЬАЖАРИЙ_ДУКХАЛЛА', 'КОЛИЧЕСТВО_ПРОСМОТРОВ', 'NUMBEROFVIEWS' ),
-	'pagename'                => array( '1', 'АГlОН_ЦlЕ', 'НАЗВАНИЕ_СТРАНИЦЫ', 'PAGENAME' ),
-	'pagenamee'               => array( '1', 'АГlОН_ЦlЕ_2', 'НАЗВАНИЕ_СТРАНИЦЫ_2', 'PAGENAMEE' ),
-	'namespace'               => array( '1', 'ЦlЕРИ_АНА', 'ПРОСТРАНСТВО_ИМЁН', 'NAMESPACE' ),
-	'namespacee'              => array( '1', 'ЦlЕРИ_АНА_2', 'ПРОСТРАНСТВО_ИМЁН_2', 'NAMESPACEE' ),
-	'talkspace'               => array( '1', 'ДИЙЦАРШИ_АНА', 'ПРОСТРАНСТВО_ОБСУЖДЕНИЙ', 'TALKSPACE' ),
-	'talkspacee'              => array( '1', 'ДИЙЦАРШИ_АНА_2', 'ПРОСТРАНСТВО_ОБСУЖДЕНИЙ_2', 'TALKSPACEE' ),
-	'subjectspace'            => array( '1', 'ЯЗЗАМАШИ_АНА', 'ПРОСТРАНСТВО_СТАТЕЙ', 'SUBJECTSPACE', 'ARTICLESPACE' ),
-	'subjectspacee'           => array( '1', 'ЯЗЗАМАШИ_АНА_2', 'ПРОСТРАНСТВО_СТАТЕЙ_2', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
-	'fullpagename'            => array( '1', 'ЮЬЗЗИНА_АГlОН_ЦlЕ', 'ПОЛНОЕ_НАЗВАНИЕ_СТРАНИЦЫ', 'FULLPAGENAME' ),
-	'fullpagenamee'           => array( '1', 'ЮЬЗЗИНА_АГlОН_ЦlЕ_2', 'ПОЛНОЕ_НАЗВАНИЕ_СТРАНИЦЫ_2', 'FULLPAGENAMEE' ),
-	'subpagename'             => array( '1', 'АГlОН_КlЕЛАРА_ЦlЕ', 'НАЗВАНИЕ_ПОДСТРАНИЦЫ', 'SUBPAGENAME' ),
-	'subpagenamee'            => array( '1', 'АГlОН_КlЕЛАРА_ЦlЕ_2', 'НАЗВАНИЕ_ПОДСТРАНИЦЫ_2', 'SUBPAGENAMEE' ),
-	'basepagename'            => array( '1', 'АГlОН_ЦlЕРА_БУХ', 'ОСНОВА_НАЗВАНИЯ_СТРАНИЦЫ', 'BASEPAGENAME' ),
-	'basepagenamee'           => array( '1', 'АГlОН_ЦlЕРА_БУХ_2', 'ОСНОВА_НАЗВАНИЯ_СТРАНИЦЫ_2', 'BASEPAGENAMEE' ),
-	'talkpagename'            => array( '1', 'ДИЙЦАРЕ_АГlОН_ЦlЕ', 'НАЗВАНИЕ_СТРАНИЦЫ_ОБСУЖДЕНИЯ', 'TALKPAGENAME' ),
-	'talkpagenamee'           => array( '1', 'ДИЙЦАРЕ_АГlОН_ЦlЕ_2', 'НАЗВАНИЕ_СТРАНИЦЫ_ОБСУЖДЕНИЯ_2', 'TALKPAGENAMEE' ),
-	'subjectpagename'         => array( '1', 'АГlОН_ЯЗЗАМАН_ЦlЕ', 'НАЗВАНИЕ_СТРАНИЦЫ_СТАТЬИ', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
-	'subjectpagenamee'        => array( '1', 'АГlОН_ЯЗЗАМАН_ЦlЕ_2', 'НАЗВАНИЕ_СТРАНИЦЫ_СТАТЬИ_2', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
-	'msg'                     => array( '0', 'ХААМ:', 'СООБЩЕНИЕ:', 'СООБЩ:', 'MSG:' ),
-	'subst'                   => array( '0', 'ХlОТТОР:', 'ХlОТТ:', 'ПОДСТАНОВКА:', 'ПОДСТ:', 'SUBST:' ),
-	'msgnw'                   => array( '0', 'ВИКИ_ХААМ_БОЦАШ:', 'СООБЩ_БЕЗ_ВИКИ:', 'MSGNW:' ),
-	'img_thumbnail'           => array( '1', 'жима', 'жимо', 'мини', 'миниатюра', 'thumbnail', 'thumb' ),
-	'img_manualthumb'         => array( '1', 'жима=$1', 'жимо=$1', 'мини=$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_page'                => array( '1', 'агlо=$1', 'агlо_$1', 'page_$1', 'страница=$1', 'страница $1', 'page=$1', 'page $1' ),
-	'img_upright'             => array( '1', 'бакъхьалакхо', 'бакъхьалакхо=$1', 'бакъхьалакхо_$1', 'upright_$1', 'сверхусправа', 'сверхусправа=$1', 'сверхусправа $1', 'upright', 'upright=$1', 'upright $1' ),
-	'img_border'              => array( '1', 'доза', 'граница', 'border' ),
-	'img_baseline'            => array( '1', 'бух', 'основание', 'baseline' ),
-	'img_sub'                 => array( '1', 'буха', 'под', 'sub' ),
-	'img_super'               => array( '1', 'тlе', 'над', 'super', 'sup' ),
-	'img_top'                 => array( '1', 'лакхахь', 'сверху', 'top' ),
-	'img_text_top'            => array( '1', 'лакххьара-йоза', 'текст-сверху', 'text-top' ),
-	'img_middle'              => array( '1', 'юккъе', 'посередине', 'middle' ),
-	'img_bottom'              => array( '1', 'бухар', 'снизу', 'bottom' ),
-	'img_text_bottom'         => array( '1', 'бухара-йоза', 'текст-снизу', 'text-bottom' ),
-	'img_link'                => array( '1', 'хьажориг=$1', 'ссылка=$1', 'link=$1' ),
-	'img_alt'                 => array( '1', 'альт=$1', 'alt=$1' ),
-	'int'                     => array( '0', 'ЧУЬРА:', 'ВНУТР:', 'INT:' ),
-	'sitename'                => array( '1', 'МЕТТИГ_ЦlЕ', 'НАЗВАНИЕ_САЙТА', 'SITENAME' ),
-	'ns'                      => array( '0', 'БО:', 'ПИ:', 'NS:' ),
-	'nse'                     => array( '0', 'БОХЬ:', 'ПИК:', 'NSE:' ),
-	'localurl'                => array( '0', 'ХlОТТАЕЛЛА_МЕТТИГ:', 'ЛОКАЛЬНЫЙ_АДРЕС:', 'LOCALURL:' ),
-	'localurle'               => array( '0', 'ХlОТТАЕЛЛА_МЕТТИГ_2:', 'ЛОКАЛЬНЫЙ_АДРЕС_2:', 'LOCALURLE:' ),
-	'server'                  => array( '0', 'ГlУЛКХДИРИГ', 'СЕРВЕР', 'SERVER' ),
-	'servername'              => array( '0', 'ГlУЛКХДЕЧУЬНА_ЦlЕ', 'НАЗВАНИЕ_СЕРВЕРА', 'SERVERNAME' ),
-	'scriptpath'              => array( '0', 'НЕКЪ_ОЦ_МЕТТАКЕПА', 'ПУТЬ_К_СКРИПТУ', 'SCRIPTPATH' ),
-	'stylepath'               => array( '0', 'ЙОМАНХАТl', 'ПУТЬ_К_СТИЛЮ', 'STYLEPATH' ),
-	'grammar'                 => array( '0', 'ДОЖАР:', 'ПАДЕЖ:', 'GRAMMAR:' ),
-	'gender'                  => array( '0', 'ВУ_ЙУ:', 'GENDER', 'ПОЛ:', 'GENDER:' ),
-	'notitleconvert'          => array( '0', '__ХИЙЦАР_ДОЦУШ_КОЬРТЕ__', '__БЕЗ_ПРЕОБРАЗОВАНИЯ_ЗАГОЛОВКА__', '__NOTITLECONVERT__', '__NOTC__' ),
-	'nocontentconvert'        => array( '0', '__ЙОЗА_ХИЙЦАР_ДОЦУШ__', '__БЕЗ_ПРЕОБРАЗОВАНИЯ_ТЕКСТА__', '__NOCONTENTCONVERT__', '__NOCC__' ),
-	'currentweek'             => array( '1', 'КАРАРА_КlИР', 'ТЕКУЩАЯ_НЕДЕЛЯ', 'CURRENTWEEK' ),
-	'currentdow'              => array( '1', 'КАРАРА_КlИРАН_ДЕ', 'ТЕКУЩИЙ_ДЕНЬ_НЕДЕЛИ', 'CURRENTDOW' ),
-	'localweek'               => array( '1', 'МЕТТИГЕРА_КlИРА', 'МЕСТНАЯ_НЕДЕЛЯ', 'LOCALWEEK' ),
-	'localdow'                => array( '1', 'МЕТТИГАН_КlИРАН_ДЕ', 'МЕСТНЫЙ_ДЕНЬ_НЕДЕЛИ', 'LOCALDOW' ),
-	'revisionid'              => array( '1', 'ЦУЬНА_БАШХО', 'ИД_ВЕРСИИ', 'REVISIONID' ),
-	'revisionday'             => array( '1', 'ДЕ_БАШХО', 'ДЕНЬ_ВЕРСИИ', 'REVISIONDAY' ),
-	'revisionday2'            => array( '1', 'ДЕ_БАШХО_2', 'ДЕНЬ_ВЕРСИИ_2', 'REVISIONDAY2' ),
-	'revisionmonth'           => array( '1', 'БЕТТА_БАШХО', 'МЕСЯЦ_ВЕРСИИ', 'REVISIONMONTH' ),
-	'revisionyear'            => array( '1', 'ШО_БАШХО', 'ГОД_ВЕРСИИ', 'REVISIONYEAR' ),
-	'revisiontimestamp'       => array( '1', 'КЪАСТАМ_ХЕНА_БАШХО', 'ОТМЕТКА_ВРЕМЕНИ_ВЕРСИИ', 'REVISIONTIMESTAMP' ),
-	'revisionuser'            => array( '1', 'ДЕКЪАШХОН_БАШХО', 'ВЕРСИЯ_УЧАСНИКА', 'REVISIONUSER' ),
-	'plural'                  => array( '0', 'ДУКХАЛЛИН_ТЕРАХЬ:', 'МНОЖЕСТВЕННОЕ_ЧИСЛО:', 'PLURAL:' ),
-	'fullurl'                 => array( '0', 'МАЙАРРА_МЕТТИГ:', 'ПОЛНЫЙ_АДРЕС:', 'FULLURL:' ),
-	'fullurle'                => array( '0', 'МАЙАРРА_МЕТТИГ_2:', 'ПОЛНЫЙ_АДРЕС_2:', 'FULLURLE:' ),
-	'lcfirst'                 => array( '0', 'ХЬАЛХАР_ЭЛП_ЖИМА:', 'ПЕРВАЯ_БУКВА_МАЛЕНЬКАЯ:', 'LCFIRST:' ),
-	'ucfirst'                 => array( '0', 'ХЬАЛХАР_ЭЛП_ДОККХА:', 'ПЕРВАЯ_БУКВА_БОЛЬШАЯ:', 'UCFIRST:' ),
-	'lc'                      => array( '0', 'КЕГИЙЧУ_ЭЛПАШЦА:', 'МАЛЕНЬКИМИ_БУКВАМИ:', 'LC:' ),
-	'uc'                      => array( '0', 'ДАККХИЙЧУ_ЭЛПАШЦА:', 'БОЛЬШИМИ_БУКВАМИ:', 'UC:' ),
-	'raw'                     => array( '0', 'ТАЙАНЗА:', 'НЕОБРАБ:', 'RAW:' ),
-	'displaytitle'            => array( '1', 'ГАЙТА_КОЬРТАМОГl', 'ПОКАЗАТЬ_ЗАГОЛОВОК', 'DISPLAYTITLE' ),
-	'rawsuffix'               => array( '1', 'Т', 'Н', 'R' ),
-	'newsectionlink'          => array( '1', '__ХЬАЖОРИГ_ОЦ_КЕРЛАЧУ_ДЕКЪАН__', '__ССЫЛКА_НА_НОВЫЙ_РАЗДЕЛ__', '__NEWSECTIONLINK__' ),
-	'nonewsectionlink'        => array( '1', '__ЙОЦАШ_ХЬАЖОРИГ_ОЦ_КЕРЛАЧУ_ДЕКЪАН__', '__БЕЗ_ССЫЛКИ_НА_НОВЫЙ_РАЗДЕЛ__', '__NONEWSECTIONLINK__' ),
-	'currentversion'          => array( '1', 'ЙОЛШЙОЛУ_БАШХО', 'ТЕКУЩАЯ_ВЕРСИЯ', 'CURRENTVERSION' ),
-	'urlencode'               => array( '0', 'ИШАРЙИНА_МЕТТИГ:', 'ЗАКОДИРОВАННЫЙ_АДРЕС:', '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', 'АГlОНАШ_ОЦ_ЦlЕРАШКАХЬ:', 'СТРАНИЦ_В_ПРОСТРАНСТВЕ_ИМЁН:', 'PAGESINNAMESPACE:', 'PAGESINNS:' ),
-	'numberofadmins'          => array( '1', 'АДМАНКУЬГАЛХОЙ_ДУКХАЛЛА', 'КОЛИЧЕСТВО_АДМИНИСТРАТОРОВ', 'NUMBEROFADMINS' ),
-	'formatnum'               => array( '0', 'ТЕРАХЬАН_БАРАМХlОТТОР', 'ФОРМАТИРОВАТЬ_ЧИСЛО', 'FORMATNUM' ),
-	'padleft'                 => array( '0', 'ЙУЗА_ХАРЦЕ', 'ЗАПОЛНИТЬ_СЛЕВА', 'PADLEFT' ),
-	'padright'                => array( '0', 'ЙУЗА_БАКЪЕ', 'ЗАПОЛНИТЬ_СПРАВА', 'PADRIGHT' ),
-	'special'                 => array( '0', 'белхан', 'гlуллакхан', 'служебная', 'special' ),
-	'defaultsort'             => array( '1', 'ЛИСТАР_ЦАХЬЕХОР', 'ДОГlА_ЛИСТАРАН', 'СОРТИРОВКА_ПО_УМОЛЧАНИЮ', 'КЛЮЧ_СОРТИРОВКИ', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:' ),
-	'filepath'                => array( '0', 'ОЦ_ХlУМАНТlЕ_НЕКЪ:', 'ПУТЬ_К_ФАЙЛУ:', 'FILEPATH:' ),
-	'tag'                     => array( '0', 'къастам', 'къасто', 'къаст', 'метка', 'тег', 'тэг', 'tag' ),
-	'hiddencat'               => array( '1', '__КЪАЙЛАХЙОЛУ_КАДЕГАР__', '__СКРЫТАЯ_КАТЕГОРИЯ__', '__HIDDENCAT__' ),
-	'pagesincategory'         => array( '1', 'АГlОНАШ_ОЦУ_КАДЕГАРШЧОХЬ', 'СТРАНИЦ_В_КАТЕГОРИИ', 'PAGESINCATEGORY', 'PAGESINCAT' ),
-	'pagesize'                => array( '1', 'АГlОН_БАРАМ', 'РАЗМЕР_СТРАНИЦЫ', 'PAGESIZE' ),
-	'index'                   => array( '1', '__МЕТТИГТЕРАХЬ__', '__ИНДЕКС__', '__INDEX__' ),
-	'noindex'                 => array( '1', '__МЕТТИГТЕРАХЬ_ЙОЦАШ__', '__БЕЗ_ИНДЕКСА__', '__NOINDEX__' ),
-	'numberingroup'           => array( '1', 'ТЕРАХЬ_ОЦ_ТОБАНЦА', 'ЧИСЛО_В_ГРУППЕ', 'NUMBERINGROUP', 'NUMINGROUP' ),
-	'staticredirect'          => array( '1', '__БУХЕХЬДЕРГ_ДlАСХЬАЖАЙАР__', '__СТАТИЧЕСКОЕ_ПЕРЕНАПРАВЛЕНИЕ__', '__STATICREDIRECT__' ),
-	'protectionlevel'         => array( '1', 'ГlАРОЛЛИ_БАРАМ', 'УРОВЕНЬ_ЗАЩИТЫ', 'PROTECTIONLEVEL' ),
-	'formatdate'              => array( '0', 'терахьибарам', 'форматдаты', 'formatdate', 'dateformat' ),
-	'url_path'                => array( '0', 'ЙОМА', 'ПУТЬ', 'PATH' ),
-	'url_wiki'                => array( '0', 'ЧЕХКА', 'ВИКИ', 'WIKI' ),
+	'redirect'                  => array( '0', '#дlасахьажайар\'', '\'#хьажайо\'', '\'#REDIRECT', '#перенаправление', '#перенапр', '#REDIRECT' ),
+	'notoc'                     => array( '0', '__БАЦ_ЧУЛАЦАМ__', '__БАЦ_ЧУЛ__', '__БЕЗ_ОГЛАВЛЕНИЯ__', '__БЕЗ_ОГЛ__', '__NOTOC__' ),
+	'nogallery'                 => array( '0', '__ЙАЦ_УЧЕ__', '__БЕЗ_ГАЛЕРЕИ__', '__NOGALLERY__' ),
+	'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' ),
+	'currentmonthnamegen'       => array( '1', 'КАРАРАЧУ_БЕТТА_ЦlЕ_МУХ', 'НАЗВАНИЕ_ТЕКУЩЕГО_МЕСЯЦА_РОД', 'CURRENTMONTHNAMEGEN' ),
+	'currentmonthabbrev'        => array( '1', 'КАРАРАЧУ_БЕТТА_ЦlЕ_АБР', 'НАЗВАНИЕ_ТЕКУЩЕГО_МЕСЯЦА_АБР', 'CURRENTMONTHABBREV' ),
+	'currentday'                => array( '1', 'КАРАРА_ДЕ', 'ТЕКУЩИЙ_ДЕНЬ', 'CURRENTDAY' ),
+	'currentday2'               => array( '1', 'КАРАРА_ДЕ_2', 'ТЕКУЩИЙ_ДЕНЬ_2', 'CURRENTDAY2' ),
+	'currentdayname'            => array( '1', 'КАРАРАЧУ_ДЕ_ЦlЕ', 'НАЗВАНИЕ_ТЕКУЩЕГО_ДНЯ', 'CURRENTDAYNAME' ),
+	'currentyear'               => array( '1', 'КАРАРА_ШО', 'ТЕКУЩИЙ_ГОД', 'CURRENTYEAR' ),
+	'currenttime'               => array( '1', 'КАРАРА_ХАН', 'ТЕКУЩЕЕ_ВРЕМЯ', 'CURRENTTIME' ),
+	'currenthour'               => array( '1', 'КАРАРА_САХЬТ', 'ТЕКУЩИЙ_ЧАС', 'CURRENTHOUR' ),
+	'localmonth'                => array( '1', 'МЕТТИГАН_БУТТ', 'МЕСТНЫЙ_МЕСЯЦ_2', 'МЕСТНЫЙ_МЕСЯЦ', 'LOCALMONTH', 'LOCALMONTH2' ),
+	'localmonth1'               => array( '1', 'МЕТТИГАН_БУТТ_1', 'МЕСТНЫЙ_МЕСЯЦ_1', 'LOCALMONTH1' ),
+	'localmonthname'            => array( '1', 'МЕТТИГАН_БЕТТА_ЦlЕ', 'НАЗВАНИЕ_МЕСТНОГО_МЕСЯЦА', 'LOCALMONTHNAME' ),
+	'localmonthnamegen'         => array( '1', 'МЕТТИГАН_БЕТТА_ЦlЕ_МУХ', 'НАЗВАНИЕ_МЕСТНОГО_МЕСЯЦА_РОД', 'LOCALMONTHNAMEGEN' ),
+	'localmonthabbrev'          => array( '1', 'МЕТТИГАН_БЕТТА_ЦlЕ_АБР', 'НАЗВАНИЕ_МЕСТНОГО_МЕСЯЦА_АБР', 'LOCALMONTHABBREV' ),
+	'localday'                  => array( '1', 'МЕТТИГАН_ДЕ', 'МЕСТНЫЙ_ДЕНЬ', 'LOCALDAY' ),
+	'localday2'                 => array( '1', 'МЕТТИГАН_ДЕ_2', 'МЕСТНЫЙ_ДЕНЬ_2', 'LOCALDAY2' ),
+	'localdayname'              => array( '1', 'МЕТТИГАН_ДЕ_ЦlЕ', 'НАЗВАНИЕ_МЕСТНОГО_ДНЯ', 'LOCALDAYNAME' ),
+	'localyear'                 => array( '1', 'МЕТТИГАН_ШО', 'МЕСТНЫЙ_ГОД', 'LOCALYEAR' ),
+	'localtime'                 => array( '1', 'МЕТТИГАН_ХАН', 'МЕСТНОЕ_ВРЕМЯ', 'LOCALTIME' ),
+	'localhour'                 => array( '1', 'МЕТТИГАН_САХЬТ', 'МЕСТНЫЙ_ЧАС', 'LOCALHOUR' ),
+	'numberofpages'             => array( '1', 'АГlОНИЙ_ДУКХАЛЛА', 'КОЛИЧЕСТВО_СТРАНИЦ', 'NUMBEROFPAGES' ),
+	'numberofarticles'          => array( '1', 'ЯЗЗАМАШИ_ДУКХАЛЛА', 'КОЛИЧЕСТВО_СТАТЕЙ', 'NUMBEROFARTICLES' ),
+	'numberoffiles'             => array( '1', 'ХlУМНИЙ_ДУКХАЛЛА', 'КОЛИЧЕСТВО_ФАЙЛОВ', 'NUMBEROFFILES' ),
+	'numberofusers'             => array( '1', 'ДЕКЪАШХОЙ_ДУКХАЛЛА', 'КОЛИЧЕСТВО_УЧАСТНИКОВ', 'NUMBEROFUSERS' ),
+	'numberofactiveusers'       => array( '1', 'ДУКХАЛЛА_ЖИГАРА_ДЕКЪАШХОЙ', 'КОЛИЧЕСТВО_АКТИВНЫХ_УЧАСТНИКОВ', 'NUMBEROFACTIVEUSERS' ),
+	'numberofedits'             => array( '1', 'НИСДАРШИЙ_ДУКХАЛЛА', 'КОЛИЧЕСТВО_ПРАВОК', 'NUMBEROFEDITS' ),
+	'numberofviews'             => array( '1', 'ХЬАЖАРИЙ_ДУКХАЛЛА', 'КОЛИЧЕСТВО_ПРОСМОТРОВ', 'NUMBEROFVIEWS' ),
+	'pagename'                  => array( '1', 'АГlОН_ЦlЕ', 'НАЗВАНИЕ_СТРАНИЦЫ', 'PAGENAME' ),
+	'pagenamee'                 => array( '1', 'АГlОН_ЦlЕ_2', 'НАЗВАНИЕ_СТРАНИЦЫ_2', 'PAGENAMEE' ),
+	'namespace'                 => array( '1', 'ЦlЕРИ_АНА', 'ПРОСТРАНСТВО_ИМЁН', 'NAMESPACE' ),
+	'namespacee'                => array( '1', 'ЦlЕРИ_АНА_2', 'ПРОСТРАНСТВО_ИМЁН_2', 'NAMESPACEE' ),
+	'talkspace'                 => array( '1', 'ДИЙЦАРШИ_АНА', 'ПРОСТРАНСТВО_ОБСУЖДЕНИЙ', 'TALKSPACE' ),
+	'talkspacee'                => array( '1', 'ДИЙЦАРШИ_АНА_2', 'ПРОСТРАНСТВО_ОБСУЖДЕНИЙ_2', 'TALKSPACEE' ),
+	'subjectspace'              => array( '1', 'ЯЗЗАМАШИ_АНА', 'ПРОСТРАНСТВО_СТАТЕЙ', 'SUBJECTSPACE', 'ARTICLESPACE' ),
+	'subjectspacee'             => array( '1', 'ЯЗЗАМАШИ_АНА_2', 'ПРОСТРАНСТВО_СТАТЕЙ_2', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
+	'fullpagename'              => array( '1', 'ЮЬЗЗИНА_АГlОН_ЦlЕ', 'ПОЛНОЕ_НАЗВАНИЕ_СТРАНИЦЫ', 'FULLPAGENAME' ),
+	'fullpagenamee'             => array( '1', 'ЮЬЗЗИНА_АГlОН_ЦlЕ_2', 'ПОЛНОЕ_НАЗВАНИЕ_СТРАНИЦЫ_2', 'FULLPAGENAMEE' ),
+	'subpagename'               => array( '1', 'АГlОН_КlЕЛАРА_ЦlЕ', 'НАЗВАНИЕ_ПОДСТРАНИЦЫ', 'SUBPAGENAME' ),
+	'subpagenamee'              => array( '1', 'АГlОН_КlЕЛАРА_ЦlЕ_2', 'НАЗВАНИЕ_ПОДСТРАНИЦЫ_2', 'SUBPAGENAMEE' ),
+	'basepagename'              => array( '1', 'АГlОН_ЦlЕРА_БУХ', 'ОСНОВА_НАЗВАНИЯ_СТРАНИЦЫ', 'BASEPAGENAME' ),
+	'basepagenamee'             => array( '1', 'АГlОН_ЦlЕРА_БУХ_2', 'ОСНОВА_НАЗВАНИЯ_СТРАНИЦЫ_2', 'BASEPAGENAMEE' ),
+	'talkpagename'              => array( '1', 'ДИЙЦАРЕ_АГlОН_ЦlЕ', 'НАЗВАНИЕ_СТРАНИЦЫ_ОБСУЖДЕНИЯ', 'TALKPAGENAME' ),
+	'talkpagenamee'             => array( '1', 'ДИЙЦАРЕ_АГlОН_ЦlЕ_2', 'НАЗВАНИЕ_СТРАНИЦЫ_ОБСУЖДЕНИЯ_2', 'TALKPAGENAMEE' ),
+	'subjectpagename'           => array( '1', 'АГlОН_ЯЗЗАМАН_ЦlЕ', 'НАЗВАНИЕ_СТРАНИЦЫ_СТАТЬИ', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
+	'subjectpagenamee'          => array( '1', 'АГlОН_ЯЗЗАМАН_ЦlЕ_2', 'НАЗВАНИЕ_СТРАНИЦЫ_СТАТЬИ_2', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
+	'msg'                       => array( '0', 'ХААМ:', 'СООБЩЕНИЕ:', 'СООБЩ:', 'MSG:' ),
+	'subst'                     => array( '0', 'ХlОТТОР:', 'ХlОТТ:', 'ПОДСТАНОВКА:', 'ПОДСТ:', 'SUBST:' ),
+	'msgnw'                     => array( '0', 'ВИКИ_ХААМ_БОЦАШ:', 'СООБЩ_БЕЗ_ВИКИ:', 'MSGNW:' ),
+	'img_thumbnail'             => array( '1', 'жима', 'жимо', 'мини', 'миниатюра', 'thumbnail', 'thumb' ),
+	'img_manualthumb'           => array( '1', 'жима=$1', 'жимо=$1', 'мини=$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_page'                  => array( '1', 'агlо=$1', 'агlо_$1', 'page_$1', 'страница=$1', 'страница $1', 'page=$1', 'page $1' ),
+	'img_upright'               => array( '1', 'бакъхьалакхо', 'бакъхьалакхо=$1', 'бакъхьалакхо_$1', 'upright_$1', 'сверхусправа', 'сверхусправа=$1', 'сверхусправа $1', 'upright', 'upright=$1', 'upright $1' ),
+	'img_border'                => array( '1', 'доза', 'граница', 'border' ),
+	'img_baseline'              => array( '1', 'бух', 'основание', 'baseline' ),
+	'img_sub'                   => array( '1', 'буха', 'под', 'sub' ),
+	'img_super'                 => array( '1', 'тlе', 'над', 'super', 'sup' ),
+	'img_top'                   => array( '1', 'лакхахь', 'сверху', 'top' ),
+	'img_text_top'              => array( '1', 'лакххьара-йоза', 'текст-сверху', 'text-top' ),
+	'img_middle'                => array( '1', 'юккъе', 'посередине', 'middle' ),
+	'img_bottom'                => array( '1', 'бухар', 'снизу', 'bottom' ),
+	'img_text_bottom'           => array( '1', 'бухара-йоза', 'текст-снизу', 'text-bottom' ),
+	'img_link'                  => array( '1', 'хьажориг=$1', 'ссылка=$1', 'link=$1' ),
+	'img_alt'                   => array( '1', 'альт=$1', 'alt=$1' ),
+	'int'                       => array( '0', 'ЧУЬРА:', 'ВНУТР:', 'INT:' ),
+	'sitename'                  => array( '1', 'МЕТТИГ_ЦlЕ', 'НАЗВАНИЕ_САЙТА', 'SITENAME' ),
+	'ns'                        => array( '0', 'БО:', 'ПИ:', 'NS:' ),
+	'nse'                       => array( '0', 'БОХЬ:', 'ПИК:', 'NSE:' ),
+	'localurl'                  => array( '0', 'ХlОТТАЕЛЛА_МЕТТИГ:', 'ЛОКАЛЬНЫЙ_АДРЕС:', 'LOCALURL:' ),
+	'localurle'                 => array( '0', 'ХlОТТАЕЛЛА_МЕТТИГ_2:', 'ЛОКАЛЬНЫЙ_АДРЕС_2:', 'LOCALURLE:' ),
+	'server'                    => array( '0', 'ГlУЛКХДИРИГ', 'СЕРВЕР', 'SERVER' ),
+	'servername'                => array( '0', 'ГlУЛКХДЕЧУЬНА_ЦlЕ', 'НАЗВАНИЕ_СЕРВЕРА', 'SERVERNAME' ),
+	'scriptpath'                => array( '0', 'НЕКЪ_ОЦ_МЕТТАКЕПА', 'ПУТЬ_К_СКРИПТУ', 'SCRIPTPATH' ),
+	'stylepath'                 => array( '0', 'ЙОМАНХАТl', 'ПУТЬ_К_СТИЛЮ', 'STYLEPATH' ),
+	'grammar'                   => array( '0', 'ДОЖАР:', 'ПАДЕЖ:', 'GRAMMAR:' ),
+	'gender'                    => array( '0', 'ВУ_ЙУ:', 'GENDER', 'ПОЛ:', 'GENDER:' ),
+	'notitleconvert'            => array( '0', '__ХИЙЦАР_ДОЦУШ_КОЬРТЕ__', '__БЕЗ_ПРЕОБРАЗОВАНИЯ_ЗАГОЛОВКА__', '__NOTITLECONVERT__', '__NOTC__' ),
+	'nocontentconvert'          => array( '0', '__ЙОЗА_ХИЙЦАР_ДОЦУШ__', '__БЕЗ_ПРЕОБРАЗОВАНИЯ_ТЕКСТА__', '__NOCONTENTCONVERT__', '__NOCC__' ),
+	'currentweek'               => array( '1', 'КАРАРА_КlИР', 'ТЕКУЩАЯ_НЕДЕЛЯ', 'CURRENTWEEK' ),
+	'currentdow'                => array( '1', 'КАРАРА_КlИРАН_ДЕ', 'ТЕКУЩИЙ_ДЕНЬ_НЕДЕЛИ', 'CURRENTDOW' ),
+	'localweek'                 => array( '1', 'МЕТТИГЕРА_КlИРА', 'МЕСТНАЯ_НЕДЕЛЯ', 'LOCALWEEK' ),
+	'localdow'                  => array( '1', 'МЕТТИГАН_КlИРАН_ДЕ', 'МЕСТНЫЙ_ДЕНЬ_НЕДЕЛИ', 'LOCALDOW' ),
+	'revisionid'                => array( '1', 'ЦУЬНА_БАШХО', 'ИД_ВЕРСИИ', 'REVISIONID' ),
+	'revisionday'               => array( '1', 'ДЕ_БАШХО', 'ДЕНЬ_ВЕРСИИ', 'REVISIONDAY' ),
+	'revisionday2'              => array( '1', 'ДЕ_БАШХО_2', 'ДЕНЬ_ВЕРСИИ_2', 'REVISIONDAY2' ),
+	'revisionmonth'             => array( '1', 'БЕТТА_БАШХО', 'МЕСЯЦ_ВЕРСИИ', 'REVISIONMONTH' ),
+	'revisionyear'              => array( '1', 'ШО_БАШХО', 'ГОД_ВЕРСИИ', 'REVISIONYEAR' ),
+	'revisiontimestamp'         => array( '1', 'КЪАСТАМ_ХЕНА_БАШХО', 'ОТМЕТКА_ВРЕМЕНИ_ВЕРСИИ', 'REVISIONTIMESTAMP' ),
+	'revisionuser'              => array( '1', 'ДЕКЪАШХОН_БАШХО', 'ВЕРСИЯ_УЧАСНИКА', 'REVISIONUSER' ),
+	'plural'                    => array( '0', 'ДУКХАЛЛИН_ТЕРАХЬ:', 'МНОЖЕСТВЕННОЕ_ЧИСЛО:', 'PLURAL:' ),
+	'fullurl'                   => array( '0', 'МАЙАРРА_МЕТТИГ:', 'ПОЛНЫЙ_АДРЕС:', 'FULLURL:' ),
+	'fullurle'                  => array( '0', 'МАЙАРРА_МЕТТИГ_2:', 'ПОЛНЫЙ_АДРЕС_2:', 'FULLURLE:' ),
+	'lcfirst'                   => array( '0', 'ХЬАЛХАР_ЭЛП_ЖИМА:', 'ПЕРВАЯ_БУКВА_МАЛЕНЬКАЯ:', 'LCFIRST:' ),
+	'ucfirst'                   => array( '0', 'ХЬАЛХАР_ЭЛП_ДОККХА:', 'ПЕРВАЯ_БУКВА_БОЛЬШАЯ:', 'UCFIRST:' ),
+	'lc'                        => array( '0', 'КЕГИЙЧУ_ЭЛПАШЦА:', 'МАЛЕНЬКИМИ_БУКВАМИ:', 'LC:' ),
+	'uc'                        => array( '0', 'ДАККХИЙЧУ_ЭЛПАШЦА:', 'БОЛЬШИМИ_БУКВАМИ:', 'UC:' ),
+	'raw'                       => array( '0', 'ТАЙАНЗА:', 'НЕОБРАБ:', 'RAW:' ),
+	'displaytitle'              => array( '1', 'ГАЙТА_КОЬРТАМОГl', 'ПОКАЗАТЬ_ЗАГОЛОВОК', 'DISPLAYTITLE' ),
+	'rawsuffix'                 => array( '1', 'Т', 'Н', 'R' ),
+	'newsectionlink'            => array( '1', '__ХЬАЖОРИГ_ОЦ_КЕРЛАЧУ_ДЕКЪАН__', '__ССЫЛКА_НА_НОВЫЙ_РАЗДЕЛ__', '__NEWSECTIONLINK__' ),
+	'nonewsectionlink'          => array( '1', '__ЙОЦАШ_ХЬАЖОРИГ_ОЦ_КЕРЛАЧУ_ДЕКЪАН__', '__БЕЗ_ССЫЛКИ_НА_НОВЫЙ_РАЗДЕЛ__', '__NONEWSECTIONLINK__' ),
+	'currentversion'            => array( '1', 'ЙОЛШЙОЛУ_БАШХО', 'ТЕКУЩАЯ_ВЕРСИЯ', 'CURRENTVERSION' ),
+	'urlencode'                 => array( '0', 'ИШАРЙИНА_МЕТТИГ:', 'ЗАКОДИРОВАННЫЙ_АДРЕС:', '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', 'АГlОНАШ_ОЦ_ЦlЕРАШКАХЬ:', 'СТРАНИЦ_В_ПРОСТРАНСТВЕ_ИМЁН:', 'PAGESINNAMESPACE:', 'PAGESINNS:' ),
+	'numberofadmins'            => array( '1', 'АДМАНКУЬГАЛХОЙ_ДУКХАЛЛА', 'КОЛИЧЕСТВО_АДМИНИСТРАТОРОВ', 'NUMBEROFADMINS' ),
+	'formatnum'                 => array( '0', 'ТЕРАХЬАН_БАРАМХlОТТОР', 'ФОРМАТИРОВАТЬ_ЧИСЛО', 'FORMATNUM' ),
+	'padleft'                   => array( '0', 'ЙУЗА_ХАРЦЕ', 'ЗАПОЛНИТЬ_СЛЕВА', 'PADLEFT' ),
+	'padright'                  => array( '0', 'ЙУЗА_БАКЪЕ', 'ЗАПОЛНИТЬ_СПРАВА', 'PADRIGHT' ),
+	'special'                   => array( '0', 'белхан', 'гlуллакхан', 'служебная', 'special' ),
+	'defaultsort'               => array( '1', 'ЛИСТАР_ЦАХЬЕХОР', 'ДОГlА_ЛИСТАРАН', 'СОРТИРОВКА_ПО_УМОЛЧАНИЮ', 'КЛЮЧ_СОРТИРОВКИ', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:' ),
+	'filepath'                  => array( '0', 'ОЦ_ХlУМАНТlЕ_НЕКЪ:', 'ПУТЬ_К_ФАЙЛУ:', 'FILEPATH:' ),
+	'tag'                       => array( '0', 'къастам', 'къасто', 'къаст', 'метка', 'тег', 'тэг', 'tag' ),
+	'hiddencat'                 => array( '1', '__КЪАЙЛАХЙОЛУ_КАДЕГАР__', '__СКРЫТАЯ_КАТЕГОРИЯ__', '__HIDDENCAT__' ),
+	'pagesincategory'           => array( '1', 'АГlОНАШ_ОЦУ_КАДЕГАРШЧОХЬ', 'СТРАНИЦ_В_КАТЕГОРИИ', 'PAGESINCATEGORY', 'PAGESINCAT' ),
+	'pagesize'                  => array( '1', 'АГlОН_БАРАМ', 'РАЗМЕР_СТРАНИЦЫ', 'PAGESIZE' ),
+	'index'                     => array( '1', '__МЕТТИГТЕРАХЬ__', '__ИНДЕКС__', '__INDEX__' ),
+	'noindex'                   => array( '1', '__МЕТТИГТЕРАХЬ_ЙОЦАШ__', '__БЕЗ_ИНДЕКСА__', '__NOINDEX__' ),
+	'numberingroup'             => array( '1', 'ТЕРАХЬ_ОЦ_ТОБАНЦА', 'ЧИСЛО_В_ГРУППЕ', 'NUMBERINGROUP', 'NUMINGROUP' ),
+	'staticredirect'            => array( '1', '__БУХЕХЬДЕРГ_ДlАСХЬАЖАЙАР__', '__СТАТИЧЕСКОЕ_ПЕРЕНАПРАВЛЕНИЕ__', '__STATICREDIRECT__' ),
+	'protectionlevel'           => array( '1', 'ГlАРОЛЛИ_БАРАМ', 'УРОВЕНЬ_ЗАЩИТЫ', 'PROTECTIONLEVEL' ),
+	'formatdate'                => array( '0', 'терахьибарам', 'форматдаты', 'formatdate', 'dateformat' ),
+	'url_path'                  => array( '0', 'ЙОМА', 'ПУТЬ', 'PATH' ),
+	'url_wiki'                  => array( '0', 'ЧЕХКА', 'ВИКИ', 'WIKI' ),
 );
 
 $messages = array(
diff --git a/languages/messages/MessagesCkb.php b/languages/messages/MessagesCkb.php
index c921623225..95293636d6 100644
--- a/languages/messages/MessagesCkb.php
+++ b/languages/messages/MessagesCkb.php
@@ -135,14 +135,14 @@ $specialPageAliases = array(
 );
 
 $magicWords = array(
-	'img_thumbnail'           => array( '1', 'وێنۆک', 'thumbnail', 'thumb' ),
-	'img_right'               => array( '1', 'ڕاست', 'right' ),
-	'img_left'                => array( '1', 'چەپ', 'left' ),
-	'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_border'              => array( '1', 'سنوور', 'border' ),
+	'img_thumbnail'             => array( '1', 'وێنۆک', 'thumbnail', 'thumb' ),
+	'img_right'                 => array( '1', 'ڕاست', 'right' ),
+	'img_left'                  => array( '1', 'چەپ', 'left' ),
+	'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_border'                => array( '1', 'سنوور', 'border' ),
 );
 
 $messages = array(
@@ -273,6 +273,7 @@ $messages = array(
 'listingcontinuesabbrev' => '(درێژە)',
 'index-category' => 'پەڕە پێرستەکراوەکان',
 'noindex-category' => 'پەڕە پێرستنەکراوەکان',
+'broken-file-category' => 'ئەو پەڕانەی بەستەری پەڕگەکانیان شکاوە',
 
 'about' => 'سەبارەت',
 'article' => 'بابەت',
@@ -547,6 +548,7 @@ $2',
 'yourpasswordagain' => 'دیسان تێپەڕوشەکە بنووسەوە:',
 'remembermypassword' => 'چوونە ژوورەوەم لەسەر ئەم کۆمپیوتەرە پاشەکەوت بکە (ئەو پەڕی $1 {{PLURAL:$1|ڕۆژ|ڕۆژ}}ە)',
 'yourdomainname' => 'ناوی دۆمه‌ینی خۆت',
+'password-change-forbidden' => 'ناتوانیت تێپەڕوشەکانت لەم ویکییەدا بگۆڕیت.',
 'externaldberror' => 'یان هەڵەی ڕێگەپێدانی بنکەدراو هەیە یان ڕێگات پێ نادرێت بۆ نوێ کردنی هەژماری دەرەکیت.',
 'login' => 'بچۆ ژوورەوە',
 'nav-login-createaccount' => 'بچۆ ژوورەوە / ھەژمار دروست بکە',
@@ -568,6 +570,7 @@ $2',
 'userexists' => 'ئەو ناوەی تۆ داوتە پێشتر بەکارھێنراوە.
 ناوێکی دیکە ھەڵبژێرە.',
 'loginerror' => 'ھەڵەی چوونەژوورەوە',
+'createaccounterror' => 'ناتوانیت هەژماری بەکارهێنەر دروست بکەیت: $1',
 'nocookiesnew' => 'ھەژماری بەکارھێنەر دروست‌کرا، بەڵام بە سەرکەوتوویی نەچوویتەوە ژوورەوە.
 {{SITENAME}} بۆ چوونەوە ژوورەوەی بەکارھێنەر لە شەکرۆکە کەڵک وەردەگرێت.
 تۆ شەکرۆکەکەت لەکارخستووە.
@@ -715,8 +718,8 @@ $2
 'showpreview' => 'پێشبینین نیشانبدە',
 'showlivepreview' => 'پێشبینینی ڕاسته‌وخۆ',
 'showdiff' => 'گۆڕانکارییەکان نیشان بدە',
-'anoneditwarning' => "'''ھۆشیار بە:''' نەچوویتەتە ژوورەوە.
-ئەدرەسی IPی تۆ لە مێژووی دەستکارییەکانی ئەم پەڕەدا تۆماردەکرێت.",
+'anoneditwarning' => "'''ھۆشیار بە:''' نەچوویتە ژوورەوە.
+ناونیشانی IPی تۆ لە مێژووی دەستکارییەکانی ئەم پەڕەیەدا تۆماردەکرێت.",
 'anonpreviewwarning' => '«نەڕۆشتوویتە ژوورەوە. پاشەکەوتکردن، ئەدرەسی IPەکەت لە مێژووی دەستکاریی ئەم پەڕە تۆمار دەکات.»',
 'missingsummary' => "'''وە بیر خستنەوە:''' پوختەیەکت نەنووسیوە بۆ چۆنیەتی گۆڕانکارییەکەت.
 ئەگەر جارێکی تر پاشکەوت کردن لێبدەی، بێ پوختە تۆمار دەکرێ.",
@@ -805,6 +808,7 @@ $2
 'note' => "'''تێبینی:'''",
 'previewnote' => "'''لە بیرت نەچێت ئەمە تەنیا پێشبینینە.'''
 گۆڕانکارییەکانت ھێشتا پاشەکەوت نەکراون!",
+'continue-editing' => 'بەردەوام بە لەدەستکاریکردن',
 'previewconflict' => 'ئەم پێشبینینە بە تۆ نیشان ئەدات ئەو دەقەی لە شوێنی دەستکاری سەرەوە داتناوە چۆن بەرچاو ئەکەوێت ئەگەر پاشەکەوتی بکەیت.',
 'session_fail_preview' => "'''ببوورە! ناتوانین دەستکارییەکەت پێواژۆ بکەین بە ھۆی لەدەستدانی session data.'''
 تکایە دیسان ھەوڵبدەوە.
@@ -886,6 +890,7 @@ $2
 'edit-no-change' => 'دەستکاریەکەت بەرچاو نەخرا، لەبەر ئەوەی هیچ گۆڕانکارییەکت لەسەر دەقەکە نەکردووە.',
 'edit-already-exists' => 'توانای درووست‌کردنی لاپەڕەی نوێ نیە.<br />
 ئەوە لەپێش‌دا هەبوو.',
+'defaultmessagetext' => 'دەقی پەیامی هەمیشەیی',
 
 # Parser/template warnings
 'expensive-parserfunction-warning' => "'''ئاگاداری:''' ئەم لاپەڕە ژمارەیەکی زۆر بانگ‌کەری فەنکشێنی لێک‌کەرەوەی لەخۆ گرتوو.<br /><br />
@@ -1069,7 +1074,7 @@ $1",
 
 # Diffs
 'history-title' => 'مێژووی پیاچوونەوەکانی «$1»',
-'difference-title' => 'جیاوازی نێوان پیاچوونەوەکانی «$1»',
+'difference-title' => 'جیاوازیی نێوان پێداچوونەوەکانی «$1»',
 'difference-title-multipage' => 'جیاوازیی نێوان پەڕەی «$1» و «$2»',
 'difference-multipage' => '(جیاوازی نێوان پەڕەکان)',
 'lineno' => 'ھێڵی  $1:',
@@ -1178,7 +1183,7 @@ $1",
 'prefs-misc' => 'جۆراوجۆر',
 'prefs-resetpass' => 'تێپەڕوشە بگۆڕە',
 'prefs-changeemail' => 'ئەدرەسی ئیمەیل بگۆڕە',
-'prefs-setemail' => 'ئەدرەسێکی ئیمەیل رێکبخە',
+'prefs-setemail' => 'ناونیشانێکی ئیمەیل دیاری بکە',
 'prefs-email' => 'ھەڵبژاردەکانی ئیمەیل',
 'prefs-rendering' => 'ڕواڵەت',
 'saveprefs' => 'پاشەکەوت',
@@ -1381,7 +1386,7 @@ $1",
 
 # Associated actions - in the sentence "You do not have permission to X"
 'action-read' => 'خوێندنەوەی ئەم پەڕە',
-'action-edit' => 'دەستکاریی ئەم پەڕە',
+'action-edit' => 'دەستکاریی ئەم پەڕەیە',
 'action-createpage' => 'درووست‌کردنی لاپەڕە',
 'action-createtalk' => 'درووست‌کردنی لەپەڕەکانی وتووێژ',
 'action-createaccount' => 'درووست‌کردنی هەژمارەی ئەم بەکارهێنەرە',
@@ -1693,6 +1698,7 @@ $1',
 **لادان لە مافەکانی بڵاوکردنەوە
 ***پەڕگەی دووبارەکراوە',
 'filedelete-edit-reasonlist' => 'دەستکاری هۆکارەکانی سڕینەوە',
+'filedelete-maintenance-title' => 'ناتوانیت پەڕگە بسڕیتەوە',
 
 # MIME search
 'mimesearch' => 'گەڕانی MIME',
@@ -1755,7 +1761,7 @@ $1',
 ئێستا ڕەوانکەرە بۆ [[$2]].',
 'double-redirect-fixer' => 'چارەسەرکەری ڕەوانکەر',
 
-'brokenredirects' => 'ڕەوانەکراوە شکاوەکان',
+'brokenredirects' => 'ڕەوانەکەرە شکاوەکان',
 'brokenredirectstext' => 'ئەم ڕەوانەکراوانە بەستەرن بۆ ئەو پەڕانە کە بوونیان نییە:',
 'brokenredirects-edit' => 'دەستکاری',
 'brokenredirects-delete' => 'سڕینەوە',
@@ -1868,6 +1874,9 @@ $1',
 'allpages-bad-ns' => '{{SITENAME}} ناوبۆشایی نیە "$1".',
 'allpages-hide-redirects' => 'ڕەوانەکراوەکان بشارەوە',
 
+# SpecialCachedPage
+'cachedspecial-refresh-now' => 'دواترین پیشانبدە',
+
 # Special:Categories
 'categories' => 'پۆلەكان',
 'categoriespagetext' => 'ئەم {{PLURAL:$1|پۆلە پەڕە یان پەڕگەی|پۆلانە پەڕە یان پەڕگەیان}} لەخۆگرتە.
@@ -2080,7 +2089,7 @@ $UNWATCHURL
 
 دوایین دەستکاری ئەم لاپەڕە [[User:$3|$3]] کردوویە ([[User talk:$3|وتووێژ]]{{int:pipe-separator}}[[Special:Contributions/$3|{{int:contribslink}}]]).',
 'editcomment' => "پوختەی دەستکاری \"''\$1''\" بوو.",
-'revertpage' => 'گەڕاندنەوەی دەستکارییەکان لەلایەن [[Special:Contributions/$2|$2]] ([[User talk:$2|لێدوان]]) بۆ دوایین دەستکاریی [[User:$1|$1]]',
+'revertpage' => 'گەڕاندنەوەی دەستکارییەکانی [[Special:Contributions/$2|$2]] ([[User talk:$2|لێدوان]]) بۆ دوایین دەستکاریی [[User:$1|$1]]',
 'rollback-success' => 'دەستکارییەکانی $1 وەرگێرایەوە؛<br />
 گۆڕدرا بۆ دوایین دەستکاریی $2.',
 
@@ -2096,9 +2105,9 @@ $UNWATCHURL
 'protectedarticle' => '«[[$1]]»ی پاراست',
 'modifiedarticleprotection' => 'ئاستی پاراستنی «[[$1]]»ی گۆڕا',
 'unprotectedarticle' => 'پاراستنی لەسەر «[[$1]]» لابرد',
-'movedarticleprotection' => 'ڕێککارییەکانی پاراستن لە  "[[$2]]" گوازرایەوە بۆ "[[$1]]"',
+'movedarticleprotection' => 'ڕێککارییەکانی پاراستن لە  «[[$2]]» گوازرایەوە بۆ «[[$1]]»',
 'protect-title' => 'گۆڕینی ئاستی پاراستنی "$1"',
-'prot_1movedto2' => '[[$1]] گوازراوەتەوە بۆ [[$2]]',
+'prot_1movedto2' => '[[$1]] گوازرایەوە بۆ [[$2]]',
 'protect-legend' => 'پاراستن تەیید بکە',
 'protectcomment' => 'ھۆکار:',
 'protectexpiry' => 'ھەتا:',
@@ -2409,7 +2418,7 @@ $1',
 * ئەو چوارچێوەی خوارەوە لێنەدراو بکەی.
 
 لەو حاڵەتەدا، ئەگەر بتەوێت بیگوازیتەوە ناچار دەبیت بە شێوەی دەستی بیگوازیتەوە یان تێکەڵیان بکەی.",
-'movearticle' => 'ئەم پەڕە بگوازەوە:',
+'movearticle' => 'ئەم پەڕەیە بگوازەوە:',
 'movenologin' => 'نەچوویتەتە ژوورەوە',
 'movenologintext' => 'بۆ گواستنەوەی پەڕەیەک، ئەشێ ببی بە ئەندام و [[Special:UserLogin|لە ژوورەوە]] بیت.',
 'movenotallowed' => 'ڕێگەت پێ‌نەدراوە بۆ گواستنەوەی لاپەڕەکان.',
@@ -2417,11 +2426,11 @@ $1',
 'cant-move-user-page' => 'ڕێگەت پێ‌نەدراوە بۆ گواستنەوەی لاپەڕەکانی بەکارهێنەر (جیاواز لە ژێرلاپەڕەکان).',
 'cant-move-to-user-page' => 'ڕێگەت پێ‌نەدراوە بۆ گواستنەوەی لاپەڕەیەک بۆ لاپەڕەی بەکارهێنەر (غەیری بۆ ژێرلاپەڕەی بەکارهێنەر).',
 'newtitle' => 'بۆ ناوی نوێی:',
-'move-watch' => 'ئەم پەڕە چاودێری بکە',
-'movepagebtn' => 'ئەم پەڕە بگوازەوە',
+'move-watch' => 'چاودێری ئەم پەڕەیە بکە',
+'movepagebtn' => 'ئەم پەڕەیە بگوازەوە',
 'pagemovedsub' => 'گواستنەوە بە سەرکەوتوویی جێبەجێ کرا',
 'movepage-moved' => "'''«$1» گوازرایەوە بۆ «$2»'''",
-'movepage-moved-redirect' => 'ڕەوانکەرێک درووست‌کرا.',
+'movepage-moved-redirect' => 'ڕەوانەکەرێک دروست کرا.',
 'movepage-moved-noredirect' => 'لە دانانی ڕەوانەکەر بەرگری کرا.',
 'articleexists' => 'پەڕەیەک بەم ناوە ھەیە یان ئەو ناوەی تۆ ھەڵتبژاردووە ڕێگەی پێنەدراوە.
 تکایە ناوێکی دیکە ھەڵبژێرە.',
@@ -2431,7 +2440,7 @@ $1',
 'movedto' => 'گواسترایەوە بۆ',
 'movetalk' => 'پەڕەی وتووێژی پەیوەندیدار بگوازەوە',
 'move-subpages' => 'ژێرپەڕەکانی بگوازەوە (ھەتا $1 پەڕە)',
-'move-talk-subpages' => 'ژێرپەڕەکانی پەڕەی وتووێژی بگۆزەرەوە (ھەتاکوو $1)',
+'move-talk-subpages' => 'ژێرپەڕەکانی پەڕەی وتووێژ بگوازەوە (ھەتا $1 پەڕە)',
 'movepage-page-exists' => 'پەڕەی $1 هەیە و ناتوانرێت خۆکار بخرێتە جێی.',
 'movepage-page-moved' => 'پەڕەی $1 گۆزرایەوە بۆ $2.',
 'movepage-page-unmoved' => 'ناکرێ پەڕەی $1 بگوێزرێتەوە بۆ $2.',
@@ -2440,14 +2449,14 @@ $1',
 'movelogpagetext' => 'لە خوارەوەدا لیستی ھەموو پەڕە گواستنەوەکان دەبینن.',
 'movesubpage' => '{{PLURAL:$1|ژێرپەڕە|ژێرپەڕە}}',
 'movesubpagetext' => 'ئەم لاپەڕە $1 {{PLURAL:$1|ژێرلاپەڕەی‌|ژێرلاپەڕەی}} هەیە کە لەخوارە نیشان دراوە.',
-'movenosubpage' => 'ئەم پەڕە ھیچ ژێرپەڕەیەکی نییە.',
+'movenosubpage' => 'ئەم پەڕەیە ھیچ ژێرپەڕەیەکی نییە.',
 'movereason' => 'ھۆکار:',
 'revertmove' => 'پێچەوانەکردنەوە',
 'delete_and_move' => 'بیسڕەوە و بیگوازەوە',
 'delete_and_move_text' => '== پێویستییەکانی سڕینەوە ==
 لاپەڕەی مەبەست "[[:$1]]" لە پێش‌دا هەیە.
 ئایا دەتەوێ ئەوە بسڕیتەوە تا ڕێگە بۆ گواستنەوەی بکەیتەوە؟',
-'delete_and_move_confirm' => 'بەڵێ، لاپەڕەکە بسڕەوه',
+'delete_and_move_confirm' => 'بەڵێ، پەڕەکە بسڕەوه',
 'delete_and_move_reason' => 'سڕایەوە بۆ کردنەوەی ڕیگە بۆ گواستنەوە لە «[[$1]]»ەوە',
 'selfmove' => 'سەردێڕەکانی سەرچاوە و مەبەست یەکێکن؛
 ناکرێ لاپەڕەیەک بۆ سەر خۆی‌ بگوازرێتەوە.',
@@ -2461,7 +2470,7 @@ $1',
 'imagetypemismatch' => 'پاشگری ئەو پەڕگە نوێیە هاوتای جۆری پەڕگەکە نیە.',
 'imageinvalidfilename' => 'ناوی پەڕگەی ئامانج گونجاو نیە',
 'fix-double-redirects' => 'نوێ‌کەردنەوەی هەموو ڕەوانکەرەکان وا ئاماژە بە سەردێڕە سەرەکیەکە دەکەن',
-'move-leave-redirect' => 'لە پاشەوە ڕەوانکەرێک دابنە',
+'move-leave-redirect' => 'لە پاشەوە ڕەوانکەرێک بە جێ بھێڵە',
 'protectedpagemovewarning' => "'''ھۆشیار بە: ئەم پەڕە پارێزراوە بۆ ئەوی تەنیا ئەو بەکارھێنەرانە کە مافەکانی بەڕێوەبەرایەتییان ھەیە بتوانن بیگوازنەوە.'''
 دوایین لۆگ بۆ ژێدەر لە خوارەوەدا ھاتووە:",
 'semiprotectedpagemovewarning' => "'''ئاگاداری:''' ئەم پەڕە پارێزراوە بۆ ئەوی تەنھا بەکارھێنەرە تۆمارکراوەکان بتوانن بیگوازنەوە.
@@ -2659,9 +2668,11 @@ $1',
 
 # Info page
 'pageinfo-title' => 'زانیاری بۆ «$1»',
+'pageinfo-header-basic' => 'زانیاریی سەرەتایی',
 'pageinfo-header-edits' => 'دەستکاریەکان',
 'pageinfo-views' => 'ژمارەی بینینەکان',
 'pageinfo-watchers' => 'ژمارەی چاودێران',
+'pageinfo-firstuser' => 'دروستکەری پەڕە',
 'pageinfo-edits' => 'ژمارەی دەستکارییەکان',
 
 # Skin names
@@ -2711,7 +2722,7 @@ $1',
 'file-info-size' => '$1 × $2 پیکسێل، قەبارەی پەڕگە: $3، جۆری MIME: $4',
 'file-nohires' => 'رەزۆلوشنی سەرتر لەمە لە بەردەست دا نیە.',
 'svg-long-desc' => 'پەڕگەی SVG، بە ناو $1 × $2 پیکسەڵ، قەبارەی پەڕگە: $3',
-'show-big-image' => 'گەورە کردنەوە',
+'show-big-image' => 'گەورەکردنەوە',
 'show-big-image-preview' => 'قەبارەی ئەم پێشبینینە: $1.',
 'show-big-image-other' => '{{PLURAL:$2|ڕەزەلووشنی|ڕەزەلووشنەکانی}} تر: $1.',
 'show-big-image-size' => '$1 لە $2 پیکسەڵ',
@@ -2773,8 +2784,11 @@ $1',
 'exif-imagelength' => 'بەرزی',
 'exif-imagedescription' => 'ناونیشانی وێنە',
 'exif-model' => 'جۆری کامێرا',
+'exif-software' => 'نەرمەواڵەی بەکارهاتوو',
 'exif-artist' => 'نووسەر',
 'exif-colorspace' => 'بۆشایی ره‌نگ',
+'exif-pixelydimension' => 'پانی وێنە',
+'exif-pixelxdimension' => 'بەرزی وێنە',
 'exif-usercomment' => 'بۆچوونەکانی بەکارهێنەر',
 'exif-relatedsoundfile' => 'فایلی ده‌نگی لێکچوو',
 'exif-lightsource' => 'سەرچاوەی ڕووناکی',
@@ -2790,6 +2804,10 @@ $1',
 'exif-gpstrack' => 'ئاڕاستەی جوڵان',
 'exif-gpsimgdirection' => 'ئاڕاستەی وێنە',
 'exif-gpsdatestamp' => 'ڕێکەوتی GPS',
+'exif-objectname' => 'سەردێری کورت',
+'exif-headline' => 'سەردێر',
+'exif-source' => 'سەرچاوە',
+'exif-copyrighted' => 'ڕەوشی مافی لەبەرگرتنەوە',
 
 # EXIF attributes
 'exif-compression-1' => 'نەپەستێنراو',
@@ -2899,6 +2917,18 @@ $1',
 'exif-gpsspeed-k' => 'کیلۆمەتر هەر کاتژمێر',
 'exif-gpsspeed-m' => 'مایل هەر کاتژمێر',
 
+# Pseudotags used for GPSDestDistanceRef
+'exif-gpsdestdistance-k' => 'کیلۆمەتر',
+'exif-gpsdestdistance-m' => 'میل',
+'exif-gpsdestdistance-n' => 'میکی دەریایی',
+
+'exif-dc-date' => 'ڕۆژ(ەکان)',
+'exif-dc-publisher' => 'بڵاوکار',
+'exif-dc-relation' => 'پەڕگەی پەیوەندیدار',
+'exif-dc-rights' => 'مافەکان',
+'exif-dc-source' => 'سەرچاوەی پەڕگە',
+'exif-dc-type' => 'جۆری پەڕگە',
+
 'exif-iimcategory-hth' => 'تەندروستی',
 'exif-iimcategory-sci' => 'زانست و تەکنۆلۆژیا',
 'exif-iimcategory-soi' => 'بابەتە کۆمەڵایەتییەکان',
@@ -3220,8 +3250,8 @@ $5
 '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-move-move_redir' => '$1 پەڕەی $3 گواستەوە بۆ $4 کە پێشتر ڕەوانەکەر بوو',
+'logentry-move-move_redir-noredirect' => '$1 پەڕەی $3 بەبێ بەجێھشتنی ڕەوانەکەرێک گواستەوە بۆ $4 کە پێشتر ڕەوانەکەر بوو',
 'logentry-newusers-newusers' => '$1 ھەژمارێکی بەکارھێنەریی دروستکرد',
 'logentry-newusers-create' => '$1 ھەژمارێکی بەکارھێنەریی دروستکرد',
 'logentry-newusers-create2' => '$1 ھەژمارێکی بەکارھێنەریی دروستکرد $3',
diff --git a/languages/messages/MessagesCs.php b/languages/messages/MessagesCs.php
index de54e88565..2276e87c34 100644
--- a/languages/messages/MessagesCs.php
+++ b/languages/messages/MessagesCs.php
@@ -139,121 +139,121 @@ $bookstoreList = array(
 );
 
 $magicWords = array(
-	'redirect'                => array( '0', '#PŘESMĚRUJ', '#REDIRECT' ),
-	'notoc'                   => array( '0', '__BEZOBSAHU__', '__NOTOC__' ),
-	'nogallery'               => array( '0', '__BEZGALERIE__', '__NOGALLERY__' ),
-	'forcetoc'                => array( '0', '__VŽDYOBSAH__', '__FORCETOC__' ),
-	'toc'                     => array( '0', '__OBSAH__', '__TOC__' ),
-	'noeditsection'           => array( '0', '__BEZEDITOVATČÁST__', '__NOEDITSECTION__' ),
-	'currentmonth'            => array( '1', 'AKTUÁLNÍMĚSÍC', 'AKTUÁLNÍMĚSÍC2', 'CURRENTMONTH', 'CURRENTMONTH2' ),
-	'currentmonth1'           => array( '1', 'AKTUÁLNÍMĚSÍC1', 'CURRENTMONTH1' ),
-	'currentmonthname'        => array( '1', 'AKTUÁLNÍMĚSÍCJMÉNO', 'CURRENTMONTHNAME' ),
-	'currentmonthnamegen'     => array( '1', 'AKTUÁLNÍMĚSÍCGEN', 'CURRENTMONTHNAMEGEN' ),
-	'currentmonthabbrev'      => array( '1', 'AKTUÁLNÍMĚSÍCZKR', 'CURRENTMONTHABBREV' ),
-	'currentday'              => array( '1', 'AKTUÁLNÍDEN', 'CURRENTDAY' ),
-	'currentday2'             => array( '1', 'AKTUÁLNÍDEN2', 'CURRENTDAY2' ),
-	'currentdayname'          => array( '1', 'AKTUÁLNÍDENJMÉNO', 'CURRENTDAYNAME' ),
-	'currentyear'             => array( '1', 'AKTUÁLNÍROK', 'CURRENTYEAR' ),
-	'currenttime'             => array( '1', 'AKTUÁLNÍČAS', 'CURRENTTIME' ),
-	'currenthour'             => array( '1', 'AKTUÁLNÍHODINA', 'CURRENTHOUR' ),
-	'localmonth'              => array( '1', 'MÍSTNÍMĚSÍC', 'MÍSTNÍMĚSÍC2', 'LOCALMONTH', 'LOCALMONTH2' ),
-	'localmonth1'             => array( '1', 'MÍSTNÍMĚSÍC1', 'LOCALMONTH1' ),
-	'localmonthname'          => array( '1', 'MÍSTNÍMĚSÍCJMÉNO', 'LOCALMONTHNAME' ),
-	'localmonthnamegen'       => array( '1', 'MÍSTNÍMĚSÍCGEN', 'LOCALMONTHNAMEGEN' ),
-	'localmonthabbrev'        => array( '1', 'MÍSTNÍMĚSÍCZKR', 'LOCALMONTHABBREV' ),
-	'localday'                => array( '1', 'MÍSTNÍDEN', 'LOCALDAY' ),
-	'localday2'               => array( '1', 'MÍSTNÍDEN2', 'LOCALDAY2' ),
-	'localdayname'            => array( '1', 'MÍSTNÍDENJMÉNO', 'LOCALDAYNAME' ),
-	'localyear'               => array( '1', 'MÍSTNÍROK', 'LOCALYEAR' ),
-	'localtime'               => array( '1', 'MÍSTNÍČAS', 'LOCALTIME' ),
-	'localhour'               => array( '1', 'MÍSTNÍHODINA', 'LOCALHOUR' ),
-	'numberofpages'           => array( '1', 'POČETSTRAN', 'NUMBEROFPAGES' ),
-	'numberofarticles'        => array( '1', 'POČETČLÁNKŮ', 'NUMBEROFARTICLES' ),
-	'numberoffiles'           => array( '1', 'POČETSOUBORŮ', 'NUMBEROFFILES' ),
-	'numberofusers'           => array( '1', 'POČETUŽIVATELŮ', 'NUMBEROFUSERS' ),
-	'numberofactiveusers'     => array( '1', 'POČETAKTIVNÍCHUŽIVATELŮ', 'NUMBEROFACTIVEUSERS' ),
-	'numberofedits'           => array( '1', 'POČETEDITACÍ', 'NUMBEROFEDITS' ),
-	'pagename'                => array( '1', 'NÁZEVSTRANY', 'PAGENAME' ),
-	'pagenamee'               => array( '1', 'NÁZEVSTRANYE', 'PAGENAMEE' ),
-	'namespace'               => array( '1', 'JMENNÝPROSTOR', 'NAMESPACE' ),
-	'namespacee'              => array( '1', 'JMENNÝPROSTORE', 'NAMESPACEE' ),
-	'talkspace'               => array( '1', 'DISKUSNÍPROSTOR', 'TALKSPACE' ),
-	'talkspacee'              => array( '1', 'DISKUSNÍPROSTORE', 'TALKSPACEE' ),
-	'subjectspace'            => array( '1', 'ČLÁNEKPROSTOR', 'SUBJECTSPACE', 'ARTICLESPACE' ),
-	'subjectspacee'           => array( '1', 'ČLÁNEKPROSTORE', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
-	'fullpagename'            => array( '1', 'PLNÝNÁZEVSTRANY', 'FULLPAGENAME' ),
-	'fullpagenamee'           => array( '1', 'PLNÝNÁZEVSTRANYE', 'FULLPAGENAMEE' ),
-	'subpagename'             => array( '1', 'NÁZEVPODSTRANY', 'SUBPAGENAME' ),
-	'subpagenamee'            => array( '1', 'NÁZEVPODSTRANYE', 'SUBPAGENAMEE' ),
-	'basepagename'            => array( '1', 'NÁZEVNADSTRANY', 'BASEPAGENAME' ),
-	'basepagenamee'           => array( '1', 'NÁZEVNADSTRANYE', 'BASEPAGENAMEE' ),
-	'talkpagename'            => array( '1', 'NÁZEVDISKUSE', 'TALKPAGENAME' ),
-	'talkpagenamee'           => array( '1', 'NÁZEVDISKUSEE', 'TALKPAGENAMEE' ),
-	'subjectpagename'         => array( '1', 'NÁZEVČLÁNKU', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
-	'subjectpagenamee'        => array( '1', 'NÁZEVČLÁNKUE', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
-	'subst'                   => array( '0', 'VLOŽIT:', 'SUBST:' ),
-	'msgnw'                   => array( '0', 'VLOŽITNW:', 'MSGNW:' ),
-	'img_thumbnail'           => array( '1', 'náhled', 'thumbnail', 'thumb' ),
-	'img_manualthumb'         => array( '1', 'náhled=$1', 'thumbnail=$1', 'thumb=$1' ),
-	'img_right'               => array( '1', 'vpravo', 'right' ),
-	'img_left'                => array( '1', 'vlevo', 'left' ),
-	'img_none'                => array( '1', 'žádné', 'none' ),
-	'img_width'               => array( '1', '$1pixelů', '$1px' ),
-	'img_center'              => array( '1', 'střed', 'center', 'centre' ),
-	'img_framed'              => array( '1', 'rám', 'framed', 'enframed', 'frame' ),
-	'img_frameless'           => array( '1', 'bezrámu', 'frameless' ),
-	'img_page'                => array( '1', 'strana=$1', 'strana $1', 'page=$1', 'page $1' ),
-	'img_border'              => array( '1', 'okraj', 'border' ),
-	'sitename'                => array( '1', 'NÁZEVWEBU', 'SITENAME' ),
-	'ns'                      => array( '0', 'JMENNÝPROSTOR:', 'NS:' ),
-	'localurl'                => array( '0', 'MÍSTNÍURL:', 'LOCALURL:' ),
-	'localurle'               => array( '0', 'MÍSTNÍURLE:', 'LOCALURLE:' ),
-	'servername'              => array( '0', 'NÁZEVSERVERU', 'SERVERNAME' ),
-	'grammar'                 => array( '0', 'SKLOŇUJ:', 'GRAMMAR:' ),
-	'notitleconvert'          => array( '0', '__BEZKONVERZENADPISU__', '__NOTITLECONVERT__', '__NOTC__' ),
-	'nocontentconvert'        => array( '0', '__BEZKONVERZEOBSAHU__', '__NOCONTENTCONVERT__', '__NOCC__' ),
-	'currentweek'             => array( '1', 'AKTUÁLNÍTÝDEN', 'CURRENTWEEK' ),
-	'currentdow'              => array( '1', 'AKTUÁLNÍDENTÝDNE', 'CURRENTDOW' ),
-	'localweek'               => array( '1', 'MÍSTNÍTÝDEN', 'LOCALWEEK' ),
-	'localdow'                => array( '1', 'MÍSTNÍDENTÝDNE', 'LOCALDOW' ),
-	'revisionid'              => array( '1', 'IDREVIZE', 'REVISIONID' ),
-	'revisionday'             => array( '1', 'DENREVIZE', 'REVISIONDAY' ),
-	'revisionday2'            => array( '1', 'DENREVIZE2', 'REVISIONDAY2' ),
-	'revisionmonth'           => array( '1', 'MĚSÍCREVIZE', 'REVISIONMONTH' ),
-	'revisionyear'            => array( '1', 'ROKREVIZE', 'REVISIONYEAR' ),
-	'revisiontimestamp'       => array( '1', 'KÓDČASUREVIZE', 'REVISIONTIMESTAMP' ),
-	'plural'                  => array( '0', 'PLURÁL:', 'PLURAL:' ),
-	'fullurl'                 => array( '0', 'PLNÉURL:', 'FULLURL:' ),
-	'fullurle'                => array( '0', 'PLNÉURLE:', 'FULLURLE:' ),
-	'lcfirst'                 => array( '0', 'PRVNÍMALÉ:', 'LCFIRST:' ),
-	'ucfirst'                 => array( '0', 'PRVNÍVELKÉ:', 'UCFIRST:' ),
-	'lc'                      => array( '0', 'MALÁ:', 'LC:' ),
-	'uc'                      => array( '0', 'VELKÁ:', 'UC:' ),
-	'displaytitle'            => array( '1', 'ZOBRAZOVANÝNADPIS', 'DISPLAYTITLE' ),
-	'newsectionlink'          => array( '1', '__LINKPŘIDATKOMENTÁŘ__', '__NEWSECTIONLINK__' ),
-	'currentversion'          => array( '1', 'VERZESOFTWARE', 'CURRENTVERSION' ),
-	'urlencode'               => array( '0', 'ENKÓDOVATURL:', 'URLENCODE:' ),
-	'anchorencode'            => array( '0', 'ENKÓDOVATNADPIS', 'ANCHORENCODE' ),
-	'currenttimestamp'        => array( '1', 'AKTUÁLNÍKÓDČASU', 'CURRENTTIMESTAMP' ),
-	'localtimestamp'          => array( '1', 'MÍSTNÍKÓDČASU', 'LOCALTIMESTAMP' ),
-	'language'                => array( '0', '#JAZYK:', '#LANGUAGE:' ),
-	'contentlanguage'         => array( '1', 'JAZYKOBSAHU', 'CONTENTLANGUAGE', 'CONTENTLANG' ),
-	'pagesinnamespace'        => array( '1', 'STRÁNEKVEJMENNÉMPROSTORU:', 'PAGESINNAMESPACE:', 'PAGESINNS:' ),
-	'numberofadmins'          => array( '1', 'POČETSPRÁVCŮ', 'NUMBEROFADMINS' ),
-	'formatnum'               => array( '0', 'FORMÁTUJČÍSLO', 'FORMATNUM' ),
-	'padleft'                 => array( '0', 'ZAROVNATVLEVO', 'PADLEFT' ),
-	'padright'                => array( '0', 'ZAROVNATVPRAVO', 'PADRIGHT' ),
-	'special'                 => array( '0', 'speciální', 'special' ),
-	'defaultsort'             => array( '1', 'KLÍČŘAZENÍ:', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:' ),
-	'filepath'                => array( '0', 'CESTAKSOUBORU', 'FILEPATH:' ),
-	'tag'                     => array( '0', 'značka', 'tag' ),
-	'hiddencat'               => array( '1', '__SKRÝTKAT__', '__HIDDENCAT__' ),
-	'pagesincategory'         => array( '1', 'STRÁNEKVKATEGORII', 'STRÁNEKVKAT', 'PAGESINCATEGORY', 'PAGESINCAT' ),
-	'pagesize'                => array( '1', 'VELIKOSTSTRÁNKY', 'PAGESIZE' ),
-	'index'                   => array( '1', '__INDEXOVAT__', '__INDEX__' ),
-	'noindex'                 => array( '1', '__NEINDEXOVAT__', '__NOINDEX__' ),
-	'staticredirect'          => array( '1', '__STATICKÉPŘESMĚROVÁNÍ__', '__STATICREDIRECT__' ),
-	'protectionlevel'         => array( '1', 'ÚROVEŇZAMČENÍ', 'PROTECTIONLEVEL' ),
+	'redirect'                  => array( '0', '#PŘESMĚRUJ', '#REDIRECT' ),
+	'notoc'                     => array( '0', '__BEZOBSAHU__', '__NOTOC__' ),
+	'nogallery'                 => array( '0', '__BEZGALERIE__', '__NOGALLERY__' ),
+	'forcetoc'                  => array( '0', '__VŽDYOBSAH__', '__FORCETOC__' ),
+	'toc'                       => array( '0', '__OBSAH__', '__TOC__' ),
+	'noeditsection'             => array( '0', '__BEZEDITOVATČÁST__', '__NOEDITSECTION__' ),
+	'currentmonth'              => array( '1', 'AKTUÁLNÍMĚSÍC', 'AKTUÁLNÍMĚSÍC2', 'CURRENTMONTH', 'CURRENTMONTH2' ),
+	'currentmonth1'             => array( '1', 'AKTUÁLNÍMĚSÍC1', 'CURRENTMONTH1' ),
+	'currentmonthname'          => array( '1', 'AKTUÁLNÍMĚSÍCJMÉNO', 'CURRENTMONTHNAME' ),
+	'currentmonthnamegen'       => array( '1', 'AKTUÁLNÍMĚSÍCGEN', 'CURRENTMONTHNAMEGEN' ),
+	'currentmonthabbrev'        => array( '1', 'AKTUÁLNÍMĚSÍCZKR', 'CURRENTMONTHABBREV' ),
+	'currentday'                => array( '1', 'AKTUÁLNÍDEN', 'CURRENTDAY' ),
+	'currentday2'               => array( '1', 'AKTUÁLNÍDEN2', 'CURRENTDAY2' ),
+	'currentdayname'            => array( '1', 'AKTUÁLNÍDENJMÉNO', 'CURRENTDAYNAME' ),
+	'currentyear'               => array( '1', 'AKTUÁLNÍROK', 'CURRENTYEAR' ),
+	'currenttime'               => array( '1', 'AKTUÁLNÍČAS', 'CURRENTTIME' ),
+	'currenthour'               => array( '1', 'AKTUÁLNÍHODINA', 'CURRENTHOUR' ),
+	'localmonth'                => array( '1', 'MÍSTNÍMĚSÍC', 'MÍSTNÍMĚSÍC2', 'LOCALMONTH', 'LOCALMONTH2' ),
+	'localmonth1'               => array( '1', 'MÍSTNÍMĚSÍC1', 'LOCALMONTH1' ),
+	'localmonthname'            => array( '1', 'MÍSTNÍMĚSÍCJMÉNO', 'LOCALMONTHNAME' ),
+	'localmonthnamegen'         => array( '1', 'MÍSTNÍMĚSÍCGEN', 'LOCALMONTHNAMEGEN' ),
+	'localmonthabbrev'          => array( '1', 'MÍSTNÍMĚSÍCZKR', 'LOCALMONTHABBREV' ),
+	'localday'                  => array( '1', 'MÍSTNÍDEN', 'LOCALDAY' ),
+	'localday2'                 => array( '1', 'MÍSTNÍDEN2', 'LOCALDAY2' ),
+	'localdayname'              => array( '1', 'MÍSTNÍDENJMÉNO', 'LOCALDAYNAME' ),
+	'localyear'                 => array( '1', 'MÍSTNÍROK', 'LOCALYEAR' ),
+	'localtime'                 => array( '1', 'MÍSTNÍČAS', 'LOCALTIME' ),
+	'localhour'                 => array( '1', 'MÍSTNÍHODINA', 'LOCALHOUR' ),
+	'numberofpages'             => array( '1', 'POČETSTRAN', 'NUMBEROFPAGES' ),
+	'numberofarticles'          => array( '1', 'POČETČLÁNKŮ', 'NUMBEROFARTICLES' ),
+	'numberoffiles'             => array( '1', 'POČETSOUBORŮ', 'NUMBEROFFILES' ),
+	'numberofusers'             => array( '1', 'POČETUŽIVATELŮ', 'NUMBEROFUSERS' ),
+	'numberofactiveusers'       => array( '1', 'POČETAKTIVNÍCHUŽIVATELŮ', 'NUMBEROFACTIVEUSERS' ),
+	'numberofedits'             => array( '1', 'POČETEDITACÍ', 'NUMBEROFEDITS' ),
+	'pagename'                  => array( '1', 'NÁZEVSTRANY', 'PAGENAME' ),
+	'pagenamee'                 => array( '1', 'NÁZEVSTRANYE', 'PAGENAMEE' ),
+	'namespace'                 => array( '1', 'JMENNÝPROSTOR', 'NAMESPACE' ),
+	'namespacee'                => array( '1', 'JMENNÝPROSTORE', 'NAMESPACEE' ),
+	'talkspace'                 => array( '1', 'DISKUSNÍPROSTOR', 'TALKSPACE' ),
+	'talkspacee'                => array( '1', 'DISKUSNÍPROSTORE', 'TALKSPACEE' ),
+	'subjectspace'              => array( '1', 'ČLÁNEKPROSTOR', 'SUBJECTSPACE', 'ARTICLESPACE' ),
+	'subjectspacee'             => array( '1', 'ČLÁNEKPROSTORE', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
+	'fullpagename'              => array( '1', 'PLNÝNÁZEVSTRANY', 'FULLPAGENAME' ),
+	'fullpagenamee'             => array( '1', 'PLNÝNÁZEVSTRANYE', 'FULLPAGENAMEE' ),
+	'subpagename'               => array( '1', 'NÁZEVPODSTRANY', 'SUBPAGENAME' ),
+	'subpagenamee'              => array( '1', 'NÁZEVPODSTRANYE', 'SUBPAGENAMEE' ),
+	'basepagename'              => array( '1', 'NÁZEVNADSTRANY', 'BASEPAGENAME' ),
+	'basepagenamee'             => array( '1', 'NÁZEVNADSTRANYE', 'BASEPAGENAMEE' ),
+	'talkpagename'              => array( '1', 'NÁZEVDISKUSE', 'TALKPAGENAME' ),
+	'talkpagenamee'             => array( '1', 'NÁZEVDISKUSEE', 'TALKPAGENAMEE' ),
+	'subjectpagename'           => array( '1', 'NÁZEVČLÁNKU', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
+	'subjectpagenamee'          => array( '1', 'NÁZEVČLÁNKUE', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
+	'subst'                     => array( '0', 'VLOŽIT:', 'SUBST:' ),
+	'msgnw'                     => array( '0', 'VLOŽITNW:', 'MSGNW:' ),
+	'img_thumbnail'             => array( '1', 'náhled', 'thumbnail', 'thumb' ),
+	'img_manualthumb'           => array( '1', 'náhled=$1', 'thumbnail=$1', 'thumb=$1' ),
+	'img_right'                 => array( '1', 'vpravo', 'right' ),
+	'img_left'                  => array( '1', 'vlevo', 'left' ),
+	'img_none'                  => array( '1', 'žádné', 'none' ),
+	'img_width'                 => array( '1', '$1pixelů', '$1px' ),
+	'img_center'                => array( '1', 'střed', 'center', 'centre' ),
+	'img_framed'                => array( '1', 'rám', 'framed', 'enframed', 'frame' ),
+	'img_frameless'             => array( '1', 'bezrámu', 'frameless' ),
+	'img_page'                  => array( '1', 'strana=$1', 'strana $1', 'page=$1', 'page $1' ),
+	'img_border'                => array( '1', 'okraj', 'border' ),
+	'sitename'                  => array( '1', 'NÁZEVWEBU', 'SITENAME' ),
+	'ns'                        => array( '0', 'JMENNÝPROSTOR:', 'NS:' ),
+	'localurl'                  => array( '0', 'MÍSTNÍURL:', 'LOCALURL:' ),
+	'localurle'                 => array( '0', 'MÍSTNÍURLE:', 'LOCALURLE:' ),
+	'servername'                => array( '0', 'NÁZEVSERVERU', 'SERVERNAME' ),
+	'grammar'                   => array( '0', 'SKLOŇUJ:', 'GRAMMAR:' ),
+	'notitleconvert'            => array( '0', '__BEZKONVERZENADPISU__', '__NOTITLECONVERT__', '__NOTC__' ),
+	'nocontentconvert'          => array( '0', '__BEZKONVERZEOBSAHU__', '__NOCONTENTCONVERT__', '__NOCC__' ),
+	'currentweek'               => array( '1', 'AKTUÁLNÍTÝDEN', 'CURRENTWEEK' ),
+	'currentdow'                => array( '1', 'AKTUÁLNÍDENTÝDNE', 'CURRENTDOW' ),
+	'localweek'                 => array( '1', 'MÍSTNÍTÝDEN', 'LOCALWEEK' ),
+	'localdow'                  => array( '1', 'MÍSTNÍDENTÝDNE', 'LOCALDOW' ),
+	'revisionid'                => array( '1', 'IDREVIZE', 'REVISIONID' ),
+	'revisionday'               => array( '1', 'DENREVIZE', 'REVISIONDAY' ),
+	'revisionday2'              => array( '1', 'DENREVIZE2', 'REVISIONDAY2' ),
+	'revisionmonth'             => array( '1', 'MĚSÍCREVIZE', 'REVISIONMONTH' ),
+	'revisionyear'              => array( '1', 'ROKREVIZE', 'REVISIONYEAR' ),
+	'revisiontimestamp'         => array( '1', 'KÓDČASUREVIZE', 'REVISIONTIMESTAMP' ),
+	'plural'                    => array( '0', 'PLURÁL:', 'PLURAL:' ),
+	'fullurl'                   => array( '0', 'PLNÉURL:', 'FULLURL:' ),
+	'fullurle'                  => array( '0', 'PLNÉURLE:', 'FULLURLE:' ),
+	'lcfirst'                   => array( '0', 'PRVNÍMALÉ:', 'LCFIRST:' ),
+	'ucfirst'                   => array( '0', 'PRVNÍVELKÉ:', 'UCFIRST:' ),
+	'lc'                        => array( '0', 'MALÁ:', 'LC:' ),
+	'uc'                        => array( '0', 'VELKÁ:', 'UC:' ),
+	'displaytitle'              => array( '1', 'ZOBRAZOVANÝNADPIS', 'DISPLAYTITLE' ),
+	'newsectionlink'            => array( '1', '__LINKPŘIDATKOMENTÁŘ__', '__NEWSECTIONLINK__' ),
+	'currentversion'            => array( '1', 'VERZESOFTWARE', 'CURRENTVERSION' ),
+	'urlencode'                 => array( '0', 'ENKÓDOVATURL:', 'URLENCODE:' ),
+	'anchorencode'              => array( '0', 'ENKÓDOVATNADPIS', 'ANCHORENCODE' ),
+	'currenttimestamp'          => array( '1', 'AKTUÁLNÍKÓDČASU', 'CURRENTTIMESTAMP' ),
+	'localtimestamp'            => array( '1', 'MÍSTNÍKÓDČASU', 'LOCALTIMESTAMP' ),
+	'language'                  => array( '0', '#JAZYK:', '#LANGUAGE:' ),
+	'contentlanguage'           => array( '1', 'JAZYKOBSAHU', 'CONTENTLANGUAGE', 'CONTENTLANG' ),
+	'pagesinnamespace'          => array( '1', 'STRÁNEKVEJMENNÉMPROSTORU:', 'PAGESINNAMESPACE:', 'PAGESINNS:' ),
+	'numberofadmins'            => array( '1', 'POČETSPRÁVCŮ', 'NUMBEROFADMINS' ),
+	'formatnum'                 => array( '0', 'FORMÁTUJČÍSLO', 'FORMATNUM' ),
+	'padleft'                   => array( '0', 'ZAROVNATVLEVO', 'PADLEFT' ),
+	'padright'                  => array( '0', 'ZAROVNATVPRAVO', 'PADRIGHT' ),
+	'special'                   => array( '0', 'speciální', 'special' ),
+	'defaultsort'               => array( '1', 'KLÍČŘAZENÍ:', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:' ),
+	'filepath'                  => array( '0', 'CESTAKSOUBORU', 'FILEPATH:' ),
+	'tag'                       => array( '0', 'značka', 'tag' ),
+	'hiddencat'                 => array( '1', '__SKRÝTKAT__', '__HIDDENCAT__' ),
+	'pagesincategory'           => array( '1', 'STRÁNEKVKATEGORII', 'STRÁNEKVKAT', 'PAGESINCATEGORY', 'PAGESINCAT' ),
+	'pagesize'                  => array( '1', 'VELIKOSTSTRÁNKY', 'PAGESIZE' ),
+	'index'                     => array( '1', '__INDEXOVAT__', '__INDEX__' ),
+	'noindex'                   => array( '1', '__NEINDEXOVAT__', '__NOINDEX__' ),
+	'staticredirect'            => array( '1', '__STATICKÉPŘESMĚROVÁNÍ__', '__STATICREDIRECT__' ),
+	'protectionlevel'           => array( '1', 'ÚROVEŇZAMČENÍ', 'PROTECTIONLEVEL' ),
 );
 
 /**
@@ -267,15 +267,16 @@ $separatorTransformTable = array( ',' => "\xc2\xa0", '.' => ',' );
 
 $specialPageAliases = array(
 	'Activeusers'               => array( 'Aktivní_uživatelé', 'Aktivni_uzivatele' ),
-	'Allmessages'               => array( 'Všechny_zprávy' ),
+	'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( 'Blokovat_uživatele', 'Blokovat_IP', 'Blokovat_uzivatele' ),
+	'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' ),
@@ -314,7 +315,7 @@ $specialPageAliases = array(
 	'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', 'Moje_diskuze' ),
+	'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' ),
@@ -331,6 +332,7 @@ $specialPageAliases = array(
 	'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' ),
@@ -2920,6 +2922,7 @@ Pokud si přejete přispívat k lokalizaci softwaru MediaWiki, navštivte [//www
 'import-interwiki-templates' => 'Zahrnout všechny šablony',
 'import-interwiki-submit' => 'Importovat',
 'import-interwiki-namespace' => 'Cílový jmenný prostor:',
+'import-interwiki-rootpage' => 'Cílová kořenová stránka (nepovinné):',
 'import-upload-filename' => 'Jméno souboru:',
 'import-comment' => 'Zdůvodnění:',
 'importtext' => 'Prosím exportujte soubor ze zdrojové wiki pomocí [[Special:Export|exportního nástroje]].
@@ -2952,6 +2955,9 @@ Uložte jej na svůj disk a nahrajte ho sem.',
 'import-error-interwiki' => 'Stránka „$1“ se neimportuje, protože její název je vyhrazen pro externí odkazy (interwiki).',
 'import-error-special' => 'Stránka „$1“ se neimportuje, protože patří do speciálního jmenného prostoru, do kterého stránky nepatří.',
 'import-error-invalid' => 'Stránka „$1“ se neimportuje, protože její název je neplatný.',
+'import-options-wrong' => '{{PLURAL:$2|Chybná volba|Chybné volby}}: <nowiki>$1</nowiki>',
+'import-rootpage-invalid' => 'Zadaný název kořenové stránky je neplatný.',
+'import-rootpage-nosubpage' => 'Ve jmenném prostoru „$1“ kořenové stránky nejsou dovoleny podstránky.',
 
 # Import log
 'importlogpage' => 'Kniha importů',
@@ -3126,7 +3132,7 @@ Uložte jej na svůj disk a nahrajte ho sem.',
 'pageinfo-authors' => 'Celkový počet různých autorů',
 'pageinfo-recent-edits' => 'Počet nedávných ($1) editací',
 'pageinfo-recent-authors' => 'Nedávný počet různých autorů',
-'pageinfo-restriction' => 'Zámek stránky (<code>$1</code>)',
+'pageinfo-restriction' => 'Zámek stránky (<code>{{lcfirst:$1}}</code>)',
 'pageinfo-magic-words' => '{{PLURAL:$1|Kouzelné slovo|Kouzelná slova}} ($1)',
 'pageinfo-hidden-categories' => '{{PLURAL:$1|Skrytá|Skryté}} kategorie ($1)',
 'pageinfo-templates' => '{{PLURAL:$1|Použitá šablona|Použité šablony}} ($1)',
diff --git a/languages/messages/MessagesCu.php b/languages/messages/MessagesCu.php
index c750c1937c..ce92abdfa3 100644
--- a/languages/messages/MessagesCu.php
+++ b/languages/messages/MessagesCu.php
@@ -61,8 +61,8 @@ $namespaceAliases = array(
 );
 
 $magicWords = array(
-	'redirect'                => array( '0', '#ПРѢНАПРАВЛЄНИѤ', '#REDIRECT' ),
-	'language'                => array( '0', '#ѨꙀꙐКЪ:', '#LANGUAGE:' ),
+	'redirect'                  => array( '0', '#ПРѢНАПРАВЛЄНИѤ', '#REDIRECT' ),
+	'language'                  => array( '0', '#ѨꙀꙐКЪ:', '#LANGUAGE:' ),
 );
 
 $defaultDateFormat = 'mdy';
diff --git a/languages/messages/MessagesCy.php b/languages/messages/MessagesCy.php
index e45ad2bb02..4a3fdf3966 100644
--- a/languages/messages/MessagesCy.php
+++ b/languages/messages/MessagesCy.php
@@ -49,69 +49,69 @@ $bookstoreList = array(
 );
 
 $magicWords = array(
-	'redirect'                => array( '0', '#ail-cyfeirio', '#ailgyfeirio', '#REDIRECT' ),
-	'notoc'                   => array( '0', '__DIMTAFLENCYNNWYS__', '__DIMRHESTRGYNNWYS__', '__DIMRHG__', '__NOTOC__' ),
-	'noeditsection'           => array( '0', '__DIMADRANGOLYGU__', '__DIMGOLYGUADRAN__', '__NOEDITSECTION__' ),
-	'currentmonth'            => array( '1', 'MISCYFOES', 'MISCYFREDOL', 'CURRENTMONTH', 'CURRENTMONTH2' ),
-	'currentmonthname'        => array( '1', 'ENWMISCYFOES', 'ENWMISCYFREDOL', 'CURRENTMONTHNAME' ),
-	'currentmonthnamegen'     => array( '1', 'GENENWMISCYFOES', 'CURRENTMONTHNAMEGEN' ),
-	'currentday'              => array( '1', 'DYDDIADCYFOES', 'DYDDCYFREDOL', 'CURRENTDAY' ),
-	'currentdayname'          => array( '1', 'ENWDYDDCYFOES', 'ENWDYDDCYFREDOL', 'CURRENTDAYNAME' ),
-	'currentyear'             => array( '1', 'FLWYDDYNCYFOES', 'BLWYDDYNGYFREDOL', 'CURRENTYEAR' ),
-	'currenttime'             => array( '1', 'AMSERCYFOES', 'AMSERCYFREDOL', 'CURRENTTIME' ),
-	'currenthour'             => array( '1', 'AWRGYFREDOL', 'CURRENTHOUR' ),
-	'numberofarticles'        => array( '1', 'NIFEROERTHYGLAU', 'NIFERYRERTHYGLAU', 'NUMBEROFARTICLES' ),
-	'numberoffiles'           => array( '1', 'NIFERYFFEILIAU', 'NUMBEROFFILES' ),
-	'numberofusers'           => array( '1', 'NIFERYDEFNYDDWYR', 'NUMBEROFUSERS' ),
-	'numberofedits'           => array( '1', 'NIFERYGOLYGIADAU', 'NUMBEROFEDITS' ),
-	'pagename'                => array( '1', 'ENWTUDALEN', 'PAGENAME' ),
-	'pagenamee'               => array( '1', 'ENWTUDALENE', 'PAGENAMEE' ),
-	'namespace'               => array( '1', 'PARTH', 'NAMESPACE' ),
-	'namespacee'              => array( '1', 'NAMESPACE', 'PARTHE', 'NAMESPACEE' ),
-	'fullpagename'            => array( '1', 'ENWLLAWNTUDALEN', 'FULLPAGENAME' ),
-	'fullpagenamee'           => array( '1', 'ENWLLAWNTUDALENE', 'FULLPAGENAMEE' ),
-	'subpagename'             => array( '1', 'ENWISDUDALEN', 'SUBPAGENAME' ),
-	'subpagenamee'            => array( '1', 'ENWISDUDALENE', 'SUBPAGENAMEE' ),
-	'talkpagename'            => array( '1', 'ENWTUDALENSGWRS', 'TALKPAGENAME' ),
-	'talkpagenamee'           => array( '1', 'ENWTUDALENSGWRSE', 'TALKPAGENAMEE' ),
-	'img_thumbnail'           => array( '1', 'ewin bawd', 'bawd', 'mân-lun', 'thumbnail', 'thumb' ),
-	'img_manualthumb'         => array( '1', 'mân-lun=$1', 'bawd=$1', 'thumbnail=$1', 'thumb=$1' ),
-	'img_right'               => array( '1', 'de', 'right' ),
-	'img_left'                => array( '1', 'chwith', 'left' ),
-	'img_none'                => array( '1', 'dim', 'none' ),
-	'img_center'              => array( '1', 'canol', 'center', 'centre' ),
-	'img_page'                => array( '1', 'tudalen=$1', 'tudalen $1', 'page=$1', 'page $1' ),
-	'img_upright'             => array( '1', 'unionsyth', 'unionsyth=$1', 'unionsyth $1', 'upright', 'upright=$1', 'upright $1' ),
-	'img_sub'                 => array( '1', 'is', 'sub' ),
-	'img_super'               => array( '1', 'uwch', 'super', 'sup' ),
-	'img_top'                 => array( '1', 'brig', 'top' ),
-	'img_bottom'              => array( '1', 'gwaelod', 'godre', 'bottom' ),
-	'server'                  => array( '0', 'GWEINYDD', 'SERVER' ),
-	'servername'              => array( '0', 'ENW\'RGWEINYDD', 'SERVERNAME' ),
-	'grammar'                 => array( '0', 'GRAMMAR', 'GRAMADEG', 'GRAMMAR:' ),
-	'currentweek'             => array( '1', 'WYTHNOSGYFREDOL', 'CURRENTWEEK' ),
-	'revisionid'              => array( '1', 'IDYGOLYGIAD', 'REVISIONID' ),
-	'revisionday'             => array( '1', 'DIWRNODYGOLYGIAD', 'REVISIONDAY' ),
-	'revisionday2'            => array( '1', 'DIWRNODYGOLYGIAD2', 'REVISIONDAY2' ),
-	'revisionmonth'           => array( '1', 'MISYGOLYGIAD', 'REVISIONMONTH' ),
-	'revisionyear'            => array( '1', 'BLWYDDYNYGOLYGIAD', 'REVISIONYEAR' ),
-	'revisiontimestamp'       => array( '1', 'STAMPAMSERYGOLYGIAD', 'REVISIONTIMESTAMP' ),
-	'plural'                  => array( '0', 'LLUOSOG:', 'PLURAL:' ),
-	'fullurl'                 => array( '0', 'URLLLAWN:', 'FULLURL:' ),
-	'fullurle'                => array( '0', 'URLLLAWNE:', 'FULLURLE:' ),
-	'newsectionlink'          => array( '1', '_NEWSECTIONLINK_', '_CYSWLLTADRANNEWYDD_', '__NEWSECTIONLINK__' ),
-	'currentversion'          => array( '1', 'GOLYGIADCYFREDOL', 'CURRENTVERSION' ),
-	'currenttimestamp'        => array( '1', 'STAMPAMSERCYFREDOL', 'CURRENTTIMESTAMP' ),
-	'localtimestamp'          => array( '1', 'STAMPAMSERLLEOL', 'LOCALTIMESTAMP' ),
-	'language'                => array( '0', '#IAITH:', '#LANGUAGE:' ),
-	'contentlanguage'         => array( '1', 'IAITHYCYNNWYS', 'CONTENTLANGUAGE', 'CONTENTLANG' ),
-	'pagesinnamespace'        => array( '1', 'TUDALENNAUYNYPARTH:', 'PAGESINNAMESPACE:', 'PAGESINNS:' ),
-	'numberofadmins'          => array( '1', 'NIFERYGWEINYDDWYR', 'NUMBEROFADMINS' ),
-	'formatnum'               => array( '0', 'FFORMATIORHIF', 'FORMATNUM' ),
-	'special'                 => array( '0', 'arbennig', 'special' ),
-	'hiddencat'               => array( '1', '_HIDDENCAT_', '_CATCUDD_', '__HIDDENCAT__' ),
-	'pagesincategory'         => array( '1', 'TUDALENNAUYNYCAT', 'PAGESINCATEGORY', 'PAGESINCAT' ),
-	'pagesize'                => array( '1', 'MAINTTUD', 'PAGESIZE' ),
+	'redirect'                  => array( '0', '#ail-cyfeirio', '#ailgyfeirio', '#REDIRECT' ),
+	'notoc'                     => array( '0', '__DIMTAFLENCYNNWYS__', '__DIMRHESTRGYNNWYS__', '__DIMRHG__', '__NOTOC__' ),
+	'noeditsection'             => array( '0', '__DIMADRANGOLYGU__', '__DIMGOLYGUADRAN__', '__NOEDITSECTION__' ),
+	'currentmonth'              => array( '1', 'MISCYFOES', 'MISCYFREDOL', 'CURRENTMONTH', 'CURRENTMONTH2' ),
+	'currentmonthname'          => array( '1', 'ENWMISCYFOES', 'ENWMISCYFREDOL', 'CURRENTMONTHNAME' ),
+	'currentmonthnamegen'       => array( '1', 'GENENWMISCYFOES', 'CURRENTMONTHNAMEGEN' ),
+	'currentday'                => array( '1', 'DYDDIADCYFOES', 'DYDDCYFREDOL', 'CURRENTDAY' ),
+	'currentdayname'            => array( '1', 'ENWDYDDCYFOES', 'ENWDYDDCYFREDOL', 'CURRENTDAYNAME' ),
+	'currentyear'               => array( '1', 'FLWYDDYNCYFOES', 'BLWYDDYNGYFREDOL', 'CURRENTYEAR' ),
+	'currenttime'               => array( '1', 'AMSERCYFOES', 'AMSERCYFREDOL', 'CURRENTTIME' ),
+	'currenthour'               => array( '1', 'AWRGYFREDOL', 'CURRENTHOUR' ),
+	'numberofarticles'          => array( '1', 'NIFEROERTHYGLAU', 'NIFERYRERTHYGLAU', 'NUMBEROFARTICLES' ),
+	'numberoffiles'             => array( '1', 'NIFERYFFEILIAU', 'NUMBEROFFILES' ),
+	'numberofusers'             => array( '1', 'NIFERYDEFNYDDWYR', 'NUMBEROFUSERS' ),
+	'numberofedits'             => array( '1', 'NIFERYGOLYGIADAU', 'NUMBEROFEDITS' ),
+	'pagename'                  => array( '1', 'ENWTUDALEN', 'PAGENAME' ),
+	'pagenamee'                 => array( '1', 'ENWTUDALENE', 'PAGENAMEE' ),
+	'namespace'                 => array( '1', 'PARTH', 'NAMESPACE' ),
+	'namespacee'                => array( '1', 'NAMESPACE', 'PARTHE', 'NAMESPACEE' ),
+	'fullpagename'              => array( '1', 'ENWLLAWNTUDALEN', 'FULLPAGENAME' ),
+	'fullpagenamee'             => array( '1', 'ENWLLAWNTUDALENE', 'FULLPAGENAMEE' ),
+	'subpagename'               => array( '1', 'ENWISDUDALEN', 'SUBPAGENAME' ),
+	'subpagenamee'              => array( '1', 'ENWISDUDALENE', 'SUBPAGENAMEE' ),
+	'talkpagename'              => array( '1', 'ENWTUDALENSGWRS', 'TALKPAGENAME' ),
+	'talkpagenamee'             => array( '1', 'ENWTUDALENSGWRSE', 'TALKPAGENAMEE' ),
+	'img_thumbnail'             => array( '1', 'ewin bawd', 'bawd', 'mân-lun', 'thumbnail', 'thumb' ),
+	'img_manualthumb'           => array( '1', 'mân-lun=$1', 'bawd=$1', 'thumbnail=$1', 'thumb=$1' ),
+	'img_right'                 => array( '1', 'de', 'right' ),
+	'img_left'                  => array( '1', 'chwith', 'left' ),
+	'img_none'                  => array( '1', 'dim', 'none' ),
+	'img_center'                => array( '1', 'canol', 'center', 'centre' ),
+	'img_page'                  => array( '1', 'tudalen=$1', 'tudalen $1', 'page=$1', 'page $1' ),
+	'img_upright'               => array( '1', 'unionsyth', 'unionsyth=$1', 'unionsyth $1', 'upright', 'upright=$1', 'upright $1' ),
+	'img_sub'                   => array( '1', 'is', 'sub' ),
+	'img_super'                 => array( '1', 'uwch', 'super', 'sup' ),
+	'img_top'                   => array( '1', 'brig', 'top' ),
+	'img_bottom'                => array( '1', 'gwaelod', 'godre', 'bottom' ),
+	'server'                    => array( '0', 'GWEINYDD', 'SERVER' ),
+	'servername'                => array( '0', 'ENW\'RGWEINYDD', 'SERVERNAME' ),
+	'grammar'                   => array( '0', 'GRAMMAR', 'GRAMADEG', 'GRAMMAR:' ),
+	'currentweek'               => array( '1', 'WYTHNOSGYFREDOL', 'CURRENTWEEK' ),
+	'revisionid'                => array( '1', 'IDYGOLYGIAD', 'REVISIONID' ),
+	'revisionday'               => array( '1', 'DIWRNODYGOLYGIAD', 'REVISIONDAY' ),
+	'revisionday2'              => array( '1', 'DIWRNODYGOLYGIAD2', 'REVISIONDAY2' ),
+	'revisionmonth'             => array( '1', 'MISYGOLYGIAD', 'REVISIONMONTH' ),
+	'revisionyear'              => array( '1', 'BLWYDDYNYGOLYGIAD', 'REVISIONYEAR' ),
+	'revisiontimestamp'         => array( '1', 'STAMPAMSERYGOLYGIAD', 'REVISIONTIMESTAMP' ),
+	'plural'                    => array( '0', 'LLUOSOG:', 'PLURAL:' ),
+	'fullurl'                   => array( '0', 'URLLLAWN:', 'FULLURL:' ),
+	'fullurle'                  => array( '0', 'URLLLAWNE:', 'FULLURLE:' ),
+	'newsectionlink'            => array( '1', '_NEWSECTIONLINK_', '_CYSWLLTADRANNEWYDD_', '__NEWSECTIONLINK__' ),
+	'currentversion'            => array( '1', 'GOLYGIADCYFREDOL', 'CURRENTVERSION' ),
+	'currenttimestamp'          => array( '1', 'STAMPAMSERCYFREDOL', 'CURRENTTIMESTAMP' ),
+	'localtimestamp'            => array( '1', 'STAMPAMSERLLEOL', 'LOCALTIMESTAMP' ),
+	'language'                  => array( '0', '#IAITH:', '#LANGUAGE:' ),
+	'contentlanguage'           => array( '1', 'IAITHYCYNNWYS', 'CONTENTLANGUAGE', 'CONTENTLANG' ),
+	'pagesinnamespace'          => array( '1', 'TUDALENNAUYNYPARTH:', 'PAGESINNAMESPACE:', 'PAGESINNS:' ),
+	'numberofadmins'            => array( '1', 'NIFERYGWEINYDDWYR', 'NUMBEROFADMINS' ),
+	'formatnum'                 => array( '0', 'FFORMATIORHIF', 'FORMATNUM' ),
+	'special'                   => array( '0', 'arbennig', 'special' ),
+	'hiddencat'                 => array( '1', '_HIDDENCAT_', '_CATCUDD_', '__HIDDENCAT__' ),
+	'pagesincategory'           => array( '1', 'TUDALENNAUYNYCAT', 'PAGESINCATEGORY', 'PAGESINCAT' ),
+	'pagesize'                  => array( '1', 'MAINTTUD', 'PAGESIZE' ),
 );
 
 $linkTrail = "/^([àáâèéêìíîïòóôûŵŷa-z]+)(.*)$/sDu";
@@ -775,7 +775,6 @@ Dyma'r cofnod lòg diweddaraf, er gwybodaeth:",
 *'''Firefox / Safari:''' Pwyswch ar ''Shift'' tra'n clicio ''Ail-lwytho/Reload'', neu gwasgwch ''Ctrl-F5'' neu ''Ctrl-R'' (''⌘-R'' ar Mac);
 *'''Google Chrome:'''Pwyswch ar Ctrl-Shift-R'' (''⌘-Shift-R'' ar Mac)
 *'''Internet Explorer:''' Pwyswch ar ''Ctrl'' tra'n clicio ''Adnewyddu/Refresh'', neu gwasgwch ''Ctrl-F5''. 
-*'''Konqueror:''' Cliciwch y botwm ''Ail-lwytho/Reload'', neu gwasgwch ''F5''; 
 *'''Opera:''' gwacewch y celc yn llwyr trwy ''Offer → Dewisiadau / Tools→Preferences'';",
 'usercssyoucanpreview' => "'''Tip:''' Defnyddiwch y botwm \"{{int:showpreview}}\" er mwyn profi eich CSS newydd cyn ei gadw.",
 'userjsyoucanpreview' => "'''Tip:''' Defnyddiwch y botwm \"{{int:showpreview}}\" er mwyn profi eich JS newydd cyn ei gadw.",
@@ -2047,6 +2046,7 @@ Protocoliau sy\'n cael eu cynnal: <code>$1</code> (peidiwch ag ychwanegu\'r rhai
 a bod cyfeiriad e-bost dilys yn eich [[Special:Preferences|dewisiadau]]
 er mwyn medru anfon e-bost at ddefnyddwyr eraill.',
 'emailuser' => 'Anfon e-bost at y defnyddiwr hwn',
+'emailuser-title-notarget' => 'Anfon e-bost at ddefnyddiwr',
 'emailpage' => 'Anfon e-bost at ddefnyddiwr',
 'emailpagetext' => "Os yw'r cyfeiriad e-bost sydd yn newisiadau'r defnyddiwr hwn yn un dilys, gellir anfon neges ato o'i ysgrifennu ar y ffurflen isod.
 Bydd y cyfeiriad e-bost a osodoch yn eich [[Special:Preferences|dewisiadau chithau]] yn ymddangos ym maes \"Oddi wrth\" yr e-bost, fel bod y defnyddiwr arall yn gallu anfon ateb atoch.",
@@ -2191,7 +2191,7 @@ Gallai dileu tudalen, gyda hanes golygu cymaint â hyn iddi, beri dryswch i weit
 # Rollback
 'rollback' => 'Gwrthdroi golygiadau',
 'rollback_short' => 'Gwrthdroi',
-'rollbacklink' => 'gwrthdroi',
+'rollbacklink' => 'gwrthdröer',
 'rollbacklinkcount' => 'gwrthdröer $1 {{PLURAL:$1||golygiad|olygiad|golygiad|golygiad|golygiad}}',
 'rollbacklinkcount-morethan' => 'gwrthdröer mwy na $1 {{PLURAL:$1||golygiad|olygiad|golygiad|golygiad|golygiad}}',
 'rollbackfailed' => 'Methodd y gwrthdroi',
@@ -2842,11 +2842,20 @@ Achos hyn yn fwy na thebyg yw presenoldeb cysylltiad i wefan ar y rhestr wahardd
 
 # Info page
 'pageinfo-title' => 'Manylion "$1"',
-'pageinfo-header-edits' => 'Golygiadau',
+'pageinfo-header-basic' => 'Gwybodaeth sylfaenol',
+'pageinfo-header-edits' => 'Hanes golygu',
+'pageinfo-header-restrictions' => 'Diogelwch y dudalen',
+'pageinfo-header-properties' => "Priodweddau'r dudalen",
+'pageinfo-length' => 'Hyd y dudalen (beitiau)',
+'pageinfo-article-id' => 'ID y dudalen',
 'pageinfo-views' => 'Nifer yr ymweliadau',
-'pageinfo-watchers' => 'Nifer y gwylwyr',
-'pageinfo-edits' => 'Nifer y golygiadau',
-'pageinfo-authors' => 'Nifer yr awduron gwahanol',
+'pageinfo-watchers' => 'Nifer gwylwyr y dudalen',
+'pageinfo-firstuser' => 'Y defnyddiwr a ddechreuodd y dudalen',
+'pageinfo-firsttime' => "Dyddiad dechrau'r dudalen",
+'pageinfo-lastuser' => 'Y golygydd diweddaraf',
+'pageinfo-lasttime' => 'Dyddiad y golygiad diweddaraf',
+'pageinfo-edits' => 'Cyfanswm y golygiadau',
+'pageinfo-authors' => 'Cyfanswm yr awduron gwahanol',
 
 # Skin names
 'skinname-standard' => 'Safonol',
diff --git a/languages/messages/MessagesDe.php b/languages/messages/MessagesDe.php
index 87a94c5c29..72f9a97deb 100644
--- a/languages/messages/MessagesDe.php
+++ b/languages/messages/MessagesDe.php
@@ -157,6 +157,7 @@ $specialPageAliases = array(
 	'MIMEsearch'                => array( 'MIME-Typ-Suche' ),
 	'Mostcategories'            => array( 'Meistkategorisierte_Seiten' ),
 	'Mostimages'                => array( 'Meistbenutzte_Dateien' ),
+	'Mostinterwikis'            => array( 'Meiste_Interwikilinks' ),
 	'Mostlinked'                => array( 'Meistverlinkte_Seiten' ),
 	'Mostlinkedcategories'      => array( 'Meistbenutzte_Kategorien' ),
 	'Mostlinkedtemplates'       => array( 'Meistbenutzte_Vorlagen' ),
@@ -245,150 +246,153 @@ $dateFormats = array(
 );
 
 $magicWords = array(
-	'redirect'                => array( '0', '#WEITERLEITUNG', '#REDIRECT' ),
-	'notoc'                   => array( '0', '__KEIN_INHALTSVERZEICHNIS__', '__KEININHALTSVERZEICHNIS__', '__NOTOC__' ),
-	'nogallery'               => array( '0', '__KEINE_GALERIE__', '__KEINEGALERIE__', '__NOGALLERY__' ),
-	'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' ),
-	'currentmonthabbrev'      => array( '1', 'JETZIGER_MONATSNAME_KURZ', 'CURRENTMONTHABBREV' ),
-	'currentday'              => array( '1', 'JETZIGER_KALENDERTAG', 'CURRENTDAY' ),
-	'currentday2'             => array( '1', 'JETZIGER_KALENDERTAG_2', 'CURRENTDAY2' ),
-	'currentdayname'          => array( '1', 'JETZIGER_WOCHENTAG', 'CURRENTDAYNAME' ),
-	'currentyear'             => array( '1', 'JETZIGES_JAHR', 'CURRENTYEAR' ),
-	'currenttime'             => array( '1', 'JETZIGE_UHRZEIT', 'CURRENTTIME' ),
-	'currenthour'             => array( '1', 'JETZIGE_STUNDE', 'CURRENTHOUR' ),
-	'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' ),
-	'localmonthabbrev'        => array( '1', 'LOKALER_MONATSNAME_KURZ', 'LOCALMONTHABBREV' ),
-	'localday'                => array( '1', 'LOKALER_KALENDERTAG', 'LOCALDAY' ),
-	'localday2'               => array( '1', 'LOKALER_KALENDERTAG_2', 'LOCALDAY2' ),
-	'localdayname'            => array( '1', 'LOKALER_WOCHENTAG', 'LOCALDAYNAME' ),
-	'localyear'               => array( '1', 'LOKALES_JAHR', 'LOCALYEAR' ),
-	'localtime'               => array( '1', 'LOKALE_UHRZEIT', 'LOCALTIME' ),
-	'localhour'               => array( '1', 'LOKALE_STUNDE', 'LOCALHOUR' ),
-	'numberofpages'           => array( '1', 'SEITENANZAHL', 'NUMBEROFPAGES' ),
-	'numberofarticles'        => array( '1', 'ARTIKELANZAHL', 'NUMBEROFARTICLES' ),
-	'numberoffiles'           => array( '1', 'DATEIANZAHL', 'NUMBEROFFILES' ),
-	'numberofusers'           => array( '1', 'BENUTZERANZAHL', 'NUMBEROFUSERS' ),
-	'numberofactiveusers'     => array( '1', 'AKTIVE_BENUTZER', 'NUMBEROFACTIVEUSERS' ),
-	'numberofedits'           => array( '1', 'BEARBEITUNGSANZAHL', 'NUMBEROFEDITS' ),
-	'numberofviews'           => array( '1', 'BETRACHTUNGEN', 'NUMBEROFVIEWS' ),
-	'pagename'                => array( '1', 'SEITENNAME', 'PAGENAME' ),
-	'pagenamee'               => array( '1', 'SEITENNAME_URL', 'PAGENAMEE' ),
-	'namespace'               => array( '1', 'NAMENSRAUM', 'NAMESPACE' ),
-	'namespacee'              => array( '1', 'NAMENSRAUM_URL', 'NAMESPACEE' ),
-	'talkspace'               => array( '1', 'DISKUSSIONSNAMENSRAUM', 'DISK_NR', 'TALKSPACE' ),
-	'talkspacee'              => array( '1', 'DISKUSSIONSNAMENSRAUM_URL', 'DISK_NR_URL', 'TALKSPACEE' ),
-	'subjectspace'            => array( '1', 'HAUPTNAMENSRAUM', 'SUBJECTSPACE', 'ARTICLESPACE' ),
-	'subjectspacee'           => array( '1', 'HAUPTNAMENSRAUM_URL', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
-	'fullpagename'            => array( '1', 'VOLLER_SEITENNAME', 'FULLPAGENAME' ),
-	'fullpagenamee'           => array( '1', 'VOLLER_SEITENNAME_URL', 'FULLPAGENAMEE' ),
-	'subpagename'             => array( '1', 'UNTERSEITE', 'SUBPAGENAME' ),
-	'subpagenamee'            => array( '1', 'UNTERSEITE_URL', 'SUBPAGENAMEE' ),
-	'basepagename'            => array( '1', 'OBERSEITE', 'BASEPAGENAME' ),
-	'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' ),
-	'subst'                   => array( '0', 'ERS:', 'SUBST:' ),
-	'safesubst'               => array( '0', 'SICHER_ERS:', 'SICHERERS:', 'SAFESUBST:' ),
-	'img_thumbnail'           => array( '1', 'miniatur', 'mini', 'thumbnail', 'thumb' ),
-	'img_manualthumb'         => array( '1', 'miniatur=$1', 'mini=$1', 'thumbnail=$1', 'thumb=$1' ),
-	'img_right'               => array( '1', 'rechts', 'right' ),
-	'img_left'                => array( '1', 'links', 'left' ),
-	'img_none'                => array( '1', 'ohne', 'none' ),
-	'img_center'              => array( '1', 'zentriert', 'center', 'centre' ),
-	'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_border'              => array( '1', 'rand', 'border' ),
-	'img_baseline'            => array( '1', 'grundlinie', 'baseline' ),
-	'img_sub'                 => array( '1', 'tiefgestellt', 'tief', 'sub' ),
-	'img_super'               => array( '1', 'hochgestellt', 'hoch', 'super', 'sup' ),
-	'img_top'                 => array( '1', 'oben', 'top' ),
-	'img_text_top'            => array( '1', 'text-oben', 'text-top' ),
-	'img_middle'              => array( '1', 'mitte', 'middle' ),
-	'img_bottom'              => array( '1', 'unten', 'bottom' ),
-	'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' ),
-	'int'                     => array( '0', 'NACHRICHT:', 'INT:' ),
-	'sitename'                => array( '1', 'PROJEKTNAME', 'SITENAME' ),
-	'ns'                      => array( '0', 'NR:', 'NS:' ),
-	'nse'                     => array( '0', 'NR_URL:', 'NSE:' ),
-	'localurl'                => array( '0', 'LOKALE_URL:', 'LOCALURL:' ),
-	'localurle'               => array( '0', 'LOKALE_URL_C:', 'LOCALURLE:' ),
-	'articlepath'             => array( '0', 'ARTIKELPFAD', 'ARTICLEPATH' ),
-	'scriptpath'              => array( '0', 'SKRIPTPFAD', 'SCRIPTPATH' ),
-	'stylepath'               => array( '0', 'STILPFAD', 'STYLEPFAD', 'STYLEPATH' ),
-	'grammar'                 => array( '0', 'GRAMMATIK:', 'GRAMMAR:' ),
-	'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' ),
-	'currentdow'              => array( '1', 'JETZIGER_WOCHENTAG_ZAHL', 'CURRENTDOW' ),
-	'localweek'               => array( '1', 'LOKALE_KALENDERWOCHE', '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' ),
-	'fullurl'                 => array( '0', 'VOLLSTÄNDIGE_URL:', 'FULLURL:' ),
-	'fullurle'                => array( '0', 'VOLLSTÄNDIGE_URL_C:', 'FULLURLE:' ),
-	'canonicalurl'            => array( '0', 'KANONISCHE_URL:', 'CANONICALURL:' ),
-	'canonicalurle'           => array( '0', 'KANONISCHE_URL_C:', 'CANONICALURLE:' ),
-	'lcfirst'                 => array( '0', 'INITIAL_KLEIN:', 'LCFIRST:' ),
-	'ucfirst'                 => array( '0', 'INITIAL_GROSS:', 'UCFIRST:' ),
-	'lc'                      => array( '0', 'KLEIN:', 'LC:' ),
-	'uc'                      => array( '0', 'GROSS:', 'UC:' ),
-	'raw'                     => array( '0', 'ROH:', 'RAW:' ),
-	'displaytitle'            => array( '1', 'SEITENTITEL', 'DISPLAYTITLE' ),
-	'newsectionlink'          => array( '1', '__NEUER_ABSCHNITTSLINK__', '__PLUS_LINK__', '__NEWSECTIONLINK__' ),
-	'nonewsectionlink'        => array( '1', '__KEIN_NEUER_ABSCHNITTSLINK__', '__KEIN_PLUS_LINK__', '__NONEWSECTIONLINK__' ),
-	'currentversion'          => array( '1', 'JETZIGE_VERSION', 'CURRENTVERSION' ),
-	'urlencode'               => array( '0', 'URLENKODIERT:', 'URLENCODE:' ),
-	'anchorencode'            => array( '0', 'ANKERENKODIERT:', 'SPRUNGMARKEENKODIERT:', 'ANCHORENCODE' ),
-	'currenttimestamp'        => array( '1', 'JETZIGER_ZEITSTEMPEL', 'CURRENTTIMESTAMP' ),
-	'localtimestamp'          => array( '1', 'LOKALER_ZEITSTEMPEL', 'LOCALTIMESTAMP' ),
-	'directionmark'           => array( '1', 'TEXTAUSRICHTUNG', 'DIRECTIONMARK', 'DIRMARK' ),
-	'language'                => array( '0', '#SPRACHE:', '#LANGUAGE:' ),
-	'contentlanguage'         => array( '1', 'INHALTSSPRACHE', 'CONTENTLANGUAGE', 'CONTENTLANG' ),
-	'pagesinnamespace'        => array( '1', 'SEITEN_IM_NAMENSRAUM:', 'SEITEN_IN_NR:', 'SEITEN_NR:', 'PAGESINNAMESPACE:', 'PAGESINNS:' ),
-	'numberofadmins'          => array( '1', 'ADMINANZAHL', 'NUMBEROFADMINS' ),
-	'formatnum'               => array( '0', 'ZAHLENFORMAT', 'FORMATNUM' ),
-	'padleft'                 => array( '0', 'FÜLLENLINKS', 'PADLEFT' ),
-	'padright'                => array( '0', 'FÜLLENRECHTS', 'PADRIGHT' ),
-	'special'                 => array( '0', 'spezial', 'special' ),
-	'defaultsort'             => array( '1', 'SORTIERUNG:', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:' ),
-	'filepath'                => array( '0', 'DATEIPFAD:', 'FILEPATH:' ),
-	'tag'                     => array( '0', 'markierung', 'tag' ),
-	'hiddencat'               => array( '1', '__VERSTECKTE_KATEGORIE__', '__WARTUNGSKATEGORIE__', '__HIDDENCAT__' ),
-	'pagesincategory'         => array( '1', 'SEITEN_IN_KATEGORIE', 'SEITEN_KAT', 'PAGESINCATEGORY', 'PAGESINCAT' ),
-	'pagesize'                => array( '1', 'SEITENGRÖSSE', 'PAGESIZE' ),
-	'index'                   => array( '1', '__INDIZIEREN__', '__INDEX__' ),
-	'noindex'                 => array( '1', '__NICHT_INDIZIEREN__', '__NOINDEX__' ),
-	'numberingroup'           => array( '1', 'BENUTZER_IN_GRUPPE', 'NUMBERINGROUP', 'NUMINGROUP' ),
-	'staticredirect'          => array( '1', '__PERMANENTE_WEITERLEITUNG__', '__STATICREDIRECT__' ),
-	'protectionlevel'         => array( '1', 'SCHUTZSTATUS', 'PROTECTIONLEVEL' ),
-	'formatdate'              => array( '0', 'DATUMSFORMAT', 'formatdate', 'dateformat' ),
-	'url_path'                => array( '0', 'PFAD', 'PATH' ),
-	'url_query'               => array( '0', 'ABFRAGE', 'QUERY' ),
-	'defaultsort_noerror'     => array( '0', 'keinfehler', 'noerror' ),
-	'defaultsort_noreplace'   => array( '0', 'keineersetzung', 'noreplace' ),
+	'redirect'                  => array( '0', '#WEITERLEITUNG', '#REDIRECT' ),
+	'notoc'                     => array( '0', '__KEIN_INHALTSVERZEICHNIS__', '__KEININHALTSVERZEICHNIS__', '__NOTOC__' ),
+	'nogallery'                 => array( '0', '__KEINE_GALERIE__', '__KEINEGALERIE__', '__NOGALLERY__' ),
+	'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' ),
+	'currentmonthabbrev'        => array( '1', 'JETZIGER_MONATSNAME_KURZ', 'CURRENTMONTHABBREV' ),
+	'currentday'                => array( '1', 'JETZIGER_KALENDERTAG', 'CURRENTDAY' ),
+	'currentday2'               => array( '1', 'JETZIGER_KALENDERTAG_2', 'CURRENTDAY2' ),
+	'currentdayname'            => array( '1', 'JETZIGER_WOCHENTAG', 'CURRENTDAYNAME' ),
+	'currentyear'               => array( '1', 'JETZIGES_JAHR', 'CURRENTYEAR' ),
+	'currenttime'               => array( '1', 'JETZIGE_UHRZEIT', 'CURRENTTIME' ),
+	'currenthour'               => array( '1', 'JETZIGE_STUNDE', 'CURRENTHOUR' ),
+	'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' ),
+	'localmonthabbrev'          => array( '1', 'LOKALER_MONATSNAME_KURZ', 'LOCALMONTHABBREV' ),
+	'localday'                  => array( '1', 'LOKALER_KALENDERTAG', 'LOCALDAY' ),
+	'localday2'                 => array( '1', 'LOKALER_KALENDERTAG_2', 'LOCALDAY2' ),
+	'localdayname'              => array( '1', 'LOKALER_WOCHENTAG', 'LOCALDAYNAME' ),
+	'localyear'                 => array( '1', 'LOKALES_JAHR', 'LOCALYEAR' ),
+	'localtime'                 => array( '1', 'LOKALE_UHRZEIT', 'LOCALTIME' ),
+	'localhour'                 => array( '1', 'LOKALE_STUNDE', 'LOCALHOUR' ),
+	'numberofpages'             => array( '1', 'SEITENANZAHL', 'NUMBEROFPAGES' ),
+	'numberofarticles'          => array( '1', 'ARTIKELANZAHL', 'NUMBEROFARTICLES' ),
+	'numberoffiles'             => array( '1', 'DATEIANZAHL', 'NUMBEROFFILES' ),
+	'numberofusers'             => array( '1', 'BENUTZERANZAHL', 'NUMBEROFUSERS' ),
+	'numberofactiveusers'       => array( '1', 'AKTIVE_BENUTZER', 'NUMBEROFACTIVEUSERS' ),
+	'numberofedits'             => array( '1', 'BEARBEITUNGSANZAHL', 'NUMBEROFEDITS' ),
+	'numberofviews'             => array( '1', 'BETRACHTUNGEN', 'NUMBEROFVIEWS' ),
+	'pagename'                  => array( '1', 'SEITENNAME', 'PAGENAME' ),
+	'pagenamee'                 => array( '1', 'SEITENNAME_URL', 'PAGENAMEE' ),
+	'namespace'                 => array( '1', 'NAMENSRAUM', 'NAMESPACE' ),
+	'namespacee'                => array( '1', 'NAMENSRAUM_URL', 'NAMESPACEE' ),
+	'namespacenumber'           => array( '1', 'NAMENSRAUMNUMMER', 'NAMESPACENUMBER' ),
+	'talkspace'                 => array( '1', 'DISKUSSIONSNAMENSRAUM', 'DISK_NR', 'TALKSPACE' ),
+	'talkspacee'                => array( '1', 'DISKUSSIONSNAMENSRAUM_URL', 'DISK_NR_URL', 'TALKSPACEE' ),
+	'subjectspace'              => array( '1', 'HAUPTNAMENSRAUM', 'SUBJECTSPACE', 'ARTICLESPACE' ),
+	'subjectspacee'             => array( '1', 'HAUPTNAMENSRAUM_URL', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
+	'fullpagename'              => array( '1', 'VOLLER_SEITENNAME', 'FULLPAGENAME' ),
+	'fullpagenamee'             => array( '1', 'VOLLER_SEITENNAME_URL', 'FULLPAGENAMEE' ),
+	'subpagename'               => array( '1', 'UNTERSEITE', 'SUBPAGENAME' ),
+	'subpagenamee'              => array( '1', 'UNTERSEITE_URL', 'SUBPAGENAMEE' ),
+	'basepagename'              => array( '1', 'OBERSEITE', 'BASEPAGENAME' ),
+	'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' ),
+	'subst'                     => array( '0', 'ERS:', 'SUBST:' ),
+	'safesubst'                 => array( '0', 'SICHER_ERS:', 'SICHERERS:', 'SAFESUBST:' ),
+	'img_thumbnail'             => array( '1', 'miniatur', 'mini', 'thumbnail', 'thumb' ),
+	'img_manualthumb'           => array( '1', 'miniatur=$1', 'mini=$1', 'thumbnail=$1', 'thumb=$1' ),
+	'img_right'                 => array( '1', 'rechts', 'right' ),
+	'img_left'                  => array( '1', 'links', 'left' ),
+	'img_none'                  => array( '1', 'ohne', 'none' ),
+	'img_center'                => array( '1', 'zentriert', 'center', 'centre' ),
+	'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_border'                => array( '1', 'rand', 'border' ),
+	'img_baseline'              => array( '1', 'grundlinie', 'baseline' ),
+	'img_sub'                   => array( '1', 'tiefgestellt', 'tief', 'sub' ),
+	'img_super'                 => array( '1', 'hochgestellt', 'hoch', 'super', 'sup' ),
+	'img_top'                   => array( '1', 'oben', 'top' ),
+	'img_text_top'              => array( '1', 'text-oben', 'text-top' ),
+	'img_middle'                => array( '1', 'mitte', 'middle' ),
+	'img_bottom'                => array( '1', 'unten', 'bottom' ),
+	'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' ),
+	'int'                       => array( '0', 'NACHRICHT:', 'INT:' ),
+	'sitename'                  => array( '1', 'PROJEKTNAME', 'SITENAME' ),
+	'ns'                        => array( '0', 'NR:', 'NS:' ),
+	'nse'                       => array( '0', 'NR_URL:', 'NSE:' ),
+	'localurl'                  => array( '0', 'LOKALE_URL:', 'LOCALURL:' ),
+	'localurle'                 => array( '0', 'LOKALE_URL_C:', 'LOCALURLE:' ),
+	'articlepath'               => array( '0', 'ARTIKELPFAD', 'ARTICLEPATH' ),
+	'pageid'                    => array( '0', 'SEITENID', 'SEITENKENNUNG', 'PAGEID' ),
+	'scriptpath'                => array( '0', 'SKRIPTPFAD', 'SCRIPTPATH' ),
+	'stylepath'                 => array( '0', 'STILPFAD', 'STYLEPFAD', 'STYLEPATH' ),
+	'grammar'                   => array( '0', 'GRAMMATIK:', 'GRAMMAR:' ),
+	'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' ),
+	'currentdow'                => array( '1', 'JETZIGER_WOCHENTAG_ZAHL', 'CURRENTDOW' ),
+	'localweek'                 => array( '1', 'LOKALE_KALENDERWOCHE', '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' ),
+	'fullurl'                   => array( '0', 'VOLLSTÄNDIGE_URL:', 'FULLURL:' ),
+	'fullurle'                  => array( '0', 'VOLLSTÄNDIGE_URL_C:', 'FULLURLE:' ),
+	'canonicalurl'              => array( '0', 'KANONISCHE_URL:', 'CANONICALURL:' ),
+	'canonicalurle'             => array( '0', 'KANONISCHE_URL_C:', 'CANONICALURLE:' ),
+	'lcfirst'                   => array( '0', 'INITIAL_KLEIN:', 'LCFIRST:' ),
+	'ucfirst'                   => array( '0', 'INITIAL_GROSS:', 'UCFIRST:' ),
+	'lc'                        => array( '0', 'KLEIN:', 'LC:' ),
+	'uc'                        => array( '0', 'GROSS:', 'UC:' ),
+	'raw'                       => array( '0', 'ROH:', 'RAW:' ),
+	'displaytitle'              => array( '1', 'SEITENTITEL', 'DISPLAYTITLE' ),
+	'newsectionlink'            => array( '1', '__NEUER_ABSCHNITTSLINK__', '__PLUS_LINK__', '__NEWSECTIONLINK__' ),
+	'nonewsectionlink'          => array( '1', '__KEIN_NEUER_ABSCHNITTSLINK__', '__KEIN_PLUS_LINK__', '__NONEWSECTIONLINK__' ),
+	'currentversion'            => array( '1', 'JETZIGE_VERSION', 'CURRENTVERSION' ),
+	'urlencode'                 => array( '0', 'URLENKODIERT:', 'URLENCODE:' ),
+	'anchorencode'              => array( '0', 'ANKERENKODIERT:', 'SPRUNGMARKEENKODIERT:', 'ANCHORENCODE' ),
+	'currenttimestamp'          => array( '1', 'JETZIGER_ZEITSTEMPEL', 'CURRENTTIMESTAMP' ),
+	'localtimestamp'            => array( '1', 'LOKALER_ZEITSTEMPEL', 'LOCALTIMESTAMP' ),
+	'directionmark'             => array( '1', 'TEXTAUSRICHTUNG', 'DIRECTIONMARK', 'DIRMARK' ),
+	'language'                  => array( '0', '#SPRACHE:', '#LANGUAGE:' ),
+	'contentlanguage'           => array( '1', 'INHALTSSPRACHE', 'CONTENTLANGUAGE', 'CONTENTLANG' ),
+	'pagesinnamespace'          => array( '1', 'SEITEN_IM_NAMENSRAUM:', 'SEITEN_IN_NR:', 'SEITEN_NR:', 'PAGESINNAMESPACE:', 'PAGESINNS:' ),
+	'numberofadmins'            => array( '1', 'ADMINANZAHL', 'NUMBEROFADMINS' ),
+	'formatnum'                 => array( '0', 'ZAHLENFORMAT', 'FORMATNUM' ),
+	'padleft'                   => array( '0', 'FÜLLENLINKS', 'PADLEFT' ),
+	'padright'                  => array( '0', 'FÜLLENRECHTS', 'PADRIGHT' ),
+	'special'                   => array( '0', 'spezial', 'special' ),
+	'speciale'                  => array( '0', 'speziale', 'speciale' ),
+	'defaultsort'               => array( '1', 'SORTIERUNG:', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:' ),
+	'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' ),
+	'pagesize'                  => array( '1', 'SEITENGRÖSSE', 'PAGESIZE' ),
+	'index'                     => array( '1', '__INDIZIEREN__', '__INDEX__' ),
+	'noindex'                   => array( '1', '__NICHT_INDIZIEREN__', '__NOINDEX__' ),
+	'numberingroup'             => array( '1', 'BENUTZER_IN_GRUPPE', 'NUMBERINGROUP', 'NUMINGROUP' ),
+	'staticredirect'            => array( '1', '__PERMANENTE_WEITERLEITUNG__', '__STATICREDIRECT__' ),
+	'protectionlevel'           => array( '1', 'SCHUTZSTATUS', 'PROTECTIONLEVEL' ),
+	'formatdate'                => array( '0', 'DATUMSFORMAT', 'formatdate', 'dateformat' ),
+	'url_path'                  => array( '0', 'PFAD', 'PATH' ),
+	'url_query'                 => array( '0', 'ABFRAGE', 'QUERY' ),
+	'defaultsort_noerror'       => array( '0', 'keinfehler', 'noerror' ),
+	'defaultsort_noreplace'     => array( '0', 'keineersetzung', 'noreplace' ),
 );
 
 $imageFiles = array(
@@ -1796,7 +1800,7 @@ Um ein '''Bild''' in einer Seite zu verwenden, nutze einen Link in der folgenden
 'filereuploadsummary' => 'Dateiänderungen:',
 'filestatus' => 'Copyright-Status:',
 'filesource' => 'Quelle:',
-'uploadedfiles' => 'Hochgeladene Dateien',
+'uploadedfiles' => 'Hochladen',
 'ignorewarning' => 'Warnung ignorieren und Datei speichern',
 'ignorewarnings' => 'Warnungen ignorieren',
 'minlength1' => 'Dateinamen müssen mindestens einen Buchstaben lang sein.',
@@ -2564,7 +2568,7 @@ Siehe die [[Special:ProtectedPages|Liste der geschützten Seiten]] für alle akt
 
 # Restriction levels
 'restriction-level-sysop' => 'geschützt (nur Administratoren)',
-'restriction-level-autoconfirmed' => 'geschützt (nur angemeldete, nicht-neue Benutzer)',
+'restriction-level-autoconfirmed' => 'geschützt (nur angemeldete, nicht neue Benutzer)',
 'restriction-level-all' => 'alle',
 
 # Undelete
diff --git a/languages/messages/MessagesDiq.php b/languages/messages/MessagesDiq.php
index 9718162bb6..1e177990e5 100644
--- a/languages/messages/MessagesDiq.php
+++ b/languages/messages/MessagesDiq.php
@@ -24,7 +24,7 @@ $namespaceNames = array(
 	NS_SPECIAL          => 'Xısusi',
 	NS_TALK             => 'Werênayış',
 	NS_USER             => 'Karber',
-	NS_USER_TALK        => 'Karber_mesac',
+	NS_USER_TALK        => 'Karber_werênayış',
 	NS_PROJECT_TALK     => '$1_werênayış',
 	NS_FILE             => 'Dosya',
 	NS_FILE_TALK        => 'Dosya_werênayış',
@@ -32,26 +32,34 @@ $namespaceNames = array(
 	NS_MEDIAWIKI_TALK   => 'MediaWiki_werênayış',
 	NS_TEMPLATE         => 'Şablon',
 	NS_TEMPLATE_TALK    => 'Şablon_werênayış',
-	NS_HELP             => 'Desteg',
-	NS_HELP_TALK        => 'Desteg_werênayış',
-	NS_CATEGORY         => 'Kategori',
-	NS_CATEGORY_TALK    => 'Kategori_werênayış',
+	NS_HELP             => 'Peşti',
+	NS_HELP_TALK        => 'Peşti_werênayış',
+	NS_CATEGORY         => 'Kategoriye',
+	NS_CATEGORY_TALK    => 'Kategoriye_werênayış',
+);
+
+$namespaceAliases = array(
+	'Karber_mesac'       => NS_USER_TALK,
+	'Desteg'             => NS_HELP,
+	'Desteg_werênayış'   => NS_HELP_TALK,
+	'Kategori'           => NS_CATEGORY,
+	'Kategori_werênayış' => NS_CATEGORY_TALK,
 );
 
 $specialPageAliases = array(
-	'Activeusers'               => array( 'KarbereAktivi', 'AktivKarberi' ),
-	'Allmessages'               => array( 'MesaciPero' ),
-	'Allpages'                  => array( 'PeleyPero' ),
-	'Ancientpages'              => array( 'PeleyVereni' ),
+	'Activeusers'               => array( 'KarberêAktivi', 'AktivKarberi' ),
+	'Allmessages'               => array( 'MesaciPêro' ),
+	'Allpages'                  => array( 'PeleyPêro' ),
+	'Ancientpages'              => array( 'PeleyVerêni' ),
 	'Badtitle'                  => array( 'SernameyoXırab' ),
 	'Blankpage'                 => array( 'PelaVeng', 'VengPela' ),
 	'Block'                     => array( 'Bloke', 'BlokeIP', 'BlokeKarber' ),
-	'Blockme'                   => array( 'BlokeMe' ),
+	'Blockme'                   => array( 'BlokêMe' ),
 	'Booksources'               => array( 'KıtabeÇıme' ),
-	'BrokenRedirects'           => array( 'HetenayışoXırab' ),
+	'BrokenRedirects'           => array( 'HetênayışoXırab' ),
 	'Categories'                => array( 'Kategoriye' ),
-	'ChangeEmail'               => array( 'EpostaBıvurne' ),
-	'ChangePassword'            => array( 'ParolaBıvurne', 'ParolaResetke' ),
+	'ChangeEmail'               => array( 'EpostaBıvurnê' ),
+	'ChangePassword'            => array( 'ParolaBıvurnê', 'ParolaResetke' ),
 	'ComparePages'              => array( 'PelaPêverke' ),
 	'Confirmemail'              => array( 'EpostayAraştke' ),
 	'Contributions'             => array( 'İştiraxi' ),
@@ -103,23 +111,23 @@ $specialPageAliases = array(
 	'Protectedpages'            => array( 'PeleyêkeStaryayê' ),
 	'Protectedtitles'           => array( 'SernameyêkeStaryayê' ),
 	'Randompage'                => array( 'Raştamê', 'PelayakeRaştamê' ),
-	'Randomredirect'            => array( 'HetenayışoRaştmae' ),
+	'Randomredirect'            => array( 'HetenayışoRaştame' ),
 	'Recentchanges'             => array( 'VurnayışêPeyêni' ),
 	'Recentchangeslinked'       => array( 'GreyêVurnayışêPeyêni' ),
 	'Revisiondelete'            => array( 'RevizyoniBesterne' ),
-	'RevisionMove'              => array( 'RevizyoniAhulne' ),
+	'RevisionMove'              => array( 'RewizyoniAhulne' ),
 	'Search'                    => array( 'Cıgeyre' ),
 	'Shortpages'                => array( 'PeleyêKılmi' ),
 	'Specialpages'              => array( 'PeleyXısusi' ),
 	'Statistics'                => array( 'Ä°statistiki' ),
 	'Tags'                      => array( 'Etiketi' ),
-	'Unblock'                   => array( 'Bloqihewad' ),
+	'Unblock'                   => array( 'Bloqiwedarne' ),
 	'Uncategorizedcategories'   => array( 'KategoriyêkeKategorinêbiyê' ),
 	'Uncategorizedimages'       => array( 'DosyeyêkeKategorinêbiyê' ),
 	'Uncategorizedpages'        => array( 'PeleyêkeKategorinêbiyê' ),
 	'Uncategorizedtemplates'    => array( 'ŞablonêkeKategorinêbiyê' ),
 	'Undelete'                  => array( 'Peyserbiya' ),
-	'Unlockdb'                  => array( 'DBKlitiake' ),
+	'Unlockdb'                  => array( 'DBSırmiake' ),
 	'Unusedcategories'          => array( 'KategoriyêkeNêkaryayê' ),
 	'Unusedimages'              => array( 'DosyeyêkeNêkaryayê' ),
 	'Unusedtemplates'           => array( 'ŞablonêkeNêkaryayê' ),
@@ -133,140 +141,167 @@ $specialPageAliases = array(
 	'Wantedcategories'          => array( 'KategoriyêkeWazênê' ),
 	'Wantedfiles'               => array( 'DosyeyêkeWazênê' ),
 	'Wantedpages'               => array( 'PeleyêkeWazênê' ),
-	'Wantedtemplates'           => array( 'ŞablonyêkeWazênê' ),
+	'Wantedtemplates'           => array( 'ŞablonêkeWazênê' ),
 	'Watchlist'                 => array( 'Listeyseyri' ),
 	'Whatlinkshere'             => array( 'PelarêGre' ),
 	'Withoutinterwiki'          => array( 'Bêİnterwiki' ),
 );
 
 $magicWords = array(
-	'redirect'                => array( '0', '#HETENAYIŞ', '#REDIRECT' ),
-	'notoc'                   => array( '0', '__ESTENÇINO__', '__NOTOC__' ),
-	'nogallery'               => array( '0', '__GALERİÇINO__', '__NOGALLERY__' ),
-	'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', 'MEWCUDAŞMİ', 'MEWCUDAŞMİ2', 'CURRENTMONTH', 'CURRENTMONTH2' ),
-	'currentmonth1'           => array( '1', 'MEWCUDAŞMİ1', 'CURRENTMONTH1' ),
-	'currentmonthname'        => array( '1', 'NAMEYAŞMDAMEWCUD', 'CURRENTMONTHNAME' ),
-	'currentmonthnamegen'     => array( '1', 'MEWCUDAŞMACI', 'CURRENTMONTHNAMEGEN' ),
-	'currentmonthabbrev'      => array( '1', 'MEWCUDAŞMİKILMKERDIŞ', 'CURRENTMONTHABBREV' ),
-	'currentday'              => array( '1', 'MEWCUDROCE', 'CURRENTDAY' ),
-	'currentday2'             => array( '1', 'MEWCUDROCE2', 'CURRENTDAY2' ),
-	'currentdayname'          => array( '1', 'NAMEYÊMEWCUDROCE', 'CURRENTDAYNAME' ),
-	'currentyear'             => array( '1', 'MEWCUDSERRE', 'CURRENTYEAR' ),
-	'currenttime'             => array( '1', 'MEWCUDDEME', 'CURRENTTIME' ),
-	'currenthour'             => array( '1', 'MEWCUDSEHAT', 'CURRENTHOUR' ),
-	'localmonth'              => array( '1', 'WAREYAŞMİ', 'WAREYAŞMİ2', 'LOCALMONTH', 'LOCALMONTH2' ),
-	'localmonth1'             => array( '1', 'WAREYAŞMİ1', 'LOCALMONTH1' ),
-	'localmonthname'          => array( '1', 'NAMEYÊWAREYAŞMİ', 'LOCALMONTHNAME' ),
-	'localmonthnamegen'       => array( '1', 'NAMEYWAREDÊAŞMİDACI', 'LOCALMONTHNAMEGEN' ),
-	'localmonthabbrev'        => array( '1', 'WAREYAŞMİKILMKERDIŞ', 'LOCALMONTHABBREV' ),
-	'localday'                => array( '1', 'WAREYROCE', 'LOCALDAY' ),
-	'localday2'               => array( '1', 'WAREYROCE2', 'LOCALDAY2' ),
-	'localdayname'            => array( '1', 'NAMEYÊWAREYROCE', 'LOCALDAYNAME' ),
-	'localyear'               => array( '1', 'WAREYSERRE', 'LOCALYEAR' ),
-	'localtime'               => array( '1', 'WAREYDEME', 'LOCALTIME' ),
-	'localhour'               => array( '1', 'WAREYSEHAT', 'LOCALHOUR' ),
-	'numberofpages'           => array( '1', 'AMARÄ°YAPELAN', 'NUMBEROFPAGES' ),
-	'numberofarticles'        => array( '1', 'AMARÄ°YAWESÄ°QAN', 'NUMBEROFARTICLES' ),
-	'numberoffiles'           => array( '1', 'AMARÄ°YADOSYAYAN', 'NUMBEROFFILES' ),
-	'numberofusers'           => array( '1', 'AMARÄ°YAKARBERAN', 'NUMBEROFUSERS' ),
-	'numberofactiveusers'     => array( '1', 'AMARÄ°YAAKTÄ°VKARBERAN', 'NUMBEROFACTIVEUSERS' ),
-	'numberofedits'           => array( '1', 'AMARİYAVURNAYIŞAN', 'NUMBEROFEDITS' ),
-	'numberofviews'           => array( '1', 'AMARİYAMOCNAYIŞAN', 'NUMBEROFVIEWS' ),
-	'pagename'                => array( '1', 'NAMEYPELA', 'PAGENAME' ),
-	'pagenamee'               => array( '1', 'NAMEYPELAA', 'PAGENAMEE' ),
-	'namespace'               => array( '1', 'CANAME', 'NAMESPACE' ),
-	'namespacee'              => array( '1', 'CANAMEE', 'NAMESPACEE' ),
-	'namespacenumber'         => array( '1', 'AMARÄ°YACANAME', 'NAMESPACENUMBER' ),
-	'talkspace'               => array( '1', 'CAYÊWERÊNAYIŞİ', 'TALKSPACE' ),
-	'talkspacee'              => array( '1', 'CAYÊWERÊNAYIŞAN', 'TALKSPACEE' ),
-	'subjectspace'            => array( '1', 'CAYÊMESEL', 'CAYÊWESİQE', 'SUBJECTSPACE', 'ARTICLESPACE' ),
-	'subjectspacee'           => array( '1', 'CAYÊMESELAN', 'CAYÊWESİQAN', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
-	'fullpagename'            => array( '1', 'NAMEYPELAPÊRO', 'FULLPAGENAME' ),
-	'fullpagenamee'           => array( '1', 'NAMEYPELAPÊRON', 'FULLPAGENAMEE' ),
-	'subpagename'             => array( '1', 'NAMEYBINPELA', 'SUBPAGENAME' ),
-	'subpagenamee'            => array( '1', 'NAMEYBINPELAA', 'SUBPAGENAMEE' ),
-	'basepagename'            => array( '1', 'NAMEYSERPELA', 'BASEPAGENAME' ),
-	'basepagenamee'           => array( '1', 'NAMEYSERPELAA', 'BASEPAGENAMEE' ),
-	'talkpagename'            => array( '1', 'NAMEYPELAWERÊNAYIŞ', 'TALKPAGENAME' ),
-	'talkpagenamee'           => array( '1', 'NAMEYPELAWERÊNAYIŞAN', 'TALKPAGENAMEE' ),
-	'subjectpagename'         => array( '1', 'NAMEYPELAMESEL', 'NAMEYPELAWESÄ°QE', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
-	'subjectpagenamee'        => array( '1', 'NAMEYPELAMESELER', 'NAMEYPELAQESÄ°QER', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
-	'msg'                     => array( '0', 'MSC', 'MSG:' ),
-	'subst'                   => array( '0', 'KOPYAKE', 'ATEBERDE', 'SUBST:' ),
-	'safesubst'               => array( '0', 'EMELEYATEBERDE', 'SAFESUBST:' ),
-	'msgnw'                   => array( '0', 'MSJNW:', 'MSGNW:' ),
-	'img_thumbnail'           => array( '1', 'resmowerdı', 'werdı', 'thumbnail', 'thumb' ),
-	'img_manualthumb'         => array( '1', 'resmowerdı=$1', 'erwdı=$1', 'thumbnail=$1', 'thumb=$1' ),
-	'img_right'               => array( '1', 'raşt', 'right' ),
-	'img_left'                => array( '1', 'çep', 'left' ),
-	'img_none'                => array( '1', 'çıno', 'none' ),
-	'img_width'               => array( '1', '$1pik', '$1piksel', '$1px' ),
-	'img_center'              => array( '1', 'werte', 'miyan', 'center', 'centre' ),
-	'img_framed'              => array( '1', 'çerçeweyın', 'çerçeweya', 'çerçewe', 'framed', 'enframed', 'frame' ),
-	'img_frameless'           => array( '1', 'beçerçewe', 'frameless' ),
-	'img_page'                => array( '1', 'pela=$1', 'pela_$1', 'page=$1', 'page $1' ),
-	'img_border'              => array( '1', 'sinor', 'border' ),
-	'img_top'                 => array( '1', 'gedug', 'top' ),
-	'img_middle'              => array( '1', 'merkez', 'middle' ),
-	'img_link'                => array( '1', 'gre=$1', 'link=$1' ),
-	'int'                     => array( '0', 'Ä°NT:', 'INT:' ),
-	'scriptpath'              => array( '0', 'RAYASCRIPTÄ°', 'SCRIPTPATH' ),
-	'stylepath'               => array( '0', 'TERZÊTEWRİ', 'STYLEPATH' ),
-	'grammar'                 => array( '0', 'GRAMER:', 'GRAMMAR:' ),
-	'gender'                  => array( '0', 'CÄ°NSÄ°YET:', 'GENDER:' ),
-	'notitleconvert'          => array( '0', '__SERNAMEVURNAYIŞÇINO__', '__SVÇ__', '__NOTITLECONVERT__', '__NOTC__' ),
-	'nocontentconvert'        => array( '0', '__ZERREVURNAYIŞÇINO__', '__ZVÇ__', '__NOCONTENTCONVERT__', '__NOCC__' ),
-	'currentweek'             => array( '1', 'MEVCUDHEFTE', 'CURRENTWEEK' ),
-	'currentdow'              => array( '1', 'MEVCUDWAREYHEFTÄ°', 'CURRENTDOW' ),
-	'localweek'               => array( '1', 'WAREYHEFTÄ°', 'LOCALWEEK' ),
-	'localdow'                => array( '1', 'WAREYROCAHEFTÄ°', 'LOCALDOW' ),
-	'revisionid'              => array( '1', 'NIMREYREVÄ°ZYONÄ°', 'REVISIONID' ),
-	'revisionday'             => array( '1', 'ROCAREVÄ°ZYONÄ°', 'REVISIONDAY' ),
-	'revisionday2'            => array( '1', 'ROCAREVÄ°ZYON1', 'REVISIONDAY2' ),
-	'revisionmonth'           => array( '1', 'AŞMAREVİZYONİ', 'REVISIONMONTH' ),
-	'revisionmonth1'          => array( '1', 'AŞMAREVİZYONİ1', 'REVISIONMONTH1' ),
-	'revisionyear'            => array( '1', 'SERRAREVÄ°ZYONÄ°', 'REVISIONYEAR' ),
-	'revisiontimestamp'       => array( '1', 'MELUMATÊREVİZYONÊDEMİ', 'REVISIONTIMESTAMP' ),
-	'revisionuser'            => array( '1', 'REVÄ°ZYONKARBER', 'REVISIONUSER' ),
-	'plural'                  => array( '0', 'ZAFEN:', 'PLURAL:' ),
-	'fullurl'                 => array( '0', 'GREPÊRO:', 'FULLURL:' ),
-	'fullurle'                => array( '0', 'GREYOPÊRON:', 'FULLURLE:' ),
-	'canonicalurl'            => array( '0', 'GREYÊKANONİK:', 'CANONICALURL:' ),
-	'canonicalurle'           => array( '0', 'GREYOKANONÄ°K:', 'CANONICALURLE:' ),
-	'lcfirst'                 => array( '0', 'KHÄ°LK:', 'LCFIRST:' ),
-	'ucfirst'                 => array( '0', 'BHÄ°LK:', 'UCFIRST:' ),
-	'lc'                      => array( '0', 'KH:', 'LC:' ),
-	'uc'                      => array( '0', 'BH:', 'UC:' ),
-	'raw'                     => array( '0', 'XAM:', 'RAW:' ),
-	'displaytitle'            => array( '1', 'SERNAMEÄ°BIMOCNE', 'DISPLAYTITLE' ),
-	'newsectionlink'          => array( '1', '__GREYÊSERNAMEDÊNEWİ__', '__NEWSECTIONLINK__' ),
-	'nonewsectionlink'        => array( '1', '__GREYÊSERNAMEDÊNEWİÇINO__', '__NONEWSECTIONLINK__' ),
-	'currentversion'          => array( '1', 'MEWCUDVERSÄ°YON', 'CURRENTVERSION' ),
-	'currenttimestamp'        => array( '1', 'MEWCUDWAREYSEHAT', 'CURRENTTIMESTAMP' ),
-	'localtimestamp'          => array( '1', 'MALUMATÊWAREYSEHAT', 'LOCALTIMESTAMP' ),
-	'language'                => array( '0', '#ZIWAN', '#LANGUAGE:' ),
-	'contentlanguage'         => array( '1', 'ZIWANÊESTİN', 'ZIWESTEN', 'CONTENTLANGUAGE', 'CONTENTLANG' ),
-	'pagesinnamespace'        => array( '1', 'PELEYÊKECADÊNAMİDEYÊ', 'PELECN', 'PAGESINNAMESPACE:', 'PAGESINNS:' ),
-	'numberofadmins'          => array( '1', 'AMARÄ°YAXÄ°ZMETKARAN', 'NUMBEROFADMINS' ),
-	'formatnum'               => array( '0', 'BABETNAYIŞ', 'FORMATNUM' ),
-	'special'                 => array( '0', 'xısusi', 'special' ),
-	'speciale'                => array( '0', 'xısusiye', 'speciale' ),
-	'defaultsort'             => array( '1', 'RATNAYIŞOHESBNAYIŞ', 'QESAYARATNAYIŞOHESBNAYIŞ', 'KATEGORİYARATNAYIŞOHESBNAYIŞ', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:' ),
-	'filepath'                => array( '0', 'RAYADOSYA:', 'FILEPATH:' ),
-	'tag'                     => array( '0', 'etiket', 'tag' ),
-	'hiddencat'               => array( '1', '__KATEGORÄ°YANIMITÄ°__', '__HIDDENCAT__' ),
-	'pagesincategory'         => array( '1', 'PELEYÊKEKATEGORİDEYÊ', 'KATDÊPELEY', 'PAGESINCATEGORY', 'PAGESINCAT' ),
-	'pagesize'                => array( '1', 'EBATÊPELA', 'PAGESIZE' ),
-	'index'                   => array( '1', '__SERSIQ__', '__INDEX__' ),
-	'noindex'                 => array( '1', '__SERSIQÇINYO__', '__NOINDEX__' ),
-	'numberingroup'           => array( '1', 'GRUBDEAMARE', 'AMARÄ°YAGRUBER', 'NUMBERINGROUP', 'NUMINGROUP' ),
-	'staticredirect'          => array( '1', '__STATİKHETENAYIŞ__', '__STATICREDIRECT__' ),
-	'protectionlevel'         => array( '1', 'SEWİYEYÊSTARE', 'PROTECTIONLEVEL' ),
-	'url_wiki'                => array( '0', 'WÄ°KÄ°', 'WIKI' ),
+	'redirect'                  => array( '0', '#HETENAYIŞ', '#REDIRECT' ),
+	'notoc'                     => array( '0', '__ESTENÇINO__', '__NOTOC__' ),
+	'nogallery'                 => array( '0', '__GALERİÇINO__', '__NOGALLERY__' ),
+	'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' ),
+	'currentmonthnamegen'       => array( '1', 'AŞMACIYANEWKİ', 'CURRENTMONTHNAMEGEN' ),
+	'currentmonthabbrev'        => array( '1', 'AŞMİYANEWKİKILMKERDIŞ', 'CURRENTMONTHABBREV' ),
+	'currentday'                => array( '1', 'ROCENEWKÄ°', 'CURRENTDAY' ),
+	'currentday2'               => array( '1', 'ROCENEWKÄ°2', 'CURRENTDAY2' ),
+	'currentdayname'            => array( '1', 'NAMEYÊROCENEWKİ', 'CURRENTDAYNAME' ),
+	'currentyear'               => array( '1', 'SERRENEWKÄ°', 'CURRENTYEAR' ),
+	'currenttime'               => array( '1', 'DEMENEWKÄ°', 'CURRENTTIME' ),
+	'currenthour'               => array( '1', 'SEHATNEWKÄ°', 'CURRENTHOUR' ),
+	'localmonth'                => array( '1', 'WAREYAŞMİ', 'WAREYAŞMİ2', 'LOCALMONTH', 'LOCALMONTH2' ),
+	'localmonth1'               => array( '1', 'WAREYAŞMİ1', 'LOCALMONTH1' ),
+	'localmonthname'            => array( '1', 'NAMEYÊWAREYAŞMİ', 'LOCALMONTHNAME' ),
+	'localmonthnamegen'         => array( '1', 'NAMEYWAREDÊAŞMİDACI', 'LOCALMONTHNAMEGEN' ),
+	'localmonthabbrev'          => array( '1', 'WAREYAŞMİKILMKERDIŞ', 'LOCALMONTHABBREV' ),
+	'localday'                  => array( '1', 'WAREYROCE', 'LOCALDAY' ),
+	'localday2'                 => array( '1', 'WAREYROCE2', 'LOCALDAY2' ),
+	'localdayname'              => array( '1', 'NAMEYÊWAREYROCE', 'LOCALDAYNAME' ),
+	'localyear'                 => array( '1', 'WAREYSERRE', 'LOCALYEAR' ),
+	'localtime'                 => array( '1', 'WAREYDEME', 'LOCALTIME' ),
+	'localhour'                 => array( '1', 'WAREYSEHAT', 'LOCALHOUR' ),
+	'numberofpages'             => array( '1', 'AMARÄ°YAPELAN', 'NUMBEROFPAGES' ),
+	'numberofarticles'          => array( '1', 'AMARÄ°YAWESÄ°QAN', 'NUMBEROFARTICLES' ),
+	'numberoffiles'             => array( '1', 'AMARÄ°YADOSYAYAN', 'NUMBEROFFILES' ),
+	'numberofusers'             => array( '1', 'AMARÄ°YAKARBERAN', 'NUMBEROFUSERS' ),
+	'numberofactiveusers'       => array( '1', 'AMARÄ°YAAKTÄ°VKARBERAN', 'NUMBEROFACTIVEUSERS' ),
+	'numberofedits'             => array( '1', 'AMARİYAVURNAYIŞAN', 'NUMBEROFEDITS' ),
+	'numberofviews'             => array( '1', 'AMARİYAMOCNAYIŞAN', 'NUMBEROFVIEWS' ),
+	'pagename'                  => array( '1', 'NAMEYPELA', 'PAGENAME' ),
+	'pagenamee'                 => array( '1', 'NAMEYPELAA', 'PAGENAMEE' ),
+	'namespace'                 => array( '1', 'CANAME', 'NAMESPACE' ),
+	'namespacee'                => array( '1', 'CANAMEE', 'NAMESPACEE' ),
+	'namespacenumber'           => array( '1', 'AMARÄ°YACANAME', 'NAMESPACENUMBER' ),
+	'talkspace'                 => array( '1', 'CAYÊWERÊNAYIŞİ', 'TALKSPACE' ),
+	'talkspacee'                => array( '1', 'CAYÊWERÊNAYIŞAN', 'TALKSPACEE' ),
+	'subjectspace'              => array( '1', 'CAYÊMESEL', 'CAYÊWESİQE', 'SUBJECTSPACE', 'ARTICLESPACE' ),
+	'subjectspacee'             => array( '1', 'CAYÊMESELAN', 'CAYÊWESİQAN', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
+	'fullpagename'              => array( '1', 'NAMEYPELAPÊRO', 'FULLPAGENAME' ),
+	'fullpagenamee'             => array( '1', 'NAMEYPELAPÊRON', 'FULLPAGENAMEE' ),
+	'subpagename'               => array( '1', 'NAMEYBINPELA', 'SUBPAGENAME' ),
+	'subpagenamee'              => array( '1', 'NAMEYBINPELAA', 'SUBPAGENAMEE' ),
+	'basepagename'              => array( '1', 'NAMEYSERPELA', 'BASEPAGENAME' ),
+	'basepagenamee'             => array( '1', 'NAMEYSERPELAA', 'BASEPAGENAMEE' ),
+	'talkpagename'              => array( '1', 'NAMEYPELAWERÊNAYIŞ', 'TALKPAGENAME' ),
+	'talkpagenamee'             => array( '1', 'NAMEYPELAWERÊNAYIŞAN', 'TALKPAGENAMEE' ),
+	'subjectpagename'           => array( '1', 'NAMEYPELAMESEL', 'NAMEYPELAWESÄ°QE', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
+	'subjectpagenamee'          => array( '1', 'NAMEYPELAMESELER', 'NAMEYPELAQESÄ°QER', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
+	'msg'                       => array( '0', 'MSC', 'MSG:' ),
+	'subst'                     => array( '0', 'KOPYAKE', 'ATEBERDE', 'SUBST:' ),
+	'safesubst'                 => array( '0', 'EMELEYATEBERDE', 'SAFESUBST:' ),
+	'msgnw'                     => array( '0', 'MSJNW:', 'MSGNW:' ),
+	'img_thumbnail'             => array( '1', 'resmoqıckek', 'qıckek', 'thumbnail', 'thumb' ),
+	'img_manualthumb'           => array( '1', 'resmoqıckek=$1', 'qıckek=$1', 'thumbnail=$1', 'thumb=$1' ),
+	'img_right'                 => array( '1', 'raşt', 'right' ),
+	'img_left'                  => array( '1', 'çep', 'left' ),
+	'img_none'                  => array( '1', 'çıniyo', 'none' ),
+	'img_width'                 => array( '1', '$1pik', '$1piksel', '$1px' ),
+	'img_center'                => array( '1', 'werte', 'miyan', 'center', 'centre' ),
+	'img_framed'                => array( '1', 'çerçeweya', 'çerçeweniyo', 'çerçewe', 'framed', 'enframed', 'frame' ),
+	'img_frameless'             => array( '1', 'bêçerçewe', 'frameless' ),
+	'img_page'                  => array( '1', 'pela=$1', 'pela_$1', 'page=$1', 'page $1' ),
+	'img_upright'               => array( '1', 'disleg', 'disleg=$1', 'disleg_$1', 'upright', 'upright=$1', 'upright $1' ),
+	'img_border'                => array( '1', 'sinor', 'border' ),
+	'img_baseline'              => array( '1', 'Sinorêerdi', 'baseline' ),
+	'img_sub'                   => array( '1', 'bın', 'sub' ),
+	'img_super'                 => array( '1', 'corên', 'cor', 'super', 'sup' ),
+	'img_top'                   => array( '1', 'gedug', 'top' ),
+	'img_text_top'              => array( '1', 'gedug-metin', 'text-top' ),
+	'img_middle'                => array( '1', 'merkez', 'middle' ),
+	'img_bottom'                => array( '1', 'erd', 'bottom' ),
+	'img_text_bottom'           => array( '1', 'erd-metin', 'text-bottom' ),
+	'img_link'                  => array( '1', 'gre=$1', 'link=$1' ),
+	'int'                       => array( '0', 'Ä°NT:', 'INT:' ),
+	'sitename'                  => array( '1', 'NAMEYSÄ°TA', 'SITENAME' ),
+	'ns'                        => array( '0', 'CN', 'NS:' ),
+	'nse'                       => array( '0', 'CNV', 'NSE:' ),
+	'localurl'                  => array( '0', 'LOKALGRE', 'LOCALURL:' ),
+	'localurle'                 => array( '0', 'LOKALGREV', 'LOCALURLE:' ),
+	'articlepath'               => array( '0', 'SOPAWESÄ°QAN', 'ARTICLEPATH' ),
+	'pageid'                    => array( '0', 'NIMREYPELA', 'PAGEID' ),
+	'server'                    => array( '0', 'ARDEN', 'SERVER' ),
+	'servername'                => array( '0', 'NAMEYARDEN', 'SERVERNAME' ),
+	'scriptpath'                => array( '0', 'RAYASCRIPTÄ°', 'SCRIPTPATH' ),
+	'stylepath'                 => array( '0', 'TERZÊTEWRİ', 'STYLEPATH' ),
+	'grammar'                   => array( '0', 'GRAMER:', 'GRAMMAR:' ),
+	'gender'                    => array( '0', 'CÄ°NSÄ°YET:', 'GENDER:' ),
+	'notitleconvert'            => array( '0', '__SERNAMEVURNAYIŞÇINO__', '__SVÇ__', '__NOTITLECONVERT__', '__NOTC__' ),
+	'nocontentconvert'          => array( '0', '__ZERREVURNAYIŞÇINO__', '__ZVÇ__', '__NOCONTENTCONVERT__', '__NOCC__' ),
+	'currentweek'               => array( '1', 'MEVCUDHEFTE', 'CURRENTWEEK' ),
+	'currentdow'                => array( '1', 'MEVCUDWAREYHEFTÄ°', 'CURRENTDOW' ),
+	'localweek'                 => array( '1', 'WAREYHEFTÄ°', 'LOCALWEEK' ),
+	'localdow'                  => array( '1', 'WAREYROCAHEFTÄ°', 'LOCALDOW' ),
+	'revisionid'                => array( '1', 'NIMREYREVÄ°ZYONÄ°', 'REVISIONID' ),
+	'revisionday'               => array( '1', 'ROCAREVÄ°ZYONÄ°', 'REVISIONDAY' ),
+	'revisionday2'              => array( '1', 'ROCAREVÄ°ZYON1', 'REVISIONDAY2' ),
+	'revisionmonth'             => array( '1', 'AŞMAREVİZYONİ', 'REVISIONMONTH' ),
+	'revisionmonth1'            => array( '1', 'AŞMAREVİZYONİ1', 'REVISIONMONTH1' ),
+	'revisionyear'              => array( '1', 'SERRAREVÄ°ZYONÄ°', 'REVISIONYEAR' ),
+	'revisiontimestamp'         => array( '1', 'MELUMATÊREVİZYONÊDEMİ', 'REVISIONTIMESTAMP' ),
+	'revisionuser'              => array( '1', 'REVÄ°ZYONKARBER', 'REVISIONUSER' ),
+	'plural'                    => array( '0', 'ZAFEN:', 'PLURAL:' ),
+	'fullurl'                   => array( '0', 'GREPÊRO:', 'FULLURL:' ),
+	'fullurle'                  => array( '0', 'GREYOPÊRON:', 'FULLURLE:' ),
+	'canonicalurl'              => array( '0', 'GREYÊKANONİK:', 'CANONICALURL:' ),
+	'canonicalurle'             => array( '0', 'GREYOKANONÄ°K:', 'CANONICALURLE:' ),
+	'lcfirst'                   => array( '0', 'KHÄ°LK:', 'LCFIRST:' ),
+	'ucfirst'                   => array( '0', 'BHÄ°LK:', 'UCFIRST:' ),
+	'lc'                        => array( '0', 'KH:', 'LC:' ),
+	'uc'                        => array( '0', 'BH:', 'UC:' ),
+	'raw'                       => array( '0', 'XAM:', 'RAW:' ),
+	'displaytitle'              => array( '1', 'SERNAMÄ°BIMOCNE', 'DISPLAYTITLE' ),
+	'newsectionlink'            => array( '1', '__GREYÊSERNAMEDÊNEWİ__', '__NEWSECTIONLINK__' ),
+	'nonewsectionlink'          => array( '1', '__GREYÊSERNAMEDÊNEWİÇINO__', '__NONEWSECTIONLINK__' ),
+	'currentversion'            => array( '1', 'VERSİYONÊNEWKİ', 'CURRENTVERSION' ),
+	'currenttimestamp'          => array( '1', 'WAREYSEHATÊNEWKİ', 'CURRENTTIMESTAMP' ),
+	'localtimestamp'            => array( '1', 'MALUMATÊWAREYSEHAT', 'LOCALTIMESTAMP' ),
+	'directionmark'             => array( '1', 'HETANIŞANKERDIŞ', 'HETNIŞAN', 'DIRECTIONMARK', 'DIRMARK' ),
+	'language'                  => array( '0', '#ZIWAN', '#LANGUAGE:' ),
+	'contentlanguage'           => array( '1', 'ZIWANÊESTİN', 'ZIWESTEN', 'CONTENTLANGUAGE', 'CONTENTLANG' ),
+	'pagesinnamespace'          => array( '1', 'PELEYÊKECADÊNAMİDEYÊ', 'PELECN', 'PAGESINNAMESPACE:', 'PAGESINNS:' ),
+	'numberofadmins'            => array( '1', 'AMARÄ°YAXÄ°ZMETKARAN', 'NUMBEROFADMINS' ),
+	'formatnum'                 => array( '0', 'BABETNAYIŞ', 'FORMATNUM' ),
+	'padleft'                   => array( '0', 'ÇEPİPIRKE', 'PADLEFT' ),
+	'padright'                  => array( '0', 'RAŞTİPIRKE', 'PADRIGHT' ),
+	'special'                   => array( '0', 'xısusi', 'special' ),
+	'speciale'                  => array( '0', 'xısusiye', 'speciale' ),
+	'defaultsort'               => array( '1', 'RATNAYIŞOHESBNAYIŞ', 'SIRMEYRATNAYIŞOHESBNAYIŞ', 'KATEGORİYARATNAYIŞOHESBNAYIŞ', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:' ),
+	'filepath'                  => array( '0', 'RAYADOSYA:', 'FILEPATH:' ),
+	'tag'                       => array( '0', 'etiket', 'tag' ),
+	'hiddencat'                 => array( '1', '__KATEGORÄ°YANIMITÄ°__', '__HIDDENCAT__' ),
+	'pagesincategory'           => array( '1', 'PELEYÊKEKATEGORİDEYÊ', 'KATDÊPELEY', 'PAGESINCATEGORY', 'PAGESINCAT' ),
+	'pagesize'                  => array( '1', 'EBATÊPELA', 'PAGESIZE' ),
+	'index'                     => array( '1', '__SERSIQ__', '__INDEX__' ),
+	'noindex'                   => array( '1', '__SERSIQÇINYO__', '__NOINDEX__' ),
+	'numberingroup'             => array( '1', 'GRUBDEAMARE', 'AMARÄ°YAGRUBER', 'NUMBERINGROUP', 'NUMINGROUP' ),
+	'staticredirect'            => array( '1', '__STATİKHETENAYIŞ__', '__STATICHETENAYIŞ__', '__STATICREDIRECT__' ),
+	'protectionlevel'           => array( '1', 'SEWİYEYÊSTARE', 'PROTECTIONLEVEL' ),
+	'formatdate'                => array( '0', 'demêformati', 'formatdate', 'dateformat' ),
+	'url_path'                  => array( '0', 'RAY', 'PATH' ),
+	'url_wiki'                  => array( '0', 'WÄ°KÄ°', 'WIKI' ),
+	'url_query'                 => array( '0', 'PERSÄ°YE', 'QUERY' ),
+	'defaultsort_noerror'       => array( '0', 'xırabinçıniya', 'noerror' ),
+	'defaultsort_noreplace'     => array( '0', 'cewabçıniyo', 'noreplace' ),
+	'pagesincategory_all'       => array( '0', 'pêro', 'all' ),
+	'pagesincategory_pages'     => array( '0', 'peley', 'pages' ),
+	'pagesincategory_files'     => array( '0', 'dosyey', 'files' ),
 );
 
 $messages = array(
@@ -1950,6 +1985,7 @@ listeya ke ha ver a têna na {{PLURAL:$1|dosyaya ewwili|dosyaya $1 ewwili}} mocn
 'shared-repo' => 'yew embarê repositoryî',
 'shared-repo-name-wikimediacommons' => 'Wikimedia Commons',
 'filepage.css' => '/* CSS placed here is included on the file description page, also included on foreign client wikis */',
+'upload-disallowed-here' => 'Nê asengi sero theba nênusneyêno.',
 
 # File reversion
 'filerevert' => '$1 reyna biyere',
@@ -3054,7 +3090,7 @@ Tı eşkeno yew sebeb bınus.',
 'pageinfo-authors' => 'Amarina nuştekaran pêro',
 'pageinfo-recent-edits' => 'Amariya vurnayışan ($1 ra nata)',
 'pageinfo-recent-authors' => 'Amarina nuştekaran pêro',
-'pageinfo-restriction' => 'Xısusiyetê pela da  (<code>$1</code>)',
+'pageinfo-restriction' => 'Xısusiyetê pela (<code>{{lcfirst:$1}}</code>)',
 '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ê',
@@ -3113,6 +3149,7 @@ Gurênayışê nae de, beno ke sistemê şıma zerar bıvêno.",
 'file-info-size-pages' => '$1 × $2 pikse, dergeya dosyay: $3, MIME tipiya cı: $4, $5 {{PLURAL:$5|pela|pela}}',
 'file-nohires' => 'Rovıleşiyayışo berzêr çıniyo.',
 'svg-long-desc' => 'SVG dosya, nominalin $1 × $2 piksels, ebatê dosya: $3',
+'svg-long-desc-animated' => 'SVG dosya, nominalin $1 × $2 piksela, ebatê dosya: $3',
 'show-big-image' => 'Resolosyonê temami',
 'show-big-image-preview' => "Verqayd dergiya: $1'i.",
 'show-big-image-other' => 'Zewmi{{PLURAL:$2|Vılêşnayış|Vılêşnayışê}}: $1.',
@@ -3122,6 +3159,8 @@ Gurênayışê nae de, beno ke sistemê şıma zerar bıvêno.",
 'file-info-png-looped' => 'atlama biyo',
 'file-info-png-repeat' => '$1 {{PLURAL:$1|hew|hew}} kay biyê',
 'file-info-png-frames' => '$1 {{PLURAL:$1|çerçeve|çerçeveyi}}',
+'file-no-thumb-animation' => "'''Not: Dılet tekniko limit, gırd agozneya resm de qıckek de animasyoni miyan dı nêbo.'''",
+'file-no-thumb-animation-gif' => "'''Not: Dılet tekniko limit, gırd agozneya resm de qıckek de  GIF imaci de animasyon do nêbo.'''",
 
 # Special:NewFiles
 'newimages' => 'Galeriya dosyayan dê newan',
diff --git a/languages/messages/MessagesDsb.php b/languages/messages/MessagesDsb.php
index 60acadae80..1caeafa76c 100644
--- a/languages/messages/MessagesDsb.php
+++ b/languages/messages/MessagesDsb.php
@@ -2874,7 +2874,7 @@ W zespominanju dajo se pśicyna pódaś.',
 'pageinfo-authors' => 'Cełkowna licba wšakich awtorow',
 'pageinfo-recent-edits' => 'Licba nejnowšych změnow (za zachadnych $1)',
 'pageinfo-recent-authors' => 'Nejnowša licba rozdźělnych awtorow',
-'pageinfo-restriction' => 'Šćit boka (<code>$1</code>)',
+'pageinfo-restriction' => 'Šćit boka (<code>{{lcfirst:$1}}</code>)',
 'pageinfo-magic-words' => '{{PLURAL:$1|Magiske słowo|Magiskej słowje|Magiske słowa|Magiske słowa}} ($1)',
 'pageinfo-hidden-categories' => '{{PLURAL:$1|Schowana kategorija|Schowanej kategoriji|Schowane kategorije|Schowane kategorije}} ($1)',
 'pageinfo-templates' => '{{PLURAL:$1|Zapśěgnjona pśedłoga|Zapśěgnjonej pśedłoze|Zapśěgnjone pśedłogi|Zapśěgnjone pśedłogi}} ($1)',
diff --git a/languages/messages/MessagesEl.php b/languages/messages/MessagesEl.php
index 5ee9f93dd7..385ae47986 100644
--- a/languages/messages/MessagesEl.php
+++ b/languages/messages/MessagesEl.php
@@ -212,143 +212,143 @@ $dateFormats = 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__' ),
-	'noheader'                => array( '0', '__ΧΩΡΙΣΚΕΦΑΛΙΔΑ__', '__NOHEADER__' ),
-	'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' ),
-	'localmonth'              => array( '1', 'ΤΟΠΙΚΟΣΜΗΝΑΣ', 'LOCALMONTH', 'LOCALMONTH2' ),
-	'localmonth1'             => array( '1', 'ΤΟΠΙΚΟΣΜΗΝΑΣ1', 'LOCALMONTH1' ),
-	'localmonthname'          => array( '1', 'ΤΟΠΙΚΟΣΜΗΝΑΣΟΝΟΜΑ', 'LOCALMONTHNAME' ),
-	'localmonthnamegen'       => array( '1', 'ΤΟΠΙΚΟΣΜΗΝΑΣΓΕΝΙΚΗ', 'LOCALMONTHNAMEGEN' ),
-	'localmonthabbrev'        => array( '1', 'ΤΟΠΙΚΟΣΜΗΝΑΣΣΥΝΤ', 'LOCALMONTHABBREV' ),
-	'localday'                => array( '1', 'ΤΟΠΙΚΗΜΕΡΑ', 'LOCALDAY' ),
-	'localday2'               => array( '1', 'ΤΟΠΙΚΗΜΕΡΑ2', 'LOCALDAY2' ),
-	'localdayname'            => array( '1', 'ΤΟΠΙΚΗΜΕΡΑΟΝΟΜΑ', 'LOCALDAYNAME' ),
-	'localyear'               => array( '1', 'ΤΟΠΙΚΟΕΤΟΣ', 'LOCALYEAR' ),
-	'localtime'               => array( '1', 'ΤΟΠΙΚΟΣΧΡΟΝΟΣ', 'LOCALTIME' ),
-	'localhour'               => array( '1', 'ΤΟΠΙΚΗΩΡΑ', 'LOCALHOUR' ),
-	'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' ),
-	'talkspace'               => array( '1', 'ΠΕΡΙΟΧΗΣΥΖΗΤΗΣΕΩΝ', 'TALKSPACE' ),
-	'talkspacee'              => array( '1', 'ΠΕΡΙΟΧΗΣΥΖΗΤΗΣΕΩΝΚ', 'TALKSPACEE' ),
-	'subjectspace'            => array( '1', 'ΠΕΡΙΟΧΗΘΕΜΑΤΩΝ', 'SUBJECTSPACE', 'ARTICLESPACE' ),
-	'subjectspacee'           => array( '1', 'ΠΕΡΙΟΧΗΘΕΜΑΤΩΝΚ', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
-	'fullpagename'            => array( '1', 'ΠΛΗΡΕΣΟΝΟΜΑΣΕΛΙΔΑΣ', 'FULLPAGENAME' ),
-	'fullpagenamee'           => array( '1', 'ΠΛΗΡΕΣΟΝΟΜΑΣΕΛΙΔΑΣΚ', 'FULLPAGENAMEE' ),
-	'subpagename'             => array( '1', 'ΟΝΟΜΑΥΠΟΣΕΛΙΔΑΣ', 'SUBPAGENAME' ),
-	'subpagenamee'            => array( '1', 'ΟΝΟΜΑΥΠΟΣΕΛΙΔΑΣΚ', 'SUBPAGENAMEE' ),
-	'basepagename'            => array( '1', 'ΒΑΣΗΟΝΟΜΑΤΟΣΣΕΛΙΔΑΣ', 'BASEPAGENAME' ),
-	'basepagenamee'           => array( '1', 'ΒΑΣΗΟΝΟΜΑΤΟΣΣΕΛΙΔΑΣΚ', 'BASEPAGENAMEE' ),
-	'talkpagename'            => array( '1', 'ΟΝΟΜΑΣΕΛΙΔΑΣΣΥΖΗΤΗΣΕΩΝ', 'TALKPAGENAME' ),
-	'talkpagenamee'           => array( '1', 'ΟΝΟΜΑΣΕΛΙΔΑΣΣΥΖΗΤΗΣΕΩΝΚ', 'TALKPAGENAMEE' ),
-	'subjectpagename'         => array( '1', 'ΟΝΟΜΑΣΕΛΙΔΑΣΘΕΜΑΤΟΣ', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
-	'subjectpagenamee'        => array( '1', 'ΟΝΟΜΑΣΕΛΙΔΑΣΘΕΜΑΤΟΣΚ', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
-	'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_right'               => array( '1', 'δεξιά', 'right' ),
-	'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_frameless'           => array( '1', 'χωρίς-πλαίσιο', 'frameless' ),
-	'img_page'                => array( '1', 'σελίδα=$1', 'σελίδα $1', 'page=$1', 'page $1' ),
-	'img_upright'             => array( '1', 'κατακόρυφα', 'κατακόρυφα=$1', 'κατακόρυφα $1', 'upright', 'upright=$1', 'upright $1' ),
-	'img_border'              => array( '1', 'πλαίσιο', 'border' ),
-	'img_baseline'            => array( '1', 'γραμμήβάσης', 'baseline' ),
-	'img_sub'                 => array( '1', 'δείκτης', 'sub' ),
-	'img_super'               => array( '1', 'εκθέτης', 'super', 'sup' ),
-	'img_top'                 => array( '1', 'άνω', 'top' ),
-	'img_text_top'            => array( '1', 'πάνω-από-το-κείμενο', 'text-top' ),
-	'img_middle'              => array( '1', 'μέσο', 'middle' ),
-	'img_bottom'              => array( '1', 'κάτω', 'bottom' ),
-	'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:' ),
-	'sitename'                => array( '1', 'ΙΣΤΟΧΩΡΟΣ', 'SITENAME' ),
-	'ns'                      => array( '0', 'ΧΟ:', 'NS:' ),
-	'localurl'                => array( '0', 'ΤΟΠΙΚΟURL:', 'LOCALURL:' ),
-	'localurle'               => array( '0', 'ΤΟΠΙΚΟURLΚ:', 'LOCALURLE:' ),
-	'server'                  => array( '0', 'ΕΞΥΠΗΡΕΤΗΤΗΣ', 'SERVER' ),
-	'servername'              => array( '0', 'ΟΝΟΜΑΕΞΥΠΗΡΕΤΗΤΗ', 'SERVERNAME' ),
-	'scriptpath'              => array( '0', 'ΔΙΑΔΡΟΜΗΠΡΟΓΡΑΜΜΑΤΟΣ', 'SCRIPTPATH' ),
-	'grammar'                 => array( '0', 'ΓΡΑΜΜΑΤΙΚΗ:', 'GRAMMAR:' ),
-	'gender'                  => array( '0', 'ΦΥΛΟ:', 'GENDER:' ),
-	'notitleconvert'          => array( '0', '__ΧΩΡΙΣΜΕΤΑΤΡΟΠΗΤΙΤΛΟΥ__', '__NOTITLECONVERT__', '__NOTC__' ),
-	'nocontentconvert'        => array( '0', '__ΧΩΡΙΣΜΕΤΑΤΡΟΠΗΠΕΡΙΧΟΜΕΝΟΥ__', '__NOCONTENTCONVERT__', '__NOCC__' ),
-	'currentweek'             => array( '1', 'ΤΡΕΧΟΥΣΑΕΒΔΟΜΑΔΑ', 'CURRENTWEEK' ),
-	'currentdow'              => array( '1', 'ΤΡΕΧΟΥΣΑΜΕΡΑΕΒΔΟΜΑΔΑΣ', 'CURRENTDOW' ),
-	'localweek'               => array( '1', 'ΤΟΠΙΚΗΕΒΔΟΜΑΔΑ', 'LOCALWEEK' ),
-	'localdow'                => array( '1', 'ΤΟΠΙΚΗΜΕΡΑΕΒΔΟΜΑΔΑΣ', 'LOCALDOW' ),
-	'revisionid'              => array( '1', 'ΚΩΔΙΚΟΣΑΛΛΑΓΗΣ', 'REVISIONID' ),
-	'revisionday'             => array( '1', 'ΜΕΡΑΑΛΛΑΓΗΣ', 'REVISIONDAY' ),
-	'revisionday2'            => array( '1', 'ΜΕΡΑΑΛΛΑΓΗΣ2', 'REVISIONDAY2' ),
-	'revisionmonth'           => array( '1', 'ΜΗΝΑΣΑΛΛΑΓΗΣ', 'REVISIONMONTH' ),
-	'revisionyear'            => array( '1', 'ΕΤΟΣΑΛΛΑΓΗΣ', 'REVISIONYEAR' ),
-	'revisiontimestamp'       => array( '1', 'ΧΡΟΝΟΣΗΜΑΝΣΗΑΛΛΑΓΗΣ', 'REVISIONTIMESTAMP' ),
-	'plural'                  => array( '0', 'ΠΛΗΘΥΝΤΙΚΟΣ:', 'PLURAL:' ),
-	'fullurl'                 => array( '0', 'ΠΛΗΡΕΣURL:', 'FULLURL:' ),
-	'fullurle'                => array( '0', 'ΠΛΗΡΕΣURLΚ:', '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' ),
-	'rawsuffix'               => array( '1', 'Γ', 'R' ),
-	'newsectionlink'          => array( '1', '__ΔΕΣΜΟΣΝΕΑΣΕΝΟΤΗΤΑΣ__', '__NEWSECTIONLINK__' ),
-	'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' ),
-	'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' ),
+	'redirect'                  => array( '0', '#ΑΝΑΚΑΤΕΥΘΥΝΣΗ', '#REDIRECT' ),
+	'notoc'                     => array( '0', '__ΧΩΡΙΣΠΠ__', '__NOTOC__' ),
+	'nogallery'                 => array( '0', '__ΧΩΡΙΣΠΙΝΑΚΟΘΗΚΗ__', '__NOGALLERY__' ),
+	'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' ),
+	'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' ),
+	'localmonth'                => array( '1', 'ΤΟΠΙΚΟΣΜΗΝΑΣ', 'LOCALMONTH', 'LOCALMONTH2' ),
+	'localmonth1'               => array( '1', 'ΤΟΠΙΚΟΣΜΗΝΑΣ1', 'LOCALMONTH1' ),
+	'localmonthname'            => array( '1', 'ΤΟΠΙΚΟΣΜΗΝΑΣΟΝΟΜΑ', 'LOCALMONTHNAME' ),
+	'localmonthnamegen'         => array( '1', 'ΤΟΠΙΚΟΣΜΗΝΑΣΓΕΝΙΚΗ', 'LOCALMONTHNAMEGEN' ),
+	'localmonthabbrev'          => array( '1', 'ΤΟΠΙΚΟΣΜΗΝΑΣΣΥΝΤ', 'LOCALMONTHABBREV' ),
+	'localday'                  => array( '1', 'ΤΟΠΙΚΗΜΕΡΑ', 'LOCALDAY' ),
+	'localday2'                 => array( '1', 'ΤΟΠΙΚΗΜΕΡΑ2', 'LOCALDAY2' ),
+	'localdayname'              => array( '1', 'ΤΟΠΙΚΗΜΕΡΑΟΝΟΜΑ', 'LOCALDAYNAME' ),
+	'localyear'                 => array( '1', 'ΤΟΠΙΚΟΕΤΟΣ', 'LOCALYEAR' ),
+	'localtime'                 => array( '1', 'ΤΟΠΙΚΟΣΧΡΟΝΟΣ', 'LOCALTIME' ),
+	'localhour'                 => array( '1', 'ΤΟΠΙΚΗΩΡΑ', 'LOCALHOUR' ),
+	'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' ),
+	'talkspace'                 => array( '1', 'ΠΕΡΙΟΧΗΣΥΖΗΤΗΣΕΩΝ', 'TALKSPACE' ),
+	'talkspacee'                => array( '1', 'ΠΕΡΙΟΧΗΣΥΖΗΤΗΣΕΩΝΚ', 'TALKSPACEE' ),
+	'subjectspace'              => array( '1', 'ΠΕΡΙΟΧΗΘΕΜΑΤΩΝ', 'SUBJECTSPACE', 'ARTICLESPACE' ),
+	'subjectspacee'             => array( '1', 'ΠΕΡΙΟΧΗΘΕΜΑΤΩΝΚ', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
+	'fullpagename'              => array( '1', 'ΠΛΗΡΕΣΟΝΟΜΑΣΕΛΙΔΑΣ', 'FULLPAGENAME' ),
+	'fullpagenamee'             => array( '1', 'ΠΛΗΡΕΣΟΝΟΜΑΣΕΛΙΔΑΣΚ', 'FULLPAGENAMEE' ),
+	'subpagename'               => array( '1', 'ΟΝΟΜΑΥΠΟΣΕΛΙΔΑΣ', 'SUBPAGENAME' ),
+	'subpagenamee'              => array( '1', 'ΟΝΟΜΑΥΠΟΣΕΛΙΔΑΣΚ', 'SUBPAGENAMEE' ),
+	'basepagename'              => array( '1', 'ΒΑΣΗΟΝΟΜΑΤΟΣΣΕΛΙΔΑΣ', 'BASEPAGENAME' ),
+	'basepagenamee'             => array( '1', 'ΒΑΣΗΟΝΟΜΑΤΟΣΣΕΛΙΔΑΣΚ', 'BASEPAGENAMEE' ),
+	'talkpagename'              => array( '1', 'ΟΝΟΜΑΣΕΛΙΔΑΣΣΥΖΗΤΗΣΕΩΝ', 'TALKPAGENAME' ),
+	'talkpagenamee'             => array( '1', 'ΟΝΟΜΑΣΕΛΙΔΑΣΣΥΖΗΤΗΣΕΩΝΚ', 'TALKPAGENAMEE' ),
+	'subjectpagename'           => array( '1', 'ΟΝΟΜΑΣΕΛΙΔΑΣΘΕΜΑΤΟΣ', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
+	'subjectpagenamee'          => array( '1', 'ΟΝΟΜΑΣΕΛΙΔΑΣΘΕΜΑΤΟΣΚ', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
+	'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_right'                 => array( '1', 'δεξιά', 'right' ),
+	'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_frameless'             => array( '1', 'χωρίς-πλαίσιο', 'frameless' ),
+	'img_page'                  => array( '1', 'σελίδα=$1', 'σελίδα $1', 'page=$1', 'page $1' ),
+	'img_upright'               => array( '1', 'κατακόρυφα', 'κατακόρυφα=$1', 'κατακόρυφα $1', 'upright', 'upright=$1', 'upright $1' ),
+	'img_border'                => array( '1', 'πλαίσιο', 'border' ),
+	'img_baseline'              => array( '1', 'γραμμήβάσης', 'baseline' ),
+	'img_sub'                   => array( '1', 'δείκτης', 'sub' ),
+	'img_super'                 => array( '1', 'εκθέτης', 'super', 'sup' ),
+	'img_top'                   => array( '1', 'άνω', 'top' ),
+	'img_text_top'              => array( '1', 'πάνω-από-το-κείμενο', 'text-top' ),
+	'img_middle'                => array( '1', 'μέσο', 'middle' ),
+	'img_bottom'                => array( '1', 'κάτω', 'bottom' ),
+	'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:' ),
+	'sitename'                  => array( '1', 'ΙΣΤΟΧΩΡΟΣ', 'SITENAME' ),
+	'ns'                        => array( '0', 'ΧΟ:', 'NS:' ),
+	'localurl'                  => array( '0', 'ΤΟΠΙΚΟURL:', 'LOCALURL:' ),
+	'localurle'                 => array( '0', 'ΤΟΠΙΚΟURLΚ:', 'LOCALURLE:' ),
+	'server'                    => array( '0', 'ΕΞΥΠΗΡΕΤΗΤΗΣ', 'SERVER' ),
+	'servername'                => array( '0', 'ΟΝΟΜΑΕΞΥΠΗΡΕΤΗΤΗ', 'SERVERNAME' ),
+	'scriptpath'                => array( '0', 'ΔΙΑΔΡΟΜΗΠΡΟΓΡΑΜΜΑΤΟΣ', 'SCRIPTPATH' ),
+	'grammar'                   => array( '0', 'ΓΡΑΜΜΑΤΙΚΗ:', 'GRAMMAR:' ),
+	'gender'                    => array( '0', 'ΦΥΛΟ:', 'GENDER:' ),
+	'notitleconvert'            => array( '0', '__ΧΩΡΙΣΜΕΤΑΤΡΟΠΗΤΙΤΛΟΥ__', '__NOTITLECONVERT__', '__NOTC__' ),
+	'nocontentconvert'          => array( '0', '__ΧΩΡΙΣΜΕΤΑΤΡΟΠΗΠΕΡΙΧΟΜΕΝΟΥ__', '__NOCONTENTCONVERT__', '__NOCC__' ),
+	'currentweek'               => array( '1', 'ΤΡΕΧΟΥΣΑΕΒΔΟΜΑΔΑ', 'CURRENTWEEK' ),
+	'currentdow'                => array( '1', 'ΤΡΕΧΟΥΣΑΜΕΡΑΕΒΔΟΜΑΔΑΣ', 'CURRENTDOW' ),
+	'localweek'                 => array( '1', 'ΤΟΠΙΚΗΕΒΔΟΜΑΔΑ', 'LOCALWEEK' ),
+	'localdow'                  => array( '1', 'ΤΟΠΙΚΗΜΕΡΑΕΒΔΟΜΑΔΑΣ', 'LOCALDOW' ),
+	'revisionid'                => array( '1', 'ΚΩΔΙΚΟΣΑΛΛΑΓΗΣ', 'REVISIONID' ),
+	'revisionday'               => array( '1', 'ΜΕΡΑΑΛΛΑΓΗΣ', 'REVISIONDAY' ),
+	'revisionday2'              => array( '1', 'ΜΕΡΑΑΛΛΑΓΗΣ2', 'REVISIONDAY2' ),
+	'revisionmonth'             => array( '1', 'ΜΗΝΑΣΑΛΛΑΓΗΣ', 'REVISIONMONTH' ),
+	'revisionyear'              => array( '1', 'ΕΤΟΣΑΛΛΑΓΗΣ', 'REVISIONYEAR' ),
+	'revisiontimestamp'         => array( '1', 'ΧΡΟΝΟΣΗΜΑΝΣΗΑΛΛΑΓΗΣ', 'REVISIONTIMESTAMP' ),
+	'plural'                    => array( '0', 'ΠΛΗΘΥΝΤΙΚΟΣ:', 'PLURAL:' ),
+	'fullurl'                   => array( '0', 'ΠΛΗΡΕΣURL:', 'FULLURL:' ),
+	'fullurle'                  => array( '0', 'ΠΛΗΡΕΣURLΚ:', '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' ),
+	'rawsuffix'                 => array( '1', 'Γ', 'R' ),
+	'newsectionlink'            => array( '1', '__ΔΕΣΜΟΣΝΕΑΣΕΝΟΤΗΤΑΣ__', '__NEWSECTIONLINK__' ),
+	'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' ),
+	'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' ),
 );
 
 $messages = array(
diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 0828bbec0d..515a433f0b 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1435,6 +1435,7 @@ You are also promising us that you wrote this yourself, or copied it from a publ
 If you do not want your writing to be edited mercilessly, then do not submit it here.<br />
 You are also promising us that you wrote this yourself, or copied it from a public domain or similar free resource (see $1 for details).
 '''Do not submit copyrighted work without permission!'''",
+'editpage-head-copy-warn'          => '-', # do not translate or duplicate this message to other languages
 'editpage-tos-summary'             => '-', # do not translate or duplicate this message to other languages
 'longpage-hint'                    => '-', # do not translate or duplicate this message to other languages
 'longpageerror'                    => "'''Error: The text you have submitted is {{PLURAL:$1|one kilobyte|$1 kilobytes}} long, which is longer than the maximum of {{PLURAL:$2|one kilobyte|$2 kilobytes}}.'''
@@ -3734,6 +3735,7 @@ This is probably caused by a link to a blacklisted external site.',
 'spam_deleting'       => 'All revisions contained links to $1, deleting',
 
 # Info page
+'pageinfo-header'              => '-', # do not translate or duplicate this message to other languages
 'pageinfo-title'               => 'Information for "$1"',
 'pageinfo-header-basic'        => 'Basic information',
 'pageinfo-header-edits'        => 'Edit history',
@@ -3764,6 +3766,7 @@ This is probably caused by a link to a blacklisted external site.',
 'pageinfo-magic-words'         => 'Magic {{PLURAL:$1|word|words}} ($1)',
 'pageinfo-hidden-categories'   => 'Hidden {{PLURAL:$1|category|categories}} ($1)',
 'pageinfo-templates'           => 'Transcluded {{PLURAL:$1|template|templates}} ($1)',
+'pageinfo-footer'              => '-', # do not translate or duplicate this message to other languages
 
 # Skin names
 'skinname-standard'    => 'Classic', # only translate this message to other languages if you have to change it
diff --git a/languages/messages/MessagesEo.php b/languages/messages/MessagesEo.php
index dc36986289..f8382692dd 100644
--- a/languages/messages/MessagesEo.php
+++ b/languages/messages/MessagesEo.php
@@ -175,129 +175,129 @@ $specialPageAliases = array(
 );
 
 $magicWords = array(
-	'redirect'                => array( '0', '#ALIDIREKTU', '#ALIDIREKTI', '#AL', '#REDIRECT' ),
-	'notoc'                   => array( '0', '__NI__', '__NEINDEKSO__', '__NT__', '__NOTOC__' ),
-	'nogallery'               => array( '0', '__NG__', '__SENBILDARO__', '__SB__', '__SG__', '__SENGALERIO__', '__NOGALLERY__' ),
-	'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' ),
-	'currentmonthnamegen'     => array( '1', 'NUNAMONATNOMOGEN', 'NUNAMONATONOMOGEN', 'NUNAMONATANOMOGEN', 'CURRENTMONTHNAMEGEN' ),
-	'currentmonthabbrev'      => array( '1', 'NUNAMONATNOMOMAL', 'NUNAMONATONOMOMAL', 'NUNAMONATANOMOMAL', 'CURRENTMONTHABBREV' ),
-	'currentday'              => array( '1', 'NUNATAGO', 'CURRENTDAY' ),
-	'currentday2'             => array( '1', 'NUNATAGO2', 'CURRENTDAY2' ),
-	'currentdayname'          => array( '1', 'NUNATAGNOMO', 'CURRENTDAYNAME' ),
-	'currentyear'             => array( '1', 'NUNAJARO', 'CURRENTYEAR' ),
-	'currenttime'             => array( '1', 'NUNATEMPO', 'CURRENTTIME' ),
-	'currenthour'             => array( '1', 'NUNAHORO', 'CURRENTHOUR' ),
-	'localmonth'              => array( '1', 'LOKAMONATO', 'LOKAMONATO2', 'LOCALMONTH', 'LOCALMONTH2' ),
-	'localmonth1'             => array( '1', 'LOKAMONATO1', 'LOCALMONTH1' ),
-	'localmonthname'          => array( '1', 'LOKAMONATNOMO', 'LOKAMONATONOMO', 'LOKAMONATANOMO', 'LOCALMONTHNAME' ),
-	'localmonthnamegen'       => array( '1', 'LOKAMONATNOMOGEN', 'LOKAMONATONOMOGEN', 'LOKAMONATANOMOGEN', 'LOCALMONTHNAMEGEN' ),
-	'localmonthabbrev'        => array( '1', 'LOKAMONATNOMOMAL', 'LOKAMONATONOMOMAL', 'LOKAMONATANOMOMAL', 'LOCALMONTHABBREV' ),
-	'localday'                => array( '1', 'LOKATAGO', 'LOCALDAY' ),
-	'localday2'               => array( '1', 'LOKATAGO2', 'LOCALDAY2' ),
-	'localdayname'            => array( '1', 'LOKATAGNOMO', 'LOKATAGONOMO', 'LOKATAGANOMO', 'LOCALDAYNAME' ),
-	'localyear'               => array( '1', 'LOKAJARO', 'LOCALYEAR' ),
-	'localtime'               => array( '1', 'LOKATEMPO', 'LOCALTIME' ),
-	'localhour'               => array( '1', 'LOKAHORO', 'LOCALHOUR' ),
-	'numberofpages'           => array( '1', 'NOMBRODEPAĜOJ', 'NOMBRODEPAGXOJ', 'NUMBEROFPAGES' ),
-	'numberofarticles'        => array( '1', 'NOMBRODEARTIKOLOJ', 'NUMBEROFARTICLES' ),
-	'numberoffiles'           => array( '1', 'NOMBRODEDOSIEROJ', 'NUMBEROFFILES' ),
-	'numberofusers'           => array( '1', 'NOMBRODEUZANTOJ', 'NUMBEROFUSERS' ),
-	'numberofactiveusers'     => array( '1', 'NOMBRODEAKTIVAJUZANTOJ', 'NUMBEROFACTIVEUSERS' ),
-	'numberofedits'           => array( '1', 'NOMBRODEREDAKTOJ', 'NUMBEROFEDITS' ),
-	'numberofviews'           => array( '1', 'NOMBRODEVIZITOJ', 'NUMBEROFVIEWS' ),
-	'pagename'                => array( '1', 'PAĜONOMO', 'PAGXONOMO', 'PAĜNOMO', 'PAGXNOMO', 'PAGENAME' ),
-	'pagenamee'               => array( '1', 'PAĜONOMOO', 'PAGXONOMOO', 'PAĜNOMOO', 'PAGXNOMOO', 'PAGENAMEE' ),
-	'namespace'               => array( '1', 'NOMSPACO', 'NAMESPACE' ),
-	'namespacee'              => array( '1', 'NOMSPACOO', 'NAMESPACEE' ),
-	'talkspace'               => array( '1', 'DISKUTNOMSPACO', 'TALKSPACE' ),
-	'talkspacee'              => array( '1', 'DISKUTNOMSPACOO', 'TALKSPACEE' ),
-	'fullpagename'            => array( '1', 'TUTAPAĜONOMO', 'TUTAPAGXONOMO', 'TUTAPAĜNOMO', 'TUTAPAGXNOMO', 'FULLPAGENAME' ),
-	'fullpagenamee'           => array( '1', 'TUTAPAĜONOMOO', 'TUTAPAGXONOMOO', 'TUTAPAĜNOMOO', 'TUTAPAGXNOMOO', 'FULLPAGENAMEE' ),
-	'subpagename'             => array( '1', 'SUBPAĜONOMO', 'SUBPAGXONOMO', 'SUBPAĜNOMO', 'SUBPAGXNOMO', 'SUBPAGENAME' ),
-	'subpagenamee'            => array( '1', 'SUBPAĜONOMOO', 'SUBPAGXONOMOO', 'SUBPAĜNOMOO', 'SUBPAGXNOMOO', 'SUBPAGENAMEE' ),
-	'basepagename'            => array( '1', 'PATRAPAĜONOMO', 'PATRAPAGXONOMO', 'PATRAPAĜNOMO', 'PATRAPAGXNOMO', 'BASEPAGENAME' ),
-	'basepagenamee'           => array( '1', 'PATRAPAĜONOMOO', 'PATRAPAGXONOMOO', 'PATRAPAĜNOMOO', 'PATRAPAGXNOMOO', 'BASEPAGENAMEE' ),
-	'talkpagename'            => array( '1', 'DISKUTPAĜONOMO', 'DISKUTPAGXONOMO', 'DISKUTPAĜNOMO', 'DISKUTPAGXNOMO', 'TALKPAGENAME' ),
-	'talkpagenamee'           => array( '1', 'DISKUTPAĜONOMOO', 'DISKUTPAGXONOMOO', 'DISKUTPAĜNOMOO', 'DISKUTPAGXNOMOO', 'TALKPAGENAMEE' ),
-	'msg'                     => array( '0', 'MSĜ:', 'MSGX:', 'MSG:' ),
-	'subst'                   => array( '0', 'ANSTAT:', 'SUBST:' ),
-	'safesubst'               => array( '0', 'SEKURANSTAT:', 'SAFESUBST:' ),
-	'msgnw'                   => array( '0', 'NVMSĜ:', 'NVMSGX:', 'MSGNW:' ),
-	'img_thumbnail'           => array( '1', 'eta', 'thumbnail', 'thumb' ),
-	'img_manualthumb'         => array( '1', 'eta=$1', 'thumbnail=$1', 'thumb=$1' ),
-	'img_right'               => array( '1', 'dekstra', 'dekstre', 'right' ),
-	'img_left'                => array( '1', 'maldekstra', 'maldekstre', 'left' ),
-	'img_none'                => array( '1', 'nenio', 'neniu', 'none' ),
-	'img_width'               => array( '1', '$1ra', '$1px' ),
-	'img_center'              => array( '1', 'centra', 'meza', 'center', 'centre' ),
-	'img_framed'              => array( '1', 'kadro', 'enkadrita', 'enkadrite', 'framed', 'enframed', 'frame' ),
-	'img_frameless'           => array( '1', 'senkadra', 'frameless' ),
-	'img_page'                => array( '1', 'paĝo=$1', 'paĝo $1', 'pagxo=$1', 'pagxo_$1', 'page=$1', 'page $1' ),
-	'img_upright'             => array( '1', 'altdekstre', 'altdekstre=$1', 'altdekstre_$1', 'upright', 'upright=$1', 'upright $1' ),
-	'img_border'              => array( '1', 'kadra', 'kadrita', 'kadrigita', 'kadrite', 'kadrigite', 'border' ),
-	'img_sub'                 => array( '1', 'sube', 'malsupre', 'sub' ),
-	'img_super'               => array( '1', 'supre', 'malsube', 'super', 'sup' ),
-	'img_top'                 => array( '1', 'alte', 'top' ),
-	'img_text_top'            => array( '1', 'tekst-alte', 'text-top' ),
-	'img_middle'              => array( '1', 'meze', 'middle' ),
-	'img_bottom'              => array( '1', 'malalte', 'bottom' ),
-	'img_text_bottom'         => array( '1', 'suba-teksto', 'text-bottom' ),
-	'img_link'                => array( '1', 'ligilo=$1', 'link=$1' ),
-	'img_alt'                 => array( '1', 'alternative=$1', 'alt=$1' ),
-	'int'                     => array( '0', 'ENE:', 'INT:' ),
-	'sitename'                => array( '1', 'TTT-NOMO', 'RETPAĜNOMO', 'RETPAGXNOMO', 'RETEJNOMO', 'SITENAME' ),
-	'nse'                     => array( '0', 'NSS:', 'NSO:', 'NSE:' ),
-	'localurl'                => array( '0', 'LOKATTT:', 'LOCALURL:' ),
-	'localurle'               => array( '0', 'LOKATTTT:', 'LOCALURLE:' ),
-	'articlepath'             => array( '0', 'ARTIKOLAPADO', 'ARTIKOLAVOJO', 'ARTICLEPATH' ),
-	'server'                  => array( '0', 'SERVILO', 'SERVER' ),
-	'servername'              => array( '0', 'NOMODESERVILO', 'SERVILANOMO', 'SERVILONOMO', 'SERVERNAME' ),
-	'scriptpath'              => array( '0', 'SKRIPTO-VOJO', 'SKRIPTOVOJO', 'SKRIPTVOJO', 'SCRIPTPATH' ),
-	'stylepath'               => array( '0', 'STILO-VOJO', 'STILOVOJO', 'STILVOJO', 'STYLEPATH' ),
-	'grammar'                 => array( '0', 'GRAMATIKO:', 'GRAMMAR:' ),
-	'gender'                  => array( '0', 'SEKSO:', 'GENDER:' ),
-	'notitleconvert'          => array( '0', '__NEKONVERTUTITOLON__', '__NKT__', '__NTC__', '__NOTITLECONVERT__', '__NOTC__' ),
-	'nocontentconvert'        => array( '0', '__NEKONVERTUENHAVON__', '__NKH__', '__NCC__', '__NOCONTENTCONVERT__', '__NOCC__' ),
-	'currentweek'             => array( '1', 'NUNASEMAJNO', 'CURRENTWEEK' ),
-	'localweek'               => array( '1', 'LOKASEMAJNO', 'LOCALWEEK' ),
-	'revisionyear'            => array( '1', 'JARODEREVIZIO', 'REVISIONYEAR' ),
-	'plural'                  => array( '0', 'PLURALA:', 'PLURAL:' ),
-	'fullurl'                 => array( '0', 'PLENALIGILO:', 'PLENLIG:', 'TUTATTT:', 'FULLURL:' ),
-	'fullurle'                => array( '0', 'PLENALIGILOO:', 'PLENLIGG:', 'TUTATTTT:', 'FULLURLE:' ),
-	'lcfirst'                 => array( '0', 'MALMAJUSKLEUNUA:', 'MINUSKLEUNUA:', 'MMU:', 'LCFIRST:' ),
-	'ucfirst'                 => array( '0', 'MAJUSKLEUNUA:', 'MALMINUSKLEUNUA:', 'MU:', 'UCFIRST:' ),
-	'lc'                      => array( '0', 'MALMAJUSKLE:', 'MINUSKLE:', 'LC:' ),
-	'uc'                      => array( '0', 'MAJUSKLE:', 'MALMINUSKLE:', 'UC:' ),
-	'displaytitle'            => array( '1', 'MONTRUTITOLON:', 'DISPLAYTITLE' ),
-	'newsectionlink'          => array( '1', '__LIGILOALNOVASEKCIO__', '__NSL__', '__LNS__', '__LANS__', '__NEWSECTIONLINK__' ),
-	'nonewsectionlink'        => array( '1', '__SENLIGILOALNOVASEKCIO__', '__NNSL__', '__SLNS__', '__SLANS__', '__NONEWSECTIONLINK__' ),
-	'currentversion'          => array( '1', 'NUNAVERSIO', 'CURRENTVERSION' ),
-	'currenttimestamp'        => array( '1', 'NUNATEMPINDIKO', 'CURRENTTIMESTAMP' ),
-	'localtimestamp'          => array( '1', 'LOKATEMPINDIKO', 'LOCALTIMESTAMP' ),
-	'language'                => array( '0', '#LINGVO:', '#LANGUAGE:' ),
-	'contentlanguage'         => array( '1', 'ENHAVA-LINGVO', 'CONTENTLANGUAGE', 'CONTENTLANG' ),
-	'pagesinnamespace'        => array( '1', 'PAĜOJENNOMSPACO', 'PAGXOJENNOMSPACO', 'PAĜOJENS', 'PAGXOJENNS', 'PAGESINNAMESPACE:', 'PAGESINNS:' ),
-	'numberofadmins'          => array( '1', 'NOMBRODEADMINOJ', 'NUMBEROFADMINS' ),
-	'special'                 => array( '0', 'speciala', 'special' ),
-	'defaultsort'             => array( '1', 'DEFAŬLTORDIGO:', 'DEFAUXLTORDIGO:', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:' ),
-	'filepath'                => array( '0', 'DOSIERO-VORO', 'DOSIERVOJO', 'FILEPATH:' ),
-	'tag'                     => array( '0', 'marko', 'etikedo', 'tag' ),
-	'hiddencat'               => array( '1', '__KK__', '__KAŜITAKATEGORIO__', '__KASXITAKATEGORIO__', '__HIDDENCAT__' ),
-	'pagesincategory'         => array( '1', 'PAĜOJENKATEGORIO', 'PAGXOJENKATEGORIO', 'PAĜOJENKAT', 'PAGXOJENKAT', 'PAGESINCATEGORY', 'PAGESINCAT' ),
-	'pagesize'                => array( '1', 'PAĜOPEZO', 'PAGXOPEZO', 'PEZODEPAĜO', 'PEZODEPAGXO', 'PAGESIZE' ),
-	'index'                   => array( '1', '__INDEKSU__', '__INDEKSI__', '__INDEX__' ),
-	'noindex'                 => array( '1', '__NEINDEKSU__', '__NIU__', '__NOINDEX__' ),
-	'staticredirect'          => array( '1', '__STATIKAALIDIREKTO__', '__STATICREDIRECT__' ),
-	'protectionlevel'         => array( '1', 'PROTEKTONIVELO', 'PROTECTIONLEVEL' ),
-	'url_path'                => array( '0', 'VOJO', 'PATH' ),
-	'url_wiki'                => array( '0', 'VIKIO', 'WIKI' ),
-	'url_query'               => array( '0', 'INFORMPETO', 'QUERY' ),
+	'redirect'                  => array( '0', '#ALIDIREKTU', '#ALIDIREKTI', '#AL', '#REDIRECT' ),
+	'notoc'                     => array( '0', '__NI__', '__NEINDEKSO__', '__NT__', '__NOTOC__' ),
+	'nogallery'                 => array( '0', '__NG__', '__SENBILDARO__', '__SB__', '__SG__', '__SENGALERIO__', '__NOGALLERY__' ),
+	'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' ),
+	'currentmonthnamegen'       => array( '1', 'NUNAMONATNOMOGEN', 'NUNAMONATONOMOGEN', 'NUNAMONATANOMOGEN', 'CURRENTMONTHNAMEGEN' ),
+	'currentmonthabbrev'        => array( '1', 'NUNAMONATNOMOMAL', 'NUNAMONATONOMOMAL', 'NUNAMONATANOMOMAL', 'CURRENTMONTHABBREV' ),
+	'currentday'                => array( '1', 'NUNATAGO', 'CURRENTDAY' ),
+	'currentday2'               => array( '1', 'NUNATAGO2', 'CURRENTDAY2' ),
+	'currentdayname'            => array( '1', 'NUNATAGNOMO', 'CURRENTDAYNAME' ),
+	'currentyear'               => array( '1', 'NUNAJARO', 'CURRENTYEAR' ),
+	'currenttime'               => array( '1', 'NUNATEMPO', 'CURRENTTIME' ),
+	'currenthour'               => array( '1', 'NUNAHORO', 'CURRENTHOUR' ),
+	'localmonth'                => array( '1', 'LOKAMONATO', 'LOKAMONATO2', 'LOCALMONTH', 'LOCALMONTH2' ),
+	'localmonth1'               => array( '1', 'LOKAMONATO1', 'LOCALMONTH1' ),
+	'localmonthname'            => array( '1', 'LOKAMONATNOMO', 'LOKAMONATONOMO', 'LOKAMONATANOMO', 'LOCALMONTHNAME' ),
+	'localmonthnamegen'         => array( '1', 'LOKAMONATNOMOGEN', 'LOKAMONATONOMOGEN', 'LOKAMONATANOMOGEN', 'LOCALMONTHNAMEGEN' ),
+	'localmonthabbrev'          => array( '1', 'LOKAMONATNOMOMAL', 'LOKAMONATONOMOMAL', 'LOKAMONATANOMOMAL', 'LOCALMONTHABBREV' ),
+	'localday'                  => array( '1', 'LOKATAGO', 'LOCALDAY' ),
+	'localday2'                 => array( '1', 'LOKATAGO2', 'LOCALDAY2' ),
+	'localdayname'              => array( '1', 'LOKATAGNOMO', 'LOKATAGONOMO', 'LOKATAGANOMO', 'LOCALDAYNAME' ),
+	'localyear'                 => array( '1', 'LOKAJARO', 'LOCALYEAR' ),
+	'localtime'                 => array( '1', 'LOKATEMPO', 'LOCALTIME' ),
+	'localhour'                 => array( '1', 'LOKAHORO', 'LOCALHOUR' ),
+	'numberofpages'             => array( '1', 'NOMBRODEPAĜOJ', 'NOMBRODEPAGXOJ', 'NUMBEROFPAGES' ),
+	'numberofarticles'          => array( '1', 'NOMBRODEARTIKOLOJ', 'NUMBEROFARTICLES' ),
+	'numberoffiles'             => array( '1', 'NOMBRODEDOSIEROJ', 'NUMBEROFFILES' ),
+	'numberofusers'             => array( '1', 'NOMBRODEUZANTOJ', 'NUMBEROFUSERS' ),
+	'numberofactiveusers'       => array( '1', 'NOMBRODEAKTIVAJUZANTOJ', 'NUMBEROFACTIVEUSERS' ),
+	'numberofedits'             => array( '1', 'NOMBRODEREDAKTOJ', 'NUMBEROFEDITS' ),
+	'numberofviews'             => array( '1', 'NOMBRODEVIZITOJ', 'NUMBEROFVIEWS' ),
+	'pagename'                  => array( '1', 'PAĜONOMO', 'PAGXONOMO', 'PAĜNOMO', 'PAGXNOMO', 'PAGENAME' ),
+	'pagenamee'                 => array( '1', 'PAĜONOMOO', 'PAGXONOMOO', 'PAĜNOMOO', 'PAGXNOMOO', 'PAGENAMEE' ),
+	'namespace'                 => array( '1', 'NOMSPACO', 'NAMESPACE' ),
+	'namespacee'                => array( '1', 'NOMSPACOO', 'NAMESPACEE' ),
+	'talkspace'                 => array( '1', 'DISKUTNOMSPACO', 'TALKSPACE' ),
+	'talkspacee'                => array( '1', 'DISKUTNOMSPACOO', 'TALKSPACEE' ),
+	'fullpagename'              => array( '1', 'TUTAPAĜONOMO', 'TUTAPAGXONOMO', 'TUTAPAĜNOMO', 'TUTAPAGXNOMO', 'FULLPAGENAME' ),
+	'fullpagenamee'             => array( '1', 'TUTAPAĜONOMOO', 'TUTAPAGXONOMOO', 'TUTAPAĜNOMOO', 'TUTAPAGXNOMOO', 'FULLPAGENAMEE' ),
+	'subpagename'               => array( '1', 'SUBPAĜONOMO', 'SUBPAGXONOMO', 'SUBPAĜNOMO', 'SUBPAGXNOMO', 'SUBPAGENAME' ),
+	'subpagenamee'              => array( '1', 'SUBPAĜONOMOO', 'SUBPAGXONOMOO', 'SUBPAĜNOMOO', 'SUBPAGXNOMOO', 'SUBPAGENAMEE' ),
+	'basepagename'              => array( '1', 'PATRAPAĜONOMO', 'PATRAPAGXONOMO', 'PATRAPAĜNOMO', 'PATRAPAGXNOMO', 'BASEPAGENAME' ),
+	'basepagenamee'             => array( '1', 'PATRAPAĜONOMOO', 'PATRAPAGXONOMOO', 'PATRAPAĜNOMOO', 'PATRAPAGXNOMOO', 'BASEPAGENAMEE' ),
+	'talkpagename'              => array( '1', 'DISKUTPAĜONOMO', 'DISKUTPAGXONOMO', 'DISKUTPAĜNOMO', 'DISKUTPAGXNOMO', 'TALKPAGENAME' ),
+	'talkpagenamee'             => array( '1', 'DISKUTPAĜONOMOO', 'DISKUTPAGXONOMOO', 'DISKUTPAĜNOMOO', 'DISKUTPAGXNOMOO', 'TALKPAGENAMEE' ),
+	'msg'                       => array( '0', 'MSĜ:', 'MSGX:', 'MSG:' ),
+	'subst'                     => array( '0', 'ANSTAT:', 'SUBST:' ),
+	'safesubst'                 => array( '0', 'SEKURANSTAT:', 'SAFESUBST:' ),
+	'msgnw'                     => array( '0', 'NVMSĜ:', 'NVMSGX:', 'MSGNW:' ),
+	'img_thumbnail'             => array( '1', 'eta', 'thumbnail', 'thumb' ),
+	'img_manualthumb'           => array( '1', 'eta=$1', 'thumbnail=$1', 'thumb=$1' ),
+	'img_right'                 => array( '1', 'dekstra', 'dekstre', 'right' ),
+	'img_left'                  => array( '1', 'maldekstra', 'maldekstre', 'left' ),
+	'img_none'                  => array( '1', 'nenio', 'neniu', 'none' ),
+	'img_width'                 => array( '1', '$1ra', '$1px' ),
+	'img_center'                => array( '1', 'centra', 'meza', 'center', 'centre' ),
+	'img_framed'                => array( '1', 'kadro', 'enkadrita', 'enkadrite', 'framed', 'enframed', 'frame' ),
+	'img_frameless'             => array( '1', 'senkadra', 'frameless' ),
+	'img_page'                  => array( '1', 'paĝo=$1', 'paĝo $1', 'pagxo=$1', 'pagxo_$1', 'page=$1', 'page $1' ),
+	'img_upright'               => array( '1', 'altdekstre', 'altdekstre=$1', 'altdekstre_$1', 'upright', 'upright=$1', 'upright $1' ),
+	'img_border'                => array( '1', 'kadra', 'kadrita', 'kadrigita', 'kadrite', 'kadrigite', 'border' ),
+	'img_sub'                   => array( '1', 'sube', 'malsupre', 'sub' ),
+	'img_super'                 => array( '1', 'supre', 'malsube', 'super', 'sup' ),
+	'img_top'                   => array( '1', 'alte', 'top' ),
+	'img_text_top'              => array( '1', 'tekst-alte', 'text-top' ),
+	'img_middle'                => array( '1', 'meze', 'middle' ),
+	'img_bottom'                => array( '1', 'malalte', 'bottom' ),
+	'img_text_bottom'           => array( '1', 'suba-teksto', 'text-bottom' ),
+	'img_link'                  => array( '1', 'ligilo=$1', 'link=$1' ),
+	'img_alt'                   => array( '1', 'alternative=$1', 'alt=$1' ),
+	'int'                       => array( '0', 'ENE:', 'INT:' ),
+	'sitename'                  => array( '1', 'TTT-NOMO', 'RETPAĜNOMO', 'RETPAGXNOMO', 'RETEJNOMO', 'SITENAME' ),
+	'nse'                       => array( '0', 'NSS:', 'NSO:', 'NSE:' ),
+	'localurl'                  => array( '0', 'LOKATTT:', 'LOCALURL:' ),
+	'localurle'                 => array( '0', 'LOKATTTT:', 'LOCALURLE:' ),
+	'articlepath'               => array( '0', 'ARTIKOLAPADO', 'ARTIKOLAVOJO', 'ARTICLEPATH' ),
+	'server'                    => array( '0', 'SERVILO', 'SERVER' ),
+	'servername'                => array( '0', 'NOMODESERVILO', 'SERVILANOMO', 'SERVILONOMO', 'SERVERNAME' ),
+	'scriptpath'                => array( '0', 'SKRIPTO-VOJO', 'SKRIPTOVOJO', 'SKRIPTVOJO', 'SCRIPTPATH' ),
+	'stylepath'                 => array( '0', 'STILO-VOJO', 'STILOVOJO', 'STILVOJO', 'STYLEPATH' ),
+	'grammar'                   => array( '0', 'GRAMATIKO:', 'GRAMMAR:' ),
+	'gender'                    => array( '0', 'SEKSO:', 'GENDER:' ),
+	'notitleconvert'            => array( '0', '__NEKONVERTUTITOLON__', '__NKT__', '__NTC__', '__NOTITLECONVERT__', '__NOTC__' ),
+	'nocontentconvert'          => array( '0', '__NEKONVERTUENHAVON__', '__NKH__', '__NCC__', '__NOCONTENTCONVERT__', '__NOCC__' ),
+	'currentweek'               => array( '1', 'NUNASEMAJNO', 'CURRENTWEEK' ),
+	'localweek'                 => array( '1', 'LOKASEMAJNO', 'LOCALWEEK' ),
+	'revisionyear'              => array( '1', 'JARODEREVIZIO', 'REVISIONYEAR' ),
+	'plural'                    => array( '0', 'PLURALA:', 'PLURAL:' ),
+	'fullurl'                   => array( '0', 'PLENALIGILO:', 'PLENLIG:', 'TUTATTT:', 'FULLURL:' ),
+	'fullurle'                  => array( '0', 'PLENALIGILOO:', 'PLENLIGG:', 'TUTATTTT:', 'FULLURLE:' ),
+	'lcfirst'                   => array( '0', 'MALMAJUSKLEUNUA:', 'MINUSKLEUNUA:', 'MMU:', 'LCFIRST:' ),
+	'ucfirst'                   => array( '0', 'MAJUSKLEUNUA:', 'MALMINUSKLEUNUA:', 'MU:', 'UCFIRST:' ),
+	'lc'                        => array( '0', 'MALMAJUSKLE:', 'MINUSKLE:', 'LC:' ),
+	'uc'                        => array( '0', 'MAJUSKLE:', 'MALMINUSKLE:', 'UC:' ),
+	'displaytitle'              => array( '1', 'MONTRUTITOLON:', 'DISPLAYTITLE' ),
+	'newsectionlink'            => array( '1', '__LIGILOALNOVASEKCIO__', '__NSL__', '__LNS__', '__LANS__', '__NEWSECTIONLINK__' ),
+	'nonewsectionlink'          => array( '1', '__SENLIGILOALNOVASEKCIO__', '__NNSL__', '__SLNS__', '__SLANS__', '__NONEWSECTIONLINK__' ),
+	'currentversion'            => array( '1', 'NUNAVERSIO', 'CURRENTVERSION' ),
+	'currenttimestamp'          => array( '1', 'NUNATEMPINDIKO', 'CURRENTTIMESTAMP' ),
+	'localtimestamp'            => array( '1', 'LOKATEMPINDIKO', 'LOCALTIMESTAMP' ),
+	'language'                  => array( '0', '#LINGVO:', '#LANGUAGE:' ),
+	'contentlanguage'           => array( '1', 'ENHAVA-LINGVO', 'CONTENTLANGUAGE', 'CONTENTLANG' ),
+	'pagesinnamespace'          => array( '1', 'PAĜOJENNOMSPACO', 'PAGXOJENNOMSPACO', 'PAĜOJENS', 'PAGXOJENNS', 'PAGESINNAMESPACE:', 'PAGESINNS:' ),
+	'numberofadmins'            => array( '1', 'NOMBRODEADMINOJ', 'NUMBEROFADMINS' ),
+	'special'                   => array( '0', 'speciala', 'special' ),
+	'defaultsort'               => array( '1', 'DEFAŬLTORDIGO:', 'DEFAUXLTORDIGO:', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:' ),
+	'filepath'                  => array( '0', 'DOSIERO-VORO', 'DOSIERVOJO', 'FILEPATH:' ),
+	'tag'                       => array( '0', 'marko', 'etikedo', 'tag' ),
+	'hiddencat'                 => array( '1', '__KK__', '__KAŜITAKATEGORIO__', '__KASXITAKATEGORIO__', '__HIDDENCAT__' ),
+	'pagesincategory'           => array( '1', 'PAĜOJENKATEGORIO', 'PAGXOJENKATEGORIO', 'PAĜOJENKAT', 'PAGXOJENKAT', 'PAGESINCATEGORY', 'PAGESINCAT' ),
+	'pagesize'                  => array( '1', 'PAĜOPEZO', 'PAGXOPEZO', 'PEZODEPAĜO', 'PEZODEPAGXO', 'PAGESIZE' ),
+	'index'                     => array( '1', '__INDEKSU__', '__INDEKSI__', '__INDEX__' ),
+	'noindex'                   => array( '1', '__NEINDEKSU__', '__NIU__', '__NOINDEX__' ),
+	'staticredirect'            => array( '1', '__STATIKAALIDIREKTO__', '__STATICREDIRECT__' ),
+	'protectionlevel'           => array( '1', 'PROTEKTONIVELO', 'PROTECTIONLEVEL' ),
+	'url_path'                  => array( '0', 'VOJO', 'PATH' ),
+	'url_wiki'                  => array( '0', 'VIKIO', 'WIKI' ),
+	'url_query'                 => array( '0', 'INFORMPETO', 'QUERY' ),
 );
 
 $separatorTransformTable = array( ',' => "\xc2\xa0", '.' => ',' );
@@ -630,12 +630,12 @@ Listo de validaj specialaj paĝoj estas trovebla ĉe [[Special:SpecialPages|{{in
 # General errors
 'error' => 'Eraro',
 'databaseerror' => 'Datumbaza eraro',
-'dberrortext' => 'Sintakseraro okazis dum informpeto al la datumaro.
-Ĝi eble indikas cimon en la programaro.
+'dberrortext' => 'Sintakseraro okazis dum informpeto al la datenbazo.
+Ĝi eble indikas misaĵeton en la programaro.
 Jen la plej laste provita informpeto:
-<blockquote><tt>$1</tt></blockquote>
-el la funkcio "<tt>$2</tt>".
-MySQL liveris eraron "<tt>$3: $4</tt>".',
+<blockquote><code>$1</code></blockquote>
+el la funkcio "<code>$2</code>".
+La datenbazo liveris eraron "<samp>$3: $4</samp>".',
 'dberrortextcl' => 'Sintaksa eraro de la datumbaza informmendo okazis.
 La lasta provita datumbaza informmendo estis:
 "$1"
@@ -989,12 +989,10 @@ Detaloj troveblos en la [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}
 'userpage-userdoesnotexist-view' => 'Uzanto-konto "$1" ne estas registrita.',
 'blocked-notice-logextract' => 'Ĉi tiu uzanto estas ĉi-momente forbarita.
 La lasta protokolero estas jene montrata por via referenco:',
-'clearyourcache' => "'''Notu:''' Post konservado vi forviŝu la kaŝmemoron de via foliumilo por vidi la ŝanĝojn. 
-* '''Firefox / Safari:''' Premu majuskligan klavon klakante ''Reŝarĝi'', aŭ premu ''Stir-F5'', aŭ premu ''Stir-R'' aŭ ''⌘-R'' kun Makintoŝo
-* '''Google Chrome:''' Premu ''Stir-majuskligklavon'' aŭ ⌘-Majuskligklavo-R'' kun Makintoŝo
+'clearyourcache' => "Notu:''' Post konservado, vi forviŝu la kaŝmemoron de via foliumilo por vidi la ŝanĝojn. 
+* '''Firefox / Safari:''' Premu majuskligan klavon klakante ''Reŝarĝi'', aŭ premu aŭ ''Stir-F5'' aŭ ''Stir-R'' (''⌘-R'' kun Makintoŝo)
+* '''Google Chrome:''' Premu ''Stir-majuskligklavon-R'' (''⌘-Majuskligklavo-R'' kun Makintoŝo)
 * '''Interreta Esplorilo''': Premu ''Stir'' klakante ''Refreŝu'', aŭ premu ''Stir-F5'' 
-* '''Safari:''' ''Cmd-R''
-* '''Konqueror:''' Klaku ''Reŝarĝu'' aŭ premu ''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.",
@@ -1988,6 +1986,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.',
 
 # File reversion
 'filerevert' => 'Restarigi $1',
@@ -2270,6 +2269,8 @@ Estas [[{{MediaWiki:Listgrouprights-helppage}}|aldona informo]] pri individuaj r
 'mailnologin' => 'Neniu alsendota adreso',
 'mailnologintext' => 'Vi nepre estu [[Special:UserLogin|salutanta]] kaj havanta validan retpoŝtadreson en viaj [[Special:Preferences|preferoj]] por retpoŝti al aliaj uzantoj.',
 'emailuser' => 'Retpoŝti ĉi tiun uzanton',
+'emailuser-title-target' => 'Retpoŝti ĉi tiun {{GENDER:$1|uzanton}}',
+'emailuser-title-notarget' => 'Retpoŝti uzanton',
 'emailpage' => 'Retpoŝti uzanton',
 'emailpagetext' => 'Vi povas uzi la jenan paĝon por sendi retpoŝtan mesaĝon al ĉi tiu uzanto.
 La retadreso kiun vi enigis en [[Special:Preferences|viaj preferoj]] aperos kiel la "De" adreso de la retpoŝto, do la ricevonto eblos respondi rekte al vi.',
@@ -3093,11 +3094,17 @@ Datoj de versioj kaj nomoj de redaktantoj estos preservitaj.
 
 # Info page
 'pageinfo-title' => 'Informoj por "$1"',
-'pageinfo-header-edits' => 'Redaktoj',
+'pageinfo-header-basic' => 'Baza informo',
+'pageinfo-header-edits' => 'Historio de redaktoj',
+'pageinfo-robot-index' => 'Indeksebla',
+'pageinfo-robot-noindex' => 'Ne indeksebla',
 'pageinfo-views' => 'Nombro de rigardoj',
-'pageinfo-watchers' => 'Nombro de atentantoj',
-'pageinfo-edits' => 'Nombro de redaktoj',
-'pageinfo-authors' => 'Nombro de distingaj aÅ­toroj',
+'pageinfo-watchers' => 'Nombro de paĝatentantoj',
+'pageinfo-lastuser' => 'Lasta redaktoro',
+'pageinfo-lasttime' => 'Dato de lasta redakto',
+'pageinfo-edits' => 'Tuta nombro de redaktoj',
+'pageinfo-authors' => 'Tuta nombro de malsamaj aÅ­toroj',
+'pageinfo-recent-authors' => 'Lasta nombro de malsamaj aÅ­toroj',
 
 # Skin names
 'skinname-standard' => 'Klasiko',
diff --git a/languages/messages/MessagesEs.php b/languages/messages/MessagesEs.php
index e93f9d0fdf..387d06a053 100644
--- a/languages/messages/MessagesEs.php
+++ b/languages/messages/MessagesEs.php
@@ -70,6 +70,7 @@
  * @author Richard Wolf VI
  * @author Sanbec
  * @author Savh
+ * @author Shirayuki
  * @author Spacebirdy
  * @author Technorum
  * @author The Evil IP address
@@ -130,7 +131,7 @@ $specialPageAliases = array(
 	'ChangeEmail'               => array( 'CambiarEmail', 'CambiarCorreo' ),
 	'ChangePassword'            => array( 'Cambiar_contraseña', 'CambiarContraseña', 'ResetearContraseña', 'Resetear_contraseña' ),
 	'ComparePages'              => array( 'CompararPáginas' ),
-	'Confirmemail'              => array( 'ConfirmarEmail', 'Confirmar_e-mail' ),
+	'Confirmemail'              => array( 'ConfirmarEmail', 'Confirmar_correo_electrónico' ),
 	'Contributions'             => array( 'Contribuciones' ),
 	'CreateAccount'             => array( 'Crear_una_cuenta', 'CrearCuenta' ),
 	'Deadendpages'              => array( 'PáginasSinSalida', 'Páginas_sin_salida' ),
@@ -144,7 +145,7 @@ $specialPageAliases = array(
 	'FileDuplicateSearch'       => array( 'BuscarArchivosDuplicados', 'Buscar_archivos_duplicados' ),
 	'Filepath'                  => array( 'RutaDeArchivo', 'Ruta_de_archivo' ),
 	'Import'                    => array( 'Importar' ),
-	'Invalidateemail'           => array( 'InvalidarEmail', 'Invalidar_e-mail' ),
+	'Invalidateemail'           => array( 'InvalidarEmail', 'Invalidar_correo_electrónico' ),
 	'BlockList'                 => array( 'UsuariosBloqueados', 'Lista_de_usuarios_bloqueados' ),
 	'LinkSearch'                => array( 'BúsquedaDeEnlaces', 'Búsqueda_de_enlaces' ),
 	'Listadmins'                => array( 'ListaDeAdministradores', 'Lista_de_administradores' ),
@@ -173,6 +174,7 @@ $specialPageAliases = array(
 	'Newimages'                 => array( 'NuevasImágenes', 'Nuevas_imágenes' ),
 	'Newpages'                  => array( 'PáginasNuevas', 'Páginas_nuevas' ),
 	'PasswordReset'             => array( 'RestablecerContraseña' ),
+	'PermanentLink'             => array( 'EnlacePermanente' ),
 	'Popularpages'              => array( 'PáginasMásVisitadas', 'PáginasPopulares', 'Páginas_más_visitadas' ),
 	'Preferences'               => array( 'Preferencias' ),
 	'Prefixindex'               => array( 'PáginasPorPrefijo', 'Páginas_por_prefijo' ),
@@ -215,125 +217,132 @@ $specialPageAliases = array(
 );
 
 $magicWords = array(
-	'redirect'                => array( '0', '#REDIRECCIÓN', '#REDIRECCION', '#REDIRECT' ),
-	'notoc'                   => array( '0', '__NOTDC__', '__NOTOC__' ),
-	'nogallery'               => array( '0', '__NOGALERÍA__', '__NOGALERIA__', '__NOGALLERY__' ),
-	'forcetoc'                => array( '0', '__FORZARTDC__', '__FORZARTOC__', '__FORCETOC__' ),
-	'toc'                     => array( '0', '__TDC__', '__TOC__' ),
-	'noeditsection'           => array( '0', '__NOEDITARSECCIÓN__', '__NOEDITARSECCION__', '__NOEDITSECTION__' ),
-	'noheader'                => array( '0', '__NOTÍTULO__', '__NOTITULO__', '__NOHEADER__' ),
-	'currentmonth'            => array( '1', 'MESACTUAL', 'MESACTUAL2', 'CURRENTMONTH', 'CURRENTMONTH2' ),
-	'currentmonth1'           => array( '1', 'MESACTUAL1', 'CURRENTMONTH1' ),
-	'currentmonthname'        => array( '1', 'MESACTUALCOMPLETO', 'NOMBREMESACTUAL', 'CURRENTMONTHNAME' ),
-	'currentmonthnamegen'     => array( '1', 'MESACTUALGENITIVO', 'CURRENTMONTHNAMEGEN' ),
-	'currentmonthabbrev'      => array( '1', 'MESACTUALABREVIADO', 'CURRENTMONTHABBREV' ),
-	'currentday'              => array( '1', 'DÍAACTUAL', 'DIAACTUAL', 'DÍA_ACTUAL', 'DIA_ACTUAL', 'CURRENTDAY' ),
-	'currentday2'             => array( '1', 'DÍAACTUAL2', 'DIAACTUAL2', 'DÍA_ACTUAL2', 'DIA_ACTUAL2', 'CURRENTDAY2' ),
-	'currentdayname'          => array( '1', 'NOMBREDÍAACTUAL', 'NOMBREDIAACTUAL', 'CURRENTDAYNAME' ),
-	'currentyear'             => array( '1', 'AÑOACTUAL', 'AÑO_ACTUAL', 'CURRENTYEAR' ),
-	'currenttime'             => array( '1', 'HORA_MINUTOS_ACTUAL', 'HORAMINUTOSACTUAL', 'TIEMPOACTUAL', 'CURRENTTIME' ),
-	'currenthour'             => array( '1', 'HORAACTUAL', 'HORA_ACTUAL', 'CURRENTHOUR' ),
-	'localmonth'              => array( '1', 'MESLOCAL', 'MESLOCAL2', 'LOCALMONTH', 'LOCALMONTH2' ),
-	'localmonth1'             => array( '1', 'MESLOCAL1', 'LOCALMONTH1' ),
-	'localmonthname'          => array( '1', 'MESLOCALCOMPLETO', 'NOMBREMESLOCAL', 'LOCALMONTHNAME' ),
-	'localmonthnamegen'       => array( '1', 'MESLOCALGENITIVO', 'LOCALMONTHNAMEGEN' ),
-	'localmonthabbrev'        => array( '1', 'MESLOCALABREVIADO', 'LOCALMONTHABBREV' ),
-	'localday'                => array( '1', 'DÍALOCAL', 'DIALOCAL', 'LOCALDAY' ),
-	'localday2'               => array( '1', 'DIALOCAL2', 'DÍALOCAL2', 'LOCALDAY2' ),
-	'localdayname'            => array( '1', 'NOMBREDIALOCAL', 'NOMBREDÍALOCAL', 'LOCALDAYNAME' ),
-	'localyear'               => array( '1', 'AÑOLOCAL', 'LOCALYEAR' ),
-	'localtime'               => array( '1', 'HORAMINUTOSLOCAL', 'TIEMPOLOCAL', 'LOCALTIME' ),
-	'localhour'               => array( '1', 'HORALOCAL', 'LOCALHOUR' ),
-	'numberofpages'           => array( '1', 'NÚMERODEPÁGINAS', 'NUMERODEPAGINAS', 'NUMBEROFPAGES' ),
-	'numberofarticles'        => array( '1', 'NÚMERODEARTÍCULOS', 'NUMERODEARTICULOS', 'NUMBEROFARTICLES' ),
-	'numberoffiles'           => array( '1', 'NÚMERODEARCHIVOS', 'NUMERODEARCHIVOS', 'NUMBEROFFILES' ),
-	'numberofusers'           => array( '1', 'NÚMERODEUSUARIOS', 'NUMERODEUSUARIOS', 'NUMBEROFUSERS' ),
-	'numberofactiveusers'     => array( '1', 'NÚMERODEUSUARIOSACTIVOS', 'NUMERODEUSUARIOSACTIVOS', 'NUMBEROFACTIVEUSERS' ),
-	'numberofedits'           => array( '1', 'NÚMERODEEDICIONES', 'NUMERODEEDICIONES', 'NUMBEROFEDITS' ),
-	'numberofviews'           => array( '1', 'NÚMERODEVISTAS', 'NUMERODEVISTAS', 'NUMBEROFVIEWS' ),
-	'pagename'                => array( '1', 'NOMBREDEPAGINA', 'NOMBREDEPÁGINA', 'PAGENAME' ),
-	'pagenamee'               => array( '1', 'NOMBREDEPAGINAC', 'NOMBREDEPÁGINAC', 'PAGENAMEE' ),
-	'namespace'               => array( '1', 'ESPACIODENOMBRE', 'NAMESPACE' ),
-	'namespacee'              => array( '1', 'ESPACIODENOMBREC', 'NAMESPACEE' ),
-	'talkspace'               => array( '1', 'ESPACIODEDISCUSION', 'ESPACIODEDISCUSIÓN', 'TALKSPACE' ),
-	'talkspacee'              => array( '1', 'ESPACIODEDISCUSIONC', 'TALKSPACEE' ),
-	'subjectspace'            => array( '1', 'ESPACIODEASUNTO', 'ESPACIODETEMA', 'ESPACIODEARTÍCULO', 'ESPACIODEARTICULO', 'SUBJECTSPACE', 'ARTICLESPACE' ),
-	'subjectspacee'           => array( '1', 'ESPACIODETEMAC', 'ESPACIODEASUNTOC', 'ESPACIODEARTICULOC', 'ESPACIODEARTÍCULOC', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
-	'fullpagename'            => array( '1', 'NOMBRECOMPLETODEPÁGINA', 'NOMBRECOMPLETODEPAGINA', 'FULLPAGENAME' ),
-	'fullpagenamee'           => array( '1', 'NOMBRECOMPLETODEPAGINAC', 'NOMBRECOMPLETODEPÁGINAC', 'FULLPAGENAMEE' ),
-	'subpagename'             => array( '1', 'NOMBREDESUBPAGINA', 'NOMBREDESUBPÁGINA', 'SUBPAGENAME' ),
-	'subpagenamee'            => array( '1', 'NOMBREDESUBPAGINAC', 'NOMBREDESUBPÁGINAC', 'SUBPAGENAMEE' ),
-	'basepagename'            => array( '1', 'NOMBREDEPAGINABASE', 'NOMBREDEPÁGINABASE', 'BASEPAGENAME' ),
-	'basepagenamee'           => array( '1', 'NOMBREDEPAGINABASEC', 'NOMBREDEPÁGINABASEC', 'BASEPAGENAMEE' ),
-	'talkpagename'            => array( '1', 'NOMBREDEPÁGINADEDISCUSIÓN', 'NOMBREDEPAGINADEDISCUSION', 'NOMBREDEPAGINADISCUSION', 'NOMBREDEPÁGINADISCUSIÓN', 'TALKPAGENAME' ),
-	'talkpagenamee'           => array( '1', 'NOMBREDEPÁGINADEDISCUSIÓNC', 'NOMBREDEPAGINADEDISCUSIONC', 'NOMBREDEPAGINADISCUSIONC', 'NOMBREDEPÁGINADISCUSIÓNC', 'TALKPAGENAMEE' ),
-	'subjectpagename'         => array( '1', 'NOMBREDEPAGINADETEMA', 'NOMBREDEPÁGINADETEMA', 'NOMBREDEPÁGINADEASUNTO', 'NOMBREDEPAGINADEASUNTO', 'NOMBREDEPAGINADEARTICULO', 'NOMBREDEPÁGINADEARTÍCULO', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
-	'subjectpagenamee'        => array( '1', 'NOMBREDEPAGINADETEMAC', 'NOMBREDEPÁGINADETEMAC', 'NOMBREDEPÁGINADEASUNTOC', 'NOMBREDEPAGINADEASUNTOC', 'NOMBREDEPAGINADEARTICULOC', 'NOMBREDEPÁGINADEARTÍCULOC', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
-	'msg'                     => array( '0', 'MSJ:', 'MSG:' ),
-	'img_thumbnail'           => array( '1', 'miniaturadeimagen', 'miniatura', 'mini', 'thumbnail', 'thumb' ),
-	'img_manualthumb'         => array( '1', 'miniaturadeimagen=$1', 'miniatura=$1', 'thumbnail=$1', 'thumb=$1' ),
-	'img_right'               => array( '1', 'derecha', 'dcha', 'der', 'right' ),
-	'img_left'                => array( '1', 'izquierda', 'izda', 'izq', 'left' ),
-	'img_none'                => array( '1', 'ninguna', 'nada', 'no', 'ninguno', 'none' ),
-	'img_center'              => array( '1', 'centro', 'centrado', 'centrada', 'centrar', 'center', 'centre' ),
-	'img_framed'              => array( '1', 'marco', 'enmarcado', 'enmarcada', 'framed', 'enframed', 'frame' ),
-	'img_frameless'           => array( '1', 'sinmarco', 'sin_enmarcar', 'sinenmarcar', 'frameless' ),
-	'img_page'                => array( '1', 'pagina=$1', 'página=$1', 'pagina_$1', 'página_$1', 'page=$1', 'page $1' ),
-	'img_border'              => array( '1', 'borde', 'border' ),
-	'img_link'                => array( '1', 'vínculo=$1', 'vinculo=$1', 'enlace=$1', 'link=$1' ),
-	'sitename'                => array( '1', 'NOMBREDELSITIO', 'SITENAME' ),
-	'ns'                      => array( '0', 'EN:', 'NS:' ),
-	'localurl'                => array( '0', 'URLLOCAL', 'LOCALURL:' ),
-	'localurle'               => array( '0', 'URLLOCALC:', 'LOCALURLE:' ),
-	'server'                  => array( '0', 'SERVIDOR', 'SERVER' ),
-	'servername'              => array( '0', 'NOMBRESERVIDOR', 'SERVERNAME' ),
-	'scriptpath'              => array( '0', 'RUTASCRIPT', 'RUTADESCRIPT', 'SCRIPTPATH' ),
-	'stylepath'               => array( '0', 'RUTAESTILO', 'RUTADEESTILO', 'STYLEPATH' ),
-	'grammar'                 => array( '0', 'GRAMATICA:', 'GRAMÁTICA:', 'GRAMMAR:' ),
-	'gender'                  => array( '0', 'GÉNERO:', 'GENERO:', 'GENDER:' ),
-	'notitleconvert'          => array( '0', '__NOCONVERTIRTITULO__', '__NOCONVERTIRTÍTULO__', '__NOCT___', '__NOTITLECONVERT__', '__NOTC__' ),
-	'nocontentconvert'        => array( '0', '__NOCONVERTIRCONTENIDO__', '__NOCC___', '__NOCONTENTCONVERT__', '__NOCC__' ),
-	'currentweek'             => array( '1', 'SEMANAACTUAL', 'CURRENTWEEK' ),
-	'currentdow'              => array( '1', 'DDSACTUAL', 'DIADESEMANAACTUAL', 'DÍADESEMANAACTUAL', 'CURRENTDOW' ),
-	'localweek'               => array( '1', 'SEMANALOCAL', 'LOCALWEEK' ),
-	'localdow'                => array( '1', 'DDSLOCAL', 'DIADESEMANALOCAL', 'DÍADESEMANALOCAL', 'LOCALDOW' ),
-	'revisionid'              => array( '1', 'IDDEREVISION', 'IDREVISION', 'IDDEREVISIÓN', 'IDREVISIÓN', 'REVISIONID' ),
-	'revisionday'             => array( '1', 'DIADEREVISION', 'DIAREVISION', 'DÍADEREVISIÓN', 'DÍAREVISIÓN', 'REVISIONDAY' ),
-	'revisionday2'            => array( '1', 'DIADEREVISION2', 'DIAREVISION2', 'DÍADEREVISIÓN2', 'DÍAREVISIÓN2', 'REVISIONDAY2' ),
-	'revisionmonth'           => array( '1', 'MESDEREVISION', 'MESDEREVISIÓN', 'MESREVISION', 'MESREVISIÓN', 'REVISIONMONTH' ),
-	'revisionyear'            => array( '1', 'AÑODEREVISION', 'AÑODEREVISIÓN', 'AÑOREVISION', 'AÑOREVISIÓN', 'REVISIONYEAR' ),
-	'revisiontimestamp'       => array( '1', 'MARCADEHORADEREVISION', 'MARCADEHORADEREVISIÓN', 'REVISIONTIMESTAMP' ),
-	'revisionuser'            => array( '1', 'USUARIODEREVISION', 'USUARIODEREVISIÓN', 'REVISIONUSER' ),
-	'fullurl'                 => array( '0', 'URLCOMPLETA:', 'FULLURL:' ),
-	'fullurle'                => array( '0', 'URLCOMPLETAC:', 'FULLURLE:' ),
-	'lcfirst'                 => array( '0', 'PRIMEROMINUS;', 'PRIMEROMINÚS:', 'LCFIRST:' ),
-	'ucfirst'                 => array( '0', 'PRIMEROMAYUS;', 'PRIMEROMAYÚS:', 'UCFIRST:' ),
-	'lc'                      => array( '0', 'MINUS:', 'MINÚS:', 'LC:' ),
-	'uc'                      => array( '0', 'MAYUS:', 'MAYÚS:', 'UC:' ),
-	'displaytitle'            => array( '1', 'MOSTRARTÍTULO', 'MOSTRARTITULO', 'DISPLAYTITLE' ),
-	'newsectionlink'          => array( '1', '__VINCULARANUEVASECCION__', 'VÍNCULARANUEVASECCIÓN__', '__NEWSECTIONLINK__' ),
-	'nonewsectionlink'        => array( '1', '__NOVINCULARANUEVASECCION__', 'NOVÍNCULARANUEVASECCIÓN__', '__NONEWSECTIONLINK__' ),
-	'currentversion'          => array( '1', 'VERSIONACTUAL', 'VERSIÓNACTUAL', 'CURRENTVERSION' ),
-	'urlencode'               => array( '0', 'CODIFICARURL:', 'URLENCODE:' ),
-	'currenttimestamp'        => array( '1', 'MARCADEHORAACTUAL', 'CURRENTTIMESTAMP' ),
-	'localtimestamp'          => array( '1', 'MARCADEHORALOCAL', 'LOCALTIMESTAMP' ),
-	'language'                => array( '0', '#IDIOMA:', '#LANGUAGE:' ),
-	'contentlanguage'         => array( '1', 'IDIOMADELCONTENIDO', 'IDIOMADELCONT', 'CONTENTLANGUAGE', 'CONTENTLANG' ),
-	'numberofadmins'          => array( '1', 'NÚMEROADMINIISTRADORES', 'NÚMEROADMINS', 'NUMEROADMINS', 'NUMEROADMINISTRADORES', 'NUMERODEADMINISTRADORES', 'NUMERODEADMINS', 'NÚMERODEADMINISTRADORES', 'NÚMERODEADMINS', 'NUMBEROFADMINS' ),
-	'formatnum'               => array( '0', 'FORMATONÚMERO', 'FORMATONUMERO', 'FORMATNUM' ),
-	'special'                 => array( '0', 'especial', 'special' ),
-	'defaultsort'             => array( '1', 'ORDENAR:', 'CLAVEDEORDENPREDETERMINADO:', 'ORDENDECATEGORIAPREDETERMINADO:', 'ORDENDECATEGORÍAPREDETERMINADO:', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:' ),
-	'filepath'                => array( '0', 'RUTAARCHIVO:', 'RUTARCHIVO:', 'RUTADEARCHIVO:', 'FILEPATH:' ),
-	'tag'                     => array( '0', 'etiqueta', 'ETIQUETA', 'tag' ),
-	'hiddencat'               => array( '1', '__CATEGORÍAOCULTA__', '__HIDDENCAT__' ),
-	'pagesincategory'         => array( '1', 'PÁGINASENCATEGORÍA', 'PÁGINASENCAT', 'PAGSENCAT', 'PAGINASENCATEGORIA', 'PAGINASENCAT', 'PAGESINCATEGORY', 'PAGESINCAT' ),
-	'pagesize'                => array( '1', 'TAMAÑOPÁGINA', 'TAMAÑODEPÁGINA', 'TAMAÑOPAGINA', 'TAMAÑODEPAGINA', 'PAGESIZE' ),
-	'index'                   => array( '1', '__INDEXAR__', '__INDEX__' ),
-	'noindex'                 => array( '1', '__NOINDEXAR__', '__NOINDEX__' ),
-	'numberingroup'           => array( '1', 'NÚMEROENGRUPO', 'NUMEROENGRUPO', 'NUMENGRUPO', 'NÚMENGRUPO', 'NUMBERINGROUP', 'NUMINGROUP' ),
-	'staticredirect'          => array( '1', '__REDIRECCIONESTATICA__', '__REDIRECCIÓNESTÁTICA__', '__STATICREDIRECT__' ),
-	'protectionlevel'         => array( '1', 'NIVELDEPROTECCIÓN', 'PROTECTIONLEVEL' ),
-	'formatdate'              => array( '0', 'formatodefecha', 'formatearfecha', 'formatdate', 'dateformat' ),
+	'redirect'                  => array( '0', '#REDIRECCIÓN', '#REDIRECCION', '#REDIRECT' ),
+	'notoc'                     => array( '0', '__SIN_TDC__', '__NOTDC__', '__NOTOC__' ),
+	'nogallery'                 => array( '0', '__SIN_GALERÍA__', '__NOGALERÍA__', '__NOGALERIA__', '__NOGALLERY__' ),
+	'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' ),
+	'currentmonthnamegen'       => array( '1', 'MESACTUALGENITIVO', 'CURRENTMONTHNAMEGEN' ),
+	'currentmonthabbrev'        => array( '1', 'MESACTUALABREVIADO', 'CURRENTMONTHABBREV' ),
+	'currentday'                => array( '1', 'DÍAACTUAL', 'DIAACTUAL', 'DÍA_ACTUAL', 'DIA_ACTUAL', 'CURRENTDAY' ),
+	'currentday2'               => array( '1', 'DÍAACTUAL2', 'DIAACTUAL2', 'DÍA_ACTUAL2', 'DIA_ACTUAL2', 'CURRENTDAY2' ),
+	'currentdayname'            => array( '1', 'NOMBREDÍAACTUAL', 'NOMBREDIAACTUAL', 'CURRENTDAYNAME' ),
+	'currentyear'               => array( '1', 'AÑOACTUAL', 'AÑO_ACTUAL', 'CURRENTYEAR' ),
+	'currenttime'               => array( '1', 'HORA_MINUTOS_ACTUAL', 'HORAMINUTOSACTUAL', 'TIEMPOACTUAL', 'CURRENTTIME' ),
+	'currenthour'               => array( '1', 'HORAACTUAL', 'HORA_ACTUAL', 'CURRENTHOUR' ),
+	'localmonth'                => array( '1', 'MESLOCAL', 'MESLOCAL2', 'LOCALMONTH', 'LOCALMONTH2' ),
+	'localmonth1'               => array( '1', 'MESLOCAL1', 'LOCALMONTH1' ),
+	'localmonthname'            => array( '1', 'MESLOCALCOMPLETO', 'NOMBREMESLOCAL', 'LOCALMONTHNAME' ),
+	'localmonthnamegen'         => array( '1', 'MESLOCALGENITIVO', 'LOCALMONTHNAMEGEN' ),
+	'localmonthabbrev'          => array( '1', 'MESLOCALABREVIADO', 'LOCALMONTHABBREV' ),
+	'localday'                  => array( '1', 'DÍALOCAL', 'DIALOCAL', 'LOCALDAY' ),
+	'localday2'                 => array( '1', 'DIALOCAL2', 'DÍALOCAL2', 'LOCALDAY2' ),
+	'localdayname'              => array( '1', 'NOMBREDIALOCAL', 'NOMBREDÍALOCAL', 'LOCALDAYNAME' ),
+	'localyear'                 => array( '1', 'AÑOLOCAL', 'LOCALYEAR' ),
+	'localtime'                 => array( '1', 'HORAMINUTOSLOCAL', 'TIEMPOLOCAL', 'LOCALTIME' ),
+	'localhour'                 => array( '1', 'HORALOCAL', 'LOCALHOUR' ),
+	'numberofpages'             => array( '1', 'NÚMERODEPÁGINAS', 'NUMERODEPAGINAS', 'NUMBEROFPAGES' ),
+	'numberofarticles'          => array( '1', 'NÚMERODEARTÍCULOS', 'NUMERODEARTICULOS', 'NUMBEROFARTICLES' ),
+	'numberoffiles'             => array( '1', 'NÚMERODEARCHIVOS', 'NUMERODEARCHIVOS', 'NUMBEROFFILES' ),
+	'numberofusers'             => array( '1', 'NÚMERODEUSUARIOS', 'NUMERODEUSUARIOS', 'NUMBEROFUSERS' ),
+	'numberofactiveusers'       => array( '1', 'NÚMERODEUSUARIOSACTIVOS', 'NUMERODEUSUARIOSACTIVOS', 'NUMBEROFACTIVEUSERS' ),
+	'numberofedits'             => array( '1', 'NÚMERODEEDICIONES', 'NUMERODEEDICIONES', 'NUMBEROFEDITS' ),
+	'numberofviews'             => array( '1', 'NÚMERODEVISTAS', 'NUMERODEVISTAS', 'NUMBEROFVIEWS' ),
+	'pagename'                  => array( '1', 'NOMBREDEPAGINA', 'NOMBREDEPÁGINA', 'PAGENAME' ),
+	'pagenamee'                 => array( '1', 'NOMBREDEPAGINAC', 'NOMBREDEPÁGINAC', 'PAGENAMEE' ),
+	'namespace'                 => array( '1', 'ESPACIODENOMBRE', 'NAMESPACE' ),
+	'namespacee'                => array( '1', 'ESPACIODENOMBREC', 'NAMESPACEE' ),
+	'namespacenumber'           => array( '1', 'NÚMERODELESPACIO', 'NAMESPACENUMBER' ),
+	'talkspace'                 => array( '1', 'ESPACIODEDISCUSION', 'ESPACIODEDISCUSIÓN', 'TALKSPACE' ),
+	'talkspacee'                => array( '1', 'ESPACIODEDISCUSIONC', 'TALKSPACEE' ),
+	'subjectspace'              => array( '1', 'ESPACIODEASUNTO', 'ESPACIODETEMA', 'ESPACIODEARTÍCULO', 'ESPACIODEARTICULO', 'SUBJECTSPACE', 'ARTICLESPACE' ),
+	'subjectspacee'             => array( '1', 'ESPACIODETEMAC', 'ESPACIODEASUNTOC', 'ESPACIODEARTICULOC', 'ESPACIODEARTÍCULOC', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
+	'fullpagename'              => array( '1', 'NOMBRECOMPLETODEPÁGINA', 'NOMBRECOMPLETODEPAGINA', 'FULLPAGENAME' ),
+	'fullpagenamee'             => array( '1', 'NOMBRECOMPLETODEPAGINAC', 'NOMBRECOMPLETODEPÁGINAC', 'FULLPAGENAMEE' ),
+	'subpagename'               => array( '1', 'NOMBREDESUBPAGINA', 'NOMBREDESUBPÁGINA', 'SUBPAGENAME' ),
+	'subpagenamee'              => array( '1', 'NOMBREDESUBPAGINAC', 'NOMBREDESUBPÁGINAC', 'SUBPAGENAMEE' ),
+	'basepagename'              => array( '1', 'NOMBREDEPAGINABASE', 'NOMBREDEPÁGINABASE', 'BASEPAGENAME' ),
+	'basepagenamee'             => array( '1', 'NOMBREDEPAGINABASEC', 'NOMBREDEPÁGINABASEC', 'BASEPAGENAMEE' ),
+	'talkpagename'              => array( '1', 'NOMBREDEPÁGINADEDISCUSIÓN', 'NOMBREDEPAGINADEDISCUSION', 'NOMBREDEPAGINADISCUSION', 'NOMBREDEPÁGINADISCUSIÓN', 'TALKPAGENAME' ),
+	'talkpagenamee'             => array( '1', 'NOMBREDEPÁGINADEDISCUSIÓNC', 'NOMBREDEPAGINADEDISCUSIONC', 'NOMBREDEPAGINADISCUSIONC', 'NOMBREDEPÁGINADISCUSIÓNC', 'TALKPAGENAMEE' ),
+	'subjectpagename'           => array( '1', 'NOMBREDEPAGINADETEMA', 'NOMBREDEPÁGINADETEMA', 'NOMBREDEPÁGINADEASUNTO', 'NOMBREDEPAGINADEASUNTO', 'NOMBREDEPAGINADEARTICULO', 'NOMBREDEPÁGINADEARTÍCULO', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
+	'subjectpagenamee'          => array( '1', 'NOMBREDEPAGINADETEMAC', 'NOMBREDEPÁGINADETEMAC', 'NOMBREDEPÁGINADEASUNTOC', 'NOMBREDEPAGINADEASUNTOC', 'NOMBREDEPAGINADEARTICULOC', 'NOMBREDEPÁGINADEARTÍCULOC', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
+	'msg'                       => array( '0', 'MSJ:', 'MSG:' ),
+	'subst'                     => array( '0', 'SUST:', 'FIJAR:', 'SUBST:' ),
+	'img_thumbnail'             => array( '1', 'miniaturadeimagen', 'miniatura', 'mini', 'thumbnail', 'thumb' ),
+	'img_manualthumb'           => array( '1', 'miniaturadeimagen=$1', 'miniatura=$1', 'thumbnail=$1', 'thumb=$1' ),
+	'img_right'                 => array( '1', 'derecha', 'dcha', 'der', 'right' ),
+	'img_left'                  => array( '1', 'izquierda', 'izda', 'izq', 'left' ),
+	'img_none'                  => array( '1', 'ninguna', 'nada', 'no', 'ninguno', 'none' ),
+	'img_center'                => array( '1', 'centro', 'centrado', 'centrada', 'centrar', 'center', 'centre' ),
+	'img_framed'                => array( '1', 'marco', 'enmarcado', 'enmarcada', 'framed', 'enframed', 'frame' ),
+	'img_frameless'             => array( '1', 'sinmarco', 'sin_enmarcar', 'sinenmarcar', 'frameless' ),
+	'img_page'                  => array( '1', 'pagina=$1', 'página=$1', 'pagina_$1', 'página_$1', 'page=$1', 'page $1' ),
+	'img_border'                => array( '1', 'borde', 'border' ),
+	'img_link'                  => array( '1', 'vínculo=$1', 'vinculo=$1', 'enlace=$1', 'link=$1' ),
+	'sitename'                  => array( '1', 'NOMBREDELSITIO', 'SITENAME' ),
+	'ns'                        => array( '0', 'EN:', 'NS:' ),
+	'localurl'                  => array( '0', 'URLLOCAL', 'LOCALURL:' ),
+	'localurle'                 => array( '0', 'URLLOCALC:', 'LOCALURLE:' ),
+	'server'                    => array( '0', 'SERVIDOR', 'SERVER' ),
+	'servername'                => array( '0', 'NOMBRESERVIDOR', 'SERVERNAME' ),
+	'scriptpath'                => array( '0', 'RUTASCRIPT', 'RUTADESCRIPT', 'SCRIPTPATH' ),
+	'stylepath'                 => array( '0', 'RUTAESTILO', 'RUTADEESTILO', 'STYLEPATH' ),
+	'grammar'                   => array( '0', 'GRAMATICA:', 'GRAMÁTICA:', 'GRAMMAR:' ),
+	'gender'                    => array( '0', 'GÉNERO:', 'GENERO:', 'GENDER:' ),
+	'notitleconvert'            => array( '0', '__NOCONVERTIRTITULO__', '__NOCONVERTIRTÍTULO__', '__NOCT___', '__NOTITLECONVERT__', '__NOTC__' ),
+	'nocontentconvert'          => array( '0', '__NOCONVERTIRCONTENIDO__', '__NOCC___', '__NOCONTENTCONVERT__', '__NOCC__' ),
+	'currentweek'               => array( '1', 'SEMANAACTUAL', 'CURRENTWEEK' ),
+	'currentdow'                => array( '1', 'DDSACTUAL', 'DIADESEMANAACTUAL', 'DÍADESEMANAACTUAL', 'CURRENTDOW' ),
+	'localweek'                 => array( '1', 'SEMANALOCAL', 'LOCALWEEK' ),
+	'localdow'                  => array( '1', 'DDSLOCAL', 'DIADESEMANALOCAL', 'DÍADESEMANALOCAL', 'LOCALDOW' ),
+	'revisionid'                => array( '1', 'IDDEREVISION', 'IDREVISION', 'IDDEREVISIÓN', 'IDREVISIÓN', 'REVISIONID' ),
+	'revisionday'               => array( '1', 'DIADEREVISION', 'DIAREVISION', 'DÍADEREVISIÓN', 'DÍAREVISIÓN', 'REVISIONDAY' ),
+	'revisionday2'              => array( '1', 'DIADEREVISION2', 'DIAREVISION2', 'DÍADEREVISIÓN2', 'DÍAREVISIÓN2', 'REVISIONDAY2' ),
+	'revisionmonth'             => array( '1', 'MESDEREVISION', 'MESDEREVISIÓN', 'MESREVISION', 'MESREVISIÓN', 'REVISIONMONTH' ),
+	'revisionyear'              => array( '1', 'AÑODEREVISION', 'AÑODEREVISIÓN', 'AÑOREVISION', 'AÑOREVISIÓN', 'REVISIONYEAR' ),
+	'revisiontimestamp'         => array( '1', 'MARCADEHORADEREVISION', 'MARCADEHORADEREVISIÓN', 'REVISIONTIMESTAMP' ),
+	'revisionuser'              => array( '1', 'USUARIODEREVISION', 'USUARIODEREVISIÓN', 'REVISIONUSER' ),
+	'fullurl'                   => array( '0', 'URLCOMPLETA:', 'FULLURL:' ),
+	'fullurle'                  => array( '0', 'URLCOMPLETAC:', 'FULLURLE:' ),
+	'canonicalurl'              => array( '0', 'URLCANONICA:', 'CANONICALURL:' ),
+	'canonicalurle'             => array( '0', 'URLCANONICAC:', 'CANONICALURLE:' ),
+	'lcfirst'                   => array( '0', 'PRIMEROMINUS;', 'PRIMEROMINÚS:', 'LCFIRST:' ),
+	'ucfirst'                   => array( '0', 'PRIMEROMAYUS;', 'PRIMEROMAYÚS:', 'UCFIRST:' ),
+	'lc'                        => array( '0', 'MINUS:', 'MINÚS:', 'LC:' ),
+	'uc'                        => array( '0', 'MAYUS:', 'MAYÚS:', 'UC:' ),
+	'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__' ),
+	'currentversion'            => array( '1', 'VERSIONACTUAL', 'VERSIÓNACTUAL', 'CURRENTVERSION' ),
+	'urlencode'                 => array( '0', 'CODIFICARURL:', 'URLENCODE:' ),
+	'currenttimestamp'          => array( '1', 'MARCADEHORAACTUAL', 'CURRENTTIMESTAMP' ),
+	'localtimestamp'            => array( '1', 'MARCADEHORALOCAL', 'LOCALTIMESTAMP' ),
+	'language'                  => array( '0', '#IDIOMA:', '#LANGUAGE:' ),
+	'contentlanguage'           => array( '1', 'IDIOMADELCONTENIDO', 'IDIOMADELCONT', 'CONTENTLANGUAGE', 'CONTENTLANG' ),
+	'pagesinnamespace'          => array( '1', 'PÁGINASENESPACIO', 'PAGESINNAMESPACE:', 'PAGESINNS:' ),
+	'numberofadmins'            => array( '1', 'NÚMEROADMINIISTRADORES', 'NÚMEROADMINS', 'NUMEROADMINS', 'NUMEROADMINISTRADORES', 'NUMERODEADMINISTRADORES', 'NUMERODEADMINS', 'NÚMERODEADMINISTRADORES', 'NÚMERODEADMINS', 'NUMBEROFADMINS' ),
+	'formatnum'                 => array( '0', 'FORMATONÚMERO', 'FORMATONUMERO', 'FORMATNUM' ),
+	'special'                   => array( '0', 'especial', 'special' ),
+	'defaultsort'               => array( '1', 'ORDENAR:', 'CLAVEDEORDENPREDETERMINADO:', 'ORDENDECATEGORIAPREDETERMINADO:', 'ORDENDECATEGORÍAPREDETERMINADO:', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:' ),
+	'filepath'                  => array( '0', 'RUTAARCHIVO:', 'RUTARCHIVO:', 'RUTADEARCHIVO:', 'FILEPATH:' ),
+	'tag'                       => array( '0', 'etiqueta', 'tag' ),
+	'hiddencat'                 => array( '1', '__CATEGORÍAOCULTA__', '__HIDDENCAT__' ),
+	'pagesincategory'           => array( '1', 'PÁGINASENCATEGORÍA', 'PÁGINASENCAT', 'PAGSENCAT', 'PAGINASENCATEGORIA', 'PAGINASENCAT', 'PAGESINCATEGORY', 'PAGESINCAT' ),
+	'pagesize'                  => array( '1', 'TAMAÑOPÁGINA', 'TAMAÑODEPÁGINA', 'TAMAÑOPAGINA', 'TAMAÑODEPAGINA', 'PAGESIZE' ),
+	'index'                     => array( '1', '__INDEXAR__', '__INDEX__' ),
+	'noindex'                   => array( '1', '__NOINDEXAR__', '__NOINDEX__' ),
+	'numberingroup'             => array( '1', 'NÚMEROENGRUPO', 'NUMEROENGRUPO', 'NUMENGRUPO', 'NÚMENGRUPO', 'NUMBERINGROUP', 'NUMINGROUP' ),
+	'staticredirect'            => array( '1', '__REDIRECCIONESTATICA__', '__REDIRECCIÓNESTÁTICA__', '__STATICREDIRECT__' ),
+	'protectionlevel'           => array( '1', 'NIVELDEPROTECCIÓN', 'PROTECTIONLEVEL' ),
+	'formatdate'                => array( '0', 'formatodefecha', 'formatearfecha', 'formatdate', 'dateformat' ),
 );
 
 $datePreferences = false;
@@ -987,10 +996,10 @@ La razón dada es esta:
 
 Puedes contactar con $1 o con otro de los [[{{MediaWiki:Grouppage-sysop}}|administradores]] para discutir el bloqueo.
 
-Ten en cuenta de que no podrás utilizar la herramienta de «enviar correo electrónico a este usuario»  a menos que tengas una dirección de correo electrónico válida registrada en tus [[Special:Preferences|preferencias de usuario]] y que el bloqueo no haya inhabilitado esta función.
+Ten en cuenta que no podrás utilizar la herramienta de «enviar correo electrónico a este usuario» a menos que tengas una dirección de correo electrónico válida registrada en tus [[Special:Preferences|preferencias de usuario]] y que el bloqueo no haya inhabilitado esta función.
 
 Tu actual dirección IP es $3, y el identificador del bloqueo es #$5.
-Por favor incluye todos los datos aquí mostrados en cualquier consulta que hagas.",
+Por favor, incluye todos los datos mostrados aquí en cualquier consulta que hagas.",
 'blockednoreason' => 'no se ha especificado el motivo',
 'whitelistedittext' => 'Tienes que $1 para editar artículos.',
 'confirmedittext' => 'Debes confirmar tu dirección electrónica antes de editar páginas. Por favor, establece y valida una dirección electrónica a través de tus [[Special:Preferences|preferencias de usuario]].',
@@ -2822,7 +2831,7 @@ por favor, asegúrate de entender las consecuencias del procedimiento antes de s
 
 En estos casos, deberás trasladar manualmente el contenido de la página de discusión.",
 'movearticle' => 'Renombrar página',
-'moveuserpage-warning' => "'''Aviso:''' estás a punto de mover una página de usuario. Ten en cuenta de que solo la página será trasladada pero el usuario '''no''' será renombrado.",
+'moveuserpage-warning' => "'''Aviso:''' estás a punto de mover una página de usuario. Ten en cuenta que solo será trasladada la página; el usuario '''no''' será renombrado.",
 'movenologin' => 'No has iniciado sesión',
 'movenologintext' => 'Es necesario ser usuario registrado y [[Special:UserLogin|haber iniciado sesión]] para renombrar una página.',
 'movenotallowed' => 'No tienes permiso para mover páginas.',
@@ -3162,7 +3171,7 @@ Esto podría estar causado por un enlace a un sitio externo incluido en la lista
 'pageinfo-authors' => 'Número total de autores distintos',
 'pageinfo-recent-edits' => 'Número de ediciones recientes (en los últimos $1)',
 'pageinfo-recent-authors' => 'Número de autores distintos recientes',
-'pageinfo-restriction' => 'Protección de la página (<code>$1</code>)',
+'pageinfo-restriction' => 'Protección de la página (<code>{{lcfirst:$1}}</code>)',
 'pageinfo-magic-words' => '{{PLURAL:$1|Palabra mágica|Palabras mágicas}} ($1)',
 'pageinfo-hidden-categories' => '{{PLURAL:$1|Categoría oculta|Categorías ocultas}} ($1)',
 'pageinfo-templates' => '{{PLURAL:$1|plantilla incluida|plantillas incluidas}} ($1)',
diff --git a/languages/messages/MessagesEt.php b/languages/messages/MessagesEt.php
index edc9ffdb32..0c18a34413 100644
--- a/languages/messages/MessagesEt.php
+++ b/languages/messages/MessagesEt.php
@@ -105,6 +105,7 @@ $specialPageAliases = array(
 	'Newimages'                 => array( 'Uued_failid' ),
 	'Newpages'                  => array( 'Uued_leheküljed' ),
 	'PasswordReset'             => array( 'Parooli_lähtestamine' ),
+	'PermanentLink'             => array( 'Püsilink' ),
 	'Popularpages'              => array( 'Loetumad_leheküljed' ),
 	'Preferences'               => array( 'Eelistused' ),
 	'Prefixindex'               => array( 'Kõik_pealkirjad_eesliitega' ),
@@ -158,99 +159,99 @@ $bookstoreList = array(
 );
 
 $magicWords = array(
-	'redirect'                => array( '0', '#suuna', '#REDIRECT' ),
-	'notoc'                   => array( '0', '__SISUKORRATA__', '__NOTOC__' ),
-	'nogallery'               => array( '0', '__GALERIITA__', '__NOGALLERY__' ),
-	'forcetoc'                => array( '0', '__SISUKORDEES__', '__FORCETOC__' ),
-	'toc'                     => array( '0', '__SISUKORD__', '__TOC__' ),
-	'noeditsection'           => array( '0', '__ALAOSALINGITA__', '__NOEDITSECTION__' ),
-	'currentmonth'            => array( '1', 'HETKEKUU', 'CURRENTMONTH', 'CURRENTMONTH2' ),
-	'currentmonth1'           => array( '1', 'HETKEKUU1', 'CURRENTMONTH1' ),
-	'currentmonthname'        => array( '1', 'HETKEKUUNIMETUS', 'CURRENTMONTHNAME' ),
-	'currentday'              => array( '1', 'HETKEKUUPÄEV', 'CURRENTDAY' ),
-	'currentday2'             => array( '1', 'HETKEKUUPÄEV2', 'CURRENTDAY2' ),
-	'currentdayname'          => array( '1', 'HETKENÄDALAPÄEV', 'CURRENTDAYNAME' ),
-	'currentyear'             => array( '1', 'HETKEAASTA', 'CURRENTYEAR' ),
-	'currenttime'             => array( '1', 'HETKEAEG', 'CURRENTTIME' ),
-	'currenthour'             => array( '1', 'HETKETUND', 'CURRENTHOUR' ),
-	'localmonth'              => array( '1', 'KOHALIKKUU', 'LOCALMONTH', 'LOCALMONTH2' ),
-	'localmonth1'             => array( '1', 'KOHALIKKUU1', 'LOCALMONTH1' ),
-	'localmonthname'          => array( '1', 'KOHALIKKUUNIMETUS', 'LOCALMONTHNAME' ),
-	'localday'                => array( '1', 'KOHALIKKUUPÄEV', 'LOCALDAY' ),
-	'localday2'               => array( '1', 'KOHALIKKUUPÄEV2', 'LOCALDAY2' ),
-	'localdayname'            => array( '1', 'KOHALIKNÄDALAPÄEV', 'LOCALDAYNAME' ),
-	'localyear'               => array( '1', 'KOHALIKAASTA', 'LOCALYEAR' ),
-	'localtime'               => array( '1', 'KOHALIKAEG', 'LOCALTIME' ),
-	'localhour'               => array( '1', 'KOHALIKTUND', 'LOCALHOUR' ),
-	'numberofpages'           => array( '1', 'LEHEMÄÄR', 'NUMBEROFPAGES' ),
-	'numberofarticles'        => array( '1', 'ARTIKLIMÄÄR', 'NUMBEROFARTICLES' ),
-	'numberoffiles'           => array( '1', 'FAILIMÄÄR', 'NUMBEROFFILES' ),
-	'numberofusers'           => array( '1', 'KASUTAJAMÄÄR', 'NUMBEROFUSERS' ),
-	'numberofactiveusers'     => array( '1', 'TEGUSKASUTAJAMÄÄR', 'NUMBEROFACTIVEUSERS' ),
-	'numberofedits'           => array( '1', 'REDIGEERIMISMÄÄR', 'NUMBEROFEDITS' ),
-	'numberofviews'           => array( '1', 'VAATAMISTEARV', 'NUMBEROFVIEWS' ),
-	'pagename'                => array( '1', 'LEHEKÜLJENIMI', 'PAGENAME' ),
-	'pagenamee'               => array( '1', 'LEHEKÜLJENIMI1', 'PAGENAMEE' ),
-	'namespace'               => array( '1', 'NIMERUUM', 'NAMESPACE' ),
-	'namespacee'              => array( '1', 'NIMERUUM1', 'NAMESPACEE' ),
-	'talkspace'               => array( '1', 'ARUTELUNIMERUUM', 'TALKSPACE' ),
-	'talkspacee'              => array( '1', 'ARUTELUNIMERUUM1', 'TALKSPACEE' ),
-	'subjectspace'            => array( '1', 'SISUNIMERUUM', 'SUBJECTSPACE', 'ARTICLESPACE' ),
-	'subjectspacee'           => array( '1', 'SISUNIMERUUM1', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
-	'fullpagename'            => array( '1', 'KOGULEHEKÜLJENIMI', 'FULLPAGENAME' ),
-	'fullpagenamee'           => array( '1', 'KOGULEHEKÜLJENIMI1', 'FULLPAGENAMEE' ),
-	'subpagename'             => array( '1', 'ALAMLEHEKÜLJENIMI', 'SUBPAGENAME' ),
-	'subpagenamee'            => array( '1', 'ALAMLEHEKÜLJENIMI1', 'SUBPAGENAMEE' ),
-	'basepagename'            => array( '1', 'NIMERUUMITANIMI', 'BASEPAGENAME' ),
-	'basepagenamee'           => array( '1', 'NIMERUUMITANIMI1', 'BASEPAGENAMEE' ),
-	'talkpagename'            => array( '1', 'ARUTELUNIMI', 'TALKPAGENAME' ),
-	'talkpagenamee'           => array( '1', 'ARUTELUNIMI1', 'TALKPAGENAMEE' ),
-	'subst'                   => array( '0', 'ASENDA:', 'SUBST:' ),
-	'img_thumbnail'           => array( '1', 'pisi', 'pisipilt', 'thumbnail', 'thumb' ),
-	'img_manualthumb'         => array( '1', 'pisi=$1', 'pisipilt=$1', 'thumbnail=$1', 'thumb=$1' ),
-	'img_right'               => array( '1', 'paremal', 'right' ),
-	'img_left'                => array( '1', 'vasakul', 'left' ),
-	'img_none'                => array( '1', 'tühi', 'none' ),
-	'img_center'              => array( '1', 'keskel', 'center', 'centre' ),
-	'img_framed'              => array( '1', 'raam', 'framed', 'enframed', 'frame' ),
-	'img_frameless'           => array( '1', 'raamita', 'frameless' ),
-	'img_page'                => array( '1', 'lehekülg=$1', 'lehekülg_$1', 'page=$1', 'page $1' ),
-	'img_border'              => array( '1', 'ääris', 'border' ),
-	'sitename'                => array( '1', 'KOHANIMI', 'SITENAME' ),
-	'ns'                      => array( '0', 'NR:', 'NS:' ),
-	'nse'                     => array( '0', 'NR1:', 'NSE:' ),
-	'localurl'                => array( '0', 'KOHALIKURL', 'LOCALURL:' ),
-	'localurle'               => array( '0', 'KOHALIKURL1', 'LOCALURLE:' ),
-	'servername'              => array( '0', 'SERVERINIMI', 'SERVERNAME' ),
-	'gender'                  => array( '0', 'SUGU:', 'GENDER:' ),
-	'currentweek'             => array( '1', 'HETKENÄDAL', 'CURRENTWEEK' ),
-	'currentdow'              => array( '1', 'HETKENÄDALAPÄEV1', 'CURRENTDOW' ),
-	'localweek'               => array( '1', 'KOHALIKNÄDAL', 'LOCALWEEK' ),
-	'localdow'                => array( '1', 'KOHALIKNÄDALAPÄEV1', 'LOCALDOW' ),
-	'fullurl'                 => array( '0', 'KOGUURL:', 'FULLURL:' ),
-	'fullurle'                => array( '0', 'KOGUURL1:', 'FULLURLE:' ),
-	'lcfirst'                 => array( '0', 'ESIVT:', 'LCFIRST:' ),
-	'ucfirst'                 => array( '0', 'ESIST:', 'UCFIRST:' ),
-	'lc'                      => array( '0', 'VT:', 'LC:' ),
-	'uc'                      => array( '0', 'ST:', 'UC:' ),
-	'displaytitle'            => array( '1', 'PEALKIRI', 'DISPLAYTITLE' ),
-	'newsectionlink'          => array( '1', '__UUEALAOSALINK__', '__NEWSECTIONLINK__' ),
-	'nonewsectionlink'        => array( '1', '__UUEALAOSALINGITA__', '__NONEWSECTIONLINK__' ),
-	'currenttimestamp'        => array( '1', 'HETKEAJATEMPEL', 'CURRENTTIMESTAMP' ),
-	'localtimestamp'          => array( '1', 'KOHALIKAJATEMPEL', 'LOCALTIMESTAMP' ),
-	'language'                => array( '0', '#KEEL:', '#LANGUAGE:' ),
-	'contentlanguage'         => array( '1', 'VAIKEKEEL', 'CONTENTLANGUAGE', 'CONTENTLANG' ),
-	'pagesinnamespace'        => array( '1', 'LEHEKÜLGINIMERUUMIS', 'PAGESINNAMESPACE:', 'PAGESINNS:' ),
-	'numberofadmins'          => array( '1', 'ÜLEMAMÄÄR', 'NUMBEROFADMINS' ),
-	'formatnum'               => array( '0', 'ARVUVORMINDUS', 'FORMATNUM' ),
-	'defaultsort'             => array( '1', 'JÄRJESTA:', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:' ),
-	'hiddencat'               => array( '1', '__PEIDETUDKAT__', '__HIDDENCAT__' ),
-	'pagesincategory'         => array( '1', 'LEHEKÜLGIKATEGOORIAS', 'PAGESINCATEGORY', 'PAGESINCAT' ),
-	'index'                   => array( '1', 'INDEKSIGA', '__INDEX__' ),
-	'noindex'                 => array( '1', 'INDEKSITA', '__NOINDEX__' ),
-	'numberingroup'           => array( '1', 'KASUTAJAIDRÜHMAS', 'NUMBERINGROUP', 'NUMINGROUP' ),
-	'protectionlevel'         => array( '1', 'KAITSETASE', 'PROTECTIONLEVEL' ),
-	'formatdate'              => array( '0', 'kuupäevavormindus', 'formatdate', 'dateformat' ),
+	'redirect'                  => array( '0', '#suuna', '#REDIRECT' ),
+	'notoc'                     => array( '0', '__SISUKORRATA__', '__NOTOC__' ),
+	'nogallery'                 => array( '0', '__GALERIITA__', '__NOGALLERY__' ),
+	'forcetoc'                  => array( '0', '__SISUKORDEES__', '__FORCETOC__' ),
+	'toc'                       => array( '0', '__SISUKORD__', '__TOC__' ),
+	'noeditsection'             => array( '0', '__ALAOSALINGITA__', '__NOEDITSECTION__' ),
+	'currentmonth'              => array( '1', 'HETKEKUU', 'CURRENTMONTH', 'CURRENTMONTH2' ),
+	'currentmonth1'             => array( '1', 'HETKEKUU1', 'CURRENTMONTH1' ),
+	'currentmonthname'          => array( '1', 'HETKEKUUNIMETUS', 'CURRENTMONTHNAME' ),
+	'currentday'                => array( '1', 'HETKEKUUPÄEV', 'CURRENTDAY' ),
+	'currentday2'               => array( '1', 'HETKEKUUPÄEV2', 'CURRENTDAY2' ),
+	'currentdayname'            => array( '1', 'HETKENÄDALAPÄEV', 'CURRENTDAYNAME' ),
+	'currentyear'               => array( '1', 'HETKEAASTA', 'CURRENTYEAR' ),
+	'currenttime'               => array( '1', 'HETKEAEG', 'CURRENTTIME' ),
+	'currenthour'               => array( '1', 'HETKETUND', 'CURRENTHOUR' ),
+	'localmonth'                => array( '1', 'KOHALIKKUU', 'LOCALMONTH', 'LOCALMONTH2' ),
+	'localmonth1'               => array( '1', 'KOHALIKKUU1', 'LOCALMONTH1' ),
+	'localmonthname'            => array( '1', 'KOHALIKKUUNIMETUS', 'LOCALMONTHNAME' ),
+	'localday'                  => array( '1', 'KOHALIKKUUPÄEV', 'LOCALDAY' ),
+	'localday2'                 => array( '1', 'KOHALIKKUUPÄEV2', 'LOCALDAY2' ),
+	'localdayname'              => array( '1', 'KOHALIKNÄDALAPÄEV', 'LOCALDAYNAME' ),
+	'localyear'                 => array( '1', 'KOHALIKAASTA', 'LOCALYEAR' ),
+	'localtime'                 => array( '1', 'KOHALIKAEG', 'LOCALTIME' ),
+	'localhour'                 => array( '1', 'KOHALIKTUND', 'LOCALHOUR' ),
+	'numberofpages'             => array( '1', 'LEHEMÄÄR', 'NUMBEROFPAGES' ),
+	'numberofarticles'          => array( '1', 'ARTIKLIMÄÄR', 'NUMBEROFARTICLES' ),
+	'numberoffiles'             => array( '1', 'FAILIMÄÄR', 'NUMBEROFFILES' ),
+	'numberofusers'             => array( '1', 'KASUTAJAMÄÄR', 'NUMBEROFUSERS' ),
+	'numberofactiveusers'       => array( '1', 'TEGUSKASUTAJAMÄÄR', 'NUMBEROFACTIVEUSERS' ),
+	'numberofedits'             => array( '1', 'REDIGEERIMISMÄÄR', 'NUMBEROFEDITS' ),
+	'numberofviews'             => array( '1', 'VAATAMISTEARV', 'NUMBEROFVIEWS' ),
+	'pagename'                  => array( '1', 'LEHEKÜLJENIMI', 'PAGENAME' ),
+	'pagenamee'                 => array( '1', 'LEHEKÜLJENIMI1', 'PAGENAMEE' ),
+	'namespace'                 => array( '1', 'NIMERUUM', 'NAMESPACE' ),
+	'namespacee'                => array( '1', 'NIMERUUM1', 'NAMESPACEE' ),
+	'talkspace'                 => array( '1', 'ARUTELUNIMERUUM', 'TALKSPACE' ),
+	'talkspacee'                => array( '1', 'ARUTELUNIMERUUM1', 'TALKSPACEE' ),
+	'subjectspace'              => array( '1', 'SISUNIMERUUM', 'SUBJECTSPACE', 'ARTICLESPACE' ),
+	'subjectspacee'             => array( '1', 'SISUNIMERUUM1', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
+	'fullpagename'              => array( '1', 'KOGULEHEKÜLJENIMI', 'FULLPAGENAME' ),
+	'fullpagenamee'             => array( '1', 'KOGULEHEKÜLJENIMI1', 'FULLPAGENAMEE' ),
+	'subpagename'               => array( '1', 'ALAMLEHEKÜLJENIMI', 'SUBPAGENAME' ),
+	'subpagenamee'              => array( '1', 'ALAMLEHEKÜLJENIMI1', 'SUBPAGENAMEE' ),
+	'basepagename'              => array( '1', 'NIMERUUMITANIMI', 'BASEPAGENAME' ),
+	'basepagenamee'             => array( '1', 'NIMERUUMITANIMI1', 'BASEPAGENAMEE' ),
+	'talkpagename'              => array( '1', 'ARUTELUNIMI', 'TALKPAGENAME' ),
+	'talkpagenamee'             => array( '1', 'ARUTELUNIMI1', 'TALKPAGENAMEE' ),
+	'subst'                     => array( '0', 'ASENDA:', 'SUBST:' ),
+	'img_thumbnail'             => array( '1', 'pisi', 'pisipilt', 'thumbnail', 'thumb' ),
+	'img_manualthumb'           => array( '1', 'pisi=$1', 'pisipilt=$1', 'thumbnail=$1', 'thumb=$1' ),
+	'img_right'                 => array( '1', 'paremal', 'right' ),
+	'img_left'                  => array( '1', 'vasakul', 'left' ),
+	'img_none'                  => array( '1', 'tühi', 'none' ),
+	'img_center'                => array( '1', 'keskel', 'center', 'centre' ),
+	'img_framed'                => array( '1', 'raam', 'framed', 'enframed', 'frame' ),
+	'img_frameless'             => array( '1', 'raamita', 'frameless' ),
+	'img_page'                  => array( '1', 'lehekülg=$1', 'lehekülg_$1', 'page=$1', 'page $1' ),
+	'img_border'                => array( '1', 'ääris', 'border' ),
+	'sitename'                  => array( '1', 'KOHANIMI', 'SITENAME' ),
+	'ns'                        => array( '0', 'NR:', 'NS:' ),
+	'nse'                       => array( '0', 'NR1:', 'NSE:' ),
+	'localurl'                  => array( '0', 'KOHALIKURL', 'LOCALURL:' ),
+	'localurle'                 => array( '0', 'KOHALIKURL1', 'LOCALURLE:' ),
+	'servername'                => array( '0', 'SERVERINIMI', 'SERVERNAME' ),
+	'gender'                    => array( '0', 'SUGU:', 'GENDER:' ),
+	'currentweek'               => array( '1', 'HETKENÄDAL', 'CURRENTWEEK' ),
+	'currentdow'                => array( '1', 'HETKENÄDALAPÄEV1', 'CURRENTDOW' ),
+	'localweek'                 => array( '1', 'KOHALIKNÄDAL', 'LOCALWEEK' ),
+	'localdow'                  => array( '1', 'KOHALIKNÄDALAPÄEV1', 'LOCALDOW' ),
+	'fullurl'                   => array( '0', 'KOGUURL:', 'FULLURL:' ),
+	'fullurle'                  => array( '0', 'KOGUURL1:', 'FULLURLE:' ),
+	'lcfirst'                   => array( '0', 'ESIVT:', 'LCFIRST:' ),
+	'ucfirst'                   => array( '0', 'ESIST:', 'UCFIRST:' ),
+	'lc'                        => array( '0', 'VT:', 'LC:' ),
+	'uc'                        => array( '0', 'ST:', 'UC:' ),
+	'displaytitle'              => array( '1', 'PEALKIRI', 'DISPLAYTITLE' ),
+	'newsectionlink'            => array( '1', '__UUEALAOSALINK__', '__NEWSECTIONLINK__' ),
+	'nonewsectionlink'          => array( '1', '__UUEALAOSALINGITA__', '__NONEWSECTIONLINK__' ),
+	'currenttimestamp'          => array( '1', 'HETKEAJATEMPEL', 'CURRENTTIMESTAMP' ),
+	'localtimestamp'            => array( '1', 'KOHALIKAJATEMPEL', 'LOCALTIMESTAMP' ),
+	'language'                  => array( '0', '#KEEL:', '#LANGUAGE:' ),
+	'contentlanguage'           => array( '1', 'VAIKEKEEL', 'CONTENTLANGUAGE', 'CONTENTLANG' ),
+	'pagesinnamespace'          => array( '1', 'LEHEKÜLGINIMERUUMIS', 'PAGESINNAMESPACE:', 'PAGESINNS:' ),
+	'numberofadmins'            => array( '1', 'ÜLEMAMÄÄR', 'NUMBEROFADMINS' ),
+	'formatnum'                 => array( '0', 'ARVUVORMINDUS', 'FORMATNUM' ),
+	'defaultsort'               => array( '1', 'JÄRJESTA:', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:' ),
+	'hiddencat'                 => array( '1', '__PEIDETUDKAT__', '__HIDDENCAT__' ),
+	'pagesincategory'           => array( '1', 'LEHEKÜLGIKATEGOORIAS', 'PAGESINCATEGORY', 'PAGESINCAT' ),
+	'index'                     => array( '1', 'INDEKSIGA', '__INDEX__' ),
+	'noindex'                   => array( '1', 'INDEKSITA', '__NOINDEX__' ),
+	'numberingroup'             => array( '1', 'KASUTAJAIDRÜHMAS', 'NUMBERINGROUP', 'NUMINGROUP' ),
+	'protectionlevel'           => array( '1', 'KAITSETASE', 'PROTECTIONLEVEL' ),
+	'formatdate'                => array( '0', 'kuupäevavormindus', 'formatdate', 'dateformat' ),
 );
 
 $separatorTransformTable = array( ',' => "\xc2\xa0", '.' => ',' );
@@ -3046,7 +3047,7 @@ See on ilmselt põhjustatud linkimisest mustas nimekirjas olevasse välisvõrguk
 'pageinfo-authors' => 'Erinevate autorite koguarv',
 'pageinfo-recent-edits' => 'Viimaste redigeerimiste arv (viimase $1 jooksul)',
 'pageinfo-recent-authors' => 'Erinevate viimaste toimetajate arv',
-'pageinfo-restriction' => 'Lehekülje kaitse (<code>$1</code>)',
+'pageinfo-restriction' => 'Lehekülje kaitse (<code>{{lcfirst:$1}}</code>)',
 'pageinfo-magic-words' => '{{PLURAL:$1|Võlusõna|Võlusõnad}} ($1)',
 'pageinfo-hidden-categories' => 'Peidetud {{PLURAL:$1|kategooria|kategooriad}} ($1)',
 'pageinfo-templates' => 'Kasutatud {{PLURAL:$1|mall|mallid}} ($1)',
diff --git a/languages/messages/MessagesEu.php b/languages/messages/MessagesEu.php
index 84836f38a7..fde8589ea8 100644
--- a/languages/messages/MessagesEu.php
+++ b/languages/messages/MessagesEu.php
@@ -104,22 +104,22 @@ $specialPageAliases = array(
 );
 
 $magicWords = array(
-	'redirect'                => array( '0', '#BIRZUZENDU', '#REDIRECT' ),
-	'currentmonth'            => array( '1', 'ORAINGOHILABETE', 'CURRENTMONTH', 'CURRENTMONTH2' ),
-	'currentmonthname'        => array( '1', 'ORAINGOHILABETEIZEN', 'CURRENTMONTHNAME' ),
-	'currentday'              => array( '1', 'ORAINGOEGUN', 'CURRENTDAY' ),
-	'currentday2'             => array( '1', 'ORAINGOEGUN2', 'CURRENTDAY2' ),
-	'currentdayname'          => array( '1', 'ORAINGOEGUNIZEN', 'CURRENTDAYNAME' ),
-	'currentyear'             => array( '1', 'ORAINGOURTE', 'CURRENTYEAR' ),
-	'numberofpages'           => array( '1', 'ORRIALDEKOPURU', 'NUMBEROFPAGES' ),
-	'numberofarticles'        => array( '1', 'ARTIKULUKOPURU', 'NUMBEROFARTICLES' ),
-	'numberoffiles'           => array( '1', 'FITXATEGIKOPURU', 'NUMBEROFFILES' ),
-	'numberofusers'           => array( '1', 'LANKIDEKOPURU', 'NUMBEROFUSERS' ),
-	'numberofedits'           => array( '1', 'ALDAKETAKOPURU', 'NUMBEROFEDITS' ),
-	'pagename'                => array( '1', 'ORRIALDEIZEN', 'PAGENAME' ),
-	'img_right'               => array( '1', 'eskuinera', 'right' ),
-	'img_left'                => array( '1', 'ezkerrera', 'left' ),
-	'img_center'              => array( '1', 'erdian', 'center', 'centre' ),
+	'redirect'                  => array( '0', '#BIRZUZENDU', '#REDIRECT' ),
+	'currentmonth'              => array( '1', 'ORAINGOHILABETE', 'CURRENTMONTH', 'CURRENTMONTH2' ),
+	'currentmonthname'          => array( '1', 'ORAINGOHILABETEIZEN', 'CURRENTMONTHNAME' ),
+	'currentday'                => array( '1', 'ORAINGOEGUN', 'CURRENTDAY' ),
+	'currentday2'               => array( '1', 'ORAINGOEGUN2', 'CURRENTDAY2' ),
+	'currentdayname'            => array( '1', 'ORAINGOEGUNIZEN', 'CURRENTDAYNAME' ),
+	'currentyear'               => array( '1', 'ORAINGOURTE', 'CURRENTYEAR' ),
+	'numberofpages'             => array( '1', 'ORRIALDEKOPURU', 'NUMBEROFPAGES' ),
+	'numberofarticles'          => array( '1', 'ARTIKULUKOPURU', 'NUMBEROFARTICLES' ),
+	'numberoffiles'             => array( '1', 'FITXATEGIKOPURU', 'NUMBEROFFILES' ),
+	'numberofusers'             => array( '1', 'LANKIDEKOPURU', 'NUMBEROFUSERS' ),
+	'numberofedits'             => array( '1', 'ALDAKETAKOPURU', 'NUMBEROFEDITS' ),
+	'pagename'                  => array( '1', 'ORRIALDEIZEN', 'PAGENAME' ),
+	'img_right'                 => array( '1', 'eskuinera', 'right' ),
+	'img_left'                  => array( '1', 'ezkerrera', 'left' ),
+	'img_center'                => array( '1', 'erdian', 'center', 'centre' ),
 );
 
 $separatorTransformTable = array( ',' => '.', '.' => ',' ); /* Bug 15717 */
@@ -132,7 +132,7 @@ $messages = array(
 'tog-hidepatrolled' => 'Ezkutatu patruilatutako aldaketa azken aldaketetan',
 'tog-newpageshidepatrolled' => 'Ezkutatu patruilatutako orriak, orri-zerrenda berritik',
 'tog-extendwatchlist' => 'Jarraipen-zerrenda zabaldu aldaketa guztiak ikusteko, ez bakarrik azken aldaketak',
-'tog-usenewrc' => 'Hobetutako azken aldaketak (JavaScript behar da)',
+'tog-usenewrc' => 'Azken aldaketetan eta jarraipen-zerrendan aldaketak orrialdearen arabera taldekatu (JavaScript behar da)',
 'tog-numberheadings' => 'Goiburukoak automatikoki zenbakitu',
 'tog-showtoolbar' => 'Aldaketen tresna-barra erakutsi (JavaScript)',
 'tog-editondblclick' => 'Klik bikoitzaren bitartez orrialdeak aldatu (JavaScript)',
@@ -140,17 +140,17 @@ $messages = array(
 'tog-editsectiononrightclick' => 'Atalen izenburuetan klik eginez atala<br />aldatzea gaitu (JavaScript)',
 'tog-showtoc' => 'Edukien taula erakutsi (3 goiburukotik gorako orrialdeentzako)',
 'tog-rememberpassword' => 'Nire saioa ordenagailu honetan gorde ({{PLURAL:$1|egun baterako| $1 egunerako}} gehienez)',
-'tog-watchcreations' => 'Sortzen ditudan orrialdeak nire segimendu zerrendara gehitu',
-'tog-watchdefault' => 'Aldatzen ditudan orrialdeak nire segimendu zerrendara gehitu',
-'tog-watchmoves' => 'Izena aldatutako orrialdeak segimendu zerrendan erakutsi',
-'tog-watchdeletion' => 'Ezabatzen ditudan orrialdeak nire segimendu zerrendara gehitu',
+'tog-watchcreations' => 'Sortzen ditudan orrialdeak eta fitxategiak nire jarraipen-zerrendara gehitu',
+'tog-watchdefault' => 'Aldatzen ditudan orrialdeak eta fitxategiak nire jarraipen-zerrendara gehitu',
+'tog-watchmoves' => 'Izena aldatutako orrialdeak eta fitxategiak jarraipen-zerrendara gehitu',
+'tog-watchdeletion' => 'Ezabatzen ditudan orrialdeak eta fitxategiak nire jarraipen-zerrendara gehitu',
 'tog-minordefault' => 'Lehenetsi bezala aldaketa txiki bezala markatu guztiak',
 'tog-previewontop' => 'Aurrebista aldaketa koadroaren aurretik erakutsi',
 'tog-previewonfirst' => 'Lehen aldaketan aurrebista erakutsi',
 'tog-nocache' => 'Orrialdeen katxea ezgaitu',
-'tog-enotifwatchlistpages' => 'Bidal iezadazue e-postako mezua, jarraitzen ari naizen orri bat aldatzen denean',
+'tog-enotifwatchlistpages' => 'Bidal iezadazue e-posta bat, jarraitzen ari naizen orrialde edo fitxategi bat aldatzen denean',
 'tog-enotifusertalkpages' => 'Nire eztabaida orrialdea aldatzen denean e-posta jaso',
-'tog-enotifminoredits' => 'Aldaketa txikiak direnean ere e-posta jaso',
+'tog-enotifminoredits' => 'Orrialde edo fitxategietan aldaketak txikiak direnean ere e-posta jaso',
 'tog-enotifrevealaddr' => 'Jakinarazpen mezuetan nire e-posta helbidea erakutsi',
 'tog-shownumberswatching' => 'Jarraitzen duen erabiltzaile kopurua erakutsi',
 'tog-oldsig' => 'Egungo sinadura:',
@@ -387,6 +387,7 @@ $1',
 'youhavenewmessages' => '$1 dauzkazu ($2).',
 'newmessageslink' => 'Mezu berriak',
 'newmessagesdifflink' => 'azken aldaketa ikusi',
+'newmessagesdifflinkplural' => 'azken {{PLURAL:$1|aldaketa|aldaketak}}',
 'youhavenewmessagesmulti' => 'Mezu berriak dituzu $1(e)n',
 'editsection' => 'aldatu',
 'editold' => 'aldatu',
@@ -436,10 +437,12 @@ Existitzen direnen zerrenda ikus dezakezu  [[Special:SpecialPages|{{int:specialp
 # General errors
 'error' => 'Errorea',
 'databaseerror' => 'Datu-base errorea',
-'dberrortext' => 'Datu-basean kontsulta egiterakoan sintaxi errore bat gertatu da. Baliteke softwareak bug bat izatea. Datu-basean egindako azken kontsulta:
-<blockquote><tt>$1</tt></blockquote>
-funtzio honekin: "<tt>$2</tt>".
-Datu-baseak emandako errore informazioa: "<tt>$3: $4</tt>".',
+'dberrortext' => 'Datu-basean kontsulta egiterakoan sintaxi errore bat gertatu da. 
+Baliteke softwareak bug bat izatea. 
+Datu-basean egindako azken kontsulta:
+<blockquote><code>$1</code></blockquote>
+funtzio honekin: "<code>$2</code>".
+Datu-baseak emandako errorea: "<samp>$3: $4</samp>".',
 'dberrortextcl' => 'Datu-basean kontsulta egiterakoan sintaxi errore bat gertatu da.
 Datu-basean egindako azken kontsulta:
 "$1"
@@ -475,15 +478,17 @@ Mesedez, bidali gertakar hau administradore bati, URLaren izena jarriz.',
 'badarticleerror' => 'Ezin da ekintza hau orrialde honetan burutu.',
 'cannotdelete' => 'Ezin izan da "$1" orrialde edo fitxategia ezabatu.
 Baliteke beste norbaitek ezabatu izana.',
+'cannotdelete-title' => 'Ezin da "$1" orrialdea ezabatu',
 'badtitle' => 'Izenburu ezegokia',
 'badtitletext' => 'Eskatutako orrialde izenburua ez da baliozkoa, hutsik dago, edo gaizki lotutako hizkuntzen arteko lotura da. Baliteke izenburuetan erabili ezin den karaktereren bat izatea.',
 'perfcached' => 'Hurrengo datuak katxean gordeta daude eta litekeena da guztiz eguneratuta ez egotea. Gehienez {{PLURAL:$1|emaitza 1 dago|$1 emaitza daude}} eskuragarri katxean.',
-'perfcachedts' => 'Hurrengo datuak katxean daude, $1 eguneratu zen azkenekoz. {{PLURAL:$1|emaitza 1 dago|$1 emaitza daude}} eskuragarri katxean.',
+'perfcachedts' => 'Hurrengo datuak katxean daude, $1 eguneratu zen azkenekoz. {{PLURAL:$4|emaitza 1 dago|$4 emaitza daude}} eskuragarri katxean.',
 'querypage-no-updates' => 'Orrialde honen berritzeak ez dira baimentzen. Hemen dagoen data ez da zuzenean berrituko.',
 'wrong_wfQuery_params' => 'Baliogabeko parametroak eman zaizkio wfQuery() funtzioari<br />
 Funtzioa: $1<br />
 Kontsulta: $2',
 'viewsource' => 'Kodea ikusi',
+'viewsource-title' => '$1-en iturria ikusi',
 'actionthrottled' => 'Ekintzaren gainetik pasa da',
 'actionthrottledtext' => 'Spamaren aurkako neurri gisa ekintza hau denbora tarte laburrean aldi askotan egiteko mugapena duzu, eta muga hori zeharkatu duzu.
 Saia zaitez berriro minutu batzuen buruan, mesedez.',
@@ -634,6 +639,8 @@ Behin-behineko pasahitza: $2',
 'passwordreset-emailsent' => 'Gogorarazteko e-posta bidali da.',
 
 # Special:ChangeEmail
+'changeemail' => 'Aldatu e-mail helbidea',
+'changeemail-oldemail' => 'Egungo e-mail helbidea:',
 'changeemail-newemail' => 'E-posta helbide berria:',
 'changeemail-none' => '(bat ere ez)',
 'changeemail-submit' => 'E-posta aldatu',
@@ -735,12 +742,11 @@ edo <span class="plainlinks">[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}
 'userpage-userdoesnotexist-view' => '"$1" erabiltzaile-kontua ez dago erregistraturik.',
 'blocked-notice-logextract' => 'Erabiltzaile hau blokeatuta dago une honetan.
 Azken blokeoaren erregistroa ageri da behean, erreferentzia gisa:',
-'clearyourcache' => "'''Oharra:''' Gorde ondoren zure nabigatzailearen katxea ekidin beharko duzu aldaketak ikusteko.
-* '''Firefox / Safari:''' ''Shift'' tekla sakatu birkargatzeko momentuan, edo ''Ctrl-Shift-R'' sakatu (''⌘-R''' Mac baten)
-* '''Google Chrome:''' ''Ctrl-Shift-R'' sakatu (''⌘-R'' Mac batean)
+'clearyourcache' => "'''Oharra:''' Gorde ondoren, zure nabigatzailearen katxea ekidin beharko duzu aldaketak ikusteko.
+* '''Firefox / Safari:''' ''Shift'' tekla sakatu birkargatzeko momentuan, edo ''Ctrl-Shift-R'' edo ''Crtl-F5'' sakatu (''⌘-R''' Mac batean)
+* '''Google Chrome:''' ''Ctrl-Shift-R'' sakatu (''⌘-Shift-R'' Mac batean)
 * '''Internet Explorer:''' ''Ctrl'' tekla sakatu birkargatzeko momentuan, edo ''Ctrl-F5'' sakatu
-* '''Konqueror:''': Birkargatzeko klik egin, edo F5 sakatu, besterik ez
-* '''Opera''' erabiltzaileek ''Tresnak → Hobespenak'' atalera jo eta katxea garbitzeko aukera hautatu",
+* '''Opera''' erabiltzaileek ''Tresnak → Hobespenak'' atalera joan eta katxea garbitzeko aukera hautatu",
 'usercssyoucanpreview' => "'''Laguntza:''' Zure CSS berria gorde aurretik probatzeko \"{{int:showpreview}}\" botoia erabili.",
 'userjsyoucanpreview' => "'''Laguntza:''' Zure JS berria gorde aurretik probatzeko \"{{int:showpreview}}\" botoia erabili.",
 'usercsspreview' => "'''Ez ahaztu zure CSS kodea aurreikusten zabiltzala.'''
@@ -755,6 +761,7 @@ Azken blokeoaren erregistroa ageri da behean, erreferentzia gisa:',
 'note' => "'''Oharra:'''",
 'previewnote' => "'''Gogoratu hau aurrikuspen bat dela.'''
 Zure aldaketak ez dira oraindik gorde!",
+'continue-editing' => 'Aldatzen jarraitu',
 'previewconflict' => 'Aurreikuspenak aldaketen koadroan idatzitako testua erakusten du, gorde ondoren agertuko den bezala.',
 'session_fail_preview' => "'''Sentitzen dugu! Ezin izan da zure aldaketa prozesatu, saioko datu batzuen galera dela-eta. Mesedez, saiatu berriz. Arazoak jarraitzen badu, saiatu saioa amaitu eta berriz hasten.'''",
 'session_fail_preview_html' => "'''Sentitzen dugu! Ezin izan dugu zure aldaketa burutu, saio datu galera bat medio.'''
@@ -766,6 +773,7 @@ Zure aldaketak ez dira oraindik gorde!",
 Aldaketa ezeztatua izan da testuaren galtzea galarazteko.
 Hau batzuetan gertatzen da buggyan oinarritutako web proxy zerbitzua erabiltzean.'''",
 'editing' => '$1 aldatzen',
+'creating' => '$1 sortzen',
 'editingsection' => '$1 aldatzen (atala)',
 'editingcomment' => '$1 aldatzen (atal berria)',
 'editconflict' => 'Aldaketa gatazka: $1',
@@ -906,9 +914,9 @@ Administratzaile bezala ikus dezakezu; xehetasun gehiagorako [{{fullurl:{{#Speci
 'rev-deleted-no-diff' => "Ezin duzu ezberdintasun hau ikusi, berrikuspenetako bat '''ezabatua''' izan delako.
 Xehetasunak [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} ezabaketa erregistroan] aurki ditzakezu.",
 'rev-suppressed-no-diff' => "Ezin duzu ezberdintasunik ikusi berrikuspenen bat '''ezabatua''' izan delako.",
-'rev-deleted-unhide-diff' => "diff honen bertsioetako bat '''ezabatu''' da.
+'rev-deleted-unhide-diff' => "aldaketa honen bertsioetako bat '''ezabatu''' da.
 Xehetasunak ikusgai daude [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} ezabatze erregistroan].
-Administratzailea zarenez, oraindik [$1 diff hau ikus dezakezu], nahi izanez gero.",
+Oraindik [$1 aldaketa hau ikus dezakezu], nahi izanez gero.",
 'rev-suppressed-unhide-diff' => "diff honen bertsioetako bat '''ezeztatu''' da.
 Xehetasunak ikusgai daude [{{fullurl:{{#Special:Log}}/suppress|page={{FULLPAGENAMEE}}}} ezeztatze erregistroan].
 Administratzailea zarenez, oraindik [$1 diff hau ikus dezakezu], nahi izanez gero.",
@@ -983,7 +991,7 @@ Begira itzazu erregistroak.',
 # Suppression log
 'suppressionlog' => 'Ezabatze loga',
 'suppressionlogtext' => 'Azpian administratzaileek ezkutatutako edukia duten ezabaketa eta blokeoen zerrenda dago.
-Ikusi [[Special:BlockList|IP blokeoen zerrenda]] orain dauden blokeoak ikusi ahal izateko.',
+Ikusi [[Special:BlockList|blokeoen zerrenda]] orain dauden blokeoak eta debekuak ikusi ahal izateko.',
 
 # History merging
 'mergehistory' => 'Orrialdeen historiak bateratu',
@@ -1018,6 +1026,7 @@ Kontura zaitez nabigazio loturek, zutabea ezabatu dezakela.',
 
 # Diffs
 'history-title' => '"$1" orrialdearen historia berrikuspena',
+'difference-title' => '"$1"-en berrikuspenen arteko aldaketa',
 'difference-multipage' => '(Orrialdeen arteko ezberdintasunak)',
 'lineno' => '$1. lerroa:',
 'compareselectedversions' => 'Hautatutako bertsioak alderatu',
@@ -1121,6 +1130,8 @@ Saia zaitez zure eskeraren aurretik ''all:'' jartzen eduki guztien artean bilatz
 'prefs-watchlist-token' => 'Jarraipen zerrendaren tokena:',
 'prefs-misc' => 'Denetarik',
 'prefs-resetpass' => 'Pasahitza aldatu',
+'prefs-changeemail' => 'Aldatu e-mail helbidea',
+'prefs-setemail' => 'E-mail helbide bat ezarri',
 'prefs-email' => 'E-posta aukerak',
 'prefs-rendering' => 'Itxura',
 'saveprefs' => 'Gorde',
@@ -1242,7 +1253,7 @@ $1 {{PLURAL:$1|karakteretik|karakteretik}} behera izan behar ditu.',
 'group-all' => '(guztiak)',
 
 'group-user-member' => '{{GENDER:$1|lankidea}}',
-'group-autoconfirmed-member' => '{{GENDER:$1|baieztatutako erabiltzailea}}',
+'group-autoconfirmed-member' => '{{GENDER:$1|baieztatutako lankidea}}',
 'group-bot-member' => '{{GENDER:$1|bot-a}}',
 'group-sysop-member' => '{{GENDER:$1|administratzailea}}',
 'group-bureaucrat-member' => '{{GENDER:$1|burokrata}}',
@@ -1355,6 +1366,7 @@ $1 {{PLURAL:$1|karakteretik|karakteretik}} behera izan behar ditu.',
 'action-userrights' => 'lankide guztien eskumenak aldatu',
 'action-userrights-interwiki' => 'beste wikietako lankideen lankide-eskumenak aldatu',
 'action-siteadmin' => 'datubasea babestu edo babesa kendu',
+'action-sendemail' => 'E-mailak bidali',
 
 # Recent changes
 'nchanges' => '{{PLURAL:$1|aldaketa 1|$1 aldaketa}}',
@@ -1528,7 +1540,7 @@ $1',
 'img-auth-nopathinfo' => 'PATH_INFO falta da.
 Zure zerbitzaria ez dago informazio hau pasatzeko konfiguratuta.
 CGI-oinarriduna izan daiteke, img_auth onartzen ez duena.
-[https://www.mediawiki.org/wiki/Manual:Image_Authorization Ikusi irudi-baimenak.]',
+Ikusi https://www.mediawiki.org/wiki/Manual:Image_Authorization.',
 'img-auth-notindir' => 'Eskatutako bidea ez dago kofiguratutako igoera-direktorioan.',
 'img-auth-badtitle' => 'Ezin izan da baleko izenbururik eraiki "$1" izenetik abiatuta',
 'img-auth-nologinnWL' => 'Ez duzu saioa hasi eta "$1" ez dago zerrenda zurian.',
@@ -1634,6 +1646,7 @@ Bere [$2 fitxategiaren deskribapen orrialdea] behean dago.',
 ** Copyright bortxaketa
 ** Bikoiztutako fitxategia',
 'filedelete-edit-reasonlist' => 'Ezabaketa arrazoiak aldatu',
+'filedelete-maintenance-title' => 'Ezin da artxiboa ezabatu',
 
 # MIME search
 'mimesearch' => 'MIME bilaketa',
@@ -1682,7 +1695,9 @@ Bere [$2 fitxategiaren deskribapen orrialdea] behean dago.',
 
 'disambiguations' => 'Argipen orrietara lotzen duten orriak',
 'disambiguationspage' => 'Template:argipen',
-'disambiguations-text' => "Jarraian azaltzen diren orrialdeek '''argipen orrialde''' baterako lotura dute. Kasu bakoitzean dagokion artikulu zuzenarekin izan beharko lukete lotura.<br />Orrialde bat argipen motakoa dela antzeman ohi da [[MediaWiki:Disambiguationspage]] orrialdean agertzen den txantiloietako bat duenean.",
+'disambiguations-text' => "Jarraian azaltzen diren orrialdeek '''argipen orrialde''' baterako lotura dute. 
+Kasu bakoitzean dagokion artikulu zuzenarekin izan beharko lukete lotura.<br />
+Orrialde bat argipen motakoa dela antzeman ohi da [[MediaWiki:Disambiguationspage]] orrialdean agertzen den txantiloietako bat duenean.",
 
 'doubleredirects' => 'Birzuzenketa bikoitzak',
 'doubleredirectstext' => 'Lerro bakoitzean lehen eta bigarren birzuzenketetarako loturak ikus daitezke, eta baita edukia daukan edo eduki beharko lukeen orrialderako lotura ere. Lehen birzuzenketak azken honetara <del>zuzendu</del> beharko luke.',
@@ -1797,6 +1812,10 @@ Erregistro mota, erabiltzailearen izena edota orrialdearen izena iragaziz bistar
 'allpagesprefix' => 'Aurrizki hau duten orrialdeak bistaratu:',
 'allpagesbadtitle' => 'Orrialdearen izena baliogabekoa da edo interwiki edo hizkuntzen arteko aurrizkia dauka. Izenburuetan erabili ezin daitezkeen karaktere bat edo gehiago izan ditzake.',
 'allpages-bad-ns' => '{{SITENAME}}(e)k ez dauka "$1" izeneko izen-tarterik.',
+'allpages-hide-redirects' => 'Birzuzenketak ezkutatu',
+
+# SpecialCachedPage
+'cachedspecial-refresh-now' => 'Azkena ikusi.',
 
 # Special:Categories
 'categories' => 'Kategoriak',
@@ -1862,6 +1881,7 @@ Badago [[{{MediaWiki:Listgrouprights-helppage}}|informazio osagarria]] banakako
 'mailnologin' => 'Bidalketa helbiderik ez',
 'mailnologintext' => 'Beste erabiltzaileei e-posta mezuak bidaltzeko [[Special:UserLogin|saioa hasi]] eta baliozko e-posta helbidea behar duzu izan zure [[Special:Preferences|hobespenetan]].',
 'emailuser' => 'Erabiltzaile honi e-posta bidali',
+'emailuser-title-notarget' => 'Erabiltzaileari e-maila bidali',
 'emailpage' => 'Erabiltzaileari e-posta bidali',
 'emailpagetext' => 'Erabiltzaile honek baliozko e-posta helbide bat ezarri badu bere hobespenetan, beheko formularioa erabiliz mezu bat bidal dakioke.
 [[Special:Preferences|Hobespenetan]] daukazun e-posta helbidea azalduko da mezuaren bidaltzaile bezala eta beraz erantzun ahal izango dizu.',
@@ -2114,6 +2134,7 @@ In such cases, you must uncheck or unhide the newest deleted revision.',
 
 [[Special:Log/delete|Ezabaketa erregistrora]] jo azken ezabaketa eta leheneraketak ikusteko.",
 'undelete-header' => 'Berriki ezabatutako orrialdeak ikusteko [[Special:Log/delete|ezabaketa erregistrora]] jo.',
+'undelete-search-title' => 'Ezabatutako orrialdeak bilatu',
 'undelete-search-box' => 'Ezabatutako orrialdeak bilatu',
 'undelete-search-prefix' => 'Honela hasten diren orrialdeak erakutsi:',
 'undelete-search-submit' => 'Bilatu',
@@ -2214,8 +2235,8 @@ Blokeo erregistroa azken sarrera ematen da azpian erreferentziarako:',
 'ipb-confirm' => 'Blokeoa baieztatu',
 'badipaddress' => 'Baliogabeko IP helbidea',
 'blockipsuccesssub' => 'Blokeoa burutu da',
-'blockipsuccesstext' => '[[Special:Contributions/$1|$1]] erabiltzaileari blokeoa ezarri zaio.<br />
-Ikus [[Special:BlockList|IP blokeoen zerrenda]] blokeoak aztertzeko.',
+'blockipsuccesstext' => '[[Special:Contributions/$1|$1]] blokeatua izan da.<br />
+Ikus [[Special:BlockList|blokeoen zerrenda]] blokeoak aztertzeko.',
 'ipb-edit-dropdown' => 'Blokeatzeko arrazoiak aldatu',
 'ipb-unblock-addr' => '$1 lankide edo IP helbideari blokeoa baliogabetu',
 'ipb-unblock' => 'Erabiltzaile izen edo IP helbide bati blokeoa kendu',
@@ -2247,6 +2268,7 @@ Ikus [[Special:BlockList|IP blokeoen zerrenda]] blokeoak aztertzeko.',
 'unblocklink' => 'blokeoa kendu',
 'change-blocklink' => 'blokeoa aldatu',
 'contribslink' => 'ekarpenak',
+'emaillink' => 'E-maila bidali',
 'autoblocker' => '"[[User:$1|$1]]"(e)k berriki erabili duen IP helbidea duzulako autoblokeatu zaizu. $1(e)k emandako arrazoia zera da: "\'\'\'$2\'\'\'"',
 'blocklogpage' => 'Blokeo erregistroa',
 'blocklog-showlog' => 'Lankide hau aurretik blokeatua izan da.
@@ -2255,7 +2277,9 @@ Blokeo erregistroa ematen da azpian erreferentziarako:',
 Erregistroa ematen da azpian erreferentziarako:',
 'blocklogentry' => '"[[$1]]" wikilariari blokeoa ezarri zaio. Blokeoaldia: $2 $3',
 'reblock-logentry' => '[[$1]] wikilariari blokeoaldia aldatu diogu. Blokeoaldi berria: $2 $3',
-'blocklogtext' => 'Erabiltzaileen blokeoen ezarpen eta ezabaketen erregistroa da hau. Ez dira automatikoki blokeatutako IP helbideak zerrendatzen. Ikus [[Special:BlockList|IP blokeoen zerrenda]] aktibo dauden blokeoak aztertzeko.',
+'blocklogtext' => 'Erabiltzaileen blokeoen ezarpen eta ezabaketen erregistroa da hau. 
+Automatikoki blokeatutako IP helbideak ez dira zerrendatzen. 
+Ikus [[Special:BlockList|blokeoen zerrenda]] aktibo dauden blokeoak eta debekuak aztertzeko.',
 'unblocklogentry' => '$1 desblokeatu da',
 'block-log-flags-anononly' => 'erabiltzaile anonimoak bakarrik',
 'block-log-flags-nocreate' => 'kontuak sortzea ezgaituta',
@@ -2362,7 +2386,7 @@ Kasu horietan orrialdea eskuz mugitu edo bestearekin bateratu beharko duzu.",
 
 "[[:$1]]" helburua existitzen da. Lekua egiteko ezabatu nahi al duzu?',
 'delete_and_move_confirm' => 'Bai, orrialdea ezabatu',
-'delete_and_move_reason' => 'Lekua egiteko ezabatu da',
+'delete_and_move_reason' => '[[$1]] mugitzeko ezabatu da',
 'selfmove' => 'Helburu izenburua berdina da; ezin da orrialde bat bere gainera mugitu.',
 'immobile-source-namespace' => '"$1" motako orrialdeak ezin dira mugitu',
 'immobile-target-namespace' => 'Orrialdeak ezin dira "$1" motara mugitu',
@@ -2387,6 +2411,7 @@ Azken erregistroko sarrera ematen da azpian erreferentzia gisa:",
 Orrialdeak esportatzeko zehaztu hauen izenburuak beheko koadroan, izenburu bat lerroko, eta aukeratu zein bertsio esportatu nahi dituzun.
 
 Horrez gain, lotura zuzena ere erabil dezakezu; adibidez, [[{{#Special:Export}}/{{MediaWiki:Mainpage}}]] "[[{{MediaWiki:Mainpage}}]]" orrialdearentzako.',
+'exportall' => 'Orrialde guztiak esportatu',
 'exportcuronly' => 'Oraingo berrikuspena bakarrik hartu, ez historia guztia',
 'exportnohistory' => "----
 '''Oharra:''' Formulario honen bitartez orrialdeen historia osoak esportatzeko aukera ezgaitu egin da, errendimendua dela-eta.",
@@ -2573,9 +2598,9 @@ Baliteke zerrenda beltzean dagoen kanpo lotura batek sortzea arazo hori.',
 'spam_blanking' => 'Berrikuspen guztiek $1(e)rako lotura zeukaten, husten',
 
 # Info page
-'pageinfo-header-edits' => 'Aldaketak',
+'pageinfo-header-edits' => 'Aldaketen historia',
 'pageinfo-views' => 'Bistaratze-kopurua',
-'pageinfo-edits' => 'Aldaketa kopurua',
+'pageinfo-edits' => 'Aldaketa kopuru totala',
 
 # Skin names
 'skinname-standard' => 'Lehenetsia',
@@ -3071,6 +3096,10 @@ Egiaztapen kode hau $4 iraungiko da.',
 'confirm-purge-top' => 'Orrialde honen katxea ezabatu?',
 'confirm-purge-bottom' => 'Orrialdea purgatzean katxea ezabatzen du eta orrialdearen bertsiorik eguneratuena erakustera behartzen du.',
 
+# action=watch/unwatch
+'confirm-watch-button' => 'Ados',
+'confirm-unwatch-button' => 'Ados',
+
 # Multipage image navigation
 'imgmultipageprev' => '&larr; aurreko orrialdea',
 'imgmultipagenext' => 'hurrengo orrialdea &rarr;',
@@ -3186,7 +3215,7 @@ Irudiak bereizmen handienean daude, bestelako fitxategi motak beraiei esleitutak
 * <strong class="mw-specialpagerestricted">Mugatutako orrialde bereziak.</strong>',
 'specialpages-group-maintenance' => 'Mantentze-oharrak',
 'specialpages-group-other' => 'Beste orrialde berezi batzuk',
-'specialpages-group-login' => 'Sartu / Izena eman',
+'specialpages-group-login' => 'Saioa hasi / kontua sortu',
 'specialpages-group-changes' => 'Aldaketa berriak eta erregistroak',
 'specialpages-group-media' => 'Artxiboen orriak',
 'specialpages-group-users' => 'Erabiltzaileak eta eskumenak',
diff --git a/languages/messages/MessagesFa.php b/languages/messages/MessagesFa.php
index 5a968c8ef2..9094df2e78 100644
--- a/languages/messages/MessagesFa.php
+++ b/languages/messages/MessagesFa.php
@@ -264,158 +264,158 @@ $dateFormats = 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__' ),
-	'noheader'                => array( '0', '__بی‌عنوان__', '__NOHEADER__' ),
-	'currentmonth'            => array( '1', 'ماه', 'ماه‌کنونی', 'ماه_کنونی', 'ماه‌کنونی۲', 'ماه_کنونی۲', 'CURRENTMONTH', 'CURRENTMONTH2' ),
-	'currentmonth1'           => array( '1', 'ماه۱', 'ماه‌کنونی۱', 'ماه_کنونی۱', 'CURRENTMONTH1' ),
-	'currentmonthname'        => array( '1', 'نام‌ماه', 'نام_ماه', 'نام‌ماه‌کنونی', 'نام_ماه_کنونی', 'CURRENTMONTHNAME' ),
-	'currentmonthnamegen'     => array( '1', 'نام‌ماه‌اضافه', 'نام_ماه_اضافه', 'نام‌ماه‌کنونی‌اضافه', 'نام_ماه_کنونی_اضافه', 'CURRENTMONTHNAMEGEN' ),
-	'currentmonthabbrev'      => array( '1', 'مخفف‌نام‌ماه', 'مخفف_نام_ماه', 'CURRENTMONTHABBREV' ),
-	'currentday'              => array( '1', 'روز', 'روزکنونی', 'روز_کنونی', 'CURRENTDAY' ),
-	'currentday2'             => array( '1', 'روز۲', 'روز_۲', 'CURRENTDAY2' ),
-	'currentdayname'          => array( '1', 'نام‌روز', 'نام_روز', 'CURRENTDAYNAME' ),
-	'currentyear'             => array( '1', 'سال', 'سال‌کنونی', 'سال_کنونی', 'CURRENTYEAR' ),
-	'currenttime'             => array( '1', 'زمان‌کنونی', 'زمان_کنونی', 'CURRENTTIME' ),
-	'currenthour'             => array( '1', 'ساعت', 'ساعت‌کنونی', 'ساعت_کنونی', 'CURRENTHOUR' ),
-	'localmonth'              => array( '1', 'ماه‌محلی', 'ماه_محلی', 'ماه‌محلی۲', 'ماه_محلی۲', 'LOCALMONTH', 'LOCALMONTH2' ),
-	'localmonth1'             => array( '1', 'ماه‌محلی۱', 'ماه_محلی۱', 'LOCALMONTH1' ),
-	'localmonthname'          => array( '1', 'نام‌ماه‌محلی', 'نام_ماه_محلی', 'LOCALMONTHNAME' ),
-	'localmonthnamegen'       => array( '1', 'نام‌ماه‌محلی‌اضافه', 'نام_ماه_محلی_اضافه', 'LOCALMONTHNAMEGEN' ),
-	'localmonthabbrev'        => array( '1', 'مخفف‌ماه‌محلی', 'مخفف_ماه_محلی', 'LOCALMONTHABBREV' ),
-	'localday'                => array( '1', 'روزمحلی', 'روز_محلی', 'LOCALDAY' ),
-	'localday2'               => array( '1', 'روزمحلی۲', 'روز_محلی_۲', 'LOCALDAY2' ),
-	'localdayname'            => array( '1', 'نام‌روزمحلی', 'نام_روز_محلی', 'LOCALDAYNAME' ),
-	'localyear'               => array( '1', 'سال‌محلی', 'سال_محلی', 'LOCALYEAR' ),
-	'localtime'               => array( '1', 'زمان‌محلی', 'زمان_محلی', 'LOCALTIME' ),
-	'localhour'               => array( '1', 'ساعت‌محلی', 'ساعت_محلی', 'LOCALHOUR' ),
-	'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' ),
-	'namespacenumber'         => array( '1', 'شماره_فضای_نام', 'شماره‌فضای‌نام', 'NAMESPACENUMBER' ),
-	'talkspace'               => array( '1', 'فضای‌بحث', 'فضای_بحث', 'TALKSPACE' ),
-	'talkspacee'              => array( '1', 'فضای‌بحث‌کد', 'فضای_بحث_کد', 'TALKSPACEE' ),
-	'subjectspace'            => array( '1', 'فضای‌موضوع', 'فضای‌مقاله', 'فضای_موضوع', 'فضای_مقاله', 'SUBJECTSPACE', 'ARTICLESPACE' ),
-	'subjectspacee'           => array( '1', 'فضای‌موضوع‌کد', 'فضای‌مقاله‌کد', 'فضای_موضوع_کد', 'فضای_مقاله_کد', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
-	'fullpagename'            => array( '1', 'نام‌کامل‌صفحه', 'نام_کامل_صفحه', 'FULLPAGENAME' ),
-	'fullpagenamee'           => array( '1', 'نام‌کامل‌صفحه‌کد', 'نام_کامل_صفحه_کد', 'FULLPAGENAMEE' ),
-	'subpagename'             => array( '1', 'نام‌زیرصفحه', 'نام_زیرصفحه', 'SUBPAGENAME' ),
-	'subpagenamee'            => array( '1', 'نام‌زیرصفحه‌کد', 'نام_زیرصفحه_کد', 'SUBPAGENAMEE' ),
-	'basepagename'            => array( '1', 'نام‌صفحه‌مبنا', 'نام_صفحه_مبنا', 'BASEPAGENAME' ),
-	'basepagenamee'           => array( '1', 'نام‌صفحه‌مبناکد', 'نام_صفحه_مبنا_کد', 'BASEPAGENAMEE' ),
-	'talkpagename'            => array( '1', 'نام‌صفحه‌بحث', 'نام_صفحه_بحث', 'TALKPAGENAME' ),
-	'talkpagenamee'           => array( '1', 'نام‌صفحه‌بحث‌کد', 'نام_صفحه_بحث_کد', 'TALKPAGENAMEE' ),
-	'subjectpagename'         => array( '1', 'نام‌صفحه‌موضوع', 'نام‌صفحه‌مقاله', 'نام_صفحه_موضوع', 'نام_صفحه_مقاله', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
-	'subjectpagenamee'        => array( '1', 'نام‌صفحه‌موضوع‌کد', 'نام‌صفحه‌مقاله‌کد', 'نام_صفحه_موضوع_کد', 'نام_صفحه_مقاله_کد', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
-	'msg'                     => array( '0', 'پیغام:', 'پ:', 'MSG:' ),
-	'subst'                   => array( '0', 'جایگزین:', 'جا:', 'SUBST:' ),
-	'safesubst'               => array( '0', 'جایگزین_امن:', 'جام:', 'SAFESUBST:' ),
-	'msgnw'                   => array( '0', 'پیغام‌بی‌بسط:', 'MSGNW:' ),
-	'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_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_upright'             => array( '1', 'ایستاده', 'ایستاده=$1', 'ایستاده_$1', 'upright', 'upright=$1', 'upright $1' ),
-	'img_border'              => array( '1', 'حاشیه', 'border' ),
-	'img_baseline'            => array( '1', 'همکف', 'baseline' ),
-	'img_sub'                 => array( '1', 'زیر', 'sub' ),
-	'img_super'               => array( '1', 'زبر', 'super', 'sup' ),
-	'img_top'                 => array( '1', 'بالا', 'top' ),
-	'img_text_top'            => array( '1', 'متن-بالا', 'text-top' ),
-	'img_middle'              => array( '1', 'میانه', 'middle' ),
-	'img_bottom'              => array( '1', 'پایین', 'bottom' ),
-	'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:' ),
-	'sitename'                => array( '1', 'نام‌وبگاه', 'نام_وبگاه', 'SITENAME' ),
-	'ns'                      => array( '0', 'فن:', 'NS:' ),
-	'nse'                     => array( '0', 'فنک:', 'NSE:' ),
-	'localurl'                => array( '0', 'نشانی:', 'LOCALURL:' ),
-	'localurle'               => array( '0', 'نشانی‌کد:', 'نشانی_کد:', 'LOCALURLE:' ),
-	'articlepath'             => array( '0', 'مسیرمقاله', 'مسیر_مقاله', 'ARTICLEPATH' ),
-	'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__' ),
-	'currentweek'             => array( '1', 'هفته', 'CURRENTWEEK' ),
-	'currentdow'              => array( '1', 'روزهفته', 'روز_هفته', 'CURRENTDOW' ),
-	'localweek'               => array( '1', 'هفته‌محلی', 'هفته_محلی', 'LOCALWEEK' ),
-	'localdow'                => array( '1', 'روزهفته‌محلی', 'روز_هفته_محلی', 'LOCALDOW' ),
-	'revisionid'              => array( '1', 'نسخه', 'شماره‌نسخه', 'شماره_نسخه', 'REVISIONID' ),
-	'revisionday'             => array( '1', 'روزنسخه', 'روز_نسخه', 'REVISIONDAY' ),
-	'revisionday2'            => array( '1', 'روزنسخه۲', 'روز_نسخه۲', 'روز_نسخه_۲', 'REVISIONDAY2' ),
-	'revisionmonth'           => array( '1', 'ماه‌نسخه', 'ماه_نسخه', 'REVISIONMONTH' ),
-	'revisionmonth1'          => array( '1', 'ماه‌نسخه۱', 'ماه_نسخه_۱', 'REVISIONMONTH1' ),
-	'revisionyear'            => array( '1', 'سال‌نسخه', 'سال_نسخه', 'REVISIONYEAR' ),
-	'revisiontimestamp'       => array( '1', 'زمان‌یونیکسی‌نسخه', 'زمان‌نسخه', 'زمان_یونیکسی_نسخه', 'زمان_نسخه', 'REVISIONTIMESTAMP' ),
-	'revisionuser'            => array( '1', 'کاربرنسخه', 'کاربر_نسخه', 'REVISIONUSER' ),
-	'plural'                  => array( '0', 'جمع:', 'PLURAL:' ),
-	'fullurl'                 => array( '0', 'نشانی‌کامل:', 'نشانی_کامل:', 'FULLURL:' ),
-	'fullurle'                => array( '0', 'نشانی‌کامل‌کد:', 'نشانی_کامل_کد:', 'FULLURLE:' ),
-	'canonicalurl'            => array( '0', 'نشانی_استاندارد:', 'نشانی‌استاندارد:', 'CANONICALURL:' ),
-	'lcfirst'                 => array( '0', 'ابتداکوچک:', 'ابتدا_کوچک:', 'LCFIRST:' ),
-	'ucfirst'                 => array( '0', 'ابتدابزرگ:', 'ابتدا_بزرگ:', 'UCFIRST:' ),
-	'lc'                      => array( '0', 'Ú©:', 'LC:' ),
-	'uc'                      => array( '0', 'ب:', 'UC:' ),
-	'raw'                     => array( '0', 'خام:', 'RAW:' ),
-	'displaytitle'            => array( '1', 'عنوان‌ظاهری', 'عنوان_ظاهری', 'DISPLAYTITLE' ),
-	'rawsuffix'               => array( '1', 'ن', 'R' ),
-	'newsectionlink'          => array( '1', '__بخش‌جدید__', '__NEWSECTIONLINK__' ),
-	'nonewsectionlink'        => array( '1', '__بی‌پیوندبخش__', '__بی‌پیوند‌بخش‌جدید__', '__NONEWSECTIONLINK__' ),
-	'currentversion'          => array( '1', 'نسخه‌کنونی', 'نسخه_کنونی', 'CURRENTVERSION' ),
-	'urlencode'               => array( '0', 'کدنشانی:', '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' ),
-	'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' ),
-	'url_path'                => array( '0', 'مسیر', 'PATH' ),
-	'url_wiki'                => array( '0', 'ویکی', 'WIKI' ),
-	'url_query'               => array( '0', 'دستور', 'QUERY' ),
-	'defaultsort_noerror'     => array( '0', 'بدون‌خطا', 'بدون_خطا', 'noerror' ),
-	'defaultsort_noreplace'   => array( '0', 'جایگزین‌نکن', 'جایگزین_نکن', 'noreplace' ),
+	'redirect'                  => array( '0', '#تغییر_مسیر', '#تغییرمسیر', '#REDIRECT' ),
+	'notoc'                     => array( '0', '__بی‌فهرست__', '__NOTOC__' ),
+	'nogallery'                 => array( '0', '__بی‌نگارخانه__', '__NOGALLERY__' ),
+	'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' ),
+	'currentmonthnamegen'       => array( '1', 'نام‌ماه‌اضافه', 'نام_ماه_اضافه', 'نام‌ماه‌کنونی‌اضافه', 'نام_ماه_کنونی_اضافه', 'CURRENTMONTHNAMEGEN' ),
+	'currentmonthabbrev'        => array( '1', 'مخفف‌نام‌ماه', 'مخفف_نام_ماه', 'CURRENTMONTHABBREV' ),
+	'currentday'                => array( '1', 'روز', 'روزکنونی', 'روز_کنونی', 'CURRENTDAY' ),
+	'currentday2'               => array( '1', 'روز۲', 'روز_۲', 'CURRENTDAY2' ),
+	'currentdayname'            => array( '1', 'نام‌روز', 'نام_روز', 'CURRENTDAYNAME' ),
+	'currentyear'               => array( '1', 'سال', 'سال‌کنونی', 'سال_کنونی', 'CURRENTYEAR' ),
+	'currenttime'               => array( '1', 'زمان‌کنونی', 'زمان_کنونی', 'CURRENTTIME' ),
+	'currenthour'               => array( '1', 'ساعت', 'ساعت‌کنونی', 'ساعت_کنونی', 'CURRENTHOUR' ),
+	'localmonth'                => array( '1', 'ماه‌محلی', 'ماه_محلی', 'ماه‌محلی۲', 'ماه_محلی۲', 'LOCALMONTH', 'LOCALMONTH2' ),
+	'localmonth1'               => array( '1', 'ماه‌محلی۱', 'ماه_محلی۱', 'LOCALMONTH1' ),
+	'localmonthname'            => array( '1', 'نام‌ماه‌محلی', 'نام_ماه_محلی', 'LOCALMONTHNAME' ),
+	'localmonthnamegen'         => array( '1', 'نام‌ماه‌محلی‌اضافه', 'نام_ماه_محلی_اضافه', 'LOCALMONTHNAMEGEN' ),
+	'localmonthabbrev'          => array( '1', 'مخفف‌ماه‌محلی', 'مخفف_ماه_محلی', 'LOCALMONTHABBREV' ),
+	'localday'                  => array( '1', 'روزمحلی', 'روز_محلی', 'LOCALDAY' ),
+	'localday2'                 => array( '1', 'روزمحلی۲', 'روز_محلی_۲', 'LOCALDAY2' ),
+	'localdayname'              => array( '1', 'نام‌روزمحلی', 'نام_روز_محلی', 'LOCALDAYNAME' ),
+	'localyear'                 => array( '1', 'سال‌محلی', 'سال_محلی', 'LOCALYEAR' ),
+	'localtime'                 => array( '1', 'زمان‌محلی', 'زمان_محلی', 'LOCALTIME' ),
+	'localhour'                 => array( '1', 'ساعت‌محلی', 'ساعت_محلی', 'LOCALHOUR' ),
+	'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' ),
+	'namespacenumber'           => array( '1', 'شماره_فضای_نام', 'شماره‌فضای‌نام', 'NAMESPACENUMBER' ),
+	'talkspace'                 => array( '1', 'فضای‌بحث', 'فضای_بحث', 'TALKSPACE' ),
+	'talkspacee'                => array( '1', 'فضای‌بحث‌کد', 'فضای_بحث_کد', 'TALKSPACEE' ),
+	'subjectspace'              => array( '1', 'فضای‌موضوع', 'فضای‌مقاله', 'فضای_موضوع', 'فضای_مقاله', 'SUBJECTSPACE', 'ARTICLESPACE' ),
+	'subjectspacee'             => array( '1', 'فضای‌موضوع‌کد', 'فضای‌مقاله‌کد', 'فضای_موضوع_کد', 'فضای_مقاله_کد', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
+	'fullpagename'              => array( '1', 'نام‌کامل‌صفحه', 'نام_کامل_صفحه', 'FULLPAGENAME' ),
+	'fullpagenamee'             => array( '1', 'نام‌کامل‌صفحه‌کد', 'نام_کامل_صفحه_کد', 'FULLPAGENAMEE' ),
+	'subpagename'               => array( '1', 'نام‌زیرصفحه', 'نام_زیرصفحه', 'SUBPAGENAME' ),
+	'subpagenamee'              => array( '1', 'نام‌زیرصفحه‌کد', 'نام_زیرصفحه_کد', 'SUBPAGENAMEE' ),
+	'basepagename'              => array( '1', 'نام‌صفحه‌مبنا', 'نام_صفحه_مبنا', 'BASEPAGENAME' ),
+	'basepagenamee'             => array( '1', 'نام‌صفحه‌مبناکد', 'نام_صفحه_مبنا_کد', 'BASEPAGENAMEE' ),
+	'talkpagename'              => array( '1', 'نام‌صفحه‌بحث', 'نام_صفحه_بحث', 'TALKPAGENAME' ),
+	'talkpagenamee'             => array( '1', 'نام‌صفحه‌بحث‌کد', 'نام_صفحه_بحث_کد', 'TALKPAGENAMEE' ),
+	'subjectpagename'           => array( '1', 'نام‌صفحه‌موضوع', 'نام‌صفحه‌مقاله', 'نام_صفحه_موضوع', 'نام_صفحه_مقاله', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
+	'subjectpagenamee'          => array( '1', 'نام‌صفحه‌موضوع‌کد', 'نام‌صفحه‌مقاله‌کد', 'نام_صفحه_موضوع_کد', 'نام_صفحه_مقاله_کد', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
+	'msg'                       => array( '0', 'پیغام:', 'پ:', 'MSG:' ),
+	'subst'                     => array( '0', 'جایگزین:', 'جا:', 'SUBST:' ),
+	'safesubst'                 => array( '0', 'جایگزین_امن:', 'جام:', 'SAFESUBST:' ),
+	'msgnw'                     => array( '0', 'پیغام‌بی‌بسط:', 'MSGNW:' ),
+	'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_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_upright'               => array( '1', 'ایستاده', 'ایستاده=$1', 'ایستاده_$1', 'upright', 'upright=$1', 'upright $1' ),
+	'img_border'                => array( '1', 'حاشیه', 'border' ),
+	'img_baseline'              => array( '1', 'همکف', 'baseline' ),
+	'img_sub'                   => array( '1', 'زیر', 'sub' ),
+	'img_super'                 => array( '1', 'زبر', 'super', 'sup' ),
+	'img_top'                   => array( '1', 'بالا', 'top' ),
+	'img_text_top'              => array( '1', 'متن-بالا', 'text-top' ),
+	'img_middle'                => array( '1', 'میانه', 'middle' ),
+	'img_bottom'                => array( '1', 'پایین', 'bottom' ),
+	'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:' ),
+	'sitename'                  => array( '1', 'نام‌وبگاه', 'نام_وبگاه', 'SITENAME' ),
+	'ns'                        => array( '0', 'فن:', 'NS:' ),
+	'nse'                       => array( '0', 'فنک:', 'NSE:' ),
+	'localurl'                  => array( '0', 'نشانی:', 'LOCALURL:' ),
+	'localurle'                 => array( '0', 'نشانی‌کد:', 'نشانی_کد:', 'LOCALURLE:' ),
+	'articlepath'               => array( '0', 'مسیرمقاله', 'مسیر_مقاله', 'ARTICLEPATH' ),
+	'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__' ),
+	'currentweek'               => array( '1', 'هفته', 'CURRENTWEEK' ),
+	'currentdow'                => array( '1', 'روزهفته', 'روز_هفته', 'CURRENTDOW' ),
+	'localweek'                 => array( '1', 'هفته‌محلی', 'هفته_محلی', 'LOCALWEEK' ),
+	'localdow'                  => array( '1', 'روزهفته‌محلی', 'روز_هفته_محلی', 'LOCALDOW' ),
+	'revisionid'                => array( '1', 'نسخه', 'شماره‌نسخه', 'شماره_نسخه', 'REVISIONID' ),
+	'revisionday'               => array( '1', 'روزنسخه', 'روز_نسخه', 'REVISIONDAY' ),
+	'revisionday2'              => array( '1', 'روزنسخه۲', 'روز_نسخه۲', 'روز_نسخه_۲', 'REVISIONDAY2' ),
+	'revisionmonth'             => array( '1', 'ماه‌نسخه', 'ماه_نسخه', 'REVISIONMONTH' ),
+	'revisionmonth1'            => array( '1', 'ماه‌نسخه۱', 'ماه_نسخه_۱', 'REVISIONMONTH1' ),
+	'revisionyear'              => array( '1', 'سال‌نسخه', 'سال_نسخه', 'REVISIONYEAR' ),
+	'revisiontimestamp'         => array( '1', 'زمان‌یونیکسی‌نسخه', 'زمان‌نسخه', 'زمان_یونیکسی_نسخه', 'زمان_نسخه', 'REVISIONTIMESTAMP' ),
+	'revisionuser'              => array( '1', 'کاربرنسخه', 'کاربر_نسخه', 'REVISIONUSER' ),
+	'plural'                    => array( '0', 'جمع:', 'PLURAL:' ),
+	'fullurl'                   => array( '0', 'نشانی‌کامل:', 'نشانی_کامل:', 'FULLURL:' ),
+	'fullurle'                  => array( '0', 'نشانی‌کامل‌کد:', 'نشانی_کامل_کد:', 'FULLURLE:' ),
+	'canonicalurl'              => array( '0', 'نشانی_استاندارد:', 'نشانی‌استاندارد:', 'CANONICALURL:' ),
+	'lcfirst'                   => array( '0', 'ابتداکوچک:', 'ابتدا_کوچک:', 'LCFIRST:' ),
+	'ucfirst'                   => array( '0', 'ابتدابزرگ:', 'ابتدا_بزرگ:', 'UCFIRST:' ),
+	'lc'                        => array( '0', 'Ú©:', 'LC:' ),
+	'uc'                        => array( '0', 'ب:', 'UC:' ),
+	'raw'                       => array( '0', 'خام:', 'RAW:' ),
+	'displaytitle'              => array( '1', 'عنوان‌ظاهری', 'عنوان_ظاهری', 'DISPLAYTITLE' ),
+	'rawsuffix'                 => array( '1', 'ن', 'R' ),
+	'newsectionlink'            => array( '1', '__بخش‌جدید__', '__NEWSECTIONLINK__' ),
+	'nonewsectionlink'          => array( '1', '__بی‌پیوندبخش__', '__بی‌پیوند‌بخش‌جدید__', '__NONEWSECTIONLINK__' ),
+	'currentversion'            => array( '1', 'نسخه‌کنونی', 'نسخه_کنونی', 'CURRENTVERSION' ),
+	'urlencode'                 => array( '0', 'کدنشانی:', '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' ),
+	'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' ),
+	'url_path'                  => array( '0', 'مسیر', 'PATH' ),
+	'url_wiki'                  => array( '0', 'ویکی', 'WIKI' ),
+	'url_query'                 => array( '0', 'دستور', 'QUERY' ),
+	'defaultsort_noerror'       => array( '0', 'بدون‌خطا', 'بدون_خطا', 'noerror' ),
+	'defaultsort_noreplace'     => array( '0', 'جایگزین‌نکن', 'جایگزین_نکن', 'noreplace' ),
 );
 
 # Harakat are intentionally not included in the linkTrail. Their addition should
diff --git a/languages/messages/MessagesFi.php b/languages/messages/MessagesFi.php
index ce09c1f74c..b6921e14f6 100644
--- a/languages/messages/MessagesFi.php
+++ b/languages/messages/MessagesFi.php
@@ -103,110 +103,110 @@ $bookstoreList = array(
 );
 
 $magicWords = array(
-	'redirect'                => array( '0', '#OHJAUS', '#UUDELLEENOHJAUS', '#REDIRECT' ),
-	'notoc'                   => array( '0', '__EISISLUETT__', '__NOTOC__' ),
-	'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' ),
-	'currentmonthabbrev'      => array( '1', 'KULUVAKUUNIMILYHYT', 'CURRENTMONTHABBREV' ),
-	'currentday'              => array( '1', 'KULUVAPÄIVÄ', 'CURRENTDAY' ),
-	'currentday2'             => array( '1', 'KULUVAPÄIVÄ2', 'CURRENTDAY2' ),
-	'currentdayname'          => array( '1', 'KULUVAPÄIVÄNIMI', 'CURRENTDAYNAME' ),
-	'currentyear'             => array( '1', 'KULUVAVUOSI', 'CURRENTYEAR' ),
-	'currenttime'             => array( '1', 'KULUVAAIKA', 'CURRENTTIME' ),
-	'currenthour'             => array( '1', 'KULUVATUNTI', 'CURRENTHOUR' ),
-	'localmonth'              => array( '1', 'PAIKALLINENKUU', 'LOCALMONTH', 'LOCALMONTH2' ),
-	'localmonthname'          => array( '1', 'PAIKALLINENKUUNIMI', 'LOCALMONTHNAME' ),
-	'localmonthnamegen'       => array( '1', 'PAIKALLINENKUUNIMIGEN', 'LOCALMONTHNAMEGEN' ),
-	'localmonthabbrev'        => array( '1', 'PAIKALLINENKUUNIMILYHYT', 'LOCALMONTHABBREV' ),
-	'localday'                => array( '1', 'PAIKALLINENPÄIVÄ', 'LOCALDAY' ),
-	'localday2'               => array( '1', 'PAIKALLINENPÄIVÄ2', 'LOCALDAY2' ),
-	'localdayname'            => array( '1', 'PAIKALLINENPÄIVÄNIMI', 'LOCALDAYNAME' ),
-	'localyear'               => array( '1', 'PAIKALLINENVUOSI', 'LOCALYEAR' ),
-	'localtime'               => array( '1', 'PAIKALLINENAIKA', 'LOCALTIME' ),
-	'localhour'               => array( '1', 'PAIKALLINENTUNTI', 'LOCALHOUR' ),
-	'numberofpages'           => array( '1', 'SIVUMÄÄRÄ', 'NUMBEROFPAGES' ),
-	'numberofarticles'        => array( '1', 'ARTIKKELIMÄÄRÄ', 'NUMBEROFARTICLES' ),
-	'numberoffiles'           => array( '1', 'TIEDOSTOMÄÄRÄ', 'NUMBEROFFILES' ),
-	'numberofusers'           => array( '1', 'KÄYTTÄJÄMÄÄRÄ', 'NUMBEROFUSERS' ),
-	'numberofedits'           => array( '1', 'MUOKKAUSMÄÄRÄ', 'NUMBEROFEDITS' ),
-	'numberofviews'           => array( '1', 'SIVUHAKUMÄÄRÄ', 'NUMBEROFVIEWS' ),
-	'pagename'                => array( '1', 'SIVUNIMI', 'PAGENAME' ),
-	'pagenamee'               => array( '1', 'SIVUNIMIE', 'PAGENAMEE' ),
-	'namespace'               => array( '1', 'NIMIAVARUUS', 'NAMESPACE' ),
-	'namespacee'              => array( '1', 'NIMIAVARUUSE', 'NAMESPACEE' ),
-	'talkspace'               => array( '1', 'KESKUSTELUAVARUUS', 'TALKSPACE' ),
-	'talkspacee'              => array( '1', 'KESKUSTELUAVARUUSE', 'TALKSPACEE' ),
-	'subjectspace'            => array( '1', 'AIHEAVARUUS', 'ARTIKKELIAVARUUS', 'SUBJECTSPACE', 'ARTICLESPACE' ),
-	'subjectspacee'           => array( '1', 'AIHEAVARUUSE', 'ARTIKKELIAVARUUSE', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
-	'fullpagename'            => array( '1', 'KOKOSIVUNIMI', 'FULLPAGENAME' ),
-	'fullpagenamee'           => array( '1', 'KOKOSIVUNIMIE', 'FULLPAGENAMEE' ),
-	'subpagename'             => array( '1', 'ALASIVUNIMI', 'SUBPAGENAME' ),
-	'subpagenamee'            => array( '1', 'ALASIVUNIMIE', 'SUBPAGENAMEE' ),
-	'basepagename'            => array( '1', 'KANTASIVUNIMI', 'BASEPAGENAME' ),
-	'basepagenamee'           => array( '1', 'KANTASIVUNIMIE', 'BASEPAGENAMEE' ),
-	'talkpagename'            => array( '1', 'KESKUSTELUSIVUNIMI', 'TALKPAGENAME' ),
-	'talkpagenamee'           => array( '1', 'KESKUSTELUSIVUNIMIE', 'TALKPAGENAMEE' ),
-	'subjectpagename'         => array( '1', 'AIHESIVUNIMI', 'ARTIKKELISIVUNIMI', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
-	'subjectpagenamee'        => array( '1', 'AIHESIVUNIMIE', 'ARTIKKELISIVUNIMIE', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
-	'subst'                   => array( '0', 'VASTINE:', 'SUBST:' ),
-	'img_thumbnail'           => array( '1', 'pienoiskuva', 'pienois', 'thumbnail', 'thumb' ),
-	'img_manualthumb'         => array( '1', 'pienoiskuva=$1', 'pienois=$1', 'thumbnail=$1', 'thumb=$1' ),
-	'img_right'               => array( '1', 'oikea', 'right' ),
-	'img_left'                => array( '1', 'vasen', 'left' ),
-	'img_none'                => array( '1', 'tyhjä', 'none' ),
-	'img_center'              => array( '1', 'keskitetty', 'keski', 'center', 'centre' ),
-	'img_framed'              => array( '1', 'kehys', 'kehystetty', 'framed', 'enframed', 'frame' ),
-	'img_frameless'           => array( '1', 'kehyksetön', 'frameless' ),
-	'img_page'                => array( '1', 'sivu=$1', 'sivu $1', 'page=$1', 'page $1' ),
-	'img_upright'             => array( '1', 'yläoikea', 'yläoikea=$1', 'yläoikea $1', 'upright', 'upright=$1', 'upright $1' ),
-	'img_border'              => array( '1', 'reunus', 'border' ),
-	'img_baseline'            => array( '1', 'perustaso', 'baseline' ),
-	'img_sub'                 => array( '1', 'alaindeksi', 'sub' ),
-	'img_super'               => array( '1', 'yläindeksi', 'super', 'sup' ),
-	'img_top'                 => array( '1', 'ylös', 'ylhäällä', 'top' ),
-	'img_middle'              => array( '1', 'keskellä', 'middle' ),
-	'img_bottom'              => array( '1', 'alas', 'alhaalla', 'bottom' ),
-	'img_link'                => array( '1', 'linkki=$1', 'link=$1' ),
-	'sitename'                => array( '1', 'SIVUSTONIMI', 'SITENAME' ),
-	'ns'                      => array( '0', 'NA:', 'NS:' ),
-	'localurl'                => array( '0', 'PAIKALLINENOSOITE:', 'LOCALURL:' ),
-	'localurle'               => array( '0', 'PAIKALLINENOSOITEE:', 'LOCALURLE:' ),
-	'server'                  => array( '0', 'PALVELIN', 'SERVER' ),
-	'servername'              => array( '0', 'PALVELINNIMI', 'SERVERNAME' ),
-	'scriptpath'              => array( '0', 'SKRIPTIPOLKU', 'SCRIPTPATH' ),
-	'grammar'                 => array( '0', 'TAIVUTUS:', 'GRAMMAR:' ),
-	'gender'                  => array( '0', 'SUKUPUOLI:', 'GENDER:' ),
-	'currentweek'             => array( '1', 'KULUVAVIIKKO', 'CURRENTWEEK' ),
-	'currentdow'              => array( '1', 'KULUVAVIIKONPÄIVÄ', 'CURRENTDOW' ),
-	'localweek'               => array( '1', 'PAIKALLINENVIIKKO', 'LOCALWEEK' ),
-	'localdow'                => array( '1', 'PAIKALLINENVIIKONPÄIVÄ', 'LOCALDOW' ),
-	'revisionid'              => array( '1', 'VERSIOID', 'REVISIONID' ),
-	'revisionday'             => array( '1', 'VERSIOPÄIVÄ', 'REVISIONDAY' ),
-	'revisionday2'            => array( '1', 'VERSIOPÄIVÄ2', 'REVISIONDAY2' ),
-	'revisionmonth'           => array( '1', 'VERSIOKUUKAUSI', 'REVISIONMONTH' ),
-	'revisionyear'            => array( '1', 'VERSIOVUOSI', 'REVISIONYEAR' ),
-	'revisiontimestamp'       => array( '1', 'VERSIOAIKALEIMA', 'REVISIONTIMESTAMP' ),
-	'plural'                  => array( '0', 'MONIKKO:', 'PLURAL:' ),
-	'fullurl'                 => array( '0', 'TÄYSIOSOITE:', 'FULLURL:' ),
-	'fullurle'                => array( '0', 'TÄYSIOSOITEE:', 'FULLURLE:' ),
-	'displaytitle'            => array( '1', 'NÄKYVÄOTSIKKO', 'DISPLAYTITLE' ),
-	'currentversion'          => array( '1', 'NYKYINENVERSIO', 'CURRENTVERSION' ),
-	'currenttimestamp'        => array( '1', 'KULUVAAIKALEIMA', 'CURRENTTIMESTAMP' ),
-	'localtimestamp'          => array( '1', 'PAIKALLINENAIKALEIMA', 'LOCALTIMESTAMP' ),
-	'language'                => array( '0', '#KIELI:', '#LANGUAGE:' ),
-	'numberofadmins'          => array( '1', 'YLLÄPITÄJÄMÄÄRÄ', 'NUMBEROFADMINS' ),
-	'formatnum'               => array( '0', 'MUOTOILELUKU', 'FORMATNUM' ),
-	'defaultsort'             => array( '1', 'AAKKOSTUS:', 'OLETUSAAKKOSTUS:', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:' ),
-	'filepath'                => array( '0', 'TIEDOSTOPOLKU:', 'FILEPATH:' ),
-	'hiddencat'               => array( '1', '__PIILOLUOKKA__', '__HIDDENCAT__' ),
-	'pagesize'                => array( '1', 'SIVUKOKO', 'PAGESIZE' ),
-	'noindex'                 => array( '1', '__HAKUKONEKIELTO__', '__NOINDEX__' ),
-	'protectionlevel'         => array( '1', 'SUOJAUSTASO', 'PROTECTIONLEVEL' ),
+	'redirect'                  => array( '0', '#OHJAUS', '#UUDELLEENOHJAUS', '#REDIRECT' ),
+	'notoc'                     => array( '0', '__EISISLUETT__', '__NOTOC__' ),
+	'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' ),
+	'currentmonthabbrev'        => array( '1', 'KULUVAKUUNIMILYHYT', 'CURRENTMONTHABBREV' ),
+	'currentday'                => array( '1', 'KULUVAPÄIVÄ', 'CURRENTDAY' ),
+	'currentday2'               => array( '1', 'KULUVAPÄIVÄ2', 'CURRENTDAY2' ),
+	'currentdayname'            => array( '1', 'KULUVAPÄIVÄNIMI', 'CURRENTDAYNAME' ),
+	'currentyear'               => array( '1', 'KULUVAVUOSI', 'CURRENTYEAR' ),
+	'currenttime'               => array( '1', 'KULUVAAIKA', 'CURRENTTIME' ),
+	'currenthour'               => array( '1', 'KULUVATUNTI', 'CURRENTHOUR' ),
+	'localmonth'                => array( '1', 'PAIKALLINENKUU', 'LOCALMONTH', 'LOCALMONTH2' ),
+	'localmonthname'            => array( '1', 'PAIKALLINENKUUNIMI', 'LOCALMONTHNAME' ),
+	'localmonthnamegen'         => array( '1', 'PAIKALLINENKUUNIMIGEN', 'LOCALMONTHNAMEGEN' ),
+	'localmonthabbrev'          => array( '1', 'PAIKALLINENKUUNIMILYHYT', 'LOCALMONTHABBREV' ),
+	'localday'                  => array( '1', 'PAIKALLINENPÄIVÄ', 'LOCALDAY' ),
+	'localday2'                 => array( '1', 'PAIKALLINENPÄIVÄ2', 'LOCALDAY2' ),
+	'localdayname'              => array( '1', 'PAIKALLINENPÄIVÄNIMI', 'LOCALDAYNAME' ),
+	'localyear'                 => array( '1', 'PAIKALLINENVUOSI', 'LOCALYEAR' ),
+	'localtime'                 => array( '1', 'PAIKALLINENAIKA', 'LOCALTIME' ),
+	'localhour'                 => array( '1', 'PAIKALLINENTUNTI', 'LOCALHOUR' ),
+	'numberofpages'             => array( '1', 'SIVUMÄÄRÄ', 'NUMBEROFPAGES' ),
+	'numberofarticles'          => array( '1', 'ARTIKKELIMÄÄRÄ', 'NUMBEROFARTICLES' ),
+	'numberoffiles'             => array( '1', 'TIEDOSTOMÄÄRÄ', 'NUMBEROFFILES' ),
+	'numberofusers'             => array( '1', 'KÄYTTÄJÄMÄÄRÄ', 'NUMBEROFUSERS' ),
+	'numberofedits'             => array( '1', 'MUOKKAUSMÄÄRÄ', 'NUMBEROFEDITS' ),
+	'numberofviews'             => array( '1', 'SIVUHAKUMÄÄRÄ', 'NUMBEROFVIEWS' ),
+	'pagename'                  => array( '1', 'SIVUNIMI', 'PAGENAME' ),
+	'pagenamee'                 => array( '1', 'SIVUNIMIE', 'PAGENAMEE' ),
+	'namespace'                 => array( '1', 'NIMIAVARUUS', 'NAMESPACE' ),
+	'namespacee'                => array( '1', 'NIMIAVARUUSE', 'NAMESPACEE' ),
+	'talkspace'                 => array( '1', 'KESKUSTELUAVARUUS', 'TALKSPACE' ),
+	'talkspacee'                => array( '1', 'KESKUSTELUAVARUUSE', 'TALKSPACEE' ),
+	'subjectspace'              => array( '1', 'AIHEAVARUUS', 'ARTIKKELIAVARUUS', 'SUBJECTSPACE', 'ARTICLESPACE' ),
+	'subjectspacee'             => array( '1', 'AIHEAVARUUSE', 'ARTIKKELIAVARUUSE', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
+	'fullpagename'              => array( '1', 'KOKOSIVUNIMI', 'FULLPAGENAME' ),
+	'fullpagenamee'             => array( '1', 'KOKOSIVUNIMIE', 'FULLPAGENAMEE' ),
+	'subpagename'               => array( '1', 'ALASIVUNIMI', 'SUBPAGENAME' ),
+	'subpagenamee'              => array( '1', 'ALASIVUNIMIE', 'SUBPAGENAMEE' ),
+	'basepagename'              => array( '1', 'KANTASIVUNIMI', 'BASEPAGENAME' ),
+	'basepagenamee'             => array( '1', 'KANTASIVUNIMIE', 'BASEPAGENAMEE' ),
+	'talkpagename'              => array( '1', 'KESKUSTELUSIVUNIMI', 'TALKPAGENAME' ),
+	'talkpagenamee'             => array( '1', 'KESKUSTELUSIVUNIMIE', 'TALKPAGENAMEE' ),
+	'subjectpagename'           => array( '1', 'AIHESIVUNIMI', 'ARTIKKELISIVUNIMI', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
+	'subjectpagenamee'          => array( '1', 'AIHESIVUNIMIE', 'ARTIKKELISIVUNIMIE', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
+	'subst'                     => array( '0', 'VASTINE:', 'SUBST:' ),
+	'img_thumbnail'             => array( '1', 'pienoiskuva', 'pienois', 'thumbnail', 'thumb' ),
+	'img_manualthumb'           => array( '1', 'pienoiskuva=$1', 'pienois=$1', 'thumbnail=$1', 'thumb=$1' ),
+	'img_right'                 => array( '1', 'oikea', 'right' ),
+	'img_left'                  => array( '1', 'vasen', 'left' ),
+	'img_none'                  => array( '1', 'tyhjä', 'none' ),
+	'img_center'                => array( '1', 'keskitetty', 'keski', 'center', 'centre' ),
+	'img_framed'                => array( '1', 'kehys', 'kehystetty', 'framed', 'enframed', 'frame' ),
+	'img_frameless'             => array( '1', 'kehyksetön', 'frameless' ),
+	'img_page'                  => array( '1', 'sivu=$1', 'sivu $1', 'page=$1', 'page $1' ),
+	'img_upright'               => array( '1', 'yläoikea', 'yläoikea=$1', 'yläoikea $1', 'upright', 'upright=$1', 'upright $1' ),
+	'img_border'                => array( '1', 'reunus', 'border' ),
+	'img_baseline'              => array( '1', 'perustaso', 'baseline' ),
+	'img_sub'                   => array( '1', 'alaindeksi', 'sub' ),
+	'img_super'                 => array( '1', 'yläindeksi', 'super', 'sup' ),
+	'img_top'                   => array( '1', 'ylös', 'ylhäällä', 'top' ),
+	'img_middle'                => array( '1', 'keskellä', 'middle' ),
+	'img_bottom'                => array( '1', 'alas', 'alhaalla', 'bottom' ),
+	'img_link'                  => array( '1', 'linkki=$1', 'link=$1' ),
+	'sitename'                  => array( '1', 'SIVUSTONIMI', 'SITENAME' ),
+	'ns'                        => array( '0', 'NA:', 'NS:' ),
+	'localurl'                  => array( '0', 'PAIKALLINENOSOITE:', 'LOCALURL:' ),
+	'localurle'                 => array( '0', 'PAIKALLINENOSOITEE:', 'LOCALURLE:' ),
+	'server'                    => array( '0', 'PALVELIN', 'SERVER' ),
+	'servername'                => array( '0', 'PALVELINNIMI', 'SERVERNAME' ),
+	'scriptpath'                => array( '0', 'SKRIPTIPOLKU', 'SCRIPTPATH' ),
+	'grammar'                   => array( '0', 'TAIVUTUS:', 'GRAMMAR:' ),
+	'gender'                    => array( '0', 'SUKUPUOLI:', 'GENDER:' ),
+	'currentweek'               => array( '1', 'KULUVAVIIKKO', 'CURRENTWEEK' ),
+	'currentdow'                => array( '1', 'KULUVAVIIKONPÄIVÄ', 'CURRENTDOW' ),
+	'localweek'                 => array( '1', 'PAIKALLINENVIIKKO', 'LOCALWEEK' ),
+	'localdow'                  => array( '1', 'PAIKALLINENVIIKONPÄIVÄ', 'LOCALDOW' ),
+	'revisionid'                => array( '1', 'VERSIOID', 'REVISIONID' ),
+	'revisionday'               => array( '1', 'VERSIOPÄIVÄ', 'REVISIONDAY' ),
+	'revisionday2'              => array( '1', 'VERSIOPÄIVÄ2', 'REVISIONDAY2' ),
+	'revisionmonth'             => array( '1', 'VERSIOKUUKAUSI', 'REVISIONMONTH' ),
+	'revisionyear'              => array( '1', 'VERSIOVUOSI', 'REVISIONYEAR' ),
+	'revisiontimestamp'         => array( '1', 'VERSIOAIKALEIMA', 'REVISIONTIMESTAMP' ),
+	'plural'                    => array( '0', 'MONIKKO:', 'PLURAL:' ),
+	'fullurl'                   => array( '0', 'TÄYSIOSOITE:', 'FULLURL:' ),
+	'fullurle'                  => array( '0', 'TÄYSIOSOITEE:', 'FULLURLE:' ),
+	'displaytitle'              => array( '1', 'NÄKYVÄOTSIKKO', 'DISPLAYTITLE' ),
+	'currentversion'            => array( '1', 'NYKYINENVERSIO', 'CURRENTVERSION' ),
+	'currenttimestamp'          => array( '1', 'KULUVAAIKALEIMA', 'CURRENTTIMESTAMP' ),
+	'localtimestamp'            => array( '1', 'PAIKALLINENAIKALEIMA', 'LOCALTIMESTAMP' ),
+	'language'                  => array( '0', '#KIELI:', '#LANGUAGE:' ),
+	'numberofadmins'            => array( '1', 'YLLÄPITÄJÄMÄÄRÄ', 'NUMBEROFADMINS' ),
+	'formatnum'                 => array( '0', 'MUOTOILELUKU', 'FORMATNUM' ),
+	'defaultsort'               => array( '1', 'AAKKOSTUS:', 'OLETUSAAKKOSTUS:', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:' ),
+	'filepath'                  => array( '0', 'TIEDOSTOPOLKU:', 'FILEPATH:' ),
+	'hiddencat'                 => array( '1', '__PIILOLUOKKA__', '__HIDDENCAT__' ),
+	'pagesize'                  => array( '1', 'SIVUKOKO', 'PAGESIZE' ),
+	'noindex'                   => array( '1', '__HAKUKONEKIELTO__', '__NOINDEX__' ),
+	'protectionlevel'           => array( '1', 'SUOJAUSTASO', 'PROTECTIONLEVEL' ),
 );
 
 $specialPageAliases = array(
diff --git a/languages/messages/MessagesFr.php b/languages/messages/MessagesFr.php
index 3838f0ecdc..5b1f34a987 100644
--- a/languages/messages/MessagesFr.php
+++ b/languages/messages/MessagesFr.php
@@ -65,6 +65,7 @@
  * @author Sandji
  * @author Seb35
  * @author Sherbrooke
+ * @author Shirayuki
  * @author Skalman
  * @author The Evil IP address
  * @author Tititou36
@@ -135,143 +136,143 @@ $dateFormats = array(
 );
 
 $magicWords = array(
-	'redirect'                => array( '0', '#REDIRECTION', '#REDIRECT' ),
-	'notoc'                   => array( '0', '__AUCUNSOMMAIRE__', '__AUCUNETDM__', '__NOTOC__' ),
-	'nogallery'               => array( '0', '__AUCUNEGALERIE__', '__NOGALLERY__' ),
-	'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' ),
-	'currentmonthnamegen'     => array( '1', 'NOMGENMOISACTUEL', 'CURRENTMONTHNAMEGEN' ),
-	'currentmonthabbrev'      => array( '1', 'ABREVMOISACTUEL', 'CURRENTMONTHABBREV' ),
-	'currentday'              => array( '1', 'JOURACTUEL', 'JOUR1ACTUEL', 'CURRENTDAY' ),
-	'currentday2'             => array( '1', 'JOUR2ACTUEL', 'CURRENTDAY2' ),
-	'currentdayname'          => array( '1', 'NOMJOURACTUEL', 'CURRENTDAYNAME' ),
-	'currentyear'             => array( '1', 'ANNEEACTUELLE', 'CURRENTYEAR' ),
-	'currenttime'             => array( '1', 'HORAIREACTUEL', 'CURRENTTIME' ),
-	'currenthour'             => array( '1', 'HEUREACTUELLE', 'CURRENTHOUR' ),
-	'localmonth'              => array( '1', 'MOISLOCAL', 'MOIS2LOCAL', 'LOCALMONTH', 'LOCALMONTH2' ),
-	'localmonth1'             => array( '1', 'MOIS1LOCAL', 'LOCALMONTH1' ),
-	'localmonthname'          => array( '1', 'NOMMOISLOCAL', 'LOCALMONTHNAME' ),
-	'localmonthnamegen'       => array( '1', 'NOMGENMOISLOCAL', 'LOCALMONTHNAMEGEN' ),
-	'localmonthabbrev'        => array( '1', 'ABREVMOISLOCAL', 'LOCALMONTHABBREV' ),
-	'localday'                => array( '1', 'JOURLOCAL', 'JOUR1LOCAL', 'LOCALDAY' ),
-	'localday2'               => array( '1', 'JOUR2LOCAL', 'LOCALDAY2' ),
-	'localdayname'            => array( '1', 'NOMJOURLOCAL', 'LOCALDAYNAME' ),
-	'localyear'               => array( '1', 'ANNEELOCALE', 'LOCALYEAR' ),
-	'localtime'               => array( '1', 'HORAIRELOCAL', 'LOCALTIME' ),
-	'localhour'               => array( '1', 'HEURELOCALE', 'LOCALHOUR' ),
-	'numberofpages'           => array( '1', 'NOMBREPAGES', 'NUMBEROFPAGES' ),
-	'numberofarticles'        => array( '1', 'NOMBREARTICLES', 'NUMBEROFARTICLES' ),
-	'numberoffiles'           => array( '1', 'NOMBREFICHIERS', 'NUMBEROFFILES' ),
-	'numberofusers'           => array( '1', 'NOMBREUTILISATEURS', 'NUMBEROFUSERS' ),
-	'numberofactiveusers'     => array( '1', 'NOMBREUTILISATEURSACTIFS', 'NUMBEROFACTIVEUSERS' ),
-	'numberofedits'           => array( '1', 'NOMBREMODIFS', 'NUMBEROFEDITS' ),
-	'numberofviews'           => array( '1', 'NOMBREVUES', 'NUMBEROFVIEWS' ),
-	'pagename'                => array( '1', 'NOMPAGE', 'PAGENAME' ),
-	'pagenamee'               => array( '1', 'NOMPAGEX', 'PAGENAMEE' ),
-	'namespace'               => array( '1', 'ESPACENOMMAGE', 'NAMESPACE' ),
-	'namespacee'              => array( '1', 'ESPACENOMMAGEX', 'NAMESPACEE' ),
-	'talkspace'               => array( '1', 'ESPACEDISCUSSION', 'TALKSPACE' ),
-	'talkspacee'              => array( '1', 'ESPACEDISCUSSIONX', 'TALKSPACEE' ),
-	'subjectspace'            => array( '1', 'ESPACESUJET', 'ESPACEARTICLE', 'SUBJECTSPACE', 'ARTICLESPACE' ),
-	'subjectspacee'           => array( '1', 'ESPACESUJETX', 'ESPACEARTICLEX', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
-	'fullpagename'            => array( '1', 'NOMPAGECOMPLET', 'FULLPAGENAME' ),
-	'fullpagenamee'           => array( '1', 'NOMPAGECOMPLETX', 'FULLPAGENAMEE' ),
-	'subpagename'             => array( '1', 'NOMSOUSPAGE', 'SUBPAGENAME' ),
-	'subpagenamee'            => array( '1', 'NOMSOUSPAGEX', 'SUBPAGENAMEE' ),
-	'basepagename'            => array( '1', 'NOMBASEDEPAGE', 'BASEPAGENAME' ),
-	'basepagenamee'           => array( '1', 'NOMBASEDEPAGEX', 'BASEPAGENAMEE' ),
-	'talkpagename'            => array( '1', 'NOMPAGEDISCUSSION', 'TALKPAGENAME' ),
-	'talkpagenamee'           => array( '1', 'NOMPAGEDISCUSSIONX', 'TALKPAGENAMEE' ),
-	'subjectpagename'         => array( '1', 'NOMPAGESUJET', 'NOMPAGEARTICLE', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
-	'subjectpagenamee'        => array( '1', 'NOMPAGESUJETX', 'NOMPAGEARTICLEX', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
-	'img_thumbnail'           => array( '1', 'vignette', 'thumbnail', 'thumb' ),
-	'img_manualthumb'         => array( '1', 'vignette=$1', 'thumbnail=$1', 'thumb=$1' ),
-	'img_right'               => array( '1', 'droite', 'right' ),
-	'img_left'                => array( '1', 'gauche', 'left' ),
-	'img_none'                => array( '1', 'néant', 'neant', 'none' ),
-	'img_center'              => array( '1', 'centré', 'center', 'centre' ),
-	'img_framed'              => array( '1', 'cadre', 'encadré', 'encadre', 'framed', 'enframed', 'frame' ),
-	'img_frameless'           => array( '1', 'sans_cadre', 'non_encadré', 'non_encadre', 'frameless' ),
-	'img_upright'             => array( '1', 'redresse', 'redresse=$1', 'redresse $1', 'upright', 'upright=$1', 'upright $1' ),
-	'img_border'              => array( '1', 'bordure', 'border' ),
-	'img_baseline'            => array( '1', 'ligne_de_base', 'base', 'baseline' ),
-	'img_sub'                 => array( '1', 'indice', 'ind', 'sub' ),
-	'img_super'               => array( '1', 'exposant', 'exp', 'super', 'sup' ),
-	'img_top'                 => array( '1', 'haut', 'top' ),
-	'img_text_top'            => array( '1', 'haut-texte', 'haut-txt', 'text-top' ),
-	'img_middle'              => array( '1', 'milieu', 'middle' ),
-	'img_bottom'              => array( '1', 'bas', 'bottom' ),
-	'img_text_bottom'         => array( '1', 'bas-texte', 'bas-txt', 'text-bottom' ),
-	'img_link'                => array( '1', 'lien=$1', 'link=$1' ),
-	'sitename'                => array( '1', 'NOMSITE', 'SITENAME' ),
-	'ns'                      => array( '0', 'ESPACEN:', 'NS:' ),
-	'nse'                     => array( '0', 'ESPACENX:', 'NSE:' ),
-	'localurl'                => array( '0', 'URLLOCALE:', 'LOCALURL:' ),
-	'localurle'               => array( '0', 'URLLOCALEX:', 'LOCALURLE:' ),
-	'articlepath'             => array( '0', 'CHEMINARTICLE', 'ARTICLEPATH' ),
-	'server'                  => array( '0', 'SERVEUR', 'SERVER' ),
-	'servername'              => array( '0', 'NOMSERVEUR', 'SERVERNAME' ),
-	'scriptpath'              => array( '0', 'CHEMINSCRIPT', 'SCRIPTPATH' ),
-	'stylepath'               => array( '0', 'CHEMINSTYLE', 'STYLEPATH' ),
-	'grammar'                 => array( '0', 'GRAMMAIRE:', 'GRAMMAR:' ),
-	'gender'                  => array( '0', 'GENRE:', 'GENDER:' ),
-	'notitleconvert'          => array( '0', '__SANSCONVERSIONTITRE__', '__SANSCT__', '__NOTITLECONVERT__', '__NOTC__' ),
-	'nocontentconvert'        => array( '0', '__SANSCONVERSIONCONTENU__', '__SANSCC__', '__NOCONTENTCONVERT__', '__NOCC__' ),
-	'currentweek'             => array( '1', 'SEMAINEACTUELLE', 'CURRENTWEEK' ),
-	'currentdow'              => array( '1', 'JDSACTUEL', 'CURRENTDOW' ),
-	'localweek'               => array( '1', 'SEMAINELOCALE', 'LOCALWEEK' ),
-	'localdow'                => array( '1', 'JDSLOCAL', 'LOCALDOW' ),
-	'revisionid'              => array( '1', 'IDVERSION', 'REVISIONID' ),
-	'revisionday'             => array( '1', 'JOURVERSION', 'JOUR1VERSION', 'REVISIONDAY' ),
-	'revisionday2'            => array( '1', 'JOUR2VERSION', 'REVISIONDAY2' ),
-	'revisionmonth'           => array( '1', 'MOISVERSION', 'REVISIONMONTH' ),
-	'revisionmonth1'          => array( '1', 'MOISVERSION1', 'REVISIONMONTH1' ),
-	'revisionyear'            => array( '1', 'ANNEEVERSION', 'REVISIONYEAR' ),
-	'revisiontimestamp'       => array( '1', 'INSTANTVERSION', 'REVISIONTIMESTAMP' ),
-	'revisionuser'            => array( '1', 'UTILISATEURVERSION', 'REVISIONUSER' ),
-	'plural'                  => array( '0', 'PLURIEL:', 'PLURAL:' ),
-	'fullurl'                 => array( '0', 'URLCOMPLETE:', 'FULLURL:' ),
-	'fullurle'                => array( '0', 'URLCOMPLETEX:', 'FULLURLE:' ),
-	'lcfirst'                 => array( '0', 'INITMINUS:', 'LCFIRST:' ),
-	'ucfirst'                 => array( '0', 'INITMAJUS:', 'INITCAPIT:', 'UCFIRST:' ),
-	'lc'                      => array( '0', 'MINUS:', 'LC:' ),
-	'uc'                      => array( '0', 'MAJUS:', 'CAPIT:', 'UC:' ),
-	'raw'                     => array( '0', 'BRUT:', 'RAW:' ),
-	'displaytitle'            => array( '1', 'AFFICHERTITRE', 'DISPLAYTITLE' ),
-	'rawsuffix'               => array( '1', 'BRUT', 'B', 'R' ),
-	'newsectionlink'          => array( '1', '__LIENNOUVELLESECTION__', '__NEWSECTIONLINK__' ),
-	'nonewsectionlink'        => array( '1', '__AUCUNLIENNOUVELLESECTION__', '__NONEWSECTIONLINK__' ),
-	'currentversion'          => array( '1', 'VERSIONACTUELLE', 'CURRENTVERSION' ),
-	'urlencode'               => array( '0', 'ENCODEURL:', 'URLENCODE:' ),
-	'anchorencode'            => array( '0', 'ENCODEANCRE', 'ANCHORENCODE' ),
-	'currenttimestamp'        => array( '1', 'INSTANTACTUEL', 'CURRENTTIMESTAMP' ),
-	'localtimestamp'          => array( '1', 'INSTANTLOCAL', 'LOCALTIMESTAMP' ),
-	'directionmark'           => array( '1', 'MARQUEDIRECTION', 'MARQUEDIR', 'DIRECTIONMARK', 'DIRMARK' ),
-	'language'                => array( '0', '#LANGUE:', '#LANGUAGE:' ),
-	'contentlanguage'         => array( '1', 'LANGUECONTENU', 'LANGCONTENU', 'CONTENTLANGUAGE', 'CONTENTLANG' ),
-	'pagesinnamespace'        => array( '1', 'PAGESDANSESPACE:', 'PAGESINNAMESPACE:', 'PAGESINNS:' ),
-	'numberofadmins'          => array( '1', 'NOMBREADMINS', 'NUMBEROFADMINS' ),
-	'formatnum'               => array( '0', 'FORMATNOMBRE', 'FORMATNUM' ),
-	'padleft'                 => array( '0', 'BOURRAGEGAUCHE', 'BOURREGAUCHE', 'PADLEFT' ),
-	'padright'                => array( '0', 'BOURRAGEDROITE', 'BOURREDROITE', 'PADRIGHT' ),
-	'special'                 => array( '0', 'spécial', 'special' ),
-	'defaultsort'             => array( '1', 'CLEFDETRI:', 'CLEDETRI:', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:' ),
-	'filepath'                => array( '0', 'CHEMIN:', 'FILEPATH:' ),
-	'tag'                     => array( '0', 'balise', 'tag' ),
-	'hiddencat'               => array( '1', '__CATCACHEE__', '__HIDDENCAT__' ),
-	'pagesincategory'         => array( '1', 'PAGESDANSCAT', 'PAGESINCATEGORY', 'PAGESINCAT' ),
-	'pagesize'                => array( '1', 'TAILLEPAGE', 'PAGESIZE' ),
-	'noindex'                 => array( '1', '__AUCUNINDEX__', '__NOINDEX__' ),
-	'numberingroup'           => array( '1', 'NOMBREDANSGROUPE', 'NBDANSGROUPE', 'NUMBERINGROUP', 'NUMINGROUP' ),
-	'staticredirect'          => array( '1', '__REDIRECTIONSTATIQUE__', '__STATICREDIRECT__' ),
-	'protectionlevel'         => array( '1', 'NIVEAUDEPROTECTION', 'PROTECTIONLEVEL' ),
-	'url_path'                => array( '0', 'CHEMIN', 'PATH' ),
-	'url_query'               => array( '0', 'QUESTION', 'QUERY' ),
+	'redirect'                  => array( '0', '#REDIRECTION', '#REDIRECT' ),
+	'notoc'                     => array( '0', '__AUCUNSOMMAIRE__', '__AUCUNETDM__', '__NOTOC__' ),
+	'nogallery'                 => array( '0', '__AUCUNEGALERIE__', '__NOGALLERY__' ),
+	'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' ),
+	'currentmonthnamegen'       => array( '1', 'NOMGENMOISACTUEL', 'CURRENTMONTHNAMEGEN' ),
+	'currentmonthabbrev'        => array( '1', 'ABREVMOISACTUEL', 'CURRENTMONTHABBREV' ),
+	'currentday'                => array( '1', 'JOURACTUEL', 'JOUR1ACTUEL', 'CURRENTDAY' ),
+	'currentday2'               => array( '1', 'JOUR2ACTUEL', 'CURRENTDAY2' ),
+	'currentdayname'            => array( '1', 'NOMJOURACTUEL', 'CURRENTDAYNAME' ),
+	'currentyear'               => array( '1', 'ANNEEACTUELLE', 'CURRENTYEAR' ),
+	'currenttime'               => array( '1', 'HORAIREACTUEL', 'CURRENTTIME' ),
+	'currenthour'               => array( '1', 'HEUREACTUELLE', 'CURRENTHOUR' ),
+	'localmonth'                => array( '1', 'MOISLOCAL', 'MOIS2LOCAL', 'LOCALMONTH', 'LOCALMONTH2' ),
+	'localmonth1'               => array( '1', 'MOIS1LOCAL', 'LOCALMONTH1' ),
+	'localmonthname'            => array( '1', 'NOMMOISLOCAL', 'LOCALMONTHNAME' ),
+	'localmonthnamegen'         => array( '1', 'NOMGENMOISLOCAL', 'LOCALMONTHNAMEGEN' ),
+	'localmonthabbrev'          => array( '1', 'ABREVMOISLOCAL', 'LOCALMONTHABBREV' ),
+	'localday'                  => array( '1', 'JOURLOCAL', 'JOUR1LOCAL', 'LOCALDAY' ),
+	'localday2'                 => array( '1', 'JOUR2LOCAL', 'LOCALDAY2' ),
+	'localdayname'              => array( '1', 'NOMJOURLOCAL', 'LOCALDAYNAME' ),
+	'localyear'                 => array( '1', 'ANNEELOCALE', 'LOCALYEAR' ),
+	'localtime'                 => array( '1', 'HORAIRELOCAL', 'LOCALTIME' ),
+	'localhour'                 => array( '1', 'HEURELOCALE', 'LOCALHOUR' ),
+	'numberofpages'             => array( '1', 'NOMBREPAGES', 'NUMBEROFPAGES' ),
+	'numberofarticles'          => array( '1', 'NOMBREARTICLES', 'NUMBEROFARTICLES' ),
+	'numberoffiles'             => array( '1', 'NOMBREFICHIERS', 'NUMBEROFFILES' ),
+	'numberofusers'             => array( '1', 'NOMBREUTILISATEURS', 'NUMBEROFUSERS' ),
+	'numberofactiveusers'       => array( '1', 'NOMBREUTILISATEURSACTIFS', 'NUMBEROFACTIVEUSERS' ),
+	'numberofedits'             => array( '1', 'NOMBREMODIFS', 'NUMBEROFEDITS' ),
+	'numberofviews'             => array( '1', 'NOMBREVUES', 'NUMBEROFVIEWS' ),
+	'pagename'                  => array( '1', 'NOMPAGE', 'PAGENAME' ),
+	'pagenamee'                 => array( '1', 'NOMPAGEX', 'PAGENAMEE' ),
+	'namespace'                 => array( '1', 'ESPACENOMMAGE', 'NAMESPACE' ),
+	'namespacee'                => array( '1', 'ESPACENOMMAGEX', 'NAMESPACEE' ),
+	'talkspace'                 => array( '1', 'ESPACEDISCUSSION', 'TALKSPACE' ),
+	'talkspacee'                => array( '1', 'ESPACEDISCUSSIONX', 'TALKSPACEE' ),
+	'subjectspace'              => array( '1', 'ESPACESUJET', 'ESPACEARTICLE', 'SUBJECTSPACE', 'ARTICLESPACE' ),
+	'subjectspacee'             => array( '1', 'ESPACESUJETX', 'ESPACEARTICLEX', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
+	'fullpagename'              => array( '1', 'NOMPAGECOMPLET', 'FULLPAGENAME' ),
+	'fullpagenamee'             => array( '1', 'NOMPAGECOMPLETX', 'FULLPAGENAMEE' ),
+	'subpagename'               => array( '1', 'NOMSOUSPAGE', 'SUBPAGENAME' ),
+	'subpagenamee'              => array( '1', 'NOMSOUSPAGEX', 'SUBPAGENAMEE' ),
+	'basepagename'              => array( '1', 'NOMBASEDEPAGE', 'BASEPAGENAME' ),
+	'basepagenamee'             => array( '1', 'NOMBASEDEPAGEX', 'BASEPAGENAMEE' ),
+	'talkpagename'              => array( '1', 'NOMPAGEDISCUSSION', 'TALKPAGENAME' ),
+	'talkpagenamee'             => array( '1', 'NOMPAGEDISCUSSIONX', 'TALKPAGENAMEE' ),
+	'subjectpagename'           => array( '1', 'NOMPAGESUJET', 'NOMPAGEARTICLE', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
+	'subjectpagenamee'          => array( '1', 'NOMPAGESUJETX', 'NOMPAGEARTICLEX', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
+	'img_thumbnail'             => array( '1', 'vignette', 'thumbnail', 'thumb' ),
+	'img_manualthumb'           => array( '1', 'vignette=$1', 'thumbnail=$1', 'thumb=$1' ),
+	'img_right'                 => array( '1', 'droite', 'right' ),
+	'img_left'                  => array( '1', 'gauche', 'left' ),
+	'img_none'                  => array( '1', 'néant', 'neant', 'none' ),
+	'img_center'                => array( '1', 'centré', 'center', 'centre' ),
+	'img_framed'                => array( '1', 'cadre', 'encadré', 'encadre', 'framed', 'enframed', 'frame' ),
+	'img_frameless'             => array( '1', 'sans_cadre', 'non_encadré', 'non_encadre', 'frameless' ),
+	'img_upright'               => array( '1', 'redresse', 'redresse=$1', 'redresse $1', 'upright', 'upright=$1', 'upright $1' ),
+	'img_border'                => array( '1', 'bordure', 'border' ),
+	'img_baseline'              => array( '1', 'ligne_de_base', 'base', 'baseline' ),
+	'img_sub'                   => array( '1', 'indice', 'ind', 'sub' ),
+	'img_super'                 => array( '1', 'exposant', 'exp', 'super', 'sup' ),
+	'img_top'                   => array( '1', 'haut', 'top' ),
+	'img_text_top'              => array( '1', 'haut-texte', 'haut-txt', 'text-top' ),
+	'img_middle'                => array( '1', 'milieu', 'middle' ),
+	'img_bottom'                => array( '1', 'bas', 'bottom' ),
+	'img_text_bottom'           => array( '1', 'bas-texte', 'bas-txt', 'text-bottom' ),
+	'img_link'                  => array( '1', 'lien=$1', 'link=$1' ),
+	'sitename'                  => array( '1', 'NOMSITE', 'SITENAME' ),
+	'ns'                        => array( '0', 'ESPACEN:', 'NS:' ),
+	'nse'                       => array( '0', 'ESPACENX:', 'NSE:' ),
+	'localurl'                  => array( '0', 'URLLOCALE:', 'LOCALURL:' ),
+	'localurle'                 => array( '0', 'URLLOCALEX:', 'LOCALURLE:' ),
+	'articlepath'               => array( '0', 'CHEMINARTICLE', 'ARTICLEPATH' ),
+	'server'                    => array( '0', 'SERVEUR', 'SERVER' ),
+	'servername'                => array( '0', 'NOMSERVEUR', 'SERVERNAME' ),
+	'scriptpath'                => array( '0', 'CHEMINSCRIPT', 'SCRIPTPATH' ),
+	'stylepath'                 => array( '0', 'CHEMINSTYLE', 'STYLEPATH' ),
+	'grammar'                   => array( '0', 'GRAMMAIRE:', 'GRAMMAR:' ),
+	'gender'                    => array( '0', 'GENRE:', 'GENDER:' ),
+	'notitleconvert'            => array( '0', '__SANSCONVERSIONTITRE__', '__SANSCT__', '__NOTITLECONVERT__', '__NOTC__' ),
+	'nocontentconvert'          => array( '0', '__SANSCONVERSIONCONTENU__', '__SANSCC__', '__NOCONTENTCONVERT__', '__NOCC__' ),
+	'currentweek'               => array( '1', 'SEMAINEACTUELLE', 'CURRENTWEEK' ),
+	'currentdow'                => array( '1', 'JDSACTUEL', 'CURRENTDOW' ),
+	'localweek'                 => array( '1', 'SEMAINELOCALE', 'LOCALWEEK' ),
+	'localdow'                  => array( '1', 'JDSLOCAL', 'LOCALDOW' ),
+	'revisionid'                => array( '1', 'IDVERSION', 'REVISIONID' ),
+	'revisionday'               => array( '1', 'JOURVERSION', 'JOUR1VERSION', 'REVISIONDAY' ),
+	'revisionday2'              => array( '1', 'JOUR2VERSION', 'REVISIONDAY2' ),
+	'revisionmonth'             => array( '1', 'MOISVERSION', 'REVISIONMONTH' ),
+	'revisionmonth1'            => array( '1', 'MOISVERSION1', 'REVISIONMONTH1' ),
+	'revisionyear'              => array( '1', 'ANNEEVERSION', 'REVISIONYEAR' ),
+	'revisiontimestamp'         => array( '1', 'INSTANTVERSION', 'REVISIONTIMESTAMP' ),
+	'revisionuser'              => array( '1', 'UTILISATEURVERSION', 'REVISIONUSER' ),
+	'plural'                    => array( '0', 'PLURIEL:', 'PLURAL:' ),
+	'fullurl'                   => array( '0', 'URLCOMPLETE:', 'FULLURL:' ),
+	'fullurle'                  => array( '0', 'URLCOMPLETEX:', 'FULLURLE:' ),
+	'lcfirst'                   => array( '0', 'INITMINUS:', 'LCFIRST:' ),
+	'ucfirst'                   => array( '0', 'INITMAJUS:', 'INITCAPIT:', 'UCFIRST:' ),
+	'lc'                        => array( '0', 'MINUS:', 'LC:' ),
+	'uc'                        => array( '0', 'MAJUS:', 'CAPIT:', 'UC:' ),
+	'raw'                       => array( '0', 'BRUT:', 'RAW:' ),
+	'displaytitle'              => array( '1', 'AFFICHERTITRE', 'DISPLAYTITLE' ),
+	'rawsuffix'                 => array( '1', 'BRUT', 'B', 'R' ),
+	'newsectionlink'            => array( '1', '__LIENNOUVELLESECTION__', '__NEWSECTIONLINK__' ),
+	'nonewsectionlink'          => array( '1', '__AUCUNLIENNOUVELLESECTION__', '__NONEWSECTIONLINK__' ),
+	'currentversion'            => array( '1', 'VERSIONACTUELLE', 'CURRENTVERSION' ),
+	'urlencode'                 => array( '0', 'ENCODEURL:', 'URLENCODE:' ),
+	'anchorencode'              => array( '0', 'ENCODEANCRE', 'ANCHORENCODE' ),
+	'currenttimestamp'          => array( '1', 'INSTANTACTUEL', 'CURRENTTIMESTAMP' ),
+	'localtimestamp'            => array( '1', 'INSTANTLOCAL', 'LOCALTIMESTAMP' ),
+	'directionmark'             => array( '1', 'MARQUEDIRECTION', 'MARQUEDIR', 'DIRECTIONMARK', 'DIRMARK' ),
+	'language'                  => array( '0', '#LANGUE:', '#LANGUAGE:' ),
+	'contentlanguage'           => array( '1', 'LANGUECONTENU', 'LANGCONTENU', 'CONTENTLANGUAGE', 'CONTENTLANG' ),
+	'pagesinnamespace'          => array( '1', 'PAGESDANSESPACE:', 'PAGESINNAMESPACE:', 'PAGESINNS:' ),
+	'numberofadmins'            => array( '1', 'NOMBREADMINS', 'NUMBEROFADMINS' ),
+	'formatnum'                 => array( '0', 'FORMATNOMBRE', 'FORMATNUM' ),
+	'padleft'                   => array( '0', 'BOURRAGEGAUCHE', 'BOURREGAUCHE', 'PADLEFT' ),
+	'padright'                  => array( '0', 'BOURRAGEDROITE', 'BOURREDROITE', 'PADRIGHT' ),
+	'special'                   => array( '0', 'spécial', 'special' ),
+	'defaultsort'               => array( '1', 'CLEFDETRI:', 'CLEDETRI:', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:' ),
+	'filepath'                  => array( '0', 'CHEMIN:', 'FILEPATH:' ),
+	'tag'                       => array( '0', 'balise', 'tag' ),
+	'hiddencat'                 => array( '1', '__CATCACHEE__', '__HIDDENCAT__' ),
+	'pagesincategory'           => array( '1', 'PAGESDANSCAT', 'PAGESINCATEGORY', 'PAGESINCAT' ),
+	'pagesize'                  => array( '1', 'TAILLEPAGE', 'PAGESIZE' ),
+	'noindex'                   => array( '1', '__AUCUNINDEX__', '__NOINDEX__' ),
+	'numberingroup'             => array( '1', 'NOMBREDANSGROUPE', 'NBDANSGROUPE', 'NUMBERINGROUP', 'NUMINGROUP' ),
+	'staticredirect'            => array( '1', '__REDIRECTIONSTATIQUE__', '__STATICREDIRECT__' ),
+	'protectionlevel'           => array( '1', 'NIVEAUDEPROTECTION', 'PROTECTIONLEVEL' ),
+	'url_path'                  => array( '0', 'CHEMIN', 'PATH' ),
+	'url_query'                 => array( '0', 'QUESTION', 'QUERY' ),
 );
 
 $specialPageAliases = array(
@@ -3180,7 +3181,7 @@ Permet de rétablir la version précédente et d’ajouter un motif dans la boî
 'pageinfo-authors' => "Nombre total d'auteurs distincts",
 'pageinfo-recent-edits' => 'Nombre de modifications récentes (dans les derniers $1)',
 'pageinfo-recent-authors' => "Nombre d'auteurs distincts récents",
-'pageinfo-restriction' => 'Protection de la page (<code>$1</code>)',
+'pageinfo-restriction' => 'Protection de la page (<code>{{lcfirst:$1}}</code>)',
 'pageinfo-magic-words' => '{{PLURAL:$1|Mot magique|Mots magiques}} ($1)',
 '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)',
diff --git a/languages/messages/MessagesFrp.php b/languages/messages/MessagesFrp.php
index 7e020427a3..b715fc4eb5 100644
--- a/languages/messages/MessagesFrp.php
+++ b/languages/messages/MessagesFrp.php
@@ -145,149 +145,149 @@ $specialPageAliases = array(
 );
 
 $magicWords = array(
-	'redirect'                => array( '0', '#REDIRÈCCION', '#REDIRECTION', '#REDIRECT' ),
-	'notoc'                   => array( '0', '__NION_SOMÈRO__', '__NIONA_TRÂBLA__', '__AUCUNSOMMAIRE__', '__AUCUNETDM__', '__NOTOC__' ),
-	'nogallery'               => array( '0', '__NIONA_GALERIE__', '__AUCUNEGALERIE__', '__NOGALLERY__' ),
-	'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' ),
-	'currentmonthnamegen'     => array( '1', 'GÈNITIF_DU_NOM_DU_MÊS_D_ORA', 'NOMGENMOISACTUEL', 'CURRENTMONTHNAMEGEN' ),
-	'currentmonthabbrev'      => array( '1', 'ABRÈV_DU_MÊS_D_ORA', 'ABREVMOISACTUEL', 'CURRENTMONTHABBREV' ),
-	'currentday'              => array( '1', 'JORN_D_ORA', 'JOURACTUEL', 'JOUR1ACTUEL', 'CURRENTDAY' ),
-	'currentday2'             => array( '1', 'JORN_D_ORA_2', 'JOUR2ACTUEL', 'CURRENTDAY2' ),
-	'currentdayname'          => array( '1', 'NOM_DU_JORN_D_ORA', 'NOMJOURACTUEL', 'CURRENTDAYNAME' ),
-	'currentyear'             => array( '1', 'AN_D_ORA', 'ANNEEACTUELLE', 'CURRENTYEAR' ),
-	'currenttime'             => array( '1', 'HORÈRO_D_ORA', 'HORAIREACTUEL', 'CURRENTTIME' ),
-	'currenthour'             => array( '1', 'HORA_D_ORA', 'HEUREACTUELLE', 'CURRENTHOUR' ),
-	'localmonth'              => array( '1', 'MÊS_LOCAL', 'MÊS_LOCAL_2', 'MOISLOCAL', 'MOIS2LOCAL', 'LOCALMONTH', 'LOCALMONTH2' ),
-	'localmonth1'             => array( '1', 'MÊS_LOCAL_1', 'MOIS1LOCAL', 'LOCALMONTH1' ),
-	'localmonthname'          => array( '1', 'NOM_DU_MÊS_LOCAL', 'NOMMOISLOCAL', 'LOCALMONTHNAME' ),
-	'localmonthnamegen'       => array( '1', 'GÈNITIF_DU_NOM_DU_MÊS_LOCAL', 'NOMGENMOISLOCAL', 'LOCALMONTHNAMEGEN' ),
-	'localmonthabbrev'        => array( '1', 'ABRÈV_DU_MÊS_LOCAL', 'ABREVMOISLOCAL', 'LOCALMONTHABBREV' ),
-	'localday'                => array( '1', 'JORN_LOCAL', 'JOURLOCAL', 'JOUR1LOCAL', 'LOCALDAY' ),
-	'localday2'               => array( '1', 'JORN_LOCAL_2', 'JOUR2LOCAL', 'LOCALDAY2' ),
-	'localdayname'            => array( '1', 'NOM_DU_JORN_LOCAL', 'NOMJOURLOCAL', 'LOCALDAYNAME' ),
-	'localyear'               => array( '1', 'AN_LOCAL', 'ANNEELOCALE', 'LOCALYEAR' ),
-	'localtime'               => array( '1', 'HORÈRO_LOCAL', 'HORAIRELOCAL', 'LOCALTIME' ),
-	'localhour'               => array( '1', 'HORA_LOCALA', 'HEURELOCALE', 'LOCALHOUR' ),
-	'numberofpages'           => array( '1', 'NOMBRO_DE_PÂGES', 'NOMBREPAGES', 'NUMBEROFPAGES' ),
-	'numberofarticles'        => array( '1', 'NOMBRO_D_ARTICLLOS', 'NOMBREARTICLES', 'NUMBEROFARTICLES' ),
-	'numberoffiles'           => array( '1', 'NOMBRO_DE_FICHIÉRS', 'NOMBREFICHIERS', 'NUMBEROFFILES' ),
-	'numberofusers'           => array( '1', 'NOMBRO_D_USANCIÉRS', 'NOMBREUTILISATEURS', 'NUMBEROFUSERS' ),
-	'numberofactiveusers'     => array( '1', 'NOMBRO_D_USANCIÉRS_ACTIFS', 'NOMBREUTILISATEURSACTIFS', 'NUMBEROFACTIVEUSERS' ),
-	'numberofedits'           => array( '1', 'NOMBRO_DE_CHANGEMENTS', 'NOMBREMODIFS', 'NUMBEROFEDITS' ),
-	'numberofviews'           => array( '1', 'NOMBRO_DE_VUES', 'NOMBREVUES', 'NUMBEROFVIEWS' ),
-	'pagename'                => array( '1', 'NOM_DE_LA_PÂGE', 'NOMPAGE', 'PAGENAME' ),
-	'pagenamee'               => array( '1', 'NOM_DE_LA_PÂGE_URL', 'NOMPAGEX', 'PAGENAMEE' ),
-	'namespace'               => array( '1', 'ÈSPÂÇO_DE_NOMS', 'ESPACENOMMAGE', 'NAMESPACE' ),
-	'namespacee'              => array( '1', 'ÈSPÂÇO_DE_NOMS_URL', 'ESPACENOMMAGEX', 'NAMESPACEE' ),
-	'talkspace'               => array( '1', 'ÈSPÂÇO_DE_DISCUSSION', 'ESPACEDISCUSSION', 'TALKSPACE' ),
-	'talkspacee'              => array( '1', 'ÈSPÂÇO_DE_DISCUSSION_URL', 'ESPACEDISCUSSIONX', 'TALKSPACEE' ),
-	'subjectspace'            => array( '1', 'ÈSPÂÇO_DU_SUJÈT', 'ÈSPÂÇO_DE_L_ARTICLLO', 'ESPACESUJET', 'ESPACEARTICLE', 'SUBJECTSPACE', 'ARTICLESPACE' ),
-	'subjectspacee'           => array( '1', 'ÈSPÂÇO_DU_SUJÈT_URL', 'ÈSPÂÇO_DE_L_ARTICLLO_URL', 'ESPACESUJETX', 'ESPACEARTICLEX', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
-	'fullpagename'            => array( '1', 'NOM_COMPLÈT_DE_LA_PÂGE', 'NOMPAGECOMPLET', 'FULLPAGENAME' ),
-	'fullpagenamee'           => array( '1', 'NOM_COMPLÈT_DE_LA_PÂGE_URL', 'NOMPAGECOMPLETX', 'FULLPAGENAMEE' ),
-	'subpagename'             => array( '1', 'NOM_DE_LA_SOT_PÂGE', 'NOMSOUSPAGE', 'SUBPAGENAME' ),
-	'subpagenamee'            => array( '1', 'NOM_DE_LA_SOT_PÂGE_URL', 'NOMSOUSPAGEX', 'SUBPAGENAMEE' ),
-	'basepagename'            => array( '1', 'NOM_DE_LA_PÂGE_DE_BÂSA', 'NOMBASEDEPAGE', 'BASEPAGENAME' ),
-	'basepagenamee'           => array( '1', 'NOM_DE_LA_PÂGE_DE_BÂSA_URL', 'NOMBASEDEPAGEX', 'BASEPAGENAMEE' ),
-	'talkpagename'            => array( '1', 'NOM_DE_LA_PÂGE_DE_DISCUSSION', 'NOMPAGEDISCUSSION', 'TALKPAGENAME' ),
-	'talkpagenamee'           => array( '1', 'NOM_DE_LA_PÂGE_DE_DISCUSSION_URL', 'NOMPAGEDISCUSSIONX', 'TALKPAGENAMEE' ),
-	'subjectpagename'         => array( '1', 'NOM_DE_LA_PÂGE_DU_SUJÈT', 'NOM_DE_LA_PÂGE_DE_L_ARTICLLO', 'NOMPAGESUJET', 'NOMPAGEARTICLE', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
-	'subjectpagenamee'        => array( '1', 'NOM_DE_LA_PÂGE_DU_SUJÈT_URL', 'NOM_DE_LA_PÂGE_DE_L_ARTICLLO_URL', 'NOMPAGESUJETX', 'NOMPAGEARTICLEX', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
-	'msg'                     => array( '0', 'MSJ:', 'MSG:' ),
-	'msgnw'                   => array( '0', 'MSJNV:', 'MSGNW:' ),
-	'img_thumbnail'           => array( '1', 'figura', 'vignette', 'thumbnail', 'thumb' ),
-	'img_manualthumb'         => array( '1', 'figura=$1', 'vignette=$1', 'thumbnail=$1', 'thumb=$1' ),
-	'img_right'               => array( '1', 'drêta', 'droite', 'right' ),
-	'img_left'                => array( '1', 'gôche', 'gauche', 'left' ),
-	'img_none'                => array( '1', 'vouedo', 'néant', 'neant', 'none' ),
-	'img_center'              => array( '1', 'centrâ', 'centré', 'center', 'centre' ),
-	'img_framed'              => array( '1', 'encâdrâ', 'câdro', 'cadre', 'encadré', 'encadre', 'framed', 'enframed', 'frame' ),
-	'img_frameless'           => array( '1', 'sen_câdro', 'pas_encâdrâ', 'sans_cadre', 'non_encadré', 'non_encadre', 'frameless' ),
-	'img_page'                => array( '1', 'pâge=$1', 'pâge $1', 'page=$1', 'page $1' ),
-	'img_upright'             => array( '1', 'drêt', 'drêt=$1', 'drêt $1', 'redresse', 'redresse=$1', 'redresse $1', 'upright', 'upright=$1', 'upright $1' ),
-	'img_border'              => array( '1', 'bordura', 'bordure', 'border' ),
-	'img_baseline'            => array( '1', 'legne_de_bâsa', 'ligne_de_base', 'base', 'baseline' ),
-	'img_sub'                 => array( '1', 'segno', 'indice', 'ind', 'sub' ),
-	'img_super'               => array( '1', 'èxposent', 'èxp', 'exposant', 'exp', 'super', 'sup' ),
-	'img_top'                 => array( '1', 'd\'amont', 'haut', 'top' ),
-	'img_text_top'            => array( '1', 'tèxto-d\'amont', 'haut-texte', 'haut-txt', 'text-top' ),
-	'img_middle'              => array( '1', 'entre-mié', 'milieu', 'middle' ),
-	'img_bottom'              => array( '1', 'd\'avâl', 'bas', 'bottom' ),
-	'img_text_bottom'         => array( '1', 'tèxto-d\'avâl', 'bas-texte', 'bas-txt', 'text-bottom' ),
-	'img_link'                => array( '1', 'lim=$1', 'lien=$1', 'link=$1' ),
-	'int'                     => array( '0', 'ENT:', 'INT:' ),
-	'sitename'                => array( '1', 'NOM_DU_SETO', 'NOMSITE', 'SITENAME' ),
-	'ns'                      => array( '0', 'ÈDN:', 'ESPACEN:', 'NS:' ),
-	'nse'                     => array( '0', 'ÈDN_URL:', 'ESPACENX:', 'NSE:' ),
-	'localurl'                => array( '0', 'URL_LOCALA:', 'URLLOCALE:', 'LOCALURL:' ),
-	'localurle'               => array( '0', 'URL_LOCALA_URL:', 'URLLOCALEX:', 'LOCALURLE:' ),
-	'articlepath'             => array( '0', 'CHEMIN_DE_L_ARTICLLO', 'CHEMINARTICLE', 'ARTICLEPATH' ),
-	'server'                  => array( '0', 'SÈRVOR', 'SERVEUR', 'SERVER' ),
-	'servername'              => array( '0', 'NOM_DU_SÈRVOR', 'NOMSERVEUR', 'SERVERNAME' ),
-	'scriptpath'              => array( '0', 'CHEMIN_DU_SCRIPTE', 'CHEMINSCRIPT', 'SCRIPTPATH' ),
-	'stylepath'               => array( '0', 'CHEMIN_DU_STILO', 'CHEMINSTYLE', 'STYLEPATH' ),
-	'grammar'                 => array( '0', 'GRAMÈRE:', 'GRAMMAIRE:', 'GRAMMAR:' ),
-	'gender'                  => array( '0', 'GENRO:', 'GENRE:', 'GENDER:' ),
-	'notitleconvert'          => array( '0', '__SEN_CONVÈRSION_DE_TITRO__', '__SENCDT__', '__SANSCONVERSIONTITRE__', '__SANSCT__', '__NOTITLECONVERT__', '__NOTC__' ),
-	'nocontentconvert'        => array( '0', '__SEN_CONVÈRSION_DE_CONTEGNU__', '__SENCDC__', '__SANSCONVERSIONCONTENU__', '__SANSCC__', '__NOCONTENTCONVERT__', '__NOCC__' ),
-	'currentweek'             => array( '1', 'SEMANA_D_ORA', 'SEMAINEACTUELLE', 'CURRENTWEEK' ),
-	'currentdow'              => array( '1', 'JDS_D_ORA', 'JDSACTUEL', 'CURRENTDOW' ),
-	'localweek'               => array( '1', 'SEMANA_LOCALA', 'SEMAINELOCALE', 'LOCALWEEK' ),
-	'localdow'                => array( '1', 'JDS_LOCAL', 'JDSLOCAL', 'LOCALDOW' ),
-	'revisionid'              => array( '1', 'NUMERÔ_DE_LA_VÈRSION', 'IDVERSION', 'REVISIONID' ),
-	'revisionday'             => array( '1', 'JORN_DE_LA_VÈRSION', 'JOURVERSION', 'JOUR1VERSION', 'REVISIONDAY' ),
-	'revisionday2'            => array( '1', 'JORN_DE_LA_VÈRSION_2', 'JOUR2VERSION', 'REVISIONDAY2' ),
-	'revisionmonth'           => array( '1', 'MÊS_DE_LA_VÈRSION', 'MOISVERSION', 'REVISIONMONTH' ),
-	'revisionmonth1'          => array( '1', 'MÊS_DE_LA_VÈRSION_1', 'MOISVERSION1', 'REVISIONMONTH1' ),
-	'revisionyear'            => array( '1', 'AN_DE_LA_VÈRSION', 'ANNEEVERSION', 'REVISIONYEAR' ),
-	'revisiontimestamp'       => array( '1', 'DÂTA_ET_HORA_DE_LA_VÈRSION', 'INSTANTVERSION', 'REVISIONTIMESTAMP' ),
-	'revisionuser'            => array( '1', 'USANCIÉR_DE_LA_VÈRSION', 'UTILISATEURVERSION', 'REVISIONUSER' ),
-	'plural'                  => array( '0', 'PLURÂL:', 'PLURIEL:', 'PLURAL:' ),
-	'fullurl'                 => array( '0', 'URL_COMPLÈTA:', 'URLCOMPLETE:', 'FULLURL:' ),
-	'fullurle'                => array( '0', 'URL_COMPLÈTA_URL:', 'URLCOMPLETEX:', 'FULLURLE:' ),
-	'lcfirst'                 => array( '0', 'PREMIÉRE_PETIÔTA_LÈTRA:', 'INITMINUS:', 'LCFIRST:' ),
-	'ucfirst'                 => array( '0', 'PREMIÉRE_GRANTA_LÈTRA:', 'INITMAJUS:', 'INITCAPIT:', 'UCFIRST:' ),
-	'lc'                      => array( '0', 'PETIÔTA_LÈTRA:', 'MINUS:', 'LC:' ),
-	'uc'                      => array( '0', 'GRANTA_LÈTRA:', 'MAJUS:', 'CAPIT:', 'UC:' ),
-	'raw'                     => array( '0', 'BRUTO:', 'BRUT:', 'RAW:' ),
-	'displaytitle'            => array( '1', 'FÂRE_VÊRE_LO_TITRO', 'AFFICHERTITRE', 'DISPLAYTITLE' ),
-	'rawsuffix'               => array( '1', 'B', 'BRUT', 'R' ),
-	'newsectionlink'          => array( '1', '__LIM_DE_NOVÈLA_SÈCCION__', '__LIENNOUVELLESECTION__', '__NEWSECTIONLINK__' ),
-	'nonewsectionlink'        => array( '1', '__NION_LIM_DE_NOVÈLA_SÈCCION__', '__AUCUNLIENNOUVELLESECTION__', '__NONEWSECTIONLINK__' ),
-	'currentversion'          => array( '1', 'VÈRSION_D_ORA', 'VERSIONACTUELLE', 'CURRENTVERSION' ),
-	'urlencode'               => array( '0', 'URL_ENCODÂ:', 'ENCODEURL:', 'URLENCODE:' ),
-	'anchorencode'            => array( '0', 'ANCRO_ENCODÂ', 'ENCODEANCRE', 'ANCHORENCODE' ),
-	'currenttimestamp'        => array( '1', 'DÂTA_ET_HORA_D_ORA', 'INSTANTACTUEL', 'CURRENTTIMESTAMP' ),
-	'localtimestamp'          => array( '1', 'DÂTA_ET_HORA_LOCALA', 'INSTANTLOCAL', 'LOCALTIMESTAMP' ),
-	'directionmark'           => array( '1', 'MÂRCA_DE_DIRÈCCION', 'MARQUEDIRECTION', 'MARQUEDIR', 'DIRECTIONMARK', 'DIRMARK' ),
-	'language'                => array( '0', '#LENGOUA:', '#LANGUE:', '#LANGUAGE:' ),
-	'contentlanguage'         => array( '1', 'LENGOUA_DU_CONTEGNU', 'LANGUECONTENU', 'LANGCONTENU', 'CONTENTLANGUAGE', 'CONTENTLANG' ),
-	'pagesinnamespace'        => array( '1', 'PÂGES_DENS_L_ÈSPÂÇO_DE_NOMS:', 'PÂGES_DENS_L_ÈDN:', 'PAGESDANSESPACE:', 'PAGESINNAMESPACE:', 'PAGESINNS:' ),
-	'numberofadmins'          => array( '1', 'NOMBRO_D_ADMINS', 'NOMBREADMINS', 'NUMBEROFADMINS' ),
-	'formatnum'               => array( '0', 'FORMAT_NOMBRO', 'FORMATNOMBRE', 'FORMATNUM' ),
-	'padleft'                 => array( '0', 'BORRÂJO_A_GÔCHE', 'BOURRAGEGAUCHE', 'BOURREGAUCHE', 'PADLEFT' ),
-	'padright'                => array( '0', 'BORRÂJO_A_DRÊTA', 'BOURRAGEDROITE', 'BOURREDROITE', 'PADRIGHT' ),
-	'special'                 => array( '0', 'spèciâl', 'spécial', 'special' ),
-	'defaultsort'             => array( '1', 'CLLÂF_DE_TRI:', 'CLEFDETRI:', 'CLEDETRI:', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:' ),
-	'filepath'                => array( '0', 'CHEMIN_D_ACCÈS:', 'CHEMIN:', 'FILEPATH:' ),
-	'tag'                     => array( '0', 'balisa', 'balise', 'tag' ),
-	'hiddencat'               => array( '1', '__CATÈGORIE_CACHIÊ__', '__CATCACHEE__', '__HIDDENCAT__' ),
-	'pagesincategory'         => array( '1', 'PÂGES_DENS_LA_CATÈGORIE', 'PAGESDANSCAT', 'PAGESINCATEGORY', 'PAGESINCAT' ),
-	'pagesize'                => array( '1', 'TALYE_DE_LA_PÂGE', 'TAILLEPAGE', 'PAGESIZE' ),
-	'index'                   => array( '1', '__ENDÈXE__', '__INDEX__' ),
-	'noindex'                 => array( '1', '__NION_ENDÈXE__', '__AUCUNINDEX__', '__NOINDEX__' ),
-	'numberingroup'           => array( '1', 'NOMBRO_D_USANCIÉRS_DENS_LA_TROPA', 'NOMBREDANSGROUPE', 'NBDANSGROUPE', 'NUMBERINGROUP', 'NUMINGROUP' ),
-	'staticredirect'          => array( '1', '__REDIRÈCCION_IMOBILA__', '__REDIRECTIONSTATIQUE__', '__STATICREDIRECT__' ),
-	'protectionlevel'         => array( '1', 'NIVÉL_DE_PROTÈCCION', 'NIVEAUDEPROTECTION', 'PROTECTIONLEVEL' ),
-	'formatdate'              => array( '0', 'format_de_dâta', 'formatdate', 'dateformat' ),
-	'url_path'                => array( '0', 'CHEMIN', 'PATH' ),
-	'url_wiki'                => array( '0', 'VOUIQUI', 'WIKI' ),
+	'redirect'                  => array( '0', '#REDIRÈCCION', '#REDIRECTION', '#REDIRECT' ),
+	'notoc'                     => array( '0', '__NION_SOMÈRO__', '__NIONA_TRÂBLA__', '__AUCUNSOMMAIRE__', '__AUCUNETDM__', '__NOTOC__' ),
+	'nogallery'                 => array( '0', '__NIONA_GALERIE__', '__AUCUNEGALERIE__', '__NOGALLERY__' ),
+	'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' ),
+	'currentmonthnamegen'       => array( '1', 'GÈNITIF_DU_NOM_DU_MÊS_D_ORA', 'NOMGENMOISACTUEL', 'CURRENTMONTHNAMEGEN' ),
+	'currentmonthabbrev'        => array( '1', 'ABRÈV_DU_MÊS_D_ORA', 'ABREVMOISACTUEL', 'CURRENTMONTHABBREV' ),
+	'currentday'                => array( '1', 'JORN_D_ORA', 'JOURACTUEL', 'JOUR1ACTUEL', 'CURRENTDAY' ),
+	'currentday2'               => array( '1', 'JORN_D_ORA_2', 'JOUR2ACTUEL', 'CURRENTDAY2' ),
+	'currentdayname'            => array( '1', 'NOM_DU_JORN_D_ORA', 'NOMJOURACTUEL', 'CURRENTDAYNAME' ),
+	'currentyear'               => array( '1', 'AN_D_ORA', 'ANNEEACTUELLE', 'CURRENTYEAR' ),
+	'currenttime'               => array( '1', 'HORÈRO_D_ORA', 'HORAIREACTUEL', 'CURRENTTIME' ),
+	'currenthour'               => array( '1', 'HORA_D_ORA', 'HEUREACTUELLE', 'CURRENTHOUR' ),
+	'localmonth'                => array( '1', 'MÊS_LOCAL', 'MÊS_LOCAL_2', 'MOISLOCAL', 'MOIS2LOCAL', 'LOCALMONTH', 'LOCALMONTH2' ),
+	'localmonth1'               => array( '1', 'MÊS_LOCAL_1', 'MOIS1LOCAL', 'LOCALMONTH1' ),
+	'localmonthname'            => array( '1', 'NOM_DU_MÊS_LOCAL', 'NOMMOISLOCAL', 'LOCALMONTHNAME' ),
+	'localmonthnamegen'         => array( '1', 'GÈNITIF_DU_NOM_DU_MÊS_LOCAL', 'NOMGENMOISLOCAL', 'LOCALMONTHNAMEGEN' ),
+	'localmonthabbrev'          => array( '1', 'ABRÈV_DU_MÊS_LOCAL', 'ABREVMOISLOCAL', 'LOCALMONTHABBREV' ),
+	'localday'                  => array( '1', 'JORN_LOCAL', 'JOURLOCAL', 'JOUR1LOCAL', 'LOCALDAY' ),
+	'localday2'                 => array( '1', 'JORN_LOCAL_2', 'JOUR2LOCAL', 'LOCALDAY2' ),
+	'localdayname'              => array( '1', 'NOM_DU_JORN_LOCAL', 'NOMJOURLOCAL', 'LOCALDAYNAME' ),
+	'localyear'                 => array( '1', 'AN_LOCAL', 'ANNEELOCALE', 'LOCALYEAR' ),
+	'localtime'                 => array( '1', 'HORÈRO_LOCAL', 'HORAIRELOCAL', 'LOCALTIME' ),
+	'localhour'                 => array( '1', 'HORA_LOCALA', 'HEURELOCALE', 'LOCALHOUR' ),
+	'numberofpages'             => array( '1', 'NOMBRO_DE_PÂGES', 'NOMBREPAGES', 'NUMBEROFPAGES' ),
+	'numberofarticles'          => array( '1', 'NOMBRO_D_ARTICLLOS', 'NOMBREARTICLES', 'NUMBEROFARTICLES' ),
+	'numberoffiles'             => array( '1', 'NOMBRO_DE_FICHIÉRS', 'NOMBREFICHIERS', 'NUMBEROFFILES' ),
+	'numberofusers'             => array( '1', 'NOMBRO_D_USANCIÉRS', 'NOMBREUTILISATEURS', 'NUMBEROFUSERS' ),
+	'numberofactiveusers'       => array( '1', 'NOMBRO_D_USANCIÉRS_ACTIFS', 'NOMBREUTILISATEURSACTIFS', 'NUMBEROFACTIVEUSERS' ),
+	'numberofedits'             => array( '1', 'NOMBRO_DE_CHANGEMENTS', 'NOMBREMODIFS', 'NUMBEROFEDITS' ),
+	'numberofviews'             => array( '1', 'NOMBRO_DE_VUES', 'NOMBREVUES', 'NUMBEROFVIEWS' ),
+	'pagename'                  => array( '1', 'NOM_DE_LA_PÂGE', 'NOMPAGE', 'PAGENAME' ),
+	'pagenamee'                 => array( '1', 'NOM_DE_LA_PÂGE_URL', 'NOMPAGEX', 'PAGENAMEE' ),
+	'namespace'                 => array( '1', 'ÈSPÂÇO_DE_NOMS', 'ESPACENOMMAGE', 'NAMESPACE' ),
+	'namespacee'                => array( '1', 'ÈSPÂÇO_DE_NOMS_URL', 'ESPACENOMMAGEX', 'NAMESPACEE' ),
+	'talkspace'                 => array( '1', 'ÈSPÂÇO_DE_DISCUSSION', 'ESPACEDISCUSSION', 'TALKSPACE' ),
+	'talkspacee'                => array( '1', 'ÈSPÂÇO_DE_DISCUSSION_URL', 'ESPACEDISCUSSIONX', 'TALKSPACEE' ),
+	'subjectspace'              => array( '1', 'ÈSPÂÇO_DU_SUJÈT', 'ÈSPÂÇO_DE_L_ARTICLLO', 'ESPACESUJET', 'ESPACEARTICLE', 'SUBJECTSPACE', 'ARTICLESPACE' ),
+	'subjectspacee'             => array( '1', 'ÈSPÂÇO_DU_SUJÈT_URL', 'ÈSPÂÇO_DE_L_ARTICLLO_URL', 'ESPACESUJETX', 'ESPACEARTICLEX', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
+	'fullpagename'              => array( '1', 'NOM_COMPLÈT_DE_LA_PÂGE', 'NOMPAGECOMPLET', 'FULLPAGENAME' ),
+	'fullpagenamee'             => array( '1', 'NOM_COMPLÈT_DE_LA_PÂGE_URL', 'NOMPAGECOMPLETX', 'FULLPAGENAMEE' ),
+	'subpagename'               => array( '1', 'NOM_DE_LA_SOT_PÂGE', 'NOMSOUSPAGE', 'SUBPAGENAME' ),
+	'subpagenamee'              => array( '1', 'NOM_DE_LA_SOT_PÂGE_URL', 'NOMSOUSPAGEX', 'SUBPAGENAMEE' ),
+	'basepagename'              => array( '1', 'NOM_DE_LA_PÂGE_DE_BÂSA', 'NOMBASEDEPAGE', 'BASEPAGENAME' ),
+	'basepagenamee'             => array( '1', 'NOM_DE_LA_PÂGE_DE_BÂSA_URL', 'NOMBASEDEPAGEX', 'BASEPAGENAMEE' ),
+	'talkpagename'              => array( '1', 'NOM_DE_LA_PÂGE_DE_DISCUSSION', 'NOMPAGEDISCUSSION', 'TALKPAGENAME' ),
+	'talkpagenamee'             => array( '1', 'NOM_DE_LA_PÂGE_DE_DISCUSSION_URL', 'NOMPAGEDISCUSSIONX', 'TALKPAGENAMEE' ),
+	'subjectpagename'           => array( '1', 'NOM_DE_LA_PÂGE_DU_SUJÈT', 'NOM_DE_LA_PÂGE_DE_L_ARTICLLO', 'NOMPAGESUJET', 'NOMPAGEARTICLE', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
+	'subjectpagenamee'          => array( '1', 'NOM_DE_LA_PÂGE_DU_SUJÈT_URL', 'NOM_DE_LA_PÂGE_DE_L_ARTICLLO_URL', 'NOMPAGESUJETX', 'NOMPAGEARTICLEX', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
+	'msg'                       => array( '0', 'MSJ:', 'MSG:' ),
+	'msgnw'                     => array( '0', 'MSJNV:', 'MSGNW:' ),
+	'img_thumbnail'             => array( '1', 'figura', 'vignette', 'thumbnail', 'thumb' ),
+	'img_manualthumb'           => array( '1', 'figura=$1', 'vignette=$1', 'thumbnail=$1', 'thumb=$1' ),
+	'img_right'                 => array( '1', 'drêta', 'droite', 'right' ),
+	'img_left'                  => array( '1', 'gôche', 'gauche', 'left' ),
+	'img_none'                  => array( '1', 'vouedo', 'néant', 'neant', 'none' ),
+	'img_center'                => array( '1', 'centrâ', 'centré', 'center', 'centre' ),
+	'img_framed'                => array( '1', 'encâdrâ', 'câdro', 'cadre', 'encadré', 'encadre', 'framed', 'enframed', 'frame' ),
+	'img_frameless'             => array( '1', 'sen_câdro', 'pas_encâdrâ', 'sans_cadre', 'non_encadré', 'non_encadre', 'frameless' ),
+	'img_page'                  => array( '1', 'pâge=$1', 'pâge $1', 'page=$1', 'page $1' ),
+	'img_upright'               => array( '1', 'drêt', 'drêt=$1', 'drêt $1', 'redresse', 'redresse=$1', 'redresse $1', 'upright', 'upright=$1', 'upright $1' ),
+	'img_border'                => array( '1', 'bordura', 'bordure', 'border' ),
+	'img_baseline'              => array( '1', 'legne_de_bâsa', 'ligne_de_base', 'base', 'baseline' ),
+	'img_sub'                   => array( '1', 'segno', 'indice', 'ind', 'sub' ),
+	'img_super'                 => array( '1', 'èxposent', 'èxp', 'exposant', 'exp', 'super', 'sup' ),
+	'img_top'                   => array( '1', 'd\'amont', 'haut', 'top' ),
+	'img_text_top'              => array( '1', 'tèxto-d\'amont', 'haut-texte', 'haut-txt', 'text-top' ),
+	'img_middle'                => array( '1', 'entre-mié', 'milieu', 'middle' ),
+	'img_bottom'                => array( '1', 'd\'avâl', 'bas', 'bottom' ),
+	'img_text_bottom'           => array( '1', 'tèxto-d\'avâl', 'bas-texte', 'bas-txt', 'text-bottom' ),
+	'img_link'                  => array( '1', 'lim=$1', 'lien=$1', 'link=$1' ),
+	'int'                       => array( '0', 'ENT:', 'INT:' ),
+	'sitename'                  => array( '1', 'NOM_DU_SETO', 'NOMSITE', 'SITENAME' ),
+	'ns'                        => array( '0', 'ÈDN:', 'ESPACEN:', 'NS:' ),
+	'nse'                       => array( '0', 'ÈDN_URL:', 'ESPACENX:', 'NSE:' ),
+	'localurl'                  => array( '0', 'URL_LOCALA:', 'URLLOCALE:', 'LOCALURL:' ),
+	'localurle'                 => array( '0', 'URL_LOCALA_URL:', 'URLLOCALEX:', 'LOCALURLE:' ),
+	'articlepath'               => array( '0', 'CHEMIN_DE_L_ARTICLLO', 'CHEMINARTICLE', 'ARTICLEPATH' ),
+	'server'                    => array( '0', 'SÈRVOR', 'SERVEUR', 'SERVER' ),
+	'servername'                => array( '0', 'NOM_DU_SÈRVOR', 'NOMSERVEUR', 'SERVERNAME' ),
+	'scriptpath'                => array( '0', 'CHEMIN_DU_SCRIPTE', 'CHEMINSCRIPT', 'SCRIPTPATH' ),
+	'stylepath'                 => array( '0', 'CHEMIN_DU_STILO', 'CHEMINSTYLE', 'STYLEPATH' ),
+	'grammar'                   => array( '0', 'GRAMÈRE:', 'GRAMMAIRE:', 'GRAMMAR:' ),
+	'gender'                    => array( '0', 'GENRO:', 'GENRE:', 'GENDER:' ),
+	'notitleconvert'            => array( '0', '__SEN_CONVÈRSION_DE_TITRO__', '__SENCDT__', '__SANSCONVERSIONTITRE__', '__SANSCT__', '__NOTITLECONVERT__', '__NOTC__' ),
+	'nocontentconvert'          => array( '0', '__SEN_CONVÈRSION_DE_CONTEGNU__', '__SENCDC__', '__SANSCONVERSIONCONTENU__', '__SANSCC__', '__NOCONTENTCONVERT__', '__NOCC__' ),
+	'currentweek'               => array( '1', 'SEMANA_D_ORA', 'SEMAINEACTUELLE', 'CURRENTWEEK' ),
+	'currentdow'                => array( '1', 'JDS_D_ORA', 'JDSACTUEL', 'CURRENTDOW' ),
+	'localweek'                 => array( '1', 'SEMANA_LOCALA', 'SEMAINELOCALE', 'LOCALWEEK' ),
+	'localdow'                  => array( '1', 'JDS_LOCAL', 'JDSLOCAL', 'LOCALDOW' ),
+	'revisionid'                => array( '1', 'NUMERÔ_DE_LA_VÈRSION', 'IDVERSION', 'REVISIONID' ),
+	'revisionday'               => array( '1', 'JORN_DE_LA_VÈRSION', 'JOURVERSION', 'JOUR1VERSION', 'REVISIONDAY' ),
+	'revisionday2'              => array( '1', 'JORN_DE_LA_VÈRSION_2', 'JOUR2VERSION', 'REVISIONDAY2' ),
+	'revisionmonth'             => array( '1', 'MÊS_DE_LA_VÈRSION', 'MOISVERSION', 'REVISIONMONTH' ),
+	'revisionmonth1'            => array( '1', 'MÊS_DE_LA_VÈRSION_1', 'MOISVERSION1', 'REVISIONMONTH1' ),
+	'revisionyear'              => array( '1', 'AN_DE_LA_VÈRSION', 'ANNEEVERSION', 'REVISIONYEAR' ),
+	'revisiontimestamp'         => array( '1', 'DÂTA_ET_HORA_DE_LA_VÈRSION', 'INSTANTVERSION', 'REVISIONTIMESTAMP' ),
+	'revisionuser'              => array( '1', 'USANCIÉR_DE_LA_VÈRSION', 'UTILISATEURVERSION', 'REVISIONUSER' ),
+	'plural'                    => array( '0', 'PLURÂL:', 'PLURIEL:', 'PLURAL:' ),
+	'fullurl'                   => array( '0', 'URL_COMPLÈTA:', 'URLCOMPLETE:', 'FULLURL:' ),
+	'fullurle'                  => array( '0', 'URL_COMPLÈTA_URL:', 'URLCOMPLETEX:', 'FULLURLE:' ),
+	'lcfirst'                   => array( '0', 'PREMIÉRE_PETIÔTA_LÈTRA:', 'INITMINUS:', 'LCFIRST:' ),
+	'ucfirst'                   => array( '0', 'PREMIÉRE_GRANTA_LÈTRA:', 'INITMAJUS:', 'INITCAPIT:', 'UCFIRST:' ),
+	'lc'                        => array( '0', 'PETIÔTA_LÈTRA:', 'MINUS:', 'LC:' ),
+	'uc'                        => array( '0', 'GRANTA_LÈTRA:', 'MAJUS:', 'CAPIT:', 'UC:' ),
+	'raw'                       => array( '0', 'BRUTO:', 'BRUT:', 'RAW:' ),
+	'displaytitle'              => array( '1', 'FÂRE_VÊRE_LO_TITRO', 'AFFICHERTITRE', 'DISPLAYTITLE' ),
+	'rawsuffix'                 => array( '1', 'B', 'BRUT', 'R' ),
+	'newsectionlink'            => array( '1', '__LIM_DE_NOVÈLA_SÈCCION__', '__LIENNOUVELLESECTION__', '__NEWSECTIONLINK__' ),
+	'nonewsectionlink'          => array( '1', '__NION_LIM_DE_NOVÈLA_SÈCCION__', '__AUCUNLIENNOUVELLESECTION__', '__NONEWSECTIONLINK__' ),
+	'currentversion'            => array( '1', 'VÈRSION_D_ORA', 'VERSIONACTUELLE', 'CURRENTVERSION' ),
+	'urlencode'                 => array( '0', 'URL_ENCODÂ:', 'ENCODEURL:', 'URLENCODE:' ),
+	'anchorencode'              => array( '0', 'ANCRO_ENCODÂ', 'ENCODEANCRE', 'ANCHORENCODE' ),
+	'currenttimestamp'          => array( '1', 'DÂTA_ET_HORA_D_ORA', 'INSTANTACTUEL', 'CURRENTTIMESTAMP' ),
+	'localtimestamp'            => array( '1', 'DÂTA_ET_HORA_LOCALA', 'INSTANTLOCAL', 'LOCALTIMESTAMP' ),
+	'directionmark'             => array( '1', 'MÂRCA_DE_DIRÈCCION', 'MARQUEDIRECTION', 'MARQUEDIR', 'DIRECTIONMARK', 'DIRMARK' ),
+	'language'                  => array( '0', '#LENGOUA:', '#LANGUE:', '#LANGUAGE:' ),
+	'contentlanguage'           => array( '1', 'LENGOUA_DU_CONTEGNU', 'LANGUECONTENU', 'LANGCONTENU', 'CONTENTLANGUAGE', 'CONTENTLANG' ),
+	'pagesinnamespace'          => array( '1', 'PÂGES_DENS_L_ÈSPÂÇO_DE_NOMS:', 'PÂGES_DENS_L_ÈDN:', 'PAGESDANSESPACE:', 'PAGESINNAMESPACE:', 'PAGESINNS:' ),
+	'numberofadmins'            => array( '1', 'NOMBRO_D_ADMINS', 'NOMBREADMINS', 'NUMBEROFADMINS' ),
+	'formatnum'                 => array( '0', 'FORMAT_NOMBRO', 'FORMATNOMBRE', 'FORMATNUM' ),
+	'padleft'                   => array( '0', 'BORRÂJO_A_GÔCHE', 'BOURRAGEGAUCHE', 'BOURREGAUCHE', 'PADLEFT' ),
+	'padright'                  => array( '0', 'BORRÂJO_A_DRÊTA', 'BOURRAGEDROITE', 'BOURREDROITE', 'PADRIGHT' ),
+	'special'                   => array( '0', 'spèciâl', 'spécial', 'special' ),
+	'defaultsort'               => array( '1', 'CLLÂF_DE_TRI:', 'CLEFDETRI:', 'CLEDETRI:', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:' ),
+	'filepath'                  => array( '0', 'CHEMIN_D_ACCÈS:', 'CHEMIN:', 'FILEPATH:' ),
+	'tag'                       => array( '0', 'balisa', 'balise', 'tag' ),
+	'hiddencat'                 => array( '1', '__CATÈGORIE_CACHIÊ__', '__CATCACHEE__', '__HIDDENCAT__' ),
+	'pagesincategory'           => array( '1', 'PÂGES_DENS_LA_CATÈGORIE', 'PAGESDANSCAT', 'PAGESINCATEGORY', 'PAGESINCAT' ),
+	'pagesize'                  => array( '1', 'TALYE_DE_LA_PÂGE', 'TAILLEPAGE', 'PAGESIZE' ),
+	'index'                     => array( '1', '__ENDÈXE__', '__INDEX__' ),
+	'noindex'                   => array( '1', '__NION_ENDÈXE__', '__AUCUNINDEX__', '__NOINDEX__' ),
+	'numberingroup'             => array( '1', 'NOMBRO_D_USANCIÉRS_DENS_LA_TROPA', 'NOMBREDANSGROUPE', 'NBDANSGROUPE', 'NUMBERINGROUP', 'NUMINGROUP' ),
+	'staticredirect'            => array( '1', '__REDIRÈCCION_IMOBILA__', '__REDIRECTIONSTATIQUE__', '__STATICREDIRECT__' ),
+	'protectionlevel'           => array( '1', 'NIVÉL_DE_PROTÈCCION', 'NIVEAUDEPROTECTION', 'PROTECTIONLEVEL' ),
+	'formatdate'                => array( '0', 'format_de_dâta', 'formatdate', 'dateformat' ),
+	'url_path'                  => array( '0', 'CHEMIN', 'PATH' ),
+	'url_wiki'                  => array( '0', 'VOUIQUI', 'WIKI' ),
 );
 
 $linkTrail = '/^([a-zàâçéèêîœôû·’æäåāăëēïīòöōùü‘]+)(.*)$/sDu';
@@ -785,11 +785,11 @@ pouede ignorar ceti mèssâjo et continuar a empleyér voutron viely contresegno
 'noemailcreate' => 'Vos dête balyér n’adrèce èlèctronica valida',
 'passwordsent' => 'Un contresegno novél est étâ mandâ a l’adrèce èlèctronica de l’utilisator « $1 ».
 Vos volyéd tornar branchiér aprés l’avêr reçu.',
-'blocked-mailpassword' => 'Voutron adrèce IP est blocâye en ècritura, la fonccion de rapèl du contresegno est vêr dèsactivâye por èvitar los abus.',
+'blocked-mailpassword' => 'Voutron adrèce IP est blocâye en ècritura, la fonccion de sovegnence du contresegno est vêr dèsactivâye por èvitar los abus.',
 'eauthentsent' => 'Un mèssâjo de confirmacion est étâ mandâ a l’adrèce endicâye.
 Devant qu’un ôtro mèssâjo seye mandâ a ceti compto, vos devréd siuvre les enstruccions du mèssâjo et pués confirmar que lo compto est franc lo voutro.',
-'throttled-mailpassword' => 'Un mèssâjo de rapèl de voutron contresegno est ja étâ mandâ pendent {{PLURAL:$1|l’hora passâye|les $1 hores passâyes}}.
-Por èvitar los abus, solament yon mèssâjo de rapèl serat mandâ per {{PLURAL:$1|hora|entèrvalo de $1 hores}}.',
+'throttled-mailpassword' => 'Un mèssâjo de sovegnence de voutron contresegno est ja étâ mandâ pendent {{PLURAL:$1|l’hora passâye|les $1 hores passâyes}}.
+Por èvitar los abus, solament yon mèssâjo de sovegnence serat mandâ per {{PLURAL:$1|hora|entèrvalo de $1 hores}}.',
 'mailerror' => 'Fôta pendent l’èxpèdicion du mèssâjo : $1',
 'acct_creation_throttle_hit' => 'Quârqu’un qu’empleye voutron adrèce IP at fêt {{PLURAL:$1|yon compto|$1 comptos}} pendent les 24 hores passâyes, cen qu’est la limita ôtorisâye dens ceti temps.
 Du côp la crèacion de compto est étâye dèsactivâye temporèrament por cel’adrèce IP.',
@@ -822,7 +822,7 @@ Volyéd atendre devant que tornar èprovar.',
 
 # Change password dialog
 'resetpass' => 'Changiér lo contresegno',
-'resetpass_announce' => 'Vos vos éte branchiê avouéc un contresegno temporèro mandâ per mèssageria èlèctronica.
+'resetpass_announce' => 'Vos vos éte branchiê{{GENDER:||ye|(ye)}} avouéc un contresegno temporèro mandâ per mèssageria èlèctronica.
 Por chavonar lo branchement, vos dête buchiér un contresegno novél ique :',
 'resetpass_text' => '<!-- Apondéd lo tèxto ique -->',
 'resetpass_header' => 'Changiér lo contresegno du compto',
@@ -830,21 +830,21 @@ Por chavonar lo branchement, vos dête buchiér un contresegno novél ique :',
 'newpassword' => 'Contresegno novél :',
 'retypenew' => 'Confirmar lo contresegno novél :',
 'resetpass_submit' => 'Changiér lo contresegno et sè branchiér',
-'resetpass_success' => 'Voutron contresegno at étâ changiê avouéc reusséta !
+'resetpass_success' => 'Voutron contresegno est étâ changiê avouéc reusséta !
 Branchement en cors...',
-'resetpass_forbidden' => 'Los contresegnos pôvont pas étre changiês.',
+'resetpass_forbidden' => 'Los contresegnos pôvont pas étre changiês',
 'resetpass-no-info' => 'Vos dête étre branchiê por avêr accès a cela pâge.',
 'resetpass-submit-loggedin' => 'Changiér lo contresegno',
 'resetpass-submit-cancel' => 'Anular',
-'resetpass-wrong-oldpass' => 'Contresegno temporèro ou ben d’ora fôx.
-Vos éd pôt-étre ja changiê voutron contresegno avouéc reusséta ou ben demandâ un contresegno temporèro novél.',
+'resetpass-wrong-oldpass' => 'Contresegno temporèro ou ben d’ora envalido.
+Pôt-étre vos éd ja changiê voutron contresegno avouéc reusséta ou ben demandâ un contresegno temporèro novél.',
 'resetpass-temp-password' => 'Contresegno temporèro :',
 
 # Special:PasswordReset
-'passwordreset' => 'Tornar inicialisar lo contresegno',
-'passwordreset-text' => 'Rempléd ceti formulèro por recêvre un mèssâjo de rapèl des dètalys de voutron compto.',
+'passwordreset' => 'Remisa a zérô du contresegno',
+'passwordreset-text' => 'Rempléd ceti formulèro por recêvre un mèssâjo de sovegnence des dètalys de voutron compto.',
 'passwordreset-legend' => 'Tornar inicialisar lo contresegno',
-'passwordreset-disabled' => 'La remisa a zérô des contresegnos at étâ dèsactivâ sur ceti vouiqui.',
+'passwordreset-disabled' => 'La remisa a zérô des contresegnos est étâye dèsactivâye sur ceti vouiqui.',
 'passwordreset-pretext' => '{{PLURAL:$1||Buchiéd yon des bocons de balyês ce-desot}}',
 'passwordreset-username' => 'Nom d’usanciér :',
 'passwordreset-domain' => 'Domêno :',
@@ -992,12 +992,11 @@ Volyéd controlar que vos voléd fâre ou ben changiér cela pâge.',
 'userpage-userdoesnotexist-view' => 'Lo compto usanciér « $1 » est pas encartâ.',
 'blocked-notice-logextract' => 'Ceti usanciér est ora blocâ.
 La dèrriére entrâ du jornal des blocâjos est disponibla ce-desot :',
-'clearyourcache' => "'''Nota :''' aprés avêr encartâ, vos devréd forciér lo rechargement complèt du cache de voutron navigator por vêre los changements.
+'clearyourcache' => "'''Nota :''' aprés avêr encartâ, vos devréd forciér lo rechargement complèt du cacho de voutron navigator por vêre los changements.
 * '''Firefox / Safari :''' mantegnéd la toche ''Granta Lètra'' (''Shift'') en cliquent sur lo boton ''Rechargiér'' (''Reload'') ou ben prèssâd ''Ctrl-F5'' ou ''Ctrl-R'' (''⌘-R'' sur un Mac)
 * '''Google Chrome :''' prèssâd ''Ctrl-Shift-R'' (''⌘-Shift-R'' sur un Mac)
 * '''Internet Explorer :''' mantegnéd la toche ''Ctrl'' en cliquent sur lo boton ''Rafrèchir'' (''Refresh'') ou ben prèssâd ''Ctrl-F5''
-* '''Konqueror :''' clicâd sur lo boton ''Rechargiér'' ou ben prèssâd ''F5''
-* '''Opera :''' èfaciéd lo cache dens ''Outils → Prèferences''",
+* '''Opera :''' èfaciéd lo cacho dedens ''Outils → Prèferences''",
 'usercssyoucanpreview' => "'''Combina :''' utilisâd lo boton « {{int:showpreview}} » por èprovar voutra fôlye CSS novèla devant que la sôvar.",
 'userjsyoucanpreview' => "'''Combina :''' utilisâd lo boton « {{int:showpreview}} » por èprovar voutra fôlye JS novèla devant que la sôvar.",
 'usercsspreview' => "'''Rapelâd-vos que vos éte solament aprés prèvisualisar voutra prôpra fôlye CSS.'''
@@ -3125,11 +3124,11 @@ O est probâblament diu a un lim de vers un seto de defôr qu’aparêt sur la l
 
 # Info page
 'pageinfo-title' => 'Enformacions por « $1 »',
-'pageinfo-header-edits' => 'Changements',
+'pageinfo-header-edits' => 'Historico des changements',
 'pageinfo-views' => 'Nombro de visualisacions',
-'pageinfo-watchers' => 'Nombro de contributors qu’ont la pâge dens lor lista de survelyence',
-'pageinfo-edits' => 'Nombro de changements',
-'pageinfo-authors' => 'Nombro d’ôtors difèrents',
+'pageinfo-watchers' => 'Nombro de contributors qu’ont la pâge dedens lor lista de survelyence',
+'pageinfo-edits' => 'Soma totâla de changements',
+'pageinfo-authors' => 'Soma totâla d’ôtors difèrents',
 
 # Skin names
 'skinname-standard' => 'Estandârd',
diff --git a/languages/messages/MessagesGa.php b/languages/messages/MessagesGa.php
index df96f18c29..522a976a5f 100644
--- a/languages/messages/MessagesGa.php
+++ b/languages/messages/MessagesGa.php
@@ -24,47 +24,47 @@
  */
 
 $magicWords = array(
-	'redirect'                => array( '0', '#athsheoladh', '#REDIRECT' ),
-	'notoc'                   => array( '0', '__GANCÁ__', '__NOTOC__' ),
-	'forcetoc'                => array( '0', '__CÁGACHUAIR__', '__FORCETOC__' ),
-	'toc'                     => array( '0', '__CÁ__', '__TOC__' ),
-	'noeditsection'           => array( '0', '__GANMHÍRATHRÚ__', '__NOEDITSECTION__' ),
-	'currentmonth'            => array( '1', 'MÍLÁITHREACH', 'CURRENTMONTH', 'CURRENTMONTH2' ),
-	'currentmonthname'        => array( '1', 'AINMNAMÍOSALÁITHREAÍ', 'CURRENTMONTHNAME' ),
-	'currentmonthnamegen'     => array( '1', 'GINAINMNAMÍOSALÁITHREAÍ', 'CURRENTMONTHNAMEGEN' ),
-	'currentmonthabbrev'      => array( '1', 'GIORRÚNAMÍOSALÁITHREAÍ', 'CURRENTMONTHABBREV' ),
-	'currentday'              => array( '1', 'LÁLÁITHREACH', 'CURRENTDAY' ),
-	'currentdayname'          => array( '1', 'AINMANLAELÁITHRIGH', 'CURRENTDAYNAME' ),
-	'currentyear'             => array( '1', 'BLIAINLÁITHREACH', 'CURRENTYEAR' ),
-	'currenttime'             => array( '1', 'AMLÁITHREACH', 'CURRENTTIME' ),
-	'numberofarticles'        => array( '1', 'LÍONNANALT', 'NUMBEROFARTICLES' ),
-	'numberoffiles'           => array( '1', 'LÍONNAGCOMHAD', 'NUMBEROFFILES' ),
-	'pagename'                => array( '1', 'AINMANLGH', 'PAGENAME' ),
-	'pagenamee'               => array( '1', 'AINMANLGHB', 'PAGENAMEE' ),
-	'namespace'               => array( '1', 'AINMSPÁS', 'NAMESPACE' ),
-	'msg'                     => array( '0', 'TCHT:', 'MSG:' ),
-	'subst'                   => array( '0', 'IONAD:', 'SUBST:' ),
-	'msgnw'                   => array( '0', 'TCHTFS:', 'MSGNW:' ),
-	'img_thumbnail'           => array( '1', 'mionsamhail', 'mion', 'thumbnail', 'thumb' ),
-	'img_right'               => array( '1', 'deas', 'right' ),
-	'img_left'                => array( '1', 'clé', 'left' ),
-	'img_none'                => array( '1', 'faic', 'none' ),
-	'img_center'              => array( '1', 'lár', 'center', 'centre' ),
-	'img_framed'              => array( '1', 'fráma', 'frámaithe', 'framed', 'enframed', 'frame' ),
-	'int'                     => array( '0', 'INMH:', 'INT:' ),
-	'sitename'                => array( '1', 'AINMANTSUÍMH', 'SITENAME' ),
-	'ns'                      => array( '0', 'AS:', 'NS:' ),
-	'localurl'                => array( '0', 'URLÁITIÚIL', 'LOCALURL:' ),
-	'localurle'               => array( '0', 'URLÁITIÚILB', 'LOCALURLE:' ),
-	'server'                  => array( '0', 'FREASTALAÍ', 'SERVER' ),
-	'servername'              => array( '0', 'AINMANFHREASTALAÍ', 'SERVERNAME' ),
-	'scriptpath'              => array( '0', 'SCRIPTCHOSÁN', 'SCRIPTPATH' ),
-	'grammar'                 => array( '0', 'GRAMADACH:', 'GRAMMAR:' ),
-	'notitleconvert'          => array( '0', '__GANTIONTÚNADTEIDEAL__', '__GANTT__', '__NOTITLECONVERT__', '__NOTC__' ),
-	'nocontentconvert'        => array( '0', '__GANTIONTÚNANÁBHAIR__', '__GANTA__', '__NOCONTENTCONVERT__', '__NOCC__' ),
-	'currentweek'             => array( '1', 'SEACHTAINLÁITHREACH', 'CURRENTWEEK' ),
-	'currentdow'              => array( '1', 'LÁLÁITHREACHNAS', 'CURRENTDOW' ),
-	'revisionid'              => array( '1', 'IDANLEASAITHE', 'REVISIONID' ),
+	'redirect'                  => array( '0', '#athsheoladh', '#REDIRECT' ),
+	'notoc'                     => array( '0', '__GANCÁ__', '__NOTOC__' ),
+	'forcetoc'                  => array( '0', '__CÁGACHUAIR__', '__FORCETOC__' ),
+	'toc'                       => array( '0', '__CÁ__', '__TOC__' ),
+	'noeditsection'             => array( '0', '__GANMHÍRATHRÚ__', '__NOEDITSECTION__' ),
+	'currentmonth'              => array( '1', 'MÍLÁITHREACH', 'CURRENTMONTH', 'CURRENTMONTH2' ),
+	'currentmonthname'          => array( '1', 'AINMNAMÍOSALÁITHREAÍ', 'CURRENTMONTHNAME' ),
+	'currentmonthnamegen'       => array( '1', 'GINAINMNAMÍOSALÁITHREAÍ', 'CURRENTMONTHNAMEGEN' ),
+	'currentmonthabbrev'        => array( '1', 'GIORRÚNAMÍOSALÁITHREAÍ', 'CURRENTMONTHABBREV' ),
+	'currentday'                => array( '1', 'LÁLÁITHREACH', 'CURRENTDAY' ),
+	'currentdayname'            => array( '1', 'AINMANLAELÁITHRIGH', 'CURRENTDAYNAME' ),
+	'currentyear'               => array( '1', 'BLIAINLÁITHREACH', 'CURRENTYEAR' ),
+	'currenttime'               => array( '1', 'AMLÁITHREACH', 'CURRENTTIME' ),
+	'numberofarticles'          => array( '1', 'LÍONNANALT', 'NUMBEROFARTICLES' ),
+	'numberoffiles'             => array( '1', 'LÍONNAGCOMHAD', 'NUMBEROFFILES' ),
+	'pagename'                  => array( '1', 'AINMANLGH', 'PAGENAME' ),
+	'pagenamee'                 => array( '1', 'AINMANLGHB', 'PAGENAMEE' ),
+	'namespace'                 => array( '1', 'AINMSPÁS', 'NAMESPACE' ),
+	'msg'                       => array( '0', 'TCHT:', 'MSG:' ),
+	'subst'                     => array( '0', 'IONAD:', 'SUBST:' ),
+	'msgnw'                     => array( '0', 'TCHTFS:', 'MSGNW:' ),
+	'img_thumbnail'             => array( '1', 'mionsamhail', 'mion', 'thumbnail', 'thumb' ),
+	'img_right'                 => array( '1', 'deas', 'right' ),
+	'img_left'                  => array( '1', 'clé', 'left' ),
+	'img_none'                  => array( '1', 'faic', 'none' ),
+	'img_center'                => array( '1', 'lár', 'center', 'centre' ),
+	'img_framed'                => array( '1', 'fráma', 'frámaithe', 'framed', 'enframed', 'frame' ),
+	'int'                       => array( '0', 'INMH:', 'INT:' ),
+	'sitename'                  => array( '1', 'AINMANTSUÍMH', 'SITENAME' ),
+	'ns'                        => array( '0', 'AS:', 'NS:' ),
+	'localurl'                  => array( '0', 'URLÁITIÚIL', 'LOCALURL:' ),
+	'localurle'                 => array( '0', 'URLÁITIÚILB', 'LOCALURLE:' ),
+	'server'                    => array( '0', 'FREASTALAÍ', 'SERVER' ),
+	'servername'                => array( '0', 'AINMANFHREASTALAÍ', 'SERVERNAME' ),
+	'scriptpath'                => array( '0', 'SCRIPTCHOSÁN', 'SCRIPTPATH' ),
+	'grammar'                   => array( '0', 'GRAMADACH:', 'GRAMMAR:' ),
+	'notitleconvert'            => array( '0', '__GANTIONTÚNADTEIDEAL__', '__GANTT__', '__NOTITLECONVERT__', '__NOTC__' ),
+	'nocontentconvert'          => array( '0', '__GANTIONTÚNANÁBHAIR__', '__GANTA__', '__NOCONTENTCONVERT__', '__NOCC__' ),
+	'currentweek'               => array( '1', 'SEACHTAINLÁITHREACH', 'CURRENTWEEK' ),
+	'currentdow'                => array( '1', 'LÁLÁITHREACHNAS', 'CURRENTDOW' ),
+	'revisionid'                => array( '1', 'IDANLEASAITHE', 'REVISIONID' ),
 );
 
 $namespaceNames = array(
diff --git a/languages/messages/MessagesGag.php b/languages/messages/MessagesGag.php
index fd490b0237..bb10a36b3d 100644
--- a/languages/messages/MessagesGag.php
+++ b/languages/messages/MessagesGag.php
@@ -93,7 +93,7 @@ $specialPageAliases = array(
 );
 
 $magicWords = array(
-	'redirect'                => array( '0', '#YÖNNENDİRMÄKLER', '#YÖNNENDİR', '#YÖNNENDİRMÄ', '#YÖNLENDİRME', '#YÖNLENDİR', '#REDIRECT' ),
+	'redirect'                  => array( '0', '#YÖNNENDİRMÄKLER', '#YÖNNENDİR', '#YÖNNENDİRMÄ', '#YÖNLENDİRME', '#YÖNLENDİR', '#REDIRECT' ),
 );
 
 $messages = array(
diff --git a/languages/messages/MessagesGan.php b/languages/messages/MessagesGan.php
index decfa8b512..64c800e645 100644
--- a/languages/messages/MessagesGan.php
+++ b/languages/messages/MessagesGan.php
@@ -15,22 +15,21 @@
 $fallback = 'gan-hant, zh-hant, zh-hans';
 
 $namespaceNames = array(
-	NS_MEDIA            => 'Media',
-	NS_SPECIAL          => 'Special',
-	NS_TALK             => 'Talk',
-	NS_USER             => 'User',
-	NS_USER_TALK        => 'User_talk',
-	NS_PROJECT_TALK     => '$1_talk',
-	NS_FILE             => 'File',
-	NS_FILE_TALK        => 'File_talk',
-	NS_MEDIAWIKI        => 'MediaWiki',
-	NS_MEDIAWIKI_TALK   => 'MediaWiki_talk',
-	NS_TEMPLATE         => 'Template',
-	NS_TEMPLATE_TALK    => 'Template_talk',
-	NS_HELP             => 'Help',
-	NS_HELP_TALK        => 'Help_talk',
-	NS_CATEGORY         => 'Category',
-	NS_CATEGORY_TALK    => 'Category_talk',
+	NS_MEDIA            => '媒體',
+	NS_SPECIAL          => '特別',
+	NS_TALK             => '談詑',
+	NS_USER             => '用戶',
+	NS_USER_TALK        => '用戶・談詑',
+	NS_PROJECT_TALK     => '$1_談詑',
+	NS_FILE             => '文檔',
+	NS_FILE_TALK        => '文檔・談詑',
+	NS_MEDIAWIKI_TALK   => 'MediaWiki・談詑',
+	NS_TEMPLATE         => '模板',
+	NS_TEMPLATE_TALK    => '模板・談詑',
+	NS_HELP             => '幫助',
+	NS_HELP_TALK        => '幫助・談詑',
+	NS_CATEGORY         => '分類',
+	NS_CATEGORY_TALK    => '分類・談詑',
 );
 
 $messages = array(
diff --git a/languages/messages/MessagesGd.php b/languages/messages/MessagesGd.php
index c27cc54e09..83abaeaf8e 100644
--- a/languages/messages/MessagesGd.php
+++ b/languages/messages/MessagesGd.php
@@ -251,7 +251,7 @@ $messages = array(
 'otherlanguages' => 'Ann an cànain eile',
 'redirectedfrom' => '(Air ath-sheòladh o $1)',
 'redirectpagesub' => 'Ath-sheòl an duilleag',
-'lastmodifiedat' => 'Chaidh an duilleag seo a mhùthadh $1, aig $2 turas mu dheireadh.',
+'lastmodifiedat' => 'Chaidh an duilleag seo a mhùthadh $1 aig $2 turas mu dheireadh.',
 'viewcount' => 'Chaidh inntrigeadh a dhèanam dhan duilleag seo {{PLURAL:$1|aon turas|$1 thuras|$1 turas|$1 turais|$1 turas}}.',
 'protectedpage' => 'Duilleag fo dhìon',
 'jumpto' => 'Gearr leum gu:',
@@ -353,9 +353,9 @@ Gheibh thu liosta nan duilleagan sònraichte 's dligheach aig [[Special:SpecialP
 'dberrortext' => 'Thachair mearachd co-chàraidh rè iarrtas an stòir-dhàta.
 Faodaidh gu bheil seo a\' comharrachadh mearachd sa bhathar-bhog.
 Seo iarrtas an stòir-dhàta mu dheireadh a chaidh feuchainn ris:
-<blockquote><tt>$1</tt></blockquote>
-o bhroinn an fhoincsein "<tt>$2</tt>".
-Thill an stòr-dàta a\' mhearachd "<tt>$3: $4</tt>".',
+<blockquote><code>$1</code></blockquote>
+o bhroinn an fhoincsein "<code>$2</code>".
+Thill an stòr-dàta a\' mhearachd "<samp>$3: $4</samp>".',
 'dberrortextcl' => 'Thachair mearachd co-chàraidh rè iarrtas an stòir-dhàta.
 Seo iarrtas an stòir-dhàta mu dheireadh a chaidh feuchainn ris:
 "$1"
@@ -700,11 +700,10 @@ Dèan cinnteach gu bheil thu airson an duilleag seo a chruthachadh/dheasachadh.'
 'userpage-userdoesnotexist-view' => 'Cha deach an cunntas cleachdaiche "$1" a chlàradh.',
 'blocked-notice-logextract' => "Tha an cleachdaiche seo air a bhacadh an-dràsta fhèin.
 Chì thu loga a' bhacaidh mu dheireadh gu h-ìosal mar fhiosrachadh dhut:",
-'clearyourcache' => "''An aire:''' As dèidh dhut sàbhaladh, 's mathaid gum bi agad tasgadan a' bhrabhsair agad a chur air gleus mus fhaic thu na dh'atharraich thu.
+'clearyourcache' => "'''An aire:''' As dèidh dhut sàbhaladh, 's mathaid gum bi agad tasgadan a' bhrabhsair agad a chur air gleus mus fhaic thu na dh'atharraich thu.
 * '''Firefox / Safari:''' Cum 'shìos 'Shift'' is briog air ''Ath-luchdaich' no brùth ''Ctrl-F5'' no ''Ctrl-R'' (''⌘-R'' air Mac)
 * '''Google Chrome:''' Brùth ''Ctrl-Shift-R'' (''⌘-Shift-R'' air Mac)
 * '''Internet Explorer:''' Cum shìos ''Ctrl'' is briog air ''Ath-nuadhaich'' no brùth ''Ctrl-F5''
-* '''Konqueror:''' Briog air ''Reload'' no brùth ''F5''
 * '''Opera:''' Falamhaich an tasgadan ann an ''Innealan → Roghainnean''",
 'usercssyoucanpreview' => "'''Gliocas:''' Cleachd am putan \"{{int:showpreview}}\" airson an CSS agad a chur fo dheuchainn mus sàbhail thu e.",
 'userjsyoucanpreview' => "'''Gliocas:''' Cleachd am putan \"{{int:showpreview}}\" gus an JavaScript ùr agad a chur fo dheuchainn mus sàbhail thu e.",
@@ -716,11 +715,29 @@ Chì thu loga a' bhacaidh mu dheireadh gu h-ìosal mar fhiosrachadh dhut:",
 '''Cha deach a shàbhaladh fhathast!''''",
 'sitejspreview' => "'''Cuimhnich nach e seo ach ro-shealladh air còd a' JavaScript agad.'''
 '''Cha deach a shàbhaladh fhathast!''''",
+'userinvalidcssjstitle' => "'''Rabhadh:''' Chan eil an craiceann \"\$1\" ann.
+Cleachdaidh duilleagan gnàthaichte .css agus .js tiotal ann an litrichean beaga, m.e. {{ns:user}}:Foo/vector.css seach {{ns:user}}:Foo/Vector.css.",
 'updated' => '(Air ùrachadh)',
+'note' => "'''An aire:'''",
 'previewnote' => "'''Cuimhnich nach eil ann ach ro-shealladh.'''
 Cha deach na mùthaidhean agad a shàbhaladh fhathast!",
+'previewconflict' => "Tha an ro-shealladh seo a' sealltainn dhut an teacsa san raon teacsa gu h-àrd mar a nochdas e ma shàbhaileas tu an-dràsta.",
+'session_fail_preview' => "'''Duilich! Cha b' urrainn dhuinn na dheasaich thu a làimhseachadh air sgàth call dàta an t-seisein.'''
+Nach fheuch thu ris a-rithist?
+Mur obraich e fhathast, feuch is [[Special:UserLogout|clàraich a-mach]] is a-steach a-rithist an uairsin.",
+'session_fail_preview_html' => "'''Duilich! Cha b' urrainn dhuinn na dheasaich thu a làimhseachadh air sgàth call dàta an t-seisein.'''
+
+''A chionn 's gun do chuir {{SITENAME}} HTML amh an comas, tha an ro-shealladh falaichte mar dhìon an aghaidh ionnsaighean JavaScript.''
+
+'''Mas e deasachadh dligheach a tha seo, feuch ris a-rithist.'''
+Mur obraich e fhathast, feuch is [[Special:UserLogout|clàraich a-mach]] is a-steach a-rithist an uairsin.",
+'token_suffix_mismatch' => "'''Dhiùlt sinn na dheasaich thu a chionn 's gun do chuir an cliant agad na caractaran puingeachaidh tro chèile san tòcan deasachaidh.'''
+Dhiùlt sinn na dheasaich thu air eagal 's gun coirbeadh e teacsa na duilleige.
+Tachraidh seo uaireannan ma chleachdar seirbheis-lìn progsaidh gun urra a tha làn de mhearachdan.",
+'edit_form_incomplete' => "'''Cha do ràinig cuid dhen fhoirm deasachaidh am frithealaichte; dèan cinnteach gu bheil gach deasachadh agad slàn is feuch ris a-rithist.'''",
 'editing' => "A' deasachadh $1",
 'editingsection' => "A' deasachadh $1 (earrann)",
+'editingcomment' => "A' deasachadh $1 (earrann ùr)",
 'editconflict' => 'Còmhstri deasachaidh: $1',
 'explainconflict' => "Tha cuideigin eile air an duilleag seo a mhùthadh on a thòisich thu fhèin air a dheasachadh.
 Tha am bogsa teacsa gu h-àrd a' nochdadh na duilleige mar a tha i an-dràsta.
@@ -729,6 +746,8 @@ Bidh agad ris na mùthaidhean agad fhilleadh a-steach san teacsa làithreach.
 Cha dèid '''ach an teacsa gu h-àrd''' a shàbhaladh nuair a bhriogas tu air \"{{int:savearticle}}\".",
 'yourtext' => 'An teacsa agad',
 'storedversion' => 'Lethbhreac taisgte',
+'nonunicodebrowser' => "'''Rabhadh: Chan eil am brabhsair agad co-chòrdail le Unicode.'''
+Chuir sinn gleus air dòigh dhut a nì cinnteach gun urrainn dhut duilleagan a shàbhaladh gu tèarainte: Nochdaidh caractaran taobh a-muigh ASCII mar chòd sia-dheicheach sa bhogsa deasachaidh.",
 'editingold' => "'''RABHADH: Tha thu a' deasachadh lethbhreac seann-aimsireil na duilleige seo.
 Ma shàbhalas tu seo, thèid gach mùthadh air chall a rinneadh a-mach on mhùthadh seo.'''",
 'yourdiff' => 'Caochlaidhean',
@@ -740,10 +759,22 @@ Tha thu a' toirt geall cuideachd gun do sgrìobh thu fhèin seo no gun do rinn t
 Mur eil thu ag iarraidh an sgrìobhaidh agad a dheasaichear is a sgaoilear le càch, na cuir e.<br />
 Ma dh'fhoilleachas tu rudeigin an seo, bidh tu a' dearbhadh gun do sgrìobh thu fhèin e, no gur ann às an raon phòballach a thàinig e; thoir aire '''nach eil''' sin a' gabhail a-staigh duilleagan-lìn mar as àbhaist (seall $1 airson barrachd fiosrachaidh). <br />
 '''NA CLEACHDAIBH SAOTHAIR FO DHLIGHE-SGRÌOBHAIDH GUN CHEAD!'''",
+'longpageerror' => "'''Mearachd: Tha an teacsa a chur thu thugainn {{PLURAL:$1 kilobyte|$1 kilobyte|$1 kilobyte|$1 kilobyte|$1 kilobyte|$1 kilobyte|}} a dh'fhaid is tha sin nas fhaide na tha ceadaichte ({{PLURAL:$1 kilobyte|$2 kilobyte|$2 kilobyte|$2 kilobyte|$2 kilobyte|$2 kilobyte|}}).'''
+Cha ghabh a shàbhaladh.",
+'readonlywarning' => "'''Rabhadh: Chaidh an stòr-dàta a ghlasadh a chum obair-ghlèidhidh agus chan urrainn dhut na còraichean-deasachaidh agad a chur gu feum an-dràsta fhèin.'''
+'S mathaid gum b' fheairrde dhut lethbhreac a dhèanamh dhen teacsa agus a shàbhaladh ann am faidhle ach an urrainn dhut a chleachdadh as a dhèidh seo.
+
+Seo am mìneachadh a thug an rianaire a ghlais e: $1",
 'protectedpagewarning' => "'''Rabhadh: Chaidh an duilleag seo a dhìon 's chan urrainn ach dhan fheadhainn aig a bheil ùghdarras rianaire a dheasachadh.'''
 Chì thu an clàr mu dheireadh san loga mar fhiosrachadh dhut gu h-ìosal:",
+'semiprotectedpagewarning' => "'''An aire:''' Chaidh an duilleag seo a dhìon 's chan fhaod ach cleachdaichean clàraichte a dheasachadh.
+Seo an rud mu dheireadh san loga mar fhiosrachadh dhut:",
+'cascadeprotectedwarning' => "'''Rabhadh:''' Chaidh an duilleag seo a dhìon 's chan fhaod ach rianairean a dheasachadh a chionn 's gun robh e am broinn {{PLURAL:$1|na duilleige|nan duilleagan}} a leanas a tha cascade-protected.",
+'titleprotectedwarning' => "'''Rabhadh: Chaidh an duilleag seo a dhìon 's feumar [[Special:ListGroupRights|còraichean sònraichte]] gus a dheasachadh.'''
+Seo an rud mu dheireadh san loga mar fhiosrachadh dhut:",
 'templatesused' => "Tha {{PLURAL:$1|teamplaid|theamplaid||teamplaid|theamplaid|teamplaidean|teamplaid}} 'gan cleachdadh air an duilleag seo:",
 'templatesusedpreview' => "Tha {{PLURAL:$1|teamplaid 'ga cleachdadh|teamplaidean 'gan cleachdadh|teamplaidean 'gan cleachdadh|teamplaidean 'gan cleachdadh|teamplaidean 'gan cleachdadh|teamplaidean 'gan cleachdadh}} san ro-shealladh seo:",
+'templatesusedsection' => "Tha {{PLURAL:$1|teamplaid 'ga cleachdadh|teamplaidean 'gan cleachdadh|teamplaidean 'gan cleachdadh|teamplaidean 'gan cleachdadh|teamplaidean 'gan cleachdadh|teamplaidean 'gan cleachdadh}} san earrann seo:",
 'template-protected' => '(air a dhìon)',
 'template-semiprotected' => '(air a leth-dhìon)',
 'hiddencategories' => "Tha an duilleag seo 'na ball de {{PLURAL:$1|1 roinn-seòrsa fhalaichte|$1 roinn-seòrsa fhalaichte|1 roinn-seòrsa fhalaichte|$1 roinn-seòrsa fhalaichte|$1 roinnean-seòrsa falaichte|$1 roinn-seòrsa fhalaichte}}:",
diff --git a/languages/messages/MessagesGl.php b/languages/messages/MessagesGl.php
index 734e8a0adf..83428da62f 100644
--- a/languages/messages/MessagesGl.php
+++ b/languages/messages/MessagesGl.php
@@ -163,60 +163,60 @@ $specialPageAliases = array(
 );
 
 $magicWords = array(
-	'redirect'                => array( '0', '#REDIRECCIÓN', '#REDIRECIONAMENTO', '#REDIRECT' ),
-	'notoc'                   => array( '0', '__SENÍNDICE__', '__SEMTDC__', '__SEMSUMÁRIO__', '__NOTOC__' ),
-	'nogallery'               => array( '0', '__SENGALERÍA__', '__SEMGALERIA__', '__NOGALLERY__' ),
-	'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' ),
-	'currentmonthabbrev'      => array( '1', 'ABREVIATURADOMESACTUAL', 'MESATUALABREV', 'MESATUALABREVIADO', 'ABREVIATURADOMESATUAL', 'CURRENTMONTHABBREV' ),
-	'currentday'              => array( '1', 'DÍAACTUAL', 'DIAATUAL', 'CURRENTDAY' ),
-	'currentday2'             => array( '1', 'DÍAACTUAL2', 'DIAATUAL2', 'CURRENTDAY2' ),
-	'currentdayname'          => array( '1', 'NOMEDODÍAACTUAL', 'NOMEDODIAATUAL', 'CURRENTDAYNAME' ),
-	'currentyear'             => array( '1', 'ANOACTUAL', 'ANOATUAL', 'CURRENTYEAR' ),
-	'currenthour'             => array( '1', 'HORAACTUAL', 'HORAATUAL', 'CURRENTHOUR' ),
-	'localmonth'              => array( '1', 'MESLOCAL', 'LOCALMONTH', 'LOCALMONTH2' ),
-	'localmonth1'             => array( '1', 'MESLOCAL1', 'LOCALMONTH1' ),
-	'localmonthname'          => array( '1', 'NOMEDOMESLOCAL', 'LOCALMONTHNAME' ),
-	'localmonthabbrev'        => array( '1', 'ABREVIATURADOMESLOCAL', 'MESLOCALABREV', 'MESLOCALABREVIADO', 'LOCALMONTHABBREV' ),
-	'localday'                => array( '1', 'DÍALOCAL', 'DIALOCAL', 'LOCALDAY' ),
-	'localday2'               => array( '1', 'DÍALOCAL2', 'DIALOCAL2', 'LOCALDAY2' ),
-	'localdayname'            => array( '1', 'NOMEDODÍALOCAL', 'NOMEDODIALOCAL', 'LOCALDAYNAME' ),
-	'localyear'               => array( '1', 'ANOLOCAL', 'LOCALYEAR' ),
-	'localhour'               => array( '1', 'HORALOCAL', 'LOCALHOUR' ),
-	'numberofpages'           => array( '1', 'NÚMERODEPÁXINAS', 'NUMERODEPAGINAS', 'NÚMERODEPÁGINAS', 'NUMBEROFPAGES' ),
-	'numberofarticles'        => array( '1', 'NÚMERODEARTIGOS', 'NUMERODEARTIGOS', 'NUMBEROFARTICLES' ),
-	'numberoffiles'           => array( '1', 'NÚMERODEFICHEIROS', 'NUMERODEARQUIVOS', 'NÚMERODEARQUIVOS', 'NUMBEROFFILES' ),
-	'numberofusers'           => array( '1', 'NÚMERODEUSUARIOS', 'NUMERODEUSUARIOS', 'NÚMERODEUSUÁRIOS', 'NUMBEROFUSERS' ),
-	'numberofedits'           => array( '1', 'NÚMERODEEDICIÓNS', 'NUMERODEEDICOES', 'NÚMERODEEDIÇÕES', 'NUMBEROFEDITS' ),
-	'pagename'                => array( '1', 'NOMEDAPÁXINA', 'NOMEDAPAGINA', 'NOMEDAPÁGINA', 'PAGENAME' ),
-	'namespace'               => array( '1', 'ESPAZODENOMES', 'DOMINIO', 'DOMÍNIO', 'ESPACONOMINAL', 'ESPAÇONOMINAL', 'NAMESPACE' ),
-	'fullpagename'            => array( '1', 'NOMECOMPLETODAPÁXINA', 'NOMECOMPLETODAPAGINA', 'NOMECOMPLETODAPÁGINA', 'FULLPAGENAME' ),
-	'subpagename'             => array( '1', 'NOMEDASUBPÁXINA', 'NOMEDASUBPAGINA', 'NOMEDASUBPÁGINA', 'SUBPAGENAME' ),
-	'basepagename'            => array( '1', 'NOMEDAPÁXINABASE', 'NOMEDAPAGINABASE', 'NOMEDAPÁGINABASE', 'BASEPAGENAME' ),
-	'talkpagename'            => array( '1', 'NOMEDAPÁXINADECONVERSA', 'NOMEDAPAGINADEDISCUSSAO', 'NOMEDAPÁGINADEDISCUSSÃO', 'TALKPAGENAME' ),
-	'img_manualthumb'         => array( '1', 'miniatura=$1', 'miniaturadaimagem=$1', 'thumbnail=$1', 'thumb=$1' ),
-	'img_right'               => array( '1', 'dereita', 'direita', 'right' ),
-	'img_left'                => array( '1', 'esquerda', 'left' ),
-	'img_none'                => array( '1', 'ningún', 'nenhum', 'none' ),
-	'img_center'              => array( '1', 'centro', 'center', 'centre' ),
-	'img_page'                => array( '1', 'páxina=$1', 'páxina $1', 'página=$1', 'página $1', 'page=$1', 'page $1' ),
-	'img_border'              => array( '1', 'bordo', 'borda', 'border' ),
-	'grammar'                 => array( '0', 'GRAMÁTICA:', 'GRAMMAR:' ),
-	'displaytitle'            => array( '1', 'AMOSAROTÍTULO', 'EXIBETITULO', 'EXIBETÍTULO', 'DISPLAYTITLE' ),
-	'newsectionlink'          => array( '1', '__LIGAZÓNDANOVASECCIÓN__', '__LINKDENOVASECAO__', '__LINKDENOVASEÇÃO__', '__LIGACAODENOVASECAO__', '__LIGAÇÃODENOVASEÇÃO__', '__NEWSECTIONLINK__' ),
-	'language'                => array( '0', '#LINGUA:', '#IDIOMA:', '#LANGUAGE:' ),
-	'numberofadmins'          => array( '1', 'NÚMERODEADMINISTRADORES', 'NUMERODEADMINISTRADORES', 'NUMBEROFADMINS' ),
-	'special'                 => array( '0', 'especial', 'special' ),
-	'defaultsort'             => array( '1', 'ORDENAR:', 'ORDENACAOPADRAO', 'ORDENAÇÃOPADRÃO', 'ORDEMPADRAO', 'ORDEMPADRÃO', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:' ),
-	'tag'                     => array( '0', 'etiqueta', 'tag' ),
-	'hiddencat'               => array( '1', '__CATEGORÍAOCULTA__', '__CATEGORIAOCULTA__', '__CATOCULTA__', '__HIDDENCAT__' ),
-	'pagesincategory'         => array( '1', 'PÁXINASNACATEGORÍA', 'PAGINASNACATEGORIA', 'PÁGINASNACATEGORIA', 'PAGINASNACAT', 'PÁGINASNACAT', 'PAGESINCATEGORY', 'PAGESINCAT' ),
-	'pagesize'                => array( '1', 'TAMAÑODAPÁXINA', 'TAMANHODAPAGINA', 'TAMANHODAPÁGINA', 'PAGESIZE' ),
+	'redirect'                  => array( '0', '#REDIRECCIÓN', '#REDIRECIONAMENTO', '#REDIRECT' ),
+	'notoc'                     => array( '0', '__SENÍNDICE__', '__SEMTDC__', '__SEMSUMÁRIO__', '__NOTOC__' ),
+	'nogallery'                 => array( '0', '__SENGALERÍA__', '__SEMGALERIA__', '__NOGALLERY__' ),
+	'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' ),
+	'currentmonthabbrev'        => array( '1', 'ABREVIATURADOMESACTUAL', 'MESATUALABREV', 'MESATUALABREVIADO', 'ABREVIATURADOMESATUAL', 'CURRENTMONTHABBREV' ),
+	'currentday'                => array( '1', 'DÍAACTUAL', 'DIAATUAL', 'CURRENTDAY' ),
+	'currentday2'               => array( '1', 'DÍAACTUAL2', 'DIAATUAL2', 'CURRENTDAY2' ),
+	'currentdayname'            => array( '1', 'NOMEDODÍAACTUAL', 'NOMEDODIAATUAL', 'CURRENTDAYNAME' ),
+	'currentyear'               => array( '1', 'ANOACTUAL', 'ANOATUAL', 'CURRENTYEAR' ),
+	'currenthour'               => array( '1', 'HORAACTUAL', 'HORAATUAL', 'CURRENTHOUR' ),
+	'localmonth'                => array( '1', 'MESLOCAL', 'LOCALMONTH', 'LOCALMONTH2' ),
+	'localmonth1'               => array( '1', 'MESLOCAL1', 'LOCALMONTH1' ),
+	'localmonthname'            => array( '1', 'NOMEDOMESLOCAL', 'LOCALMONTHNAME' ),
+	'localmonthabbrev'          => array( '1', 'ABREVIATURADOMESLOCAL', 'MESLOCALABREV', 'MESLOCALABREVIADO', 'LOCALMONTHABBREV' ),
+	'localday'                  => array( '1', 'DÍALOCAL', 'DIALOCAL', 'LOCALDAY' ),
+	'localday2'                 => array( '1', 'DÍALOCAL2', 'DIALOCAL2', 'LOCALDAY2' ),
+	'localdayname'              => array( '1', 'NOMEDODÍALOCAL', 'NOMEDODIALOCAL', 'LOCALDAYNAME' ),
+	'localyear'                 => array( '1', 'ANOLOCAL', 'LOCALYEAR' ),
+	'localhour'                 => array( '1', 'HORALOCAL', 'LOCALHOUR' ),
+	'numberofpages'             => array( '1', 'NÚMERODEPÁXINAS', 'NUMERODEPAGINAS', 'NÚMERODEPÁGINAS', 'NUMBEROFPAGES' ),
+	'numberofarticles'          => array( '1', 'NÚMERODEARTIGOS', 'NUMERODEARTIGOS', 'NUMBEROFARTICLES' ),
+	'numberoffiles'             => array( '1', 'NÚMERODEFICHEIROS', 'NUMERODEARQUIVOS', 'NÚMERODEARQUIVOS', 'NUMBEROFFILES' ),
+	'numberofusers'             => array( '1', 'NÚMERODEUSUARIOS', 'NUMERODEUSUARIOS', 'NÚMERODEUSUÁRIOS', 'NUMBEROFUSERS' ),
+	'numberofedits'             => array( '1', 'NÚMERODEEDICIÓNS', 'NUMERODEEDICOES', 'NÚMERODEEDIÇÕES', 'NUMBEROFEDITS' ),
+	'pagename'                  => array( '1', 'NOMEDAPÁXINA', 'NOMEDAPAGINA', 'NOMEDAPÁGINA', 'PAGENAME' ),
+	'namespace'                 => array( '1', 'ESPAZODENOMES', 'DOMINIO', 'DOMÍNIO', 'ESPACONOMINAL', 'ESPAÇONOMINAL', 'NAMESPACE' ),
+	'fullpagename'              => array( '1', 'NOMECOMPLETODAPÁXINA', 'NOMECOMPLETODAPAGINA', 'NOMECOMPLETODAPÁGINA', 'FULLPAGENAME' ),
+	'subpagename'               => array( '1', 'NOMEDASUBPÁXINA', 'NOMEDASUBPAGINA', 'NOMEDASUBPÁGINA', 'SUBPAGENAME' ),
+	'basepagename'              => array( '1', 'NOMEDAPÁXINABASE', 'NOMEDAPAGINABASE', 'NOMEDAPÁGINABASE', 'BASEPAGENAME' ),
+	'talkpagename'              => array( '1', 'NOMEDAPÁXINADECONVERSA', 'NOMEDAPAGINADEDISCUSSAO', 'NOMEDAPÁGINADEDISCUSSÃO', 'TALKPAGENAME' ),
+	'img_manualthumb'           => array( '1', 'miniatura=$1', 'miniaturadaimagem=$1', 'thumbnail=$1', 'thumb=$1' ),
+	'img_right'                 => array( '1', 'dereita', 'direita', 'right' ),
+	'img_left'                  => array( '1', 'esquerda', 'left' ),
+	'img_none'                  => array( '1', 'ningún', 'nenhum', 'none' ),
+	'img_center'                => array( '1', 'centro', 'center', 'centre' ),
+	'img_page'                  => array( '1', 'páxina=$1', 'páxina $1', 'página=$1', 'página $1', 'page=$1', 'page $1' ),
+	'img_border'                => array( '1', 'bordo', 'borda', 'border' ),
+	'grammar'                   => array( '0', 'GRAMÁTICA:', 'GRAMMAR:' ),
+	'displaytitle'              => array( '1', 'AMOSAROTÍTULO', 'EXIBETITULO', 'EXIBETÍTULO', 'DISPLAYTITLE' ),
+	'newsectionlink'            => array( '1', '__LIGAZÓNDANOVASECCIÓN__', '__LINKDENOVASECAO__', '__LINKDENOVASEÇÃO__', '__LIGACAODENOVASECAO__', '__LIGAÇÃODENOVASEÇÃO__', '__NEWSECTIONLINK__' ),
+	'language'                  => array( '0', '#LINGUA:', '#IDIOMA:', '#LANGUAGE:' ),
+	'numberofadmins'            => array( '1', 'NÚMERODEADMINISTRADORES', 'NUMERODEADMINISTRADORES', 'NUMBEROFADMINS' ),
+	'special'                   => array( '0', 'especial', 'special' ),
+	'defaultsort'               => array( '1', 'ORDENAR:', 'ORDENACAOPADRAO', 'ORDENAÇÃOPADRÃO', 'ORDEMPADRAO', 'ORDEMPADRÃO', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:' ),
+	'tag'                       => array( '0', 'etiqueta', 'tag' ),
+	'hiddencat'                 => array( '1', '__CATEGORÍAOCULTA__', '__CATEGORIAOCULTA__', '__CATOCULTA__', '__HIDDENCAT__' ),
+	'pagesincategory'           => array( '1', 'PÁXINASNACATEGORÍA', 'PAGINASNACATEGORIA', 'PÁGINASNACATEGORIA', 'PAGINASNACAT', 'PÁGINASNACAT', 'PAGESINCATEGORY', 'PAGESINCAT' ),
+	'pagesize'                  => array( '1', 'TAMAÑODAPÁXINA', 'TAMANHODAPAGINA', 'TAMANHODAPÁGINA', 'PAGESIZE' ),
 );
 
 $separatorTransformTable = array( ',' => '.', '.' => ',' );
@@ -3073,7 +3073,7 @@ Isto, probabelmente, se debe a unha ligazón cara a un sitio externo que está n
 'pageinfo-authors' => 'Número total de autores distintos',
 'pageinfo-recent-edits' => 'Número de edicións recentes (durante os últimos $1)',
 'pageinfo-recent-authors' => 'Número de autores distintos recentes',
-'pageinfo-restriction' => 'Protección da páxina (<code>$1</code>)',
+'pageinfo-restriction' => 'Protección da páxina (<code>{{lcfirst:$1}}</code>)',
 'pageinfo-magic-words' => '{{PLURAL:$1|Palabra máxica|Palabras máxicas}} ($1)',
 'pageinfo-hidden-categories' => '{{PLURAL:$1|Categoría agochada|Categorías agochadas}} ($1)',
 'pageinfo-templates' => '{{PLURAL:$1|Modelo incluído|Modelos incluídos}} ($1)',
diff --git a/languages/messages/MessagesGot.php b/languages/messages/MessagesGot.php
index a81a230b63..ea1c5b5227 100644
--- a/languages/messages/MessagesGot.php
+++ b/languages/messages/MessagesGot.php
@@ -14,6 +14,25 @@
  * @author Zylbath
  */
 
+$namespaceNames = array(
+	NS_USER             => '𐌽𐌹𐌿𐍄𐌰𐌽𐌳𐍃',
+	NS_USER_TALK        => '𐌽𐌹𐌿𐍄𐌰𐌽𐌳𐌹𐍃_𐌲𐌰𐍅𐌰𐌿𐍂𐌳𐌾𐌰',
+	NS_PROJECT_TALK     => '𐌸𐌹𐍃_$1_𐌲𐌰𐍅𐌰𐌿𐍂𐌳𐌾𐌰',
+	NS_FILE             => '𐍆𐌴𐌹𐌻𐌰',
+	NS_FILE_TALK        => '𐍆𐌴𐌹𐌻𐌹𐌽𐍃_𐌲𐌰𐍅𐌰𐌿𐍂𐌳𐌾𐌰',
+	NS_TEMPLATE         => '𐍆𐌰𐌿𐍂𐌰𐌼𐌴𐌻𐌴𐌹𐌽𐍃',
+	NS_TEMPLATE_TALK    => '𐍆𐌰𐌿𐍂𐌰𐌼𐌴𐌻𐌴𐌹𐌽𐌰𐌹𐍃_𐌲𐌰𐍅𐌰𐌿𐍂𐌳𐌾𐌰',
+	NS_HELP             => '𐌷𐌹𐌻𐍀𐌰',
+	NS_HELP_TALK        => '𐌷𐌹𐌻𐍀𐍉𐍃_𐌲𐌰𐍅𐌰𐌿𐍂𐌳𐌾𐌰',
+	NS_CATEGORY         => '𐌷𐌰𐌽𐍃𐌰',
+	NS_CATEGORY_TALK    => '𐌷𐌰𐌽𐍃𐍉𐍃_𐌲𐌰𐍅𐌰𐌿𐍂𐌳𐌾𐌰',
+);
+
+$specialPageAliases = array(
+	'Allpages'                  => array( '𐌰𐌻𐌻𐍃𐍃𐌴𐌹𐌳𐍉𐌽𐍃' ),
+	'Recentchanges'             => array( '𐌰𐍆𐍄𐌿𐌼𐌹𐍃𐍄𐍉𐍃𐌼𐌰𐌹𐌳𐌴𐌹𐌽𐌴𐌹𐍃' ),
+);
+
 $messages = array(
 'underline-always' => 'Sinteino',
 'underline-never'  => 'Niu',
diff --git a/languages/messages/MessagesGsw.php b/languages/messages/MessagesGsw.php
index 3644766723..271cb561b7 100644
--- a/languages/messages/MessagesGsw.php
+++ b/languages/messages/MessagesGsw.php
@@ -127,7 +127,7 @@ $specialPageAliases = array(
 );
 
 $magicWords = array(
-	'displaytitle'            => array( '1', 'SYTETITEL', 'SEITENTITEL', 'DISPLAYTITLE' ),
+	'displaytitle'              => array( '1', 'SYTETITEL', 'SEITENTITEL', 'DISPLAYTITLE' ),
 );
 
 $linkTrail = '/^([äöüßa-z]+)(.*)$/sDu';
diff --git a/languages/messages/MessagesGu.php b/languages/messages/MessagesGu.php
index ab1b0be96a..473f0c6243 100644
--- a/languages/messages/MessagesGu.php
+++ b/languages/messages/MessagesGu.php
@@ -862,7 +862,7 @@ $2
 જ્યારે તમે વેબ આધારિત  અજ્ઞાત પ્રોક્સી વાપરતા હોવ ત્યારે આવું બની શકે છે.",
 'edit_form_incomplete' => "'''ફેરફાર પત્રનો અમુક ભાગ સર્વર સુધી ન પહોંચ્યો; ખાત્રી કરો કે તમે કરેલા ફેરફાર બરાબર છે અને ફરી પ્રયત્ન કરો.'''",
 'editing' => '$1નો ફેરફાર કરી રહ્યા છે',
-'creating' => '$1 બનાવે છે',
+'creating' => '$1 બનાવી રહ્યા છો',
 'editingsection' => '$1 (પરિચ્છેદ)નો ફેરફાર કરી રહ્યા છો',
 'editingcomment' => '$1 (પરિચ્છેદ)નો ફેરફાર કરી રહ્યા છો',
 'editconflict' => 'ફેરફારમાં વિસંગતતા: $1',
@@ -1506,7 +1506,7 @@ HTML નાકું ચકાસો',
 'rcshowhidepatr' => ' $1 ચોકીયાત ફેરફારો',
 'rcshowhidemine' => 'મારા ફેરફારો $1',
 'rclinks' => 'છેલ્લાં $2 દિવસમાં થયેલા છેલ્લાં $1 ફેરફારો દર્શાવો<br />$3',
-'diff' => 'તફાવત',
+'diff' => 'ભેદ',
 'hist' => 'ઇતિહાસ',
 'hide' => 'છુપાવો',
 'show' => 'બતાવો',
@@ -2252,7 +2252,7 @@ Deleting it may disrupt database operations of {{SITENAME}};',
 'rollback' => 'ફેરફારો ઉલટાવો',
 'rollback_short' => 'ઉલટાવો',
 'rollbacklink' => 'પાછું વાળો',
-'rollbacklinkcount' => '$1 {{PLURAL:$1|ફેરફાર|ફેરફારો}} કરતાં વધુ પાછાં લાવો',
+'rollbacklinkcount' => '$1 {{PLURAL:$1|ફેરફાર પાછો વાળો|ફેરફારો પાછા વાળો}}',
 'rollbacklinkcount-morethan' => '$1 {{PLURAL:$1|ફેરફાર|ફેરફારો}} કરતાં ઓછું પાછું લાવો',
 'rollbackfailed' => 'ઉલટાવવું નિષ્ફળ',
 'cantrollback' => 'આ ફેરફારો ઉલટાવી નહી શકાય
diff --git a/languages/messages/MessagesHaw.php b/languages/messages/MessagesHaw.php
index 3776098424..45caf628b1 100644
--- a/languages/messages/MessagesHaw.php
+++ b/languages/messages/MessagesHaw.php
@@ -63,27 +63,27 @@ $specialPageAliases = array(
 );
 
 $magicWords = array(
-	'currentmonth'            => array( '1', 'KĒIAMAHINA', 'KEIAMAHINA', 'CURRENTMONTH', 'CURRENTMONTH2' ),
-	'currentmonthname'        => array( '1', 'KĒIAINOAMAHINA', 'KEIAINOAMAHINA', 'CURRENTMONTHNAME' ),
-	'currentday'              => array( '1', 'KĒIALĀ', 'KEIALA', 'CURRENTDAY' ),
-	'currentday2'             => array( '1', 'KĒIALĀ2', 'KEIALA2', 'CURRENTDAY2' ),
-	'currentdayname'          => array( '1', 'KĒIAINOALĀ', 'KEIAINOALA', 'CURRENTDAYNAME' ),
-	'currentyear'             => array( '1', 'KĒIAMAKAHIKI', 'KEIAMAKAHIKI', 'CURRENTYEAR' ),
-	'currenttime'             => array( '1', 'KĒIAMANAWA', 'KEIAMANAWA', 'CURRENTTIME' ),
-	'currenthour'             => array( '1', 'KĒIAHOLA', 'KEIAHOLA', 'CURRENTHOUR' ),
-	'numberofpages'           => array( '1', 'HELUʻAOʻAO', 'HELUAOAO', 'NUMBEROFPAGES' ),
-	'numberofarticles'        => array( '1', 'HELUMEA', 'NUMBEROFARTICLES' ),
-	'numberoffiles'           => array( '1', 'HELUWAIHONA', 'NUMBEROFFILES' ),
-	'numberofusers'           => array( '1', 'HELUMEAHOʻOHANA', 'HELUMEAHOOHANA', 'NUMBEROFUSERS' ),
-	'numberofedits'           => array( '1', 'HELULOLI', 'NUMBEROFEDITS' ),
-	'pagename'                => array( '1', 'INOAʻAOʻAO', 'INOAAOAO', 'PAGENAME' ),
-	'img_right'               => array( '1', 'ʻākau', 'ākau', 'akau', 'right' ),
-	'img_left'                => array( '1', 'hema', 'left' ),
-	'img_none'                => array( '1', 'ʻaʻohe', 'aohe', 'none' ),
-	'img_link'                => array( '1', 'loulou=$1', 'link=$1' ),
-	'currentweek'             => array( '1', 'KĒIAPULE', 'KEIAPULE', 'CURRENTWEEK' ),
-	'language'                => array( '0', '#ʻŌLELO', '#ŌLELO', '#OLELO', '#LANGUAGE:' ),
-	'numberofadmins'          => array( '1', 'HELUKAHU', 'NUMBEROFADMINS' ),
+	'currentmonth'              => array( '1', 'KĒIAMAHINA', 'KEIAMAHINA', 'CURRENTMONTH', 'CURRENTMONTH2' ),
+	'currentmonthname'          => array( '1', 'KĒIAINOAMAHINA', 'KEIAINOAMAHINA', 'CURRENTMONTHNAME' ),
+	'currentday'                => array( '1', 'KĒIALĀ', 'KEIALA', 'CURRENTDAY' ),
+	'currentday2'               => array( '1', 'KĒIALĀ2', 'KEIALA2', 'CURRENTDAY2' ),
+	'currentdayname'            => array( '1', 'KĒIAINOALĀ', 'KEIAINOALA', 'CURRENTDAYNAME' ),
+	'currentyear'               => array( '1', 'KĒIAMAKAHIKI', 'KEIAMAKAHIKI', 'CURRENTYEAR' ),
+	'currenttime'               => array( '1', 'KĒIAMANAWA', 'KEIAMANAWA', 'CURRENTTIME' ),
+	'currenthour'               => array( '1', 'KĒIAHOLA', 'KEIAHOLA', 'CURRENTHOUR' ),
+	'numberofpages'             => array( '1', 'HELUʻAOʻAO', 'HELUAOAO', 'NUMBEROFPAGES' ),
+	'numberofarticles'          => array( '1', 'HELUMEA', 'NUMBEROFARTICLES' ),
+	'numberoffiles'             => array( '1', 'HELUWAIHONA', 'NUMBEROFFILES' ),
+	'numberofusers'             => array( '1', 'HELUMEAHOʻOHANA', 'HELUMEAHOOHANA', 'NUMBEROFUSERS' ),
+	'numberofedits'             => array( '1', 'HELULOLI', 'NUMBEROFEDITS' ),
+	'pagename'                  => array( '1', 'INOAʻAOʻAO', 'INOAAOAO', 'PAGENAME' ),
+	'img_right'                 => array( '1', 'ʻākau', 'ākau', 'akau', 'right' ),
+	'img_left'                  => array( '1', 'hema', 'left' ),
+	'img_none'                  => array( '1', 'ʻaʻohe', 'aohe', 'none' ),
+	'img_link'                  => array( '1', 'loulou=$1', 'link=$1' ),
+	'currentweek'               => array( '1', 'KĒIAPULE', 'KEIAPULE', 'CURRENTWEEK' ),
+	'language'                  => array( '0', '#ʻŌLELO', '#ŌLELO', '#OLELO', '#LANGUAGE:' ),
+	'numberofadmins'            => array( '1', 'HELUKAHU', 'NUMBEROFADMINS' ),
 );
 
 $messages = array(
diff --git a/languages/messages/MessagesHe.php b/languages/messages/MessagesHe.php
index d13d169a07..2c878b1a69 100644
--- a/languages/messages/MessagesHe.php
+++ b/languages/messages/MessagesHe.php
@@ -67,158 +67,158 @@ $bookstoreList = 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__' ),
-	'noheader'                => array( '0', '__ללא_כותרת__', '__NOHEADER__' ),
-	'currentmonth'            => array( '1', 'חודש נוכחי', 'חודש נוכחי 2', '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' ),
-	'localmonth'              => array( '1', 'חודש מקומי', 'חודש מקומי 2', 'LOCALMONTH', 'LOCALMONTH2' ),
-	'localmonth1'             => array( '1', 'חודש מקומי 1', 'LOCALMONTH1' ),
-	'localmonthname'          => array( '1', 'שם חודש מקומי', 'LOCALMONTHNAME' ),
-	'localmonthnamegen'       => array( '1', 'שם חודש מקומי קניין', 'LOCALMONTHNAMEGEN' ),
-	'localmonthabbrev'        => array( '1', 'קיצור חודש מקומי', 'LOCALMONTHABBREV' ),
-	'localday'                => array( '1', 'יום מקומי', 'LOCALDAY' ),
-	'localday2'               => array( '1', 'יום מקומי 2', 'LOCALDAY2' ),
-	'localdayname'            => array( '1', 'שם יום מקומי', 'LOCALDAYNAME' ),
-	'localyear'               => array( '1', 'שנה מקומית', 'LOCALYEAR' ),
-	'localtime'               => array( '1', 'שעה מקומית', 'LOCALTIME' ),
-	'localhour'               => array( '1', 'שעות מקומיות', 'LOCALHOUR' ),
-	'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' ),
-	'talkspace'               => array( '1', 'מרחב השיחה', 'TALKSPACE' ),
-	'talkspacee'              => array( '1', 'מרחב השיחה מקודד', 'TALKSPACEE' ),
-	'subjectspace'            => array( '1', 'מרחב הנושא', 'מרחב הערכים', 'SUBJECTSPACE', 'ARTICLESPACE' ),
-	'subjectspacee'           => array( '1', 'מרחב הנושא מקודד', 'מרחב הערכים מקודד', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
-	'fullpagename'            => array( '1', 'שם הדף המלא', 'FULLPAGENAME' ),
-	'fullpagenamee'           => array( '1', 'שם הדף המלא מקודד', 'FULLPAGENAMEE' ),
-	'subpagename'             => array( '1', 'שם דף המשנה', 'SUBPAGENAME' ),
-	'subpagenamee'            => array( '1', 'שם דף המשנה מקודד', 'SUBPAGENAMEE' ),
-	'basepagename'            => array( '1', 'שם דף הבסיס', 'BASEPAGENAME' ),
-	'basepagenamee'           => array( '1', 'שם דף הבסיס מקודד', 'BASEPAGENAMEE' ),
-	'talkpagename'            => array( '1', 'שם דף השיחה', 'TALKPAGENAME' ),
-	'talkpagenamee'           => array( '1', 'שם דף השיחה מקודד', 'TALKPAGENAMEE' ),
-	'subjectpagename'         => array( '1', 'שם דף הנושא', 'שם הערך', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
-	'subjectpagenamee'        => array( '1', 'שם דף הנושא מקודד', 'שם הערך מקודד', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
-	'msg'                     => array( '0', 'הכללה:', 'MSG:' ),
-	'subst'                   => array( '0', 'ס:', 'SUBST:' ),
-	'safesubst'               => array( '0', 'ס בטוח:', 'SAFESUBST:' ),
-	'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 פיקסלים', '$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_upright'             => array( '1', 'ימין למעלה', 'ימין למעלה=$1', 'ימין למעלה $1', 'upright', 'upright=$1', 'upright $1' ),
-	'img_border'              => array( '1', 'גבולות', 'גבול', 'border' ),
-	'img_baseline'            => array( '1', 'שורת הבסיס', 'baseline' ),
-	'img_sub'                 => array( '1', 'תחתי', 'sub' ),
-	'img_super'               => array( '1', 'עילי', 'super', 'sup' ),
-	'img_top'                 => array( '1', 'למעלה', 'top' ),
-	'img_text_top'            => array( '1', 'בראש הטקסט', 'text-top' ),
-	'img_middle'              => array( '1', 'באמצע', 'middle' ),
-	'img_bottom'              => array( '1', 'למטה', 'bottom' ),
-	'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:' ),
-	'sitename'                => array( '1', 'שם האתר', 'SITENAME' ),
-	'ns'                      => array( '0', 'מרחב שם:', 'NS:' ),
-	'nse'                     => array( '0', 'מרחב שם מקודד:', 'NSE:' ),
-	'localurl'                => array( '0', 'כתובת יחסית:', 'LOCALURL:' ),
-	'localurle'               => array( '0', 'כתובת יחסית מקודד:', 'LOCALURLE:' ),
-	'articlepath'             => array( '0', 'נתיב הדפים', 'ARTICLEPATH' ),
-	'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__' ),
-	'currentweek'             => array( '1', 'שבוע נוכחי', 'CURRENTWEEK' ),
-	'currentdow'              => array( '1', 'מספר יום נוכחי', 'CURRENTDOW' ),
-	'localweek'               => array( '1', 'שבוע מקומי', 'LOCALWEEK' ),
-	'localdow'                => array( '1', 'מספר יום מקומי', 'LOCALDOW' ),
-	'revisionid'              => array( '1', 'מזהה גרסה', 'REVISIONID' ),
-	'revisionday'             => array( '1', 'יום גרסה', 'REVISIONDAY' ),
-	'revisionday2'            => array( '1', 'יום גרסה 2', 'REVISIONDAY2' ),
-	'revisionmonth'           => array( '1', 'חודש גרסה', 'REVISIONMONTH' ),
-	'revisionmonth1'          => array( '1', 'חודש גרסה 1', 'REVISIONMONTH1' ),
-	'revisionyear'            => array( '1', 'שנת גרסה', 'REVISIONYEAR' ),
-	'revisiontimestamp'       => array( '1', 'זמן גרסה', 'REVISIONTIMESTAMP' ),
-	'revisionuser'            => array( '1', 'כותב גרסה', 'REVISIONUSER' ),
-	'plural'                  => array( '0', 'רבים:', 'PLURAL:' ),
-	'fullurl'                 => array( '0', 'כתובת מלאה:', 'FULLURL:' ),
-	'fullurle'                => array( '0', 'כתובת מלאה מקודד:', 'FULLURLE:' ),
-	'canonicalurl'            => array( '0', 'כתובת קנונית:', 'CANONICALURL:' ),
-	'canonicalurle'           => array( '0', 'כתובת קנונית מקודד:', 'CANONICALURLE:' ),
-	'lcfirst'                 => array( '0', 'אות ראשונה קטנה:', 'LCFIRST:' ),
-	'ucfirst'                 => array( '0', 'אות ראשונה גדולה:', 'UCFIRST:' ),
-	'lc'                      => array( '0', 'אותיות קטנות:', 'LC:' ),
-	'uc'                      => array( '0', 'אותיות גדולות:', 'UC:' ),
-	'raw'                     => array( '0', 'ללא עיבוד:', 'RAW:' ),
-	'displaytitle'            => array( '1', 'כותרת תצוגה', 'DISPLAYTITLE' ),
-	'rawsuffix'               => array( '1', 'ללא פסיק', 'R' ),
-	'newsectionlink'          => array( '1', '__יצירת_הערה__', '__NEWSECTIONLINK__' ),
-	'nonewsectionlink'        => array( '1', '__ללא_יצירת_הערה__', '__NONEWSECTIONLINK__' ),
-	'currentversion'          => array( '1', 'גרסה נוכחית', 'CURRENTVERSION' ),
-	'urlencode'               => array( '0', 'נתיב מקודד:', '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' ),
-	'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' ),
-	'url_path'                => array( '0', 'נתיב', 'PATH' ),
-	'url_wiki'                => array( '0', 'ויקי', 'WIKI' ),
-	'url_query'               => array( '0', 'שאילתה', 'QUERY' ),
-	'defaultsort_noerror'     => array( '0', 'ללא שגיאה', 'noerror' ),
-	'defaultsort_noreplace'   => array( '0', 'ללא החלפה', 'noreplace' ),
+	'redirect'                  => array( '0', '#הפניה', '#REDIRECT' ),
+	'notoc'                     => array( '0', '__ללא_תוכן_עניינים__', '__ללא_תוכן__', '__NOTOC__' ),
+	'nogallery'                 => array( '0', '__ללא_גלריה__', '__NOGALLERY__' ),
+	'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' ),
+	'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' ),
+	'localmonth'                => array( '1', 'חודש מקומי', 'חודש מקומי 2', 'LOCALMONTH', 'LOCALMONTH2' ),
+	'localmonth1'               => array( '1', 'חודש מקומי 1', 'LOCALMONTH1' ),
+	'localmonthname'            => array( '1', 'שם חודש מקומי', 'LOCALMONTHNAME' ),
+	'localmonthnamegen'         => array( '1', 'שם חודש מקומי קניין', 'LOCALMONTHNAMEGEN' ),
+	'localmonthabbrev'          => array( '1', 'קיצור חודש מקומי', 'LOCALMONTHABBREV' ),
+	'localday'                  => array( '1', 'יום מקומי', 'LOCALDAY' ),
+	'localday2'                 => array( '1', 'יום מקומי 2', 'LOCALDAY2' ),
+	'localdayname'              => array( '1', 'שם יום מקומי', 'LOCALDAYNAME' ),
+	'localyear'                 => array( '1', 'שנה מקומית', 'LOCALYEAR' ),
+	'localtime'                 => array( '1', 'שעה מקומית', 'LOCALTIME' ),
+	'localhour'                 => array( '1', 'שעות מקומיות', 'LOCALHOUR' ),
+	'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' ),
+	'talkspace'                 => array( '1', 'מרחב השיחה', 'TALKSPACE' ),
+	'talkspacee'                => array( '1', 'מרחב השיחה מקודד', 'TALKSPACEE' ),
+	'subjectspace'              => array( '1', 'מרחב הנושא', 'מרחב הערכים', 'SUBJECTSPACE', 'ARTICLESPACE' ),
+	'subjectspacee'             => array( '1', 'מרחב הנושא מקודד', 'מרחב הערכים מקודד', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
+	'fullpagename'              => array( '1', 'שם הדף המלא', 'FULLPAGENAME' ),
+	'fullpagenamee'             => array( '1', 'שם הדף המלא מקודד', 'FULLPAGENAMEE' ),
+	'subpagename'               => array( '1', 'שם דף המשנה', 'SUBPAGENAME' ),
+	'subpagenamee'              => array( '1', 'שם דף המשנה מקודד', 'SUBPAGENAMEE' ),
+	'basepagename'              => array( '1', 'שם דף הבסיס', 'BASEPAGENAME' ),
+	'basepagenamee'             => array( '1', 'שם דף הבסיס מקודד', 'BASEPAGENAMEE' ),
+	'talkpagename'              => array( '1', 'שם דף השיחה', 'TALKPAGENAME' ),
+	'talkpagenamee'             => array( '1', 'שם דף השיחה מקודד', 'TALKPAGENAMEE' ),
+	'subjectpagename'           => array( '1', 'שם דף הנושא', 'שם הערך', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
+	'subjectpagenamee'          => array( '1', 'שם דף הנושא מקודד', 'שם הערך מקודד', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
+	'msg'                       => array( '0', 'הכללה:', 'MSG:' ),
+	'subst'                     => array( '0', 'ס:', 'SUBST:' ),
+	'safesubst'                 => array( '0', 'ס בטוח:', 'SAFESUBST:' ),
+	'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 פיקסלים', '$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_upright'               => array( '1', 'ימין למעלה', 'ימין למעלה=$1', 'ימין למעלה $1', 'upright', 'upright=$1', 'upright $1' ),
+	'img_border'                => array( '1', 'גבולות', 'גבול', 'border' ),
+	'img_baseline'              => array( '1', 'שורת הבסיס', 'baseline' ),
+	'img_sub'                   => array( '1', 'תחתי', 'sub' ),
+	'img_super'                 => array( '1', 'עילי', 'super', 'sup' ),
+	'img_top'                   => array( '1', 'למעלה', 'top' ),
+	'img_text_top'              => array( '1', 'בראש הטקסט', 'text-top' ),
+	'img_middle'                => array( '1', 'באמצע', 'middle' ),
+	'img_bottom'                => array( '1', 'למטה', 'bottom' ),
+	'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:' ),
+	'sitename'                  => array( '1', 'שם האתר', 'SITENAME' ),
+	'ns'                        => array( '0', 'מרחב שם:', 'NS:' ),
+	'nse'                       => array( '0', 'מרחב שם מקודד:', 'NSE:' ),
+	'localurl'                  => array( '0', 'כתובת יחסית:', 'LOCALURL:' ),
+	'localurle'                 => array( '0', 'כתובת יחסית מקודד:', 'LOCALURLE:' ),
+	'articlepath'               => array( '0', 'נתיב הדפים', 'ARTICLEPATH' ),
+	'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__' ),
+	'currentweek'               => array( '1', 'שבוע נוכחי', 'CURRENTWEEK' ),
+	'currentdow'                => array( '1', 'מספר יום נוכחי', 'CURRENTDOW' ),
+	'localweek'                 => array( '1', 'שבוע מקומי', 'LOCALWEEK' ),
+	'localdow'                  => array( '1', 'מספר יום מקומי', 'LOCALDOW' ),
+	'revisionid'                => array( '1', 'מזהה גרסה', 'REVISIONID' ),
+	'revisionday'               => array( '1', 'יום גרסה', 'REVISIONDAY' ),
+	'revisionday2'              => array( '1', 'יום גרסה 2', 'REVISIONDAY2' ),
+	'revisionmonth'             => array( '1', 'חודש גרסה', 'REVISIONMONTH' ),
+	'revisionmonth1'            => array( '1', 'חודש גרסה 1', 'REVISIONMONTH1' ),
+	'revisionyear'              => array( '1', 'שנת גרסה', 'REVISIONYEAR' ),
+	'revisiontimestamp'         => array( '1', 'זמן גרסה', 'REVISIONTIMESTAMP' ),
+	'revisionuser'              => array( '1', 'כותב גרסה', 'REVISIONUSER' ),
+	'plural'                    => array( '0', 'רבים:', 'PLURAL:' ),
+	'fullurl'                   => array( '0', 'כתובת מלאה:', 'FULLURL:' ),
+	'fullurle'                  => array( '0', 'כתובת מלאה מקודד:', 'FULLURLE:' ),
+	'canonicalurl'              => array( '0', 'כתובת קנונית:', 'CANONICALURL:' ),
+	'canonicalurle'             => array( '0', 'כתובת קנונית מקודד:', 'CANONICALURLE:' ),
+	'lcfirst'                   => array( '0', 'אות ראשונה קטנה:', 'LCFIRST:' ),
+	'ucfirst'                   => array( '0', 'אות ראשונה גדולה:', 'UCFIRST:' ),
+	'lc'                        => array( '0', 'אותיות קטנות:', 'LC:' ),
+	'uc'                        => array( '0', 'אותיות גדולות:', 'UC:' ),
+	'raw'                       => array( '0', 'ללא עיבוד:', 'RAW:' ),
+	'displaytitle'              => array( '1', 'כותרת תצוגה', 'DISPLAYTITLE' ),
+	'rawsuffix'                 => array( '1', 'ללא פסיק', 'R' ),
+	'newsectionlink'            => array( '1', '__יצירת_הערה__', '__NEWSECTIONLINK__' ),
+	'nonewsectionlink'          => array( '1', '__ללא_יצירת_הערה__', '__NONEWSECTIONLINK__' ),
+	'currentversion'            => array( '1', 'גרסה נוכחית', 'CURRENTVERSION' ),
+	'urlencode'                 => array( '0', 'נתיב מקודד:', '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' ),
+	'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' ),
+	'url_path'                  => array( '0', 'נתיב', 'PATH' ),
+	'url_wiki'                  => array( '0', 'ויקי', 'WIKI' ),
+	'url_query'                 => array( '0', 'שאילתה', 'QUERY' ),
+	'defaultsort_noerror'       => array( '0', 'ללא שגיאה', 'noerror' ),
+	'defaultsort_noreplace'     => array( '0', 'ללא החלפה', 'noreplace' ),
 );
 
 $specialPageAliases = array(
diff --git a/languages/messages/MessagesHif_latn.php b/languages/messages/MessagesHif_latn.php
index 6205132c46..261937c754 100644
--- a/languages/messages/MessagesHif_latn.php
+++ b/languages/messages/MessagesHif_latn.php
@@ -17,6 +17,23 @@
  * @author Thakurji
  */
 
+$namespaceNames = array(
+	NS_MEDIA            => 'saadhan',
+	NS_SPECIAL          => 'khaas',
+	NS_TALK             => 'baat',
+	NS_USER             => 'sadasya',
+	NS_USER_TALK        => 'sadasya_ke_baat',
+	NS_PROJECT_TALK     => '$1_baat',
+	NS_FILE             => 'file',
+	NS_FILE_TALK        => 'file_ke_baat',
+	NS_MEDIAWIKI_TALK   => 'Mediawiki_ke_baat',
+	NS_TEMPLATE_TALK    => 'Template_ke_baat',
+	NS_HELP             => 'madat',
+	NS_HELP_TALK        => 'madat_ke_baat',
+	NS_CATEGORY         => 'vibhag',
+	NS_CATEGORY_TALK    => 'voibhag_ke_baat',
+);
+
 $messages = array(
 # User preference toggles
 'tog-underline' => 'Jorr ke niche line khicho:',
diff --git a/languages/messages/MessagesHr.php b/languages/messages/MessagesHr.php
index d1766d1528..4a1a6f47f8 100644
--- a/languages/messages/MessagesHr.php
+++ b/languages/messages/MessagesHr.php
@@ -151,132 +151,132 @@ $specialPageAliases = array(
 );
 
 $magicWords = array(
-	'redirect'                => array( '0', '#PREUSMJERI', '#REDIRECT' ),
-	'notoc'                   => array( '0', '__BEZSADRŽAJA__', '__NOTOC__' ),
-	'nogallery'               => array( '0', '__BEZGALERIJE__', '__NOGALLERY__' ),
-	'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' ),
-	'currentmonthnamegen'     => array( '1', 'TRENUTAČNIMJESECIMEGEN', 'CURRENTMONTHNAMEGEN' ),
-	'currentmonthabbrev'      => array( '1', 'TRENUTAČNIMJESECKRAT', 'CURRENTMONTHABBREV' ),
-	'currentday'              => array( '1', 'TRENUTAČNIDAN', 'CURRENTDAY' ),
-	'currentday2'             => array( '1', 'TRENUTAČNIDAN2', 'CURRENTDAY2' ),
-	'currentdayname'          => array( '1', 'TRENUTAČNIDANIME', 'CURRENTDAYNAME' ),
-	'currentyear'             => array( '1', 'TRENUTAČNAGODINA', 'CURRENTYEAR' ),
-	'currenttime'             => array( '1', 'TRENUTAČNOVRIJEME', 'CURRENTTIME' ),
-	'currenthour'             => array( '1', 'TRENUTAČNISAT', 'CURRENTHOUR' ),
-	'localmonth'              => array( '1', 'MJESNIMJESEC', 'LOCALMONTH', 'LOCALMONTH2' ),
-	'localmonth1'             => array( '1', 'MJESNIMJESEC1', 'LOCALMONTH1' ),
-	'localmonthname'          => array( '1', 'MJESNIMJESECIME', 'LOCALMONTHNAME' ),
-	'localmonthnamegen'       => array( '1', 'MJESNIMJESECIMEGEN', 'LOCALMONTHNAMEGEN' ),
-	'localmonthabbrev'        => array( '1', 'MJESNIMJESECKRAT', 'LOCALMONTHABBREV' ),
-	'localday'                => array( '1', 'MJESNIDAN', 'LOCALDAY' ),
-	'localday2'               => array( '1', 'MJESNIDAN2', 'LOCALDAY2' ),
-	'localdayname'            => array( '1', 'MJESNIDANIME', 'LOCALDAYNAME' ),
-	'localyear'               => array( '1', 'MJESNAGODINA', 'LOCALYEAR' ),
-	'localtime'               => array( '1', 'MJESNOVRIJEME', 'LOCALTIME' ),
-	'localhour'               => array( '1', 'MJESNISAT', 'LOCALHOUR' ),
-	'numberofpages'           => array( '1', 'BROJSTRANICA', 'NUMBEROFPAGES' ),
-	'numberofarticles'        => array( '1', 'BROJČLANAKA', 'NUMBEROFARTICLES' ),
-	'numberoffiles'           => array( '1', 'BROJDATOTEKA', 'NUMBEROFFILES' ),
-	'numberofusers'           => array( '1', 'BROJSURADNIKA', 'NUMBEROFUSERS' ),
-	'numberofactiveusers'     => array( '1', 'BROJAKTIVNIHSURADNIKA', 'NUMBEROFACTIVEUSERS' ),
-	'numberofedits'           => array( '1', 'BROJUREĐIVANJA', 'NUMBEROFEDITS' ),
-	'numberofviews'           => array( '1', 'BROJPREGLEDA', 'NUMBEROFVIEWS' ),
-	'pagename'                => array( '1', 'IMESTRANICE', 'PAGENAME' ),
-	'pagenamee'               => array( '1', 'IMESTRANICEE', 'PAGENAMEE' ),
-	'namespace'               => array( '1', 'IMENSKIPROSTOR', 'NAMESPACE' ),
-	'namespacee'              => array( '1', 'IMENSKIPROSTORE', 'NAMESPACEE' ),
-	'talkspace'               => array( '1', 'RAZGOVOR', 'TALKSPACE' ),
-	'talkspacee'              => array( '1', 'RAZGOVORE', 'TALKSPACEE' ),
-	'subjectspace'            => array( '1', 'PROSTORSTRANICE', 'IMPSTRANICE', 'SUBJECTSPACE', 'ARTICLESPACE' ),
-	'subjectspacee'           => array( '1', 'PROSTORSTRANICEE', 'IMPSTRANICEE', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
-	'fullpagename'            => array( '1', 'PUNOIMESTRANICE', 'FULLPAGENAME' ),
-	'fullpagenamee'           => array( '1', 'PUNOIMESTRANICEE', 'FULLPAGENAMEE' ),
-	'subpagename'             => array( '1', 'IMEPODSTRANICE', 'SUBPAGENAME' ),
-	'subpagenamee'            => array( '1', 'IMEPODSTRANICEE', 'SUBPAGENAMEE' ),
-	'basepagename'            => array( '1', 'IMEOSNOVNESTRANICE', 'BASEPAGENAME' ),
-	'basepagenamee'           => array( '1', 'IMEOSNOVNESTRANICEE', 'BASEPAGENAMEE' ),
-	'talkpagename'            => array( '1', 'IMERAZGOVORASTRANICE', 'TALKPAGENAME' ),
-	'talkpagenamee'           => array( '1', 'IMERAZGOVORASTRANICEE', 'TALKPAGENAMEE' ),
-	'subjectpagename'         => array( '1', 'IMEGLAVNESTRANICE', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
-	'subjectpagenamee'        => array( '1', 'IMEGLAVNESTRANICEE', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
-	'subst'                   => array( '0', 'ZAMJENA:', 'SUBST:' ),
-	'img_thumbnail'           => array( '1', 'minijatura', 'mini', 'thumbnail', 'thumb' ),
-	'img_manualthumb'         => array( '1', 'minijatura=$1', 'thumbnail=$1', 'thumb=$1' ),
-	'img_right'               => array( '1', 'desno', 'right' ),
-	'img_left'                => array( '1', 'lijevo', 'left' ),
-	'img_none'                => array( '1', 'ništa', 'none' ),
-	'img_center'              => array( '1', 'središte', 'center', 'centre' ),
-	'img_framed'              => array( '1', 'okvir', 'framed', 'enframed', 'frame' ),
-	'img_frameless'           => array( '1', 'bezokvira', 'frameless' ),
-	'img_page'                => array( '1', 'stranica=$1', 'stranica $1', 'page=$1', 'page $1' ),
-	'img_upright'             => array( '1', 'uspravno=$1', 'uspravno $1', 'upright', 'upright=$1', 'upright $1' ),
-	'img_border'              => array( '1', 'obrub', 'border' ),
-	'img_baseline'            => array( '1', 'osnovnacrta', 'baseline' ),
-	'img_sub'                 => array( '1', 'potpis', 'ind', 'sub' ),
-	'img_super'               => array( '1', 'natpis', 'eks', 'super', 'sup' ),
-	'img_top'                 => array( '1', 'vrh', 'top' ),
-	'img_text_top'            => array( '1', 'tekst-vrh', 'text-top' ),
-	'img_middle'              => array( '1', 'pola', 'middle' ),
-	'img_bottom'              => array( '1', 'dno', 'bottom' ),
-	'img_text_bottom'         => array( '1', 'tekst-dno', 'text-bottom' ),
-	'sitename'                => array( '1', 'IMEPROJEKTA', 'SITENAME' ),
-	'ns'                      => array( '0', 'IMP:', 'NS:' ),
-	'localurl'                => array( '0', 'MJESNIURL:', 'LOCALURL:' ),
-	'localurle'               => array( '0', 'MJESNIURLE:', 'LOCALURLE:' ),
-	'servername'              => array( '0', 'IMESERVERA', 'SERVERNAME' ),
-	'scriptpath'              => array( '0', 'PUTANJASKRIPTE', 'SCRIPTPATH' ),
-	'grammar'                 => array( '0', 'GRAMATIKA:', 'GRAMMAR:' ),
-	'notitleconvert'          => array( '0', '__BEZPRETVARANJANASLOVA__', '__BPN__', '__NOTITLECONVERT__', '__NOTC__' ),
-	'nocontentconvert'        => array( '0', '__BEZPRETVARANJASADRŽAJA__', '__BPS__', '__NOCONTENTCONVERT__', '__NOCC__' ),
-	'currentweek'             => array( '1', 'TRENUTAČNITJEDAN', 'CURRENTWEEK' ),
-	'currentdow'              => array( '1', 'TRENUTAČNIDANTJEDNA', 'CURRENTDOW' ),
-	'localweek'               => array( '1', 'MJESNITJEDAN', 'LOCALWEEK' ),
-	'localdow'                => array( '1', 'MJESNIDANTJEDNA', 'LOCALDOW' ),
-	'revisionid'              => array( '1', 'IDIZMJENE', 'REVISIONID' ),
-	'revisionday'             => array( '1', 'DANIZMJENE', 'REVISIONDAY' ),
-	'revisionday2'            => array( '1', 'DANIZMJENE2', 'REVISIONDAY2' ),
-	'revisionmonth'           => array( '1', 'MJESECIZMJENE', 'REVISIONMONTH' ),
-	'revisionyear'            => array( '1', 'GODINAIZMJENE', 'REVISIONYEAR' ),
-	'revisiontimestamp'       => array( '1', 'VREMENSKAOZNAKAIZMJENE', 'REVISIONTIMESTAMP' ),
-	'plural'                  => array( '0', 'MNOŽINA:', 'PLURAL:' ),
-	'fullurl'                 => array( '0', 'PUNIURL:', 'FULLURL:' ),
-	'fullurle'                => array( '0', 'PUNIURLE:', 'FULLURLE:' ),
-	'lcfirst'                 => array( '0', 'MSPRVO:', 'LCFIRST:' ),
-	'ucfirst'                 => array( '0', 'VSPRVO:', 'UCFIRST:' ),
-	'lc'                      => array( '0', 'MS:', 'LC:' ),
-	'uc'                      => array( '0', 'VS:', 'UC:' ),
-	'raw'                     => array( '0', 'NEOBRAĐENO:', 'RAW:' ),
-	'displaytitle'            => array( '1', 'POKAŽINASLOV', 'DISPLAYTITLE' ),
-	'rawsuffix'               => array( '1', 'NEO', 'R' ),
-	'newsectionlink'          => array( '1', '__NOVIODLOMAKPOVEZNICA__', '__NEWSECTIONLINK__' ),
-	'currentversion'          => array( '1', 'TRENUTAČNAIZMJENA', 'CURRENTVERSION' ),
-	'urlencode'               => array( '0', 'URLKODIRANJE:', 'URLENCODE:' ),
-	'anchorencode'            => array( '0', 'SIDROKODIRANJE', 'ANCHORENCODE' ),
-	'currenttimestamp'        => array( '1', 'TRENUTAČNAOZNAKAVREMENA', 'CURRENTTIMESTAMP' ),
-	'localtimestamp'          => array( '1', 'MJESNAOZNAKAVREMENA', 'LOCALTIMESTAMP' ),
-	'language'                => array( '0', '#JEZIK:', '#LANGUAGE:' ),
-	'contentlanguage'         => array( '1', 'JEZIKPROJEKTA', 'CONTENTLANGUAGE', 'CONTENTLANG' ),
-	'pagesinnamespace'        => array( '1', 'STRANICEPOPROSTORU:', 'STRANICEUIMP', 'PAGESINNAMESPACE:', 'PAGESINNS:' ),
-	'numberofadmins'          => array( '1', 'BROJADMINA', 'NUMBEROFADMINS' ),
-	'formatnum'               => array( '0', 'OBLIKBROJA', 'FORMATNUM' ),
-	'padleft'                 => array( '0', 'POSTAVALIJEVO', 'PADLEFT' ),
-	'padright'                => array( '0', 'POSTAVADESNO', 'PADRIGHT' ),
-	'special'                 => array( '0', 'posebno', 'special' ),
-	'defaultsort'             => array( '1', 'GLAVNIRASPORED:', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:' ),
-	'filepath'                => array( '0', 'PUTANJADATOTEKE:', 'FILEPATH:' ),
-	'tag'                     => array( '0', 'oznaka', 'tag' ),
-	'hiddencat'               => array( '1', '__SKRIVENAKAT__', '__HIDDENCAT__' ),
-	'pagesincategory'         => array( '1', 'STRANICEPOKATEGORIJI', 'STRANICEUKAT', 'PAGESINCATEGORY', 'PAGESINCAT' ),
-	'pagesize'                => array( '1', 'VELIČINASTRANICE', 'PAGESIZE' ),
-	'index'                   => array( '1', '__KAZALO__', '__INDEX__' ),
-	'noindex'                 => array( '1', '__BEZKAZALA__', '__NOINDEX__' ),
-	'staticredirect'          => array( '1', '__NEPOMIČNOPREUSMJERAVANJE__', '__STATICREDIRECT__' ),
+	'redirect'                  => array( '0', '#PREUSMJERI', '#REDIRECT' ),
+	'notoc'                     => array( '0', '__BEZSADRŽAJA__', '__NOTOC__' ),
+	'nogallery'                 => array( '0', '__BEZGALERIJE__', '__NOGALLERY__' ),
+	'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' ),
+	'currentmonthnamegen'       => array( '1', 'TRENUTAČNIMJESECIMEGEN', 'CURRENTMONTHNAMEGEN' ),
+	'currentmonthabbrev'        => array( '1', 'TRENUTAČNIMJESECKRAT', 'CURRENTMONTHABBREV' ),
+	'currentday'                => array( '1', 'TRENUTAČNIDAN', 'CURRENTDAY' ),
+	'currentday2'               => array( '1', 'TRENUTAČNIDAN2', 'CURRENTDAY2' ),
+	'currentdayname'            => array( '1', 'TRENUTAČNIDANIME', 'CURRENTDAYNAME' ),
+	'currentyear'               => array( '1', 'TRENUTAČNAGODINA', 'CURRENTYEAR' ),
+	'currenttime'               => array( '1', 'TRENUTAČNOVRIJEME', 'CURRENTTIME' ),
+	'currenthour'               => array( '1', 'TRENUTAČNISAT', 'CURRENTHOUR' ),
+	'localmonth'                => array( '1', 'MJESNIMJESEC', 'LOCALMONTH', 'LOCALMONTH2' ),
+	'localmonth1'               => array( '1', 'MJESNIMJESEC1', 'LOCALMONTH1' ),
+	'localmonthname'            => array( '1', 'MJESNIMJESECIME', 'LOCALMONTHNAME' ),
+	'localmonthnamegen'         => array( '1', 'MJESNIMJESECIMEGEN', 'LOCALMONTHNAMEGEN' ),
+	'localmonthabbrev'          => array( '1', 'MJESNIMJESECKRAT', 'LOCALMONTHABBREV' ),
+	'localday'                  => array( '1', 'MJESNIDAN', 'LOCALDAY' ),
+	'localday2'                 => array( '1', 'MJESNIDAN2', 'LOCALDAY2' ),
+	'localdayname'              => array( '1', 'MJESNIDANIME', 'LOCALDAYNAME' ),
+	'localyear'                 => array( '1', 'MJESNAGODINA', 'LOCALYEAR' ),
+	'localtime'                 => array( '1', 'MJESNOVRIJEME', 'LOCALTIME' ),
+	'localhour'                 => array( '1', 'MJESNISAT', 'LOCALHOUR' ),
+	'numberofpages'             => array( '1', 'BROJSTRANICA', 'NUMBEROFPAGES' ),
+	'numberofarticles'          => array( '1', 'BROJČLANAKA', 'NUMBEROFARTICLES' ),
+	'numberoffiles'             => array( '1', 'BROJDATOTEKA', 'NUMBEROFFILES' ),
+	'numberofusers'             => array( '1', 'BROJSURADNIKA', 'NUMBEROFUSERS' ),
+	'numberofactiveusers'       => array( '1', 'BROJAKTIVNIHSURADNIKA', 'NUMBEROFACTIVEUSERS' ),
+	'numberofedits'             => array( '1', 'BROJUREĐIVANJA', 'NUMBEROFEDITS' ),
+	'numberofviews'             => array( '1', 'BROJPREGLEDA', 'NUMBEROFVIEWS' ),
+	'pagename'                  => array( '1', 'IMESTRANICE', 'PAGENAME' ),
+	'pagenamee'                 => array( '1', 'IMESTRANICEE', 'PAGENAMEE' ),
+	'namespace'                 => array( '1', 'IMENSKIPROSTOR', 'NAMESPACE' ),
+	'namespacee'                => array( '1', 'IMENSKIPROSTORE', 'NAMESPACEE' ),
+	'talkspace'                 => array( '1', 'RAZGOVOR', 'TALKSPACE' ),
+	'talkspacee'                => array( '1', 'RAZGOVORE', 'TALKSPACEE' ),
+	'subjectspace'              => array( '1', 'PROSTORSTRANICE', 'IMPSTRANICE', 'SUBJECTSPACE', 'ARTICLESPACE' ),
+	'subjectspacee'             => array( '1', 'PROSTORSTRANICEE', 'IMPSTRANICEE', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
+	'fullpagename'              => array( '1', 'PUNOIMESTRANICE', 'FULLPAGENAME' ),
+	'fullpagenamee'             => array( '1', 'PUNOIMESTRANICEE', 'FULLPAGENAMEE' ),
+	'subpagename'               => array( '1', 'IMEPODSTRANICE', 'SUBPAGENAME' ),
+	'subpagenamee'              => array( '1', 'IMEPODSTRANICEE', 'SUBPAGENAMEE' ),
+	'basepagename'              => array( '1', 'IMEOSNOVNESTRANICE', 'BASEPAGENAME' ),
+	'basepagenamee'             => array( '1', 'IMEOSNOVNESTRANICEE', 'BASEPAGENAMEE' ),
+	'talkpagename'              => array( '1', 'IMERAZGOVORASTRANICE', 'TALKPAGENAME' ),
+	'talkpagenamee'             => array( '1', 'IMERAZGOVORASTRANICEE', 'TALKPAGENAMEE' ),
+	'subjectpagename'           => array( '1', 'IMEGLAVNESTRANICE', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
+	'subjectpagenamee'          => array( '1', 'IMEGLAVNESTRANICEE', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
+	'subst'                     => array( '0', 'ZAMJENA:', 'SUBST:' ),
+	'img_thumbnail'             => array( '1', 'minijatura', 'mini', 'thumbnail', 'thumb' ),
+	'img_manualthumb'           => array( '1', 'minijatura=$1', 'thumbnail=$1', 'thumb=$1' ),
+	'img_right'                 => array( '1', 'desno', 'right' ),
+	'img_left'                  => array( '1', 'lijevo', 'left' ),
+	'img_none'                  => array( '1', 'ništa', 'none' ),
+	'img_center'                => array( '1', 'središte', 'center', 'centre' ),
+	'img_framed'                => array( '1', 'okvir', 'framed', 'enframed', 'frame' ),
+	'img_frameless'             => array( '1', 'bezokvira', 'frameless' ),
+	'img_page'                  => array( '1', 'stranica=$1', 'stranica $1', 'page=$1', 'page $1' ),
+	'img_upright'               => array( '1', 'uspravno=$1', 'uspravno $1', 'upright', 'upright=$1', 'upright $1' ),
+	'img_border'                => array( '1', 'obrub', 'border' ),
+	'img_baseline'              => array( '1', 'osnovnacrta', 'baseline' ),
+	'img_sub'                   => array( '1', 'potpis', 'ind', 'sub' ),
+	'img_super'                 => array( '1', 'natpis', 'eks', 'super', 'sup' ),
+	'img_top'                   => array( '1', 'vrh', 'top' ),
+	'img_text_top'              => array( '1', 'tekst-vrh', 'text-top' ),
+	'img_middle'                => array( '1', 'pola', 'middle' ),
+	'img_bottom'                => array( '1', 'dno', 'bottom' ),
+	'img_text_bottom'           => array( '1', 'tekst-dno', 'text-bottom' ),
+	'sitename'                  => array( '1', 'IMEPROJEKTA', 'SITENAME' ),
+	'ns'                        => array( '0', 'IMP:', 'NS:' ),
+	'localurl'                  => array( '0', 'MJESNIURL:', 'LOCALURL:' ),
+	'localurle'                 => array( '0', 'MJESNIURLE:', 'LOCALURLE:' ),
+	'servername'                => array( '0', 'IMESERVERA', 'SERVERNAME' ),
+	'scriptpath'                => array( '0', 'PUTANJASKRIPTE', 'SCRIPTPATH' ),
+	'grammar'                   => array( '0', 'GRAMATIKA:', 'GRAMMAR:' ),
+	'notitleconvert'            => array( '0', '__BEZPRETVARANJANASLOVA__', '__BPN__', '__NOTITLECONVERT__', '__NOTC__' ),
+	'nocontentconvert'          => array( '0', '__BEZPRETVARANJASADRŽAJA__', '__BPS__', '__NOCONTENTCONVERT__', '__NOCC__' ),
+	'currentweek'               => array( '1', 'TRENUTAČNITJEDAN', 'CURRENTWEEK' ),
+	'currentdow'                => array( '1', 'TRENUTAČNIDANTJEDNA', 'CURRENTDOW' ),
+	'localweek'                 => array( '1', 'MJESNITJEDAN', 'LOCALWEEK' ),
+	'localdow'                  => array( '1', 'MJESNIDANTJEDNA', 'LOCALDOW' ),
+	'revisionid'                => array( '1', 'IDIZMJENE', 'REVISIONID' ),
+	'revisionday'               => array( '1', 'DANIZMJENE', 'REVISIONDAY' ),
+	'revisionday2'              => array( '1', 'DANIZMJENE2', 'REVISIONDAY2' ),
+	'revisionmonth'             => array( '1', 'MJESECIZMJENE', 'REVISIONMONTH' ),
+	'revisionyear'              => array( '1', 'GODINAIZMJENE', 'REVISIONYEAR' ),
+	'revisiontimestamp'         => array( '1', 'VREMENSKAOZNAKAIZMJENE', 'REVISIONTIMESTAMP' ),
+	'plural'                    => array( '0', 'MNOŽINA:', 'PLURAL:' ),
+	'fullurl'                   => array( '0', 'PUNIURL:', 'FULLURL:' ),
+	'fullurle'                  => array( '0', 'PUNIURLE:', 'FULLURLE:' ),
+	'lcfirst'                   => array( '0', 'MSPRVO:', 'LCFIRST:' ),
+	'ucfirst'                   => array( '0', 'VSPRVO:', 'UCFIRST:' ),
+	'lc'                        => array( '0', 'MS:', 'LC:' ),
+	'uc'                        => array( '0', 'VS:', 'UC:' ),
+	'raw'                       => array( '0', 'NEOBRAĐENO:', 'RAW:' ),
+	'displaytitle'              => array( '1', 'POKAŽINASLOV', 'DISPLAYTITLE' ),
+	'rawsuffix'                 => array( '1', 'NEO', 'R' ),
+	'newsectionlink'            => array( '1', '__NOVIODLOMAKPOVEZNICA__', '__NEWSECTIONLINK__' ),
+	'currentversion'            => array( '1', 'TRENUTAČNAIZMJENA', 'CURRENTVERSION' ),
+	'urlencode'                 => array( '0', 'URLKODIRANJE:', 'URLENCODE:' ),
+	'anchorencode'              => array( '0', 'SIDROKODIRANJE', 'ANCHORENCODE' ),
+	'currenttimestamp'          => array( '1', 'TRENUTAČNAOZNAKAVREMENA', 'CURRENTTIMESTAMP' ),
+	'localtimestamp'            => array( '1', 'MJESNAOZNAKAVREMENA', 'LOCALTIMESTAMP' ),
+	'language'                  => array( '0', '#JEZIK:', '#LANGUAGE:' ),
+	'contentlanguage'           => array( '1', 'JEZIKPROJEKTA', 'CONTENTLANGUAGE', 'CONTENTLANG' ),
+	'pagesinnamespace'          => array( '1', 'STRANICEPOPROSTORU:', 'STRANICEUIMP', 'PAGESINNAMESPACE:', 'PAGESINNS:' ),
+	'numberofadmins'            => array( '1', 'BROJADMINA', 'NUMBEROFADMINS' ),
+	'formatnum'                 => array( '0', 'OBLIKBROJA', 'FORMATNUM' ),
+	'padleft'                   => array( '0', 'POSTAVALIJEVO', 'PADLEFT' ),
+	'padright'                  => array( '0', 'POSTAVADESNO', 'PADRIGHT' ),
+	'special'                   => array( '0', 'posebno', 'special' ),
+	'defaultsort'               => array( '1', 'GLAVNIRASPORED:', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:' ),
+	'filepath'                  => array( '0', 'PUTANJADATOTEKE:', 'FILEPATH:' ),
+	'tag'                       => array( '0', 'oznaka', 'tag' ),
+	'hiddencat'                 => array( '1', '__SKRIVENAKAT__', '__HIDDENCAT__' ),
+	'pagesincategory'           => array( '1', 'STRANICEPOKATEGORIJI', 'STRANICEUKAT', 'PAGESINCATEGORY', 'PAGESINCAT' ),
+	'pagesize'                  => array( '1', 'VELIČINASTRANICE', 'PAGESIZE' ),
+	'index'                     => array( '1', '__KAZALO__', '__INDEX__' ),
+	'noindex'                   => array( '1', '__BEZKAZALA__', '__NOINDEX__' ),
+	'staticredirect'            => array( '1', '__NEPOMIČNOPREUSMJERAVANJE__', '__STATICREDIRECT__' ),
 );
 
 $datePreferences = array(
@@ -1076,6 +1076,13 @@ Neki predlošci neće biti uključeni.',
 'parser-template-loop-warning' => 'Otkrivena petlja predloška: [[$1]]',
 'parser-template-recursion-depth-warning' => 'Dubina rekurzije predloška je izvan granice ($1)',
 'language-converter-depth-warning' => 'Prekoračena granica dubine jezičnog pretvarača ($1)',
+'node-count-exceeded-category' => 'Stranice s previše čvorova',
+'node-count-exceeded-warning' => 'Ova stranica ima previše čvorova',
+'expansion-depth-exceeded-category' => 'Stranice s prevelikom dubinom proširenja',
+'expansion-depth-exceeded-warning' => 'Na ovoj stranici dubina proširenja je prevelika',
+'parser-unstrip-loop-warning' => 'Nedopuštena petlja',
+'parser-unstrip-recursion-limit' => 'Dosegnuto je ograničenje rekurzije ($1)',
+'converter-manual-rule-error' => 'Pronađena je pogrješka u pravilu ručnog prijevoda',
 
 # "Undo" feature
 'undo-success' => 'Izmjena je uklonjena (tekst u okviru ispod ne sadrži zadnju izmjenu). Molim sačuvajte stranicu (provjerite sažetak).',
@@ -1252,7 +1259,7 @@ Primijetite da uporaba navigacijskih poveznica resetira Vaše izbore u stupcu.',
 
 # Diffs
 'history-title' => 'Povijest izmjena stranice "$1"',
-'difference-title' => '$1: Razlika između inačica',
+'difference-title' => 'Razlika između inačica stranice $1',
 'difference-multipage' => '(Razlika između stranica)',
 'lineno' => 'Redak $1:',
 'compareselectedversions' => 'Usporedi odabrane inačice',
@@ -1779,6 +1786,12 @@ Ako se problem ponovi, javite to [[Special:ListUsers/sysop|administratoru]].',
 'backend-fail-backup' => 'Izrada sigurnosne kopije datoteke "$1" nije uspjela.',
 'backend-fail-notexists' => 'Datoteka $1 ne postoji.',
 'backend-fail-hashes' => '"Hash" indeksi datoteka za usporedbu nisu nađeni.',
+'backend-fail-notsame' => 'Na lokaciji $1 već postoji datoteka koja se razlikuje.',
+'backend-fail-invalidpath' => "$1 nije valjana pričuvna putanja (''path'').",
+'backend-fail-delete' => 'Ne mogu obrisati datoteku $1.',
+'backend-fail-opentemp' => 'Ne mogu otvoriti privremenu datoteku.',
+'backend-fail-writetemp' => 'Ne mogu pisati u privremenu datoteku.',
+'backend-fail-closetemp' => 'Ne mogu zatvoriti privremenu datoteku.',
 
 # ZipDirectoryReader
 'zip-file-open-error' => 'Došlo je do pogreške pri otvaranju datoteke za ZIP provjeru.',
@@ -2842,6 +2855,10 @@ Snimite je na svoje računalo i postavite je ovdje.',
 'import-logentry-interwiki' => 'transwiki uvezeno $1',
 'import-logentry-interwiki-detail' => '$1 {{PLURAL:$1|promjena|promjene|promjena}} od $2',
 
+# JavaScriptTest
+'javascripttest' => 'Testiranje JavaScripta',
+'javascripttest-disabled' => 'Ova funkcija nije omogućena na ovom wikiprojektu.',
+
 # Tooltip help for the actions
 'tooltip-pt-userpage' => 'Moja suradnička stranica',
 'tooltip-pt-anonuserpage' => 'Suradnička stranica za IP adresu pod kojom uređujete',
@@ -2958,6 +2975,10 @@ Razlog je vjerojatno vanjska poveznica koja se nalazi na crnom popisu.',
 'pageinfo-robot-index' => 'Stranicu je moguće indeksirati',
 'pageinfo-views' => 'Broj pregleda',
 'pageinfo-watchers' => 'Broj pratitelja stranice',
+'pageinfo-firstuser' => 'Suradnik koji je stvorio stranicu',
+'pageinfo-firsttime' => 'Datum stvaranja stranice',
+'pageinfo-lastuser' => 'Posljednji urednik stranice',
+'pageinfo-lasttime' => 'Datum zadnjeg uređivanja',
 'pageinfo-edits' => 'Broj uređivanja',
 'pageinfo-authors' => 'Broj različitih autora',
 
@@ -3711,6 +3732,9 @@ Trebali ste primiti [{{SERVER}}{{SCRIPTPATH}}/COPYING kopiju GNU opće javne lic
 'version-software' => 'Instalirani softver',
 'version-software-product' => 'Proizvod',
 'version-software-version' => 'Verzija',
+'version-entrypoints' => 'URL adresa instalacije',
+'version-entrypoints-header-entrypoint' => 'Početna adresa',
+'version-entrypoints-header-url' => 'URL',
 
 # Special:FilePath
 'filepath' => 'Putanja datoteke',
@@ -3862,9 +3886,9 @@ Inače, možete ispuniti jednostavan obrazac u nastavku. Vaš komentar biti će
 
 # API errors
 'api-error-badaccess-groups' => 'Nemate ovlasti za postavljanje datoteka na ovu wiki.',
-'api-error-badtoken' => "''Token'' koji smo koristili za vašu identifikaciju na ovaj poslužitelj nije bio ispravan.",
-'api-error-copyuploaddisabled' => 'Postavljanja datoteka kopiranjem su onemogućena.',
-'api-error-duplicate' => 'Već postoji jedna datoteka na ovoj wiki s istim sadržajem',
+'api-error-badtoken' => 'Interna pogrješka: Token nije ispravan.',
+'api-error-copyuploaddisabled' => 'Postavljanje datoteka putem URL-a nije omogućeno na ovom projektu.',
+'api-error-duplicate' => '{{PLURAL:$1|Postoji [$2 druga datoteka]|Postoje $1 [$2 druge datoteke]|Postoji $1 [$2 drugih datoteka]}} istog sadržaja.',
 'api-error-empty-file' => 'Datoteka koju ste poslali je prazna.',
 'api-error-fetchfileerror' => 'Pojavio se neki problem pri dobivanju podataka o datoteci.',
 'api-error-file-too-large' => 'Datoteka koju ste poslali bila je prevelika.',
diff --git a/languages/messages/MessagesHsb.php b/languages/messages/MessagesHsb.php
index ad6d519f9f..b7c2b96888 100644
--- a/languages/messages/MessagesHsb.php
+++ b/languages/messages/MessagesHsb.php
@@ -2870,7 +2870,7 @@ W poslednim padźe móžeš tež wotkaz wužiwać, na př. „[[{{#Special:Expor
 'pageinfo-authors' => 'Cyłkowna ličba rozdźělnych awtorow',
 'pageinfo-recent-edits' => 'Ličba najnowšich změnow (za zańdźenych $1)',
 'pageinfo-recent-authors' => 'Najnowša ličba rozdźělnych awtorow',
-'pageinfo-restriction' => 'Å kit strony (<code>$1</code>)',
+'pageinfo-restriction' => 'Å kit strony (<code>{{lcfirst:$1}}</code>)',
 'pageinfo-magic-words' => '{{PLURAL:$1|Magiske słowo|Magiskej słowje|Magiske słowa|Magiske słowa}} ($1)',
 'pageinfo-hidden-categories' => '{{PLURAL:$1|Schowana kategorija|Schowanej kategoriji|Schowane kategorije|Schowane kategorije}} ($1)',
 'pageinfo-templates' => '{{PLURAL:$1|Zapřijata předłoha|Zapřijatej předłoze|Zapřijate předłohi|Zapřijate předłohi}} ($1)',
diff --git a/languages/messages/MessagesHu.php b/languages/messages/MessagesHu.php
index 551f9719b8..6832d26dc1 100644
--- a/languages/messages/MessagesHu.php
+++ b/languages/messages/MessagesHu.php
@@ -185,128 +185,128 @@ $dateFormats = array(
 );
 
 $magicWords = array(
-	'redirect'                => array( '0', '#ÁTIRÁNYÍTÁS', '#REDIRECT' ),
-	'notoc'                   => array( '0', '__NINCSTARTALOMJEGYZÉK__', '__NINCSTJ__', '__NOTOC__' ),
-	'nogallery'               => array( '0', '__NINCSGALÉRIA__', '__NOGALLERY__' ),
-	'forcetoc'                => array( '0', '__LEGYENTARTALOMJEGYZÉK__', '__LEGYENTJ__', '__FORCETOC__' ),
-	'toc'                     => array( '0', '__TARTALOMJEGYZÉK__', '__TJ__', '__TOC__' ),
-	'noeditsection'           => array( '0', '__NINCSSZERKESZTÉS__', '__NINCSSZERK__', '__NOEDITSECTION__' ),
-	'currentmonth'            => array( '1', 'HÓNAP', 'CURRENTMONTH', 'CURRENTMONTH2' ),
-	'currentmonth1'           => array( '1', 'HÓNAP1', 'CURRENTMONTH1' ),
-	'currentmonthname'        => array( '1', 'HÓNAPNEVE', 'CURRENTMONTHNAME' ),
-	'currentmonthabbrev'      => array( '1', 'HÓNAPRÖVID', 'CURRENTMONTHABBREV' ),
-	'currentday'              => array( '1', 'MAINAP', 'CURRENTDAY' ),
-	'currentday2'             => array( '1', 'MAINAP2', 'CURRENTDAY2' ),
-	'currentdayname'          => array( '1', 'MAINAPNEVE', 'CURRENTDAYNAME' ),
-	'currentyear'             => array( '1', 'ÉV', 'CURRENTYEAR' ),
-	'currenttime'             => array( '1', 'IDŐ', 'CURRENTTIME' ),
-	'currenthour'             => array( '1', 'ÓRA', 'CURRENTHOUR' ),
-	'localmonth'              => array( '1', 'HELYIHÓNAP', 'LOCALMONTH', 'LOCALMONTH2' ),
-	'localmonth1'             => array( '1', 'HELYIHÓNAP1', 'LOCALMONTH1' ),
-	'localmonthname'          => array( '1', 'HELYIHÓNAPNÉV', 'LOCALMONTHNAME' ),
-	'localmonthabbrev'        => array( '1', 'HELYIHÓNAPRÖVIDÍTÉS', 'LOCALMONTHABBREV' ),
-	'localday'                => array( '1', 'HELYINAP', 'LOCALDAY' ),
-	'localday2'               => array( '1', 'HELYINAP2', 'LOCALDAY2' ),
-	'localdayname'            => array( '1', 'HELYINAPNEVE', 'LOCALDAYNAME' ),
-	'localyear'               => array( '1', 'HELYIÉV', 'LOCALYEAR' ),
-	'localtime'               => array( '1', 'HELYIIDŐ', 'LOCALTIME' ),
-	'localhour'               => array( '1', 'HELYIÓRA', 'LOCALHOUR' ),
-	'numberofpages'           => array( '1', 'OLDALAKSZÁMA', 'LAPOKSZÁMA', 'NUMBEROFPAGES' ),
-	'numberofarticles'        => array( '1', 'SZÓCIKKEKSZÁMA', 'NUMBEROFARTICLES' ),
-	'numberoffiles'           => array( '1', 'FÁJLOKSZÁMA', 'KÉPEKSZÁMA', 'NUMBEROFFILES' ),
-	'numberofusers'           => array( '1', 'SZERKESZTŐKSZÁMA', 'NUMBEROFUSERS' ),
-	'numberofactiveusers'     => array( '1', 'AKTÍVSZERKESZTŐKSZÁMA', 'NUMBEROFACTIVEUSERS' ),
-	'numberofedits'           => array( '1', 'SZERKESZTÉSEKSZÁMA', 'NUMBEROFEDITS' ),
-	'numberofviews'           => array( '1', 'MEGTEKINTÉSEKSZÁMA', 'NUMBEROFVIEWS' ),
-	'pagename'                => array( '1', 'OLDALNEVE', 'PAGENAME' ),
-	'pagenamee'               => array( '1', 'OLDALNEVEE', 'PAGENAMEE' ),
-	'namespace'               => array( '1', 'NÉVTERE', 'NAMESPACE' ),
-	'namespacee'              => array( '1', 'NÉVTEREE', 'NAMESPACEE' ),
-	'talkspace'               => array( '1', 'VITATERE', 'TALKSPACE' ),
-	'talkspacee'              => array( '1', 'VITATEREE', 'TALKSPACEE' ),
-	'subjectspace'            => array( '1', 'SZÓCIKKNÉVTERE', 'SUBJECTSPACE', 'ARTICLESPACE' ),
-	'subjectspacee'           => array( '1', 'SZÓCIKKNÉVTEREE', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
-	'fullpagename'            => array( '1', 'LAPTELJESNEVE', 'FULLPAGENAME' ),
-	'fullpagenamee'           => array( '1', 'LAPTELJESNEVEE', 'FULLPAGENAMEE' ),
-	'subpagename'             => array( '1', 'ALLAPNEVE', 'SUBPAGENAME' ),
-	'subpagenamee'            => array( '1', 'ALLAPNEVEE', 'SUBPAGENAMEE' ),
-	'basepagename'            => array( '1', 'ALAPLAPNEVE', 'BASEPAGENAME' ),
-	'basepagenamee'           => array( '1', 'ALAPLAPNEVEE', 'BASEPAGENAMEE' ),
-	'talkpagename'            => array( '1', 'VITALAPNEVE', 'TALKPAGENAME' ),
-	'talkpagenamee'           => array( '1', 'VITALAPNEVEE', 'TALKPAGENAMEE' ),
-	'subjectpagename'         => array( '1', 'SZÓCIKKNEVE', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
-	'subjectpagenamee'        => array( '1', 'SZÓCIKKNEVEE', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
-	'msg'                     => array( '0', 'ÜZENET:', 'ÜZ:', 'MSG:' ),
-	'subst'                   => array( '0', 'BEILLESZT:', 'BEMÁSOL:', 'SUBST:' ),
-	'img_thumbnail'           => array( '1', 'bélyegkép', 'bélyeg', 'miniatűr', 'thumbnail', 'thumb' ),
-	'img_manualthumb'         => array( '1', 'bélyegkép=$1', 'bélyeg=$1', 'miniatűr=$1', 'thumbnail=$1', 'thumb=$1' ),
-	'img_right'               => array( '1', 'jobb', 'jobbra', 'right' ),
-	'img_left'                => array( '1', 'bal', 'balra', 'left' ),
-	'img_none'                => array( '1', 'semmi', 'none' ),
-	'img_center'              => array( '1', 'közép', 'középre', 'center', 'centre' ),
-	'img_framed'              => array( '1', 'keretezett', 'keretes', 'keretben', 'kerettel', 'framed', 'enframed', 'frame' ),
-	'img_frameless'           => array( '1', 'keretnélküli', 'frameless' ),
-	'img_page'                => array( '1', 'oldal=$1', 'oldal $1', 'page=$1', 'page $1' ),
-	'img_upright'             => array( '1', 'fennjobbra', 'fennjobbra=$1', 'fennjobbra $1', 'upright', 'upright=$1', 'upright $1' ),
-	'img_border'              => array( '1', 'keret', 'border' ),
-	'img_baseline'            => array( '1', 'alapvonal', 'baseline' ),
-	'img_sub'                 => array( '1', 'ai', 'alsóindex', 'sub' ),
-	'img_super'               => array( '1', 'fi', 'felsőindex', 'super', 'sup' ),
-	'img_top'                 => array( '1', 'fenn', 'fent', 'top' ),
-	'img_text_top'            => array( '1', 'szöveg-fenn', 'szöveg-fent', 'text-top' ),
-	'img_middle'              => array( '1', 'vközépen', 'vközépre', 'middle' ),
-	'img_bottom'              => array( '1', 'lenn', 'lent', 'bottom' ),
-	'img_text_bottom'         => array( '1', 'szöveg-lenn', 'szöveg-lent', 'text-bottom' ),
-	'sitename'                => array( '1', 'WIKINEVE', 'SITENAME' ),
-	'ns'                      => array( '0', 'NÉVTÉR:', 'NS:' ),
-	'localurl'                => array( '0', 'HELYIURL:', 'LOCALURL:' ),
-	'localurle'               => array( '0', 'HELYIURLE:', 'LOCALURLE:' ),
-	'server'                  => array( '0', 'SZERVER', 'KISZOLGÁLÓ', 'SERVER' ),
-	'servername'              => array( '0', 'SZERVERNEVE', 'KISZOLGÁLÓNEVE', 'SERVERNAME' ),
-	'grammar'                 => array( '0', 'NYELVTAN:', 'GRAMMAR:' ),
-	'currentweek'             => array( '1', 'HÉT', 'CURRENTWEEK' ),
-	'currentdow'              => array( '1', 'HÉTNAPJA', 'CURRENTDOW' ),
-	'localweek'               => array( '1', 'HELYIHÉT', 'LOCALWEEK' ),
-	'localdow'                => array( '1', 'HELYIHÉTNAPJA', 'LOCALDOW' ),
-	'revisionid'              => array( '1', 'VÁLTOZATAZON', 'VÁLTOZATAZONOSÍTÓ', 'REVISIONID' ),
-	'revisionday'             => array( '1', 'VÁLTOZATNAPJA', 'REVISIONDAY' ),
-	'revisionday2'            => array( '1', 'VÁLTOZATNAPJA2', 'REVISIONDAY2' ),
-	'revisionmonth'           => array( '1', 'VÁLTOZATHÓNAPJA', 'REVISIONMONTH' ),
-	'revisionyear'            => array( '1', 'VÁLTOZATÉVE', 'REVISIONYEAR' ),
-	'revisiontimestamp'       => array( '1', 'VÁLTOZATIDŐBÉLYEG', 'VÁLTOZATIDEJE', 'REVISIONTIMESTAMP' ),
-	'revisionuser'            => array( '1', 'VÁLTOZATSZERKESZTŐJE', 'REVISIONUSER' ),
-	'plural'                  => array( '0', 'TÖBBESSZÁM:', 'PLURAL:' ),
-	'fullurl'                 => array( '0', 'TELJESURL:', 'FULLURL:' ),
-	'fullurle'                => array( '0', 'TELJESURLE:', 'FULLURLE:' ),
-	'lcfirst'                 => array( '0', 'KISKEZDŐ:', 'KISKEZDŐBETŰ:', 'LCFIRST:' ),
-	'ucfirst'                 => array( '0', 'NAGYKEZDŐ:', 'NAGYKEZDŐBETŰ:', 'UCFIRST:' ),
-	'lc'                      => array( '0', 'KISBETÅ°:', 'KISBETÅ°K:', 'KB:', 'KISBETÅ°S:', 'LC:' ),
-	'uc'                      => array( '0', 'NAGYBETÅ°:', 'NAGYBETÅ°K', 'NB:', 'NAGYBETÅ°S:', 'UC:' ),
-	'displaytitle'            => array( '1', 'MEGJELENÍTENDŐCÍM', 'CÍM', 'DISPLAYTITLE' ),
-	'newsectionlink'          => array( '1', '__ÚJSZAKASZHIV__', '__ÚJSZAKASZLINK__', '__NEWSECTIONLINK__' ),
-	'nonewsectionlink'        => array( '1', '__NINCSÚJSZAKASZHIV__', '__NINCSÚJSZAKASZLINK__', '__NONEWSECTIONLINK__' ),
-	'currentversion'          => array( '1', 'JELENLEGIVÁLTOZAT', 'CURRENTVERSION' ),
-	'urlencode'               => array( '0', 'URLKÓDOLVA:', 'URLENCODE:' ),
-	'anchorencode'            => array( '0', 'HORGONYKÓDOLVA', 'ANCHORENCODE' ),
-	'currenttimestamp'        => array( '1', 'IDŐBÉLYEG', 'CURRENTTIMESTAMP' ),
-	'localtimestamp'          => array( '1', 'HELYIIDŐBÉLYEG', 'LOCALTIMESTAMP' ),
-	'directionmark'           => array( '1', 'IRÁNYJELZŐ', 'DIRECTIONMARK', 'DIRMARK' ),
-	'language'                => array( '0', '#NYELV:', '#LANGUAGE:' ),
-	'contentlanguage'         => array( '1', 'TARTALOMNYELVE', 'TARTNYELVE', 'CONTENTLANGUAGE', 'CONTENTLANG' ),
-	'pagesinnamespace'        => array( '1', 'OLDALAKNÉVTÉRBEN:', 'OLDALAKNBEN:', 'PAGESINNAMESPACE:', 'PAGESINNS:' ),
-	'numberofadmins'          => array( '1', 'ADMINOKSZÁMA', 'NUMBEROFADMINS' ),
-	'formatnum'               => array( '0', 'FORMÁZOTTSZÁM', 'SZÁMFORMÁZÁS', 'SZÁMFORM', 'FORMATNUM' ),
-	'special'                 => array( '0', 'speciális', 'special' ),
-	'defaultsort'             => array( '1', 'RENDEZÉS:', 'KULCS:', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:' ),
-	'filepath'                => array( '0', 'ELÉRÉSIÚT:', 'FILEPATH:' ),
-	'hiddencat'               => array( '1', '__REJTETTKAT__', '__REJTETTKATEGÓRIA__', '__HIDDENCAT__' ),
-	'pagesincategory'         => array( '1', 'LAPOKAKATEGÓRIÁBAN', 'PAGESINCATEGORY', 'PAGESINCAT' ),
-	'pagesize'                => array( '1', 'LAPMÉRET', 'PAGESIZE' ),
-	'noindex'                 => array( '1', '__NINCSINDEX__', '__NOINDEX__' ),
-	'numberingroup'           => array( '1', 'CSOPORTTAGOK', 'NUMBERINGROUP', 'NUMINGROUP' ),
-	'staticredirect'          => array( '1', '__ÁLLANDÓÁTIRÁNYÍTÁS__', '__STATIKUSÁTIRÁNYÍTÁS__', '__STATICREDIRECT__' ),
-	'protectionlevel'         => array( '1', 'VÉDELMISZINT', 'PROTECTIONLEVEL' ),
-	'formatdate'              => array( '0', 'dátumformázás', 'formatdate', 'dateformat' ),
+	'redirect'                  => array( '0', '#ÁTIRÁNYÍTÁS', '#REDIRECT' ),
+	'notoc'                     => array( '0', '__NINCSTARTALOMJEGYZÉK__', '__NINCSTJ__', '__NOTOC__' ),
+	'nogallery'                 => array( '0', '__NINCSGALÉRIA__', '__NOGALLERY__' ),
+	'forcetoc'                  => array( '0', '__LEGYENTARTALOMJEGYZÉK__', '__LEGYENTJ__', '__FORCETOC__' ),
+	'toc'                       => array( '0', '__TARTALOMJEGYZÉK__', '__TJ__', '__TOC__' ),
+	'noeditsection'             => array( '0', '__NINCSSZERKESZTÉS__', '__NINCSSZERK__', '__NOEDITSECTION__' ),
+	'currentmonth'              => array( '1', 'HÓNAP', 'CURRENTMONTH', 'CURRENTMONTH2' ),
+	'currentmonth1'             => array( '1', 'HÓNAP1', 'CURRENTMONTH1' ),
+	'currentmonthname'          => array( '1', 'HÓNAPNEVE', 'CURRENTMONTHNAME' ),
+	'currentmonthabbrev'        => array( '1', 'HÓNAPRÖVID', 'CURRENTMONTHABBREV' ),
+	'currentday'                => array( '1', 'MAINAP', 'CURRENTDAY' ),
+	'currentday2'               => array( '1', 'MAINAP2', 'CURRENTDAY2' ),
+	'currentdayname'            => array( '1', 'MAINAPNEVE', 'CURRENTDAYNAME' ),
+	'currentyear'               => array( '1', 'ÉV', 'CURRENTYEAR' ),
+	'currenttime'               => array( '1', 'IDŐ', 'CURRENTTIME' ),
+	'currenthour'               => array( '1', 'ÓRA', 'CURRENTHOUR' ),
+	'localmonth'                => array( '1', 'HELYIHÓNAP', 'LOCALMONTH', 'LOCALMONTH2' ),
+	'localmonth1'               => array( '1', 'HELYIHÓNAP1', 'LOCALMONTH1' ),
+	'localmonthname'            => array( '1', 'HELYIHÓNAPNÉV', 'LOCALMONTHNAME' ),
+	'localmonthabbrev'          => array( '1', 'HELYIHÓNAPRÖVIDÍTÉS', 'LOCALMONTHABBREV' ),
+	'localday'                  => array( '1', 'HELYINAP', 'LOCALDAY' ),
+	'localday2'                 => array( '1', 'HELYINAP2', 'LOCALDAY2' ),
+	'localdayname'              => array( '1', 'HELYINAPNEVE', 'LOCALDAYNAME' ),
+	'localyear'                 => array( '1', 'HELYIÉV', 'LOCALYEAR' ),
+	'localtime'                 => array( '1', 'HELYIIDŐ', 'LOCALTIME' ),
+	'localhour'                 => array( '1', 'HELYIÓRA', 'LOCALHOUR' ),
+	'numberofpages'             => array( '1', 'OLDALAKSZÁMA', 'LAPOKSZÁMA', 'NUMBEROFPAGES' ),
+	'numberofarticles'          => array( '1', 'SZÓCIKKEKSZÁMA', 'NUMBEROFARTICLES' ),
+	'numberoffiles'             => array( '1', 'FÁJLOKSZÁMA', 'KÉPEKSZÁMA', 'NUMBEROFFILES' ),
+	'numberofusers'             => array( '1', 'SZERKESZTŐKSZÁMA', 'NUMBEROFUSERS' ),
+	'numberofactiveusers'       => array( '1', 'AKTÍVSZERKESZTŐKSZÁMA', 'NUMBEROFACTIVEUSERS' ),
+	'numberofedits'             => array( '1', 'SZERKESZTÉSEKSZÁMA', 'NUMBEROFEDITS' ),
+	'numberofviews'             => array( '1', 'MEGTEKINTÉSEKSZÁMA', 'NUMBEROFVIEWS' ),
+	'pagename'                  => array( '1', 'OLDALNEVE', 'PAGENAME' ),
+	'pagenamee'                 => array( '1', 'OLDALNEVEE', 'PAGENAMEE' ),
+	'namespace'                 => array( '1', 'NÉVTERE', 'NAMESPACE' ),
+	'namespacee'                => array( '1', 'NÉVTEREE', 'NAMESPACEE' ),
+	'talkspace'                 => array( '1', 'VITATERE', 'TALKSPACE' ),
+	'talkspacee'                => array( '1', 'VITATEREE', 'TALKSPACEE' ),
+	'subjectspace'              => array( '1', 'SZÓCIKKNÉVTERE', 'SUBJECTSPACE', 'ARTICLESPACE' ),
+	'subjectspacee'             => array( '1', 'SZÓCIKKNÉVTEREE', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
+	'fullpagename'              => array( '1', 'LAPTELJESNEVE', 'FULLPAGENAME' ),
+	'fullpagenamee'             => array( '1', 'LAPTELJESNEVEE', 'FULLPAGENAMEE' ),
+	'subpagename'               => array( '1', 'ALLAPNEVE', 'SUBPAGENAME' ),
+	'subpagenamee'              => array( '1', 'ALLAPNEVEE', 'SUBPAGENAMEE' ),
+	'basepagename'              => array( '1', 'ALAPLAPNEVE', 'BASEPAGENAME' ),
+	'basepagenamee'             => array( '1', 'ALAPLAPNEVEE', 'BASEPAGENAMEE' ),
+	'talkpagename'              => array( '1', 'VITALAPNEVE', 'TALKPAGENAME' ),
+	'talkpagenamee'             => array( '1', 'VITALAPNEVEE', 'TALKPAGENAMEE' ),
+	'subjectpagename'           => array( '1', 'SZÓCIKKNEVE', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
+	'subjectpagenamee'          => array( '1', 'SZÓCIKKNEVEE', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
+	'msg'                       => array( '0', 'ÜZENET:', 'ÜZ:', 'MSG:' ),
+	'subst'                     => array( '0', 'BEILLESZT:', 'BEMÁSOL:', 'SUBST:' ),
+	'img_thumbnail'             => array( '1', 'bélyegkép', 'bélyeg', 'miniatűr', 'thumbnail', 'thumb' ),
+	'img_manualthumb'           => array( '1', 'bélyegkép=$1', 'bélyeg=$1', 'miniatűr=$1', 'thumbnail=$1', 'thumb=$1' ),
+	'img_right'                 => array( '1', 'jobb', 'jobbra', 'right' ),
+	'img_left'                  => array( '1', 'bal', 'balra', 'left' ),
+	'img_none'                  => array( '1', 'semmi', 'none' ),
+	'img_center'                => array( '1', 'közép', 'középre', 'center', 'centre' ),
+	'img_framed'                => array( '1', 'keretezett', 'keretes', 'keretben', 'kerettel', 'framed', 'enframed', 'frame' ),
+	'img_frameless'             => array( '1', 'keretnélküli', 'frameless' ),
+	'img_page'                  => array( '1', 'oldal=$1', 'oldal $1', 'page=$1', 'page $1' ),
+	'img_upright'               => array( '1', 'fennjobbra', 'fennjobbra=$1', 'fennjobbra $1', 'upright', 'upright=$1', 'upright $1' ),
+	'img_border'                => array( '1', 'keret', 'border' ),
+	'img_baseline'              => array( '1', 'alapvonal', 'baseline' ),
+	'img_sub'                   => array( '1', 'ai', 'alsóindex', 'sub' ),
+	'img_super'                 => array( '1', 'fi', 'felsőindex', 'super', 'sup' ),
+	'img_top'                   => array( '1', 'fenn', 'fent', 'top' ),
+	'img_text_top'              => array( '1', 'szöveg-fenn', 'szöveg-fent', 'text-top' ),
+	'img_middle'                => array( '1', 'vközépen', 'vközépre', 'middle' ),
+	'img_bottom'                => array( '1', 'lenn', 'lent', 'bottom' ),
+	'img_text_bottom'           => array( '1', 'szöveg-lenn', 'szöveg-lent', 'text-bottom' ),
+	'sitename'                  => array( '1', 'WIKINEVE', 'SITENAME' ),
+	'ns'                        => array( '0', 'NÉVTÉR:', 'NS:' ),
+	'localurl'                  => array( '0', 'HELYIURL:', 'LOCALURL:' ),
+	'localurle'                 => array( '0', 'HELYIURLE:', 'LOCALURLE:' ),
+	'server'                    => array( '0', 'SZERVER', 'KISZOLGÁLÓ', 'SERVER' ),
+	'servername'                => array( '0', 'SZERVERNEVE', 'KISZOLGÁLÓNEVE', 'SERVERNAME' ),
+	'grammar'                   => array( '0', 'NYELVTAN:', 'GRAMMAR:' ),
+	'currentweek'               => array( '1', 'HÉT', 'CURRENTWEEK' ),
+	'currentdow'                => array( '1', 'HÉTNAPJA', 'CURRENTDOW' ),
+	'localweek'                 => array( '1', 'HELYIHÉT', 'LOCALWEEK' ),
+	'localdow'                  => array( '1', 'HELYIHÉTNAPJA', 'LOCALDOW' ),
+	'revisionid'                => array( '1', 'VÁLTOZATAZON', 'VÁLTOZATAZONOSÍTÓ', 'REVISIONID' ),
+	'revisionday'               => array( '1', 'VÁLTOZATNAPJA', 'REVISIONDAY' ),
+	'revisionday2'              => array( '1', 'VÁLTOZATNAPJA2', 'REVISIONDAY2' ),
+	'revisionmonth'             => array( '1', 'VÁLTOZATHÓNAPJA', 'REVISIONMONTH' ),
+	'revisionyear'              => array( '1', 'VÁLTOZATÉVE', 'REVISIONYEAR' ),
+	'revisiontimestamp'         => array( '1', 'VÁLTOZATIDŐBÉLYEG', 'VÁLTOZATIDEJE', 'REVISIONTIMESTAMP' ),
+	'revisionuser'              => array( '1', 'VÁLTOZATSZERKESZTŐJE', 'REVISIONUSER' ),
+	'plural'                    => array( '0', 'TÖBBESSZÁM:', 'PLURAL:' ),
+	'fullurl'                   => array( '0', 'TELJESURL:', 'FULLURL:' ),
+	'fullurle'                  => array( '0', 'TELJESURLE:', 'FULLURLE:' ),
+	'lcfirst'                   => array( '0', 'KISKEZDŐ:', 'KISKEZDŐBETŰ:', 'LCFIRST:' ),
+	'ucfirst'                   => array( '0', 'NAGYKEZDŐ:', 'NAGYKEZDŐBETŰ:', 'UCFIRST:' ),
+	'lc'                        => array( '0', 'KISBETÅ°:', 'KISBETÅ°K:', 'KB:', 'KISBETÅ°S:', 'LC:' ),
+	'uc'                        => array( '0', 'NAGYBETÅ°:', 'NAGYBETÅ°K', 'NB:', 'NAGYBETÅ°S:', 'UC:' ),
+	'displaytitle'              => array( '1', 'MEGJELENÍTENDŐCÍM', 'CÍM', 'DISPLAYTITLE' ),
+	'newsectionlink'            => array( '1', '__ÚJSZAKASZHIV__', '__ÚJSZAKASZLINK__', '__NEWSECTIONLINK__' ),
+	'nonewsectionlink'          => array( '1', '__NINCSÚJSZAKASZHIV__', '__NINCSÚJSZAKASZLINK__', '__NONEWSECTIONLINK__' ),
+	'currentversion'            => array( '1', 'JELENLEGIVÁLTOZAT', 'CURRENTVERSION' ),
+	'urlencode'                 => array( '0', 'URLKÓDOLVA:', 'URLENCODE:' ),
+	'anchorencode'              => array( '0', 'HORGONYKÓDOLVA', 'ANCHORENCODE' ),
+	'currenttimestamp'          => array( '1', 'IDŐBÉLYEG', 'CURRENTTIMESTAMP' ),
+	'localtimestamp'            => array( '1', 'HELYIIDŐBÉLYEG', 'LOCALTIMESTAMP' ),
+	'directionmark'             => array( '1', 'IRÁNYJELZŐ', 'DIRECTIONMARK', 'DIRMARK' ),
+	'language'                  => array( '0', '#NYELV:', '#LANGUAGE:' ),
+	'contentlanguage'           => array( '1', 'TARTALOMNYELVE', 'TARTNYELVE', 'CONTENTLANGUAGE', 'CONTENTLANG' ),
+	'pagesinnamespace'          => array( '1', 'OLDALAKNÉVTÉRBEN:', 'OLDALAKNBEN:', 'PAGESINNAMESPACE:', 'PAGESINNS:' ),
+	'numberofadmins'            => array( '1', 'ADMINOKSZÁMA', 'NUMBEROFADMINS' ),
+	'formatnum'                 => array( '0', 'FORMÁZOTTSZÁM', 'SZÁMFORMÁZÁS', 'SZÁMFORM', 'FORMATNUM' ),
+	'special'                   => array( '0', 'speciális', 'special' ),
+	'defaultsort'               => array( '1', 'RENDEZÉS:', 'KULCS:', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:' ),
+	'filepath'                  => array( '0', 'ELÉRÉSIÚT:', 'FILEPATH:' ),
+	'hiddencat'                 => array( '1', '__REJTETTKAT__', '__REJTETTKATEGÓRIA__', '__HIDDENCAT__' ),
+	'pagesincategory'           => array( '1', 'LAPOKAKATEGÓRIÁBAN', 'PAGESINCATEGORY', 'PAGESINCAT' ),
+	'pagesize'                  => array( '1', 'LAPMÉRET', 'PAGESIZE' ),
+	'noindex'                   => array( '1', '__NINCSINDEX__', '__NOINDEX__' ),
+	'numberingroup'             => array( '1', 'CSOPORTTAGOK', 'NUMBERINGROUP', 'NUMINGROUP' ),
+	'staticredirect'            => array( '1', '__ÁLLANDÓÁTIRÁNYÍTÁS__', '__STATIKUSÁTIRÁNYÍTÁS__', '__STATICREDIRECT__' ),
+	'protectionlevel'           => array( '1', 'VÉDELMISZINT', 'PROTECTIONLEVEL' ),
+	'formatdate'                => array( '0', 'dátumformázás', 'formatdate', 'dateformat' ),
 );
 
 $linkTrail = '/^([a-záéíóúöüőűÁÉÍÓÚÖÜŐŰ]+)(.*)$/sDu';
@@ -382,7 +382,7 @@ $messages = array(
 'tue' => 'kedd',
 'wed' => 'sze',
 'thu' => 'csü',
-'fri' => 'pé',
+'fri' => 'pén',
 'sat' => 'szo',
 'january' => 'január',
 'february' => 'február',
@@ -633,9 +633,9 @@ Az érvényes speciális lapok listáját a [[Special:SpecialPages|{{int:special
 'databaseerror' => 'Adatbázishiba',
 'dberrortext' => 'Szintaktikai hiba található az adatbázis-lekérdezésben.
 Ezt szoftverhiba okozhatta.
-Az utolsó adatbázis-lekérdezés a(z) „<tt>$2</tt>” függvényből történt, és a következő volt:
-<blockquote><tt>$1</tt></blockquote>
-Az adatbázis ezzel a hibával tért vissza: „<tt>$3: $4</tt>”.',
+Az utolsó adatbázis-lekérdezés a(z) „<code>$2</code>” függvényből történt, és a következő volt:
+<blockquote><code>$1</code></blockquote>
+Az adatbázis ezzel a hibával tért vissza: „<samp>$3: $4</samp>”.',
 'dberrortextcl' => 'Szintaktikai hiba található az adatbázis-lekérdezésben.
 Az utolsó adatbázis-lekérdezés a(z) „$2” függvényből történt, és a következő volt:
 „$1”
@@ -978,7 +978,6 @@ A blokkolási napló legutóbbi ide vonatkozó bejegyzése a következő:',
 '''Firefox / Safari:''' tartsd lenyomva a Shift gombot és kattints a ''Frissítés'' gombra a címsorban, vagy használd a ''Ctrl–F5'' vagy ''Ctrl–R'' billentyűkombinációt (Mac-en ''Command–R'');
 '''Google Chrome:''' használd a ''Ctrl–Shift–R'' billentyűkombinációt (Mac-en ''Command–Shift–R'');
 '''Internet Explorer:''' tartsd nyomva a ''Ctrl''-t, és kattints a ''Frissítés'' gombra, vagy nyomj ''Ctrl–F5''-öt;
-'''Konqueror: '''kattints a ''Frissítés'' gombra vagy nyomj ''F5''-öt;
 '''Opera:''' ürítsd ki a gyorsítótárat a ''Beállítások / Haladó / Előzmények→Törlés most'' gombbal, majd frissítsd az oldalt.",
 'usercssyoucanpreview' => "'''Tipp:''' mentés előtt használd az „{{int:showpreview}}” gombot az új CSS-ed teszteléséhez.",
 'userjsyoucanpreview' => "'''Tipp:''' mentés előtt használd az „{{int:showpreview}}” gombot az új JavaScipted teszteléséhez.",
@@ -3056,11 +3055,11 @@ Ez valószínűleg egy olyan link miatt van, ami egy feketelistán lévő oldalr
 
 # Info page
 'pageinfo-title' => 'Információk a(z) „$1” lapról',
-'pageinfo-header-edits' => 'Szerkesztések',
+'pageinfo-header-edits' => 'Szerkesztések története',
 'pageinfo-views' => 'Megtekintések száma',
 'pageinfo-watchers' => 'Figyelők száma',
-'pageinfo-edits' => 'Szerkesztések száma',
-'pageinfo-authors' => 'Egyedi szerkesztők száma',
+'pageinfo-edits' => 'Szerkesztések teljes száma',
+'pageinfo-authors' => 'Egyedi szerkesztők teljes száma',
 
 # Skin names
 'skinname-standard' => 'Klasszikus',
diff --git a/languages/messages/MessagesHy.php b/languages/messages/MessagesHy.php
index 15107a3a4b..0216dfe9e0 100644
--- a/languages/messages/MessagesHy.php
+++ b/languages/messages/MessagesHy.php
@@ -92,109 +92,109 @@ $bookstoreList = 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' ),
-	'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' ),
-	'localmonth'              => array( '1', 'ՏԵՂԱԿԱՆ_ԱՄԻՍԸ', 'LOCALMONTH', 'LOCALMONTH2' ),
-	'localmonthname'          => array( '1', 'ՏԵՂԱԿԱՆ_ԱՄՍՎԱ_ԱՆՈՒՆԸ', 'LOCALMONTHNAME' ),
-	'localmonthnamegen'       => array( '1', 'ՏԵՂԱԿԱՆ_ԱՄՍՎԱ_ԱՆՈՒՆԸ_ՍԵՌ', 'LOCALMONTHNAMEGEN' ),
-	'localmonthabbrev'        => array( '1', 'ՏԵՂԱԿԱՆ_ԱՄՍՎԱ_ԱՆՎԱՆ_ՀԱՊԱՎՈՒՄԸ', 'LOCALMONTHABBREV' ),
-	'localday'                => array( '1', 'ՏԵՂԱԿԱՆ_ՕՐԸ', 'LOCALDAY' ),
-	'localday2'               => array( '1', 'ՏԵՂԱԿԱՆ_ՕՐԸ_2', 'LOCALDAY2' ),
-	'localdayname'            => array( '1', 'ՏԵՂԱԿԱՆ_ՕՐՎԱ_ԱՆՈՒՆԸ', 'LOCALDAYNAME' ),
-	'localyear'               => array( '1', 'ՏԵՂԱԿԱՆ_ՏԱՐԻՆ', 'LOCALYEAR' ),
-	'localtime'               => array( '1', 'ՏԵՂԱԿԱՆ_ԺԱՄԱՆԱԿԸ', 'LOCALTIME' ),
-	'localhour'               => array( '1', 'ՏԵՂԱԿԱՆ_ԺԱՄԸ', 'LOCALHOUR' ),
-	'numberofpages'           => array( '1', 'ԷՋԵՐԻ_ՔԱՆԱԿԸ', 'NUMBEROFPAGES' ),
-	'numberofarticles'        => array( '1', 'ՀՈԴՎԱԾՆԵՐԻ_ՔԱՆԱԿԸ', 'NUMBEROFARTICLES' ),
-	'numberoffiles'           => array( '1', 'ՖԱՅԼԵՐԻ_ՔԱՆԱԿԸ', 'NUMBEROFFILES' ),
-	'numberofusers'           => array( '1', 'ՄԱՍՆԱԿԻՑՆԵՐԻ_ՔԱՆԱԿԸ', 'NUMBEROFUSERS' ),
-	'pagename'                => array( '1', 'ԷՋԻ_ԱՆՈՒՆԸ', 'PAGENAME' ),
-	'pagenamee'               => array( '1', 'ԷՋԻ_ԱՆՈՒՆԸ_2', 'PAGENAMEE' ),
-	'namespace'               => array( '1', 'ԱՆՎԱՆԱՏԱՐԱԾՔ', 'NAMESPACE' ),
-	'namespacee'              => array( '1', 'ԱՆՎԱՆԱՏԱՐԱԾՔ_2', 'NAMESPACEE' ),
-	'talkspace'               => array( '1', 'ՔՆՆԱՐԿՄԱՆ_ՏԱՐԱԾՔԸ', 'TALKSPACE' ),
-	'talkspacee'              => array( '1', 'ՔՆՆԱՐԿՄԱՆ_ՏԱՐԱԾՔԸ_2', 'TALKSPACEE' ),
-	'subjectspace'            => array( '1', 'ՀՈԴՎԱԾՆԵՐԻ_ՏԱՐԱԾՔԸ', 'SUBJECTSPACE', 'ARTICLESPACE' ),
-	'subjectspacee'           => array( '1', 'ՀՈԴՎԱԾՆԵՐԻ_ՏԱՐԱԾՔԸ_2', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
-	'fullpagename'            => array( '1', 'ARTICLESPACE', 'ԷՋԻ_ԼՐԻՎ_ԱՆՎԱՆՈՒՄԸ', 'FULLPAGENAME' ),
-	'fullpagenamee'           => array( '1', 'ԷՋԻ_ԼՐԻՎ_ԱՆՎԱՆՈՒՄԸ_2', 'FULLPAGENAMEE' ),
-	'subpagename'             => array( '1', 'ԵՆԹԱԷՋԻ_ԱՆՎԱՆՈՒՄԸ', 'SUBPAGENAME' ),
-	'subpagenamee'            => array( '1', 'ԵՆԹԱԷՋԻ_ԱՆՎԱՆՈՒՄԸ_2', 'SUBPAGENAMEE' ),
-	'basepagename'            => array( '1', 'ՀԻՄՆԱԿԱՆ_ԷՋԻ_ԱՆՎԱՆՈՒՄԸ', 'BASEPAGENAME' ),
-	'basepagenamee'           => array( '1', 'ՀԻՄՆԱԿԱՆ_ԷՋԻ_ԱՆՎԱՆՈՒՄԸ_2', 'BASEPAGENAMEE' ),
-	'talkpagename'            => array( '1', 'ՔՆՆԱՐԿՄԱՆ_ԷՋԻ_ԱՆՎԱՆՈՒՄԸ', 'TALKPAGENAME' ),
-	'talkpagenamee'           => array( '1', 'ՔՆՆԱՐԿՄԱՆ_ԷՋԻ_ԱՆՎԱՆՈՒՄԸ_2', 'TALKPAGENAMEE' ),
-	'subjectpagename'         => array( '1', 'ՀՈԴՎԱԾԻ_ԷՋԻ_ԱՆՎԱՆՈՒՄԸ', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
-	'subjectpagenamee'        => array( '1', 'ՀՈԴՎԱԾԻ_ԷՋԻ_ԱՆՎԱՆՈՒՄԸ_2', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
-	'msg'                     => array( '0', 'ՀՈՂՈՐԴ՝', 'MSG:' ),
-	'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փքս', '$1px' ),
-	'img_center'              => array( '1', 'կենտրոն', 'center', 'centre' ),
-	'img_framed'              => array( '1', 'շրջափակել', 'framed', 'enframed', 'frame' ),
-	'img_page'                => array( '1', 'Õ§Õ»Õ¨=$1', 'Õ§Õ» $1', 'page=$1', 'page $1' ),
-	'int'                     => array( '0', 'ՆԵՐՔ՝', 'INT:' ),
-	'sitename'                => array( '1', 'ԿԱՅՔԻ_ԱՆՈՒՆԸ', 'SITENAME' ),
-	'ns'                      => array( '0', 'ԱՏ՝', 'NS:' ),
-	'localurl'                => array( '0', 'ՏԵՂԱԿԱՆ_ՀԱՍՑԵՆ՝', 'LOCALURL:' ),
-	'localurle'               => array( '0', 'ՏԵՂԱԿԱՆ_ՀԱՍՑԵՆ_2՝', 'LOCALURLE:' ),
-	'server'                  => array( '0', 'ՍԵՐՎԵՐԸ', 'SERVER' ),
-	'servername'              => array( '0', 'ՍԵՐՎԵՐԻ_ԱՆՈՒՆԸ', 'SERVERNAME' ),
-	'scriptpath'              => array( '0', 'ՍՔՐԻՊՏԻ_ՃԱՆԱՊԱՐՀԸ', 'SCRIPTPATH' ),
-	'grammar'                 => array( '0', 'ՀՈԼՈՎ՛', 'GRAMMAR:' ),
-	'notitleconvert'          => array( '0', '__ԱՌԱՆՑ_ՎԵՐՆԱԳՐԻ_ՓՈՓՈԽՄԱՆ__', '__NOTITLECONVERT__', '__NOTC__' ),
-	'nocontentconvert'        => array( '0', '__ԱՌԱՆՑ_ՊԱՐՈՒՆԱԿՈՒԹՅԱՆ_ՓՈՓՈԽՄԱՆ__', '__NOCONTENTCONVERT__', '__NOCC__' ),
-	'currentweek'             => array( '1', 'ԸՆԹԱՑԻՔ_ՇԱԲԱԹԸ', 'CURRENTWEEK' ),
-	'currentdow'              => array( '1', 'ԸՆԹԱՑԻՔ_ՇԱԲԱԹՎԱ_ՕՐԸ', 'CURRENTDOW' ),
-	'localweek'               => array( '1', 'ՏԵՂԱԿԱՆ_ՇԱԲԱԹՎԸ', 'LOCALWEEK' ),
-	'localdow'                => array( '1', 'ՏԵՂԱԿԱՆ_ՇԱԲԱԹՎԱ_ՕՐԸ', 'LOCALDOW' ),
-	'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', 'ԼՐԻՎ_ՀԱՍՑԵՆ_2՝', 'FULLURLE:' ),
-	'lcfirst'                 => array( '0', 'ՓՈՔՐԱՏԱՌ_ՍԿԶԲՆԱՏԱՌ՝', 'LCFIRST:' ),
-	'ucfirst'                 => array( '0', 'ՄԵԾԱՏԱՌ_ՍԿԶԲՆԱՏԱՌ՝', 'UCFIRST:' ),
-	'lc'                      => array( '0', 'ՓՈՔՐԱՏԱՌ՝', 'LC:' ),
-	'uc'                      => array( '0', 'ՄԵԾԱՏԱՌ՝', 'UC:' ),
-	'displaytitle'            => array( '1', 'ՑՈՒՅՑ_ՏԱԼ_ՎԵՐՆԱԳԻՐԸ', 'DISPLAYTITLE' ),
-	'rawsuffix'               => array( '1', 'Չ', 'R' ),
-	'newsectionlink'          => array( '1', '__ՀՂՈՒՄ_ՆՈՐ_ԲԱԺՆԻ_ՎՐԱ__', '__NEWSECTIONLINK__' ),
-	'currentversion'          => array( '1', 'ԸՆԹԱՑԻՔ_ՏԱՐԲԵՐԱԿԸ', 'CURRENTVERSION' ),
-	'urlencode'               => array( '0', 'ՄՇԱԿՎԱԾ_ՀԱՍՑԵ՛', 'URLENCODE:' ),
-	'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' ),
-	'defaultsort'             => array( '1', 'ԼՌՈՒԹՅԱՄԲ_ԴԱՍԱՎՈՐՈՒՄ՝', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:' ),
+	'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' ),
+	'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' ),
+	'localmonth'                => array( '1', 'ՏԵՂԱԿԱՆ_ԱՄԻՍԸ', 'LOCALMONTH', 'LOCALMONTH2' ),
+	'localmonthname'            => array( '1', 'ՏԵՂԱԿԱՆ_ԱՄՍՎԱ_ԱՆՈՒՆԸ', 'LOCALMONTHNAME' ),
+	'localmonthnamegen'         => array( '1', 'ՏԵՂԱԿԱՆ_ԱՄՍՎԱ_ԱՆՈՒՆԸ_ՍԵՌ', 'LOCALMONTHNAMEGEN' ),
+	'localmonthabbrev'          => array( '1', 'ՏԵՂԱԿԱՆ_ԱՄՍՎԱ_ԱՆՎԱՆ_ՀԱՊԱՎՈՒՄԸ', 'LOCALMONTHABBREV' ),
+	'localday'                  => array( '1', 'ՏԵՂԱԿԱՆ_ՕՐԸ', 'LOCALDAY' ),
+	'localday2'                 => array( '1', 'ՏԵՂԱԿԱՆ_ՕՐԸ_2', 'LOCALDAY2' ),
+	'localdayname'              => array( '1', 'ՏԵՂԱԿԱՆ_ՕՐՎԱ_ԱՆՈՒՆԸ', 'LOCALDAYNAME' ),
+	'localyear'                 => array( '1', 'ՏԵՂԱԿԱՆ_ՏԱՐԻՆ', 'LOCALYEAR' ),
+	'localtime'                 => array( '1', 'ՏԵՂԱԿԱՆ_ԺԱՄԱՆԱԿԸ', 'LOCALTIME' ),
+	'localhour'                 => array( '1', 'ՏԵՂԱԿԱՆ_ԺԱՄԸ', 'LOCALHOUR' ),
+	'numberofpages'             => array( '1', 'ԷՋԵՐԻ_ՔԱՆԱԿԸ', 'NUMBEROFPAGES' ),
+	'numberofarticles'          => array( '1', 'ՀՈԴՎԱԾՆԵՐԻ_ՔԱՆԱԿԸ', 'NUMBEROFARTICLES' ),
+	'numberoffiles'             => array( '1', 'ՖԱՅԼԵՐԻ_ՔԱՆԱԿԸ', 'NUMBEROFFILES' ),
+	'numberofusers'             => array( '1', 'ՄԱՍՆԱԿԻՑՆԵՐԻ_ՔԱՆԱԿԸ', 'NUMBEROFUSERS' ),
+	'pagename'                  => array( '1', 'ԷՋԻ_ԱՆՈՒՆԸ', 'PAGENAME' ),
+	'pagenamee'                 => array( '1', 'ԷՋԻ_ԱՆՈՒՆԸ_2', 'PAGENAMEE' ),
+	'namespace'                 => array( '1', 'ԱՆՎԱՆԱՏԱՐԱԾՔ', 'NAMESPACE' ),
+	'namespacee'                => array( '1', 'ԱՆՎԱՆԱՏԱՐԱԾՔ_2', 'NAMESPACEE' ),
+	'talkspace'                 => array( '1', 'ՔՆՆԱՐԿՄԱՆ_ՏԱՐԱԾՔԸ', 'TALKSPACE' ),
+	'talkspacee'                => array( '1', 'ՔՆՆԱՐԿՄԱՆ_ՏԱՐԱԾՔԸ_2', 'TALKSPACEE' ),
+	'subjectspace'              => array( '1', 'ՀՈԴՎԱԾՆԵՐԻ_ՏԱՐԱԾՔԸ', 'SUBJECTSPACE', 'ARTICLESPACE' ),
+	'subjectspacee'             => array( '1', 'ՀՈԴՎԱԾՆԵՐԻ_ՏԱՐԱԾՔԸ_2', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
+	'fullpagename'              => array( '1', 'ARTICLESPACE', 'ԷՋԻ_ԼՐԻՎ_ԱՆՎԱՆՈՒՄԸ', 'FULLPAGENAME' ),
+	'fullpagenamee'             => array( '1', 'ԷՋԻ_ԼՐԻՎ_ԱՆՎԱՆՈՒՄԸ_2', 'FULLPAGENAMEE' ),
+	'subpagename'               => array( '1', 'ԵՆԹԱԷՋԻ_ԱՆՎԱՆՈՒՄԸ', 'SUBPAGENAME' ),
+	'subpagenamee'              => array( '1', 'ԵՆԹԱԷՋԻ_ԱՆՎԱՆՈՒՄԸ_2', 'SUBPAGENAMEE' ),
+	'basepagename'              => array( '1', 'ՀԻՄՆԱԿԱՆ_ԷՋԻ_ԱՆՎԱՆՈՒՄԸ', 'BASEPAGENAME' ),
+	'basepagenamee'             => array( '1', 'ՀԻՄՆԱԿԱՆ_ԷՋԻ_ԱՆՎԱՆՈՒՄԸ_2', 'BASEPAGENAMEE' ),
+	'talkpagename'              => array( '1', 'ՔՆՆԱՐԿՄԱՆ_ԷՋԻ_ԱՆՎԱՆՈՒՄԸ', 'TALKPAGENAME' ),
+	'talkpagenamee'             => array( '1', 'ՔՆՆԱՐԿՄԱՆ_ԷՋԻ_ԱՆՎԱՆՈՒՄԸ_2', 'TALKPAGENAMEE' ),
+	'subjectpagename'           => array( '1', 'ՀՈԴՎԱԾԻ_ԷՋԻ_ԱՆՎԱՆՈՒՄԸ', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
+	'subjectpagenamee'          => array( '1', 'ՀՈԴՎԱԾԻ_ԷՋԻ_ԱՆՎԱՆՈՒՄԸ_2', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
+	'msg'                       => array( '0', 'ՀՈՂՈՐԴ՝', 'MSG:' ),
+	'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փքս', '$1px' ),
+	'img_center'                => array( '1', 'կենտրոն', 'center', 'centre' ),
+	'img_framed'                => array( '1', 'շրջափակել', 'framed', 'enframed', 'frame' ),
+	'img_page'                  => array( '1', 'Õ§Õ»Õ¨=$1', 'Õ§Õ» $1', 'page=$1', 'page $1' ),
+	'int'                       => array( '0', 'ՆԵՐՔ՝', 'INT:' ),
+	'sitename'                  => array( '1', 'ԿԱՅՔԻ_ԱՆՈՒՆԸ', 'SITENAME' ),
+	'ns'                        => array( '0', 'ԱՏ՝', 'NS:' ),
+	'localurl'                  => array( '0', 'ՏԵՂԱԿԱՆ_ՀԱՍՑԵՆ՝', 'LOCALURL:' ),
+	'localurle'                 => array( '0', 'ՏԵՂԱԿԱՆ_ՀԱՍՑԵՆ_2՝', 'LOCALURLE:' ),
+	'server'                    => array( '0', 'ՍԵՐՎԵՐԸ', 'SERVER' ),
+	'servername'                => array( '0', 'ՍԵՐՎԵՐԻ_ԱՆՈՒՆԸ', 'SERVERNAME' ),
+	'scriptpath'                => array( '0', 'ՍՔՐԻՊՏԻ_ՃԱՆԱՊԱՐՀԸ', 'SCRIPTPATH' ),
+	'grammar'                   => array( '0', 'ՀՈԼՈՎ՛', 'GRAMMAR:' ),
+	'notitleconvert'            => array( '0', '__ԱՌԱՆՑ_ՎԵՐՆԱԳՐԻ_ՓՈՓՈԽՄԱՆ__', '__NOTITLECONVERT__', '__NOTC__' ),
+	'nocontentconvert'          => array( '0', '__ԱՌԱՆՑ_ՊԱՐՈՒՆԱԿՈՒԹՅԱՆ_ՓՈՓՈԽՄԱՆ__', '__NOCONTENTCONVERT__', '__NOCC__' ),
+	'currentweek'               => array( '1', 'ԸՆԹԱՑԻՔ_ՇԱԲԱԹԸ', 'CURRENTWEEK' ),
+	'currentdow'                => array( '1', 'ԸՆԹԱՑԻՔ_ՇԱԲԱԹՎԱ_ՕՐԸ', 'CURRENTDOW' ),
+	'localweek'                 => array( '1', 'ՏԵՂԱԿԱՆ_ՇԱԲԱԹՎԸ', 'LOCALWEEK' ),
+	'localdow'                  => array( '1', 'ՏԵՂԱԿԱՆ_ՇԱԲԱԹՎԱ_ՕՐԸ', 'LOCALDOW' ),
+	'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', 'ԼՐԻՎ_ՀԱՍՑԵՆ_2՝', 'FULLURLE:' ),
+	'lcfirst'                   => array( '0', 'ՓՈՔՐԱՏԱՌ_ՍԿԶԲՆԱՏԱՌ՝', 'LCFIRST:' ),
+	'ucfirst'                   => array( '0', 'ՄԵԾԱՏԱՌ_ՍԿԶԲՆԱՏԱՌ՝', 'UCFIRST:' ),
+	'lc'                        => array( '0', 'ՓՈՔՐԱՏԱՌ՝', 'LC:' ),
+	'uc'                        => array( '0', 'ՄԵԾԱՏԱՌ՝', 'UC:' ),
+	'displaytitle'              => array( '1', 'ՑՈՒՅՑ_ՏԱԼ_ՎԵՐՆԱԳԻՐԸ', 'DISPLAYTITLE' ),
+	'rawsuffix'                 => array( '1', 'Չ', 'R' ),
+	'newsectionlink'            => array( '1', '__ՀՂՈՒՄ_ՆՈՐ_ԲԱԺՆԻ_ՎՐԱ__', '__NEWSECTIONLINK__' ),
+	'currentversion'            => array( '1', 'ԸՆԹԱՑԻՔ_ՏԱՐԲԵՐԱԿԸ', 'CURRENTVERSION' ),
+	'urlencode'                 => array( '0', 'ՄՇԱԿՎԱԾ_ՀԱՍՑԵ՛', 'URLENCODE:' ),
+	'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' ),
+	'defaultsort'               => array( '1', 'ԼՌՈՒԹՅԱՄԲ_ԴԱՍԱՎՈՐՈՒՄ՝', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:' ),
 );
 
 $specialPageAliases = array(
diff --git a/languages/messages/MessagesIa.php b/languages/messages/MessagesIa.php
index 804005eb06..738b529679 100644
--- a/languages/messages/MessagesIa.php
+++ b/languages/messages/MessagesIa.php
@@ -3023,7 +3023,7 @@ Le causa es probabilemente un ligamine verso un sito externe que es presente in
 'pageinfo-authors' => 'Numero total de autores distincte',
 'pageinfo-recent-edits' => 'Numero de modificationes recente (intra le ultime $1)',
 'pageinfo-recent-authors' => 'Numero de autores distincte recente',
-'pageinfo-restriction' => 'Protection del pagina (<code>$1</code>)',
+'pageinfo-restriction' => 'Protection del pagina (<code>{{lcfirst:$1}}</code>)',
 'pageinfo-magic-words' => '{{PLURAL:$1|Parola|Parolas}} magic ($1)',
 'pageinfo-hidden-categories' => '{{PLURAL:$1|Categoria|Categorias}} celate ($1)',
 'pageinfo-templates' => '{{PLURAL:$1|Patrono|Patronos}} transcludite ($1)',
@@ -3090,6 +3090,8 @@ Le execution de illo pote compromitter le securitate de tu systema.",
 'file-info-png-looped' => 'repetente',
 'file-info-png-repeat' => 'repetite $1 {{PLURAL:$1|vice|vices}}',
 'file-info-png-frames' => '$1 {{PLURAL:$1|photogramma|photogrammas}}',
+'file-no-thumb-animation' => "'''Note: A causa de limitationes technic, le miniaturas de iste file non essera animate.'''",
+'file-no-thumb-animation-gif' => "'''Nota: A causa de limitationes technic, le miniaturas de imagines GIF in alte resolution como iste non essera animate.'''",
 
 # Special:NewFiles
 'newimages' => 'Galeria de nove files',
diff --git a/languages/messages/MessagesId.php b/languages/messages/MessagesId.php
index 73ed0c012d..ff96cb3898 100644
--- a/languages/messages/MessagesId.php
+++ b/languages/messages/MessagesId.php
@@ -74,144 +74,144 @@ $bookstoreList = array(
 );
 
 $magicWords = array(
-	'redirect'                => array( '0', '#ALIH', '#REDIRECT' ),
-	'notoc'                   => array( '0', '__TANPADAFTARISI__', '__NIRDASI__', '__NOTOC__' ),
-	'nogallery'               => array( '0', '__TANPAGALERI__', '__NIRGAL__', '__NOGALLERY__' ),
-	'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' ),
-	'currentmonthnamegen'     => array( '1', 'NAMAJENDERBULANKINI', 'NAMJENBUKIN', 'CURRENTMONTHNAMEGEN' ),
-	'currentmonthabbrev'      => array( '1', 'NAMASINGKATBULANKINI', 'BULANINISINGKAT', 'NAMSINGBUKIN', 'CURRENTMONTHABBREV' ),
-	'currentday'              => array( '1', 'HARIKINI', 'HARKIN', 'CURRENTDAY' ),
-	'currentday2'             => array( '1', 'HARIKINI2', 'HARKIN2', 'CURRENTDAY2' ),
-	'currentdayname'          => array( '1', 'NAMAHARIKINI', 'NAMHARKIN', 'CURRENTDAYNAME' ),
-	'currentyear'             => array( '1', 'TAHUNKINI', 'TAKIN', 'CURRENTYEAR' ),
-	'currenttime'             => array( '1', 'WAKTUKINI', 'WAKIN', 'CURRENTTIME' ),
-	'currenthour'             => array( '1', 'JAMKINI', 'JAKIN', 'CURRENTHOUR' ),
-	'localmonth'              => array( '1', 'BULANLOKAL', 'BULANLOKAL2', 'BULOK', 'BULOK2', 'LOCALMONTH', 'LOCALMONTH2' ),
-	'localmonth1'             => array( '1', 'BULANLOKAL1', 'BULOK1', 'LOCALMONTH1' ),
-	'localmonthname'          => array( '1', 'NAMABULANLOKAL', 'NAMBULOK', 'LOCALMONTHNAME' ),
-	'localmonthnamegen'       => array( '1', 'NAMAJENDERBULANLOKAL', 'NAMJENBULOK', 'LOCALMONTHNAMEGEN' ),
-	'localmonthabbrev'        => array( '1', 'NAMASINGKATBULANLOKAL', 'NAMSINGBULOK', 'LOCALMONTHABBREV' ),
-	'localday'                => array( '1', 'HARILOKAL', 'HALOK', 'LOCALDAY' ),
-	'localday2'               => array( '1', 'HARILOKAL2', 'HALOK2', 'LOCALDAY2' ),
-	'localdayname'            => array( '1', 'NAMAHARILOKAL', 'NAMHALOK', 'LOCALDAYNAME' ),
-	'localyear'               => array( '1', 'TAHUNLOKAL', 'TALOK', 'LOCALYEAR' ),
-	'localtime'               => array( '1', 'WAKTULOKAL', 'WALOK', 'LOCALTIME' ),
-	'localhour'               => array( '1', 'JAMLOKAL', 'JALOK', 'LOCALHOUR' ),
-	'numberofpages'           => array( '1', 'JUMLAHHALAMAN', 'JUMMAN', 'NUMBEROFPAGES' ),
-	'numberofarticles'        => array( '1', 'JUMLAHARTIKEL', 'JUMKEL', 'NUMBEROFARTICLES' ),
-	'numberoffiles'           => array( '1', 'JUMLAHBERKAS', 'JUMKAS', 'NUMBEROFFILES' ),
-	'numberofusers'           => array( '1', 'JUMLAHPENGGUNA', 'JUMPENG', 'NUMBEROFUSERS' ),
-	'numberofactiveusers'     => array( '1', 'JUMLAHPENGGUNAAKTIF', 'JUMPENGTIF', 'NUMBEROFACTIVEUSERS' ),
-	'numberofedits'           => array( '1', 'JUMLAHSUNTINGAN', 'JUMTING', 'NUMBEROFEDITS' ),
-	'numberofviews'           => array( '1', 'JUMLAHTAMPILAN', 'JUMTAM', 'NUMBEROFVIEWS' ),
-	'pagename'                => array( '1', 'NAMAHALAMAN', 'NAMMAN', 'PAGENAME' ),
-	'pagenamee'               => array( '1', 'NAMAHALAMANE', 'NAMMANE', 'PAGENAMEE' ),
-	'namespace'               => array( '1', 'RUANGNAMA', 'RUNAM', 'NAMESPACE' ),
-	'namespacee'              => array( '1', 'RUANGNAMAE', 'RUNAME', 'NAMESPACEE' ),
-	'talkspace'               => array( '1', 'RUANGBICARA', 'RUBIR', 'TALKSPACE' ),
-	'talkspacee'              => array( '1', 'RUANGBICARAE', 'RUBIRE', 'TALKSPACEE' ),
-	'subjectspace'            => array( '1', 'RUANGUTAMA', 'RUANGARTIKEL', 'RUTAMA', 'RUTIKEL', 'SUBJECTSPACE', 'ARTICLESPACE' ),
-	'subjectspacee'           => array( '1', 'RUANGUTAMAE', 'RUANGARTIKELE', 'RUTAMAE', 'RUKELE', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
-	'fullpagename'            => array( '1', 'NAMAHALAMANLENGKAP', 'NAMALENGKAPHALAMAN', 'NAMMANKAP', 'FULLPAGENAME' ),
-	'fullpagenamee'           => array( '1', 'AMAHALAMANLENGKAPE', 'NAMALENGKAPHALAMANE', 'NAMMANKAPE', 'FULLPAGENAMEE' ),
-	'subpagename'             => array( '1', 'NAMASUBHALAMAN', 'NAMAUPAHALAMAN', 'NAMUMAN', 'SUBPAGENAME' ),
-	'subpagenamee'            => array( '1', 'NAMASUBHALAMANE', 'NAMAUPAHALAMANE', 'NAMUMANE', 'SUBPAGENAMEE' ),
-	'basepagename'            => array( '1', 'NAMAHALAMANDASAR', 'NAMADASARHALAMAN', 'NAMMANSAR', 'BASEPAGENAME' ),
-	'basepagenamee'           => array( '1', 'NAMAHALAMANDASARE', 'NAMADASARHALAMANE', 'NAMMANSARE', 'BASEPAGENAMEE' ),
-	'talkpagename'            => array( '1', 'NAMAHALAMANBICARA', 'NAMMANBIR', 'TALKPAGENAME' ),
-	'talkpagenamee'           => array( '1', 'NAMAHALAMANBICARAE', 'NAMMANBIRE', 'TALKPAGENAMEE' ),
-	'subjectpagename'         => array( '1', 'NAMAHALAMANUTAMA', 'NAMAHALAMANARTIKEL', 'NAMMANTAMA', 'NAMMANTIKEL', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
-	'subjectpagenamee'        => array( '1', 'NAMAHALAMANUTAMAE', 'NAMAHALAMANARTIKELE', 'NAMMANTAMAE', 'NAMMANTIKELE', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
-	'msg'                     => array( '0', 'PSN:', 'PESAN:', 'MSG:' ),
-	'subst'                   => array( '0', 'GNT:', 'GANTI:', 'SUBST:' ),
-	'msgnw'                   => array( '0', 'TPL:', 'MSGNW:' ),
-	'img_thumbnail'           => array( '1', 'jmpl', 'jempol', 'mini', 'miniatur', 'thumbnail', 'thumb' ),
-	'img_manualthumb'         => array( '1', 'jmpl=$1', 'jempol=$1', 'mini=$1', 'miniatur=$1', 'thumbnail=$1', 'thumb=$1' ),
-	'img_right'               => array( '1', 'ka', 'kanan', 'right' ),
-	'img_left'                => array( '1', 'ki', 'kiri', 'left' ),
-	'img_none'                => array( '1', 'nir', 'tanpa', 'none' ),
-	'img_center'              => array( '1', 'pus', 'pusat', 'center', 'centre' ),
-	'img_framed'              => array( '1', 'bing', 'bingkai', 'framed', 'enframed', 'frame' ),
-	'img_frameless'           => array( '1', 'nirbing', 'tanpabingkai', 'frameless' ),
-	'img_page'                => array( '1', 'hal=$1', 'halaman=$1', 'hal $1', 'halaman $1', 'page=$1', 'page $1' ),
-	'img_upright'             => array( '1', 'lurus', 'lurus=$1', 'lurus $1', 'tegak', 'tegak=$1', 'tegak $1', 'upright', 'upright=$1', 'upright $1' ),
-	'img_border'              => array( '1', 'tepi', 'batas', 'border' ),
-	'img_baseline'            => array( '1', 'gada', 'garis_dasar', 'baseline' ),
-	'img_sub'                 => array( '1', 'upa', 'sub' ),
-	'img_top'                 => array( '1', 'atas', 'top' ),
-	'img_text_top'            => array( '1', 'atek', 'atas-teks', 'text-top' ),
-	'img_middle'              => array( '1', 'tengah', 'middle' ),
-	'img_bottom'              => array( '1', 'bawah', 'bottom' ),
-	'img_text_bottom'         => array( '1', 'batek', 'bawah-teks', 'text-bottom' ),
-	'img_link'                => array( '1', 'pra=$1', 'pranala=$1', 'link=$1' ),
-	'img_alt'                 => array( '1', 'al=$1', 'alternatif=$1', 'alt=$1' ),
-	'sitename'                => array( '1', 'NAMASITUS', 'NAMSIT', 'SITENAME' ),
-	'ns'                      => array( '0', 'RN:', 'RUNAM:', 'NS:' ),
-	'localurl'                => array( '0', 'URLLOKAL', 'LOCALURL:' ),
-	'localurle'               => array( '0', 'URLLOKALE', 'LOCALURLE:' ),
-	'server'                  => array( '0', 'PELADEN', 'SERVER' ),
-	'servername'              => array( '0', 'NAMAPELADEN', 'NAMASERVER', 'NAMPEL', 'SERVERNAME' ),
-	'scriptpath'              => array( '0', 'LOKASISKRIP', 'SCRIPTPATH' ),
-	'grammar'                 => array( '0', 'TATABAHASA', 'TASA', 'GRAMMAR:' ),
-	'gender'                  => array( '0', 'JANTINA', 'GENDER:' ),
-	'notitleconvert'          => array( '0', '__TANPAKONVERSIJUDUL__', '__NIRKODUL__', '__NOTITLECONVERT__', '__NOTC__' ),
-	'nocontentconvert'        => array( '0', '__TANPAKONVERSIISI__', '__NIRKOSI__', '__NOCONTENTCONVERT__', '__NOCC__' ),
-	'currentweek'             => array( '1', 'MINGGUKINI', 'MIKIN', 'CURRENTWEEK' ),
-	'currentdow'              => array( '1', 'HARIDALAMMINGGU', 'HADAMI', 'CURRENTDOW' ),
-	'localweek'               => array( '1', 'MINGGULOKAL', 'MIKAL', 'LOCALWEEK' ),
-	'localdow'                => array( '1', 'HARIDALAMMINGGULOKAL', 'HADAMIKAL', 'LOCALDOW' ),
-	'revisionid'              => array( '1', 'IDREVISI', 'IREV', 'REVISIONID' ),
-	'revisionday'             => array( '1', 'HARIREVISI', 'HAREV', 'REVISIONDAY' ),
-	'revisionday2'            => array( '1', 'HARIREVISI2', 'HAREV2', 'REVISIONDAY2' ),
-	'revisionmonth'           => array( '1', 'BULANREVISI', 'BUREV', 'REVISIONMONTH' ),
-	'revisionmonth1'          => array( '1', 'BULANREVISI1', 'REVISIONMONTH1' ),
-	'revisionyear'            => array( '1', 'TAHUNREVISI', 'TAREV', 'REVISIONYEAR' ),
-	'revisiontimestamp'       => array( '1', 'STEMPELWAKTUREVISI', 'REKAMWAKTUREVISI', 'REVISIONTIMESTAMP' ),
-	'revisionuser'            => array( '1', 'PENGGUNAREVISI', 'REVISIONUSER' ),
-	'plural'                  => array( '0', 'JAMAK:', 'PLURAL:' ),
-	'fullurl'                 => array( '0', 'URLLENGKAP:', 'FULLURL:' ),
-	'fullurle'                => array( '0', 'URLLENGKAPE', 'FULLURLE:' ),
-	'lcfirst'                 => array( '0', 'AKC:', 'AWALKECIL:', 'LCFIRST:' ),
-	'ucfirst'                 => array( '0', 'ABS:', 'AWALBESAR:', 'UCFIRST:' ),
-	'lc'                      => array( '0', 'KC:', 'KECIL:', 'HURUFKECIL:', 'LC:' ),
-	'uc'                      => array( '0', 'BS:', 'BESAR:', 'HURUFBESAR:', 'UC:' ),
-	'raw'                     => array( '0', 'MENTAH:', 'RAW:' ),
-	'displaytitle'            => array( '1', 'JUDULTAMPILAN', 'JUTAM', 'DISPLAYTITLE' ),
-	'rawsuffix'               => array( '1', 'M', 'R' ),
-	'newsectionlink'          => array( '1', '__PRANALABAGIANBARU__', '__PRABABA__', '__NEWSECTIONLINK__' ),
-	'nonewsectionlink'        => array( '1', '_TANPAPRANALABAGIANBARU__', '__NIRPRABABA__', '__NONEWSECTIONLINK__' ),
-	'currentversion'          => array( '1', 'VERSIKINI', 'VERKIN', 'CURRENTVERSION' ),
-	'urlencode'               => array( '0', 'KODEURL:', 'KODU:', 'URLENCODE:' ),
-	'anchorencode'            => array( '0', 'KODEJANGKAR', 'KOJANG', 'ANCHORENCODE' ),
-	'currenttimestamp'        => array( '1', 'STEMPELWAKTUKINI', 'STEMWAKIN', 'CURRENTTIMESTAMP' ),
-	'localtimestamp'          => array( '1', 'STEMPELWAKTULOKAL', 'STEMWAKAL', 'LOCALTIMESTAMP' ),
-	'directionmark'           => array( '1', 'MARKAARAH', 'MARRAH', 'DIRECTIONMARK', 'DIRMARK' ),
-	'language'                => array( '0', '#BAHASA:', '#BHS:', '#LANGUAGE:' ),
-	'contentlanguage'         => array( '1', 'BAHASAISI', 'BHSISI', 'BASI', 'CONTENTLANGUAGE', 'CONTENTLANG' ),
-	'pagesinnamespace'        => array( '1', 'HALAMANDIRUANGNAMA:', 'HALDIRN', 'PAGESINNAMESPACE:', 'PAGESINNS:' ),
-	'numberofadmins'          => array( '1', 'JUMLAHADMIN', 'JUMLAHPENGURUS', 'JUMAD', 'JURUS', 'NUMBEROFADMINS' ),
-	'formatnum'               => array( '0', 'FORMATANGKA', 'FORANG', 'FORMATNUM' ),
-	'padleft'                 => array( '0', 'ISIKIRI', 'IKI', 'PADLEFT' ),
-	'padright'                => array( '0', 'ISIKANAN', 'IKA', 'PADRIGHT' ),
-	'special'                 => array( '0', 'istimewa', 'spesial', 'special' ),
-	'defaultsort'             => array( '1', 'URUTANBAKU:', 'UBUR:', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:' ),
-	'filepath'                => array( '0', 'LOKASIBERKAS:', 'LOBER:', 'FILEPATH:' ),
-	'tag'                     => array( '0', 'kata_kunci', 'takun', 'tag' ),
-	'hiddencat'               => array( '1', '__KATEGORITERSEMBUNYI__', '__KATSEM__', '__HIDDENCAT__' ),
-	'pagesincategory'         => array( '1', 'HALAMANDIKATEGORI', 'HALDIKAT', 'PAGESINCATEGORY', 'PAGESINCAT' ),
-	'pagesize'                => array( '1', 'BESARHALAMAN', 'BESMAN', 'PAGESIZE' ),
-	'index'                   => array( '1', '__INDEKS__', '__INDEX__' ),
-	'noindex'                 => array( '1', '__TANPAINDEKS__', '__NIRDEKS__', '__NOINDEX__' ),
-	'numberingroup'           => array( '1', 'JUMLAHDIKELOMPOK', 'JULDIPOK', 'NUMBERINGROUP', 'NUMINGROUP' ),
-	'staticredirect'          => array( '1', '__PENGALIHANSTATIK__', '__PENGALIHANSTATIS__', '__PETIK__', '__PETIS__', '__STATICREDIRECT__' ),
-	'protectionlevel'         => array( '1', 'TINGKATPERLINDUNGAN', 'TIPER', 'PROTECTIONLEVEL' ),
-	'formatdate'              => array( '0', 'formattanggal', 'formatdate', 'dateformat' ),
+	'redirect'                  => array( '0', '#ALIH', '#REDIRECT' ),
+	'notoc'                     => array( '0', '__TANPADAFTARISI__', '__NIRDASI__', '__NOTOC__' ),
+	'nogallery'                 => array( '0', '__TANPAGALERI__', '__NIRGAL__', '__NOGALLERY__' ),
+	'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' ),
+	'currentmonthnamegen'       => array( '1', 'NAMAJENDERBULANKINI', 'NAMJENBUKIN', 'CURRENTMONTHNAMEGEN' ),
+	'currentmonthabbrev'        => array( '1', 'NAMASINGKATBULANKINI', 'BULANINISINGKAT', 'NAMSINGBUKIN', 'CURRENTMONTHABBREV' ),
+	'currentday'                => array( '1', 'HARIKINI', 'HARKIN', 'CURRENTDAY' ),
+	'currentday2'               => array( '1', 'HARIKINI2', 'HARKIN2', 'CURRENTDAY2' ),
+	'currentdayname'            => array( '1', 'NAMAHARIKINI', 'NAMHARKIN', 'CURRENTDAYNAME' ),
+	'currentyear'               => array( '1', 'TAHUNKINI', 'TAKIN', 'CURRENTYEAR' ),
+	'currenttime'               => array( '1', 'WAKTUKINI', 'WAKIN', 'CURRENTTIME' ),
+	'currenthour'               => array( '1', 'JAMKINI', 'JAKIN', 'CURRENTHOUR' ),
+	'localmonth'                => array( '1', 'BULANLOKAL', 'BULANLOKAL2', 'BULOK', 'BULOK2', 'LOCALMONTH', 'LOCALMONTH2' ),
+	'localmonth1'               => array( '1', 'BULANLOKAL1', 'BULOK1', 'LOCALMONTH1' ),
+	'localmonthname'            => array( '1', 'NAMABULANLOKAL', 'NAMBULOK', 'LOCALMONTHNAME' ),
+	'localmonthnamegen'         => array( '1', 'NAMAJENDERBULANLOKAL', 'NAMJENBULOK', 'LOCALMONTHNAMEGEN' ),
+	'localmonthabbrev'          => array( '1', 'NAMASINGKATBULANLOKAL', 'NAMSINGBULOK', 'LOCALMONTHABBREV' ),
+	'localday'                  => array( '1', 'HARILOKAL', 'HALOK', 'LOCALDAY' ),
+	'localday2'                 => array( '1', 'HARILOKAL2', 'HALOK2', 'LOCALDAY2' ),
+	'localdayname'              => array( '1', 'NAMAHARILOKAL', 'NAMHALOK', 'LOCALDAYNAME' ),
+	'localyear'                 => array( '1', 'TAHUNLOKAL', 'TALOK', 'LOCALYEAR' ),
+	'localtime'                 => array( '1', 'WAKTULOKAL', 'WALOK', 'LOCALTIME' ),
+	'localhour'                 => array( '1', 'JAMLOKAL', 'JALOK', 'LOCALHOUR' ),
+	'numberofpages'             => array( '1', 'JUMLAHHALAMAN', 'JUMMAN', 'NUMBEROFPAGES' ),
+	'numberofarticles'          => array( '1', 'JUMLAHARTIKEL', 'JUMKEL', 'NUMBEROFARTICLES' ),
+	'numberoffiles'             => array( '1', 'JUMLAHBERKAS', 'JUMKAS', 'NUMBEROFFILES' ),
+	'numberofusers'             => array( '1', 'JUMLAHPENGGUNA', 'JUMPENG', 'NUMBEROFUSERS' ),
+	'numberofactiveusers'       => array( '1', 'JUMLAHPENGGUNAAKTIF', 'JUMPENGTIF', 'NUMBEROFACTIVEUSERS' ),
+	'numberofedits'             => array( '1', 'JUMLAHSUNTINGAN', 'JUMTING', 'NUMBEROFEDITS' ),
+	'numberofviews'             => array( '1', 'JUMLAHTAMPILAN', 'JUMTAM', 'NUMBEROFVIEWS' ),
+	'pagename'                  => array( '1', 'NAMAHALAMAN', 'NAMMAN', 'PAGENAME' ),
+	'pagenamee'                 => array( '1', 'NAMAHALAMANE', 'NAMMANE', 'PAGENAMEE' ),
+	'namespace'                 => array( '1', 'RUANGNAMA', 'RUNAM', 'NAMESPACE' ),
+	'namespacee'                => array( '1', 'RUANGNAMAE', 'RUNAME', 'NAMESPACEE' ),
+	'talkspace'                 => array( '1', 'RUANGBICARA', 'RUBIR', 'TALKSPACE' ),
+	'talkspacee'                => array( '1', 'RUANGBICARAE', 'RUBIRE', 'TALKSPACEE' ),
+	'subjectspace'              => array( '1', 'RUANGUTAMA', 'RUANGARTIKEL', 'RUTAMA', 'RUTIKEL', 'SUBJECTSPACE', 'ARTICLESPACE' ),
+	'subjectspacee'             => array( '1', 'RUANGUTAMAE', 'RUANGARTIKELE', 'RUTAMAE', 'RUKELE', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
+	'fullpagename'              => array( '1', 'NAMAHALAMANLENGKAP', 'NAMALENGKAPHALAMAN', 'NAMMANKAP', 'FULLPAGENAME' ),
+	'fullpagenamee'             => array( '1', 'AMAHALAMANLENGKAPE', 'NAMALENGKAPHALAMANE', 'NAMMANKAPE', 'FULLPAGENAMEE' ),
+	'subpagename'               => array( '1', 'NAMASUBHALAMAN', 'NAMAUPAHALAMAN', 'NAMUMAN', 'SUBPAGENAME' ),
+	'subpagenamee'              => array( '1', 'NAMASUBHALAMANE', 'NAMAUPAHALAMANE', 'NAMUMANE', 'SUBPAGENAMEE' ),
+	'basepagename'              => array( '1', 'NAMAHALAMANDASAR', 'NAMADASARHALAMAN', 'NAMMANSAR', 'BASEPAGENAME' ),
+	'basepagenamee'             => array( '1', 'NAMAHALAMANDASARE', 'NAMADASARHALAMANE', 'NAMMANSARE', 'BASEPAGENAMEE' ),
+	'talkpagename'              => array( '1', 'NAMAHALAMANBICARA', 'NAMMANBIR', 'TALKPAGENAME' ),
+	'talkpagenamee'             => array( '1', 'NAMAHALAMANBICARAE', 'NAMMANBIRE', 'TALKPAGENAMEE' ),
+	'subjectpagename'           => array( '1', 'NAMAHALAMANUTAMA', 'NAMAHALAMANARTIKEL', 'NAMMANTAMA', 'NAMMANTIKEL', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
+	'subjectpagenamee'          => array( '1', 'NAMAHALAMANUTAMAE', 'NAMAHALAMANARTIKELE', 'NAMMANTAMAE', 'NAMMANTIKELE', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
+	'msg'                       => array( '0', 'PSN:', 'PESAN:', 'MSG:' ),
+	'subst'                     => array( '0', 'GNT:', 'GANTI:', 'SUBST:' ),
+	'msgnw'                     => array( '0', 'TPL:', 'MSGNW:' ),
+	'img_thumbnail'             => array( '1', 'jmpl', 'jempol', 'mini', 'miniatur', 'thumbnail', 'thumb' ),
+	'img_manualthumb'           => array( '1', 'jmpl=$1', 'jempol=$1', 'mini=$1', 'miniatur=$1', 'thumbnail=$1', 'thumb=$1' ),
+	'img_right'                 => array( '1', 'ka', 'kanan', 'right' ),
+	'img_left'                  => array( '1', 'ki', 'kiri', 'left' ),
+	'img_none'                  => array( '1', 'nir', 'tanpa', 'none' ),
+	'img_center'                => array( '1', 'pus', 'pusat', 'center', 'centre' ),
+	'img_framed'                => array( '1', 'bing', 'bingkai', 'framed', 'enframed', 'frame' ),
+	'img_frameless'             => array( '1', 'nirbing', 'tanpabingkai', 'frameless' ),
+	'img_page'                  => array( '1', 'hal=$1', 'halaman=$1', 'hal $1', 'halaman $1', 'page=$1', 'page $1' ),
+	'img_upright'               => array( '1', 'lurus', 'lurus=$1', 'lurus $1', 'tegak', 'tegak=$1', 'tegak $1', 'upright', 'upright=$1', 'upright $1' ),
+	'img_border'                => array( '1', 'tepi', 'batas', 'border' ),
+	'img_baseline'              => array( '1', 'gada', 'garis_dasar', 'baseline' ),
+	'img_sub'                   => array( '1', 'upa', 'sub' ),
+	'img_top'                   => array( '1', 'atas', 'top' ),
+	'img_text_top'              => array( '1', 'atek', 'atas-teks', 'text-top' ),
+	'img_middle'                => array( '1', 'tengah', 'middle' ),
+	'img_bottom'                => array( '1', 'bawah', 'bottom' ),
+	'img_text_bottom'           => array( '1', 'batek', 'bawah-teks', 'text-bottom' ),
+	'img_link'                  => array( '1', 'pra=$1', 'pranala=$1', 'link=$1' ),
+	'img_alt'                   => array( '1', 'al=$1', 'alternatif=$1', 'alt=$1' ),
+	'sitename'                  => array( '1', 'NAMASITUS', 'NAMSIT', 'SITENAME' ),
+	'ns'                        => array( '0', 'RN:', 'RUNAM:', 'NS:' ),
+	'localurl'                  => array( '0', 'URLLOKAL', 'LOCALURL:' ),
+	'localurle'                 => array( '0', 'URLLOKALE', 'LOCALURLE:' ),
+	'server'                    => array( '0', 'PELADEN', 'SERVER' ),
+	'servername'                => array( '0', 'NAMAPELADEN', 'NAMASERVER', 'NAMPEL', 'SERVERNAME' ),
+	'scriptpath'                => array( '0', 'LOKASISKRIP', 'SCRIPTPATH' ),
+	'grammar'                   => array( '0', 'TATABAHASA', 'TASA', 'GRAMMAR:' ),
+	'gender'                    => array( '0', 'JANTINA', 'GENDER:' ),
+	'notitleconvert'            => array( '0', '__TANPAKONVERSIJUDUL__', '__NIRKODUL__', '__NOTITLECONVERT__', '__NOTC__' ),
+	'nocontentconvert'          => array( '0', '__TANPAKONVERSIISI__', '__NIRKOSI__', '__NOCONTENTCONVERT__', '__NOCC__' ),
+	'currentweek'               => array( '1', 'MINGGUKINI', 'MIKIN', 'CURRENTWEEK' ),
+	'currentdow'                => array( '1', 'HARIDALAMMINGGU', 'HADAMI', 'CURRENTDOW' ),
+	'localweek'                 => array( '1', 'MINGGULOKAL', 'MIKAL', 'LOCALWEEK' ),
+	'localdow'                  => array( '1', 'HARIDALAMMINGGULOKAL', 'HADAMIKAL', 'LOCALDOW' ),
+	'revisionid'                => array( '1', 'IDREVISI', 'IREV', 'REVISIONID' ),
+	'revisionday'               => array( '1', 'HARIREVISI', 'HAREV', 'REVISIONDAY' ),
+	'revisionday2'              => array( '1', 'HARIREVISI2', 'HAREV2', 'REVISIONDAY2' ),
+	'revisionmonth'             => array( '1', 'BULANREVISI', 'BUREV', 'REVISIONMONTH' ),
+	'revisionmonth1'            => array( '1', 'BULANREVISI1', 'REVISIONMONTH1' ),
+	'revisionyear'              => array( '1', 'TAHUNREVISI', 'TAREV', 'REVISIONYEAR' ),
+	'revisiontimestamp'         => array( '1', 'STEMPELWAKTUREVISI', 'REKAMWAKTUREVISI', 'REVISIONTIMESTAMP' ),
+	'revisionuser'              => array( '1', 'PENGGUNAREVISI', 'REVISIONUSER' ),
+	'plural'                    => array( '0', 'JAMAK:', 'PLURAL:' ),
+	'fullurl'                   => array( '0', 'URLLENGKAP:', 'FULLURL:' ),
+	'fullurle'                  => array( '0', 'URLLENGKAPE', 'FULLURLE:' ),
+	'lcfirst'                   => array( '0', 'AKC:', 'AWALKECIL:', 'LCFIRST:' ),
+	'ucfirst'                   => array( '0', 'ABS:', 'AWALBESAR:', 'UCFIRST:' ),
+	'lc'                        => array( '0', 'KC:', 'KECIL:', 'HURUFKECIL:', 'LC:' ),
+	'uc'                        => array( '0', 'BS:', 'BESAR:', 'HURUFBESAR:', 'UC:' ),
+	'raw'                       => array( '0', 'MENTAH:', 'RAW:' ),
+	'displaytitle'              => array( '1', 'JUDULTAMPILAN', 'JUTAM', 'DISPLAYTITLE' ),
+	'rawsuffix'                 => array( '1', 'M', 'R' ),
+	'newsectionlink'            => array( '1', '__PRANALABAGIANBARU__', '__PRABABA__', '__NEWSECTIONLINK__' ),
+	'nonewsectionlink'          => array( '1', '_TANPAPRANALABAGIANBARU__', '__NIRPRABABA__', '__NONEWSECTIONLINK__' ),
+	'currentversion'            => array( '1', 'VERSIKINI', 'VERKIN', 'CURRENTVERSION' ),
+	'urlencode'                 => array( '0', 'KODEURL:', 'KODU:', 'URLENCODE:' ),
+	'anchorencode'              => array( '0', 'KODEJANGKAR', 'KOJANG', 'ANCHORENCODE' ),
+	'currenttimestamp'          => array( '1', 'STEMPELWAKTUKINI', 'STEMWAKIN', 'CURRENTTIMESTAMP' ),
+	'localtimestamp'            => array( '1', 'STEMPELWAKTULOKAL', 'STEMWAKAL', 'LOCALTIMESTAMP' ),
+	'directionmark'             => array( '1', 'MARKAARAH', 'MARRAH', 'DIRECTIONMARK', 'DIRMARK' ),
+	'language'                  => array( '0', '#BAHASA:', '#BHS:', '#LANGUAGE:' ),
+	'contentlanguage'           => array( '1', 'BAHASAISI', 'BHSISI', 'BASI', 'CONTENTLANGUAGE', 'CONTENTLANG' ),
+	'pagesinnamespace'          => array( '1', 'HALAMANDIRUANGNAMA:', 'HALDIRN', 'PAGESINNAMESPACE:', 'PAGESINNS:' ),
+	'numberofadmins'            => array( '1', 'JUMLAHADMIN', 'JUMLAHPENGURUS', 'JUMAD', 'JURUS', 'NUMBEROFADMINS' ),
+	'formatnum'                 => array( '0', 'FORMATANGKA', 'FORANG', 'FORMATNUM' ),
+	'padleft'                   => array( '0', 'ISIKIRI', 'IKI', 'PADLEFT' ),
+	'padright'                  => array( '0', 'ISIKANAN', 'IKA', 'PADRIGHT' ),
+	'special'                   => array( '0', 'istimewa', 'spesial', 'special' ),
+	'defaultsort'               => array( '1', 'URUTANBAKU:', 'UBUR:', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:' ),
+	'filepath'                  => array( '0', 'LOKASIBERKAS:', 'LOBER:', 'FILEPATH:' ),
+	'tag'                       => array( '0', 'kata_kunci', 'takun', 'tag' ),
+	'hiddencat'                 => array( '1', '__KATEGORITERSEMBUNYI__', '__KATSEM__', '__HIDDENCAT__' ),
+	'pagesincategory'           => array( '1', 'HALAMANDIKATEGORI', 'HALDIKAT', 'PAGESINCATEGORY', 'PAGESINCAT' ),
+	'pagesize'                  => array( '1', 'BESARHALAMAN', 'BESMAN', 'PAGESIZE' ),
+	'index'                     => array( '1', '__INDEKS__', '__INDEX__' ),
+	'noindex'                   => array( '1', '__TANPAINDEKS__', '__NIRDEKS__', '__NOINDEX__' ),
+	'numberingroup'             => array( '1', 'JUMLAHDIKELOMPOK', 'JULDIPOK', 'NUMBERINGROUP', 'NUMINGROUP' ),
+	'staticredirect'            => array( '1', '__PENGALIHANSTATIK__', '__PENGALIHANSTATIS__', '__PETIK__', '__PETIS__', '__STATICREDIRECT__' ),
+	'protectionlevel'           => array( '1', 'TINGKATPERLINDUNGAN', 'TIPER', 'PROTECTIONLEVEL' ),
+	'formatdate'                => array( '0', 'formattanggal', 'formatdate', 'dateformat' ),
 );
 
 $specialPageAliases = array(
diff --git a/languages/messages/MessagesIg.php b/languages/messages/MessagesIg.php
index 282d871817..fcc45d6799 100644
--- a/languages/messages/MessagesIg.php
+++ b/languages/messages/MessagesIg.php
@@ -61,16 +61,16 @@ $specialPageAliases = array(
 );
 
 $magicWords = array(
-	'redirect'                => array( '0', '#KÚFÙ', '#REDIRECT' ),
-	'fullpagename'            => array( '1', 'ÁHÀNÍLÉNKÈIHÜ', 'FULLPAGENAME' ),
-	'msg'                     => array( '0', 'OZI:', 'MSG:' ),
-	'img_right'               => array( '1', 'áká_ịkẹngạ', 'right' ),
-	'img_left'                => array( '1', 'áká_èkpè', 'left' ),
-	'img_top'                 => array( '1', 'élú', 'top' ),
-	'img_middle'              => array( '1', 'ẹtítì', 'middle' ),
-	'img_text_bottom'         => array( '1', 'okpúrù-ede', 'text-bottom' ),
-	'displaytitle'            => array( '1', 'ZIÍSHÍ', 'DISPLAYTITLE' ),
-	'pagesize'                => array( '1', 'ÀSÁIHÜ', 'PAGESIZE' ),
+	'redirect'                  => array( '0', '#KÚFÙ', '#REDIRECT' ),
+	'fullpagename'              => array( '1', 'ÁHÀNÍLÉNKÈIHÜ', 'FULLPAGENAME' ),
+	'msg'                       => array( '0', 'OZI:', 'MSG:' ),
+	'img_right'                 => array( '1', 'áká_ịkẹngạ', 'right' ),
+	'img_left'                  => array( '1', 'áká_èkpè', 'left' ),
+	'img_top'                   => array( '1', 'élú', 'top' ),
+	'img_middle'                => array( '1', 'ẹtítì', 'middle' ),
+	'img_text_bottom'           => array( '1', 'okpúrù-ede', 'text-bottom' ),
+	'displaytitle'              => array( '1', 'ZIÍSHÍ', 'DISPLAYTITLE' ),
+	'pagesize'                  => array( '1', 'ÀSÁIHÜ', 'PAGESIZE' ),
 );
 
 $messages = array(
diff --git a/languages/messages/MessagesIs.php b/languages/messages/MessagesIs.php
index 8ac717aea4..60f2d71572 100644
--- a/languages/messages/MessagesIs.php
+++ b/languages/messages/MessagesIs.php
@@ -80,54 +80,54 @@ $dateFormats = array(
 );
 
 $magicWords = array(
-	'redirect'                => array( '0', '#tilvísun', '#TILVÍSUN', '#REDIRECT' ),
-	'nogallery'               => array( '0', '__EMSAFN__', '__NOGALLERY__' ),
-	'currentday'              => array( '1', 'NÚDAGUR', 'CURRENTDAY' ),
-	'currentday2'             => array( '1', 'NÚDAGUR2', 'CURRENTDAY2' ),
-	'currentdayname'          => array( '1', 'NÚDAGNAFN', 'CURRENTDAYNAME' ),
-	'currentyear'             => array( '1', 'NÚÁR', 'CURRENTYEAR' ),
-	'currenttime'             => array( '1', 'NÚTÍMI', 'CURRENTTIME' ),
-	'currenthour'             => array( '1', 'NÚKTÍMI', 'CURRENTHOUR' ),
-	'localmonth'              => array( '1', 'STMÁN', 'LOCALMONTH', 'LOCALMONTH2' ),
-	'localmonthname'          => array( '1', 'STMÁNNAFN', 'LOCALMONTHNAME' ),
-	'localmonthabbrev'        => array( '1', 'STMÁNST', 'LOCALMONTHABBREV' ),
-	'localday'                => array( '1', 'STDAGUR', 'LOCALDAY' ),
-	'localday2'               => array( '1', 'STDAGUR2', 'LOCALDAY2' ),
-	'localdayname'            => array( '1', 'STDAGNAFN', 'LOCALDAYNAME' ),
-	'localyear'               => array( '1', 'STÁR', 'LOCALYEAR' ),
-	'localtime'               => array( '1', 'STTÍMI', 'LOCALTIME' ),
-	'localhour'               => array( '1', 'STKTÍMI', 'LOCALHOUR' ),
-	'numberofpages'           => array( '1', 'FJLSÍÐA', 'NUMBEROFPAGES' ),
-	'numberofarticles'        => array( '1', 'FJLGREINA', 'NUMBEROFARTICLES' ),
-	'numberoffiles'           => array( '1', 'FJLSKJALA', 'NUMBEROFFILES' ),
-	'numberofusers'           => array( '1', 'FJLNOT', 'NUMBEROFUSERS' ),
-	'numberofedits'           => array( '1', 'FJLBREYT', 'NUMBEROFEDITS' ),
-	'pagename'                => array( '1', 'SÍÐUNAFN', 'PAGENAME' ),
-	'namespace'               => array( '1', 'NAFNSVÆÐI', 'NAMESPACE' ),
-	'talkspace'               => array( '1', 'SPJALLSVÆÐI', 'TALKSPACE' ),
-	'fullpagename'            => array( '1', 'FULLTSÍÐUNF', 'FULLPAGENAME' ),
-	'img_manualthumb'         => array( '1', 'þumall', 'thumbnail=$1', 'thumb=$1' ),
-	'img_right'               => array( '1', 'hægri', 'right' ),
-	'img_left'                => array( '1', 'vinstri', 'left' ),
-	'img_none'                => array( '1', 'engin', 'none' ),
-	'img_width'               => array( '1', '$1dp', '$1px' ),
-	'img_center'              => array( '1', 'miðja', 'center', 'centre' ),
-	'img_sub'                 => array( '1', 'undir', 'sub' ),
-	'img_super'               => array( '1', 'yfir', 'super', 'sup' ),
-	'img_top'                 => array( '1', 'efst', 'top' ),
-	'img_bottom'              => array( '1', 'neðst', 'bottom' ),
-	'img_text_bottom'         => array( '1', 'texti-neðst', 'text-bottom' ),
-	'ns'                      => array( '0', 'NR:', 'NS:' ),
-	'server'                  => array( '0', 'VEFÞJ', 'SERVER' ),
-	'servername'              => array( '0', 'VEFÞJNF', 'SERVERNAME' ),
-	'grammar'                 => array( '0', 'MÁLFRÆÐI:', 'GRAMMAR:' ),
-	'currentweek'             => array( '1', 'NÚVIKA', 'CURRENTWEEK' ),
-	'localweek'               => array( '1', 'STVIKA', 'LOCALWEEK' ),
-	'plural'                  => array( '0', 'FLTALA:', 'PLURAL:' ),
-	'raw'                     => array( '0', 'HRÁ:', 'RAW:' ),
-	'displaytitle'            => array( '1', 'SÝNATITIL', 'DISPLAYTITLE' ),
-	'language'                => array( '0', '#TUNGUMÁL', '#LANGUAGE:' ),
-	'special'                 => array( '0', 'kerfissíða', 'special' ),
+	'redirect'                  => array( '0', '#tilvísun', '#TILVÍSUN', '#REDIRECT' ),
+	'nogallery'                 => array( '0', '__EMSAFN__', '__NOGALLERY__' ),
+	'currentday'                => array( '1', 'NÚDAGUR', 'CURRENTDAY' ),
+	'currentday2'               => array( '1', 'NÚDAGUR2', 'CURRENTDAY2' ),
+	'currentdayname'            => array( '1', 'NÚDAGNAFN', 'CURRENTDAYNAME' ),
+	'currentyear'               => array( '1', 'NÚÁR', 'CURRENTYEAR' ),
+	'currenttime'               => array( '1', 'NÚTÍMI', 'CURRENTTIME' ),
+	'currenthour'               => array( '1', 'NÚKTÍMI', 'CURRENTHOUR' ),
+	'localmonth'                => array( '1', 'STMÁN', 'LOCALMONTH', 'LOCALMONTH2' ),
+	'localmonthname'            => array( '1', 'STMÁNNAFN', 'LOCALMONTHNAME' ),
+	'localmonthabbrev'          => array( '1', 'STMÁNST', 'LOCALMONTHABBREV' ),
+	'localday'                  => array( '1', 'STDAGUR', 'LOCALDAY' ),
+	'localday2'                 => array( '1', 'STDAGUR2', 'LOCALDAY2' ),
+	'localdayname'              => array( '1', 'STDAGNAFN', 'LOCALDAYNAME' ),
+	'localyear'                 => array( '1', 'STÁR', 'LOCALYEAR' ),
+	'localtime'                 => array( '1', 'STTÍMI', 'LOCALTIME' ),
+	'localhour'                 => array( '1', 'STKTÍMI', 'LOCALHOUR' ),
+	'numberofpages'             => array( '1', 'FJLSÍÐA', 'NUMBEROFPAGES' ),
+	'numberofarticles'          => array( '1', 'FJLGREINA', 'NUMBEROFARTICLES' ),
+	'numberoffiles'             => array( '1', 'FJLSKJALA', 'NUMBEROFFILES' ),
+	'numberofusers'             => array( '1', 'FJLNOT', 'NUMBEROFUSERS' ),
+	'numberofedits'             => array( '1', 'FJLBREYT', 'NUMBEROFEDITS' ),
+	'pagename'                  => array( '1', 'SÍÐUNAFN', 'PAGENAME' ),
+	'namespace'                 => array( '1', 'NAFNSVÆÐI', 'NAMESPACE' ),
+	'talkspace'                 => array( '1', 'SPJALLSVÆÐI', 'TALKSPACE' ),
+	'fullpagename'              => array( '1', 'FULLTSÍÐUNF', 'FULLPAGENAME' ),
+	'img_manualthumb'           => array( '1', 'þumall', 'thumbnail=$1', 'thumb=$1' ),
+	'img_right'                 => array( '1', 'hægri', 'right' ),
+	'img_left'                  => array( '1', 'vinstri', 'left' ),
+	'img_none'                  => array( '1', 'engin', 'none' ),
+	'img_width'                 => array( '1', '$1dp', '$1px' ),
+	'img_center'                => array( '1', 'miðja', 'center', 'centre' ),
+	'img_sub'                   => array( '1', 'undir', 'sub' ),
+	'img_super'                 => array( '1', 'yfir', 'super', 'sup' ),
+	'img_top'                   => array( '1', 'efst', 'top' ),
+	'img_bottom'                => array( '1', 'neðst', 'bottom' ),
+	'img_text_bottom'           => array( '1', 'texti-neðst', 'text-bottom' ),
+	'ns'                        => array( '0', 'NR:', 'NS:' ),
+	'server'                    => array( '0', 'VEFÞJ', 'SERVER' ),
+	'servername'                => array( '0', 'VEFÞJNF', 'SERVERNAME' ),
+	'grammar'                   => array( '0', 'MÁLFRÆÐI:', 'GRAMMAR:' ),
+	'currentweek'               => array( '1', 'NÚVIKA', 'CURRENTWEEK' ),
+	'localweek'                 => array( '1', 'STVIKA', 'LOCALWEEK' ),
+	'plural'                    => array( '0', 'FLTALA:', 'PLURAL:' ),
+	'raw'                       => array( '0', 'HRÁ:', 'RAW:' ),
+	'displaytitle'              => array( '1', 'SÝNATITIL', 'DISPLAYTITLE' ),
+	'language'                  => array( '0', '#TUNGUMÁL', '#LANGUAGE:' ),
+	'special'                   => array( '0', 'kerfissíða', 'special' ),
 );
 
 $specialPageAliases = array(
@@ -148,7 +148,7 @@ $specialPageAliases = array(
 	'Contributions'             => array( 'Framlög' ),
 	'CreateAccount'             => array( 'Búa_til_aðgang' ),
 	'Deadendpages'              => array( 'Botnlangar' ),
-	'DeletedContributions'      => array( 'Edd_framlög' ),
+	'DeletedContributions'      => array( 'Eydd_framlög' ),
 	'Disambiguations'           => array( 'Tenglar_í_aðgreiningarsíður' ),
 	'DoubleRedirects'           => array( 'Tvöfaldar_tilvísanir' ),
 	'EditWatchlist'             => array( 'Breyta_vaktlista' ),
@@ -200,6 +200,7 @@ $specialPageAliases = array(
 	'Shortpages'                => array( 'Stuttar_síður' ),
 	'Specialpages'              => array( 'Kerfissíður' ),
 	'Statistics'                => array( 'Tölfræði' ),
+	'Tags'                      => array( 'Tög' ),
 	'Unblock'                   => array( 'Afbönnun' ),
 	'Uncategorizedcategories'   => array( 'Óflokkaðir_flokkar' ),
 	'Uncategorizedimages'       => array( 'Óflokkaðar_myndir' ),
@@ -217,6 +218,7 @@ $specialPageAliases = array(
 	'Userrights'                => array( 'Notandaréttindi' ),
 	'Version'                   => array( 'Útgáfa' ),
 	'Wantedcategories'          => array( 'Eftirsóttir_flokkar' ),
+	'Wantedfiles'               => array( 'Eftirsóttar_skrár' ),
 	'Wantedpages'               => array( 'Eftirsóttar_síður' ),
 	'Wantedtemplates'           => array( 'Eftirsótt_snið' ),
 	'Watchlist'                 => array( 'Vaktlistinn' ),
@@ -2174,41 +2176,48 @@ Frekari breytingar á henni eða spallsíðu hennar munu verða sýndar þar, og
 'enotif_newpagetext' => 'Þetta er ný síða.',
 'enotif_impersonal_salutation' => '{{SITENAME}}notandi',
 'changed' => 'breytt',
-'created' => 'búið til',
+'created' => 'búin til',
 'enotif_subject' => '$PAGETITLE á {{SITENAME}} hefur verið $CHANGEDORCREATED af $PAGEEDITOR',
-'enotif_lastvisited' => 'Sjá $1 fyrir allar breytingar síðan þú sóttir síðuna síðast.',
-'enotif_lastdiff' => 'Sjá $1 til að skoða þessa breytingu.',
+'enotif_lastvisited' => 'Heimsóttu eftirfarandi tengil til að sjá allar breytingar síðan 
+þú heimsóttir síðuna síðast:
+  $1',
+'enotif_lastdiff' => 'Einnig getur þú heimsótt eftirfarandi tengil til að skoða þessa breytingu:
+  $1',
 'enotif_anon_editor' => 'ónefndur notandi $1',
 'enotif_body' => 'Kæri $WATCHINGUSERNAME,
 
+Það lítur út fyrir að þú hafir ný skilaboð á {{SITENAME}} $PAGETITLE.
+Hún hefur verið $CHANGEDORCREATED $PAGEEDITDATE af 
+$PAGEEDITOR. Breytingarágripið var:
 
-Síðan $PAGETITLE á {{SITENAME}} hefur verið $CHANGEDORCREATED þann $PAGEEDITDATE eftir $PAGEEDITOR, sjá $PAGETITLE_URL fyrir núverandi útgáfu.
+   $PAGESUMMARY
+
+Þetta er tengill á spjallsíðuna þína:
+
+   $PAGETITLE_URL
 
 $NEWPAGE
 
-Breytingarágrip notandans: $PAGESUMMARY $PAGEMINOREDIT
+Til þess að hafa samband við $PAGEEDITOR, heimsóttu:
 
-Samskipta upplýsingar notandans:
-netfang: $PAGEEDITOR_EMAIL
-wiki: $PAGEEDITOR_WIKI
+   $PAGEEDITOR_WIKI
 
-Engar frekari tilkynningar verða sendar nema þú heimsækir síðuna.
-Þú getur einnig endursett tilkynninga merkingar fyrir allar síður á vaktlistanum.
+Athugaðu að frekari breytingar á $PAGETITLE leiða
+ekki af sér fleiri tilkynningar fyrr en þú hefur heimsótt síðuna.
 
-			 Vingjarnlega {{SITENAME}} tilkynningar kerfið
+Kveðja,
+{{SITENAME}}
 
 --
-Til þess að breyta tilkynningum sem sendast á netfangið, smelltu á
+
+Til þess að breyta stillingum um hvenær þú færð sendar tilkynningar, heimsóttu:
+
 {{canonicalurl:{{#special:Preferences}}}}
 
-Til þess að breyta stillingum vaktlistans, smelltu á
-{{canonicalurl:{{#special:EditWatchlist}}}}
 
-Til þess að eyða síðunni af vaktlistanum, smelltu á
-$UNWATCHURL
+Til þess að hætta að fylgjast með $PAGETITLE, heimsóttu:
 
-Svörun og frekari aðstoð:
-{{canonicalurl:{{MediaWiki:Helppage}}}}',
+$UNWATCHURL',
 
 # Delete
 'deletepage' => 'Eyða',
diff --git a/languages/messages/MessagesIt.php b/languages/messages/MessagesIt.php
index ea44663da7..2986d89797 100644
--- a/languages/messages/MessagesIt.php
+++ b/languages/messages/MessagesIt.php
@@ -127,7 +127,7 @@ $specialPageAliases = array(
 	'DeletedContributions'      => array( 'ContributiCancellati' ),
 	'Disambiguations'           => array( 'Disambigua' ),
 	'DoubleRedirects'           => array( 'RedirectDoppi' ),
-	'EditWatchlist'             => array( 'ModificaListaSeguiti' ),
+	'EditWatchlist'             => array( 'ModificaOsservati', 'ModificaOsservatiSpeciali', 'ModificaListaSeguiti' ),
 	'Emailuser'                 => array( 'InviaEMail' ),
 	'Export'                    => array( 'Esporta' ),
 	'Fewestrevisions'           => array( 'PagineConMenoRevisioni' ),
@@ -205,59 +205,63 @@ $specialPageAliases = array(
 );
 
 $magicWords = array(
-	'redirect'                => array( '0', '#RINVIA', '#RINVIO', '#RIMANDO', '#REDIRECT' ),
-	'currentmonth'            => array( '1', 'MESECORRENTE', 'CURRENTMONTH', 'CURRENTMONTH2' ),
-	'currentmonthname'        => array( '1', 'NOMEMESECORRENTE', 'CURRENTMONTHNAME' ),
-	'currentmonthnamegen'     => array( '1', 'NOMEMESECORRENTEGEN', 'CURRENTMONTHNAMEGEN' ),
-	'currentmonthabbrev'      => array( '1', 'MESECORRENTEABBREV', 'CURRENTMONTHABBREV' ),
-	'currentday'              => array( '1', 'GIORNOCORRENTE', 'CURRENTDAY' ),
-	'currentday2'             => array( '1', 'GIORNOCORRENTE2', 'CURRENTDAY2' ),
-	'currentdayname'          => array( '1', 'NOMEGIORNOCORRENTE', 'CURRENTDAYNAME' ),
-	'currentyear'             => array( '1', 'ANNOCORRENTE', 'CURRENTYEAR' ),
-	'currenttime'             => array( '1', 'ORARIOATTUALE', 'CURRENTTIME' ),
-	'currenthour'             => array( '1', 'ORACORRENTE', 'CURRENTHOUR' ),
-	'localmonth'              => array( '1', 'MESELOCALE', 'LOCALMONTH', 'LOCALMONTH2' ),
-	'localmonthname'          => array( '1', 'NOMEMESELOCALE', 'LOCALMONTHNAME' ),
-	'localmonthnamegen'       => array( '1', 'NOMEMESELOCALEGEN', 'LOCALMONTHNAMEGEN' ),
-	'localmonthabbrev'        => array( '1', 'MESELOCALEABBREV', 'LOCALMONTHABBREV' ),
-	'localday'                => array( '1', 'GIORNOLOCALE', 'LOCALDAY' ),
-	'localday2'               => array( '1', 'GIORNOLOCALE2', 'LOCALDAY2' ),
-	'localdayname'            => array( '1', 'NOMEGIORNOLOCALE', 'LOCALDAYNAME' ),
-	'localyear'               => array( '1', 'ANNOLOCALE', 'LOCALYEAR' ),
-	'localtime'               => array( '1', 'ORARIOLOCALE', 'LOCALTIME' ),
-	'localhour'               => array( '1', 'ORALOCALE', 'LOCALHOUR' ),
-	'numberofpages'           => array( '1', 'NUMEROPAGINE', 'NUMBEROFPAGES' ),
-	'numberofarticles'        => array( '1', 'NUMEROARTICOLI', 'NUMBEROFARTICLES' ),
-	'numberoffiles'           => array( '1', 'NUMEROFILE', 'NUMBEROFFILES' ),
-	'numberofusers'           => array( '1', 'NUMEROUTENTI', 'NUMBEROFUSERS' ),
-	'numberofactiveusers'     => array( '1', 'NUMEROUTENTIATTIVI', 'NUMBEROFACTIVEUSERS' ),
-	'numberofedits'           => array( '1', 'NUMEROEDIT', 'NUMBEROFEDITS' ),
-	'numberofviews'           => array( '1', 'NUMEROVISITE', 'NUMBEROFVIEWS' ),
-	'pagename'                => array( '1', 'TITOLOPAGINA', 'PAGENAME' ),
-	'pagenamee'               => array( '1', 'TITOLOPAGINAE', 'PAGENAMEE' ),
-	'subpagename'             => array( '1', 'NOMESOTTOPAGINA', 'SUBPAGENAME' ),
-	'subpagenamee'            => array( '1', 'NOMESOTTOPAGINAE', 'SUBPAGENAMEE' ),
-	'subst'                   => array( '0', 'SOST:', 'SUBST:' ),
-	'img_right'               => array( '1', 'destra', 'right' ),
-	'img_left'                => array( '1', 'sinistra', 'left' ),
-	'img_none'                => array( '1', 'nessuno', 'none' ),
-	'img_center'              => array( '1', 'centro', 'center', 'centre' ),
-	'img_page'                => array( '1', 'pagina=$1', 'pagina $1', 'page=$1', 'page $1' ),
-	'img_border'              => array( '1', 'bordo', 'border' ),
-	'sitename'                => array( '1', 'NOMESITO', 'SITENAME' ),
-	'servername'              => array( '0', 'NOMESERVER', 'SERVERNAME' ),
-	'gender'                  => array( '0', 'GENERE:', 'GENDER:' ),
-	'currentweek'             => array( '1', 'SETTIMANACORRENTE', 'CURRENTWEEK' ),
-	'localweek'               => array( '1', 'SETTIMANALOCALE', 'LOCALWEEK' ),
-	'plural'                  => array( '0', 'PLURALE:', 'PLURAL:' ),
-	'language'                => array( '0', '#LINGUA', '#LANGUAGE:' ),
-	'numberofadmins'          => array( '1', 'NUMEROADMIN', 'NUMBEROFADMINS' ),
-	'special'                 => array( '0', 'speciale', 'special' ),
-	'pagesincategory'         => array( '1', 'PAGINEINCAT', 'PAGESINCATEGORY', 'PAGESINCAT' ),
-	'pagesize'                => array( '1', 'DIMENSIONEPAGINA', 'PESOPAGINA', 'PAGESIZE' ),
-	'index'                   => array( '1', '__INDICE__', '__INDEX__' ),
-	'noindex'                 => array( '1', '__NOINDICE__', '__NOINDEX__' ),
-	'protectionlevel'         => array( '1', 'LIVELLOPROTEZIONE', 'PROTECTIONLEVEL' ),
+	'redirect'                  => array( '0', '#RINVIA', '#RINVIO', '#RIMANDO', '#REDIRECT' ),
+	'currentmonth'              => array( '1', 'MESEATTUALE', 'MESECORRENTE', 'CURRENTMONTH', 'CURRENTMONTH2' ),
+	'currentmonthname'          => array( '1', 'NOMEMESEATTUALE', 'NOMEMESECORRENTE', 'CURRENTMONTHNAME' ),
+	'currentmonthnamegen'       => array( '1', 'NOMEMESEATTUALEGEN', 'NOMEMESECORRENTEGEN', 'CURRENTMONTHNAMEGEN' ),
+	'currentmonthabbrev'        => array( '1', 'MESEATTUALEABBREV', 'MESECORRENTEABBREV', 'CURRENTMONTHABBREV' ),
+	'currentday'                => array( '1', 'GIORNOATTUALE', 'GIORNOCORRENTE', 'CURRENTDAY' ),
+	'currentday2'               => array( '1', 'GIORNOATTUALE2', 'GIORNOCORRENTE2', 'CURRENTDAY2' ),
+	'currentdayname'            => array( '1', 'NOMEGIORNOATTUALE', 'NOMEGIORNOCORRENTE', 'CURRENTDAYNAME' ),
+	'currentyear'               => array( '1', 'ANNOATTUALE', 'ANNOCORRENTE', 'CURRENTYEAR' ),
+	'currenttime'               => array( '1', 'ORARIOATTUALE', 'CURRENTTIME' ),
+	'currenthour'               => array( '1', 'ORAATTUALE', 'ORACORRENTE', 'CURRENTHOUR' ),
+	'localmonth'                => array( '1', 'MESELOCALE', 'MESELOCALE2', 'LOCALMONTH', 'LOCALMONTH2' ),
+	'localmonth1'               => array( '1', 'MESELOCALE1', 'LOCALMONTH1' ),
+	'localmonthname'            => array( '1', 'NOMEMESELOCALE', 'LOCALMONTHNAME' ),
+	'localmonthnamegen'         => array( '1', 'NOMEMESELOCALEGEN', 'LOCALMONTHNAMEGEN' ),
+	'localmonthabbrev'          => array( '1', 'MESELOCALEABBREV', 'LOCALMONTHABBREV' ),
+	'localday'                  => array( '1', 'GIORNOLOCALE', 'LOCALDAY' ),
+	'localday2'                 => array( '1', 'GIORNOLOCALE2', 'LOCALDAY2' ),
+	'localdayname'              => array( '1', 'NOMEGIORNOLOCALE', 'LOCALDAYNAME' ),
+	'localyear'                 => array( '1', 'ANNOLOCALE', 'LOCALYEAR' ),
+	'localtime'                 => array( '1', 'ORARIOLOCALE', 'LOCALTIME' ),
+	'localhour'                 => array( '1', 'ORALOCALE', 'LOCALHOUR' ),
+	'numberofpages'             => array( '1', 'NUMEROPAGINE', 'NUMBEROFPAGES' ),
+	'numberofarticles'          => array( '1', 'NUMEROVOCI', 'NUMEROARTICOLI', 'NUMBEROFARTICLES' ),
+	'numberoffiles'             => array( '1', 'NUMEROFILE', 'NUMBEROFFILES' ),
+	'numberofusers'             => array( '1', 'NUMEROUTENTI', 'NUMBEROFUSERS' ),
+	'numberofactiveusers'       => array( '1', 'NUMEROUTENTIATTIVI', 'NUMBEROFACTIVEUSERS' ),
+	'numberofedits'             => array( '1', 'NUMEROMODIFICHE', 'NUMEROEDIT', 'NUMBEROFEDITS' ),
+	'numberofviews'             => array( '1', 'NUMEROVISITE', 'NUMBEROFVIEWS' ),
+	'pagename'                  => array( '1', 'TITOLOPAGINA', 'PAGENAME' ),
+	'pagenamee'                 => array( '1', 'TITOLOPAGINAE', 'PAGENAMEE' ),
+	'subpagename'               => array( '1', 'NOMESOTTOPAGINA', 'SUBPAGENAME' ),
+	'subpagenamee'              => array( '1', 'NOMESOTTOPAGINAE', 'SUBPAGENAMEE' ),
+	'subst'                     => array( '0', 'SOST:', 'SUBST:' ),
+	'img_thumbnail'             => array( '1', 'miniatura', 'min', 'thumbnail', 'thumb' ),
+	'img_manualthumb'           => array( '1', 'miniatura=$1', 'min=$1', 'thumbnail=$1', 'thumb=$1' ),
+	'img_right'                 => array( '1', 'destra', 'right' ),
+	'img_left'                  => array( '1', 'sinistra', 'left' ),
+	'img_none'                  => array( '1', 'nessuno', 'none' ),
+	'img_center'                => array( '1', 'centro', 'center', 'centre' ),
+	'img_page'                  => array( '1', 'pagina=$1', 'pagina_$1', 'page=$1', 'page $1' ),
+	'img_border'                => array( '1', 'bordo', 'border' ),
+	'sitename'                  => array( '1', 'NOMESITO', 'SITENAME' ),
+	'servername'                => array( '0', 'NOMESERVER', 'SERVERNAME' ),
+	'gender'                    => array( '0', 'GENERE:', 'GENDER:' ),
+	'currentweek'               => array( '1', 'SETTIMANACORRENTE', 'CURRENTWEEK' ),
+	'localweek'                 => array( '1', 'SETTIMANALOCALE', 'LOCALWEEK' ),
+	'plural'                    => array( '0', 'PLURALE:', 'PLURAL:' ),
+	'language'                  => array( '0', '#LINGUA', '#LANGUAGE:' ),
+	'numberofadmins'            => array( '1', 'NUMEROADMIN', 'NUMBEROFADMINS' ),
+	'special'                   => array( '0', 'speciale', 'special' ),
+	'tag'                       => array( '0', 'etichetta', 'tag' ),
+	'pagesincategory'           => array( '1', 'PAGINEINCAT', 'PAGESINCATEGORY', 'PAGESINCAT' ),
+	'pagesize'                  => array( '1', 'DIMENSIONEPAGINA', 'PESOPAGINA', 'PAGESIZE' ),
+	'index'                     => array( '1', '__INDICE__', '__INDEX__' ),
+	'noindex'                   => array( '1', '__NOINDICE__', '__NOINDEX__' ),
+	'protectionlevel'           => array( '1', 'LIVELLOPROTEZIONE', 'PROTECTIONLEVEL' ),
 );
 
 $linkTrail = '/^([a-zàéèíîìóòúù]+)(.*)$/sDu';
@@ -688,7 +692,7 @@ L'account è stato creato correttamente. Non dimenticare di personalizzare le [[
 'userlogin' => 'Entra / registrati',
 'userloginnocreate' => 'Entra',
 'logout' => 'Esci',
-'userlogout' => 'Esci',
+'userlogout' => 'esci',
 'notloggedin' => 'Accesso non effettuato',
 'nologin' => "Non hai ancora un accesso? '''$1'''.",
 'nologinlink' => 'Registrati',
@@ -923,7 +927,7 @@ I dettagli possono essere trovati nel [{{fullurl:{{#Special:Log}}/delete|page={{
 L'ultimo elemento del registro dei blocchi è riportato di seguito per informazione:",
 'clearyourcache' => "'''Nota:''' dopo aver salvato, potrebbe essere necessario pulire la cache del proprio browser per vedere i cambiamenti. 
 *'''Firefox / Safari''': tenere premuto il tasto delle maiuscole e fare clic su ''Ricarica'', oppure premere ''Ctrl-F5'' o ''Ctrl-R'' (''⌘-R'' su Mac)
-*'''Google Chrome''': premere ''Ctrl-Shift-R'' (''⌘-Shift-R'' su un Mac)
+*'''Google Chrome''': fare clic su ''Ricarica'', oppure premere ''Ctrl-R'' o ''Ctrl-Shift-R'' (''⌘-Shift-R'' su un Mac)
 *'''Internet Explorer''': tenere premuto il tasto ''Ctrl'' mentre si fa clic su ''Refresh'', oppure premere ''Ctrl-F5''
 *'''Opera''': svuotare completamente la cache dal menu ''Strumenti → Preferenze''",
 'usercssyoucanpreview' => "'''Suggerimento:''' usa il pulsante 'Visualizza anteprima' per provare il tuo nuovo CSS prima di salvarlo.",
@@ -2022,7 +2026,7 @@ I redirect <del>cancellati</del> sono stati corretti.',
 'lonelypages' => 'Pagine orfane',
 'lonelypagestext' => 'Le pagine indicate di seguito sono prive di collegamenti provenienti da altre pagine di {{SITENAME}} e non sono incluse in nessuna pagina del sito.',
 'uncategorizedpages' => 'Pagine prive di categorie',
-'uncategorizedcategories' => 'Categorie non categorizzate',
+'uncategorizedcategories' => 'Categorie prive di categorie',
 'uncategorizedimages' => 'File privi di categorie',
 'uncategorizedtemplates' => 'Template privi di categorie',
 'unusedcategories' => 'Categorie vuote',
@@ -2152,7 +2156,7 @@ Protocolli supportati: <code>$1</code> (non aggiungere nessuno di questi nella t
 'listusers-blocked' => '(bloccato)',
 
 # Special:ActiveUsers
-'activeusers' => 'Lista degli utenti attivi',
+'activeusers' => 'Elenco degli utenti attivi',
 'activeusers-intro' => 'Questo è un elenco di utenti che hanno avuto qualche tipo di attività da $1 {{PLURAL:$1|giorno|giorni}} a questa parte.',
 'activeusers-count' => "$1 {{PLURAL:$1|modifica|modifiche}} {{PLURAL:$3|nell'ultimo giorno|negli ultimi $3 giorni}}",
 'activeusers-from' => 'Mostra gli utenti a partire da:',
@@ -3013,7 +3017,7 @@ Tutte le operazioni di importazione trans-wiki sono registrate nel [[Special:Log
 'pageinfo-authors' => 'Numero totale di autori diversi',
 'pageinfo-recent-edits' => 'Numero di modifiche recenti (negli ultimi $1)',
 'pageinfo-recent-authors' => 'Numero di autori diversi recenti',
-'pageinfo-restriction' => 'Protezione della pagina (<code>$1</code>)',
+'pageinfo-restriction' => 'Protezione della pagina (<code>{{lcfirst:$1}}</code>)',
 'pageinfo-magic-words' => '{{PLURAL:$1|Parola magica|Parole magiche}} ($1)',
 'pageinfo-hidden-categories' => '{{PLURAL:$1|Categoria nascosta|Categorie nascoste}} ($1)',
 'pageinfo-templates' => 'Template {{PLURAL:$1|incluso|inclusi}}  ($1)',
@@ -3644,7 +3648,7 @@ Per favore, conferma che desideri veramente ricreare questa pagina.",
 'size-bytes' => '$1 byte',
 
 # Live preview
-'livepreview-loading' => 'Caricamento in corso…',
+'livepreview-loading' => 'Caricamento in corso...',
 'livepreview-ready' => 'Caricamento in corso… Pronto.',
 'livepreview-failed' => "Errore nella funzione Live preview.
 Usare l'anteprima standard.",
diff --git a/languages/messages/MessagesJa.php b/languages/messages/MessagesJa.php
index 8dd8c40c3d..80f537687e 100644
--- a/languages/messages/MessagesJa.php
+++ b/languages/messages/MessagesJa.php
@@ -119,7 +119,7 @@ $specialPageAliases = array(
 	'Blankpage'                 => array( '白紙ページ' ),
 	'Block'                     => array( '投稿ブロック', 'ブロック' ),
 	'Blockme'                   => array( '自己ブロック' ),
-	'Booksources'               => array( '文献資料' ),
+	'Booksources'               => array( '文献資料', '書籍情報源' ),
 	'BrokenRedirects'           => array( '迷子のリダイレクト', '壊れたリダイレクト' ),
 	'Categories'                => array( 'カテゴリ', 'カテゴリ一覧' ),
 	'ChangeEmail'               => array( 'メールアドレスの変更' ),
@@ -212,154 +212,154 @@ $specialPageAliases = 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__' ),
-	'noheader'                => array( '0', '__見出し非表示__', '＿＿見出し非表示＿＿', '__NOHEADER__' ),
-	'currentmonth'            => array( '1', '現在の月', '協定月', 'CURRENTMONTH', 'CURRENTMONTH2' ),
-	'currentmonth1'           => array( '1', '現在の月1', '協定月1', '協定月１', 'CURRENTMONTH1' ),
-	'currentmonthname'        => array( '1', '現在の月名', '協定月名', 'CURRENTMONTHNAME' ),
-	'currentmonthnamegen'     => array( '1', '現在の月属格', 'CURRENTMONTHNAMEGEN' ),
-	'currentmonthabbrev'      => array( '1', '現在の月省略形', '省略協定月', '協定月省略', '協定月省略形', 'CURRENTMONTHABBREV' ),
-	'currentday'              => array( '1', '現在の日', '協定日', 'CURRENTDAY' ),
-	'currentday2'             => array( '1', '現在の日2', '協定日2', '協定日２', 'CURRENTDAY2' ),
-	'currentdayname'          => array( '1', '現在の曜日名', '協定曜日', 'CURRENTDAYNAME' ),
-	'currentyear'             => array( '1', '現在の年', '協定年', 'CURRENTYEAR' ),
-	'currenttime'             => array( '1', '現在の時刻', '協定時間', '協定時刻', 'CURRENTTIME' ),
-	'currenthour'             => array( '1', '現在の時', '協定時', 'CURRENTHOUR' ),
-	'localmonth'              => array( '1', '地方時の月', '現地月', 'LOCALMONTH', 'LOCALMONTH2' ),
-	'localmonth1'             => array( '1', '地方時の月1', '現地月1', '現地月１', 'LOCALMONTH1' ),
-	'localmonthname'          => array( '1', '地方時の月名1', '現地月名', 'LOCALMONTHNAME' ),
-	'localmonthnamegen'       => array( '1', '地方時の月属格', 'LOCALMONTHNAMEGEN' ),
-	'localmonthabbrev'        => array( '1', '地方時の月省略形', '省略現地月', 'LOCALMONTHABBREV' ),
-	'localday'                => array( '1', '地方時の日', '現地日', 'ローカルデイ', 'LOCALDAY' ),
-	'localday2'               => array( '1', '地方時の日2', '現地日2', '現地日２', 'LOCALDAY2' ),
-	'localdayname'            => array( '1', '地方時の曜日名', '現地曜日', 'ローカルデイネーム', 'LOCALDAYNAME' ),
-	'localyear'               => array( '1', '地方時の年', '現地年', 'ローカルイヤー', 'LOCALYEAR' ),
-	'localtime'               => array( '1', '地方時の時刻', '現地時間', 'ローカルタイム', 'LOCALTIME' ),
-	'localhour'               => array( '1', '地方時の時', '現地時', 'LOCALHOUR' ),
-	'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', 'ページ名E', 'ページ名Ｅ', 'PAGENAMEE' ),
-	'namespace'               => array( '1', '名前空間', 'NAMESPACE' ),
-	'namespacee'              => array( '1', '名前空間E', '名前空間Ｅ', 'NAMESPACEE' ),
-	'talkspace'               => array( '1', 'トーク空間', 'ノート空間', '会話空間', 'トークスペース', 'TALKSPACE' ),
-	'talkspacee'              => array( '1', 'トーク空間E', 'トーク空間Ｅ', 'ノート空間E', '会話空間E', 'ノート空間Ｅ', '会話空間Ｅ', 'トークスペースE', 'トークスペースＥ', 'TALKSPACEE' ),
-	'subjectspace'            => array( '1', '主空間', '標準空間', '記事空間', 'SUBJECTSPACE', 'ARTICLESPACE' ),
-	'subjectspacee'           => array( '1', '主空間E', '標準空間E', '標準空間Ｅ', '記事空間E', '記事空間Ｅ', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
-	'fullpagename'            => array( '1', '完全なページ名', 'フルページ名', '完全な記事名', '完全記事名', 'FULLPAGENAME' ),
-	'fullpagenamee'           => array( '1', '完全なページ名E', 'フルページ名E', 'フルページ名Ｅ', '完全なページ名Ｅ', 'FULLPAGENAMEE' ),
-	'subpagename'             => array( '1', 'サブページ名', 'SUBPAGENAME' ),
-	'subpagenamee'            => array( '1', 'サブページ名E', 'サブページ名Ｅ', 'SUBPAGENAMEE' ),
-	'basepagename'            => array( '1', '親ページ名', 'BASEPAGENAME' ),
-	'basepagenamee'           => array( '1', '親ページ名E', '親ページ名Ｅ', 'BASEPAGENAMEE' ),
-	'talkpagename'            => array( '1', 'トークページ名', '会話ページ名', 'TALKPAGENAME' ),
-	'talkpagenamee'           => array( '1', 'トークページ名E', '会話ページ名E', '会話ページ名Ｅ', 'トークページ名Ｅ', 'TALKPAGENAMEE' ),
-	'subjectpagename'         => array( '1', '主ページ名', '記事ページ名', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
-	'subjectpagenamee'        => array( '1', '主ページ名E', '記事ページ名E', '主ページ名Ｅ', '記事ページ名Ｅ', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
-	'msg'                     => array( '0', 'メッセージ:', 'MSG:' ),
-	'subst'                   => array( '0', '展開:', '展開：', 'SUBST:' ),
-	'safesubst'               => array( '0', '安全展開:', 'SAFESUBST:' ),
-	'msgnw'                   => array( '0', 'ウィキ無効メッセージ:', 'MSGNW:' ),
-	'img_thumbnail'           => array( '1', 'サムネイル', 'thumbnail', 'thumb' ),
-	'img_manualthumb'         => array( '1', '代替画像=$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ピクセル', '$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_upright'             => array( '1', '右上', 'upright', 'upright=$1', 'upright $1' ),
-	'img_border'              => array( '1', '境界', 'ボーダー', 'border' ),
-	'img_baseline'            => array( '1', '下線', 'ベースライン', 'baseline' ),
-	'img_sub'                 => array( '1', '下付き', 'sub' ),
-	'img_super'               => array( '1', '上付き', 'super', 'sup' ),
-	'img_top'                 => array( '1', '上端', 'top' ),
-	'img_text_top'            => array( '1', '文上端', 'text-top' ),
-	'img_middle'              => array( '1', '中心', 'middle' ),
-	'img_bottom'              => array( '1', '下端', 'bottom' ),
-	'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:' ),
-	'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' ),
-	'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__' ),
-	'currentweek'             => array( '1', '現在の週', 'CURRENTWEEK' ),
-	'currentdow'              => array( '1', '現在の曜日番号', 'CURRENTDOW' ),
-	'localweek'               => array( '1', '地方時の週', '現地週', 'ローカルウィーク', 'LOCALWEEK' ),
-	'localdow'                => array( '1', '地方時の曜日番号', 'LOCALDOW' ),
-	'revisionid'              => array( '1', '版のID', 'リビジョンID', '差分ID', 'リビジョンＩＤ', '差分ＩＤ', 'REVISIONID' ),
-	'revisionday'             => array( '1', '版の日', 'リビジョン日', '差分日', 'REVISIONDAY' ),
-	'revisionday2'            => array( '1', '版の日2', 'リビジョン日2', '差分日2', 'リビジョン日２', '差分日２', 'REVISIONDAY2' ),
-	'revisionmonth'           => array( '1', '版の月', 'リビジョン月', '差分月', 'REVISIONMONTH' ),
-	'revisionmonth1'          => array( '1', '版の月1', 'REVISIONMONTH1' ),
-	'revisionyear'            => array( '1', '版の年', 'リビジョン年', '差分年', 'REVISIONYEAR' ),
-	'revisiontimestamp'       => array( '1', '版のタイムスタンプ', 'リビジョンタイムスタンプ', 'REVISIONTIMESTAMP' ),
-	'revisionuser'            => array( '1', '版の利用者', 'リビジョンユーザー', 'リビジョンユーザ', 'リビジョン利用者', '差分利用者', 'REVISIONUSER' ),
-	'plural'                  => array( '0', '複数:', '複数：', 'PLURAL:' ),
-	'fullurl'                 => array( '0', '完全なURL:', 'フルURL:', '完全なＵＲＬ：', 'フルＵＲＬ：', 'FULLURL:' ),
-	'fullurle'                => array( '0', '完全なURLE:', 'フルURLE:', '完全なＵＲＬＥ：', 'フルＵＲＬＥ：', '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' ),
-	'rawsuffix'               => array( '1', '生', 'R' ),
-	'newsectionlink'          => array( '1', '__新しい節リンク__', '__新しいセクションリンク__', '__新セクションリンク__', '＿＿新しいセクションリンク＿＿', '＿＿新セクションリンク＿＿', '__NEWSECTIONLINK__' ),
-	'nonewsectionlink'        => array( '1', '__新しい節リンク非表示__', '__新しいセクションリンク非表示__', '＿＿新しいセクションリンク非表示＿＿', '__新セクションリンク非表示__', '＿＿新セクションリンク非表示＿＿', '__NONEWSECTIONLINK__' ),
-	'currentversion'          => array( '1', '現在のバージョン', 'ウィキバージョン', 'MediaWikiバージョン', 'メディアウィキバージョン', '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' ),
-	'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' ),
-	'url_path'                => array( '0', 'パス', 'PATH' ),
-	'url_wiki'                => array( '0', 'ウィキ', 'WIKI' ),
-	'url_query'               => array( '0', 'クエリー', 'QUERY' ),
+	'redirect'                  => array( '0', '#転送', '#リダイレクト', '＃転送', '＃リダイレクト', '#REDIRECT' ),
+	'notoc'                     => array( '0', '__目次非表示__', '＿＿目次非表示＿＿', '__NOTOC__' ),
+	'nogallery'                 => array( '0', '__ギャラリー非表示__', '＿＿ギャラリー非表示＿＿', '__NOGALLERY__' ),
+	'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' ),
+	'currentmonthnamegen'       => array( '1', '現在の月属格', 'CURRENTMONTHNAMEGEN' ),
+	'currentmonthabbrev'        => array( '1', '現在の月省略形', '省略協定月', '協定月省略', '協定月省略形', 'CURRENTMONTHABBREV' ),
+	'currentday'                => array( '1', '現在の日', '協定日', 'CURRENTDAY' ),
+	'currentday2'               => array( '1', '現在の日2', '協定日2', '協定日２', 'CURRENTDAY2' ),
+	'currentdayname'            => array( '1', '現在の曜日名', '協定曜日', 'CURRENTDAYNAME' ),
+	'currentyear'               => array( '1', '現在の年', '協定年', 'CURRENTYEAR' ),
+	'currenttime'               => array( '1', '現在の時刻', '協定時間', '協定時刻', 'CURRENTTIME' ),
+	'currenthour'               => array( '1', '現在の時', '協定時', 'CURRENTHOUR' ),
+	'localmonth'                => array( '1', '地方時の月', '現地月', 'LOCALMONTH', 'LOCALMONTH2' ),
+	'localmonth1'               => array( '1', '地方時の月1', '現地月1', '現地月１', 'LOCALMONTH1' ),
+	'localmonthname'            => array( '1', '地方時の月名1', '現地月名', 'LOCALMONTHNAME' ),
+	'localmonthnamegen'         => array( '1', '地方時の月属格', 'LOCALMONTHNAMEGEN' ),
+	'localmonthabbrev'          => array( '1', '地方時の月省略形', '省略現地月', 'LOCALMONTHABBREV' ),
+	'localday'                  => array( '1', '地方時の日', '現地日', 'ローカルデイ', 'LOCALDAY' ),
+	'localday2'                 => array( '1', '地方時の日2', '現地日2', '現地日２', 'LOCALDAY2' ),
+	'localdayname'              => array( '1', '地方時の曜日名', '現地曜日', 'ローカルデイネーム', 'LOCALDAYNAME' ),
+	'localyear'                 => array( '1', '地方時の年', '現地年', 'ローカルイヤー', 'LOCALYEAR' ),
+	'localtime'                 => array( '1', '地方時の時刻', '現地時間', 'ローカルタイム', 'LOCALTIME' ),
+	'localhour'                 => array( '1', '地方時の時', '現地時', 'LOCALHOUR' ),
+	'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', 'ページ名E', 'ページ名Ｅ', 'PAGENAMEE' ),
+	'namespace'                 => array( '1', '名前空間', 'NAMESPACE' ),
+	'namespacee'                => array( '1', '名前空間E', '名前空間Ｅ', 'NAMESPACEE' ),
+	'talkspace'                 => array( '1', 'トーク空間', 'ノート空間', '会話空間', 'トークスペース', 'TALKSPACE' ),
+	'talkspacee'                => array( '1', 'トーク空間E', 'トーク空間Ｅ', 'ノート空間E', '会話空間E', 'ノート空間Ｅ', '会話空間Ｅ', 'トークスペースE', 'トークスペースＥ', 'TALKSPACEE' ),
+	'subjectspace'              => array( '1', '主空間', '標準空間', '記事空間', 'SUBJECTSPACE', 'ARTICLESPACE' ),
+	'subjectspacee'             => array( '1', '主空間E', '標準空間E', '標準空間Ｅ', '記事空間E', '記事空間Ｅ', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
+	'fullpagename'              => array( '1', '完全なページ名', 'フルページ名', '完全な記事名', '完全記事名', 'FULLPAGENAME' ),
+	'fullpagenamee'             => array( '1', '完全なページ名E', 'フルページ名E', 'フルページ名Ｅ', '完全なページ名Ｅ', 'FULLPAGENAMEE' ),
+	'subpagename'               => array( '1', 'サブページ名', 'SUBPAGENAME' ),
+	'subpagenamee'              => array( '1', 'サブページ名E', 'サブページ名Ｅ', 'SUBPAGENAMEE' ),
+	'basepagename'              => array( '1', '親ページ名', 'BASEPAGENAME' ),
+	'basepagenamee'             => array( '1', '親ページ名E', '親ページ名Ｅ', 'BASEPAGENAMEE' ),
+	'talkpagename'              => array( '1', 'トークページ名', '会話ページ名', 'TALKPAGENAME' ),
+	'talkpagenamee'             => array( '1', 'トークページ名E', '会話ページ名E', '会話ページ名Ｅ', 'トークページ名Ｅ', 'TALKPAGENAMEE' ),
+	'subjectpagename'           => array( '1', '主ページ名', '記事ページ名', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
+	'subjectpagenamee'          => array( '1', '主ページ名E', '記事ページ名E', '主ページ名Ｅ', '記事ページ名Ｅ', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
+	'msg'                       => array( '0', 'メッセージ:', 'MSG:' ),
+	'subst'                     => array( '0', '展開:', '展開：', 'SUBST:' ),
+	'safesubst'                 => array( '0', '安全展開:', 'SAFESUBST:' ),
+	'msgnw'                     => array( '0', 'ウィキ無効メッセージ:', 'MSGNW:' ),
+	'img_thumbnail'             => array( '1', 'サムネイル', 'thumbnail', 'thumb' ),
+	'img_manualthumb'           => array( '1', '代替画像=$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ピクセル', '$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_upright'               => array( '1', '右上', 'upright', 'upright=$1', 'upright $1' ),
+	'img_border'                => array( '1', '境界', 'ボーダー', 'border' ),
+	'img_baseline'              => array( '1', '下線', 'ベースライン', 'baseline' ),
+	'img_sub'                   => array( '1', '下付き', 'sub' ),
+	'img_super'                 => array( '1', '上付き', 'super', 'sup' ),
+	'img_top'                   => array( '1', '上端', 'top' ),
+	'img_text_top'              => array( '1', '文上端', 'text-top' ),
+	'img_middle'                => array( '1', '中心', 'middle' ),
+	'img_bottom'                => array( '1', '下端', 'bottom' ),
+	'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:' ),
+	'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' ),
+	'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__' ),
+	'currentweek'               => array( '1', '現在の週', 'CURRENTWEEK' ),
+	'currentdow'                => array( '1', '現在の曜日番号', 'CURRENTDOW' ),
+	'localweek'                 => array( '1', '地方時の週', '現地週', 'ローカルウィーク', 'LOCALWEEK' ),
+	'localdow'                  => array( '1', '地方時の曜日番号', 'LOCALDOW' ),
+	'revisionid'                => array( '1', '版のID', 'リビジョンID', '差分ID', 'リビジョンＩＤ', '差分ＩＤ', 'REVISIONID' ),
+	'revisionday'               => array( '1', '版の日', 'リビジョン日', '差分日', 'REVISIONDAY' ),
+	'revisionday2'              => array( '1', '版の日2', 'リビジョン日2', '差分日2', 'リビジョン日２', '差分日２', 'REVISIONDAY2' ),
+	'revisionmonth'             => array( '1', '版の月', 'リビジョン月', '差分月', 'REVISIONMONTH' ),
+	'revisionmonth1'            => array( '1', '版の月1', 'REVISIONMONTH1' ),
+	'revisionyear'              => array( '1', '版の年', 'リビジョン年', '差分年', 'REVISIONYEAR' ),
+	'revisiontimestamp'         => array( '1', '版のタイムスタンプ', 'リビジョンタイムスタンプ', 'REVISIONTIMESTAMP' ),
+	'revisionuser'              => array( '1', '版の利用者', 'リビジョンユーザー', 'リビジョンユーザ', 'リビジョン利用者', '差分利用者', 'REVISIONUSER' ),
+	'plural'                    => array( '0', '複数:', '複数：', 'PLURAL:' ),
+	'fullurl'                   => array( '0', '完全なURL:', 'フルURL:', '完全なＵＲＬ：', 'フルＵＲＬ：', 'FULLURL:' ),
+	'fullurle'                  => array( '0', '完全なURLE:', 'フルURLE:', '完全なＵＲＬＥ：', 'フルＵＲＬＥ：', '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' ),
+	'rawsuffix'                 => array( '1', '生', 'R' ),
+	'newsectionlink'            => array( '1', '__新しい節リンク__', '__新しいセクションリンク__', '__新セクションリンク__', '＿＿新しいセクションリンク＿＿', '＿＿新セクションリンク＿＿', '__NEWSECTIONLINK__' ),
+	'nonewsectionlink'          => array( '1', '__新しい節リンク非表示__', '__新しいセクションリンク非表示__', '＿＿新しいセクションリンク非表示＿＿', '__新セクションリンク非表示__', '＿＿新セクションリンク非表示＿＿', '__NONEWSECTIONLINK__' ),
+	'currentversion'            => array( '1', '現在のバージョン', 'ウィキバージョン', 'MediaWikiバージョン', 'メディアウィキバージョン', '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' ),
+	'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' ),
+	'url_path'                  => array( '0', 'パス', 'PATH' ),
+	'url_wiki'                  => array( '0', 'ウィキ', 'WIKI' ),
+	'url_query'                 => array( '0', 'クエリー', 'QUERY' ),
 );
 
 $messages = array(
@@ -378,7 +378,7 @@ $messages = array(
 'tog-editsectiononrightclick' => '節見出しの右クリックで節を編集できるようにする（JavaScriptが必要）',
 'tog-showtoc' => '目次を表示（ページに見出しが4つ以上ある場合）',
 'tog-rememberpassword' => 'このブラウザーにログイン情報を記憶（最大 $1 {{PLURAL:$1|日間}}）',
-'tog-watchcreations' => '自分が作成したページとアップロードしたファイルをウォッチリストに追加',
+'tog-watchcreations' => '自分が作成したページやアップロードしたファイルをウォッチリストに追加',
 'tog-watchdefault' => '自分が編集したページやファイルをウォッチリストに追加',
 'tog-watchmoves' => '自分が移動したページやファイルをウォッチリストに追加',
 'tog-watchdeletion' => '自分が削除したページやファイルをウォッチリストに追加',
@@ -415,7 +415,7 @@ $messages = array(
 'underline-default' => 'ブラウザーの設定を使用',
 
 # Font style option in Special:Preferences
-'editfont-style' => '編集エリアのフォントスタイル：',
+'editfont-style' => '編集エリアのフォント:',
 'editfont-default' => 'ブラウザーの設定を使用',
 'editfont-monospace' => '等幅フォント',
 'editfont-sansserif' => 'Sans Serif フォント',
@@ -655,8 +655,8 @@ $1',
 'page-rss-feed' => '「$1」のRSSフィード',
 'page-atom-feed' => '「$1」のAtomフィード',
 'red-link-title' => '$1（存在しないページ）',
-'sort-descending' => '降順に整列',
-'sort-ascending' => '昇順に整列',
+'sort-descending' => '降順に並べ替え',
+'sort-ascending' => '昇順に並べ替え',
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main' => 'ページ',
@@ -815,6 +815,7 @@ Cookieを無効にしているようです。
 Cookieを有効にしてから、もう一度試してください。',
 'nocookiesfornew' => '発信元を確認できなかったため、アカウントは作成されませんでした。
 Cookieを有効にしていることを確認して、このページを再読込してもう一度試してください。',
+'nocookiesforlogin' => '{{int:nocookieslogin}}',
 'noname' => '利用者名を正しく指定していません。',
 'loginsuccesstitle' => 'ログイン成功',
 'loginsuccess' => "'''{{SITENAME}}に「$1」としてログインしました。'''",
@@ -886,9 +887,9 @@ Cookieを有効にしていることを確認して、このページを再読
 'resetpass_announce' => 'メールでお送りした仮パスワードでログインしました。
 ログインを完了するには、ここで新しいパスワードを設定する必要があります：',
 'resetpass_text' => '<!-- ここに文を挿入 -->',
-'resetpass_header' => 'アカウントのパスワードを変更',
-'oldpassword' => '古いパスワード：',
-'newpassword' => '新しいパスワード：',
+'resetpass_header' => 'アカウントのパスワードの変更',
+'oldpassword' => '古いパスワード:',
+'newpassword' => '新しいパスワード:',
 'retypenew' => '新しいパスワードを再入力:',
 'resetpass_submit' => '再設定してログイン',
 'resetpass_success' => 'パスワードの変更に成功しました!
@@ -1075,7 +1076,7 @@ IP アドレスは複数の利用者で共有されている場合がありま
 'previewnote' => "'''これはプレビューです。'''
 変更箇所はまだ保存されていません！",
 'continue-editing' => '編集を続行',
-'previewconflict' => 'このプレビューは、上の文章編集エリアの文章を保存した場合にどう見えるようになるかを示すものです。',
+'previewconflict' => 'これは、上の編集エリアの文章を保存した場合にどう表示されるかを示すプレビューです。',
 'session_fail_preview' => "'''申し訳ありません！セッションデータが消失したため編集を処理できませんでした。'''
 もう一度やり直してください。
 それでも失敗する場合、[[Special:UserLogout|ログアウト]]してからログインし直してください。",
@@ -1229,8 +1230,8 @@ $3が示した理由：''$2''",
 
 # Revision deletion
 'rev-deleted-comment' => '(要約は除去されています)',
-'rev-deleted-user' => '（利用者名は除去されています）',
-'rev-deleted-event' => '（記録は除去されています）',
+'rev-deleted-user' => '(利用者名は除去されています)',
+'rev-deleted-event' => '(記録は除去されています)',
 'rev-deleted-user-contribs' => '[利用者名またはIPアドレスは除去されました - その編集は投稿記録で非表示にされています]',
 'rev-deleted-text-permission' => "この版は'''削除されています'''。
 [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} 削除記録]に詳細情報があるかもしれません。",
@@ -1628,27 +1629,27 @@ $1 {{PLURAL:$1|文字}}以下である必要があります。',
 'right-move-subpages' => '下位ページを含めてページを移動',
 'right-move-rootuserpages' => '利用者ページ本体を移動',
 'right-movefile' => 'ファイルの移動',
-'right-suppressredirect' => 'ページの移動の際に元のページ名からのリダイレクトを作成しない',
+'right-suppressredirect' => 'リダイレクトを残さずにページを移動',
 'right-upload' => 'ファイルをアップロード',
 'right-reupload' => '既存のファイルに上書き',
 'right-reupload-own' => '自分自身がアップロードした既存のファイルに上書き',
-'right-reupload-shared' => '共有メディアリポジトリ上のファイルのローカルでの上書き',
-'right-upload_by_url' => 'URLからファイルをアップロード',
+'right-reupload-shared' => '共有メディアリポジトリ上のファイルにローカルで上書き',
+'right-upload_by_url' => 'URL からファイルをアップロード',
 'right-purge' => '確認を省略してサイトのキャッシュを破棄',
 'right-autoconfirmed' => '半保護されたページを編集',
 'right-bot' => '自動処理と認識させる',
-'right-nominornewtalk' => '議論ページへ細部の編集をしたときに、新しいメッセージのお知らせを表示しない',
-'right-apihighlimits' => 'API要求でより高い制限値の使用',
-'right-writeapi' => '書き込みAPIの使用',
+'right-nominornewtalk' => '議論ページの細部の編集をした際に、新着メッセージとして通知しない',
+'right-apihighlimits' => 'API要求でより高い制限値を使用',
+'right-writeapi' => '書き込みAPIを使用',
 'right-delete' => 'ページの削除',
 'right-bigdelete' => '大きな履歴があるページを削除',
-'right-deletelogentry' => '特定の記録項目の削除と復帰',
-'right-deleterevision' => 'ページの特定の版の削除と復帰',
+'right-deletelogentry' => '特定の記録項目を削除/復帰',
+'right-deleterevision' => 'ページの特定の版を削除/復帰',
 'right-deletedhistory' => '削除された履歴項目（関連する本文を除く）を閲覧',
 'right-deletedtext' => '削除された本文と削除された版間の差分を閲覧',
 'right-browsearchive' => '削除されたページを検索',
-'right-undelete' => 'ページの復帰',
-'right-suppressrevision' => '管理者から隠された版の確認と復元',
+'right-undelete' => 'ページを復帰',
+'right-suppressrevision' => '管理者から隠された版を確認/復元',
 'right-suppressionlog' => '非公開記録を閲覧',
 'right-block' => '他の利用者の編集をブロック',
 'right-blockemail' => '利用者のメール送信をブロック',
@@ -1659,14 +1660,14 @@ $1 {{PLURAL:$1|文字}}以下である必要があります。',
 'right-protect' => '保護レベルを変更し、保護されたページを編集',
 'right-editprotected' => '保護ページ（カスケード保護を除く）を編集',
 'right-editinterface' => 'ユーザーインターフェイスを編集',
-'right-editusercssjs' => '他の利用者のCSSとJavaScriptファイルを編集',
+'right-editusercssjs' => '他の利用者のCSSファイル/JavaScriptファイルを編集',
 'right-editusercss' => '他の利用者のCSSファイルを編集',
 'right-edituserjs' => '他の利用者のJavaScriptファイルを編集',
 'right-rollback' => '特定ページを最後に編集した利用者の編集を即時巻き戻し',
 'right-markbotedits' => '巻き戻しをボットの編集として扱う',
 'right-noratelimit' => '速度制限を受けない',
-'right-import' => '他のウィキからのページ取り込み',
-'right-importupload' => 'ファイルアップロードによるページ取り込み',
+'right-import' => '他のウィキからページを取り込み',
+'right-importupload' => 'ファイルアップロードでページを取り込み',
 'right-patrol' => '他人の編集を巡回済みにする',
 'right-autopatrol' => '自分の編集を自動的に巡回済みにする',
 'right-patrolmarks' => '最近の更新で巡回済み印を閲覧',
@@ -1674,7 +1675,7 @@ $1 {{PLURAL:$1|文字}}以下である必要があります。',
 'right-mergehistory' => 'ページ履歴の統合',
 'right-userrights' => '全利用者権限を編集',
 'right-userrights-interwiki' => '他のウィキの利用者の利用者権限を編集',
-'right-siteadmin' => 'データベースのロックおよびロック解除',
+'right-siteadmin' => 'データベースをロックおよびロック解除',
 'right-override-export-depth' => 'リンク先ページを5階層まで含めて書き出す',
 'right-sendemail' => '他の利用者にメールを送信',
 'right-passwordreset' => 'パスワード再設定メールを閲覧',
@@ -1687,41 +1688,41 @@ $1 {{PLURAL:$1|文字}}以下である必要があります。',
 'rightsnone' => '（なし）',
 
 # Associated actions - in the sentence "You do not have permission to X"
-'action-read' => 'このページを閲覧',
-'action-edit' => 'このページを編集',
-'action-createpage' => 'ページを作成',
-'action-createtalk' => 'トークページを作成',
-'action-createaccount' => 'この利用者アカウントを作成',
+'action-read' => 'このページの閲覧',
+'action-edit' => 'このページの編集',
+'action-createpage' => 'ページの作成',
+'action-createtalk' => '議論ページの作成',
+'action-createaccount' => 'この利用者アカウントの作成',
 'action-minoredit' => '細部の編集の印を付ける',
 'action-move' => 'このページの移動',
-'action-move-subpages' => 'このページと下位ページの移動',
+'action-move-subpages' => 'このページとその下位ページの移動',
 'action-move-rootuserpages' => '利用者ページ本体の移動',
 'action-movefile' => 'このファイルの移動',
-'action-upload' => 'このファイルをアップロード',
-'action-reupload' => 'この既存のファイルに上書き',
-'action-reupload-shared' => '共有リポジトリにあるこのファイルに上書き',
-'action-upload_by_url' => 'URLからこのファイルをアップロード',
-'action-writeapi' => '書き込みAPIを使用',
-'action-delete' => 'このページを削除',
-'action-deleterevision' => 'この版を削除',
-'action-deletedhistory' => 'このページの削除履歴を表示',
+'action-upload' => 'このファイルのアップロード',
+'action-reupload' => 'この既存のファイルへの上書き',
+'action-reupload-shared' => '共有リポジトリにあるこのファイルへの上書き',
+'action-upload_by_url' => 'URL からのこのファイルのアップロード',
+'action-writeapi' => '書き込みAPIの使用',
+'action-delete' => 'このページの削除',
+'action-deleterevision' => 'この版の削除',
+'action-deletedhistory' => 'このページの削除履歴の閲覧',
 'action-browsearchive' => '削除されたページの検索',
-'action-undelete' => 'このページを復帰',
+'action-undelete' => 'このページの復帰',
 'action-suppressrevision' => '隠された版の確認と復元',
-'action-suppressionlog' => 'この非公開記録の表示',
-'action-block' => 'この利用者の編集をブロック',
-'action-protect' => 'このページの保護レベルを変更',
-'action-rollback' => '特定ページを最後に編集した利用者の編集を即時巻き戻し',
-'action-import' => 'このページを他のウィキから取り込む',
-'action-importupload' => 'ファイルアップロードでこのページに取り込む',
+'action-suppressionlog' => 'この非公開記録の閲覧',
+'action-block' => 'この利用者の編集ブロック',
+'action-protect' => 'このページの保護レベルの変更',
+'action-rollback' => '特定ページを最後に編集した利用者の編集の即時巻き戻し',
+'action-import' => '他のウィキからのこのページの取り込み',
+'action-importupload' => 'ファイルアップロードでのこのページへの取り込み',
 'action-patrol' => '他の利用者の編集を巡回済みにする',
 'action-autopatrol' => '自分の編集を巡回済みにする',
-'action-unwatchedpages' => 'ウォッチされていないページ一覧を表示',
-'action-mergehistory' => 'このページの履歴を統合',
-'action-userrights' => '全利用者権限の変更',
-'action-userrights-interwiki' => '他のウィキ上の利用者の利用者権限変更',
-'action-siteadmin' => 'データベースをロックまたはロック解除',
-'action-sendemail' => 'メールを送信',
+'action-unwatchedpages' => 'ウォッチされていないページ一覧の閲覧',
+'action-mergehistory' => 'このページの履歴の統合',
+'action-userrights' => '全利用者権限の編集',
+'action-userrights-interwiki' => '他のウィキの利用者の利用者権限変更',
+'action-siteadmin' => 'データベースのロックまたはロック解除',
+'action-sendemail' => 'メールの送信',
 
 # Recent changes
 'nchanges' => '$1 {{PLURAL:$1|回の変更}}',
@@ -2268,6 +2269,7 @@ contenttype/subtypeの形式で入力してください（例：<code>image/jpeg
 # Book sources
 'booksources' => '書籍情報源',
 'booksources-search-legend' => '書籍情報源を検索',
+'booksources-isbn' => 'ISBN:',
 'booksources-go' => '検索',
 'booksources-text' => 'お探しの書籍の新品/中古品を販売している外部サイトへのリンクを以下に列挙します。この書籍についてさらに詳しい情報があるかもしれません:',
 'booksources-invalid-isbn' => '指定したISBN番号は有効ではないようです。情報源から写し間違えていないか確認してください。',
@@ -2324,7 +2326,7 @@ contenttype/subtypeの形式で入力してください（例：<code>image/jpeg
 # Special:LinkSearch
 'linksearch' => '外部リンクの検索',
 'linksearch-pat' => '検索パターン：',
-'linksearch-ns' => '名前空間：',
+'linksearch-ns' => '名前空間:',
 'linksearch-ok' => '検索',
 'linksearch-text' => '"*.wikipedia.org" のようにワイルドカードを使用できます。
 少なくとも "*.org" のようなトップレベルドメインが必要です。<br />
@@ -2361,6 +2363,8 @@ contenttype/subtypeの形式で入力してください（例：<code>image/jpeg
 'listgrouprights-rights' => '権限',
 'listgrouprights-helppage' => 'Help:グループ権限',
 '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',
 'listgrouprights-removegroup' => '{{PLURAL:$2|グループ}}を除去：$1',
 'listgrouprights-addgroup-all' => '全グループを追加可能',
@@ -2665,7 +2669,7 @@ $1',
 'undelete-show-file-submit' => 'はい',
 
 # Namespace form on various pages
-'namespace' => '名前空間：',
+'namespace' => '名前空間:',
 'invert' => '選択したものを除く',
 'tooltip-invert' => '選択した名前空間（チェックされている場合は、関連付けられた名前空間も）のページの変更を非表示にするには、このボックスにチェックを入れる',
 'namespace_association' => '対応付けられた名前空間',
@@ -2841,6 +2845,7 @@ $1のブロックの理由は「''$2''」です。",
 'proxyblockreason' => 'ご使用中のIPアドレスは公開プロキシであるため投稿ブロックされています。
 使用中のインターネットサービスプロバイダー、または所属組織の技術担当者に連絡して、これが深刻なセキュリティ問題であることを伝えてください。',
 'proxyblocksuccess' => '完了。',
+'sorbs' => 'DNSBL',
 'sorbsreason' => 'ご使用中のIPアドレスが、{{SITENAME}}の使用しているDNSBLに公開プロキシとして記載されています。',
 'sorbs_create_account_reason' => 'ご使用中のIPアドレスが、{{SITENAME}}の使用しているDNSBLに公開プロキシとして記載されています。
 アカウント作成はできません',
@@ -2923,8 +2928,8 @@ hideuser権限を持っていないため、この利用者のブロックを閲
 手動で統合してください。'''",
 'movedto' => '移動先：',
 'movetalk' => '付随するトークページも移動',
-'move-subpages' => '下位ページも移動（$1ページまで）',
-'move-talk-subpages' => 'トークページの下位ページも移動（$1個まで）',
+'move-subpages' => '下位ページも移動（$1 件まで）',
+'move-talk-subpages' => 'トークページの下位ページも移動（$1 件まで）',
 'movepage-page-exists' => 'ページ「$1」は既に存在するため、自動的な上書きはできませんでした。',
 'movepage-page-moved' => 'ページ「$1」は「$2」に移動しました。',
 'movepage-page-unmoved' => 'ページ「$1」は「$2」に移動できませんでした。',
@@ -2932,7 +2937,7 @@ hideuser権限を持っていないため、この利用者のブロックを閲
 'movelogpage' => '移動記録',
 'movelogpagetext' => '以下はすべてのページ移動の一覧です。',
 'movesubpage' => '{{PLURAL:$1|下位ページ}}',
-'movesubpagetext' => 'このページには{{PLURAL:$1|下位ページ}}が以下の $1 件あります。',
+'movesubpagetext' => 'このページには、以下の $1 {{PLURAL:$1|下位ページ}}があります。',
 'movenosubpage' => 'このページに下位ページはありません。',
 'movereason' => '理由：',
 'revertmove' => '差し戻し',
@@ -2995,12 +3000,12 @@ hideuser権限を持っていないため、この利用者のブロックを閲
 MediaWiki 全般のローカライズ（地域化）に貢献したい場合は、[//www.mediawiki.org/wiki/Localisation/ja MediaWiki のローカライズ] や [//translatewiki.net?setlang=ja translatewiki.net] をご覧ください。',
 'allmessagesnotsupportedDB' => "'''\$wgUseDatabaseMessages'''が無効のため、このページを使用できません。",
 'allmessages-filter-legend' => '絞り込み',
-'allmessages-filter' => '変更状態により絞り込む：',
+'allmessages-filter' => '変更状態により絞り込む:',
 'allmessages-filter-unmodified' => '変更なし',
 'allmessages-filter-all' => 'すべて',
 'allmessages-filter-modified' => '変更あり',
-'allmessages-prefix' => '名前の先頭部分で絞り込む：',
-'allmessages-language' => '言語：',
+'allmessages-prefix' => '名前の先頭部分で絞り込む:',
+'allmessages-language' => '言語:',
 'allmessages-filter-submit' => '表示',
 
 # Thumbnails
@@ -3153,8 +3158,8 @@ MediaWiki 全般のローカライズ（地域化）に貢献したい場合は
 'tooltip-watchlistedit-raw-submit' => 'ウォッチリストを更新する',
 'tooltip-recreate' => '削除されていても、ページを再作成する',
 'tooltip-upload' => 'アップロードを開始する',
-'tooltip-rollback' => '「巻き戻し」は、最後に編集した人によるこのページへの複数の編集を1クリックで差し戻します',
-'tooltip-undo' => '「取り消し」はこの編集を差し戻し、編集画面をプレビューを付けて開きます。要約欄に取り消しの理由を追加できます。',
+'tooltip-rollback' => '「巻き戻し」は最後の編集者によるこのページの複数の編集を1クリックで差し戻します',
+'tooltip-undo' => '「取り消し」はこの編集を差し戻し、編集画面をプレビュー付きで開きます。要約欄に理由を追加できます。',
 'tooltip-preferences-save' => '設定を保存する',
 'tooltip-summary' => '短い要約を入力してください',
 
@@ -3243,7 +3248,7 @@ MediaWiki 全般のローカライズ（地域化）に貢献したい場合は
 'pageinfo-edits' => '総編集回数',
 'pageinfo-authors' => '総投稿者数',
 'pageinfo-recent-edits' => '最近の編集回数 (過去 $1)',
-'pageinfo-restriction' => 'ページ保護 (<code>$1</code>)',
+'pageinfo-restriction' => 'ページ保護 (<code>{{lcfirst:$1}}</code>)',
 'pageinfo-magic-words' => 'マジック {{PLURAL:$1|ワード}} ($1)',
 'pageinfo-hidden-categories' => '隠し{{PLURAL:$1|カテゴリ}} ($1)',
 'pageinfo-templates' => '参照読み込みされた{{PLURAL:$1|テンプレート}} ($1)',
@@ -3392,6 +3397,11 @@ Variants for Chinese language
 'variantname-ike-latn' => 'イヌクティトゥット語 (ラテン文字)',
 'variantname-iu' => 'イヌクティトゥット語',
 
+# Variants for Tachelhit language
+'variantname-shi-tfng' => 'シルハ語 (ティフィナグ文字)',
+'variantname-shi-latn' => 'シルハ語 (ラテン文字)',
+'variantname-shi' => 'シルハ語',
+
 # Metadata
 'metadata' => 'メタデータ',
 'metadata-help' => 'このファイルには、追加情報があります（おそらく、作成やデジタル化する際に使用したデジタルカメラやスキャナーが追加したものです）。
@@ -3817,10 +3827,10 @@ Variants for Chinese language
 # E-mail address confirmation
 'confirmemail' => 'メールアドレスの確認',
 'confirmemail_noemail' => '[[Special:Preferences|個人設定]]で有効なメールアドレスが指定されていません。',
-'confirmemail_text' => '{{SITENAME}}では、メール機能を利用する前にメールアドレスの確認が必要です。
-以下のボタンを押すとメールアドレスに確認メールが送られます。
-メールには確認用コードを含むリンクが書かれています。
-そのリンクをブラウザーで読み込んで、メールアドレスの正当性を確認してください。',
+'confirmemail_text' => '{{SITENAME}}では、メール機能を使用する前にメールアドレスの検証が必要です。
+以下のボタンを押すと、あなたのメールアドレスに確認用メールをお送りします。
+そのメール内に、確認用コードを含むリンクがあります。
+メールアドレスが有効であることを確認するために、そのリンクをブラウザーで開いてください。',
 'confirmemail_pending' => '確認用コードをメールで既にお送りしました。
 アカウントを作成したばかりの場合は、メールが届くまでしばらくお待ちください。届かない場合は新しいコードを再度申請してください。',
 'confirmemail_send' => '確認用コードをメールで送信',
@@ -3930,7 +3940,7 @@ $5
 'table_pager_first' => '最初のページ',
 'table_pager_last' => '最後のページ',
 'table_pager_limit' => '1ページに$1項目を表示',
-'table_pager_limit_label' => 'ページあたりの項目数：',
+'table_pager_limit_label' => 'ページあたりの項目数:',
 'table_pager_limit_submit' => '実行',
 'table_pager_empty' => '結果なし',
 
diff --git a/languages/messages/MessagesKa.php b/languages/messages/MessagesKa.php
index c24776a3fc..cc82658735 100644
--- a/languages/messages/MessagesKa.php
+++ b/languages/messages/MessagesKa.php
@@ -88,8 +88,8 @@ $specialPageAliases = array(
 	'Listgrouprights'           => array( 'ჯგუფის_უფლებათა_სია' ),
 	'Listredirects'             => array( 'გადამისამართებების_სია' ),
 	'Listusers'                 => array( 'მომხმარებელთა_სია' ),
-	'Lonelypages'               => array( 'ობოლიგვერდები' ),
-	'Longpages'                 => array( 'გრძელიგვერდები' ),
+	'Lonelypages'               => array( 'ობოლი_გვერდები' ),
+	'Longpages'                 => array( 'გრძელი_გვერდები' ),
 	'Movepage'                  => array( 'გვერდის_გადატანა' ),
 	'Mycontributions'           => array( 'ჩემი_წვლილი' ),
 	'Mypage'                    => array( 'ჩემი_გვერდი' ),
@@ -101,10 +101,10 @@ $specialPageAliases = array(
 	'Preferences'               => array( 'კონფიგურაცია' ),
 	'Protectedpages'            => array( 'დაცული_გვერდები' ),
 	'Protectedtitles'           => array( 'დაცული_სათაურები' ),
-	'Randompage'                => array( 'შემთხვევით', 'შემთხვევითიგვერდი' ),
+	'Randompage'                => array( 'შემთხვევით', 'შემთხვევითი_გვერდი' ),
 	'Recentchanges'             => array( 'ბოლოცვლილებები' ),
 	'Search'                    => array( 'ძიება' ),
-	'Shortpages'                => array( 'მოკლეგვერდები' ),
+	'Shortpages'                => array( 'მოკლე_გვერდები' ),
 	'Specialpages'              => array( 'განსაკუთრებული_გვერდები' ),
 	'Statistics'                => array( 'სტატისტიკა' ),
 	'Unblock'                   => array( 'ბლოკის_მოხსნა' ),
@@ -113,36 +113,54 @@ $specialPageAliases = array(
 	'Uncategorizedpages'        => array( 'უკატეგორიო_გვერდები' ),
 	'Uncategorizedtemplates'    => array( 'უკატეგორიო_თარგები' ),
 	'Undelete'                  => array( 'აღდგენა' ),
-	'Unusedcategories'          => array( 'გამოუყკატეგორიები' ),
-	'Unusedimages'              => array( 'გამოუყსურათები' ),
+	'Unusedcategories'          => array( 'გამოუყენებელი_კატეგორიები' ),
+	'Unusedimages'              => array( 'გამოუყენებელი_სურათები' ),
 	'Upload'                    => array( 'ატვირთვა' ),
 	'Userlogin'                 => array( 'შესვლა' ),
 	'Userlogout'                => array( 'გასვლა' ),
 	'Userrights'                => array( 'მომხმარებელთა_უფლებები' ),
 	'Version'                   => array( 'ვერსია' ),
-	'Wantedcategories'          => array( 'მოთხოვნილიკატეგორიები' ),
+	'Wantedcategories'          => array( 'მოთხოვნილი_კატეგორიები' ),
 	'Wantedfiles'               => array( 'საჭირო_ფაილები' ),
 	'Wantedpages'               => array( 'საჭირო_გვერდები' ),
 	'Wantedtemplates'           => array( 'საჭირო_თარგები' ),
-	'Watchlist'                 => array( 'კონტროლსია' ),
-	'Withoutinterwiki'          => array( 'ინტერვიკისგარეშე' ),
+	'Watchlist'                 => array( 'კონტროლის_სია' ),
+	'Withoutinterwiki'          => array( 'ინტერვიკის_გარეშე' ),
 );
 
 $magicWords = array(
-	'redirect'                => array( '0', '#გადამისამართება', '#REDIRECT' ),
-	'nogallery'               => array( '0', '__უგალერეო__', '__NOGALLERY__' ),
-	'subst'                   => array( '0', 'მიდგმ:', 'SUBST:' ),
-	'img_thumbnail'           => array( '1', 'მინიატიურა', 'მინი', 'მინიასლი', 'ცეროდენა', 'thumbnail', 'thumb' ),
-	'img_right'               => array( '1', 'მარჯვნივ', 'right' ),
-	'img_left'                => array( '1', 'მარცხნივ', 'left' ),
-	'img_none'                => array( '1', 'არა', 'none' ),
-	'img_width'               => array( '1', '$1პქ', '$1px' ),
-	'img_center'              => array( '1', 'ცენტრი', 'ცენტრში', 'center', 'centre' ),
-	'img_border'              => array( '1', 'საზღვარი', 'border' ),
-	'img_top'                 => array( '1', 'ზედა', 'top' ),
-	'img_middle'              => array( '1', 'შუა', 'middle' ),
-	'img_bottom'              => array( '1', 'ქვედა', 'bottom' ),
-	'special'                 => array( '0', 'სპეციალური', 'special' ),
+	'redirect'                  => array( '0', '#გადამისამართება', '#REDIRECT' ),
+	'nogallery'                 => array( '0', '__უგალერეო__', '__NOGALLERY__' ),
+	'currentmonth'              => array( '1', 'მიმდინარე_თვე', 'მიმდინარე_თვე2', 'CURRENTMONTH', 'CURRENTMONTH2' ),
+	'currentmonth1'             => array( '1', 'მიმდინარე_თვე1', 'CURRENTMONTH1' ),
+	'currentmonthname'          => array( '1', 'მიმდინარე_თვის_სახელი', 'CURRENTMONTHNAME' ),
+	'currentmonthnamegen'       => array( '1', 'მიმდინარე_თვის_სახელის_აბრევიატურა', 'CURRENTMONTHNAMEGEN' ),
+	'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' ),
+	'pagename'                  => array( '1', 'გვერდის_სახელი', 'PAGENAME' ),
+	'namespace'                 => array( '1', 'სახელთა_სივრცე', 'NAMESPACE' ),
+	'fullpagename'              => array( '1', 'გვერდის_სრული_სახელი', 'FULLPAGENAME' ),
+	'subst'                     => array( '0', 'მიდგმ:', 'SUBST:' ),
+	'img_thumbnail'             => array( '1', 'მინიატიურა', 'მინი', 'მინიასლი', 'ცეროდენა', 'thumbnail', 'thumb' ),
+	'img_manualthumb'           => array( '1', 'მინიატიურა=$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პქ', '$1px' ),
+	'img_center'                => array( '1', 'ცენტრი', 'ცენტრში', 'center', 'centre' ),
+	'img_page'                  => array( '1', 'გვერდი=$1', 'გვერდი_$1', 'page=$1', 'page $1' ),
+	'img_border'                => array( '1', 'საზღვარი', 'border' ),
+	'img_top'                   => array( '1', 'ზედა', 'top' ),
+	'img_middle'                => array( '1', 'შუა', 'middle' ),
+	'img_bottom'                => array( '1', 'ქვედა', 'bottom' ),
+	'img_link'                  => array( '1', 'ბმული=$1', 'link=$1' ),
+	'img_alt'                   => array( '1', 'ალტ=$1', 'alt=$1' ),
+	'sitename'                  => array( '1', 'საიტის_სახელი', 'SITENAME' ),
+	'special'                   => array( '0', 'სპეციალური', 'special' ),
 );
 
 $linkPrefixExtension = true;
@@ -399,7 +417,7 @@ $1',
 'policy-url' => 'Project:პოლიტიკა',
 'portal' => 'საზოგადოების გვერდები',
 'portal-url' => 'Project:საზოგადოების გვერდები',
-'privacy' => 'ანონიმურობის პოლიტიკა',
+'privacy' => 'კონფიდენციალურობის პოლიტიკა',
 'privacypage' => 'Project:ანონიმურობის პოლიტიკა',
 
 'badaccess' => 'ნებართვის შეცდომა',
@@ -1830,6 +1848,7 @@ $1',
 'shared-repo-from' => ' $1-დან',
 'shared-repo' => 'საერთო საცავიდან',
 'shared-repo-name-wikimediacommons' => 'ვიკისაწყობი',
+'upload-disallowed-here' => 'სამწუხაროდ, თქვენ არ შეგიძლიათ ამ სურათზე გადაწერა.',
 
 # File reversion
 'filerevert' => 'დააბრუნე $1',
@@ -1938,6 +1957,7 @@ $1',
 # Miscellaneous special pages
 'nbytes' => '$1 ბაიტი',
 'ncategories' => '$1 კატეგორია',
+'ninterwikis' => '$1 {{PLURAL:$1|ინტერვიკი|ინტერვიკი}}',
 'nlinks' => '$1 ბმული',
 'nmembers' => '$1 წევრი',
 'nrevisions' => '$1 რედაქტირება',
@@ -1966,6 +1986,7 @@ $1',
 'mostlinkedtemplates' => 'ყველაზე მეტი ბმულების მქონე თარგები',
 'mostcategories' => 'ყველაზე მეტი კატეგორიის მქონე სტატიები',
 'mostimages' => 'ყველაზე მეტი ბმულების მქონე ფაილები',
+'mostinterwikis' => 'ყველაზე მეტი ინტერვიკის მქონე სტატია',
 'mostrevisions' => 'ყველაზე მეტად რედაქტირებული სტატიები',
 'prefixindex' => 'ყველა გვერდი (თავსართით)',
 'prefixindex-namespace' => 'ყველა პრეფიქსიანი გვერდი ($1 სახელთა სივრცე)',
@@ -2115,6 +2136,8 @@ $1',
 'mailnologin' => 'გამგზავნი მისამართი არ არის მითითებული.',
 'mailnologintext' => 'თქვენ უნდა [[Special:UserLogin|წარადგენილი იყოთ სისტემისადმი]] და გქონდეთ წესიერი ელექტრონული ფოსტის მისამართი თქვენს [[Special:Preferences|კონფიგურაციაში]] იმისთვის, რომ გაუგზავნოთ წერილების სხვა მომხმარებლებს.',
 'emailuser' => 'გაუგზავნეთ იმეილი ამ მომხმარებელს',
+'emailuser-title-target' => 'ელ. ფოსტის მიწერა {{GENDER:$1|მომხმარებელთან}}',
+'emailuser-title-notarget' => 'ელ. ფოსტის გაგზავნა მომხმარებელთან',
 'emailpage' => 'ელ. ფოსტა მომხმარებელს',
 'emailpagetext' => 'თუ ამ მომხმარებელმა თავის პარამეტრებში ელ. ფოსტის მოქმედი მისამართი მიუთითა, ქვემოთ მოყვანილი ფორმის შევსებისას შეგიძლიათ მისთვის შეტყობინების გაგზავნა. ელ. ფოსტის მისამართი, რომელიც [[Special:Preferences|თქვენს პარამეტრებში]] მიუთითეთ, დაფიქსირდება „გამომგზავნის“ ველში, რათა ადრესატმა პასუხის გაცემა შეძლოს.',
 'usermailererror' => 'ელ. ფოსტა დაბრუნდა შეცდომის გამო:',
@@ -2744,6 +2767,7 @@ $1',
 'import-interwiki-templates' => 'ყველა თარგის ჩართვა',
 'import-interwiki-submit' => 'იმპორტირება',
 'import-interwiki-namespace' => 'სამიზნე სახელთა სივრცე',
+'import-interwiki-rootpage' => 'ძირეული გვერდი (არასავალდებულო):',
 'import-upload-filename' => 'ფაილის სახელი:',
 'import-comment' => 'კომენტარი:',
 'importtext' => 'გთხოვთ, მოახდინოთ გვერდის ექსპორტი თავდაპირველი ვიკიდან, [[Special:Export|შესაბამისი ხელსაწყოს]] გამოყენებით. ფაილი შეინახეთ დისკზე, ხოლო შემდეგ ატვირთეთ აქ.',
@@ -2775,6 +2799,8 @@ $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 log
 'importlogpage' => 'იმპორტის ჟურნალი',
@@ -2913,6 +2939,7 @@ $1',
 'pageinfo-header-basic' => 'საბაზისო ინფორმაცია',
 'pageinfo-header-edits' => 'რედაქტირების ისტორია',
 'pageinfo-header-restrictions' => 'გვერდის დაცვა',
+'pageinfo-header-properties' => 'გვერდის თვისებები',
 'pageinfo-article-id' => 'გვერდის ID',
 'pageinfo-robot-policy' => 'საძიებო სისტემის სტატუსი',
 'pageinfo-views' => 'ხილვების რაოდენობა',
@@ -2923,9 +2950,10 @@ $1',
 'pageinfo-lasttime' => 'ბოლო რედაქტირების თარიღი',
 'pageinfo-edits' => 'რედაქტირებების ჯამური რაოდენობა',
 'pageinfo-authors' => 'განსხვავებულ ავტორთა ჯამური რაოდენობა',
-'pageinfo-restriction' => 'გვერდის დაცვა (<code>$1</code>)',
+'pageinfo-restriction' => 'გვერდის დაცვა (<code>{{lcfirst:$1}}</code>)',
 'pageinfo-magic-words' => 'ჯადოსნური {{PLURAL:$1|სიტყვა|სიტყვა}} ($1)',
 'pageinfo-hidden-categories' => 'დამალული {{PLURAL:$1|კატეგორია|კატეგორია}} ($1)',
+'pageinfo-templates' => 'ინტეგრირებულია {{PLURAL:$1|თარგი|თარგი}} ($1)',
 
 # Skin names
 'skinname-standard' => 'კლასიკური',
@@ -2981,6 +3009,7 @@ $1',
 'file-info-size-pages' => '$1 × $2 პიქსელი, ფაილის ზომა: $3, MIME ტიპი: $4, $5 გვერდი',
 '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.',
diff --git a/languages/messages/MessagesKhw.php b/languages/messages/MessagesKhw.php
index 69e8cb84ff..d28025d10e 100644
--- a/languages/messages/MessagesKhw.php
+++ b/languages/messages/MessagesKhw.php
@@ -234,7 +234,7 @@ $messages = array(
 'jumptonavigation' => 'رہنمائی',
 'jumptosearch' => 'تلاش',
 'view-pool-error' => 'معذرت: تمام سرورا موجودہ وختہ اِضافی بوجھ شیر.
-بہت زیادہ صارفین موجودہ وختہ ھیہ صفحو لاڑینیان 
+بو زیادہ صارفین موجودہ وختہ ھیہ صفحو لاڑینیان 
 برائے مہربانی! صفحو لوڑیکو بچے دوبارہ کوشش کوریکاری پروشٹی پھوکرو انتظار کورے.
 
 $1',
@@ -715,7 +715,7 @@ HTML tags لوڑے.',",
 'recentchangeslinked-summary' => "ھیہ ھتے تبدیلیان لسٹ شیر کہ ھیتان پھوک مدا پروشٹی ساوزینو بیتی شینی وا ھے صفحان سوم جستہ خور کیہ صفحہ چوکی شینی یا کیہ خاص زمرہ جاتو ممبرانن سوم چوکی شینی<br />
 ساوزیرو [[Special:Watchlist|موڑا صفحہ]] '''بولڈ''' شینی",
 'recentchangeslinked-page' => 'کھوار ویکیپیڈیو منصوبو صفحو لوڑے',
-'recentchangeslinked-to' => 'کھلولاو بیرو صفحو بجایا ھمو سوم چوکیرو صفحو نوغ تبدیلیان پشاوے',
+'recentchangeslinked-to' => 'کھولاو بیرو صفحو بجایا ھمو سوم چوکیرو صفحو نوغ تبدیلیان پشاوے',
 
 # Upload
 'upload' => 'فائل انځاوے',
diff --git a/languages/messages/MessagesKiu.php b/languages/messages/MessagesKiu.php
index 28cdd6ed26..cf9fff044e 100644
--- a/languages/messages/MessagesKiu.php
+++ b/languages/messages/MessagesKiu.php
@@ -13,6 +13,44 @@
 
 $fallback = 'tr';
 
+$namespaceNames = array(
+	NS_MEDIA            => 'Medya',
+	NS_SPECIAL          => 'Xısusi',
+	NS_TALK             => 'Werênayış',
+	NS_USER             => 'Karber',
+	NS_USER_TALK        => 'Karber_werênayış',
+	NS_PROJECT_TALK     => '$1_werênayış',
+	NS_FILE             => 'Dosye',
+	NS_FILE_TALK        => 'Dosya_werênayış',
+	NS_MEDIAWIKI        => 'MediaWiki',
+	NS_MEDIAWIKI_TALK   => 'MediaWiki_werênayış',
+	NS_TEMPLATE         => 'Şablon',
+	NS_TEMPLATE_TALK    => 'Şablon_werênayış',
+	NS_HELP             => 'Peşti',
+	NS_HELP_TALK        => 'Peşti_werênayış',
+	NS_CATEGORY         => 'Kategoriye',
+	NS_CATEGORY_TALK    => 'Kategori_werênayış',
+);
+
+$namespaceAliases = array(
+	// Turkish namespace names.
+	'Medya'              => NS_MEDIA,
+	'Özel'               => NS_SPECIAL,
+	'Tartışma'           => NS_TALK,
+	'Kullanıcı'          => NS_USER,
+	'Kullanıcı_mesaj'    => NS_USER_TALK,
+	'$1_tartışma'        => NS_PROJECT_TALK,
+	'Dosya'              => NS_FILE,
+	'Dosya_tartışma'     => NS_FILE_TALK,
+	'MediaWiki_tartışma' => NS_MEDIAWIKI_TALK,
+	'Şablon'             => NS_TEMPLATE,
+	'Şablon_tartışma'    => NS_TEMPLATE_TALK,
+	'Yardım'             => NS_HELP,
+	'Yardım_tartışma'    => NS_HELP_TALK,
+	'Kategori'           => NS_CATEGORY,
+	'Kategori_tartışma'  => NS_CATEGORY_TALK,
+);
+
 $messages = array(
 # User preference toggles
 'tog-underline' => 'Bınê girey de xete bonce:',
diff --git a/languages/messages/MessagesKk_arab.php b/languages/messages/MessagesKk_arab.php
index acbf8de007..bf7d35477a 100644
--- a/languages/messages/MessagesKk_arab.php
+++ b/languages/messages/MessagesKk_arab.php
@@ -180,130 +180,130 @@ $dateFormats = array(
  * This array can be modified at runtime with the LanguageGetMagic hook
  */
 $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' ),
-	'currentmonthname'        => array( '1', 'اعىمداعىاياتاۋى', 'АҒЫМДАҒЫАЙАТАУЫ', 'CURRENTMONTHNAME' ),
-	'currentmonthnamegen'     => array( '1', 'اعىمداعىايىلىكاتاۋى', 'АҒЫМДАҒЫАЙІЛІКАТАУЫ', 'CURRENTMONTHNAMEGEN' ),
-	'currentmonthabbrev'      => array( '1', 'اعىمداعىايجىيىر', 'اعىمداعىايقىسقا', 'АҒЫМДАҒЫАЙЖИЫР', 'АҒЫМДАҒЫАЙҚЫСҚА', 'CURRENTMONTHABBREV' ),
-	'currentday'              => array( '1', 'اعىمداعىكۇن', 'АҒЫМДАҒЫКҮН', 'CURRENTDAY' ),
-	'currentday2'             => array( '1', 'اعىمداعىكۇن2', 'АҒЫМДАҒЫКҮН2', 'CURRENTDAY2' ),
-	'currentdayname'          => array( '1', 'اعىمداعىكۇناتاۋى', 'АҒЫМДАҒЫКҮНАТАУЫ', 'CURRENTDAYNAME' ),
-	'currentyear'             => array( '1', 'اعىمداعىجىل', 'АҒЫМДАҒЫЖЫЛ', 'CURRENTYEAR' ),
-	'currenttime'             => array( '1', 'اعىمداعىۋاقىت', 'АҒЫМДАҒЫУАҚЫТ', 'CURRENTTIME' ),
-	'currenthour'             => array( '1', 'اعىمداعىساعات', 'АҒЫМДАҒЫСАҒАТ', 'CURRENTHOUR' ),
-	'localmonth'              => array( '1', 'جەرگىلىكتىاي', 'ЖЕРГІЛІКТІАЙ', 'LOCALMONTH', 'LOCALMONTH2' ),
-	'localmonthname'          => array( '1', 'جەرگىلىكتىاياتاۋى', 'ЖЕРГІЛІКТІАЙАТАУЫ', 'LOCALMONTHNAME' ),
-	'localmonthnamegen'       => array( '1', 'جەرگىلىكتىايىلىكاتاۋى', 'ЖЕРГІЛІКТІАЙІЛІКАТАУЫ', 'LOCALMONTHNAMEGEN' ),
-	'localmonthabbrev'        => array( '1', 'جەرگىلىكتىايجىيىر', 'جەرگىلىكتىايقىسقاشا', 'جەرگىلىكتىايقىسقا', 'ЖЕРГІЛІКТІАЙЖИЫР', 'ЖЕРГІЛІКТІАЙҚЫСҚАША', 'ЖЕРГІЛІКТІАЙҚЫСҚА', 'LOCALMONTHABBREV' ),
-	'localday'                => array( '1', 'جەرگىلىكتىكۇن', 'ЖЕРГІЛІКТІКҮН', 'LOCALDAY' ),
-	'localday2'               => array( '1', 'جەرگىلىكتىكۇن2', 'ЖЕРГІЛІКТІКҮН2', 'LOCALDAY2' ),
-	'localdayname'            => array( '1', 'جەرگىلىكتىكۇناتاۋى', 'ЖЕРГІЛІКТІКҮНАТАУЫ', 'LOCALDAYNAME' ),
-	'localyear'               => array( '1', 'جەرگىلىكتىجىل', 'ЖЕРГІЛІКТІЖЫЛ', 'LOCALYEAR' ),
-	'localtime'               => array( '1', 'جەرگىلىكتىۋاقىت', 'ЖЕРГІЛІКТІУАҚЫТ', 'LOCALTIME' ),
-	'localhour'               => array( '1', 'جەرگىلىكتىساعات', 'ЖЕРГІЛІКТІСАҒАТ', 'LOCALHOUR' ),
-	'numberofpages'           => array( '1', 'بەتسانى', 'БЕТСАНЫ', 'NUMBEROFPAGES' ),
-	'numberofarticles'        => array( '1', 'ماقالاسانى', 'МАҚАЛАСАНЫ', 'NUMBEROFARTICLES' ),
-	'numberoffiles'           => array( '1', 'فايلسانى', 'ФАЙЛСАНЫ', 'NUMBEROFFILES' ),
-	'numberofusers'           => array( '1', 'قاتىسۋشىسانى', 'ҚАТЫСУШЫСАНЫ', 'NUMBEROFUSERS' ),
-	'numberofedits'           => array( '1', 'وڭدەمەسانى', 'تۇزەتۋسانى', 'ӨҢДЕМЕСАНЫ', 'ТҮЗЕТУСАНЫ', 'NUMBEROFEDITS' ),
-	'pagename'                => array( '1', 'بەتاتاۋى', 'БЕТАТАУЫ', 'PAGENAME' ),
-	'pagenamee'               => array( '1', 'بەتاتاۋى2', 'БЕТАТАУЫ2', 'PAGENAMEE' ),
-	'namespace'               => array( '1', 'ەسىماياسى', 'ЕСІМАЯСЫ', 'NAMESPACE' ),
-	'namespacee'              => array( '1', 'ەسىماياسى2', 'ЕСІМАЯСЫ2', 'NAMESPACEE' ),
-	'talkspace'               => array( '1', 'تالقىلاۋاياسى', 'ТАЛҚЫЛАУАЯСЫ', 'TALKSPACE' ),
-	'talkspacee'              => array( '1', 'تالقىلاۋاياسى2', 'ТАЛҚЫЛАУАЯСЫ2', 'TALKSPACEE' ),
-	'subjectspace'            => array( '1', 'تاقىرىپبەتى', 'ماقالابەتى', 'ТАҚЫРЫПБЕТІ', 'МАҚАЛАБЕТІ', 'SUBJECTSPACE', 'ARTICLESPACE' ),
-	'subjectspacee'           => array( '1', 'تاقىرىپبەتى2', 'ماقالابەتى2', 'ТАҚЫРЫПБЕТІ2', 'МАҚАЛАБЕТІ2', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
-	'fullpagename'            => array( '1', 'تولىقبەتاتاۋى', 'ТОЛЫҚБЕТАТАУЫ', 'FULLPAGENAME' ),
-	'fullpagenamee'           => array( '1', 'تولىقبەتاتاۋى2', 'ТОЛЫҚБЕТАТАУЫ2', 'FULLPAGENAMEE' ),
-	'subpagename'             => array( '1', 'بەتشەاتاۋى', 'استىڭعىبەتاتاۋى', 'БЕТШЕАТАУЫ', 'АСТЫҢҒЫБЕТАТАУЫ', 'SUBPAGENAME' ),
-	'subpagenamee'            => array( '1', 'بەتشەاتاۋى2', 'استىڭعىبەتاتاۋى2', 'БЕТШЕАТАУЫ2', 'АСТЫҢҒЫБЕТАТАУЫ2', 'SUBPAGENAMEE' ),
-	'basepagename'            => array( '1', 'نەگىزگىبەتاتاۋى', 'НЕГІЗГІБЕТАТАУЫ', 'BASEPAGENAME' ),
-	'basepagenamee'           => array( '1', 'نەگىزگىبەتاتاۋى2', 'НЕГІЗГІБЕТАТАУЫ2', 'BASEPAGENAMEE' ),
-	'talkpagename'            => array( '1', 'تالقىلاۋبەتاتاۋى', 'ТАЛҚЫЛАУБЕТАТАУЫ', 'TALKPAGENAME' ),
-	'talkpagenamee'           => array( '1', 'تالقىلاۋبەتاتاۋى2', 'ТАЛҚЫЛАУБЕТАТАУЫ2', 'TALKPAGENAMEE' ),
-	'subjectpagename'         => array( '1', 'تاقىرىپبەتاتاۋى', 'ماقالابەتاتاۋى', 'ТАҚЫРЫПБЕТАТАУЫ', 'МАҚАЛАБЕТАТАУЫ', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
-	'subjectpagenamee'        => array( '1', 'تاقىرىپبەتاتاۋى2', 'ماقالابەتاتاۋى2', 'ТАҚЫРЫПБЕТАТАУЫ2', 'МАҚАЛАБЕТАТАУЫ2', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
-	'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_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_page'                => array( '1', 'بەت=$1', 'بەت $1', 'бет=$1', 'бет $1', 'page=$1', 'page $1' ),
-	'img_upright'             => array( '1', 'تىكتى', 'تىكتىك=$1', 'تىكتىك $1', 'тікті', 'тіктік=$1', 'тіктік $1', 'upright', 'upright=$1', 'upright $1' ),
-	'img_border'              => array( '1', 'جىييەكتى', 'жиекті', 'border' ),
-	'img_baseline'            => array( '1', 'تىرەكجول', 'тірекжол', 'baseline' ),
-	'img_sub'                 => array( '1', 'استىلىعى', 'است', 'астылығы', 'аст', 'sub' ),
-	'img_super'               => array( '1', 'ۇستىلىگى', 'ۇست', 'үстілігі', 'үст', 'super', 'sup' ),
-	'img_top'                 => array( '1', 'ۇستىنە', 'үстіне', 'top' ),
-	'img_text_top'            => array( '1', 'ماتىن-ۇستىندە', 'мәтін-үстінде', 'text-top' ),
-	'img_middle'              => array( '1', 'ارالىعىنا', 'аралығына', 'middle' ),
-	'img_bottom'              => array( '1', 'استىنا', 'астына', 'bottom' ),
-	'img_text_bottom'         => array( '1', 'ماتىن-استىندا', 'мәтін-астында', 'text-bottom' ),
-	'int'                     => array( '0', 'ىشكى:', 'ІШКІ:', 'INT:' ),
-	'sitename'                => array( '1', 'توراپاتاۋى', 'ТОРАПАТАУЫ', 'SITENAME' ),
-	'ns'                      => array( '0', 'ەا:', 'ەسىمايا:', 'ЕА:', 'ЕСІМАЯ:', 'NS:' ),
-	'localurl'                => array( '0', 'جەرگىلىكتىجاي:', 'ЖЕРГІЛІКТІЖАЙ:', 'LOCALURL:' ),
-	'localurle'               => array( '0', 'جەرگىلىكتىجاي2:', 'ЖЕРГІЛІКТІЖАЙ2:', 'LOCALURLE:' ),
-	'server'                  => array( '0', 'سەرۆەر', 'СЕРВЕР', 'SERVER' ),
-	'servername'              => array( '0', 'سەرۆەراتاۋى', 'СЕРВЕРАТАУЫ', 'SERVERNAME' ),
-	'scriptpath'              => array( '0', 'امىرجولى', 'ӘМІРЖОЛЫ', 'SCRIPTPATH' ),
-	'grammar'                 => array( '0', 'سەپتىگى:', 'سەپتىك:', 'СЕПТІГІ:', 'СЕПТІК:', 'GRAMMAR:' ),
-	'notitleconvert'          => array( '0', '__تاقىرىپاتىنتۇرلەندىرگىزبەۋ__', '__تاتجوق__', '__اتاۋالماستىرعىزباۋ__', '__ااباۋ__', '__ТАҚЫРЫПАТЫНТҮРЛЕНДІРГІЗБЕУ__', '__ТАТЖОҚ__', '__АТАУАЛМАСТЫРҒЫЗБАУ__', '__ААБАУ__', '__NOTITLECONVERT__', '__NOTC__' ),
-	'nocontentconvert'        => array( '0', '__ماعلۇماتىنتۇرلەندىرگىزبەۋ__', '__ماتجوق__', '__ماعلۇماتالماستىرعىزباۋ__', '__ماباۋ__', '__МАҒЛҰМАТЫНТҮРЛЕНДІРГІЗБЕУ__', '__МАТЖОҚ__', '__МАҒЛҰМАТАЛМАСТЫРҒЫЗБАУ__', '__МАБАУ__', '__NOCONTENTCONVERT__', '__NOCC__' ),
-	'currentweek'             => array( '1', 'اعىمداعىاپتاسى', 'اعىمداعىاپتا', 'АҒЫМДАҒЫАПТАСЫ', 'АҒЫМДАҒЫАПТА', 'CURRENTWEEK' ),
-	'currentdow'              => array( '1', 'اعىمداعىاپتاكۇنى', 'АҒЫМДАҒЫАПТАКҮНІ', 'CURRENTDOW' ),
-	'localweek'               => array( '1', 'جەرگىلىكتىاپتاسى', 'جەرگىلىكتىاپتا', 'ЖЕРГІЛІКТІАПТАСЫ', 'ЖЕРГІЛІКТІАПТА', 'LOCALWEEK' ),
-	'localdow'                => array( '1', 'جەرگىلىكتىاپتاكۇنى', 'ЖЕРГІЛІКТІАПТАКҮНІ', 'LOCALDOW' ),
-	'revisionid'              => array( '1', 'تۇزەتۋنومىرٴى', 'نۇسقانومىرٴى', 'ТҮЗЕТУНӨМІРІ', 'НҰСҚАНӨМІРІ', 'REVISIONID' ),
-	'revisionday'             => array( '1', 'تۇزەتۋكۇنى', 'نۇسقاكۇنى', 'ТҮЗЕТУКҮНІ', 'НҰСҚАКҮНІ', 'REVISIONDAY' ),
-	'revisionday2'            => array( '1', 'تۇزەتۋكۇنى2', 'نۇسقاكۇنى2', 'ТҮЗЕТУКҮНІ2', 'НҰСҚАКҮНІ2', 'REVISIONDAY2' ),
-	'revisionmonth'           => array( '1', 'تۇزەتۋايى', 'نۇسقاايى', 'ТҮЗЕТУАЙЫ', 'НҰСҚААЙЫ', 'REVISIONMONTH' ),
-	'revisionyear'            => array( '1', 'تۇزەتۋجىلى', 'نۇسقاجىلى', 'ТҮЗЕТУЖЫЛЫ', 'НҰСҚАЖЫЛЫ', 'REVISIONYEAR' ),
-	'revisiontimestamp'       => array( '1', 'تۇزەتۋۋاقىتىتاڭباسى', 'نۇسقاۋاقىتتۇيىندەمەسى', 'ТҮЗЕТУУАҚЫТЫТАҢБАСЫ', 'НҰСҚАУАҚЫТТҮЙІНДЕМЕСІ', 'REVISIONTIMESTAMP' ),
-	'plural'                  => array( '0', 'كوپشەتۇرى:', 'كوپشە:', 'КӨПШЕТҮРІ:', 'КӨПШЕ:', 'PLURAL:' ),
-	'fullurl'                 => array( '0', 'تولىقجايى:', 'تولىقجاي:', 'ТОЛЫҚЖАЙЫ:', 'ТОЛЫҚЖАЙ:', 'FULLURL:' ),
-	'fullurle'                => array( '0', 'تولىقجايى2:', 'تولىقجاي2:', 'ТОЛЫҚЖАЙЫ2:', 'ТОЛЫҚЖАЙ2:', 'FULLURLE:' ),
-	'lcfirst'                 => array( '0', 'كا1:', 'كىشىارىپپەن1:', 'КӘ1:', 'КІШІӘРІППЕН1:', 'LCFIRST:' ),
-	'ucfirst'                 => array( '0', 'با1:', 'باسارىپپەن1:', 'БӘ1:', 'БАСӘРІППЕН1:', 'UCFIRST:' ),
-	'lc'                      => array( '0', 'كا:', 'كىشىارىپپەن:', 'КӘ:', 'КІШІӘРІППЕН:', 'LC:' ),
-	'uc'                      => array( '0', 'با:', 'باسارىپپەن:', 'БӘ:', 'БАСӘРІППЕН:', 'UC:' ),
-	'raw'                     => array( '0', 'قام:', 'ҚАМ:', 'RAW:' ),
-	'displaytitle'            => array( '1', 'كورسەتىلەتىناتاۋ', 'КӨРІНЕТІНТАҚЫРЫАПАТЫ', 'КӨРСЕТІЛЕТІНАТАУ', 'DISPLAYTITLE' ),
-	'rawsuffix'               => array( '1', 'ق', 'Қ', 'R' ),
-	'newsectionlink'          => array( '1', '__جاڭابولىمسىلتەمەسى__', '__ЖАҢАБӨЛІМСІЛТЕМЕСІ__', '__NEWSECTIONLINK__' ),
-	'currentversion'          => array( '1', 'باعدارلامانۇسقاسى', 'БАҒДАРЛАМАНҰСҚАСЫ', 'CURRENTVERSION' ),
-	'urlencode'               => array( '0', 'جايدىمۇقامداۋ:', 'ЖАЙДЫМҰҚАМДАУ:', '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' ),
-	'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' ),
+	'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' ),
+	'currentmonthname'          => array( '1', 'اعىمداعىاياتاۋى', 'АҒЫМДАҒЫАЙАТАУЫ', 'CURRENTMONTHNAME' ),
+	'currentmonthnamegen'       => array( '1', 'اعىمداعىايىلىكاتاۋى', 'АҒЫМДАҒЫАЙІЛІКАТАУЫ', 'CURRENTMONTHNAMEGEN' ),
+	'currentmonthabbrev'        => array( '1', 'اعىمداعىايجىيىر', 'اعىمداعىايقىسقا', 'АҒЫМДАҒЫАЙЖИЫР', 'АҒЫМДАҒЫАЙҚЫСҚА', 'CURRENTMONTHABBREV' ),
+	'currentday'                => array( '1', 'اعىمداعىكۇن', 'АҒЫМДАҒЫКҮН', 'CURRENTDAY' ),
+	'currentday2'               => array( '1', 'اعىمداعىكۇن2', 'АҒЫМДАҒЫКҮН2', 'CURRENTDAY2' ),
+	'currentdayname'            => array( '1', 'اعىمداعىكۇناتاۋى', 'АҒЫМДАҒЫКҮНАТАУЫ', 'CURRENTDAYNAME' ),
+	'currentyear'               => array( '1', 'اعىمداعىجىل', 'АҒЫМДАҒЫЖЫЛ', 'CURRENTYEAR' ),
+	'currenttime'               => array( '1', 'اعىمداعىۋاقىت', 'АҒЫМДАҒЫУАҚЫТ', 'CURRENTTIME' ),
+	'currenthour'               => array( '1', 'اعىمداعىساعات', 'АҒЫМДАҒЫСАҒАТ', 'CURRENTHOUR' ),
+	'localmonth'                => array( '1', 'جەرگىلىكتىاي', 'ЖЕРГІЛІКТІАЙ', 'LOCALMONTH', 'LOCALMONTH2' ),
+	'localmonthname'            => array( '1', 'جەرگىلىكتىاياتاۋى', 'ЖЕРГІЛІКТІАЙАТАУЫ', 'LOCALMONTHNAME' ),
+	'localmonthnamegen'         => array( '1', 'جەرگىلىكتىايىلىكاتاۋى', 'ЖЕРГІЛІКТІАЙІЛІКАТАУЫ', 'LOCALMONTHNAMEGEN' ),
+	'localmonthabbrev'          => array( '1', 'جەرگىلىكتىايجىيىر', 'جەرگىلىكتىايقىسقاشا', 'جەرگىلىكتىايقىسقا', 'ЖЕРГІЛІКТІАЙЖИЫР', 'ЖЕРГІЛІКТІАЙҚЫСҚАША', 'ЖЕРГІЛІКТІАЙҚЫСҚА', 'LOCALMONTHABBREV' ),
+	'localday'                  => array( '1', 'جەرگىلىكتىكۇن', 'ЖЕРГІЛІКТІКҮН', 'LOCALDAY' ),
+	'localday2'                 => array( '1', 'جەرگىلىكتىكۇن2', 'ЖЕРГІЛІКТІКҮН2', 'LOCALDAY2' ),
+	'localdayname'              => array( '1', 'جەرگىلىكتىكۇناتاۋى', 'ЖЕРГІЛІКТІКҮНАТАУЫ', 'LOCALDAYNAME' ),
+	'localyear'                 => array( '1', 'جەرگىلىكتىجىل', 'ЖЕРГІЛІКТІЖЫЛ', 'LOCALYEAR' ),
+	'localtime'                 => array( '1', 'جەرگىلىكتىۋاقىت', 'ЖЕРГІЛІКТІУАҚЫТ', 'LOCALTIME' ),
+	'localhour'                 => array( '1', 'جەرگىلىكتىساعات', 'ЖЕРГІЛІКТІСАҒАТ', 'LOCALHOUR' ),
+	'numberofpages'             => array( '1', 'بەتسانى', 'БЕТСАНЫ', 'NUMBEROFPAGES' ),
+	'numberofarticles'          => array( '1', 'ماقالاسانى', 'МАҚАЛАСАНЫ', 'NUMBEROFARTICLES' ),
+	'numberoffiles'             => array( '1', 'فايلسانى', 'ФАЙЛСАНЫ', 'NUMBEROFFILES' ),
+	'numberofusers'             => array( '1', 'قاتىسۋشىسانى', 'ҚАТЫСУШЫСАНЫ', 'NUMBEROFUSERS' ),
+	'numberofedits'             => array( '1', 'وڭدەمەسانى', 'تۇزەتۋسانى', 'ӨҢДЕМЕСАНЫ', 'ТҮЗЕТУСАНЫ', 'NUMBEROFEDITS' ),
+	'pagename'                  => array( '1', 'بەتاتاۋى', 'БЕТАТАУЫ', 'PAGENAME' ),
+	'pagenamee'                 => array( '1', 'بەتاتاۋى2', 'БЕТАТАУЫ2', 'PAGENAMEE' ),
+	'namespace'                 => array( '1', 'ەسىماياسى', 'ЕСІМАЯСЫ', 'NAMESPACE' ),
+	'namespacee'                => array( '1', 'ەسىماياسى2', 'ЕСІМАЯСЫ2', 'NAMESPACEE' ),
+	'talkspace'                 => array( '1', 'تالقىلاۋاياسى', 'ТАЛҚЫЛАУАЯСЫ', 'TALKSPACE' ),
+	'talkspacee'                => array( '1', 'تالقىلاۋاياسى2', 'ТАЛҚЫЛАУАЯСЫ2', 'TALKSPACEE' ),
+	'subjectspace'              => array( '1', 'تاقىرىپبەتى', 'ماقالابەتى', 'ТАҚЫРЫПБЕТІ', 'МАҚАЛАБЕТІ', 'SUBJECTSPACE', 'ARTICLESPACE' ),
+	'subjectspacee'             => array( '1', 'تاقىرىپبەتى2', 'ماقالابەتى2', 'ТАҚЫРЫПБЕТІ2', 'МАҚАЛАБЕТІ2', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
+	'fullpagename'              => array( '1', 'تولىقبەتاتاۋى', 'ТОЛЫҚБЕТАТАУЫ', 'FULLPAGENAME' ),
+	'fullpagenamee'             => array( '1', 'تولىقبەتاتاۋى2', 'ТОЛЫҚБЕТАТАУЫ2', 'FULLPAGENAMEE' ),
+	'subpagename'               => array( '1', 'بەتشەاتاۋى', 'استىڭعىبەتاتاۋى', 'БЕТШЕАТАУЫ', 'АСТЫҢҒЫБЕТАТАУЫ', 'SUBPAGENAME' ),
+	'subpagenamee'              => array( '1', 'بەتشەاتاۋى2', 'استىڭعىبەتاتاۋى2', 'БЕТШЕАТАУЫ2', 'АСТЫҢҒЫБЕТАТАУЫ2', 'SUBPAGENAMEE' ),
+	'basepagename'              => array( '1', 'نەگىزگىبەتاتاۋى', 'НЕГІЗГІБЕТАТАУЫ', 'BASEPAGENAME' ),
+	'basepagenamee'             => array( '1', 'نەگىزگىبەتاتاۋى2', 'НЕГІЗГІБЕТАТАУЫ2', 'BASEPAGENAMEE' ),
+	'talkpagename'              => array( '1', 'تالقىلاۋبەتاتاۋى', 'ТАЛҚЫЛАУБЕТАТАУЫ', 'TALKPAGENAME' ),
+	'talkpagenamee'             => array( '1', 'تالقىلاۋبەتاتاۋى2', 'ТАЛҚЫЛАУБЕТАТАУЫ2', 'TALKPAGENAMEE' ),
+	'subjectpagename'           => array( '1', 'تاقىرىپبەتاتاۋى', 'ماقالابەتاتاۋى', 'ТАҚЫРЫПБЕТАТАУЫ', 'МАҚАЛАБЕТАТАУЫ', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
+	'subjectpagenamee'          => array( '1', 'تاقىرىپبەتاتاۋى2', 'ماقالابەتاتاۋى2', 'ТАҚЫРЫПБЕТАТАУЫ2', 'МАҚАЛАБЕТАТАУЫ2', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
+	'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_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_page'                  => array( '1', 'بەت=$1', 'بەت $1', 'бет=$1', 'бет $1', 'page=$1', 'page $1' ),
+	'img_upright'               => array( '1', 'تىكتى', 'تىكتىك=$1', 'تىكتىك $1', 'тікті', 'тіктік=$1', 'тіктік $1', 'upright', 'upright=$1', 'upright $1' ),
+	'img_border'                => array( '1', 'جىييەكتى', 'жиекті', 'border' ),
+	'img_baseline'              => array( '1', 'تىرەكجول', 'тірекжол', 'baseline' ),
+	'img_sub'                   => array( '1', 'استىلىعى', 'است', 'астылығы', 'аст', 'sub' ),
+	'img_super'                 => array( '1', 'ۇستىلىگى', 'ۇست', 'үстілігі', 'үст', 'super', 'sup' ),
+	'img_top'                   => array( '1', 'ۇستىنە', 'үстіне', 'top' ),
+	'img_text_top'              => array( '1', 'ماتىن-ۇستىندە', 'мәтін-үстінде', 'text-top' ),
+	'img_middle'                => array( '1', 'ارالىعىنا', 'аралығына', 'middle' ),
+	'img_bottom'                => array( '1', 'استىنا', 'астына', 'bottom' ),
+	'img_text_bottom'           => array( '1', 'ماتىن-استىندا', 'мәтін-астында', 'text-bottom' ),
+	'int'                       => array( '0', 'ىشكى:', 'ІШКІ:', 'INT:' ),
+	'sitename'                  => array( '1', 'توراپاتاۋى', 'ТОРАПАТАУЫ', 'SITENAME' ),
+	'ns'                        => array( '0', 'ەا:', 'ەسىمايا:', 'ЕА:', 'ЕСІМАЯ:', 'NS:' ),
+	'localurl'                  => array( '0', 'جەرگىلىكتىجاي:', 'ЖЕРГІЛІКТІЖАЙ:', 'LOCALURL:' ),
+	'localurle'                 => array( '0', 'جەرگىلىكتىجاي2:', 'ЖЕРГІЛІКТІЖАЙ2:', 'LOCALURLE:' ),
+	'server'                    => array( '0', 'سەرۆەر', 'СЕРВЕР', 'SERVER' ),
+	'servername'                => array( '0', 'سەرۆەراتاۋى', 'СЕРВЕРАТАУЫ', 'SERVERNAME' ),
+	'scriptpath'                => array( '0', 'امىرجولى', 'ӘМІРЖОЛЫ', 'SCRIPTPATH' ),
+	'grammar'                   => array( '0', 'سەپتىگى:', 'سەپتىك:', 'СЕПТІГІ:', 'СЕПТІК:', 'GRAMMAR:' ),
+	'notitleconvert'            => array( '0', '__تاقىرىپاتىنتۇرلەندىرگىزبەۋ__', '__تاتجوق__', '__اتاۋالماستىرعىزباۋ__', '__ااباۋ__', '__ТАҚЫРЫПАТЫНТҮРЛЕНДІРГІЗБЕУ__', '__ТАТЖОҚ__', '__АТАУАЛМАСТЫРҒЫЗБАУ__', '__ААБАУ__', '__NOTITLECONVERT__', '__NOTC__' ),
+	'nocontentconvert'          => array( '0', '__ماعلۇماتىنتۇرلەندىرگىزبەۋ__', '__ماتجوق__', '__ماعلۇماتالماستىرعىزباۋ__', '__ماباۋ__', '__МАҒЛҰМАТЫНТҮРЛЕНДІРГІЗБЕУ__', '__МАТЖОҚ__', '__МАҒЛҰМАТАЛМАСТЫРҒЫЗБАУ__', '__МАБАУ__', '__NOCONTENTCONVERT__', '__NOCC__' ),
+	'currentweek'               => array( '1', 'اعىمداعىاپتاسى', 'اعىمداعىاپتا', 'АҒЫМДАҒЫАПТАСЫ', 'АҒЫМДАҒЫАПТА', 'CURRENTWEEK' ),
+	'currentdow'                => array( '1', 'اعىمداعىاپتاكۇنى', 'АҒЫМДАҒЫАПТАКҮНІ', 'CURRENTDOW' ),
+	'localweek'                 => array( '1', 'جەرگىلىكتىاپتاسى', 'جەرگىلىكتىاپتا', 'ЖЕРГІЛІКТІАПТАСЫ', 'ЖЕРГІЛІКТІАПТА', 'LOCALWEEK' ),
+	'localdow'                  => array( '1', 'جەرگىلىكتىاپتاكۇنى', 'ЖЕРГІЛІКТІАПТАКҮНІ', 'LOCALDOW' ),
+	'revisionid'                => array( '1', 'تۇزەتۋنومىرٴى', 'نۇسقانومىرٴى', 'ТҮЗЕТУНӨМІРІ', 'НҰСҚАНӨМІРІ', 'REVISIONID' ),
+	'revisionday'               => array( '1', 'تۇزەتۋكۇنى', 'نۇسقاكۇنى', 'ТҮЗЕТУКҮНІ', 'НҰСҚАКҮНІ', 'REVISIONDAY' ),
+	'revisionday2'              => array( '1', 'تۇزەتۋكۇنى2', 'نۇسقاكۇنى2', 'ТҮЗЕТУКҮНІ2', 'НҰСҚАКҮНІ2', 'REVISIONDAY2' ),
+	'revisionmonth'             => array( '1', 'تۇزەتۋايى', 'نۇسقاايى', 'ТҮЗЕТУАЙЫ', 'НҰСҚААЙЫ', 'REVISIONMONTH' ),
+	'revisionyear'              => array( '1', 'تۇزەتۋجىلى', 'نۇسقاجىلى', 'ТҮЗЕТУЖЫЛЫ', 'НҰСҚАЖЫЛЫ', 'REVISIONYEAR' ),
+	'revisiontimestamp'         => array( '1', 'تۇزەتۋۋاقىتىتاڭباسى', 'نۇسقاۋاقىتتۇيىندەمەسى', 'ТҮЗЕТУУАҚЫТЫТАҢБАСЫ', 'НҰСҚАУАҚЫТТҮЙІНДЕМЕСІ', 'REVISIONTIMESTAMP' ),
+	'plural'                    => array( '0', 'كوپشەتۇرى:', 'كوپشە:', 'КӨПШЕТҮРІ:', 'КӨПШЕ:', 'PLURAL:' ),
+	'fullurl'                   => array( '0', 'تولىقجايى:', 'تولىقجاي:', 'ТОЛЫҚЖАЙЫ:', 'ТОЛЫҚЖАЙ:', 'FULLURL:' ),
+	'fullurle'                  => array( '0', 'تولىقجايى2:', 'تولىقجاي2:', 'ТОЛЫҚЖАЙЫ2:', 'ТОЛЫҚЖАЙ2:', 'FULLURLE:' ),
+	'lcfirst'                   => array( '0', 'كا1:', 'كىشىارىپپەن1:', 'КӘ1:', 'КІШІӘРІППЕН1:', 'LCFIRST:' ),
+	'ucfirst'                   => array( '0', 'با1:', 'باسارىپپەن1:', 'БӘ1:', 'БАСӘРІППЕН1:', 'UCFIRST:' ),
+	'lc'                        => array( '0', 'كا:', 'كىشىارىپپەن:', 'КӘ:', 'КІШІӘРІППЕН:', 'LC:' ),
+	'uc'                        => array( '0', 'با:', 'باسارىپپەن:', 'БӘ:', 'БАСӘРІППЕН:', 'UC:' ),
+	'raw'                       => array( '0', 'قام:', 'ҚАМ:', 'RAW:' ),
+	'displaytitle'              => array( '1', 'كورسەتىلەتىناتاۋ', 'КӨРІНЕТІНТАҚЫРЫАПАТЫ', 'КӨРСЕТІЛЕТІНАТАУ', 'DISPLAYTITLE' ),
+	'rawsuffix'                 => array( '1', 'ق', 'Қ', 'R' ),
+	'newsectionlink'            => array( '1', '__جاڭابولىمسىلتەمەسى__', '__ЖАҢАБӨЛІМСІЛТЕМЕСІ__', '__NEWSECTIONLINK__' ),
+	'currentversion'            => array( '1', 'باعدارلامانۇسقاسى', 'БАҒДАРЛАМАНҰСҚАСЫ', 'CURRENTVERSION' ),
+	'urlencode'                 => array( '0', 'جايدىمۇقامداۋ:', 'ЖАЙДЫМҰҚАМДАУ:', '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' ),
+	'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' ),
 );
 
 $specialPageAliases = array(
diff --git a/languages/messages/MessagesKk_cyrl.php b/languages/messages/MessagesKk_cyrl.php
index 1c042d377f..28dec2189d 100644
--- a/languages/messages/MessagesKk_cyrl.php
+++ b/languages/messages/MessagesKk_cyrl.php
@@ -147,130 +147,130 @@ $dateFormats = 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' ),
-	'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' ),
-	'localmonth'              => array( '1', 'ЖЕРГІЛІКТІАЙ', 'LOCALMONTH', 'LOCALMONTH2' ),
-	'localmonthname'          => array( '1', 'ЖЕРГІЛІКТІАЙАТАУЫ', 'LOCALMONTHNAME' ),
-	'localmonthnamegen'       => array( '1', 'ЖЕРГІЛІКТІАЙІЛІКАТАУЫ', 'LOCALMONTHNAMEGEN' ),
-	'localmonthabbrev'        => array( '1', 'ЖЕРГІЛІКТІАЙЖИЫР', 'ЖЕРГІЛІКТІАЙҚЫСҚАША', 'ЖЕРГІЛІКТІАЙҚЫСҚА', 'LOCALMONTHABBREV' ),
-	'localday'                => array( '1', 'ЖЕРГІЛІКТІКҮН', 'LOCALDAY' ),
-	'localday2'               => array( '1', 'ЖЕРГІЛІКТІКҮН2', 'LOCALDAY2' ),
-	'localdayname'            => array( '1', 'ЖЕРГІЛІКТІКҮНАТАУЫ', 'LOCALDAYNAME' ),
-	'localyear'               => array( '1', 'ЖЕРГІЛІКТІЖЫЛ', 'LOCALYEAR' ),
-	'localtime'               => array( '1', 'ЖЕРГІЛІКТІУАҚЫТ', 'LOCALTIME' ),
-	'localhour'               => array( '1', 'ЖЕРГІЛІКТІСАҒАТ', 'LOCALHOUR' ),
-	'numberofpages'           => array( '1', 'БЕТСАНЫ', 'NUMBEROFPAGES' ),
-	'numberofarticles'        => array( '1', 'МАҚАЛАСАНЫ', 'NUMBEROFARTICLES' ),
-	'numberoffiles'           => array( '1', 'ФАЙЛСАНЫ', 'NUMBEROFFILES' ),
-	'numberofusers'           => array( '1', 'ҚАТЫСУШЫСАНЫ', 'NUMBEROFUSERS' ),
-	'numberofedits'           => array( '1', 'ӨҢДЕМЕСАНЫ', 'ТҮЗЕТУСАНЫ', 'NUMBEROFEDITS' ),
-	'pagename'                => array( '1', 'БЕТАТАУЫ', 'PAGENAME' ),
-	'pagenamee'               => array( '1', 'БЕТАТАУЫ2', 'PAGENAMEE' ),
-	'namespace'               => array( '1', 'ЕСІМАЯСЫ', 'NAMESPACE' ),
-	'namespacee'              => array( '1', 'ЕСІМАЯСЫ2', 'NAMESPACEE' ),
-	'talkspace'               => array( '1', 'ТАЛҚЫЛАУАЯСЫ', 'TALKSPACE' ),
-	'talkspacee'              => array( '1', 'ТАЛҚЫЛАУАЯСЫ2', 'TALKSPACEE' ),
-	'subjectspace'            => array( '1', 'ТАҚЫРЫПБЕТІ', 'МАҚАЛАБЕТІ', 'SUBJECTSPACE', 'ARTICLESPACE' ),
-	'subjectspacee'           => array( '1', 'ТАҚЫРЫПБЕТІ2', 'МАҚАЛАБЕТІ2', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
-	'fullpagename'            => array( '1', 'ТОЛЫҚБЕТАТАУЫ', 'FULLPAGENAME' ),
-	'fullpagenamee'           => array( '1', 'ТОЛЫҚБЕТАТАУЫ2', 'FULLPAGENAMEE' ),
-	'subpagename'             => array( '1', 'БЕТШЕАТАУЫ', 'АСТЫҢҒЫБЕТАТАУЫ', 'SUBPAGENAME' ),
-	'subpagenamee'            => array( '1', 'БЕТШЕАТАУЫ2', 'АСТЫҢҒЫБЕТАТАУЫ2', 'SUBPAGENAMEE' ),
-	'basepagename'            => array( '1', 'НЕГІЗГІБЕТАТАУЫ', 'BASEPAGENAME' ),
-	'basepagenamee'           => array( '1', 'НЕГІЗГІБЕТАТАУЫ2', 'BASEPAGENAMEE' ),
-	'talkpagename'            => array( '1', 'ТАЛҚЫЛАУБЕТАТАУЫ', 'TALKPAGENAME' ),
-	'talkpagenamee'           => array( '1', 'ТАЛҚЫЛАУБЕТАТАУЫ2', 'TALKPAGENAMEE' ),
-	'subjectpagename'         => array( '1', 'ТАҚЫРЫПБЕТАТАУЫ', 'МАҚАЛАБЕТАТАУЫ', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
-	'subjectpagenamee'        => array( '1', 'ТАҚЫРЫПБЕТАТАУЫ2', 'МАҚАЛАБЕТАТАУЫ2', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
-	'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 нүкте', '$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_upright'             => array( '1', 'тікті', 'тіктік=$1', 'тіктік $1', 'upright', 'upright=$1', 'upright $1' ),
-	'img_border'              => array( '1', 'жиекті', 'border' ),
-	'img_baseline'            => array( '1', 'тірекжол', 'baseline' ),
-	'img_sub'                 => array( '1', 'астылығы', 'аст', 'sub' ),
-	'img_super'               => array( '1', 'үстілігі', 'үст', 'super', 'sup' ),
-	'img_top'                 => array( '1', 'үстіне', 'top' ),
-	'img_text_top'            => array( '1', 'мәтін-үстінде', 'text-top' ),
-	'img_middle'              => array( '1', 'аралығына', 'middle' ),
-	'img_bottom'              => array( '1', 'астына', 'bottom' ),
-	'img_text_bottom'         => array( '1', 'мәтін-астында', 'text-bottom' ),
-	'int'                     => array( '0', 'ІШКІ:', 'INT:' ),
-	'sitename'                => array( '1', 'ТОРАПАТАУЫ', 'SITENAME' ),
-	'ns'                      => array( '0', 'ЕА:', 'ЕСІМАЯ:', 'NS:' ),
-	'localurl'                => array( '0', 'ЖЕРГІЛІКТІЖАЙ:', 'LOCALURL:' ),
-	'localurle'               => array( '0', 'ЖЕРГІЛІКТІЖАЙ2:', 'LOCALURLE:' ),
-	'server'                  => array( '0', 'СЕРВЕР', 'SERVER' ),
-	'servername'              => array( '0', 'СЕРВЕРАТАУЫ', 'SERVERNAME' ),
-	'scriptpath'              => array( '0', 'ӘМІРЖОЛЫ', 'SCRIPTPATH' ),
-	'grammar'                 => array( '0', 'СЕПТІГІ:', 'СЕПТІК:', 'GRAMMAR:' ),
-	'notitleconvert'          => array( '0', '__ТАҚЫРЫПАТЫНТҮРЛЕНДІРГІЗБЕУ__', '__ТАТЖОҚ__', '__АТАУАЛМАСТЫРҒЫЗБАУ__', '__ААБАУ__', '__NOTITLECONVERT__', '__NOTC__' ),
-	'nocontentconvert'        => array( '0', '__МАҒЛҰМАТЫНТҮРЛЕНДІРГІЗБЕУ__', '__МАТЖОҚ__', '__МАҒЛҰМАТАЛМАСТЫРҒЫЗБАУ__', '__МАБАУ__', '__NOCONTENTCONVERT__', '__NOCC__' ),
-	'currentweek'             => array( '1', 'АҒЫМДАҒЫАПТАСЫ', 'АҒЫМДАҒЫАПТА', 'CURRENTWEEK' ),
-	'currentdow'              => array( '1', 'АҒЫМДАҒЫАПТАКҮНІ', 'CURRENTDOW' ),
-	'localweek'               => array( '1', 'ЖЕРГІЛІКТІАПТАСЫ', 'ЖЕРГІЛІКТІАПТА', 'LOCALWEEK' ),
-	'localdow'                => array( '1', 'ЖЕРГІЛІКТІАПТАКҮНІ', 'LOCALDOW' ),
-	'revisionid'              => array( '1', 'ТҮЗЕТУНӨМІРІ', 'НҰСҚАНӨМІРІ', 'REVISIONID' ),
-	'revisionday'             => array( '1', 'ТҮЗЕТУКҮНІ', 'НҰСҚАКҮНІ', 'REVISIONDAY' ),
-	'revisionday2'            => array( '1', 'ТҮЗЕТУКҮНІ2', 'НҰСҚАКҮНІ2', 'REVISIONDAY2' ),
-	'revisionmonth'           => array( '1', 'ТҮЗЕТУАЙЫ', 'НҰСҚААЙЫ', 'REVISIONMONTH' ),
-	'revisionyear'            => array( '1', 'ТҮЗЕТУЖЫЛЫ', 'НҰСҚАЖЫЛЫ', 'REVISIONYEAR' ),
-	'revisiontimestamp'       => array( '1', 'ТҮЗЕТУУАҚЫТЫТАҢБАСЫ', 'НҰСҚАУАҚЫТТҮЙІНДЕМЕСІ', 'REVISIONTIMESTAMP' ),
-	'plural'                  => array( '0', 'КӨПШЕТҮРІ:', 'КӨПШЕ:', 'PLURAL:' ),
-	'fullurl'                 => array( '0', 'ТОЛЫҚЖАЙЫ:', 'ТОЛЫҚЖАЙ:', 'FULLURL:' ),
-	'fullurle'                => array( '0', 'ТОЛЫҚЖАЙЫ2:', 'ТОЛЫҚЖАЙ2:', 'FULLURLE:' ),
-	'lcfirst'                 => array( '0', 'КӘ1:', 'КІШІӘРІППЕН1:', 'LCFIRST:' ),
-	'ucfirst'                 => array( '0', 'БӘ1:', 'БАСӘРІППЕН1:', 'UCFIRST:' ),
-	'lc'                      => array( '0', 'КӘ:', 'КІШІӘРІППЕН:', 'LC:' ),
-	'uc'                      => array( '0', 'БӘ:', 'БАСӘРІППЕН:', 'UC:' ),
-	'raw'                     => array( '0', 'ҚАМ:', 'RAW:' ),
-	'displaytitle'            => array( '1', 'КӨРІНЕТІНТАҚЫРЫАПАТЫ', 'КӨРСЕТІЛЕТІНАТАУ', 'DISPLAYTITLE' ),
-	'rawsuffix'               => array( '1', 'Қ', 'R' ),
-	'newsectionlink'          => array( '1', '__ЖАҢАБӨЛІМСІЛТЕМЕСІ__', '__NEWSECTIONLINK__' ),
-	'currentversion'          => array( '1', 'БАҒДАРЛАМАНҰСҚАСЫ', 'CURRENTVERSION' ),
-	'urlencode'               => array( '0', 'ЖАЙДЫМҰҚАМДАУ:', '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' ),
-	'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' ),
+	'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' ),
+	'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' ),
+	'localmonth'                => array( '1', 'ЖЕРГІЛІКТІАЙ', 'LOCALMONTH', 'LOCALMONTH2' ),
+	'localmonthname'            => array( '1', 'ЖЕРГІЛІКТІАЙАТАУЫ', 'LOCALMONTHNAME' ),
+	'localmonthnamegen'         => array( '1', 'ЖЕРГІЛІКТІАЙІЛІКАТАУЫ', 'LOCALMONTHNAMEGEN' ),
+	'localmonthabbrev'          => array( '1', 'ЖЕРГІЛІКТІАЙЖИЫР', 'ЖЕРГІЛІКТІАЙҚЫСҚАША', 'ЖЕРГІЛІКТІАЙҚЫСҚА', 'LOCALMONTHABBREV' ),
+	'localday'                  => array( '1', 'ЖЕРГІЛІКТІКҮН', 'LOCALDAY' ),
+	'localday2'                 => array( '1', 'ЖЕРГІЛІКТІКҮН2', 'LOCALDAY2' ),
+	'localdayname'              => array( '1', 'ЖЕРГІЛІКТІКҮНАТАУЫ', 'LOCALDAYNAME' ),
+	'localyear'                 => array( '1', 'ЖЕРГІЛІКТІЖЫЛ', 'LOCALYEAR' ),
+	'localtime'                 => array( '1', 'ЖЕРГІЛІКТІУАҚЫТ', 'LOCALTIME' ),
+	'localhour'                 => array( '1', 'ЖЕРГІЛІКТІСАҒАТ', 'LOCALHOUR' ),
+	'numberofpages'             => array( '1', 'БЕТСАНЫ', 'NUMBEROFPAGES' ),
+	'numberofarticles'          => array( '1', 'МАҚАЛАСАНЫ', 'NUMBEROFARTICLES' ),
+	'numberoffiles'             => array( '1', 'ФАЙЛСАНЫ', 'NUMBEROFFILES' ),
+	'numberofusers'             => array( '1', 'ҚАТЫСУШЫСАНЫ', 'NUMBEROFUSERS' ),
+	'numberofedits'             => array( '1', 'ӨҢДЕМЕСАНЫ', 'ТҮЗЕТУСАНЫ', 'NUMBEROFEDITS' ),
+	'pagename'                  => array( '1', 'БЕТАТАУЫ', 'PAGENAME' ),
+	'pagenamee'                 => array( '1', 'БЕТАТАУЫ2', 'PAGENAMEE' ),
+	'namespace'                 => array( '1', 'ЕСІМАЯСЫ', 'NAMESPACE' ),
+	'namespacee'                => array( '1', 'ЕСІМАЯСЫ2', 'NAMESPACEE' ),
+	'talkspace'                 => array( '1', 'ТАЛҚЫЛАУАЯСЫ', 'TALKSPACE' ),
+	'talkspacee'                => array( '1', 'ТАЛҚЫЛАУАЯСЫ2', 'TALKSPACEE' ),
+	'subjectspace'              => array( '1', 'ТАҚЫРЫПБЕТІ', 'МАҚАЛАБЕТІ', 'SUBJECTSPACE', 'ARTICLESPACE' ),
+	'subjectspacee'             => array( '1', 'ТАҚЫРЫПБЕТІ2', 'МАҚАЛАБЕТІ2', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
+	'fullpagename'              => array( '1', 'ТОЛЫҚБЕТАТАУЫ', 'FULLPAGENAME' ),
+	'fullpagenamee'             => array( '1', 'ТОЛЫҚБЕТАТАУЫ2', 'FULLPAGENAMEE' ),
+	'subpagename'               => array( '1', 'БЕТШЕАТАУЫ', 'АСТЫҢҒЫБЕТАТАУЫ', 'SUBPAGENAME' ),
+	'subpagenamee'              => array( '1', 'БЕТШЕАТАУЫ2', 'АСТЫҢҒЫБЕТАТАУЫ2', 'SUBPAGENAMEE' ),
+	'basepagename'              => array( '1', 'НЕГІЗГІБЕТАТАУЫ', 'BASEPAGENAME' ),
+	'basepagenamee'             => array( '1', 'НЕГІЗГІБЕТАТАУЫ2', 'BASEPAGENAMEE' ),
+	'talkpagename'              => array( '1', 'ТАЛҚЫЛАУБЕТАТАУЫ', 'TALKPAGENAME' ),
+	'talkpagenamee'             => array( '1', 'ТАЛҚЫЛАУБЕТАТАУЫ2', 'TALKPAGENAMEE' ),
+	'subjectpagename'           => array( '1', 'ТАҚЫРЫПБЕТАТАУЫ', 'МАҚАЛАБЕТАТАУЫ', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
+	'subjectpagenamee'          => array( '1', 'ТАҚЫРЫПБЕТАТАУЫ2', 'МАҚАЛАБЕТАТАУЫ2', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
+	'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 нүкте', '$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_upright'               => array( '1', 'тікті', 'тіктік=$1', 'тіктік $1', 'upright', 'upright=$1', 'upright $1' ),
+	'img_border'                => array( '1', 'жиекті', 'border' ),
+	'img_baseline'              => array( '1', 'тірекжол', 'baseline' ),
+	'img_sub'                   => array( '1', 'астылығы', 'аст', 'sub' ),
+	'img_super'                 => array( '1', 'үстілігі', 'үст', 'super', 'sup' ),
+	'img_top'                   => array( '1', 'үстіне', 'top' ),
+	'img_text_top'              => array( '1', 'мәтін-үстінде', 'text-top' ),
+	'img_middle'                => array( '1', 'аралығына', 'middle' ),
+	'img_bottom'                => array( '1', 'астына', 'bottom' ),
+	'img_text_bottom'           => array( '1', 'мәтін-астында', 'text-bottom' ),
+	'int'                       => array( '0', 'ІШКІ:', 'INT:' ),
+	'sitename'                  => array( '1', 'ТОРАПАТАУЫ', 'SITENAME' ),
+	'ns'                        => array( '0', 'ЕА:', 'ЕСІМАЯ:', 'NS:' ),
+	'localurl'                  => array( '0', 'ЖЕРГІЛІКТІЖАЙ:', 'LOCALURL:' ),
+	'localurle'                 => array( '0', 'ЖЕРГІЛІКТІЖАЙ2:', 'LOCALURLE:' ),
+	'server'                    => array( '0', 'СЕРВЕР', 'SERVER' ),
+	'servername'                => array( '0', 'СЕРВЕРАТАУЫ', 'SERVERNAME' ),
+	'scriptpath'                => array( '0', 'ӘМІРЖОЛЫ', 'SCRIPTPATH' ),
+	'grammar'                   => array( '0', 'СЕПТІГІ:', 'СЕПТІК:', 'GRAMMAR:' ),
+	'notitleconvert'            => array( '0', '__ТАҚЫРЫПАТЫНТҮРЛЕНДІРГІЗБЕУ__', '__ТАТЖОҚ__', '__АТАУАЛМАСТЫРҒЫЗБАУ__', '__ААБАУ__', '__NOTITLECONVERT__', '__NOTC__' ),
+	'nocontentconvert'          => array( '0', '__МАҒЛҰМАТЫНТҮРЛЕНДІРГІЗБЕУ__', '__МАТЖОҚ__', '__МАҒЛҰМАТАЛМАСТЫРҒЫЗБАУ__', '__МАБАУ__', '__NOCONTENTCONVERT__', '__NOCC__' ),
+	'currentweek'               => array( '1', 'АҒЫМДАҒЫАПТАСЫ', 'АҒЫМДАҒЫАПТА', 'CURRENTWEEK' ),
+	'currentdow'                => array( '1', 'АҒЫМДАҒЫАПТАКҮНІ', 'CURRENTDOW' ),
+	'localweek'                 => array( '1', 'ЖЕРГІЛІКТІАПТАСЫ', 'ЖЕРГІЛІКТІАПТА', 'LOCALWEEK' ),
+	'localdow'                  => array( '1', 'ЖЕРГІЛІКТІАПТАКҮНІ', 'LOCALDOW' ),
+	'revisionid'                => array( '1', 'ТҮЗЕТУНӨМІРІ', 'НҰСҚАНӨМІРІ', 'REVISIONID' ),
+	'revisionday'               => array( '1', 'ТҮЗЕТУКҮНІ', 'НҰСҚАКҮНІ', 'REVISIONDAY' ),
+	'revisionday2'              => array( '1', 'ТҮЗЕТУКҮНІ2', 'НҰСҚАКҮНІ2', 'REVISIONDAY2' ),
+	'revisionmonth'             => array( '1', 'ТҮЗЕТУАЙЫ', 'НҰСҚААЙЫ', 'REVISIONMONTH' ),
+	'revisionyear'              => array( '1', 'ТҮЗЕТУЖЫЛЫ', 'НҰСҚАЖЫЛЫ', 'REVISIONYEAR' ),
+	'revisiontimestamp'         => array( '1', 'ТҮЗЕТУУАҚЫТЫТАҢБАСЫ', 'НҰСҚАУАҚЫТТҮЙІНДЕМЕСІ', 'REVISIONTIMESTAMP' ),
+	'plural'                    => array( '0', 'КӨПШЕТҮРІ:', 'КӨПШЕ:', 'PLURAL:' ),
+	'fullurl'                   => array( '0', 'ТОЛЫҚЖАЙЫ:', 'ТОЛЫҚЖАЙ:', 'FULLURL:' ),
+	'fullurle'                  => array( '0', 'ТОЛЫҚЖАЙЫ2:', 'ТОЛЫҚЖАЙ2:', 'FULLURLE:' ),
+	'lcfirst'                   => array( '0', 'КӘ1:', 'КІШІӘРІППЕН1:', 'LCFIRST:' ),
+	'ucfirst'                   => array( '0', 'БӘ1:', 'БАСӘРІППЕН1:', 'UCFIRST:' ),
+	'lc'                        => array( '0', 'КӘ:', 'КІШІӘРІППЕН:', 'LC:' ),
+	'uc'                        => array( '0', 'БӘ:', 'БАСӘРІППЕН:', 'UC:' ),
+	'raw'                       => array( '0', 'ҚАМ:', 'RAW:' ),
+	'displaytitle'              => array( '1', 'КӨРІНЕТІНТАҚЫРЫАПАТЫ', 'КӨРСЕТІЛЕТІНАТАУ', 'DISPLAYTITLE' ),
+	'rawsuffix'                 => array( '1', 'Қ', 'R' ),
+	'newsectionlink'            => array( '1', '__ЖАҢАБӨЛІМСІЛТЕМЕСІ__', '__NEWSECTIONLINK__' ),
+	'currentversion'            => array( '1', 'БАҒДАРЛАМАНҰСҚАСЫ', 'CURRENTVERSION' ),
+	'urlencode'                 => array( '0', 'ЖАЙДЫМҰҚАМДАУ:', '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' ),
+	'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' ),
 );
 
 $specialPageAliases = array(
diff --git a/languages/messages/MessagesKk_latn.php b/languages/messages/MessagesKk_latn.php
index 82b4cfb447..c2524b7c57 100644
--- a/languages/messages/MessagesKk_latn.php
+++ b/languages/messages/MessagesKk_latn.php
@@ -146,129 +146,129 @@ $dateFormats = array(
 );
 
 $magicWords = array(
-	'redirect'                => array( '0', '#AÝDAW', '#АЙДАУ', '#REDIRECT' ),
-	'notoc'                   => array( '0', '__MAZMUNSIZ__', '__MSIZ__', '__МАЗМҰНСЫЗ__', '__МСЫЗ__', '__NOTOC__' ),
-	'nogallery'               => array( '0', '__QOÝMASIZ__', '__QSIZ__', '__ҚОЙМАСЫЗ__', '__ҚСЫЗ__', '__NOGALLERY__' ),
-	'forcetoc'                => array( '0', '__MAZMUNDATQIZW__', '__MQIZW__', '__МАЗМҰНДАТҚЫЗУ__', '__МҚЫЗУ__', '__FORCETOC__' ),
-	'toc'                     => array( '0', '__MAZMUNI__', '__MZMN__', '__МАЗМҰНЫ__', '__МЗМН__', '__TOC__' ),
-	'noeditsection'           => array( '0', '__BÖLİDİMÖNDEMEW__', '__BÖLİMÖNDETKİZBEW__', '__БӨЛІДІМӨНДЕМЕУ__', '__БӨЛІМӨНДЕТКІЗБЕУ__', '__NOEDITSECTION__' ),
-	'currentmonth'            => array( '1', 'AĞIMDAĞIAÝ', 'АҒЫМДАҒЫАЙ', 'CURRENTMONTH', 'CURRENTMONTH2' ),
-	'currentmonthname'        => array( '1', 'AĞIMDAĞIAÝATAWI', 'АҒЫМДАҒЫАЙАТАУЫ', 'CURRENTMONTHNAME' ),
-	'currentmonthnamegen'     => array( '1', 'AĞIMDAĞIAÝİLİKATAWI', 'АҒЫМДАҒЫАЙІЛІКАТАУЫ', 'CURRENTMONTHNAMEGEN' ),
-	'currentmonthabbrev'      => array( '1', 'AĞIMDAĞIAÝJÏIR', 'AĞIMDAĞIAÝQISQA', 'АҒЫМДАҒЫАЙЖИЫР', 'АҒЫМДАҒЫАЙҚЫСҚА', 'CURRENTMONTHABBREV' ),
-	'currentday'              => array( '1', 'AĞIMDAĞIKÜN', 'АҒЫМДАҒЫКҮН', 'CURRENTDAY' ),
-	'currentday2'             => array( '1', 'AĞIMDAĞIKÜN2', 'АҒЫМДАҒЫКҮН2', 'CURRENTDAY2' ),
-	'currentdayname'          => array( '1', 'AĞIMDAĞIKÜNATAWI', 'АҒЫМДАҒЫКҮНАТАУЫ', 'CURRENTDAYNAME' ),
-	'currentyear'             => array( '1', 'AĞIMDAĞIJIL', 'АҒЫМДАҒЫЖЫЛ', 'CURRENTYEAR' ),
-	'currenttime'             => array( '1', 'AĞIMDAĞIWAQIT', 'АҒЫМДАҒЫУАҚЫТ', 'CURRENTTIME' ),
-	'currenthour'             => array( '1', 'AĞIMDAĞISAĞAT', 'АҒЫМДАҒЫСАҒАТ', 'CURRENTHOUR' ),
-	'localmonth'              => array( '1', 'JERGİLİKTİAÝ', 'ЖЕРГІЛІКТІАЙ', 'LOCALMONTH', 'LOCALMONTH2' ),
-	'localmonthname'          => array( '1', 'JERGİLİKTİAÝATAWI', 'ЖЕРГІЛІКТІАЙАТАУЫ', 'LOCALMONTHNAME' ),
-	'localmonthnamegen'       => array( '1', 'JERGİLİKTİAÝİLİKATAWI', 'ЖЕРГІЛІКТІАЙІЛІКАТАУЫ', 'LOCALMONTHNAMEGEN' ),
-	'localmonthabbrev'        => array( '1', 'JERGİLİKTİAÝJÏIR', 'JERGİLİKTİAÝQISQAŞA', 'JERGİLİKTİAÝQISQA', 'ЖЕРГІЛІКТІАЙЖИЫР', 'ЖЕРГІЛІКТІАЙҚЫСҚАША', 'ЖЕРГІЛІКТІАЙҚЫСҚА', 'LOCALMONTHABBREV' ),
-	'localday'                => array( '1', 'JERGİLİKTİKÜN', 'ЖЕРГІЛІКТІКҮН', 'LOCALDAY' ),
-	'localday2'               => array( '1', 'JERGİLİKTİKÜN2', 'ЖЕРГІЛІКТІКҮН2', 'LOCALDAY2' ),
-	'localdayname'            => array( '1', 'JERGİLİKTİKÜNATAWI', 'ЖЕРГІЛІКТІКҮНАТАУЫ', 'LOCALDAYNAME' ),
-	'localyear'               => array( '1', 'JERGİLİKTİJIL', 'ЖЕРГІЛІКТІЖЫЛ', 'LOCALYEAR' ),
-	'localtime'               => array( '1', 'JERGİLİKTİWAQIT', 'ЖЕРГІЛІКТІУАҚЫТ', 'LOCALTIME' ),
-	'localhour'               => array( '1', 'JERGİLİKTİSAĞAT', 'ЖЕРГІЛІКТІСАҒАТ', 'LOCALHOUR' ),
-	'numberofpages'           => array( '1', 'BETSANI', 'БЕТСАНЫ', 'NUMBEROFPAGES' ),
-	'numberofarticles'        => array( '1', 'MAQALASANI', 'МАҚАЛАСАНЫ', 'NUMBEROFARTICLES' ),
-	'numberoffiles'           => array( '1', 'FAÝLSANI', 'ФАЙЛСАНЫ', 'NUMBEROFFILES' ),
-	'numberofusers'           => array( '1', 'QATISWŞISANI', 'ҚАТЫСУШЫСАНЫ', 'NUMBEROFUSERS' ),
-	'numberofedits'           => array( '1', 'ÖÑDEMESANI', 'TÜZETWSANI', 'ӨҢДЕМЕСАНЫ', 'ТҮЗЕТУСАНЫ', 'NUMBEROFEDITS' ),
-	'pagename'                => array( '1', 'BETATAWI', 'БЕТАТАУЫ', 'PAGENAME' ),
-	'pagenamee'               => array( '1', 'BETATAWI2', 'БЕТАТАУЫ2', 'PAGENAMEE' ),
-	'namespace'               => array( '1', 'ESİMAYASI', 'ЕСІМАЯСЫ', 'NAMESPACE' ),
-	'namespacee'              => array( '1', 'ESİMAYASI2', 'ЕСІМАЯСЫ2', 'NAMESPACEE' ),
-	'talkspace'               => array( '1', 'TALQILAWAYASI', 'ТАЛҚЫЛАУАЯСЫ', 'TALKSPACE' ),
-	'talkspacee'              => array( '1', 'TALQILAWAYASI2', 'ТАЛҚЫЛАУАЯСЫ2', 'TALKSPACEE' ),
-	'subjectspace'            => array( '1', 'TAQIRIPBETİ', 'MAQALABETİ', 'ТАҚЫРЫПБЕТІ', 'МАҚАЛАБЕТІ', 'SUBJECTSPACE', 'ARTICLESPACE' ),
-	'subjectspacee'           => array( '1', 'TAQIRIPBETİ2', 'MAQALABETİ2', 'ТАҚЫРЫПБЕТІ2', 'МАҚАЛАБЕТІ2', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
-	'fullpagename'            => array( '1', 'TOLIQBETATAWI', 'ТОЛЫҚБЕТАТАУЫ', 'FULLPAGENAME' ),
-	'fullpagenamee'           => array( '1', 'TOLIQBETATAWI2', 'ТОЛЫҚБЕТАТАУЫ2', 'FULLPAGENAMEE' ),
-	'subpagename'             => array( '1', 'BETŞEATAWI', 'ASTIÑĞIBETATAWI', 'БЕТШЕАТАУЫ', 'АСТЫҢҒЫБЕТАТАУЫ', 'SUBPAGENAME' ),
-	'subpagenamee'            => array( '1', 'BETŞEATAWI2', 'ASTIÑĞIBETATAWI2', 'БЕТШЕАТАУЫ2', 'АСТЫҢҒЫБЕТАТАУЫ2', 'SUBPAGENAMEE' ),
-	'basepagename'            => array( '1', 'NEGİZGİBETATAWI', 'НЕГІЗГІБЕТАТАУЫ', 'BASEPAGENAME' ),
-	'basepagenamee'           => array( '1', 'NEGİZGİBETATAWI2', 'НЕГІЗГІБЕТАТАУЫ2', 'BASEPAGENAMEE' ),
-	'talkpagename'            => array( '1', 'TALQILAWBETATAWI', 'ТАЛҚЫЛАУБЕТАТАУЫ', 'TALKPAGENAME' ),
-	'talkpagenamee'           => array( '1', 'TALQILAWBETATAWI2', 'ТАЛҚЫЛАУБЕТАТАУЫ2', 'TALKPAGENAMEE' ),
-	'subjectpagename'         => array( '1', 'TAQIRIPBETATAWI', 'MAQALABETATAWI', 'ТАҚЫРЫПБЕТАТАУЫ', 'МАҚАЛАБЕТАТАУЫ', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
-	'subjectpagenamee'        => array( '1', 'TAQIRIPBETATAWI2', 'MAQALABETATAWI2', 'ТАҚЫРЫПБЕТАТАУЫ2', 'МАҚАЛАБЕТАТАУЫ2', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
-	'msg'                     => array( '0', 'XBR:', 'ХБР:', 'MSG:' ),
-	'subst'                   => array( '0', 'BÄDEL:', 'БӘДЕЛ:', 'SUBST:' ),
-	'msgnw'                   => array( '0', 'WÏKÏSİZXBR:', 'УИКИСІЗХБР:', 'MSGNW:' ),
-	'img_thumbnail'           => array( '1', 'nobaý', 'нобай', 'thumbnail', 'thumb' ),
-	'img_manualthumb'         => array( '1', 'nobaý=$1', 'нобай=$1', 'thumbnail=$1', 'thumb=$1' ),
-	'img_right'               => array( '1', 'oñğa', 'oñ', 'оңға', 'оң', 'right' ),
-	'img_left'                => array( '1', 'solğa', 'sol', 'солға', 'сол', 'left' ),
-	'img_none'                => array( '1', 'eşqandaý', 'joq', 'ешқандай', 'жоқ', 'none' ),
-	'img_width'               => array( '1', '$1 nükte', '$1 нүкте', '$1px' ),
-	'img_center'              => array( '1', 'ortağa', 'orta', 'ортаға', 'орта', 'center', 'centre' ),
-	'img_framed'              => array( '1', 'sürmeli', 'сүрмелі', 'framed', 'enframed', 'frame' ),
-	'img_frameless'           => array( '1', 'sürmesiz', 'сүрмесіз', 'frameless' ),
-	'img_page'                => array( '1', 'bet=$1', 'bet $1', 'бет=$1', 'бет $1', 'page=$1', 'page $1' ),
-	'img_upright'             => array( '1', 'tikti', 'tiktik=$1', 'tiktik $1', 'тікті', 'тіктік=$1', 'тіктік $1', 'upright', 'upright=$1', 'upright $1' ),
-	'img_border'              => array( '1', 'jïekti', 'жиекті', 'border' ),
-	'img_baseline'            => array( '1', 'tirekjol', 'тірекжол', 'baseline' ),
-	'img_sub'                 => array( '1', 'astılığı', 'ast', 'астылығы', 'аст', 'sub' ),
-	'img_super'               => array( '1', 'üstiligi', 'üst', 'үстілігі', 'үст', 'super', 'sup' ),
-	'img_top'                 => array( '1', 'üstine', 'үстіне', 'top' ),
-	'img_text_top'            => array( '1', 'mätin-üstinde', 'мәтін-үстінде', 'text-top' ),
-	'img_middle'              => array( '1', 'aralığına', 'аралығына', 'middle' ),
-	'img_bottom'              => array( '1', 'astına', 'астына', 'bottom' ),
-	'img_text_bottom'         => array( '1', 'mätin-astında', 'мәтін-астында', 'text-bottom' ),
-	'int'                     => array( '0', 'İŞKİ:', 'ІШКІ:', 'INT:' ),
-	'sitename'                => array( '1', 'TORAPATAWI', 'ТОРАПАТАУЫ', 'SITENAME' ),
-	'ns'                      => array( '0', 'EA:', 'ESİMAYA:', 'ЕА:', 'ЕСІМАЯ:', 'NS:' ),
-	'localurl'                => array( '0', 'JERGİLİKTİJAÝ:', 'ЖЕРГІЛІКТІЖАЙ:', 'LOCALURL:' ),
-	'localurle'               => array( '0', 'JERGİLİKTİJAÝ2:', 'ЖЕРГІЛІКТІЖАЙ2:', 'LOCALURLE:' ),
-	'servername'              => array( '0', 'SERVERATAWI', 'СЕРВЕРАТАУЫ', 'SERVERNAME' ),
-	'scriptpath'              => array( '0', 'ÄMİRJOLI', 'ӘМІРЖОЛЫ', 'SCRIPTPATH' ),
-	'grammar'                 => array( '0', 'SEPTİGİ:', 'SEPTİK:', 'СЕПТІГІ:', 'СЕПТІК:', 'GRAMMAR:' ),
-	'notitleconvert'          => array( '0', '__TAQIRIPATINTÜRLENDİRGİZBEW__', '__TATJOQ__', '__ATAWALMASTIRĞIZBAW__', '__AABAW__', '__ТАҚЫРЫПАТЫНТҮРЛЕНДІРГІЗБЕУ__', '__ТАТЖОҚ__', '__АТАУАЛМАСТЫРҒЫЗБАУ__', '__ААБАУ__', '__NOTITLECONVERT__', '__NOTC__' ),
-	'nocontentconvert'        => array( '0', '__MAĞLUMATINTÜRLENDİRGİZBEW__', '__MATJOQ__', '__MAĞLUMATALMASTIRĞIZBAW__', '__MABAW__', '__МАҒЛҰМАТЫНТҮРЛЕНДІРГІЗБЕУ__', '__МАТЖОҚ__', '__МАҒЛҰМАТАЛМАСТЫРҒЫЗБАУ__', '__МАБАУ__', '__NOCONTENTCONVERT__', '__NOCC__' ),
-	'currentweek'             => array( '1', 'AĞIMDAĞIAPTASI', 'AĞIMDAĞIAPTA', 'АҒЫМДАҒЫАПТАСЫ', 'АҒЫМДАҒЫАПТА', 'CURRENTWEEK' ),
-	'currentdow'              => array( '1', 'AĞIMDAĞIAPTAKÜNİ', 'АҒЫМДАҒЫАПТАКҮНІ', 'CURRENTDOW' ),
-	'localweek'               => array( '1', 'JERGİLİKTİAPTASI', 'JERGİLİKTİAPTA', 'ЖЕРГІЛІКТІАПТАСЫ', 'ЖЕРГІЛІКТІАПТА', 'LOCALWEEK' ),
-	'localdow'                => array( '1', 'JERGİLİKTİAPTAKÜNİ', 'ЖЕРГІЛІКТІАПТАКҮНІ', 'LOCALDOW' ),
-	'revisionid'              => array( '1', 'TÜZETWNÖMİRİ', 'NUSQANÖMİRİ', 'ТҮЗЕТУНӨМІРІ', 'НҰСҚАНӨМІРІ', 'REVISIONID' ),
-	'revisionday'             => array( '1', 'TÜZETWKÜNİ', 'NUSQAKÜNİ', 'ТҮЗЕТУКҮНІ', 'НҰСҚАКҮНІ', 'REVISIONDAY' ),
-	'revisionday2'            => array( '1', 'TÜZETWKÜNİ2', 'NUSQAKÜNİ2', 'ТҮЗЕТУКҮНІ2', 'НҰСҚАКҮНІ2', 'REVISIONDAY2' ),
-	'revisionmonth'           => array( '1', 'TÜZETWAÝI', 'NUSQAAÝI', 'ТҮЗЕТУАЙЫ', 'НҰСҚААЙЫ', 'REVISIONMONTH' ),
-	'revisionyear'            => array( '1', 'TÜZETWJILI', 'NUSQAJILI', 'ТҮЗЕТУЖЫЛЫ', 'НҰСҚАЖЫЛЫ', 'REVISIONYEAR' ),
-	'revisiontimestamp'       => array( '1', 'TÜZETWWAQITITAÑBASI', 'NUSQAWAQITTÜÝİNDEMESİ', 'ТҮЗЕТУУАҚЫТЫТАҢБАСЫ', 'НҰСҚАУАҚЫТТҮЙІНДЕМЕСІ', 'REVISIONTIMESTAMP' ),
-	'plural'                  => array( '0', 'KÖPŞETÜRİ:', 'KÖPŞE:', 'КӨПШЕТҮРІ:', 'КӨПШЕ:', 'PLURAL:' ),
-	'fullurl'                 => array( '0', 'TOLIQJAÝI:', 'TOLIQJAÝ:', 'ТОЛЫҚЖАЙЫ:', 'ТОЛЫҚЖАЙ:', 'FULLURL:' ),
-	'fullurle'                => array( '0', 'TOLIQJAÝI2:', 'TOLIQJAÝ2:', 'ТОЛЫҚЖАЙЫ2:', 'ТОЛЫҚЖАЙ2:', 'FULLURLE:' ),
-	'lcfirst'                 => array( '0', 'KÄ1:', 'KİŞİÄRİPPEN1:', 'КӘ1:', 'КІШІӘРІППЕН1:', 'LCFIRST:' ),
-	'ucfirst'                 => array( '0', 'BÄ1:', 'BASÄRİPPEN1:', 'БӘ1:', 'БАСӘРІППЕН1:', 'UCFIRST:' ),
-	'lc'                      => array( '0', 'KÄ:', 'KİŞİÄRİPPEN:', 'КӘ:', 'КІШІӘРІППЕН:', 'LC:' ),
-	'uc'                      => array( '0', 'BÄ:', 'BASÄRİPPEN:', 'БӘ:', 'БАСӘРІППЕН:', 'UC:' ),
-	'raw'                     => array( '0', 'QAM:', 'ҚАМ:', 'RAW:' ),
-	'displaytitle'            => array( '1', 'KÖRİNETİNTAQIRIAPATI', 'KÖRSETİLETİNATAW', 'КӨРІНЕТІНТАҚЫРЫАПАТЫ', 'КӨРСЕТІЛЕТІНАТАУ', 'DISPLAYTITLE' ),
-	'rawsuffix'               => array( '1', 'Q', 'Қ', 'R' ),
-	'newsectionlink'          => array( '1', '__JAÑABÖLİMSİLTEMESİ__', '__ЖАҢАБӨЛІМСІЛТЕМЕСІ__', '__NEWSECTIONLINK__' ),
-	'currentversion'          => array( '1', 'BAĞDARLAMANUSQASI', 'БАҒДАРЛАМАНҰСҚАСЫ', 'CURRENTVERSION' ),
-	'urlencode'               => array( '0', 'JAÝDIMUQAMDAW:', 'ЖАЙДЫМҰҚАМДАУ:', 'URLENCODE:' ),
-	'anchorencode'            => array( '0', 'JÄKİRDİMUQAMDAW', 'ЖӘКІРДІМҰҚАМДАУ', 'ANCHORENCODE' ),
-	'currenttimestamp'        => array( '1', 'AĞIMDAĞIWAQITTÜÝİNDEMESİ', 'AĞIMDAĞIWAQITTÜÝİN', 'АҒЫМДАҒЫУАҚЫТТҮЙІНДЕМЕСІ', 'АҒЫМДАҒЫУАҚЫТТҮЙІН', 'CURRENTTIMESTAMP' ),
-	'localtimestamp'          => array( '1', 'JERGİLİKTİWAQITTÜÝİNDEMESİ', 'JERGİLİKTİWAQITTÜÝİN', 'ЖЕРГІЛІКТІУАҚЫТТҮЙІНДЕМЕСІ', 'ЖЕРГІЛІКТІУАҚЫТТҮЙІН', 'LOCALTIMESTAMP' ),
-	'directionmark'           => array( '1', 'BAĞITBELGİSİ', 'БАҒЫТБЕЛГІСІ', 'DIRECTIONMARK', 'DIRMARK' ),
-	'language'                => array( '0', '#TİL:', '#ТІЛ:', '#LANGUAGE:' ),
-	'contentlanguage'         => array( '1', 'MAĞLUMATTİLİ', 'МАҒЛҰМАТТІЛІ', 'CONTENTLANGUAGE', 'CONTENTLANG' ),
-	'pagesinnamespace'        => array( '1', 'ESİMAYABETSANI:', 'EABETSANI:', 'AYABETSANI:', 'ЕСІМАЯБЕТСАНЫ:', 'ЕАБЕТСАНЫ:', 'АЯБЕТСАНЫ:', 'PAGESINNAMESPACE:', 'PAGESINNS:' ),
-	'numberofadmins'          => array( '1', 'ÄKİMŞİSANI', 'ӘКІМШІСАНЫ', 'NUMBEROFADMINS' ),
-	'formatnum'               => array( '0', 'SANPİŞİMİ', 'САНПІШІМІ', 'FORMATNUM' ),
-	'padleft'                 => array( '0', 'SOLĞAIĞIS', 'SOLIĞIS', 'СОЛҒАЫҒЫС', 'СОЛЫҒЫС', 'PADLEFT' ),
-	'padright'                => array( '0', 'OÑĞAIĞIS', 'OÑIĞIS', 'ОҢҒАЫҒЫС', 'ОҢЫҒЫС', 'PADRIGHT' ),
-	'special'                 => array( '0', 'arnaýı', 'арнайы', 'special' ),
-	'defaultsort'             => array( '1', 'ÄDEPKİSURIPTAW:', 'ÄDEPKİSANATSURIPTAW:', 'ÄDEPKİSURIPTAWKİLTİ:', 'ÄDEPKİSURIP:', 'ӘДЕПКІСҰРЫПТАУ:', 'ӘДЕПКІСАНАТСҰРЫПТАУ:', 'ӘДЕПКІСҰРЫПТАУКІЛТІ:', 'ӘДЕПКІСҰРЫП:', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:' ),
-	'filepath'                => array( '0', 'FAÝLMEKENİ:', 'ФАЙЛМЕКЕНІ:', 'FILEPATH:' ),
-	'tag'                     => array( '0', 'belgi', 'белгі', 'tag' ),
-	'hiddencat'               => array( '1', '__JASIRINSANAT__', '__ЖАСЫРЫНСАНАТ__', '__HIDDENCAT__' ),
-	'pagesincategory'         => array( '1', 'SANATTAĞIBETTER', 'САНАТТАҒЫБЕТТЕР', 'PAGESINCATEGORY', 'PAGESINCAT' ),
-	'pagesize'                => array( '1', 'BETMÖLŞERİ', 'БЕТМӨЛШЕРІ', 'PAGESIZE' ),
+	'redirect'                  => array( '0', '#AÝDAW', '#АЙДАУ', '#REDIRECT' ),
+	'notoc'                     => array( '0', '__MAZMUNSIZ__', '__MSIZ__', '__МАЗМҰНСЫЗ__', '__МСЫЗ__', '__NOTOC__' ),
+	'nogallery'                 => array( '0', '__QOÝMASIZ__', '__QSIZ__', '__ҚОЙМАСЫЗ__', '__ҚСЫЗ__', '__NOGALLERY__' ),
+	'forcetoc'                  => array( '0', '__MAZMUNDATQIZW__', '__MQIZW__', '__МАЗМҰНДАТҚЫЗУ__', '__МҚЫЗУ__', '__FORCETOC__' ),
+	'toc'                       => array( '0', '__MAZMUNI__', '__MZMN__', '__МАЗМҰНЫ__', '__МЗМН__', '__TOC__' ),
+	'noeditsection'             => array( '0', '__BÖLİDİMÖNDEMEW__', '__BÖLİMÖNDETKİZBEW__', '__БӨЛІДІМӨНДЕМЕУ__', '__БӨЛІМӨНДЕТКІЗБЕУ__', '__NOEDITSECTION__' ),
+	'currentmonth'              => array( '1', 'AĞIMDAĞIAÝ', 'АҒЫМДАҒЫАЙ', 'CURRENTMONTH', 'CURRENTMONTH2' ),
+	'currentmonthname'          => array( '1', 'AĞIMDAĞIAÝATAWI', 'АҒЫМДАҒЫАЙАТАУЫ', 'CURRENTMONTHNAME' ),
+	'currentmonthnamegen'       => array( '1', 'AĞIMDAĞIAÝİLİKATAWI', 'АҒЫМДАҒЫАЙІЛІКАТАУЫ', 'CURRENTMONTHNAMEGEN' ),
+	'currentmonthabbrev'        => array( '1', 'AĞIMDAĞIAÝJÏIR', 'AĞIMDAĞIAÝQISQA', 'АҒЫМДАҒЫАЙЖИЫР', 'АҒЫМДАҒЫАЙҚЫСҚА', 'CURRENTMONTHABBREV' ),
+	'currentday'                => array( '1', 'AĞIMDAĞIKÜN', 'АҒЫМДАҒЫКҮН', 'CURRENTDAY' ),
+	'currentday2'               => array( '1', 'AĞIMDAĞIKÜN2', 'АҒЫМДАҒЫКҮН2', 'CURRENTDAY2' ),
+	'currentdayname'            => array( '1', 'AĞIMDAĞIKÜNATAWI', 'АҒЫМДАҒЫКҮНАТАУЫ', 'CURRENTDAYNAME' ),
+	'currentyear'               => array( '1', 'AĞIMDAĞIJIL', 'АҒЫМДАҒЫЖЫЛ', 'CURRENTYEAR' ),
+	'currenttime'               => array( '1', 'AĞIMDAĞIWAQIT', 'АҒЫМДАҒЫУАҚЫТ', 'CURRENTTIME' ),
+	'currenthour'               => array( '1', 'AĞIMDAĞISAĞAT', 'АҒЫМДАҒЫСАҒАТ', 'CURRENTHOUR' ),
+	'localmonth'                => array( '1', 'JERGİLİKTİAÝ', 'ЖЕРГІЛІКТІАЙ', 'LOCALMONTH', 'LOCALMONTH2' ),
+	'localmonthname'            => array( '1', 'JERGİLİKTİAÝATAWI', 'ЖЕРГІЛІКТІАЙАТАУЫ', 'LOCALMONTHNAME' ),
+	'localmonthnamegen'         => array( '1', 'JERGİLİKTİAÝİLİKATAWI', 'ЖЕРГІЛІКТІАЙІЛІКАТАУЫ', 'LOCALMONTHNAMEGEN' ),
+	'localmonthabbrev'          => array( '1', 'JERGİLİKTİAÝJÏIR', 'JERGİLİKTİAÝQISQAŞA', 'JERGİLİKTİAÝQISQA', 'ЖЕРГІЛІКТІАЙЖИЫР', 'ЖЕРГІЛІКТІАЙҚЫСҚАША', 'ЖЕРГІЛІКТІАЙҚЫСҚА', 'LOCALMONTHABBREV' ),
+	'localday'                  => array( '1', 'JERGİLİKTİKÜN', 'ЖЕРГІЛІКТІКҮН', 'LOCALDAY' ),
+	'localday2'                 => array( '1', 'JERGİLİKTİKÜN2', 'ЖЕРГІЛІКТІКҮН2', 'LOCALDAY2' ),
+	'localdayname'              => array( '1', 'JERGİLİKTİKÜNATAWI', 'ЖЕРГІЛІКТІКҮНАТАУЫ', 'LOCALDAYNAME' ),
+	'localyear'                 => array( '1', 'JERGİLİKTİJIL', 'ЖЕРГІЛІКТІЖЫЛ', 'LOCALYEAR' ),
+	'localtime'                 => array( '1', 'JERGİLİKTİWAQIT', 'ЖЕРГІЛІКТІУАҚЫТ', 'LOCALTIME' ),
+	'localhour'                 => array( '1', 'JERGİLİKTİSAĞAT', 'ЖЕРГІЛІКТІСАҒАТ', 'LOCALHOUR' ),
+	'numberofpages'             => array( '1', 'BETSANI', 'БЕТСАНЫ', 'NUMBEROFPAGES' ),
+	'numberofarticles'          => array( '1', 'MAQALASANI', 'МАҚАЛАСАНЫ', 'NUMBEROFARTICLES' ),
+	'numberoffiles'             => array( '1', 'FAÝLSANI', 'ФАЙЛСАНЫ', 'NUMBEROFFILES' ),
+	'numberofusers'             => array( '1', 'QATISWŞISANI', 'ҚАТЫСУШЫСАНЫ', 'NUMBEROFUSERS' ),
+	'numberofedits'             => array( '1', 'ÖÑDEMESANI', 'TÜZETWSANI', 'ӨҢДЕМЕСАНЫ', 'ТҮЗЕТУСАНЫ', 'NUMBEROFEDITS' ),
+	'pagename'                  => array( '1', 'BETATAWI', 'БЕТАТАУЫ', 'PAGENAME' ),
+	'pagenamee'                 => array( '1', 'BETATAWI2', 'БЕТАТАУЫ2', 'PAGENAMEE' ),
+	'namespace'                 => array( '1', 'ESİMAYASI', 'ЕСІМАЯСЫ', 'NAMESPACE' ),
+	'namespacee'                => array( '1', 'ESİMAYASI2', 'ЕСІМАЯСЫ2', 'NAMESPACEE' ),
+	'talkspace'                 => array( '1', 'TALQILAWAYASI', 'ТАЛҚЫЛАУАЯСЫ', 'TALKSPACE' ),
+	'talkspacee'                => array( '1', 'TALQILAWAYASI2', 'ТАЛҚЫЛАУАЯСЫ2', 'TALKSPACEE' ),
+	'subjectspace'              => array( '1', 'TAQIRIPBETİ', 'MAQALABETİ', 'ТАҚЫРЫПБЕТІ', 'МАҚАЛАБЕТІ', 'SUBJECTSPACE', 'ARTICLESPACE' ),
+	'subjectspacee'             => array( '1', 'TAQIRIPBETİ2', 'MAQALABETİ2', 'ТАҚЫРЫПБЕТІ2', 'МАҚАЛАБЕТІ2', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
+	'fullpagename'              => array( '1', 'TOLIQBETATAWI', 'ТОЛЫҚБЕТАТАУЫ', 'FULLPAGENAME' ),
+	'fullpagenamee'             => array( '1', 'TOLIQBETATAWI2', 'ТОЛЫҚБЕТАТАУЫ2', 'FULLPAGENAMEE' ),
+	'subpagename'               => array( '1', 'BETŞEATAWI', 'ASTIÑĞIBETATAWI', 'БЕТШЕАТАУЫ', 'АСТЫҢҒЫБЕТАТАУЫ', 'SUBPAGENAME' ),
+	'subpagenamee'              => array( '1', 'BETŞEATAWI2', 'ASTIÑĞIBETATAWI2', 'БЕТШЕАТАУЫ2', 'АСТЫҢҒЫБЕТАТАУЫ2', 'SUBPAGENAMEE' ),
+	'basepagename'              => array( '1', 'NEGİZGİBETATAWI', 'НЕГІЗГІБЕТАТАУЫ', 'BASEPAGENAME' ),
+	'basepagenamee'             => array( '1', 'NEGİZGİBETATAWI2', 'НЕГІЗГІБЕТАТАУЫ2', 'BASEPAGENAMEE' ),
+	'talkpagename'              => array( '1', 'TALQILAWBETATAWI', 'ТАЛҚЫЛАУБЕТАТАУЫ', 'TALKPAGENAME' ),
+	'talkpagenamee'             => array( '1', 'TALQILAWBETATAWI2', 'ТАЛҚЫЛАУБЕТАТАУЫ2', 'TALKPAGENAMEE' ),
+	'subjectpagename'           => array( '1', 'TAQIRIPBETATAWI', 'MAQALABETATAWI', 'ТАҚЫРЫПБЕТАТАУЫ', 'МАҚАЛАБЕТАТАУЫ', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
+	'subjectpagenamee'          => array( '1', 'TAQIRIPBETATAWI2', 'MAQALABETATAWI2', 'ТАҚЫРЫПБЕТАТАУЫ2', 'МАҚАЛАБЕТАТАУЫ2', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
+	'msg'                       => array( '0', 'XBR:', 'ХБР:', 'MSG:' ),
+	'subst'                     => array( '0', 'BÄDEL:', 'БӘДЕЛ:', 'SUBST:' ),
+	'msgnw'                     => array( '0', 'WÏKÏSİZXBR:', 'УИКИСІЗХБР:', 'MSGNW:' ),
+	'img_thumbnail'             => array( '1', 'nobaý', 'нобай', 'thumbnail', 'thumb' ),
+	'img_manualthumb'           => array( '1', 'nobaý=$1', 'нобай=$1', 'thumbnail=$1', 'thumb=$1' ),
+	'img_right'                 => array( '1', 'oñğa', 'oñ', 'оңға', 'оң', 'right' ),
+	'img_left'                  => array( '1', 'solğa', 'sol', 'солға', 'сол', 'left' ),
+	'img_none'                  => array( '1', 'eşqandaý', 'joq', 'ешқандай', 'жоқ', 'none' ),
+	'img_width'                 => array( '1', '$1 nükte', '$1 нүкте', '$1px' ),
+	'img_center'                => array( '1', 'ortağa', 'orta', 'ортаға', 'орта', 'center', 'centre' ),
+	'img_framed'                => array( '1', 'sürmeli', 'сүрмелі', 'framed', 'enframed', 'frame' ),
+	'img_frameless'             => array( '1', 'sürmesiz', 'сүрмесіз', 'frameless' ),
+	'img_page'                  => array( '1', 'bet=$1', 'bet $1', 'бет=$1', 'бет $1', 'page=$1', 'page $1' ),
+	'img_upright'               => array( '1', 'tikti', 'tiktik=$1', 'tiktik $1', 'тікті', 'тіктік=$1', 'тіктік $1', 'upright', 'upright=$1', 'upright $1' ),
+	'img_border'                => array( '1', 'jïekti', 'жиекті', 'border' ),
+	'img_baseline'              => array( '1', 'tirekjol', 'тірекжол', 'baseline' ),
+	'img_sub'                   => array( '1', 'astılığı', 'ast', 'астылығы', 'аст', 'sub' ),
+	'img_super'                 => array( '1', 'üstiligi', 'üst', 'үстілігі', 'үст', 'super', 'sup' ),
+	'img_top'                   => array( '1', 'üstine', 'үстіне', 'top' ),
+	'img_text_top'              => array( '1', 'mätin-üstinde', 'мәтін-үстінде', 'text-top' ),
+	'img_middle'                => array( '1', 'aralığına', 'аралығына', 'middle' ),
+	'img_bottom'                => array( '1', 'astına', 'астына', 'bottom' ),
+	'img_text_bottom'           => array( '1', 'mätin-astında', 'мәтін-астында', 'text-bottom' ),
+	'int'                       => array( '0', 'İŞKİ:', 'ІШКІ:', 'INT:' ),
+	'sitename'                  => array( '1', 'TORAPATAWI', 'ТОРАПАТАУЫ', 'SITENAME' ),
+	'ns'                        => array( '0', 'EA:', 'ESİMAYA:', 'ЕА:', 'ЕСІМАЯ:', 'NS:' ),
+	'localurl'                  => array( '0', 'JERGİLİKTİJAÝ:', 'ЖЕРГІЛІКТІЖАЙ:', 'LOCALURL:' ),
+	'localurle'                 => array( '0', 'JERGİLİKTİJAÝ2:', 'ЖЕРГІЛІКТІЖАЙ2:', 'LOCALURLE:' ),
+	'servername'                => array( '0', 'SERVERATAWI', 'СЕРВЕРАТАУЫ', 'SERVERNAME' ),
+	'scriptpath'                => array( '0', 'ÄMİRJOLI', 'ӘМІРЖОЛЫ', 'SCRIPTPATH' ),
+	'grammar'                   => array( '0', 'SEPTİGİ:', 'SEPTİK:', 'СЕПТІГІ:', 'СЕПТІК:', 'GRAMMAR:' ),
+	'notitleconvert'            => array( '0', '__TAQIRIPATINTÜRLENDİRGİZBEW__', '__TATJOQ__', '__ATAWALMASTIRĞIZBAW__', '__AABAW__', '__ТАҚЫРЫПАТЫНТҮРЛЕНДІРГІЗБЕУ__', '__ТАТЖОҚ__', '__АТАУАЛМАСТЫРҒЫЗБАУ__', '__ААБАУ__', '__NOTITLECONVERT__', '__NOTC__' ),
+	'nocontentconvert'          => array( '0', '__MAĞLUMATINTÜRLENDİRGİZBEW__', '__MATJOQ__', '__MAĞLUMATALMASTIRĞIZBAW__', '__MABAW__', '__МАҒЛҰМАТЫНТҮРЛЕНДІРГІЗБЕУ__', '__МАТЖОҚ__', '__МАҒЛҰМАТАЛМАСТЫРҒЫЗБАУ__', '__МАБАУ__', '__NOCONTENTCONVERT__', '__NOCC__' ),
+	'currentweek'               => array( '1', 'AĞIMDAĞIAPTASI', 'AĞIMDAĞIAPTA', 'АҒЫМДАҒЫАПТАСЫ', 'АҒЫМДАҒЫАПТА', 'CURRENTWEEK' ),
+	'currentdow'                => array( '1', 'AĞIMDAĞIAPTAKÜNİ', 'АҒЫМДАҒЫАПТАКҮНІ', 'CURRENTDOW' ),
+	'localweek'                 => array( '1', 'JERGİLİKTİAPTASI', 'JERGİLİKTİAPTA', 'ЖЕРГІЛІКТІАПТАСЫ', 'ЖЕРГІЛІКТІАПТА', 'LOCALWEEK' ),
+	'localdow'                  => array( '1', 'JERGİLİKTİAPTAKÜNİ', 'ЖЕРГІЛІКТІАПТАКҮНІ', 'LOCALDOW' ),
+	'revisionid'                => array( '1', 'TÜZETWNÖMİRİ', 'NUSQANÖMİRİ', 'ТҮЗЕТУНӨМІРІ', 'НҰСҚАНӨМІРІ', 'REVISIONID' ),
+	'revisionday'               => array( '1', 'TÜZETWKÜNİ', 'NUSQAKÜNİ', 'ТҮЗЕТУКҮНІ', 'НҰСҚАКҮНІ', 'REVISIONDAY' ),
+	'revisionday2'              => array( '1', 'TÜZETWKÜNİ2', 'NUSQAKÜNİ2', 'ТҮЗЕТУКҮНІ2', 'НҰСҚАКҮНІ2', 'REVISIONDAY2' ),
+	'revisionmonth'             => array( '1', 'TÜZETWAÝI', 'NUSQAAÝI', 'ТҮЗЕТУАЙЫ', 'НҰСҚААЙЫ', 'REVISIONMONTH' ),
+	'revisionyear'              => array( '1', 'TÜZETWJILI', 'NUSQAJILI', 'ТҮЗЕТУЖЫЛЫ', 'НҰСҚАЖЫЛЫ', 'REVISIONYEAR' ),
+	'revisiontimestamp'         => array( '1', 'TÜZETWWAQITITAÑBASI', 'NUSQAWAQITTÜÝİNDEMESİ', 'ТҮЗЕТУУАҚЫТЫТАҢБАСЫ', 'НҰСҚАУАҚЫТТҮЙІНДЕМЕСІ', 'REVISIONTIMESTAMP' ),
+	'plural'                    => array( '0', 'KÖPŞETÜRİ:', 'KÖPŞE:', 'КӨПШЕТҮРІ:', 'КӨПШЕ:', 'PLURAL:' ),
+	'fullurl'                   => array( '0', 'TOLIQJAÝI:', 'TOLIQJAÝ:', 'ТОЛЫҚЖАЙЫ:', 'ТОЛЫҚЖАЙ:', 'FULLURL:' ),
+	'fullurle'                  => array( '0', 'TOLIQJAÝI2:', 'TOLIQJAÝ2:', 'ТОЛЫҚЖАЙЫ2:', 'ТОЛЫҚЖАЙ2:', 'FULLURLE:' ),
+	'lcfirst'                   => array( '0', 'KÄ1:', 'KİŞİÄRİPPEN1:', 'КӘ1:', 'КІШІӘРІППЕН1:', 'LCFIRST:' ),
+	'ucfirst'                   => array( '0', 'BÄ1:', 'BASÄRİPPEN1:', 'БӘ1:', 'БАСӘРІППЕН1:', 'UCFIRST:' ),
+	'lc'                        => array( '0', 'KÄ:', 'KİŞİÄRİPPEN:', 'КӘ:', 'КІШІӘРІППЕН:', 'LC:' ),
+	'uc'                        => array( '0', 'BÄ:', 'BASÄRİPPEN:', 'БӘ:', 'БАСӘРІППЕН:', 'UC:' ),
+	'raw'                       => array( '0', 'QAM:', 'ҚАМ:', 'RAW:' ),
+	'displaytitle'              => array( '1', 'KÖRİNETİNTAQIRIAPATI', 'KÖRSETİLETİNATAW', 'КӨРІНЕТІНТАҚЫРЫАПАТЫ', 'КӨРСЕТІЛЕТІНАТАУ', 'DISPLAYTITLE' ),
+	'rawsuffix'                 => array( '1', 'Q', 'Қ', 'R' ),
+	'newsectionlink'            => array( '1', '__JAÑABÖLİMSİLTEMESİ__', '__ЖАҢАБӨЛІМСІЛТЕМЕСІ__', '__NEWSECTIONLINK__' ),
+	'currentversion'            => array( '1', 'BAĞDARLAMANUSQASI', 'БАҒДАРЛАМАНҰСҚАСЫ', 'CURRENTVERSION' ),
+	'urlencode'                 => array( '0', 'JAÝDIMUQAMDAW:', 'ЖАЙДЫМҰҚАМДАУ:', 'URLENCODE:' ),
+	'anchorencode'              => array( '0', 'JÄKİRDİMUQAMDAW', 'ЖӘКІРДІМҰҚАМДАУ', 'ANCHORENCODE' ),
+	'currenttimestamp'          => array( '1', 'AĞIMDAĞIWAQITTÜÝİNDEMESİ', 'AĞIMDAĞIWAQITTÜÝİN', 'АҒЫМДАҒЫУАҚЫТТҮЙІНДЕМЕСІ', 'АҒЫМДАҒЫУАҚЫТТҮЙІН', 'CURRENTTIMESTAMP' ),
+	'localtimestamp'            => array( '1', 'JERGİLİKTİWAQITTÜÝİNDEMESİ', 'JERGİLİKTİWAQITTÜÝİN', 'ЖЕРГІЛІКТІУАҚЫТТҮЙІНДЕМЕСІ', 'ЖЕРГІЛІКТІУАҚЫТТҮЙІН', 'LOCALTIMESTAMP' ),
+	'directionmark'             => array( '1', 'BAĞITBELGİSİ', 'БАҒЫТБЕЛГІСІ', 'DIRECTIONMARK', 'DIRMARK' ),
+	'language'                  => array( '0', '#TİL:', '#ТІЛ:', '#LANGUAGE:' ),
+	'contentlanguage'           => array( '1', 'MAĞLUMATTİLİ', 'МАҒЛҰМАТТІЛІ', 'CONTENTLANGUAGE', 'CONTENTLANG' ),
+	'pagesinnamespace'          => array( '1', 'ESİMAYABETSANI:', 'EABETSANI:', 'AYABETSANI:', 'ЕСІМАЯБЕТСАНЫ:', 'ЕАБЕТСАНЫ:', 'АЯБЕТСАНЫ:', 'PAGESINNAMESPACE:', 'PAGESINNS:' ),
+	'numberofadmins'            => array( '1', 'ÄKİMŞİSANI', 'ӘКІМШІСАНЫ', 'NUMBEROFADMINS' ),
+	'formatnum'                 => array( '0', 'SANPİŞİMİ', 'САНПІШІМІ', 'FORMATNUM' ),
+	'padleft'                   => array( '0', 'SOLĞAIĞIS', 'SOLIĞIS', 'СОЛҒАЫҒЫС', 'СОЛЫҒЫС', 'PADLEFT' ),
+	'padright'                  => array( '0', 'OÑĞAIĞIS', 'OÑIĞIS', 'ОҢҒАЫҒЫС', 'ОҢЫҒЫС', 'PADRIGHT' ),
+	'special'                   => array( '0', 'arnaýı', 'арнайы', 'special' ),
+	'defaultsort'               => array( '1', 'ÄDEPKİSURIPTAW:', 'ÄDEPKİSANATSURIPTAW:', 'ÄDEPKİSURIPTAWKİLTİ:', 'ÄDEPKİSURIP:', 'ӘДЕПКІСҰРЫПТАУ:', 'ӘДЕПКІСАНАТСҰРЫПТАУ:', 'ӘДЕПКІСҰРЫПТАУКІЛТІ:', 'ӘДЕПКІСҰРЫП:', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:' ),
+	'filepath'                  => array( '0', 'FAÝLMEKENİ:', 'ФАЙЛМЕКЕНІ:', 'FILEPATH:' ),
+	'tag'                       => array( '0', 'belgi', 'белгі', 'tag' ),
+	'hiddencat'                 => array( '1', '__JASIRINSANAT__', '__ЖАСЫРЫНСАНАТ__', '__HIDDENCAT__' ),
+	'pagesincategory'           => array( '1', 'SANATTAĞIBETTER', 'САНАТТАҒЫБЕТТЕР', 'PAGESINCATEGORY', 'PAGESINCAT' ),
+	'pagesize'                  => array( '1', 'BETMÖLŞERİ', 'БЕТМӨЛШЕРІ', 'PAGESIZE' ),
 );
 
 $specialPageAliases = array(
diff --git a/languages/messages/MessagesKm.php b/languages/messages/MessagesKm.php
index b7329fec36..c9c09ff47b 100644
--- a/languages/messages/MessagesKm.php
+++ b/languages/messages/MessagesKm.php
@@ -189,76 +189,76 @@ $specialPageAliases = 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__' ),
-	'noheader'                => array( '0', '__លាក់បឋមកថា__', '__NOHEADER__' ),
-	'currentmonth'            => array( '1', 'ខែនេះ', 'CURRENTMONTH', 'CURRENTMONTH2' ),
-	'currentmonthname'        => array( '1', 'ឈ្មោះខែនេះ', 'CURRENTMONTHNAME' ),
-	'currentday'              => array( '1', 'ថ្ងៃនេះ', 'CURRENTDAY' ),
-	'currentdayname'          => array( '1', 'ឈ្មោះថ្ងៃនេះ', 'CURRENTDAYNAME' ),
-	'currentyear'             => array( '1', 'ឆ្នាំនេះ', 'CURRENTYEAR' ),
-	'currenttime'             => array( '1', 'ពេលនេះ', 'CURRENTTIME' ),
-	'currenthour'             => array( '1', 'ម៉ោងនេះ', 'ម៉ោងឥឡូវ', 'CURRENTHOUR' ),
-	'localyear'               => array( '1', 'LOCALDAYNAME', 'LOCALYEAR' ),
-	'localtime'               => array( '1', 'ពេលវេលាក្នុងតំបន់', 'LOCALTIME' ),
-	'localhour'               => array( '1', 'ម៉ោងតំបន់', 'LOCALHOUR' ),
-	'numberofpages'           => array( '1', 'ចំនួនទំព័រ', 'NUMBEROFPAGES' ),
-	'numberofarticles'        => array( '1', 'ចំនួនអត្ថបទ', 'NUMBEROFARTICLES' ),
-	'numberoffiles'           => array( '1', 'ចំនួនឯកសារ', 'NUMBEROFFILES' ),
-	'numberofusers'           => array( '1', 'ចំនួនអ្នកប្រើប្រាស់', 'NUMBEROFUSERS' ),
-	'numberofedits'           => array( '1', 'ចំនួនកំណែប្រែ', 'NUMBEROFEDITS' ),
-	'pagename'                => array( '1', 'ឈ្មោះទំព័រ', 'PAGENAME' ),
-	'namespace'               => array( '1', 'លំហឈ្មោះ', 'NAMESPACE' ),
-	'talkspace'               => array( '1', 'លំហឈ្មោះទំព័រពិភាក្សា', 'TALKSPACE' ),
-	'fullpagename'            => array( '1', 'ឈ្មោះទំព័រពេញ', 'FULLPAGENAME' ),
-	'subpagename'             => array( '1', 'ឈ្មោះទំព័ររង', 'SUBPAGENAME' ),
-	'talkpagename'            => array( '1', 'ឈ្មោះទំព័រពិភាក្សា', 'TALKPAGENAME' ),
-	'msg'                     => array( '0', 'សារ:', 'MSG:' ),
-	'msgnw'                   => array( '0', 'សារមិនមែនជាកូដវិគី:', 'MSGNW:' ),
-	'img_thumbnail'           => array( '1', 'រូបភាពតូច', 'រូបតូច', 'thumbnail', 'thumb' ),
-	'img_manualthumb'         => array( '1', 'រូបភាពតូច=$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_page'                => array( '1', 'ទំព័រ=$1', 'ទំព័រ$1', 'page=$1', 'page $1' ),
-	'img_top'                 => array( '1', 'ផ្នែកលើ', 'ផ្នែកខាងលើ', 'top' ),
-	'img_text_top'            => array( '1', 'ឃ្លានៅផ្នែកខាងលើ', 'ឃ្លាផ្នែកខាងលើ', 'text-top' ),
-	'img_middle'              => array( '1', 'ផ្នែកកណ្តាល', 'middle' ),
-	'img_bottom'              => array( '1', 'បាត', 'ផ្នែកបាត', 'bottom' ),
-	'img_text_bottom'         => array( '1', 'ឃ្លានៅផ្នែកបាត', 'ឃ្លាផ្នែកបាត', 'text-bottom' ),
-	'img_link'                => array( '1', 'តំនភ្ជាប់=$1', 'តំណភ្ជាប់=$1', 'link=$1' ),
-	'sitename'                => array( '1', 'ឈ្មោះវិបសាយ', 'ឈ្មោះគេហទំព័រ', 'SITENAME' ),
-	'ns'                      => array( '0', 'លឈ:', 'NS:' ),
-	'server'                  => array( '0', 'ម៉ាស៊ីនបម្រើសេវា', 'SERVER' ),
-	'servername'              => array( '0', 'ឈ្មោះម៉ាស៊ីនបម្រើសេវា', 'SERVERNAME' ),
-	'scriptpath'              => array( '0', 'ផ្លូវស្រ្គីប', 'SCRIPTPATH' ),
-	'grammar'                 => array( '0', 'វេយ្យាករណ៍:', 'GRAMMAR:' ),
-	'currentweek'             => array( '1', 'សប្ដាហ៍នេះ', 'CURRENTWEEK' ),
-	'plural'                  => array( '0', 'ពហុវចនៈ:', 'PLURAL:' ),
-	'fullurl'                 => array( '0', 'URLពេញ:', 'FULLURL:' ),
-	'displaytitle'            => array( '1', 'បង្ហាញចំណងជើង', 'បង្ហាញចំនងជើង', 'DISPLAYTITLE' ),
-	'rawsuffix'               => array( '1', 'រ', 'R' ),
-	'newsectionlink'          => array( '1', '__តំនភ្ជាប់ផ្នែកថ្មី__', '__តំណភ្ជាប់ផ្នែកថ្មី__', '__NEWSECTIONLINK__' ),
-	'language'                => array( '0', '#ភាសា:', '#LANGUAGE:' ),
-	'contentlanguage'         => array( '1', 'កូដភាសា', 'CONTENTLANGUAGE', 'CONTENTLANG' ),
-	'numberofadmins'          => array( '1', 'ចំនួនអ្នកអភិបាល', 'ចំនួនអ្នកថែទាំប្រព័ន្ធ', 'NUMBEROFADMINS' ),
-	'special'                 => array( '0', 'ពិសេស', 'special' ),
-	'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__' ),
-	'staticredirect'          => array( '1', '__ស្ថិតិទំព័របញ្ជូនបន្ត__', '__STATICREDIRECT__' ),
+	'redirect'                  => array( '0', '#បញ្ជូនបន្ត', '#ប្ដូរទីតាំងទៅ', '#ប្តូរទីតាំងទៅ', '#ប្ដូរទីតាំង', '#ប្តូរទីតាំង', '#ប្ដូរចំណងជើង', '#REDIRECT' ),
+	'notoc'                     => array( '0', '__លាក់មាតិកា__', '__លាក់បញ្ជីអត្ថបទ__', '__គ្មានមាតិកា__', '__គ្មានបញ្ជីអត្ថបទ__', '__កុំបង្ហាញមាតិកា__', '__NOTOC__' ),
+	'nogallery'                 => array( '0', '__លាក់វិចិត្រសាល__', '__NOGALLERY__' ),
+	'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' ),
+	'currentdayname'            => array( '1', 'ឈ្មោះថ្ងៃនេះ', 'CURRENTDAYNAME' ),
+	'currentyear'               => array( '1', 'ឆ្នាំនេះ', 'CURRENTYEAR' ),
+	'currenttime'               => array( '1', 'ពេលនេះ', 'CURRENTTIME' ),
+	'currenthour'               => array( '1', 'ម៉ោងនេះ', 'ម៉ោងឥឡូវ', 'CURRENTHOUR' ),
+	'localyear'                 => array( '1', 'LOCALDAYNAME', 'LOCALYEAR' ),
+	'localtime'                 => array( '1', 'ពេលវេលាក្នុងតំបន់', 'LOCALTIME' ),
+	'localhour'                 => array( '1', 'ម៉ោងតំបន់', 'LOCALHOUR' ),
+	'numberofpages'             => array( '1', 'ចំនួនទំព័រ', 'NUMBEROFPAGES' ),
+	'numberofarticles'          => array( '1', 'ចំនួនអត្ថបទ', 'NUMBEROFARTICLES' ),
+	'numberoffiles'             => array( '1', 'ចំនួនឯកសារ', 'NUMBEROFFILES' ),
+	'numberofusers'             => array( '1', 'ចំនួនអ្នកប្រើប្រាស់', 'NUMBEROFUSERS' ),
+	'numberofedits'             => array( '1', 'ចំនួនកំណែប្រែ', 'NUMBEROFEDITS' ),
+	'pagename'                  => array( '1', 'ឈ្មោះទំព័រ', 'PAGENAME' ),
+	'namespace'                 => array( '1', 'លំហឈ្មោះ', 'NAMESPACE' ),
+	'talkspace'                 => array( '1', 'លំហឈ្មោះទំព័រពិភាក្សា', 'TALKSPACE' ),
+	'fullpagename'              => array( '1', 'ឈ្មោះទំព័រពេញ', 'FULLPAGENAME' ),
+	'subpagename'               => array( '1', 'ឈ្មោះទំព័ររង', 'SUBPAGENAME' ),
+	'talkpagename'              => array( '1', 'ឈ្មោះទំព័រពិភាក្សា', 'TALKPAGENAME' ),
+	'msg'                       => array( '0', 'សារ:', 'MSG:' ),
+	'msgnw'                     => array( '0', 'សារមិនមែនជាកូដវិគី:', 'MSGNW:' ),
+	'img_thumbnail'             => array( '1', 'រូបភាពតូច', 'រូបតូច', 'thumbnail', 'thumb' ),
+	'img_manualthumb'           => array( '1', 'រូបភាពតូច=$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_page'                  => array( '1', 'ទំព័រ=$1', 'ទំព័រ$1', 'page=$1', 'page $1' ),
+	'img_top'                   => array( '1', 'ផ្នែកលើ', 'ផ្នែកខាងលើ', 'top' ),
+	'img_text_top'              => array( '1', 'ឃ្លានៅផ្នែកខាងលើ', 'ឃ្លាផ្នែកខាងលើ', 'text-top' ),
+	'img_middle'                => array( '1', 'ផ្នែកកណ្តាល', 'middle' ),
+	'img_bottom'                => array( '1', 'បាត', 'ផ្នែកបាត', 'bottom' ),
+	'img_text_bottom'           => array( '1', 'ឃ្លានៅផ្នែកបាត', 'ឃ្លាផ្នែកបាត', 'text-bottom' ),
+	'img_link'                  => array( '1', 'តំនភ្ជាប់=$1', 'តំណភ្ជាប់=$1', 'link=$1' ),
+	'sitename'                  => array( '1', 'ឈ្មោះវិបសាយ', 'ឈ្មោះគេហទំព័រ', 'SITENAME' ),
+	'ns'                        => array( '0', 'លឈ:', 'NS:' ),
+	'server'                    => array( '0', 'ម៉ាស៊ីនបម្រើសេវា', 'SERVER' ),
+	'servername'                => array( '0', 'ឈ្មោះម៉ាស៊ីនបម្រើសេវា', 'SERVERNAME' ),
+	'scriptpath'                => array( '0', 'ផ្លូវស្រ្គីប', 'SCRIPTPATH' ),
+	'grammar'                   => array( '0', 'វេយ្យាករណ៍:', 'GRAMMAR:' ),
+	'currentweek'               => array( '1', 'សប្ដាហ៍នេះ', 'CURRENTWEEK' ),
+	'plural'                    => array( '0', 'ពហុវចនៈ:', 'PLURAL:' ),
+	'fullurl'                   => array( '0', 'URLពេញ:', 'FULLURL:' ),
+	'displaytitle'              => array( '1', 'បង្ហាញចំណងជើង', 'បង្ហាញចំនងជើង', 'DISPLAYTITLE' ),
+	'rawsuffix'                 => array( '1', 'រ', 'R' ),
+	'newsectionlink'            => array( '1', '__តំនភ្ជាប់ផ្នែកថ្មី__', '__តំណភ្ជាប់ផ្នែកថ្មី__', '__NEWSECTIONLINK__' ),
+	'language'                  => array( '0', '#ភាសា:', '#LANGUAGE:' ),
+	'contentlanguage'           => array( '1', 'កូដភាសា', 'CONTENTLANGUAGE', 'CONTENTLANG' ),
+	'numberofadmins'            => array( '1', 'ចំនួនអ្នកអភិបាល', 'ចំនួនអ្នកថែទាំប្រព័ន្ធ', 'NUMBEROFADMINS' ),
+	'special'                   => array( '0', 'ពិសេស', 'special' ),
+	'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__' ),
+	'staticredirect'            => array( '1', '__ស្ថិតិទំព័របញ្ជូនបន្ត__', '__STATICREDIRECT__' ),
 );
 
 $messages = array(
@@ -287,7 +287,7 @@ $messages = array(
 'tog-nocache' => 'មិនប្រើសតិភ្ជាប់​នៃ​ទំព័រ',
 'tog-enotifwatchlistpages' => 'ផ្ញើអ៊ីមែល​មកខ្ញុំ​កាលបើ​មានបំលាស់ប្ដូរនៃទំព័រ​ណាមួយដែលមានក្នុងបញ្ជីតាមដានរបស់ខ្ញុំ',
 'tog-enotifusertalkpages' => 'ផ្ញើអ៊ីមែល​មកខ្ញុំ​កាលបើ​មានបំលាស់ប្ដូរ​នៅ​ក្នុងទំព័រពិភាក្សា​របស់ខ្ញុំ',
-'tog-enotifminoredits' => 'ផ្ញើអ៊ីមែល​មកខ្ញុំផងដែរ​ចំពោះ​បំលាស់ប្ដូរតិចតួច​',
+'tog-enotifminoredits' => 'ផ្ញើអ៊ីមែល​មកខ្ញុំពេលមានបំលាស់ប្ដូរតិចតួច​លើទំព័រឬឯកសារផងដែរ​',
 'tog-enotifrevealaddr' => 'បង្ហាញ​អាសយដ្ឋានអ៊ីមែល​របស់ខ្ញុំ​ក្នុង​​មែល​ក្រើនរំលឹក​នានា',
 'tog-shownumberswatching' => 'បង្ហាញ​ចំនួនអ្នកប្រើប្រាស់​ដែលតាមដាន​ទំព័រនេះ',
 'tog-oldsig' => 'ហត្ថលេខាមានហើយ៖',
@@ -528,6 +528,10 @@ $1',
 'youhavenewmessages' => 'អ្នកមាន $1 ($2)។',
 'newmessageslink' => 'សារថ្មីៗ',
 'newmessagesdifflink' => 'បំលាស់ប្ដូរចុងក្រោយ',
+'youhavenewmessagesfromusers' => 'អ្នកមាន $1 ទទួលបានពី {{PLURAL:$3|អ្នកប្រើប្រាស់ម្នាក់|អុ្នកប្រើប្រាស់ចំនួន $3 នាក់}} ($2)។',
+'youhavenewmessagesmanyusers' => 'អ្នកមាន $1 ទទួលបានពីអ្នកប្រើប្រាស់ជាច្រើន ($2)។',
+'newmessageslinkplural' => '{{PLURAL:$1|សារថ្មីមួយ|សារថ្មី}}',
+'newmessagesdifflinkplural' => '{{PLURAL:$1|បំលាស់ប្ដូរ|បំលាស់ប្ដូរ}}ចុងក្រោយ',
 'youhavenewmessagesmulti' => 'អ្នកមានសារថ្មីៗនៅ $1',
 'editsection' => 'កែប្រែ',
 'editold' => 'កែប្រែ',
@@ -612,8 +616,8 @@ $1',
 'cannotdelete-title' => 'មិនអាចលុបទំព័រ "$1"',
 'badtitle' => 'ចំណងជើង​មិនល្អ',
 'badtitletext' => 'ចំណងជើងទំព័រដែលបានស្នើ គ្មានសុពលភាព, ទទេ, ឬ ចំណងជើងតំណភ្ជាប់អន្តរភាសាឬអន្តរវិគី មិនត្រឹមត្រូវ ។ ប្រហែលជាមានតួអក្សរមួយឬច្រើន ដែលជាតួអក្សរហាមប្រើ​ក្នុង​ចំណងជើង។',
-'perfcached' => 'ទិន្នន័យទាំងនេះត្រូវបានដាក់ទៅសតិភ្ជាប់និងប្រហែលជាមិនទាន់សម័យ ។ A maximum of {{PLURAL:$1|one result is|$1 results are}} available in the cache.',
-'perfcachedts' => 'ទិន្នន័យខាងក្រោមនេះត្រូវបានដាក់ក្នុងសតិភ្ជាប់ និង បានត្រូវបន្ទាន់សម័យចុងក្រោយនៅ $1។ A maximum of {{PLURAL:$4|one result is|$4 results are}} available in the cache.',
+'perfcached' => 'ទិន្នន័យទាំងនេះត្រូវបានដាក់ទៅសតិភ្ជាប់និងប្រហែលជាមិនទាន់សម័យ ។ ជាអតិបរមា {{PLURAL:$1|លទ្ធផលមួយ|លទ្ធផលចំនួន $1}} អាចប្រើបាននៅក្នុងសតិភ្ជាប់។',
+'perfcachedts' => 'ទិន្នន័យខាងក្រោមនេះត្រូវបានដាក់ក្នុងសតិភ្ជាប់ និង បានត្រូវបន្ទាន់សម័យចុងក្រោយនៅ $1។ ជាអតិបរមា {{PLURAL:$4|លទ្ធផលមួយ|លទ្ធផលចំនួន $4}} អាចប្រើបាននៅក្នុងសតិភ្ជាប់។',
 'querypage-no-updates' => 'ការបន្ទាន់សម័យសម្រាប់ទំព័រនេះគឺមិនអាចធ្វើទៅរួចទេនាពេលឥឡូវទេ។
 
 ទិន្នន័យនៅទីនេះនឹងមិនត្រូវផ្លាស់ប្ដូរថ្មីនាពេលបច្ចុប្បន្នទេ។',
@@ -640,6 +644,10 @@ $2',
 'ns-specialprotected' => 'ទំព័រពិសេសៗមិនអាចកែប្រែបានទេ។',
 'titleprotected' => "ចំណងជើងនេះត្រូវបានការពារមិនឱ្យបង្កើត​ដោយ [[User:$1|$1]]។
 ហេតុផលលើកឡើងគឺ ''$2''។",
+'filereadonlyerror' => 'មិនអាចកែប្រែឯកសារ "$1" បានទេពីព្រោះថតឯកសារ "$2" ស្ថិតក្នុងម៉ូដសំរាប់តែអានប៉ុណ្ណោះ។
+
+អភិបាលដែលបានចាក់សោរវាបានផ្ដល់សេចក្ដីពន្យល់បែបនេះ៖ "$3"។',
+'exception-nologin-text' => 'ទំព័រឬសកម្មភាពនេះតំរូវអោយអ្នកធ្វើការកត់ឈ្មោះចូលទៅក្នុងវិគីនេះ។',
 
 # Virus scanner
 'virus-badscanner' => "ការ​កំណត់​រចនា​សម្ព័ន្ធ​មិន​ល្អ​៖ កម្មវិធី​ស្កេន​មេរោគមិន​ស្គាល់​៖ ''$1''",
@@ -662,6 +670,7 @@ $2',
 'remembermypassword' => 'ចងចាំកំណត់ឈ្មោះចូលរបស់ខ្ញុំក្នុងកុំព្យូទ័រនេះ (សំរាប់រយៈពេលយូរបំផុត $1 {{PLURAL:$1|ថ្ងៃ|ថ្ងៃ}})',
 'securelogin-stick-https' => 'នៅភ្ជាប់ទៅ HTTPS ដដែលបន្ទាប់ពីចុះឈ្មោះចូលហើយក៏ដោយ',
 'yourdomainname' => 'ដូម៉ែនរបស់អ្នក៖',
+'password-change-forbidden' => 'អ្នកមិនអាចផ្លាស់ប្ដូរពាក្យសំងាត់ក្នុងវិគីនេះទេ។',
 'externaldberror' => 'មាន​​បញ្ហាក្នុងការ​បញ្ជាក់​ផ្ទៀង​ផ្ទាត់​​មូលដ្ឋាន​ទិន្នន័យ​ ឬ​អ្នក​មិន​ត្រូវ​បាន​អនុញ្ញាត​ឲ្យ​បន្ទាន់​សម័យ​គណនី​ខាង​ក្រៅ​របស់​អ្នក​។​
 ​',
 'login' => 'កត់ឈ្មោះចូល',
@@ -750,6 +759,7 @@ $2',
 
 សូមបញ្ចូល​អាសយដ្ឋានមួយ​ដែលមាន​ទម្រង់​ត្រឹមត្រូវ ឬមួយក៏ទុកវាលនោះឱ្យនៅទំនេរ​​។',
 'cannotchangeemail' => 'អាសយដ្ឋានអ៊ីមែលរបស់គណនីមិនអាចប្ដូរបានទេនៅលើវិគីនេះ។',
+'emaildisabled' => 'វិបសៃថ៍នេះមិនអាចផ្ញើអ៊ីមែលបានទេ។',
 'accountcreated' => 'គណនីរបស់លោកអ្នកត្រូវបានបង្កើតហើយ',
 'accountcreatedtext' => 'គណនីឈ្មោះ $1 ត្រូវបានបង្កើតហើយ។',
 'createaccount-title' => 'ការបង្កើតគណនីសម្រាប់{{SITENAME}}',
@@ -802,6 +812,25 @@ $2',
 'passwordreset-capture-help' => 'ប្រសិនបើអ្នកគូសធីកប្រអប់នេះ អ៊ីមែល (ដែលមានពាក្យសំងាត់បណ្ដោះអាសន្ន) មិនត្រូវបានបង្ហាញដូចគ្នានឹងអ៊ីមែលដែលនឹងត្រូវផ្ញើទៅទៅកាន់អ្នកប្រើប្រាស់ដែរ។',
 'passwordreset-email' => 'អាសយដ្ឋានអ៊ីមែល៖',
 'passwordreset-emailtitle' => 'ព័ត៌មានលំអិតពីគណនីនៅលើ {{SITENAME}}',
+'passwordreset-emailtext-ip' => 'មាននរណាម្នាក់ (ប្រហែលជាខ្លួនអ្នកផ្ទាល់, មកពីអាស័យដ្ឋាន IP $1) បានស្នើសុំសារក្រើនរំលឹកពីព័ត៌មានពិស្ដារ
+អំពីគណនីរបស់អ្នកសំរាប់ {{SITENAME}} ($4)។ {{PLURAL:$3|គណនី|គណនី}}អ្នកប្រើប្រាស់ដូចតទៅនេះ
+មានជាប់ទាក់ទិននឹងអាស័យដ្ឋានអ៊ីមែលនេះ៖
+
+$2
+
+{{PLURAL:$3|ពាក្យសំងាត់បណ្ដោះអាសន្ននេះ|ពាក្យសំងាត់បណ្ដោះអាសន្នទាំងនេះ}} និងហួសសុពលភាពក្នុងរយៈពេល {{PLURAL:$5|មួយថ្ងៃ|$5 ថ្ងៃ}}។
+យកល្អអ្នកគួរតែកត់ឈ្មោះរួចជ្រើសរើសពាក្យសំងាត់ថ្មីមួយ។ ប្រសិនបើមាននរណាម្នាក់ផ្សេងធ្វើការស្នើសុំនេះ 
+ឬប្រសិនបើអ្នកនឹកឃើញពាក្យសំងាត់ដើមរបស់អ្នកហើយអ្នកមិនប្រាថ្នាផ្លាស់ប្ដូរវាទៀតទេនោះ អ្នកគ្រាន់តែ
+កុំខ្វល់ជាមួយសារមួយនេះ ហើយបន្តប្រើប្រាស់ពាក្យសំងាត់ចាស់របស់អ្នកទៅបានហើយ។',
+'passwordreset-emailtext-user' => 'អ្នកប្រើប្រាស់ $1 នៅក្នុង {{SITENAME}} បានស្នើសុំសារក្រើនរំលឹកអំពីព័ត៌មានពិស្ដាររបស់គណនីរបស់អ្នកនៅក្នុង {{SITENAME}} ($4)។
+ {{PLURAL:$3|គណនី|គណនី}}អ្នកប្រើប្រាស់ដូចតទៅនេះមានជាប់ទាក់ទិននឹងអាស័យដ្ឋានអ៊ីមែលនេះ៖
+
+$2
+
+{{PLURAL:$3|ពាក្យសំងាត់បណ្ដោះអាសន្ននេះ|ពាក្យសំងាត់បណ្ដោះអាសន្នទាំងនេះ}} និងហួសសុពលភាពក្នុងរយៈពេល {{PLURAL:$5|មួយថ្ងៃ|$5 ថ្ងៃ}}។
+យកល្អអ្នកគួរតែកត់ឈ្មោះរួចជ្រើសរើសពាក្យសំងាត់ថ្មីមួយ។ ប្រសិនបើមាននរណាម្នាក់ផ្សេងធ្វើការស្នើសុំនេះ 
+ឬប្រសិនបើអ្នកនឹកឃើញពាក្យសំងាត់ដើមរបស់អ្នកហើយអ្នកមិនប្រាថ្នាផ្លាស់ប្ដូរវាទៀតទេនោះ អ្នកគ្រាន់តែ
+កុំខ្វល់ជាមួយសារមួយនេះ ហើយបន្តប្រើប្រាស់ពាក្យសំងាត់ចាស់របស់អ្នកទៅបានហើយ។',
 'passwordreset-emailelement' => 'ឈ្មោះអ្នកប្រើប្រាស់៖ $1
 លេខសម្ងាត់បណ្ដោះអាសន្ន៖ $2',
 'passwordreset-emailsent' => 'អីុមែលរំលឹកមួយបានផ្ញើទៅហើយ។',
@@ -930,12 +959,12 @@ $2',
 'userpage-userdoesnotexist-view' => 'គណនីអ្នកប្រើប្រាស់ដែលមានឈ្មោះ "$1"មិនទាន់បានចុះឈ្មោះទេ។',
 'blocked-notice-logextract' => 'អ្នកប្រើប្រាស់នេះត្រូវបានហាមឃាត់ហើយនាពេលនេះ។
 កំណត់ត្រាស្ដីពីការហាមឃាត់ចុងក្រោយមានបង្ហាញដូចខាងក្រោមនេះ៖',
-'clearyourcache' => "!'''សម្គាល់:''' បន្ទាប់ពីបានរក្សាទុករួចហើយ លោកអ្នកគួរតែសំអាត browser's cache របស់លោកអ្នកដើម្បីមើលការផ្លាស់ប្តូរ។ ខាងក្រោមនេះជាវិធីសំអាត browser's cache ចំពោះកម្មវិធីរុករក(Browser)មួយចំនួន។
-* ''' Firefox / Safari:''' សង្កត់ [Shift] ឱ្យជាប់រួចចុចប៊ូតុង ''Reload'' ឬក៏ចុច  ''Ctrl-F5'' ឬ ''Ctrl-R'' (ចំពោះApple Mac វិញ​ចុច ''Command-R'')
-* '''Google Chrome:''' ចុច ''Ctrl-Shift-R'' (''Command-Shift-R'' សំរាប់ Mac)
+'clearyourcache' => "'''សម្គាល់:''' បន្ទាប់ពីបានរក្សាទុករួចហើយ លោកអ្នកគួរតែសំអាត browser's cache របស់លោកអ្នកដើម្បីមើលការផ្លាស់ប្តូរ។ ខាងក្រោមនេះជាវិធីសំអាត browser's cache ចំពោះកម្មវិធីរុករក(Browser)មួយចំនួន។
+* ''' Firefox / Safari:''' សង្កត់ [Shift] ឱ្យជាប់រួចចុចប៊ូតុង ''Reload'' ឬក៏ចុច  ''Ctrl-F5'' ឬ ''Ctrl-R'' ( ''⌘-R'' សំរាប់ Mac)
+* '''Google Chrome:''' ចុច ''Ctrl-Shift-R'' (''⌘-Shift-R'' សំរាប់ Mac)
 * '''IE(Internet Explorer):''' សង្កត់ [Ctrl] ឱ្យជាប់ រួចចុច ''Refresh''ប៊ូតុង ឬក៏ចុច ''Ctrl-F5''​។
 * '''Konqueror:''' ចុចប៊ូតុង  ''Reload'' ឬក៏ចុច ''F5''
-* '''Opera:''' សូមចុច  ''[Tools]→[Preferences]''​។",
+* '''Opera:''' សូមសំអាតcacheនៅក្នុង  ''[Tools]→[Preferences]''​",
 'usercssyoucanpreview' => "'''គន្លឹះ ៖ ''' សូមប្រើប្រាស់ប៊ូតុង\"{{int:showpreview}}\"ដើម្បី​ធ្វើតេស្ត​សន្លឹក CSS ថ្មីរបស់អ្នក​មុននឹង​រក្សាទុកវា ។",
 'userjsyoucanpreview' => "'''គន្លឹះ ៖ ''' សូមប្រើប្រាស់​ប៊ូតុង \"{{int:showpreview}}\" ដើម្បី​ធ្វើតេស្ត​សន្លឹក JS ថ្មីរបស់អ្នក​មុននឹង​រក្សាទុកវា ។",
 'usercsspreview' => "'''កុំភ្លេចថា​អ្នកគ្រាន់តែ​កំពុងមើលជាមុនសន្លឹក CSS របស់អ្នក។
@@ -949,6 +978,7 @@ $2',
 'updated' => '(បានបន្ទាន់សម័យ)',
 'note' => "'''ចំណាំ៖'''",
 'previewnote' => "'''សូមចាំថានេះគ្រាន់តែជា​ការបង្ហាញការមើលជាមុនប៉ុណ្ណោះ។ បំលាស់ប្ដូរ​របស់អ្នកមិនទាន់បាន​រក្សាទុកទេ!'''",
+'continue-editing' => 'បន្តធ្វើការកែប្រែ',
 'previewconflict' => 'ការមើលមុននេះយោងតាមអត្ថបទក្នុងប្រអប់កែប្រែខាងលើ។ ទំព័រអត្ថបទនឹងបង្ហាញចេញបែបនេះប្រសិនបើអ្នកជ្រើសរើសរក្សាទុក។',
 'session_fail_preview' => "'''សូមអភ័យទោស! យើងមិនអាចរក្សាទុកការកែប្រែរបស់អ្នកបានទេ ដោយសារបាត់ទិន្នន័យវេនការងារ។
 
@@ -963,6 +993,7 @@ $2',
 
 បើនៅតែមិនបានទេ សូមព្យាយាម[[Special:UserLogout|កត់ឈ្មោះចេញ]] រួចកត់ឈ្មោះចូលឡើងវិញ។'''",
 'editing' => 'កំពុងកែប្រែ​ $1',
+'creating' => 'កំពុងបង្កើត $1',
 'editingsection' => "កំពុងកែប្រែ'''$1'''(ផ្នែក)",
 'editingcomment' => 'កែប្រែ $1 (ផ្នែកថ្មី)',
 'editconflict' => 'ភាពឆ្គងនៃកំណែប្រែ៖ $1',
@@ -1031,6 +1062,7 @@ $2',
 'edit-already-exists' => 'មិនអាចបង្កើតទំព័រថ្មីមួយទេ។
 
 ទំព័រនេះមានរួចហើយ។',
+'defaultmessagetext' => 'អត្ថបទសារតាមលំនាំដើម',
 
 # Parser/template warnings
 'expensive-parserfunction-warning' => "'''ប្រយ័ត្ន៖''' ទំព័រនេះមានប្រើអនុគមន៍ញែកច្រើនពេកហើយ។
@@ -1180,7 +1212,7 @@ $1",
 'suppressionlog' => 'កំណត់​ហេតុ​នៃ​ការ​ហាម​ឃាត់​',
 'suppressionlogtext' => 'ខាងក្រោមនេះជាបញ្ជីការលុបចោលនិងការហាមឃាត់ទាក់ទិននឹងខ្លឹមសារដែលអ្នកអភិបាលបានលាក់។
 
-សូមមើលបំរាមនិងការហាមឃាត់ដែលនៅជាធរមាននាពេលបច្ចុប្បន្ននៅក្នុង[[Special:BlockList|បញ្ជីនៃការហាមឃាត់ IP]]។',
+សូមមើលបំរាមនិងការហាមឃាត់ដែលនៅជាធរមាននាពេលបច្ចុប្បន្ននៅក្នុង[[Special:BlockList|បញ្ជីនៃការហាមឃាត់]]។',
 
 # History merging
 'mergehistory' => 'ច្របាច់ប្រវត្តិទាំងឡាយរបស់ទំព័របញ្ចូលគ្នា',
@@ -1212,7 +1244,9 @@ $1",
 'mergelogpagetext' => 'ខាងក្រោមគឺជាតារាងនៃការច្របាច់បញ្ចូលគ្នាថ្មីៗបំផុតរបស់ប្រវត្តិនៃទំព័រមួយទៅក្នុងប្រវត្តិនៃទំព័រមួយទៀត។',
 
 # Diffs
-'history-title' => 'ប្រវត្តិកំណែប្រែនានានៃ "$1"',
+'history-title' => 'ប្រវត្តិកំណែប្រែរបស់ "$1"',
+'difference-title' => 'ភាពខុសគ្នារវាងកំណែនានារបស់ "$1"',
+'difference-title-multipage' => 'ភាពខុសគ្នារបស់ទំព័រ "$1" និង "$2"',
 'difference-multipage' => '(ភាពខុសគ្នារវាងទំព័រនានា)',
 'lineno' => 'បន្ទាត់ទី$1៖',
 'compareselectedversions' => 'ប្រៀបធៀប​កំណែដែលបាន​ជ្រើសយក',
@@ -1220,6 +1254,10 @@ $1",
 'editundo' => 'មិនធ្វើវិញ',
 'diff-multi' => '({{PLURAL:$1|កំណែប្រែកម្រិតបង្គួរមួយ|កំណែប្រែកម្រិតបង្គួរចំនួន $1}}មិនត្រូវបានបង្ហាញ)',
 'diff-multi-manyusers' => '({{PLURAL:$1|កំណែប្រែកម្រិតបង្គួរមួយ|កំណែប្រែកម្រិតបង្គួរចំនួន $1}}មិនត្រូវបានបង្ហាញ)',
+'difference-missing-revision' => ' {{PLURAL:$2|រកមិនឃើញ|រកមិនឃើញ}}{{PLURAL:$2|កំណែមួយ|កំណែចំនួន $2}} របស់ភាពខុសគ្នានេះ ($1) ទេ។
+
+ជាធម្មតានេះបណ្ដាលមកពីការតាមទៅកាន់តំនភ្ជាប់ភាពខុសគ្នារបស់ទំព័រដែលត្រូវបានលុបចោល។
+ព័ត៌មានលំអិតអាចរកបាននៅក្នុង [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} កំណត់ហេតុនៃការលុបចោល]។',
 
 # Search results
 'searchresults' => 'លទ្ធផលស្វែងរក',
@@ -1310,6 +1348,7 @@ $1",
 'prefs-beta' => 'មុខងារពិសេសថ្មីៗរបស់ស៊េរីបេតា',
 'prefs-datetime' => 'កាលបរិច្ឆេទនិងល្វែងម៉ោង',
 'prefs-labs' => 'មុខងារពិសេសថ្មីៗដែលស្ថិតក្រោមការពិសោធន៍នៅឡើយ',
+'prefs-user-pages' => 'ទំព័រអ្នកប្រើប្រាស់',
 'prefs-personal' => 'ប្រវត្តិរូប',
 'prefs-rc' => 'បំលាស់ប្ដូរថ្មីៗ',
 'prefs-watchlist' => 'បញ្ជីតាមដាន',
@@ -1558,6 +1597,7 @@ $1",
 'action-userrights' => 'កែប្រែសិទ្ធិរបស់អ្នកប្រើប្រាស់ទាំងអស់',
 'action-userrights-interwiki' => 'កែប្រែសិទ្ធិនានារបស់អ្នកប្រើប្រាស់នៅលើវិគីដទៃ',
 'action-siteadmin' => 'ចាក់សោឬដោះសោមូលដ្ឋានទិន្នន័យ',
+'action-sendemail' => 'ផ្ញើអ៊ីមែល',
 
 # Recent changes
 'nchanges' => '$1 {{PLURAL:$1|បំលាស់ប្ដូរ|បំលាស់ប្ដូរ}}',
@@ -1590,9 +1630,11 @@ $1",
 'rc_categories' => 'កម្រិតទីតាំងចំណាត់ថ្នាក់ក្រុម(ខណ្ឌដោយសញ្ញា "|")',
 'rc_categories_any' => 'មួយណាក៏បាន',
 'rc-change-size' => '$1',
+'rc-change-size-new' => '$1 {{PLURAL:$1|បៃ|បៃ}} បន្ទាប់ពីបំលាស់ប្ដូរ',
 'newsectionsummary' => '/* $1 */ ផ្នែកថ្មី',
 'rc-enhanced-expand' => 'បង្ហាញព័ត៌មានលំអិត (តម្រូវអោយមាន JavaScript)',
 'rc-enhanced-hide' => 'លាក់ព័ត៌មានលំអិត',
+'rc-old-title' => 'បង្កើតឡើងដំបូងដោយ "$1"',
 
 # Recent changes linked
 'recentchangeslinked' => 'បន្លាស់ប្ដូរពាក់ព័ន្ធ',
@@ -1769,6 +1811,21 @@ $1',
 'upload-unknown-size' => 'មិនដឹងទំហំ',
 'upload-http-error' => 'មានកំហុសHTTPមួយបានកើតឡើង៖ $1',
 
+# File backend
+'backend-fail-notexists' => 'គ្មានឯកសារ "$1" ទេ។',
+'backend-fail-notsame' => 'ឯកសារដែលមិនដូចគ្នាបេះបិទមួយមានរួចហើយនៅ "$1"។',
+'backend-fail-delete' => 'មិនអាចលុបឯកសារ "$1" បានទេ។',
+'backend-fail-alreadyexists' => 'ឯកសារ "$1" មានរួចហើយ។',
+'backend-fail-store' => 'មិនអាចស្តុកឯកសារ "$1" នៅ "$2" បានទេ។',
+'backend-fail-copy' => 'មិនអាចចំលងឯកសារ "$1" ទៅ "$2" បានទេ។',
+'backend-fail-move' => 'មិនអាចផ្លាស់ប្ដូរទីតាំងឯកសារ "$1" ទៅ "$2"​ បានទេ។',
+'backend-fail-opentemp' => 'មិនអាចបើកឯកសារបណ្ដោះអាសន្ន។',
+'backend-fail-writetemp' => 'មិនអាចសរសេរទៅក្នុងឯកសារបណ្ដោះអាសន្ន។',
+'backend-fail-closetemp' => 'មិនអាចបិទឯកសារបណ្ដោះអាសន្ន។',
+'backend-fail-read' => 'មិនអាចអានឯកសារ "$1" បានទេ។',
+'backend-fail-create' => 'មិនអាចសរសេរឯកសារ "$1" បានទេ។',
+'backend-fail-maxsize' => 'មិនអាចសរសេរឯកសារ "$1" បានទេពីព្រោះវាមានទំហំធំជាង {{PLURAL:$2|មួយបៃ|$2 បៃ}}.',
+
 # Special:UploadStash
 'uploadstash-errclear' => 'ការសំអាតឯកសារមិនបានសំរេច។',
 'uploadstash-refresh' => 'ផ្ទុកបញ្ជីឯកសារឡើងវិញ',
@@ -2128,6 +2185,8 @@ $1',
 'mailnologin' => 'មិនមានអាសយដ្ឋានផ្ញើទេ',
 'mailnologintext' => 'អ្នកត្រូវតែ [[Special:UserLogin|កត់ឈ្មោះចូល]] និង មានអាសយដ្ឋានអ៊ីមែលមានសុពលភាពមួយ ក្នុង[[Special:Preferences|ចំណង់ចំណូលចិត្ត]]របស់អ្នក ដើម្បីមានសិទ្ធិផ្ញើអ៊ីមែលទៅអ្នកប្រើប្រាស់ដទៃទៀត។',
 'emailuser' => 'ផ្ញើអ៊ីមែល​ទៅកាន់​អ្នក​ប្រើប្រាស់នេះ',
+'emailuser-title-target' => 'ផ្ញើសារទៅកាន់ {{GENDER:$1|អ្នកប្រើប្រាស់}} នេះ',
+'emailuser-title-notarget' => 'ផ្ញើអ៊ីមែលទៅកាន់អ្នកប្រើប្រាស់',
 'emailpage' => 'ផ្ញើអ៊ីមែលទៅកាន់អ្នកប្រើប្រាស់',
 'emailpagetext' => 'អ្នក​អាច​ប្រើសំនុំ​បែប​បទ​ខាង​ក្រោម​ក្នុង​ការ​ផ្ញើ​សារ​ជា​អ៊ីមែល​ទៅ​កាន់​អ្នក​ប្រើប្រាស់​នេះ​។
 អាសយដ្ឋាន​អ៊ីមែល​ដែល​អ្នក​បាន​វាយ​បញ្ចូល​ក្នុង​[[Special:Preferences|ចំណង់ចំណូល​ចិត្ត​]]​របស់​អ្នក នឹង​បង្ហាញ​ជា​អាសយដ្ឋាន​អ៊ីមែល "From" ដូច្នោះ​អ្នក​ទទួល​នឹង​អាច​ឆ្លើយ​តប​ទៅ​អ្នក​វិញ​ដោយ​ផ្ទាល់​។',
@@ -2510,6 +2569,8 @@ $1',
 'ipb-confirm' => 'បញ្ជាក់ទទួលស្គាល់ការហាមឃាត់',
 'badipaddress' => 'អាសយដ្ឋានIPមិនត្រឹមត្រូវ',
 'blockipsuccesssub' => 'ដាក់ការហាមឃាត់បានសំរេច',
+'ipb-blockingself' => 'អ្នករៀបនឹងរាំងខ្ទប់ខ្លួនឯងហើយ! តើអ្នកប្រាកដថាចង់ធ្វើបែបនេះមែនទេ?',
+'ipb-confirmhideuser' => 'អ្នករៀបនឹងរាំងខ្ទប់អ្នកប្រើប្រាស់ម្នាក់ដែលមានប្រើមុខងារ "អ្នកប្រើប្រាស់លាក់មុខ"។ ការធ្វើបែបនេះនឹងលាក់ឈ្មោះរបស់អ្នកប្រើប្រាស់នេះនៅក្នុងបញ្ជីនិងកំណត់ហេតុទាំងអស់។ តើអ្នកប្រាកដថាចង់ធ្វើបែបនេះមែនទេ?',
 'ipb-edit-dropdown' => 'កែប្រែមូលហេតុនៃការហាមឃាត់',
 'ipb-unblock-addr' => 'ដកការហាមឃាត់លើ $1',
 'ipb-unblock' => 'ដកការហាមឃាត់លើអ្នកប្រើប្រាស់ ឬ អាសយដ្ឋាន IP',
@@ -2553,7 +2614,7 @@ $1',
 'blocklog-showlog' => 'អ្នកប្រើប្រាស់នេះត្រូវបានរាំងខ្ទប់មុននេះម្ដងហើយ។
 កំណត់ហេតុស្ដីពីការរាំងខ្ទប់ត្រូវបានផ្ដល់អោយដូចខាងក្រោម៖',
 'blocklogentry' => 'បានហាមឃាត់ [[$1]]​ដោយរយៈពេលផុតកំណត់$2 $3',
-'blocklogtext' => 'នេះជាកំណត់ហេតុនៃការហាមឃាត់និងឈប់ហាមឃាត់អ្នកប្រើប្រាស់។ អាសយដ្ឋានIPដែលត្រូវបានហាមឃាត់ដោយស្វ័យប្រវត្តិមិនត្រូវបានដាក់ក្នុងបញ្ជីនេះទេ។ សូមមើល[[Special:BlockList|បញ្ជីនៃការហាមឃាត់IP]]ចំពោះបញ្ជីនៃហាមឃាត់នាថ្មីៗ។',
+'blocklogtext' => 'នេះជាកំណត់ហេតុនៃការហាមឃាត់និងឈប់ហាមឃាត់អ្នកប្រើប្រាស់។ អាសយដ្ឋានIPដែលត្រូវបានហាមឃាត់ដោយស្វ័យប្រវត្តិមិនត្រូវបានដាក់ក្នុងបញ្ជីនេះទេ។ សូមមើល[[Special:BlockList|បញ្ជីនៃការហាមឃាត់]]ចំពោះបញ្ជីនៃហាមឃាត់នាថ្មីៗ។',
 'unblocklogentry' => 'បានឈប់ហាមឃាត់ $1',
 'block-log-flags-anononly' => 'សម្រាប់​តែ​អ្នកប្រើប្រាស់​អនាមិក​ប៉ុណ្ណោះ',
 'block-log-flags-nocreate' => 'ការបង្កើតគណនីត្រូវបានហាមឃាត់',
@@ -2869,11 +2930,30 @@ $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-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-restriction' => 'ការការពារទំព័រ (<code>{{$1}}</code>)',
+'pageinfo-magic-words' => '{{PLURAL:$1|ពាក្យ|ពាក្យ}} វេទមន្ត ($1)',
+'pageinfo-hidden-categories' => '{{PLURAL:$1|ចំណាត់ថ្នាក់ក្រុម|ចំណាត់ថ្នាក់ក្រុម}}ដែលបានលាក់ ($1)',
 
 # Skin names
 'skinname-standard' => 'បុរាណ',
@@ -2920,9 +3000,12 @@ $1',
 '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-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-size' => '$1 × $2 ភីកសែ',
 'file-info-gif-looped' => 'រង្វិល',
 'file-info-gif-frames' => '$1 {{PLURAL:$1|ផ្ទាំង|ផ្ទាំង}}',
@@ -3054,6 +3137,33 @@ $1',
 'exif-specialinstructions' => 'ការណែនាំពិសេស',
 'exif-credit' => 'អ្នកផ្ដល់',
 'exif-source' => 'ប្រភព',
+'exif-contact' => 'ព័ត៌មានសំរាប់ធ្វើការទាក់ទង',
+'exif-writer' => 'អ្នកសរសេរ',
+'exif-languagecode' => 'ភាសា​',
+'exif-iimcategory' => 'ចំណាត់ថ្នាក់ក្រុម',
+'exif-iimsupplementalcategory' => 'ចំណាត់ថ្នាក់ក្រុមបំពេញ',
+'exif-datetimeexpires' => 'កុំប្រើបន្ទាប់ពី',
+'exif-datetimereleased' => 'ចេញផ្សាយនៅ',
+'exif-lens' => 'ឡង់ទីដែលបានប្រើ',
+'exif-cameraownername' => 'ម្ចាស់កាមេរ៉ា',
+'exif-label' => 'ផ្លាក',
+'exif-rating' => 'រង្វាយតំលៃ (ធំបំផុត ៥)',
+'exif-rightscertificate' => 'លិខិត្របញ្ជាក់ការគ្រប់គ្រងកម្មសិទ្ធបញ្ញា',
+'exif-copyrighted' => 'ស្ថានភាពកម្មសិទ្ធបញ្ញា',
+'exif-copyrightowner' => 'ម្ចាស់កម្មសិទ្ធិបញ្ញា',
+'exif-usageterms' => 'លក្ខខណ្ឌប្រើប្រាស់',
+'exif-webstatement' => 'សេចក្ដីប្រកាសកម្មសិទ្ធបញ្ញាលើអ៊ីនធើណិត',
+'exif-licenseurl' => 'URL សំរាប់អាជ្ញាបណ្ឌកម្មសិទ្ធបញ្ញា',
+'exif-morepermissionsurl' => 'ព័ត៌មានអាជ្ញាបណ្ឌជំនួស',
+'exif-attributionurl' => 'នៅពេលកែច្នៃស្នាដៃនេះយកទៅប្រើ សូមដាក់តំណភ្ជាប់ទៅ',
+'exif-preferredattributionname' => 'នៅពេលកែច្នៃស្នាដៃនេះយកទៅប្រើ សូមថ្លែងអំណរគុណដល់ម្ចាស់ដើម',
+'exif-pngfilecomment' => 'វិចារលើឯកសារ PNG',
+'exif-disclaimer' => 'ការបដិសេធ',
+'exif-contentwarning' => 'ការព្រមានអំពីខ្លឹមសារ',
+'exif-giffilecomment' => 'វិចារលើឯកសារ GIF',
+'exif-intellectualgenre' => 'ប្រភេទរបស់',
+'exif-originalimageheight' => 'កំពស់របស់រូបភាពមុនពេលកាត់តំរឹម',
+'exif-originalimagewidth' => 'ទទឹងរបស់រូបភាពមុនពេលកាត់តំរឹម',
 
 # EXIF attributes
 'exif-compression-1' => 'លែងបានបង្ហាប់',
@@ -3248,6 +3358,34 @@ $3
 
 $5
 
+កូដដើម្បីទទួលស្គាល់នេះនឹងផុតកំណត់នៅ  $4 ។',
+'confirmemail_body_changed' => 'មាននរណាម្នាក់, ប្រហែលជាខ្លួនអ្នកផ្ទាល់, មកពីអាស័យដ្ឋាន IP $1,
+បានផ្លាស់ប្ដូរអាស័យដ្ឋានអ៊ីមែលរបស់គណនី "$2" មកកាន់អាស័យដ្ឋាននេះនៅក្នុង {{SITENAME}}។
+
+ដើម្បីបញ្ជាក់ថាគណនីនេះពិតជារបស់អ្នកមែន រួចដំណើរការមុខងារអ៊ីមែលនៅលើ {{SITENAME}} ឡើងវិញ
+សូមបើកតំណភ្ជាប់ខាងក្រោមនេះនៅលើកម្មវិធីរាយរកអ៊ីនធើណិតរបស់អ្នក៖
+
+$3
+
+ប្រសិនបើគណនីនេះ *មិនមែន* ជារបស់អ្នក សូមចុចលើតំណភ្ជាប់ខាងក្រោមនេះ
+ដើម្បីលុបចោលការបញ្ជាក់ទទួលស្គាល់អាស័យដ្ឋានអ៊ីមែល៖
+
+$5
+
+កូដបញ្ជាក់ទទួលស្គាល់នេះនឹងផុតកំណត់នៅ $4។',
+'confirmemail_body_set' => 'នរណាម្នាក់ ប្រហែលជាខ្លួនអ្នកផ្ទាល់ មកពីអាស័យដ្ឋានIP $1,
+បានដាក់ភ្ជាប់អាស័យដ្ឋានអ៊ីមែលរបស់គណនី "$2" ជាមួយនឹងអាស័យដ្ឋានអ៊ីមែលនេះនៅលើ{{SITENAME}}។
+
+ដើម្បីបញ្ជាក់ថានេះពិតជាគណនីផ្ទាល់របស់អ្នកមែន និងដំណើរការមុខងារអ៊ីមែលក្នុង{{SITENAME}}ឡើងវិញ
+សូមបើកតំណភ្ជាប់ខាងក្រោមនេះក្នុងកម្មវិធីរាយរកអ៊ីនធើណិតរបស់អ្នក៖
+
+$3
+
+ប្រសិនបើនេះ*មិនមែន*ជាគណនីរបស់អ្នកទេ សូមចុចតំណភ្ជាប់ខាងក្រោម 
+ដើម្បីបោះបង់ចោលនូវការបញ្ជាក់ទទួលស្គាល់អាសយដ្ឋានអ៊ីមែលនេះ៖
+
+$5
+
 កូដដើម្បីទទួលស្គាល់នេះនឹងផុតកំណត់នៅ  $4 ។',
 'confirmemail_invalidated' => 'ការអះអាងបញ្ជាក់ទទួលស្គាល់អាសយដ្ឋានអ៊ីមែលបានបោះបង់ចោលហើយ',
 'invalidateemail' => 'បោះបង់ចោលការបញ្ជាក់ទទួលស្គាល់អ៊ីមែល',
@@ -3400,7 +3538,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' => 'អ្នកប្រើប្រាស់និងសិទ្ធិ',
@@ -3461,6 +3599,14 @@ $5
 'htmlform-selectorother-other' => 'ផ្សេងទៀត',
 
 # New logging system
+'logentry-delete-delete' => '$1 បានលុបទំព័រ $3 ចោល',
+'logentry-delete-restore' => '$1 បានស្ដារទំព័រ $3 ឡើងវិញ',
+'revdelete-content-hid' => 'ខ្លឹមសារត្រូវបានលាក់',
+'revdelete-summary-hid' => 'ចំណារពន្យល់ការកែប្រែត្រូវបានលាក់',
+'revdelete-uname-hid' => 'អត្តនាមត្រូវបានលាក់',
+'revdelete-content-unhid' => 'ខ្លឹមសារត្រូវបានបង្ហាញ',
+'revdelete-summary-unhid' => 'ចំណារពន្យល់ការកែប្រែត្រូវបានបង្ហាញ',
+'revdelete-uname-unhid' => 'អត្តនាមត្រូវបានបង្ហាញ',
 'revdelete-restricted' => 'បានអនុវត្តការដាក់កំហិតចំពោះអ្នកអភិបាល',
 'revdelete-unrestricted' => 'បានដកការដាក់កំហិតចេញសម្រាប់អ្នកអភិបាល',
 'logentry-move-move' => '$1 បានប្ដូរទីតាំងទំព័រ $3 ពី $4',
@@ -3473,7 +3619,35 @@ $5
 'logentry-newusers-autocreate' => 'គណនី $1 ត្រូវ បានបង្កើត ដោយស្វ័យប្រវត្តិ',
 'newuserlog-byemail' => 'ពាក្យសំងាត់ត្រូវបានផ្ញើតាមអ៊ីមែល',
 
+# Feedback
+'feedback-subject' => 'កម្មវត្ថុ ៖',
+'feedback-message' => 'សារ​៖',
+'feedback-cancel' => 'បោះបង់​',
+'feedback-submit' => 'ដាក់ស្នើមតិយោបល់',
+'feedback-adding' => 'កំពុងបន្ថែមមតិយោបល់ទៅលើទំព័រ...',
+'feedback-thanks' => 'សូមអរគុណ! មតិយោបល់របស់អ្នកត្រូវបានដាក់ផ្សាយនៅលើទំព័រ "[$2 $1]"។',
+'feedback-close' => 'រួចរាល់',
+
 # API errors
+'api-error-badaccess-groups' => 'អ្នកគ្មានការអនុញ្ញាតអោយផ្ទុកឯកសារឡើងទៅក្នុងវិគីនេះទេ។',
+'api-error-empty-file' => 'ឯកសារដែលអ្នកបានដាក់ស្នើគឺទទេ។',
+'api-error-emptypage' => 'ការអនុញ្ញាតអោយបង្កើតទំព័រថ្មីដែលគ្មានសរសេរអ្វីទេ',
+'api-error-fileexists-forbidden' => 'ឯកសារដែលមានឈ្មោះ "$1" មានរួចហើយ ហើយមិនអាចសរសេរជាន់ពីលើបានទេ។',
+'api-error-fileexists-shared-forbidden' => 'ឯកសារដែលមានឈ្មោះ "$1" មានរួចហើយនៅក្នុងថតឯកសាររួម ហើយមិនអាចសរសេរជាន់ពីលើបានទេ។',
+'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-missing' => 'ឈ្មោះឯកសារបាត់កន្ទុយ។',
+'api-error-http' => 'បញ្ហាខាងក្នុង៖ មិនអាចភ្ជាប់ទោកាន់ម៉ាស៊ីនបំរើការ។',
+'api-error-illegal-filename' => 'មិនអនុញ្ញាតអោយប្រើឈ្មោះឯកសារនេះ។',
+'api-error-internal-error' => 'បញ្ហាខាងក្នុង៖ មានបញ្ហាណាមួយកើតឡើងពេលកំពុងដំណើរការផ្ទុកឯកសារអ្នកឡើងទៅក្នុងវិគី។',
+'api-error-missingresult' => 'បញ្ហាខាងក្នុង៖ មិនអាចកំណត់បានថាការថតចំលងបានសំរេចទេ។',
+'api-error-mustbeloggedin' => 'អ្នកត្រូវតែកត់ឈ្មោះចូលដើម្បីផ្ទុកឯកសារឡើង។',
+'api-error-ok-but-empty' => 'បញ្ហាខាងក្នុង៖ គ្មានចំលើយពីម៉ាស៊ីនបំរើការ។',
+'api-error-overwrite' => 'មិនអនុញ្ញាតអោយសរសេរជាន់ពីលើឯកសារដែលមានស្រាប់ហើយ។',
+'api-error-timeout' => 'ម៉ាស៊ីនបំរើការមិនបានឆ្លើយតបក្នុងរយៈពេលដែលយើងរំពឹងទុក។',
 'api-error-unclassified' => 'បញ្ហាមិនស្គាល់មួយបានកើតឡើង។',
 'api-error-unknown-code' => 'បញ្ហាមិនស្គាល់៖ "$1" ។',
 'api-error-unknown-error' => 'បញ្ហាខាងក្នុង៖ មានបញ្ហាមិនស្រួលពេលកំពុងព្យាយាមផ្ទុកឯកសាររបស់អ្នកឡើង។',
@@ -3482,4 +3656,14 @@ $5
 'api-error-uploaddisabled' => 'ការផ្ទុកឡើងត្រូវបានបិទមិនអោយប្រើនៅលើវិគីនេះទេ។',
 'api-error-verification-error' => 'ឯកសារនេះប្រហែលជាខូច ឯមានកន្ទុយមិនត្រឹមត្រូវ។',
 
+# Durations
+'duration-seconds' => '$1 {{PLURAL:$1|វិនាទី|វិនាទី}}',
+'duration-minutes' => '$1 {{PLURAL:$1|នាទី|នាទី}}',
+'duration-hours' => '$1 {{PLURAL:$1|ម៉ោង|ម៉ោង}}',
+'duration-days' => '$1 {{PLURAL:$1|ថ្ងៃ|ថ្ងៃ}}',
+'duration-weeks' => '$1 {{PLURAL: $1|សប្តាហ៍|សប្តាហ៍}}',
+'duration-years' => '$1 {{PLURAL:$1|ឆ្នាំ|ឆ្នាំ}}',
+'duration-decades' => '$1 {{PLURAL:$1|ទសវត្សរ៍|ទសវត្សរ៍}}',
+'duration-centuries' => '$1 {{PLURAL:$1|សតវត្សរ៍|សតវត្សរ៍}}',
+
 );
diff --git a/languages/messages/MessagesKo.php b/languages/messages/MessagesKo.php
index 574c1c7d7d..210e2c3eaf 100644
--- a/languages/messages/MessagesKo.php
+++ b/languages/messages/MessagesKo.php
@@ -21,6 +21,7 @@
  * @author IRTC1015
  * @author ITurtle
  * @author Idh0854
+ * @author Jmkim dot com
  * @author Kaganer
  * @author Klutzy
  * @author Kwj2772
@@ -73,8 +74,8 @@ $specialPageAliases = array(
 	'Booksources'               => array( '책찾기' ),
 	'BrokenRedirects'           => array( '끊긴넘겨주기' ),
 	'Categories'                => array( '분류' ),
-	'ChangeEmail'               => array( '이메일변경', '이메일바꾸기' ),
-	'ChangePassword'            => array( '비밀번호변경', '비밀번호바꾸기', '비밀단어변경', '비밀단어바꾸기' ),
+	'ChangeEmail'               => array( '이메일바꾸기', '이메일변경' ),
+	'ChangePassword'            => array( '비밀번호바꾸기', '비밀번호변경', '비밀단어바꾸기', '비밀단어변경' ),
 	'ComparePages'              => array( '문서비교' ),
 	'Confirmemail'              => array( '이메일인증' ),
 	'Contributions'             => array( '기여', '기여목록', '사용자기여' ),
@@ -108,6 +109,7 @@ $specialPageAliases = array(
 	'MIMEsearch'                => array( 'MIME찾기', 'MIME검색' ),
 	'Mostcategories'            => array( '많이분류된문서' ),
 	'Mostimages'                => array( '많이쓰는파일', '많이쓰는그림' ),
+	'Mostinterwikis'            => array( '인터위키많은문서' ),
 	'Mostlinked'                => array( '많이링크된문서' ),
 	'Mostlinkedcategories'      => array( '많이쓰는분류' ),
 	'Mostlinkedtemplates'       => array( '많이쓰는틀' ),
@@ -119,13 +121,13 @@ $specialPageAliases = array(
 	'Myuploads'                 => array( '내가올린파일' ),
 	'Newimages'                 => array( '새파일', '새그림' ),
 	'Newpages'                  => array( '새문서' ),
-	'PasswordReset'             => array( '비밀번호초기화', '비밀단어초기화' ),
+	'PasswordReset'             => array( '비밀번호재설정', '비밀단어재설정', '비밀번호초기화', '비밀단어초기화' ),
 	'PermanentLink'             => array( '고유링크', '영구링크' ),
 	'Popularpages'              => array( '인기있는문서' ),
 	'Preferences'               => array( '환경설정' ),
 	'Prefixindex'               => array( '접두어찾기' ),
 	'Protectedpages'            => array( '보호된문서' ),
-	'Protectedtitles'           => array( '생성보호된문서' ),
+	'Protectedtitles'           => array( '생성보호된문서', '만들기보호된문서' ),
 	'Randompage'                => array( '임의문서' ),
 	'Randomredirect'            => array( '임의넘겨주기' ),
 	'Recentchanges'             => array( '최근바뀜' ),
@@ -164,159 +166,164 @@ $specialPageAliases = 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__' ),
-	'noheader'                => array( '0', '__머릿글숨김__', '__헤더숨김__', '__NOHEADER__' ),
-	'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' ),
-	'localmonth'              => array( '1', '지역월', 'LOCALMONTH', 'LOCALMONTH2' ),
-	'localmonth1'             => array( '1', '지역월1', 'LOCALMONTH1' ),
-	'localmonthname'          => array( '1', '지역월이름', 'LOCALMONTHNAME' ),
-	'localmonthnamegen'       => array( '1', '지역월이름소유격', 'LOCALMONTHNAMEGEN' ),
-	'localmonthabbrev'        => array( '1', '지역월이름약자', 'LOCALMONTHABBREV' ),
-	'localday'                => array( '1', '지역일', 'LOCALDAY' ),
-	'localday2'               => array( '1', '지역일2', 'LOCALDAY2' ),
-	'localdayname'            => array( '1', '지역요일', 'LOCALDAYNAME' ),
-	'localyear'               => array( '1', '지역년', 'LOCALYEAR' ),
-	'localtime'               => array( '1', '지역시분', '지역시각', 'LOCALTIME' ),
-	'localhour'               => array( '1', '지역시', 'LOCALHOUR' ),
-	'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', '문서이름E', 'PAGENAMEE' ),
-	'namespace'               => array( '1', '이름공간', 'NAMESPACE' ),
-	'namespacee'              => array( '1', '이름공간E', 'NAMESPACEE' ),
-	'namespacenumber'         => array( '1', '이름공간수', 'NAMESPACENUMBER' ),
-	'talkspace'               => array( '1', '토론이름공간', 'TALKSPACE' ),
-	'talkspacee'              => array( '1', '토론이름공간E', 'TALKSPACEE' ),
-	'subjectspace'            => array( '1', '본문서이름공간', 'SUBJECTSPACE', 'ARTICLESPACE' ),
-	'subjectspacee'           => array( '1', '본문서이름공간E', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
-	'fullpagename'            => array( '1', '전체문서이름', 'FULLPAGENAME' ),
-	'fullpagenamee'           => array( '1', '전체문서이름E', 'FULLPAGENAMEE' ),
-	'subpagename'             => array( '1', '하위문서이름', 'SUBPAGENAME' ),
-	'subpagenamee'            => array( '1', '하위문서이름E', 'SUBPAGENAMEE' ),
-	'basepagename'            => array( '1', '상위문서이름', 'BASEPAGENAME' ),
-	'basepagenamee'           => array( '1', '상위문서이름E', 'BASEPAGENAMEE' ),
-	'talkpagename'            => array( '1', '토론문서이름', 'TALKPAGENAME' ),
-	'talkpagenamee'           => array( '1', '토론문서이름E', 'TALKPAGENAMEE' ),
-	'subjectpagename'         => array( '1', '본문서이름', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
-	'subjectpagenamee'        => array( '1', '본문서이름E', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
-	'msg'                     => array( '0', '메시지:', 'MSG:' ),
-	'subst'                   => array( '0', '풀기:', 'SUBST:' ),
-	'safesubst'               => array( '0', '안전풀기:', 'SAFESUBST:' ),
-	'msgnw'                   => array( '0', '위키잘못메시지:', 'MSGNW:' ),
-	'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_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', 'page=$1', 'page $1' ),
-	'img_upright'             => array( '1', '위오른쪽', '위오른쪽=$1', 'upright', 'upright=$1', 'upright $1' ),
-	'img_border'              => array( '1', '테두리', 'border' ),
-	'img_baseline'            => array( '1', '밑줄', 'baseline' ),
-	'img_sub'                 => array( '1', '아래첨자', 'sub' ),
-	'img_super'               => array( '1', '위첨자', 'super', 'sup' ),
-	'img_top'                 => array( '1', '위', 'top' ),
-	'img_text_top'            => array( '1', '글자위', '텍스트위', 'text-top' ),
-	'img_middle'              => array( '1', '중간', 'middle' ),
-	'img_bottom'              => array( '1', '아래', 'bottom' ),
-	'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:' ),
-	'sitename'                => array( '1', '사이트이름', 'SITENAME' ),
-	'ns'                      => array( '0', '이름:', '이름공간:', 'NS:' ),
-	'nse'                     => array( '0', '이름E:', '이름공간E:', 'NSE:' ),
-	'localurl'                => array( '0', '지역주소:', 'LOCALURL:' ),
-	'localurle'               => array( '0', '지역주소E:', 'LOCALURLE:' ),
-	'articlepath'             => array( '0', '항목경로', '기사경로', 'ARTICLEPATH' ),
-	'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__' ),
-	'currentweek'             => array( '1', '현재주', 'CURRENTWEEK' ),
-	'currentdow'              => array( '1', '현재요일숫자', 'CURRENTDOW' ),
-	'localweek'               => array( '1', '지역주', 'LOCALWEEK' ),
-	'localdow'                => array( '1', '지역요일숫자', 'LOCALDOW' ),
-	'revisionid'              => array( '1', '판번호', 'REVISIONID' ),
-	'revisionday'             => array( '1', '판일', 'REVISIONDAY' ),
-	'revisionday2'            => array( '1', '판일2', 'REVISIONDAY2' ),
-	'revisionmonth'           => array( '1', '판월', 'REVISIONMONTH' ),
-	'revisionmonth1'          => array( '1', '판월1', 'REVISIONMONTH1' ),
-	'revisionyear'            => array( '1', '판년', 'REVISIONYEAR' ),
-	'revisiontimestamp'       => array( '1', '판타임스탬프', 'REVISIONTIMESTAMP' ),
-	'revisionuser'            => array( '1', '판사용자', 'REVISIONUSER' ),
-	'plural'                  => array( '0', '복수:', '복수형:', 'PLURAL:' ),
-	'fullurl'                 => array( '0', '전체주소:', 'FULLURL:' ),
-	'fullurle'                => array( '0', '전체주소E:', 'FULLURLE:' ),
-	'canonicalurl'            => array( '0', '표준주소:', 'CANONICALURL:' ),
-	'canonicalurle'           => array( '0', '표준주소E:', 'CANONICALURLE:' ),
-	'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__' ),
-	'nonewsectionlink'        => array( '1', '__새글쓰기숨기기__', '__NONEWSECTIONLINK__' ),
-	'currentversion'          => array( '1', '현재버전', 'CURRENTVERSION' ),
-	'urlencode'               => array( '0', '주소인코딩:', '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', '특수기능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' ),
-	'url_path'                => array( '0', '경로', 'PATH' ),
-	'url_wiki'                => array( '0', '위키', 'WIKI' ),
-	'url_query'               => array( '0', '쿼리', 'QUERY' ),
-	'defaultsort_noerror'     => array( '0', '오류없음', 'noerror' ),
-	'defaultsort_noreplace'   => array( '0', '바꾸기없음', 'noreplace' ),
+	'redirect'                  => array( '0', '#넘겨주기', '#REDIRECT' ),
+	'notoc'                     => array( '0', '__목차숨김__', '__NOTOC__' ),
+	'nogallery'                 => array( '0', '__화랑숨김__', '__갤러리숨김__', '__NOGALLERY__' ),
+	'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' ),
+	'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' ),
+	'localmonth'                => array( '1', '지역월', 'LOCALMONTH', 'LOCALMONTH2' ),
+	'localmonth1'               => array( '1', '지역월1', 'LOCALMONTH1' ),
+	'localmonthname'            => array( '1', '지역월이름', 'LOCALMONTHNAME' ),
+	'localmonthnamegen'         => array( '1', '지역월이름소유격', 'LOCALMONTHNAMEGEN' ),
+	'localmonthabbrev'          => array( '1', '지역월이름약자', 'LOCALMONTHABBREV' ),
+	'localday'                  => array( '1', '지역일', 'LOCALDAY' ),
+	'localday2'                 => array( '1', '지역일2', 'LOCALDAY2' ),
+	'localdayname'              => array( '1', '지역요일', 'LOCALDAYNAME' ),
+	'localyear'                 => array( '1', '지역년', 'LOCALYEAR' ),
+	'localtime'                 => array( '1', '지역시분', '지역시각', 'LOCALTIME' ),
+	'localhour'                 => array( '1', '지역시', 'LOCALHOUR' ),
+	'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', '문서이름E', 'PAGENAMEE' ),
+	'namespace'                 => array( '1', '이름공간', 'NAMESPACE' ),
+	'namespacee'                => array( '1', '이름공간E', 'NAMESPACEE' ),
+	'namespacenumber'           => array( '1', '이름공간수', 'NAMESPACENUMBER' ),
+	'talkspace'                 => array( '1', '토론이름공간', 'TALKSPACE' ),
+	'talkspacee'                => array( '1', '토론이름공간E', 'TALKSPACEE' ),
+	'subjectspace'              => array( '1', '본문서이름공간', 'SUBJECTSPACE', 'ARTICLESPACE' ),
+	'subjectspacee'             => array( '1', '본문서이름공간E', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
+	'fullpagename'              => array( '1', '전체문서이름', 'FULLPAGENAME' ),
+	'fullpagenamee'             => array( '1', '전체문서이름E', 'FULLPAGENAMEE' ),
+	'subpagename'               => array( '1', '하위문서이름', 'SUBPAGENAME' ),
+	'subpagenamee'              => array( '1', '하위문서이름E', 'SUBPAGENAMEE' ),
+	'basepagename'              => array( '1', '상위문서이름', 'BASEPAGENAME' ),
+	'basepagenamee'             => array( '1', '상위문서이름E', 'BASEPAGENAMEE' ),
+	'talkpagename'              => array( '1', '토론문서이름', 'TALKPAGENAME' ),
+	'talkpagenamee'             => array( '1', '토론문서이름E', 'TALKPAGENAMEE' ),
+	'subjectpagename'           => array( '1', '본문서이름', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
+	'subjectpagenamee'          => array( '1', '본문서이름E', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
+	'msg'                       => array( '0', '메시지:', 'MSG:' ),
+	'subst'                     => array( '0', '풀기:', 'SUBST:' ),
+	'safesubst'                 => array( '0', '안전풀기:', 'SAFESUBST:' ),
+	'msgnw'                     => array( '0', '위키잘못메시지:', 'MSGNW:' ),
+	'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_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', 'page=$1', 'page $1' ),
+	'img_upright'               => array( '1', '위오른쪽', '위오른쪽=$1', 'upright', 'upright=$1', 'upright $1' ),
+	'img_border'                => array( '1', '테두리', 'border' ),
+	'img_baseline'              => array( '1', '밑줄', 'baseline' ),
+	'img_sub'                   => array( '1', '아래첨자', 'sub' ),
+	'img_super'                 => array( '1', '위첨자', 'super', 'sup' ),
+	'img_top'                   => array( '1', '위', 'top' ),
+	'img_text_top'              => array( '1', '글자위', '텍스트위', 'text-top' ),
+	'img_middle'                => array( '1', '중간', 'middle' ),
+	'img_bottom'                => array( '1', '아래', 'bottom' ),
+	'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:' ),
+	'sitename'                  => array( '1', '사이트이름', 'SITENAME' ),
+	'ns'                        => array( '0', '이름:', '이름공간:', 'NS:' ),
+	'nse'                       => array( '0', '이름E:', '이름공간E:', 'NSE:' ),
+	'localurl'                  => array( '0', '지역주소:', 'LOCALURL:' ),
+	'localurle'                 => array( '0', '지역주소E:', 'LOCALURLE:' ),
+	'articlepath'               => array( '0', '항목경로', '기사경로', 'ARTICLEPATH' ),
+	'pageid'                    => array( '0', '문서번호', '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__' ),
+	'currentweek'               => array( '1', '현재주', 'CURRENTWEEK' ),
+	'currentdow'                => array( '1', '현재요일숫자', 'CURRENTDOW' ),
+	'localweek'                 => array( '1', '지역주', 'LOCALWEEK' ),
+	'localdow'                  => array( '1', '지역요일숫자', 'LOCALDOW' ),
+	'revisionid'                => array( '1', '판번호', 'REVISIONID' ),
+	'revisionday'               => array( '1', '판일', 'REVISIONDAY' ),
+	'revisionday2'              => array( '1', '판일2', 'REVISIONDAY2' ),
+	'revisionmonth'             => array( '1', '판월', 'REVISIONMONTH' ),
+	'revisionmonth1'            => array( '1', '판월1', 'REVISIONMONTH1' ),
+	'revisionyear'              => array( '1', '판년', 'REVISIONYEAR' ),
+	'revisiontimestamp'         => array( '1', '판타임스탬프', 'REVISIONTIMESTAMP' ),
+	'revisionuser'              => array( '1', '판사용자', 'REVISIONUSER' ),
+	'plural'                    => array( '0', '복수:', '복수형:', 'PLURAL:' ),
+	'fullurl'                   => array( '0', '전체주소:', 'FULLURL:' ),
+	'fullurle'                  => array( '0', '전체주소E:', 'FULLURLE:' ),
+	'canonicalurl'              => array( '0', '표준주소:', 'CANONICALURL:' ),
+	'canonicalurle'             => array( '0', '표준주소E:', 'CANONICALURLE:' ),
+	'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__' ),
+	'nonewsectionlink'          => array( '1', '__새글쓰기숨기기__', '__NONEWSECTIONLINK__' ),
+	'currentversion'            => array( '1', '현재버전', 'CURRENTVERSION' ),
+	'urlencode'                 => array( '0', '주소인코딩:', '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', '특수기능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' ),
+	'url_path'                  => array( '0', '경로', 'PATH' ),
+	'url_wiki'                  => array( '0', '위키', 'WIKI' ),
+	'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' ),
 );
 
 $bookstoreList = array(
@@ -2149,7 +2156,7 @@ URL이 맞고 해당 웹사이트가 작동하는지 확인해주세요.',
 'doubleredirects' => '이중 넘겨주기 목록',
 'doubleredirectstext' => '이 문서는 다른 넘겨주기 문서로 넘겨주고 있는 문서의 목록입니다.
 매 줄에는 첫 번째 문서와 두 번째 문서의 링크가 있습니다. 그리고 보통 첫 번째 문서가 넘겨주어야 할 "실제" 문서인 두 번째 넘겨주기의 대상이 있습니다.
-<del>취소선이 그인</del> 부분은 이미 해결되었습니다.',
+<del>취소선이 그어진</del> 부분은 이미 해결되었습니다.',
 'double-redirect-fixed-move' => '[[$1]] 문서를 옮겼습니다.
 이 문서는 이제 [[$2]] 문서로 넘겨줍니다.',
 'double-redirect-fixed-maintenance' => '[[$1]]에서 [[$2]]로 이중 넘겨주기를 고치는 중',
@@ -3219,7 +3226,7 @@ $1 사용자가 차단된 이유는 다음과 같습니다: "$2"',
 'pageinfo-authors' => '총 서로 다른 편집자 수',
 'pageinfo-recent-edits' => '최근 편집 수 (지난 $1일 이내)',
 'pageinfo-recent-authors' => '최근 기여자 수',
-'pageinfo-restriction' => '문서 보호 (<code>$1</code>)',
+'pageinfo-restriction' => '문서 보호 (<code>{{lcfirst:$1}}</code>)',
 'pageinfo-magic-words' => '매직 {{PLURAL:$1|워드}} ($1개)',
 'pageinfo-hidden-categories' => '숨은 {{PLURAL:$1|분류}} ($1개)',
 'pageinfo-templates' => '포함한 {{PLURAL:$1|틀}} ($1개)',
diff --git a/languages/messages/MessagesKsh.php b/languages/messages/MessagesKsh.php
index 66fe9b1fb6..87015dad4a 100644
--- a/languages/messages/MessagesKsh.php
+++ b/languages/messages/MessagesKsh.php
@@ -197,13 +197,13 @@ $specialPageAliases = array(
 );
 
 $magicWords = array(
-	'redirect'                => array( '0', '#ÖMLEIDE_OP', '#ÖMLEIDE', '#LEIDT_ÖM_OP', '#ÖMLEIDUNG', '#WEITERLEITUNG', '#REDIRECT' ),
-	'nogallery'               => array( '0', '__KEIN_JALLERIE__', '__KEINE_GALERIE__', '__KEINEGALERIE__', '__NOGALLERY__' ),
-	'toc'                     => array( '0', '__ENHALLT__', '__INHALTSVERZEICHNIS__', '__TOC__' ),
-	'img_right'               => array( '1', 'rähß', 'räts', 'rechts', 'right' ),
-	'img_left'                => array( '1', 'lengks', 'lenks', 'links', 'left' ),
-	'language'                => array( '0', '#SHPROOCH:', '#SPROCH:', '#SPRACHE:', '#LANGUAGE:' ),
-	'hiddencat'               => array( '1', '__VERSHTOCHE_SAACHJRUPP__', '__VERSTECKTE_KATEGORIE__', '__WARTUNGSKATEGORIE__', '__HIDDENCAT__' ),
+	'redirect'                  => array( '0', '#ÖMLEIDE_OP', '#ÖMLEIDE', '#LEIDT_ÖM_OP', '#ÖMLEIDUNG', '#WEITERLEITUNG', '#REDIRECT' ),
+	'nogallery'                 => array( '0', '__KEIN_JALLERIE__', '__KEINE_GALERIE__', '__KEINEGALERIE__', '__NOGALLERY__' ),
+	'toc'                       => array( '0', '__ENHALLT__', '__INHALTSVERZEICHNIS__', '__TOC__' ),
+	'img_right'                 => array( '1', 'rähß', 'räts', 'rechts', 'right' ),
+	'img_left'                  => array( '1', 'lengks', 'lenks', 'links', 'left' ),
+	'language'                  => array( '0', '#SHPROOCH:', '#SPROCH:', '#SPRACHE:', '#LANGUAGE:' ),
+	'hiddencat'                 => array( '1', '__VERSHTOCHE_SAACHJRUPP__', '__VERSTECKTE_KATEGORIE__', '__WARTUNGSKATEGORIE__', '__HIDDENCAT__' ),
 );
 
 $imageFiles = array(
diff --git a/languages/messages/MessagesKu_latn.php b/languages/messages/MessagesKu_latn.php
index 47e7f5758a..311aad55ed 100644
--- a/languages/messages/MessagesKu_latn.php
+++ b/languages/messages/MessagesKu_latn.php
@@ -24,22 +24,32 @@
 $namespaceNames = array(
 	NS_MEDIA            => 'Medya',
 	NS_SPECIAL          => 'Taybet',
-	NS_TALK             => 'Nîqaş',
+	NS_TALK             => 'Gotûbêj',
 	NS_USER             => 'Bikarhêner',
-	NS_USER_TALK        => 'Bikarhêner_nîqaş',
-	NS_PROJECT_TALK     => '$1_nîqaş',
+	NS_USER_TALK        => 'Gotûbêja_bikarhêner',
+	NS_PROJECT_TALK     => '$1_gotûbêj',
 	NS_FILE             => 'Wêne',
-	NS_FILE_TALK        => 'Wêne_nîqaş',
+	NS_FILE_TALK        => 'Gotûbêja_wêneyî',
 	NS_MEDIAWIKI        => 'MediaWiki',
-	NS_MEDIAWIKI_TALK   => 'MediaWiki_nîqaş',
+	NS_MEDIAWIKI_TALK   => 'Gotûbêja_MediaWiki',
 	NS_TEMPLATE         => 'Şablon',
-	NS_TEMPLATE_TALK    => 'Şablon_nîqaş',
+	NS_TEMPLATE_TALK    => 'Gotûbêja_şablonê',
 	NS_HELP             => 'Alîkarî',
-	NS_HELP_TALK        => 'Alîkarî_nîqaş',
+	NS_HELP_TALK        => 'Gotûbêja_alîkariyê',
 	NS_CATEGORY         => 'Kategorî',
-	NS_CATEGORY_TALK    => 'Kategorî_nîqaş',
+	NS_CATEGORY_TALK    => 'Gotûbêja_kategoriyê',
 );
 
+$namespaceAliases = array(
+	'Nîqaş'            => NS_TALK,
+	'Bikarhêner_nîqaş' => NS_USER_TALK,
+	'$1_nîqaş'         => NS_PROJECT_TALK,
+	'Wêne_nîqaş'       => NS_FILE_TALK,
+	'MediaWiki_nîqaş'  => NS_MEDIAWIKI_TALK,
+	'Şablon_nîqaş'     => NS_TEMPLATE_TALK,
+	'Alîkarî_nîqaş'    => NS_HELP_TALK,
+	'Kategorî_nîqaş'   => NS_CATEGORY_TALK,
+);
 
 $specialPageAliases = array(
 	'Categories'                => array( 'Dara_kategoriyan' ),
@@ -49,7 +59,8 @@ $specialPageAliases = array(
 	'Randompage'                => array( 'Rûpela_tesadufî' ),
 	'Randomredirect'            => array( 'Redirecta_tasadufî' ),
 	'Recentchanges'             => array( 'Guherandinên_dawî' ),
-	'Search'                    => array( 'Lê_bigere' ),
+	'Search'                    => array( 'Lêgerîn' ),
+	'Shortpages'                => array( 'Rûpelên_kurt' ),
 	'Statistics'                => array( 'Statîstîk' ),
 	'Uncategorizedcategories'   => array( 'Kategoriyên_bê_kategorî' ),
 	'Uncategorizedpages'        => array( 'Rûpelên_bê_kategorî' ),
@@ -59,33 +70,33 @@ $specialPageAliases = array(
 );
 
 $magicWords = array(
-	'redirect'                => array( '0', '#BERALÎKIRIN', '#REDIRECT' ),
-	'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' ),
-	'currenttime'             => array( '1', 'DEMA_NIHA', 'CURRENTTIME' ),
-	'numberofpages'           => array( '1', 'HEJMARA_RÛPELAN', 'NUMBEROFPAGES' ),
-	'numberofarticles'        => array( '1', 'HEJMARA_GOTARAN', 'NUMBEROFARTICLES' ),
-	'numberoffiles'           => array( '1', 'HEJMARA_DOSYEYAN', 'NUMBEROFFILES' ),
-	'numberofusers'           => array( '1', 'HEJMARA_BIKARHÊNERAN', 'NUMBEROFUSERS' ),
-	'numberofactiveusers'     => array( '1', 'HEJMARA_BIKARHÊNERÊN_ÇALAK', 'NUMBEROFACTIVEUSERS' ),
-	'numberofedits'           => array( '1', 'HEJMARA_GUHERTINAN', 'NUMBEROFEDITS' ),
-	'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' ),
-	'sitename'                => array( '1', 'NAVÊ_PROJEYÊ', 'SITENAME' ),
-	'grammar'                 => array( '0', 'RÊZIMAN.', 'GRAMMAR:' ),
-	'gender'                  => array( '0', 'ZAYEND.', 'GENDER:' ),
-	'plural'                  => array( '0', 'PIRRJIMAR:', 'PLURAL:' ),
-	'currentversion'          => array( '1', 'VERSIYONA_NIHA', 'CURRENTVERSION' ),
-	'language'                => array( '0', '#ZIMAN', '#LANGUAGE:' ),
-	'numberofadmins'          => array( '1', 'HEJMARA_RÊVEBERAN', 'NUMBEROFADMINS' ),
-	'special'                 => array( '0', 'taybet', 'special' ),
+	'redirect'                  => array( '0', '#BERALÎKIRIN', '#REDIRECT' ),
+	'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' ),
+	'currenttime'               => array( '1', 'DEMA_NIHA', 'CURRENTTIME' ),
+	'numberofpages'             => array( '1', 'HEJMARA_RÛPELAN', 'NUMBEROFPAGES' ),
+	'numberofarticles'          => array( '1', 'HEJMARA_GOTARAN', 'NUMBEROFARTICLES' ),
+	'numberoffiles'             => array( '1', 'HEJMARA_DOSYEYAN', 'NUMBEROFFILES' ),
+	'numberofusers'             => array( '1', 'HEJMARA_BIKARHÊNERAN', 'NUMBEROFUSERS' ),
+	'numberofactiveusers'       => array( '1', 'HEJMARA_BIKARHÊNERÊN_ÇALAK', 'NUMBEROFACTIVEUSERS' ),
+	'numberofedits'             => array( '1', 'HEJMARA_GUHERTINAN', 'NUMBEROFEDITS' ),
+	'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' ),
+	'sitename'                  => array( '1', 'NAVÊ_PROJEYÊ', 'SITENAME' ),
+	'grammar'                   => array( '0', 'RÊZIMAN.', 'GRAMMAR:' ),
+	'gender'                    => array( '0', 'ZAYEND.', 'GENDER:' ),
+	'plural'                    => array( '0', 'PIRRJIMAR:', 'PLURAL:' ),
+	'currentversion'            => array( '1', 'VERSIYONA_NIHA', 'CURRENTVERSION' ),
+	'language'                  => array( '0', '#ZIMAN', '#LANGUAGE:' ),
+	'numberofadmins'            => array( '1', 'HEJMARA_RÊVEBERAN', 'NUMBEROFADMINS' ),
+	'special'                   => array( '0', 'taybet', 'special' ),
 );
 
 $messages = array(
@@ -1566,7 +1577,7 @@ Ji bo jêbirinan û çêkirinên nû, ji kerema xwe li [[{{ns:special}}:Log/dele
 'sp-contributions-newbies' => 'Tenê beşdariyên bikarhênerên nû nîşan bide',
 'sp-contributions-newbies-sub' => 'Ji bikarhênerên nû re',
 'sp-contributions-newbies-title' => 'Tevkariyên bikarhêner ji bo hesabên nû',
-'sp-contributions-blocklog' => 'Astengkirina têketinê',
+'sp-contributions-blocklog' => 'astengkirina têketinê',
 'sp-contributions-deleted' => 'beşdariyên bikarhêner yên jêbirî',
 'sp-contributions-uploads' => 'yên barkirî',
 'sp-contributions-logs' => 'têketin',
diff --git a/languages/messages/MessagesKw.php b/languages/messages/MessagesKw.php
index d41c07b92b..f22569beaf 100644
--- a/languages/messages/MessagesKw.php
+++ b/languages/messages/MessagesKw.php
@@ -19,43 +19,43 @@
 
 $namespaceNames = array(
 	NS_MEDIA            => 'Media',
-	NS_SPECIAL          => 'Arbennek',
-	NS_TALK             => 'Kescows',
+	NS_SPECIAL          => 'Arbednek',
+	NS_TALK             => 'Keskows',
 	NS_USER             => 'Devnydhyer',
-	NS_USER_TALK        => 'Kescows_Devnydhyer',
-	NS_PROJECT_TALK     => 'Kescows_$1',
+	NS_USER_TALK        => 'Keskows_Devnydhyer',
+	NS_PROJECT_TALK     => 'Keskows_$1',
 	NS_FILE             => 'Restren',
-	NS_FILE_TALK        => 'Kescows_Restren',
+	NS_FILE_TALK        => 'Keskows_Restren',
 	NS_MEDIAWIKI        => 'MediaWiki',
-	NS_MEDIAWIKI_TALK   => 'Kescows_MediaWiki',
-	NS_TEMPLATE         => 'Scantlyn',
-	NS_TEMPLATE_TALK    => 'Kescows_Scantlyn',
+	NS_MEDIAWIKI_TALK   => 'Keskows_MediaWiki',
+	NS_TEMPLATE         => 'Skantlyn',
+	NS_TEMPLATE_TALK    => 'Keskows_Skantlyn',
 	NS_HELP             => 'Gweres',
-	NS_HELP_TALK        => 'Kescows_Gweres',
-	NS_CATEGORY         => 'Class',
-	NS_CATEGORY_TALK    => 'Kescows_Class',
+	NS_HELP_TALK        => 'Keskows_Gweres',
+	NS_CATEGORY         => 'Klass',
+	NS_CATEGORY_TALK    => 'Keskows_Klass',
 );
 
 $namespaceAliases = array(
-	'Arbednek'           => NS_SPECIAL,
+	'Arbennek'           => NS_SPECIAL,
 	'Cows'               => NS_TALK,
-	'Keskows'            => NS_TALK,
+	'Kescows'            => NS_TALK,
 	'Cows_Devnydhyer'    => NS_USER_TALK,
-	'Keskows_Devnydhyer' => NS_USER_TALK,
+	'Kescows_Devnydhyer' => NS_USER_TALK,
 	'Cows_$1'            => NS_PROJECT_TALK,
-	'Keskows_$1'         => NS_PROJECT_TALK,
+	'Kescows_$1'         => NS_PROJECT_TALK,
 	'Cows_Restren'       => NS_FILE_TALK,
-	'Keskows_Restren'    => NS_FILE_TALK,
+	'Kescows_Restren'    => NS_FILE_TALK,
 	'Cows_MediaWiki'     => NS_MEDIAWIKI_TALK,
-	'Keskows_MediaWiki'  => NS_MEDIAWIKI_TALK,
+	'Kescows_MediaWiki'  => NS_MEDIAWIKI_TALK,
 	'Cows_Scantlyn'      => NS_TEMPLATE_TALK,
-	'Skantlyn'           => NS_TEMPLATE,
-	'Keskows_Skantlyn'   => NS_TEMPLATE_TALK,
+	'Scantlyn'           => NS_TEMPLATE,
+	'Kescows_Skantlyn'   => NS_TEMPLATE_TALK,
 	'Cows_Gweres'        => NS_HELP_TALK,
-	'Keskows_Gweres'     => NS_HELP_TALK,
+	'Kescows_Gweres'     => NS_HELP_TALK,
 	'Cows_Class'         => NS_CATEGORY_TALK,
-	'Klass'              => NS_CATEGORY,
-	'Keskows_Klass'      => NS_CATEGORY_TALK,
+	'Class'              => NS_CATEGORY,
+	'Kescows_Class'      => NS_CATEGORY_TALK,
 );
 
 $specialPageAliases = array(
diff --git a/languages/messages/MessagesLad.php b/languages/messages/MessagesLad.php
index 58bae9e70f..f2bccbf55f 100644
--- a/languages/messages/MessagesLad.php
+++ b/languages/messages/MessagesLad.php
@@ -172,12 +172,12 @@ $specialPageAliases = array(
 );
 
 $magicWords = array(
-	'redirect'                => array( '0', '#DIRIJAR', '#DIRECCIÓN', '#REDIRECCIÓN', '#REDIRECCION', '#REDIRECT' ),
-	'fullpagename'            => array( '1', 'NOMBREDEHOJACOMPLETA', 'NOMBREDEPÁGINACOMPLETA', 'NOMBREDEPAGINACOMPLETA', 'NOMBREDEPÁGINAENTERA', 'NOMBREDEPAGINAENTERA', 'NOMBRECOMPLETODEPÁGINA', 'NOMBRECOMPLETODEPAGINA', 'FULLPAGENAME' ),
-	'subpagename'             => array( '1', 'NOMBREDEHOJICA', 'NOMBREDESUBPAGINA', 'NOMBREDESUBPÁGINA', 'SUBPAGENAME' ),
-	'msg'                     => array( '0', 'MSJ:', 'MSG:' ),
-	'img_left'                => array( '1', 'cierda', 'izquierda', 'izda', 'izq', 'left' ),
-	'img_none'                => array( '1', 'dinguna', 'dinguno', 'ninguna', 'nada', 'no', 'ninguno', 'none' ),
+	'redirect'                  => array( '0', '#DIRIJAR', '#DIRECCIÓN', '#REDIRECCIÓN', '#REDIRECCION', '#REDIRECT' ),
+	'fullpagename'              => array( '1', 'NOMBREDEHOJACOMPLETA', 'NOMBREDEPÁGINACOMPLETA', 'NOMBREDEPAGINACOMPLETA', 'NOMBREDEPÁGINAENTERA', 'NOMBREDEPAGINAENTERA', 'NOMBRECOMPLETODEPÁGINA', 'NOMBRECOMPLETODEPAGINA', 'FULLPAGENAME' ),
+	'subpagename'               => array( '1', 'NOMBREDEHOJICA', 'NOMBREDESUBPAGINA', 'NOMBREDESUBPÁGINA', 'SUBPAGENAME' ),
+	'msg'                       => array( '0', 'MSJ:', 'MSG:' ),
+	'img_left'                  => array( '1', 'cierda', 'izquierda', 'izda', 'izq', 'left' ),
+	'img_none'                  => array( '1', 'dinguna', 'dinguno', 'ninguna', 'nada', 'no', 'ninguno', 'none' ),
 );
 
 $messages = array(
diff --git a/languages/messages/MessagesLb.php b/languages/messages/MessagesLb.php
index a70bc6d3d3..36efed7d55 100644
--- a/languages/messages/MessagesLb.php
+++ b/languages/messages/MessagesLb.php
@@ -27,7 +27,7 @@ $namespaceNames = array(
 	NS_TALK             => 'Diskussioun',
 	NS_USER             => 'Benotzer',
 	NS_USER_TALK        => 'Benotzer_Diskussioun',
-	NS_PROJECT_TALK     => '$1 Diskussioun',
+	NS_PROJECT_TALK     => '$1_Diskussioun',
 	NS_FILE             => 'Fichier',
 	NS_FILE_TALK        => 'Fichier_Diskussioun',
 	NS_MEDIAWIKI        => 'MediaWiki',
@@ -147,31 +147,36 @@ $specialPageAliases = array(
 );
 
 $magicWords = array(
-	'redirect'                => array( '0', '#VIRULEEDUNG', '#WEITERLEITUNG', '#REDIRECT' ),
-	'numberofpages'           => array( '1', 'Säitenzuel', 'SEITENANZAHL', 'NUMBEROFPAGES' ),
-	'numberofarticles'        => array( '1', 'Artikelen', 'ARTIKELANZAHL', 'NUMBEROFARTICLES' ),
-	'numberoffiles'           => array( '1', 'Fichieren', 'DATEIANZAHL', 'NUMBEROFFILES' ),
-	'numberofusers'           => array( '1', 'Benotzerzuel', 'BENUTZERANZAHL', 'NUMBEROFUSERS' ),
-	'numberofactiveusers'     => array( '1', 'Aktiv_Benotzer', 'AKTIVE_BENUTZER', 'NUMBEROFACTIVEUSERS' ),
-	'pagename'                => array( '1', 'Säitennumm', 'SEITENNAME', 'PAGENAME' ),
-	'namespace'               => array( '1', 'Nummraum', 'NAMENSRAUM', 'NAMESPACE' ),
-	'subjectspace'            => array( '1', 'Haaptnummraum', 'HAUPTNAMENSRAUM', 'SUBJECTSPACE', 'ARTICLESPACE' ),
-	'subjectpagename'         => array( '1', 'Haaptsäit', 'HAUPTSEITE', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
-	'img_thumbnail'           => array( '1', 'Miniatur', 'miniatur', 'mini', 'thumbnail', 'thumb' ),
-	'img_right'               => array( '1', 'riets', 'rechts', 'right' ),
-	'img_left'                => array( '1', 'lénks', 'links', 'left' ),
-	'img_none'                => array( '1', 'ouni', 'ohne', 'none' ),
-	'img_center'              => array( '1', 'zentréiert', 'zentriert', 'center', 'centre' ),
-	'img_framed'              => array( '1', 'gerummt', 'gerahmt', 'framed', 'enframed', 'frame' ),
-	'img_frameless'           => array( '1', 'net_gerummt', 'rahmenlos', 'frameless' ),
-	'img_page'                => array( '1', 'Säit=$1', 'Säit_$1', 'seite=$1', 'seite $1', 'page=$1', 'page $1' ),
-	'img_border'              => array( '1', 'bord', 'rand', 'border' ),
-	'img_top'                 => array( '1', 'uewen', 'oben', 'top' ),
-	'grammar'                 => array( '0', 'GRAMMAIRE', 'GRAMMATIK:', 'GRAMMAR:' ),
-	'plural'                  => array( '0', 'PLURAL', 'PLURAL:' ),
-	'formatnum'               => array( '0', 'ZUELEFORMAT', 'ZAHLENFORMAT', 'FORMATNUM' ),
-	'special'                 => array( '0', 'spezial', 'special' ),
-	'hiddencat'               => array( '1', '__VERSTOPPT_KATEGORIE__', '__VERSTECKTE_KATEGORIE__', '__WARTUNGSKATEGORIE__', '__HIDDENCAT__' ),
+	'redirect'                  => array( '0', '#VIRULEEDUNG', '#WEITERLEITUNG', '#REDIRECT' ),
+	'numberofpages'             => array( '1', 'Säitenzuel', 'SEITENANZAHL', 'NUMBEROFPAGES' ),
+	'numberofarticles'          => array( '1', 'Artikelen', 'ARTIKELANZAHL', 'NUMBEROFARTICLES' ),
+	'numberoffiles'             => array( '1', 'Zuel_vu_Fichieren', 'DATEIANZAHL', 'NUMBEROFFILES' ),
+	'numberofusers'             => array( '1', 'Benotzerzuel', 'BENUTZERANZAHL', 'NUMBEROFUSERS' ),
+	'numberofactiveusers'       => array( '1', 'Aktiv_Benotzer', 'AKTIVE_BENUTZER', 'NUMBEROFACTIVEUSERS' ),
+	'pagename'                  => array( '1', 'Säitennumm', 'SEITENNAME', 'PAGENAME' ),
+	'namespace'                 => array( '1', 'Nummraum', 'NAMENSRAUM', 'NAMESPACE' ),
+	'subjectspace'              => array( '1', 'Haaptnummraum', 'HAUPTNAMENSRAUM', 'SUBJECTSPACE', 'ARTICLESPACE' ),
+	'subjectpagename'           => array( '1', 'Haaptsäit', 'HAUPTSEITE', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
+	'img_thumbnail'             => array( '1', 'Miniatur', 'miniatur', 'mini', 'thumbnail', 'thumb' ),
+	'img_right'                 => array( '1', 'riets', 'rechts', 'right' ),
+	'img_left'                  => array( '1', 'lénks', 'links', 'left' ),
+	'img_none'                  => array( '1', 'ouni', 'ohne', 'none' ),
+	'img_center'                => array( '1', 'zentréiert', 'zentriert', 'center', 'centre' ),
+	'img_framed'                => array( '1', 'gerummt', 'gerahmt', 'framed', 'enframed', 'frame' ),
+	'img_frameless'             => array( '1', 'net_gerummt', 'rahmenlos', 'frameless' ),
+	'img_page'                  => array( '1', 'Säit=$1', 'Säit_$1', 'seite=$1', 'seite $1', 'page=$1', 'page $1' ),
+	'img_border'                => array( '1', 'bord', 'rand', 'border' ),
+	'img_top'                   => array( '1', 'uewen', 'oben', 'top' ),
+	'img_bottom'                => array( '1', 'ënnen', 'unten', 'bottom' ),
+	'grammar'                   => array( '0', 'GRAMMAIRE', 'GRAMMATIK:', 'GRAMMAR:' ),
+	'plural'                    => array( '0', 'PLURAL', 'PLURAL:' ),
+	'currentversion'            => array( '1', 'AKTUELL_VERSIOUN', 'JETZIGE_VERSION', 'CURRENTVERSION' ),
+	'language'                  => array( '0', '#SPROOCH:', '#SPRACHE:', '#LANGUAGE:' ),
+	'formatnum'                 => array( '0', 'ZUELEFORMAT', 'ZAHLENFORMAT', 'FORMATNUM' ),
+	'special'                   => array( '0', 'spezial', 'special' ),
+	'hiddencat'                 => array( '1', '__VERSTOPPT_KATEGORIE__', '__VERSTECKTE_KATEGORIE__', '__WARTUNGSKATEGORIE__', '__HIDDENCAT__' ),
+	'pagesincategory_pages'     => array( '0', 'Säiten', 'pages' ),
+	'pagesincategory_files'     => array( '0', 'Fichieren', 'files' ),
 );
 
 $messages = array(
@@ -939,6 +944,7 @@ Et däerfen net méi wéi $2 {{PLURAL:$2|Ufro|Ufroe}} sinn, aktuell {{PLURAL:$2|
 'parser-template-loop-warning' => 'Endlos Schleef an der Schabloun: [[$1]] entdeckt',
 'parser-template-recursion-depth-warning' => "D'Limit vun der Zuel vun de Verschachtelunge vu Schabloune gouf iwwerschratt ($1)",
 'language-converter-depth-warning' => "D'Limite vun der déift vun der Sproochëmwandlung gouf iwwerschratt ($1)",
+'converter-manual-rule-error' => 'An der Regel iwwer déi manuell Ëmwandlung vun der Sprooch gouf e Feeler fonnt',
 
 # "Undo" feature
 'undo-success' => "D'Ännerung gëtt réckgängeg gemaach. Iwwerpréift w.e.g. de Verglach ënnendrënner fir nozekuckeen ob et esou richteg ass, duerno späichert w.e.g d'Ännerungen of, fir dës Aktioun ofzeschléissen.",
@@ -1802,6 +1808,7 @@ Dir kënnt seng Beschreiwung op senger [$2 Beschreiwungssäit] änneren.',
 'shared-repo-from' => 'vu(n) $1',
 'shared-repo' => 'e gemeinsam genotzte Medienarchiv',
 'shared-repo-name-wikimediacommons' => 'Wikimedia-Commons',
+'upload-disallowed-here' => 'Leider kënnt Dir dëst Bild net iwwerschreiwen.',
 
 # File reversion
 'filerevert' => '"$1" zrécksetzen',
@@ -2082,6 +2089,8 @@ Et ginn [[{{MediaWiki:Listgrouprights-helppage}}|zousätzlech Informatiounen]] i
 'mailnologin' => 'Keng E-Mailadress',
 'mailnologintext' => 'Dir musst [[Special:UserLogin|ugemellt]] sinn an eng gëlteg E-Mail Adress an Äre [[Special:Preferences|Astellungen]] aginn hunn, fir engem anere Benotzer eng E-Mail ze schécken.',
 'emailuser' => 'Dësem Benotzer eng E-Mail schécken',
+'emailuser-title-target' => '{{GENDER:$1|Dëser Benotzerin|Dësem Benotzer}} eng Mail schécken',
+'emailuser-title-notarget' => 'Dem Benotzer eng E-Mail schécken',
 'emailpage' => 'Dem Benotzer eng E-Mail schécken',
 'emailpagetext' => 'Dir kënnt mat dësem Formulaire 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.',
@@ -2883,11 +2892,22 @@ Dëst warscheinlech duerch en externe Link den op der schwaarzer Lëscht (blackl
 
 # Info page
 'pageinfo-title' => 'Informatioun iwwer "$1"',
-'pageinfo-header-edits' => 'Ännerungen',
+'pageinfo-header-basic' => 'Basisinformatiounen',
+'pageinfo-header-edits' => 'Historique vun den Ännerungen',
+'pageinfo-display-title' => 'Titel dee gewise gëtt',
 'pageinfo-views' => 'Zuel vun de Kéieren déi dës Säit gekuckt gouf',
-'pageinfo-watchers' => 'Zuel vun de Benotzer déi iwwerwaachen',
-'pageinfo-edits' => 'Zuel vun den Ännerungen',
-'pageinfo-authors' => 'Zuel vun de verschiddenen Auteuren',
+'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-firsttime' => 'Datum vum Uleeë vun der Säit',
+'pageinfo-lastuser' => 'Leschte Benotzer deen eppes geännert huet',
+'pageinfo-lasttime' => 'Datum vun der leschter Ännerung',
+'pageinfo-edits' => 'Gesamtzuel vun den Ännerungen',
+'pageinfo-authors' => 'Gesamtzuel vun de verschiddenen Auteuren',
+'pageinfo-recent-edits' => 'Zuel vun de rezenten Ännerungen (an de leschten $1)',
+'pageinfo-restriction' => 'Protectioun vun der Säit (<code>{{lcfirst:$1}}</code>)',
+'pageinfo-magic-words' => '{{PLURAL:$1|Magescht Wuert|Magesch Wierder}} ($1)',
+'pageinfo-hidden-categories' => 'Verstoppte {{PLURAL:$1|Kategorie|Kategorien}} ($1)',
 
 # Skin names
 'skinname-standard' => 'Klassesch',
diff --git a/languages/messages/MessagesLmo.php b/languages/messages/MessagesLmo.php
index 1625953f93..5c281d7578 100644
--- a/languages/messages/MessagesLmo.php
+++ b/languages/messages/MessagesLmo.php
@@ -96,10 +96,10 @@ $specialPageAliases = array(
 );
 
 $magicWords = array(
-	'img_right'               => array( '1', 'drita', 'destra', 'right' ),
-	'img_left'                => array( '1', 'manzína', 'sinistra', 'left' ),
-	'img_none'                => array( '1', 'nissön', 'nessuno', 'none' ),
-	'sitename'                => array( '1', 'NUMSIT', 'NOMESITO', 'SITENAME' ),
+	'img_right'                 => array( '1', 'drita', 'destra', 'right' ),
+	'img_left'                  => array( '1', 'manzína', 'sinistra', 'left' ),
+	'img_none'                  => array( '1', 'nissön', 'nessuno', 'none' ),
+	'sitename'                  => array( '1', 'NUMSIT', 'NOMESITO', 'SITENAME' ),
 );
 
 $messages = array(
diff --git a/languages/messages/MessagesLt.php b/languages/messages/MessagesLt.php
index f7a8728cd3..bed5ca62bf 100644
--- a/languages/messages/MessagesLt.php
+++ b/languages/messages/MessagesLt.php
@@ -144,28 +144,28 @@ $specialPageAliases = array(
 );
 
 $magicWords = array(
-	'redirect'                => array( '0', '#PERADRESAVIMAS', '#REDIRECT' ),
-	'notoc'                   => array( '0', '__BETURIN__', '__NOTOC__' ),
-	'nogallery'               => array( '0', '__BEGALERIJOS__', '__NOGALLERY__' ),
-	'toc'                     => array( '0', '__TURINYS__', '__TOC__' ),
-	'noeditsection'           => array( '0', '__BEREDAGSEKC__', '__NOEDITSECTION__' ),
-	'currentmonth'            => array( '1', 'DABARTINISMĖNESIS', 'CURRENTMONTH', 'CURRENTMONTH2' ),
-	'currentmonthname'        => array( '1', 'DABARTINIOMĖNESIOPAVADINIMAS', 'CURRENTMONTHNAME' ),
-	'currentday'              => array( '1', 'DABARTINĖDIENA', 'CURRENTDAY' ),
-	'currentday2'             => array( '1', 'DABARTINĖDIENA2', 'CURRENTDAY2' ),
-	'currentdayname'          => array( '1', 'DABARTINĖSDIENOSPAVADINIMAS', 'CURRENTDAYNAME' ),
-	'currentyear'             => array( '1', 'DABARTINIAIMETAI', 'CURRENTYEAR' ),
-	'currenttime'             => array( '1', 'DABARTINISLAIKAS', 'CURRENTTIME' ),
-	'currenthour'             => array( '1', 'DABARTINĖVALANDA', 'CURRENTHOUR' ),
-	'numberofpages'           => array( '1', 'PUSLAPIŲSKAIČIUS', 'NUMBEROFPAGES' ),
-	'numberofarticles'        => array( '1', 'STRAIPSNIŲSKAIČIUS', 'NUMBEROFARTICLES' ),
-	'numberoffiles'           => array( '1', 'FAILŲSKAIČIUS', 'NUMBEROFFILES' ),
-	'numberofusers'           => array( '1', 'NAUDOTOJŲSKAIČIUS', 'NUMBEROFUSERS' ),
-	'numberofedits'           => array( '1', 'KEITIMŲSKAIČIUS', 'NUMBEROFEDITS' ),
-	'img_thumbnail'           => array( '1', 'miniatiūra', 'mini', 'thumbnail', 'thumb' ),
-	'img_manualthumb'         => array( '1', 'miniatiūra=$1', 'mini=$1', 'thumbnail=$1', 'thumb=$1' ),
-	'img_right'               => array( '1', 'dešinėje', 'right' ),
-	'img_left'                => array( '1', 'kairėje', 'left' ),
+	'redirect'                  => array( '0', '#PERADRESAVIMAS', '#REDIRECT' ),
+	'notoc'                     => array( '0', '__BETURIN__', '__NOTOC__' ),
+	'nogallery'                 => array( '0', '__BEGALERIJOS__', '__NOGALLERY__' ),
+	'toc'                       => array( '0', '__TURINYS__', '__TOC__' ),
+	'noeditsection'             => array( '0', '__BEREDAGSEKC__', '__NOEDITSECTION__' ),
+	'currentmonth'              => array( '1', 'DABARTINISMĖNESIS', 'CURRENTMONTH', 'CURRENTMONTH2' ),
+	'currentmonthname'          => array( '1', 'DABARTINIOMĖNESIOPAVADINIMAS', 'CURRENTMONTHNAME' ),
+	'currentday'                => array( '1', 'DABARTINĖDIENA', 'CURRENTDAY' ),
+	'currentday2'               => array( '1', 'DABARTINĖDIENA2', 'CURRENTDAY2' ),
+	'currentdayname'            => array( '1', 'DABARTINĖSDIENOSPAVADINIMAS', 'CURRENTDAYNAME' ),
+	'currentyear'               => array( '1', 'DABARTINIAIMETAI', 'CURRENTYEAR' ),
+	'currenttime'               => array( '1', 'DABARTINISLAIKAS', 'CURRENTTIME' ),
+	'currenthour'               => array( '1', 'DABARTINĖVALANDA', 'CURRENTHOUR' ),
+	'numberofpages'             => array( '1', 'PUSLAPIŲSKAIČIUS', 'NUMBEROFPAGES' ),
+	'numberofarticles'          => array( '1', 'STRAIPSNIŲSKAIČIUS', 'NUMBEROFARTICLES' ),
+	'numberoffiles'             => array( '1', 'FAILŲSKAIČIUS', 'NUMBEROFFILES' ),
+	'numberofusers'             => array( '1', 'NAUDOTOJŲSKAIČIUS', 'NUMBEROFUSERS' ),
+	'numberofedits'             => array( '1', 'KEITIMŲSKAIČIUS', 'NUMBEROFEDITS' ),
+	'img_thumbnail'             => array( '1', 'miniatiūra', 'mini', 'thumbnail', 'thumb' ),
+	'img_manualthumb'           => array( '1', 'miniatiūra=$1', 'mini=$1', 'thumbnail=$1', 'thumb=$1' ),
+	'img_right'                 => array( '1', 'dešinėje', 'right' ),
+	'img_left'                  => array( '1', 'kairėje', 'left' ),
 );
 
 $fallback8bitEncoding = 'windows-1257';
diff --git a/languages/messages/MessagesLzz.php b/languages/messages/MessagesLzz.php
index 469b4930ca..cbc2a32f44 100644
--- a/languages/messages/MessagesLzz.php
+++ b/languages/messages/MessagesLzz.php
@@ -18,6 +18,44 @@
 
 $fallback = 'tr';
 
+$namespaceNames = array(
+	NS_MEDIA            => 'Medya',
+	NS_SPECIAL          => 'Doxmeli',
+	NS_TALK             => 'Ğarğala',
+	NS_USER             => 'Maxmare',
+	NS_USER_TALK        => 'Maxmare_mesaji',
+	NS_PROJECT_TALK     => '$1_ğarğala',
+	NS_FILE             => 'Dosya',
+	NS_FILE_TALK        => 'Dosya_ğarğala',
+	NS_MEDIAWIKI        => 'MediaWiki',
+	NS_MEDIAWIKI_TALK   => 'MediaWiki_ğarğala',
+	NS_TEMPLATE         => 'Şabloni',
+	NS_TEMPLATE_TALK    => 'Şabloni_ğarğala',
+	NS_HELP             => 'Meşvela',
+	NS_HELP_TALK        => 'Meşvela_ğarğala',
+	NS_CATEGORY         => 'Kʼatʼegori',
+	NS_CATEGORY_TALK    => 'Kʼatʼegori_ğarğala',
+);
+
+$namespaceAliases = array(
+	// Turkish namespace names.
+	'Medya'              => NS_MEDIA,
+	'Özel'               => NS_SPECIAL,
+	'Tartışma'           => NS_TALK,
+	'Kullanıcı'          => NS_USER,
+	'Kullanıcı_mesaj'    => NS_USER_TALK,
+	'$1_tartışma'        => NS_PROJECT_TALK,
+	'Dosya'              => NS_FILE,
+	'Dosya_tartışma'     => NS_FILE_TALK,
+	'MediaWiki_tartışma' => NS_MEDIAWIKI_TALK,
+	'Şablon'             => NS_TEMPLATE,
+	'Şablon_tartışma'    => NS_TEMPLATE_TALK,
+	'Yardım'             => NS_HELP,
+	'Yardım_tartışma'    => NS_HELP_TALK,
+	'Kategori'           => NS_CATEGORY,
+	'Kategori_tartışma'  => NS_CATEGORY_TALK,
+);
+
 $messages = array(
 # User preference toggles
 'tog-underline' => "Link'iş tude kogu3’uxaçki:",
diff --git a/languages/messages/MessagesMg.php b/languages/messages/MessagesMg.php
index e24329325a..ff0f4f71b8 100644
--- a/languages/messages/MessagesMg.php
+++ b/languages/messages/MessagesMg.php
@@ -15,72 +15,72 @@
  */
 
 $magicWords = array(
-	'redirect'                => array( '0', '#FIHODINANA', '#REDIRECTION', '#REDIRECT' ),
-	'notoc'                   => array( '0', '__TSYASIANALAHATRA__', '__AUCUNSOMMAIRE__', '__AUCUNETDM__', '__NOTOC__' ),
-	'nogallery'               => array( '0', '__TSYASIANAGALLERY__', '__AUCUNEGALERIE__', '__NOGALLERY__' ),
-	'forcetoc'                => array( '0', '__TEREONYLAHATRA__', '__FORCERSOMMAIRE__', '__FORCERTDM__', '__FORCETOC__' ),
-	'toc'                     => array( '0', '__LAHATRA__', '__LAHAT__', '__SOMMAIRE__', '__TDM__', '__TOC__' ),
-	'noeditsection'           => array( '0', '__TSYAZOOVAINA__', '__SECTIONNONEDITABLE__', '__NOEDITSECTION__' ),
-	'currentmonth'            => array( '1', 'VOLANA', 'MOISACTUEL', 'MOIS2ACTUEL', 'CURRENTMONTH', 'CURRENTMONTH2' ),
-	'currentmonth1'           => array( '1', 'VOLANA1', 'MOIS1ACTUEL', 'CURRENTMONTH1' ),
-	'currentmonthname'        => array( '1', 'ANARAMBOLANA', 'NOMMOISACTUEL', 'CURRENTMONTHNAME' ),
-	'currentmonthnamegen'     => array( '1', 'ANARAMBOLANAGEN', 'ANARANAVOLANA', 'CURRENTMONTHNAME', 'NOMGENMOISACTUEL', 'CURRENTMONTHNAMEGEN' ),
-	'currentmonthabbrev'      => array( '1', 'ANARAMBOLANAFOHY', 'ANARANAVOLANAFOHY', 'ABREVMOISACTUEL', 'CURRENTMONTHABBREV' ),
-	'currentday'              => array( '1', 'ANDRO', 'JOURACTUEL', 'JOUR1ACTUEL', 'CURRENTDAY' ),
-	'currentday2'             => array( '1', 'ANDRO2', 'JOUR2ACTUEL', 'CURRENTDAY2' ),
-	'currentdayname'          => array( '1', 'ANARANANDRO', 'ANARANAANDRO', 'NOMJOURACTUEL', 'CURRENTDAYNAME' ),
-	'currentyear'             => array( '1', 'TAONA', 'ANNEEACTUELLE', 'CURRENTYEAR' ),
-	'currenttime'             => array( '1', 'LERA', 'HORAIREACTUEL', 'CURRENTTIME' ),
-	'currenthour'             => array( '1', 'ORA', 'HEUREACTUELLE', 'CURRENTHOUR' ),
-	'localmonth'              => array( '1', 'VOLANAANTOERANA', 'MOISLOCAL', 'MOIS2LOCAL', 'LOCALMONTH', 'LOCALMONTH2' ),
-	'localmonth1'             => array( '1', 'VOLANAANTOERANA1', 'MOIS1LOCAL', 'LOCALMONTH1' ),
-	'localmonthname'          => array( '1', 'ANARAMBOLANAANTOERANA', 'NOMMOISLOCAL', 'LOCALMONTHNAME' ),
-	'localmonthnamegen'       => array( '1', 'ANARAMBOLANAANTOERANAGEN', 'NOMGENMOISLOCAL', 'LOCALMONTHNAMEGEN' ),
-	'localmonthabbrev'        => array( '1', 'ANARAMBOLANAANTOERANAFOHY', 'ABREVMOISLOCAL', 'LOCALMONTHABBREV' ),
-	'localday'                => array( '1', 'ANDROANTOERANA', 'JOURLOCAL', 'JOUR1LOCAL', 'LOCALDAY' ),
-	'localday2'               => array( '1', 'ANDROANTOERANA2', 'JOUR2LOCAL', 'LOCALDAY2' ),
-	'localdayname'            => array( '1', 'ANARANANDROANTOERANA', 'NOMJOURLOCAL', 'LOCALDAYNAME' ),
-	'localyear'               => array( '1', 'TAONAANTOERANA', 'ANNEELOCALE', 'LOCALYEAR' ),
-	'localtime'               => array( '1', 'LERAANTOERANA', 'HORAIRELOCAL', 'LOCALTIME' ),
-	'localhour'               => array( '1', 'ORAANTOERANA', 'HEURELOCALE', 'LOCALHOUR' ),
-	'numberofpages'           => array( '1', 'ISAPEJY', 'NOMBREPAGES', 'NUMBEROFPAGES' ),
-	'numberofarticles'        => array( '1', 'ISALAHATSORATRA', 'NOMBREARTICLES', 'NUMBEROFARTICLES' ),
-	'numberoffiles'           => array( '1', 'ISARAKITRA', 'NOMBREFICHIERS', 'NUMBEROFFILES' ),
-	'numberofusers'           => array( '1', 'ISAMPIKAMBANA', 'NOMBREUTILISATEURS', 'NUMBEROFUSERS' ),
-	'numberofactiveusers'     => array( '1', 'ISAMPIKAMBANAMANOVA', 'NOMBREUTILISATEURSACTIFS', 'NUMBEROFACTIVEUSERS' ),
-	'numberofedits'           => array( '1', 'ISAFANOVANA', 'NOMBREMODIFS', 'NUMBEROFEDITS' ),
-	'numberofviews'           => array( '1', 'ISATOPIMASO', 'NOMBREVUES', 'NUMBEROFVIEWS' ),
-	'pagename'                => array( '1', 'ANARAMPEJY', 'ANARANAPEJY', 'NOMPAGE', 'PAGENAME' ),
-	'pagenamee'               => array( '1', 'ANARAMPEJYX', 'ANARANAPEJYX', 'NOMPAGEX', 'PAGENAMEE' ),
-	'namespace'               => array( '1', 'ANARANTSEHATRA', 'ANARANASEHATRA', 'ESPACENOMMAGE', 'NAMESPACE' ),
-	'namespacee'              => array( '1', 'ANARANTSEHATRAX', 'ANARANASEHATRAX', 'ESPACENOMMAGEX', 'NAMESPACEE' ),
-	'talkspace'               => array( '1', 'PEJINDRESAKA', 'PEJYRESAKA', 'DINIKA', 'ESPACEDISCUSSION', 'TALKSPACE' ),
-	'talkspacee'              => array( '1', 'PEJINDRESAKAX', 'PEJYRESAKAX', 'DINIKAX', 'ESPACEDISCUSSIONX', 'TALKSPACEE' ),
-	'subjectspace'            => array( '1', 'TOERANALAHATSORATRA', 'ESPACESUJET', 'ESPACEARTICLE', 'SUBJECTSPACE', 'ARTICLESPACE' ),
-	'subjectspacee'           => array( '1', 'TOERANNYLAHATSORATRA', 'ESPACESUJETX', 'ESPACEARTICLEX', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
-	'fullpagename'            => array( '1', 'ANARAMPEJYFENO', 'ANARANAPEJYFENO', 'NOMPAGECOMPLET', 'FULLPAGENAME' ),
-	'fullpagenamee'           => array( '1', 'ANARAMPEJYFENOX', 'ANARANAPEJYFENOX', 'NOMPAGECOMPLETX', 'FULLPAGENAMEE' ),
-	'subpagename'             => array( '1', 'ANARANAZANAPEJY', 'ANARANJANAPEJY', 'NOMSOUSPAGE', 'SUBPAGENAME' ),
-	'subpagenamee'            => array( '1', 'ANARANJANAPEJYX', 'ANARANAZANAPEJYX', 'NOMSOUSPAGEX', 'SUBPAGENAMEE' ),
-	'basepagename'            => array( '1', 'ANARANAFOTOPEJY', 'ANARAMPOTOPEJY', 'NOMBASEDEPAGE', 'BASEPAGENAME' ),
-	'basepagenamee'           => array( '1', 'ANARANAFOTOPEJYE', 'ANARAMPOTOPEJYE', 'NOMBASEDEPAGEX', 'BASEPAGENAMEE' ),
-	'talkpagename'            => array( '1', 'ANARAMPEJINDRESAKA', 'ANARANAPEJINDRESAKA', 'NOMPAGEDISCUSSION', 'TALKPAGENAME' ),
-	'img_right'               => array( '1', 'ankavanana', 'droite', 'right' ),
-	'img_left'                => array( '1', 'ankavia', 'gauche', 'left' ),
-	'img_none'                => array( '1', 'tsymisy', 'néant', 'neant', 'none' ),
-	'img_center'              => array( '1', 'ampivoany', 'anivony', 'centré', 'center', 'centre' ),
-	'img_page'                => array( '1', 'pejy $1', 'page=$1', 'page $1' ),
-	'img_border'              => array( '1', 'sisiny', 'bordure', 'border' ),
-	'img_top'                 => array( '1', 'ambony', 'haut', 'top' ),
-	'img_middle'              => array( '1', 'anivo', 'milieu', 'middle' ),
-	'img_bottom'              => array( '1', 'ambany', 'bas', 'bottom' ),
-	'currentweek'             => array( '1', 'HERINANDRO', 'SEMAINEACTUELLE', 'CURRENTWEEK' ),
-	'currentdow'              => array( '1', 'ALAHADY', 'JDSACTUEL', 'CURRENTDOW' ),
-	'localweek'               => array( '1', 'HERINANDROANTOERANA', 'SEMAINELOCALE', 'LOCALWEEK' ),
-	'localdow'                => array( '1', 'ALAHADYANTOERANA', 'JDSLOCAL', 'LOCALDOW' ),
-	'fullurl'                 => array( '0', 'URLREHETRA:', 'URLCOMPLETE:', 'FULLURL:' ),
-	'fullurle'                => array( '0', 'URLREHETRAX:', 'URLCOMPLETEX:', 'FULLURLE:' ),
-	'displaytitle'            => array( '1', 'ASEHOLOHATENY', 'AFFICHERTITRE', 'DISPLAYTITLE' ),
+	'redirect'                  => array( '0', '#FIHODINANA', '#REDIRECTION', '#REDIRECT' ),
+	'notoc'                     => array( '0', '__TSYASIANALAHATRA__', '__AUCUNSOMMAIRE__', '__AUCUNETDM__', '__NOTOC__' ),
+	'nogallery'                 => array( '0', '__TSYASIANAGALLERY__', '__AUCUNEGALERIE__', '__NOGALLERY__' ),
+	'forcetoc'                  => array( '0', '__TEREONYLAHATRA__', '__FORCERSOMMAIRE__', '__FORCERTDM__', '__FORCETOC__' ),
+	'toc'                       => array( '0', '__LAHATRA__', '__LAHAT__', '__SOMMAIRE__', '__TDM__', '__TOC__' ),
+	'noeditsection'             => array( '0', '__TSYAZOOVAINA__', '__SECTIONNONEDITABLE__', '__NOEDITSECTION__' ),
+	'currentmonth'              => array( '1', 'VOLANA', 'MOISACTUEL', 'MOIS2ACTUEL', 'CURRENTMONTH', 'CURRENTMONTH2' ),
+	'currentmonth1'             => array( '1', 'VOLANA1', 'MOIS1ACTUEL', 'CURRENTMONTH1' ),
+	'currentmonthname'          => array( '1', 'ANARAMBOLANA', 'NOMMOISACTUEL', 'CURRENTMONTHNAME' ),
+	'currentmonthnamegen'       => array( '1', 'ANARAMBOLANAGEN', 'ANARANAVOLANA', 'CURRENTMONTHNAME', 'NOMGENMOISACTUEL', 'CURRENTMONTHNAMEGEN' ),
+	'currentmonthabbrev'        => array( '1', 'ANARAMBOLANAFOHY', 'ANARANAVOLANAFOHY', 'ABREVMOISACTUEL', 'CURRENTMONTHABBREV' ),
+	'currentday'                => array( '1', 'ANDRO', 'JOURACTUEL', 'JOUR1ACTUEL', 'CURRENTDAY' ),
+	'currentday2'               => array( '1', 'ANDRO2', 'JOUR2ACTUEL', 'CURRENTDAY2' ),
+	'currentdayname'            => array( '1', 'ANARANANDRO', 'ANARANAANDRO', 'NOMJOURACTUEL', 'CURRENTDAYNAME' ),
+	'currentyear'               => array( '1', 'TAONA', 'ANNEEACTUELLE', 'CURRENTYEAR' ),
+	'currenttime'               => array( '1', 'LERA', 'HORAIREACTUEL', 'CURRENTTIME' ),
+	'currenthour'               => array( '1', 'ORA', 'HEUREACTUELLE', 'CURRENTHOUR' ),
+	'localmonth'                => array( '1', 'VOLANAANTOERANA', 'MOISLOCAL', 'MOIS2LOCAL', 'LOCALMONTH', 'LOCALMONTH2' ),
+	'localmonth1'               => array( '1', 'VOLANAANTOERANA1', 'MOIS1LOCAL', 'LOCALMONTH1' ),
+	'localmonthname'            => array( '1', 'ANARAMBOLANAANTOERANA', 'NOMMOISLOCAL', 'LOCALMONTHNAME' ),
+	'localmonthnamegen'         => array( '1', 'ANARAMBOLANAANTOERANAGEN', 'NOMGENMOISLOCAL', 'LOCALMONTHNAMEGEN' ),
+	'localmonthabbrev'          => array( '1', 'ANARAMBOLANAANTOERANAFOHY', 'ABREVMOISLOCAL', 'LOCALMONTHABBREV' ),
+	'localday'                  => array( '1', 'ANDROANTOERANA', 'JOURLOCAL', 'JOUR1LOCAL', 'LOCALDAY' ),
+	'localday2'                 => array( '1', 'ANDROANTOERANA2', 'JOUR2LOCAL', 'LOCALDAY2' ),
+	'localdayname'              => array( '1', 'ANARANANDROANTOERANA', 'NOMJOURLOCAL', 'LOCALDAYNAME' ),
+	'localyear'                 => array( '1', 'TAONAANTOERANA', 'ANNEELOCALE', 'LOCALYEAR' ),
+	'localtime'                 => array( '1', 'LERAANTOERANA', 'HORAIRELOCAL', 'LOCALTIME' ),
+	'localhour'                 => array( '1', 'ORAANTOERANA', 'HEURELOCALE', 'LOCALHOUR' ),
+	'numberofpages'             => array( '1', 'ISAPEJY', 'NOMBREPAGES', 'NUMBEROFPAGES' ),
+	'numberofarticles'          => array( '1', 'ISALAHATSORATRA', 'NOMBREARTICLES', 'NUMBEROFARTICLES' ),
+	'numberoffiles'             => array( '1', 'ISARAKITRA', 'NOMBREFICHIERS', 'NUMBEROFFILES' ),
+	'numberofusers'             => array( '1', 'ISAMPIKAMBANA', 'NOMBREUTILISATEURS', 'NUMBEROFUSERS' ),
+	'numberofactiveusers'       => array( '1', 'ISAMPIKAMBANAMANOVA', 'NOMBREUTILISATEURSACTIFS', 'NUMBEROFACTIVEUSERS' ),
+	'numberofedits'             => array( '1', 'ISAFANOVANA', 'NOMBREMODIFS', 'NUMBEROFEDITS' ),
+	'numberofviews'             => array( '1', 'ISATOPIMASO', 'NOMBREVUES', 'NUMBEROFVIEWS' ),
+	'pagename'                  => array( '1', 'ANARAMPEJY', 'ANARANAPEJY', 'NOMPAGE', 'PAGENAME' ),
+	'pagenamee'                 => array( '1', 'ANARAMPEJYX', 'ANARANAPEJYX', 'NOMPAGEX', 'PAGENAMEE' ),
+	'namespace'                 => array( '1', 'ANARANTSEHATRA', 'ANARANASEHATRA', 'ESPACENOMMAGE', 'NAMESPACE' ),
+	'namespacee'                => array( '1', 'ANARANTSEHATRAX', 'ANARANASEHATRAX', 'ESPACENOMMAGEX', 'NAMESPACEE' ),
+	'talkspace'                 => array( '1', 'PEJINDRESAKA', 'PEJYRESAKA', 'DINIKA', 'ESPACEDISCUSSION', 'TALKSPACE' ),
+	'talkspacee'                => array( '1', 'PEJINDRESAKAX', 'PEJYRESAKAX', 'DINIKAX', 'ESPACEDISCUSSIONX', 'TALKSPACEE' ),
+	'subjectspace'              => array( '1', 'TOERANALAHATSORATRA', 'ESPACESUJET', 'ESPACEARTICLE', 'SUBJECTSPACE', 'ARTICLESPACE' ),
+	'subjectspacee'             => array( '1', 'TOERANNYLAHATSORATRA', 'ESPACESUJETX', 'ESPACEARTICLEX', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
+	'fullpagename'              => array( '1', 'ANARAMPEJYFENO', 'ANARANAPEJYFENO', 'NOMPAGECOMPLET', 'FULLPAGENAME' ),
+	'fullpagenamee'             => array( '1', 'ANARAMPEJYFENOX', 'ANARANAPEJYFENOX', 'NOMPAGECOMPLETX', 'FULLPAGENAMEE' ),
+	'subpagename'               => array( '1', 'ANARANAZANAPEJY', 'ANARANJANAPEJY', 'NOMSOUSPAGE', 'SUBPAGENAME' ),
+	'subpagenamee'              => array( '1', 'ANARANJANAPEJYX', 'ANARANAZANAPEJYX', 'NOMSOUSPAGEX', 'SUBPAGENAMEE' ),
+	'basepagename'              => array( '1', 'ANARANAFOTOPEJY', 'ANARAMPOTOPEJY', 'NOMBASEDEPAGE', 'BASEPAGENAME' ),
+	'basepagenamee'             => array( '1', 'ANARANAFOTOPEJYE', 'ANARAMPOTOPEJYE', 'NOMBASEDEPAGEX', 'BASEPAGENAMEE' ),
+	'talkpagename'              => array( '1', 'ANARAMPEJINDRESAKA', 'ANARANAPEJINDRESAKA', 'NOMPAGEDISCUSSION', 'TALKPAGENAME' ),
+	'img_right'                 => array( '1', 'ankavanana', 'droite', 'right' ),
+	'img_left'                  => array( '1', 'ankavia', 'gauche', 'left' ),
+	'img_none'                  => array( '1', 'tsymisy', 'néant', 'neant', 'none' ),
+	'img_center'                => array( '1', 'ampivoany', 'anivony', 'centré', 'center', 'centre' ),
+	'img_page'                  => array( '1', 'pejy $1', 'page=$1', 'page $1' ),
+	'img_border'                => array( '1', 'sisiny', 'bordure', 'border' ),
+	'img_top'                   => array( '1', 'ambony', 'haut', 'top' ),
+	'img_middle'                => array( '1', 'anivo', 'milieu', 'middle' ),
+	'img_bottom'                => array( '1', 'ambany', 'bas', 'bottom' ),
+	'currentweek'               => array( '1', 'HERINANDRO', 'SEMAINEACTUELLE', 'CURRENTWEEK' ),
+	'currentdow'                => array( '1', 'ALAHADY', 'JDSACTUEL', 'CURRENTDOW' ),
+	'localweek'                 => array( '1', 'HERINANDROANTOERANA', 'SEMAINELOCALE', 'LOCALWEEK' ),
+	'localdow'                  => array( '1', 'ALAHADYANTOERANA', 'JDSLOCAL', 'LOCALDOW' ),
+	'fullurl'                   => array( '0', 'URLREHETRA:', 'URLCOMPLETE:', 'FULLURL:' ),
+	'fullurle'                  => array( '0', 'URLREHETRAX:', 'URLCOMPLETEX:', 'FULLURLE:' ),
+	'displaytitle'              => array( '1', 'ASEHOLOHATENY', 'AFFICHERTITRE', 'DISPLAYTITLE' ),
 );
 
 $fallback = 'fr';
@@ -529,12 +529,11 @@ Mitaky version $1-n'i MediaWiki",
 # General errors
 'error' => 'Tsy mety',
 'databaseerror' => "Tsy fetezana eo amin'ny toby",
-'dberrortext' => 'Nisy tsy fetezana ao amin\'ny fangatahana tany amin\'ny database.
-Inoana fa ny rindrankajy no misy olana (bug).
-Ny fangatahana farany dia:
-<blockquote><tt>$1</tt></blockquote>
-tao amin\'ny tao "<tt>$2</tt>".
-Toy izao no navalin\'ny MySQL "<tt>$3: $4</tt>".',
+'dberrortext' => "Nitranga ny hadisoana ara-pirafi-kataka (syntax error).
+Mety noho ny tsifandehanan'ny rindrankajy tsara izany.
+<blockquote><code>$1</code></blockquote>
+avy amin'ny tao « <code>$2</code> ».
+ary « <samp>$3 : $4</samp> » no hadisoana naverinn'ny banky angona.",
 'dberrortextcl' => "Ao amin'ny fangatahana tao amin'ny banky angona dia misy tsi-fetezana ara-pehezanteny.
 Ny fangatahana farany nalefa dia :
 « $1 »
@@ -869,10 +868,9 @@ Azonao atao ny [[Special:Search/{{PAGENAME}}|Mikaroka momba ny lohatenin'io pejy
 'blocked-notice-logextract' => "Ankehitriny ity mpikambana ity dia voasakana.
 Ny fampidirana faran'ny laogin'ny fanakanam-pikambana dia naseho teo ambany ho an'ny fampahalalàna :",
 'clearyourcache' => "'''Fantaro :''' Rehefa avy mitahiry, dia mila terenao ny fanavaozana ny voatakon'ny mpitety tranonkalanao hahafahanao mahita ny fanovana.
-'''Firefox/Safari:''' Tazomy ho voapotsitra ny kitika ''Maj'' na ''Shift'', dia tsindrio eo amin'i ''Actualiser'', na tsindrio Ctrl+F5
-'''Google Chrome:''' Miaraka tsindrio Ctrl, Maj ary R.
-'''Internet Explorer''': Miaraka tsindrio Ctrl sy F5
-'''Konqueror''': Tsindrio F5
+'''Firefox/Safari:''' Tazomy ho voapotsitra ny kitika ''Maj'' na ''Shift'', dia tsindrio eo amin'i ''Actualiser'', na Ctrl+F5
+'''Google Chrome:''' Tsindrio miaraka ny Ctrl, Maj ary R.
+'''Internet Explorer''': Tsindrio miaraka Ctrl sy F5
 '''Opera''': Esory ny voatatoka ao amin'ny ''Outils → Préférences'' (''Fitaovana  → Safidy'').",
 'usercssyoucanpreview' => "'''Fika:''' Ampiasao ny bokotra 'Tsipalotra' mialoha ny hitehirizanao ny CSS-nao vaovao.",
 'userjsyoucanpreview' => "'''Fika:''' Ampiasao ny bokotra 'Tsipalotra' mialoha ny hitehirizanao ny JS-nao vaovao.",
@@ -1268,7 +1266,7 @@ ihany no miseho amin'ny vokatry ny karoka).",
 'prefs-rc' => 'Vao niova',
 'prefs-watchlist' => 'Lisitry ny pejy arahana-maso',
 'prefs-watchlist-days' => "Isa ny andro haseho anatin'ny lisitra ny pejy arahana-maso",
-'prefs-watchlist-days-max' => 'Maximum $1 {{PLURAL:$1|day|days}}',
+'prefs-watchlist-days-max' => '$1 {{PLURAL:$1|}} andro farafahabetsany',
 'prefs-watchlist-edits' => "Isa ny fanovana aseho eo amin'ny fanaraha-maso navelatra:",
 'prefs-watchlist-edits-max' => 'Isa fara-fahabetsany : 1000',
 'prefs-watchlist-token' => "token ho an'ny lisitry ny pejy arahi-maso:",
@@ -1603,13 +1601,13 @@ Raha hanisy sary ao anaty pejy, dia mampiasà rohy toy ny iray amin'ireto
 'illegalfilename' => 'Misy litera tsy mety amin\'ny lohateny ny anaran\'ilay rakita "$1". Azafady soloy ny anaran\'ny rakitra dia andramo alefa indray.',
 'filename-toolong' => 'Tsy afaka mihoatra ny 240 oktety ny anaran-drakitra.',
 'badfilename' => 'Novana ho "$1" ny anaran\'ny rakitra.',
-'filetype-mime-mismatch' => "Ny karazan-drakitra dia tsy miady amin'ny karazana MIME.",
+'filetype-mime-mismatch' => 'Ny karazan-drakitra ".$1" dia tsy miady amin\'ny karazana MIME novinavinaina ho azy ho an\'ilay rakitra ($2).',
 'filetype-badmime' => 'Ny karazan-drakitra MIME « $1 » dia tsy afaka ampidirina.',
 'filetype-bad-ie-mime' => "Tsy afaka ampidirina ilay rakitra satria hitan'i Internet Explorer faha « $1 » izy, midika rakitra voarara satria mety mampidi-doza",
 'filetype-unwanted-type' => "Karazan-drakitra tsy tiana ny karazan-drakitra '''« .$1 »'''.
 {{PLURAL:$3||}}Ny karazan-drakitra fidiana dia $2.",
-'filetype-banned-type' => "Rarana ato ny karazan-drakitra '''« .$1 »'''
-{{PLURAL:$3||}}Ny karazan-drakitra ekena dia $2.",
+'filetype-banned-type' => "'''\".\$1\"'''dia {{PLURAL:\$4|anisan'ny|}} karazan-drakitra voarara.
+Karazan-drakitra azo alefa {{PLURAL:\$3||}} \$2.",
 'filetype-missing' => 'Tsy manan-karazan-drakitra ilay rakitra (hoatry ny « .jpg » ohatra).',
 'empty-file' => 'Tsy manam-botoatiny ny rakitra nalefanao.',
 'file-too-large' => 'Ngeza loatra ny rakitra nalefanao.',
@@ -1680,7 +1678,7 @@ Tokony marina ny $1 aloha ny manao fampidirana vaovao.',
 'filename-bad-prefix' => "Ny anaran-drakitra ho ampidirinareo dia manomboka amin'ny '''« $1 »''', anarana omena an'ny fakan-tsary elektirônika.
 Misafidia anaran-drakitra mambangovango.",
 'upload-success-subj' => 'Voaray soa aman-tsara ny rakitra',
-'upload-success-msg' => 'Eto ny rakitra nalefanao : [[:{{ns:file}}:$1]]',
+'upload-success-msg' => "Vita soa aman-tsara ilay fandefasan-drakitra avy amin'i [$2]. Eto ny toerana mety ahitanao ny rakitrao : [[:{{ns:file}}:$1]]",
 'upload-failure-subj' => 'Olana nitranga teo am-pandefasana',
 'upload-failure-msg' => "Nisy olana tamin'ny fampidiranao [$2] :
 
@@ -1703,6 +1701,8 @@ Raha mbola misy foana ilay  olana, manorata any amin'ny [[Special:ListUsers/syso
 'backend-fail-stream' => 'Tsy afaka mamaky ilay rakitra $1.',
 'backend-fail-backup' => 'Tsy afaka mitahiry ilay rakitra $1.',
 'backend-fail-hashes' => "Tsy azo ilay hash an-drakitra ho an'ny fampitahana.",
+'backend-fail-notsame' => "Efa misy rakitra samihafa ho an'i $1",
+'backend-fail-invalidpath' => '$1 dia lalam-pitahirizana tsy azo raisina.',
 'backend-fail-delete' => 'Tsy afaka mamafa ilay rakitra $1.',
 'backend-fail-alreadyexists' => 'Efa misy ilay rakitra $1.',
 'backend-fail-store' => 'Tsy afaka mitahiry ilay rakitra $1 anaty $2.',
@@ -1824,6 +1824,7 @@ Tsindrio eo amin'ny lohan-tsanganana raha hanova ny laharam-pisehoana.",
 'linkstoimage' => "Ireto avy no {{PLURAL:$1|pejy mirohy|pejy mirohy}} ($1) amin'io rakitra io:",
 'nolinkstoimage' => "Tsy misy pejy mirohy amin'ity sary ity.",
 'morelinkstoimage' => "Hijery [[Special:WhatLinksHere/$1|rohy fanampiny]] makany amin'io rakitra io.",
+'linkstoimage-redirect' => '$1 (fihodinana) $2',
 'sharedupload' => "Mety ho rakitra itambarana amin'ny tetikasa hafa ny rakitra $1.",
 'sharedupload-desc-here' => "Avy amin'i $1 io rakitra io ary mety ampiasain'ny tetikasa hafa.
 Aseho eo ambany ny [$2 famisavisana ilay rakitra].",
@@ -2004,8 +2005,8 @@ wiki ity aza izy.</p>",
 'booksources-invalid-isbn' => 'Ny ISBN nomena dia mety diso ; marino raha diso ianao teo am-pandikanana ny loharano fotony.',
 
 # Special:Log
-'specialloguserlabel' => 'Mpikambana:',
-'speciallogtitlelabel' => 'Lohateny:',
+'specialloguserlabel' => 'Mpikambana nanao :',
+'speciallogtitlelabel' => 'Tanjona (lohateny na mpikambana) :',
 'log' => 'Tatitr’asa',
 'all-logs-page' => 'Ny tatitr’asa',
 'alllogstext' => "Seho nakambana ho an'ny laogy rehetra azo jerena eto amin'ny {{SITENAME}}.
@@ -2045,12 +2046,13 @@ Vangio koa ny [[Special:WantedCategories|sokajy ilaina]].",
 'sp-deletedcontributions-contribs' => "fandraisan'anjara",
 
 # Special:LinkSearch
-'linksearch' => 'Rohy ivelany',
+'linksearch' => 'Fikarohana rohy ivelany',
 'linksearch-pat' => 'Volana tadiavina :',
 'linksearch-ns' => 'Anaran-tsehatra :',
 'linksearch-ok' => 'Fikarohana',
-'linksearch-text' => 'Ny soratra « joker » dia azo soratana ohatra <code>*.wikipedia.org</code>. br />
-Prôtôkôly zaka : <code>$1</code>.',
+'linksearch-text' => "Azo ampiasaina ny soratra joker toa i « *.wikipedia.org ».
+Mila top-level domain ambonimbony kokoa izy ireo, sahala « *.org » <br />
+Protokoly zaka <code>$1</code> aza ampiana ao amin'ny karokao izy ireo.",
 'linksearch-line' => "$1 dia voarohy amin'ny $2",
 'linksearch-error' => "Ny soratra joker dia ampiasaina anatin'ny fanombohan'ny anaran-tsehatry ny milina hôte ihany.",
 
@@ -2096,7 +2098,7 @@ dia ahafahana mandefa hafatra tokana ho any aminy ity fisy eto ambany ity.
 Ny adiresy imailakao napetrakao tao amin'ny mombamomba anao no hiseho hoe
 adiresin'ny mpandefa izany imailaka izany, koa afaka hovaliany izay hafatra alefanao.",
 'usermailererror' => "Misy tsy mety amin'ny lohatenin'ny imailaka:",
-'defemailsubject' => "imailaka avy amin'ny sehatra {{SITENAME}}",
+'defemailsubject' => '{{SITENAME}} Mailaky ny mpikambana "$1"',
 'usermaildisabled' => 'Tsy azo mifandefa imailaka ny mpikambana',
 'usermaildisabledtext' => "Tsy mahazo mandefa imailaka any amin'ny mpikamban'ity wiki ity ianao",
 'noemailtitle' => 'Tsy misy adiresy imailaka',
@@ -2154,7 +2156,7 @@ Aoriana, raha irinao ny hanaisotra azy ao amin'ny pejy arahanao maso, dia tsindr
 'watchmethod-list' => 'fanamarinana ny pejy arahana ahitana fanovana farany',
 'watchlistcontains' => "Ao amin'ny pejy arahanao dia ahitana pejy $1{{PLURAL:}}.",
 'iteminvalidname' => "Olana amin'ny zavatra « $1 » : tsy ara-dalàna ny anarana...",
-'wlnote' => "Eo ambany eo ny {{PLURAL:}}fanovana farany $1 natao tanatin'ny $2 ora farany teo.",
+'wlnote' => "Eo ambany dia ahitana ny  {{PLURAL:$1|fanovana farany indrindra|ny fanovana ''$1'' farany}} natao tanatin'ny adin'ny {{PLURAL:$2|iray|'''$2'''}}, nanomboka ny $3, $4.",
 'wlshowlast' => 'Haneho ny $1 ora farany, ny $2 andro farany na $3',
 'watchlist-options' => 'Safidy ny lisitry ny pejy arahana',
 
@@ -2263,6 +2265,7 @@ Ho ann'y fanazavana fanampiny, jereo [[Special:ProtectedPages|ny lisitry ny pejy
 'protect-title-notallowed' => "Hijery ny lentam-piarovana ho an'i « [[$1]] »",
 'prot_1movedto2' => '[[$1]] voaova anarana ho [[$2]]',
 'protect-badnamespace-title' => 'Anaran-tsehatra tsy azo arovana',
+'protect-badnamespace-text' => "Tsy afaka arovana ny pejy ao amin'io anaran-tsehatra io.",
 'protect-legend' => 'Fanekena ny fiarovana pejy',
 'protectcomment' => 'Antony :',
 'protectexpiry' => 'Daty fitsaharana :',
@@ -2466,6 +2469,7 @@ Ampiasao ity fisy eto ambany ity hanalana ny sakana
 mihatra amin'ny adiresy IP na solonanarana iray.",
 'ipusubmit' => 'Esory ny sakana',
 'unblocked' => "voaala ny sakan'i [[User:$1|$1]]",
+'unblocked-range' => "Afaka ny sakan'i $1.",
 'unblocked-id' => "Niala ny sakan'i $1",
 'blocklist' => 'Mpikambana voasakana',
 'ipblocklist' => 'Lisitry ny adiresy IP sy mpikambana voasakana',
@@ -2630,7 +2634,7 @@ mifanaraka amin'ilay anarana vaovao. Azafady mba atambaro izay pejin-dresaka iza
 
 Efa misy ny lahatsoratra hoe "[[:$1]]". Irinao ve ny hamafana azy mba hahafahana mamindra toerana ity lahatsoratra ity?',
 'delete_and_move_confirm' => 'Eny, fafao io pejy io',
-'delete_and_move_reason' => 'Fafao mba hamindrana toerana ny anankiray',
+'delete_and_move_reason' => "Pejy voafafa hahafahana manolo ny anaran'i ''[[$1]]''",
 'selfmove' => 'Mitovy ny anarana taloha sy anarana vaovao; tsy afaka afindra ny pejy.',
 'immobile-source-namespace' => "Tsy afaka ovaina anarana ny pejy ao amin'ny anaran-tsehatra « $1 »",
 'immobile-target-namespace' => "Tsy afaka ovainao ny pejy makany amin'ny anaran-sehatra « $1 »",
@@ -2678,7 +2682,8 @@ Etsy amin'ny toerana farany dia afaka mampiasa rohy ihany koa ianao, ohatra [[{{
 'allmessagesname' => 'Anarana',
 'allmessagesdefault' => 'Dikan-teny tany am-boalohany',
 'allmessagescurrent' => 'Dikan-teny miasa ankehitriny',
-'allmessagestext' => "Ity no lisitry ny system messages misy eto amin'ity MediaWiki: namespace ity.",
+'allmessagestext' => "Ity dia lisitry ny hafatra hita ao amin'ny anaran-tsehatra MediaWiki.
+Andana vangio ny [//www.mediawiki.org/wiki/Localisation Fandikana an'i Mediawiki] ary [//translatewiki.net/ translatewiki.net] raha tia handray anjara amin'ny fandikana an'i Mediawiki amin'ny ankapobeny.",
 'allmessagesnotsupportedDB' => "Tsy mbola mandeha ny '''{{ns:special}}:Allmessages''' satria tsy mandeha koa ny '''\$wgUseDatabaseMessages'''.",
 'allmessages-filter-legend' => 'Tantavanina',
 'allmessages-filter' => 'Hanasivana araka ny satam-panovana :',
@@ -2809,6 +2814,7 @@ Ampesao ny topi-maso aloha no mihatiry.",
 'tooltip-diff' => "Asehoy izay novainao tamin'ny lahatsoratra.",
 'tooltip-compareselectedversions' => "Jereo ny fahasamihafana amin'ireo votoatin'ny pejy anankiroa ireo.",
 'tooltip-watch' => "Ampidiro amin'ny lisitry ny pejy arahinao maso ity pejy ity",
+'tooltip-watchlistedit-normal-submit' => 'Hanala ny lohateny',
 'tooltip-recreate' => 'Hamorona ilay pejy fanindroany raha efa voafafa izy',
 'tooltip-upload' => 'Hanomboka ny fampidirana',
 'tooltip-rollback' => "Manala ny fanovan'ny mpikambana farany nanova azy ilay asa « foano » (Rollback) .",
@@ -2843,11 +2849,11 @@ Mamerina ny version taloha io asa io ary afaka manometraka ny antony anatin'ny a
 
 # Info page
 'pageinfo-title' => 'Fampahalalana ho an\'i "$1"',
-'pageinfo-header-edits' => 'Fanovana',
+'pageinfo-header-edits' => "Tantaran'ny fanovana",
 'pageinfo-views' => "Isan'ny jery",
-'pageinfo-watchers' => "Isan'ny mpikambana manaraka an'ity pejy ity",
-'pageinfo-edits' => "Isan'ny fanovana",
-'pageinfo-authors' => "Isan'ny mpanoratra tokana",
+'pageinfo-watchers' => "Isan'ny mpandray anjara manaraka",
+'pageinfo-edits' => "Isa manontolon'ny fanovana",
+'pageinfo-authors' => "Isa manontolon'ny mpandray anjara",
 
 # Patrolling
 'markaspatrolleddiff' => 'Marihana ho voamarina',
@@ -2888,6 +2894,7 @@ Raha alefanao ilay izy, mety ho simban'io renifango io ny solosainao.",
 'widthheightpage' => '$1 × $2, pejy $3{{PLURAL:}}',
 'file-info' => 'Haben-drakitra : $1, karazana MIME : $2',
 'file-info-size' => "$1 × $2 teboka, haben'ilay rakitra : $3, endrika MIME : $4",
+'file-info-size-pages' => '$1 × $2 teboka, haben-drakitra : $3, karazana MIME $4, pejy $5 {{PLURAL:}}',
 'file-nohires' => "Tsy misy sary ngeza non'io",
 'svg-long-desc' => 'rakitra SVG, habe $1 × $2 teboka, habe : $3',
 'show-big-image' => "Hijery ny tena haben'ny sary",
diff --git a/languages/messages/MessagesMhr.php b/languages/messages/MessagesMhr.php
index 4c3a3f66b4..2e6cc299b7 100644
--- a/languages/messages/MessagesMhr.php
+++ b/languages/messages/MessagesMhr.php
@@ -72,14 +72,14 @@ $specialPageAliases = array(
 );
 
 $magicWords = array(
-	'img_right'               => array( '1', 'пурла', 'справа', 'right' ),
-	'img_left'                => array( '1', 'шола', 'слева', 'left' ),
-	'img_border'              => array( '1', 'чек', 'граница', 'border' ),
-	'img_sub'                 => array( '1', 'йымалне', 'под', 'sub' ),
-	'img_super'               => array( '1', 'ӱмбалне', 'над', 'super', 'sup' ),
-	'img_top'                 => array( '1', 'кӱшычын', 'сверху', 'top' ),
-	'img_middle'              => array( '1', 'покшелне', 'посередине', 'middle' ),
-	'img_bottom'              => array( '1', 'ӱлычын', 'снизу', 'bottom' ),
+	'img_right'                 => array( '1', 'пурла', 'справа', 'right' ),
+	'img_left'                  => array( '1', 'шола', 'слева', 'left' ),
+	'img_border'                => array( '1', 'чек', 'граница', 'border' ),
+	'img_sub'                   => array( '1', 'йымалне', 'под', 'sub' ),
+	'img_super'                 => array( '1', 'ӱмбалне', 'над', 'super', 'sup' ),
+	'img_top'                   => array( '1', 'кӱшычын', 'сверху', 'top' ),
+	'img_middle'                => array( '1', 'покшелне', 'посередине', 'middle' ),
+	'img_bottom'                => array( '1', 'ӱлычын', 'снизу', 'bottom' ),
 );
 
 $messages = array(
diff --git a/languages/messages/MessagesMk.php b/languages/messages/MessagesMk.php
index 71c0c04692..b664588ca9 100644
--- a/languages/messages/MessagesMk.php
+++ b/languages/messages/MessagesMk.php
@@ -139,6 +139,7 @@ $specialPageAliases = array(
 	'MIMEsearch'                => array( 'MIMEПребарување' ),
 	'Mostcategories'            => array( 'НајмногуКатегории' ),
 	'Mostimages'                => array( 'НајмногуСлики', 'НајмногуПодатотеки', 'ПодатотекиСоНајмногуВрски' ),
+	'Mostinterwikis'            => array( 'НајмногуМеѓувикија' ),
 	'Mostlinked'                => array( 'СоНајмногуВрски', 'СтранициСоНајмногуВрски' ),
 	'Mostlinkedcategories'      => array( 'НајупотребуваниКатегории' ),
 	'Mostlinkedtemplates'       => array( 'НајупотребуваниШаблони' ),
@@ -195,132 +196,148 @@ $specialPageAliases = 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__' ),
-	'noheader'                => array( '0', '__БЕЗНАСЛОВ__', '__NOHEADER__' ),
-	'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' ),
-	'localmonth'              => array( '1', 'МЕСЕЦ_ЛОКАЛНО', 'LOCALMONTH', 'LOCALMONTH2' ),
-	'localmonth1'             => array( '1', 'МЕСЕЦ_ЛОКАЛНО1', 'LOCALMONTH1' ),
-	'localmonthname'          => array( '1', 'МЕСЕЦИМЕ_ЛОКАЛНО', 'LOCALMONTHNAME' ),
-	'localmonthnamegen'       => array( '1', 'МЕСЕЦИМЕ_ЛОКАЛНО_ГЕНИТИВ', 'LOCALMONTHNAMEGEN' ),
-	'localmonthabbrev'        => array( '1', 'МЕСЕЦИМЕ_ЛОКАЛНО_КРАТЕНКА', 'LOCALMONTHABBREV' ),
-	'localday'                => array( '1', 'ДЕН_ЛОКАЛНО', 'LOCALDAY' ),
-	'localday2'               => array( '1', 'ДЕН2_ЛОКАЛНО', 'LOCALDAY2' ),
-	'localdayname'            => array( '1', 'ИМЕНАДЕН_ЛОКАЛНО', 'LOCALDAYNAME' ),
-	'localyear'               => array( '1', 'ГОДИНА_ЛОКАЛНО', 'LOCALYEAR' ),
-	'localtime'               => array( '1', 'ВРЕМЕ_ЛОКАЛНО', 'LOCALTIME' ),
-	'localhour'               => array( '1', 'ЧАС_ЛОКАЛНО', 'LOCALHOUR' ),
-	'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' ),
-	'talkspace'               => array( '1', 'РАЗГОВОРПРОСТОР', 'TALKSPACE' ),
-	'fullpagename'            => array( '1', 'ЦЕЛОСНОИМЕНАСТРАНИЦА', 'FULLPAGENAME' ),
-	'subpagename'             => array( '1', 'ИМЕНАПОТСТРАНИЦА', 'SUBPAGENAME' ),
-	'basepagename'            => array( '1', 'ИМЕНАОСНОВНАСТРАНИЦА', 'BASEPAGENAME' ),
-	'talkpagename'            => array( '1', 'СТРАНИЦАЗАРАЗГОВОР', 'TALKPAGENAME' ),
-	'subjectpagename'         => array( '1', 'ИМЕНАСТАТИЈА', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
-	'subst'                   => array( '0', 'ЗАМЕНИ:', 'SUBST:' ),
-	'safesubst'               => array( '0', 'БЕЗБЗАМЕНИ', 'SAFESUBST:' ),
-	'msgnw'                   => array( '0', 'ИЗВЕШТNW:', 'MSGNW:' ),
-	'img_thumbnail'           => array( '1', 'мини', 'мини-слика', 'thumbnail', 'thumb' ),
-	'img_manualthumb'         => array( '1', 'мини-слика=$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_page'                => array( '1', 'страница=$1', 'страница $1', 'page=$1', 'page $1' ),
-	'img_upright'             => array( '1', 'исправено', 'исправено=$1', 'исправено $1', 'upright', 'upright=$1', 'upright $1' ),
-	'img_border'              => array( '1', 'граничник', 'граница', 'border' ),
-	'img_baseline'            => array( '1', 'основналинија', 'baseline' ),
-	'img_sub'                 => array( '1', 'долениндекс', 'дол', 'sub' ),
-	'img_super'               => array( '1', 'горениндекс', 'гор', 'super', 'sup' ),
-	'img_top'                 => array( '1', 'врв', 'најгоре', 'top' ),
-	'img_text_top'            => array( '1', 'текст-врв', 'текст-најгоре', 'text-top' ),
-	'img_middle'              => array( '1', 'средина', 'middle' ),
-	'img_bottom'              => array( '1', 'дно', 'најдолу', 'bottom' ),
-	'img_text_bottom'         => array( '1', 'текст-дно', 'текст-најдолу', 'text-bottom' ),
-	'img_link'                => array( '1', 'врска=$1', 'link=$1' ),
-	'img_alt'                 => array( '1', 'алт=$1', 'alt=$1' ),
-	'sitename'                => array( '1', 'ИМЕНАМРЕЖНОМЕСТО', 'SITENAME' ),
-	'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' ),
-	'localweek'               => array( '1', 'СЕДМИЦА_ЛОКАЛНО', 'LOCALWEEK' ),
-	'localdow'                => array( '1', 'ЛОКАЛЕНДЕНВОСЕДМИЦАТА', 'LOCALDOW' ),
-	'revisionid'              => array( '1', 'НАЗНАКАНАРЕВИЗИЈА', 'REVISIONID' ),
-	'revisionday'             => array( '1', 'ДЕННАРЕВИЗИЈА', 'REVISIONDAY' ),
-	'revisionday2'            => array( '1', 'ДЕННАРЕВИЗИЈА2', 'REVISIONDAY2' ),
-	'revisionmonth'           => array( '1', 'МЕСЕЦНАРЕВИЗИЈА', 'REVISIONMONTH' ),
-	'revisionmonth1'          => array( '1', 'МЕСЕЦНАРЕВИЗИЈА1', 'REVISIONMONTH1' ),
-	'revisionyear'            => array( '1', 'ГОДИНАНАРЕВИЗИЈА', 'REVISIONYEAR' ),
-	'revisiontimestamp'       => array( '1', 'ВРЕМЕНАРЕВИЗИЈА', 'REVISIONTIMESTAMP' ),
-	'revisionuser'            => array( '1', 'КОРИСНИКНАНАРЕВИЗИЈА', 'REVISIONUSER' ),
-	'plural'                  => array( '0', 'МНОЖИНА:', 'PLURAL:' ),
-	'fullurl'                 => array( '0', 'ПОЛНАURL:', 'FULLURL:' ),
-	'raw'                     => array( '0', 'СИРОВО:', 'РЕД:', 'RAW:' ),
-	'displaytitle'            => array( '1', 'ПРИКАЖИНАСЛОВ', 'DISPLAYTITLE' ),
-	'rawsuffix'               => array( '1', 'П', 'R' ),
-	'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' ),
-	'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' ),
-	'url_path'                => array( '0', 'ПАТЕКА', 'PATH' ),
-	'url_wiki'                => array( '0', 'ВИКИ', 'WIKI' ),
-	'url_query'               => array( '0', 'БАРАЊЕ', 'QUERY' ),
-	'defaultsort_noerror'     => array( '0', 'безгрешки', 'noerror' ),
-	'defaultsort_noreplace'   => array( '0', 'беззамена', 'noreplace' ),
+	'redirect'                  => array( '0', '#пренасочување', '#види', '#Пренасочување', '#ПРЕНАСОЧУВАЊЕ', '#REDIRECT' ),
+	'notoc'                     => array( '0', '__БЕЗСОДРЖИНА__', '__NOTOC__' ),
+	'nogallery'                 => array( '0', '__БЕЗГАЛЕРИЈА__', '__NOGALLERY__' ),
+	'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' ),
+	'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' ),
+	'localmonth'                => array( '1', 'МЕСЕЦ_ЛОКАЛНО', 'LOCALMONTH', 'LOCALMONTH2' ),
+	'localmonth1'               => array( '1', 'МЕСЕЦ_ЛОКАЛНО1', 'LOCALMONTH1' ),
+	'localmonthname'            => array( '1', 'МЕСЕЦИМЕ_ЛОКАЛНО', 'LOCALMONTHNAME' ),
+	'localmonthnamegen'         => array( '1', 'МЕСЕЦИМЕ_ЛОКАЛНО_ГЕНИТИВ', 'LOCALMONTHNAMEGEN' ),
+	'localmonthabbrev'          => array( '1', 'МЕСЕЦИМЕ_ЛОКАЛНО_КРАТЕНКА', 'LOCALMONTHABBREV' ),
+	'localday'                  => array( '1', 'ДЕН_ЛОКАЛНО', 'LOCALDAY' ),
+	'localday2'                 => array( '1', 'ДЕН2_ЛОКАЛНО', 'LOCALDAY2' ),
+	'localdayname'              => array( '1', 'ИМЕНАДЕН_ЛОКАЛНО', 'LOCALDAYNAME' ),
+	'localyear'                 => array( '1', 'ГОДИНА_ЛОКАЛНО', 'LOCALYEAR' ),
+	'localtime'                 => array( '1', 'ВРЕМЕ_ЛОКАЛНО', 'LOCALTIME' ),
+	'localhour'                 => array( '1', 'ЧАС_ЛОКАЛНО', 'LOCALHOUR' ),
+	'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' ),
+	'talkspace'                 => array( '1', 'РАЗГОВОРПРОСТОР', 'TALKSPACE' ),
+	'fullpagename'              => array( '1', 'ЦЕЛОСНОИМЕНАСТРАНИЦА', 'FULLPAGENAME' ),
+	'subpagename'               => array( '1', 'ПОТСТРАНИЦА', 'SUBPAGENAME' ),
+	'basepagename'              => array( '1', 'ИМЕНАОСНОВНАСТРАНИЦА', 'BASEPAGENAME' ),
+	'talkpagename'              => array( '1', 'СТРАНИЦАЗАРАЗГОВОР', 'TALKPAGENAME' ),
+	'subjectpagename'           => array( '1', 'ИМЕНАСТАТИЈА', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
+	'subst'                     => array( '0', 'ЗАМЕНИ:', 'SUBST:' ),
+	'safesubst'                 => array( '0', 'БЕЗБЗАМЕНИ', 'SAFESUBST:' ),
+	'msgnw'                     => array( '0', 'ИЗВЕШТNW:', 'MSGNW:' ),
+	'img_thumbnail'             => array( '1', 'мини', 'мини-слика', 'thumbnail', 'thumb' ),
+	'img_manualthumb'           => array( '1', 'мини-слика=$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_page'                  => array( '1', 'страница=$1', 'страница_$1', 'page=$1', 'page $1' ),
+	'img_upright'               => array( '1', 'исправено', 'исправено=$1', 'исправено_$1', 'upright', 'upright=$1', 'upright $1' ),
+	'img_border'                => array( '1', 'граничник', 'граница', 'border' ),
+	'img_baseline'              => array( '1', 'основналинија', 'baseline' ),
+	'img_sub'                   => array( '1', 'долениндекс', 'дол', 'sub' ),
+	'img_super'                 => array( '1', 'горениндекс', 'гор', 'super', 'sup' ),
+	'img_top'                   => array( '1', 'врв', 'најгоре', 'top' ),
+	'img_text_top'              => array( '1', 'текст-врв', 'текст-најгоре', 'text-top' ),
+	'img_middle'                => array( '1', 'средина', 'middle' ),
+	'img_bottom'                => array( '1', 'дно', 'најдолу', 'bottom' ),
+	'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' ),
+	'sitename'                  => array( '1', 'ИМЕНАМРЕЖНОМЕСТО', 'SITENAME' ),
+	'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' ),
+	'stylepath'                 => array( '0', 'СТИЛСКАПАТЕКА', 'STYLEPATH' ),
+	'grammar'                   => array( '0', 'ГРАМАТИКА:', 'GRAMMAR:' ),
+	'gender'                    => array( '0', 'ПОЛ:', 'GENDER:' ),
+	'notitleconvert'            => array( '0', '__БЕЗПРЕТВОРАЊЕНАСЛОВ__', '__NOTITLECONVERT__', '__NOTC__' ),
+	'nocontentconvert'          => array( '0', '__БЕЗПРЕТВОРАЊЕСОДРЖИНА__', '__NOCONTENTCONVERT__', '__NOCC__' ),
+	'currentweek'               => array( '1', 'ТЕКОВНАСЕДМИЦА', 'CURRENTWEEK' ),
+	'currentdow'                => array( '1', 'ТЕКОВЕНДЕНВОСЕДМИЦАТА', 'CURRENTDOW' ),
+	'localweek'                 => array( '1', 'СЕДМИЦА_ЛОКАЛНО', 'LOCALWEEK' ),
+	'localdow'                  => array( '1', 'ЛОКАЛЕНДЕНВОСЕДМИЦАТА', 'LOCALDOW' ),
+	'revisionid'                => array( '1', 'НАЗНАКАНАРЕВИЗИЈА', 'REVISIONID' ),
+	'revisionday'               => array( '1', 'ДЕННАРЕВИЗИЈА', 'REVISIONDAY' ),
+	'revisionday2'              => array( '1', 'ДЕННАРЕВИЗИЈА2', 'REVISIONDAY2' ),
+	'revisionmonth'             => array( '1', 'МЕСЕЦНАРЕВИЗИЈА', 'REVISIONMONTH' ),
+	'revisionmonth1'            => array( '1', 'МЕСЕЦНАРЕВИЗИЈА1', 'REVISIONMONTH1' ),
+	'revisionyear'              => array( '1', 'ГОДИНАНАРЕВИЗИЈА', 'REVISIONYEAR' ),
+	'revisiontimestamp'         => array( '1', 'ВРЕМЕНАРЕВИЗИЈА', 'REVISIONTIMESTAMP' ),
+	'revisionuser'              => array( '1', 'КОРИСНИКНАНАРЕВИЗИЈА', 'REVISIONUSER' ),
+	'plural'                    => array( '0', 'МНОЖИНА:', 'PLURAL:' ),
+	'fullurl'                   => array( '0', 'ПОЛНАURL:', 'FULLURL:' ),
+	'lcfirst'                   => array( '0', 'ПРВОМБ', 'LCFIRST:' ),
+	'ucfirst'                   => array( '0', 'ПРВОГБ', 'UCFIRST:' ),
+	'lc'                        => array( '0', 'МБ', 'LC:' ),
+	'uc'                        => array( '0', 'ГБ', 'UC:' ),
+	'raw'                       => array( '0', 'СИРОВО:', 'RAW:' ),
+	'displaytitle'              => array( '1', 'ПРИКАЖИНАСЛОВ', 'DISPLAYTITLE' ),
+	'rawsuffix'                 => array( '1', 'П', 'R' ),
+	'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' ),
+	'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' ),
+	'url_path'                  => array( '0', 'ПАТЕКА', 'PATH' ),
+	'url_wiki'                  => array( '0', 'ВИКИ', 'WIKI' ),
+	'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' ),
 );
 
 $linkTrail = '/^([a-zабвгдѓежзѕијклљмнњопрстќуфхцчџш]+)(.*)$/sDu';
@@ -1040,7 +1057,7 @@ $2
 'updated' => '(Подновено)',
 'note' => "'''Напомена:'''",
 'previewnote' => "'''Имајте предвид дека ова е само преглед.'''
-Вашите промени сè уште не се зачувани!",
+Промените сè уште не се зачувани!",
 'continue-editing' => 'Продолжете со уредување',
 'previewconflict' => 'Овој преглед прикажува како ќе изгледа текстот внесен во горниот дел откако ќе се зачува страницата.',
 'session_fail_preview' => "'''Жалиме! Не можевме да го обработиме вашето уредување поради загуба на сесиски податоци.'''
@@ -1082,8 +1099,8 @@ $2
 '''НЕ ПРАЌАЈТЕ ТЕКСТОВИ ЗАШТИТЕНИ СО АВТОРСКИ ПРАВА БЕЗ ДОЗВОЛА!'''",
 'longpageerror' => "'''Грешка: Текстот што го внесовте е голем {{PLURAL:$1|еден килобајт|$1 килобајти}}, што ја надминува границата од {{PLURAL:$2|еден килобајт|$2 килобајти}}.'''
 Затоа нема да може да се зачува.",
-'readonlywarning' => "'''ПРЕДУПРЕДУВАЊЕ: Базата на податоци е заклучена заради одржување, па нема да можете да ги зачувате вашите промени сега.
-Пробајте да го зачувате текстот локално (cut & paste) во некоја податотека и да го пратите подоцна.'''
+'readonlywarning' => "'''ПРЕДУПРЕДУВАЊЕ: Базата на податоци е заклучена заради одржување, па нема да можете да ги зачувате промените сега.
+Пробајте да го зачувате текстот за подоцна, локално (со прекопирање) во некоја податотека.'''
 
 Администраторот кој ја заклучил базата на податоци го дал следново објаснување: $1",
 'protectedpagewarning' => "'''Предупредување:  Оваа страница е заклучена, така што само корисници со администраторски привилегии можат да ја уредуваат.'''
@@ -2047,6 +2064,7 @@ $1',
 'shared-repo' => 'заедничко складиште',
 'shared-repo-name-wikimediacommons' => 'Заедничката Ризница',
 'filepage.css' => '/* Тука поставените каскадни стилски страници (CSS) се вклучени во страницата за опис на податотеката, како и на клиентските викија */',
+'upload-disallowed-here' => 'Нажалост, не можете да ја замените сликава со нова.',
 
 # File reversion
 'filerevert' => 'Врати $1',
@@ -3101,8 +3119,8 @@ $1',
 'tooltip-ca-nstab-help' => 'Преглед на страницата за помош',
 'tooltip-ca-nstab-category' => 'Преглед на категоријата',
 'tooltip-minoredit' => 'Обележи ја промената како ситна',
-'tooltip-save' => 'Зачувајте ги вашите промени',
-'tooltip-preview' => 'Прегледајте ги вашите промени, ве молиме користете го ова пред зачувување!',
+'tooltip-save' => 'Зачувајте ги промените',
+'tooltip-preview' => 'Преглед на промените - ве молиме користете го ова пред зачувување!',
 'tooltip-diff' => 'Покажи кои промени ги направи во текстот.',
 'tooltip-compareselectedversions' => 'Видете ја разликата помеѓу двете избрани верзии на оваа страница.',
 'tooltip-watch' => 'Додај ја страницава во списокот на набљудувања',
@@ -3202,7 +3220,7 @@ $1',
 'pageinfo-authors' => 'Број на засебни автори',
 'pageinfo-recent-edits' => 'Број на скорешни уредувања (во последните $1)',
 'pageinfo-recent-authors' => 'Број на скорешни засебни автори',
-'pageinfo-restriction' => 'Заштита на страницата (<code>$1</code>)',
+'pageinfo-restriction' => 'Заштита на страницата (<code>{{lcfirst:$1}}</code>)',
 'pageinfo-magic-words' => '{{PLURAL:$1|Волшебен збор|Волшебни зборови}} ($1)',
 'pageinfo-hidden-categories' => '{{PLURAL:$1|Скриена категорија|Скриени категории}} ($1)',
 'pageinfo-templates' => '{{PLURAL:$1|Превметнат шаблон|Превметнати шаблони}} ($1)',
@@ -3261,6 +3279,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 пиксели, големина: $3',
 'show-big-image' => 'Вистинска големина',
 'show-big-image-preview' => 'Големина на овој преглед: $1.',
 'show-big-image-other' => '{{PLURAL:$2|Друга резолуција|Други резолуции}}: $1.',
@@ -3270,6 +3289,8 @@ $1',
 'file-info-png-looped' => 'кружно',
 'file-info-png-repeat' => 'пуштено {{PLURAL:$1|еднаш|$1 пати}}',
 'file-info-png-frames' => '$1 {{PLURAL:$1|кадар|кадри}}',
+'file-no-thumb-animation' => "'''Напомена: Поради технички ограничувања, минијатурите на оваа податотека нема да се анимираат.'''",
+'file-no-thumb-animation-gif' => "'''Напомена: Поради технички ограничувања, минијатурите на GIF-слики со висока резолуција како оваа нема да се анимираат.'''",
 
 # Special:NewFiles
 'newimages' => 'Галерија на нови податотеки',
diff --git a/languages/messages/MessagesMl.php b/languages/messages/MessagesMl.php
index 05ec30df32..f2f832343e 100644
--- a/languages/messages/MessagesMl.php
+++ b/languages/messages/MessagesMl.php
@@ -16,6 +16,7 @@
  * @author Junaidpv
  * @author Jyothis
  * @author Kaganer
+ * @author Krenair
  * @author Manjith Joseph <manjithkaini@gmail.com>
  * @author Naveen Sankar
  * @author Praveen Prakash <me.praveen@gmail.com>
@@ -181,147 +182,147 @@ $specialPageAliases = 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__' ),
-	'noheader'                => array( '0', '__തലക്കെട്ടുവേണ്ട__', '__NOHEADER__' ),
-	'currentmonth'            => array( '1', 'ഈമാസം', 'ഈമാസം2', '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' ),
-	'localmonth'              => array( '1', 'പ്രാദേശികമാസം', 'പ്രാദേശികമാസം2', 'LOCALMONTH', 'LOCALMONTH2' ),
-	'localmonth1'             => array( '1', 'പ്രാദേശികമാസം1', 'LOCALMONTH1' ),
-	'localmonthname'          => array( '1', 'പ്രാദേശികമാസത്തിന്റെപേര്‌', 'LOCALMONTHNAME' ),
-	'localmonthnamegen'       => array( '1', 'പ്രാദേശികമാസത്തിന്റെപേരുസൃഷ്ടിക്കുക', 'LOCALMONTHNAMEGEN' ),
-	'localmonthabbrev'        => array( '1', 'പ്രാദേശികമാസത്തിന്റെപേര്‌സംഗ്രഹം', 'പ്രാദേശികമാസത്തിന്റെപേര്‌ചുരുക്കം', 'LOCALMONTHABBREV' ),
-	'localday'                => array( '1', 'പ്രാദേശികദിവസം', 'LOCALDAY' ),
-	'localday2'               => array( '1', 'പ്രാദേശികദിവസം2', 'LOCALDAY2' ),
-	'localdayname'            => array( '1', 'പ്രാദേശികദിവസത്തിന്റെപേര്‌', 'LOCALDAYNAME' ),
-	'localyear'               => array( '1', 'പ്രാദേശികവർഷം', 'LOCALYEAR' ),
-	'localtime'               => array( '1', 'പ്രാദേശികസമയം', 'LOCALTIME' ),
-	'localhour'               => array( '1', 'പ്രാദേശികമണിക്കൂർ', 'LOCALHOUR' ),
-	'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' ),
-	'namespacenumber'         => array( '1', 'നാമമേഖലാസംഖ്യ', 'NAMESPACENUMBER' ),
-	'talkspace'               => array( '1', 'സംവാദമേഖല', 'TALKSPACE' ),
-	'talkspacee'              => array( '1', 'സംവാദമേഖലസമഗ്രം', 'TALKSPACEE' ),
-	'subjectspace'            => array( '1', 'വിഷയമേഖല', 'ലേഖനമേഖല', 'SUBJECTSPACE', 'ARTICLESPACE' ),
-	'subjectspacee'           => array( '1', 'വിഷയമേഖലസമഗ്രം', 'ലേഖനമേഖലസമഗ്രം', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
-	'fullpagename'            => array( '1', 'താളിന്റെമുഴുവൻപേര്‌', 'FULLPAGENAME' ),
-	'fullpagenamee'           => array( '1', 'താളിന്റെമുഴുവൻപേര്സമഗ്രം', 'FULLPAGENAMEE' ),
-	'subpagename'             => array( '1', 'അനുബന്ധതാളിന്റെപേര്‌', 'SUBPAGENAME' ),
-	'subpagenamee'            => array( '1', 'അനുബന്ധതാളിന്റെപേര്സമഗ്രം', 'SUBPAGENAMEE' ),
-	'basepagename'            => array( '1', 'അടിസ്ഥാനതാളിന്റെപേര്‌', 'BASEPAGENAME' ),
-	'basepagenamee'           => array( '1', 'അടിസ്ഥാനതാളിന്റെപേര്‌സമഗ്രം', 'BASEPAGENAMEE' ),
-	'talkpagename'            => array( '1', 'സംവാദതാളിന്റെപേര്‌', 'TALKPAGENAME' ),
-	'talkpagenamee'           => array( '1', 'സംവാദതാളിന്റെപേര്‌സമഗ്രം', 'TALKPAGENAMEE' ),
-	'subjectpagename'         => array( '1', 'ലേഖനതാളിന്റെപേര്‌', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
-	'subjectpagenamee'        => array( '1', 'ലേഖനതാളിന്റെപേര്‌സമഗ്രം', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
-	'msg'                     => array( '0', 'സന്ദേശം:', 'MSG:' ),
-	'subst'                   => array( '0', 'ബദൽ:', 'ഉൾപ്പെടുത്തൽ:', 'SUBST:' ),
-	'safesubst'               => array( '0', 'സംരക്ഷിതബദൽ:', 'സംരക്ഷിതയുൾപ്പെടുത്തൽ:', 'SAFESUBST:' ),
-	'msgnw'                   => array( '0', 'മൂലരൂപം:', 'MSGNW:' ),
-	'img_thumbnail'           => array( '1', 'ലഘുചിത്രം', 'ലഘു', 'thumbnail', 'thumb' ),
-	'img_manualthumb'         => array( '1', 'ലഘുചിത്രം=$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ബിന്ദു', '$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_upright'             => array( '1', 'നേരേകുത്തനെ', 'നേരേകുത്തനെ=$1', 'നേരേകുത്തനെ_$1', 'upright', 'upright=$1', 'upright $1' ),
-	'img_border'              => array( '1', 'അതിർവര', 'border' ),
-	'img_baseline'            => array( '1', 'താഴെയുള്ളവര', 'baseline' ),
-	'img_sub'                 => array( '1', 'കീഴെയെഴുത്ത്', 'sub' ),
-	'img_super'               => array( '1', 'മേലേയെഴുത്ത്', 'super', 'sup' ),
-	'img_top'                 => array( '1', 'മേലെ', 'top' ),
-	'img_text_top'            => array( '1', 'എഴുത്ത്-മേലെ', 'text-top' ),
-	'img_middle'              => array( '1', 'മദ്ധ്യം', 'middle' ),
-	'img_bottom'              => array( '1', 'താഴെ', 'bottom' ),
-	'img_text_bottom'         => array( '1', 'എഴുത്ത്-താഴെ', 'text-bottom' ),
-	'img_link'                => array( '1', 'കണ്ണി=$1', 'link=$1' ),
-	'img_alt'                 => array( '1', 'പകരം=$1', 'alt=$1' ),
-	'sitename'                => array( '1', 'സൈറ്റിന്റെപേര്', 'SITENAME' ),
-	'ns'                      => array( '0', 'നാമേ:', 'NS:' ),
-	'localurl'                => array( '0', 'ലോക്കൽയുആർഎൽ:', 'LOCALURL:' ),
-	'localurle'               => array( '0', 'ലോക്കൽയുആർഎൽഇ:', 'LOCALURLE:' ),
-	'articlepath'             => array( '0', 'ലേഖനപഥം', 'ARTICLEPATH' ),
-	'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__' ),
-	'currentweek'             => array( '1', 'ആഴ്ച', 'ആഴ്‌ച', 'CURRENTWEEK' ),
-	'currentdow'              => array( '1', 'ദിവസത്തിന്റെപേര്‌അക്കത്തിൽ', 'CURRENTDOW' ),
-	'localweek'               => array( '1', 'പ്രാദേശികആഴ്ച', 'പ്രാദേശികആഴ്‌ച', 'LOCALWEEK' ),
-	'localdow'                => array( '1', 'ആഴ്ചയുടെപേര്‌അക്കത്തിൽ', 'ആഴ്‌ചയുടെപേര്‌അക്കത്തിൽ', 'LOCALDOW' ),
-	'revisionid'              => array( '1', 'തിരുത്തൽഅടയാളം', 'REVISIONID' ),
-	'revisionday'             => array( '1', 'തിരുത്തിയദിവസം', 'തിരുത്തിയദിനം', 'REVISIONDAY' ),
-	'revisionday2'            => array( '1', 'തിരുത്തിയദിവസം2', 'തിരുത്തിയദിനം2', 'REVISIONDAY2' ),
-	'revisionmonth'           => array( '1', 'തിരുത്തിയമാസം', 'REVISIONMONTH' ),
-	'revisionmonth1'          => array( '1', 'തിരുത്തിയമാസം1', 'REVISIONMONTH1' ),
-	'revisionyear'            => array( '1', 'തിരുത്തിയവർഷം', 'REVISIONYEAR' ),
-	'revisiontimestamp'       => array( '1', 'തിരുത്തിയസമയമുദ്ര', 'REVISIONTIMESTAMP' ),
-	'revisionuser'            => array( '1', 'അവസാനംതിരുത്തിയയാൾ', 'REVISIONUSER' ),
-	'plural'                  => array( '0', 'ബഹുവചനം:', 'PLURAL:' ),
-	'fullurl'                 => array( '0', 'പൂർണ്ണവിലാസം:', 'FULLURL:' ),
-	'raw'                     => array( '0', 'അസംസ്കൃതം:', 'RAW:' ),
-	'displaytitle'            => array( '1', 'ശീർഷകംപ്രദർശിപ്പിക്കുക', 'തലക്കെട്ട്പ്രദർശിപ്പിക്കുക', 'DISPLAYTITLE' ),
-	'rawsuffix'               => array( '1', 'à´µ', 'R' ),
-	'newsectionlink'          => array( '1', '__പുതിയവിഭാഗംകണ്ണി__', '__പുതിയഖണ്ഡിക്കണ്ണി__', '__NEWSECTIONLINK__' ),
-	'nonewsectionlink'        => array( '1', '__പുതിയവിഭാഗംകണ്ണിവേണ്ട__', '__പുതിയഖണ്ഡിക്കണ്ണിവേണ്ട__', '__NONEWSECTIONLINK__' ),
-	'currentversion'          => array( '1', 'ഈപതിപ്പ്', 'CURRENTVERSION' ),
-	'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' ),
-	'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__' ),
-	'staticredirect'          => array( '1', '_സ്ഥിരസ്ഥിതതിരിച്ചുവിടൽ_', '__STATICREDIRECT__' ),
-	'protectionlevel'         => array( '1', 'സംരക്ഷണതലം', 'PROTECTIONLEVEL' ),
-	'formatdate'              => array( '0', 'ദിനരേഖീകരണരീതി', 'ദിവസരേഖീകരണരീതി', 'formatdate', 'dateformat' ),
-	'url_path'                => array( '0', 'പഥം', 'PATH' ),
-	'url_wiki'                => array( '0', 'വിക്കി', 'WIKI' ),
-	'url_query'               => array( '0', 'ക്വറി', 'QUERY' ),
-	'defaultsort_noerror'     => array( '0', 'പിഴവില്ല', 'noerror' ),
-	'defaultsort_noreplace'   => array( '0', 'മാറ്റേണ്ടതില്ല', 'noreplace' ),
+	'redirect'                  => array( '0', '#തിരിച്ചുവിടുക', '#തിരിച്ചുവിടൽ', '#REDIRECT' ),
+	'notoc'                     => array( '0', '__ഉള്ളടക്കംവേണ്ട__', '__NOTOC__' ),
+	'nogallery'                 => array( '0', '__ചിത്രസഞ്ചയംവേണ്ട__', '__NOGALLERY__' ),
+	'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' ),
+	'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' ),
+	'localmonth'                => array( '1', 'പ്രാദേശികമാസം', 'പ്രാദേശികമാസം2', 'LOCALMONTH', 'LOCALMONTH2' ),
+	'localmonth1'               => array( '1', 'പ്രാദേശികമാസം1', 'LOCALMONTH1' ),
+	'localmonthname'            => array( '1', 'പ്രാദേശികമാസത്തിന്റെപേര്‌', 'LOCALMONTHNAME' ),
+	'localmonthnamegen'         => array( '1', 'പ്രാദേശികമാസത്തിന്റെപേരുസൃഷ്ടിക്കുക', 'LOCALMONTHNAMEGEN' ),
+	'localmonthabbrev'          => array( '1', 'പ്രാദേശികമാസത്തിന്റെപേര്‌സംഗ്രഹം', 'പ്രാദേശികമാസത്തിന്റെപേര്‌ചുരുക്കം', 'LOCALMONTHABBREV' ),
+	'localday'                  => array( '1', 'പ്രാദേശികദിവസം', 'LOCALDAY' ),
+	'localday2'                 => array( '1', 'പ്രാദേശികദിവസം2', 'LOCALDAY2' ),
+	'localdayname'              => array( '1', 'പ്രാദേശികദിവസത്തിന്റെപേര്‌', 'LOCALDAYNAME' ),
+	'localyear'                 => array( '1', 'പ്രാദേശികവർഷം', 'LOCALYEAR' ),
+	'localtime'                 => array( '1', 'പ്രാദേശികസമയം', 'LOCALTIME' ),
+	'localhour'                 => array( '1', 'പ്രാദേശികമണിക്കൂർ', 'LOCALHOUR' ),
+	'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' ),
+	'namespacenumber'           => array( '1', 'നാമമേഖലാസംഖ്യ', 'NAMESPACENUMBER' ),
+	'talkspace'                 => array( '1', 'സംവാദമേഖല', 'TALKSPACE' ),
+	'talkspacee'                => array( '1', 'സംവാദമേഖലസമഗ്രം', 'TALKSPACEE' ),
+	'subjectspace'              => array( '1', 'വിഷയമേഖല', 'ലേഖനമേഖല', 'SUBJECTSPACE', 'ARTICLESPACE' ),
+	'subjectspacee'             => array( '1', 'വിഷയമേഖലസമഗ്രം', 'ലേഖനമേഖലസമഗ്രം', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
+	'fullpagename'              => array( '1', 'താളിന്റെമുഴുവൻപേര്‌', 'FULLPAGENAME' ),
+	'fullpagenamee'             => array( '1', 'താളിന്റെമുഴുവൻപേര്സമഗ്രം', 'FULLPAGENAMEE' ),
+	'subpagename'               => array( '1', 'അനുബന്ധതാളിന്റെപേര്‌', 'SUBPAGENAME' ),
+	'subpagenamee'              => array( '1', 'അനുബന്ധതാളിന്റെപേര്സമഗ്രം', 'SUBPAGENAMEE' ),
+	'basepagename'              => array( '1', 'അടിസ്ഥാനതാളിന്റെപേര്‌', 'BASEPAGENAME' ),
+	'basepagenamee'             => array( '1', 'അടിസ്ഥാനതാളിന്റെപേര്‌സമഗ്രം', 'BASEPAGENAMEE' ),
+	'talkpagename'              => array( '1', 'സംവാദതാളിന്റെപേര്‌', 'TALKPAGENAME' ),
+	'talkpagenamee'             => array( '1', 'സംവാദതാളിന്റെപേര്‌സമഗ്രം', 'TALKPAGENAMEE' ),
+	'subjectpagename'           => array( '1', 'ലേഖനതാളിന്റെപേര്‌', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
+	'subjectpagenamee'          => array( '1', 'ലേഖനതാളിന്റെപേര്‌സമഗ്രം', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
+	'msg'                       => array( '0', 'സന്ദേശം:', 'MSG:' ),
+	'subst'                     => array( '0', 'ബദൽ:', 'ഉൾപ്പെടുത്തൽ:', 'SUBST:' ),
+	'safesubst'                 => array( '0', 'സംരക്ഷിതബദൽ:', 'സംരക്ഷിതയുൾപ്പെടുത്തൽ:', 'SAFESUBST:' ),
+	'msgnw'                     => array( '0', 'മൂലരൂപം:', 'MSGNW:' ),
+	'img_thumbnail'             => array( '1', 'ലഘുചിത്രം', 'ലഘു', 'thumbnail', 'thumb' ),
+	'img_manualthumb'           => array( '1', 'ലഘുചിത്രം=$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ബിന്ദു', '$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_upright'               => array( '1', 'നേരേകുത്തനെ', 'നേരേകുത്തനെ=$1', 'നേരേകുത്തനെ_$1', 'upright', 'upright=$1', 'upright $1' ),
+	'img_border'                => array( '1', 'അതിർവര', 'border' ),
+	'img_baseline'              => array( '1', 'താഴെയുള്ളവര', 'baseline' ),
+	'img_sub'                   => array( '1', 'കീഴെയെഴുത്ത്', 'sub' ),
+	'img_super'                 => array( '1', 'മേലേയെഴുത്ത്', 'super', 'sup' ),
+	'img_top'                   => array( '1', 'മേലെ', 'top' ),
+	'img_text_top'              => array( '1', 'എഴുത്ത്-മേലെ', 'text-top' ),
+	'img_middle'                => array( '1', 'മദ്ധ്യം', 'middle' ),
+	'img_bottom'                => array( '1', 'താഴെ', 'bottom' ),
+	'img_text_bottom'           => array( '1', 'എഴുത്ത്-താഴെ', 'text-bottom' ),
+	'img_link'                  => array( '1', 'കണ്ണി=$1', 'link=$1' ),
+	'img_alt'                   => array( '1', 'പകരം=$1', 'alt=$1' ),
+	'sitename'                  => array( '1', 'സൈറ്റിന്റെപേര്', 'SITENAME' ),
+	'ns'                        => array( '0', 'നാമേ:', 'NS:' ),
+	'localurl'                  => array( '0', 'ലോക്കൽയുആർഎൽ:', 'LOCALURL:' ),
+	'localurle'                 => array( '0', 'ലോക്കൽയുആർഎൽഇ:', 'LOCALURLE:' ),
+	'articlepath'               => array( '0', 'ലേഖനപഥം', 'ARTICLEPATH' ),
+	'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__' ),
+	'currentweek'               => array( '1', 'ആഴ്ച', 'ആഴ്‌ച', 'CURRENTWEEK' ),
+	'currentdow'                => array( '1', 'ദിവസത്തിന്റെപേര്‌അക്കത്തിൽ', 'CURRENTDOW' ),
+	'localweek'                 => array( '1', 'പ്രാദേശികആഴ്ച', 'പ്രാദേശികആഴ്‌ച', 'LOCALWEEK' ),
+	'localdow'                  => array( '1', 'ആഴ്ചയുടെപേര്‌അക്കത്തിൽ', 'ആഴ്‌ചയുടെപേര്‌അക്കത്തിൽ', 'LOCALDOW' ),
+	'revisionid'                => array( '1', 'തിരുത്തൽഅടയാളം', 'REVISIONID' ),
+	'revisionday'               => array( '1', 'തിരുത്തിയദിവസം', 'തിരുത്തിയദിനം', 'REVISIONDAY' ),
+	'revisionday2'              => array( '1', 'തിരുത്തിയദിവസം2', 'തിരുത്തിയദിനം2', 'REVISIONDAY2' ),
+	'revisionmonth'             => array( '1', 'തിരുത്തിയമാസം', 'REVISIONMONTH' ),
+	'revisionmonth1'            => array( '1', 'തിരുത്തിയമാസം1', 'REVISIONMONTH1' ),
+	'revisionyear'              => array( '1', 'തിരുത്തിയവർഷം', 'REVISIONYEAR' ),
+	'revisiontimestamp'         => array( '1', 'തിരുത്തിയസമയമുദ്ര', 'REVISIONTIMESTAMP' ),
+	'revisionuser'              => array( '1', 'അവസാനംതിരുത്തിയയാൾ', 'REVISIONUSER' ),
+	'plural'                    => array( '0', 'ബഹുവചനം:', 'PLURAL:' ),
+	'fullurl'                   => array( '0', 'പൂർണ്ണവിലാസം:', 'FULLURL:' ),
+	'raw'                       => array( '0', 'അസംസ്കൃതം:', 'RAW:' ),
+	'displaytitle'              => array( '1', 'ശീർഷകംപ്രദർശിപ്പിക്കുക', 'തലക്കെട്ട്പ്രദർശിപ്പിക്കുക', 'DISPLAYTITLE' ),
+	'rawsuffix'                 => array( '1', 'à´µ', 'R' ),
+	'newsectionlink'            => array( '1', '__പുതിയവിഭാഗംകണ്ണി__', '__പുതിയഖണ്ഡിക്കണ്ണി__', '__NEWSECTIONLINK__' ),
+	'nonewsectionlink'          => array( '1', '__പുതിയവിഭാഗംകണ്ണിവേണ്ട__', '__പുതിയഖണ്ഡിക്കണ്ണിവേണ്ട__', '__NONEWSECTIONLINK__' ),
+	'currentversion'            => array( '1', 'ഈപതിപ്പ്', 'CURRENTVERSION' ),
+	'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' ),
+	'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__' ),
+	'staticredirect'            => array( '1', '_സ്ഥിരസ്ഥിതതിരിച്ചുവിടൽ_', '__STATICREDIRECT__' ),
+	'protectionlevel'           => array( '1', 'സംരക്ഷണതലം', 'PROTECTIONLEVEL' ),
+	'formatdate'                => array( '0', 'ദിനരേഖീകരണരീതി', 'ദിവസരേഖീകരണരീതി', 'formatdate', 'dateformat' ),
+	'url_path'                  => array( '0', 'പഥം', 'PATH' ),
+	'url_wiki'                  => array( '0', 'വിക്കി', 'WIKI' ),
+	'url_query'                 => array( '0', 'ക്വറി', 'QUERY' ),
+	'defaultsort_noerror'       => array( '0', 'പിഴവില്ല', 'noerror' ),
+	'defaultsort_noreplace'     => array( '0', 'മാറ്റേണ്ടതില്ല', 'noreplace' ),
 );
 
 $digitGroupingPattern = "##,##,###";
@@ -962,8 +963,8 @@ $1 ആണ് ഈ തടയൽ നടത്തിയത്. ''$2'' എന്ന
 'newarticle' => '(പുതിയത്)',
 'newarticletext' => 'ഇതുവരെ നിലവിലില്ലാത്ത ഒരു താൾ സൃഷ്ടിക്കാനുള്ള ശ്രമത്തിലാണ് താങ്കൾ. അതിനായി താഴെ ആവശ്യമുള്ള വിവരങ്ങൾ എഴുതിച്ചേർത്ത് സേവ് ചെയ്യുക (കൂടുതൽ വിവരങ്ങൾക്ക് [[{{MediaWiki:Helppage}}|സഹായം താൾ]] കാണുക). താങ്കളിവിടെ അബദ്ധത്തിൽ വന്നതാണെങ്കിൽ ബ്രൗസറിന്റെ ബാക്ക് ബട്ടൺ ഞെക്കിയാൽ തിരിച്ചുപോകാം.',
 'anontalkpagetext' => "----
-{| class=\"messagebox standard-talk\" style=\"border: 1px solid #B3B300; background-color:#FFFFBF;\"
-|align=\"left\" |
+{| class=\"messagebox standard-talk\" style=\"border: 1px solid #B3B300; background-color:#FFFFBF; text-align: left;\"
+|
 ''ഇതുവരെ അംഗത്വം എടുക്കാതിരിക്കുകയോ, നിലവിലുള്ള അംഗത്വം ഉപയോഗിക്കാതിരിക്കുകയോ ചെയ്യുന്ന '''ഒരു അജ്ഞാത ഉപയോക്താവിന്റെ സം‌വാദം താളാണിത്'''.
 അതിനാൽ അദ്ദേഹത്തെ തിരിച്ചറിയുവാൻ അക്കരൂപത്തിലുള്ള ഐ.പി. വിലാസം ഉപയോഗിക്കേണ്ടതുണ്ട്. ഇത്തരം ഒരു ഐ.പി. വിലാസം പല ഉപയോക്താക്കൾ പങ്കുവെക്കുന്നുണ്ടാവാം.
 താങ്കൾ ഈ സന്ദേശം ലഭിച്ച ഒരു അജ്ഞാത ഉപയോക്താവാണെങ്കിൽ, ഭാവിയിൽ ഇതര ഉപയോക്താക്കളുമായി ഉണ്ടായേക്കാവുന്ന ആശയക്കുഴപ്പം ഒഴിവാക്കാൻ ദയവായി [[Special:UserLogin/signup|ഒരു അംഗത്വമെടുക്കുക]] അല്ലെങ്കിൽ  [[Special:UserLogin|പ്രവേശിക്കുക]].
@@ -984,9 +985,8 @@ $1 ആണ് ഈ തടയൽ നടത്തിയത്. ''$2'' എന്ന
 'clearyourcache' => "'''ശ്രദ്ധിക്കുക:''' സേവ് ചെയ്തശേഷം മാറ്റങ്ങൾ കാണാനായി താങ്കൾക്ക് ബ്രൗസറിന്റെ കാഷെ ഒഴിവാക്കേണ്ടി വന്നേക്കാം.
 * '''ഫയർഫോക്സ് / സഫാരി:'''  ''Reload'' ബട്ടൺ അമർത്തുമ്പോൾ ''Shift'' കീ അമർത്തി പിടിക്കുകയോ, ''Ctrl-F5'' അല്ലെങ്കിൽ  ''Ctrl-R''  (മാക്കിന്റോഷിൽ ''⌘-R'' ) എന്ന് ഒരുമിച്ച് അമർത്തുകയോ ചെയ്യുക
 * '''ഗൂഗിൾ ക്രോം:'''  ''Ctrl-Shift-R'' (മാക്കിന്റോഷിൽ ''⌘-Shift-R'' ) അമർത്തുക
-* '''ഇന്റർനെറ്റ് എക്സ്പ്ലോറർ:''' ''Refresh'' ബട്ടൺ അമർത്തുമ്പോൾ ''Ctrl'' കീ അമർത്തിപിടിക്കുക. അല്ലെങ്കിൽ ''Ctrl-F5'' അമർത്തുക;
-* '''ഓപ്പറ:'''  ''Tools→Preferences'' ഉപയോഗിച്ച് കാഷെ പൂർണ്ണമായും ക്ലിയർ ചെയ്യുക;
-* '''കോൺക്വറർ:''' ''Reload'' ബട്ടൺ അമർത്തുകയോ ''F5'' കീ അമർത്തുകയോ ചെയ്യുക.",
+* '''ഇന്റർനെറ്റ് എക്സ്പ്ലോറർ:''' ''Refresh'' ബട്ടൺ അമർത്തുമ്പോൾ ''Ctrl'' കീ അമർത്തിപിടിക്കുക. അല്ലെങ്കിൽ ''Ctrl-F5'' അമർത്തുക
+* '''ഓപ്പറ:'''  ''Tools→Preferences'' ഉപയോഗിച്ച് കാഷെ പൂർണ്ണമായും ക്ലിയർ ചെയ്യുക",
 'usercssyoucanpreview' => "'''വഴികാട്ടി:''' താങ്കളുടെ പുതിയ CSS സേവ് ചെയ്യുന്നതിനു മുമ്പ് \"{{int:showpreview}}\" എന്ന ബട്ടൻ ഉപയോഗിച്ച് പരിശോധിക്കുക.",
 'userjsyoucanpreview' => "'''വഴികാട്ടി:''' താങ്കളുടെ പുതിയ ജാവാസ്ക്രിപ്റ്റ് സേവ് ചെയ്യുന്നതിനു മുമ്പ് \"{{int:showpreview}}\" എന്ന ബട്ടൻ ഉപയോഗിച്ച് പരിശോധിക്കുക.",
 'usercsspreview' => "'''താങ്കൾ താങ്കളുടെ സ്വന്തം സി.എസ്.എസ്. പ്രിവ്യൂ ചെയ്യുക മാത്രമേ ചെയ്യുന്നുള്ളൂ എന്ന കാര്യം ഓർമ്മിക്കുക.'''
@@ -1975,6 +1975,7 @@ https://www.mediawiki.org/wiki/Manual:Image_Authorization കാണുക.',
 'shared-repo' => 'ഒരു പങ്കുവെക്കപ്പെട്ട സംഭരണി',
 'shared-repo-name-wikimediacommons' => 'വിക്കിമീഡിയ കോമൺസ്',
 'filepage.css' => '/* ഇവിടെ നൽകുന്ന സി.എസ്.എസ്. പ്രമാണ വിവരണ താളുകളിൽ ഉൾപ്പെടുത്തപ്പെടുന്നതായിരിക്കും, ബാഹ്യ ക്ലൈന്റ് വിക്കികളിലും അത് ലഭ്യമായിരിക്കും */',
+'upload-disallowed-here' => 'നിർഭാഗ്യവശാൽ ഈ ചിത്രത്തിനു മുകളിൽ മറ്റൊരു ചിത്രം ചേർക്കാൻ താങ്കൾക്ക് കഴിയില്ല.',
 
 # File reversion
 'filerevert' => '$1 തിരസ്ക്കരിക്കുക',
@@ -2082,6 +2083,7 @@ https://www.mediawiki.org/wiki/Manual:Image_Authorization കാണുക.',
 # Miscellaneous special pages
 'nbytes' => '{{PLURAL:$1|ഒരു ബൈറ്റ്|$1 ബൈറ്റുകൾ}}',
 'ncategories' => '{{PLURAL:$1|ഒരു വർഗ്ഗം|$1 വർഗ്ഗങ്ങൾ}}',
+'ninterwikis' => '{{PLURAL:$1|ഒരു അന്തർവിക്കി|$1 അന്തർവിക്കികൾ}}',
 'nlinks' => '{{PLURAL:$1|ഒരു കണ്ണി|$1 കണ്ണികൾ}}',
 'nmembers' => '{{PLURAL:$1|ഒരു അംഗം|$1 അംഗങ്ങൾ}}',
 'nrevisions' => '{{PLURAL:$1|ഒരു പതിപ്പ്|$1 പതിപ്പുകൾ}}',
@@ -2110,6 +2112,7 @@ https://www.mediawiki.org/wiki/Manual:Image_Authorization കാണുക.',
 'mostlinkedtemplates' => 'ഏറ്റവുമധികം കണ്ണി ചേർത്തിരിക്കുന്ന ഫലകങ്ങൾ',
 'mostcategories' => 'ഏറ്റവുമധികം വർഗ്ഗങ്ങൾ ഉൾപ്പെടുത്തിയിരിക്കുന്ന താളുകൾ',
 'mostimages' => 'ഏറ്റവുമധികം കണ്ണി ചേർത്തിരിക്കുന്ന പ്രമാണങ്ങൾ',
+'mostinterwikis' => 'ഏറ്റവുമധികം അന്തർവിക്കികളുള്ള താളുകൾ',
 'mostrevisions' => 'ഏറ്റവുമധികം തിരുത്തപ്പെട്ട താളുകൾ',
 'prefixindex' => 'പൂർവ്വപദത്തോടു കൂടിയ എല്ലാ താളുകളും',
 'prefixindex-namespace' => 'പൂർവ്വപദമുള്ള എല്ലാ താളുകളും (നാമമേഖല $1)',
@@ -2256,6 +2259,8 @@ https://www.mediawiki.org/wiki/Manual:Image_Authorization കാണുക.',
 'mailnologin' => 'അയയ്ക്കാനുള്ള വിലാസം ലഭ്യമല്ല',
 'mailnologintext' => 'മറ്റ് ഉപയോക്താക്കൾക്കു ഇമെയിലയക്കുവാൻ താങ്കൾ [[Special:UserLogin|ലോഗിൻ]] ചെയ്തിരിക്കുകയും, സാധുവായ ഒരു ഇമെയിൽ വിലാസം താങ്കളുടെ [[Special:Preferences|ക്രമീകരണങ്ങൾ]] താളിൽ സജ്ജീകരിച്ചിരിക്കുകയും വേണം.',
 'emailuser' => 'ഈ ഉപയോക്താവിനു ഇമെയിൽ അയക്കുക',
+'emailuser-title-target' => 'ഈ {{GENDER:$1|ഉപയോക്താവിന്}} ഇമെയിൽ അയയ്ക്കുക',
+'emailuser-title-notarget' => 'ഉപയോക്താവിന് ഇമെയിൽ അയക്കുക',
 'emailpage' => 'ഉപയോക്താവിന് ഇമെയിൽ അയക്കുക',
 'emailpagetext' => 'താഴെ കാണുന്ന ഫോം മറ്റൊരു ഉപയോക്താവിന്‌ ഇമെയിൽ അയക്കാൻ ഉപയോഗിക്കാവുന്നതാണ്.
 [[Special:Preferences|ഉപയോക്താവിന്റെ ക്രമീകരണങ്ങളിൽ]] കൊടുത്തിട്ടുള്ള ഇമെയിൽ വിലാസം "ദാതാവ്" ആയി വരുന്നതാണ്‌, അതുകൊണ്ട് സ്വീകർത്താവിന്‌ താങ്കൾക്ക് നേരിട്ട് മറുപടി അയക്കാൻ കഴിയും.',
@@ -2395,8 +2400,8 @@ $UNWATCHURL
 'rollback' => 'തിരുത്തലുകൾ റോൾബാക്ക് ചെയ്യുക',
 'rollback_short' => 'റോൾബാക്ക്',
 'rollbacklink' => 'റോൾബാക്ക്',
-'rollbacklinkcount' => '{{PLURAL:$1|ഒരു തിരുത്തൽ|$1 തിരുത്തലുകൾ}} മുൻപ്രാപനം ചെയ്യുക',
-'rollbacklinkcount-morethan' => '{{PLURAL:$1|ഒന്നിലധികം തിരുത്തൽ|$1 എണ്ണത്തിലധികം തിരുത്തലുകൾ}} മുൻപ്രാപനം ചെയ്യുക',
+'rollbacklinkcount' => '{{PLURAL:$1|ഒരു തിരുത്ത്|$1 തിരുത്തുകൾ}} മുൻപ്രാപനം ചെയ്യുക',
+'rollbacklinkcount-morethan' => '{{PLURAL:$1|ഒന്നിലധികം തിരുത്തുകൾ|$1 എണ്ണത്തിലധികം തിരുത്തുകൾ}} മുൻപ്രാപനം ചെയ്യുക',
 'rollbackfailed' => 'റോൾബാക്ക് പരാജയപ്പെട്ടു',
 'cantrollback' => 'തിരുത്തൽ തിരസ്കരിക്കുവാൻ സാധിക്കുകയില്ല. ഒരു ഉപയോക്താവ് മാത്രമാണ് ഈ താളിൽ സം‌ഭാവന ചെയ്തിരിക്കുന്നത്.',
 'alreadyrolled' => '[[:$1]] എന്ന താളിൽ [[User:$2|$2]] ([[User talk:$2|സംവാദം]]{{int:pipe-separator}}[[Special:Contributions/$2|{{int:contribslink}}]]) നടത്തിയ തിരുത്തലുകൾ മുൻപ്രാപനം ചെയ്യാൻ സാധിക്കുന്നതല്ല. മറ്റാരോ താൾ തിരുത്തുകയോ മുൻപ്രാപനം ചെയ്യുകയോ ചെയ്തിരിക്കുന്നു.
@@ -2892,6 +2897,7 @@ $1',
 'import-interwiki-templates' => 'എല്ലാ ഫലകങ്ങളും ഉൾപ്പെടുത്തുക',
 'import-interwiki-submit' => 'ഇറക്കുമതി',
 'import-interwiki-namespace' => 'ഉദ്ദിഷ്ട നാമമേഖല:',
+'import-interwiki-rootpage' => 'ലക്ഷ്യമിട്ട മൂലതാൾ (ഐച്ഛികം):',
 'import-upload-filename' => 'പ്രമാണത്തിന്റെ പേര്‌',
 'import-comment' => 'കുറിപ്പ്:',
 'importtext' => 'ദയവായി സ്രോതസ്സ് വിക്കിയിൽ നിന്ന് [[Special:Export|കയറ്റുമതി ഉപകരണം]] ഉപയോഗിച്ച് പ്രമാണം കയറ്റുമതി ചെയ്യുക.
@@ -2927,6 +2933,9 @@ $1',
 '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' => 'ഇറക്കുമതി പ്രവർത്തനരേഖ',
@@ -3068,11 +3077,34 @@ $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-default-sort' => 'സ്വതേയുള്ള ക്രമപ്പെടുത്തൽ ചാവി',
+'pageinfo-length' => 'താളിന്റെ നീളം (ബൈറ്റിൽ)',
+'pageinfo-article-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 ({{PLURAL:$2|ഒരു തിരിച്ചുവിടൽ|$2 തിരിച്ചുവിടലുകൾ}}; {{PLURAL:$3|തിരിച്ചുവിടലല്ലാത്ത ഒരെണ്ണം|തിരിച്ചുവിടലല്ലാത്ത $3}})',
+'pageinfo-firstuser' => 'താളിന്റെ നിർമ്മാതാവ്',
+'pageinfo-firsttime' => 'താൾ നിർമ്മിച്ച ദിവസം',
+'pageinfo-lastuser' => 'ഏറ്റവും പുതിയ രചയിതാവ്',
+'pageinfo-lasttime' => 'അവസാനത്തെ തിരുത്തുനടന്ന ദിവസം',
+'pageinfo-edits' => 'മൊത്തം തിരുത്തുകളുടെ എണ്ണം',
+'pageinfo-authors' => 'ആകെ വ്യത്യസ്തരചയിതാക്കളുടെ എണ്ണം',
+'pageinfo-recent-edits' => 'സമീപകാലത്തെ തിരുത്തുകൾ (കഴിഞ്ഞ $1 കാലയളവിനുള്ളിൽ)',
+'pageinfo-recent-authors' => 'സമീപകാലത്തെ വ്യത്യസ്തരചയിതാക്കളുടെ എണ്ണം',
+'pageinfo-restriction' => 'താൾ സംരക്ഷണം (<code>$1</code>)',
+'pageinfo-magic-words' => 'മാന്ത്രിക{{PLURAL:$1|വാക്ക്|വാക്കുകൾ}} ($1)',
+'pageinfo-hidden-categories' => 'മറഞ്ഞിരിക്കുന്ന {{PLURAL:$1|വർഗ്ഗം|വർഗ്ഗങ്ങൾ}} ($1)',
+'pageinfo-templates' => 'ഉൾപ്പെടുത്തിയിട്ടുള്ള {{PLURAL:$1|ഫലകം|ഫലകങ്ങൾ}} ($1)',
 
 # Skin names
 'skinname-standard' => 'സാർവത്രികം',
@@ -3125,7 +3157,8 @@ $1',
 'file-info-size' => '$1 × $2 പിക്സൽ, പ്രമാണത്തിന്റെ വലിപ്പം: $3, മൈം തരം: $4',
 'file-info-size-pages' => '$1 × $2 പിക്സൽ, പ്രമാണത്തിന്റെ വലിപ്പം: $3, മൈം തരം: $4, {{PLURAL:$5|ഒരു താൾ|$5 താളുകൾ}}',
 'file-nohires' => 'കൂടുതൽ വ്യക്തതയുള്ള ചിത്രം ലഭ്യമല്ല.',
-'svg-long-desc' => 'SVG പ്രമാണം, നാമമാത്രമായ $1 × $2 പിക്സലുകൾ, പ്രമാണത്തിന്റെ വലിപ്പം: $3',
+'svg-long-desc' => 'എസ്.വി.ജി. പ്രമാണം, നാമമാത്രമായ $1 × $2 പിക്സലുകൾ, പ്രമാണത്തിന്റെ വലിപ്പം: $3',
+'svg-long-desc-animated' => 'ചലിക്കുന്ന എസ്.വി.ജി. പ്രമാണം, നാമമാത്രമായ $1 × $2 പിക്സലുകൾ, പ്രമാണത്തിന്റെ വലിപ്പം: $3',
 'show-big-image' => 'പൂർണ്ണ റെസലൂഷൻ',
 'show-big-image-preview' => 'ഈ പ്രിവ്യൂവിന്റെ വലിപ്പം: $1.',
 'show-big-image-other' => 'മറ്റ് {{PLURAL:$2|റെസലൂഷൻ|റെസലൂഷനുകൾ}}: $1.',
@@ -3135,6 +3168,8 @@ $1',
 'file-info-png-looped' => 'പുനരാവർത്തിതം',
 'file-info-png-repeat' => '{{PLURAL:$1|ഒരു തവണ|$1 തവണ}} പ്രവർത്തിപ്പിച്ചു',
 'file-info-png-frames' => '{{PLURAL:$1|ഒരു ഫ്രെയിം|$1 ഫ്രെയിം}}',
+'file-no-thumb-animation' => "'''ശ്രദ്ധിക്കുക: സാങ്കേതികപരിമിതികൾ മൂലം, ഈ പ്രമാണത്തിന്റെ ലഘുചിത്രങ്ങൾ ചലനാത്മകമല്ല.'''",
+'file-no-thumb-animation-gif' => "'''കുറിപ്പ്: സാങ്കേതികമായ പരിമിതികളാൽ, ഇങ്ങനെയുള്ള ഉയർന്ന റെസലൂഷൻ ജി.ഐ.എഫ്. ചിത്രങ്ങളുടെ ലഘുചിത്രങ്ങൾ ചലിക്കുന്നതായിരിക്കുകയില്ല.'''",
 
 # Special:NewFiles
 'newimages' => 'പുതിയ പ്രമാണങ്ങളുടെ ചിത്രശാല',
diff --git a/languages/messages/MessagesMr.php b/languages/messages/MessagesMr.php
index 57c83148e0..f0ade8ffd4 100644
--- a/languages/messages/MessagesMr.php
+++ b/languages/messages/MessagesMr.php
@@ -163,143 +163,143 @@ $specialPageAliases = 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__' ),
-	'noheader'                => array( '0', '__शीर्षकनाही__', '__NOHEADER__' ),
-	'currentmonth'            => array( '1', 'सद्यमहिना', 'सद्यमहिना२', 'CURRENTMONTH', 'CURRENTMONTH2' ),
-	'currentmonth1'           => array( '1', 'सद्यमहिना१', 'CURRENTMONTH1' ),
-	'currentmonthname'        => array( '1', 'सद्यमहिनानाव', 'CURRENTMONTHNAME' ),
-	'currentmonthnamegen'     => array( '1', 'सद्यमहिनासाधारण', 'CURRENTMONTHNAMEGEN' ),
-	'currentmonthabbrev'      => array( '1', 'सद्यमहिनासंक्षीप्त', 'CURRENTMONTHABBREV' ),
-	'currentday'              => array( '1', 'सद्यदिवस', 'CURRENTDAY' ),
-	'currentday2'             => array( '1', 'सद्यदिवस२', 'CURRENTDAY2' ),
-	'currentdayname'          => array( '1', 'सद्यदिवसनाव', 'CURRENTDAYNAME' ),
-	'currentyear'             => array( '1', 'सद्यवर्ष', 'CURRENTYEAR' ),
-	'currenttime'             => array( '1', 'सद्यवेळ', 'CURRENTTIME' ),
-	'currenthour'             => array( '1', 'सद्यतास', 'CURRENTHOUR' ),
-	'localmonth'              => array( '1', 'स्थानिकमहिना', 'स्थानिकमहिना२', 'LOCALMONTH', 'LOCALMONTH2' ),
-	'localmonth1'             => array( '1', 'स्थानिकमहिना१', 'LOCALMONTH1' ),
-	'localmonthname'          => array( '1', 'स्थानिकमहिनानाव', 'LOCALMONTHNAME' ),
-	'localmonthnamegen'       => array( '1', 'स्थानिकमहिनासाधारण', 'LOCALMONTHNAMEGEN' ),
-	'localmonthabbrev'        => array( '1', 'स्थानिकमहिनासंक्षीप्त', 'LOCALMONTHABBREV' ),
-	'localday'                => array( '1', 'स्थानिकदिवस', 'LOCALDAY' ),
-	'localday2'               => array( '1', 'स्थानिकदिवस२', 'LOCALDAY2' ),
-	'localdayname'            => array( '1', 'स्थानिकदिवसनाव', 'LOCALDAYNAME' ),
-	'localyear'               => array( '1', 'स्थानिकवर्ष', 'LOCALYEAR' ),
-	'localtime'               => array( '1', 'स्थानिकवेळ', 'LOCALTIME' ),
-	'localhour'               => array( '1', 'स्थानिकतास', 'LOCALHOUR' ),
-	'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' ),
-	'talkspace'               => array( '1', 'चर्चाविश्व', 'TALKSPACE' ),
-	'talkspacee'              => array( '1', 'चर्चाविश्वा', 'चर्चाविश्वाचे', 'TALKSPACEE' ),
-	'subjectspace'            => array( '1', 'विषयविश्व', 'लेखविश्व', 'SUBJECTSPACE', 'ARTICLESPACE' ),
-	'subjectspacee'           => array( '1', 'विषयविश्वा', 'लेखविश्वा', 'विषयविश्वाचे', 'लेखविश्वाचे', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
-	'fullpagename'            => array( '1', 'पूर्णलेखनाव', 'FULLPAGENAME' ),
-	'fullpagenamee'           => array( '1', 'पूर्णलेखनावे', 'अंशदुवा', 'FULLPAGENAMEE' ),
-	'subpagename'             => array( '1', 'उपपाननाव', 'SUBPAGENAME' ),
-	'subpagenamee'            => array( '1', 'उपपाननावे', 'उपपाननावाचे', 'उपौंशदुवा', 'SUBPAGENAMEE' ),
-	'basepagename'            => array( '1', 'मूळपाननाव', 'BASEPAGENAME' ),
-	'basepagenamee'           => array( '1', 'मूळपाननावे', 'BASEPAGENAMEE' ),
-	'talkpagename'            => array( '1', 'चर्चापाननाव', 'TALKPAGENAME' ),
-	'talkpagenamee'           => array( '1', 'चर्चापाननावे', 'TALKPAGENAMEE' ),
-	'subjectpagename'         => array( '1', 'विषयपाननाव', 'लेखपाननाव', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
-	'subjectpagenamee'        => array( '1', 'विषयपाननावे', 'लेखपाननावे', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
-	'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कणी', '$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_upright'             => array( '1', 'उभा', 'उभा=$1', 'उभा $1', 'upright', 'upright=$1', 'upright $1' ),
-	'img_border'              => array( '1', 'सीमा', 'border' ),
-	'img_baseline'            => array( '1', 'तळरेषा', 'आधाररेषा', 'baseline' ),
-	'img_sub'                 => array( '1', 'अधो', 'sub' ),
-	'img_super'               => array( '1', 'उर्ध्व', 'super', 'sup' ),
-	'img_top'                 => array( '1', 'अत्यूच्च', 'top' ),
-	'img_text_top'            => array( '1', 'मजकूर-शीर्ष', 'शीर्ष-मजकूर', 'text-top' ),
-	'img_middle'              => array( '1', 'मध्य', 'middle' ),
-	'img_bottom'              => array( '1', 'तळ', 'बूड', 'bottom' ),
-	'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:' ),
-	'sitename'                => array( '1', 'संकेतस्थळनाव', 'SITENAME' ),
-	'ns'                      => array( '0', 'नावि:', 'NS:' ),
-	'nse'                     => array( '0', 'नाविअरिक्त:', 'नाव्यारिक्त:', 'नाव्याख:', 'NSE:' ),
-	'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:' ),
-	'notitleconvert'          => array( '0', '__विनाशीर्षकबदल__', '__विनाशीब__', '__NOTITLECONVERT__', '__NOTC__' ),
-	'nocontentconvert'        => array( '0', '__विनामजकुरबदल__', '__विनामब__', '__NOCONTENTCONVERT__', '__NOCC__' ),
-	'currentweek'             => array( '1', 'सद्यआठवडा', 'CURRENTWEEK' ),
-	'currentdow'              => array( '1', 'सद्यउतरण', 'सद्यउतार', 'CURRENTDOW' ),
-	'localweek'               => array( '1', 'स्थानिकआठवडा', 'LOCALWEEK' ),
-	'localdow'                => array( '1', 'स्थानिकउतरण', 'स्थानिकउतार', 'LOCALDOW' ),
-	'revisionid'              => array( '1', 'आवृत्तीक्र्मांक', 'REVISIONID' ),
-	'revisionday'             => array( '1', 'आवृत्तीदिन', 'REVISIONDAY' ),
-	'revisionday2'            => array( '1', 'आवृत्तीदिन२', 'REVISIONDAY2' ),
-	'revisionmonth'           => array( '1', 'आवृत्तीमास', 'REVISIONMONTH' ),
-	'revisionyear'            => array( '1', 'आवृत्तीवर्ष', 'REVISIONYEAR' ),
-	'revisiontimestamp'       => array( '1', 'आवृत्तीमुद्रा', 'आवृत्तीठसा', 'REVISIONTIMESTAMP' ),
-	'revisionuser'            => array( '1', 'आवृत्तीसदस्य', 'REVISIONUSER' ),
-	'plural'                  => array( '0', 'बहुवचन:', 'PLURAL:' ),
-	'fullurl'                 => array( '0', 'संपूर्णसंस्थळ', 'FULLURL:' ),
-	'fullurle'                => array( '0', 'संपूर्णसंस्थली:', 'संपूर्णसंस्थळी:', 'FULLURLE:' ),
-	'raw'                     => array( '0', 'कच्चे:', 'RAW:' ),
-	'displaytitle'            => array( '1', 'शीर्षकदाखवा', 'DISPLAYTITLE' ),
-	'rawsuffix'               => array( '1', 'ॠ', 'R' ),
-	'newsectionlink'          => array( '1', '__नवविभागदुवा__', '__NEWSECTIONLINK__' ),
-	'nonewsectionlink'        => array( '1', '__विनानवविभागदुवा__', '__NONEWSECTIONLINK__' ),
-	'currentversion'          => array( '1', 'सद्यआवृत्ती', 'CURRENTVERSION' ),
-	'urlencode'               => array( '0', 'संकेतस्थलीआंग्ल्संकेत:', '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' ),
-	'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' ),
+	'redirect'                  => array( '0', '#पुनर्निर्देशन', '#पुर्ननिर्देशन', '#REDIRECT' ),
+	'notoc'                     => array( '0', '__अनुक्रमणिकानको__', '__NOTOC__' ),
+	'nogallery'                 => array( '0', '__प्रदर्शननको__', '__NOGALLERY__' ),
+	'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' ),
+	'currentmonthnamegen'       => array( '1', 'सद्यमहिनासाधारण', 'CURRENTMONTHNAMEGEN' ),
+	'currentmonthabbrev'        => array( '1', 'सद्यमहिनासंक्षीप्त', 'CURRENTMONTHABBREV' ),
+	'currentday'                => array( '1', 'सद्यदिवस', 'CURRENTDAY' ),
+	'currentday2'               => array( '1', 'सद्यदिवस२', 'CURRENTDAY2' ),
+	'currentdayname'            => array( '1', 'सद्यदिवसनाव', 'CURRENTDAYNAME' ),
+	'currentyear'               => array( '1', 'सद्यवर्ष', 'CURRENTYEAR' ),
+	'currenttime'               => array( '1', 'सद्यवेळ', 'CURRENTTIME' ),
+	'currenthour'               => array( '1', 'सद्यतास', 'CURRENTHOUR' ),
+	'localmonth'                => array( '1', 'स्थानिकमहिना', 'स्थानिकमहिना२', 'LOCALMONTH', 'LOCALMONTH2' ),
+	'localmonth1'               => array( '1', 'स्थानिकमहिना१', 'LOCALMONTH1' ),
+	'localmonthname'            => array( '1', 'स्थानिकमहिनानाव', 'LOCALMONTHNAME' ),
+	'localmonthnamegen'         => array( '1', 'स्थानिकमहिनासाधारण', 'LOCALMONTHNAMEGEN' ),
+	'localmonthabbrev'          => array( '1', 'स्थानिकमहिनासंक्षीप्त', 'LOCALMONTHABBREV' ),
+	'localday'                  => array( '1', 'स्थानिकदिवस', 'LOCALDAY' ),
+	'localday2'                 => array( '1', 'स्थानिकदिवस२', 'LOCALDAY2' ),
+	'localdayname'              => array( '1', 'स्थानिकदिवसनाव', 'LOCALDAYNAME' ),
+	'localyear'                 => array( '1', 'स्थानिकवर्ष', 'LOCALYEAR' ),
+	'localtime'                 => array( '1', 'स्थानिकवेळ', 'LOCALTIME' ),
+	'localhour'                 => array( '1', 'स्थानिकतास', 'LOCALHOUR' ),
+	'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' ),
+	'talkspace'                 => array( '1', 'चर्चाविश्व', 'TALKSPACE' ),
+	'talkspacee'                => array( '1', 'चर्चाविश्वा', 'चर्चाविश्वाचे', 'TALKSPACEE' ),
+	'subjectspace'              => array( '1', 'विषयविश्व', 'लेखविश्व', 'SUBJECTSPACE', 'ARTICLESPACE' ),
+	'subjectspacee'             => array( '1', 'विषयविश्वा', 'लेखविश्वा', 'विषयविश्वाचे', 'लेखविश्वाचे', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
+	'fullpagename'              => array( '1', 'पूर्णलेखनाव', 'FULLPAGENAME' ),
+	'fullpagenamee'             => array( '1', 'पूर्णलेखनावे', 'अंशदुवा', 'FULLPAGENAMEE' ),
+	'subpagename'               => array( '1', 'उपपाननाव', 'SUBPAGENAME' ),
+	'subpagenamee'              => array( '1', 'उपपाननावे', 'उपपाननावाचे', 'उपौंशदुवा', 'SUBPAGENAMEE' ),
+	'basepagename'              => array( '1', 'मूळपाननाव', 'BASEPAGENAME' ),
+	'basepagenamee'             => array( '1', 'मूळपाननावे', 'BASEPAGENAMEE' ),
+	'talkpagename'              => array( '1', 'चर्चापाननाव', 'TALKPAGENAME' ),
+	'talkpagenamee'             => array( '1', 'चर्चापाननावे', 'TALKPAGENAMEE' ),
+	'subjectpagename'           => array( '1', 'विषयपाननाव', 'लेखपाननाव', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
+	'subjectpagenamee'          => array( '1', 'विषयपाननावे', 'लेखपाननावे', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
+	'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कणी', '$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_upright'               => array( '1', 'उभा', 'उभा=$1', 'उभा $1', 'upright', 'upright=$1', 'upright $1' ),
+	'img_border'                => array( '1', 'सीमा', 'border' ),
+	'img_baseline'              => array( '1', 'तळरेषा', 'आधाररेषा', 'baseline' ),
+	'img_sub'                   => array( '1', 'अधो', 'sub' ),
+	'img_super'                 => array( '1', 'उर्ध्व', 'super', 'sup' ),
+	'img_top'                   => array( '1', 'अत्यूच्च', 'top' ),
+	'img_text_top'              => array( '1', 'मजकूर-शीर्ष', 'शीर्ष-मजकूर', 'text-top' ),
+	'img_middle'                => array( '1', 'मध्य', 'middle' ),
+	'img_bottom'                => array( '1', 'तळ', 'बूड', 'bottom' ),
+	'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:' ),
+	'sitename'                  => array( '1', 'संकेतस्थळनाव', 'SITENAME' ),
+	'ns'                        => array( '0', 'नावि:', 'NS:' ),
+	'nse'                       => array( '0', 'नाविअरिक्त:', 'नाव्यारिक्त:', 'नाव्याख:', 'NSE:' ),
+	'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:' ),
+	'notitleconvert'            => array( '0', '__विनाशीर्षकबदल__', '__विनाशीब__', '__NOTITLECONVERT__', '__NOTC__' ),
+	'nocontentconvert'          => array( '0', '__विनामजकुरबदल__', '__विनामब__', '__NOCONTENTCONVERT__', '__NOCC__' ),
+	'currentweek'               => array( '1', 'सद्यआठवडा', 'CURRENTWEEK' ),
+	'currentdow'                => array( '1', 'सद्यउतरण', 'सद्यउतार', 'CURRENTDOW' ),
+	'localweek'                 => array( '1', 'स्थानिकआठवडा', 'LOCALWEEK' ),
+	'localdow'                  => array( '1', 'स्थानिकउतरण', 'स्थानिकउतार', 'LOCALDOW' ),
+	'revisionid'                => array( '1', 'आवृत्तीक्र्मांक', 'REVISIONID' ),
+	'revisionday'               => array( '1', 'आवृत्तीदिन', 'REVISIONDAY' ),
+	'revisionday2'              => array( '1', 'आवृत्तीदिन२', 'REVISIONDAY2' ),
+	'revisionmonth'             => array( '1', 'आवृत्तीमास', 'REVISIONMONTH' ),
+	'revisionyear'              => array( '1', 'आवृत्तीवर्ष', 'REVISIONYEAR' ),
+	'revisiontimestamp'         => array( '1', 'आवृत्तीमुद्रा', 'आवृत्तीठसा', 'REVISIONTIMESTAMP' ),
+	'revisionuser'              => array( '1', 'आवृत्तीसदस्य', 'REVISIONUSER' ),
+	'plural'                    => array( '0', 'बहुवचन:', 'PLURAL:' ),
+	'fullurl'                   => array( '0', 'संपूर्णसंस्थळ', 'FULLURL:' ),
+	'fullurle'                  => array( '0', 'संपूर्णसंस्थली:', 'संपूर्णसंस्थळी:', 'FULLURLE:' ),
+	'raw'                       => array( '0', 'कच्चे:', 'RAW:' ),
+	'displaytitle'              => array( '1', 'शीर्षकदाखवा', 'DISPLAYTITLE' ),
+	'rawsuffix'                 => array( '1', 'ॠ', 'R' ),
+	'newsectionlink'            => array( '1', '__नवविभागदुवा__', '__NEWSECTIONLINK__' ),
+	'nonewsectionlink'          => array( '1', '__विनानवविभागदुवा__', '__NONEWSECTIONLINK__' ),
+	'currentversion'            => array( '1', 'सद्यआवृत्ती', 'CURRENTVERSION' ),
+	'urlencode'                 => array( '0', 'संकेतस्थलीआंग्ल्संकेत:', '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' ),
+	'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' ),
 );
 
 $digitTransformTable = array(
diff --git a/languages/messages/MessagesMs.php b/languages/messages/MessagesMs.php
index 6fd13c704c..da1ea47126 100644
--- a/languages/messages/MessagesMs.php
+++ b/languages/messages/MessagesMs.php
@@ -68,36 +68,36 @@ $namespaceAliases = array(
 );
 
 $magicWords = array(
-	'redirect'                => array( '0', '#LENCONG', '#REDIRECT' ),
-	'currentmonth'            => array( '1', 'BULANSEMASA', 'BULANSEMASA2', 'CURRENTMONTH', 'CURRENTMONTH2' ),
-	'currentmonth1'           => array( '1', 'BULANSEMASA1', 'CURRENTMONTH1' ),
-	'currentmonthname'        => array( '1', 'NAMABULANSEMASA', 'CURRENTMONTHNAME' ),
-	'currentmonthnamegen'     => array( '1', 'NAMABULANSEMASAGEN', 'CURRENTMONTHNAMEGEN' ),
-	'currentmonthabbrev'      => array( '1', 'SINGBULANSEMASA', 'CURRENTMONTHABBREV' ),
-	'currentday'              => array( '1', 'HARISEMASA', 'CURRENTDAY' ),
-	'currentday2'             => array( '1', 'HARISEMASA2', 'CURRENTDAY2' ),
-	'currentdayname'          => array( '1', 'NAMAHARISEMASA', 'CURRENTDAYNAME' ),
-	'currentyear'             => array( '1', 'TAHUNSEMASA', 'CURRENTYEAR' ),
-	'currenttime'             => array( '1', 'WAKTUSEMASA', 'CURRENTTIME' ),
-	'currenthour'             => array( '1', 'JAMSEMASA', 'CURRENTHOUR' ),
-	'pagename'                => array( '1', 'NAMALAMAN', 'PAGENAME' ),
-	'pagenamee'               => array( '1', 'NAMALAMANE', 'PAGENAMEE' ),
-	'namespace'               => array( '1', 'RUANGNAMA', 'NAMESPACE' ),
-	'namespacee'              => array( '1', 'RUANGNAMAE', 'NAMESPACEE' ),
-	'talkspace'               => array( '1', 'RUANGBINCANG', 'TALKSPACE' ),
-	'talkspacee'              => array( '1', 'RUANGBINCANGE', 'TALKSPACEE' ),
-	'fullpagename'            => array( '1', 'NAMALAMANPENUH', 'FULLPAGENAME' ),
-	'fullpagenamee'           => array( '1', 'NAMALAMANPENUHE', 'FULLPAGENAMEE' ),
-	'msg'                     => array( '0', 'PESAN:', 'MSG:' ),
-	'subst'                   => array( '0', 'TUKAR:', 'SUBST:' ),
-	'img_right'               => array( '1', 'kiri', 'right' ),
-	'img_left'                => array( '1', 'kanan', 'left' ),
-	'img_none'                => array( '1', 'tiada', 'none' ),
-	'img_center'              => array( '1', 'tengah', 'center', 'centre' ),
-	'sitename'                => array( '1', 'NAMATAPAK', 'SITENAME' ),
-	'ns'                      => array( '0', 'RN:', 'NS:' ),
-	'nse'                     => array( '0', 'RNE:', 'NSE:' ),
-	'currentweek'             => array( '1', 'MINGGUSEMASA', 'CURRENTWEEK' ),
+	'redirect'                  => array( '0', '#LENCONG', '#REDIRECT' ),
+	'currentmonth'              => array( '1', 'BULANSEMASA', 'BULANSEMASA2', 'CURRENTMONTH', 'CURRENTMONTH2' ),
+	'currentmonth1'             => array( '1', 'BULANSEMASA1', 'CURRENTMONTH1' ),
+	'currentmonthname'          => array( '1', 'NAMABULANSEMASA', 'CURRENTMONTHNAME' ),
+	'currentmonthnamegen'       => array( '1', 'NAMABULANSEMASAGEN', 'CURRENTMONTHNAMEGEN' ),
+	'currentmonthabbrev'        => array( '1', 'SINGBULANSEMASA', 'CURRENTMONTHABBREV' ),
+	'currentday'                => array( '1', 'HARISEMASA', 'CURRENTDAY' ),
+	'currentday2'               => array( '1', 'HARISEMASA2', 'CURRENTDAY2' ),
+	'currentdayname'            => array( '1', 'NAMAHARISEMASA', 'CURRENTDAYNAME' ),
+	'currentyear'               => array( '1', 'TAHUNSEMASA', 'CURRENTYEAR' ),
+	'currenttime'               => array( '1', 'WAKTUSEMASA', 'CURRENTTIME' ),
+	'currenthour'               => array( '1', 'JAMSEMASA', 'CURRENTHOUR' ),
+	'pagename'                  => array( '1', 'NAMALAMAN', 'PAGENAME' ),
+	'pagenamee'                 => array( '1', 'NAMALAMANE', 'PAGENAMEE' ),
+	'namespace'                 => array( '1', 'RUANGNAMA', 'NAMESPACE' ),
+	'namespacee'                => array( '1', 'RUANGNAMAE', 'NAMESPACEE' ),
+	'talkspace'                 => array( '1', 'RUANGBINCANG', 'TALKSPACE' ),
+	'talkspacee'                => array( '1', 'RUANGBINCANGE', 'TALKSPACEE' ),
+	'fullpagename'              => array( '1', 'NAMALAMANPENUH', 'FULLPAGENAME' ),
+	'fullpagenamee'             => array( '1', 'NAMALAMANPENUHE', 'FULLPAGENAMEE' ),
+	'msg'                       => array( '0', 'PESAN:', 'MSG:' ),
+	'subst'                     => array( '0', 'TUKAR:', 'SUBST:' ),
+	'img_right'                 => array( '1', 'kiri', 'right' ),
+	'img_left'                  => array( '1', 'kanan', 'left' ),
+	'img_none'                  => array( '1', 'tiada', 'none' ),
+	'img_center'                => array( '1', 'tengah', 'center', 'centre' ),
+	'sitename'                  => array( '1', 'NAMATAPAK', 'SITENAME' ),
+	'ns'                        => array( '0', 'RN:', 'NS:' ),
+	'nse'                       => array( '0', 'RNE:', 'NSE:' ),
+	'currentweek'               => array( '1', 'MINGGUSEMASA', 'CURRENTWEEK' ),
 );
 
 $specialPageAliases = array(
@@ -2976,7 +2976,7 @@ Simpan dalam komputer anda dan muat naiknya di sini.',
 'pageinfo-authors' => 'Jumlah pengarang yang berlainan',
 'pageinfo-recent-edits' => 'Bilangan suntingan terkini (dalam $1 yang lalu)',
 'pageinfo-recent-authors' => 'Bilangan pengarang berbeza yang terkini',
-'pageinfo-restriction' => 'Perlindungan halaman (<code>$1</code>)',
+'pageinfo-restriction' => 'Perlindungan halaman (<code>{{lcfirst:$1}}</code>)',
 'pageinfo-magic-words' => 'Kata sakti ($1)',
 'pageinfo-hidden-categories' => 'Kategori tersembunyi ($1)',
 'pageinfo-templates' => 'Templat tertransklusi ($1)',
diff --git a/languages/messages/MessagesMt.php b/languages/messages/MessagesMt.php
index f5bc99b4df..3a9a45f85b 100644
--- a/languages/messages/MessagesMt.php
+++ b/languages/messages/MessagesMt.php
@@ -142,133 +142,133 @@ $specialPageAliases = array(
 );
 
 $magicWords = array(
-	'redirect'                => array( '0', '#RINDIRIZZA', '#REDIRECT' ),
-	'notoc'                   => array( '0', '__EBDAWERREJ__', '__NOTOC__' ),
-	'nogallery'               => array( '0', '__EBDAGALLERIJA__', '__NOGALLERY__' ),
-	'forcetoc'                => array( '0', '__SFORZAWERREJ__', '__FORCETOC__' ),
-	'toc'                     => array( '0', '__WERREJ__', '__TOC__' ),
-	'noeditsection'           => array( '0', '__EBDASEZZJONIMODIFIKA__', '__NOEDITSECTION__' ),
-	'currentmonth'            => array( '1', 'XAHARKURRENTI', 'CURRENTMONTH', 'CURRENTMONTH2' ),
-	'currentmonthname'        => array( '1', 'ISEMXAHARKURRENTI', 'CURRENTMONTHNAME' ),
-	'currentmonthnamegen'     => array( '1', 'Ä ENISEMXAHARKURRENTI', 'CURRENTMONTHNAMEGEN' ),
-	'currentmonthabbrev'      => array( '1', 'ABBREVXAHARKURRENTI', 'CURRENTMONTHABBREV' ),
-	'currentday'              => array( '1', 'Ä URNATAKURRENTI', 'CURRENTDAY' ),
-	'currentday2'             => array( '1', 'Ä URNATAKURRENTI2', 'CURRENTDAY2' ),
-	'currentdayname'          => array( '1', 'ISEMÄ URNATAKURRENTI', 'CURRENTDAYNAME' ),
-	'currentyear'             => array( '1', 'SENAKURRENTI', 'CURRENTYEAR' ),
-	'currenttime'             => array( '1', 'ĦINKURRENTI', 'CURRENTTIME' ),
-	'currenthour'             => array( '1', 'SIEGĦAKURRENTI', 'CURRENTHOUR' ),
-	'localmonth'              => array( '1', 'XAHARLOKALI', 'XAHARLOKALI2', 'LOCALMONTH', 'LOCALMONTH2' ),
-	'localmonth1'             => array( '1', 'XAHARLOKALI1', 'LOCALMONTH1' ),
-	'localmonthname'          => array( '1', 'ISEMXAHARLOKALI', 'LOCALMONTHNAME' ),
-	'localmonthnamegen'       => array( '1', 'Ä ENISEMXAHARLOKALI', 'LOCALMONTHNAMEGEN' ),
-	'localmonthabbrev'        => array( '1', 'ABBREVXAHARLOKALI', 'LOCALMONTHABBREV' ),
-	'localday'                => array( '1', 'Ä URNATALOKALI', 'LOCALDAY' ),
-	'localday2'               => array( '1', 'Ä URNATALOKALI2', 'LOCALDAY2' ),
-	'localdayname'            => array( '1', 'ISEMTAL-Ä URNATALOKALI', 'LOCALDAYNAME' ),
-	'localyear'               => array( '1', 'SENALOKALI', 'LOCALYEAR' ),
-	'localtime'               => array( '1', 'ĦINLOKALI', 'LOCALTIME' ),
-	'localhour'               => array( '1', 'SIEGĦALOKALI', 'LOCALHOUR' ),
-	'numberofpages'           => array( '1', 'NUMRUTA\'PAÄ NI', 'NUMBEROFPAGES' ),
-	'numberofarticles'        => array( '1', 'NUMRUTA\'ARTIKLI', 'NUMBEROFARTICLES' ),
-	'numberoffiles'           => array( '1', 'NUMRUTA\'FAJLS', 'NUMBEROFFILES' ),
-	'numberofusers'           => array( '1', 'NUMRUTA\'UTENTI', 'NUMBEROFUSERS' ),
-	'numberofactiveusers'     => array( '1', 'NUMRUTA\'UTENTIATTIVI', 'NUMBEROFACTIVEUSERS' ),
-	'numberofedits'           => array( '1', 'NUMBRUTA\'MODIFIKI', 'NUMBEROFEDITS' ),
-	'numberofviews'           => array( '1', 'NUMRUTA\'VISTI', 'NUMBEROFVIEWS' ),
-	'pagename'                => array( '1', 'ISEMTAL-PAÄ NA', 'PAGENAME' ),
-	'pagenamee'               => array( '1', 'ISEMTAL-PAÄ NAE', 'PAGENAMEE' ),
-	'namespace'               => array( '1', 'SPAZJUTAL-ISEM', 'NAMESPACE' ),
-	'namespacee'              => array( '1', 'SPAZJUTAL-ISEME', 'NAMESPACEE' ),
-	'talkspace'               => array( '1', 'SPAZJUTA\'DISKUSSJONI', 'TALKSPACE' ),
-	'talkspacee'              => array( '1', 'SPAZJUTA\'DISKUSSJONIE', 'TALKSPACEE' ),
-	'subjectspace'            => array( '1', 'SPAZJUTAS-SUÄ Ä ETT', 'SPAZJUTAL-ARTIKLU', 'SUBJECTSPACE', 'ARTICLESPACE' ),
-	'fullpagename'            => array( '1', 'ISEMSĦIĦTAL-PAĠNA', 'FULLPAGENAME' ),
-	'fullpagenamee'           => array( '1', 'ISEMTAL-PAĠNASĦIĦAE', 'FULLPAGENAMEE' ),
-	'subpagename'             => array( '1', 'ISEMTAS-SOTTOPAÄ NA', 'SUBPAGENAME' ),
-	'subpagenamee'            => array( '1', 'ISEMTAS-SUBPAÄ NAE', 'SUBPAGENAMEE' ),
-	'basepagename'            => array( '1', 'ISEMBAŻIKUTAL-PAĠNA', 'BASEPAGENAME' ),
-	'basepagenamee'           => array( '1', 'ISEMTAL-PAĠNATAL-BAŻIE', 'BASEPAGENAMEE' ),
-	'talkpagename'            => array( '1', 'ISEMPAÄ NATA\'DISKUSSJONI', 'TALKPAGENAME' ),
-	'talkpagenamee'           => array( '1', 'ISEMTAL-PAÄ NATAD-DISKUSSJONIE', 'TALKPAGENAMEE' ),
-	'subjectpagename'         => array( '1', 'ISEMTAS-SUÄ Ä ETTTAL-PAÄ NA', 'ISEMTAL-ARTIKLUTAL-PAÄ NA', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
-	'subjectpagenamee'        => array( '1', 'ISEMTAS-SUÄ Ä ETTTAL-PAÄ NAE', 'ISEMTAL-ARTIKLUTAL-PAÄ NAE', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
-	'msg'                     => array( '0', 'MSÄ :', 'MSG:' ),
-	'subst'                   => array( '0', 'BIDDEL:', 'SUBST:' ),
-	'msgnw'                   => array( '0', 'MSÄ EW:', 'MSGNW:' ),
-	'img_thumbnail'           => array( '1', 'daqsminuri', 'minuri', 'thumbnail', 'thumb' ),
-	'img_manualthumb'         => array( '1', 'daqsminuri=$1', 'minuri=$1', 'thumbnail=$1', 'thumb=$1' ),
-	'img_right'               => array( '1', 'lemin', 'right' ),
-	'img_left'                => array( '1', 'xellug', 'left' ),
-	'img_none'                => array( '1', 'xejn', 'none' ),
-	'img_center'              => array( '1', 'nofs', 'ċentrali', 'ċentru', 'center', 'centre' ),
-	'img_framed'              => array( '1', 'tilat', 'b\'tilar', 'tilar', 'framed', 'enframed', 'frame' ),
-	'img_frameless'           => array( '1', 'bla_tilar', 'frameless' ),
-	'img_page'                => array( '1', 'paġna=$1', 'paġna $1', 'page=$1', 'page $1' ),
-	'img_upright'             => array( '1', 'wieqaf', 'wieqaf=$1', 'wieqaf $1', 'upright', 'upright=$1', 'upright $1' ),
-	'img_border'              => array( '1', 'bordura', 'burdura', 'border' ),
-	'img_baseline'            => array( '1', 'bażi_tal-linja', 'baseline' ),
-	'img_sub'                 => array( '1', 'bid', 'sub' ),
-	'img_super'               => array( '1', 'tajjeb', 'super', 'sup' ),
-	'img_top'                 => array( '1', 'fuq', 'top' ),
-	'img_text_top'            => array( '1', 'test-fuq', 'text-top' ),
-	'img_bottom'              => array( '1', 'taħt', 'bottom' ),
-	'img_text_bottom'         => array( '1', 'test-taħt', 'text-bottom' ),
-	'img_link'                => array( '1', 'ħolqa=$1', 'link=$1' ),
-	'sitename'                => array( '1', 'ISEMTAS-SIT', 'SITENAME' ),
-	'ns'                      => array( '0', 'IS:', 'NS:' ),
-	'localurl'                => array( '0', 'URLLOKALI:', 'LOCALURL:' ),
-	'localurle'               => array( '0', 'URLLOKALIE:', 'LOCALURLE:' ),
-	'servername'              => array( '0', 'ISEMTAS-SERVER', 'SERVERNAME' ),
-	'scriptpath'              => array( '0', 'DESTINAZZJONITA\'SKRITT', 'SCRIPTPATH' ),
-	'grammar'                 => array( '0', 'GRAMMATIKA:', 'GRAMMAR:' ),
-	'gender'                  => array( '0', 'SESS:', 'GENDER:' ),
-	'notitleconvert'          => array( '0', '__EBDAKONVERTURTITLU__', '__EBDAKT__', '__NOTITLECONVERT__', '__NOTC__' ),
-	'nocontentconvert'        => array( '0', '__EBDAKONVERTURKONTENUT__', '__EBDAKK__', '__NOCONTENTCONVERT__', '__NOCC__' ),
-	'currentweek'             => array( '1', 'ĠIMGĦAKURRENTI', 'CURRENTWEEK' ),
-	'currentdow'              => array( '1', 'Ä TÄ KURRENTI', 'CURRENTDOW' ),
-	'localweek'               => array( '1', 'ĠIMGĦALOKALI', 'LOCALWEEK' ),
-	'localdow'                => array( '1', 'Ä TÄ LOKALI', 'LOCALDOW' ),
-	'revisionid'              => array( '1', 'IDTAR-REVIŻJONI', 'REVISIONID' ),
-	'revisionday'             => array( '1', 'ĠURNATATAR-REVIŻJONI', 'REVISIONDAY' ),
-	'revisionday2'            => array( '1', 'ĠURNATATAR-REVIŻJONI2', 'REVISIONDAY2' ),
-	'revisionmonth'           => array( '1', 'XAHARTAR-REVIŻJONI', 'REVISIONMONTH' ),
-	'revisionyear'            => array( '1', 'SENATAR-REVIŻJONI', 'REVISIONYEAR' ),
-	'revisiontimestamp'       => array( '1', 'TIMBRUTAR-REVIŻJONI', 'REVISIONTIMESTAMP' ),
-	'fullurl'                 => array( '0', 'URLSĦIĦA:', 'FULLURL:' ),
-	'fullurle'                => array( '0', 'URLSĦIĦAE:', 'FULLURLE:' ),
-	'lcfirst'                 => array( '0', 'IBDAKÅ»:', 'LCFIRST:' ),
-	'ucfirst'                 => array( '0', 'IBDAKK:', 'UCFIRST:' ),
-	'lc'                      => array( '0', 'KÅ»:', 'LC:' ),
-	'uc'                      => array( '0', 'KK:', 'UC:' ),
-	'displaytitle'            => array( '1', 'URITITLU', 'DISPLAYTITLE' ),
-	'newsectionlink'          => array( '1', '__ĦOLQASEZZJONIĠDIDA__', '__NEWSECTIONLINK__' ),
-	'nonewsectionlink'        => array( '1', '__EBDAĦOLQASEZZJONIĠDIDA__', '__NONEWSECTIONLINK__' ),
-	'currentversion'          => array( '1', 'VERŻJONIKURRENTI', 'CURRENTVERSION' ),
-	'urlencode'               => array( '0', 'URLKODIĊI:', 'URLENCODE:' ),
-	'anchorencode'            => array( '0', 'ANKRAKODIĊI', 'ANCHORENCODE' ),
-	'currenttimestamp'        => array( '1', 'TIMBRUTAL-ĦINKURRENTI', 'CURRENTTIMESTAMP' ),
-	'localtimestamp'          => array( '1', 'TIMBRUTAL-ĦINLOKALI', 'LOCALTIMESTAMP' ),
-	'directionmark'           => array( '1', 'MARKATAD-DIREZZJONI', 'MARKADIRE', 'DIRECTIONMARK', 'DIRMARK' ),
-	'language'                => array( '0', '#LINGWA:', '#LANGUAGE:' ),
-	'contentlanguage'         => array( '1', 'LINGWATAL-KONTENUT', 'LINGKONTENUT', 'CONTENTLANGUAGE', 'CONTENTLANG' ),
-	'pagesinnamespace'        => array( '1', 'PAÄ NIFL-ISPAZJUTAL-ISEM:', 'PAÄ NISI:', 'PAGESINNAMESPACE:', 'PAGESINNS:' ),
-	'numberofadmins'          => array( '1', 'NUMRUTA\'AMMIN', 'NUMBEROFADMINS' ),
-	'padleft'                 => array( '0', 'PADXELLUG', 'PADLEFT' ),
-	'padright'                => array( '0', 'PADLEMIN', 'PADRIGHT' ),
-	'special'                 => array( '0', 'speċjali', 'special' ),
-	'defaultsort'             => array( '1', 'DEFAULTSORTJA:', 'DEFAULTSORTJAĊAVETTA:', 'DEFAULTKATEGORIJISORTJA:', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:' ),
-	'filepath'                => array( '0', 'DESTINAZZJONITAL-FAJL:', 'FILEPATH:' ),
-	'tag'                     => array( '0', 'tabella', 'tag' ),
-	'hiddencat'               => array( '1', '__KATMOĦBIJA__', '__HIDDENCAT__' ),
-	'pagesincategory'         => array( '1', 'PAÄ NIFIL-KATEGORIJA', 'PAÄ NIFILK', 'PAGESINCATEGORY', 'PAGESINCAT' ),
-	'pagesize'                => array( '1', 'DAQSTAL-PAÄ NI', 'PAGESIZE' ),
-	'index'                   => array( '1', '__INDIĊI__', '__INDEX__' ),
-	'noindex'                 => array( '1', '__EBDAINDIĊI__', '__NOINDEX__' ),
-	'numberingroup'           => array( '1', 'NUMRUFIL-GRUPP', 'NUMFIL-GRUPP', 'NUMBERINGROUP', 'NUMINGROUP' ),
-	'staticredirect'          => array( '1', '__RIINDIRIZZSTATIKU__', '__STATICREDIRECT__' ),
-	'protectionlevel'         => array( '1', 'LIVELLITA\'PROTEZZJONI', 'PROTECTIONLEVEL' ),
-	'formatdate'              => array( '0', 'formatdata', 'dataformat', 'formatdate', 'dateformat' ),
+	'redirect'                  => array( '0', '#RINDIRIZZA', '#REDIRECT' ),
+	'notoc'                     => array( '0', '__EBDAWERREJ__', '__NOTOC__' ),
+	'nogallery'                 => array( '0', '__EBDAGALLERIJA__', '__NOGALLERY__' ),
+	'forcetoc'                  => array( '0', '__SFORZAWERREJ__', '__FORCETOC__' ),
+	'toc'                       => array( '0', '__WERREJ__', '__TOC__' ),
+	'noeditsection'             => array( '0', '__EBDASEZZJONIMODIFIKA__', '__NOEDITSECTION__' ),
+	'currentmonth'              => array( '1', 'XAHARKURRENTI', 'CURRENTMONTH', 'CURRENTMONTH2' ),
+	'currentmonthname'          => array( '1', 'ISEMXAHARKURRENTI', 'CURRENTMONTHNAME' ),
+	'currentmonthnamegen'       => array( '1', 'Ä ENISEMXAHARKURRENTI', 'CURRENTMONTHNAMEGEN' ),
+	'currentmonthabbrev'        => array( '1', 'ABBREVXAHARKURRENTI', 'CURRENTMONTHABBREV' ),
+	'currentday'                => array( '1', 'Ä URNATAKURRENTI', 'CURRENTDAY' ),
+	'currentday2'               => array( '1', 'Ä URNATAKURRENTI2', 'CURRENTDAY2' ),
+	'currentdayname'            => array( '1', 'ISEMÄ URNATAKURRENTI', 'CURRENTDAYNAME' ),
+	'currentyear'               => array( '1', 'SENAKURRENTI', 'CURRENTYEAR' ),
+	'currenttime'               => array( '1', 'ĦINKURRENTI', 'CURRENTTIME' ),
+	'currenthour'               => array( '1', 'SIEGĦAKURRENTI', 'CURRENTHOUR' ),
+	'localmonth'                => array( '1', 'XAHARLOKALI', 'XAHARLOKALI2', 'LOCALMONTH', 'LOCALMONTH2' ),
+	'localmonth1'               => array( '1', 'XAHARLOKALI1', 'LOCALMONTH1' ),
+	'localmonthname'            => array( '1', 'ISEMXAHARLOKALI', 'LOCALMONTHNAME' ),
+	'localmonthnamegen'         => array( '1', 'Ä ENISEMXAHARLOKALI', 'LOCALMONTHNAMEGEN' ),
+	'localmonthabbrev'          => array( '1', 'ABBREVXAHARLOKALI', 'LOCALMONTHABBREV' ),
+	'localday'                  => array( '1', 'Ä URNATALOKALI', 'LOCALDAY' ),
+	'localday2'                 => array( '1', 'Ä URNATALOKALI2', 'LOCALDAY2' ),
+	'localdayname'              => array( '1', 'ISEMTAL-Ä URNATALOKALI', 'LOCALDAYNAME' ),
+	'localyear'                 => array( '1', 'SENALOKALI', 'LOCALYEAR' ),
+	'localtime'                 => array( '1', 'ĦINLOKALI', 'LOCALTIME' ),
+	'localhour'                 => array( '1', 'SIEGĦALOKALI', 'LOCALHOUR' ),
+	'numberofpages'             => array( '1', 'NUMRUTA\'PAÄ NI', 'NUMBEROFPAGES' ),
+	'numberofarticles'          => array( '1', 'NUMRUTA\'ARTIKLI', 'NUMBEROFARTICLES' ),
+	'numberoffiles'             => array( '1', 'NUMRUTA\'FAJLS', 'NUMBEROFFILES' ),
+	'numberofusers'             => array( '1', 'NUMRUTA\'UTENTI', 'NUMBEROFUSERS' ),
+	'numberofactiveusers'       => array( '1', 'NUMRUTA\'UTENTIATTIVI', 'NUMBEROFACTIVEUSERS' ),
+	'numberofedits'             => array( '1', 'NUMBRUTA\'MODIFIKI', 'NUMBEROFEDITS' ),
+	'numberofviews'             => array( '1', 'NUMRUTA\'VISTI', 'NUMBEROFVIEWS' ),
+	'pagename'                  => array( '1', 'ISEMTAL-PAÄ NA', 'PAGENAME' ),
+	'pagenamee'                 => array( '1', 'ISEMTAL-PAÄ NAE', 'PAGENAMEE' ),
+	'namespace'                 => array( '1', 'SPAZJUTAL-ISEM', 'NAMESPACE' ),
+	'namespacee'                => array( '1', 'SPAZJUTAL-ISEME', 'NAMESPACEE' ),
+	'talkspace'                 => array( '1', 'SPAZJUTA\'DISKUSSJONI', 'TALKSPACE' ),
+	'talkspacee'                => array( '1', 'SPAZJUTA\'DISKUSSJONIE', 'TALKSPACEE' ),
+	'subjectspace'              => array( '1', 'SPAZJUTAS-SUÄ Ä ETT', 'SPAZJUTAL-ARTIKLU', 'SUBJECTSPACE', 'ARTICLESPACE' ),
+	'fullpagename'              => array( '1', 'ISEMSĦIĦTAL-PAĠNA', 'FULLPAGENAME' ),
+	'fullpagenamee'             => array( '1', 'ISEMTAL-PAĠNASĦIĦAE', 'FULLPAGENAMEE' ),
+	'subpagename'               => array( '1', 'ISEMTAS-SOTTOPAÄ NA', 'SUBPAGENAME' ),
+	'subpagenamee'              => array( '1', 'ISEMTAS-SUBPAÄ NAE', 'SUBPAGENAMEE' ),
+	'basepagename'              => array( '1', 'ISEMBAŻIKUTAL-PAĠNA', 'BASEPAGENAME' ),
+	'basepagenamee'             => array( '1', 'ISEMTAL-PAĠNATAL-BAŻIE', 'BASEPAGENAMEE' ),
+	'talkpagename'              => array( '1', 'ISEMPAÄ NATA\'DISKUSSJONI', 'TALKPAGENAME' ),
+	'talkpagenamee'             => array( '1', 'ISEMTAL-PAÄ NATAD-DISKUSSJONIE', 'TALKPAGENAMEE' ),
+	'subjectpagename'           => array( '1', 'ISEMTAS-SUÄ Ä ETTTAL-PAÄ NA', 'ISEMTAL-ARTIKLUTAL-PAÄ NA', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
+	'subjectpagenamee'          => array( '1', 'ISEMTAS-SUÄ Ä ETTTAL-PAÄ NAE', 'ISEMTAL-ARTIKLUTAL-PAÄ NAE', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
+	'msg'                       => array( '0', 'MSÄ :', 'MSG:' ),
+	'subst'                     => array( '0', 'BIDDEL:', 'SUBST:' ),
+	'msgnw'                     => array( '0', 'MSÄ EW:', 'MSGNW:' ),
+	'img_thumbnail'             => array( '1', 'daqsminuri', 'minuri', 'thumbnail', 'thumb' ),
+	'img_manualthumb'           => array( '1', 'daqsminuri=$1', 'minuri=$1', 'thumbnail=$1', 'thumb=$1' ),
+	'img_right'                 => array( '1', 'lemin', 'right' ),
+	'img_left'                  => array( '1', 'xellug', 'left' ),
+	'img_none'                  => array( '1', 'xejn', 'none' ),
+	'img_center'                => array( '1', 'nofs', 'ċentrali', 'ċentru', 'center', 'centre' ),
+	'img_framed'                => array( '1', 'tilat', 'b\'tilar', 'tilar', 'framed', 'enframed', 'frame' ),
+	'img_frameless'             => array( '1', 'bla_tilar', 'frameless' ),
+	'img_page'                  => array( '1', 'paġna=$1', 'paġna $1', 'page=$1', 'page $1' ),
+	'img_upright'               => array( '1', 'wieqaf', 'wieqaf=$1', 'wieqaf $1', 'upright', 'upright=$1', 'upright $1' ),
+	'img_border'                => array( '1', 'bordura', 'burdura', 'border' ),
+	'img_baseline'              => array( '1', 'bażi_tal-linja', 'baseline' ),
+	'img_sub'                   => array( '1', 'bid', 'sub' ),
+	'img_super'                 => array( '1', 'tajjeb', 'super', 'sup' ),
+	'img_top'                   => array( '1', 'fuq', 'top' ),
+	'img_text_top'              => array( '1', 'test-fuq', 'text-top' ),
+	'img_bottom'                => array( '1', 'taħt', 'bottom' ),
+	'img_text_bottom'           => array( '1', 'test-taħt', 'text-bottom' ),
+	'img_link'                  => array( '1', 'ħolqa=$1', 'link=$1' ),
+	'sitename'                  => array( '1', 'ISEMTAS-SIT', 'SITENAME' ),
+	'ns'                        => array( '0', 'IS:', 'NS:' ),
+	'localurl'                  => array( '0', 'URLLOKALI:', 'LOCALURL:' ),
+	'localurle'                 => array( '0', 'URLLOKALIE:', 'LOCALURLE:' ),
+	'servername'                => array( '0', 'ISEMTAS-SERVER', 'SERVERNAME' ),
+	'scriptpath'                => array( '0', 'DESTINAZZJONITA\'SKRITT', 'SCRIPTPATH' ),
+	'grammar'                   => array( '0', 'GRAMMATIKA:', 'GRAMMAR:' ),
+	'gender'                    => array( '0', 'SESS:', 'GENDER:' ),
+	'notitleconvert'            => array( '0', '__EBDAKONVERTURTITLU__', '__EBDAKT__', '__NOTITLECONVERT__', '__NOTC__' ),
+	'nocontentconvert'          => array( '0', '__EBDAKONVERTURKONTENUT__', '__EBDAKK__', '__NOCONTENTCONVERT__', '__NOCC__' ),
+	'currentweek'               => array( '1', 'ĠIMGĦAKURRENTI', 'CURRENTWEEK' ),
+	'currentdow'                => array( '1', 'Ä TÄ KURRENTI', 'CURRENTDOW' ),
+	'localweek'                 => array( '1', 'ĠIMGĦALOKALI', 'LOCALWEEK' ),
+	'localdow'                  => array( '1', 'Ä TÄ LOKALI', 'LOCALDOW' ),
+	'revisionid'                => array( '1', 'IDTAR-REVIŻJONI', 'REVISIONID' ),
+	'revisionday'               => array( '1', 'ĠURNATATAR-REVIŻJONI', 'REVISIONDAY' ),
+	'revisionday2'              => array( '1', 'ĠURNATATAR-REVIŻJONI2', 'REVISIONDAY2' ),
+	'revisionmonth'             => array( '1', 'XAHARTAR-REVIŻJONI', 'REVISIONMONTH' ),
+	'revisionyear'              => array( '1', 'SENATAR-REVIŻJONI', 'REVISIONYEAR' ),
+	'revisiontimestamp'         => array( '1', 'TIMBRUTAR-REVIŻJONI', 'REVISIONTIMESTAMP' ),
+	'fullurl'                   => array( '0', 'URLSĦIĦA:', 'FULLURL:' ),
+	'fullurle'                  => array( '0', 'URLSĦIĦAE:', 'FULLURLE:' ),
+	'lcfirst'                   => array( '0', 'IBDAKÅ»:', 'LCFIRST:' ),
+	'ucfirst'                   => array( '0', 'IBDAKK:', 'UCFIRST:' ),
+	'lc'                        => array( '0', 'KÅ»:', 'LC:' ),
+	'uc'                        => array( '0', 'KK:', 'UC:' ),
+	'displaytitle'              => array( '1', 'URITITLU', 'DISPLAYTITLE' ),
+	'newsectionlink'            => array( '1', '__ĦOLQASEZZJONIĠDIDA__', '__NEWSECTIONLINK__' ),
+	'nonewsectionlink'          => array( '1', '__EBDAĦOLQASEZZJONIĠDIDA__', '__NONEWSECTIONLINK__' ),
+	'currentversion'            => array( '1', 'VERŻJONIKURRENTI', 'CURRENTVERSION' ),
+	'urlencode'                 => array( '0', 'URLKODIĊI:', 'URLENCODE:' ),
+	'anchorencode'              => array( '0', 'ANKRAKODIĊI', 'ANCHORENCODE' ),
+	'currenttimestamp'          => array( '1', 'TIMBRUTAL-ĦINKURRENTI', 'CURRENTTIMESTAMP' ),
+	'localtimestamp'            => array( '1', 'TIMBRUTAL-ĦINLOKALI', 'LOCALTIMESTAMP' ),
+	'directionmark'             => array( '1', 'MARKATAD-DIREZZJONI', 'MARKADIRE', 'DIRECTIONMARK', 'DIRMARK' ),
+	'language'                  => array( '0', '#LINGWA:', '#LANGUAGE:' ),
+	'contentlanguage'           => array( '1', 'LINGWATAL-KONTENUT', 'LINGKONTENUT', 'CONTENTLANGUAGE', 'CONTENTLANG' ),
+	'pagesinnamespace'          => array( '1', 'PAÄ NIFL-ISPAZJUTAL-ISEM:', 'PAÄ NISI:', 'PAGESINNAMESPACE:', 'PAGESINNS:' ),
+	'numberofadmins'            => array( '1', 'NUMRUTA\'AMMIN', 'NUMBEROFADMINS' ),
+	'padleft'                   => array( '0', 'PADXELLUG', 'PADLEFT' ),
+	'padright'                  => array( '0', 'PADLEMIN', 'PADRIGHT' ),
+	'special'                   => array( '0', 'speċjali', 'special' ),
+	'defaultsort'               => array( '1', 'DEFAULTSORTJA:', 'DEFAULTSORTJAĊAVETTA:', 'DEFAULTKATEGORIJISORTJA:', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:' ),
+	'filepath'                  => array( '0', 'DESTINAZZJONITAL-FAJL:', 'FILEPATH:' ),
+	'tag'                       => array( '0', 'tabella', 'tag' ),
+	'hiddencat'                 => array( '1', '__KATMOĦBIJA__', '__HIDDENCAT__' ),
+	'pagesincategory'           => array( '1', 'PAÄ NIFIL-KATEGORIJA', 'PAÄ NIFILK', 'PAGESINCATEGORY', 'PAGESINCAT' ),
+	'pagesize'                  => array( '1', 'DAQSTAL-PAÄ NI', 'PAGESIZE' ),
+	'index'                     => array( '1', '__INDIĊI__', '__INDEX__' ),
+	'noindex'                   => array( '1', '__EBDAINDIĊI__', '__NOINDEX__' ),
+	'numberingroup'             => array( '1', 'NUMRUFIL-GRUPP', 'NUMFIL-GRUPP', 'NUMBERINGROUP', 'NUMINGROUP' ),
+	'staticredirect'            => array( '1', '__RIINDIRIZZSTATIKU__', '__STATICREDIRECT__' ),
+	'protectionlevel'           => array( '1', 'LIVELLITA\'PROTEZZJONI', 'PROTECTIONLEVEL' ),
+	'formatdate'                => array( '0', 'formatdata', 'dataformat', 'formatdate', 'dateformat' ),
 );
 
 $messages = array(
diff --git a/languages/messages/MessagesMwl.php b/languages/messages/MessagesMwl.php
index 8047db0176..ac69cb029b 100644
--- a/languages/messages/MessagesMwl.php
+++ b/languages/messages/MessagesMwl.php
@@ -64,17 +64,17 @@ $specialPageAliases = array(
 );
 
 $magicWords = array(
-	'redirect'                => array( '0', '#ANCAMINAR', '#REDIRECIONAMENTO', '#REDIRECT' ),
-	'img_right'               => array( '1', 'dreita', 'direita', 'right' ),
-	'img_left'                => array( '1', 'squierda', 'esquerda', 'left' ),
-	'img_none'                => array( '1', 'nanhun', 'nenhum', 'none' ),
-	'img_center'              => array( '1', 'centro', 'center', 'centre' ),
-	'img_middle'              => array( '1', 'meio', 'middle' ),
-	'language'                => array( '0', '#LHENGUA:', '#IDIOMA:', '#LANGUAGE:' ),
-	'filepath'                => array( '0', 'CAMINOFEXEIRO:', 'CAMINHODOARQUIVO', 'FILEPATH:' ),
-	'tag'                     => array( '0', 'eitiqueta', 'tag' ),
-	'pagesize'                => array( '1', 'TAMANHOFEXEIRO', 'TAMANHODAPAGINA', 'TAMANHODAPÁGINA', 'PAGESIZE' ),
-	'staticredirect'          => array( '1', '_ANCAMINARSTATICO_', '__REDIRECIONAMENTOESTATICO__', '__REDIRECIONAMENTOESTÁTICO__', '__STATICREDIRECT__' ),
+	'redirect'                  => array( '0', '#ANCAMINAR', '#REDIRECIONAMENTO', '#REDIRECT' ),
+	'img_right'                 => array( '1', 'dreita', 'direita', 'right' ),
+	'img_left'                  => array( '1', 'squierda', 'esquerda', 'left' ),
+	'img_none'                  => array( '1', 'nanhun', 'nenhum', 'none' ),
+	'img_center'                => array( '1', 'centro', 'center', 'centre' ),
+	'img_middle'                => array( '1', 'meio', 'middle' ),
+	'language'                  => array( '0', '#LHENGUA:', '#IDIOMA:', '#LANGUAGE:' ),
+	'filepath'                  => array( '0', 'CAMINOFEXEIRO:', 'CAMINHODOARQUIVO', 'FILEPATH:' ),
+	'tag'                       => array( '0', 'eitiqueta', 'tag' ),
+	'pagesize'                  => array( '1', 'TAMANHOFEXEIRO', 'TAMANHODAPAGINA', 'TAMANHODAPÁGINA', 'PAGESIZE' ),
+	'staticredirect'            => array( '1', '_ANCAMINARSTATICO_', '__REDIRECIONAMENTOESTATICO__', '__REDIRECIONAMENTOESTÁTICO__', '__STATICREDIRECT__' ),
 );
 
 $messages = array(
diff --git a/languages/messages/MessagesMyv.php b/languages/messages/MessagesMyv.php
index 4868a464a7..f908fdc071 100644
--- a/languages/messages/MessagesMyv.php
+++ b/languages/messages/MessagesMyv.php
@@ -114,75 +114,75 @@ $specialPageAliases = array(
 );
 
 $magicWords = array(
-	'currentmonth'            => array( '1', 'МОЛИЦЯКОВ', 'ТЕКУЩИЙ_МЕСЯЦ', 'ТЕКУЩИЙ_МЕСЯЦ_2', 'CURRENTMONTH', 'CURRENTMONTH2' ),
-	'currentmonthname'        => array( '1', 'МОЛИЦЯКОВЛЕМ', 'НАЗВАНИЕ_ТЕКУЩЕГО_МЕСЯЦА', 'CURRENTMONTHNAME' ),
-	'currentmonthnamegen'     => array( '1', 'МОЛИЦЯКОВЛЕМГЕН', 'НАЗВАНИЕ_ТЕКУЩЕГО_МЕСЯЦА_РОД', 'CURRENTMONTHNAMEGEN' ),
-	'currentmonthabbrev'      => array( '1', 'МОЛИЦЯКОВКИРЬТЯНЬХВОРМА', 'НАЗВАНИЕ_ТЕКУЩЕГО_МЕСЯЦА_АБР', 'CURRENTMONTHABBREV' ),
-	'currentday'              => array( '1', 'МОЛИЦЯЧЫ', 'ТЕКУЩИЙ_ДЕНЬ', 'CURRENTDAY' ),
-	'currentday2'             => array( '1', 'МОЛИЦЯЧЫ2', 'ТЕКУЩИЙ_ДЕНЬ_2', 'CURRENTDAY2' ),
-	'currentdayname'          => array( '1', 'МОЛИЦЯЧЫЛЕМ', 'НАЗВАНИЕ_ТЕКУЩЕГО_ДНЯ', 'CURRENTDAYNAME' ),
-	'currentyear'             => array( '1', 'МОЛИЦЯИЕ', 'ТЕКУЩИЙ_ГОД', 'CURRENTYEAR' ),
-	'currenttime'             => array( '1', 'МОЛИЦЯШКА', 'ТЕКУЩЕЕ_ВРЕМЯ', 'CURRENTTIME' ),
-	'currenthour'             => array( '1', 'МОЛИЦЯЦЯС', 'ТЕКУЩИЙ_ЧАС', 'CURRENTHOUR' ),
-	'localmonth'              => array( '1', 'ТЕСКЭНЬКОВ', 'МЕСТНЫЙ_МЕСЯЦ', 'МЕСТНЫЙ_МЕСЯЦ_2', 'LOCALMONTH', 'LOCALMONTH2' ),
-	'localmonthname'          => array( '1', 'ТЕСКЭНЬКОВЛЕМ', 'НАЗВАНИЕ_МЕСТНОГО_МЕСЯЦА', 'LOCALMONTHNAME' ),
-	'localmonthnamegen'       => array( '1', 'ТЕСКЭНЬКОВЛЕМГЕН', 'НАЗВАНИЕ_МЕСТНОГО_МЕСЯЦА_РОД', 'LOCALMONTHNAMEGEN' ),
-	'localmonthabbrev'        => array( '1', 'ТЕСКЭНЬКОВКИРЬТЯНЬХВОРМА', 'НАЗВАНИЕ_МЕСТНОГО_МЕСЯЦА_АБР', 'LOCALMONTHABBREV' ),
-	'localday'                => array( '1', 'ТЕСКЭНЬЧЫ', 'МЕСТНЫЙ_ДЕНЬ', 'LOCALDAY' ),
-	'localday2'               => array( '1', 'ТЕСКЭНЬЧЫ2', 'МЕСТНЫЙ_ДЕНЬ_2', 'LOCALDAY2' ),
-	'localdayname'            => array( '1', 'ТЕСКЭНЬЧЫЛЕМ', 'НАЗВАНИЕ_МЕСТНОГО_ДНЯ', 'LOCALDAYNAME' ),
-	'localyear'               => array( '1', 'ТЕСКЭНЬИЕ', 'МЕСТНЫЙ_ГОД', 'LOCALYEAR' ),
-	'localtime'               => array( '1', 'ТЕСКЭНЬШКА', 'МЕСТНОЕ_ВРЕМЯ', 'LOCALTIME' ),
-	'localhour'               => array( '1', 'ТЕСКЭНЬЦЯС', 'МЕСТНЫЙ_ЧАС', 'LOCALHOUR' ),
-	'numberofpages'           => array( '1', 'ЗЯРОЛОПАТ', 'КОЛИЧЕСТВО_СТРАНИЦ', 'NUMBEROFPAGES' ),
-	'numberofarticles'        => array( '1', 'ЗЯРОСЁРМАДОВКСТ', 'КОЛИЧЕСТВО_СТАТЕЙ', 'NUMBEROFARTICLES' ),
-	'numberoffiles'           => array( '1', 'ЗЯРОФАЙЛАТ', 'КОЛИЧЕСТВО_ФАЙЛОВ', 'NUMBEROFFILES' ),
-	'numberofusers'           => array( '1', 'ЗЯРОТЕИЦЯТ', 'КОЛИЧЕСТВО_УЧАСТНИКОВ', 'NUMBEROFUSERS' ),
-	'numberofedits'           => array( '1', 'ЗЯРОВИТНЕМАТПЕТНЕМАТ', 'КОЛИЧЕСТВО_ПРАВОК', 'NUMBEROFEDITS' ),
-	'pagename'                => array( '1', 'ЛОПАЛЕМ', 'НАЗВАНИЕ_СТРАНИЦЫ', 'PAGENAME' ),
-	'namespace'               => array( '1', 'ЛЕМПОТМО', 'ПРОСТРАНСТВО_ИМЁН', 'NAMESPACE' ),
-	'talkspace'               => array( '1', 'КОРТАМОПОТМО', 'ПРОСТРАНСТВО_ОБСУЖДЕНИЙ', 'TALKSPACE' ),
-	'fullpagename'            => array( '1', 'ЛОПАЛЕМКУВАКАСТО', 'ПОЛНОЕ_НАЗВАНИЕ_СТРАНИЦЫ', 'FULLPAGENAME' ),
-	'talkpagename'            => array( '1', 'КОРТАМОЛОПАЛЕМ', 'НАЗВАНИЕ_СТРАНИЦЫ_ОБСУЖДЕНИЯ', 'TALKPAGENAME' ),
-	'msg'                     => array( '0', 'ПАЧТЯМНЭ:', 'СООБЩЕНИЕ:', 'СООБЩ:', 'MSG:' ),
-	'img_thumbnail'           => array( '1', 'кенжешка', 'мини', 'миниатюра', 'thumbnail', 'thumb' ),
-	'img_right'               => array( '1', 'вить_кедь', 'справа', 'right' ),
-	'img_left'                => array( '1', 'керш_кедь', 'слева', 'left' ),
-	'img_none'                => array( '1', 'вейкеяк_арась', 'без', 'none' ),
-	'img_center'              => array( '1', 'куншкасо', 'центр', 'center', 'centre' ),
-	'img_framed'              => array( '1', 'кундсо', 'обрамить', 'framed', 'enframed', 'frame' ),
-	'img_frameless'           => array( '1', 'кундовтомо', 'безрамки', 'frameless' ),
-	'img_page'                => array( '1', 'лопа=$1', 'лопа $1', 'страница=$1', 'страница $1', 'страница $1', 'page=$1', 'page $1' ),
-	'img_top'                 => array( '1', 'верькс', 'сверху', 'top' ),
-	'img_text_top'            => array( '1', 'текст-верькс', 'текст-сверху', 'text-top' ),
-	'img_middle'              => array( '1', 'куншка', 'посередине', 'middle' ),
-	'img_bottom'              => array( '1', 'алкс', 'снизу', 'bottom' ),
-	'img_text_bottom'         => array( '1', 'текст-алкс', 'текст-снизу', 'text-bottom' ),
-	'sitename'                => array( '1', 'САЙТЛЕМ', 'НАЗВАНИЕ_САЙТА', 'SITENAME' ),
-	'gender'                  => array( '0', 'СЫМЕ:', 'ПОЛ:', 'GENDER:' ),
-	'currentweek'             => array( '1', 'МОЛИЦЯ_ТАРГО', 'ТЕКУЩАЯ_НЕДЕЛЯ', 'CURRENTWEEK' ),
-	'currentdow'              => array( '1', 'МОЛИЦЯ_ЧИ', 'ТЕКУЩИЙ_ДЕНЬ_НЕДЕЛИ', 'CURRENTDOW' ),
-	'localweek'               => array( '1', 'ТЕСКЭНЬТАРГО', 'МЕСТНАЯ_НЕДЕЛЯ', 'LOCALWEEK' ),
-	'revisionid'              => array( '1', 'ЛИЯКСТОМТОМАID', 'ИД_ВЕРСИИ', 'REVISIONID' ),
-	'revisionday'             => array( '1', 'ЛИЯКСТОМТОМАЧЫ', 'ДЕНЬ_ВЕРСИИ', 'REVISIONDAY' ),
-	'revisionday2'            => array( '1', 'ЛИЯКСТОМТОМАЧЫ2', 'ДЕНЬ_ВЕРСИИ_2', 'REVISIONDAY2' ),
-	'revisionmonth'           => array( '1', 'ЛИЯКСТОМТОМАКОВ', 'МЕСЯЦ_ВЕРСИИ', 'REVISIONMONTH' ),
-	'revisionyear'            => array( '1', 'ЛИЯКСТОМТОМАИЕ', 'ГОД_ВЕРСИИ', 'REVISIONYEAR' ),
-	'plural'                  => array( '0', 'ЛАМОНЬЧИСЛА', 'МНОЖЕСТВЕННОЕ_ЧИСЛО:', 'PLURAL:' ),
-	'lcfirst'                 => array( '0', 'ВАСЕНЦЕ_ТЕШТЬКЕСЬ_ВИШКИНЕ:', 'ПЕРВАЯ_БУКВА_МАЛЕНЬКАЯ:', 'LCFIRST:' ),
-	'ucfirst'                 => array( '0', 'ВАСЕНЦЕ_ТЕШТЬКЕСЬ_ПОКШ:', 'ПЕРВАЯ_БУКВА_БОЛЬШАЯ:', 'UCFIRST:' ),
-	'lc'                      => array( '0', 'ВИШКА_ТЕШТЬКЕСЭ:', 'МАЛЕНЬКИМИ_БУКВАМИ:', 'LC:' ),
-	'uc'                      => array( '0', 'ПОШК_ТЕШТЬКЕСЭ:', 'БОЛЬШИМИ_БУКВАМИ:', 'UC:' ),
-	'raw'                     => array( '0', 'ВЕРЕКСТЭ', 'НЕОБРАБ:', 'RAW:' ),
-	'displaytitle'            => array( '1', 'НЕВТЕМС_КОНЯКС', 'ПОКАЗАТЬ_ЗАГОЛОВОК', 'DISPLAYTITLE' ),
-	'currentversion'          => array( '1', 'ТЕВАТЕВЕРСИЯ', 'ТЕКУЩАЯ_ВЕРСИЯ', 'CURRENTVERSION' ),
-	'language'                => array( '0', '#КЕЛЕСЬ:', '#ЯЗЫК:', '#LANGUAGE:' ),
-	'numberofadmins'          => array( '1', 'ЗЯРОАДМИНТНЭДЕ', 'КОЛИЧЕСТВО_АДМИНИСТРАТОРОВ', 'NUMBEROFADMINS' ),
-	'special'                 => array( '0', 'башка_тевень', 'служебная', 'special' ),
-	'filepath'                => array( '0', 'ФАЙЛАНЬКИ', 'ПУТЬ_К_ФАЙЛУ:', 'FILEPATH:' ),
-	'pagesize'                => array( '1', 'ЛОПАКУВАЛМО', 'РАЗМЕР_СТРАНИЦЫ', 'PAGESIZE' ),
-	'url_path'                => array( '0', 'ЯН', 'ПУТЬ', 'PATH' ),
-	'url_wiki'                => array( '0', 'ВИКИ', 'WIKI' ),
+	'currentmonth'              => array( '1', 'МОЛИЦЯКОВ', 'ТЕКУЩИЙ_МЕСЯЦ', 'ТЕКУЩИЙ_МЕСЯЦ_2', 'CURRENTMONTH', 'CURRENTMONTH2' ),
+	'currentmonthname'          => array( '1', 'МОЛИЦЯКОВЛЕМ', 'НАЗВАНИЕ_ТЕКУЩЕГО_МЕСЯЦА', 'CURRENTMONTHNAME' ),
+	'currentmonthnamegen'       => array( '1', 'МОЛИЦЯКОВЛЕМГЕН', 'НАЗВАНИЕ_ТЕКУЩЕГО_МЕСЯЦА_РОД', 'CURRENTMONTHNAMEGEN' ),
+	'currentmonthabbrev'        => array( '1', 'МОЛИЦЯКОВКИРЬТЯНЬХВОРМА', 'НАЗВАНИЕ_ТЕКУЩЕГО_МЕСЯЦА_АБР', 'CURRENTMONTHABBREV' ),
+	'currentday'                => array( '1', 'МОЛИЦЯЧЫ', 'ТЕКУЩИЙ_ДЕНЬ', 'CURRENTDAY' ),
+	'currentday2'               => array( '1', 'МОЛИЦЯЧЫ2', 'ТЕКУЩИЙ_ДЕНЬ_2', 'CURRENTDAY2' ),
+	'currentdayname'            => array( '1', 'МОЛИЦЯЧЫЛЕМ', 'НАЗВАНИЕ_ТЕКУЩЕГО_ДНЯ', 'CURRENTDAYNAME' ),
+	'currentyear'               => array( '1', 'МОЛИЦЯИЕ', 'ТЕКУЩИЙ_ГОД', 'CURRENTYEAR' ),
+	'currenttime'               => array( '1', 'МОЛИЦЯШКА', 'ТЕКУЩЕЕ_ВРЕМЯ', 'CURRENTTIME' ),
+	'currenthour'               => array( '1', 'МОЛИЦЯЦЯС', 'ТЕКУЩИЙ_ЧАС', 'CURRENTHOUR' ),
+	'localmonth'                => array( '1', 'ТЕСКЭНЬКОВ', 'МЕСТНЫЙ_МЕСЯЦ', 'МЕСТНЫЙ_МЕСЯЦ_2', 'LOCALMONTH', 'LOCALMONTH2' ),
+	'localmonthname'            => array( '1', 'ТЕСКЭНЬКОВЛЕМ', 'НАЗВАНИЕ_МЕСТНОГО_МЕСЯЦА', 'LOCALMONTHNAME' ),
+	'localmonthnamegen'         => array( '1', 'ТЕСКЭНЬКОВЛЕМГЕН', 'НАЗВАНИЕ_МЕСТНОГО_МЕСЯЦА_РОД', 'LOCALMONTHNAMEGEN' ),
+	'localmonthabbrev'          => array( '1', 'ТЕСКЭНЬКОВКИРЬТЯНЬХВОРМА', 'НАЗВАНИЕ_МЕСТНОГО_МЕСЯЦА_АБР', 'LOCALMONTHABBREV' ),
+	'localday'                  => array( '1', 'ТЕСКЭНЬЧЫ', 'МЕСТНЫЙ_ДЕНЬ', 'LOCALDAY' ),
+	'localday2'                 => array( '1', 'ТЕСКЭНЬЧЫ2', 'МЕСТНЫЙ_ДЕНЬ_2', 'LOCALDAY2' ),
+	'localdayname'              => array( '1', 'ТЕСКЭНЬЧЫЛЕМ', 'НАЗВАНИЕ_МЕСТНОГО_ДНЯ', 'LOCALDAYNAME' ),
+	'localyear'                 => array( '1', 'ТЕСКЭНЬИЕ', 'МЕСТНЫЙ_ГОД', 'LOCALYEAR' ),
+	'localtime'                 => array( '1', 'ТЕСКЭНЬШКА', 'МЕСТНОЕ_ВРЕМЯ', 'LOCALTIME' ),
+	'localhour'                 => array( '1', 'ТЕСКЭНЬЦЯС', 'МЕСТНЫЙ_ЧАС', 'LOCALHOUR' ),
+	'numberofpages'             => array( '1', 'ЗЯРОЛОПАТ', 'КОЛИЧЕСТВО_СТРАНИЦ', 'NUMBEROFPAGES' ),
+	'numberofarticles'          => array( '1', 'ЗЯРОСЁРМАДОВКСТ', 'КОЛИЧЕСТВО_СТАТЕЙ', 'NUMBEROFARTICLES' ),
+	'numberoffiles'             => array( '1', 'ЗЯРОФАЙЛАТ', 'КОЛИЧЕСТВО_ФАЙЛОВ', 'NUMBEROFFILES' ),
+	'numberofusers'             => array( '1', 'ЗЯРОТЕИЦЯТ', 'КОЛИЧЕСТВО_УЧАСТНИКОВ', 'NUMBEROFUSERS' ),
+	'numberofedits'             => array( '1', 'ЗЯРОВИТНЕМАТПЕТНЕМАТ', 'КОЛИЧЕСТВО_ПРАВОК', 'NUMBEROFEDITS' ),
+	'pagename'                  => array( '1', 'ЛОПАЛЕМ', 'НАЗВАНИЕ_СТРАНИЦЫ', 'PAGENAME' ),
+	'namespace'                 => array( '1', 'ЛЕМПОТМО', 'ПРОСТРАНСТВО_ИМЁН', 'NAMESPACE' ),
+	'talkspace'                 => array( '1', 'КОРТАМОПОТМО', 'ПРОСТРАНСТВО_ОБСУЖДЕНИЙ', 'TALKSPACE' ),
+	'fullpagename'              => array( '1', 'ЛОПАЛЕМКУВАКАСТО', 'ПОЛНОЕ_НАЗВАНИЕ_СТРАНИЦЫ', 'FULLPAGENAME' ),
+	'talkpagename'              => array( '1', 'КОРТАМОЛОПАЛЕМ', 'НАЗВАНИЕ_СТРАНИЦЫ_ОБСУЖДЕНИЯ', 'TALKPAGENAME' ),
+	'msg'                       => array( '0', 'ПАЧТЯМНЭ:', 'СООБЩЕНИЕ:', 'СООБЩ:', 'MSG:' ),
+	'img_thumbnail'             => array( '1', 'кенжешка', 'мини', 'миниатюра', 'thumbnail', 'thumb' ),
+	'img_right'                 => array( '1', 'вить_кедь', 'справа', 'right' ),
+	'img_left'                  => array( '1', 'керш_кедь', 'слева', 'left' ),
+	'img_none'                  => array( '1', 'вейкеяк_арась', 'без', 'none' ),
+	'img_center'                => array( '1', 'куншкасо', 'центр', 'center', 'centre' ),
+	'img_framed'                => array( '1', 'кундсо', 'обрамить', 'framed', 'enframed', 'frame' ),
+	'img_frameless'             => array( '1', 'кундовтомо', 'безрамки', 'frameless' ),
+	'img_page'                  => array( '1', 'лопа=$1', 'лопа $1', 'страница=$1', 'страница $1', 'страница $1', 'page=$1', 'page $1' ),
+	'img_top'                   => array( '1', 'верькс', 'сверху', 'top' ),
+	'img_text_top'              => array( '1', 'текст-верькс', 'текст-сверху', 'text-top' ),
+	'img_middle'                => array( '1', 'куншка', 'посередине', 'middle' ),
+	'img_bottom'                => array( '1', 'алкс', 'снизу', 'bottom' ),
+	'img_text_bottom'           => array( '1', 'текст-алкс', 'текст-снизу', 'text-bottom' ),
+	'sitename'                  => array( '1', 'САЙТЛЕМ', 'НАЗВАНИЕ_САЙТА', 'SITENAME' ),
+	'gender'                    => array( '0', 'СЫМЕ:', 'ПОЛ:', 'GENDER:' ),
+	'currentweek'               => array( '1', 'МОЛИЦЯ_ТАРГО', 'ТЕКУЩАЯ_НЕДЕЛЯ', 'CURRENTWEEK' ),
+	'currentdow'                => array( '1', 'МОЛИЦЯ_ЧИ', 'ТЕКУЩИЙ_ДЕНЬ_НЕДЕЛИ', 'CURRENTDOW' ),
+	'localweek'                 => array( '1', 'ТЕСКЭНЬТАРГО', 'МЕСТНАЯ_НЕДЕЛЯ', 'LOCALWEEK' ),
+	'revisionid'                => array( '1', 'ЛИЯКСТОМТОМАID', 'ИД_ВЕРСИИ', 'REVISIONID' ),
+	'revisionday'               => array( '1', 'ЛИЯКСТОМТОМАЧЫ', 'ДЕНЬ_ВЕРСИИ', 'REVISIONDAY' ),
+	'revisionday2'              => array( '1', 'ЛИЯКСТОМТОМАЧЫ2', 'ДЕНЬ_ВЕРСИИ_2', 'REVISIONDAY2' ),
+	'revisionmonth'             => array( '1', 'ЛИЯКСТОМТОМАКОВ', 'МЕСЯЦ_ВЕРСИИ', 'REVISIONMONTH' ),
+	'revisionyear'              => array( '1', 'ЛИЯКСТОМТОМАИЕ', 'ГОД_ВЕРСИИ', 'REVISIONYEAR' ),
+	'plural'                    => array( '0', 'ЛАМОНЬЧИСЛА', 'МНОЖЕСТВЕННОЕ_ЧИСЛО:', 'PLURAL:' ),
+	'lcfirst'                   => array( '0', 'ВАСЕНЦЕ_ТЕШТЬКЕСЬ_ВИШКИНЕ:', 'ПЕРВАЯ_БУКВА_МАЛЕНЬКАЯ:', 'LCFIRST:' ),
+	'ucfirst'                   => array( '0', 'ВАСЕНЦЕ_ТЕШТЬКЕСЬ_ПОКШ:', 'ПЕРВАЯ_БУКВА_БОЛЬШАЯ:', 'UCFIRST:' ),
+	'lc'                        => array( '0', 'ВИШКА_ТЕШТЬКЕСЭ:', 'МАЛЕНЬКИМИ_БУКВАМИ:', 'LC:' ),
+	'uc'                        => array( '0', 'ПОШК_ТЕШТЬКЕСЭ:', 'БОЛЬШИМИ_БУКВАМИ:', 'UC:' ),
+	'raw'                       => array( '0', 'ВЕРЕКСТЭ', 'НЕОБРАБ:', 'RAW:' ),
+	'displaytitle'              => array( '1', 'НЕВТЕМС_КОНЯКС', 'ПОКАЗАТЬ_ЗАГОЛОВОК', 'DISPLAYTITLE' ),
+	'currentversion'            => array( '1', 'ТЕВАТЕВЕРСИЯ', 'ТЕКУЩАЯ_ВЕРСИЯ', 'CURRENTVERSION' ),
+	'language'                  => array( '0', '#КЕЛЕСЬ:', '#ЯЗЫК:', '#LANGUAGE:' ),
+	'numberofadmins'            => array( '1', 'ЗЯРОАДМИНТНЭДЕ', 'КОЛИЧЕСТВО_АДМИНИСТРАТОРОВ', 'NUMBEROFADMINS' ),
+	'special'                   => array( '0', 'башка_тевень', 'служебная', 'special' ),
+	'filepath'                  => array( '0', 'ФАЙЛАНЬКИ', 'ПУТЬ_К_ФАЙЛУ:', 'FILEPATH:' ),
+	'pagesize'                  => array( '1', 'ЛОПАКУВАЛМО', 'РАЗМЕР_СТРАНИЦЫ', 'PAGESIZE' ),
+	'url_path'                  => array( '0', 'ЯН', 'ПУТЬ', 'PATH' ),
+	'url_wiki'                  => array( '0', 'ВИКИ', 'WIKI' ),
 );
 
 $messages = array(
@@ -193,7 +193,7 @@ $messages = array(
 'tog-hidepatrolled' => 'Кекшемс лувонь кирдиень витнеметнень-петнематнень чыяконь полавтнематнестэ',
 'tog-newpageshidepatrolled' => 'Кекшемс лувонь кирдиень ванстома лопатнень од лопань керьксэнть эйстэ',
 'tog-extendwatchlist' => 'Келейгавтомс сёрмадовксонь мельга ваномань сёрмалевксэнть невтевест весе полавтнематне, аволь ансяк чыеньсетне.',
-'tog-usenewrc' => 'Нолдак тевс вадрялгавтозь од лиякстомат  (веши JavaScript)',
+'tog-usenewrc' => 'Пурнамс лиякстомтомат лопань коряс куронь-куронь чиень полавтнематнесэ-ванома лемрисьметнесэ  (веши JavaScript)',
 'tog-numberheadings' => 'Сёрмадовкс коняксос кадык сынсь ловома валтнэ путовить',
 'tog-showtoolbar' => 'Кедьёнкс лазнэнть невтемс сёрмадома шкасто (JavaScript)',
 'tog-editondblclick' => 'Кавксть лепштязь совамс сёрмадовксонь витнеме-петнеме (JavaScript)',
@@ -201,7 +201,7 @@ $messages = array(
 'tog-editsectiononrightclick' => 'Витнемс секциятнень-пелькстнэнь, лепштямс сёрмадовксонть лемензэ лангс чэерень витьёнсе повнэсэ  (JavaScript)',
 'tog-showtoc' => 'Невтемс сёрмадовкс потмокс (лопатненень, конатнесэ 3-до ламо сёрмадовкст)',
 'tog-rememberpassword' => 'Ледстемс совамо валом те бравзерсэнть (сех кувать $1 {{PLURAL:$1|чи|чить}})',
-'tog-watchcreations' => 'Совавтомс монь теевть лопатнень ванома лем рисьмезэнь',
+'tog-watchcreations' => 'Совавтомс ванома лемрисьмезэнь монь теевть лопатнень ды сень, мезе йовкстан',
 'tog-watchdefault' => 'Совавтомс монь витевть лопатнень ванома лем рисьмезэнь',
 'tog-watchmoves' => 'Лопанть лиякстомтса, совавтык ванома лем рисьмезэнь',
 'tog-watchdeletion' => 'Лопанть нардаса, совавтык сонзэ ванома лем рисьмезэнь',
@@ -214,6 +214,7 @@ $messages = array(
 'tog-enotifminoredits' => 'Пачтямс е-сёрмасо лиякстомтоматнеде, сестэяк зярдо апокшкынеть',
 'tog-enotifrevealaddr' => 'Штавтомс е-сёрмань адресэм яволявтомань сёрмадовкстнэсэ',
 'tog-shownumberswatching' => 'Невтемс зяро теицятнеде, конат аравтызь лопанть эсест ванома лемрисьментень',
+'tog-oldsig' => 'Уликс кедьпутовксось:',
 'tog-fancysig' => 'Лемпутовксось прок викитекст (сонсь теевиця сюлмавома певтеме)',
 'tog-externaleditor' => 'Нолдамс тевс ушоёнонь витнемканть, зярс лиякс апак аравто (ансяк тевень содыйтненень, арсий машинасот эрявить башка ёнкст-аравтомат [//www.mediawiki.org/wiki/Manual:External_editors подробнее])',
 'tog-externaldiff' => 'Нолдамс тевс ушоёнонь diff, зярс лиякс апак аравто (ансяк тевень содыйтненень, арсий машинасот эрявить башка ёнкст-аравтомат [//www.mediawiki.org/wiki/Manual:External_editors подробнее])',
@@ -310,6 +311,7 @@ $messages = array(
 'listingcontinuesabbrev' => 'поладксозо моли',
 'index-category' => 'Индекс марто лопатне',
 'noindex-category' => 'Индекстэме лопатне',
+'broken-file-category' => 'Лопат, конатнесэ файлань яжазь сюлмавомапеть',
 
 'about' => 'Эстедензэ',
 'article' => 'Потмокслопа',
@@ -689,7 +691,7 @@ IP-тешкстэть — $3, саймас совавтоманть ID-сь —
 {{FULLPAGENAME}}|action=edit}} витнемс-петнемс те лопанть]</span>.',
 'updated' => '(Одолгавтозь)',
 'note' => "'''Явт мель:'''",
-'previewnote' => "'''Кирдть мельсэ, Те ансяк васнянь невтевкс.'''
+'previewnote' => "'''Кирдтяя мельсэ, те ансяк васнянь невтевкс.'''
 Полавтоматне зярс апак вансто!",
 'editing' => 'Витнят-петнят $1',
 'editingsection' => 'Витнеме-петнеме $1 (секциянть)',
@@ -728,6 +730,7 @@ IP-тешкстэть — $3, саймас совавтоманть ID-сь —
 'post-expand-template-inclusion-warning' => 'Ванок: Парцунлопатнеде кельгстят пек ламо.
 Совавтовомо аволь весе парцунлопатне кельгить.',
 'post-expand-template-inclusion-category' => 'Лопатне, конатнень лопапарцун марто покшолмаст пек ламо',
+'post-expand-template-argument-warning' => "'''Ванок''': Те лопасонть ули лопапарцунонь вейке эли седе ламо аргумент, конась вельть покш. Сеть аргументтнэ нардазь.",
 'post-expand-template-argument-category' => 'Лопатнесэ улить лопа парцунонь нардань аргументт',
 'parser-template-loop-warning' => 'Лопа парцунсто "чары реве" муевсь: [[$1]]',
 
@@ -811,7 +814,7 @@ IP-тешкстэть — $3, саймас совавтоманть ID-сь —
 'revertmerge' => 'Явомс логонть мекев, кода ульнесь вейтьсэндямодо икеле',
 
 # Diffs
-'history-title' => 'Историясь ламо вановксонть "$1"',
+'history-title' => '"$1"-нь полавтнемань историязо',
 'lineno' => 'Киксэсь $1:',
 'compareselectedversions' => 'Кочказь версиятнень аравтомс карадо-каршо',
 'editundo' => 'Велявтомс мекев мезе витнинь-петнинь',
@@ -945,6 +948,8 @@ IP-тешкстэть — $3, саймас совавтоманть ID-сь —
 'gender-female' => 'Авань сыме',
 'email' => 'Е-сёрма',
 'prefs-help-realname' => 'Алкуксонь леметь (арась мелеть, иляк путо): путсак, ды сон карми неявомо не таркатнесэ, косо тон тев теят.',
+'prefs-help-email' => 'Е-сёрмапаргот а эряви тешкстамс. Сон карми эрявомо ансяк салававалонь одов пачтямсто ёмавтындерясак неень салавань валот.',
+'prefs-help-email-others' => 'Мелеть сайтянзат, путыка кортамо лопазот е-сёрмапаргот, конань вельде лия ломантне сёрмадовить тенть. Минек вельде е-сёрмапаргот зярдояк а неяви, зярдо лия совицятне сёрмалить тенть.',
 'prefs-help-email-required' => 'Е-сёрмань адресэть эряви.',
 'prefs-signature' => 'Кедь путовкс',
 'prefs-dateformat' => 'Ков чинь форматозо',
diff --git a/languages/messages/MessagesMzn.php b/languages/messages/MessagesMzn.php
index f94221b4f2..68482dbdb0 100644
--- a/languages/messages/MessagesMzn.php
+++ b/languages/messages/MessagesMzn.php
@@ -74,56 +74,56 @@ $namespaceAliases = 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__' ),
-	'noheader'                => array( '0', 'بی‌عنوان__', '__بی‌عنوان__', '__NOHEADER__' ),
-	'currentmonth'            => array( '1', 'ماه', 'ماه‌کنونی', 'ماه_کنونی', 'ماه‌کنونی۲', 'ماه_اسایی۲', 'ماه_کنونی۲', 'CURRENTMONTH', 'CURRENTMONTH2' ),
-	'currentmonth1'           => array( '1', 'ماه۱', 'ماه‌کنونی۱', 'ماه_کنونی۱', 'CURRENTMONTH1' ),
-	'currentmonthname'        => array( '1', 'نام‌ماه', 'نام_ماه', 'نام‌ماه‌کنونی', 'نام_ماه_کنونی', 'CURRENTMONTHNAME' ),
-	'currentmonthnamegen'     => array( '1', 'نام‌ماه‌اضافه', 'نام_ماه_اضافه', 'نام‌ماه‌کنونی‌اضافه', 'نام_ماه_کنونی_اضافه', 'CURRENTMONTHNAMEGEN' ),
-	'currentmonthabbrev'      => array( '1', 'مخفف‌نام‌ماه', 'مخفف_نام_ماه', 'CURRENTMONTHABBREV' ),
-	'currentday'              => array( '1', 'روز', 'روزکنونی', 'روز_کنونی', 'CURRENTDAY' ),
-	'currentday2'             => array( '1', 'روز۲', 'روز_۲', 'CURRENTDAY2' ),
-	'currentdayname'          => array( '1', 'نام‌روز', 'نام_روز', 'CURRENTDAYNAME' ),
-	'currentyear'             => array( '1', 'سال', 'سال‌کنونی', 'سال_کنونی', 'CURRENTYEAR' ),
-	'currenttime'             => array( '1', 'زمان‌کنونی', 'زمان_کنونی', 'CURRENTTIME' ),
-	'currenthour'             => array( '1', 'ساعت', 'ساعت‌کنونی', 'ساعت_کنونی', 'CURRENTHOUR' ),
-	'localmonth'              => array( '1', 'ماه‌محلی', 'ماه_محلی', 'ماه‌محلی۲', 'ماه_محلی۲', 'LOCALMONTH', 'LOCALMONTH2' ),
-	'localmonth1'             => array( '1', 'ماه‌محلی۱', 'ماه_محلی۱', 'LOCALMONTH1' ),
-	'localmonthname'          => array( '1', 'نام‌ماه‌محلی', 'نام_ماه_محلی', 'LOCALMONTHNAME' ),
-	'localmonthnamegen'       => array( '1', 'نام‌ماه‌محلی‌اضافه', 'نام_ماه_محلی_اضافه', 'LOCALMONTHNAMEGEN' ),
-	'localmonthabbrev'        => array( '1', 'مخفف‌ماه‌محلی', 'مخفف_ماه_محلی', 'LOCALMONTHABBREV' ),
-	'localday'                => array( '1', 'روزمحلی', 'روز_محلی', 'LOCALDAY' ),
-	'localday2'               => array( '1', 'روزمحلی۲', 'روز_محلی_۲', 'LOCALDAY2' ),
-	'localdayname'            => array( '1', 'نام‌روزمحلی', 'نام_روز_محلی', 'LOCALDAYNAME' ),
-	'localyear'               => array( '1', 'سال‌محلی', 'سال_محلی', 'LOCALYEAR' ),
-	'localtime'               => array( '1', 'زمون_محلی', 'زمان_محلی', 'زمان‌محلی', 'LOCALTIME' ),
-	'localhour'               => array( '1', 'ساعت‌محلی', 'ساعت_محلی', 'LOCALHOUR' ),
-	'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' ),
-	'talkspace'               => array( '1', 'فضای‌گپ', 'فضای_گپ', 'فضای‌بحث', 'فضای_بحث', 'TALKSPACE' ),
-	'talkspacee'              => array( '1', 'فضای‌گپ_کد', 'فضای_گپ_کد', 'فضای‌بحث‌کد', 'فضای_بحث_کد', 'TALKSPACEE' ),
-	'subjectspace'            => array( '1', 'فضای‌موضوع', 'فضای‌مقاله', 'فضای_موضوع', 'فضای_مقاله', 'SUBJECTSPACE', 'ARTICLESPACE' ),
-	'int'                     => array( '0', 'ترجمه:', 'INT:' ),
-	'sitename'                => array( '1', 'نام‌وبگاه', 'نام_وبگاه', 'SITENAME' ),
-	'ns'                      => array( '0', 'فن:', 'NS:' ),
-	'nse'                     => array( '0', 'فنک:', 'NSE:' ),
-	'localurl'                => array( '0', 'نشونی:', 'نشانی:', 'LOCALURL:' ),
-	'grammar'                 => array( '0', 'دستور_زبون:', 'دستور_زوون:', 'دستورزبان:', 'دستور_زبان:', 'GRAMMAR:' ),
-	'gender'                  => array( '0', 'جنسیت:', 'جنس:', 'GENDER:' ),
+	'redirect'                  => array( '0', '#بور', '#تغییرمسیر', '#تغییر_مسیر', '#REDIRECT' ),
+	'notoc'                     => array( '0', '__بی‌فهرست__', '__NOTOC__' ),
+	'nogallery'                 => array( '0', '__بی‌نگارخنه__', '__بی‌نگارخانه__', '__NOGALLERY__' ),
+	'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' ),
+	'currentmonthnamegen'       => array( '1', 'نام‌ماه‌اضافه', 'نام_ماه_اضافه', 'نام‌ماه‌کنونی‌اضافه', 'نام_ماه_کنونی_اضافه', 'CURRENTMONTHNAMEGEN' ),
+	'currentmonthabbrev'        => array( '1', 'مخفف‌نام‌ماه', 'مخفف_نام_ماه', 'CURRENTMONTHABBREV' ),
+	'currentday'                => array( '1', 'روز', 'روزکنونی', 'روز_کنونی', 'CURRENTDAY' ),
+	'currentday2'               => array( '1', 'روز۲', 'روز_۲', 'CURRENTDAY2' ),
+	'currentdayname'            => array( '1', 'نام‌روز', 'نام_روز', 'CURRENTDAYNAME' ),
+	'currentyear'               => array( '1', 'سال', 'سال‌کنونی', 'سال_کنونی', 'CURRENTYEAR' ),
+	'currenttime'               => array( '1', 'زمان‌کنونی', 'زمان_کنونی', 'CURRENTTIME' ),
+	'currenthour'               => array( '1', 'ساعت', 'ساعت‌کنونی', 'ساعت_کنونی', 'CURRENTHOUR' ),
+	'localmonth'                => array( '1', 'ماه‌محلی', 'ماه_محلی', 'ماه‌محلی۲', 'ماه_محلی۲', 'LOCALMONTH', 'LOCALMONTH2' ),
+	'localmonth1'               => array( '1', 'ماه‌محلی۱', 'ماه_محلی۱', 'LOCALMONTH1' ),
+	'localmonthname'            => array( '1', 'نام‌ماه‌محلی', 'نام_ماه_محلی', 'LOCALMONTHNAME' ),
+	'localmonthnamegen'         => array( '1', 'نام‌ماه‌محلی‌اضافه', 'نام_ماه_محلی_اضافه', 'LOCALMONTHNAMEGEN' ),
+	'localmonthabbrev'          => array( '1', 'مخفف‌ماه‌محلی', 'مخفف_ماه_محلی', 'LOCALMONTHABBREV' ),
+	'localday'                  => array( '1', 'روزمحلی', 'روز_محلی', 'LOCALDAY' ),
+	'localday2'                 => array( '1', 'روزمحلی۲', 'روز_محلی_۲', 'LOCALDAY2' ),
+	'localdayname'              => array( '1', 'نام‌روزمحلی', 'نام_روز_محلی', 'LOCALDAYNAME' ),
+	'localyear'                 => array( '1', 'سال‌محلی', 'سال_محلی', 'LOCALYEAR' ),
+	'localtime'                 => array( '1', 'زمون_محلی', 'زمان_محلی', 'زمان‌محلی', 'LOCALTIME' ),
+	'localhour'                 => array( '1', 'ساعت‌محلی', 'ساعت_محلی', 'LOCALHOUR' ),
+	'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' ),
+	'talkspace'                 => array( '1', 'فضای‌گپ', 'فضای_گپ', 'فضای‌بحث', 'فضای_بحث', 'TALKSPACE' ),
+	'talkspacee'                => array( '1', 'فضای‌گپ_کد', 'فضای_گپ_کد', 'فضای‌بحث‌کد', 'فضای_بحث_کد', 'TALKSPACEE' ),
+	'subjectspace'              => array( '1', 'فضای‌موضوع', 'فضای‌مقاله', 'فضای_موضوع', 'فضای_مقاله', 'SUBJECTSPACE', 'ARTICLESPACE' ),
+	'int'                       => array( '0', 'ترجمه:', 'INT:' ),
+	'sitename'                  => array( '1', 'نام‌وبگاه', 'نام_وبگاه', 'SITENAME' ),
+	'ns'                        => array( '0', 'فن:', 'NS:' ),
+	'nse'                       => array( '0', 'فنک:', 'NSE:' ),
+	'localurl'                  => array( '0', 'نشونی:', 'نشانی:', 'LOCALURL:' ),
+	'grammar'                   => array( '0', 'دستور_زبون:', 'دستور_زوون:', 'دستورزبان:', 'دستور_زبان:', 'GRAMMAR:' ),
+	'gender'                    => array( '0', 'جنسیت:', 'جنس:', 'GENDER:' ),
 );
 
 $messages = array(
diff --git a/languages/messages/MessagesNb.php b/languages/messages/MessagesNb.php
index ec83973329..ce5f61a18c 100644
--- a/languages/messages/MessagesNb.php
+++ b/languages/messages/MessagesNb.php
@@ -192,124 +192,124 @@ $specialPageAliases = array(
 );
 
 $magicWords = array(
-	'redirect'                => array( '0', '#OMDIRIGERING', '#REDIRECT' ),
-	'notoc'                   => array( '0', '__INGENINNHOLDSFORTEGNELSE__', '__NOTOC__' ),
-	'nogallery'               => array( '0', '__INTETGALLERI__', '__NOGALLERY__' ),
-	'forcetoc'                => array( '0', '__TVINGINNHOLDSFORTEGNELSE__', '__FORCETOC__' ),
-	'toc'                     => array( '0', '__INNHOLDSFORTEGNELSE__', '__TOC__' ),
-	'noeditsection'           => array( '0', '__INGENSEKSJONSREDIGERING__', '__NOEDITSECTION__' ),
-	'currentmonth'            => array( '1', 'NÅVÆRENDEMÅNED', 'NÅVÆRENDEMÅNED2', 'CURRENTMONTH', 'CURRENTMONTH2' ),
-	'currentmonth1'           => array( '1', 'NÅVÆRENDEMÅNED1', 'CURRENTMONTH1' ),
-	'currentmonthname'        => array( '1', 'NÅVÆRENDEMÅNEDSNAVN', 'CURRENTMONTHNAME' ),
-	'currentmonthnamegen'     => array( '1', 'NÅVÆRENDEMÅNEDSNAVNGEN', 'CURRENTMONTHNAMEGEN' ),
-	'currentmonthabbrev'      => array( '1', 'NÅVÆRENDEMÅNEDSNAVNKORT', 'CURRENTMONTHABBREV' ),
-	'currentday'              => array( '1', 'NÅVÆRENDEDAG', 'CURRENTDAY' ),
-	'currentday2'             => array( '1', 'NÅVÆRENDEDAG2', 'CURRENTDAY2' ),
-	'currentdayname'          => array( '1', 'NÅVÆRENDEDAGSNAVN', 'CURRENTDAYNAME' ),
-	'currentyear'             => array( '1', 'NÅVÆRENDEÅR', 'CURRENTYEAR' ),
-	'currenttime'             => array( '1', 'NÅVÆRENDETID', 'CURRENTTIME' ),
-	'currenthour'             => array( '1', 'NÅVÆRENDETIME', 'CURRENTHOUR' ),
-	'localmonth'              => array( '1', 'LOKALMÅNED', 'LOKALMÅNED2', 'LOCALMONTH', 'LOCALMONTH2' ),
-	'localmonth1'             => array( '1', 'LOKALMÅNED1', 'LOCALMONTH1' ),
-	'localmonthname'          => array( '1', 'LOKALMÅNEDSNAVN', 'LOCALMONTHNAME' ),
-	'localmonthnamegen'       => array( '1', 'LOKALMÅNEDSNAVNGEN', 'LOCALMONTHNAMEGEN' ),
-	'localmonthabbrev'        => array( '1', 'LOKALMÅNEDSNAVNKORT', 'LOCALMONTHABBREV' ),
-	'localday'                => array( '1', 'LOKALDAG', 'LOCALDAY' ),
-	'localday2'               => array( '1', 'LOKALDAG2', 'LOCALDAY2' ),
-	'localdayname'            => array( '1', 'LOKALDAGSNAVN', 'LOCALDAYNAME' ),
-	'localyear'               => array( '1', 'LOKALTÅR', 'LOCALYEAR' ),
-	'localtime'               => array( '1', 'LOKALTID', 'LOCALTIME' ),
-	'localhour'               => array( '1', 'LOKALTIME', 'LOCALHOUR' ),
-	'numberofpages'           => array( '1', 'ANTALLSIDER', 'NUMBEROFPAGES' ),
-	'numberofarticles'        => array( '1', 'ANTALLARTIKLER', 'NUMBEROFARTICLES' ),
-	'numberoffiles'           => array( '1', 'ANTALLFILER', 'NUMBEROFFILES' ),
-	'numberofusers'           => array( '1', 'ANTALLBRUKERE', 'NUMBEROFUSERS' ),
-	'numberofactiveusers'     => array( '1', 'ANTALLAKTIVEBRUKERE', 'NUMBEROFACTIVEUSERS' ),
-	'numberofedits'           => array( '1', 'ANTALLREDIGERINGER', 'NUMBEROFEDITS' ),
-	'numberofviews'           => array( '1', 'ANTALLVISNINGER', 'NUMBEROFVIEWS' ),
-	'pagename'                => array( '1', 'SIDENAVN', 'PAGENAME' ),
-	'pagenamee'               => array( '1', 'SIDENAVNE', 'PAGENAMEE' ),
-	'namespace'               => array( '1', 'NAVNEROM', 'NAMESPACE' ),
-	'namespacee'              => array( '1', 'NAVNEROME', 'NAMESPACEE' ),
-	'talkspace'               => array( '1', 'DISKUSJONSROM', 'TALKSPACE' ),
-	'talkspacee'              => array( '1', 'DISKUSJONSROME', 'TALKSPACEE' ),
-	'subjectspace'            => array( '1', 'SUBJEKTROM', 'ARTIKKELROM', 'SUBJECTSPACE', 'ARTICLESPACE' ),
-	'subjectspacee'           => array( '1', 'SUBJEKTROME', 'ARTIKKELROME', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
-	'fullpagename'            => array( '1', 'FULLTSIDENAVN', 'FULLPAGENAME' ),
-	'fullpagenamee'           => array( '1', 'FULLTSIDENAVNE', 'FULLPAGENAMEE' ),
-	'subpagename'             => array( '1', 'UNDERSIDENAVN', 'SUBPAGENAME' ),
-	'subpagenamee'            => array( '1', 'UNDERSIDENAVNE', 'SUBPAGENAMEE' ),
-	'basepagename'            => array( '1', 'GRUNNSIDENAVN', 'BASEPAGENAME' ),
-	'basepagenamee'           => array( '1', 'GRUNNSIDENAVNE', 'BASEPAGENAMEE' ),
-	'talkpagename'            => array( '1', 'DISKUSJONSSIDENAVN', 'TALKPAGENAME' ),
-	'talkpagenamee'           => array( '1', 'DISKUSJONSSIDENAVNE', 'TALKPAGENAMEE' ),
-	'subjectpagename'         => array( '1', 'SUBJEKTSIDENAVN', 'ARTIKKELSIDENAVN', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
-	'subjectpagenamee'        => array( '1', 'SUBJEKTSIDENAVNE', 'ARTIKKELSIDENAVNE', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
-	'img_thumbnail'           => array( '1', 'miniatyr', 'mini', 'thumbnail', 'thumb' ),
-	'img_manualthumb'         => array( '1', 'miniatyr=$1', 'mini=$1', 'thumbnail=$1', 'thumb=$1' ),
-	'img_right'               => array( '1', 'høyre', 'right' ),
-	'img_left'                => array( '1', 'venstre', 'left' ),
-	'img_none'                => array( '1', 'ingen', 'none' ),
-	'img_center'              => array( '1', 'sentrer', 'senter', 'midtstilt', 'center', 'centre' ),
-	'img_framed'              => array( '1', 'ramme', 'framed', 'enframed', 'frame' ),
-	'img_frameless'           => array( '1', 'rammeløs', 'ingenramme', 'frameless' ),
-	'img_page'                => array( '1', 'side=$1', 'side $1', 'page=$1', 'page $1' ),
-	'img_upright'             => array( '1', 'portrett', 'portrett=$1', 'portrett_$1', 'upright', 'upright=$1', 'upright $1' ),
-	'img_baseline'            => array( '1', 'grunnlinje', 'baseline' ),
-	'img_top'                 => array( '1', 'topp', 'top' ),
-	'img_middle'              => array( '1', 'midt', 'middle' ),
-	'img_bottom'              => array( '1', 'bunn', 'bottom' ),
-	'img_text_bottom'         => array( '1', 'tekst-bunn', 'text-bottom' ),
-	'img_link'                => array( '1', 'lenke=$1', 'link=$1' ),
-	'ns'                      => array( '0', 'NR:', 'NS:' ),
-	'localurl'                => array( '0', 'LOKALURL:', 'LOCALURL:' ),
-	'localurle'               => array( '0', 'LOKALURLE:', 'LOCALURLE:' ),
-	'articlepath'             => array( '0', 'ARTIKKELSTI', 'ARTICLEPATH' ),
-	'server'                  => array( '0', 'TJENER', 'SERVER' ),
-	'servername'              => array( '0', 'TJENERNAVN', 'SERVERNAME' ),
-	'scriptpath'              => array( '0', 'SKRIPTSTI', 'SCRIPTPATH' ),
-	'stylepath'               => array( '0', 'STILSTI', 'STYLEPATH' ),
-	'grammar'                 => array( '0', 'GRAMMATIKK:', 'GRAMMAR:' ),
-	'gender'                  => array( '0', 'KJØNN:', 'GENDER:' ),
-	'notitleconvert'          => array( '0', '__INGENTITTELKONVERTERING__', '__NOTITLECONVERT__', '__NOTC__' ),
-	'nocontentconvert'        => array( '0', '__INGENINNHOLDSKONVERTERING__', '__NOCONTENTCONVERT__', '__NOCC__' ),
-	'currentweek'             => array( '1', 'NÅVÆRENDEUKE', 'CURRENTWEEK' ),
-	'currentdow'              => array( '1', 'NÅVÆRENDEUKEDAG', 'CURRENTDOW' ),
-	'localweek'               => array( '1', 'LOKALUKE', 'LOCALWEEK' ),
-	'localdow'                => array( '1', 'LOKALUKEDAG', 'LOCALDOW' ),
-	'revisionid'              => array( '1', 'REVISJONSID', 'REVISIONID' ),
-	'revisionday'             => array( '1', 'REVISJONSDAG', 'REVISIONDAY' ),
-	'revisionday2'            => array( '1', 'REVISJONSDAG2', 'REVISIONDAY2' ),
-	'revisionmonth'           => array( '1', 'REVISJONSMÅNED', 'REVISIONMONTH' ),
-	'revisionmonth1'          => array( '1', 'REVISJONSMÅNED1', 'REVISIONMONTH1' ),
-	'revisionyear'            => array( '1', 'REVISJONSÅR', 'REVISIONYEAR' ),
-	'revisiontimestamp'       => array( '1', 'REVISJONSTIDSSTEMPEL', 'REVISIONTIMESTAMP' ),
-	'revisionuser'            => array( '1', 'REVISJONSBRUKER', 'REVISIONUSER' ),
-	'plural'                  => array( '0', 'FLERTALL:', 'PLURAL:' ),
-	'raw'                     => array( '0', 'RÅ:', 'RAW:' ),
-	'displaytitle'            => array( '1', 'VISTITTEL', 'DISPLAYTITLE' ),
-	'newsectionlink'          => array( '1', '__NYSEKSJONSLENKE__', '__NEWSECTIONLINK__' ),
-	'nonewsectionlink'        => array( '1', '__INGENNYSEKSJONSLENKE__', '__NONEWSECTIONLINK__' ),
-	'currentversion'          => array( '1', 'NÅVÆRENDEVERSJON', 'CURRENTVERSION' ),
-	'currenttimestamp'        => array( '1', 'NÅVÆRENDETIDSSTEMPEL', 'CURRENTTIMESTAMP' ),
-	'localtimestamp'          => array( '1', 'LOKALTTIDSSTEMPEL', 'LOCALTIMESTAMP' ),
-	'contentlanguage'         => array( '1', 'INNHOLDSSPRÅK', 'CONTENTLANGUAGE', 'CONTENTLANG' ),
-	'pagesinnamespace'        => array( '1', 'SIDERINAVNEROM:', 'PAGESINNAMESPACE:', 'PAGESINNS:' ),
-	'numberofadmins'          => array( '1', 'ANTALLADMINISTRATORER', 'NUMBEROFADMINS' ),
-	'special'                 => array( '0', 'spesial', 'special' ),
-	'defaultsort'             => array( '1', 'STANDARDSORTERING', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:' ),
-	'filepath'                => array( '0', 'FILSTI:', 'FILEPATH:' ),
-	'hiddencat'               => array( '1', '__SKJULTKATEGORI__', '__HIDDENCAT__' ),
-	'pagesincategory'         => array( '1', 'SIDERIKATEGORI', 'PAGESINCATEGORY', 'PAGESINCAT' ),
-	'pagesize'                => array( '1', 'SIDESTØRRELSE', 'PAGESIZE' ),
-	'index'                   => array( '1', '__INDEKSER__', '__INDEX__' ),
-	'noindex'                 => array( '1', '__INGENINDEKSERING__', '__NOINDEX__' ),
-	'numberingroup'           => array( '1', 'NUMMERIGRUPPE', 'NUMBERINGROUP', 'NUMINGROUP' ),
-	'staticredirect'          => array( '1', '__STATISTOMDIRIGERING__', '__STATICREDIRECT__' ),
-	'protectionlevel'         => array( '1', 'BESKYTTELSESNIVÅ', 'PROTECTIONLEVEL' ),
-	'formatdate'              => array( '0', 'datoformat', 'formatdate', 'dateformat' ),
-	'url_path'                => array( '0', 'STI', 'PATH' ),
-	'url_query'               => array( '0', 'SPØRRING', 'QUERY' ),
+	'redirect'                  => array( '0', '#OMDIRIGERING', '#REDIRECT' ),
+	'notoc'                     => array( '0', '__INGENINNHOLDSFORTEGNELSE__', '__NOTOC__' ),
+	'nogallery'                 => array( '0', '__INTETGALLERI__', '__NOGALLERY__' ),
+	'forcetoc'                  => array( '0', '__TVINGINNHOLDSFORTEGNELSE__', '__FORCETOC__' ),
+	'toc'                       => array( '0', '__INNHOLDSFORTEGNELSE__', '__TOC__' ),
+	'noeditsection'             => array( '0', '__INGENSEKSJONSREDIGERING__', '__NOEDITSECTION__' ),
+	'currentmonth'              => array( '1', 'NÅVÆRENDEMÅNED', 'NÅVÆRENDEMÅNED2', 'CURRENTMONTH', 'CURRENTMONTH2' ),
+	'currentmonth1'             => array( '1', 'NÅVÆRENDEMÅNED1', 'CURRENTMONTH1' ),
+	'currentmonthname'          => array( '1', 'NÅVÆRENDEMÅNEDSNAVN', 'CURRENTMONTHNAME' ),
+	'currentmonthnamegen'       => array( '1', 'NÅVÆRENDEMÅNEDSNAVNGEN', 'CURRENTMONTHNAMEGEN' ),
+	'currentmonthabbrev'        => array( '1', 'NÅVÆRENDEMÅNEDSNAVNKORT', 'CURRENTMONTHABBREV' ),
+	'currentday'                => array( '1', 'NÅVÆRENDEDAG', 'CURRENTDAY' ),
+	'currentday2'               => array( '1', 'NÅVÆRENDEDAG2', 'CURRENTDAY2' ),
+	'currentdayname'            => array( '1', 'NÅVÆRENDEDAGSNAVN', 'CURRENTDAYNAME' ),
+	'currentyear'               => array( '1', 'NÅVÆRENDEÅR', 'CURRENTYEAR' ),
+	'currenttime'               => array( '1', 'NÅVÆRENDETID', 'CURRENTTIME' ),
+	'currenthour'               => array( '1', 'NÅVÆRENDETIME', 'CURRENTHOUR' ),
+	'localmonth'                => array( '1', 'LOKALMÅNED', 'LOKALMÅNED2', 'LOCALMONTH', 'LOCALMONTH2' ),
+	'localmonth1'               => array( '1', 'LOKALMÅNED1', 'LOCALMONTH1' ),
+	'localmonthname'            => array( '1', 'LOKALMÅNEDSNAVN', 'LOCALMONTHNAME' ),
+	'localmonthnamegen'         => array( '1', 'LOKALMÅNEDSNAVNGEN', 'LOCALMONTHNAMEGEN' ),
+	'localmonthabbrev'          => array( '1', 'LOKALMÅNEDSNAVNKORT', 'LOCALMONTHABBREV' ),
+	'localday'                  => array( '1', 'LOKALDAG', 'LOCALDAY' ),
+	'localday2'                 => array( '1', 'LOKALDAG2', 'LOCALDAY2' ),
+	'localdayname'              => array( '1', 'LOKALDAGSNAVN', 'LOCALDAYNAME' ),
+	'localyear'                 => array( '1', 'LOKALTÅR', 'LOCALYEAR' ),
+	'localtime'                 => array( '1', 'LOKALTID', 'LOCALTIME' ),
+	'localhour'                 => array( '1', 'LOKALTIME', 'LOCALHOUR' ),
+	'numberofpages'             => array( '1', 'ANTALLSIDER', 'NUMBEROFPAGES' ),
+	'numberofarticles'          => array( '1', 'ANTALLARTIKLER', 'NUMBEROFARTICLES' ),
+	'numberoffiles'             => array( '1', 'ANTALLFILER', 'NUMBEROFFILES' ),
+	'numberofusers'             => array( '1', 'ANTALLBRUKERE', 'NUMBEROFUSERS' ),
+	'numberofactiveusers'       => array( '1', 'ANTALLAKTIVEBRUKERE', 'NUMBEROFACTIVEUSERS' ),
+	'numberofedits'             => array( '1', 'ANTALLREDIGERINGER', 'NUMBEROFEDITS' ),
+	'numberofviews'             => array( '1', 'ANTALLVISNINGER', 'NUMBEROFVIEWS' ),
+	'pagename'                  => array( '1', 'SIDENAVN', 'PAGENAME' ),
+	'pagenamee'                 => array( '1', 'SIDENAVNE', 'PAGENAMEE' ),
+	'namespace'                 => array( '1', 'NAVNEROM', 'NAMESPACE' ),
+	'namespacee'                => array( '1', 'NAVNEROME', 'NAMESPACEE' ),
+	'talkspace'                 => array( '1', 'DISKUSJONSROM', 'TALKSPACE' ),
+	'talkspacee'                => array( '1', 'DISKUSJONSROME', 'TALKSPACEE' ),
+	'subjectspace'              => array( '1', 'SUBJEKTROM', 'ARTIKKELROM', 'SUBJECTSPACE', 'ARTICLESPACE' ),
+	'subjectspacee'             => array( '1', 'SUBJEKTROME', 'ARTIKKELROME', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
+	'fullpagename'              => array( '1', 'FULLTSIDENAVN', 'FULLPAGENAME' ),
+	'fullpagenamee'             => array( '1', 'FULLTSIDENAVNE', 'FULLPAGENAMEE' ),
+	'subpagename'               => array( '1', 'UNDERSIDENAVN', 'SUBPAGENAME' ),
+	'subpagenamee'              => array( '1', 'UNDERSIDENAVNE', 'SUBPAGENAMEE' ),
+	'basepagename'              => array( '1', 'GRUNNSIDENAVN', 'BASEPAGENAME' ),
+	'basepagenamee'             => array( '1', 'GRUNNSIDENAVNE', 'BASEPAGENAMEE' ),
+	'talkpagename'              => array( '1', 'DISKUSJONSSIDENAVN', 'TALKPAGENAME' ),
+	'talkpagenamee'             => array( '1', 'DISKUSJONSSIDENAVNE', 'TALKPAGENAMEE' ),
+	'subjectpagename'           => array( '1', 'SUBJEKTSIDENAVN', 'ARTIKKELSIDENAVN', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
+	'subjectpagenamee'          => array( '1', 'SUBJEKTSIDENAVNE', 'ARTIKKELSIDENAVNE', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
+	'img_thumbnail'             => array( '1', 'miniatyr', 'mini', 'thumbnail', 'thumb' ),
+	'img_manualthumb'           => array( '1', 'miniatyr=$1', 'mini=$1', 'thumbnail=$1', 'thumb=$1' ),
+	'img_right'                 => array( '1', 'høyre', 'right' ),
+	'img_left'                  => array( '1', 'venstre', 'left' ),
+	'img_none'                  => array( '1', 'ingen', 'none' ),
+	'img_center'                => array( '1', 'sentrer', 'senter', 'midtstilt', 'center', 'centre' ),
+	'img_framed'                => array( '1', 'ramme', 'framed', 'enframed', 'frame' ),
+	'img_frameless'             => array( '1', 'rammeløs', 'ingenramme', 'frameless' ),
+	'img_page'                  => array( '1', 'side=$1', 'side $1', 'page=$1', 'page $1' ),
+	'img_upright'               => array( '1', 'portrett', 'portrett=$1', 'portrett_$1', 'upright', 'upright=$1', 'upright $1' ),
+	'img_baseline'              => array( '1', 'grunnlinje', 'baseline' ),
+	'img_top'                   => array( '1', 'topp', 'top' ),
+	'img_middle'                => array( '1', 'midt', 'middle' ),
+	'img_bottom'                => array( '1', 'bunn', 'bottom' ),
+	'img_text_bottom'           => array( '1', 'tekst-bunn', 'text-bottom' ),
+	'img_link'                  => array( '1', 'lenke=$1', 'link=$1' ),
+	'ns'                        => array( '0', 'NR:', 'NS:' ),
+	'localurl'                  => array( '0', 'LOKALURL:', 'LOCALURL:' ),
+	'localurle'                 => array( '0', 'LOKALURLE:', 'LOCALURLE:' ),
+	'articlepath'               => array( '0', 'ARTIKKELSTI', 'ARTICLEPATH' ),
+	'server'                    => array( '0', 'TJENER', 'SERVER' ),
+	'servername'                => array( '0', 'TJENERNAVN', 'SERVERNAME' ),
+	'scriptpath'                => array( '0', 'SKRIPTSTI', 'SCRIPTPATH' ),
+	'stylepath'                 => array( '0', 'STILSTI', 'STYLEPATH' ),
+	'grammar'                   => array( '0', 'GRAMMATIKK:', 'GRAMMAR:' ),
+	'gender'                    => array( '0', 'KJØNN:', 'GENDER:' ),
+	'notitleconvert'            => array( '0', '__INGENTITTELKONVERTERING__', '__NOTITLECONVERT__', '__NOTC__' ),
+	'nocontentconvert'          => array( '0', '__INGENINNHOLDSKONVERTERING__', '__NOCONTENTCONVERT__', '__NOCC__' ),
+	'currentweek'               => array( '1', 'NÅVÆRENDEUKE', 'CURRENTWEEK' ),
+	'currentdow'                => array( '1', 'NÅVÆRENDEUKEDAG', 'CURRENTDOW' ),
+	'localweek'                 => array( '1', 'LOKALUKE', 'LOCALWEEK' ),
+	'localdow'                  => array( '1', 'LOKALUKEDAG', 'LOCALDOW' ),
+	'revisionid'                => array( '1', 'REVISJONSID', 'REVISIONID' ),
+	'revisionday'               => array( '1', 'REVISJONSDAG', 'REVISIONDAY' ),
+	'revisionday2'              => array( '1', 'REVISJONSDAG2', 'REVISIONDAY2' ),
+	'revisionmonth'             => array( '1', 'REVISJONSMÅNED', 'REVISIONMONTH' ),
+	'revisionmonth1'            => array( '1', 'REVISJONSMÅNED1', 'REVISIONMONTH1' ),
+	'revisionyear'              => array( '1', 'REVISJONSÅR', 'REVISIONYEAR' ),
+	'revisiontimestamp'         => array( '1', 'REVISJONSTIDSSTEMPEL', 'REVISIONTIMESTAMP' ),
+	'revisionuser'              => array( '1', 'REVISJONSBRUKER', 'REVISIONUSER' ),
+	'plural'                    => array( '0', 'FLERTALL:', 'PLURAL:' ),
+	'raw'                       => array( '0', 'RÅ:', 'RAW:' ),
+	'displaytitle'              => array( '1', 'VISTITTEL', 'DISPLAYTITLE' ),
+	'newsectionlink'            => array( '1', '__NYSEKSJONSLENKE__', '__NEWSECTIONLINK__' ),
+	'nonewsectionlink'          => array( '1', '__INGENNYSEKSJONSLENKE__', '__NONEWSECTIONLINK__' ),
+	'currentversion'            => array( '1', 'NÅVÆRENDEVERSJON', 'CURRENTVERSION' ),
+	'currenttimestamp'          => array( '1', 'NÅVÆRENDETIDSSTEMPEL', 'CURRENTTIMESTAMP' ),
+	'localtimestamp'            => array( '1', 'LOKALTTIDSSTEMPEL', 'LOCALTIMESTAMP' ),
+	'contentlanguage'           => array( '1', 'INNHOLDSSPRÅK', 'CONTENTLANGUAGE', 'CONTENTLANG' ),
+	'pagesinnamespace'          => array( '1', 'SIDERINAVNEROM:', 'PAGESINNAMESPACE:', 'PAGESINNS:' ),
+	'numberofadmins'            => array( '1', 'ANTALLADMINISTRATORER', 'NUMBEROFADMINS' ),
+	'special'                   => array( '0', 'spesial', 'special' ),
+	'defaultsort'               => array( '1', 'STANDARDSORTERING', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:' ),
+	'filepath'                  => array( '0', 'FILSTI:', 'FILEPATH:' ),
+	'hiddencat'                 => array( '1', '__SKJULTKATEGORI__', '__HIDDENCAT__' ),
+	'pagesincategory'           => array( '1', 'SIDERIKATEGORI', 'PAGESINCATEGORY', 'PAGESINCAT' ),
+	'pagesize'                  => array( '1', 'SIDESTØRRELSE', 'PAGESIZE' ),
+	'index'                     => array( '1', '__INDEKSER__', '__INDEX__' ),
+	'noindex'                   => array( '1', '__INGENINDEKSERING__', '__NOINDEX__' ),
+	'numberingroup'             => array( '1', 'NUMMERIGRUPPE', 'NUMBERINGROUP', 'NUMINGROUP' ),
+	'staticredirect'            => array( '1', '__STATISTOMDIRIGERING__', '__STATICREDIRECT__' ),
+	'protectionlevel'           => array( '1', 'BESKYTTELSESNIVÅ', 'PROTECTIONLEVEL' ),
+	'formatdate'                => array( '0', 'datoformat', 'formatdate', 'dateformat' ),
+	'url_path'                  => array( '0', 'STI', 'PATH' ),
+	'url_query'                 => array( '0', 'SPØRRING', 'QUERY' ),
 );
 
 $messages = array(
diff --git a/languages/messages/MessagesNds.php b/languages/messages/MessagesNds.php
index 2c5b1cf16a..db850eb33d 100644
--- a/languages/messages/MessagesNds.php
+++ b/languages/messages/MessagesNds.php
@@ -56,33 +56,33 @@ $namespaceAliases = array(
 );
 
 $magicWords = array(
-	'redirect'                => array( '0', '#wiederleiden', '#WEITERLEITUNG', '#REDIRECT' ),
-	'notoc'                   => array( '0', '__KEENINHOLTVERTEKEN__', '__KEIN_INHALTSVERZEICHNIS__', '__KEININHALTSVERZEICHNIS__', '__NOTOC__' ),
-	'forcetoc'                => array( '0', '__WIESINHOLTVERTEKEN__', '__INHALTSVERZEICHNIS_ERZWINGEN__', '__FORCETOC__' ),
-	'toc'                     => array( '0', '__INHOLTVERTEKEN__', '__INHALTSVERZEICHNIS__', '__TOC__' ),
-	'noeditsection'           => array( '0', '__KEENÄNNERNLINK__', '__ABSCHNITTE_NICHT_BEARBEITEN__', '__NOEDITSECTION__' ),
-	'currentmonth'            => array( '1', 'AKTMAAND', 'JETZIGER_MONAT', 'JETZIGER_MONAT_2', 'CURRENTMONTH', 'CURRENTMONTH2' ),
-	'currentmonthname'        => array( '1', 'AKTMAANDNAAM', 'JETZIGER_MONATSNAME', 'CURRENTMONTHNAME' ),
-	'currentmonthnamegen'     => array( '1', 'AKTMAANDNAAMGEN', 'JETZIGER_MONATSNAME_GENITIV', 'CURRENTMONTHNAMEGEN' ),
-	'currentday'              => array( '1', 'AKTDAG', 'JETZIGER_KALENDERTAG', 'CURRENTDAY' ),
-	'currentdayname'          => array( '1', 'AKTDAGNAAM', 'JETZIGER_WOCHENTAG', 'CURRENTDAYNAME' ),
-	'currentyear'             => array( '1', 'AKTJOHR', 'JETZIGES_JAHR', 'CURRENTYEAR' ),
-	'currenttime'             => array( '1', 'AKTTIED', 'JETZIGE_UHRZEIT', 'CURRENTTIME' ),
-	'numberofarticles'        => array( '1', 'ARTIKELTALL', 'ARTIKELANZAHL', 'NUMBEROFARTICLES' ),
-	'pagename'                => array( '1', 'SIETNAAM', 'SEITENNAME', 'PAGENAME' ),
-	'pagenamee'               => array( '1', 'SIETNAAME', 'SEITENNAME_URL', 'PAGENAMEE' ),
-	'namespace'               => array( '1', 'NAAMRUUM', 'NAMENSRAUM', 'NAMESPACE' ),
-	'img_thumbnail'           => array( '1', 'duum', 'miniatur', 'mini', 'thumbnail', 'thumb' ),
-	'img_right'               => array( '1', 'rechts', 'right' ),
-	'img_left'                => array( '1', 'links', 'left' ),
-	'img_none'                => array( '1', 'keen', 'ohne', 'none' ),
-	'img_center'              => array( '1', 'merrn', 'zentriert', 'center', 'centre' ),
-	'img_framed'              => array( '1', 'rahmt', 'gerahmt', 'framed', 'enframed', 'frame' ),
-	'sitename'                => array( '1', 'STEEDNAAM', 'PROJEKTNAME', 'SITENAME' ),
-	'ns'                      => array( '0', 'NR:', 'NS:' ),
-	'localurl'                => array( '0', 'STEEDURL:', 'LOKALE_URL:', 'LOCALURL:' ),
-	'localurle'               => array( '0', 'STEEDURLE:', 'LOKALE_URL_C:', 'LOCALURLE:' ),
-	'grammar'                 => array( '0', 'GRAMMATIK:', 'GRAMMAR:' ),
+	'redirect'                  => array( '0', '#wiederleiden', '#WEITERLEITUNG', '#REDIRECT' ),
+	'notoc'                     => array( '0', '__KEENINHOLTVERTEKEN__', '__KEIN_INHALTSVERZEICHNIS__', '__KEININHALTSVERZEICHNIS__', '__NOTOC__' ),
+	'forcetoc'                  => array( '0', '__WIESINHOLTVERTEKEN__', '__INHALTSVERZEICHNIS_ERZWINGEN__', '__FORCETOC__' ),
+	'toc'                       => array( '0', '__INHOLTVERTEKEN__', '__INHALTSVERZEICHNIS__', '__TOC__' ),
+	'noeditsection'             => array( '0', '__KEENÄNNERNLINK__', '__ABSCHNITTE_NICHT_BEARBEITEN__', '__NOEDITSECTION__' ),
+	'currentmonth'              => array( '1', 'AKTMAAND', 'JETZIGER_MONAT', 'JETZIGER_MONAT_2', 'CURRENTMONTH', 'CURRENTMONTH2' ),
+	'currentmonthname'          => array( '1', 'AKTMAANDNAAM', 'JETZIGER_MONATSNAME', 'CURRENTMONTHNAME' ),
+	'currentmonthnamegen'       => array( '1', 'AKTMAANDNAAMGEN', 'JETZIGER_MONATSNAME_GENITIV', 'CURRENTMONTHNAMEGEN' ),
+	'currentday'                => array( '1', 'AKTDAG', 'JETZIGER_KALENDERTAG', 'CURRENTDAY' ),
+	'currentdayname'            => array( '1', 'AKTDAGNAAM', 'JETZIGER_WOCHENTAG', 'CURRENTDAYNAME' ),
+	'currentyear'               => array( '1', 'AKTJOHR', 'JETZIGES_JAHR', 'CURRENTYEAR' ),
+	'currenttime'               => array( '1', 'AKTTIED', 'JETZIGE_UHRZEIT', 'CURRENTTIME' ),
+	'numberofarticles'          => array( '1', 'ARTIKELTALL', 'ARTIKELANZAHL', 'NUMBEROFARTICLES' ),
+	'pagename'                  => array( '1', 'SIETNAAM', 'SEITENNAME', 'PAGENAME' ),
+	'pagenamee'                 => array( '1', 'SIETNAAME', 'SEITENNAME_URL', 'PAGENAMEE' ),
+	'namespace'                 => array( '1', 'NAAMRUUM', 'NAMENSRAUM', 'NAMESPACE' ),
+	'img_thumbnail'             => array( '1', 'duum', 'miniatur', 'mini', 'thumbnail', 'thumb' ),
+	'img_right'                 => array( '1', 'rechts', 'right' ),
+	'img_left'                  => array( '1', 'links', 'left' ),
+	'img_none'                  => array( '1', 'keen', 'ohne', 'none' ),
+	'img_center'                => array( '1', 'merrn', 'zentriert', 'center', 'centre' ),
+	'img_framed'                => array( '1', 'rahmt', 'gerahmt', 'framed', 'enframed', 'frame' ),
+	'sitename'                  => array( '1', 'STEEDNAAM', 'PROJEKTNAME', 'SITENAME' ),
+	'ns'                        => array( '0', 'NR:', 'NS:' ),
+	'localurl'                  => array( '0', 'STEEDURL:', 'LOKALE_URL:', 'LOCALURL:' ),
+	'localurle'                 => array( '0', 'STEEDURLE:', 'LOKALE_URL_C:', 'LOCALURLE:' ),
+	'grammar'                   => array( '0', 'GRAMMATIK:', 'GRAMMAR:' ),
 );
 
 
diff --git a/languages/messages/MessagesNds_nl.php b/languages/messages/MessagesNds_nl.php
index c4fd17304e..714892db8f 100644
--- a/languages/messages/MessagesNds_nl.php
+++ b/languages/messages/MessagesNds_nl.php
@@ -74,139 +74,139 @@ $bookstoreList = array(
 
 #!!# Translation <b>HLEERSTE:</b> is used more than once for <a href="#mw-sp-magic-lcfirst">lcfirst</a> and <a href="#mw-sp-magic-ucfirst">ucfirst</a>.
 $magicWords = array(
-	'redirect'                => array( '0', '#DEURVERWIEZING', '#DOORVERWIJZING', '#REDIRECT' ),
-	'notoc'                   => array( '0', '__GIENONDERWARPEN__', '__GEENINHOUD__', '__NOTOC__' ),
-	'nogallery'               => array( '0', '__GIENGALLERIEJE__', '__GEEN_GALERIJ__', '__NOGALLERY__' ),
-	'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' ),
-	'currentmonthabbrev'      => array( '1', 'DISSEMAONDAOFK', 'HUIDIGEMAANDAFK', 'CURRENTMONTHABBREV' ),
-	'currentday'              => array( '1', 'DISSEDAG', 'HUIDIGEDAG', 'CURRENTDAY' ),
-	'currentday2'             => array( '1', 'DISSEDAG2', 'HUIDIGEDAG2', 'CURRENTDAY2' ),
-	'currentdayname'          => array( '1', 'DISSEDAGNAAM', 'HUIDIGEDAGNAAM', 'CURRENTDAYNAME' ),
-	'currentyear'             => array( '1', 'DITJAOR', 'HUIDIGJAAR', 'CURRENTYEAR' ),
-	'currenttime'             => array( '1', 'DISSETIED', 'HUIDIGETIJD', 'CURRENTTIME' ),
-	'currenthour'             => array( '1', 'DITURE', 'HUIDIGUUR', 'CURRENTHOUR' ),
-	'localmonth'              => array( '1', 'LOKALEMAOND', 'PLAATSELIJKEMAAND', 'LOKALEMAAND', 'LOKALEMAAND2', 'LOCALMONTH', 'LOCALMONTH2' ),
-	'localmonth1'             => array( '1', 'LOKALEMAOND1', 'LOKALEMAAND1', 'LOCALMONTH1' ),
-	'localmonthname'          => array( '1', 'LOKALEMAONDNAAM', 'PLAATSELIJKEMAANDNAAM', 'LOKALEMAANDNAAM', 'LOCALMONTHNAME' ),
-	'localmonthnamegen'       => array( '1', 'LOKALEMAONDNAAMGEN', 'PLAATSELIJKEMAANDNAAMGEN', 'LOKALEMAANDNAAMGEN', 'LOCALMONTHNAMEGEN' ),
-	'localmonthabbrev'        => array( '1', 'LOKALEMAONDAOFK', 'PLAATSELIJKEMAANDAFK', 'LOKALEMAANDAFK', 'LOCALMONTHABBREV' ),
-	'localday'                => array( '1', 'LOKALEDAG', 'PLAATSELIJKEDAG', 'LOCALDAY' ),
-	'localday2'               => array( '1', 'LOKALEDAG2', 'PLAATSELIJKEDAG2', 'LOCALDAY2' ),
-	'localdayname'            => array( '1', 'LOKALEDAGNAAM', 'PLAATSELIJKEDAGNAAM', 'LOCALDAYNAME' ),
-	'localyear'               => array( '1', 'LOKAALJAOR', 'PLAATSELIJKJAAR', 'LOKAALJAAR', 'LOCALYEAR' ),
-	'localtime'               => array( '1', 'LOKALETIED', 'PLAATSELIJKETIJD', 'LOKALETIJD', 'LOCALTIME' ),
-	'localhour'               => array( '1', 'LOKAALURE', 'PLAATSELIJKUUR', 'LOKAALUUR', 'LOCALHOUR' ),
-	'numberofpages'           => array( '1', 'ANTALPAGINAS', 'ANTALPAGINA\'S', 'ANTALPAGINA’S', 'AANTALPAGINAS', 'AANTALPAGINA\'S', 'AANTALPAGINA’S', 'NUMBEROFPAGES' ),
-	'numberofarticles'        => array( '1', 'ANTALARTIKELS', 'AANTALARTIKELEN', 'NUMBEROFARTICLES' ),
-	'numberoffiles'           => array( '1', 'ANTALBESTANDEN', 'AANTALBESTANDEN', 'NUMBEROFFILES' ),
-	'numberofusers'           => array( '1', 'ANTALGEBRUKERS', 'AANTALGEBRUIKERS', 'NUMBEROFUSERS' ),
-	'numberofactiveusers'     => array( '1', 'ANTALAKTIEVEGEBRUKERS', 'AANTALACTIEVEGEBRUIKERS', 'ACTIEVEGEBRUIKERS', 'NUMBEROFACTIVEUSERS' ),
-	'numberofedits'           => array( '1', 'ANTALBEWARKINGEN', 'AANTALBEWERKINGEN', 'NUMBEROFEDITS' ),
-	'numberofviews'           => array( '1', 'ANTALKERENBEKEKEN', 'AANTALKERENBEKEKEN', 'NUMBEROFVIEWS' ),
-	'pagename'                => array( '1', 'PAGINANAAM', 'PAGENAME' ),
-	'pagenamee'               => array( '1', 'PAGINANAAME', 'PAGENAMEE' ),
-	'namespace'               => array( '1', 'NAAMRUUMTE', 'NAAMRUIMTE', 'NAMESPACE' ),
-	'namespacee'              => array( '1', 'NAAMRUUMTEE', 'NAAMRUIMTEE', 'NAMESPACEE' ),
-	'talkspace'               => array( '1', 'OVERLEGRUUMTE', 'OVERLEGRUIMTE', 'TALKSPACE' ),
-	'talkspacee'              => array( '1', 'OVERLEGRUUMTEE', 'OVERLEGRUIMTEE', 'TALKSPACEE' ),
-	'subjectspace'            => array( '1', 'ONDERWARPRUUMTE', 'ARTIKELRUUMTE', 'ONDERWERPRUIMTE', 'ARTIKELRUIMTE', 'SUBJECTSPACE', 'ARTICLESPACE' ),
-	'subjectspacee'           => array( '1', 'ONDERWARPRUUMTEE', 'ARTIKELRUUMTEE', 'ONDERWERPRUIMTEE', 'ARTIKELRUIMTEE', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
-	'fullpagename'            => array( '1', 'HELEPAGINANAAM', 'VOLLEDIGEPAGINANAAM', 'FULLPAGENAME' ),
-	'fullpagenamee'           => array( '1', 'HELEPAGINANAAME', 'VOLLEDIGEPAGINANAAME', 'FULLPAGENAMEE' ),
-	'subpagename'             => array( '1', 'DEELPAGINANAAM', 'SUBPAGENAME' ),
-	'subpagenamee'            => array( '1', 'DEELPAGINANAAME', 'SUBPAGENAMEE' ),
-	'basepagename'            => array( '1', 'BAOSISPAGINANAAM', 'BASISPAGINANAAM', 'BASEPAGENAME' ),
-	'basepagenamee'           => array( '1', 'BAOSISPAGINANAAME', 'BASISPAGINANAAME', 'BASEPAGENAMEE' ),
-	'talkpagename'            => array( '1', 'OVERLEGPAGINANAAM', 'TALKPAGENAME' ),
-	'talkpagenamee'           => array( '1', 'OVERLEGPAGINANAAME', 'TALKPAGENAMEE' ),
-	'subjectpagename'         => array( '1', 'ONDERWARPPAGINANAAM', 'ARTIKELPAGINANAAM', 'ONDERWERPPAGINANAAM', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
-	'subjectpagenamee'        => array( '1', 'ONDERWARPPAGINANAAME', 'ARTIKELPAGINANAAME', 'ONDERWERPPAGINANAAME', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
-	'msg'                     => array( '0', 'BERICHT:', 'MSG:' ),
-	'subst'                   => array( '0', 'VERVANG:', 'VERV:', 'SUBST:' ),
-	'msgnw'                   => array( '0', 'BERICHTNW', 'MSGNW:' ),
-	'img_thumbnail'           => array( '1', 'miniatuur', 'duumnegel', 'doemnaegel', 'thumbnail', 'thumb' ),
-	'img_manualthumb'         => array( '1', 'miniatuur=$1', 'duumnegel=$1', 'doemnaegel=$1', 'thumbnail=$1', 'thumb=$1' ),
-	'img_right'               => array( '1', 'rechts', 'right' ),
-	'img_left'                => array( '1', 'links', 'left' ),
-	'img_none'                => array( '1', 'gien', 'geen', 'none' ),
-	'img_center'              => array( '1', 'esentreerd', 'gecentreerd', 'center', 'centre' ),
-	'img_framed'              => array( '1', 'umraand', 'omkaderd', 'framed', 'enframed', 'frame' ),
-	'img_frameless'           => array( '1', 'kaoderloos', 'kaderloos', 'frameless' ),
-	'img_page'                => array( '1', 'pagina=$1', 'pagina_$1', 'pagina $1', 'page=$1', 'page $1' ),
-	'img_upright'             => array( '1', 'rechtop', 'rechtop=$1', 'rechtop$1', 'upright', 'upright=$1', 'upright $1' ),
-	'img_border'              => array( '1', 'raand', 'rand', 'border' ),
-	'img_baseline'            => array( '1', 'grondliende', 'grondlijn', 'baseline' ),
-	'img_top'                 => array( '1', 'boven', 'top' ),
-	'img_text_top'            => array( '1', 'tekste-boven', 'tekst-boven', 'text-top' ),
-	'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' ),
-	'sitename'                => array( '1', 'WEBSTEENAAM', 'SITENAAM', 'SITENAME' ),
-	'ns'                      => array( '0', 'NR:', 'NS:' ),
-	'localurl'                => array( '0', 'LOKALEURL', 'LOCALURL:' ),
-	'localurle'               => array( '0', 'LOKALEURLE', 'LOCALURLE:' ),
-	'servername'              => array( '0', 'SERVERNAAM', 'SERVERNAME' ),
-	'scriptpath'              => array( '0', 'SKRIPTPAD', 'SCRIPTPAD', 'SCRIPTPATH' ),
-	'stylepath'               => array( '0', 'STIELPAD', 'STIJLPAD', 'STYLEPATH' ),
-	'grammar'                 => array( '0', 'GRAMMATIKA:', 'GRAMMATICA:', 'GRAMMAR:' ),
-	'gender'                  => array( '0', 'GESLACHTE:', 'GESLACHT:', 'GENDER:' ),
-	'notitleconvert'          => array( '0', '__GIENTITELKONVERSIE__', '__GIENTC__', '__GEENTITELCONVERSIE__', '__GEENTC__', '__GEENPAGINANAAMCONVERSIE__', '__NOTITLECONVERT__', '__NOTC__' ),
-	'nocontentconvert'        => array( '0', '__GIENINHOUDKONVERSIE__', '__GIENIC__', '__GEENINHOUDCONVERSIE__', '__GEENIC__', '__NOCONTENTCONVERT__', '__NOCC__' ),
-	'currentweek'             => array( '1', 'DISSEWEKE', 'HUIDIGEWEEK', 'CURRENTWEEK' ),
-	'currentdow'              => array( '1', 'DISSEDVDW', 'HUIDIGEDVDW', 'CURRENTDOW' ),
-	'localweek'               => array( '1', 'LOKALEWEKE', 'PLAATSELIJKEWEEK', 'LOKALEWEEK', 'LOCALWEEK' ),
-	'localdow'                => array( '1', 'LOKALEDVDW', 'PLAATSELIJKEDVDW', 'LOCALDOW' ),
-	'revisionid'              => array( '1', 'REVISIEID', 'REVISIE-ID', 'VERSIEID', 'REVISIONID' ),
-	'revisionday'             => array( '1', 'REVISIEDAG', 'VERSIEDAG', 'REVISIONDAY' ),
-	'revisionday2'            => array( '1', 'REVISIEDAG2', 'VERSIEDAG2', 'REVISIONDAY2' ),
-	'revisionmonth'           => array( '1', 'REVISIEMAOND', 'VERSIEMAAND', 'REVISIONMONTH' ),
-	'revisionyear'            => array( '1', 'REVISIEJAOR', 'VERSIEJAAR', 'REVISIONYEAR' ),
-	'revisiontimestamp'       => array( '1', 'REVISIETIEDSTEMPEL', 'VERSIETIJD', 'REVISIONTIMESTAMP' ),
-	'revisionuser'            => array( '1', 'VERSIEGEBRUKER', 'VERSIEGEBRUIKER', 'REVISIONUSER' ),
-	'plural'                  => array( '0', 'MEERVOUD:', 'PLURAL:' ),
-	'fullurl'                 => array( '0', 'HELEURL', 'VOLLEDIGEURL', 'VOLLEDIGEURL:', 'FULLURL:' ),
-	'fullurle'                => array( '0', 'HELEURLE', 'VOLLEDIGEURLE', 'VOLLEDIGEURLE:', 'FULLURLE:' ),
-	'lcfirst'                 => array( '0', 'KLEERSTE:', 'LCFIRST:' ),
-	'ucfirst'                 => array( '0', 'GLEERSTE:', 'HLEERSTE:', 'UCFIRST:' ),
-	'lc'                      => array( '0', 'KL:', 'LC:' ),
-	'uc'                      => array( '0', 'HL:', 'UC:' ),
-	'raw'                     => array( '0', 'RAUW:', 'RUW:', 'RAW:' ),
-	'displaytitle'            => array( '1', 'TEUNTITEL', 'TOONTITEL', 'TITELTONEN', 'WEERGEGEVENTITEL', 'DISPLAYTITLE' ),
-	'newsectionlink'          => array( '1', '__NIEJESECTIEVERWIEZING__', '__NIEUWESECTIELINK__', '__NIEUWESECTIEKOPPELING__', '__NEWSECTIONLINK__' ),
-	'nonewsectionlink'        => array( '1', '__GIENNIEJKOPJENVERWIEZING__', '__GEENNIEUWKOPJEVERWIJZING__', '__GEENNIEUWESECTIELINK__', '__NONEWSECTIONLINK__' ),
-	'currentversion'          => array( '1', 'DISSEVERSIE', 'HUIDIGEVERSIE', 'CURRENTVERSION' ),
-	'urlencode'               => array( '0', 'URLKODEREN', 'URLCODEREN', 'CODEERURL', 'URLENCODE:' ),
-	'anchorencode'            => array( '0', 'ANKERKODEREN', 'ANKERCODEREN', 'CODEERANKER', 'ANCHORENCODE' ),
-	'currenttimestamp'        => array( '1', 'DISSETIEDSTEMPEL', 'HUIDIGETIJDSTEMPEL', 'CURRENTTIMESTAMP' ),
-	'localtimestamp'          => array( '1', 'LOKALETIEDSTEMPEL', 'PLAATSELIJKETIJDSTEMPEL', 'LOKALETIJDSTEMPEL', 'LOCALTIMESTAMP' ),
-	'directionmark'           => array( '1', 'RICHTINGMARKERING', 'RICHTINGSMARKERING', 'DIRECTIONMARK', 'DIRMARK' ),
-	'language'                => array( '0', '#TAAL:', '#LANGUAGE:' ),
-	'contentlanguage'         => array( '1', 'INHOUDSTAAL', 'INHOUDTAAL', 'CONTENTLANGUAGE', 'CONTENTLANG' ),
-	'pagesinnamespace'        => array( '1', 'PAGINASINNAAMRUUMTE', 'PAGINA’SINNAAMRUUMTE', 'PAGINA\'SINNAAMRUUMTE', 'PAGINASINNAAMRUIMTE', 'PAGINA’SINNAAMRUIMTE', 'PAGINA\'SINNAAMRUIMTE', 'PAGESINNAMESPACE:', 'PAGESINNS:' ),
-	'numberofadmins'          => array( '1', 'ANTALBEHEERDERS', 'AANTALBEHEERDERS', 'AANTALADMINS', 'NUMBEROFADMINS' ),
-	'formatnum'               => array( '0', 'FORMATTEERNUM', 'NUMFORMATTEREN', 'FORMATNUM' ),
-	'padleft'                 => array( '0', 'LINKSOPVULLEN', 'PADLEFT' ),
-	'padright'                => array( '0', 'RECHTSOPVULLEN', 'PADRIGHT' ),
-	'special'                 => array( '0', 'spesiaal', 'speciaal', 'special' ),
-	'defaultsort'             => array( '1', 'STANDARDSORTERING:', 'STANDAARDSORTERING:', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:' ),
-	'filepath'                => array( '0', 'BESTAANDSPAD:', 'BESTANDSPAD:', 'FILEPATH:' ),
-	'tag'                     => array( '0', 'etiket', 'label', 'tag' ),
-	'hiddencat'               => array( '1', '__VERBÖRGENKAT__', '__VERBORGENCAT__', '__HIDDENCAT__' ),
-	'pagesincategory'         => array( '1', 'PAGINASINKATEGORIE', 'PAGINASINKAT', 'PAGINASINCATEGORIE', 'PAGINASINCAT', 'PAGESINCATEGORY', 'PAGESINCAT' ),
-	'pagesize'                => array( '1', 'PAGINAGROOTTE', 'PAGESIZE' ),
-	'noindex'                 => array( '1', '__GIENINDEX__', '__GEENINDEX__', '__NOINDEX__' ),
-	'numberingroup'           => array( '1', 'ANTALINGROEP', 'AANTALINGROEP', 'NUMBERINGROUP', 'NUMINGROUP' ),
-	'staticredirect'          => array( '1', '__STAOTIESEDEURVERWIEZING__', '__STATISCHEDOORVERWIJZING__', '__STATISCHEREDIRECT__', '__STATICREDIRECT__' ),
-	'protectionlevel'         => array( '1', 'BEVEILIGINGSNIVO', 'BEVEILIGINGSNIVEAU', 'PROTECTIONLEVEL' ),
-	'formatdate'              => array( '0', 'daotumopmaak', 'datumopmaak', 'formatdate', 'dateformat' ),
-	'url_query'               => array( '0', 'ZEUKOPDRACHTE', 'ZOEKOPDRACHT', 'QUERY' ),
+	'redirect'                  => array( '0', '#DEURVERWIEZING', '#DOORVERWIJZING', '#REDIRECT' ),
+	'notoc'                     => array( '0', '__GIENONDERWARPEN__', '__GEENINHOUD__', '__NOTOC__' ),
+	'nogallery'                 => array( '0', '__GIENGALLERIEJE__', '__GEEN_GALERIJ__', '__NOGALLERY__' ),
+	'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' ),
+	'currentmonthabbrev'        => array( '1', 'DISSEMAONDAOFK', 'HUIDIGEMAANDAFK', 'CURRENTMONTHABBREV' ),
+	'currentday'                => array( '1', 'DISSEDAG', 'HUIDIGEDAG', 'CURRENTDAY' ),
+	'currentday2'               => array( '1', 'DISSEDAG2', 'HUIDIGEDAG2', 'CURRENTDAY2' ),
+	'currentdayname'            => array( '1', 'DISSEDAGNAAM', 'HUIDIGEDAGNAAM', 'CURRENTDAYNAME' ),
+	'currentyear'               => array( '1', 'DITJAOR', 'HUIDIGJAAR', 'CURRENTYEAR' ),
+	'currenttime'               => array( '1', 'DISSETIED', 'HUIDIGETIJD', 'CURRENTTIME' ),
+	'currenthour'               => array( '1', 'DITURE', 'HUIDIGUUR', 'CURRENTHOUR' ),
+	'localmonth'                => array( '1', 'LOKALEMAOND', 'PLAATSELIJKEMAAND', 'LOKALEMAAND', 'LOKALEMAAND2', 'LOCALMONTH', 'LOCALMONTH2' ),
+	'localmonth1'               => array( '1', 'LOKALEMAOND1', 'LOKALEMAAND1', 'LOCALMONTH1' ),
+	'localmonthname'            => array( '1', 'LOKALEMAONDNAAM', 'PLAATSELIJKEMAANDNAAM', 'LOKALEMAANDNAAM', 'LOCALMONTHNAME' ),
+	'localmonthnamegen'         => array( '1', 'LOKALEMAONDNAAMGEN', 'PLAATSELIJKEMAANDNAAMGEN', 'LOKALEMAANDNAAMGEN', 'LOCALMONTHNAMEGEN' ),
+	'localmonthabbrev'          => array( '1', 'LOKALEMAONDAOFK', 'PLAATSELIJKEMAANDAFK', 'LOKALEMAANDAFK', 'LOCALMONTHABBREV' ),
+	'localday'                  => array( '1', 'LOKALEDAG', 'PLAATSELIJKEDAG', 'LOCALDAY' ),
+	'localday2'                 => array( '1', 'LOKALEDAG2', 'PLAATSELIJKEDAG2', 'LOCALDAY2' ),
+	'localdayname'              => array( '1', 'LOKALEDAGNAAM', 'PLAATSELIJKEDAGNAAM', 'LOCALDAYNAME' ),
+	'localyear'                 => array( '1', 'LOKAALJAOR', 'PLAATSELIJKJAAR', 'LOKAALJAAR', 'LOCALYEAR' ),
+	'localtime'                 => array( '1', 'LOKALETIED', 'PLAATSELIJKETIJD', 'LOKALETIJD', 'LOCALTIME' ),
+	'localhour'                 => array( '1', 'LOKAALURE', 'PLAATSELIJKUUR', 'LOKAALUUR', 'LOCALHOUR' ),
+	'numberofpages'             => array( '1', 'ANTALPAGINAS', 'ANTALPAGINA\'S', 'ANTALPAGINA’S', 'AANTALPAGINAS', 'AANTALPAGINA\'S', 'AANTALPAGINA’S', 'NUMBEROFPAGES' ),
+	'numberofarticles'          => array( '1', 'ANTALARTIKELS', 'AANTALARTIKELEN', 'NUMBEROFARTICLES' ),
+	'numberoffiles'             => array( '1', 'ANTALBESTANDEN', 'AANTALBESTANDEN', 'NUMBEROFFILES' ),
+	'numberofusers'             => array( '1', 'ANTALGEBRUKERS', 'AANTALGEBRUIKERS', 'NUMBEROFUSERS' ),
+	'numberofactiveusers'       => array( '1', 'ANTALAKTIEVEGEBRUKERS', 'AANTALACTIEVEGEBRUIKERS', 'ACTIEVEGEBRUIKERS', 'NUMBEROFACTIVEUSERS' ),
+	'numberofedits'             => array( '1', 'ANTALBEWARKINGEN', 'AANTALBEWERKINGEN', 'NUMBEROFEDITS' ),
+	'numberofviews'             => array( '1', 'ANTALKERENBEKEKEN', 'AANTALKERENBEKEKEN', 'NUMBEROFVIEWS' ),
+	'pagename'                  => array( '1', 'PAGINANAAM', 'PAGENAME' ),
+	'pagenamee'                 => array( '1', 'PAGINANAAME', 'PAGENAMEE' ),
+	'namespace'                 => array( '1', 'NAAMRUUMTE', 'NAAMRUIMTE', 'NAMESPACE' ),
+	'namespacee'                => array( '1', 'NAAMRUUMTEE', 'NAAMRUIMTEE', 'NAMESPACEE' ),
+	'talkspace'                 => array( '1', 'OVERLEGRUUMTE', 'OVERLEGRUIMTE', 'TALKSPACE' ),
+	'talkspacee'                => array( '1', 'OVERLEGRUUMTEE', 'OVERLEGRUIMTEE', 'TALKSPACEE' ),
+	'subjectspace'              => array( '1', 'ONDERWARPRUUMTE', 'ARTIKELRUUMTE', 'ONDERWERPRUIMTE', 'ARTIKELRUIMTE', 'SUBJECTSPACE', 'ARTICLESPACE' ),
+	'subjectspacee'             => array( '1', 'ONDERWARPRUUMTEE', 'ARTIKELRUUMTEE', 'ONDERWERPRUIMTEE', 'ARTIKELRUIMTEE', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
+	'fullpagename'              => array( '1', 'HELEPAGINANAAM', 'VOLLEDIGEPAGINANAAM', 'FULLPAGENAME' ),
+	'fullpagenamee'             => array( '1', 'HELEPAGINANAAME', 'VOLLEDIGEPAGINANAAME', 'FULLPAGENAMEE' ),
+	'subpagename'               => array( '1', 'DEELPAGINANAAM', 'SUBPAGENAME' ),
+	'subpagenamee'              => array( '1', 'DEELPAGINANAAME', 'SUBPAGENAMEE' ),
+	'basepagename'              => array( '1', 'BAOSISPAGINANAAM', 'BASISPAGINANAAM', 'BASEPAGENAME' ),
+	'basepagenamee'             => array( '1', 'BAOSISPAGINANAAME', 'BASISPAGINANAAME', 'BASEPAGENAMEE' ),
+	'talkpagename'              => array( '1', 'OVERLEGPAGINANAAM', 'TALKPAGENAME' ),
+	'talkpagenamee'             => array( '1', 'OVERLEGPAGINANAAME', 'TALKPAGENAMEE' ),
+	'subjectpagename'           => array( '1', 'ONDERWARPPAGINANAAM', 'ARTIKELPAGINANAAM', 'ONDERWERPPAGINANAAM', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
+	'subjectpagenamee'          => array( '1', 'ONDERWARPPAGINANAAME', 'ARTIKELPAGINANAAME', 'ONDERWERPPAGINANAAME', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
+	'msg'                       => array( '0', 'BERICHT:', 'MSG:' ),
+	'subst'                     => array( '0', 'VERVANG:', 'VERV:', 'SUBST:' ),
+	'msgnw'                     => array( '0', 'BERICHTNW', 'MSGNW:' ),
+	'img_thumbnail'             => array( '1', 'miniatuur', 'duumnegel', 'doemnaegel', 'thumbnail', 'thumb' ),
+	'img_manualthumb'           => array( '1', 'miniatuur=$1', 'duumnegel=$1', 'doemnaegel=$1', 'thumbnail=$1', 'thumb=$1' ),
+	'img_right'                 => array( '1', 'rechts', 'right' ),
+	'img_left'                  => array( '1', 'links', 'left' ),
+	'img_none'                  => array( '1', 'gien', 'geen', 'none' ),
+	'img_center'                => array( '1', 'esentreerd', 'gecentreerd', 'center', 'centre' ),
+	'img_framed'                => array( '1', 'umraand', 'omkaderd', 'framed', 'enframed', 'frame' ),
+	'img_frameless'             => array( '1', 'kaoderloos', 'kaderloos', 'frameless' ),
+	'img_page'                  => array( '1', 'pagina=$1', 'pagina_$1', 'pagina $1', 'page=$1', 'page $1' ),
+	'img_upright'               => array( '1', 'rechtop', 'rechtop=$1', 'rechtop$1', 'upright', 'upright=$1', 'upright $1' ),
+	'img_border'                => array( '1', 'raand', 'rand', 'border' ),
+	'img_baseline'              => array( '1', 'grondliende', 'grondlijn', 'baseline' ),
+	'img_top'                   => array( '1', 'boven', 'top' ),
+	'img_text_top'              => array( '1', 'tekste-boven', 'tekst-boven', 'text-top' ),
+	'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' ),
+	'sitename'                  => array( '1', 'WEBSTEENAAM', 'SITENAAM', 'SITENAME' ),
+	'ns'                        => array( '0', 'NR:', 'NS:' ),
+	'localurl'                  => array( '0', 'LOKALEURL', 'LOCALURL:' ),
+	'localurle'                 => array( '0', 'LOKALEURLE', 'LOCALURLE:' ),
+	'servername'                => array( '0', 'SERVERNAAM', 'SERVERNAME' ),
+	'scriptpath'                => array( '0', 'SKRIPTPAD', 'SCRIPTPAD', 'SCRIPTPATH' ),
+	'stylepath'                 => array( '0', 'STIELPAD', 'STIJLPAD', 'STYLEPATH' ),
+	'grammar'                   => array( '0', 'GRAMMATIKA:', 'GRAMMATICA:', 'GRAMMAR:' ),
+	'gender'                    => array( '0', 'GESLACHTE:', 'GESLACHT:', 'GENDER:' ),
+	'notitleconvert'            => array( '0', '__GIENTITELKONVERSIE__', '__GIENTC__', '__GEENTITELCONVERSIE__', '__GEENTC__', '__GEENPAGINANAAMCONVERSIE__', '__NOTITLECONVERT__', '__NOTC__' ),
+	'nocontentconvert'          => array( '0', '__GIENINHOUDKONVERSIE__', '__GIENIC__', '__GEENINHOUDCONVERSIE__', '__GEENIC__', '__NOCONTENTCONVERT__', '__NOCC__' ),
+	'currentweek'               => array( '1', 'DISSEWEKE', 'HUIDIGEWEEK', 'CURRENTWEEK' ),
+	'currentdow'                => array( '1', 'DISSEDVDW', 'HUIDIGEDVDW', 'CURRENTDOW' ),
+	'localweek'                 => array( '1', 'LOKALEWEKE', 'PLAATSELIJKEWEEK', 'LOKALEWEEK', 'LOCALWEEK' ),
+	'localdow'                  => array( '1', 'LOKALEDVDW', 'PLAATSELIJKEDVDW', 'LOCALDOW' ),
+	'revisionid'                => array( '1', 'REVISIEID', 'REVISIE-ID', 'VERSIEID', 'REVISIONID' ),
+	'revisionday'               => array( '1', 'REVISIEDAG', 'VERSIEDAG', 'REVISIONDAY' ),
+	'revisionday2'              => array( '1', 'REVISIEDAG2', 'VERSIEDAG2', 'REVISIONDAY2' ),
+	'revisionmonth'             => array( '1', 'REVISIEMAOND', 'VERSIEMAAND', 'REVISIONMONTH' ),
+	'revisionyear'              => array( '1', 'REVISIEJAOR', 'VERSIEJAAR', 'REVISIONYEAR' ),
+	'revisiontimestamp'         => array( '1', 'REVISIETIEDSTEMPEL', 'VERSIETIJD', 'REVISIONTIMESTAMP' ),
+	'revisionuser'              => array( '1', 'VERSIEGEBRUKER', 'VERSIEGEBRUIKER', 'REVISIONUSER' ),
+	'plural'                    => array( '0', 'MEERVOUD:', 'PLURAL:' ),
+	'fullurl'                   => array( '0', 'HELEURL', 'VOLLEDIGEURL', 'VOLLEDIGEURL:', 'FULLURL:' ),
+	'fullurle'                  => array( '0', 'HELEURLE', 'VOLLEDIGEURLE', 'VOLLEDIGEURLE:', 'FULLURLE:' ),
+	'lcfirst'                   => array( '0', 'KLEERSTE:', 'LCFIRST:' ),
+	'ucfirst'                   => array( '0', 'GLEERSTE:', 'HLEERSTE:', 'UCFIRST:' ),
+	'lc'                        => array( '0', 'KL:', 'LC:' ),
+	'uc'                        => array( '0', 'HL:', 'UC:' ),
+	'raw'                       => array( '0', 'RAUW:', 'RUW:', 'RAW:' ),
+	'displaytitle'              => array( '1', 'TEUNTITEL', 'TOONTITEL', 'TITELTONEN', 'WEERGEGEVENTITEL', 'DISPLAYTITLE' ),
+	'newsectionlink'            => array( '1', '__NIEJESECTIEVERWIEZING__', '__NIEUWESECTIELINK__', '__NIEUWESECTIEKOPPELING__', '__NEWSECTIONLINK__' ),
+	'nonewsectionlink'          => array( '1', '__GIENNIEJKOPJENVERWIEZING__', '__GEENNIEUWKOPJEVERWIJZING__', '__GEENNIEUWESECTIELINK__', '__NONEWSECTIONLINK__' ),
+	'currentversion'            => array( '1', 'DISSEVERSIE', 'HUIDIGEVERSIE', 'CURRENTVERSION' ),
+	'urlencode'                 => array( '0', 'URLKODEREN', 'URLCODEREN', 'CODEERURL', 'URLENCODE:' ),
+	'anchorencode'              => array( '0', 'ANKERKODEREN', 'ANKERCODEREN', 'CODEERANKER', 'ANCHORENCODE' ),
+	'currenttimestamp'          => array( '1', 'DISSETIEDSTEMPEL', 'HUIDIGETIJDSTEMPEL', 'CURRENTTIMESTAMP' ),
+	'localtimestamp'            => array( '1', 'LOKALETIEDSTEMPEL', 'PLAATSELIJKETIJDSTEMPEL', 'LOKALETIJDSTEMPEL', 'LOCALTIMESTAMP' ),
+	'directionmark'             => array( '1', 'RICHTINGMARKERING', 'RICHTINGSMARKERING', 'DIRECTIONMARK', 'DIRMARK' ),
+	'language'                  => array( '0', '#TAAL:', '#LANGUAGE:' ),
+	'contentlanguage'           => array( '1', 'INHOUDSTAAL', 'INHOUDTAAL', 'CONTENTLANGUAGE', 'CONTENTLANG' ),
+	'pagesinnamespace'          => array( '1', 'PAGINASINNAAMRUUMTE', 'PAGINA’SINNAAMRUUMTE', 'PAGINA\'SINNAAMRUUMTE', 'PAGINASINNAAMRUIMTE', 'PAGINA’SINNAAMRUIMTE', 'PAGINA\'SINNAAMRUIMTE', 'PAGESINNAMESPACE:', 'PAGESINNS:' ),
+	'numberofadmins'            => array( '1', 'ANTALBEHEERDERS', 'AANTALBEHEERDERS', 'AANTALADMINS', 'NUMBEROFADMINS' ),
+	'formatnum'                 => array( '0', 'FORMATTEERNUM', 'NUMFORMATTEREN', 'FORMATNUM' ),
+	'padleft'                   => array( '0', 'LINKSOPVULLEN', 'PADLEFT' ),
+	'padright'                  => array( '0', 'RECHTSOPVULLEN', 'PADRIGHT' ),
+	'special'                   => array( '0', 'spesiaal', 'speciaal', 'special' ),
+	'defaultsort'               => array( '1', 'STANDARDSORTERING:', 'STANDAARDSORTERING:', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:' ),
+	'filepath'                  => array( '0', 'BESTAANDSPAD:', 'BESTANDSPAD:', 'FILEPATH:' ),
+	'tag'                       => array( '0', 'etiket', 'label', 'tag' ),
+	'hiddencat'                 => array( '1', '__VERBÖRGENKAT__', '__VERBORGENCAT__', '__HIDDENCAT__' ),
+	'pagesincategory'           => array( '1', 'PAGINASINKATEGORIE', 'PAGINASINKAT', 'PAGINASINCATEGORIE', 'PAGINASINCAT', 'PAGESINCATEGORY', 'PAGESINCAT' ),
+	'pagesize'                  => array( '1', 'PAGINAGROOTTE', 'PAGESIZE' ),
+	'noindex'                   => array( '1', '__GIENINDEX__', '__GEENINDEX__', '__NOINDEX__' ),
+	'numberingroup'             => array( '1', 'ANTALINGROEP', 'AANTALINGROEP', 'NUMBERINGROUP', 'NUMINGROUP' ),
+	'staticredirect'            => array( '1', '__STAOTIESEDEURVERWIEZING__', '__STATISCHEDOORVERWIJZING__', '__STATISCHEREDIRECT__', '__STATICREDIRECT__' ),
+	'protectionlevel'           => array( '1', 'BEVEILIGINGSNIVO', 'BEVEILIGINGSNIVEAU', 'PROTECTIONLEVEL' ),
+	'formatdate'                => array( '0', 'daotumopmaak', 'datumopmaak', 'formatdate', 'dateformat' ),
+	'url_query'                 => array( '0', 'ZEUKOPDRACHTE', 'ZOEKOPDRACHT', 'QUERY' ),
 );
 
 $specialPageAliases = array(
diff --git a/languages/messages/MessagesNl.php b/languages/messages/MessagesNl.php
index 08d9d375ca..0ae203dfe3 100644
--- a/languages/messages/MessagesNl.php
+++ b/languages/messages/MessagesNl.php
@@ -95,151 +95,153 @@ $bookstoreList = array(
 );
 
 $magicWords = array(
-	'redirect'                => array( '0', '#DOORVERWIJZING', '#REDIRECT' ),
-	'notoc'                   => array( '0', '__GEENINHOUD__', '__NOTOC__' ),
-	'nogallery'               => array( '0', '__GEEN_GALERIJ__', '__NOGALLERY__' ),
-	'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' ),
-	'currentmonthnamegen'     => array( '1', 'HUIDIGEMAANDGEN', 'CURRENTMONTHNAMEGEN' ),
-	'currentmonthabbrev'      => array( '1', 'HUIDIGEMAANDAFK', 'CURRENTMONTHABBREV' ),
-	'currentday'              => array( '1', 'HUIDIGEDAG', 'CURRENTDAY' ),
-	'currentday2'             => array( '1', 'HUIDIGEDAG2', 'CURRENTDAY2' ),
-	'currentdayname'          => array( '1', 'HUIDIGEDAGNAAM', 'CURRENTDAYNAME' ),
-	'currentyear'             => array( '1', 'HUIDIGJAAR', 'CURRENTYEAR' ),
-	'currenttime'             => array( '1', 'HUIDIGETIJD', 'CURRENTTIME' ),
-	'currenthour'             => array( '1', 'HUIDIGUUR', 'CURRENTHOUR' ),
-	'localmonth'              => array( '1', 'PLAATSELIJKEMAAND', 'LOKALEMAAND', 'LOKALEMAAND2', 'LOCALMONTH', 'LOCALMONTH2' ),
-	'localmonth1'             => array( '1', 'LOKALEMAAND1', 'LOCALMONTH1' ),
-	'localmonthname'          => array( '1', 'PLAATSELIJKEMAANDNAAM', 'LOKALEMAANDNAAM', 'LOCALMONTHNAME' ),
-	'localmonthnamegen'       => array( '1', 'PLAATSELIJKEMAANDNAAMGEN', 'LOKALEMAANDNAAMGEN', 'LOCALMONTHNAMEGEN' ),
-	'localmonthabbrev'        => array( '1', 'PLAATSELIJKEMAANDAFK', 'LOKALEMAANDAFK', 'LOCALMONTHABBREV' ),
-	'localday'                => array( '1', 'PLAATSELIJKEDAG', 'LOKALEDAG', 'LOCALDAY' ),
-	'localday2'               => array( '1', 'PLAATSELIJKEDAG2', 'LOKALEDAG2', 'LOCALDAY2' ),
-	'localdayname'            => array( '1', 'PLAATSELIJKEDAGNAAM', 'LOKALEDAGNAAM', 'LOCALDAYNAME' ),
-	'localyear'               => array( '1', 'PLAATSELIJKJAAR', 'LOKAALJAAR', 'LOCALYEAR' ),
-	'localtime'               => array( '1', 'PLAATSELIJKETIJD', 'LOKALETIJD', 'LOCALTIME' ),
-	'localhour'               => array( '1', 'PLAATSELIJKUUR', 'LOKAALUUR', 'LOCALHOUR' ),
-	'numberofpages'           => array( '1', 'AANTALPAGINAS', 'AANTALPAGINA\'S', 'AANTALPAGINA’S', 'NUMBEROFPAGES' ),
-	'numberofarticles'        => array( '1', 'AANTALARTIKELEN', 'NUMBEROFARTICLES' ),
-	'numberoffiles'           => array( '1', 'AANTALBESTANDEN', 'NUMBEROFFILES' ),
-	'numberofusers'           => array( '1', 'AANTALGEBRUIKERS', 'NUMBEROFUSERS' ),
-	'numberofactiveusers'     => array( '1', 'AANTALACTIEVEGEBRUIKERS', 'ACTIEVEGEBRUIKERS', 'NUMBEROFACTIVEUSERS' ),
-	'numberofedits'           => array( '1', 'AANTALBEWERKINGEN', 'NUMBEROFEDITS' ),
-	'numberofviews'           => array( '1', 'AANTALKERENBEKEKEN', 'NUMBEROFVIEWS' ),
-	'pagename'                => array( '1', 'PAGINANAAM', 'PAGENAME' ),
-	'pagenamee'               => array( '1', 'PAGINANAAME', 'PAGENAMEE' ),
-	'namespace'               => array( '1', 'NAAMRUIMTE', 'NAMESPACE' ),
-	'namespacee'              => array( '1', 'NAAMRUIMTEE', 'NAMESPACEE' ),
-	'namespacenumber'         => array( '1', 'NAAMRUIMTENUMMER', 'NAMESPACENUMBER' ),
-	'talkspace'               => array( '1', 'OVERLEGRUIMTE', 'TALKSPACE' ),
-	'talkspacee'              => array( '1', 'OVERLEGRUIMTEE', 'TALKSPACEE' ),
-	'subjectspace'            => array( '1', 'ONDERWERPRUIMTE', 'ARTIKELRUIMTE', 'SUBJECTSPACE', 'ARTICLESPACE' ),
-	'subjectspacee'           => array( '1', 'ONDERWERPRUIMTEE', 'ARTIKELRUIMTEE', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
-	'fullpagename'            => array( '1', 'VOLLEDIGEPAGINANAAM', 'FULLPAGENAME' ),
-	'fullpagenamee'           => array( '1', 'VOLLEDIGEPAGINANAAME', 'FULLPAGENAMEE' ),
-	'subpagename'             => array( '1', 'DEELPAGINANAAM', 'SUBPAGENAME' ),
-	'subpagenamee'            => array( '1', 'DEELPAGINANAAME', 'SUBPAGENAMEE' ),
-	'basepagename'            => array( '1', 'BASISPAGINANAAM', 'BASEPAGENAME' ),
-	'basepagenamee'           => array( '1', 'BASISPAGINANAAME', 'BASEPAGENAMEE' ),
-	'talkpagename'            => array( '1', 'OVERLEGPAGINANAAM', 'TALKPAGENAME' ),
-	'talkpagenamee'           => array( '1', 'OVERLEGPAGINANAAME', 'TALKPAGENAMEE' ),
-	'subjectpagename'         => array( '1', 'ONDERWERPPAGINANAAM', 'ARTIKELPAGINANAAM', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
-	'subjectpagenamee'        => array( '1', 'ONDERWERPPAGINANAAME', 'ARTIKELPAGINANAAME', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
-	'msg'                     => array( '0', 'BERICHT:', 'MSG:' ),
-	'subst'                   => array( '0', 'VERV:', 'SUBST:' ),
-	'safesubst'               => array( '0', 'VEILIGVERV:', 'SAFESUBST:' ),
-	'msgnw'                   => array( '0', 'BERICHTNW', 'MSGNW:' ),
-	'img_thumbnail'           => array( '1', 'miniatuur', 'thumbnail', 'thumb' ),
-	'img_manualthumb'         => array( '1', 'miniatuur=$1', 'thumbnail=$1', 'thumb=$1' ),
-	'img_right'               => array( '1', 'rechts', 'right' ),
-	'img_left'                => array( '1', 'links', 'left' ),
-	'img_none'                => array( '1', 'geen', 'none' ),
-	'img_center'              => array( '1', 'gecentreerd', 'center', 'centre' ),
-	'img_framed'              => array( '1', 'omkaderd', 'framed', 'enframed', 'frame' ),
-	'img_frameless'           => array( '1', 'kaderloos', 'frameless' ),
-	'img_page'                => array( '1', 'pagina=$1', 'pagina $1', 'page=$1', 'page $1' ),
-	'img_upright'             => array( '1', 'rechtop', 'rechtop=$1', 'rechtop$1', 'upright', 'upright=$1', 'upright $1' ),
-	'img_border'              => array( '1', 'rand', 'border' ),
-	'img_baseline'            => array( '1', 'grondlijn', 'baseline' ),
-	'img_top'                 => array( '1', 'boven', 'top' ),
-	'img_text_top'            => array( '1', 'tekst-boven', 'text-top' ),
-	'img_middle'              => array( '1', 'midden', 'middle' ),
-	'img_bottom'              => array( '1', 'beneden', 'bottom' ),
-	'img_text_bottom'         => array( '1', 'tekst-beneden', 'text-bottom' ),
-	'img_link'                => array( '1', 'verwijzing=$1', 'link=$1' ),
-	'sitename'                => array( '1', 'SITENAAM', 'SITENAME' ),
-	'ns'                      => array( '0', 'NR:', 'NS:' ),
-	'localurl'                => array( '0', 'LOKALEURL', 'LOCALURL:' ),
-	'localurle'               => array( '0', 'LOKALEURLE', 'LOCALURLE:' ),
-	'articlepath'             => array( '0', 'ARTIKELPAD', 'ARTICLEPATH' ),
-	'servername'              => array( '0', 'SERVERNAAM', 'SERVERNAME' ),
-	'scriptpath'              => array( '0', 'SCRIPTPAD', 'SCRIPTPATH' ),
-	'stylepath'               => array( '0', 'STIJLPAD', 'STYLEPATH' ),
-	'grammar'                 => array( '0', 'GRAMMATICA:', 'GRAMMAR:' ),
-	'gender'                  => array( '0', 'GESLACHT:', 'GENDER:' ),
-	'notitleconvert'          => array( '0', '__GEENPAGINANAAMCONVERSIE__', '__GEENTITELCONVERSIE__', '__GEENTC__', '__NOTITLECONVERT__', '__NOTC__' ),
-	'nocontentconvert'        => array( '0', '__GEENINHOUDCONVERSIE__', '__GEENIC__', '__NOCONTENTCONVERT__', '__NOCC__' ),
-	'currentweek'             => array( '1', 'HUIDIGEWEEK', 'CURRENTWEEK' ),
-	'currentdow'              => array( '1', 'HUIDIGEDVDW', 'CURRENTDOW' ),
-	'localweek'               => array( '1', 'PLAATSELIJKEWEEK', 'LOKALEWEEK', 'LOCALWEEK' ),
-	'localdow'                => array( '1', 'PLAATSELIJKEDVDW', 'LOKALEDVDW', 'LOCALDOW' ),
-	'revisionid'              => array( '1', 'VERSIEID', 'REVISIONID' ),
-	'revisionday'             => array( '1', 'VERSIEDAG', 'REVISIONDAY' ),
-	'revisionday2'            => array( '1', 'VERSIEDAG2', 'REVISIONDAY2' ),
-	'revisionmonth'           => array( '1', 'VERSIEMAAND', 'REVISIONMONTH' ),
-	'revisionmonth1'          => array( '1', 'VERSIEMAAND1', 'REVISIONMONTH1' ),
-	'revisionyear'            => array( '1', 'VERSIEJAAR', 'REVISIONYEAR' ),
-	'revisiontimestamp'       => array( '1', 'VERSIETIJD', 'REVISIONTIMESTAMP' ),
-	'revisionuser'            => array( '1', 'VERSIEGEBRUIKER', 'REVISIONUSER' ),
-	'plural'                  => array( '0', 'MEERVOUD:', 'PLURAL:' ),
-	'fullurl'                 => array( '0', 'VOLLEDIGEURL:', 'FULLURL:' ),
-	'fullurle'                => array( '0', 'VOLLEDIGEURLE:', 'FULLURLE:' ),
-	'canonicalurl'            => array( '0', 'CANOIEKEURL:', 'CANONICALURL:' ),
-	'canonicalurle'           => array( '0', 'CANONIEKEURLE:', 'CANONICALURLE:' ),
-	'lcfirst'                 => array( '0', 'KLEERSTE:', 'LCFIRST:' ),
-	'ucfirst'                 => array( '0', 'GLEERSTE:', 'HLEERSTE:', 'UCFIRST:' ),
-	'lc'                      => array( '0', 'KL:', 'LC:' ),
-	'uc'                      => array( '0', 'HL:', 'UC:' ),
-	'raw'                     => array( '0', 'RAUW:', 'RUW:', 'RAW:' ),
-	'displaytitle'            => array( '1', 'WEERGEGEVENTITEL', 'TOONTITEL', 'DISPLAYTITLE' ),
-	'rawsuffix'               => array( '1', 'V', 'R' ),
-	'newsectionlink'          => array( '1', '__NIEUWESECTIELINK__', '__NIEUWESECTIEKOPPELING__', '__NEWSECTIONLINK__' ),
-	'nonewsectionlink'        => array( '1', '__GEENNIEUWESECTIELINK__', '__GEENNIEUWKOPJEVERWIJZING__', '__NONEWSECTIONLINK__' ),
-	'currentversion'          => array( '1', 'HUIDIGEVERSIE', 'CURRENTVERSION' ),
-	'urlencode'               => array( '0', 'URLCODEREN', 'CODEERURL', 'URLENCODE:' ),
-	'anchorencode'            => array( '0', 'ANKERCODEREN', 'CODEERANKER', 'ANCHORENCODE' ),
-	'currenttimestamp'        => array( '1', 'HUIDIGETIJDSTEMPEL', 'CURRENTTIMESTAMP' ),
-	'localtimestamp'          => array( '1', 'PLAATSELIJKETIJDSTEMPEL', 'LOKALETIJDSTEMPEL', 'LOCALTIMESTAMP' ),
-	'directionmark'           => array( '1', 'RICHTINGMARKERING', 'RICHTINGSMARKERING', 'DIRECTIONMARK', 'DIRMARK' ),
-	'language'                => array( '0', '#TAAL:', '#LANGUAGE:' ),
-	'contentlanguage'         => array( '1', 'INHOUDSTAAL', 'INHOUDTAAL', 'CONTENTLANGUAGE', 'CONTENTLANG' ),
-	'pagesinnamespace'        => array( '1', 'PAGINASINNAAMRUIMTE', 'PAGINA’SINNAAMRUIMTE', 'PAGINA\'SINNAAMRUIMTE', 'PAGESINNAMESPACE:', 'PAGESINNS:' ),
-	'numberofadmins'          => array( '1', 'AANTALBEHEERDERS', 'AANTALADMINS', 'NUMBEROFADMINS' ),
-	'formatnum'               => array( '0', 'FORMATTEERNUM', 'NUMFORMATTEREN', 'FORMATNUM' ),
-	'padleft'                 => array( '0', 'LINKSOPVULLEN', 'PADLEFT' ),
-	'padright'                => array( '0', 'RECHTSOPVULLEN', 'PADRIGHT' ),
-	'special'                 => array( '0', 'speciaal', 'special' ),
-	'speciale'                => array( '0', 'speciaale', 'speciale' ),
-	'defaultsort'             => array( '1', 'STANDAARDSORTERING:', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:' ),
-	'filepath'                => array( '0', 'BESTANDSPAD:', 'FILEPATH:' ),
-	'tag'                     => array( '0', 'label', 'tag' ),
-	'hiddencat'               => array( '1', '__VERBORGENCAT__', '__HIDDENCAT__' ),
-	'pagesincategory'         => array( '1', 'PAGINASINCATEGORIE', 'PAGINASINCAT', 'PAGESINCATEGORY', 'PAGESINCAT' ),
-	'pagesize'                => array( '1', 'PAGINAGROOTTE', 'PAGESIZE' ),
-	'noindex'                 => array( '1', '__GEENINDEX__', '__NOINDEX__' ),
-	'numberingroup'           => array( '1', 'AANTALINGROEP', 'NUMBERINGROUP', 'NUMINGROUP' ),
-	'staticredirect'          => array( '1', '__STATISCHEDOORVERWIJZING__', '__STATISCHEREDIRECT__', '__STATICREDIRECT__' ),
-	'protectionlevel'         => array( '1', 'BEVEILIGINGSNIVEAU', 'PROTECTIONLEVEL' ),
-	'formatdate'              => array( '0', 'datumopmaak', 'formatdate', 'dateformat' ),
-	'url_path'                => array( '0', 'PAD', 'PATH' ),
-	'url_query'               => array( '0', 'ZOEKOPDRACHT', 'QUERY' ),
-	'defaultsort_noerror'     => array( '0', 'geenfout', 'noerror' ),
-	'defaultsort_noreplace'   => array( '0', 'nietvervangen', 'noreplace' ),
+	'redirect'                  => array( '0', '#DOORVERWIJZING', '#REDIRECT' ),
+	'notoc'                     => array( '0', '__GEENINHOUD__', '__NOTOC__' ),
+	'nogallery'                 => array( '0', '__GEEN_GALERIJ__', '__NOGALLERY__' ),
+	'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' ),
+	'currentmonthnamegen'       => array( '1', 'HUIDIGEMAANDGEN', 'CURRENTMONTHNAMEGEN' ),
+	'currentmonthabbrev'        => array( '1', 'HUIDIGEMAANDAFK', 'CURRENTMONTHABBREV' ),
+	'currentday'                => array( '1', 'HUIDIGEDAG', 'CURRENTDAY' ),
+	'currentday2'               => array( '1', 'HUIDIGEDAG2', 'CURRENTDAY2' ),
+	'currentdayname'            => array( '1', 'HUIDIGEDAGNAAM', 'CURRENTDAYNAME' ),
+	'currentyear'               => array( '1', 'HUIDIGJAAR', 'CURRENTYEAR' ),
+	'currenttime'               => array( '1', 'HUIDIGETIJD', 'CURRENTTIME' ),
+	'currenthour'               => array( '1', 'HUIDIGUUR', 'CURRENTHOUR' ),
+	'localmonth'                => array( '1', 'PLAATSELIJKEMAAND', 'LOKALEMAAND', 'LOKALEMAAND2', 'LOCALMONTH', 'LOCALMONTH2' ),
+	'localmonth1'               => array( '1', 'LOKALEMAAND1', 'LOCALMONTH1' ),
+	'localmonthname'            => array( '1', 'PLAATSELIJKEMAANDNAAM', 'LOKALEMAANDNAAM', 'LOCALMONTHNAME' ),
+	'localmonthnamegen'         => array( '1', 'PLAATSELIJKEMAANDNAAMGEN', 'LOKALEMAANDNAAMGEN', 'LOCALMONTHNAMEGEN' ),
+	'localmonthabbrev'          => array( '1', 'PLAATSELIJKEMAANDAFK', 'LOKALEMAANDAFK', 'LOCALMONTHABBREV' ),
+	'localday'                  => array( '1', 'PLAATSELIJKEDAG', 'LOKALEDAG', 'LOCALDAY' ),
+	'localday2'                 => array( '1', 'PLAATSELIJKEDAG2', 'LOKALEDAG2', 'LOCALDAY2' ),
+	'localdayname'              => array( '1', 'PLAATSELIJKEDAGNAAM', 'LOKALEDAGNAAM', 'LOCALDAYNAME' ),
+	'localyear'                 => array( '1', 'PLAATSELIJKJAAR', 'LOKAALJAAR', 'LOCALYEAR' ),
+	'localtime'                 => array( '1', 'PLAATSELIJKETIJD', 'LOKALETIJD', 'LOCALTIME' ),
+	'localhour'                 => array( '1', 'PLAATSELIJKUUR', 'LOKAALUUR', 'LOCALHOUR' ),
+	'numberofpages'             => array( '1', 'AANTALPAGINAS', 'AANTALPAGINA\'S', 'AANTALPAGINA’S', 'NUMBEROFPAGES' ),
+	'numberofarticles'          => array( '1', 'AANTALARTIKELEN', 'NUMBEROFARTICLES' ),
+	'numberoffiles'             => array( '1', 'AANTALBESTANDEN', 'NUMBEROFFILES' ),
+	'numberofusers'             => array( '1', 'AANTALGEBRUIKERS', 'NUMBEROFUSERS' ),
+	'numberofactiveusers'       => array( '1', 'AANTALACTIEVEGEBRUIKERS', 'ACTIEVEGEBRUIKERS', 'NUMBEROFACTIVEUSERS' ),
+	'numberofedits'             => array( '1', 'AANTALBEWERKINGEN', 'NUMBEROFEDITS' ),
+	'numberofviews'             => array( '1', 'AANTALKERENBEKEKEN', 'NUMBEROFVIEWS' ),
+	'pagename'                  => array( '1', 'PAGINANAAM', 'PAGENAME' ),
+	'pagenamee'                 => array( '1', 'PAGINANAAME', 'PAGENAMEE' ),
+	'namespace'                 => array( '1', 'NAAMRUIMTE', 'NAMESPACE' ),
+	'namespacee'                => array( '1', 'NAAMRUIMTEE', 'NAMESPACEE' ),
+	'namespacenumber'           => array( '1', 'NAAMRUIMTENUMMER', 'NAMESPACENUMBER' ),
+	'talkspace'                 => array( '1', 'OVERLEGRUIMTE', 'TALKSPACE' ),
+	'talkspacee'                => array( '1', 'OVERLEGRUIMTEE', 'TALKSPACEE' ),
+	'subjectspace'              => array( '1', 'ONDERWERPRUIMTE', 'ARTIKELRUIMTE', 'SUBJECTSPACE', 'ARTICLESPACE' ),
+	'subjectspacee'             => array( '1', 'ONDERWERPRUIMTEE', 'ARTIKELRUIMTEE', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
+	'fullpagename'              => array( '1', 'VOLLEDIGEPAGINANAAM', 'FULLPAGENAME' ),
+	'fullpagenamee'             => array( '1', 'VOLLEDIGEPAGINANAAME', 'FULLPAGENAMEE' ),
+	'subpagename'               => array( '1', 'DEELPAGINANAAM', 'SUBPAGENAME' ),
+	'subpagenamee'              => array( '1', 'DEELPAGINANAAME', 'SUBPAGENAMEE' ),
+	'basepagename'              => array( '1', 'BASISPAGINANAAM', 'BASEPAGENAME' ),
+	'basepagenamee'             => array( '1', 'BASISPAGINANAAME', 'BASEPAGENAMEE' ),
+	'talkpagename'              => array( '1', 'OVERLEGPAGINANAAM', 'TALKPAGENAME' ),
+	'talkpagenamee'             => array( '1', 'OVERLEGPAGINANAAME', 'TALKPAGENAMEE' ),
+	'subjectpagename'           => array( '1', 'ONDERWERPPAGINANAAM', 'ARTIKELPAGINANAAM', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
+	'subjectpagenamee'          => array( '1', 'ONDERWERPPAGINANAAME', 'ARTIKELPAGINANAAME', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
+	'msg'                       => array( '0', 'BERICHT:', 'MSG:' ),
+	'subst'                     => array( '0', 'VERV:', 'SUBST:' ),
+	'safesubst'                 => array( '0', 'VEILIGVERV:', 'SAFESUBST:' ),
+	'msgnw'                     => array( '0', 'BERICHTNW', 'MSGNW:' ),
+	'img_thumbnail'             => array( '1', 'miniatuur', 'thumbnail', 'thumb' ),
+	'img_manualthumb'           => array( '1', 'miniatuur=$1', 'thumbnail=$1', 'thumb=$1' ),
+	'img_right'                 => array( '1', 'rechts', 'right' ),
+	'img_left'                  => array( '1', 'links', 'left' ),
+	'img_none'                  => array( '1', 'geen', 'none' ),
+	'img_center'                => array( '1', 'gecentreerd', 'center', 'centre' ),
+	'img_framed'                => array( '1', 'omkaderd', 'framed', 'enframed', 'frame' ),
+	'img_frameless'             => array( '1', 'kaderloos', 'frameless' ),
+	'img_page'                  => array( '1', 'pagina=$1', 'pagina $1', 'page=$1', 'page $1' ),
+	'img_upright'               => array( '1', 'rechtop', 'rechtop=$1', 'rechtop$1', 'upright', 'upright=$1', 'upright $1' ),
+	'img_border'                => array( '1', 'rand', 'border' ),
+	'img_baseline'              => array( '1', 'grondlijn', 'baseline' ),
+	'img_top'                   => array( '1', 'boven', 'top' ),
+	'img_text_top'              => array( '1', 'tekst-boven', 'text-top' ),
+	'img_middle'                => array( '1', 'midden', 'middle' ),
+	'img_bottom'                => array( '1', 'beneden', 'bottom' ),
+	'img_text_bottom'           => array( '1', 'tekst-beneden', 'text-bottom' ),
+	'img_link'                  => array( '1', 'verwijzing=$1', 'link=$1' ),
+	'sitename'                  => array( '1', 'SITENAAM', 'SITENAME' ),
+	'ns'                        => array( '0', 'NR:', 'NS:' ),
+	'nse'                       => array( '0', 'NRE:', 'NSE:' ),
+	'localurl'                  => array( '0', 'LOKALEURL', 'LOCALURL:' ),
+	'localurle'                 => array( '0', 'LOKALEURLE', 'LOCALURLE:' ),
+	'articlepath'               => array( '0', 'ARTIKELPAD', 'ARTICLEPATH' ),
+	'pageid'                    => array( '0', 'PAGINAID', 'PAGEID' ),
+	'servername'                => array( '0', 'SERVERNAAM', 'SERVERNAME' ),
+	'scriptpath'                => array( '0', 'SCRIPTPAD', 'SCRIPTPATH' ),
+	'stylepath'                 => array( '0', 'STIJLPAD', 'STYLEPATH' ),
+	'grammar'                   => array( '0', 'GRAMMATICA:', 'GRAMMAR:' ),
+	'gender'                    => array( '0', 'GESLACHT:', 'GENDER:' ),
+	'notitleconvert'            => array( '0', '__GEENPAGINANAAMCONVERSIE__', '__GEENTITELCONVERSIE__', '__GEENTC__', '__NOTITLECONVERT__', '__NOTC__' ),
+	'nocontentconvert'          => array( '0', '__GEENINHOUDCONVERSIE__', '__GEENIC__', '__NOCONTENTCONVERT__', '__NOCC__' ),
+	'currentweek'               => array( '1', 'HUIDIGEWEEK', 'CURRENTWEEK' ),
+	'currentdow'                => array( '1', 'HUIDIGEDVDW', 'CURRENTDOW' ),
+	'localweek'                 => array( '1', 'PLAATSELIJKEWEEK', 'LOKALEWEEK', 'LOCALWEEK' ),
+	'localdow'                  => array( '1', 'PLAATSELIJKEDVDW', 'LOKALEDVDW', 'LOCALDOW' ),
+	'revisionid'                => array( '1', 'VERSIEID', 'REVISIONID' ),
+	'revisionday'               => array( '1', 'VERSIEDAG', 'REVISIONDAY' ),
+	'revisionday2'              => array( '1', 'VERSIEDAG2', 'REVISIONDAY2' ),
+	'revisionmonth'             => array( '1', 'VERSIEMAAND', 'REVISIONMONTH' ),
+	'revisionmonth1'            => array( '1', 'VERSIEMAAND1', 'REVISIONMONTH1' ),
+	'revisionyear'              => array( '1', 'VERSIEJAAR', 'REVISIONYEAR' ),
+	'revisiontimestamp'         => array( '1', 'VERSIETIJD', 'REVISIONTIMESTAMP' ),
+	'revisionuser'              => array( '1', 'VERSIEGEBRUIKER', 'REVISIONUSER' ),
+	'plural'                    => array( '0', 'MEERVOUD:', 'PLURAL:' ),
+	'fullurl'                   => array( '0', 'VOLLEDIGEURL:', 'FULLURL:' ),
+	'fullurle'                  => array( '0', 'VOLLEDIGEURLE:', 'FULLURLE:' ),
+	'canonicalurl'              => array( '0', 'CANOIEKEURL:', 'CANONICALURL:' ),
+	'canonicalurle'             => array( '0', 'CANONIEKEURLE:', 'CANONICALURLE:' ),
+	'lcfirst'                   => array( '0', 'KLEERSTE:', 'LCFIRST:' ),
+	'ucfirst'                   => array( '0', 'GLEERSTE:', 'HLEERSTE:', 'UCFIRST:' ),
+	'lc'                        => array( '0', 'KL:', 'LC:' ),
+	'uc'                        => array( '0', 'HL:', 'UC:' ),
+	'raw'                       => array( '0', 'RAUW:', 'RUW:', 'RAW:' ),
+	'displaytitle'              => array( '1', 'WEERGEGEVENTITEL', 'TOONTITEL', 'DISPLAYTITLE' ),
+	'rawsuffix'                 => array( '1', 'V', 'R' ),
+	'newsectionlink'            => array( '1', '__NIEUWESECTIELINK__', '__NIEUWESECTIEKOPPELING__', '__NEWSECTIONLINK__' ),
+	'nonewsectionlink'          => array( '1', '__GEENNIEUWESECTIELINK__', '__GEENNIEUWKOPJEVERWIJZING__', '__NONEWSECTIONLINK__' ),
+	'currentversion'            => array( '1', 'HUIDIGEVERSIE', 'CURRENTVERSION' ),
+	'urlencode'                 => array( '0', 'URLCODEREN', 'CODEERURL', 'URLENCODE:' ),
+	'anchorencode'              => array( '0', 'ANKERCODEREN', 'CODEERANKER', 'ANCHORENCODE' ),
+	'currenttimestamp'          => array( '1', 'HUIDIGETIJDSTEMPEL', 'CURRENTTIMESTAMP' ),
+	'localtimestamp'            => array( '1', 'PLAATSELIJKETIJDSTEMPEL', 'LOKALETIJDSTEMPEL', 'LOCALTIMESTAMP' ),
+	'directionmark'             => array( '1', 'RICHTINGMARKERING', 'RICHTINGSMARKERING', 'DIRECTIONMARK', 'DIRMARK' ),
+	'language'                  => array( '0', '#TAAL:', '#LANGUAGE:' ),
+	'contentlanguage'           => array( '1', 'INHOUDSTAAL', 'INHOUDTAAL', 'CONTENTLANGUAGE', 'CONTENTLANG' ),
+	'pagesinnamespace'          => array( '1', 'PAGINASINNAAMRUIMTE', 'PAGINA’SINNAAMRUIMTE', 'PAGINA\'SINNAAMRUIMTE', 'PAGESINNAMESPACE:', 'PAGESINNS:' ),
+	'numberofadmins'            => array( '1', 'AANTALBEHEERDERS', 'AANTALADMINS', 'NUMBEROFADMINS' ),
+	'formatnum'                 => array( '0', 'FORMATTEERNUM', 'NUMFORMATTEREN', 'FORMATNUM' ),
+	'padleft'                   => array( '0', 'LINKSOPVULLEN', 'PADLEFT' ),
+	'padright'                  => array( '0', 'RECHTSOPVULLEN', 'PADRIGHT' ),
+	'special'                   => array( '0', 'speciaal', 'special' ),
+	'speciale'                  => array( '0', 'speciaale', 'speciale' ),
+	'defaultsort'               => array( '1', 'STANDAARDSORTERING:', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:' ),
+	'filepath'                  => array( '0', 'BESTANDSPAD:', 'FILEPATH:' ),
+	'tag'                       => array( '0', 'label', 'tag' ),
+	'hiddencat'                 => array( '1', '__VERBORGENCAT__', '__HIDDENCAT__' ),
+	'pagesincategory'           => array( '1', 'PAGINASINCATEGORIE', 'PAGINASINCAT', 'PAGESINCATEGORY', 'PAGESINCAT' ),
+	'pagesize'                  => array( '1', 'PAGINAGROOTTE', 'PAGESIZE' ),
+	'noindex'                   => array( '1', '__GEENINDEX__', '__NOINDEX__' ),
+	'numberingroup'             => array( '1', 'AANTALINGROEP', 'NUMBERINGROUP', 'NUMINGROUP' ),
+	'staticredirect'            => array( '1', '__STATISCHEDOORVERWIJZING__', '__STATISCHEREDIRECT__', '__STATICREDIRECT__' ),
+	'protectionlevel'           => array( '1', 'BEVEILIGINGSNIVEAU', 'PROTECTIONLEVEL' ),
+	'formatdate'                => array( '0', 'datumopmaak', 'formatdate', 'dateformat' ),
+	'url_path'                  => array( '0', 'PAD', 'PATH' ),
+	'url_query'                 => array( '0', 'ZOEKOPDRACHT', 'QUERY' ),
+	'defaultsort_noerror'       => array( '0', 'geenfout', 'noerror' ),
+	'defaultsort_noreplace'     => array( '0', 'nietvervangen', 'noreplace' ),
 );
 
 $specialPageAliases = array(
@@ -288,6 +290,7 @@ $specialPageAliases = array(
 	'MIMEsearch'                => array( 'MIMEzoeken', 'MIME-zoeken' ),
 	'Mostcategories'            => array( 'MeesteCategorieën' ),
 	'Mostimages'                => array( 'MeesteVerwezenBestanden', 'MeesteBestanden', 'MeesteAfbeeldingen' ),
+	'Mostinterwikis'            => array( 'MeesteInterwikiverwijzingen' ),
 	'Mostlinked'                => array( 'MeestVerwezenPaginas', 'MeestVerwezenPagina\'s', 'MeestVerwezen' ),
 	'Mostlinkedcategories'      => array( 'MeestVerwezenCategorieën' ),
 	'Mostlinkedtemplates'       => array( 'MeestVerwezenSjablonen' ),
@@ -2085,6 +2088,7 @@ U kunt de beschrijving bewerken op de [$2 pagina met de bestandsbeschrijving].',
 'shared-repo' => 'een gedeelde mediadatabank',
 'shared-repo-name-wikimediacommons' => 'Wikimedia Commons',
 'filepage.css' => "/ * De CSS die hier geplaatst wordt, wordt opgenomen in de bestandsbeschrijvingspagina en wordt ook opgenomen op externe wiki's (via externe repositories) * /",
+'upload-disallowed-here' => 'U kunt deze afbeelding helaas niet overschrijven.',
 
 # File reversion
 'filerevert' => '$1 terugdraaien',
@@ -3242,7 +3246,7 @@ Meestal wordt dit door een externe verwijzing op een zwarte lijst veroorzaakt.',
 'pageinfo-authors' => 'Totaal aantal verschillende auteurs',
 'pageinfo-recent-edits' => 'Recent aantal bewerkingen (binnen de afgelopen $1).',
 'pageinfo-recent-authors' => 'Recent aantal verschillende auteurs',
-'pageinfo-restriction' => 'Paginabeveiliging (<code>$1</code>)',
+'pageinfo-restriction' => 'Paginabeveiliging (<code>{{lcfirst:$1}}</code>)',
 'pageinfo-magic-words' => '{{PLURAL:$1|Magisch woord|Magische woorden}} ($1)',
 'pageinfo-hidden-categories' => 'Verborgen {{PLURAL:$1|categorie|categorieën}} ($1)',
 'pageinfo-templates' => '{{PLURAL:$1|Gebruikt sjabloon|Gebruikte sjablonen}} ($1)',
@@ -3300,6 +3304,7 @@ $1',
 'file-info-size-pages' => "$1 × $2 pixels, bestandsgrootte: $3, MIME-type: $4, $5 {{PLURAL:$5|pagina|pagina's}}",
 'file-nohires' => 'Geen hogere resolutie beschikbaar.',
 'svg-long-desc' => 'SVG-bestand, nominaal $1 × $2 pixels, bestandsgrootte: $3',
+'svg-long-desc-animated' => 'Bewegend SVG-bestand, nominaal $1 × $2 pixels, bestandsgrootte: $3',
 'show-big-image' => 'Volledige resolutie',
 'show-big-image-preview' => 'Grootte van deze voorvertoning: $1.',
 'show-big-image-other' => 'Andere {{PLURAL:$2|resolutie|resoluties}}: $1.',
@@ -3309,6 +3314,8 @@ $1',
 'file-info-png-looped' => 'herhalend',
 'file-info-png-repeat' => '$1 {{PLURAL:$1|keer|keer}} afgespeeld',
 'file-info-png-frames' => '$1 {{PLURAL:$1|frame|frames}}',
+'file-no-thumb-animation' => "'''Let op: vanwege technische beperkingen, kunnen miniaturen van dit bestand niet geanimeerd worden weergegeven.''",
+'file-no-thumb-animation-gif' => "'''Let op: vanwege technische beperkingen, kunnen miniaturen van GIF-afbeeldingen met een hoge resolutie niet geanimeerd worden weergegeven.''",
 
 # Special:NewFiles
 'newimages' => 'Nieuwe bestanden',
diff --git a/languages/messages/MessagesNn.php b/languages/messages/MessagesNn.php
index c41342fa91..506d181173 100644
--- a/languages/messages/MessagesNn.php
+++ b/languages/messages/MessagesNn.php
@@ -99,74 +99,97 @@ $bookstoreList = array(
 );
 
 $magicWords = array(
-	'redirect'                => array( '0', '#omdiriger', '#REDIRECT' ),
-	'notoc'                   => array( '0', '__INGAINNHALDSLISTE__', '__INGENINNHOLDSLISTE__', '__NOTOC__' ),
-	'nogallery'               => array( '0', '__INKJEGALLERI__', '__NOGALLERY__' ),
-	'forcetoc'                => array( '0', '__ALLTIDINNHALDSLISTE__', '__ALLTIDINNHOLDSLISTE__', '__FORCETOC__' ),
-	'toc'                     => array( '0', '__INNHALDSLISTE__', '__INNHOLDSLISTE__', '__TOC__' ),
-	'noeditsection'           => array( '0', '__INGABOLKENDRING__', '__INGABOLKREDIGERING__', '__INGENDELENDRING__', '__NOEDITSECTION__' ),
-	'currentmonth'            => array( '1', 'MÅNADNO', 'MÅNEDNÅ', 'CURRENTMONTH', 'CURRENTMONTH2' ),
-	'currentmonthname'        => array( '1', 'MÅNADNONAMN', 'MÅNEDNÅNAVN', 'CURRENTMONTHNAME' ),
-	'currentmonthabbrev'      => array( '1', 'MÅNADNOKORT', 'MÅNEDNÅKORT', 'CURRENTMONTHABBREV' ),
-	'currentday'              => array( '1', 'DAGNO', 'DAGNÅ', 'CURRENTDAY' ),
-	'currentday2'             => array( '1', 'DAGNO2', 'DAGNÅ2', 'CURRENTDAY2' ),
-	'currentdayname'          => array( '1', 'DAGNONAMN', 'DAGNÅNAVN', 'CURRENTDAYNAME' ),
-	'currentyear'             => array( '1', 'ÅRNO', 'ÅRNÅ', 'CURRENTYEAR' ),
-	'currenttime'             => array( '1', 'TIDNO', 'TIDNÅ', 'CURRENTTIME' ),
-	'currenthour'             => array( '1', 'TIMENO', 'CURRENTHOUR' ),
-	'numberofpages'           => array( '1', 'SIDETAL', 'NUMBEROFPAGES' ),
-	'numberofarticles'        => array( '1', 'INNHALDSSIDETAL', 'INNHOLDSSIDETALL', 'NUMBEROFARTICLES' ),
-	'numberoffiles'           => array( '1', 'FILTAL', 'NUMBEROFFILES' ),
-	'numberofusers'           => array( '1', 'BRUKARTAL', 'NUMBEROFUSERS' ),
-	'numberofactiveusers'     => array( '1', 'AKTIVEBRUKARAR', 'NUMBEROFACTIVEUSERS' ),
-	'numberofedits'           => array( '1', 'ENDRINGSTAL', 'NUMBEROFEDITS' ),
-	'pagename'                => array( '1', 'SIDENAMN', 'SIDENAVN', 'PAGENAME' ),
-	'pagenamee'               => array( '1', 'SIDENAMNE', 'SIDENAVNE', 'PAGENAMEE' ),
-	'namespace'               => array( '1', 'NAMNEROM', 'NAVNEROM', 'NAMESPACE' ),
-	'fullpagename'            => array( '1', 'FULLTSIDENAMN', 'FULLPAGENAME' ),
-	'subpagename'             => array( '1', 'UNDERSIDENAMN', 'SUBPAGENAME' ),
-	'basepagename'            => array( '1', 'HOVUDSIDENAMN', 'BASEPAGENAME' ),
-	'talkpagename'            => array( '1', 'DISKUSJONSSIDENAMN', 'TALKPAGENAME' ),
-	'subst'                   => array( '0', 'LIMINN:', 'SUBST:' ),
-	'msgnw'                   => array( '0', 'IKWIKMELD:', 'MSGNW:' ),
-	'img_thumbnail'           => array( '1', 'mini', 'miniatyr', 'thumbnail', 'thumb' ),
-	'img_manualthumb'         => array( '1', 'mini=$1', 'miniatyr=$1', 'thumbnail=$1', 'thumb=$1' ),
-	'img_right'               => array( '1', 'høgre', 'høyre', 'right' ),
-	'img_left'                => array( '1', 'venstre', 'left' ),
-	'img_none'                => array( '1', 'ingen', 'none' ),
-	'img_width'               => array( '1', '$1pk', '$1px' ),
-	'img_center'              => array( '1', 'sentrum', 'center', 'centre' ),
-	'img_framed'              => array( '1', 'ramme', 'ramma', 'framed', 'enframed', 'frame' ),
-	'img_link'                => array( '1', 'lenkje=$1', 'lenkja=$1', 'link=$1' ),
-	'sitename'                => array( '1', 'NETTSTADNAMN', 'SITENAME' ),
-	'ns'                      => array( '0', 'NR:', 'NS:' ),
-	'localurl'                => array( '0', 'LOKALLENKJE:', 'LOKALLENKE:', 'LOCALURL:' ),
-	'localurle'               => array( '0', 'LOKALLENKJEE:', 'LOKALLENKEE:', 'LOCALURLE:' ),
-	'server'                  => array( '0', 'TENAR', 'TJENER', 'SERVER' ),
-	'servername'              => array( '0', 'TENARNAMN', 'TJENERNAVN', 'SERVERNAME' ),
-	'scriptpath'              => array( '0', 'SKRIPTSTIG', 'SKRIPTSTI', 'SCRIPTPATH' ),
-	'grammar'                 => array( '0', 'GRAMMATIKK:', 'GRAMMAR:' ),
-	'gender'                  => array( '0', 'KJØNN:', 'GENDER:' ),
-	'currentweek'             => array( '1', 'VEKENRNO', 'UKENRNÅ', 'CURRENTWEEK' ),
-	'currentdow'              => array( '1', 'VEKEDAGNRNO', 'UKEDAGNRNÅ', 'CURRENTDOW' ),
-	'revisionid'              => array( '1', 'VERSJONSID', 'REVISIONID' ),
-	'revisionday'             => array( '1', 'VERSJONSDAG', 'REVISIONDAY' ),
-	'revisionday2'            => array( '1', 'VERSJONSDAG2', 'REVISIONDAY2' ),
-	'revisionmonth'           => array( '1', 'VERSJONSMÅNAD', 'REVISIONMONTH' ),
-	'revisionmonth1'          => array( '1', 'VERSJONSMÅNAD1', 'REVISIONMONTH1' ),
-	'revisionyear'            => array( '1', 'VERSJONSÅR', 'REVISIONYEAR' ),
-	'revisiontimestamp'       => array( '1', 'VERSJONSTIDSTEMPEL', 'REVISIONTIMESTAMP' ),
-	'revisionuser'            => array( '1', 'VERSJONSBRUKAR', 'REVISIONUSER' ),
-	'plural'                  => array( '0', 'FLEIRTAL:', 'PLURAL:' ),
-	'currentversion'          => array( '1', 'VERSJONNO', 'CURRENTVERSION' ),
-	'language'                => array( '0', '#SPRÅK:', '#LANGUAGE:' ),
-	'contentlanguage'         => array( '1', 'INNHALDSSPRÅK', 'CONTENTLANGUAGE', 'CONTENTLANG' ),
-	'pagesinnamespace'        => array( '1', 'SIDERINAMNEROM', 'PAGESINNAMESPACE:', 'PAGESINNS:' ),
-	'numberofadmins'          => array( '1', 'ADMINTAL', 'ADMINISTRATORTAL', 'NUMBEROFADMINS' ),
-	'filepath'                => array( '0', 'FILSTIG', 'FILEPATH:' ),
-	'hiddencat'               => array( '1', '__GØYMDKAT__', '__LØYNDKAT__', '__HIDDENCAT__' ),
-	'pagesincategory'         => array( '1', 'SIDERIKAT', 'SIDERIKATEGORI', 'PAGESINCATEGORY', 'PAGESINCAT' ),
-	'protectionlevel'         => array( '1', 'VERNENIVÅ', 'PROTECTIONLEVEL' ),
+	'redirect'                  => array( '0', '#omdiriger', '#REDIRECT' ),
+	'notoc'                     => array( '0', '__INGAINNHALDSLISTE__', '__INGENINNHOLDSLISTE__', '__NOTOC__' ),
+	'nogallery'                 => array( '0', '__INKJEGALLERI__', '__NOGALLERY__' ),
+	'forcetoc'                  => array( '0', '__ALLTIDINNHALDSLISTE__', '__ALLTIDINNHOLDSLISTE__', '__FORCETOC__' ),
+	'toc'                       => array( '0', '__INNHALDSLISTE__', '__INNHOLDSLISTE__', '__TOC__' ),
+	'noeditsection'             => array( '0', '__INGABOLKENDRING__', '__INGABOLKREDIGERING__', '__INGENDELENDRING__', '__NOEDITSECTION__' ),
+	'currentmonth'              => array( '1', 'MÅNADNO', 'MÅNEDNÅ', 'CURRENTMONTH', 'CURRENTMONTH2' ),
+	'currentmonthname'          => array( '1', 'MÅNADNONAMN', 'MÅNEDNÅNAVN', 'CURRENTMONTHNAME' ),
+	'currentmonthabbrev'        => array( '1', 'MÅNADNOKORT', 'MÅNEDNÅKORT', 'CURRENTMONTHABBREV' ),
+	'currentday'                => array( '1', 'DAGNO', 'DAGNÅ', 'CURRENTDAY' ),
+	'currentday2'               => array( '1', 'DAGNO2', 'DAGNÅ2', 'CURRENTDAY2' ),
+	'currentdayname'            => array( '1', 'DAGNONAMN', 'DAGNÅNAVN', 'CURRENTDAYNAME' ),
+	'currentyear'               => array( '1', 'ÅRNO', 'ÅRNÅ', 'CURRENTYEAR' ),
+	'currenttime'               => array( '1', 'TIDNO', 'TIDNÅ', 'CURRENTTIME' ),
+	'currenthour'               => array( '1', 'TIMENO', 'CURRENTHOUR' ),
+	'numberofpages'             => array( '1', 'SIDETAL', 'NUMBEROFPAGES' ),
+	'numberofarticles'          => array( '1', 'INNHALDSSIDETAL', 'INNHOLDSSIDETALL', 'NUMBEROFARTICLES' ),
+	'numberoffiles'             => array( '1', 'FILTAL', 'NUMBEROFFILES' ),
+	'numberofusers'             => array( '1', 'BRUKARTAL', 'NUMBEROFUSERS' ),
+	'numberofactiveusers'       => array( '1', 'AKTIVEBRUKARAR', 'NUMBEROFACTIVEUSERS' ),
+	'numberofedits'             => array( '1', 'ENDRINGSTAL', 'NUMBEROFEDITS' ),
+	'numberofviews'             => array( '1', 'VISINGSTAL', 'TALPÅVISINGAR', 'NUMBEROFVIEWS' ),
+	'pagename'                  => array( '1', 'SIDENAMN', 'SIDENAVN', 'PAGENAME' ),
+	'pagenamee'                 => array( '1', 'SIDENAMNE', 'SIDENAVNE', 'PAGENAMEE' ),
+	'namespace'                 => array( '1', 'NAMNEROM', 'NAVNEROM', 'NAMESPACE' ),
+	'fullpagename'              => array( '1', 'FULLTSIDENAMN', 'FULLPAGENAME' ),
+	'subpagename'               => array( '1', 'UNDERSIDENAMN', 'SUBPAGENAME' ),
+	'basepagename'              => array( '1', 'HOVUDSIDENAMN', 'BASEPAGENAME' ),
+	'talkpagename'              => array( '1', 'DISKUSJONSSIDENAMN', 'TALKPAGENAME' ),
+	'msg'                       => array( '0', 'MLD:', 'MSG:' ),
+	'subst'                     => array( '0', 'LIMINN:', 'SUBST:' ),
+	'safesubst'                 => array( '0', 'TRYGGLIMINN:', 'SAFESUBST:' ),
+	'msgnw'                     => array( '0', 'IKWIKMELD:', 'MSGNW:' ),
+	'img_thumbnail'             => array( '1', 'mini', 'miniatyr', 'thumbnail', 'thumb' ),
+	'img_manualthumb'           => array( '1', 'mini=$1', 'miniatyr=$1', 'thumbnail=$1', 'thumb=$1' ),
+	'img_right'                 => array( '1', 'høgre', 'høyre', 'right' ),
+	'img_left'                  => array( '1', 'venstre', 'left' ),
+	'img_none'                  => array( '1', 'ingen', 'none' ),
+	'img_width'                 => array( '1', '$1pk', '$1px' ),
+	'img_center'                => array( '1', 'sentrum', 'center', 'centre' ),
+	'img_framed'                => array( '1', 'ramme', 'ramma', 'framed', 'enframed', 'frame' ),
+	'img_frameless'             => array( '1', 'rammelaus', 'frameless' ),
+	'img_page'                  => array( '1', 'side=$1', 'side_$1', 'page=$1', 'page $1' ),
+	'img_link'                  => array( '1', 'lenkje=$1', 'lenkja=$1', 'link=$1' ),
+	'sitename'                  => array( '1', 'NETTSTADNAMN', 'SITENAME' ),
+	'ns'                        => array( '0', 'NR:', 'NS:' ),
+	'localurl'                  => array( '0', 'LOKALLENKJE:', 'LOKALLENKE:', 'LOCALURL:' ),
+	'localurle'                 => array( '0', 'LOKALLENKJEE:', 'LOKALLENKEE:', 'LOCALURLE:' ),
+	'articlepath'               => array( '0', 'ARTIKKELSTIG', 'ARTICLEPATH' ),
+	'pageid'                    => array( '0', 'SIDEID', 'PAGEID' ),
+	'server'                    => array( '0', 'TENAR', 'TJENER', 'SERVER' ),
+	'servername'                => array( '0', 'TENARNAMN', 'TJENERNAVN', 'SERVERNAME' ),
+	'scriptpath'                => array( '0', 'SKRIPTSTIG', 'SKRIPTSTI', 'SCRIPTPATH' ),
+	'grammar'                   => array( '0', 'GRAMMATIKK:', 'GRAMMAR:' ),
+	'gender'                    => array( '0', 'KJØNN:', 'GENDER:' ),
+	'currentweek'               => array( '1', 'VEKENRNO', 'UKENRNÅ', 'CURRENTWEEK' ),
+	'currentdow'                => array( '1', 'VEKEDAGNRNO', 'UKEDAGNRNÅ', 'CURRENTDOW' ),
+	'localweek'                 => array( '1', 'LOKALVEKE', 'LOCALWEEK' ),
+	'revisionid'                => array( '1', 'VERSJONSID', 'REVISIONID' ),
+	'revisionday'               => array( '1', 'VERSJONSDAG', 'REVISIONDAY' ),
+	'revisionday2'              => array( '1', 'VERSJONSDAG2', 'REVISIONDAY2' ),
+	'revisionmonth'             => array( '1', 'VERSJONSMÅNAD', 'REVISIONMONTH' ),
+	'revisionmonth1'            => array( '1', 'VERSJONSMÅNAD1', 'REVISIONMONTH1' ),
+	'revisionyear'              => array( '1', 'VERSJONSÅR', 'REVISIONYEAR' ),
+	'revisiontimestamp'         => array( '1', 'VERSJONSTIDSTEMPEL', 'REVISIONTIMESTAMP' ),
+	'revisionuser'              => array( '1', 'VERSJONSBRUKAR', 'REVISIONUSER' ),
+	'plural'                    => array( '0', 'FLEIRTAL:', 'PLURAL:' ),
+	'lcfirst'                   => array( '0', 'LFYRST:', 'LFØRST:', 'LCFIRST:' ),
+	'ucfirst'                   => array( '0', 'SFYRST:', 'SFØRST:', 'UCFIRST:' ),
+	'lc'                        => array( '0', 'SMÅ:', 'LC:' ),
+	'uc'                        => array( '0', 'STORE:', 'UC:' ),
+	'displaytitle'              => array( '1', 'VISTITTEL', 'DISPLAYTITLE' ),
+	'currentversion'            => array( '1', 'VERSJONNO', 'CURRENTVERSION' ),
+	'language'                  => array( '0', '#SPRÅK:', '#LANGUAGE:' ),
+	'contentlanguage'           => array( '1', 'INNHALDSSPRÅK', 'CONTENTLANGUAGE', 'CONTENTLANG' ),
+	'pagesinnamespace'          => array( '1', 'SIDERINAMNEROM', 'PAGESINNAMESPACE:', 'PAGESINNS:' ),
+	'numberofadmins'            => array( '1', 'ADMINTAL', 'ADMINISTRATORTAL', 'NUMBEROFADMINS' ),
+	'formatnum'                 => array( '0', 'FORMATTAL', 'FORMATNUM' ),
+	'special'                   => array( '0', 'spesial', 'special' ),
+	'filepath'                  => array( '0', 'FILSTIG', 'FILEPATH:' ),
+	'tag'                       => array( '0', 'merke', 'tag' ),
+	'hiddencat'                 => array( '1', '__GØYMDKAT__', '__LØYNDKAT__', '__HIDDENCAT__' ),
+	'pagesincategory'           => array( '1', 'SIDERIKAT', 'SIDERIKATEGORI', 'PAGESINCATEGORY', 'PAGESINCAT' ),
+	'pagesize'                  => array( '1', 'SIDESTORLEIK', 'PAGESIZE' ),
+	'protectionlevel'           => array( '1', 'VERNENIVÅ', 'PROTECTIONLEVEL' ),
+	'formatdate'                => array( '0', 'datoformat', 'formatdate', 'dateformat' ),
+	'url_path'                  => array( '0', 'STIG', 'PATH' ),
+	'pagesincategory_all'       => array( '0', 'alle', 'all' ),
+	'pagesincategory_pages'     => array( '0', 'sider', 'pages' ),
+	'pagesincategory_subcats'   => array( '0', 'underkategoriar', 'subcats' ),
+	'pagesincategory_files'     => array( '0', 'filer', 'files' ),
 );
 
 $namespaceNames = array(
@@ -1477,7 +1500,7 @@ Dette kan ikkje tilbakestillast.',
 'right-ipblock-exempt' => 'Kan gjere endringar frå blokkerte IP-adresser',
 'right-proxyunbannable' => 'Kan gjere endringar frå blokkerte proxyar',
 'right-unblockself' => 'Avblokkera seg sjølve',
-'right-protect' => 'Endre vernenivå<!-- og redigera beskyttete sider-->',
+'right-protect' => 'Endra vernenivå og verna sider',
 'right-editprotected' => 'Endre verna sider',
 'right-editinterface' => 'Redigere brukargrensesnittet',
 'right-editusercssjs' => 'Endre andre brukarar sine CSS- og JS-filer',
@@ -1525,13 +1548,13 @@ Dette kan ikkje tilbakestillast.',
 'action-writeapi' => 'bruke skrive-API',
 'action-delete' => 'slette denne sida',
 'action-deleterevision' => 'slette denne endringa',
-'action-deletedhistory' => 'sjå slettehistorikken til denne sida',
+'action-deletedhistory' => 'sjå slettehistorikken til sida',
 'action-browsearchive' => 'søke i sletta sider',
 'action-undelete' => 'attopprette denne sida',
 'action-suppressrevision' => 'sjå og attopprette denne skjulte endringa',
 'action-suppressionlog' => 'sjå denne private loggen',
 'action-block' => 'blokkere denne brukaren frå å gjere endringar',
-'action-protect' => 'endre vernenivået til denne sida',
+'action-protect' => 'endre vernenivået til sida',
 'action-import' => 'importere denne sida frå ein annan wiki',
 'action-importupload' => 'importere denne sida frå ei opplasta fil',
 'action-patrol' => 'merke andre endringar av andre brukar som patruljert',
@@ -2730,14 +2753,14 @@ Vitja [//www.mediawiki.org/wiki/Localisation MediaWiki Localisation] og [//trans
 'tooltip-ca-edit' => 'Du kan endre denne sida. Bruk førehandsvisings-knappen før du lagrar.',
 'tooltip-ca-addsection' => 'Start ein ny bolk',
 'tooltip-ca-viewsource' => 'Denne sida er verna, men du kan sjå kjeldeteksten.',
-'tooltip-ca-history' => 'Eldre versjonar av denne sida',
+'tooltip-ca-history' => 'Eldre versjonar av sida',
 'tooltip-ca-protect' => 'Vern denne sida',
 'tooltip-ca-unprotect' => 'Endra vernet av sida',
 'tooltip-ca-delete' => 'Slett denne sida',
 'tooltip-ca-undelete' => 'Attopprett denne sida',
 'tooltip-ca-move' => 'Flytt denne sida',
-'tooltip-ca-watch' => 'Legg denne sida til i overvakingslista di',
-'tooltip-ca-unwatch' => 'Fjern denne sida frå overvakingslista di',
+'tooltip-ca-watch' => 'Legg til sida i overvakingslista di',
+'tooltip-ca-unwatch' => 'Fjern sida frå overvakingslista di',
 'tooltip-search' => 'Søk gjennom {{SITENAME}}',
 'tooltip-search-go' => 'GÃ¥ til ei side med dette namnet om ho finst',
 'tooltip-search-fulltext' => 'Søk etter sider som inneheld denne teksten',
@@ -2774,7 +2797,7 @@ Vitja [//www.mediawiki.org/wiki/Localisation MediaWiki Localisation] og [//trans
 'tooltip-preview' => 'Førehandsvis endringane dine, bruk denne funksjonen før du lagrar!',
 'tooltip-diff' => 'Vis skilnaden mellom din versjon og lagra versjon, utan å lagre.',
 'tooltip-compareselectedversions' => 'Sjå endringane mellom dei valde versjonane av denne sida.',
-'tooltip-watch' => 'Legg denne sida til i overvakingslista di [alt-w]',
+'tooltip-watch' => 'Legg sida til i overvakingslista di [alt-w]',
 'tooltip-watchlistedit-raw-submit' => 'Oppdater overvakingslista',
 'tooltip-recreate' => 'Ved å trykkje på «Nyopprett» vert sida oppretta på nytt.',
 'tooltip-upload' => 'Start opplastinga',
diff --git a/languages/messages/MessagesNso.php b/languages/messages/MessagesNso.php
index 94b5b1f7b4..848131ada1 100644
--- a/languages/messages/MessagesNso.php
+++ b/languages/messages/MessagesNso.php
@@ -32,14 +32,14 @@ $namespaceNames = array(
 );
 
 $magicWords = array(
-	'currentmonth'            => array( '1', 'KGWEDI_BJALE', 'CURRENTMONTH', 'CURRENTMONTH2' ),
-	'currentmonthname'        => array( '1', 'LEINA_KGWEDI_BJALE', 'CURRENTMONTHNAME' ),
-	'currentday'              => array( '1', 'LEHONO_LETSATSI', 'CURRENTDAY' ),
-	'currentday2'             => array( '1', 'LEHONO_LETSATSI2', 'CURRENTDAY2' ),
-	'currentdayname'          => array( '1', 'LEHONO_LETSATSILEINA', 'CURRENTDAYNAME' ),
-	'currentyear'             => array( '1', 'NGWAGA_BJALE', 'CURRENTYEAR' ),
-	'currenttime'             => array( '1', 'NAKO_BJALE', 'CURRENTTIME' ),
-	'currenthour'             => array( '1', 'IRI_BJALE', 'CURRENTHOUR' ),
+	'currentmonth'              => array( '1', 'KGWEDI_BJALE', 'CURRENTMONTH', 'CURRENTMONTH2' ),
+	'currentmonthname'          => array( '1', 'LEINA_KGWEDI_BJALE', 'CURRENTMONTHNAME' ),
+	'currentday'                => array( '1', 'LEHONO_LETSATSI', 'CURRENTDAY' ),
+	'currentday2'               => array( '1', 'LEHONO_LETSATSI2', 'CURRENTDAY2' ),
+	'currentdayname'            => array( '1', 'LEHONO_LETSATSILEINA', 'CURRENTDAYNAME' ),
+	'currentyear'               => array( '1', 'NGWAGA_BJALE', 'CURRENTYEAR' ),
+	'currenttime'               => array( '1', 'NAKO_BJALE', 'CURRENTTIME' ),
+	'currenthour'               => array( '1', 'IRI_BJALE', 'CURRENTHOUR' ),
 );
 
 $messages = array(
diff --git a/languages/messages/MessagesOc.php b/languages/messages/MessagesOc.php
index 845395a4b0..6b4a774846 100644
--- a/languages/messages/MessagesOc.php
+++ b/languages/messages/MessagesOc.php
@@ -146,130 +146,130 @@ $specialPageAliases = array(
 );
 
 $magicWords = array(
-	'redirect'                => array( '0', '#REDIRECCION', '#REDIRECT' ),
-	'notoc'                   => array( '0', '__CAPDETAULA__', '__PASCAPDESOMARI__', '__PASCAPDETDM__', '__NOTOC__' ),
-	'nogallery'               => array( '0', '__CAPDEGALARIÁ__', '__CAPDEGALARIA__', '__PASCAPDEDEGALARIÁ__', '__NOGALLERY__' ),
-	'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' ),
-	'currentmonthabbrev'      => array( '1', 'ABREVMESCORRENT', 'ABREVMESACTUAL', 'CURRENTMONTHABBREV' ),
-	'currentday'              => array( '1', 'JORNCORRENT', 'JORNACTUAL', 'CURRENTDAY' ),
-	'currentday2'             => array( '1', 'JORNCORRENT2', 'JORNACTUAL2', 'CURRENTDAY2' ),
-	'currentdayname'          => array( '1', 'NOMJORNCORRENT', 'NOMJORNACTUAL', 'CURRENTDAYNAME' ),
-	'currentyear'             => array( '1', 'ANNADACORRENTA', 'ANNADAACTUALA', 'CURRENTYEAR' ),
-	'currenttime'             => array( '1', 'DATACORRENTA', 'DATAACTUALA', 'CURRENTTIME' ),
-	'currenthour'             => array( '1', 'ORACORRENTA', 'ORAACTUALA', 'CURRENTHOUR' ),
-	'localmonth'              => array( '1', 'MESLOCAL', 'LOCALMONTH', 'LOCALMONTH2' ),
-	'localmonthname'          => array( '1', 'NOMMESLOCAL', 'LOCALMONTHNAME' ),
-	'localmonthnamegen'       => array( '1', 'NOMGENMESLOCAL', 'LOCALMONTHNAMEGEN' ),
-	'localmonthabbrev'        => array( '1', 'ABREVMESLOCAL', 'LOCALMONTHABBREV' ),
-	'localday'                => array( '1', 'JORNLOCAL', 'LOCALDAY' ),
-	'localday2'               => array( '1', 'JORNLOCAL2', 'LOCALDAY2' ),
-	'localdayname'            => array( '1', 'NOMJORNLOCAL', 'LOCALDAYNAME' ),
-	'localyear'               => array( '1', 'ANNADALOCALA', 'LOCALYEAR' ),
-	'localtime'               => array( '1', 'ORARILOCAL', 'LOCALTIME' ),
-	'localhour'               => array( '1', 'ORALOCALA', 'LOCALHOUR' ),
-	'numberofpages'           => array( '1', 'NOMBREPAGINAS', 'NUMBEROFPAGES' ),
-	'numberofarticles'        => array( '1', 'NOMBREARTICLES', 'NUMBEROFARTICLES' ),
-	'numberoffiles'           => array( '1', 'NOMBREFICHIÈRS', 'NUMBEROFFILES' ),
-	'numberofusers'           => array( '1', 'NOMBREUTILIZAIRES', 'NUMBEROFUSERS' ),
-	'numberofactiveusers'     => array( '1', 'NOMBREUTILIZAIRESACTIUS', 'NUMBEROFACTIVEUSERS' ),
-	'numberofedits'           => array( '1', 'NOMBREEDICIONS', 'NOMBREMODIFS', 'NUMBEROFEDITS' ),
-	'numberofviews'           => array( '1', 'NOMBREVISTAS', 'NUMBEROFVIEWS' ),
-	'pagename'                => array( '1', 'NOMPAGINA', 'PAGENAME' ),
-	'pagenamee'               => array( '1', 'NOMPAGINAX', 'PAGENAMEE' ),
-	'namespace'               => array( '1', 'ESPACINOMENATGE', 'NAMESPACE' ),
-	'namespacee'              => array( '1', 'ESPACINOMENATGEX', 'NAMESPACEE' ),
-	'talkspace'               => array( '1', 'ESPACIDISCUSSION', 'TALKSPACE' ),
-	'talkspacee'              => array( '1', 'ESPACIDISCUSSIONX', 'TALKSPACEE' ),
-	'subjectspace'            => array( '1', 'ESPACISUBJECTE', 'ESPACISUBJÈCTE', 'ESPACIARTICLE', 'SUBJECTSPACE', 'ARTICLESPACE' ),
-	'subjectspacee'           => array( '1', 'ESPACISUBJECTEX', 'ESPACISUBJÈCTEX', 'ESPACIARTICLEX', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
-	'fullpagename'            => array( '1', 'NOMPAGINACOMPLET', 'FULLPAGENAME' ),
-	'fullpagenamee'           => array( '1', 'NOMPAGINACOMPLETX', 'FULLPAGENAMEE' ),
-	'subpagename'             => array( '1', 'NOMSOSPAGINA', 'SUBPAGENAME' ),
-	'subpagenamee'            => array( '1', 'NOMSOSPAGINAX', 'SUBPAGENAMEE' ),
-	'basepagename'            => array( '1', 'NOMBASADEPAGINA', 'BASEPAGENAME' ),
-	'basepagenamee'           => array( '1', 'NOMBASADEPAGINAX', 'BASEPAGENAMEE' ),
-	'talkpagename'            => array( '1', 'NOMPAGINADISCUSSION', 'TALKPAGENAME' ),
-	'talkpagenamee'           => array( '1', 'NOMPAGINADISCUSSIONX', 'TALKPAGENAMEE' ),
-	'subjectpagename'         => array( '1', 'NOMPAGINASUBJECTE', 'NOMPAGINASUBJÈCTE', 'NOMPAGINAARTICLE', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
-	'subjectpagenamee'        => array( '1', 'NOMPAGINASUBJECTEX', 'NOMPAGINASUBJÈCTEX', 'NOMPAGINAARTICLEX', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
-	'img_thumbnail'           => array( '1', 'vinheta', 'thumbnail', 'thumb' ),
-	'img_manualthumb'         => array( '1', 'vinheta=$1', 'thumbnail=$1', 'thumb=$1' ),
-	'img_right'               => array( '1', 'drecha', 'dreta', 'right' ),
-	'img_left'                => array( '1', 'esquèrra', 'senèstra', 'gaucha', 'left' ),
-	'img_none'                => array( '1', 'neant', 'nonrés', 'none' ),
-	'img_center'              => array( '1', 'centrat', 'center', 'centre' ),
-	'img_framed'              => array( '1', 'quadre', 'enquagrat', 'framed', 'enframed', 'frame' ),
-	'img_frameless'           => array( '1', 'sens_quadre', 'frameless' ),
-	'img_upright'             => array( '1', 'redreça', 'redreça$1', 'redreça $1', 'upright', 'upright=$1', 'upright $1' ),
-	'img_border'              => array( '1', 'bordadura', 'border' ),
-	'img_baseline'            => array( '1', 'linha_de_basa', 'baseline' ),
-	'img_sub'                 => array( '1', 'indici', 'ind', 'sub' ),
-	'img_super'               => array( '1', 'exp', 'super', 'sup' ),
-	'img_top'                 => array( '1', 'naut', 'top' ),
-	'img_text_top'            => array( '1', 'naut-tèxte', 'naut-txt', 'text-top' ),
-	'img_middle'              => array( '1', 'mitan', 'middle' ),
-	'img_bottom'              => array( '1', 'bas', 'bottom' ),
-	'img_text_bottom'         => array( '1', 'bas-tèxte', 'bas-txt', 'text-bottom' ),
-	'img_link'                => array( '1', 'ligam=$1', 'link=$1' ),
-	'sitename'                => array( '1', 'NOMSIT', 'NOMSITE_NOMSITI', 'SITENAME' ),
-	'ns'                      => array( '0', 'ESPACEN:', 'NS:' ),
-	'localurl'                => array( '0', 'URLLOCALA:', 'LOCALURL:' ),
-	'localurle'               => array( '0', 'URLLOCALAX:', 'LOCALURLE:' ),
-	'server'                  => array( '0', 'SERVIDOR', 'SERVER' ),
-	'servername'              => array( '0', 'NOMSERVIDOR', 'SERVERNAME' ),
-	'scriptpath'              => array( '0', 'CAMINESCRIPT', 'SCRIPTPATH' ),
-	'grammar'                 => array( '0', 'GRAMATICA:', 'GRAMMAR:' ),
-	'gender'                  => array( '0', 'GENRE:', 'GENDER:' ),
-	'currentweek'             => array( '1', 'SETMANACORRENTA', 'CURRENTWEEK' ),
-	'currentdow'              => array( '1', 'JDSCORRENT', 'CURRENTDOW' ),
-	'localweek'               => array( '1', 'SETMANALOCALA', 'LOCALWEEK' ),
-	'localdow'                => array( '1', 'JDSLOCAL', 'LOCALDOW' ),
-	'revisionid'              => array( '1', 'NUMÈROVERSION', 'REVISIONID' ),
-	'revisionday'             => array( '1', 'DATAVERSION', 'REVISIONDAY' ),
-	'revisionday2'            => array( '1', 'DATAVERSION2', 'REVISIONDAY2' ),
-	'revisionmonth'           => array( '1', 'MESREVISION', 'REVISIONMONTH' ),
-	'revisionyear'            => array( '1', 'ANNADAREVISION', 'ANREVISION', 'REVISIONYEAR' ),
-	'revisiontimestamp'       => array( '1', 'ORAREVISION', 'REVISIONTIMESTAMP' ),
-	'fullurl'                 => array( '0', 'URLCOMPLETA:', 'FULLURL:' ),
-	'fullurle'                => array( '0', 'URLCOMPLETAX:', 'FULLURLE:' ),
-	'lcfirst'                 => array( '0', 'INITMINUS:', 'LCFIRST:' ),
-	'ucfirst'                 => array( '0', 'INITMAJUS:', 'UCFIRST:' ),
-	'lc'                      => array( '0', 'MINUS:', 'LC:' ),
-	'uc'                      => array( '0', 'MAJUS:', 'CAPIT:', 'UC:' ),
-	'raw'                     => array( '0', 'LINHA:', 'BRUT:', 'RAW:' ),
-	'displaytitle'            => array( '1', 'AFICHARTÍTOL', 'DISPLAYTITLE' ),
-	'rawsuffix'               => array( '1', 'BRUT', 'B', 'R' ),
-	'newsectionlink'          => array( '1', '__LIGAMSECCIONNOVÈLA__', '__NEWSECTIONLINK__' ),
-	'nonewsectionlink'        => array( '1', '__PASCAPDELIGAMSECCIONNOVÈLA__', '__NONEWSECTIONLINK__' ),
-	'currentversion'          => array( '1', 'VERSIONACTUALA', 'CURRENTVERSION' ),
-	'urlencode'               => array( '0', 'ENCÒDAURL:', 'URLENCODE:' ),
-	'anchorencode'            => array( '0', 'ENCÒDAANCÒRA', 'ANCHORENCODE' ),
-	'currenttimestamp'        => array( '1', 'INSTANTACTUAL', 'CURRENTTIMESTAMP' ),
-	'localtimestamp'          => array( '1', 'INSTANTLOCAL', 'LOCALTIMESTAMP' ),
-	'directionmark'           => array( '1', 'MARCADIRECCION', 'MARCADIR', 'DIRECTIONMARK', 'DIRMARK' ),
-	'language'                => array( '0', '#LENGA:', '#LANGUAGE:' ),
-	'contentlanguage'         => array( '1', 'LENGACONTENGUT', 'LENGCONTENGUT', 'CONTENTLANGUAGE', 'CONTENTLANG' ),
-	'pagesinnamespace'        => array( '1', 'PAGINASDINSESPACI:', 'PAGESINNAMESPACE:', 'PAGESINNS:' ),
-	'numberofadmins'          => array( '1', 'NOMBREADMINS', 'NUMBEROFADMINS' ),
-	'formatnum'               => array( '0', 'FORMATNOMBRE', 'FORMATNUM' ),
-	'padleft'                 => array( '0', 'BORRATGEESQUÈRRA', 'PADLEFT' ),
-	'padright'                => array( '0', 'BORRATGEDRECHA', 'PADRIGHT' ),
-	'special'                 => array( '0', 'especial', 'special' ),
-	'defaultsort'             => array( '1', 'ORDENA:', 'CLAUDETRIADA:', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:' ),
-	'filepath'                => array( '0', 'CAMIN:', 'FILEPATH:' ),
-	'tag'                     => array( '0', 'balisa', 'tag' ),
-	'hiddencat'               => array( '1', '__CATAMAGADA__', '__HIDDENCAT__' ),
-	'pagesincategory'         => array( '1', 'PAGINASDINSCAT', 'PAGESINCATEGORY', 'PAGESINCAT' ),
-	'pagesize'                => array( '1', 'TALHAPAGINA', 'PAGESIZE' ),
-	'noindex'                 => array( '1', '__PASCAPDINDÈX__', '__NOINDEX__' ),
-	'staticredirect'          => array( '1', '__REDIRECCIONESTATICA__', '__STATICREDIRECT__' ),
-	'protectionlevel'         => array( '1', 'NIVÈLDEPROTECCION', 'PROTECTIONLEVEL' ),
+	'redirect'                  => array( '0', '#REDIRECCION', '#REDIRECT' ),
+	'notoc'                     => array( '0', '__CAPDETAULA__', '__PASCAPDESOMARI__', '__PASCAPDETDM__', '__NOTOC__' ),
+	'nogallery'                 => array( '0', '__CAPDEGALARIÁ__', '__CAPDEGALARIA__', '__PASCAPDEDEGALARIÁ__', '__NOGALLERY__' ),
+	'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' ),
+	'currentmonthabbrev'        => array( '1', 'ABREVMESCORRENT', 'ABREVMESACTUAL', 'CURRENTMONTHABBREV' ),
+	'currentday'                => array( '1', 'JORNCORRENT', 'JORNACTUAL', 'CURRENTDAY' ),
+	'currentday2'               => array( '1', 'JORNCORRENT2', 'JORNACTUAL2', 'CURRENTDAY2' ),
+	'currentdayname'            => array( '1', 'NOMJORNCORRENT', 'NOMJORNACTUAL', 'CURRENTDAYNAME' ),
+	'currentyear'               => array( '1', 'ANNADACORRENTA', 'ANNADAACTUALA', 'CURRENTYEAR' ),
+	'currenttime'               => array( '1', 'DATACORRENTA', 'DATAACTUALA', 'CURRENTTIME' ),
+	'currenthour'               => array( '1', 'ORACORRENTA', 'ORAACTUALA', 'CURRENTHOUR' ),
+	'localmonth'                => array( '1', 'MESLOCAL', 'LOCALMONTH', 'LOCALMONTH2' ),
+	'localmonthname'            => array( '1', 'NOMMESLOCAL', 'LOCALMONTHNAME' ),
+	'localmonthnamegen'         => array( '1', 'NOMGENMESLOCAL', 'LOCALMONTHNAMEGEN' ),
+	'localmonthabbrev'          => array( '1', 'ABREVMESLOCAL', 'LOCALMONTHABBREV' ),
+	'localday'                  => array( '1', 'JORNLOCAL', 'LOCALDAY' ),
+	'localday2'                 => array( '1', 'JORNLOCAL2', 'LOCALDAY2' ),
+	'localdayname'              => array( '1', 'NOMJORNLOCAL', 'LOCALDAYNAME' ),
+	'localyear'                 => array( '1', 'ANNADALOCALA', 'LOCALYEAR' ),
+	'localtime'                 => array( '1', 'ORARILOCAL', 'LOCALTIME' ),
+	'localhour'                 => array( '1', 'ORALOCALA', 'LOCALHOUR' ),
+	'numberofpages'             => array( '1', 'NOMBREPAGINAS', 'NUMBEROFPAGES' ),
+	'numberofarticles'          => array( '1', 'NOMBREARTICLES', 'NUMBEROFARTICLES' ),
+	'numberoffiles'             => array( '1', 'NOMBREFICHIÈRS', 'NUMBEROFFILES' ),
+	'numberofusers'             => array( '1', 'NOMBREUTILIZAIRES', 'NUMBEROFUSERS' ),
+	'numberofactiveusers'       => array( '1', 'NOMBREUTILIZAIRESACTIUS', 'NUMBEROFACTIVEUSERS' ),
+	'numberofedits'             => array( '1', 'NOMBREEDICIONS', 'NOMBREMODIFS', 'NUMBEROFEDITS' ),
+	'numberofviews'             => array( '1', 'NOMBREVISTAS', 'NUMBEROFVIEWS' ),
+	'pagename'                  => array( '1', 'NOMPAGINA', 'PAGENAME' ),
+	'pagenamee'                 => array( '1', 'NOMPAGINAX', 'PAGENAMEE' ),
+	'namespace'                 => array( '1', 'ESPACINOMENATGE', 'NAMESPACE' ),
+	'namespacee'                => array( '1', 'ESPACINOMENATGEX', 'NAMESPACEE' ),
+	'talkspace'                 => array( '1', 'ESPACIDISCUSSION', 'TALKSPACE' ),
+	'talkspacee'                => array( '1', 'ESPACIDISCUSSIONX', 'TALKSPACEE' ),
+	'subjectspace'              => array( '1', 'ESPACISUBJECTE', 'ESPACISUBJÈCTE', 'ESPACIARTICLE', 'SUBJECTSPACE', 'ARTICLESPACE' ),
+	'subjectspacee'             => array( '1', 'ESPACISUBJECTEX', 'ESPACISUBJÈCTEX', 'ESPACIARTICLEX', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
+	'fullpagename'              => array( '1', 'NOMPAGINACOMPLET', 'FULLPAGENAME' ),
+	'fullpagenamee'             => array( '1', 'NOMPAGINACOMPLETX', 'FULLPAGENAMEE' ),
+	'subpagename'               => array( '1', 'NOMSOSPAGINA', 'SUBPAGENAME' ),
+	'subpagenamee'              => array( '1', 'NOMSOSPAGINAX', 'SUBPAGENAMEE' ),
+	'basepagename'              => array( '1', 'NOMBASADEPAGINA', 'BASEPAGENAME' ),
+	'basepagenamee'             => array( '1', 'NOMBASADEPAGINAX', 'BASEPAGENAMEE' ),
+	'talkpagename'              => array( '1', 'NOMPAGINADISCUSSION', 'TALKPAGENAME' ),
+	'talkpagenamee'             => array( '1', 'NOMPAGINADISCUSSIONX', 'TALKPAGENAMEE' ),
+	'subjectpagename'           => array( '1', 'NOMPAGINASUBJECTE', 'NOMPAGINASUBJÈCTE', 'NOMPAGINAARTICLE', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
+	'subjectpagenamee'          => array( '1', 'NOMPAGINASUBJECTEX', 'NOMPAGINASUBJÈCTEX', 'NOMPAGINAARTICLEX', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
+	'img_thumbnail'             => array( '1', 'vinheta', 'thumbnail', 'thumb' ),
+	'img_manualthumb'           => array( '1', 'vinheta=$1', 'thumbnail=$1', 'thumb=$1' ),
+	'img_right'                 => array( '1', 'drecha', 'dreta', 'right' ),
+	'img_left'                  => array( '1', 'esquèrra', 'senèstra', 'gaucha', 'left' ),
+	'img_none'                  => array( '1', 'neant', 'nonrés', 'none' ),
+	'img_center'                => array( '1', 'centrat', 'center', 'centre' ),
+	'img_framed'                => array( '1', 'quadre', 'enquagrat', 'framed', 'enframed', 'frame' ),
+	'img_frameless'             => array( '1', 'sens_quadre', 'frameless' ),
+	'img_upright'               => array( '1', 'redreça', 'redreça$1', 'redreça $1', 'upright', 'upright=$1', 'upright $1' ),
+	'img_border'                => array( '1', 'bordadura', 'border' ),
+	'img_baseline'              => array( '1', 'linha_de_basa', 'baseline' ),
+	'img_sub'                   => array( '1', 'indici', 'ind', 'sub' ),
+	'img_super'                 => array( '1', 'exp', 'super', 'sup' ),
+	'img_top'                   => array( '1', 'naut', 'top' ),
+	'img_text_top'              => array( '1', 'naut-tèxte', 'naut-txt', 'text-top' ),
+	'img_middle'                => array( '1', 'mitan', 'middle' ),
+	'img_bottom'                => array( '1', 'bas', 'bottom' ),
+	'img_text_bottom'           => array( '1', 'bas-tèxte', 'bas-txt', 'text-bottom' ),
+	'img_link'                  => array( '1', 'ligam=$1', 'link=$1' ),
+	'sitename'                  => array( '1', 'NOMSIT', 'NOMSITE_NOMSITI', 'SITENAME' ),
+	'ns'                        => array( '0', 'ESPACEN:', 'NS:' ),
+	'localurl'                  => array( '0', 'URLLOCALA:', 'LOCALURL:' ),
+	'localurle'                 => array( '0', 'URLLOCALAX:', 'LOCALURLE:' ),
+	'server'                    => array( '0', 'SERVIDOR', 'SERVER' ),
+	'servername'                => array( '0', 'NOMSERVIDOR', 'SERVERNAME' ),
+	'scriptpath'                => array( '0', 'CAMINESCRIPT', 'SCRIPTPATH' ),
+	'grammar'                   => array( '0', 'GRAMATICA:', 'GRAMMAR:' ),
+	'gender'                    => array( '0', 'GENRE:', 'GENDER:' ),
+	'currentweek'               => array( '1', 'SETMANACORRENTA', 'CURRENTWEEK' ),
+	'currentdow'                => array( '1', 'JDSCORRENT', 'CURRENTDOW' ),
+	'localweek'                 => array( '1', 'SETMANALOCALA', 'LOCALWEEK' ),
+	'localdow'                  => array( '1', 'JDSLOCAL', 'LOCALDOW' ),
+	'revisionid'                => array( '1', 'NUMÈROVERSION', 'REVISIONID' ),
+	'revisionday'               => array( '1', 'DATAVERSION', 'REVISIONDAY' ),
+	'revisionday2'              => array( '1', 'DATAVERSION2', 'REVISIONDAY2' ),
+	'revisionmonth'             => array( '1', 'MESREVISION', 'REVISIONMONTH' ),
+	'revisionyear'              => array( '1', 'ANNADAREVISION', 'ANREVISION', 'REVISIONYEAR' ),
+	'revisiontimestamp'         => array( '1', 'ORAREVISION', 'REVISIONTIMESTAMP' ),
+	'fullurl'                   => array( '0', 'URLCOMPLETA:', 'FULLURL:' ),
+	'fullurle'                  => array( '0', 'URLCOMPLETAX:', 'FULLURLE:' ),
+	'lcfirst'                   => array( '0', 'INITMINUS:', 'LCFIRST:' ),
+	'ucfirst'                   => array( '0', 'INITMAJUS:', 'UCFIRST:' ),
+	'lc'                        => array( '0', 'MINUS:', 'LC:' ),
+	'uc'                        => array( '0', 'MAJUS:', 'CAPIT:', 'UC:' ),
+	'raw'                       => array( '0', 'LINHA:', 'BRUT:', 'RAW:' ),
+	'displaytitle'              => array( '1', 'AFICHARTÍTOL', 'DISPLAYTITLE' ),
+	'rawsuffix'                 => array( '1', 'BRUT', 'B', 'R' ),
+	'newsectionlink'            => array( '1', '__LIGAMSECCIONNOVÈLA__', '__NEWSECTIONLINK__' ),
+	'nonewsectionlink'          => array( '1', '__PASCAPDELIGAMSECCIONNOVÈLA__', '__NONEWSECTIONLINK__' ),
+	'currentversion'            => array( '1', 'VERSIONACTUALA', 'CURRENTVERSION' ),
+	'urlencode'                 => array( '0', 'ENCÒDAURL:', 'URLENCODE:' ),
+	'anchorencode'              => array( '0', 'ENCÒDAANCÒRA', 'ANCHORENCODE' ),
+	'currenttimestamp'          => array( '1', 'INSTANTACTUAL', 'CURRENTTIMESTAMP' ),
+	'localtimestamp'            => array( '1', 'INSTANTLOCAL', 'LOCALTIMESTAMP' ),
+	'directionmark'             => array( '1', 'MARCADIRECCION', 'MARCADIR', 'DIRECTIONMARK', 'DIRMARK' ),
+	'language'                  => array( '0', '#LENGA:', '#LANGUAGE:' ),
+	'contentlanguage'           => array( '1', 'LENGACONTENGUT', 'LENGCONTENGUT', 'CONTENTLANGUAGE', 'CONTENTLANG' ),
+	'pagesinnamespace'          => array( '1', 'PAGINASDINSESPACI:', 'PAGESINNAMESPACE:', 'PAGESINNS:' ),
+	'numberofadmins'            => array( '1', 'NOMBREADMINS', 'NUMBEROFADMINS' ),
+	'formatnum'                 => array( '0', 'FORMATNOMBRE', 'FORMATNUM' ),
+	'padleft'                   => array( '0', 'BORRATGEESQUÈRRA', 'PADLEFT' ),
+	'padright'                  => array( '0', 'BORRATGEDRECHA', 'PADRIGHT' ),
+	'special'                   => array( '0', 'especial', 'special' ),
+	'defaultsort'               => array( '1', 'ORDENA:', 'CLAUDETRIADA:', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:' ),
+	'filepath'                  => array( '0', 'CAMIN:', 'FILEPATH:' ),
+	'tag'                       => array( '0', 'balisa', 'tag' ),
+	'hiddencat'                 => array( '1', '__CATAMAGADA__', '__HIDDENCAT__' ),
+	'pagesincategory'           => array( '1', 'PAGINASDINSCAT', 'PAGESINCATEGORY', 'PAGESINCAT' ),
+	'pagesize'                  => array( '1', 'TALHAPAGINA', 'PAGESIZE' ),
+	'noindex'                   => array( '1', '__PASCAPDINDÈX__', '__NOINDEX__' ),
+	'staticredirect'            => array( '1', '__REDIRECCIONESTATICA__', '__STATICREDIRECT__' ),
+	'protectionlevel'           => array( '1', 'NIVÈLDEPROTECCION', 'PROTECTIONLEVEL' ),
 );
 
 $datePreferences = array(
diff --git a/languages/messages/MessagesOr.php b/languages/messages/MessagesOr.php
index 4254e2bc51..ed01145d7d 100644
--- a/languages/messages/MessagesOr.php
+++ b/languages/messages/MessagesOr.php
@@ -174,84 +174,84 @@ $specialPageAliases = array(
 );
 
 $magicWords = array(
-	'redirect'                => array( '0', '#ଲେଉଟାଣି', '#REDIRECT' ),
-	'noeditsection'           => array( '0', '_ବଦଳା_ନହେବାଶ୍ରେଣୀ_', '__NOEDITSECTION__' ),
-	'currentmonth'            => array( '1', 'ଏବେକାର_ମାସ', 'ଏବେର_ମାସ୨', 'CURRENTMONTH', 'CURRENTMONTH2' ),
-	'currentmonth1'           => array( '1', 'ଏବେର_ମାସ', 'CURRENTMONTH1' ),
-	'currentmonthname'        => array( '1', 'ଏବେକାର_ମାସ_ନାଆଁ', 'CURRENTMONTHNAME' ),
-	'currentmonthnamegen'     => array( '1', 'ଏବେକାର_ମାସ_ନାଆଁ_ସାଧାରଣ', 'CURRENTMONTHNAMEGEN' ),
-	'currentmonthabbrev'      => array( '1', 'ଏବେକାର_ମାସ_ନାଆଁ_ସଂକ୍ଷିପ୍ତ', 'CURRENTMONTHABBREV' ),
-	'currentday'              => array( '1', 'ଏବେକାର_ଦିନ', 'CURRENTDAY' ),
-	'currentday2'             => array( '1', 'ଏବେକାର_ଦିନ୨', 'CURRENTDAY2' ),
-	'currentdayname'          => array( '1', 'ଏବେକାର_ଦିନ_ନାଆଁ', 'CURRENTDAYNAME' ),
-	'currentyear'             => array( '1', 'ଏବେକାର_ବର୍ଷ', 'CURRENTYEAR' ),
-	'currenttime'             => array( '1', 'ଏବେକାର_ସମୟ', 'CURRENTTIME' ),
-	'currenthour'             => array( '1', 'ଏବେକାର_ଘଣ୍ଟା', 'CURRENTHOUR' ),
-	'localmonth'              => array( '1', 'ଏବେର_ମାସ୧', 'ସ୍ଥାନୀୟ_ମାସ୨', 'LOCALMONTH', 'LOCALMONTH2' ),
-	'localmonth1'             => array( '1', 'ଏବେକାର_ମାସ୧', 'LOCALMONTH1' ),
-	'localmonthname'          => array( '1', 'ମାସ୧ର_ନାଆଁ', 'LOCALMONTHNAME' ),
-	'localmonthnamegen'       => array( '1', 'ସ୍ଥାନୀୟ_ମାସ୧_ନାଆଁ_ସାଧାରଣ', 'LOCALMONTHNAMEGEN' ),
-	'localmonthabbrev'        => array( '1', 'ସ୍ଥାନୀୟ_ମାସର୧_ନାଆଁ_ସଂକ୍ଷିପ୍ତ', 'LOCALMONTHABBREV' ),
-	'localday'                => array( '1', 'Local_ଦିନ', 'LOCALDAY' ),
-	'localday2'               => array( '1', 'ସ୍ଥାନୀୟ_ଦିନ୨', 'LOCALDAY2' ),
-	'localdayname'            => array( '1', 'ଦିନ', 'LOCALDAYNAME' ),
-	'localyear'               => array( '1', 'ସ୍ଥାନୀୟ_ବର୍ଷ', 'LOCALYEAR' ),
-	'localtime'               => array( '1', 'ସ୍ଥାନୀୟ_ସମୟ', 'LOCALTIME' ),
-	'localhour'               => array( '1', 'ସ୍ଥାନୀୟ_ଘଣ୍ଟା', 'LOCALHOUR' ),
-	'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' ),
-	'talkspace'               => array( '1', 'ଟକସ୍ପେସ', 'TALKSPACE' ),
-	'talkspacee'              => array( '1', 'ଟକସ୍ପେସକାରୀ', 'TALKSPACEE' ),
-	'subjectspace'            => array( '1', 'ବିଷୟସ୍ପେସ', 'ଲେଖାସ୍ପେସ', 'SUBJECTSPACE', 'ARTICLESPACE' ),
-	'msg'                     => array( '0', 'ମେସେଜ:', 'MSG:' ),
-	'img_manualthumb'         => array( '1', 'ନଖଦେଖଣା=$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_ପିକସେଲ', '$1px' ),
-	'img_center'              => array( '1', 'କେନ୍ଦ୍ର', 'center', 'centre' ),
-	'img_framed'              => array( '1', 'ଫ୍ରେମକରା', 'framed', 'enframed', 'frame' ),
-	'img_frameless'           => array( '1', 'ଫ୍ରେମନଥିବା', 'frameless' ),
-	'img_border'              => array( '1', 'ବର୍ଡର', 'border' ),
-	'img_baseline'            => array( '1', 'ବେସଲାଇନ', 'baseline' ),
-	'img_top'                 => array( '1', 'ଉପର', 'top' ),
-	'img_text_top'            => array( '1', 'ଲେଖା-ଉପର', 'text-top' ),
-	'img_middle'              => array( '1', 'ମଝି', 'middle' ),
-	'img_bottom'              => array( '1', 'ତଳ', 'bottom' ),
-	'img_text_bottom'         => array( '1', 'ଲେଖା-ତଳ', 'text-bottom' ),
-	'img_link'                => array( '1', 'ଲିଙ୍କ=$1', 'link=$1' ),
-	'articlepath'             => array( '0', 'ଲେଖାର_ପଥ', 'ARTICLEPATH' ),
-	'server'                  => array( '0', 'ସର୍ଭର', 'SERVER' ),
-	'grammar'                 => array( '0', 'ବ୍ୟାକରଣ', 'GRAMMAR:' ),
-	'gender'                  => array( '0', 'ଲିଙ୍ଗ', 'GENDER:' ),
-	'plural'                  => array( '0', 'ବହୁବଚନ:', 'PLURAL:' ),
-	'raw'                     => array( '0', 'କଞ୍ଚା', 'RAW:' ),
-	'displaytitle'            => array( '1', 'ଦେଖଣାନାଆଁ', 'DISPLAYTITLE' ),
-	'newsectionlink'          => array( '1', '_ନୂଆବିଭାଗଲିଙ୍କ_', '__NEWSECTIONLINK__' ),
-	'nonewsectionlink'        => array( '1', '_ନୂଆ_ବିଭାଗ_ନକରିବା_ଲିଙ୍କ_', '__NONEWSECTIONLINK__' ),
-	'currentversion'          => array( '1', 'ନଗଦ_ରିଭିଜନ', 'CURRENTVERSION' ),
-	'numberofadmins'          => array( '1', 'ପରିଛାମାନଙ୍କତାଲିକା', 'NUMBEROFADMINS' ),
-	'padleft'                 => array( '0', 'ବାଆଁପ୍ୟାଡ଼', 'PADLEFT' ),
-	'padright'                => array( '0', 'ଡାହାଣପ୍ୟାଡ଼', 'PADRIGHT' ),
-	'special'                 => array( '0', 'ବିଶେଷ', 'special' ),
-	'filepath'                => array( '0', 'ଫାଇଲରାହା:', 'FILEPATH:' ),
-	'tag'                     => array( '0', 'ଟାଗ', 'tag' ),
-	'hiddencat'               => array( '1', '_ଲୁଚିଥିବାବିଭାଗ_', '__HIDDENCAT__' ),
-	'pagesize'                => array( '1', 'ଫରଦଆକାର', 'PAGESIZE' ),
-	'protectionlevel'         => array( '1', 'ପ୍ରତିରକ୍ଷାସ୍ତର', 'PROTECTIONLEVEL' ),
-	'formatdate'              => array( '0', 'ତାରିଖରପ୍ରକାର', 'formatdate', 'dateformat' ),
-	'url_path'                => array( '0', 'ବାଟ', 'PATH' ),
-	'url_wiki'                => array( '0', 'ଉଇକି', 'WIKI' ),
-	'url_query'               => array( '0', 'ପ୍ରଶ୍ନ', 'QUERY' ),
+	'redirect'                  => array( '0', '#ଲେଉଟାଣି', '#REDIRECT' ),
+	'noeditsection'             => array( '0', '_ବଦଳା_ନହେବାଶ୍ରେଣୀ_', '__NOEDITSECTION__' ),
+	'currentmonth'              => array( '1', 'ଏବେକାର_ମାସ', 'ଏବେର_ମାସ୨', 'CURRENTMONTH', 'CURRENTMONTH2' ),
+	'currentmonth1'             => array( '1', 'ଏବେର_ମାସ', 'CURRENTMONTH1' ),
+	'currentmonthname'          => array( '1', 'ଏବେକାର_ମାସ_ନାଆଁ', 'CURRENTMONTHNAME' ),
+	'currentmonthnamegen'       => array( '1', 'ଏବେକାର_ମାସ_ନାଆଁ_ସାଧାରଣ', 'CURRENTMONTHNAMEGEN' ),
+	'currentmonthabbrev'        => array( '1', 'ଏବେକାର_ମାସ_ନାଆଁ_ସଂକ୍ଷିପ୍ତ', 'CURRENTMONTHABBREV' ),
+	'currentday'                => array( '1', 'ଏବେକାର_ଦିନ', 'CURRENTDAY' ),
+	'currentday2'               => array( '1', 'ଏବେକାର_ଦିନ୨', 'CURRENTDAY2' ),
+	'currentdayname'            => array( '1', 'ଏବେକାର_ଦିନ_ନାଆଁ', 'CURRENTDAYNAME' ),
+	'currentyear'               => array( '1', 'ଏବେକାର_ବର୍ଷ', 'CURRENTYEAR' ),
+	'currenttime'               => array( '1', 'ଏବେକାର_ସମୟ', 'CURRENTTIME' ),
+	'currenthour'               => array( '1', 'ଏବେକାର_ଘଣ୍ଟା', 'CURRENTHOUR' ),
+	'localmonth'                => array( '1', 'ଏବେର_ମାସ୧', 'ସ୍ଥାନୀୟ_ମାସ୨', 'LOCALMONTH', 'LOCALMONTH2' ),
+	'localmonth1'               => array( '1', 'ଏବେକାର_ମାସ୧', 'LOCALMONTH1' ),
+	'localmonthname'            => array( '1', 'ମାସ୧ର_ନାଆଁ', 'LOCALMONTHNAME' ),
+	'localmonthnamegen'         => array( '1', 'ସ୍ଥାନୀୟ_ମାସ୧_ନାଆଁ_ସାଧାରଣ', 'LOCALMONTHNAMEGEN' ),
+	'localmonthabbrev'          => array( '1', 'ସ୍ଥାନୀୟ_ମାସର୧_ନାଆଁ_ସଂକ୍ଷିପ୍ତ', 'LOCALMONTHABBREV' ),
+	'localday'                  => array( '1', 'Local_ଦିନ', 'LOCALDAY' ),
+	'localday2'                 => array( '1', 'ସ୍ଥାନୀୟ_ଦିନ୨', 'LOCALDAY2' ),
+	'localdayname'              => array( '1', 'ଦିନ', 'LOCALDAYNAME' ),
+	'localyear'                 => array( '1', 'ସ୍ଥାନୀୟ_ବର୍ଷ', 'LOCALYEAR' ),
+	'localtime'                 => array( '1', 'ସ୍ଥାନୀୟ_ସମୟ', 'LOCALTIME' ),
+	'localhour'                 => array( '1', 'ସ୍ଥାନୀୟ_ଘଣ୍ଟା', 'LOCALHOUR' ),
+	'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' ),
+	'talkspace'                 => array( '1', 'ଟକସ୍ପେସ', 'TALKSPACE' ),
+	'talkspacee'                => array( '1', 'ଟକସ୍ପେସକାରୀ', 'TALKSPACEE' ),
+	'subjectspace'              => array( '1', 'ବିଷୟସ୍ପେସ', 'ଲେଖାସ୍ପେସ', 'SUBJECTSPACE', 'ARTICLESPACE' ),
+	'msg'                       => array( '0', 'ମେସେଜ:', 'MSG:' ),
+	'img_manualthumb'           => array( '1', 'ନଖଦେଖଣା=$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_ପିକସେଲ', '$1px' ),
+	'img_center'                => array( '1', 'କେନ୍ଦ୍ର', 'center', 'centre' ),
+	'img_framed'                => array( '1', 'ଫ୍ରେମକରା', 'framed', 'enframed', 'frame' ),
+	'img_frameless'             => array( '1', 'ଫ୍ରେମନଥିବା', 'frameless' ),
+	'img_border'                => array( '1', 'ବର୍ଡର', 'border' ),
+	'img_baseline'              => array( '1', 'ବେସଲାଇନ', 'baseline' ),
+	'img_top'                   => array( '1', 'ଉପର', 'top' ),
+	'img_text_top'              => array( '1', 'ଲେଖା-ଉପର', 'text-top' ),
+	'img_middle'                => array( '1', 'ମଝି', 'middle' ),
+	'img_bottom'                => array( '1', 'ତଳ', 'bottom' ),
+	'img_text_bottom'           => array( '1', 'ଲେଖା-ତଳ', 'text-bottom' ),
+	'img_link'                  => array( '1', 'ଲିଙ୍କ=$1', 'link=$1' ),
+	'articlepath'               => array( '0', 'ଲେଖାର_ପଥ', 'ARTICLEPATH' ),
+	'server'                    => array( '0', 'ସର୍ଭର', 'SERVER' ),
+	'grammar'                   => array( '0', 'ବ୍ୟାକରଣ', 'GRAMMAR:' ),
+	'gender'                    => array( '0', 'ଲିଙ୍ଗ', 'GENDER:' ),
+	'plural'                    => array( '0', 'ବହୁବଚନ:', 'PLURAL:' ),
+	'raw'                       => array( '0', 'କଞ୍ଚା', 'RAW:' ),
+	'displaytitle'              => array( '1', 'ଦେଖଣାନାଆଁ', 'DISPLAYTITLE' ),
+	'newsectionlink'            => array( '1', '_ନୂଆବିଭାଗଲିଙ୍କ_', '__NEWSECTIONLINK__' ),
+	'nonewsectionlink'          => array( '1', '_ନୂଆ_ବିଭାଗ_ନକରିବା_ଲିଙ୍କ_', '__NONEWSECTIONLINK__' ),
+	'currentversion'            => array( '1', 'ନଗଦ_ରିଭିଜନ', 'CURRENTVERSION' ),
+	'numberofadmins'            => array( '1', 'ପରିଛାମାନଙ୍କତାଲିକା', 'NUMBEROFADMINS' ),
+	'padleft'                   => array( '0', 'ବାଆଁପ୍ୟାଡ଼', 'PADLEFT' ),
+	'padright'                  => array( '0', 'ଡାହାଣପ୍ୟାଡ଼', 'PADRIGHT' ),
+	'special'                   => array( '0', 'ବିଶେଷ', 'special' ),
+	'filepath'                  => array( '0', 'ଫାଇଲରାହା:', 'FILEPATH:' ),
+	'tag'                       => array( '0', 'ଟାଗ', 'tag' ),
+	'hiddencat'                 => array( '1', '_ଲୁଚିଥିବାବିଭାଗ_', '__HIDDENCAT__' ),
+	'pagesize'                  => array( '1', 'ଫରଦଆକାର', 'PAGESIZE' ),
+	'protectionlevel'           => array( '1', 'ପ୍ରତିରକ୍ଷାସ୍ତର', 'PROTECTIONLEVEL' ),
+	'formatdate'                => array( '0', 'ତାରିଖରପ୍ରକାର', 'formatdate', 'dateformat' ),
+	'url_path'                  => array( '0', 'ବାଟ', 'PATH' ),
+	'url_wiki'                  => array( '0', 'ଉଇକି', 'WIKI' ),
+	'url_query'                 => array( '0', 'ପ୍ରଶ୍ନ', 'QUERY' ),
 );
 
 $digitGroupingPattern = "##,##,###";
diff --git a/languages/messages/MessagesOs.php b/languages/messages/MessagesOs.php
index 90e0b43a9a..9f18071162 100644
--- a/languages/messages/MessagesOs.php
+++ b/languages/messages/MessagesOs.php
@@ -50,14 +50,40 @@ $namespaceAliases = array(
 );
 
 $specialPageAliases = array(
-	'Recentchanges'             => 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( 'АккаунтСкæнын' ),
+	'DeletedContributions'      => array( 'ХафтБавæрд' ),
+	'Mycontributions'           => array( 'МæБавæрд' ),
+	'Mypage'                    => array( 'МæФарс' ),
+	'Mytalk'                    => array( 'МæНыхас' ),
+	'Myuploads'                 => array( 'МæБавгæд' ),
+	'Newimages'                 => array( 'НогФайлтæ' ),
+	'Newpages'                  => array( 'НогФæрстæ' ),
+	'Preferences'               => array( 'Фадæттæ' ),
+	'Randompage'                => array( 'ÆрхаугæФарс' ),
+	'Recentchanges'             => array( 'ФæстагИвдтытæ' ),
+	'Search'                    => array( 'Агурын' ),
+	'Watchlist'                 => array( 'Цæстдард' ),
 );
 
 
 $magicWords = array(
-	'redirect'                => array( '0', '#РАРВЫСТ', '#перенаправление', '#перенапр', '#REDIRECT' ),
-	'img_right'               => array( '1', 'рахиз', 'справа', 'right' ),
-	'img_left'                => array( '1', 'галиу', 'слева', 'left' ),
+	'redirect'                  => array( '0', '#РАРВЫСТ', '#перенаправление', '#перенапр', '#REDIRECT' ),
+	'img_right'                 => array( '1', 'рахиз', 'справа', 'right' ),
+	'img_left'                  => array( '1', 'галиу', 'слева', 'left' ),
 );
 
 $linkTrail = '/^((?:[a-z]|а|æ|б|в|г|д|е|ё|ж|з|и|й|к|л|м|н|о|п|р|с|т|у|ф|х|ц|ч|ш|щ|ъ|ы|ь|э|ю|я|“|»)+)(.*)$/sDu';
diff --git a/languages/messages/MessagesPa.php b/languages/messages/MessagesPa.php
index a3b60534eb..b192f98823 100644
--- a/languages/messages/MessagesPa.php
+++ b/languages/messages/MessagesPa.php
@@ -23,21 +23,43 @@
 
 $namespaceNames = array(
 	NS_MEDIA            => 'ਮੀਡੀਆ',
-	NS_SPECIAL          => 'ਖਾਸ',
-	NS_TALK             => 'ਚਰਚਾ',
-	NS_USER             => 'ਮੈਂਬਰ',
-	NS_USER_TALK        => 'ਮੈਂਬਰ_ਚਰਚਾ',
-	NS_PROJECT_TALK     => '$1_ਚਰਚਾ',
+	NS_SPECIAL          => 'ਖ਼ਾਸ',
+	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_FILE_TALK        => 'ਤਸਵੀਰ_ਗੱਲ-ਬਾਤ',
+	NS_MEDIAWIKI        => 'ਮੀਡੀਆਵਿਕੀ',
+	NS_MEDIAWIKI_TALK   => 'ਮੀਡੀਆਵਿਕੀ_ਗੱਲ-ਬਾਤ',
+	NS_TEMPLATE         => 'ਫਰਮਾ',
+	NS_TEMPLATE_TALK    => 'ਫਰਮਾ_ਗੱਲ-ਬਾਤ',
 	NS_HELP             => 'ਮਦਦ',
-	NS_HELP_TALK        => 'ਮਦਦ_ਚਰਚਾ',
+	NS_HELP_TALK        => 'ਮਦਦ_ਗੱਲ-ਬਾਤ',
 	NS_CATEGORY         => 'ਸ਼੍ਰੇਣੀ',
-	NS_CATEGORY_TALK    => 'ਸ਼੍ਰੇਣੀ_ਚਰਚਾ',
+	NS_CATEGORY_TALK    => 'ਸ਼੍ਰੇਣੀ_ਗੱਲ-ਬਾਤ',
+);
+
+$namespaceAliases = array(
+	'ਖਾਸ' => NS_SPECIAL,
+	'ਚਰਚਾ' => NS_TALK,
+	'ਮੈਂਬਰ' => NS_USER,
+	'ਮੈਂਬਰ_ਚਰਚਾ' => NS_USER_TALK,
+	'$1_ਚਰਚਾ' => NS_PROJECT_TALK,
+	'ਤਸਵੀਰ_ਚਰਚਾ' => NS_FILE_TALK,
+	'ਮੀਡੀਆਵਿਕਿ' => NS_MEDIAWIKI,
+	'ਮੀਡੀਆਵਿਕਿ_ਚਰਚਾ' => NS_MEDIAWIKI_TALK,
+	'ਨਮੂਨਾ' => NS_TEMPLATE,
+	'ਨਮੂਨਾ_ਚਰਚਾ' => NS_TEMPLATE_TALK,
+	'ਮਦਦ_ਚਰਚਾ' => NS_HELP_TALK,
+	'ਸ਼੍ਰੇਣੀ_ਚਰਚਾ' => NS_CATEGORY_TALK,
+);
+
+$specialPageAliases = array(
+	'Activeusers'               => array( 'ਸਰਗਰਮ_ਵਰਤੌਂਕਾਰ' ),
+	'Blankpage'                 => array( 'ਖਾਲੀ_ਸਫ਼ਾ' ),
+	'Block'                     => array( 'ਪਾਬੰਦੀ_ਲਾਉਣਾ', 'ਪਾਬੰਦੀ_ਸ਼ੁਦਾ_ਆਈ_ਪੀ', 'ਪਾਬੰਦੀ_ਸ਼ੁਦਾ_ਵਰਤੌਂਕਾਰ' ),
+	'Listusers'                 => array( 'ਵਰਤੌਂਕਾਰਾਂ_ਦੀ_ਸੂਚੀ' ),
 );
 
 $digitTransformTable = array(
@@ -1868,9 +1890,9 @@ delete|ਮਿਟਾਉਣਾਂ ਦਾ ਚਿੱਠਾ]] ਵੇਖੋ।',
 'spamprotectiontitle' => 'Spam ਸੁਰੱਖਿਆ ਫਿਲਟਰ',
 
 # Info page
-'pageinfo-header-edits' => 'ਸੋਧਾਂ',
-'pageinfo-watchers' => 'ਨਜ਼ਰ ਰੱਖਣ ਵਾਲ਼ਿਆਂ ਦੀ ਗਿਣਤੀ',
-'pageinfo-edits' => 'ਸੋਧਾਂ ਦੀ ਗਿਣਤੀ',
+'pageinfo-header-edits' => 'ਸੋਧਾਂ ਦਾ ਅਤੀਤ',
+'pageinfo-watchers' => 'ਸਫ਼ੇ ’ਤੇ ਨਜ਼ਰ ਰੱਖਣ ਵਾਲ਼ੇ',
+'pageinfo-edits' => 'ਕੁੱਲ ਸੋਧਾਂ',
 
 # Skin names
 'skinname-standard' => 'ਕਲਾਸਿਕ',
diff --git a/languages/messages/MessagesPl.php b/languages/messages/MessagesPl.php
index fd6dbce917..582180f625 100644
--- a/languages/messages/MessagesPl.php
+++ b/languages/messages/MessagesPl.php
@@ -206,90 +206,90 @@ $specialPageAliases = array(
 );
 
 $magicWords = array(
-	'redirect'                => array( '0', '#PATRZ', '#PRZEKIERUJ', '#TAM', '#REDIRECT' ),
-	'notoc'                   => array( '0', '__BEZSPISU__', '__NOTOC__' ),
-	'nogallery'               => array( '0', '__BEZGALERII__', '__NOGALLERY__' ),
-	'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' ),
-	'currenttime'             => array( '1', 'AKTUALNYCZAS', 'CURRENTTIME' ),
-	'currenthour'             => array( '1', 'AKTUALNAGODZINA', 'CURRENTHOUR' ),
-	'localmonth'              => array( '1', 'MIESIĄC', 'LOCALMONTH', 'LOCALMONTH2' ),
-	'localmonthname'          => array( '1', 'MIESIĄCNAZWA', 'LOCALMONTHNAME' ),
-	'localmonthnamegen'       => array( '1', 'MIESIĄCNAZWAD', 'LOCALMONTHNAMEGEN' ),
-	'localmonthabbrev'        => array( '1', 'MIESIĄCNAZWASKR', 'LOCALMONTHABBREV' ),
-	'localday'                => array( '1', 'DZIEŃ', 'LOCALDAY' ),
-	'localday2'               => array( '1', 'DZIEŃ2', 'LOCALDAY2' ),
-	'localdayname'            => array( '1', 'DZIEŃTYGODNIA', 'LOCALDAYNAME' ),
-	'localyear'               => array( '1', 'ROK', 'LOCALYEAR' ),
-	'localtime'               => array( '1', 'CZAS', 'LOCALTIME' ),
-	'localhour'               => array( '1', 'GODZINA', 'LOCALHOUR' ),
-	'numberofpages'           => array( '1', 'STRON', 'NUMBEROFPAGES' ),
-	'numberofarticles'        => array( '1', 'ARTYKUŁÓW', 'NUMBEROFARTICLES' ),
-	'numberoffiles'           => array( '1', 'PLIKÓW', 'NUMBEROFFILES' ),
-	'numberofusers'           => array( '1', 'UŻYTKOWNIKÓW', 'NUMBEROFUSERS' ),
-	'numberofactiveusers'     => array( '1', 'LICZBAAKTYWNYCHUŻYTKOWNIKÓW', 'NUMBEROFACTIVEUSERS' ),
-	'numberofedits'           => array( '1', 'EDYCJI', 'NUMBEROFEDITS' ),
-	'pagename'                => array( '1', 'NAZWASTRONY', 'PAGENAME' ),
-	'namespace'               => array( '1', 'NAZWAPRZESTRZENI', 'NAMESPACE' ),
-	'talkspace'               => array( '1', 'DYSKUSJA', 'TALKSPACE' ),
-	'fullpagename'            => array( '1', 'PELNANAZWASTRONY', 'FULLPAGENAME' ),
-	'subpagename'             => array( '1', 'NAZWAPODSTRONY', 'SUBPAGENAME' ),
-	'basepagename'            => array( '1', 'BAZOWANAZWASTRONY', 'BASEPAGENAME' ),
-	'talkpagename'            => array( '1', 'NAZWASTRONYDYSKUSJI', 'TALKPAGENAME' ),
-	'subst'                   => array( '0', 'podst:', 'SUBST:' ),
-	'img_thumbnail'           => array( '1', 'mały', 'thumbnail', 'thumb' ),
-	'img_manualthumb'         => array( '1', 'mały=$1', 'thumbnail=$1', 'thumb=$1' ),
-	'img_right'               => array( '1', 'prawo', 'right' ),
-	'img_left'                => array( '1', 'lewo', 'left' ),
-	'img_none'                => array( '1', 'brak', 'none' ),
-	'img_center'              => array( '1', 'centruj', 'center', 'centre' ),
-	'img_framed'              => array( '1', 'ramka', 'framed', 'enframed', 'frame' ),
-	'img_frameless'           => array( '1', 'bezramki', 'bez_ramki', 'frameless' ),
-	'img_page'                => array( '1', 'strona=$1', 'page=$1', 'page $1' ),
-	'img_border'              => array( '1', 'tło', 'border' ),
-	'img_top'                 => array( '1', 'góra', 'top' ),
-	'img_middle'              => array( '1', 'środek', 'middle' ),
-	'img_bottom'              => array( '1', 'dół', 'bottom' ),
-	'sitename'                => array( '1', 'PROJEKT', 'SITENAME' ),
-	'ns'                      => array( '0', 'PN:', 'NS:' ),
-	'articlepath'             => array( '0', 'ŚCIEŻKAARTYKUŁÓW', 'ARTICLEPATH' ),
-	'server'                  => array( '0', 'SERWER', 'SERVER' ),
-	'servername'              => array( '0', 'NAZWASERWERA', 'SERVERNAME' ),
-	'scriptpath'              => array( '0', 'ŚCIEŻKASKRYPTU', 'SCRIPTPATH' ),
-	'grammar'                 => array( '0', 'ODMIANA:', 'GRAMMAR:' ),
-	'gender'                  => array( '0', 'PŁEĆ:', 'GENDER:' ),
-	'currentweek'             => array( '1', 'AKTUALNYTYDZIEŃ', 'CURRENTWEEK' ),
-	'localweek'               => array( '1', 'TYDZIEŃROKU', 'LOCALWEEK' ),
-	'localdow'                => array( '1', 'DZIEŃTYGODNIANR', 'LOCALDOW' ),
-	'plural'                  => array( '0', 'MNOGA:', 'PLURAL:' ),
-	'fullurl'                 => array( '0', 'PEŁNYURL', 'FULLURL:' ),
-	'lcfirst'                 => array( '0', 'ZMAŁEJ:', 'LCFIRST:' ),
-	'ucfirst'                 => array( '0', 'ZWIELKIEJ:', 'ZDUŻEJ:', 'UCFIRST:' ),
-	'lc'                      => array( '0', 'MAŁE:', 'LC:' ),
-	'uc'                      => array( '0', 'WIELKIE:', 'DUŻE:', 'UC:' ),
-	'displaytitle'            => array( '1', 'WYŚWIETLANYTYTUŁ', 'DISPLAYTITLE' ),
-	'newsectionlink'          => array( '1', '__LINKNOWEJSEKCJI__', '__NEWSECTIONLINK__' ),
-	'currentversion'          => array( '1', 'AKTUALNAWERSJA', 'CURRENTVERSION' ),
-	'language'                => array( '0', '#JĘZYK:', '#LANGUAGE:' ),
-	'numberofadmins'          => array( '1', 'ADMINISTRATORÓW', 'NUMBEROFADMINS' ),
-	'padleft'                 => array( '0', 'DOLEWEJ', 'PADLEFT' ),
-	'padright'                => array( '0', 'DOPRAWEJ', 'PADRIGHT' ),
-	'special'                 => array( '0', 'specjalna', 'special' ),
-	'defaultsort'             => array( '1', 'DOMYŚLNIESORTUJ', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:' ),
-	'filepath'                => array( '0', 'ŚCIEŻKAPLIKU', 'FILEPATH:' ),
-	'hiddencat'               => array( '1', '__KATEGORIAUKRYTA__', '__HIDDENCAT__' ),
-	'pagesincategory'         => array( '1', 'STRONYWKATEGORII', 'PAGESINCATEGORY', 'PAGESINCAT' ),
-	'pagesize'                => array( '1', 'ROZMIARSTRONY', 'PAGESIZE' ),
-	'index'                   => array( '1', '__INDEKSUJ__', '__INDEX__' ),
-	'noindex'                 => array( '1', '__NIEINDEKSUJ__', '__NOINDEX__' ),
-	'protectionlevel'         => array( '1', '__POZIOMZABEZPIECZEŃ__', 'PROTECTIONLEVEL' ),
-	'url_path'                => array( '0', 'ŚCIEŻKA', 'PATH' ),
-	'url_query'               => array( '0', 'ZAPYTANIE', 'QUERY' ),
+	'redirect'                  => array( '0', '#PATRZ', '#PRZEKIERUJ', '#TAM', '#REDIRECT' ),
+	'notoc'                     => array( '0', '__BEZSPISU__', '__NOTOC__' ),
+	'nogallery'                 => array( '0', '__BEZGALERII__', '__NOGALLERY__' ),
+	'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' ),
+	'currenttime'               => array( '1', 'AKTUALNYCZAS', 'CURRENTTIME' ),
+	'currenthour'               => array( '1', 'AKTUALNAGODZINA', 'CURRENTHOUR' ),
+	'localmonth'                => array( '1', 'MIESIĄC', 'LOCALMONTH', 'LOCALMONTH2' ),
+	'localmonthname'            => array( '1', 'MIESIĄCNAZWA', 'LOCALMONTHNAME' ),
+	'localmonthnamegen'         => array( '1', 'MIESIĄCNAZWAD', 'LOCALMONTHNAMEGEN' ),
+	'localmonthabbrev'          => array( '1', 'MIESIĄCNAZWASKR', 'LOCALMONTHABBREV' ),
+	'localday'                  => array( '1', 'DZIEŃ', 'LOCALDAY' ),
+	'localday2'                 => array( '1', 'DZIEŃ2', 'LOCALDAY2' ),
+	'localdayname'              => array( '1', 'DZIEŃTYGODNIA', 'LOCALDAYNAME' ),
+	'localyear'                 => array( '1', 'ROK', 'LOCALYEAR' ),
+	'localtime'                 => array( '1', 'CZAS', 'LOCALTIME' ),
+	'localhour'                 => array( '1', 'GODZINA', 'LOCALHOUR' ),
+	'numberofpages'             => array( '1', 'STRON', 'NUMBEROFPAGES' ),
+	'numberofarticles'          => array( '1', 'ARTYKUŁÓW', 'NUMBEROFARTICLES' ),
+	'numberoffiles'             => array( '1', 'PLIKÓW', 'NUMBEROFFILES' ),
+	'numberofusers'             => array( '1', 'UŻYTKOWNIKÓW', 'NUMBEROFUSERS' ),
+	'numberofactiveusers'       => array( '1', 'LICZBAAKTYWNYCHUŻYTKOWNIKÓW', 'NUMBEROFACTIVEUSERS' ),
+	'numberofedits'             => array( '1', 'EDYCJI', 'NUMBEROFEDITS' ),
+	'pagename'                  => array( '1', 'NAZWASTRONY', 'PAGENAME' ),
+	'namespace'                 => array( '1', 'NAZWAPRZESTRZENI', 'NAMESPACE' ),
+	'talkspace'                 => array( '1', 'DYSKUSJA', 'TALKSPACE' ),
+	'fullpagename'              => array( '1', 'PELNANAZWASTRONY', 'FULLPAGENAME' ),
+	'subpagename'               => array( '1', 'NAZWAPODSTRONY', 'SUBPAGENAME' ),
+	'basepagename'              => array( '1', 'BAZOWANAZWASTRONY', 'BASEPAGENAME' ),
+	'talkpagename'              => array( '1', 'NAZWASTRONYDYSKUSJI', 'TALKPAGENAME' ),
+	'subst'                     => array( '0', 'podst:', 'SUBST:' ),
+	'img_thumbnail'             => array( '1', 'mały', 'thumbnail', 'thumb' ),
+	'img_manualthumb'           => array( '1', 'mały=$1', 'thumbnail=$1', 'thumb=$1' ),
+	'img_right'                 => array( '1', 'prawo', 'right' ),
+	'img_left'                  => array( '1', 'lewo', 'left' ),
+	'img_none'                  => array( '1', 'brak', 'none' ),
+	'img_center'                => array( '1', 'centruj', 'center', 'centre' ),
+	'img_framed'                => array( '1', 'ramka', 'framed', 'enframed', 'frame' ),
+	'img_frameless'             => array( '1', 'bezramki', 'bez_ramki', 'frameless' ),
+	'img_page'                  => array( '1', 'strona=$1', 'page=$1', 'page $1' ),
+	'img_border'                => array( '1', 'tło', 'border' ),
+	'img_top'                   => array( '1', 'góra', 'top' ),
+	'img_middle'                => array( '1', 'środek', 'middle' ),
+	'img_bottom'                => array( '1', 'dół', 'bottom' ),
+	'sitename'                  => array( '1', 'PROJEKT', 'SITENAME' ),
+	'ns'                        => array( '0', 'PN:', 'NS:' ),
+	'articlepath'               => array( '0', 'ŚCIEŻKAARTYKUŁÓW', 'ARTICLEPATH' ),
+	'server'                    => array( '0', 'SERWER', 'SERVER' ),
+	'servername'                => array( '0', 'NAZWASERWERA', 'SERVERNAME' ),
+	'scriptpath'                => array( '0', 'ŚCIEŻKASKRYPTU', 'SCRIPTPATH' ),
+	'grammar'                   => array( '0', 'ODMIANA:', 'GRAMMAR:' ),
+	'gender'                    => array( '0', 'PŁEĆ:', 'GENDER:' ),
+	'currentweek'               => array( '1', 'AKTUALNYTYDZIEŃ', 'CURRENTWEEK' ),
+	'localweek'                 => array( '1', 'TYDZIEŃROKU', 'LOCALWEEK' ),
+	'localdow'                  => array( '1', 'DZIEŃTYGODNIANR', 'LOCALDOW' ),
+	'plural'                    => array( '0', 'MNOGA:', 'PLURAL:' ),
+	'fullurl'                   => array( '0', 'PEŁNYURL', 'FULLURL:' ),
+	'lcfirst'                   => array( '0', 'ZMAŁEJ:', 'LCFIRST:' ),
+	'ucfirst'                   => array( '0', 'ZWIELKIEJ:', 'ZDUŻEJ:', 'UCFIRST:' ),
+	'lc'                        => array( '0', 'MAŁE:', 'LC:' ),
+	'uc'                        => array( '0', 'WIELKIE:', 'DUŻE:', 'UC:' ),
+	'displaytitle'              => array( '1', 'WYŚWIETLANYTYTUŁ', 'DISPLAYTITLE' ),
+	'newsectionlink'            => array( '1', '__LINKNOWEJSEKCJI__', '__NEWSECTIONLINK__' ),
+	'currentversion'            => array( '1', 'AKTUALNAWERSJA', 'CURRENTVERSION' ),
+	'language'                  => array( '0', '#JĘZYK:', '#LANGUAGE:' ),
+	'numberofadmins'            => array( '1', 'ADMINISTRATORÓW', 'NUMBEROFADMINS' ),
+	'padleft'                   => array( '0', 'DOLEWEJ', 'PADLEFT' ),
+	'padright'                  => array( '0', 'DOPRAWEJ', 'PADRIGHT' ),
+	'special'                   => array( '0', 'specjalna', 'special' ),
+	'defaultsort'               => array( '1', 'DOMYŚLNIESORTUJ', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:' ),
+	'filepath'                  => array( '0', 'ŚCIEŻKAPLIKU', 'FILEPATH:' ),
+	'hiddencat'                 => array( '1', '__KATEGORIAUKRYTA__', '__HIDDENCAT__' ),
+	'pagesincategory'           => array( '1', 'STRONYWKATEGORII', 'PAGESINCATEGORY', 'PAGESINCAT' ),
+	'pagesize'                  => array( '1', 'ROZMIARSTRONY', 'PAGESIZE' ),
+	'index'                     => array( '1', '__INDEKSUJ__', '__INDEX__' ),
+	'noindex'                   => array( '1', '__NIEINDEKSUJ__', '__NOINDEX__' ),
+	'protectionlevel'           => array( '1', '__POZIOMZABEZPIECZEŃ__', 'PROTECTIONLEVEL' ),
+	'url_path'                  => array( '0', 'ŚCIEŻKA', 'PATH' ),
+	'url_query'                 => array( '0', 'ZAPYTANIE', 'QUERY' ),
 );
 
 $messages = array(
diff --git a/languages/messages/MessagesPms.php b/languages/messages/MessagesPms.php
index 1446555323..eec58cc0b0 100644
--- a/languages/messages/MessagesPms.php
+++ b/languages/messages/MessagesPms.php
@@ -2739,22 +2739,22 @@ A peul visualisene la sorgiss",
 'tooltip-n-mainpage-description' => "Andé a la pàgina d'intrada",
 'tooltip-n-portal' => 'Rësguard al proget, lòn che a peul fé, andoa trové còsa.',
 'tooltip-n-currentevents' => 'Informassion ansima a lòn che a-i riva.',
-'tooltip-n-recentchanges' => 'Lista dj',
+'tooltip-n-recentchanges' => "Lista dj'ùltime modìfiche an sla wiki",
 'tooltip-n-randompage' => 'Carié na pàgina basta che a sia.',
 'tooltip-n-help' => 'Ël pòst për capì.',
 'tooltip-t-whatlinkshere' => 'Lista ëd tute le pàgine dla wiki che a men-o ambelessì.',
 'tooltip-t-recentchangeslinked' => 'Ùltime modìfiche dle pàgine andoa as peul andesse da costa.',
-'tooltip-feed-rss' => 'RSS feed për sta pàgina-sì.',
-'tooltip-feed-atom' => 'Atom feed për sta pàgina-sì.',
-'tooltip-t-contributions' => 'Vardé la lista dle contribussion dë st',
-'tooltip-t-emailuser' => 'Mandeje un messagi ëd pòsta a st',
-'tooltip-t-upload' => 'Carié archivi ëd figure ò son.',
+'tooltip-feed-rss' => 'Fluss RSS për costa pàgina',
+'tooltip-feed-atom' => 'Fluss Atom për costa pàgina.',
+'tooltip-t-contributions' => 'Vardé la lista dle contribussion ëd cost utent',
+'tooltip-t-emailuser' => "Mandeje un mëssagi ëd pòsta a st'utent",
+'tooltip-t-upload' => "Carié n'archivi ëd figure ò son.",
 'tooltip-t-specialpages' => 'Lista ëd tute le pàgine speciaj.',
 'tooltip-t-print' => 'Version bon-a da stampé dë sta pàgina',
-'tooltip-t-permalink' => 'Anliura fissa a sta version-i dla pàgina',
+'tooltip-t-permalink' => 'Anliura fissa a sta version-sì dla pàgina',
 'tooltip-ca-nstab-main' => 'Vardé la pàgina ëd contnù.',
 'tooltip-ca-nstab-user' => 'Vardé la pàgina Utent.',
-'tooltip-ca-nstab-media' => 'Vardé la pàgina dl',
+'tooltip-ca-nstab-media' => 'Vardé la pàgina dël mojen',
 'tooltip-ca-nstab-special' => 'Costa a l',
 'tooltip-ca-nstab-project' => 'Vardé la pàgina proteta.',
 'tooltip-ca-nstab-image' => 'Vardé la pàgina dl',
@@ -2837,7 +2837,7 @@ Sòn a l'é motobin belfé che a sia rivà përchè a-i era n'anliura a un sit e
 'pageinfo-authors' => "Nùmer d'autor diferent",
 'pageinfo-recent-edits' => "Nùmer ëd modìfiche recente (an drinta a j'ùltim $1)",
 'pageinfo-recent-authors' => "Nùmer recent d'autor diferent",
-'pageinfo-restriction' => 'Protession ëd pagina (<code>$1</code>)',
+'pageinfo-restriction' => 'Protession ëd pagina (<code>{{lcfirst:$1}}</code>)',
 'pageinfo-magic-words' => '{{PLURAL:$1|Paròla màgic|Paròle màgiche}} ($1)',
 'pageinfo-hidden-categories' => '{{PLURAL:$1|Categorìa|Categorìe}} stërmà ($1)',
 'pageinfo-templates' => 'Trascludù {{PLURAL:$1|stamp|stamp}} ($1)',
diff --git a/languages/messages/MessagesPs.php b/languages/messages/MessagesPs.php
index 606ec0d0c4..ff59bb34a0 100644
--- a/languages/messages/MessagesPs.php
+++ b/languages/messages/MessagesPs.php
@@ -95,64 +95,64 @@ $specialPageAliases = array(
 );
 
 $magicWords = array(
-	'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' ),
-	'currentmonthname'        => array( '1', 'دروانې_مياشت_نوم', 'CURRENTMONTHNAME' ),
-	'currentmonthabbrev'      => array( '1', 'دروانې_مياشت_لنډون', 'CURRENTMONTHABBREV' ),
-	'currentday'              => array( '1', 'نن', 'CURRENTDAY' ),
-	'currentday2'             => array( '1', 'نن۲', 'CURRENTDAY2' ),
-	'currentdayname'          => array( '1', 'دننۍورځې_نوم', 'CURRENTDAYNAME' ),
-	'currentyear'             => array( '1', 'سږکال', 'CURRENTYEAR' ),
-	'currenttime'             => array( '1', 'داوخت', 'CURRENTTIME' ),
-	'currenthour'             => array( '1', 'دم_ګړۍ', 'CURRENTHOUR' ),
-	'localmonth'              => array( '1', 'سيمه_يزه_مياشت', 'LOCALMONTH', 'LOCALMONTH2' ),
-	'localmonthname'          => array( '1', 'دسيمه_يزې_مياشت_نوم', 'LOCALMONTHNAME' ),
-	'localmonthabbrev'        => array( '1', 'دسيمه_يزې_مياشت_لنډون', 'LOCALMONTHABBREV' ),
-	'localday'                => array( '1', 'سيمه_يزه_ورځ', 'LOCALDAY' ),
-	'localday2'               => array( '1', 'سيمه_يزه_ورځ۲', 'LOCALDAY2' ),
-	'localdayname'            => array( '1', 'دسيمه_يزې_ورځ_نوم', 'LOCALDAYNAME' ),
-	'localyear'               => array( '1', 'سيمه_يزکال', 'LOCALYEAR' ),
-	'localtime'               => array( '1', 'سيمه_يزوخت', 'LOCALTIME' ),
-	'localhour'               => array( '1', 'سيمه_يزه_ګړۍ', 'LOCALHOUR' ),
-	'numberofpages'           => array( '1', 'دمخونوشمېر', 'NUMBEROFPAGES' ),
-	'numberofarticles'        => array( '1', 'دليکنوشمېر', 'NUMBEROFARTICLES' ),
-	'numberoffiles'           => array( '1', 'ددوتنوشمېر', 'NUMBEROFFILES' ),
-	'numberofusers'           => array( '1', 'دکارونکوشمېر', 'NUMBEROFUSERS' ),
-	'pagename'                => array( '1', 'دمخ_نوم', 'PAGENAME' ),
-	'pagenamee'               => array( '1', 'دمخ_نښه', 'PAGENAMEE' ),
-	'namespace'               => array( '1', 'نوم_تشيال', 'NAMESPACE' ),
-	'namespacee'              => array( '1', 'د_نوم_تشيال_نښه', 'NAMESPACEE' ),
-	'talkspace'               => array( '1', 'دخبرواترو_تشيال', 'TALKSPACE' ),
-	'talkspacee'              => array( '1', 'دخبرواترو_تشيال_نښه', 'TALKSPACEE' ),
-	'subjectspace'            => array( '1', 'دسکالوتشيال', 'دليکنې_تشيال', 'SUBJECTSPACE', 'ARTICLESPACE' ),
-	'subjectspacee'           => array( '1', 'دسکالوتشيال_نښه', 'دليکنې_تشيال_نښه', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
-	'fullpagename'            => array( '1', 'دمخ_بشپړنوم', 'FULLPAGENAME' ),
-	'fullpagenamee'           => array( '1', 'دمخ_بشپړنوم_نښه', 'FULLPAGENAMEE' ),
-	'msg'                     => array( '0', 'پیغام:', 'پ:', 'MSG:' ),
-	'img_thumbnail'           => array( '1', 'بټنوک', 'thumbnail', 'thumb' ),
-	'img_right'               => array( '1', 'ښي', 'right' ),
-	'img_left'                => array( '1', 'کيڼ', 'left' ),
-	'img_none'                => array( '1', 'هېڅ', 'none' ),
-	'img_center'              => array( '1', 'مېنځ،_center', 'center', 'centre' ),
-	'sitename'                => array( '1', 'دوېبځي_نوم', 'SITENAME' ),
-	'server'                  => array( '0', 'پالنګر', 'SERVER' ),
-	'servername'              => array( '0', 'دپالنګر_نوم', 'SERVERNAME' ),
-	'grammar'                 => array( '0', 'ګرامر:', 'GRAMMAR:' ),
-	'currentweek'             => array( '1', 'روانه_اوونۍ', 'CURRENTWEEK' ),
-	'currentdow'              => array( '1', 'داوونۍورځ', 'CURRENTDOW' ),
-	'localweek'               => array( '1', 'سيمه_يزه_اوونۍ', 'LOCALWEEK' ),
-	'plural'                  => array( '0', 'جمع:', 'PLURAL:' ),
-	'language'                => array( '0', '#ژبه:', '#LANGUAGE:' ),
-	'special'                 => array( '0', 'ځانګړی', 'special' ),
-	'hiddencat'               => array( '1', '__پټه_وېشنيزه__', '__HIDDENCAT__' ),
-	'pagesize'                => array( '1', 'مخکچه', 'PAGESIZE' ),
-	'index'                   => array( '1', '__ليکلړ__', '__INDEX__' ),
-	'noindex'                 => array( '1', '__بې_ليکلړ__', '__NOINDEX__' ),
-	'protectionlevel'         => array( '1', 'ژغورکچه', 'PROTECTIONLEVEL' ),
+	'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' ),
+	'currentmonthname'          => array( '1', 'دروانې_مياشت_نوم', 'CURRENTMONTHNAME' ),
+	'currentmonthabbrev'        => array( '1', 'دروانې_مياشت_لنډون', 'CURRENTMONTHABBREV' ),
+	'currentday'                => array( '1', 'نن', 'CURRENTDAY' ),
+	'currentday2'               => array( '1', 'نن۲', 'CURRENTDAY2' ),
+	'currentdayname'            => array( '1', 'دننۍورځې_نوم', 'CURRENTDAYNAME' ),
+	'currentyear'               => array( '1', 'سږکال', 'CURRENTYEAR' ),
+	'currenttime'               => array( '1', 'داوخت', 'CURRENTTIME' ),
+	'currenthour'               => array( '1', 'دم_ګړۍ', 'CURRENTHOUR' ),
+	'localmonth'                => array( '1', 'سيمه_يزه_مياشت', 'LOCALMONTH', 'LOCALMONTH2' ),
+	'localmonthname'            => array( '1', 'دسيمه_يزې_مياشت_نوم', 'LOCALMONTHNAME' ),
+	'localmonthabbrev'          => array( '1', 'دسيمه_يزې_مياشت_لنډون', 'LOCALMONTHABBREV' ),
+	'localday'                  => array( '1', 'سيمه_يزه_ورځ', 'LOCALDAY' ),
+	'localday2'                 => array( '1', 'سيمه_يزه_ورځ۲', 'LOCALDAY2' ),
+	'localdayname'              => array( '1', 'دسيمه_يزې_ورځ_نوم', 'LOCALDAYNAME' ),
+	'localyear'                 => array( '1', 'سيمه_يزکال', 'LOCALYEAR' ),
+	'localtime'                 => array( '1', 'سيمه_يزوخت', 'LOCALTIME' ),
+	'localhour'                 => array( '1', 'سيمه_يزه_ګړۍ', 'LOCALHOUR' ),
+	'numberofpages'             => array( '1', 'دمخونوشمېر', 'NUMBEROFPAGES' ),
+	'numberofarticles'          => array( '1', 'دليکنوشمېر', 'NUMBEROFARTICLES' ),
+	'numberoffiles'             => array( '1', 'ددوتنوشمېر', 'NUMBEROFFILES' ),
+	'numberofusers'             => array( '1', 'دکارونکوشمېر', 'NUMBEROFUSERS' ),
+	'pagename'                  => array( '1', 'دمخ_نوم', 'PAGENAME' ),
+	'pagenamee'                 => array( '1', 'دمخ_نښه', 'PAGENAMEE' ),
+	'namespace'                 => array( '1', 'نوم_تشيال', 'NAMESPACE' ),
+	'namespacee'                => array( '1', 'د_نوم_تشيال_نښه', 'NAMESPACEE' ),
+	'talkspace'                 => array( '1', 'دخبرواترو_تشيال', 'TALKSPACE' ),
+	'talkspacee'                => array( '1', 'دخبرواترو_تشيال_نښه', 'TALKSPACEE' ),
+	'subjectspace'              => array( '1', 'دسکالوتشيال', 'دليکنې_تشيال', 'SUBJECTSPACE', 'ARTICLESPACE' ),
+	'subjectspacee'             => array( '1', 'دسکالوتشيال_نښه', 'دليکنې_تشيال_نښه', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
+	'fullpagename'              => array( '1', 'دمخ_بشپړنوم', 'FULLPAGENAME' ),
+	'fullpagenamee'             => array( '1', 'دمخ_بشپړنوم_نښه', 'FULLPAGENAMEE' ),
+	'msg'                       => array( '0', 'پیغام:', 'پ:', 'MSG:' ),
+	'img_thumbnail'             => array( '1', 'بټنوک', 'thumbnail', 'thumb' ),
+	'img_right'                 => array( '1', 'ښي', 'right' ),
+	'img_left'                  => array( '1', 'کيڼ', 'left' ),
+	'img_none'                  => array( '1', 'هېڅ', 'none' ),
+	'img_center'                => array( '1', 'مېنځ،_center', 'center', 'centre' ),
+	'sitename'                  => array( '1', 'دوېبځي_نوم', 'SITENAME' ),
+	'server'                    => array( '0', 'پالنګر', 'SERVER' ),
+	'servername'                => array( '0', 'دپالنګر_نوم', 'SERVERNAME' ),
+	'grammar'                   => array( '0', 'ګرامر:', 'GRAMMAR:' ),
+	'currentweek'               => array( '1', 'روانه_اوونۍ', 'CURRENTWEEK' ),
+	'currentdow'                => array( '1', 'داوونۍورځ', 'CURRENTDOW' ),
+	'localweek'                 => array( '1', 'سيمه_يزه_اوونۍ', 'LOCALWEEK' ),
+	'plural'                    => array( '0', 'جمع:', 'PLURAL:' ),
+	'language'                  => array( '0', '#ژبه:', '#LANGUAGE:' ),
+	'special'                   => array( '0', 'ځانګړی', 'special' ),
+	'hiddencat'                 => array( '1', '__پټه_وېشنيزه__', '__HIDDENCAT__' ),
+	'pagesize'                  => array( '1', 'مخکچه', 'PAGESIZE' ),
+	'index'                     => array( '1', '__ليکلړ__', '__INDEX__' ),
+	'noindex'                   => array( '1', '__بې_ليکلړ__', '__NOINDEX__' ),
+	'protectionlevel'           => array( '1', 'ژغورکچه', 'PROTECTIONLEVEL' ),
 );
 
 $rtl = true;
diff --git a/languages/messages/MessagesPt.php b/languages/messages/MessagesPt.php
index 4f6d8e1b8e..fbd3612c84 100644
--- a/languages/messages/MessagesPt.php
+++ b/languages/messages/MessagesPt.php
@@ -195,117 +195,117 @@ $specialPageAliases = array(
 );
 
 $magicWords = array(
-	'redirect'                => array( '0', '#REDIRECIONAMENTO', '#REDIRECT' ),
-	'notoc'                   => array( '0', '__SEMTDC__', '__SEMSUMÁRIO__', '__NOTOC__' ),
-	'nogallery'               => array( '0', '__SEMGALERIA__', '__NOGALLERY__' ),
-	'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' ),
-	'currentmonthabbrev'      => array( '1', 'MESATUALABREV', 'MESATUALABREVIADO', 'ABREVIATURADOMESATUAL', 'CURRENTMONTHABBREV' ),
-	'currentday'              => array( '1', 'DIAATUAL', 'CURRENTDAY' ),
-	'currentday2'             => array( '1', 'DIAATUAL2', 'CURRENTDAY2' ),
-	'currentdayname'          => array( '1', 'NOMEDODIAATUAL', 'CURRENTDAYNAME' ),
-	'currentyear'             => array( '1', 'ANOATUAL', 'CURRENTYEAR' ),
-	'currenttime'             => array( '1', 'HORARIOATUAL', 'CURRENTTIME' ),
-	'currenthour'             => array( '1', 'HORAATUAL', 'CURRENTHOUR' ),
-	'localmonth'              => array( '1', 'MESLOCAL', 'LOCALMONTH', 'LOCALMONTH2' ),
-	'localmonth1'             => array( '1', 'MESLOCAL1', 'LOCALMONTH1' ),
-	'localmonthname'          => array( '1', 'NOMEDOMESLOCAL', 'LOCALMONTHNAME' ),
-	'localmonthabbrev'        => array( '1', 'MESLOCALABREV', 'MESLOCALABREVIADO', 'ABREVIATURADOMESLOCAL', 'LOCALMONTHABBREV' ),
-	'localday'                => array( '1', 'DIALOCAL', 'LOCALDAY' ),
-	'localday2'               => array( '1', 'DIALOCAL2', 'LOCALDAY2' ),
-	'localdayname'            => array( '1', 'NOMEDODIALOCAL', 'LOCALDAYNAME' ),
-	'localyear'               => array( '1', 'ANOLOCAL', 'LOCALYEAR' ),
-	'localtime'               => array( '1', 'HORARIOLOCAL', 'LOCALTIME' ),
-	'localhour'               => array( '1', 'HORALOCAL', 'LOCALHOUR' ),
-	'numberofpages'           => array( '1', 'NUMERODEPAGINAS', 'NÚMERODEPÁGINAS', 'NUMBEROFPAGES' ),
-	'numberofarticles'        => array( '1', 'NUMERODEARTIGOS', 'NÚMERODEARTIGOS', 'NUMBEROFARTICLES' ),
-	'numberoffiles'           => array( '1', 'NUMERODEARQUIVOS', 'NÚMERODEARQUIVOS', 'NUMBEROFFILES' ),
-	'numberofusers'           => array( '1', 'NUMERODEUSUARIOS', 'NÚMERODEUSUÁRIOS', 'NUMBEROFUSERS' ),
-	'numberofactiveusers'     => array( '1', 'NUMERODEUSUARIOSATIVOS', 'NÚMERODEUSUÁRIOSATIVOS', 'NUMBEROFACTIVEUSERS' ),
-	'numberofedits'           => array( '1', 'NUMERODEEDICOES', 'NÚMERODEEDIÇÕES', 'NUMBEROFEDITS' ),
-	'numberofviews'           => array( '1', 'NUMERODEEXIBICOES', 'NÚMERODEEXIBIÇÕES', 'NUMBEROFVIEWS' ),
-	'pagename'                => array( '1', 'NOMEDAPAGINA', 'NOMEDAPÁGINA', 'PAGENAME' ),
-	'pagenamee'               => array( '1', 'NOMEDAPAGINAC', 'NOMEDAPÁGINAC', 'PAGENAMEE' ),
-	'namespace'               => array( '1', 'DOMINIO', 'DOMÍNIO', 'ESPACONOMINAL', 'ESPAÇONOMINAL', 'NAMESPACE' ),
-	'namespacee'              => array( '1', 'DOMINIOC', 'DOMÍNIOC', 'ESPACONOMINALC', 'ESPAÇONOMINALC', 'NAMESPACEE' ),
-	'talkspace'               => array( '1', 'PAGINADEDISCUSSAO', 'PÁGINADEDISCUSSÃO', 'TALKSPACE' ),
-	'talkspacee'              => array( '1', 'PAGINADEDISCUSSAOC', 'PÁGINADEDISCUSSÃOC', 'TALKSPACEE' ),
-	'subjectspace'            => array( '1', 'PAGINADECONTEUDO', 'PAGINADECONTEÚDO', 'SUBJECTSPACE', 'ARTICLESPACE' ),
-	'subjectspacee'           => array( '1', 'PAGINADECONTEUDOC', 'PAGINADECONTEÚDOC', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
-	'fullpagename'            => array( '1', 'NOMECOMPLETODAPAGINA', 'NOMECOMPLETODAPÁGINA', 'FULLPAGENAME' ),
-	'fullpagenamee'           => array( '1', 'NOMECOMPLETODAPAGINAC', 'NOMECOMPLETODAPÁGINAC', 'FULLPAGENAMEE' ),
-	'subpagename'             => array( '1', 'NOMEDASUBPAGINA', 'NOMEDASUBPÁGINA', 'SUBPAGENAME' ),
-	'subpagenamee'            => array( '1', 'NOMEDASUBPAGINAC', 'NOMEDASUBPÁGINAC', 'SUBPAGENAMEE' ),
-	'basepagename'            => array( '1', 'NOMEDAPAGINABASE', 'NOMEDAPÁGINABASE', 'BASEPAGENAME' ),
-	'basepagenamee'           => array( '1', 'NOMEDAPAGINABASEC', 'NOMEDAPÁGINABASEC', 'BASEPAGENAMEE' ),
-	'talkpagename'            => array( '1', 'NOMEDAPAGINADEDISCUSSAO', 'NOMEDAPÁGINADEDISCUSSÃO', 'TALKPAGENAME' ),
-	'talkpagenamee'           => array( '1', 'NOMEDAPAGINADEDISCUSSAOC', 'NOMEDAPÁGINADEDISCUSSÃOC', 'TALKPAGENAMEE' ),
-	'subjectpagename'         => array( '1', 'NOMEDAPAGINADECONTEUDO', 'NOMEDAPÁGINADECONTEÚDO', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
-	'subjectpagenamee'        => array( '1', 'NOMEDAPAGINADECONTEUDOC', 'NOMEDAPÁGINADECONTEÚDOC', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
-	'img_thumbnail'           => array( '1', 'miniaturadaimagem', 'miniatura', 'thumbnail', 'thumb' ),
-	'img_manualthumb'         => array( '1', 'miniaturadaimagem=$1', 'miniatura=$1', 'thumbnail=$1', 'thumb=$1' ),
-	'img_right'               => array( '1', 'direita', 'right' ),
-	'img_left'                => array( '1', 'esquerda', 'left' ),
-	'img_none'                => array( '1', 'nenhum', 'none' ),
-	'img_center'              => array( '1', 'centro', 'center', 'centre' ),
-	'img_framed'              => array( '1', 'commoldura', 'comborda', 'framed', 'enframed', 'frame' ),
-	'img_frameless'           => array( '1', 'semmoldura', 'semborda', 'frameless' ),
-	'img_page'                => array( '1', 'página=$1', 'página $1', 'page=$1', 'page $1' ),
-	'img_upright'             => array( '1', 'superiordireito', 'superiordireito=$1', 'superiordireito $1', 'upright', 'upright=$1', 'upright $1' ),
-	'img_border'              => array( '1', 'borda', 'border' ),
-	'img_baseline'            => array( '1', 'linhadebase', 'baseline' ),
-	'img_top'                 => array( '1', 'acima', 'top' ),
-	'img_middle'              => array( '1', 'meio', 'middle' ),
-	'img_bottom'              => array( '1', 'abaixo', 'bottom' ),
-	'img_link'                => array( '1', 'ligação=$1', 'link=$1' ),
-	'sitename'                => array( '1', 'NOMEDOSITE', 'NOMEDOSÍTIO', 'NOMEDOSITIO', 'SITENAME' ),
-	'server'                  => array( '0', 'SERVIDOR', 'SERVER' ),
-	'servername'              => array( '0', 'NOMEDOSERVIDOR', 'SERVERNAME' ),
-	'scriptpath'              => array( '0', 'CAMINHODOSCRIPT', 'SCRIPTPATH' ),
-	'gender'                  => array( '0', 'GENERO', 'GÊNERO', 'GENDER:' ),
-	'notitleconvert'          => array( '0', '__SEMCONVERTERTITULO__', '__SEMCONVERTERTÍTULO__', '__SEMCT__', '__NOTITLECONVERT__', '__NOTC__' ),
-	'nocontentconvert'        => array( '0', '__SEMCONVERTERCONTEUDO__', '__SEMCONVERTERCONTEÚDO__', '__SEMCC__', '__NOCONTENTCONVERT__', '__NOCC__' ),
-	'currentweek'             => array( '1', 'SEMANAATUAL', 'CURRENTWEEK' ),
-	'currentdow'              => array( '1', 'DIADASEMANAATUAL', 'CURRENTDOW' ),
-	'localweek'               => array( '1', 'SEMANALOCAL', 'LOCALWEEK' ),
-	'localdow'                => array( '1', 'DIADASEMANALOCAL', 'LOCALDOW' ),
-	'revisionid'              => array( '1', 'IDDAREVISAO', 'IDDAREVISÃO', 'REVISIONID' ),
-	'revisionday'             => array( '1', 'DIADAREVISAO', 'DIADAREVISÃO', 'REVISIONDAY' ),
-	'revisionday2'            => array( '1', 'DIADAREVISAO2', 'DIADAREVISÃO2', 'REVISIONDAY2' ),
-	'revisionmonth'           => array( '1', 'MESDAREVISAO', 'MÊSDAREVISÃO', 'REVISIONMONTH' ),
-	'revisionyear'            => array( '1', 'ANODAREVISAO', 'ANODAREVISÃO', 'REVISIONYEAR' ),
-	'revisionuser'            => array( '1', 'USUARIODAREVISAO', 'USUÁRIODAREVISÃO', 'REVISIONUSER' ),
-	'fullurl'                 => array( '0', 'URLCOMPLETO:', 'FULLURL:' ),
-	'fullurle'                => array( '0', 'URLCOMPLETOC:', 'FULLURLE:' ),
-	'lcfirst'                 => array( '0', 'PRIMEIRAMINUSCULA:', 'PRIMEIRAMINÚSCULA:', 'LCFIRST:' ),
-	'ucfirst'                 => array( '0', 'PRIMEIRAMAIUSCULA:', 'PRIMEIRAMAIÚSCULA:', 'UCFIRST:' ),
-	'lc'                      => array( '0', 'MINUSCULA', 'MINÚSCULA', 'MINUSCULAS', 'MINÚSCULAS', 'LC:' ),
-	'uc'                      => array( '0', 'MAIUSCULA', 'MAIÚSCULA', 'MAIUSCULAS', 'MAIÚSCULAS', 'UC:' ),
-	'displaytitle'            => array( '1', 'EXIBETITULO', 'EXIBETÍTULO', 'DISPLAYTITLE' ),
-	'newsectionlink'          => array( '1', '__LINKDENOVASECAO__', '__LINKDENOVASEÇÃO__', '__LIGACAODENOVASECAO__', '__LIGAÇÃODENOVASEÇÃO__', '__NEWSECTIONLINK__' ),
-	'nonewsectionlink'        => array( '1', '__SEMLINKDENOVASECAO__', '__SEMLINKDENOVASEÇÃO__', '__SEMLIGACAODENOVASECAO__', '__SEMLIGAÇÃODENOVASEÇÃO__', '__NONEWSECTIONLINK__' ),
-	'currentversion'          => array( '1', 'REVISAOATUAL', 'REVISÃOATUAL', 'CURRENTVERSION' ),
-	'urlencode'               => array( '0', 'CODIFICAURL:', 'URLENCODE:' ),
-	'anchorencode'            => array( '0', 'CODIFICAANCORA:', 'CODIFICAÂNCORA:', 'ANCHORENCODE' ),
-	'language'                => array( '0', '#IDIOMA:', '#LANGUAGE:' ),
-	'contentlanguage'         => array( '1', 'IDIOMADOCONTEUDO', 'IDIOMADOCONTEÚDO', 'CONTENTLANGUAGE', 'CONTENTLANG' ),
-	'pagesinnamespace'        => array( '1', 'PAGINASNOESPACONOMINAL', 'PÁGINASNOESPAÇONOMINAL', 'PAGINASNODOMINIO', 'PÁGINASNODOMÍNIO', 'PAGESINNAMESPACE:', 'PAGESINNS:' ),
-	'numberofadmins'          => array( '1', 'NUMERODEADMINISTRADORES', 'NÚMERODEADMINISTRADORES', 'NUMBEROFADMINS' ),
-	'defaultsort'             => array( '1', 'ORDENACAOPADRAO', 'ORDENAÇÃOPADRÃO', 'ORDEMPADRAO', 'ORDEMPADRÃO', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:' ),
-	'filepath'                => array( '0', 'CAMINHODOARQUIVO', 'FILEPATH:' ),
-	'hiddencat'               => array( '1', '__CATEGORIAOCULTA__', '__CATOCULTA__', '__HIDDENCAT__' ),
-	'pagesincategory'         => array( '1', 'PAGINASNACATEGORIA', 'PÁGINASNACATEGORIA', 'PAGINASNACAT', 'PÁGINASNACAT', 'PAGESINCATEGORY', 'PAGESINCAT' ),
-	'pagesize'                => array( '1', 'TAMANHODAPAGINA', 'TAMANHODAPÁGINA', 'PAGESIZE' ),
-	'index'                   => array( '1', '__INDEXAR__', '__INDEX__' ),
-	'noindex'                 => array( '1', '__NAOINDEXAR__', '__NÃOINDEXAR__', '__NOINDEX__' ),
-	'numberingroup'           => array( '1', 'NUMERONOGRUPO', 'NÚMERONOGRUPO', 'NUMBERINGROUP', 'NUMINGROUP' ),
-	'staticredirect'          => array( '1', '__REDIRECIONAMENTOESTATICO__', '__REDIRECIONAMENTOESTÁTICO__', '__STATICREDIRECT__' ),
-	'protectionlevel'         => array( '1', 'NIVELDEPROTECAO', 'NÍVELDEPROTEÇÃO', 'PROTECTIONLEVEL' ),
+	'redirect'                  => array( '0', '#REDIRECIONAMENTO', '#REDIRECT' ),
+	'notoc'                     => array( '0', '__SEMTDC__', '__SEMSUMÁRIO__', '__NOTOC__' ),
+	'nogallery'                 => array( '0', '__SEMGALERIA__', '__NOGALLERY__' ),
+	'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' ),
+	'currentmonthabbrev'        => array( '1', 'MESATUALABREV', 'MESATUALABREVIADO', 'ABREVIATURADOMESATUAL', 'CURRENTMONTHABBREV' ),
+	'currentday'                => array( '1', 'DIAATUAL', 'CURRENTDAY' ),
+	'currentday2'               => array( '1', 'DIAATUAL2', 'CURRENTDAY2' ),
+	'currentdayname'            => array( '1', 'NOMEDODIAATUAL', 'CURRENTDAYNAME' ),
+	'currentyear'               => array( '1', 'ANOATUAL', 'CURRENTYEAR' ),
+	'currenttime'               => array( '1', 'HORARIOATUAL', 'CURRENTTIME' ),
+	'currenthour'               => array( '1', 'HORAATUAL', 'CURRENTHOUR' ),
+	'localmonth'                => array( '1', 'MESLOCAL', 'LOCALMONTH', 'LOCALMONTH2' ),
+	'localmonth1'               => array( '1', 'MESLOCAL1', 'LOCALMONTH1' ),
+	'localmonthname'            => array( '1', 'NOMEDOMESLOCAL', 'LOCALMONTHNAME' ),
+	'localmonthabbrev'          => array( '1', 'MESLOCALABREV', 'MESLOCALABREVIADO', 'ABREVIATURADOMESLOCAL', 'LOCALMONTHABBREV' ),
+	'localday'                  => array( '1', 'DIALOCAL', 'LOCALDAY' ),
+	'localday2'                 => array( '1', 'DIALOCAL2', 'LOCALDAY2' ),
+	'localdayname'              => array( '1', 'NOMEDODIALOCAL', 'LOCALDAYNAME' ),
+	'localyear'                 => array( '1', 'ANOLOCAL', 'LOCALYEAR' ),
+	'localtime'                 => array( '1', 'HORARIOLOCAL', 'LOCALTIME' ),
+	'localhour'                 => array( '1', 'HORALOCAL', 'LOCALHOUR' ),
+	'numberofpages'             => array( '1', 'NUMERODEPAGINAS', 'NÚMERODEPÁGINAS', 'NUMBEROFPAGES' ),
+	'numberofarticles'          => array( '1', 'NUMERODEARTIGOS', 'NÚMERODEARTIGOS', 'NUMBEROFARTICLES' ),
+	'numberoffiles'             => array( '1', 'NUMERODEARQUIVOS', 'NÚMERODEARQUIVOS', 'NUMBEROFFILES' ),
+	'numberofusers'             => array( '1', 'NUMERODEUSUARIOS', 'NÚMERODEUSUÁRIOS', 'NUMBEROFUSERS' ),
+	'numberofactiveusers'       => array( '1', 'NUMERODEUSUARIOSATIVOS', 'NÚMERODEUSUÁRIOSATIVOS', 'NUMBEROFACTIVEUSERS' ),
+	'numberofedits'             => array( '1', 'NUMERODEEDICOES', 'NÚMERODEEDIÇÕES', 'NUMBEROFEDITS' ),
+	'numberofviews'             => array( '1', 'NUMERODEEXIBICOES', 'NÚMERODEEXIBIÇÕES', 'NUMBEROFVIEWS' ),
+	'pagename'                  => array( '1', 'NOMEDAPAGINA', 'NOMEDAPÁGINA', 'PAGENAME' ),
+	'pagenamee'                 => array( '1', 'NOMEDAPAGINAC', 'NOMEDAPÁGINAC', 'PAGENAMEE' ),
+	'namespace'                 => array( '1', 'DOMINIO', 'DOMÍNIO', 'ESPACONOMINAL', 'ESPAÇONOMINAL', 'NAMESPACE' ),
+	'namespacee'                => array( '1', 'DOMINIOC', 'DOMÍNIOC', 'ESPACONOMINALC', 'ESPAÇONOMINALC', 'NAMESPACEE' ),
+	'talkspace'                 => array( '1', 'PAGINADEDISCUSSAO', 'PÁGINADEDISCUSSÃO', 'TALKSPACE' ),
+	'talkspacee'                => array( '1', 'PAGINADEDISCUSSAOC', 'PÁGINADEDISCUSSÃOC', 'TALKSPACEE' ),
+	'subjectspace'              => array( '1', 'PAGINADECONTEUDO', 'PAGINADECONTEÚDO', 'SUBJECTSPACE', 'ARTICLESPACE' ),
+	'subjectspacee'             => array( '1', 'PAGINADECONTEUDOC', 'PAGINADECONTEÚDOC', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
+	'fullpagename'              => array( '1', 'NOMECOMPLETODAPAGINA', 'NOMECOMPLETODAPÁGINA', 'FULLPAGENAME' ),
+	'fullpagenamee'             => array( '1', 'NOMECOMPLETODAPAGINAC', 'NOMECOMPLETODAPÁGINAC', 'FULLPAGENAMEE' ),
+	'subpagename'               => array( '1', 'NOMEDASUBPAGINA', 'NOMEDASUBPÁGINA', 'SUBPAGENAME' ),
+	'subpagenamee'              => array( '1', 'NOMEDASUBPAGINAC', 'NOMEDASUBPÁGINAC', 'SUBPAGENAMEE' ),
+	'basepagename'              => array( '1', 'NOMEDAPAGINABASE', 'NOMEDAPÁGINABASE', 'BASEPAGENAME' ),
+	'basepagenamee'             => array( '1', 'NOMEDAPAGINABASEC', 'NOMEDAPÁGINABASEC', 'BASEPAGENAMEE' ),
+	'talkpagename'              => array( '1', 'NOMEDAPAGINADEDISCUSSAO', 'NOMEDAPÁGINADEDISCUSSÃO', 'TALKPAGENAME' ),
+	'talkpagenamee'             => array( '1', 'NOMEDAPAGINADEDISCUSSAOC', 'NOMEDAPÁGINADEDISCUSSÃOC', 'TALKPAGENAMEE' ),
+	'subjectpagename'           => array( '1', 'NOMEDAPAGINADECONTEUDO', 'NOMEDAPÁGINADECONTEÚDO', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
+	'subjectpagenamee'          => array( '1', 'NOMEDAPAGINADECONTEUDOC', 'NOMEDAPÁGINADECONTEÚDOC', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
+	'img_thumbnail'             => array( '1', 'miniaturadaimagem', 'miniatura', 'thumbnail', 'thumb' ),
+	'img_manualthumb'           => array( '1', 'miniaturadaimagem=$1', 'miniatura=$1', 'thumbnail=$1', 'thumb=$1' ),
+	'img_right'                 => array( '1', 'direita', 'right' ),
+	'img_left'                  => array( '1', 'esquerda', 'left' ),
+	'img_none'                  => array( '1', 'nenhum', 'none' ),
+	'img_center'                => array( '1', 'centro', 'center', 'centre' ),
+	'img_framed'                => array( '1', 'commoldura', 'comborda', 'framed', 'enframed', 'frame' ),
+	'img_frameless'             => array( '1', 'semmoldura', 'semborda', 'frameless' ),
+	'img_page'                  => array( '1', 'página=$1', 'página $1', 'page=$1', 'page $1' ),
+	'img_upright'               => array( '1', 'superiordireito', 'superiordireito=$1', 'superiordireito $1', 'upright', 'upright=$1', 'upright $1' ),
+	'img_border'                => array( '1', 'borda', 'border' ),
+	'img_baseline'              => array( '1', 'linhadebase', 'baseline' ),
+	'img_top'                   => array( '1', 'acima', 'top' ),
+	'img_middle'                => array( '1', 'meio', 'middle' ),
+	'img_bottom'                => array( '1', 'abaixo', 'bottom' ),
+	'img_link'                  => array( '1', 'ligação=$1', 'link=$1' ),
+	'sitename'                  => array( '1', 'NOMEDOSITE', 'NOMEDOSÍTIO', 'NOMEDOSITIO', 'SITENAME' ),
+	'server'                    => array( '0', 'SERVIDOR', 'SERVER' ),
+	'servername'                => array( '0', 'NOMEDOSERVIDOR', 'SERVERNAME' ),
+	'scriptpath'                => array( '0', 'CAMINHODOSCRIPT', 'SCRIPTPATH' ),
+	'gender'                    => array( '0', 'GENERO', 'GÊNERO', 'GENDER:' ),
+	'notitleconvert'            => array( '0', '__SEMCONVERTERTITULO__', '__SEMCONVERTERTÍTULO__', '__SEMCT__', '__NOTITLECONVERT__', '__NOTC__' ),
+	'nocontentconvert'          => array( '0', '__SEMCONVERTERCONTEUDO__', '__SEMCONVERTERCONTEÚDO__', '__SEMCC__', '__NOCONTENTCONVERT__', '__NOCC__' ),
+	'currentweek'               => array( '1', 'SEMANAATUAL', 'CURRENTWEEK' ),
+	'currentdow'                => array( '1', 'DIADASEMANAATUAL', 'CURRENTDOW' ),
+	'localweek'                 => array( '1', 'SEMANALOCAL', 'LOCALWEEK' ),
+	'localdow'                  => array( '1', 'DIADASEMANALOCAL', 'LOCALDOW' ),
+	'revisionid'                => array( '1', 'IDDAREVISAO', 'IDDAREVISÃO', 'REVISIONID' ),
+	'revisionday'               => array( '1', 'DIADAREVISAO', 'DIADAREVISÃO', 'REVISIONDAY' ),
+	'revisionday2'              => array( '1', 'DIADAREVISAO2', 'DIADAREVISÃO2', 'REVISIONDAY2' ),
+	'revisionmonth'             => array( '1', 'MESDAREVISAO', 'MÊSDAREVISÃO', 'REVISIONMONTH' ),
+	'revisionyear'              => array( '1', 'ANODAREVISAO', 'ANODAREVISÃO', 'REVISIONYEAR' ),
+	'revisionuser'              => array( '1', 'USUARIODAREVISAO', 'USUÁRIODAREVISÃO', 'REVISIONUSER' ),
+	'fullurl'                   => array( '0', 'URLCOMPLETO:', 'FULLURL:' ),
+	'fullurle'                  => array( '0', 'URLCOMPLETOC:', 'FULLURLE:' ),
+	'lcfirst'                   => array( '0', 'PRIMEIRAMINUSCULA:', 'PRIMEIRAMINÚSCULA:', 'LCFIRST:' ),
+	'ucfirst'                   => array( '0', 'PRIMEIRAMAIUSCULA:', 'PRIMEIRAMAIÚSCULA:', 'UCFIRST:' ),
+	'lc'                        => array( '0', 'MINUSCULA', 'MINÚSCULA', 'MINUSCULAS', 'MINÚSCULAS', 'LC:' ),
+	'uc'                        => array( '0', 'MAIUSCULA', 'MAIÚSCULA', 'MAIUSCULAS', 'MAIÚSCULAS', 'UC:' ),
+	'displaytitle'              => array( '1', 'EXIBETITULO', 'EXIBETÍTULO', 'DISPLAYTITLE' ),
+	'newsectionlink'            => array( '1', '__LINKDENOVASECAO__', '__LINKDENOVASEÇÃO__', '__LIGACAODENOVASECAO__', '__LIGAÇÃODENOVASEÇÃO__', '__NEWSECTIONLINK__' ),
+	'nonewsectionlink'          => array( '1', '__SEMLINKDENOVASECAO__', '__SEMLINKDENOVASEÇÃO__', '__SEMLIGACAODENOVASECAO__', '__SEMLIGAÇÃODENOVASEÇÃO__', '__NONEWSECTIONLINK__' ),
+	'currentversion'            => array( '1', 'REVISAOATUAL', 'REVISÃOATUAL', 'CURRENTVERSION' ),
+	'urlencode'                 => array( '0', 'CODIFICAURL:', 'URLENCODE:' ),
+	'anchorencode'              => array( '0', 'CODIFICAANCORA:', 'CODIFICAÂNCORA:', 'ANCHORENCODE' ),
+	'language'                  => array( '0', '#IDIOMA:', '#LANGUAGE:' ),
+	'contentlanguage'           => array( '1', 'IDIOMADOCONTEUDO', 'IDIOMADOCONTEÚDO', 'CONTENTLANGUAGE', 'CONTENTLANG' ),
+	'pagesinnamespace'          => array( '1', 'PAGINASNOESPACONOMINAL', 'PÁGINASNOESPAÇONOMINAL', 'PAGINASNODOMINIO', 'PÁGINASNODOMÍNIO', 'PAGESINNAMESPACE:', 'PAGESINNS:' ),
+	'numberofadmins'            => array( '1', 'NUMERODEADMINISTRADORES', 'NÚMERODEADMINISTRADORES', 'NUMBEROFADMINS' ),
+	'defaultsort'               => array( '1', 'ORDENACAOPADRAO', 'ORDENAÇÃOPADRÃO', 'ORDEMPADRAO', 'ORDEMPADRÃO', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:' ),
+	'filepath'                  => array( '0', 'CAMINHODOARQUIVO', 'FILEPATH:' ),
+	'hiddencat'                 => array( '1', '__CATEGORIAOCULTA__', '__CATOCULTA__', '__HIDDENCAT__' ),
+	'pagesincategory'           => array( '1', 'PAGINASNACATEGORIA', 'PÁGINASNACATEGORIA', 'PAGINASNACAT', 'PÁGINASNACAT', 'PAGESINCATEGORY', 'PAGESINCAT' ),
+	'pagesize'                  => array( '1', 'TAMANHODAPAGINA', 'TAMANHODAPÁGINA', 'PAGESIZE' ),
+	'index'                     => array( '1', '__INDEXAR__', '__INDEX__' ),
+	'noindex'                   => array( '1', '__NAOINDEXAR__', '__NÃOINDEXAR__', '__NOINDEX__' ),
+	'numberingroup'             => array( '1', 'NUMERONOGRUPO', 'NÚMERONOGRUPO', 'NUMBERINGROUP', 'NUMINGROUP' ),
+	'staticredirect'            => array( '1', '__REDIRECIONAMENTOESTATICO__', '__REDIRECIONAMENTOESTÁTICO__', '__STATICREDIRECT__' ),
+	'protectionlevel'           => array( '1', 'NIVELDEPROTECAO', 'NÍVELDEPROTEÇÃO', 'PROTECTIONLEVEL' ),
 );
 
 $messages = array(
diff --git a/languages/messages/MessagesPt_br.php b/languages/messages/MessagesPt_br.php
index bd758a926a..6d17f6cf65 100644
--- a/languages/messages/MessagesPt_br.php
+++ b/languages/messages/MessagesPt_br.php
@@ -198,118 +198,118 @@ $specialPageAliases = array(
 );
 
 $magicWords = array(
-	'redirect'                => array( '0', '#REDIRECIONAMENTO', '#REDIRECT' ),
-	'notoc'                   => array( '0', '__SEMTDC__', '__SEMSUMÁRIO__', '__NOTOC__' ),
-	'nogallery'               => array( '0', '__SEMGALERIA__', '__NOGALLERY__' ),
-	'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' ),
-	'currentmonthabbrev'      => array( '1', 'MESATUALABREV', 'MESATUALABREVIADO', 'ABREVIATURADOMESATUAL', 'CURRENTMONTHABBREV' ),
-	'currentday'              => array( '1', 'DIAATUAL', 'CURRENTDAY' ),
-	'currentday2'             => array( '1', 'DIAATUAL2', 'CURRENTDAY2' ),
-	'currentdayname'          => array( '1', 'NOMEDODIAATUAL', 'CURRENTDAYNAME' ),
-	'currentyear'             => array( '1', 'ANOATUAL', 'CURRENTYEAR' ),
-	'currenttime'             => array( '1', 'HORARIOATUAL', 'CURRENTTIME' ),
-	'currenthour'             => array( '1', 'HORAATUAL', 'CURRENTHOUR' ),
-	'localmonth'              => array( '1', 'MESLOCAL', 'LOCALMONTH', 'LOCALMONTH2' ),
-	'localmonth1'             => array( '1', 'MESLOCAL1', 'LOCALMONTH1' ),
-	'localmonthname'          => array( '1', 'NOMEDOMESLOCAL', 'LOCALMONTHNAME' ),
-	'localmonthabbrev'        => array( '1', 'MESLOCALABREV', 'MESLOCALABREVIADO', 'ABREVIATURADOMESLOCAL', 'LOCALMONTHABBREV' ),
-	'localday'                => array( '1', 'DIALOCAL', 'LOCALDAY' ),
-	'localday2'               => array( '1', 'DIALOCAL2', 'LOCALDAY2' ),
-	'localdayname'            => array( '1', 'NOMEDODIALOCAL', 'LOCALDAYNAME' ),
-	'localyear'               => array( '1', 'ANOLOCAL', 'LOCALYEAR' ),
-	'localtime'               => array( '1', 'HORARIOLOCAL', 'LOCALTIME' ),
-	'localhour'               => array( '1', 'HORALOCAL', 'LOCALHOUR' ),
-	'numberofpages'           => array( '1', 'NUMERODEPAGINAS', 'NÚMERODEPÁGINAS', 'NUMBEROFPAGES' ),
-	'numberofarticles'        => array( '1', 'NUMERODEARTIGOS', 'NÚMERODEARTIGOS', 'NUMBEROFARTICLES' ),
-	'numberoffiles'           => array( '1', 'NUMERODEARQUIVOS', 'NÚMERODEARQUIVOS', 'NUMBEROFFILES' ),
-	'numberofusers'           => array( '1', 'NUMERODEUSUARIOS', 'NÚMERODEUSUÁRIOS', 'NUMBEROFUSERS' ),
-	'numberofactiveusers'     => array( '1', 'NUMERODEUSUARIOSATIVOS', 'NÚMERODEUSUÁRIOSATIVOS', 'NUMBEROFACTIVEUSERS' ),
-	'numberofedits'           => array( '1', 'NUMERODEEDICOES', 'NÚMERODEEDIÇÕES', 'NUMBEROFEDITS' ),
-	'numberofviews'           => array( '1', 'NUMERODEEXIBICOES', 'NÚMERODEEXIBIÇÕES', 'NUMBEROFVIEWS' ),
-	'pagename'                => array( '1', 'NOMEDAPAGINA', 'NOMEDAPÁGINA', 'PAGENAME' ),
-	'pagenamee'               => array( '1', 'NOMEDAPAGINAC', 'NOMEDAPÁGINAC', 'PAGENAMEE' ),
-	'namespace'               => array( '1', 'DOMINIO', 'DOMÍNIO', 'ESPACONOMINAL', 'ESPAÇONOMINAL', 'NAMESPACE' ),
-	'namespacee'              => array( '1', 'DOMINIOC', 'DOMÍNIOC', 'ESPACONOMINALC', 'ESPAÇONOMINALC', 'NAMESPACEE' ),
-	'talkspace'               => array( '1', 'PAGINADEDISCUSSAO', 'PÁGINADEDISCUSSÃO', 'TALKSPACE' ),
-	'talkspacee'              => array( '1', 'PAGINADEDISCUSSAOC', 'PÁGINADEDISCUSSÃOC', 'TALKSPACEE' ),
-	'subjectspace'            => array( '1', 'PAGINADECONTEUDO', 'PAGINADECONTEÚDO', 'SUBJECTSPACE', 'ARTICLESPACE' ),
-	'subjectspacee'           => array( '1', 'PAGINADECONTEUDOC', 'PAGINADECONTEÚDOC', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
-	'fullpagename'            => array( '1', 'NOMECOMPLETODAPAGINA', 'NOMECOMPLETODAPÁGINA', 'FULLPAGENAME' ),
-	'fullpagenamee'           => array( '1', 'NOMECOMPLETODAPAGINAC', 'NOMECOMPLETODAPÁGINAC', 'FULLPAGENAMEE' ),
-	'subpagename'             => array( '1', 'NOMEDASUBPAGINA', 'NOMEDASUBPÁGINA', 'SUBPAGENAME' ),
-	'subpagenamee'            => array( '1', 'NOMEDASUBPAGINAC', 'NOMEDASUBPÁGINAC', 'SUBPAGENAMEE' ),
-	'basepagename'            => array( '1', 'NOMEDAPAGINABASE', 'NOMEDAPÁGINABASE', 'BASEPAGENAME' ),
-	'basepagenamee'           => array( '1', 'NOMEDAPAGINABASEC', 'NOMEDAPÁGINABASEC', 'BASEPAGENAMEE' ),
-	'talkpagename'            => array( '1', 'NOMEDAPAGINADEDISCUSSAO', 'NOMEDAPÁGINADEDISCUSSÃO', 'TALKPAGENAME' ),
-	'talkpagenamee'           => array( '1', 'NOMEDAPAGINADEDISCUSSAOC', 'NOMEDAPÁGINADEDISCUSSÃOC', 'TALKPAGENAMEE' ),
-	'subjectpagename'         => array( '1', 'NOMEDAPAGINADECONTEUDO', 'NOMEDAPÁGINADECONTEÚDO', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
-	'subjectpagenamee'        => array( '1', 'NOMEDAPAGINADECONTEUDOC', 'NOMEDAPÁGINADECONTEÚDOC', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
-	'img_thumbnail'           => array( '1', 'miniaturadaimagem', 'miniatura', 'thumbnail', 'thumb' ),
-	'img_manualthumb'         => array( '1', 'miniaturadaimagem=$1', 'miniatura=$1', 'thumbnail=$1', 'thumb=$1' ),
-	'img_right'               => array( '1', 'direita', 'right' ),
-	'img_left'                => array( '1', 'esquerda', 'left' ),
-	'img_none'                => array( '1', 'nenhum', 'none' ),
-	'img_center'              => array( '1', 'centro', 'center', 'centre' ),
-	'img_framed'              => array( '1', 'commoldura', 'comborda', 'framed', 'enframed', 'frame' ),
-	'img_frameless'           => array( '1', 'semmoldura', 'semborda', 'frameless' ),
-	'img_page'                => array( '1', 'página=$1', 'página $1', 'page=$1', 'page $1' ),
-	'img_upright'             => array( '1', 'superiordireito', 'superiordireito=$1', 'superiordireito $1', 'upright', 'upright=$1', 'upright $1' ),
-	'img_border'              => array( '1', 'borda', 'border' ),
-	'img_baseline'            => array( '1', 'linhadebase', 'baseline' ),
-	'img_top'                 => array( '1', 'acima', 'top' ),
-	'img_middle'              => array( '1', 'meio', 'middle' ),
-	'img_bottom'              => array( '1', 'abaixo', 'bottom' ),
-	'img_link'                => array( '1', 'ligação=$1', 'link=$1' ),
-	'sitename'                => array( '1', 'NOMEDOSITE', 'NOMEDOSÍTIO', 'NOMEDOSITIO', 'SITENAME' ),
-	'server'                  => array( '0', 'SERVIDOR', 'SERVER' ),
-	'servername'              => array( '0', 'NOMEDOSERVIDOR', 'SERVERNAME' ),
-	'scriptpath'              => array( '0', 'CAMINHODOSCRIPT', 'SCRIPTPATH' ),
-	'gender'                  => array( '0', 'GENERO', 'GÊNERO', 'GENDER:' ),
-	'notitleconvert'          => array( '0', '__SEMCONVERTERTITULO__', '__SEMCONVERTERTÍTULO__', '__SEMCT__', '__NOTITLECONVERT__', '__NOTC__' ),
-	'nocontentconvert'        => array( '0', '__SEMCONVERTERCONTEUDO__', '__SEMCONVERTERCONTEÚDO__', '__SEMCC__', '__NOCONTENTCONVERT__', '__NOCC__' ),
-	'currentweek'             => array( '1', 'SEMANAATUAL', 'CURRENTWEEK' ),
-	'currentdow'              => array( '1', 'DIADASEMANAATUAL', 'CURRENTDOW' ),
-	'localweek'               => array( '1', 'SEMANALOCAL', 'LOCALWEEK' ),
-	'localdow'                => array( '1', 'DIADASEMANALOCAL', 'LOCALDOW' ),
-	'revisionid'              => array( '1', 'IDDAREVISAO', 'IDDAREVISÃO', 'REVISIONID' ),
-	'revisionday'             => array( '1', 'DIADAREVISAO', 'DIADAREVISÃO', 'REVISIONDAY' ),
-	'revisionday2'            => array( '1', 'DIADAREVISAO2', 'DIADAREVISÃO2', 'REVISIONDAY2' ),
-	'revisionmonth'           => array( '1', 'MESDAREVISAO', 'MÊSDAREVISÃO', 'REVISIONMONTH' ),
-	'revisionyear'            => array( '1', 'ANODAREVISAO', 'ANODAREVISÃO', 'REVISIONYEAR' ),
-	'revisionuser'            => array( '1', 'USUARIODAREVISAO', 'USUÁRIODAREVISÃO', 'REVISIONUSER' ),
-	'fullurl'                 => array( '0', 'URLCOMPLETO:', 'FULLURL:' ),
-	'fullurle'                => array( '0', 'URLCOMPLETOC:', 'FULLURLE:' ),
-	'lcfirst'                 => array( '0', 'PRIMEIRAMINUSCULA:', 'PRIMEIRAMINÚSCULA:', 'LCFIRST:' ),
-	'ucfirst'                 => array( '0', 'PRIMEIRAMAIUSCULA:', 'PRIMEIRAMAIÚSCULA:', 'UCFIRST:' ),
-	'lc'                      => array( '0', 'MINUSCULA', 'MINÚSCULA', 'MINUSCULAS', 'MINÚSCULAS', 'LC:' ),
-	'uc'                      => array( '0', 'MAIUSCULA', 'MAIÚSCULA', 'MAIUSCULAS', 'MAIÚSCULAS', 'UC:' ),
-	'displaytitle'            => array( '1', 'EXIBETITULO', 'EXIBETÍTULO', 'DISPLAYTITLE' ),
-	'newsectionlink'          => array( '1', '__LINKDENOVASECAO__', '__LINKDENOVASEÇÃO__', '__LIGACAODENOVASECAO__', '__LIGAÇÃODENOVASEÇÃO__', '__NEWSECTIONLINK__' ),
-	'nonewsectionlink'        => array( '1', '__SEMLINKDENOVASECAO__', '__SEMLINKDENOVASEÇÃO__', '__SEMLIGACAODENOVASECAO__', '__SEMLIGAÇÃODENOVASEÇÃO__', '__NONEWSECTIONLINK__' ),
-	'currentversion'          => array( '1', 'REVISAOATUAL', 'REVISÃOATUAL', 'CURRENTVERSION' ),
-	'urlencode'               => array( '0', 'CODIFICAURL:', 'URLENCODE:' ),
-	'anchorencode'            => array( '0', 'CODIFICAANCORA:', 'CODIFICAÂNCORA:', 'ANCHORENCODE' ),
-	'language'                => array( '0', '#IDIOMA:', '#LANGUAGE:' ),
-	'contentlanguage'         => array( '1', 'IDIOMADOCONTEUDO', 'IDIOMADOCONTEÚDO', 'CONTENTLANGUAGE', 'CONTENTLANG' ),
-	'pagesinnamespace'        => array( '1', 'PAGINASNOESPACONOMINAL', 'PÁGINASNOESPAÇONOMINAL', 'PAGINASNODOMINIO', 'PÁGINASNODOMÍNIO', 'PAGESINNAMESPACE:', 'PAGESINNS:' ),
-	'numberofadmins'          => array( '1', 'NUMERODEADMINISTRADORES', 'NÚMERODEADMINISTRADORES', 'NUMBEROFADMINS' ),
-	'defaultsort'             => array( '1', 'ORDENACAOPADRAO', 'ORDENAÇÃOPADRÃO', 'ORDEMPADRAO', 'ORDEMPADRÃO', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:' ),
-	'filepath'                => array( '0', 'CAMINHODOARQUIVO', 'FILEPATH:' ),
-	'hiddencat'               => array( '1', '__CATEGORIAOCULTA__', '__CATOCULTA__', '__HIDDENCAT__' ),
-	'pagesincategory'         => array( '1', 'PAGINASNACATEGORIA', 'PÁGINASNACATEGORIA', 'PAGINASNACAT', 'PÁGINASNACAT', 'PAGESINCATEGORY', 'PAGESINCAT' ),
-	'pagesize'                => array( '1', 'TAMANHODAPAGINA', 'TAMANHODAPÁGINA', 'PAGESIZE' ),
-	'index'                   => array( '1', '__INDEXAR__', '__INDEX__' ),
-	'noindex'                 => array( '1', '__NAOINDEXAR__', '__NÃOINDEXAR__', '__NOINDEX__' ),
-	'numberingroup'           => array( '1', 'NUMERONOGRUPO', 'NÚMERONOGRUPO', 'NUMBERINGROUP', 'NUMINGROUP' ),
-	'staticredirect'          => array( '1', '__REDIRECIONAMENTOESTATICO__', '__REDIRECIONAMENTOESTÁTICO__', '__STATICREDIRECT__' ),
-	'protectionlevel'         => array( '1', 'NIVELDEPROTECAO', 'NÍVELDEPROTEÇÃO', 'PROTECTIONLEVEL' ),
-	'url_path'                => array( '0', 'CAMINHO', 'PATH' ),
+	'redirect'                  => array( '0', '#REDIRECIONAMENTO', '#REDIRECT' ),
+	'notoc'                     => array( '0', '__SEMTDC__', '__SEMSUMÁRIO__', '__NOTOC__' ),
+	'nogallery'                 => array( '0', '__SEMGALERIA__', '__NOGALLERY__' ),
+	'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' ),
+	'currentmonthabbrev'        => array( '1', 'MESATUALABREV', 'MESATUALABREVIADO', 'ABREVIATURADOMESATUAL', 'CURRENTMONTHABBREV' ),
+	'currentday'                => array( '1', 'DIAATUAL', 'CURRENTDAY' ),
+	'currentday2'               => array( '1', 'DIAATUAL2', 'CURRENTDAY2' ),
+	'currentdayname'            => array( '1', 'NOMEDODIAATUAL', 'CURRENTDAYNAME' ),
+	'currentyear'               => array( '1', 'ANOATUAL', 'CURRENTYEAR' ),
+	'currenttime'               => array( '1', 'HORARIOATUAL', 'CURRENTTIME' ),
+	'currenthour'               => array( '1', 'HORAATUAL', 'CURRENTHOUR' ),
+	'localmonth'                => array( '1', 'MESLOCAL', 'LOCALMONTH', 'LOCALMONTH2' ),
+	'localmonth1'               => array( '1', 'MESLOCAL1', 'LOCALMONTH1' ),
+	'localmonthname'            => array( '1', 'NOMEDOMESLOCAL', 'LOCALMONTHNAME' ),
+	'localmonthabbrev'          => array( '1', 'MESLOCALABREV', 'MESLOCALABREVIADO', 'ABREVIATURADOMESLOCAL', 'LOCALMONTHABBREV' ),
+	'localday'                  => array( '1', 'DIALOCAL', 'LOCALDAY' ),
+	'localday2'                 => array( '1', 'DIALOCAL2', 'LOCALDAY2' ),
+	'localdayname'              => array( '1', 'NOMEDODIALOCAL', 'LOCALDAYNAME' ),
+	'localyear'                 => array( '1', 'ANOLOCAL', 'LOCALYEAR' ),
+	'localtime'                 => array( '1', 'HORARIOLOCAL', 'LOCALTIME' ),
+	'localhour'                 => array( '1', 'HORALOCAL', 'LOCALHOUR' ),
+	'numberofpages'             => array( '1', 'NUMERODEPAGINAS', 'NÚMERODEPÁGINAS', 'NUMBEROFPAGES' ),
+	'numberofarticles'          => array( '1', 'NUMERODEARTIGOS', 'NÚMERODEARTIGOS', 'NUMBEROFARTICLES' ),
+	'numberoffiles'             => array( '1', 'NUMERODEARQUIVOS', 'NÚMERODEARQUIVOS', 'NUMBEROFFILES' ),
+	'numberofusers'             => array( '1', 'NUMERODEUSUARIOS', 'NÚMERODEUSUÁRIOS', 'NUMBEROFUSERS' ),
+	'numberofactiveusers'       => array( '1', 'NUMERODEUSUARIOSATIVOS', 'NÚMERODEUSUÁRIOSATIVOS', 'NUMBEROFACTIVEUSERS' ),
+	'numberofedits'             => array( '1', 'NUMERODEEDICOES', 'NÚMERODEEDIÇÕES', 'NUMBEROFEDITS' ),
+	'numberofviews'             => array( '1', 'NUMERODEEXIBICOES', 'NÚMERODEEXIBIÇÕES', 'NUMBEROFVIEWS' ),
+	'pagename'                  => array( '1', 'NOMEDAPAGINA', 'NOMEDAPÁGINA', 'PAGENAME' ),
+	'pagenamee'                 => array( '1', 'NOMEDAPAGINAC', 'NOMEDAPÁGINAC', 'PAGENAMEE' ),
+	'namespace'                 => array( '1', 'DOMINIO', 'DOMÍNIO', 'ESPACONOMINAL', 'ESPAÇONOMINAL', 'NAMESPACE' ),
+	'namespacee'                => array( '1', 'DOMINIOC', 'DOMÍNIOC', 'ESPACONOMINALC', 'ESPAÇONOMINALC', 'NAMESPACEE' ),
+	'talkspace'                 => array( '1', 'PAGINADEDISCUSSAO', 'PÁGINADEDISCUSSÃO', 'TALKSPACE' ),
+	'talkspacee'                => array( '1', 'PAGINADEDISCUSSAOC', 'PÁGINADEDISCUSSÃOC', 'TALKSPACEE' ),
+	'subjectspace'              => array( '1', 'PAGINADECONTEUDO', 'PAGINADECONTEÚDO', 'SUBJECTSPACE', 'ARTICLESPACE' ),
+	'subjectspacee'             => array( '1', 'PAGINADECONTEUDOC', 'PAGINADECONTEÚDOC', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
+	'fullpagename'              => array( '1', 'NOMECOMPLETODAPAGINA', 'NOMECOMPLETODAPÁGINA', 'FULLPAGENAME' ),
+	'fullpagenamee'             => array( '1', 'NOMECOMPLETODAPAGINAC', 'NOMECOMPLETODAPÁGINAC', 'FULLPAGENAMEE' ),
+	'subpagename'               => array( '1', 'NOMEDASUBPAGINA', 'NOMEDASUBPÁGINA', 'SUBPAGENAME' ),
+	'subpagenamee'              => array( '1', 'NOMEDASUBPAGINAC', 'NOMEDASUBPÁGINAC', 'SUBPAGENAMEE' ),
+	'basepagename'              => array( '1', 'NOMEDAPAGINABASE', 'NOMEDAPÁGINABASE', 'BASEPAGENAME' ),
+	'basepagenamee'             => array( '1', 'NOMEDAPAGINABASEC', 'NOMEDAPÁGINABASEC', 'BASEPAGENAMEE' ),
+	'talkpagename'              => array( '1', 'NOMEDAPAGINADEDISCUSSAO', 'NOMEDAPÁGINADEDISCUSSÃO', 'TALKPAGENAME' ),
+	'talkpagenamee'             => array( '1', 'NOMEDAPAGINADEDISCUSSAOC', 'NOMEDAPÁGINADEDISCUSSÃOC', 'TALKPAGENAMEE' ),
+	'subjectpagename'           => array( '1', 'NOMEDAPAGINADECONTEUDO', 'NOMEDAPÁGINADECONTEÚDO', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
+	'subjectpagenamee'          => array( '1', 'NOMEDAPAGINADECONTEUDOC', 'NOMEDAPÁGINADECONTEÚDOC', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
+	'img_thumbnail'             => array( '1', 'miniaturadaimagem', 'miniatura', 'thumbnail', 'thumb' ),
+	'img_manualthumb'           => array( '1', 'miniaturadaimagem=$1', 'miniatura=$1', 'thumbnail=$1', 'thumb=$1' ),
+	'img_right'                 => array( '1', 'direita', 'right' ),
+	'img_left'                  => array( '1', 'esquerda', 'left' ),
+	'img_none'                  => array( '1', 'nenhum', 'none' ),
+	'img_center'                => array( '1', 'centro', 'center', 'centre' ),
+	'img_framed'                => array( '1', 'commoldura', 'comborda', 'framed', 'enframed', 'frame' ),
+	'img_frameless'             => array( '1', 'semmoldura', 'semborda', 'frameless' ),
+	'img_page'                  => array( '1', 'página=$1', 'página $1', 'page=$1', 'page $1' ),
+	'img_upright'               => array( '1', 'superiordireito', 'superiordireito=$1', 'superiordireito $1', 'upright', 'upright=$1', 'upright $1' ),
+	'img_border'                => array( '1', 'borda', 'border' ),
+	'img_baseline'              => array( '1', 'linhadebase', 'baseline' ),
+	'img_top'                   => array( '1', 'acima', 'top' ),
+	'img_middle'                => array( '1', 'meio', 'middle' ),
+	'img_bottom'                => array( '1', 'abaixo', 'bottom' ),
+	'img_link'                  => array( '1', 'ligação=$1', 'link=$1' ),
+	'sitename'                  => array( '1', 'NOMEDOSITE', 'NOMEDOSÍTIO', 'NOMEDOSITIO', 'SITENAME' ),
+	'server'                    => array( '0', 'SERVIDOR', 'SERVER' ),
+	'servername'                => array( '0', 'NOMEDOSERVIDOR', 'SERVERNAME' ),
+	'scriptpath'                => array( '0', 'CAMINHODOSCRIPT', 'SCRIPTPATH' ),
+	'gender'                    => array( '0', 'GENERO', 'GÊNERO', 'GENDER:' ),
+	'notitleconvert'            => array( '0', '__SEMCONVERTERTITULO__', '__SEMCONVERTERTÍTULO__', '__SEMCT__', '__NOTITLECONVERT__', '__NOTC__' ),
+	'nocontentconvert'          => array( '0', '__SEMCONVERTERCONTEUDO__', '__SEMCONVERTERCONTEÚDO__', '__SEMCC__', '__NOCONTENTCONVERT__', '__NOCC__' ),
+	'currentweek'               => array( '1', 'SEMANAATUAL', 'CURRENTWEEK' ),
+	'currentdow'                => array( '1', 'DIADASEMANAATUAL', 'CURRENTDOW' ),
+	'localweek'                 => array( '1', 'SEMANALOCAL', 'LOCALWEEK' ),
+	'localdow'                  => array( '1', 'DIADASEMANALOCAL', 'LOCALDOW' ),
+	'revisionid'                => array( '1', 'IDDAREVISAO', 'IDDAREVISÃO', 'REVISIONID' ),
+	'revisionday'               => array( '1', 'DIADAREVISAO', 'DIADAREVISÃO', 'REVISIONDAY' ),
+	'revisionday2'              => array( '1', 'DIADAREVISAO2', 'DIADAREVISÃO2', 'REVISIONDAY2' ),
+	'revisionmonth'             => array( '1', 'MESDAREVISAO', 'MÊSDAREVISÃO', 'REVISIONMONTH' ),
+	'revisionyear'              => array( '1', 'ANODAREVISAO', 'ANODAREVISÃO', 'REVISIONYEAR' ),
+	'revisionuser'              => array( '1', 'USUARIODAREVISAO', 'USUÁRIODAREVISÃO', 'REVISIONUSER' ),
+	'fullurl'                   => array( '0', 'URLCOMPLETO:', 'FULLURL:' ),
+	'fullurle'                  => array( '0', 'URLCOMPLETOC:', 'FULLURLE:' ),
+	'lcfirst'                   => array( '0', 'PRIMEIRAMINUSCULA:', 'PRIMEIRAMINÚSCULA:', 'LCFIRST:' ),
+	'ucfirst'                   => array( '0', 'PRIMEIRAMAIUSCULA:', 'PRIMEIRAMAIÚSCULA:', 'UCFIRST:' ),
+	'lc'                        => array( '0', 'MINUSCULA', 'MINÚSCULA', 'MINUSCULAS', 'MINÚSCULAS', 'LC:' ),
+	'uc'                        => array( '0', 'MAIUSCULA', 'MAIÚSCULA', 'MAIUSCULAS', 'MAIÚSCULAS', 'UC:' ),
+	'displaytitle'              => array( '1', 'EXIBETITULO', 'EXIBETÍTULO', 'DISPLAYTITLE' ),
+	'newsectionlink'            => array( '1', '__LINKDENOVASECAO__', '__LINKDENOVASEÇÃO__', '__LIGACAODENOVASECAO__', '__LIGAÇÃODENOVASEÇÃO__', '__NEWSECTIONLINK__' ),
+	'nonewsectionlink'          => array( '1', '__SEMLINKDENOVASECAO__', '__SEMLINKDENOVASEÇÃO__', '__SEMLIGACAODENOVASECAO__', '__SEMLIGAÇÃODENOVASEÇÃO__', '__NONEWSECTIONLINK__' ),
+	'currentversion'            => array( '1', 'REVISAOATUAL', 'REVISÃOATUAL', 'CURRENTVERSION' ),
+	'urlencode'                 => array( '0', 'CODIFICAURL:', 'URLENCODE:' ),
+	'anchorencode'              => array( '0', 'CODIFICAANCORA:', 'CODIFICAÂNCORA:', 'ANCHORENCODE' ),
+	'language'                  => array( '0', '#IDIOMA:', '#LANGUAGE:' ),
+	'contentlanguage'           => array( '1', 'IDIOMADOCONTEUDO', 'IDIOMADOCONTEÚDO', 'CONTENTLANGUAGE', 'CONTENTLANG' ),
+	'pagesinnamespace'          => array( '1', 'PAGINASNOESPACONOMINAL', 'PÁGINASNOESPAÇONOMINAL', 'PAGINASNODOMINIO', 'PÁGINASNODOMÍNIO', 'PAGESINNAMESPACE:', 'PAGESINNS:' ),
+	'numberofadmins'            => array( '1', 'NUMERODEADMINISTRADORES', 'NÚMERODEADMINISTRADORES', 'NUMBEROFADMINS' ),
+	'defaultsort'               => array( '1', 'ORDENACAOPADRAO', 'ORDENAÇÃOPADRÃO', 'ORDEMPADRAO', 'ORDEMPADRÃO', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:' ),
+	'filepath'                  => array( '0', 'CAMINHODOARQUIVO', 'FILEPATH:' ),
+	'hiddencat'                 => array( '1', '__CATEGORIAOCULTA__', '__CATOCULTA__', '__HIDDENCAT__' ),
+	'pagesincategory'           => array( '1', 'PAGINASNACATEGORIA', 'PÁGINASNACATEGORIA', 'PAGINASNACAT', 'PÁGINASNACAT', 'PAGESINCATEGORY', 'PAGESINCAT' ),
+	'pagesize'                  => array( '1', 'TAMANHODAPAGINA', 'TAMANHODAPÁGINA', 'PAGESIZE' ),
+	'index'                     => array( '1', '__INDEXAR__', '__INDEX__' ),
+	'noindex'                   => array( '1', '__NAOINDEXAR__', '__NÃOINDEXAR__', '__NOINDEX__' ),
+	'numberingroup'             => array( '1', 'NUMERONOGRUPO', 'NÚMERONOGRUPO', 'NUMBERINGROUP', 'NUMINGROUP' ),
+	'staticredirect'            => array( '1', '__REDIRECIONAMENTOESTATICO__', '__REDIRECIONAMENTOESTÁTICO__', '__STATICREDIRECT__' ),
+	'protectionlevel'           => array( '1', 'NIVELDEPROTECAO', 'NÍVELDEPROTEÇÃO', 'PROTECTIONLEVEL' ),
+	'url_path'                  => array( '0', 'CAMINHO', 'PATH' ),
 );
 
 $messages = array(
diff --git a/languages/messages/MessagesQqq.php b/languages/messages/MessagesQqq.php
index 5500ba01d1..3081b9b322 100644
--- a/languages/messages/MessagesQqq.php
+++ b/languages/messages/MessagesQqq.php
@@ -73,6 +73,7 @@
  * @author Metalhead64
  * @author MichaelFrey
  * @author Mihai
+ * @author Minh Nguyen
  * @author Mormegil
  * @author Mpradeep
  * @author Murma174
@@ -2568,10 +2569,10 @@ Part of the "Newuserlog" extension. It is both the title of [[Special:Log/newuse
 'listgrouprights-helppage' => "The link used on [[Special:ListGroupRights]]. Just translate \"Group rights\", and '''leave the \"Help:\" namespace exactly as it is'''.",
 'listgrouprights-members' => 'Used on [[Special:ListGroupRights]] and [[Special:Statistics]] as a link to [[Special:ListUsers|Special:ListUsers/"group"]], a list of members in that group.',
 'listgrouprights-right-display' => "{{optional}}
-* $1 is the text from the 'right-...' messages, i.e. [[MediaWiki:right-edit]] = {{int:right-edit}}
+* $1 is the text from the 'right-...' messages, i.e. {{msg-mw|right-edit}}
 * $2 is the codename of this right",
 'listgrouprights-right-revoked' => "{{optional}}
-* $1 is the text from the 'right-...' messages, i.e. [[MediaWiki:right-edit]] = {{int:right-edit}}
+* $1 is the text from the 'right-...' messages, i.e. {{msg-mw|right-edit}}
 * $2 is the codename of this right",
 'listgrouprights-addgroup' => 'This is an individual right for groups, used on [[Special:ListGroupRights]].
 * $1 is an enumeration of group names.
@@ -2741,8 +2742,9 @@ The name of the deletion log. Used as heading on [[Special:Log/delete]] and in t
 'rollback' => '{{Identical|Rollback}}',
 'rollback_short' => '{{Identical|Rollback}}',
 'rollbacklink' => '{{Identical|Rollback}}
+This link text appears on the recent changes page to users who have the "rollback" right.  It is also effectively a submit button; when clicked it performs the rollback without going to a dialog box first.
 This message has a tooltip {{msg-mw|tooltip-rollback}}',
-'rollbacklinkcount' => 'Text of the rollback link showing the number of edits to be rolled back. See also {{msg-mw|rollbacklink}}.
+'rollbacklinkcount' => 'Text of the rollback link showing the number of edits to be rolled back. This link is also effectively a submit button; when clicked it performs the rollback without going to a dialog box first.  See also {{msg-mw|rollbacklink}}.
 * $1: the number of edits that will be rollbacked. If $1 is over the value of $wgShowRollbackEditCount (default: 10) {{msg-mw|rollbacklinkcount-morethan}} is used.',
 'rollbacklinkcount-morethan' => 'Text of the rollback link when a greater number of edits is to be rolled back. See also {{msg-mw|rollbacklink}}.
 
@@ -3453,6 +3455,7 @@ See also {{msg-mw|Anonuser}} and {{msg-mw|Siteusers}}.',
 * $1 is a spammed domain name.',
 
 # Info page
+'pageinfo-header' => 'Header for action=info, set by wiki administrator(s).',
 'pageinfo-title' => 'Page title for action=info. Parameters:
 * $1 is the page name',
 'pageinfo-header-basic' => 'Table section header in action=info.',
@@ -3485,13 +3488,14 @@ See also {{msg-mw|Anonuser}} and {{msg-mw|Siteusers}}.',
 'pageinfo-recent-edits' => 'The number of times the page has been edited recently. $1 is a localised duration (e.g. 9 days).',
 'pageinfo-recent-authors' => 'The number of users who have edited the page recently.',
 'pageinfo-restriction' => 'Parameters:
-* $1 is the type of page protection (message restriction-$type, preferably in lowercase).',
+* $1 is the type of page protection (message restriction-$type, preferably in lowercase). If your language doesn\'t have small and capital letters, you can simply write <nowiki><code>$1</code></nowiki>.',
 'pageinfo-magic-words' => 'The list of magic words on the page. Parameters:
 * $1 is the number of magic words on the page.',
 'pageinfo-hidden-categories' => 'The list of hidden categories on the page. Parameters:
 * $1 is the number of hidden categories on the page.',
 'pageinfo-templates' => 'The list of templates transcluded within the page. Parameters:
 * $1 is the number of templates transcluded within the page.',
+'pageinfo-footer' => 'Footer for action=info, set by wiki administrator(s).',
 
 # Skin names
 'skinname-standard' => '{{optional}}
@@ -3544,8 +3548,12 @@ Parameters:
 * $4 is the MIME type, a formalized textual information — for example: <code>image/jpeg</code>
 * $5 is the total number of pages in the document.',
 'file-nohires' => 'File info displayed on file description page. For example of message in use see [[:File:Mouse10.gif]].',
-'svg-long-desc' => 'Displayed under an SVG image at the image description page. Note that argument 3 is a string that includes the file size unit symbol. See for example [[:File:Yes check.svg]].',
-'svg-long-desc-animated' => 'Displayed under an SVG image at the image description page if the image is animated. Non-animated images use {{msg-mw|svg-long-desc}}. $1 is width, $2 is height, and $3 is file size, including unit (for example "10 KB").',
+'svg-long-desc' => 'Displayed under an SVG image at the image description page. Note that argument 3 is a string that includes the file size unit symbol. See for example [[:File:Yes check.svg]].
+
+Start with a lowercase letter, unless the first word is “SVG”.',
+'svg-long-desc-animated' => 'Displayed under an SVG image at the image description page if the image is animated. Non-animated images use {{msg-mw|svg-long-desc}}. $1 is width, $2 is height, and $3 is file size, including unit (for example "10 KB").
+
+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-size' => '
 Parameters:
diff --git a/languages/messages/MessagesQu.php b/languages/messages/MessagesQu.php
index c91c0b4e21..7c34cfbe1c 100644
--- a/languages/messages/MessagesQu.php
+++ b/languages/messages/MessagesQu.php
@@ -130,139 +130,139 @@ $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__' ),
-	'toc'                     => array( '0', '__YUYARINA__', '__TDC__', '__TOC__' ),
-	'noeditsection'           => array( '0', '__AMARAKITAHUKCHAYCHU__', '__NOEDITARSECCIÓN__', '__NOEDITARSECCION__', '__NOEDITSECTION__' ),
-	'noheader'                => array( '0', '__UMANNAQ__', '__NOTÍTULO__', '__NOTITULO__', '__NOHEADER__' ),
-	'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' ),
-	'currentmonthabbrev'      => array( '1', 'KUNANKILLAPISI', 'ABREVIACIONNOMBREMESACTUAL', 'ABREVIACIÓNNOMBREMESACTUAL', 'MESACTUALABREVIADO', 'CURRENTMONTHABBREV' ),
-	'currentday'              => array( '1', 'KUNANPUNCHAW', 'DÍAACTUAL', 'DIAACTUAL', 'DÍA_ACTUAL', 'DIA_ACTUAL', 'CURRENTDAY' ),
-	'currentday2'             => array( '1', 'KUNANPUNCHAW2', 'DÍAACTUAL2', 'DIAACTUAL2', 'DÍA_ACTUAL2', 'DIA_ACTUAL2', 'CURRENTDAY2' ),
-	'currentdayname'          => array( '1', 'KUNANPUNCHAWSUTI', 'NOMBREDÍAACTUAL', 'NOMBREDIAACTUAL', 'CURRENTDAYNAME' ),
-	'currentyear'             => array( '1', 'KUNANWATA', 'AÑOACTUAL', 'AÑO_ACTUAL', 'CURRENTYEAR' ),
-	'currenttime'             => array( '1', 'KUNANPACHA', 'HORAACTUAL', 'HORA_ACTUAL', 'HORA_MINUTOS_ACTUAL', 'HORAMINUTOSACTUAL', 'TIEMPOACTUAL', 'CURRENTTIME' ),
-	'currenthour'             => array( '1', 'KUNANURA', 'CURRENTHOUR' ),
-	'localmonth'              => array( '1', 'KAYPIKILLA', 'MESLOCAL', 'MESLOCAL2', 'LOCALMONTH', 'LOCALMONTH2' ),
-	'localmonthname'          => array( '1', 'KAYPIKILLASUTI', 'NOMBREMESLOCAL', 'MESLOCALCOMPLETO', 'LOCALMONTHNAME' ),
-	'localmonthnamegen'       => array( '1', 'KAYPIKILLASUTIP', 'GENERADORNOMBREMESLOCAL', 'MESLOCALGENITIVO', 'LOCALMONTHNAMEGEN' ),
-	'localmonthabbrev'        => array( '1', 'KAYPIKILLAPISI', 'ABREVIACIONMESLOCAL', 'MESLOCALABREVIADO', 'LOCALMONTHABBREV' ),
-	'localday'                => array( '1', 'KAYPIPUNCHAW', 'DÍALOCAL', 'DIALOCAL', 'LOCALDAY' ),
-	'localday2'               => array( '1', 'KAYPIPUNCHAW2', 'DIALOCAL2', 'DÍALOCAL2', 'LOCALDAY2' ),
-	'localdayname'            => array( '1', 'KAYPIPUNCHAWSUTI', 'NOMBREDIALOCAL', 'NOMBREDÍALOCAL', 'LOCALDAYNAME' ),
-	'localyear'               => array( '1', 'KAYPIWATA', 'AÑOLOCAL', 'LOCALYEAR' ),
-	'localtime'               => array( '1', 'KAYPIPACHA', 'HORALOCAL', 'HORAMINUTOSLOCAL', 'TIEMPOLOCAL', 'LOCALTIME' ),
-	'localhour'               => array( '1', 'KAYPIURA', 'LOCALHOUR' ),
-	'numberofpages'           => array( '1', 'HAYKAPANQA', 'NÚMERODEPÁGINAS', 'NUMERODEPAGINAS', 'NUMBEROFPAGES' ),
-	'numberofarticles'        => array( '1', 'HAYKAQILLQA', 'NÚMERODEARTÍCULOS', 'NUMERODEARTICULOS', 'NUMBEROFARTICLES' ),
-	'numberoffiles'           => array( '1', 'HAYKAWILLANIQI', 'NÚMERODEARCHIVOS', 'NUMERODEARCHIVOS', 'NUMBEROFFILES' ),
-	'numberofusers'           => array( '1', 'HAYKARURAQ', 'NÚMERODEUSUARIOS', 'NUMERODEUSUARIOS', 'NUMBEROFUSERS' ),
-	'numberofactiveusers'     => array( '1', 'HAYKARURACHKAQ', 'NÚMERODEUSUARIOSACTIVOS', 'NUMERODEUSUARIOSACTIVOS', 'NUMBEROFACTIVEUSERS' ),
-	'numberofedits'           => array( '1', 'HAYKALLAMKAPUSQA', 'NÚMERODEEDICIONES', 'NUMERODEEDICIONES', 'NUMBEROFEDITS' ),
-	'numberofviews'           => array( '1', 'HAYKAQHAWASQA', 'HAYKAQAWASQA', 'NÚMERODEVISTAS', 'NUMERODEVISTAS', 'NUMBEROFVIEWS' ),
-	'pagename'                => array( '1', 'PANQASUTI', 'NOMBREDEPAGINA', 'NOMBREDEPÁGINA', 'PAGENAME' ),
-	'pagenamee'               => array( '1', 'PANQASUTIE', 'NOMBREDEPAGINAC', 'NOMBREDEPÁGINAC', 'PAGENAMEE' ),
-	'namespace'               => array( '1', 'SUTIKITI', 'ESPACIODENOMBRE', 'NAMESPACE' ),
-	'namespacee'              => array( '1', 'SUTIKITIE', 'ESPACIODENOMBREC', 'NAMESPACEE' ),
-	'talkspace'               => array( '1', 'RIMANAKUYKITI', 'RIMAYKITI', 'ESPACIODEDISCUSION', 'ESPACIODEDISCUSIÓN', 'TALKSPACE' ),
-	'talkspacee'              => array( '1', 'RIMANAKUYKITIE', 'RIMAYKITIE', 'ESPACIODEDISCUSIONC', 'TALKSPACEE' ),
-	'subjectspace'            => array( '1', 'QILLQAKITI', 'ESPACIODEASUNTO', 'ESPACIODETEMA', 'ESPACIODEARTÍCULO', 'ESPACIODEARTICULO', 'SUBJECTSPACE', 'ARTICLESPACE' ),
-	'subjectspacee'           => array( '1', 'QILLQAKITIE', 'ESPACIODETEMAC', 'ESPACIODEASUNTOC', 'ESPACIODEARTICULOC', 'ESPACIODEARTÍCULOC', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
-	'fullpagename'            => array( '1', 'HUNTAPANQASUTI', 'NOMBREDEPÁGINACOMPLETA', 'NOMBREDEPAGINACOMPLETA', 'NOMBREDEPÁGINAENTERA', 'NOMBREDEPAGINAENTERA', 'NOMBRECOMPLETODEPÁGINA', 'NOMBRECOMPLETODEPAGINA', 'FULLPAGENAME' ),
-	'fullpagenamee'           => array( '1', 'HUNTAPANQASUTIE', 'NOMBRECOMPLETODEPAGINAC', 'NOMBRECOMPLETODEPÁGINAC', 'FULLPAGENAMEE' ),
-	'subpagename'             => array( '1', 'URINPANQASUTI', 'NOMBREDESUBPAGINA', 'NOMBREDESUBPÁGINA', 'SUBPAGENAME' ),
-	'subpagenamee'            => array( '1', 'URINPANQASUTIE', 'NOMBREDESUBPAGINAC', 'NOMBREDESUBPÁGINAC', 'SUBPAGENAMEE' ),
-	'basepagename'            => array( '1', 'TIKSIPANQASUTI', 'NOMBREDEPAGINABASE', 'NOMBREDEPÁGINABASE', 'BASEPAGENAME' ),
-	'basepagenamee'           => array( '1', 'TIKSIPANQASUTIE', 'NOMBREDEPAGINABASEC', 'NOMBREDEPÁGINABASEC', 'BASEPAGENAMEE' ),
-	'talkpagename'            => array( '1', 'RIMANAKUYPANQASUTI', 'NOMBREDEPÁGINADEDISCUSIÓN', 'NOMBREDEPAGINADEDISCUSION', 'NOMBREDEPAGINADISCUSION', 'NOMBREDEPÁGINADISCUSIÓN', 'TALKPAGENAME' ),
-	'talkpagenamee'           => array( '1', 'RIMANAKUYPANQASUTIE', 'NOMBREDEPÁGINADEDISCUSIÓNC', 'NOMBREDEPAGINADEDISCUSIONC', 'NOMBREDEPAGINADISCUSIONC', 'NOMBREDEPÁGINADISCUSIÓNC', 'TALKPAGENAMEE' ),
-	'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:' ),
-	'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' ),
-	'img_right'               => array( '1', 'paña', 'alliq', 'derecha', 'dcha', 'der', 'right' ),
-	'img_left'                => array( '1', 'lluqi', 'ichuq', 'izquierda', 'izda', 'izq', 'left' ),
-	'img_none'                => array( '1', 'manaima', 'mana', 'ninguna', 'nada', 'no', 'ninguno', 'none' ),
-	'img_center'              => array( '1', 'chawpi', 'centro', 'centrado', 'centrada', 'centrar', 'center', 'centre' ),
-	'img_framed'              => array( '1', 'inchuyuq', 'inchu', 'marco', 'enmarcado', 'enmarcada', 'framed', 'enframed', 'frame' ),
-	'img_frameless'           => array( '1', 'inchunnaq', 'sinmarco', 'sin_embarcar', 'sinenmarcar', 'sin_enmarcar', 'frameless' ),
-	'img_page'                => array( '1', 'panqa=$1', 'pagina=$1', 'página=$1', 'pagina $1', 'página $1', 'pagina_$1', 'page=$1', 'page $1' ),
-	'img_upright'             => array( '1', 'sayaq', 'sayaq=$1', 'upright', 'upright=$1', 'upright $1' ),
-	'img_border'              => array( '1', 'saywa', 'borde', 'border' ),
-	'img_baseline'            => array( '1', 'tiksisiqi', 'baseline' ),
-	'img_sub'                 => array( '1', 'uran', 'sub' ),
-	'img_super'               => array( '1', 'hanan', 'super', 'sup' ),
-	'img_top'                 => array( '1', 'hawa', 'top' ),
-	'img_text_top'            => array( '1', 'qillqahawa', 'text-top' ),
-	'img_middle'              => array( '1', 'ukhupi', 'middle' ),
-	'img_bottom'              => array( '1', 'sikipi', 'bottom' ),
-	'img_text_bottom'         => array( '1', 'qillqasiki', 'text-bottom' ),
-	'img_link'                => array( '1', 'tinki=$1', 'vínculo=$1', 'vinculo=$1', 'enlace=$1', 'link=$1' ),
-	'img_alt'                 => array( '1', 'wak=$1', 'alt=$1' ),
-	'int'                     => array( '0', 'WILLAY:', 'INT:' ),
-	'sitename'                => array( '1', 'TIYAYSUTI', 'NOMBREDESITIO', 'NOMBREDELSITIO', 'SITENAME' ),
-	'ns'                      => array( '0', 'SKITI:', 'EN:', 'NS:' ),
-	'localurl'                => array( '0', 'KAYLLAURL:', 'URLLOCAL', 'LOCALURL:' ),
-	'localurle'               => array( '0', 'KAYLLAURLE:', 'URLLOCALC:', 'LOCALURLE:' ),
-	'server'                  => array( '0', 'SIRWIQ', 'SERVIDOR', 'SERVER' ),
-	'servername'              => array( '0', 'SIRWIQSUTI', 'NOMBRESERVIDOR', 'SERVERNAME' ),
-	'scriptpath'              => array( '0', 'QILLQAÑAN', 'QILLQANAN', 'RUTASCRIPT', 'RUTADESCRIPT', 'SCRIPTPATH' ),
-	'grammar'                 => array( '0', 'SIMIKAMACHIY:', 'GRAMATICA:', 'GRAMÁTICA:', 'GRAMMAR:' ),
-	'gender'                  => array( '0', 'QHARIWARMI:', 'QARIWARMI:', 'GÉNERO:', 'GENERO:', 'GENDER:' ),
-	'notitleconvert'          => array( '0', '__AMASUTITAHUKCHAYCHU__', '__NOCONVERTIRTITULO__', '__NOCONVERTIRTÍTULO__', '__NOCT___', '__NOTITLECONVERT__', '__NOTC__' ),
-	'nocontentconvert'        => array( '0', '__AMASAMIQTAHUKCHAYCHU__', '__NOCONVERTIRCONTENIDO__', '__NOCC___', '__NOCONTENTCONVERT__', '__NOCC__' ),
-	'currentweek'             => array( '1', 'KUNANSIMANA', 'SEMANAACTUAL', 'CURRENTWEEK' ),
-	'currentdow'              => array( '1', 'KUNANSIMANAPUNCHAW', 'DDSACTUAL', 'DIADESEMANAACTUAL', 'DÍADESEMANAACTUAL', 'CURRENTDOW' ),
-	'localweek'               => array( '1', 'KAYLLASIMANA', 'SEMANALOCAL', 'LOCALWEEK' ),
-	'localdow'                => array( '1', 'KAYLLASIMANAPUNCHAW', 'DDSLOCAL', 'DIADESEMANALOCAL', 'DÍADESEMANALOCAL', 'LOCALDOW' ),
-	'revisionid'              => array( '1', 'MUSUQCHASQAID', 'IDDEREVISION', 'IDREVISION', 'IDDEREVISIÓN', 'IDREVISIÓN', 'REVISIONID' ),
-	'revisionday'             => array( '1', 'MUSUQCHASQAPUNCHAW', 'DIADEREVISION', 'DIAREVISION', 'DÍADEREVISIÓN', 'DÍAREVISIÓN', 'REVISIONDAY' ),
-	'revisionday2'            => array( '1', 'MUSUQCHASQAPUNCHAW2', 'DIADEREVISION2', 'DIAREVISION2', 'DÍADEREVISIÓN2', 'DÍAREVISIÓN2', 'REVISIONDAY2' ),
-	'revisionmonth'           => array( '1', 'MUSUQCHASQAKILLA', 'MESDEREVISION', 'MESDEREVISIÓN', 'MESREVISION', 'MESREVISIÓN', 'REVISIONMONTH' ),
-	'revisionyear'            => array( '1', 'MUSUQCHASQAWATA', 'AÑODEREVISION', 'AÑODEREVISIÓN', 'AÑOREVISION', 'AÑOREVISIÓN', 'REVISIONYEAR' ),
-	'revisiontimestamp'       => array( '1', 'MUSUQCHASQAPACHAQILLPA', 'MARCADEHORADEREVISION', 'MARCADEHORADEREVISIÓN', 'REVISIONTIMESTAMP' ),
-	'revisionuser'            => array( '1', 'MUSUQCHASQARURAQ', 'USUARIODEREVISION', 'USUARIODEREVISIÓN', 'REVISIONUSER' ),
-	'plural'                  => array( '0', 'ACHKA:', 'PLURAL:' ),
-	'fullurl'                 => array( '0', 'HUNTAURL:', 'URLCOMPLETA:', 'FULLURL:' ),
-	'fullurle'                => array( '0', 'HUNTAURLE:', 'URLCOMPLETAC:', 'FULLURLE:' ),
-	'lcfirst'                 => array( '0', 'UCHUYÑAWPAQ:', 'UCHUYNAWPAQ:', 'PRIMEROMINUS;', 'PRIMEROMINÚS:', 'LCFIRST:' ),
-	'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:' ),
-	'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:' ),
-	'anchorencode'            => array( '0', 'WATANALLAWICHAY', 'ANCHORENCODE' ),
-	'currenttimestamp'        => array( '1', 'KUNANPACHAQILLPA', 'MARCADEHORAACTUAL', 'CURRENTTIMESTAMP' ),
-	'localtimestamp'          => array( '1', 'KAYLLAPACHAQILLPA', 'MARCADEHORALOCAL', 'LOCALTIMESTAMP' ),
-	'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:' ),
-	'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' ),
-	'padright'                => array( '0', 'PADPAÑA', 'PADALLIQ', 'PADRIGHT' ),
-	'special'                 => array( '0', 'sapaq', 'especial', 'special' ),
-	'defaultsort'             => array( '1', 'ALLINCHAY:', 'SIQINCHAY:', 'ORDENAR:', 'ORDENPREDETERMINADO:', 'CLAVEDEORDENPREDETERMINADO:', 'ORDENDECATEGORIAPREDETERMINADO:', 'ORDENDECATEGORÍAPREDETERMINADO:', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:' ),
-	'filepath'                => array( '0', 'WILLAÑIQIÑAN', 'WILLANIQINAN', 'RUTAARCHIVO', 'RUTARCHIVO', 'RUTAARCHIVO:', 'RUTARCHIVO:', 'RUTADEARCHIVO:', 'FILEPATH:' ),
-	'tag'                     => array( '0', 'unanchacha', 'UNANCHACHA', 'etiqueta', 'ETIQUETA', 'tag' ),
-	'hiddencat'               => array( '1', '__PAKASQAKATIGURIYA__', '__CATEGORÍAOCULTA__', '__HIDDENCAT__' ),
-	'pagesincategory'         => array( '1', 'KATIGURIYAPIPANQAKUNA', 'PÁGINASENCATEGORÍA', 'PÁGINASENCAT', 'PAGSENCAT', 'PAGINASENCATEGORIA', 'PAGINASENCAT', 'PAGESINCATEGORY', 'PAGESINCAT' ),
-	'pagesize'                => array( '1', 'PANQACHHIKAN', 'PANQACHIKAN', 'PANQACHIKA', 'TAMAÑOPÁGINA', 'TAMAÑODEPÁGINA', 'TAMAÑOPAGINA', 'TAMAÑODEPAGINA', 'PAGESIZE' ),
-	'index'                   => array( '1', '__UNANCHAY__', '__INDEXAR__', '__INDEX__' ),
-	'noindex'                 => array( '1', '__AMAUNANCHAYCHU__', '__NOINDEXAR__', '__NOINDEX__' ),
-	'numberingroup'           => array( '1', 'HUÑUPIYUPAY', 'HUNUPIYUPAY', 'NÚMEROENGRUPO', 'NUMEROENGRUPO', 'NUMENGRUPO', 'NÚMENGRUPO', 'NUMBERINGROUP', 'NUMINGROUP' ),
-	'staticredirect'          => array( '1', '__TIYAQLLAPUSAPUNA__', '__REDIRECCIONESTATICA__', '__REDIRECCIÓNESTÁTICA__', '__STATICREDIRECT__' ),
-	'protectionlevel'         => array( '1', 'HAYKAAMACHAY', 'IMASINCHIAMACHAY', 'NIVELDEPROTECCIÓN', 'PROTECTIONLEVEL' ),
+	'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__' ),
+	'toc'                       => array( '0', '__YUYARINA__', '__TDC__', '__TOC__' ),
+	'noeditsection'             => array( '0', '__AMARAKITAHUKCHAYCHU__', '__NOEDITARSECCIÓN__', '__NOEDITARSECCION__', '__NOEDITSECTION__' ),
+	'noheader'                  => array( '0', '__UMANNAQ__', '__NOTÍTULO__', '__NOTITULO__', '__NOHEADER__' ),
+	'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' ),
+	'currentmonthabbrev'        => array( '1', 'KUNANKILLAPISI', 'ABREVIACIONNOMBREMESACTUAL', 'ABREVIACIÓNNOMBREMESACTUAL', 'MESACTUALABREVIADO', 'CURRENTMONTHABBREV' ),
+	'currentday'                => array( '1', 'KUNANPUNCHAW', 'DÍAACTUAL', 'DIAACTUAL', 'DÍA_ACTUAL', 'DIA_ACTUAL', 'CURRENTDAY' ),
+	'currentday2'               => array( '1', 'KUNANPUNCHAW2', 'DÍAACTUAL2', 'DIAACTUAL2', 'DÍA_ACTUAL2', 'DIA_ACTUAL2', 'CURRENTDAY2' ),
+	'currentdayname'            => array( '1', 'KUNANPUNCHAWSUTI', 'NOMBREDÍAACTUAL', 'NOMBREDIAACTUAL', 'CURRENTDAYNAME' ),
+	'currentyear'               => array( '1', 'KUNANWATA', 'AÑOACTUAL', 'AÑO_ACTUAL', 'CURRENTYEAR' ),
+	'currenttime'               => array( '1', 'KUNANPACHA', 'HORAACTUAL', 'HORA_ACTUAL', 'HORA_MINUTOS_ACTUAL', 'HORAMINUTOSACTUAL', 'TIEMPOACTUAL', 'CURRENTTIME' ),
+	'currenthour'               => array( '1', 'KUNANURA', 'HORAACTUAL', 'HORA_ACTUAL', 'CURRENTHOUR' ),
+	'localmonth'                => array( '1', 'KAYPIKILLA', 'MESLOCAL', 'MESLOCAL2', 'LOCALMONTH', 'LOCALMONTH2' ),
+	'localmonthname'            => array( '1', 'KAYPIKILLASUTI', 'NOMBREMESLOCAL', 'MESLOCALCOMPLETO', 'LOCALMONTHNAME' ),
+	'localmonthnamegen'         => array( '1', 'KAYPIKILLASUTIP', 'GENERADORNOMBREMESLOCAL', 'MESLOCALGENITIVO', 'LOCALMONTHNAMEGEN' ),
+	'localmonthabbrev'          => array( '1', 'KAYPIKILLAPISI', 'ABREVIACIONMESLOCAL', 'MESLOCALABREVIADO', 'LOCALMONTHABBREV' ),
+	'localday'                  => array( '1', 'KAYPIPUNCHAW', 'DÍALOCAL', 'DIALOCAL', 'LOCALDAY' ),
+	'localday2'                 => array( '1', 'KAYPIPUNCHAW2', 'DIALOCAL2', 'DÍALOCAL2', 'LOCALDAY2' ),
+	'localdayname'              => array( '1', 'KAYPIPUNCHAWSUTI', 'NOMBREDIALOCAL', 'NOMBREDÍALOCAL', 'LOCALDAYNAME' ),
+	'localyear'                 => array( '1', 'KAYPIWATA', 'AÑOLOCAL', 'LOCALYEAR' ),
+	'localtime'                 => array( '1', 'KAYPIPACHA', 'HORALOCAL', 'HORAMINUTOSLOCAL', 'TIEMPOLOCAL', 'LOCALTIME' ),
+	'localhour'                 => array( '1', 'KAYPIURA', 'HORALOCAL', 'LOCALHOUR' ),
+	'numberofpages'             => array( '1', 'HAYKAPANQA', 'NÚMERODEPÁGINAS', 'NUMERODEPAGINAS', 'NUMBEROFPAGES' ),
+	'numberofarticles'          => array( '1', 'HAYKAQILLQA', 'NÚMERODEARTÍCULOS', 'NUMERODEARTICULOS', 'NUMBEROFARTICLES' ),
+	'numberoffiles'             => array( '1', 'HAYKAWILLANIQI', 'NÚMERODEARCHIVOS', 'NUMERODEARCHIVOS', 'NUMBEROFFILES' ),
+	'numberofusers'             => array( '1', 'HAYKARURAQ', 'NÚMERODEUSUARIOS', 'NUMERODEUSUARIOS', 'NUMBEROFUSERS' ),
+	'numberofactiveusers'       => array( '1', 'HAYKARURACHKAQ', 'NÚMERODEUSUARIOSACTIVOS', 'NUMERODEUSUARIOSACTIVOS', 'NUMBEROFACTIVEUSERS' ),
+	'numberofedits'             => array( '1', 'HAYKALLAMKAPUSQA', 'NÚMERODEEDICIONES', 'NUMERODEEDICIONES', 'NUMBEROFEDITS' ),
+	'numberofviews'             => array( '1', 'HAYKAQHAWASQA', 'HAYKAQAWASQA', 'NÚMERODEVISTAS', 'NUMERODEVISTAS', 'NUMBEROFVIEWS' ),
+	'pagename'                  => array( '1', 'PANQASUTI', 'NOMBREDEPAGINA', 'NOMBREDEPÁGINA', 'PAGENAME' ),
+	'pagenamee'                 => array( '1', 'PANQASUTIE', 'NOMBREDEPAGINAC', 'NOMBREDEPÁGINAC', 'PAGENAMEE' ),
+	'namespace'                 => array( '1', 'SUTIKITI', 'ESPACIODENOMBRE', 'NAMESPACE' ),
+	'namespacee'                => array( '1', 'SUTIKITIE', 'ESPACIODENOMBREC', 'NAMESPACEE' ),
+	'talkspace'                 => array( '1', 'RIMANAKUYKITI', 'RIMAYKITI', 'ESPACIODEDISCUSION', 'ESPACIODEDISCUSIÓN', 'TALKSPACE' ),
+	'talkspacee'                => array( '1', 'RIMANAKUYKITIE', 'RIMAYKITIE', 'ESPACIODEDISCUSIONC', 'TALKSPACEE' ),
+	'subjectspace'              => array( '1', 'QILLQAKITI', 'ESPACIODEASUNTO', 'ESPACIODETEMA', 'ESPACIODEARTÍCULO', 'ESPACIODEARTICULO', 'SUBJECTSPACE', 'ARTICLESPACE' ),
+	'subjectspacee'             => array( '1', 'QILLQAKITIE', 'ESPACIODETEMAC', 'ESPACIODEASUNTOC', 'ESPACIODEARTICULOC', 'ESPACIODEARTÍCULOC', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
+	'fullpagename'              => array( '1', 'HUNTAPANQASUTI', 'NOMBREDEPÁGINACOMPLETA', 'NOMBREDEPAGINACOMPLETA', 'NOMBREDEPÁGINAENTERA', 'NOMBREDEPAGINAENTERA', 'NOMBRECOMPLETODEPÁGINA', 'NOMBRECOMPLETODEPAGINA', 'FULLPAGENAME' ),
+	'fullpagenamee'             => array( '1', 'HUNTAPANQASUTIE', 'NOMBRECOMPLETODEPAGINAC', 'NOMBRECOMPLETODEPÁGINAC', 'FULLPAGENAMEE' ),
+	'subpagename'               => array( '1', 'URINPANQASUTI', 'NOMBREDESUBPAGINA', 'NOMBREDESUBPÁGINA', 'SUBPAGENAME' ),
+	'subpagenamee'              => array( '1', 'URINPANQASUTIE', 'NOMBREDESUBPAGINAC', 'NOMBREDESUBPÁGINAC', 'SUBPAGENAMEE' ),
+	'basepagename'              => array( '1', 'TIKSIPANQASUTI', 'NOMBREDEPAGINABASE', 'NOMBREDEPÁGINABASE', 'BASEPAGENAME' ),
+	'basepagenamee'             => array( '1', 'TIKSIPANQASUTIE', 'NOMBREDEPAGINABASEC', 'NOMBREDEPÁGINABASEC', 'BASEPAGENAMEE' ),
+	'talkpagename'              => array( '1', 'RIMANAKUYPANQASUTI', 'NOMBREDEPÁGINADEDISCUSIÓN', 'NOMBREDEPAGINADEDISCUSION', 'NOMBREDEPAGINADISCUSION', 'NOMBREDEPÁGINADISCUSIÓN', 'TALKPAGENAME' ),
+	'talkpagenamee'             => array( '1', 'RIMANAKUYPANQASUTIE', 'NOMBREDEPÁGINADEDISCUSIÓNC', 'NOMBREDEPAGINADEDISCUSIONC', 'NOMBREDEPAGINADISCUSIONC', 'NOMBREDEPÁGINADISCUSIÓNC', 'TALKPAGENAMEE' ),
+	'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:' ),
+	'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' ),
+	'img_right'                 => array( '1', 'paña', 'alliq', 'derecha', 'dcha', 'der', 'right' ),
+	'img_left'                  => array( '1', 'lluqi', 'ichuq', 'izquierda', 'izda', 'izq', 'left' ),
+	'img_none'                  => array( '1', 'manaima', 'mana', 'ninguna', 'nada', 'no', 'ninguno', 'none' ),
+	'img_center'                => array( '1', 'chawpi', 'centro', 'centrado', 'centrada', 'centrar', 'center', 'centre' ),
+	'img_framed'                => array( '1', 'inchuyuq', 'inchu', 'marco', 'enmarcado', 'enmarcada', 'framed', 'enframed', 'frame' ),
+	'img_frameless'             => array( '1', 'inchunnaq', 'sinmarco', 'sin_embarcar', 'sinenmarcar', 'sin_enmarcar', 'frameless' ),
+	'img_page'                  => array( '1', 'panqa=$1', 'pagina=$1', 'página=$1', 'pagina $1', 'página $1', 'pagina_$1', 'página_$1', 'page=$1', 'page $1' ),
+	'img_upright'               => array( '1', 'sayaq', 'sayaq=$1', 'upright', 'upright=$1', 'upright $1' ),
+	'img_border'                => array( '1', 'saywa', 'borde', 'border' ),
+	'img_baseline'              => array( '1', 'tiksisiqi', 'baseline' ),
+	'img_sub'                   => array( '1', 'uran', 'sub' ),
+	'img_super'                 => array( '1', 'hanan', 'super', 'sup' ),
+	'img_top'                   => array( '1', 'hawa', 'top' ),
+	'img_text_top'              => array( '1', 'qillqahawa', 'text-top' ),
+	'img_middle'                => array( '1', 'ukhupi', 'middle' ),
+	'img_bottom'                => array( '1', 'sikipi', 'bottom' ),
+	'img_text_bottom'           => array( '1', 'qillqasiki', 'text-bottom' ),
+	'img_link'                  => array( '1', 'tinki=$1', 'vínculo=$1', 'vinculo=$1', 'enlace=$1', 'link=$1' ),
+	'img_alt'                   => array( '1', 'wak=$1', 'alt=$1' ),
+	'int'                       => array( '0', 'WILLAY:', 'INT:' ),
+	'sitename'                  => array( '1', 'TIYAYSUTI', 'NOMBREDESITIO', 'NOMBREDELSITIO', 'SITENAME' ),
+	'ns'                        => array( '0', 'SKITI:', 'EN:', 'NS:' ),
+	'localurl'                  => array( '0', 'KAYLLAURL:', 'URLLOCAL', 'LOCALURL:' ),
+	'localurle'                 => array( '0', 'KAYLLAURLE:', 'URLLOCALC:', 'LOCALURLE:' ),
+	'server'                    => array( '0', 'SIRWIQ', 'SERVIDOR', 'SERVER' ),
+	'servername'                => array( '0', 'SIRWIQSUTI', 'NOMBRESERVIDOR', 'SERVERNAME' ),
+	'scriptpath'                => array( '0', 'QILLQAÑAN', 'QILLQANAN', 'RUTASCRIPT', 'RUTADESCRIPT', 'SCRIPTPATH' ),
+	'grammar'                   => array( '0', 'SIMIKAMACHIY:', 'GRAMATICA:', 'GRAMÁTICA:', 'GRAMMAR:' ),
+	'gender'                    => array( '0', 'QHARIWARMI:', 'QARIWARMI:', 'GÉNERO:', 'GENERO:', 'GENDER:' ),
+	'notitleconvert'            => array( '0', '__AMASUTITAHUKCHAYCHU__', '__NOCONVERTIRTITULO__', '__NOCONVERTIRTÍTULO__', '__NOCT___', '__NOTITLECONVERT__', '__NOTC__' ),
+	'nocontentconvert'          => array( '0', '__AMASAMIQTAHUKCHAYCHU__', '__NOCONVERTIRCONTENIDO__', '__NOCC___', '__NOCONTENTCONVERT__', '__NOCC__' ),
+	'currentweek'               => array( '1', 'KUNANSIMANA', 'SEMANAACTUAL', 'CURRENTWEEK' ),
+	'currentdow'                => array( '1', 'KUNANSIMANAPUNCHAW', 'DDSACTUAL', 'DIADESEMANAACTUAL', 'DÍADESEMANAACTUAL', 'CURRENTDOW' ),
+	'localweek'                 => array( '1', 'KAYLLASIMANA', 'SEMANALOCAL', 'LOCALWEEK' ),
+	'localdow'                  => array( '1', 'KAYLLASIMANAPUNCHAW', 'DDSLOCAL', 'DIADESEMANALOCAL', 'DÍADESEMANALOCAL', 'LOCALDOW' ),
+	'revisionid'                => array( '1', 'MUSUQCHASQAID', 'IDDEREVISION', 'IDREVISION', 'IDDEREVISIÓN', 'IDREVISIÓN', 'REVISIONID' ),
+	'revisionday'               => array( '1', 'MUSUQCHASQAPUNCHAW', 'DIADEREVISION', 'DIAREVISION', 'DÍADEREVISIÓN', 'DÍAREVISIÓN', 'REVISIONDAY' ),
+	'revisionday2'              => array( '1', 'MUSUQCHASQAPUNCHAW2', 'DIADEREVISION2', 'DIAREVISION2', 'DÍADEREVISIÓN2', 'DÍAREVISIÓN2', 'REVISIONDAY2' ),
+	'revisionmonth'             => array( '1', 'MUSUQCHASQAKILLA', 'MESDEREVISION', 'MESDEREVISIÓN', 'MESREVISION', 'MESREVISIÓN', 'REVISIONMONTH' ),
+	'revisionyear'              => array( '1', 'MUSUQCHASQAWATA', 'AÑODEREVISION', 'AÑODEREVISIÓN', 'AÑOREVISION', 'AÑOREVISIÓN', 'REVISIONYEAR' ),
+	'revisiontimestamp'         => array( '1', 'MUSUQCHASQAPACHAQILLPA', 'MARCADEHORADEREVISION', 'MARCADEHORADEREVISIÓN', 'REVISIONTIMESTAMP' ),
+	'revisionuser'              => array( '1', 'MUSUQCHASQARURAQ', 'USUARIODEREVISION', 'USUARIODEREVISIÓN', 'REVISIONUSER' ),
+	'plural'                    => array( '0', 'ACHKA:', 'PLURAL:' ),
+	'fullurl'                   => array( '0', 'HUNTAURL:', 'URLCOMPLETA:', 'FULLURL:' ),
+	'fullurle'                  => array( '0', 'HUNTAURLE:', 'URLCOMPLETAC:', 'FULLURLE:' ),
+	'lcfirst'                   => array( '0', 'UCHUYÑAWPAQ:', 'UCHUYNAWPAQ:', 'PRIMEROMINUS;', 'PRIMEROMINÚS:', 'LCFIRST:' ),
+	'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:' ),
+	'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:' ),
+	'anchorencode'              => array( '0', 'WATANALLAWICHAY', 'ANCHORENCODE' ),
+	'currenttimestamp'          => array( '1', 'KUNANPACHAQILLPA', 'MARCADEHORAACTUAL', 'CURRENTTIMESTAMP' ),
+	'localtimestamp'            => array( '1', 'KAYLLAPACHAQILLPA', 'MARCADEHORALOCAL', 'LOCALTIMESTAMP' ),
+	'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:' ),
+	'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' ),
+	'padright'                  => array( '0', 'PADPAÑA', 'PADALLIQ', 'PADRIGHT' ),
+	'special'                   => array( '0', 'sapaq', 'especial', 'special' ),
+	'defaultsort'               => array( '1', 'ALLINCHAY:', 'SIQINCHAY:', 'ORDENAR:', 'ORDENPREDETERMINADO:', 'CLAVEDEORDENPREDETERMINADO:', 'ORDENDECATEGORIAPREDETERMINADO:', 'ORDENDECATEGORÍAPREDETERMINADO:', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:' ),
+	'filepath'                  => array( '0', 'WILLAÑIQIÑAN', 'WILLANIQINAN', 'RUTAARCHIVO', 'RUTARCHIVO', 'RUTAARCHIVO:', 'RUTARCHIVO:', 'RUTADEARCHIVO:', 'FILEPATH:' ),
+	'tag'                       => array( '0', 'unanchacha', 'UNANCHACHA', 'etiqueta', 'ETIQUETA', 'tag' ),
+	'hiddencat'                 => array( '1', '__PAKASQAKATIGURIYA__', '__CATEGORÍAOCULTA__', '__HIDDENCAT__' ),
+	'pagesincategory'           => array( '1', 'KATIGURIYAPIPANQAKUNA', 'PÁGINASENCATEGORÍA', 'PÁGINASENCAT', 'PAGSENCAT', 'PAGINASENCATEGORIA', 'PAGINASENCAT', 'PAGESINCATEGORY', 'PAGESINCAT' ),
+	'pagesize'                  => array( '1', 'PANQACHHIKAN', 'PANQACHIKAN', 'PANQACHIKA', 'TAMAÑOPÁGINA', 'TAMAÑODEPÁGINA', 'TAMAÑOPAGINA', 'TAMAÑODEPAGINA', 'PAGESIZE' ),
+	'index'                     => array( '1', '__UNANCHAY__', '__INDEXAR__', '__INDEX__' ),
+	'noindex'                   => array( '1', '__AMAUNANCHAYCHU__', '__NOINDEXAR__', '__NOINDEX__' ),
+	'numberingroup'             => array( '1', 'HUÑUPIYUPAY', 'HUNUPIYUPAY', 'NÚMEROENGRUPO', 'NUMEROENGRUPO', 'NUMENGRUPO', 'NÚMENGRUPO', 'NUMBERINGROUP', 'NUMINGROUP' ),
+	'staticredirect'            => array( '1', '__TIYAQLLAPUSAPUNA__', '__REDIRECCIONESTATICA__', '__REDIRECCIÓNESTÁTICA__', '__STATICREDIRECT__' ),
+	'protectionlevel'           => array( '1', 'HAYKAAMACHAY', 'IMASINCHIAMACHAY', 'NIVELDEPROTECCIÓN', 'PROTECTIONLEVEL' ),
 );
 
 $messages = array(
diff --git a/languages/messages/MessagesRm.php b/languages/messages/MessagesRm.php
index ebc4dc54ef..fa744e368e 100644
--- a/languages/messages/MessagesRm.php
+++ b/languages/messages/MessagesRm.php
@@ -35,10 +35,10 @@ $namespaceNames = array(
 );
 
 $magicWords = array(
-	'redirect'                => array( '0', '#RENVIAMENT', '#REDIRECT' ),
-	'img_thumbnail'           => array( '1', 'miniatura', 'thumbnail', 'thumb' ),
-	'img_manualthumb'         => array( '1', 'miniatura=$1', 'thumbnail=$1', 'thumb=$1' ),
-	'img_upright'             => array( '1', 'sidretg', 'sidretg=$1', 'sidretg_$1', 'upright', 'upright=$1', 'upright $1' ),
+	'redirect'                  => array( '0', '#RENVIAMENT', '#REDIRECT' ),
+	'img_thumbnail'             => array( '1', 'miniatura', 'thumbnail', 'thumb' ),
+	'img_manualthumb'           => array( '1', 'miniatura=$1', 'thumbnail=$1', 'thumb=$1' ),
+	'img_upright'               => array( '1', 'sidretg', 'sidretg=$1', 'sidretg_$1', 'upright', 'upright=$1', 'upright $1' ),
 );
 
 $messages = array(
diff --git a/languages/messages/MessagesRo.php b/languages/messages/MessagesRo.php
index 81ba67f376..beed6e80ca 100644
--- a/languages/messages/MessagesRo.php
+++ b/languages/messages/MessagesRo.php
@@ -31,133 +31,133 @@
 $separatorTransformTable = array( ',' => ".", '.' => ',' );
 
 $magicWords = array(
-	'redirect'                => array( '0', '#REDIRECTEAZA', '#REDIRECT' ),
-	'notoc'                   => array( '0', '__FARACUPRINS__', '__NOTOC__' ),
-	'nogallery'               => array( '0', '__FARAGALERIE__', '__NOGALLERY__' ),
-	'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' ),
-	'currentmonthnamegen'     => array( '1', 'NUMELUNACURENTAGEN', 'CURRENTMONTHNAMEGEN' ),
-	'currentmonthabbrev'      => array( '1', 'LUNACURENTAABREV', 'CURRENTMONTHABBREV' ),
-	'currentday'              => array( '1', 'NUMARZIUACURENTA', 'CURRENTDAY' ),
-	'currentday2'             => array( '1', 'NUMARZIUACURENTA2', 'CURRENTDAY2' ),
-	'currentdayname'          => array( '1', 'NUMEZIUACURENTA', 'CURRENTDAYNAME' ),
-	'currentyear'             => array( '1', 'ANULCURENT', 'CURRENTYEAR' ),
-	'currenttime'             => array( '1', 'TIMPULCURENT', 'CURRENTTIME' ),
-	'currenthour'             => array( '1', 'ORACURENTA', 'CURRENTHOUR' ),
-	'localmonth'              => array( '1', 'LUNALOCALA', 'LUNALOCALA2', 'LOCALMONTH', 'LOCALMONTH2' ),
-	'localmonth1'             => array( '1', 'LUNALOCALA1', 'LOCALMONTH1' ),
-	'localmonthname'          => array( '1', 'NUMELUNALOCALA', 'LOCALMONTHNAME' ),
-	'localmonthnamegen'       => array( '1', 'NUMELUNALOCALAGEN', 'LOCALMONTHNAMEGEN' ),
-	'localmonthabbrev'        => array( '1', 'LUNALOCALAABREV', 'LOCALMONTHABBREV' ),
-	'localday'                => array( '1', 'ZIUALOCALA', 'LOCALDAY' ),
-	'localday2'               => array( '1', 'ZIUALOCALA2', 'LOCALDAY2' ),
-	'localdayname'            => array( '1', 'NUMEZIUALOCALA', 'LOCALDAYNAME' ),
-	'localyear'               => array( '1', 'ANULLOCAL', 'LOCALYEAR' ),
-	'localtime'               => array( '1', 'TIMPULLOCAL', 'LOCALTIME' ),
-	'localhour'               => array( '1', 'ORALOCALA', 'LOCALHOUR' ),
-	'numberofpages'           => array( '1', 'NUMARDEPAGINI', 'NUMBEROFPAGES' ),
-	'numberofarticles'        => array( '1', 'NUMARDEARTICOLE', 'NUMBEROFARTICLES' ),
-	'numberoffiles'           => array( '1', 'NUMARDEFISIERE', 'NUMBEROFFILES' ),
-	'numberofusers'           => array( '1', 'NUMARDEUTILIZATORI', 'NUMBEROFUSERS' ),
-	'numberofactiveusers'     => array( '1', 'NUMARDEUTILIZATORIACTIVI', 'NUMBEROFACTIVEUSERS' ),
-	'numberofedits'           => array( '1', 'NUMARDEMODIFICARI', 'NUMBEROFEDITS' ),
-	'numberofviews'           => array( '1', 'NUMARDEVIZUALIZARI', 'NUMBEROFVIEWS' ),
-	'pagename'                => array( '1', 'NUMEPAGINA', 'PAGENAME' ),
-	'pagenamee'               => array( '1', 'NUMEEPAGINA', 'PAGENAMEE' ),
-	'namespace'               => array( '1', 'SPATIUDENUME', 'NAMESPACE' ),
-	'namespacee'              => array( '1', 'SPATIUUDENUME', 'NAMESPACEE' ),
-	'talkspace'               => array( '1', 'SPATIUDEDISCUTIE', 'TALKSPACE' ),
-	'talkspacee'              => array( '1', 'SPATIUUDEDISCUTIE', 'TALKSPACEE' ),
-	'subjectspace'            => array( '1', 'SPATIUSUBIECT', 'SPATIUARTICOL', 'SUBJECTSPACE', 'ARTICLESPACE' ),
-	'subjectspacee'           => array( '1', 'SPATIUUSUBIECT', 'SPATIUUARTICOL', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
-	'fullpagename'            => array( '1', 'NUMEPAGINACOMPLET', 'FULLPAGENAME' ),
-	'fullpagenamee'           => array( '1', 'NUMEEPAGINACOMPLET', 'FULLPAGENAMEE' ),
-	'subpagename'             => array( '1', 'NUMESUBPAGINA', 'SUBPAGENAME' ),
-	'subpagenamee'            => array( '1', 'NUMEESUBPAGINA', 'SUBPAGENAMEE' ),
-	'basepagename'            => array( '1', 'NUMEDEBAZAPAGINA', 'BASEPAGENAME' ),
-	'basepagenamee'           => array( '1', 'NUMEEDEBAZAPAGINA', 'BASEPAGENAMEE' ),
-	'talkpagename'            => array( '1', 'NUMEPAGINADEDISCUTIE', 'TALKPAGENAME' ),
-	'talkpagenamee'           => array( '1', 'NUMEEPAGINADEDISCUTIE', 'TALKPAGENAMEE' ),
-	'subjectpagename'         => array( '1', 'NUMEPAGINASUBIECT', 'NUMEPAGINAARTICOL', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
-	'subjectpagenamee'        => array( '1', 'NUMEEPAGINASUBIECT', 'NUMEEPAGINAARTICOL', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
-	'msg'                     => array( '0', 'MSJ:', 'MSG:' ),
-	'msgnw'                   => array( '0', 'MSJNOU:', 'MSGNW:' ),
-	'img_thumbnail'           => array( '1', 'miniatura', 'mini', 'thumbnail', 'thumb' ),
-	'img_manualthumb'         => array( '1', 'miniatura=$1', 'mini=$1', 'thumbnail=$1', 'thumb=$1' ),
-	'img_right'               => array( '1', 'dreapta', 'right' ),
-	'img_left'                => array( '1', 'stanga', 'left' ),
-	'img_none'                => array( '1', 'nu', 'none' ),
-	'img_center'              => array( '1', 'centru', 'center', 'centre' ),
-	'img_framed'              => array( '1', 'cadru', 'framed', 'enframed', 'frame' ),
-	'img_frameless'           => array( '1', 'faracadru', 'frameless' ),
-	'img_page'                => array( '1', 'pagina=$1', 'pagina $1', 'page=$1', 'page $1' ),
-	'img_upright'             => array( '1', 'dreaptasus', 'dreaptasus=$1', 'dreaptasus $1', 'upright', 'upright=$1', 'upright $1' ),
-	'img_border'              => array( '1', 'chenar', 'border' ),
-	'img_baseline'            => array( '1', 'linia_de_bază', 'baseline' ),
-	'img_sub'                 => array( '1', 'indice', 'sub' ),
-	'img_super'               => array( '1', 'exponent', 'super', 'sup' ),
-	'img_top'                 => array( '1', 'sus', 'top' ),
-	'img_text_top'            => array( '1', 'text-sus', 'text-top' ),
-	'img_middle'              => array( '1', 'mijloc', 'middle' ),
-	'img_bottom'              => array( '1', 'jos', 'bottom' ),
-	'img_text_bottom'         => array( '1', 'text-jos', 'text-bottom' ),
-	'img_link'                => array( '1', 'legătură=$1', 'link=$1' ),
-	'sitename'                => array( '1', 'NUMESITE', 'SITENAME' ),
-	'ns'                      => array( '0', 'SN:', 'NS:' ),
-	'localurl'                => array( '0', 'URLLOCAL:', 'LOCALURL:' ),
-	'localurle'               => array( '0', 'URLLOCALE:', 'LOCALURLE:' ),
-	'servername'              => array( '0', 'NUMESERVER', 'SERVERNAME' ),
-	'scriptpath'              => array( '0', 'CALESCRIPT', 'SCRIPTPATH' ),
-	'grammar'                 => array( '0', 'GRAMATICA:', 'GRAMMAR:' ),
-	'gender'                  => array( '0', 'GEN:', 'GENDER:' ),
-	'notitleconvert'          => array( '0', '__FARACONVERTIRETITLU__', '__FCT__', '__NOTITLECONVERT__', '__NOTC__' ),
-	'nocontentconvert'        => array( '0', '__FARACONVERTIRECONTINUT__', '__FCC__', '__NOCONTENTCONVERT__', '__NOCC__' ),
-	'currentweek'             => array( '1', 'SAPTAMANACURENTA', 'CURRENTWEEK' ),
-	'localweek'               => array( '1', 'SAPTAMANALOCALA', 'LOCALWEEK' ),
-	'revisionid'              => array( '1', 'IDREVIZIE', 'REVISIONID' ),
-	'revisionday'             => array( '1', 'ZIREVIZIE', 'REVISIONDAY' ),
-	'revisionday2'            => array( '1', 'ZIREVIZIE2', 'REVISIONDAY2' ),
-	'revisionmonth'           => array( '1', 'LUNAREVIZIE', 'REVISIONMONTH' ),
-	'revisionyear'            => array( '1', 'ANREVIZIE', 'REVISIONYEAR' ),
-	'revisiontimestamp'       => array( '1', 'STAMPILATIMPREVIZIE', 'REVISIONTIMESTAMP' ),
-	'revisionuser'            => array( '1', 'UTILIZATORREVIZIE', 'REVISIONUSER' ),
-	'fullurl'                 => array( '0', 'URLCOMPLET:', 'FULLURL:' ),
-	'fullurle'                => array( '0', 'URLCOMPLETE:', 'FULLURLE:' ),
-	'lcfirst'                 => array( '0', 'MINUSCULAPRIMA:', 'LCFIRST:' ),
-	'ucfirst'                 => array( '0', 'MAJUSCULAPRIMA:', 'UCFIRST:' ),
-	'lc'                      => array( '0', 'MINUSCULA:', 'LC:' ),
-	'uc'                      => array( '0', 'MAJUSCULA:', 'UC:' ),
-	'raw'                     => array( '0', 'BRUT:', 'RAW:' ),
-	'displaytitle'            => array( '1', 'ARATATITLU', 'DISPLAYTITLE' ),
-	'newsectionlink'          => array( '1', '__LEGATURASECTIUNENOUA__', '__NEWSECTIONLINK__' ),
-	'nonewsectionlink'        => array( '1', '__FARALEGATURASECTIUNENOUA__', '__NONEWSECTIONLINK__' ),
-	'currentversion'          => array( '1', 'VERSIUNECURENTA', 'CURRENTVERSION' ),
-	'urlencode'               => array( '0', 'CODIFICAREURL:', 'URLENCODE:' ),
-	'anchorencode'            => array( '0', 'CODIFICAREANCORA', 'ANCHORENCODE' ),
-	'currenttimestamp'        => array( '1', 'STAMPILATIMPCURENT', 'CURRENTTIMESTAMP' ),
-	'localtimestamp'          => array( '1', 'STAMPILATIMPLOCAL', 'LOCALTIMESTAMP' ),
-	'directionmark'           => array( '1', 'SEMNDIRECTIE', 'DIRECTIONMARK', 'DIRMARK' ),
-	'language'                => array( '0', '#LIMBA:', '#LANGUAGE:' ),
-	'contentlanguage'         => array( '1', 'LIMBACONTINUT', 'CONTENTLANGUAGE', 'CONTENTLANG' ),
-	'pagesinnamespace'        => array( '1', 'PANIGIINSPATIULDENUME:', 'PAGINIINSN:', 'PAGESINNAMESPACE:', 'PAGESINNS:' ),
-	'numberofadmins'          => array( '1', 'NUMARADMINI', 'NUMBEROFADMINS' ),
-	'formatnum'               => array( '0', 'FORMATNR', 'FORMATNUM' ),
-	'defaultsort'             => array( '1', 'SORTAREIMPLICITA:', 'CHEIESORTAREIMPLICITA:', 'CATEGORIESORTAREIMPLICITA:', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:' ),
-	'filepath'                => array( '0', 'CALEAFISIERULUI:', 'FILEPATH:' ),
-	'tag'                     => array( '0', 'eticheta', 'tag' ),
-	'hiddencat'               => array( '1', '__ASCUNDECAT__', '__HIDDENCAT__' ),
-	'pagesincategory'         => array( '1', 'PAGINIINCATEGORIE', 'PAGINIINCAT', 'PAGESINCATEGORY', 'PAGESINCAT' ),
-	'pagesize'                => array( '1', 'MARIMEPAGINA', 'PAGESIZE' ),
-	'noindex'                 => array( '1', '__FARAINDEX__', '__NOINDEX__' ),
-	'numberingroup'           => array( '1', 'NUMARINGRUP', 'NUMINGRUP', 'NUMBERINGROUP', 'NUMINGROUP' ),
-	'staticredirect'          => array( '1', '__REDIRECTIONARESTATICA__', '__STATICREDIRECT__' ),
-	'protectionlevel'         => array( '1', 'NIVELPROTECTIE', 'PROTECTIONLEVEL' ),
-	'formatdate'              => array( '0', 'formatdata', 'dataformat', 'formatdate', 'dateformat' ),
+	'redirect'                  => array( '0', '#REDIRECTEAZA', '#REDIRECT' ),
+	'notoc'                     => array( '0', '__FARACUPRINS__', '__NOTOC__' ),
+	'nogallery'                 => array( '0', '__FARAGALERIE__', '__NOGALLERY__' ),
+	'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' ),
+	'currentmonthnamegen'       => array( '1', 'NUMELUNACURENTAGEN', 'CURRENTMONTHNAMEGEN' ),
+	'currentmonthabbrev'        => array( '1', 'LUNACURENTAABREV', 'CURRENTMONTHABBREV' ),
+	'currentday'                => array( '1', 'NUMARZIUACURENTA', 'CURRENTDAY' ),
+	'currentday2'               => array( '1', 'NUMARZIUACURENTA2', 'CURRENTDAY2' ),
+	'currentdayname'            => array( '1', 'NUMEZIUACURENTA', 'CURRENTDAYNAME' ),
+	'currentyear'               => array( '1', 'ANULCURENT', 'CURRENTYEAR' ),
+	'currenttime'               => array( '1', 'TIMPULCURENT', 'CURRENTTIME' ),
+	'currenthour'               => array( '1', 'ORACURENTA', 'CURRENTHOUR' ),
+	'localmonth'                => array( '1', 'LUNALOCALA', 'LUNALOCALA2', 'LOCALMONTH', 'LOCALMONTH2' ),
+	'localmonth1'               => array( '1', 'LUNALOCALA1', 'LOCALMONTH1' ),
+	'localmonthname'            => array( '1', 'NUMELUNALOCALA', 'LOCALMONTHNAME' ),
+	'localmonthnamegen'         => array( '1', 'NUMELUNALOCALAGEN', 'LOCALMONTHNAMEGEN' ),
+	'localmonthabbrev'          => array( '1', 'LUNALOCALAABREV', 'LOCALMONTHABBREV' ),
+	'localday'                  => array( '1', 'ZIUALOCALA', 'LOCALDAY' ),
+	'localday2'                 => array( '1', 'ZIUALOCALA2', 'LOCALDAY2' ),
+	'localdayname'              => array( '1', 'NUMEZIUALOCALA', 'LOCALDAYNAME' ),
+	'localyear'                 => array( '1', 'ANULLOCAL', 'LOCALYEAR' ),
+	'localtime'                 => array( '1', 'TIMPULLOCAL', 'LOCALTIME' ),
+	'localhour'                 => array( '1', 'ORALOCALA', 'LOCALHOUR' ),
+	'numberofpages'             => array( '1', 'NUMARDEPAGINI', 'NUMBEROFPAGES' ),
+	'numberofarticles'          => array( '1', 'NUMARDEARTICOLE', 'NUMBEROFARTICLES' ),
+	'numberoffiles'             => array( '1', 'NUMARDEFISIERE', 'NUMBEROFFILES' ),
+	'numberofusers'             => array( '1', 'NUMARDEUTILIZATORI', 'NUMBEROFUSERS' ),
+	'numberofactiveusers'       => array( '1', 'NUMARDEUTILIZATORIACTIVI', 'NUMBEROFACTIVEUSERS' ),
+	'numberofedits'             => array( '1', 'NUMARDEMODIFICARI', 'NUMBEROFEDITS' ),
+	'numberofviews'             => array( '1', 'NUMARDEVIZUALIZARI', 'NUMBEROFVIEWS' ),
+	'pagename'                  => array( '1', 'NUMEPAGINA', 'PAGENAME' ),
+	'pagenamee'                 => array( '1', 'NUMEEPAGINA', 'PAGENAMEE' ),
+	'namespace'                 => array( '1', 'SPATIUDENUME', 'NAMESPACE' ),
+	'namespacee'                => array( '1', 'SPATIUUDENUME', 'NAMESPACEE' ),
+	'talkspace'                 => array( '1', 'SPATIUDEDISCUTIE', 'TALKSPACE' ),
+	'talkspacee'                => array( '1', 'SPATIUUDEDISCUTIE', 'TALKSPACEE' ),
+	'subjectspace'              => array( '1', 'SPATIUSUBIECT', 'SPATIUARTICOL', 'SUBJECTSPACE', 'ARTICLESPACE' ),
+	'subjectspacee'             => array( '1', 'SPATIUUSUBIECT', 'SPATIUUARTICOL', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
+	'fullpagename'              => array( '1', 'NUMEPAGINACOMPLET', 'FULLPAGENAME' ),
+	'fullpagenamee'             => array( '1', 'NUMEEPAGINACOMPLET', 'FULLPAGENAMEE' ),
+	'subpagename'               => array( '1', 'NUMESUBPAGINA', 'SUBPAGENAME' ),
+	'subpagenamee'              => array( '1', 'NUMEESUBPAGINA', 'SUBPAGENAMEE' ),
+	'basepagename'              => array( '1', 'NUMEDEBAZAPAGINA', 'BASEPAGENAME' ),
+	'basepagenamee'             => array( '1', 'NUMEEDEBAZAPAGINA', 'BASEPAGENAMEE' ),
+	'talkpagename'              => array( '1', 'NUMEPAGINADEDISCUTIE', 'TALKPAGENAME' ),
+	'talkpagenamee'             => array( '1', 'NUMEEPAGINADEDISCUTIE', 'TALKPAGENAMEE' ),
+	'subjectpagename'           => array( '1', 'NUMEPAGINASUBIECT', 'NUMEPAGINAARTICOL', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
+	'subjectpagenamee'          => array( '1', 'NUMEEPAGINASUBIECT', 'NUMEEPAGINAARTICOL', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
+	'msg'                       => array( '0', 'MSJ:', 'MSG:' ),
+	'msgnw'                     => array( '0', 'MSJNOU:', 'MSGNW:' ),
+	'img_thumbnail'             => array( '1', 'miniatura', 'mini', 'thumbnail', 'thumb' ),
+	'img_manualthumb'           => array( '1', 'miniatura=$1', 'mini=$1', 'thumbnail=$1', 'thumb=$1' ),
+	'img_right'                 => array( '1', 'dreapta', 'right' ),
+	'img_left'                  => array( '1', 'stanga', 'left' ),
+	'img_none'                  => array( '1', 'nu', 'none' ),
+	'img_center'                => array( '1', 'centru', 'center', 'centre' ),
+	'img_framed'                => array( '1', 'cadru', 'framed', 'enframed', 'frame' ),
+	'img_frameless'             => array( '1', 'faracadru', 'frameless' ),
+	'img_page'                  => array( '1', 'pagina=$1', 'pagina $1', 'page=$1', 'page $1' ),
+	'img_upright'               => array( '1', 'dreaptasus', 'dreaptasus=$1', 'dreaptasus $1', 'upright', 'upright=$1', 'upright $1' ),
+	'img_border'                => array( '1', 'chenar', 'border' ),
+	'img_baseline'              => array( '1', 'linia_de_bază', 'baseline' ),
+	'img_sub'                   => array( '1', 'indice', 'sub' ),
+	'img_super'                 => array( '1', 'exponent', 'super', 'sup' ),
+	'img_top'                   => array( '1', 'sus', 'top' ),
+	'img_text_top'              => array( '1', 'text-sus', 'text-top' ),
+	'img_middle'                => array( '1', 'mijloc', 'middle' ),
+	'img_bottom'                => array( '1', 'jos', 'bottom' ),
+	'img_text_bottom'           => array( '1', 'text-jos', 'text-bottom' ),
+	'img_link'                  => array( '1', 'legătură=$1', 'link=$1' ),
+	'sitename'                  => array( '1', 'NUMESITE', 'SITENAME' ),
+	'ns'                        => array( '0', 'SN:', 'NS:' ),
+	'localurl'                  => array( '0', 'URLLOCAL:', 'LOCALURL:' ),
+	'localurle'                 => array( '0', 'URLLOCALE:', 'LOCALURLE:' ),
+	'servername'                => array( '0', 'NUMESERVER', 'SERVERNAME' ),
+	'scriptpath'                => array( '0', 'CALESCRIPT', 'SCRIPTPATH' ),
+	'grammar'                   => array( '0', 'GRAMATICA:', 'GRAMMAR:' ),
+	'gender'                    => array( '0', 'GEN:', 'GENDER:' ),
+	'notitleconvert'            => array( '0', '__FARACONVERTIRETITLU__', '__FCT__', '__NOTITLECONVERT__', '__NOTC__' ),
+	'nocontentconvert'          => array( '0', '__FARACONVERTIRECONTINUT__', '__FCC__', '__NOCONTENTCONVERT__', '__NOCC__' ),
+	'currentweek'               => array( '1', 'SAPTAMANACURENTA', 'CURRENTWEEK' ),
+	'localweek'                 => array( '1', 'SAPTAMANALOCALA', 'LOCALWEEK' ),
+	'revisionid'                => array( '1', 'IDREVIZIE', 'REVISIONID' ),
+	'revisionday'               => array( '1', 'ZIREVIZIE', 'REVISIONDAY' ),
+	'revisionday2'              => array( '1', 'ZIREVIZIE2', 'REVISIONDAY2' ),
+	'revisionmonth'             => array( '1', 'LUNAREVIZIE', 'REVISIONMONTH' ),
+	'revisionyear'              => array( '1', 'ANREVIZIE', 'REVISIONYEAR' ),
+	'revisiontimestamp'         => array( '1', 'STAMPILATIMPREVIZIE', 'REVISIONTIMESTAMP' ),
+	'revisionuser'              => array( '1', 'UTILIZATORREVIZIE', 'REVISIONUSER' ),
+	'fullurl'                   => array( '0', 'URLCOMPLET:', 'FULLURL:' ),
+	'fullurle'                  => array( '0', 'URLCOMPLETE:', 'FULLURLE:' ),
+	'lcfirst'                   => array( '0', 'MINUSCULAPRIMA:', 'LCFIRST:' ),
+	'ucfirst'                   => array( '0', 'MAJUSCULAPRIMA:', 'UCFIRST:' ),
+	'lc'                        => array( '0', 'MINUSCULA:', 'LC:' ),
+	'uc'                        => array( '0', 'MAJUSCULA:', 'UC:' ),
+	'raw'                       => array( '0', 'BRUT:', 'RAW:' ),
+	'displaytitle'              => array( '1', 'ARATATITLU', 'DISPLAYTITLE' ),
+	'newsectionlink'            => array( '1', '__LEGATURASECTIUNENOUA__', '__NEWSECTIONLINK__' ),
+	'nonewsectionlink'          => array( '1', '__FARALEGATURASECTIUNENOUA__', '__NONEWSECTIONLINK__' ),
+	'currentversion'            => array( '1', 'VERSIUNECURENTA', 'CURRENTVERSION' ),
+	'urlencode'                 => array( '0', 'CODIFICAREURL:', 'URLENCODE:' ),
+	'anchorencode'              => array( '0', 'CODIFICAREANCORA', 'ANCHORENCODE' ),
+	'currenttimestamp'          => array( '1', 'STAMPILATIMPCURENT', 'CURRENTTIMESTAMP' ),
+	'localtimestamp'            => array( '1', 'STAMPILATIMPLOCAL', 'LOCALTIMESTAMP' ),
+	'directionmark'             => array( '1', 'SEMNDIRECTIE', 'DIRECTIONMARK', 'DIRMARK' ),
+	'language'                  => array( '0', '#LIMBA:', '#LANGUAGE:' ),
+	'contentlanguage'           => array( '1', 'LIMBACONTINUT', 'CONTENTLANGUAGE', 'CONTENTLANG' ),
+	'pagesinnamespace'          => array( '1', 'PANIGIINSPATIULDENUME:', 'PAGINIINSN:', 'PAGESINNAMESPACE:', 'PAGESINNS:' ),
+	'numberofadmins'            => array( '1', 'NUMARADMINI', 'NUMBEROFADMINS' ),
+	'formatnum'                 => array( '0', 'FORMATNR', 'FORMATNUM' ),
+	'defaultsort'               => array( '1', 'SORTAREIMPLICITA:', 'CHEIESORTAREIMPLICITA:', 'CATEGORIESORTAREIMPLICITA:', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:' ),
+	'filepath'                  => array( '0', 'CALEAFISIERULUI:', 'FILEPATH:' ),
+	'tag'                       => array( '0', 'eticheta', 'tag' ),
+	'hiddencat'                 => array( '1', '__ASCUNDECAT__', '__HIDDENCAT__' ),
+	'pagesincategory'           => array( '1', 'PAGINIINCATEGORIE', 'PAGINIINCAT', 'PAGESINCATEGORY', 'PAGESINCAT' ),
+	'pagesize'                  => array( '1', 'MARIMEPAGINA', 'PAGESIZE' ),
+	'noindex'                   => array( '1', '__FARAINDEX__', '__NOINDEX__' ),
+	'numberingroup'             => array( '1', 'NUMARINGRUP', 'NUMINGRUP', 'NUMBERINGROUP', 'NUMINGROUP' ),
+	'staticredirect'            => array( '1', '__REDIRECTIONARESTATICA__', '__STATICREDIRECT__' ),
+	'protectionlevel'           => array( '1', 'NIVELPROTECTIE', 'PROTECTIONLEVEL' ),
+	'formatdate'                => array( '0', 'formatdata', 'dataformat', 'formatdate', 'dateformat' ),
 );
 
 $namespaceNames = array(
@@ -1539,10 +1539,10 @@ Dacă decideți furnizarea sa, acesta va fi folosit pentru a vă atribui munca.'
 'right-createtalk' => 'Creează pagini de discuție',
 'right-createaccount' => 'Creează conturi noi',
 'right-minoredit' => 'Marchează modificările minore',
-'right-move' => 'Mută paginile',
-'right-move-subpages' => 'Mută paginile cu tot cu subpagini',
+'right-move' => 'Redenumește paginile',
+'right-move-subpages' => 'Redenumește paginile cu tot cu subpagini',
 'right-move-rootuserpages' => 'Redenumește pagina principală a unui utilizator',
-'right-movefile' => 'Mută fișierele',
+'right-movefile' => 'Redenumește fișiere',
 'right-suppressredirect' => 'Nu crea o redirecționare de la vechiul nume atunci când muți o pagină',
 'right-upload' => 'Încarcă fișiere',
 'right-reupload' => 'Suprascrie un fișier existent',
@@ -1608,16 +1608,16 @@ Dacă decideți furnizarea sa, acesta va fi folosit pentru a vă atribui munca.'
 'action-createtalk' => 'creați pagini de discuție',
 'action-createaccount' => 'creați acest cont de utilizator',
 'action-minoredit' => 'marcați această modificare ca minoră',
-'action-move' => 'mutați această pagină',
-'action-move-subpages' => 'mutați această pagină și subpaginile sale',
+'action-move' => 'redenumiți această pagină',
+'action-move-subpages' => 'redenumiți această pagină și subpaginile sale',
 'action-move-rootuserpages' => 'redenumiți pagina principală a unui utilizator',
-'action-movefile' => 'mutați acest fișier',
+'action-movefile' => 'redenumiți acest fișier',
 'action-upload' => 'încărcați acest fișier',
 'action-reupload' => 'suprascrieți fișierul existent',
 'action-reupload-shared' => 'rescrieți acest fișier în depozitul partajat',
 'action-upload_by_url' => 'încărcați acest fișier de la o adresă URL',
 'action-writeapi' => 'utilizați scrierea prin API',
-'action-delete' => 'șterge această pagină',
+'action-delete' => 'ștergeți această pagină',
 'action-deleterevision' => 'ștergeți această versiune',
 'action-deletedhistory' => 'vizualizați istoricul șters al aceste pagini',
 'action-browsearchive' => 'căutați pagini șterse',
@@ -2153,12 +2153,12 @@ Intrările <del>tăiate</del> au fost rezolvate.',
 'newpages-username' => 'Nume de utilizator:',
 'ancientpages' => 'Cele mai vechi articole',
 'move' => 'Redenumire',
-'movethispage' => 'Mută această pagină',
+'movethispage' => 'Redenumește această pagină',
 'unusedimagestext' => 'Următoarele fișiere există dar nu sunt incluse în nicio altă pagină.
 Vă rugăm să aveți în vedere faptul că alte saituri web pot avea o legătură directă către acest URL și s-ar putea afla aici chiar dacă nu sunt în utlizare activă.',
 'unusedcategoriestext' => 'Următoarele categorii de pagini există și totuși nici un articol sau categorie nu le folosește.',
 'notargettitle' => 'Lipsă țintă',
-'notargettext' => 'Nu ai specificat nici o pagină sau un utilizator țintă pentru care să se efectueze această operațiune.',
+'notargettext' => 'Nu ați specificat nici o pagină sau un utilizator țintă pentru care să se efectueze această operațiune.',
 'nopagetitle' => 'Nu există pagina destinație',
 'nopagetext' => 'Pagina destinație specificată nu există.',
 'pager-newer-n' => '{{PLURAL:$1|1 mai nou|$1 mai noi}}',
@@ -2495,9 +2495,9 @@ Puteți schimba nivelul de protejare al acestei pagini, dar asta nu va afecta pr
 
 # Restrictions (nouns)
 'restriction-edit' => 'Modificare',
-'restriction-move' => 'Mută',
-'restriction-create' => 'Creează',
-'restriction-upload' => 'Încarcă',
+'restriction-move' => 'Redenumire',
+'restriction-create' => 'Creare',
+'restriction-upload' => 'Încărcare',
 
 # Restriction levels
 'restriction-level-sysop' => 'protejat complet',
@@ -2518,7 +2518,7 @@ Pentru a realiza o recuperare selectivă bifați versiunile pe care doriți să
 'undeleterevdel' => "Restaurarea unui versiuni nu va fi efectuată dacă ea va apărea în capul listei de versiuni parțial șterse.
 În acest caz, trebuie să debifați sau să reafișați (''unhide'') cea mai recentă versiune ștearsă.",
 'undeletehistorynoadmin' => 'Acest articol a fost șters. Motivul ștergerii apare mai jos, alături de detaliile utilzatorilor care au editat această pagină înainte de ștergere. Textul prorpiu-zis al reviziilor șterse este disponibil doar administratorilor.',
-'undelete-revision' => 'Ştergere revizia $1 (din $4 $5) de către $3:',
+'undelete-revision' => 'Ștergere versiunea $1 (din $4 $5) de către $3:',
 'undeleterevision-missing' => 'Versiune lipsă sau invalidă.
 S-ar putea ca legătura să fie greșită, ori versiunea să fi fost restaurată sau ștearsă din arhivă.',
 'undelete-nodiff' => 'Nu s-a găsit vreo versiune anterioară.',
@@ -2763,22 +2763,22 @@ Pentru a închide sau deschide baza de date, acesta trebuie să poată fi scris
 'lockedbyandtime' => '(de $1, pe $2, la $3 )',
 
 # Move page
-'move-page' => 'Mută $1',
-'move-page-legend' => 'Mută pagina',
-'movepagetext' => "Puteți folosi formularul de mai jos pentru a redenumi o pagină, mutându-i toată istoria sub noul nume.
+'move-page' => 'Redenumire $1',
+'move-page-legend' => 'Redenumire pagină',
+'movepagetext' => "Puteți folosi formularul de mai jos pentru a redenumi o pagină, mutându-i tot istoricul sub noul nume.
 Pagina veche va deveni o pagină de redirecționare către pagina nouă.
 Legăturile către pagina veche nu vor fi redirecționate către cea nouă;
 nu uitați să verificați dacă nu există redirecționări [[Special:DoubleRedirects|duble]] sau [[Special:BrokenRedirects|invalide]].
 
 Vă rugăm să rețineți că sunteți responsabil(ă) pentru a face legăturile vechi să rămână valide.
 
-Rețineți că pagina '''nu va fi mutată''' dacă există deja o pagină cu noul titlu, în afară de cazul că este complet goală sau este
-o redirecționare și în plus nu are nici o istorie de modificare.
-Cu alte cuvinte, veți putea muta înapoi o pagină pe care ați mutat-o greșit, dar nu veți putea suprascrie o pagină validă existentă prin mutarea alteia.
+Rețineți că pagina '''nu va fi redenumită''' dacă există deja o pagină cu noul titlu, în afara cazurilor în care cea din urmă nu are conținut sau este deja
+o redirecționare; în plus, aceasta nu trebuie să aibă un istoric de modificări.
+Cu alte cuvinte, veți putea redenumi înapoi o pagină pe care ați redenumit-o greșit, dar nu veți putea suprascrie o pagină validă existentă prin redenumirea alteia.
 
 '''ATENȚIE!'''
 Aceasta poate fi o schimbare drastică și neașteptată pentru o pagină populară;
-vă rugăm, să vă asigurați că înțelegeți toate consecințele înainte de a continua.",
+vă rugăm să vă asigurați că înțelegeți toate consecințele înainte de a continua.",
 'movepagetext-noredirectfixer' => "Completând formularul de mai jos veți redenumi o pagină, mutând tot istoricul la noul nume.
 Vechiul titlu va deveni o pagină de redirecționare către noul titlu.
 Fiți sigur că ați verificat lista redirecționărilor [[Special:DoubleRedirects|duble]] sau [[Special:BrokenRedirects|nefuncționale]].
@@ -2790,43 +2790,42 @@ Acest lucru înseamnă că veți putea redenumi la titlul inițial o pagină gre
 '''Atenție!'''
 Această acțiune poate determina o schimbare dramatică, neașteptată pentru o pagină cu trafic crescut;
 asigurați-vă că înțelegeți toate consecințele înainte de a continua.",
-'movepagetalktext' => "Pagina asociată de discuții, dacă există, va fi mutată
-automat odată cu aceasta '''afară de cazul că''':
-* Mutați pagina în altă secțiune a {{SITENAME}}
-* Există deja o pagină de discuții cu conținut (care nu este goală), sau
-* Nu confirmi căsuța de mai jos.
-
-În oricare din cazurile de mai sus va trebui să muți sau să unifici
-manual paginile de discuții, dacă dorești acest lucru.",
+'movepagetalktext' => "Pagina de discuții asociată, dacă există, va fi redenumită
+automat odată cu aceasta în '''afara următoarelor cazuri''':
+* există deja o pagină de discuții cu conținut (care nu este goală) sub noul nume, sau
+* nu bifați căsuța de mai jos.
+
+În oricare din cazurile de mai sus va trebui să redenumiți sau să unificați
+manual paginile de discuții, dacă doriți acest lucru.",
 'movearticle' => 'Pagina de redenumit:',
 'moveuserpage-warning' => "'''Atenție''': sunteți pe cale să redenumiți o pagină de utilizator. Vă rugăm să rețineți că singura redenumită va fi pagina, nu și utilizatorul.",
 'movenologin' => 'Nu sunteți autentificat{{GENDER:||ă}}.',
-'movenologintext' => 'Trebuie să fii un utilizator înregistrat și să te [[Special:UserLogin|autentifici]] pentru a muta o pagină.',
-'movenotallowed' => 'Nu ai permisiunea să muți pagini.',
-'movenotallowedfile' => 'Nu ai permisiunea de a muta fișiere.',
-'cant-move-user-page' => 'Nu ai permisiunea de a muta paginile utilizatorului (în afară de subpagini).',
-'cant-move-to-user-page' => 'Nu aveți permisiunea de a muta o pagină în pagina utilizatorului (cu excepția subpaginii utilizatorului).',
+'movenologintext' => 'Trebuie să fiți un utilizator înregistrat și [[Special:UserLogin|autentificat]] pentru a redenumi o pagină.',
+'movenotallowed' => 'Nu aveți permisiunea de a redenumi pagini.',
+'movenotallowedfile' => 'Nu aveți permisiunea de a redenumi fișiere.',
+'cant-move-user-page' => 'Nu aveți permisiunea de a redenumi pagini de utilizator (cu excepția subpaginilor).',
+'cant-move-to-user-page' => 'Nu aveți permisiunea de a redenumi o pagină într-o pagină de utilizator (cu excepția subpaginii utilizatorului).',
 'newtitle' => 'Titlul nou',
 'move-watch' => 'Urmărește această pagină',
-'movepagebtn' => 'Mută pagina',
-'pagemovedsub' => 'Pagina a fost mutată',
-'movepage-moved' => "'''Pagina „$1” a fost mutată la „$2”'''",
+'movepagebtn' => 'Redenumește pagina',
+'pagemovedsub' => 'Pagina a fost redenumită',
+'movepage-moved' => "'''Pagina „$1” a fost redenumită în „$2”'''",
 'movepage-moved-redirect' => 'O redirecționare a fost creată.',
 'movepage-moved-noredirect' => 'Crearea redirecționărilor a fost suprimată.',
 'articleexists' => 'O pagină cu același nume există deja, sau numele pe care l-ați ales este invalid. Sunteți rugat să alegeți un alt nume.',
-'cantmove-titleprotected' => 'Nu puteți muta o pagină la această locație, pentru că noul titlu a fost protejat la creare',
-'talkexists' => "'''Pagina în sine a fost mutată cu succes, dar pagina de discuții nu a putut fi mutată deoarece o alta deja există la noul titlu.
-Te rugăm să le unifici manual.'''",
-'movedto' => 'mutată la',
+'cantmove-titleprotected' => 'Nu puteți redenumi o pagină cu acest nume, pentru că noul titlu a fost protejat la creare.',
+'talkexists' => "'''Pagina în sine a fost redenumită cu succes, dar pagina de discuții nu a putut fi redenumită deoarece o alta deja există la noul titlu.
+Vă rugăm să le unificați manual.'''",
+'movedto' => 'redenumită în',
 'movetalk' => 'Redenumește pagina de discuții asociată',
-'move-subpages' => 'Mută subpaginile (până la $1)',
-'move-talk-subpages' => 'Mută subpaginile paginii de discuții (până la $1)',
+'move-subpages' => 'Redenumește subpaginile (până la $1)',
+'move-talk-subpages' => 'Redenumește subpaginile paginii de discuții (până la $1)',
 'movepage-page-exists' => 'Pagina $1 există deja și nu poate fi rescrisă automat.',
-'movepage-page-moved' => 'Pagina $1 a fost mutată la $2.',
-'movepage-page-unmoved' => 'Pagina $1 nu a putut fi mutată la $2.',
-'movepage-max-pages' => 'Maxim $1 {{PLURAL:$1|pagină a fost mutată|pagini au fost mutate}}, nicio altă pagină nu va mai fi mutată automat.',
-'movelogpage' => 'Jurnal mutări',
-'movelogpagetext' => 'Mai jos se află o listă cu paginile mutate.',
+'movepage-page-moved' => 'Pagina $1 a fost redenumită în $2.',
+'movepage-page-unmoved' => 'Pagina $1 nu a putut fi redenumită în $2.',
+'movepage-max-pages' => 'Maximul de $1 {{PLURAL:$1|pagină redenumită|pagini redenumite|de pagini redenumite}} a fost atins și nici o altă pagină nu va mai fi redenumită automat.',
+'movelogpage' => 'Jurnal redenumiri',
+'movelogpagetext' => 'Mai jos se află o listă cu paginile redenumite.',
 'movesubpage' => '{{PLURAL:$1|Subpagină|Subpagini}}',
 'movesubpagetext' => 'Această pagină are $1 {{PLURAL:$1|subpagină afișată|subpagini afișate}} mai jos.',
 'movenosubpage' => 'Această pagină nu are subpagini.',
@@ -2838,12 +2837,12 @@ Te rugăm să le unifici manual.'''",
 Pagina destinație „[[:$1]]” există deja. Doriți să o ștergeți pentru a face loc redenumirii?',
 'delete_and_move_confirm' => 'Da, șterge pagina.',
 'delete_and_move_reason' => 'Șters pentru a face loc redenumirii paginii „[[$1]]”',
-'selfmove' => 'Titlurile sursei și ale destinației sunt aceleași; nu puteți muta o pagină peste ea însăși.',
+'selfmove' => 'Titlul sursei și al destinației este aceleași; nu puteți redenumi o pagină peste ea însăși.',
 'immobile-source-namespace' => 'Nu se pot redenumi paginile din spațiul de nume „$1”',
 'immobile-target-namespace' => 'Nu se pot redenumi paginile în spațiul de nume „$1”',
 'immobile-target-namespace-iw' => 'Legătura interwiki nu este o țintă validă pentru redenumire.',
-'immobile-source-page' => 'Această pagină nu poate fi mutată.',
-'immobile-target-page' => 'Nu poate fi mutat la destinația cu acest titlu.',
+'immobile-source-page' => 'Această pagină nu poate fi redenumită.',
+'immobile-target-page' => 'Imposibil de redenumit pagina la acel titlu.',
 'imagenocrossnamespace' => 'Fișierul nu poate fi mutat la un spațiu de nume care nu este destinat fișierelor',
 'nonfile-cannot-move-to-file' => 'Entitatea (care nu este un fișier) nu poate fi mutată în spațiul de nume destinat fișierelor',
 'imagetypemismatch' => 'Extensia nouă a fișierului nu se potrivește cu tipul acestuia',
@@ -3112,7 +3111,7 @@ Permite adăugarea unui motiv în descrierea modificărilor',
 'pageinfo-authors' => 'Număr total de autori distincți',
 'pageinfo-recent-edits' => 'Număr de modificări recente (în ultima perioadă de $1)',
 'pageinfo-recent-authors' => 'Număr de autori distincți recenți',
-'pageinfo-restriction' => 'Protecție pagină (<code>$1</code>)',
+'pageinfo-restriction' => 'Protecție pagină (<code>{{lcfirst:$1}}</code>)',
 'pageinfo-magic-words' => '{{PLURAL:$1|Cuvânt magic|Cuvinte magice}} ($1)',
 'pageinfo-hidden-categories' => '{{PLURAL:$1|Categorie ascunsă|Categorii ascunse}} ($1)',
 'pageinfo-templates' => '{{PLURAL:$1|Format inclus|Formate incluse}} ($1)',
diff --git a/languages/messages/MessagesRoa_tara.php b/languages/messages/MessagesRoa_tara.php
index 78dc240fb6..466631f552 100644
--- a/languages/messages/MessagesRoa_tara.php
+++ b/languages/messages/MessagesRoa_tara.php
@@ -2900,17 +2900,26 @@ Stu fatte ha state causate da 'nu collegamende a 'nu site esterne ca appartene a
 
 # Info page
 'pageinfo-title' => '\'Mbormaziune pe "$1"',
+'pageinfo-header-basic' => "'Mbormaziune 'nderra-'nderre",
 'pageinfo-header-edits' => 'Cunde de le cangiaminde',
+'pageinfo-header-properties' => "Probbietà d'a pàgene",
+'pageinfo-display-title' => "Fà vedè 'u titole",
 'pageinfo-article-id' => "ID d'a pàgene",
+'pageinfo-robot-policy' => "State d'u motore de ricerche",
 'pageinfo-robot-index' => 'Indicizzabbele',
 'pageinfo-robot-noindex' => 'None indicizzabbele',
 'pageinfo-views' => 'Numere de visite',
 'pageinfo-watchers' => "Numere de visitature d'a pàgene",
 'pageinfo-redirects-name' => 'Redirezionaminde a sta pàgene',
 'pageinfo-redirects-value' => '$1',
+'pageinfo-subpages-name' => 'Sottopàggene de sta pàgene',
 'pageinfo-firstuser' => "Ccrejatore d'a pàgene",
+'pageinfo-firsttime' => "Date d'a ccrejazione d'a pàgene",
+'pageinfo-lastuser' => 'Urteme cangiatore',
+'pageinfo-lasttime' => "Darte de l'urteme cangiamende",
 'pageinfo-edits' => 'Numere totale de cangiaminde',
 'pageinfo-authors' => 'Numere Totale de autore diverse',
+'pageinfo-magic-words' => '{{PLURAL:$1|Parole|Parole}} maggiche ($1)',
 
 # Skin names
 'skinname-standard' => 'Classeche',
diff --git a/languages/messages/MessagesRu.php b/languages/messages/MessagesRu.php
index e73b8c239f..be9b03d5f6 100644
--- a/languages/messages/MessagesRu.php
+++ b/languages/messages/MessagesRu.php
@@ -59,6 +59,7 @@
  * @author Rave
  * @author Rubin
  * @author Sagan
+ * @author Shirayuki
  * @author Sk
  * @author TarzanASG
  * @author Temuri rajavi
@@ -189,154 +190,154 @@ $specialPageAliases = 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__' ),
-	'noheader'                => array( '0', '__БЕЗ_ЗАГОЛОВКА__', '__NOHEADER__' ),
-	'currentmonth'            => array( '1', 'ТЕКУЩИЙ_МЕСЯЦ', 'ТЕКУЩИЙ_МЕСЯЦ_2', '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' ),
-	'localmonth'              => array( '1', 'МЕСТНЫЙ_МЕСЯЦ', 'МЕСТНЫЙ_МЕСЯЦ_2', 'LOCALMONTH', 'LOCALMONTH2' ),
-	'localmonth1'             => array( '1', 'МЕСТНЫЙ_МЕСЯЦ_1', 'LOCALMONTH1' ),
-	'localmonthname'          => array( '1', 'НАЗВАНИЕ_МЕСТНОГО_МЕСЯЦА', 'LOCALMONTHNAME' ),
-	'localmonthnamegen'       => array( '1', 'НАЗВАНИЕ_МЕСТНОГО_МЕСЯЦА_РОД', 'LOCALMONTHNAMEGEN' ),
-	'localmonthabbrev'        => array( '1', 'НАЗВАНИЕ_МЕСТНОГО_МЕСЯЦА_АБР', 'LOCALMONTHABBREV' ),
-	'localday'                => array( '1', 'МЕСТНЫЙ_ДЕНЬ', 'LOCALDAY' ),
-	'localday2'               => array( '1', 'МЕСТНЫЙ_ДЕНЬ_2', 'LOCALDAY2' ),
-	'localdayname'            => array( '1', 'НАЗВАНИЕ_МЕСТНОГО_ДНЯ', 'LOCALDAYNAME' ),
-	'localyear'               => array( '1', 'МЕСТНЫЙ_ГОД', 'LOCALYEAR' ),
-	'localtime'               => array( '1', 'МЕСТНОЕ_ВРЕМЯ', 'LOCALTIME' ),
-	'localhour'               => array( '1', 'МЕСТНЫЙ_ЧАС', 'LOCALHOUR' ),
-	'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', 'НАЗВАНИЕ_СТРАНИЦЫ_2', 'PAGENAMEE' ),
-	'namespace'               => array( '1', 'ПРОСТРАНСТВО_ИМЁН', 'NAMESPACE' ),
-	'namespacee'              => array( '1', 'ПРОСТРАНСТВО_ИМЁН_2', 'NAMESPACEE' ),
-	'talkspace'               => array( '1', 'ПРОСТРАНСТВО_ОБСУЖДЕНИЙ', 'TALKSPACE' ),
-	'talkspacee'              => array( '1', 'ПРОСТРАНСТВО_ОБСУЖДЕНИЙ_2', 'TALKSPACEE' ),
-	'subjectspace'            => array( '1', 'ПРОСТРАНСТВО_СТАТЕЙ', 'SUBJECTSPACE', 'ARTICLESPACE' ),
-	'subjectspacee'           => array( '1', 'ПРОСТРАНСТВО_СТАТЕЙ_2', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
-	'fullpagename'            => array( '1', 'ПОЛНОЕ_НАЗВАНИЕ_СТРАНИЦЫ', 'FULLPAGENAME' ),
-	'fullpagenamee'           => array( '1', 'ПОЛНОЕ_НАЗВАНИЕ_СТРАНИЦЫ_2', 'FULLPAGENAMEE' ),
-	'subpagename'             => array( '1', 'НАЗВАНИЕ_ПОДСТРАНИЦЫ', 'SUBPAGENAME' ),
-	'subpagenamee'            => array( '1', 'НАЗВАНИЕ_ПОДСТРАНИЦЫ_2', 'SUBPAGENAMEE' ),
-	'basepagename'            => array( '1', 'ОСНОВА_НАЗВАНИЯ_СТРАНИЦЫ', 'BASEPAGENAME' ),
-	'basepagenamee'           => array( '1', 'ОСНОВА_НАЗВАНИЯ_СТРАНИЦЫ_2', 'BASEPAGENAMEE' ),
-	'talkpagename'            => array( '1', 'НАЗВАНИЕ_СТРАНИЦЫ_ОБСУЖДЕНИЯ', 'TALKPAGENAME' ),
-	'talkpagenamee'           => array( '1', 'НАЗВАНИЕ_СТРАНИЦЫ_ОБСУЖДЕНИЯ_2', 'TALKPAGENAMEE' ),
-	'subjectpagename'         => array( '1', 'НАЗВАНИЕ_СТРАНИЦЫ_СТАТЬИ', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
-	'subjectpagenamee'        => array( '1', 'НАЗВАНИЕ_СТРАНИЦЫ_СТАТЬИ_2', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
-	'msg'                     => array( '0', 'СООБЩЕНИЕ:', 'СООБЩ:', 'MSG:' ),
-	'subst'                   => array( '0', 'ПОДСТАНОВКА:', 'ПОДСТ:', 'SUBST:' ),
-	'safesubst'               => array( '0', 'ЗАЩПОДСТ:', 'SAFESUBST:' ),
-	'msgnw'                   => array( '0', 'СООБЩ_БЕЗ_ВИКИ:', 'MSGNW:' ),
-	'img_thumbnail'           => array( '1', 'мини', 'миниатюра', 'thumbnail', 'thumb' ),
-	'img_manualthumb'         => array( '1', 'мини=$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пкс', '$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_upright'             => array( '1', 'сверхусправа', 'сверхусправа=$1', 'сверхусправа $1', 'upright', 'upright=$1', 'upright $1' ),
-	'img_border'              => array( '1', 'граница', 'border' ),
-	'img_baseline'            => array( '1', 'основание', 'baseline' ),
-	'img_sub'                 => array( '1', 'под', 'sub' ),
-	'img_super'               => array( '1', 'над', 'super', 'sup' ),
-	'img_top'                 => array( '1', 'сверху', 'top' ),
-	'img_text_top'            => array( '1', 'текст-сверху', 'text-top' ),
-	'img_middle'              => array( '1', 'посередине', 'middle' ),
-	'img_bottom'              => array( '1', 'снизу', 'bottom' ),
-	'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:' ),
-	'sitename'                => array( '1', 'НАЗВАНИЕ_САЙТА', 'SITENAME' ),
-	'ns'                      => array( '0', 'ПИ:', 'NS:' ),
-	'nse'                     => array( '0', 'ПИК:', 'NSE:' ),
-	'localurl'                => array( '0', 'ЛОКАЛЬНЫЙ_АДРЕС:', 'LOCALURL:' ),
-	'localurle'               => array( '0', 'ЛОКАЛЬНЫЙ_АДРЕС_2:', 'LOCALURLE:' ),
-	'articlepath'             => array( '0', 'ПУТЬ_К_СТАТЬЕ', 'ARTICLEPATH' ),
-	'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__' ),
-	'currentweek'             => array( '1', 'ТЕКУЩАЯ_НЕДЕЛЯ', 'CURRENTWEEK' ),
-	'currentdow'              => array( '1', 'ТЕКУЩИЙ_ДЕНЬ_НЕДЕЛИ', 'CURRENTDOW' ),
-	'localweek'               => array( '1', 'МЕСТНАЯ_НЕДЕЛЯ', 'LOCALWEEK' ),
-	'localdow'                => array( '1', 'МЕСТНЫЙ_ДЕНЬ_НЕДЕЛИ', 'LOCALDOW' ),
-	'revisionid'              => array( '1', 'ИД_ВЕРСИИ', 'REVISIONID' ),
-	'revisionday'             => array( '1', 'ДЕНЬ_ВЕРСИИ', 'REVISIONDAY' ),
-	'revisionday2'            => array( '1', 'ДЕНЬ_ВЕРСИИ_2', 'REVISIONDAY2' ),
-	'revisionmonth'           => array( '1', 'МЕСЯЦ_ВЕРСИИ', 'REVISIONMONTH' ),
-	'revisionmonth1'          => array( '1', 'МЕСЯЦ_ВЕРСИИ_1', 'REVISIONMONTH1' ),
-	'revisionyear'            => array( '1', 'ГОД_ВЕРСИИ', 'REVISIONYEAR' ),
-	'revisiontimestamp'       => array( '1', 'ОТМЕТКА_ВРЕМЕНИ_ВЕРСИИ', 'REVISIONTIMESTAMP' ),
-	'revisionuser'            => array( '1', 'ВЕРСИЯ_УЧАСНИКА', 'REVISIONUSER' ),
-	'plural'                  => array( '0', 'МНОЖЕСТВЕННОЕ_ЧИСЛО:', 'PLURAL:' ),
-	'fullurl'                 => array( '0', 'ПОЛНЫЙ_АДРЕС:', 'FULLURL:' ),
-	'fullurle'                => array( '0', 'ПОЛНЫЙ_АДРЕС_2:', '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' ),
-	'rawsuffix'               => array( '1', 'Н', 'R' ),
-	'newsectionlink'          => array( '1', '__ССЫЛКА_НА_НОВЫЙ_РАЗДЕЛ__', '__NEWSECTIONLINK__' ),
-	'nonewsectionlink'        => array( '1', '__БЕЗ_ССЫЛКИ_НА_НОВЫЙ_РАЗДЕЛ__', '__NONEWSECTIONLINK__' ),
-	'currentversion'          => array( '1', 'ТЕКУЩАЯ_ВЕРСИЯ', 'CURRENTVERSION' ),
-	'urlencode'               => array( '0', 'ЗАКОДИРОВАННЫЙ_АДРЕС:', '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' ),
-	'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' ),
-	'url_path'                => array( '0', 'ПУТЬ', 'PATH' ),
-	'url_wiki'                => array( '0', 'ВИКИ', 'WIKI' ),
-	'url_query'               => array( '0', 'ЗАПРОС', 'QUERY' ),
+	'redirect'                  => array( '0', '#перенаправление', '#перенапр', '#REDIRECT' ),
+	'notoc'                     => array( '0', '__БЕЗ_ОГЛАВЛЕНИЯ__', '__БЕЗ_ОГЛ__', '__NOTOC__' ),
+	'nogallery'                 => array( '0', '__БЕЗ_ГАЛЕРЕИ__', '__NOGALLERY__' ),
+	'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' ),
+	'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' ),
+	'localmonth'                => array( '1', 'МЕСТНЫЙ_МЕСЯЦ', 'МЕСТНЫЙ_МЕСЯЦ_2', 'LOCALMONTH', 'LOCALMONTH2' ),
+	'localmonth1'               => array( '1', 'МЕСТНЫЙ_МЕСЯЦ_1', 'LOCALMONTH1' ),
+	'localmonthname'            => array( '1', 'НАЗВАНИЕ_МЕСТНОГО_МЕСЯЦА', 'LOCALMONTHNAME' ),
+	'localmonthnamegen'         => array( '1', 'НАЗВАНИЕ_МЕСТНОГО_МЕСЯЦА_РОД', 'LOCALMONTHNAMEGEN' ),
+	'localmonthabbrev'          => array( '1', 'НАЗВАНИЕ_МЕСТНОГО_МЕСЯЦА_АБР', 'LOCALMONTHABBREV' ),
+	'localday'                  => array( '1', 'МЕСТНЫЙ_ДЕНЬ', 'LOCALDAY' ),
+	'localday2'                 => array( '1', 'МЕСТНЫЙ_ДЕНЬ_2', 'LOCALDAY2' ),
+	'localdayname'              => array( '1', 'НАЗВАНИЕ_МЕСТНОГО_ДНЯ', 'LOCALDAYNAME' ),
+	'localyear'                 => array( '1', 'МЕСТНЫЙ_ГОД', 'LOCALYEAR' ),
+	'localtime'                 => array( '1', 'МЕСТНОЕ_ВРЕМЯ', 'LOCALTIME' ),
+	'localhour'                 => array( '1', 'МЕСТНЫЙ_ЧАС', 'LOCALHOUR' ),
+	'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', 'НАЗВАНИЕ_СТРАНИЦЫ_2', 'PAGENAMEE' ),
+	'namespace'                 => array( '1', 'ПРОСТРАНСТВО_ИМЁН', 'NAMESPACE' ),
+	'namespacee'                => array( '1', 'ПРОСТРАНСТВО_ИМЁН_2', 'NAMESPACEE' ),
+	'talkspace'                 => array( '1', 'ПРОСТРАНСТВО_ОБСУЖДЕНИЙ', 'TALKSPACE' ),
+	'talkspacee'                => array( '1', 'ПРОСТРАНСТВО_ОБСУЖДЕНИЙ_2', 'TALKSPACEE' ),
+	'subjectspace'              => array( '1', 'ПРОСТРАНСТВО_СТАТЕЙ', 'SUBJECTSPACE', 'ARTICLESPACE' ),
+	'subjectspacee'             => array( '1', 'ПРОСТРАНСТВО_СТАТЕЙ_2', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
+	'fullpagename'              => array( '1', 'ПОЛНОЕ_НАЗВАНИЕ_СТРАНИЦЫ', 'FULLPAGENAME' ),
+	'fullpagenamee'             => array( '1', 'ПОЛНОЕ_НАЗВАНИЕ_СТРАНИЦЫ_2', 'FULLPAGENAMEE' ),
+	'subpagename'               => array( '1', 'НАЗВАНИЕ_ПОДСТРАНИЦЫ', 'SUBPAGENAME' ),
+	'subpagenamee'              => array( '1', 'НАЗВАНИЕ_ПОДСТРАНИЦЫ_2', 'SUBPAGENAMEE' ),
+	'basepagename'              => array( '1', 'ОСНОВА_НАЗВАНИЯ_СТРАНИЦЫ', 'BASEPAGENAME' ),
+	'basepagenamee'             => array( '1', 'ОСНОВА_НАЗВАНИЯ_СТРАНИЦЫ_2', 'BASEPAGENAMEE' ),
+	'talkpagename'              => array( '1', 'НАЗВАНИЕ_СТРАНИЦЫ_ОБСУЖДЕНИЯ', 'TALKPAGENAME' ),
+	'talkpagenamee'             => array( '1', 'НАЗВАНИЕ_СТРАНИЦЫ_ОБСУЖДЕНИЯ_2', 'TALKPAGENAMEE' ),
+	'subjectpagename'           => array( '1', 'НАЗВАНИЕ_СТРАНИЦЫ_СТАТЬИ', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
+	'subjectpagenamee'          => array( '1', 'НАЗВАНИЕ_СТРАНИЦЫ_СТАТЬИ_2', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
+	'msg'                       => array( '0', 'СООБЩЕНИЕ:', 'СООБЩ:', 'MSG:' ),
+	'subst'                     => array( '0', 'ПОДСТАНОВКА:', 'ПОДСТ:', 'SUBST:' ),
+	'safesubst'                 => array( '0', 'ЗАЩПОДСТ:', 'SAFESUBST:' ),
+	'msgnw'                     => array( '0', 'СООБЩ_БЕЗ_ВИКИ:', 'MSGNW:' ),
+	'img_thumbnail'             => array( '1', 'мини', 'миниатюра', 'thumbnail', 'thumb' ),
+	'img_manualthumb'           => array( '1', 'мини=$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пкс', '$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_upright'               => array( '1', 'сверхусправа', 'сверхусправа=$1', 'сверхусправа $1', 'upright', 'upright=$1', 'upright $1' ),
+	'img_border'                => array( '1', 'граница', 'border' ),
+	'img_baseline'              => array( '1', 'основание', 'baseline' ),
+	'img_sub'                   => array( '1', 'под', 'sub' ),
+	'img_super'                 => array( '1', 'над', 'super', 'sup' ),
+	'img_top'                   => array( '1', 'сверху', 'top' ),
+	'img_text_top'              => array( '1', 'текст-сверху', 'text-top' ),
+	'img_middle'                => array( '1', 'посередине', 'middle' ),
+	'img_bottom'                => array( '1', 'снизу', 'bottom' ),
+	'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:' ),
+	'sitename'                  => array( '1', 'НАЗВАНИЕ_САЙТА', 'SITENAME' ),
+	'ns'                        => array( '0', 'ПИ:', 'NS:' ),
+	'nse'                       => array( '0', 'ПИК:', 'NSE:' ),
+	'localurl'                  => array( '0', 'ЛОКАЛЬНЫЙ_АДРЕС:', 'LOCALURL:' ),
+	'localurle'                 => array( '0', 'ЛОКАЛЬНЫЙ_АДРЕС_2:', 'LOCALURLE:' ),
+	'articlepath'               => array( '0', 'ПУТЬ_К_СТАТЬЕ', 'ARTICLEPATH' ),
+	'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__' ),
+	'currentweek'               => array( '1', 'ТЕКУЩАЯ_НЕДЕЛЯ', 'CURRENTWEEK' ),
+	'currentdow'                => array( '1', 'ТЕКУЩИЙ_ДЕНЬ_НЕДЕЛИ', 'CURRENTDOW' ),
+	'localweek'                 => array( '1', 'МЕСТНАЯ_НЕДЕЛЯ', 'LOCALWEEK' ),
+	'localdow'                  => array( '1', 'МЕСТНЫЙ_ДЕНЬ_НЕДЕЛИ', 'LOCALDOW' ),
+	'revisionid'                => array( '1', 'ИД_ВЕРСИИ', 'REVISIONID' ),
+	'revisionday'               => array( '1', 'ДЕНЬ_ВЕРСИИ', 'REVISIONDAY' ),
+	'revisionday2'              => array( '1', 'ДЕНЬ_ВЕРСИИ_2', 'REVISIONDAY2' ),
+	'revisionmonth'             => array( '1', 'МЕСЯЦ_ВЕРСИИ', 'REVISIONMONTH' ),
+	'revisionmonth1'            => array( '1', 'МЕСЯЦ_ВЕРСИИ_1', 'REVISIONMONTH1' ),
+	'revisionyear'              => array( '1', 'ГОД_ВЕРСИИ', 'REVISIONYEAR' ),
+	'revisiontimestamp'         => array( '1', 'ОТМЕТКА_ВРЕМЕНИ_ВЕРСИИ', 'REVISIONTIMESTAMP' ),
+	'revisionuser'              => array( '1', 'ВЕРСИЯ_УЧАСТНИКА', 'REVISIONUSER' ),
+	'plural'                    => array( '0', 'МНОЖЕСТВЕННОЕ_ЧИСЛО:', 'PLURAL:' ),
+	'fullurl'                   => array( '0', 'ПОЛНЫЙ_АДРЕС:', 'FULLURL:' ),
+	'fullurle'                  => array( '0', 'ПОЛНЫЙ_АДРЕС_2:', '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' ),
+	'rawsuffix'                 => array( '1', 'Н', 'R' ),
+	'newsectionlink'            => array( '1', '__ССЫЛКА_НА_НОВЫЙ_РАЗДЕЛ__', '__NEWSECTIONLINK__' ),
+	'nonewsectionlink'          => array( '1', '__БЕЗ_ССЫЛКИ_НА_НОВЫЙ_РАЗДЕЛ__', '__NONEWSECTIONLINK__' ),
+	'currentversion'            => array( '1', 'ТЕКУЩАЯ_ВЕРСИЯ', 'CURRENTVERSION' ),
+	'urlencode'                 => array( '0', 'ЗАКОДИРОВАННЫЙ_АДРЕС:', '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' ),
+	'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' ),
+	'url_path'                  => array( '0', 'ПУТЬ', 'PATH' ),
+	'url_wiki'                  => array( '0', 'ВИКИ', 'WIKI' ),
+	'url_query'                 => array( '0', 'ЗАПРОС', 'QUERY' ),
 );
 
 
@@ -3224,7 +3225,7 @@ The wiki server can't provide data in a format your client can read.",
 'pageinfo-authors' => 'Общее число различных авторов',
 'pageinfo-recent-edits' => 'Правок за последнее время (в течение $1)',
 'pageinfo-recent-authors' => 'Уникальных авторов за последнее время',
-'pageinfo-restriction' => 'Защита страницы (<code>$1</code>)',
+'pageinfo-restriction' => 'Защита страницы (<code>{{lcfirst:$1}}</code>)',
 'pageinfo-magic-words' => '{{PLURAL:$1|Магическое слово|Магические слова}} ($1)',
 'pageinfo-hidden-categories' => '{{PLURAL:$1|Скрытая категория|Скрытых категорий}} ($1)',
 'pageinfo-templates' => '{{PLURAL:$1|Шаблон|Шаблонов}} ($1)',
diff --git a/languages/messages/MessagesRue.php b/languages/messages/MessagesRue.php
index 806b3f888a..82a4753744 100644
--- a/languages/messages/MessagesRue.php
+++ b/languages/messages/MessagesRue.php
@@ -43,6 +43,80 @@ $namespaceAliases = array(
 	'Дізкузія_ку_MediaWiki'   => NS_MEDIAWIKI_TALK,
 );
 
+$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( 'Знеплатнити_імейл' ),
+	'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( 'Найбівше_хоснованы_файлы' ),
+	'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( 'Наставлїня' ),
+	'Randompage'                => array( 'Нагодна_статя' ),
+	'Randomredirect'            => array( 'Нагодне_напрямлїня' ),
+	'Recentchanges'             => array( 'Послїднї_зміны' ),
+	'Recentchangeslinked'       => array( 'Повязаны_едітованя' ),
+	'Search'                    => array( 'Гляданя' ),
+	'Shortpages'                => array( 'Курты_сторінкы' ),
+	'Specialpages'              => array( 'Шпеціялны_сторінкы' ),
+	'Statistics'                => array( 'Штатістіка' ),
+	'Tags'                      => array( 'Позначкы' ),
+	'Unblock'                   => array( 'Одблоковати' ),
+	'Uncategorizedcategories'   => array( 'Некатеґорізованы_катеґорії' ),
+	'Uncategorizedimages'       => array( 'Некатеґорізованы_файлы' ),
+);
+
 $messages = array(
 # User preference toggles
 'tog-underline' => 'Підчарковати одказы:',
@@ -59,7 +133,7 @@ $messages = array(
 'tog-editsectiononrightclick' => 'Дозволити едітованя секції сторінкы через кликаня правов клапков мышкы на надписы сторінок  (JavaScript)',
 'tog-showtoc' => 'Вказовати обсяг (на сторінках з веце як трёма надписами)',
 'tog-rememberpassword' => 'Запамятати моє приголошіня на тім переглядачу (максімално $1 {{PLURAL:$1|день|днів}})',
-'tog-watchcreations' => 'Придавати сторінкы створены мнов тай файлы мнов заладованы до мого списку слїдованых',
+'tog-watchcreations' => 'Придавати сторінкы створены мнов тай файлы мнов наладованы до мого списку слїдованых',
 'tog-watchdefault' => 'Придавати мнов едітованы сторінкы і файлы до списку слїдованых',
 'tog-watchmoves' => 'Придавати переменованы сторінкы і файлы до мого списку слїдованых',
 'tog-watchdeletion' => 'Придавати сторінкы і файлы, котры змажу, міджі слїдованы',
@@ -1265,11 +1339,11 @@ $1",
 'right-move-rootuserpages' => 'Переменованя корінёвых сторінок хоснователїв',
 'right-movefile' => 'Переменовати файлы',
 'right-suppressredirect' => 'Нестворіня напрямлїня про переменоваю сторінкы',
-'right-upload' => 'Заладовованя файлів',
+'right-upload' => 'Наладовованя файлів',
 'right-reupload' => 'Переписованя екзістуючіх файлів',
-'right-reupload-own' => 'Переписованя файлів заладованых од себе самого',
-'right-reupload-shared' => 'Заладованя локалных файлів жебы перекрыли тотых в сполочнім усховищу',
-'right-upload_by_url' => 'Заладовованя файлів з URL адрес',
+'right-reupload-own' => 'Переписованя файлів ладованых од себе самого',
+'right-reupload-shared' => 'Наладованя локалных файлів жебы перекрыли тотых в сполочнім усховищу',
+'right-upload_by_url' => 'Наладовованя файлів з URL адрес',
 'right-purge' => 'Очіщіня кешу про сторінкы без потверджовачого діалоґу',
 'right-autoconfirmed' => 'Едітованя часточно замкнутых сторінок',
 'right-bot' => 'Быти поважованый за автоматічный процес',
@@ -1303,7 +1377,7 @@ $1",
 'right-markbotedits' => 'Означованя ревертів як едітованя робота',
 'right-noratelimit' => 'Не має обмеджіня в швыдкости',
 'right-import' => 'Імпорт сторінок з іншых вікі',
-'right-importupload' => 'Імпорт сторінок через заладованя файлів',
+'right-importupload' => 'Імпорт сторінок через наладованя файлів',
 'right-patrol' => 'Позначованя едітовань як перевіреных',
 'right-autopatrol' => 'Автоматічне означованя едітовань як перевіреных',
 'right-patrolmarks' => 'Зобразованя патролёваных сторінок в Послїднїх змінах',
@@ -1334,10 +1408,10 @@ $1",
 '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' => 'вымазати тоту ревізію сторінкы',
@@ -1408,29 +1482,29 @@ $1",
 'recentchangeslinked-to' => 'Вказати зміны на сторінках, одказуючіх на задану сторінку',
 
 # Upload
-'upload' => 'Заладовати файл',
-'uploadbtn' => 'Заладовати файл',
-'reuploaddesc' => 'Зрушыти заладовованя а вернути ся до формы заладовованя',
+'upload' => 'Наладовати файл',
+'uploadbtn' => 'Наладовати файл',
+'reuploaddesc' => 'Зрушыти ладованя а вернути ся до формы наладовованя',
 'upload-tryagain' => 'Уложыти зміненый попис файлу',
 'uploadnologin' => 'Не сьте приголошеный(а)',
-'uploadnologintext' => 'Жебы заладовати файл, мусите ся [[Special:UserLogin|приголосити]].',
-'upload_directory_missing' => 'Адресарь про заладовованя файлів ($1) хыбить тай вебовый сервер го не годен створити.',
-'upload_directory_read_only' => 'До адресаря заладованых файлів ($1) не мать вебовый сервер права запису.',
-'uploaderror' => 'Під час заладовованя ся притрафила хыба',
-'upload-recreate-warning' => "'''Увага: Файл з тов назвов быв скоре змазаный ці переменованый.'''
+'uploadnologintext' => 'Жебы наладовати файл, мусите ся [[Special:UserLogin|приголосити]].',
+'upload_directory_missing' => 'Адресарь про наладовованя файлів ($1) хыбить тай вебовый сервер го не годен створити.',
+'upload_directory_read_only' => 'До адресаря наладованых файлів ($1) не мать вебовый сервер права запису.',
+'uploaderror' => 'Під час ладованя ся притрафила хыба',
+'upload-recreate-warning' => "'''Увага: Файл з тов назвов быв оперед змазаный ці переменованый.'''
 
 Ту є про перегляд зображеный список мазаня і переменованя той сторінкы:",
-'uploadtext' => "Ниже даный формуларь служыть на заладовованя файлів. Уж заладованы файлы собі можете перезерати і глядати помочов [[Special:FileList|списку заладованых файлів]], кажде заладованя ся тыж зазначує до [[Special:Log/upload|книгы заладованя]], змазаня суть в [[Special:Log/delete|книзї змазаных сторінок]].
+'uploadtext' => "Ниже даный формуларь служыть на наладовованя файлів. Уж наладованы файлы собі можете перезерати і глядати помочов [[Special:FileList|списку наладованых файлів]], кажде наладованя ся тыж зазначує до [[Special:Log/upload|книгы наладованя]], змазаня суть в [[Special:Log/delete|книзї змазаных сторінок]].
 
-Про вложіня образку до сторінкы хоснуйте єден з наслїдуючіх способів запису:
+Про вложіня образчіка до сторінкы хоснуйте єден із слїдуючіх способів запису:
 * '''<code><nowiki>[[</nowiki>{{ns:file}}<nowiki>:Файл.jpg]]</nowiki></code>''' до сторінкы вложыть цїлый образок,
 * '''<code><nowiki>[[</nowiki>{{ns:file}}<nowiki>:Файл.png|thumb|left|Попис]]</nowiki></code>''' вложыть нагляд в рамику зарівнанім на лівый бік, з пописом „Попис“,
 * '''<code><nowiki>[[</nowiki>{{ns:media}}<nowiki>:Файл.ogg]]</nowiki></code>''' вложыть дірект одказ на файл, без того жебы ся зобразив на сторінцї.",
 'upload-permitted' => 'Дозволены тіпы  файлів: $1.',
 'upload-preferred' => 'Преферованы тіпы файлів: $1',
 'upload-prohibited' => 'Заказаны тіпы файлів: $1.',
-'uploadlog' => 'книга заладованя',
-'uploadlogpage' => 'Лоґ заладованых файлів',
+'uploadlog' => 'книга наладованя',
+'uploadlogpage' => 'Лоґ наладованых файлів',
 'uploadlogpagetext' => 'Ниже найдете список найновшых файлів. Смотьте [[Special:NewFiles|ґалерію новых образків]] про веце візуалного нагляду.',
 'filename' => 'Назва файлу:',
 'filedesc' => 'Попис',
@@ -1438,22 +1512,22 @@ $1",
 'filereuploadsummary' => 'Зміны у файлі:',
 'filestatus' => 'Авторьскы права:',
 'filesource' => 'Жрідло:',
-'uploadedfiles' => 'Заладованы файлы',
+'uploadedfiles' => 'Наладованы файлы',
 'ignorewarning' => 'Іґноровати варованя тай уложыти файл.',
 'ignorewarnings' => 'Іґноровати вшыткы варованя',
 'minlength1' => 'Назва файлу мусить мати холем єдну літеру.',
-'illegalfilename' => 'Назва файлу "$1" обсягує буквы, котры не суть дозволены в назвах сторінок. Просиме, переменуйте файл і спробуйте го заладовати зясь.',
+'illegalfilename' => 'Назва файлу "$1" обсягує буквы, котры не суть дозволены в назвах сторінок. Просиме, переменуйте файл і спробуйте го наладовати зясь.',
 'filename-toolong' => 'Назвы файлів не можуть быти довшы, як 240 байтів.',
 'badfilename' => 'Назва файлу была змінена на „$1“.',
 'filetype-mime-mismatch' => 'Росшырїня файлу ".$1" не одповідать ёго MIME тіпу ($2).',
-'filetype-badmime' => 'Не є дозволено заладововати файлы MIME тіп „$1“.',
-'filetype-bad-ie-mime' => 'Неможливо заладовати тот файл, бо Internet Explorer бы го тримав за „$1“, што є не дозволеный і потенціално небеспечный тіп файлу.',
+'filetype-badmime' => 'Не є дозволено наладововати файлы MIME тіп „$1“.',
+'filetype-bad-ie-mime' => 'Неможливо наладовати тот файл, бо Internet Explorer бы го тримав за „$1“, што є не дозволеный і потенціално небеспечный тіп файлу.',
 'filetype-unwanted-type' => "„.$1“''' є нежеланый формат файлу. {{plural:$3|Желаный формат файлів є|Желаны форматы файлів суть}} $2.",
 'filetype-banned-type' => "'''„.$1“''' {{PLURAL:$4|є недозволеный формат файлів|суть недозволены форматы файлів}}.
 {{PLURAL:$3|Дозволеный формат фалів|Дозволены форматы файлів суть}} $2.",
 'filetype-missing' => 'Файл не має росшырїня (наприклад, «.jpg»).',
-'empty-file' => 'Заладованый файл є порожнїй.',
-'file-too-large' => 'Заладованый файл є барз великый.',
+'empty-file' => 'Наладованый файл є порожнїй.',
+'file-too-large' => 'Наладованый файл є барз великый.',
 'filename-tooshort' => 'Назва файлу є барз коротка.',
 'filetype-banned' => 'Тот тіп файлу є заказаный.',
 'verification-error' => 'Тот файл не перешов овіринём файлів.',
@@ -1473,65 +1547,65 @@ $1",
 Згорнутя, котре ту зазначіте, ся на пописовій сторінцї не зобразить.
 Кідь там хочете своє згорнутя зобразити, будете мусити дану сторінку едітовати мануално. [[$1|thumb]]',
 'fileexists-extension' => 'Уже екзістує файл з подобным іменом: [[$2|thumb]]
-* Назва заладованого файлу: <strong>[[:$1]]</strong>
+* Назва наладованого файлу: <strong>[[:$1]]</strong>
 * Назва екзістуючого файлу: <strong>[[:$2]]</strong>
 Выберте іншу назву.',
 'fileexists-thumbnail-yes' => "Тот файл є асі образчік в зменшеній великости ''(нагляд)''. [[$1|thumb]]
 Перевірте файл <strong>[[:$1]]</strong>.
-Кідь є вказаный файл векшый, але інакше єднакый, не треба окремо заладовати ёго зменшену верзію.",
+Кідь є вказаный файл векшый, але інакше єднакый, не треба окремо наладовати ёго зменшену верзію.",
 'file-thumbnail-no' => "Назва файлу ся зачінать на <strong>$1</strong>.
 Може є то образчік в зменшеній великости ''(нагляд)''.
 Заладуйте файл в повнім розлишіню, покы є ку діспозіції, або зміньте назву файлу.",
 'fileexists-forbidden' => 'Файл з таков назвов уж екзістує і не є дозволено го переписати.
-Кідь хочете тот файл заладовати, вернийте ся і звольте іншу назву.
+Кідь хочете тот файл наладовати, вернийте ся і звольте іншу назву.
 [[File:$1|thumb|center|$1]]',
-'fileexists-shared-forbidden' => 'Файл з тов назвов уж екзістує в сполочнім усховищу. Кідь і наперек тому хочете ваш файл заладовати, вернийте ся і звольте іншу назву. [[File:$1|thumb|center|$1]]',
+'fileexists-shared-forbidden' => 'Файл з тов назвов уж екзістує в сполочнім усховищу. Кідь і наперек тому хочете ваш файл наладовати, вернийте ся і звольте іншу назву. [[File:$1|thumb|center|$1]]',
 'file-exists-duplicate' => 'Тот файл є дуплікат {{PLURAL:$1|файлу|такых файлів}}:',
 'file-deleted-duplicate' => 'Ідентічный файл ку тому ([[:$1]]) быв уж скоре змазаный. Передтым як файл знову заладуєте, бы сьте мали перевірити записы о попереднёму змазаню.',
-'uploadwarning' => 'Позірь к заладованю',
+'uploadwarning' => 'Позірь к наладованю',
 'uploadwarning-text' => 'Просиме, зміньте опис файлу ниже і спробуйте то знову.',
 'savefile' => 'Уложыти файл',
-'uploadedimage' => 'заладовав "[[$1]]"',
-'overwroteimage' => 'заладована нова верзія "[[$1]]"',
-'uploaddisabled' => 'Заладовованя файлів заборонене.',
-'copyuploaddisabled' => 'Заладовованя файлів через URL є выпнуте.',
-'uploadfromurl-queued' => 'Ваша пожадавка на заладовованя файлу была уложена до фронты.',
-'uploaddisabledtext' => 'Заладовованя файлів є выпнуте.',
-'php-uploaddisabledtext' => 'В PHP є выпнуте заладовованя файлів. Просиме, перевірьте наставлїня file_uploads.',
+'uploadedimage' => 'наладовав "[[$1]]"',
+'overwroteimage' => 'наладована нова верзія "[[$1]]"',
+'uploaddisabled' => 'Наладовованя файлів заборонене.',
+'copyuploaddisabled' => 'Наладовованя файлів через URL є выпнуте.',
+'uploadfromurl-queued' => 'Ваша пожадавка на наладовованя файлу была уложена до шоры.',
+'uploaddisabledtext' => 'Наладовованя файлів є выпнуте.',
+'php-uploaddisabledtext' => 'В PHP є выпнуте наладовованя файлів. Просиме, перевірьте наставлїня file_uploads.',
 'uploadscripted' => 'Тот файл обсягує HTML-код або скріпт, якый може быти неправилно інтерпретованый вебовым переглядячом.',
 'uploadvirus' => 'Файл обсягує вірус! Детайлы: $1',
 'uploadjava' => 'Тот файл є ZIP архів, котрый обсягує .class-файл Java.
-Заладованя Java-файлів не є дозволене, бо они можуть запрічінити обход забеспечіня сістемы.',
+Наладованя Java-файлів не є дозволене, бо они можуть запрічінити обход забеспечіня сістемы.',
 'upload-source' => 'Жрідловый файл',
 'sourcefilename' => 'Назва жрідлового файлу:',
 'sourceurl' => 'Жрідлова URL-адреса:',
 'destfilename' => 'Назва цілёвого файлу:',
 'upload-maxfilesize' => 'Максімалный розмір файлу: $1',
 'upload-description' => 'Попис файлу',
-'upload-options' => 'Параметры заладовованя',
+'upload-options' => 'Параметры наладовованя',
 'watchthisupload' => 'Слїдовати тот файл',
 'filewasdeleted' => 'Файл з таков назвов уж екзістовав а быв змазаный. Детайлы обсягує $1.',
-'filename-bad-prefix' => "Назва заладовованого файлу ся зачінать на '''„$1“''', што не є назва звычайно приряджована діґіталным фотоапаратом. Звольте іншу назву, котра ваш файл попише лїпше.",
-'upload-success-subj' => 'Заладованя было успішне',
-'upload-success-msg' => 'Файл вами заладованый з [$2] є доступный на [[:{{ns:file}}:$1]]',
-'upload-failure-subj' => 'Проблем із заладованём',
-'upload-failure-msg' => 'У вами заладованого файлу выник проблем  з [$2]::
+'filename-bad-prefix' => "Назва наладовованого файлу ся зачінать на '''„$1“''', што не є назва звычайно приряджована діґіталным фотоапаратом. Звольте іншу назву, котра ваш файл попише лїпше.",
+'upload-success-subj' => 'Наладованя было успішне',
+'upload-success-msg' => 'Файл вами наладованый з [$2] є доступный на [[:{{ns:file}}:$1]]',
+'upload-failure-subj' => 'Проблем з наладованём',
+'upload-failure-msg' => 'У вами наладованого файлу выник проблем  з [$2]::
 
 $1',
-'upload-warning-subj' => 'Позірь к заладованю',
-'upload-warning-msg' => 'Під час вашого заладовованя файлу [$2] ся притрафив проблем. Кідь го хочете вырїшыти, можете ся вернути до  [[Special:Upload/stash/$1|формуларя заладовованя]].',
+'upload-warning-subj' => 'Позірь к наладованю',
+'upload-warning-msg' => 'Під час вашого наладовованя файлу [$2] ся притрафив проблем. Кідь го хочете вырїшыти, можете ся вернути до  [[Special:Upload/stash/$1|формуларя наладовованя]].',
 
 'upload-proto-error' => 'Неплатный протокол',
-'upload-proto-error-text' => 'Заладованя одлеглого файлу пожадує зазначіня URLs з початком <code>http://</code> або <code>ftp://</code>.',
+'upload-proto-error-text' => 'Наладованя одлеглого файлу пожадує зазначіня URLs з початком <code>http://</code> або <code>ftp://</code>.',
 'upload-file-error' => 'Інтерна хыба',
 'upload-file-error-text' => 'При спробі створити дочасный файл настала внутрїшня хыба на серверї.
 Просиме контактуйте  [[Special:ListUsers/sysop|адміністратора]].',
 'upload-misc-error' => 'Незнама хыба',
-'upload-misc-error-text' => 'Незнана хыба ся трафила під час заладованя файлу. Перевірте ці є  URL правилна і приступна і спробуйте то знову. Кідь ся хыба обявить знову, контактуйте [[Special:ListUsers/sysop|адміністратора]]. сістемы.',
+'upload-misc-error-text' => 'Незнана хыба ся трафила під час наладованя файлу. Перевірте ці є  URL правилна і приступна і спробуйте то знову. Кідь ся хыба обявить знову, контактуйте [[Special:ListUsers/sysop|адміністратора]]. сістемы.',
 'upload-too-many-redirects' => 'URL обсягує барз велё напрямлінь',
 'upload-unknown-size' => 'Незнамый розмір',
 'upload-http-error' => 'Стала ся хыба HTTP: $1',
-'upload-copy-upload-invalid-domain' => 'Заладовованя копірованём неможливе з той домены.',
+'upload-copy-upload-invalid-domain' => 'Наладовованя копірованём негодно з той домены.',
 
 # File backend
 'backend-fail-stream' => 'Не вдало ся транслёвати файл $1.',
@@ -1584,8 +1658,8 @@ $1',
 Не годен перевірити ёго беспеку.',
 
 # Special:UploadStash
-'uploadstash' => 'Скрыша заладованых файлів',
-'uploadstash-summary' => 'Тота сторінка додавать приступ ку файлом котры суть заладованы (або ладованя іщі не скінчіло) але іщі не были опувлікованы на вікі. Тоты файлы не видить нихто окрем хоснователя што їх заладовав.',
+'uploadstash' => 'Скрыша наладованых файлів',
+'uploadstash-summary' => 'Тота сторінка додавать приступ ку файлом котры суть наладованы (або ладованя іщі не скінчіло) але іщі не были опувлікованы на вікі. Тоты файлы не видить нихто окрем хоснователя што їх наладовав.',
 'uploadstash-clear' => 'Змазати схованы файлы',
 'uploadstash-nofiles' => 'Не маєте жадны схованы файлы.',
 'uploadstash-badtoken' => 'Выконаня той дїї не было успішне, може зато, же вашы повірїня про едітованя скінчіли. Попробуйте знову.',
@@ -1598,7 +1672,7 @@ $1',
 'img-auth-nopathinfo' => 'Ваш сервер не є наштелёваный так, жебы давав тоту інформацію.
 Може фунґує помочов CGI і img_auth на нім не може фунґовати.
 Посмотьте https://www.mediawiki.org/wiki/Manual:Image_Authorization.',
-'img-auth-notindir' => 'Пожадована стежка не є в конфіґурованім адресарю із заладованыма файлами.',
+'img-auth-notindir' => 'Пожадована стежка не є в конфіґурованім адресарю із наладованыма файлами.',
 'img-auth-badtitle' => 'З „$1“  ся не дасть створити платна назва сторінкы.',
 'img-auth-nologinnWL' => 'Не сьте приголошеный і „$1“ не є на білім списку.',
 'img-auth-nofile' => 'Файл «$1» не екзістує.',
@@ -1624,7 +1698,7 @@ $1',
 # Some likely curl errors. More could be added from <http://curl.haxx.se/libcurl/c/libcurl-errors.html>
 'upload-curl-error6' => 'Не вдало ся досягнути URL.',
 'upload-curl-error6-text' => 'Із зазначеной URL ся не дасть чітати. Перевірте ці є URL правилно написана і сервер є доступный.',
-'upload-curl-error28' => 'Час выдїленый на заладованя уж вычерьпаный',
+'upload-curl-error28' => 'Час становленый на наладованя уж вычерьпаный',
 'upload-curl-error28-text' => 'Сервер довго не одповідать. Перевірте ці є доступный і кус почекайте і спробуйте то знову.',
 
 'license' => 'Ліценцованя:',
@@ -1635,8 +1709,8 @@ $1',
 'upload_source_file' => ' (файл на вашім компютерї)',
 
 # Special:ListFiles
-'listfiles-summary' => 'Тота шпеціална сторінка зображує вшыткы заладованы файлы.
-При філтрованю за хоснователём, зображують ся лем файлы, у котрых хоснователь заладовав актуалну верзію.',
+'listfiles-summary' => 'Тота шпеціална сторінка зображує вшыткы наладованы файлы.
+При філтрованю за хоснователём, зображують ся лем файлы, у котрых хоснователь наладовав актуалну верзію.',
 'listfiles_search_for' => 'Глядати файл по назві:',
 'imgfile' => 'файл',
 'listfiles' => 'Список файлів',
@@ -1684,8 +1758,8 @@ $1',
 'sharedupload-desc-create' => 'Гевсесь файл походить з {{grammar:2sg|$1}} тай можуть го хосновати другы проєкты.
 Може бы сьте хотїли правити [$2 тамтушню сторінку з пописом файлу].',
 'filepage-nofile' => 'Не екзістує файл з таков назвов',
-'filepage-nofile-link' => 'Файл з таков назвов не екзістує, але можете [$1 го заладовати].',
-'uploadnewversion-linktext' => 'Заладовати нову верзію того файлу',
+'filepage-nofile-link' => 'Файл з таков назвов не екзістує, але можете [$1 го наладовати].',
+'uploadnewversion-linktext' => 'Наладовати нову верзію того файлу',
 'shared-repo-from' => 'з $1',
 'shared-repo' => 'здїляного усховіща',
 
@@ -1755,7 +1829,7 @@ $1',
 'statistics-articles' => 'Обсяговы сторінкы',
 'statistics-pages' => 'Сторінкы',
 'statistics-pages-desc' => 'Вшыткы сторінкы на вікі враховано діскузій, напрямлїня ітд.',
-'statistics-files' => 'Заладованы файлы',
+'statistics-files' => 'Наладованы файлы',
 'statistics-edits' => 'Чісло едітованя од основаня вікі {{SITENAME}}',
 'statistics-edits-average' => 'Середнє чісло едітовань на сторінку',
 'statistics-views-total' => 'Вшыткых переглядів',
@@ -2135,7 +2209,7 @@ $UNWATCHURL
 'protectedarticle' => 'замыкать "[[$1]]"',
 'modifiedarticleprotection' => 'зміненa рівень охраны сторінкы «[[$1]]»',
 'unprotectedarticle' => 'знята охрана з "[[$1]]"',
-'movedarticleprotection' => 'наставлїня замків пересунуто з „[[$2]]“ на „[[$1]]“',
+'movedarticleprotection' => 'наставлїня замків перенесено з „[[$2]]“ на „[[$1]]“',
 'protect-title' => 'Зміна уровнї охраны сторінкы „$1“',
 'protect-title-notallowed' => 'Указати уровни охраны сторінкы „$1“',
 'prot_1movedto2' => '«[[$1]]» переменована на «[[$2]]»',
@@ -2186,7 +2260,7 @@ $UNWATCHURL
 'restriction-edit' => 'Едітованя',
 'restriction-move' => 'Переменовати',
 'restriction-create' => 'Вытвориня',
-'restriction-upload' => 'Заладовованя файлів',
+'restriction-upload' => 'Наладовованя файлів',
 
 # Restriction levels
 'restriction-level-sysop' => 'замкнуте',
@@ -2264,7 +2338,7 @@ $1',
 'sp-contributions-newbies-title' => 'Приспівкы новый хоснователїв',
 'sp-contributions-blocklog' => 'Лоґ блокованя',
 'sp-contributions-deleted' => 'вымазаны приспевкы хоснователя',
-'sp-contributions-uploads' => 'заладованы файлы',
+'sp-contributions-uploads' => 'наладованы файлы',
 'sp-contributions-logs' => 'лоґы',
 'sp-contributions-talk' => 'діскузія',
 'sp-contributions-userrights' => 'Справа хосновательскых прав',
@@ -2474,11 +2548,11 @@ $1',
 
 В тых припадох будете мусити переменовати ці злучіти сторінкы ручнї кідь желаєте єй переменованя.",
 'movearticle' => 'Переменовати сторінку',
-'moveuserpage-warning' => "'''Увага:''' Рихтуєте ся переменовати сторінку хоснователя. Усвідомте собі, же буде пересунута лем тота сторінка, а хоснователь  ''не буде'' переменованый.",
+'moveuserpage-warning' => "'''Увага:''' Рихтуєте ся переменовати сторінку хоснователя. Усвідомте собі, же буде переменована лем тота сторінка, а хоснователь  ''не буде'' переменованый.",
 'movenologin' => 'Не сьте приголошеный(а)!',
 'movenologintext' => 'Про переменованя сторінок ся мусите [[Special:UserLogin|приголосити]].',
 'movenotallowed' => 'Не маєте права переменовати сторінкы.',
-'movenotallowedfile' => 'Не маєте права пересувати файлы.',
+'movenotallowedfile' => 'Не маєте права переменовати файлы.',
 'cant-move-user-page' => 'Не маєте права переменовати сторінкы хоснователїв.',
 'cant-move-to-user-page' => 'Не маєте права переменовати сторінку на сторінку хоснователя (окрем підсторінкы сторінкы хоснователя)',
 'newtitle' => 'Нова назва:',
@@ -2510,7 +2584,7 @@ $1',
 'delete_and_move' => 'Змазати і переменовати',
 'delete_and_move_text' => '==Є треба змазаня==
 
-Цілёва сторінка „[[:$1]]“ уж екзістує. Желате собі єй змазати про уволнїня місця про пересун?',
+Цілёва сторінка „[[:$1]]“ уж екзістує. Желате собі єй змазати про уволнїня місця на переменованя?',
 'delete_and_move_confirm' => 'Гей, змазати сторінку',
 'delete_and_move_reason' => 'Змазане про уможнїня переменованя з „[[$1]]“',
 'selfmove' => 'Початочна і нова назва суть ровнакы;
@@ -2610,16 +2684,16 @@ $1',
 'importnotext' => 'Порожнїй або жаден текст',
 'importsuccess' => 'Імпорт сконченый!',
 'importhistoryconflict' => 'Екзістує конфлікт міджі історіямі верзії (може тота сторінка уж была імпортована скоре)',
-'importnosources' => 'Не было выбране жрідло імпорту міджі вікі, дірект заладованя історії змін є выпнуте.',
-'importnofile' => 'Не быв заладованый файл імпорту.',
-'importuploaderrorsize' => 'Не вдало ся заладовати файл імпорту. Розмір файлу перевышує становлену меджу.',
-'importuploaderrorpartial' => 'Не вдало ся заладовати імпортный файл. Файл быв заладованый лем частково.',
-'importuploaderrortemp' => 'Не вдало ся заладовати імпортный файл. Не є к діспозіції дочасный адресарь.',
+'importnosources' => 'Не было выбране жрідло імпорту міджі вікі, дірект наладованя історії змін є выпнуте.',
+'importnofile' => 'Не быв наладованый файл імпорту.',
+'importuploaderrorsize' => 'Не вдало ся наладовати файл імпорту. Розмір файлу перевышує становлену меджу.',
+'importuploaderrorpartial' => 'Не вдало ся наладовати імпортный файл. Файл быв наладованый лем частково.',
+'importuploaderrortemp' => 'Не вдало ся наладовати імпортный файл. Не є к діспозіції дочасный адресарь.',
 'import-parse-failure' => 'Хыба під час імпорту XML',
 'import-noarticle' => 'Не є сторінка про імпорт!',
 'import-nonewrevisions' => 'Вшыткы верзії уж были скоре імпортованы',
 'xml-error-string' => '$1 на рядку $2, стовпець $3 (байт $4): $5',
-'import-upload' => 'Заладовати XML дата',
+'import-upload' => 'Наладовати XML дата',
 'import-token-mismatch' => 'Стратили ся дата релації. Спробуйте то знову.',
 'import-invalid-interwiki' => 'Із зазначеной вікі ся не дасть імпортовати.',
 'import-error-edit' => 'Сторінка „$1“ ся не наімпортовала, бо не мате право єй едітовати.',
@@ -2631,7 +2705,7 @@ $1',
 # Import log
 'importlogpage' => 'Книга імпортів',
 'importlogpagetext' => 'На тій сторінцї ся зображують адміністраторскы імпорты сторінок враховано едітовань з іншых вікі.',
-'import-logentry-upload' => 'імпортовав [[$1]] заладованём файлу',
+'import-logentry-upload' => 'імпортовав [[$1]] наладованём файлу',
 'import-logentry-upload-detail' => '$1 {{PLURAL:$1|ревізія|ревізії|ревізій}}',
 'import-logentry-interwiki' => 'міджівікі імпорт $1',
 'import-logentry-interwiki-detail' => '$1 {{PLURAL:$1|ревізія|ревізії|ревізій}} з $2',
@@ -2688,7 +2762,7 @@ $1',
 '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' => 'Перманентный одказ на тоту верзію сторінкы',
@@ -2805,7 +2879,7 @@ $1',
 # Special:NewFiles
 'newimages' => 'Ґалерія новых файлів',
 'imagelisttext' => "Ниже є {{plural:$1|єден файл|список '''$1'''&nbsp;файлів сортованых $2|список '''$1'''&nbsp;файлів сортованых $2}}.",
-'newimages-summary' => 'На тій шпеціалній сторінцї ся зображують остатнї заладованы файлы.',
+'newimages-summary' => 'На тій шпеціалній сторінцї ся зображують остатнї наладованы файлы.',
 'newimages-legend' => 'Філтер',
 'newimages-label' => 'Назва файлу (або єй часть):',
 'showhidebots' => '($1 ботів)',
@@ -3359,8 +3433,8 @@ $5
 'autosumm-new' => 'Створена сторінка: $1',
 
 # Live preview
-'livepreview-loading' => 'Заладовованя...',
-'livepreview-ready' => 'Заладовованя… Готово!',
+'livepreview-loading' => 'Наладовованя...',
+'livepreview-ready' => 'Наладовованя… Готово!',
 'livepreview-failed' => 'Швыдкый нагляд не є доступный! Спробуйте хосновати звычайный нагляд.',
 'livepreview-error' => 'Не успішне споїня: $1 "$2". Хоснуйте звычайный нагляд.',
 
@@ -3553,7 +3627,7 @@ MediaWiki є дістрібуована в надїї, же буде хосно
 'revdelete-uname-unhid' => 'імя хоснователя одкрыте',
 'revdelete-restricted' => 'приданы обмеджіня про адміністраторів',
 'revdelete-unrestricted' => 'зняты обмеджіня про адміністраторів',
-'logentry-move-move' => '$1 пересунув сторінку $3 на $4',
+'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 місце напрямлїня без створїня напрямлїня',
@@ -3582,19 +3656,19 @@ MediaWiki є дістрібуована в надїї, же буде хосно
 'feedback-bugnew' => 'Перевірив(а) єм то. Хочу повідомити нову хыбу.',
 
 # API errors
-'api-error-badaccess-groups' => 'Не мате дозволено заладововати файлы на тоту вікі.',
+'api-error-badaccess-groups' => 'Не мате дозволено наладововати файлы на тоту вікі.',
 'api-error-badtoken' => 'Внутрїшня хыба: планый знак.',
-'api-error-copyuploaddisabled' => 'Заладовованя з URL є на тім сервері заказане.',
+'api-error-copyuploaddisabled' => 'Наладовованя з URL є на тім сервері заказане.',
 'api-error-duplicate' => 'На тій вікі уж {{PLURAL:$1|екзістує [$2 другый файл]|екзістують [$2 іншы файлы]}} з такым самым обсягом.',
 'api-error-duplicate-archive' => '{{PLURAL:$1|быв [$2 другый файл]|были [$2 даякы другы файлы]}} з такым самым обсягом уж гев оперед {{PLURAL:$1|быв|были}}, але {{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|є недозволеный формат файлів|суть недозволены форматы файлів}}. {{PLURAL:$3|Дозволеный формат фалів є|Дозволены форматы файлів суть}} $2.',
@@ -3602,21 +3676,21 @@ MediaWiki є дістрібуована в надїї, же буде хосно
 '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' => 'Внутрїшня хыба: не годен становити, ці копірованя было успішне.',
-'api-error-mustbeloggedin' => 'Жебы заладовати файлы, мусите быти приголошеный.',
+'api-error-mustbeloggedin' => 'Жебы наладовати файлы, мусите быти приголошеный.',
 'api-error-mustbeposted' => 'Внутрїшня хыба: пожадавка мусить быти через HTTP POST.',
-'api-error-noimageinfo' => 'Заладованя было успішне, але сервер не додав о файлї жадны інформації.',
-'api-error-nomodule' => 'Внутрїшня хыба: не є наставленый модул заладовованя.',
+'api-error-noimageinfo' => 'Наладованя было успішне, але сервер не додав о файлї ниякы інформації.',
+'api-error-nomodule' => 'Внутрїшня хыба: не є наставленый модул наладовованя.',
 'api-error-ok-but-empty' => 'Внутрїшня хыба: сервер не одповідать.',
 'api-error-overwrite' => 'Не є дозволене переписати екзістуючій файл.',
 'api-error-stashfailed' => 'Внутрїшня хыба: серверу ся не вдало уложыти дочасный файл.',
 'api-error-timeout' => 'Сервер не одповідав в очекаванім часї.',
 'api-error-unclassified' => 'Трафила ся незнама хыба.',
 'api-error-unknown-code' => 'Незнама хыба: „$1“',
-'api-error-unknown-error' => 'Внутрїшня хыба: трафила ся хыба при спробі о заладованя файлу.',
+'api-error-unknown-error' => 'Внутрїшня хыба: трафила ся хыба при спробі о наладованя файлу.',
 'api-error-unknown-warning' => 'Незнаме варованя: $1',
 'api-error-unknownerror' => 'Незнама хыба: „$1“',
 'api-error-uploaddisabled' => 'Начітаваня файлів є на тій вікі выпнуте.',
diff --git a/languages/messages/MessagesSa.php b/languages/messages/MessagesSa.php
index deb7dee60b..1f304a54ac 100644
--- a/languages/messages/MessagesSa.php
+++ b/languages/messages/MessagesSa.php
@@ -172,107 +172,107 @@ $specialPageAliases = 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__' ),
-	'noheader'                => array( '0', '__नैवमुख्यशिर्षक__', '__NOHEADER__' ),
-	'currentmonth'            => array( '1', 'अद्यमासे', 'CURRENTMONTH', 'CURRENTMONTH2' ),
-	'currentmonthname'        => array( '1', 'अद्यमासेनाम', 'CURRENTMONTHNAME' ),
-	'currentmonthnamegen'     => array( '1', 'अद्यमासेनामसाधारण', 'CURRENTMONTHNAMEGEN' ),
-	'currentmonthabbrev'      => array( '1', 'अद्यमासेसंक्षीप्त', 'CURRENTMONTHABBREV' ),
-	'currentday'              => array( '1', 'अद्यदिवसे', 'CURRENTDAY' ),
-	'currentday2'             => array( '1', 'अद्यदिवसे२', 'CURRENTDAY2' ),
-	'currentdayname'          => array( '1', 'अद्यदिवसेनाम', 'CURRENTDAYNAME' ),
-	'currentyear'             => array( '1', 'अद्यवर्ष', 'CURRENTYEAR' ),
-	'currenttime'             => array( '1', 'सद्यसमय', 'CURRENTTIME' ),
-	'currenthour'             => array( '1', 'सद्यघण्टा', 'CURRENTHOUR' ),
-	'localmonth'              => array( '1', 'स्थानिकमासे', 'LOCALMONTH', 'LOCALMONTH2' ),
-	'localmonthname'          => array( '1', 'स्थानिकमासेनाम', 'LOCALMONTHNAME' ),
-	'localmonthnamegen'       => array( '1', 'स्थानिकमासेनामसाधारण', 'LOCALMONTHNAMEGEN' ),
-	'localmonthabbrev'        => array( '1', 'स्थानिकमासेसंक्षीप्त', 'LOCALMONTHABBREV' ),
-	'localday'                => array( '1', 'स्थानिकदिवसे', 'LOCALDAY' ),
-	'localday2'               => array( '1', 'स्थानिकदिवसे२', 'LOCALDAY2' ),
-	'localdayname'            => array( '1', 'स्थानिकदिवसेनाम', 'LOCALDAYNAME' ),
-	'localyear'               => array( '1', 'स्थानिकवर्षे', 'LOCALYEAR' ),
-	'localtime'               => array( '1', 'स्थानिकसमये', 'LOCALTIME' ),
-	'localhour'               => array( '1', 'स्थानिकघण्टा', 'LOCALHOUR' ),
-	'numberofpages'           => array( '1', 'पृष्ठानाम्‌सङ्ख्या', 'NUMBEROFPAGES' ),
-	'numberofarticles'        => array( '1', 'लेखस्य‌सङ्ख्या', 'NUMBEROFARTICLES' ),
-	'numberoffiles'           => array( '1', 'संचिकानाम्‌‌सङ्ख्या', 'NUMBEROFFILES' ),
-	'numberofusers'           => array( '1', 'योजकस्यसङ्ख्या', 'NUMBEROFUSERS' ),
-	'numberofedits'           => array( '1', 'सम्पादनसङ्ख्या', 'NUMBEROFEDITS' ),
-	'numberofviews'           => array( '1', 'दृष्टिसङ्ख्या', 'NUMBEROFVIEWS' ),
-	'pagename'                => array( '1', 'पृष्ठनाम', 'PAGENAME' ),
-	'namespace'               => array( '1', 'नामविश्व', 'NAMESPACE' ),
-	'talkspace'               => array( '1', 'व्यासपिठ', 'TALKSPACE' ),
-	'subjectspace'            => array( '1', 'विषयविश्व', 'लेखविश्व', 'SUBJECTSPACE', 'ARTICLESPACE' ),
-	'fullpagename'            => array( '1', 'पूर्णपृष्ठनाम', 'FULLPAGENAME' ),
-	'subpagename'             => array( '1', 'उपपृष्ठनाम', 'SUBPAGENAME' ),
-	'basepagename'            => array( '1', 'आधारपृष्ठनाम', 'BASEPAGENAME' ),
-	'talkpagename'            => array( '1', 'संवादपृष्ठनाम', 'TALKPAGENAME' ),
-	'subjectpagename'         => array( '1', 'विषयपृष्ठनाम', 'लेखपृष्ठनाम', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
-	'msg'                     => array( '0', 'सन्देश:', 'MSG:' ),
-	'msgnw'                   => array( '0', 'नूतनसन्देश:', 'MSGNW:' ),
-	'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_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_upright'             => array( '1', 'उन्नत', 'उन्नत=$1', 'उन्नत $1', 'upright', 'upright=$1', 'upright $1' ),
-	'img_border'              => array( '1', 'सीमा', 'border' ),
-	'img_baseline'            => array( '1', 'आधाररेखा', 'baseline' ),
-	'img_sub'                 => array( '1', 'विषये', 'sub' ),
-	'img_super'               => array( '1', 'अति', 'तीव्र', 'super', 'sup' ),
-	'img_top'                 => array( '1', 'अग्र', 'top' ),
-	'img_text_top'            => array( '1', 'पाठ्य-अग्र', 'text-top' ),
-	'img_middle'              => array( '1', 'मध्ये', 'middle' ),
-	'img_bottom'              => array( '1', 'अधस', 'bottom' ),
-	'img_text_bottom'         => array( '1', 'पाठ्य-अधस', 'text-bottom' ),
-	'img_link'                => array( '1', 'सम्बद्धं=$1', 'link=$1' ),
-	'img_alt'                 => array( '1', 'विकल्प=$1', 'alt=$1' ),
-	'sitename'                => array( '1', 'स्थलनाम', 'SITENAME' ),
-	'grammar'                 => array( '0', 'व्याकरण:', 'GRAMMAR:' ),
-	'notitleconvert'          => array( '0', '__नैवशिर्षकपरिवर्त__', '__नैशिप__', '__NOTITLECONVERT__', '__NOTC__' ),
-	'nocontentconvert'        => array( '0', '__नैवलेखपरिवर्त__', '__नैलेप__', '__NOCONTENTCONVERT__', '__NOCC__' ),
-	'currentweek'             => array( '1', 'अद्यसप्ताह', 'CURRENTWEEK' ),
-	'localweek'               => array( '1', 'स्थानिकसप्ताह', 'LOCALWEEK' ),
-	'revisionid'              => array( '1', 'आवृत्तीक्रमांक', 'REVISIONID' ),
-	'revisionday'             => array( '1', 'आवृत्तीदिवसे', 'REVISIONDAY' ),
-	'revisionday2'            => array( '1', 'आवृत्तीदिवसे२', 'REVISIONDAY2' ),
-	'revisionmonth'           => array( '1', 'आवृत्तीमासे', 'REVISIONMONTH' ),
-	'revisionyear'            => array( '1', 'आवृत्तीवर्षे', 'REVISIONYEAR' ),
-	'revisiontimestamp'       => array( '1', 'आवृत्तीसमयमुद्रा', 'REVISIONTIMESTAMP' ),
-	'plural'                  => array( '0', 'अनेकवचन:', 'PLURAL:' ),
-	'displaytitle'            => array( '1', 'प्रदर्शनशीर्षक', 'उपाधिदर्शन', 'DISPLAYTITLE' ),
-	'newsectionlink'          => array( '1', '__नूतनविभागसम्बद्धं__', '__NEWSECTIONLINK__' ),
-	'currentversion'          => array( '1', 'अद्यआवृत्ती', 'CURRENTVERSION' ),
-	'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' ),
-	'special'                 => array( '0', 'विशेष', 'special' ),
-	'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' ),
+	'redirect'                  => array( '0', '#पुनर्निदेशन', '#REDIRECT' ),
+	'notoc'                     => array( '0', '__नैवअनुक्रमणी__', '__NOTOC__' ),
+	'nogallery'                 => array( '0', '__नैवसंक्रमणका__', '__NOGALLERY__' ),
+	'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' ),
+	'currentmonthabbrev'        => array( '1', 'अद्यमासेसंक्षीप्त', 'CURRENTMONTHABBREV' ),
+	'currentday'                => array( '1', 'अद्यदिवसे', 'CURRENTDAY' ),
+	'currentday2'               => array( '1', 'अद्यदिवसे२', 'CURRENTDAY2' ),
+	'currentdayname'            => array( '1', 'अद्यदिवसेनाम', 'CURRENTDAYNAME' ),
+	'currentyear'               => array( '1', 'अद्यवर्ष', 'CURRENTYEAR' ),
+	'currenttime'               => array( '1', 'सद्यसमय', 'CURRENTTIME' ),
+	'currenthour'               => array( '1', 'सद्यघण्टा', 'CURRENTHOUR' ),
+	'localmonth'                => array( '1', 'स्थानिकमासे', 'LOCALMONTH', 'LOCALMONTH2' ),
+	'localmonthname'            => array( '1', 'स्थानिकमासेनाम', 'LOCALMONTHNAME' ),
+	'localmonthnamegen'         => array( '1', 'स्थानिकमासेनामसाधारण', 'LOCALMONTHNAMEGEN' ),
+	'localmonthabbrev'          => array( '1', 'स्थानिकमासेसंक्षीप्त', 'LOCALMONTHABBREV' ),
+	'localday'                  => array( '1', 'स्थानिकदिवसे', 'LOCALDAY' ),
+	'localday2'                 => array( '1', 'स्थानिकदिवसे२', 'LOCALDAY2' ),
+	'localdayname'              => array( '1', 'स्थानिकदिवसेनाम', 'LOCALDAYNAME' ),
+	'localyear'                 => array( '1', 'स्थानिकवर्षे', 'LOCALYEAR' ),
+	'localtime'                 => array( '1', 'स्थानिकसमये', 'LOCALTIME' ),
+	'localhour'                 => array( '1', 'स्थानिकघण्टा', 'LOCALHOUR' ),
+	'numberofpages'             => array( '1', 'पृष्ठानाम्‌सङ्ख्या', 'NUMBEROFPAGES' ),
+	'numberofarticles'          => array( '1', 'लेखस्य‌सङ्ख्या', 'NUMBEROFARTICLES' ),
+	'numberoffiles'             => array( '1', 'संचिकानाम्‌‌सङ्ख्या', 'NUMBEROFFILES' ),
+	'numberofusers'             => array( '1', 'योजकस्यसङ्ख्या', 'NUMBEROFUSERS' ),
+	'numberofedits'             => array( '1', 'सम्पादनसङ्ख्या', 'NUMBEROFEDITS' ),
+	'numberofviews'             => array( '1', 'दृष्टिसङ्ख्या', 'NUMBEROFVIEWS' ),
+	'pagename'                  => array( '1', 'पृष्ठनाम', 'PAGENAME' ),
+	'namespace'                 => array( '1', 'नामविश्व', 'NAMESPACE' ),
+	'talkspace'                 => array( '1', 'व्यासपिठ', 'TALKSPACE' ),
+	'subjectspace'              => array( '1', 'विषयविश्व', 'लेखविश्व', 'SUBJECTSPACE', 'ARTICLESPACE' ),
+	'fullpagename'              => array( '1', 'पूर्णपृष्ठनाम', 'FULLPAGENAME' ),
+	'subpagename'               => array( '1', 'उपपृष्ठनाम', 'SUBPAGENAME' ),
+	'basepagename'              => array( '1', 'आधारपृष्ठनाम', 'BASEPAGENAME' ),
+	'talkpagename'              => array( '1', 'संवादपृष्ठनाम', 'TALKPAGENAME' ),
+	'subjectpagename'           => array( '1', 'विषयपृष्ठनाम', 'लेखपृष्ठनाम', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
+	'msg'                       => array( '0', 'सन्देश:', 'MSG:' ),
+	'msgnw'                     => array( '0', 'नूतनसन्देश:', 'MSGNW:' ),
+	'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_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_upright'               => array( '1', 'उन्नत', 'उन्नत=$1', 'उन्नत $1', 'upright', 'upright=$1', 'upright $1' ),
+	'img_border'                => array( '1', 'सीमा', 'border' ),
+	'img_baseline'              => array( '1', 'आधाररेखा', 'baseline' ),
+	'img_sub'                   => array( '1', 'विषये', 'sub' ),
+	'img_super'                 => array( '1', 'अति', 'तीव्र', 'super', 'sup' ),
+	'img_top'                   => array( '1', 'अग्र', 'top' ),
+	'img_text_top'              => array( '1', 'पाठ्य-अग्र', 'text-top' ),
+	'img_middle'                => array( '1', 'मध्ये', 'middle' ),
+	'img_bottom'                => array( '1', 'अधस', 'bottom' ),
+	'img_text_bottom'           => array( '1', 'पाठ्य-अधस', 'text-bottom' ),
+	'img_link'                  => array( '1', 'सम्बद्धं=$1', 'link=$1' ),
+	'img_alt'                   => array( '1', 'विकल्प=$1', 'alt=$1' ),
+	'sitename'                  => array( '1', 'स्थलनाम', 'SITENAME' ),
+	'grammar'                   => array( '0', 'व्याकरण:', 'GRAMMAR:' ),
+	'notitleconvert'            => array( '0', '__नैवशिर्षकपरिवर्त__', '__नैशिप__', '__NOTITLECONVERT__', '__NOTC__' ),
+	'nocontentconvert'          => array( '0', '__नैवलेखपरिवर्त__', '__नैलेप__', '__NOCONTENTCONVERT__', '__NOCC__' ),
+	'currentweek'               => array( '1', 'अद्यसप्ताह', 'CURRENTWEEK' ),
+	'localweek'                 => array( '1', 'स्थानिकसप्ताह', 'LOCALWEEK' ),
+	'revisionid'                => array( '1', 'आवृत्तीक्रमांक', 'REVISIONID' ),
+	'revisionday'               => array( '1', 'आवृत्तीदिवसे', 'REVISIONDAY' ),
+	'revisionday2'              => array( '1', 'आवृत्तीदिवसे२', 'REVISIONDAY2' ),
+	'revisionmonth'             => array( '1', 'आवृत्तीमासे', 'REVISIONMONTH' ),
+	'revisionyear'              => array( '1', 'आवृत्तीवर्षे', 'REVISIONYEAR' ),
+	'revisiontimestamp'         => array( '1', 'आवृत्तीसमयमुद्रा', 'REVISIONTIMESTAMP' ),
+	'plural'                    => array( '0', 'अनेकवचन:', 'PLURAL:' ),
+	'displaytitle'              => array( '1', 'प्रदर्शनशीर्षक', 'उपाधिदर्शन', 'DISPLAYTITLE' ),
+	'newsectionlink'            => array( '1', '__नूतनविभागसम्बद्धं__', '__NEWSECTIONLINK__' ),
+	'currentversion'            => array( '1', 'अद्यआवृत्ती', 'CURRENTVERSION' ),
+	'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' ),
+	'special'                   => array( '0', 'विशेष', 'special' ),
+	'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' ),
 );
 
 $digitGroupingPattern = "##,##,###";
diff --git a/languages/messages/MessagesSah.php b/languages/messages/MessagesSah.php
index 85812d3121..935f9653e4 100644
--- a/languages/messages/MessagesSah.php
+++ b/languages/messages/MessagesSah.php
@@ -308,6 +308,7 @@ $1',
 'newmessagesdifflink' => 'кэлиҥҥи уларытыы',
 'youhavenewmessagesfromusers' => 'Маны $1 {{PLURAL:$3|соҕотох кыттааччыттан|$3 кыттааччыттан}} туппуккун ($2).',
 'youhavenewmessagesmanyusers' => 'Маны $1 элбэх кыттааччыттан туппуккун ($2).',
+'newmessagesdifflinkplural' => 'тиһэх {{PLURAL:$1|уларытыы|уларытыылар}}',
 'youhavenewmessagesmulti' => '$1, саҥа суруктар кэллилэр',
 'editsection' => 'уларыт',
 'editold' => 'уларыт',
diff --git a/languages/messages/MessagesSd.php b/languages/messages/MessagesSd.php
index 298fd95f63..13f0764283 100644
--- a/languages/messages/MessagesSd.php
+++ b/languages/messages/MessagesSd.php
@@ -104,55 +104,55 @@ $specialPageAliases = array(
 );
 
 $magicWords = array(
-	'redirect'                => array( '0', '#چوريو', '#REDIRECT' ),
-	'localmonth'              => array( '1', 'مقاميمهينو', 'LOCALMONTH', 'LOCALMONTH2' ),
-	'localmonthname'          => array( '1', 'مقاميمهينونالو', 'LOCALMONTHNAME' ),
-	'localday'                => array( '1', 'مقاميڏينهن', 'LOCALDAY' ),
-	'localday2'               => array( '1', 'مقاميڏينهن2', 'LOCALDAY2' ),
-	'localdayname'            => array( '1', 'مقاميڏينهننالو', 'LOCALDAYNAME' ),
-	'localyear'               => array( '1', 'مقاميسال', 'LOCALYEAR' ),
-	'localtime'               => array( '1', 'مقاميوقت', 'LOCALTIME' ),
-	'localhour'               => array( '1', 'مقاميڪلاڪ', 'LOCALHOUR' ),
-	'numberofpages'           => array( '1', 'صفحنجوتعداد', 'NUMBEROFPAGES' ),
-	'numberofarticles'        => array( '1', 'مضموننجوتعداد', 'NUMBEROFARTICLES' ),
-	'numberoffiles'           => array( '1', 'فائيلنجوتعداد', 'NUMBEROFFILES' ),
-	'numberofusers'           => array( '1', 'يوزرسجوتعداد', 'NUMBEROFUSERS' ),
-	'numberofedits'           => array( '1', 'ترميمنجوتعداد', 'NUMBEROFEDITS' ),
-	'pagename'                => array( '1', 'صفحيجوعنوان', 'PAGENAME' ),
-	'namespace'               => array( '1', 'نانئپولار', 'NAMESPACE' ),
-	'talkspace'               => array( '1', 'بحثپولار', 'TALKSPACE' ),
-	'subjectspace'            => array( '1', 'مضمونپولار', 'SUBJECTSPACE', 'ARTICLESPACE' ),
-	'fullpagename'            => array( '1', 'صحفيجوپورونالو', 'FULLPAGENAME' ),
-	'msg'                     => array( '0', 'نياپو:', 'MSG:' ),
-	'img_right'               => array( '1', 'ساڄو', 'right' ),
-	'img_left'                => array( '1', 'کاٻو', 'left' ),
-	'img_none'                => array( '1', 'ڪجهنه', 'none' ),
-	'img_width'               => array( '1', '$1 عڪسلون', '$1px' ),
-	'img_center'              => array( '1', 'مرڪز', 'center', 'centre' ),
-	'img_top'                 => array( '1', 'سِرُ', 'top' ),
-	'img_middle'              => array( '1', 'وچ', 'middle' ),
-	'img_bottom'              => array( '1', 'تَرُ', 'bottom' ),
-	'sitename'                => array( '1', 'سرزميننالو', 'SITENAME' ),
-	'ns'                      => array( '0', 'نپ', 'NS:' ),
-	'localurl'                => array( '0', 'مقامييوآريل', 'LOCALURL:' ),
-	'grammar'                 => array( '0', 'وياڪرڻ', 'GRAMMAR:' ),
-	'currentweek'             => array( '1', 'هلندڙهفتو', 'CURRENTWEEK' ),
-	'currentdow'              => array( '1', 'اڄوڪوڏينهن', 'CURRENTDOW' ),
-	'localweek'               => array( '1', 'مقاميهفتو', 'LOCALWEEK' ),
-	'plural'                  => array( '0', 'جمع', 'PLURAL:' ),
-	'fullurl'                 => array( '0', 'مڪمليوآريل', 'FULLURL:' ),
-	'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' ),
-	'special'                 => array( '0', 'خاص', 'special' ),
-	'filepath'                => array( '0', 'فائيلڏس', 'FILEPATH:' ),
-	'hiddencat'               => array( '1', '__ لڪل زمرو __', '__HIDDENCAT__' ),
-	'pagesincategory'         => array( '1', 'زمريجاصفحا', 'PAGESINCATEGORY', 'PAGESINCAT' ),
-	'pagesize'                => array( '1', 'صفحيجيماپ', 'PAGESIZE' ),
+	'redirect'                  => array( '0', '#چوريو', '#REDIRECT' ),
+	'localmonth'                => array( '1', 'مقاميمهينو', 'LOCALMONTH', 'LOCALMONTH2' ),
+	'localmonthname'            => array( '1', 'مقاميمهينونالو', 'LOCALMONTHNAME' ),
+	'localday'                  => array( '1', 'مقاميڏينهن', 'LOCALDAY' ),
+	'localday2'                 => array( '1', 'مقاميڏينهن2', 'LOCALDAY2' ),
+	'localdayname'              => array( '1', 'مقاميڏينهننالو', 'LOCALDAYNAME' ),
+	'localyear'                 => array( '1', 'مقاميسال', 'LOCALYEAR' ),
+	'localtime'                 => array( '1', 'مقاميوقت', 'LOCALTIME' ),
+	'localhour'                 => array( '1', 'مقاميڪلاڪ', 'LOCALHOUR' ),
+	'numberofpages'             => array( '1', 'صفحنجوتعداد', 'NUMBEROFPAGES' ),
+	'numberofarticles'          => array( '1', 'مضموننجوتعداد', 'NUMBEROFARTICLES' ),
+	'numberoffiles'             => array( '1', 'فائيلنجوتعداد', 'NUMBEROFFILES' ),
+	'numberofusers'             => array( '1', 'يوزرسجوتعداد', 'NUMBEROFUSERS' ),
+	'numberofedits'             => array( '1', 'ترميمنجوتعداد', 'NUMBEROFEDITS' ),
+	'pagename'                  => array( '1', 'صفحيجوعنوان', 'PAGENAME' ),
+	'namespace'                 => array( '1', 'نانئپولار', 'NAMESPACE' ),
+	'talkspace'                 => array( '1', 'بحثپولار', 'TALKSPACE' ),
+	'subjectspace'              => array( '1', 'مضمونپولار', 'SUBJECTSPACE', 'ARTICLESPACE' ),
+	'fullpagename'              => array( '1', 'صحفيجوپورونالو', 'FULLPAGENAME' ),
+	'msg'                       => array( '0', 'نياپو:', 'MSG:' ),
+	'img_right'                 => array( '1', 'ساڄو', 'right' ),
+	'img_left'                  => array( '1', 'کاٻو', 'left' ),
+	'img_none'                  => array( '1', 'ڪجهنه', 'none' ),
+	'img_width'                 => array( '1', '$1 عڪسلون', '$1px' ),
+	'img_center'                => array( '1', 'مرڪز', 'center', 'centre' ),
+	'img_top'                   => array( '1', 'سِرُ', 'top' ),
+	'img_middle'                => array( '1', 'وچ', 'middle' ),
+	'img_bottom'                => array( '1', 'تَرُ', 'bottom' ),
+	'sitename'                  => array( '1', 'سرزميننالو', 'SITENAME' ),
+	'ns'                        => array( '0', 'نپ', 'NS:' ),
+	'localurl'                  => array( '0', 'مقامييوآريل', 'LOCALURL:' ),
+	'grammar'                   => array( '0', 'وياڪرڻ', 'GRAMMAR:' ),
+	'currentweek'               => array( '1', 'هلندڙهفتو', 'CURRENTWEEK' ),
+	'currentdow'                => array( '1', 'اڄوڪوڏينهن', 'CURRENTDOW' ),
+	'localweek'                 => array( '1', 'مقاميهفتو', 'LOCALWEEK' ),
+	'plural'                    => array( '0', 'جمع', 'PLURAL:' ),
+	'fullurl'                   => array( '0', 'مڪمليوآريل', 'FULLURL:' ),
+	'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' ),
+	'special'                   => array( '0', 'خاص', 'special' ),
+	'filepath'                  => array( '0', 'فائيلڏس', 'FILEPATH:' ),
+	'hiddencat'                 => array( '1', '__ لڪل زمرو __', '__HIDDENCAT__' ),
+	'pagesincategory'           => array( '1', 'زمريجاصفحا', 'PAGESINCATEGORY', 'PAGESINCAT' ),
+	'pagesize'                  => array( '1', 'صفحيجيماپ', 'PAGESIZE' ),
 );
 
 $messages = array(
diff --git a/languages/messages/MessagesSe.php b/languages/messages/MessagesSe.php
index aefd19b0e0..8829a0b4c7 100644
--- a/languages/messages/MessagesSe.php
+++ b/languages/messages/MessagesSe.php
@@ -20,7 +20,7 @@
 
 $namespaceNames = array(
 	NS_MEDIA            => 'Media',
-	NS_SPECIAL          => 'Doaimmat',
+	NS_SPECIAL          => 'Erenoamáš',
 	NS_TALK             => 'Ságastallan',
 	NS_USER             => 'Geavaheaddji',
 	NS_USER_TALK        => 'Geavaheaddjeságastallan',
@@ -37,6 +37,10 @@ $namespaceNames = array(
 	NS_CATEGORY_TALK    => 'Kategoriijaságastallan',
 );
 
+$namespaceAliases = array(
+	'Doaimmat' => NS_SPECIAL,
+);
+
 $specialPageAliases = array(
 	'Activeusers'               => array( 'Aktiivvalaš_geavaheaddjit' ),
 	'Allmessages'               => array( 'Buot_systemasánit' ),
@@ -48,6 +52,7 @@ $specialPageAliases = array(
 	'Contributions'             => array( 'Geavaheaddji_rievdadusat' ),
 	'Disambiguations'           => array( 'Liŋkkat_dárkonsiidduide' ),
 	'DoubleRedirects'           => array( 'Guoktegeardásaš_ođđasitstivremat' ),
+	'Emailuser'                 => array( 'SáddeEpoastta' ),
 	'Export'                    => array( 'Olggosfievrrit_siidduid' ),
 	'Listfiles'                 => array( 'Fiilalogahallan' ),
 	'Listredirects'             => array( 'Listu_ođđasitstivremiin' ),
@@ -83,8 +88,8 @@ $specialPageAliases = array(
 );
 
 $magicWords = array(
-	'redirect'                => array( '0', '#OĐĐASITSTIVREN', '#STIVREN', '#REDIRECT' ),
-	'numberofarticles'        => array( '1', 'ARTIHKKALIIDMEARRI', 'NUMBEROFARTICLES' ),
+	'redirect'                  => array( '0', '#OĐĐASITSTIVREN', '#STIVREN', '#REDIRECT' ),
+	'numberofarticles'          => array( '1', 'ARTIHKKALIIDMEARRI', 'NUMBEROFARTICLES' ),
 );
 
 $linkTrail = '/^(:?[a-zàáâçčʒǯđðéèêëǧǥȟíìîïıǩŋñóòôõßšŧúùûýÿüžþæøåäö]+)(.*)$/sDu';
diff --git a/languages/messages/MessagesSh.php b/languages/messages/MessagesSh.php
index 5978df8640..9b3eb3e0bc 100644
--- a/languages/messages/MessagesSh.php
+++ b/languages/messages/MessagesSh.php
@@ -115,94 +115,94 @@ $specialPageAliases = array(
 );
 
 $magicWords = array(
-	'redirect'                => array( '0', '#PREUSMJERI', '#PREUSMERI', '#REDIRECT' ),
-	'notoc'                   => array( '0', '__BEZSADRŽAJA__', '__NOTOC__' ),
-	'nogallery'               => array( '0', '__BEZGALERIJE__', '__NOGALLERY__' ),
-	'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' ),
-	'currentmonthnamegen'     => array( '1', 'TRENUTNIMJESECROD', 'TRENUTNIMESECROD', 'TRENUTAČNIMJESECROD', 'CURRENTMONTHNAMEGEN' ),
-	'currentmonthabbrev'      => array( '1', 'TRENUTNIMJESECSKR', 'TRENUTNIMESECSKR', 'TRENUTAČNIMJESECSKR', 'CURRENTMONTHABBREV' ),
-	'currentday'              => array( '1', 'TRENUTNIDAN', 'TRENUTAČNIDAN', 'CURRENTDAY' ),
-	'currentday2'             => array( '1', 'TRENUTNIDAN2', 'TRENUTAČNIDAN2', 'CURRENTDAY2' ),
-	'currentdayname'          => array( '1', 'TRENUTNIDANIME', 'TRENUTAČNIDANIME', 'CURRENTDAYNAME' ),
-	'currentyear'             => array( '1', 'TRENUTNAGODINA', 'TRENUTAČNAGODINA', 'CURRENTYEAR' ),
-	'currenttime'             => array( '1', 'TRENUTNOVRIJEME', 'TRENUTNOVREME', 'TRENUTAČNOVRIJEME', 'CURRENTTIME' ),
-	'currenthour'             => array( '1', 'TRENUTNISAT', 'TRENUTAČNISAT', 'CURRENTHOUR' ),
-	'localmonth'              => array( '1', 'LOKALNIMJESEC', 'LOKALNIMESEC', 'LOCALMONTH', 'LOCALMONTH2' ),
-	'localmonth1'             => array( '1', 'LOKALNIMJESEC1', 'LOKALNIMESEC1', 'LOCALMONTH1' ),
-	'localmonthname'          => array( '1', 'LOKALNIMJESECIME', 'LOKALNIMESECIME', 'LOCALMONTHNAME' ),
-	'localmonthnamegen'       => array( '1', 'LOKALNIMJESECROD', 'LOKALNIMESECROD', 'LOKALNIMJESECGEN', 'LOKALNIMESECGEN', 'LOCALMONTHNAMEGEN' ),
-	'localmonthabbrev'        => array( '1', 'LOKALNIMJESECSKR', 'LOKALNIMESECSKR', 'LOKALNIMJESECKRAT', 'LOCALMONTHABBREV' ),
-	'localday'                => array( '1', 'LOKALNIDAN', 'LOCALDAY' ),
-	'localday2'               => array( '1', 'LOKALNIDAN2', 'LOCALDAY2' ),
-	'localdayname'            => array( '1', 'LOKALNIDANIME', 'LOCALDAYNAME' ),
-	'localyear'               => array( '1', 'LOKALNAGODINA', 'LOCALYEAR' ),
-	'localtime'               => array( '1', 'LOKALNOVRIJEME', 'LOKALNOVREME', 'LOCALTIME' ),
-	'localhour'               => array( '1', 'LOKALNISAT', 'LOCALHOUR' ),
-	'numberofpages'           => array( '1', 'BROJSTRANICA', 'BROJSTRANA', 'NUMBEROFPAGES' ),
-	'numberofarticles'        => array( '1', 'BROJČLANAKA', 'NUMBEROFARTICLES' ),
-	'numberoffiles'           => array( '1', 'BROJDATOTEKA', 'BROJFAJLOVA', 'NUMBEROFFILES' ),
-	'numberofusers'           => array( '1', 'BROJKORISNIKA', 'NUMBEROFUSERS' ),
-	'numberofactiveusers'     => array( '1', 'BROJAKTIVNIHKORISNIKA', 'NUMBEROFACTIVEUSERS' ),
-	'numberofedits'           => array( '1', 'BROJIZMJENA', 'BROJIZMENA', 'BROJUREĐIVANJA', 'NUMBEROFEDITS' ),
-	'numberofviews'           => array( '1', 'BROJPREGLEDA', 'NUMBEROFVIEWS' ),
-	'pagename'                => array( '1', 'STRANICA', 'IMESTRANICE', 'PAGENAME' ),
-	'pagenamee'               => array( '1', 'STRANICE', 'IMESTRANICEE', 'PAGENAMEE' ),
-	'namespace'               => array( '1', 'IMENSKIPROSTOR', 'NAMESPACE' ),
-	'namespacee'              => array( '1', 'IMENSKIPROSTORI', 'NAMESPACEE' ),
-	'talkspace'               => array( '1', 'PROSTORZARAZGOVOR', 'TALKSPACE' ),
-	'talkspacee'              => array( '1', 'PROSTORIZARAZGOVOR', 'TALKSPACEE' ),
-	'fullpagename'            => array( '1', 'PUNOIMESTRANE', 'PUNOIMESTRANICE', 'FULLPAGENAME' ),
-	'fullpagenamee'           => array( '1', 'PUNOIMESTRANEE', 'PUNOIMESTRANICEE', 'FULLPAGENAMEE' ),
-	'msg'                     => array( '0', 'POR:', 'MSG:' ),
-	'subst'                   => array( '0', 'ZAMJENI:', 'ZAMENI:', 'ZAMJENA:', 'SUBST:' ),
-	'msgnw'                   => array( '0', 'NVPOR:', 'MSGNW:' ),
-	'img_thumbnail'           => array( '1', 'minijatura', 'mini', 'thumbnail', 'thumb' ),
-	'img_manualthumb'         => array( '1', 'minijatura=$1', 'mini=$1', 'thumbnail=$1', 'thumb=$1' ),
-	'img_right'               => array( '1', 'desno', 'right' ),
-	'img_left'                => array( '1', 'lijevo', 'levo', 'left' ),
-	'img_none'                => array( '1', 'n', 'bez', 'ništa', 'none' ),
-	'img_center'              => array( '1', 'centar', 'središte', 'c', 'center', 'centre' ),
-	'img_framed'              => array( '1', 'okvir', 'ram', 'framed', 'enframed', 'frame' ),
-	'img_frameless'           => array( '1', 'bez_okvira', 'bezokvira', 'frameless' ),
-	'img_page'                => array( '1', 'stranica=$1', 'stranica_$1', 'strana=$1', 'strana_$1', 'page=$1', 'page $1' ),
-	'img_upright'             => array( '1', 'na_gore', 'na_gore=$1', 'na_gore_$1', 'uspravno', 'uspravno=$1', 'uspravno_$1', 'upright', 'upright=$1', 'upright $1' ),
-	'img_border'              => array( '1', 'granica', 'obrub', 'border' ),
-	'img_baseline'            => array( '1', 'osnovnacrta', 'pocetna_linija', 'baseline' ),
-	'img_top'                 => array( '1', 'vrh', 'top' ),
-	'img_text_top'            => array( '1', 'vrh_teksta', 'tekst_vrh', 'text-top' ),
-	'img_middle'              => array( '1', 'sredina', 'middle' ),
-	'img_bottom'              => array( '1', 'dno', 'bottom' ),
-	'img_text_bottom'         => array( '1', 'tekst-dno', 'text-bottom' ),
-	'localurl'                => array( '0', 'LOKALNIURL:', 'LOCALURL:' ),
-	'localurle'               => array( '0', 'LOKALNIURLE:', 'LOCALURLE:' ),
-	'notitleconvert'          => array( '0', '__BEZTC__', '__BEZKN__', '__BPN__', '__NOTITLECONVERT__', '__NOTC__' ),
-	'nocontentconvert'        => array( '0', '__BEZCC__', '__BPS__', '__NOCONTENTCONVERT__', '__NOCC__' ),
-	'currentweek'             => array( '1', 'TRENUTNASEDMICA', 'TRENUTAČNITJEDAN', 'TRENUTNANEDELJA', 'TRENUTNITJEDAN', 'CURRENTWEEK' ),
-	'currentdow'              => array( '1', 'TRENUTNIDANSEDMICE', 'TRENUTAČNIDANTJEDNA', 'TRENUTNIDANNEDELJE', 'TRENUTNIDANTJEDNA', 'CURRENTDOW' ),
-	'localweek'               => array( '1', 'LOKALNASEDMICA', 'LOKALNITJEDAN', 'LOKALNANEDELJA', 'LOCALWEEK' ),
-	'localdow'                => array( '1', 'LOKALNIDANSEDMICE', 'LOKALNIDANTJEDNA', 'LOKALNIDANNEDELJE', 'LOCALDOW' ),
-	'revisionid'              => array( '1', 'IDIZMJENE', 'IDIZMENE', 'REVISIONID' ),
-	'revisionday'             => array( '1', 'IZMJENEDANA', 'IZMENEDANA', 'REVISIONDAY' ),
-	'revisionday2'            => array( '1', 'IZMJENEDANA2', 'IZMENEDANA2', 'REVISIONDAY2' ),
-	'revisionmonth'           => array( '1', 'MJESECIZMJENE', 'MESECIZMENE', 'REVISIONMONTH' ),
-	'revisionmonth1'          => array( '1', 'MJESECIZMJENE1', 'MESECIZMENE1', 'REVISIONMONTH1' ),
-	'revisionyear'            => array( '1', 'GODINAIZMJENE', 'GODINAIZMENE', 'REVISIONYEAR' ),
-	'revisiontimestamp'       => array( '1', 'OZNAKAVREMENAIZMJENE', 'OZNAKAVREMENAIZMENE', 'REVISIONTIMESTAMP' ),
-	'plural'                  => array( '0', 'MNOŽINA:', 'PLURAL:' ),
-	'fullurl'                 => array( '0', 'PUNIURL:', 'PUNURL:', 'FULLURL:' ),
-	'fullurle'                => array( '0', 'PUNIURLE:', 'PUNURLE:', 'FULLURLE:' ),
-	'currenttimestamp'        => array( '1', 'TRENUTNAOZNAKAVREMENA', 'TRENUTAČNAOZNAKAVREMENA', 'CURRENTTIMESTAMP' ),
-	'localtimestamp'          => array( '1', 'LOKALNAOZNAKAVREMENA', 'LOCALTIMESTAMP' ),
-	'special'                 => array( '0', 'posebno', 'special' ),
-	'hiddencat'               => array( '1', '__SAKRIVENAKATEGORIJA__', 'SKRIVENAKAT', '__SAKRIVENAKAT__', '__HIDDENCAT__' ),
-	'pagesize'                => array( '1', 'VELICINASTRANICE', 'VELIČINASTRANICE', 'VELIČINASTRANE', 'VELICINASTRANE', 'PAGESIZE' ),
-	'formatdate'              => array( '0', 'formatdatuma', 'formatdate', 'dateformat' ),
+	'redirect'                  => array( '0', '#PREUSMJERI', '#PREUSMERI', '#REDIRECT' ),
+	'notoc'                     => array( '0', '__BEZSADRŽAJA__', '__NOTOC__' ),
+	'nogallery'                 => array( '0', '__BEZGALERIJE__', '__NOGALLERY__' ),
+	'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' ),
+	'currentmonthnamegen'       => array( '1', 'TRENUTNIMJESECROD', 'TRENUTNIMESECROD', 'TRENUTAČNIMJESECROD', 'CURRENTMONTHNAMEGEN' ),
+	'currentmonthabbrev'        => array( '1', 'TRENUTNIMJESECSKR', 'TRENUTNIMESECSKR', 'TRENUTAČNIMJESECSKR', 'CURRENTMONTHABBREV' ),
+	'currentday'                => array( '1', 'TRENUTNIDAN', 'TRENUTAČNIDAN', 'CURRENTDAY' ),
+	'currentday2'               => array( '1', 'TRENUTNIDAN2', 'TRENUTAČNIDAN2', 'CURRENTDAY2' ),
+	'currentdayname'            => array( '1', 'TRENUTNIDANIME', 'TRENUTAČNIDANIME', 'CURRENTDAYNAME' ),
+	'currentyear'               => array( '1', 'TRENUTNAGODINA', 'TRENUTAČNAGODINA', 'CURRENTYEAR' ),
+	'currenttime'               => array( '1', 'TRENUTNOVRIJEME', 'TRENUTNOVREME', 'TRENUTAČNOVRIJEME', 'CURRENTTIME' ),
+	'currenthour'               => array( '1', 'TRENUTNISAT', 'TRENUTAČNISAT', 'CURRENTHOUR' ),
+	'localmonth'                => array( '1', 'LOKALNIMJESEC', 'LOKALNIMESEC', 'LOCALMONTH', 'LOCALMONTH2' ),
+	'localmonth1'               => array( '1', 'LOKALNIMJESEC1', 'LOKALNIMESEC1', 'LOCALMONTH1' ),
+	'localmonthname'            => array( '1', 'LOKALNIMJESECIME', 'LOKALNIMESECIME', 'LOCALMONTHNAME' ),
+	'localmonthnamegen'         => array( '1', 'LOKALNIMJESECROD', 'LOKALNIMESECROD', 'LOKALNIMJESECGEN', 'LOKALNIMESECGEN', 'LOCALMONTHNAMEGEN' ),
+	'localmonthabbrev'          => array( '1', 'LOKALNIMJESECSKR', 'LOKALNIMESECSKR', 'LOKALNIMJESECKRAT', 'LOCALMONTHABBREV' ),
+	'localday'                  => array( '1', 'LOKALNIDAN', 'LOCALDAY' ),
+	'localday2'                 => array( '1', 'LOKALNIDAN2', 'LOCALDAY2' ),
+	'localdayname'              => array( '1', 'LOKALNIDANIME', 'LOCALDAYNAME' ),
+	'localyear'                 => array( '1', 'LOKALNAGODINA', 'LOCALYEAR' ),
+	'localtime'                 => array( '1', 'LOKALNOVRIJEME', 'LOKALNOVREME', 'LOCALTIME' ),
+	'localhour'                 => array( '1', 'LOKALNISAT', 'LOCALHOUR' ),
+	'numberofpages'             => array( '1', 'BROJSTRANICA', 'BROJSTRANA', 'NUMBEROFPAGES' ),
+	'numberofarticles'          => array( '1', 'BROJČLANAKA', 'NUMBEROFARTICLES' ),
+	'numberoffiles'             => array( '1', 'BROJDATOTEKA', 'BROJFAJLOVA', 'NUMBEROFFILES' ),
+	'numberofusers'             => array( '1', 'BROJKORISNIKA', 'NUMBEROFUSERS' ),
+	'numberofactiveusers'       => array( '1', 'BROJAKTIVNIHKORISNIKA', 'NUMBEROFACTIVEUSERS' ),
+	'numberofedits'             => array( '1', 'BROJIZMJENA', 'BROJIZMENA', 'BROJUREĐIVANJA', 'NUMBEROFEDITS' ),
+	'numberofviews'             => array( '1', 'BROJPREGLEDA', 'NUMBEROFVIEWS' ),
+	'pagename'                  => array( '1', 'STRANICA', 'IMESTRANICE', 'PAGENAME' ),
+	'pagenamee'                 => array( '1', 'STRANICE', 'IMESTRANICEE', 'PAGENAMEE' ),
+	'namespace'                 => array( '1', 'IMENSKIPROSTOR', 'NAMESPACE' ),
+	'namespacee'                => array( '1', 'IMENSKIPROSTORI', 'NAMESPACEE' ),
+	'talkspace'                 => array( '1', 'PROSTORZARAZGOVOR', 'TALKSPACE' ),
+	'talkspacee'                => array( '1', 'PROSTORIZARAZGOVOR', 'TALKSPACEE' ),
+	'fullpagename'              => array( '1', 'PUNOIMESTRANE', 'PUNOIMESTRANICE', 'FULLPAGENAME' ),
+	'fullpagenamee'             => array( '1', 'PUNOIMESTRANEE', 'PUNOIMESTRANICEE', 'FULLPAGENAMEE' ),
+	'msg'                       => array( '0', 'POR:', 'MSG:' ),
+	'subst'                     => array( '0', 'ZAMJENI:', 'ZAMENI:', 'ZAMJENA:', 'SUBST:' ),
+	'msgnw'                     => array( '0', 'NVPOR:', 'MSGNW:' ),
+	'img_thumbnail'             => array( '1', 'minijatura', 'mini', 'thumbnail', 'thumb' ),
+	'img_manualthumb'           => array( '1', 'minijatura=$1', 'mini=$1', 'thumbnail=$1', 'thumb=$1' ),
+	'img_right'                 => array( '1', 'desno', 'right' ),
+	'img_left'                  => array( '1', 'lijevo', 'levo', 'left' ),
+	'img_none'                  => array( '1', 'n', 'bez', 'ništa', 'none' ),
+	'img_center'                => array( '1', 'centar', 'središte', 'c', 'center', 'centre' ),
+	'img_framed'                => array( '1', 'okvir', 'ram', 'framed', 'enframed', 'frame' ),
+	'img_frameless'             => array( '1', 'bez_okvira', 'bezokvira', 'frameless' ),
+	'img_page'                  => array( '1', 'stranica=$1', 'stranica_$1', 'strana=$1', 'strana_$1', 'page=$1', 'page $1' ),
+	'img_upright'               => array( '1', 'na_gore', 'na_gore=$1', 'na_gore_$1', 'uspravno', 'uspravno=$1', 'uspravno_$1', 'upright', 'upright=$1', 'upright $1' ),
+	'img_border'                => array( '1', 'granica', 'obrub', 'border' ),
+	'img_baseline'              => array( '1', 'osnovnacrta', 'pocetna_linija', 'baseline' ),
+	'img_top'                   => array( '1', 'vrh', 'top' ),
+	'img_text_top'              => array( '1', 'vrh_teksta', 'tekst_vrh', 'text-top' ),
+	'img_middle'                => array( '1', 'sredina', 'middle' ),
+	'img_bottom'                => array( '1', 'dno', 'bottom' ),
+	'img_text_bottom'           => array( '1', 'tekst-dno', 'text-bottom' ),
+	'localurl'                  => array( '0', 'LOKALNIURL:', 'LOCALURL:' ),
+	'localurle'                 => array( '0', 'LOKALNIURLE:', 'LOCALURLE:' ),
+	'notitleconvert'            => array( '0', '__BEZTC__', '__BEZKN__', '__BPN__', '__NOTITLECONVERT__', '__NOTC__' ),
+	'nocontentconvert'          => array( '0', '__BEZCC__', '__BPS__', '__NOCONTENTCONVERT__', '__NOCC__' ),
+	'currentweek'               => array( '1', 'TRENUTNASEDMICA', 'TRENUTAČNITJEDAN', 'TRENUTNANEDELJA', 'TRENUTNITJEDAN', 'CURRENTWEEK' ),
+	'currentdow'                => array( '1', 'TRENUTNIDANSEDMICE', 'TRENUTAČNIDANTJEDNA', 'TRENUTNIDANNEDELJE', 'TRENUTNIDANTJEDNA', 'CURRENTDOW' ),
+	'localweek'                 => array( '1', 'LOKALNASEDMICA', 'LOKALNITJEDAN', 'LOKALNANEDELJA', 'LOCALWEEK' ),
+	'localdow'                  => array( '1', 'LOKALNIDANSEDMICE', 'LOKALNIDANTJEDNA', 'LOKALNIDANNEDELJE', 'LOCALDOW' ),
+	'revisionid'                => array( '1', 'IDIZMJENE', 'IDIZMENE', 'REVISIONID' ),
+	'revisionday'               => array( '1', 'IZMJENEDANA', 'IZMENEDANA', 'REVISIONDAY' ),
+	'revisionday2'              => array( '1', 'IZMJENEDANA2', 'IZMENEDANA2', 'REVISIONDAY2' ),
+	'revisionmonth'             => array( '1', 'MJESECIZMJENE', 'MESECIZMENE', 'REVISIONMONTH' ),
+	'revisionmonth1'            => array( '1', 'MJESECIZMJENE1', 'MESECIZMENE1', 'REVISIONMONTH1' ),
+	'revisionyear'              => array( '1', 'GODINAIZMJENE', 'GODINAIZMENE', 'REVISIONYEAR' ),
+	'revisiontimestamp'         => array( '1', 'OZNAKAVREMENAIZMJENE', 'OZNAKAVREMENAIZMENE', 'REVISIONTIMESTAMP' ),
+	'plural'                    => array( '0', 'MNOŽINA:', 'PLURAL:' ),
+	'fullurl'                   => array( '0', 'PUNIURL:', 'PUNURL:', 'FULLURL:' ),
+	'fullurle'                  => array( '0', 'PUNIURLE:', 'PUNURLE:', 'FULLURLE:' ),
+	'currenttimestamp'          => array( '1', 'TRENUTNAOZNAKAVREMENA', 'TRENUTAČNAOZNAKAVREMENA', 'CURRENTTIMESTAMP' ),
+	'localtimestamp'            => array( '1', 'LOKALNAOZNAKAVREMENA', 'LOCALTIMESTAMP' ),
+	'special'                   => array( '0', 'posebno', 'special' ),
+	'hiddencat'                 => array( '1', '__SAKRIVENAKATEGORIJA__', 'SKRIVENAKAT', '__SAKRIVENAKAT__', '__HIDDENCAT__' ),
+	'pagesize'                  => array( '1', 'VELICINASTRANICE', 'VELIČINASTRANICE', 'VELIČINASTRANE', 'VELICINASTRANE', 'PAGESIZE' ),
+	'formatdate'                => array( '0', 'formatdatuma', 'formatdate', 'dateformat' ),
 );
 
 $linkTrail = '/^([a-zčćđžš]+)(.*)$/sDu';
diff --git a/languages/messages/MessagesSi.php b/languages/messages/MessagesSi.php
index 325d8fbb39..972e2efa39 100644
--- a/languages/messages/MessagesSi.php
+++ b/languages/messages/MessagesSi.php
@@ -149,46 +149,46 @@ $specialPageAliases = array(
 );
 
 $magicWords = array(
-	'redirect'                => array( '0', '#යළියොමුව', '#REDIRECT' ),
-	'currentmonth'            => array( '1', 'වත්මන්මාසය', 'වත්මන්මාසය2', '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' ),
-	'localmonth'              => array( '1', 'දේශීයමාසය', 'LOCALMONTH', 'LOCALMONTH2' ),
-	'localmonthname'          => array( '1', 'දේශීයමාසනාමය', 'LOCALMONTHNAME' ),
-	'localmonthnamegen'       => array( '1', 'දේශීයමාසනාමයපොදු', 'LOCALMONTHNAMEGEN' ),
-	'localmonthabbrev'        => array( '1', 'දේශීයමාසයකෙටි', 'LOCALMONTHABBREV' ),
-	'localday'                => array( '1', 'දේශීයදිනය', 'LOCALDAY' ),
-	'localday2'               => array( '1', 'දේශීයදිනය2', 'LOCALDAY2' ),
-	'localdayname'            => array( '1', 'දේශීයදිනනාමය', 'LOCALDAYNAME' ),
-	'localyear'               => array( '1', 'දේශීයවසර', 'LOCALYEAR' ),
-	'localtime'               => array( '1', 'දේශීයවේලාව', 'LOCALTIME' ),
-	'localhour'               => array( '1', 'දේශීයපැය', 'LOCALHOUR' ),
-	'numberofpages'           => array( '1', 'පිටුසංඛ්‍යාව', 'NUMBEROFPAGES' ),
-	'numberofarticles'        => array( '1', 'ලිපිසංඛ්‍යාව', 'NUMBEROFARTICLES' ),
-	'numberoffiles'           => array( '1', 'ගොනුසංඛ්‍යාව', 'NUMBEROFFILES' ),
-	'numberofusers'           => array( '1', 'පරිශීලකයන්සංඛ්‍යාව', 'NUMBEROFUSERS' ),
-	'numberofedits'           => array( '1', 'සංස්කරණසංඛ්‍යාව', 'NUMBEROFEDITS' ),
-	'pagename'                => array( '1', 'පිටුනාමය', 'PAGENAME' ),
-	'namespace'               => array( '1', 'නාමඅවකාශය', 'NAMESPACE' ),
-	'namespacee'              => array( '1', 'නාමඅවකාශයන්', 'NAMESPACEE' ),
-	'msg'                     => array( '0', 'පණිවුඩ:', 'MSG:' ),
-	'img_right'               => array( '1', 'දකුණ', 'right' ),
-	'img_left'                => array( '1', 'වම', 'left' ),
-	'img_none'                => array( '1', 'නොමැත', 'none' ),
-	'img_width'               => array( '1', '$1පික්', '$1px' ),
-	'img_center'              => array( '1', 'මධ්‍යය', 'center', 'centre' ),
-	'img_border'              => array( '1', 'දාරය', 'border' ),
-	'img_sub'                 => array( '1', 'උප', 'sub' ),
-	'img_middle'              => array( '1', 'මැද', 'middle' ),
-	'special'                 => array( '0', 'විශේෂ', 'special' ),
+	'redirect'                  => array( '0', '#යළියොමුව', '#REDIRECT' ),
+	'currentmonth'              => array( '1', 'වත්මන්මාසය', 'වත්මන්මාසය2', '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' ),
+	'localmonth'                => array( '1', 'දේශීයමාසය', 'LOCALMONTH', 'LOCALMONTH2' ),
+	'localmonthname'            => array( '1', 'දේශීයමාසනාමය', 'LOCALMONTHNAME' ),
+	'localmonthnamegen'         => array( '1', 'දේශීයමාසනාමයපොදු', 'LOCALMONTHNAMEGEN' ),
+	'localmonthabbrev'          => array( '1', 'දේශීයමාසයකෙටි', 'LOCALMONTHABBREV' ),
+	'localday'                  => array( '1', 'දේශීයදිනය', 'LOCALDAY' ),
+	'localday2'                 => array( '1', 'දේශීයදිනය2', 'LOCALDAY2' ),
+	'localdayname'              => array( '1', 'දේශීයදිනනාමය', 'LOCALDAYNAME' ),
+	'localyear'                 => array( '1', 'දේශීයවසර', 'LOCALYEAR' ),
+	'localtime'                 => array( '1', 'දේශීයවේලාව', 'LOCALTIME' ),
+	'localhour'                 => array( '1', 'දේශීයපැය', 'LOCALHOUR' ),
+	'numberofpages'             => array( '1', 'පිටුසංඛ්‍යාව', 'NUMBEROFPAGES' ),
+	'numberofarticles'          => array( '1', 'ලිපිසංඛ්‍යාව', 'NUMBEROFARTICLES' ),
+	'numberoffiles'             => array( '1', 'ගොනුසංඛ්‍යාව', 'NUMBEROFFILES' ),
+	'numberofusers'             => array( '1', 'පරිශීලකයන්සංඛ්‍යාව', 'NUMBEROFUSERS' ),
+	'numberofedits'             => array( '1', 'සංස්කරණසංඛ්‍යාව', 'NUMBEROFEDITS' ),
+	'pagename'                  => array( '1', 'පිටුනාමය', 'PAGENAME' ),
+	'namespace'                 => array( '1', 'නාමඅවකාශය', 'NAMESPACE' ),
+	'namespacee'                => array( '1', 'නාමඅවකාශයන්', 'NAMESPACEE' ),
+	'msg'                       => array( '0', 'පණිවුඩ:', 'MSG:' ),
+	'img_right'                 => array( '1', 'දකුණ', 'right' ),
+	'img_left'                  => array( '1', 'වම', 'left' ),
+	'img_none'                  => array( '1', 'නොමැත', 'none' ),
+	'img_width'                 => array( '1', '$1පික්', '$1px' ),
+	'img_center'                => array( '1', 'මධ්‍යය', 'center', 'centre' ),
+	'img_border'                => array( '1', 'දාරය', 'border' ),
+	'img_sub'                   => array( '1', 'උප', 'sub' ),
+	'img_middle'                => array( '1', 'මැද', 'middle' ),
+	'special'                   => array( '0', 'විශේෂ', 'special' ),
 );
 
 $messages = array(
@@ -347,9 +347,9 @@ $messages = array(
 
 # Vector skin
 'vector-action-addsection' => 'මාතෘකාව එක්කරන්න',
-'vector-action-delete' => 'මකාදමන්න',
+'vector-action-delete' => 'මකන්න',
 'vector-action-move' => 'ගෙනයන්න',
-'vector-action-protect' => 'ආරක්‍ෂණය කරන්න',
+'vector-action-protect' => 'ආරක්‍ෂණය',
 'vector-action-undelete' => 'මකාදැමීම අවලංගු කරන්න',
 'vector-action-unprotect' => 'ආරක්ෂණ තත්වය වෙනස් කරන්න',
 'vector-simplesearch-preference' => 'වැඩිදියුණුකළ සෙවුම් යෝජනා සක්‍රීය කරන්න (වෙක්ටර් තීමය සඳහා පමණි)',
@@ -365,7 +365,7 @@ $messages = array(
 'errorpagetitle' => 'දෝෂය',
 'returnto' => '$1 වෙත නැවත යන්න.',
 'tagline' => '{{SITENAME}} වෙතින්',
-'help' => 'උදවු',
+'help' => 'උදව්',
 'search' => 'සොයන්න',
 'searchbutton' => 'සොයන්න',
 'go' => 'යන්න',
@@ -373,11 +373,11 @@ $messages = array(
 'history' => 'පිටුවේ ඉතිහාසය',
 'history_short' => 'ඉතිහාසය',
 'updatedmarker' => 'මාගේ අවසාන පිවිසුමෙන් පසුව යාවත්කාලීන කරඇත',
-'printableversion' => 'මුද්‍රණයකලහැකි සංස්කරණය',
+'printableversion' => 'මුද්‍රණය කල හැකි සංස්කරණය',
 'permalink' => 'ස්ථාවර සබැඳුම',
 'print' => 'මුද්‍රණය කරන්න',
 'view' => 'දසුන',
-'edit' => 'සංස්කරණය කරන්න',
+'edit' => 'සංස්කරණය',
 'create' => 'තනන්න',
 'editthispage' => 'මෙම පිටුව සංස්කරණය කරන්න',
 'create-this-page' => 'මෙම පිටුව තනන්න',
@@ -385,7 +385,7 @@ $messages = array(
 'deletethispage' => 'මෙම පිටුව මකන්න',
 'undelete_short' => '{{PLURAL:$1|එක් සංස්කරණයක|සංස්කරණ $1 ක}} මකා දැමීම ප්‍රතිලෝම කරන්න',
 'viewdeleted_short' => 'මකා දමනු ලැබූ {{PLURAL:$1|එක් සංස්කරණයක්|සංස්කරණ $1  ක්}} බලන්න',
-'protect' => 'ආරක්‍ෂණය කරන්න',
+'protect' => 'ආරක්‍ෂණය',
 'protect_change' => 'වෙනස් කරන්න',
 'protectthispage' => 'මෙම පිටුව ආරක්‍ෂණය කරන්න',
 'unprotect' => 'ආරක්ෂණ තත්වය වෙනස් කරන්න',
@@ -414,7 +414,7 @@ $messages = array(
 'lastmodifiedat' => 'මෙම පිටුව අවසන් වරට වෙනස් කරන ලද්දේ $1 දිනදී, $2 වේලාවෙහිදීය.',
 'viewcount' => 'මෙම පිටුවට {{PLURAL:$1|එක් වරක්|$1 වරක්}} පිවිස ඇත.',
 'protectedpage' => 'ආරක්ෂිත පිටුව',
-'jumpto' => 'වෙත යන්න:',
+'jumpto' => 'වෙත පනින්න:',
 'jumptonavigation' => 'සංචලනය',
 'jumptosearch' => 'සොයන්න',
 'view-pool-error' => "සමාවන්න, ස'වරයන් මෙම අවස්ථාවෙහිදී අධිපූරණය වී ඇත.
@@ -626,7 +626,7 @@ $2',
 'nologin' => "ඔබ හට ගිණුමක් නොමැතිද? '''$1'''.",
 'nologinlink' => 'ගිණුමක් තනන්න',
 'createaccount' => 'අලුත් ගිණුමක් තනන්න',
-'gotaccount' => "දැනටමත් ගිණුමක් තිබේද? '''$1'''.",
+'gotaccount' => 'දැනටමත් ගිණුමක් තිබේද? $1.',
 'gotaccountlink' => 'පිවිසෙන්න',
 'userlogin-resetlink' => 'ඔබේ පිවිසුම් තොරතුරු අමතකද?',
 'createaccountmail' => 'විද්‍යුත් තැපෑල මගින්',
@@ -768,7 +768,7 @@ $2
 'link_sample' => 'සබැඳි ශීර්ෂය',
 'link_tip' => 'අභ්‍යන්තර සබැඳිය',
 'extlink_sample' => 'http://www.example.com සබැඳුම් මාතෘකාව',
-'extlink_tip' => 'බාහිර සබැඳිය ( http:// උපසර්ගය සිහි තබාගන්න)',
+'extlink_tip' => 'බාහිර සබැඳිය (http:// උපසර්ගය සිහි තබාගන්න)',
 'headline_sample' => 'සිරස්තල පෙළ',
 'headline_tip' => '2 වන මට්ටමෙහි සිරස්තලය',
 'nowiki_sample' => 'ආකෘතිකරණය-නොකල පෙළ මෙහි රුවන්න',
@@ -844,9 +844,9 @@ $2
 
 මෙම නව ගිණුම සඳහා මුරපදය, ප්‍රවිෂ්ට වීමෙන් අනතුරුව, ''[[Special:ChangePassword|මුර පදය වෙනස් කරන්න]]''  පිටුව තුලදී වෙනස් කල හැක.",
 'newarticle' => '(නව)',
-'newarticletext' => "බැඳියක් ඔස්සේ පැමිණ ඔබ පිවිස ඇත්තේ දැනට නොපවතින ලිපියකටයි.
+'newarticletext' => "බැඳියක් ඔස්සේ පැමිණ ඔබ පිවිස ඇත්තේ දැනට නොපවතින පිටුවකටයි.
 මෙම ලිපිය තැනීමට අවශ්‍ය නම්, පහත ඇති කොටුව තුල අකුරු ලිවීම අරඹන්න (වැඩිදුර තොරතුරු සඳහා [[{{MediaWiki:Helppage}}|උදවු පිටුව]] බලන්න).
-ඔබ මෙහි පිවිස ඇත්තේ අත්වැරැද්දකින් නම්, ඔබගේ සැරිසරයෙහි (බ්‍රවුසරයෙහි) '''ආපසු (back)''' බොත්තම ක්ලික් කරන්න.",
+ඔබ මෙහි පිවිස ඇත්තේ අත්වැරැද්දකින් නම්, ඔබගේ ගවේෂකයෙහි '''ආපසු''' බොත්තම ඔබන්න.",
 'anontalkpagetext' => "----''මෙම සංවාද පිටුව අයත් වන්නේ තවමත් ගිණුමක් තනා නැති හෝ එසේ කොට එනමුදු එය භාවිතා නොකරන හෝ නිර්නාමික පරිශීලකයෙකුටය.
 එබැවින්, ඔහු/ඇය හැඳින්වීමට සංඛ්‍යාත්මක IP ලිපිනය භාවිතා කිරීමට අප හට සිදුවේ.
 පරිශීලකයන් කිහිප දෙනෙකු විසින් මෙවැනි IP ලිපිනයක් හවුලේ පරිහරණය කරනවා විය හැක.
@@ -1000,7 +1000,7 @@ $3 විසින් සපයා ඇති හේතුව ''$2'' වේ",
 'currentrev' => 'නවතම සංශෝධනය',
 'currentrev-asof' => '$1 වන විට නවතම සංශෝධනය',
 'revisionasof' => '$1 තෙක් සංශෝධනය',
-'revision-info' => '$1 වන විට  $2 විසින් සිදු කර ඇති සංශෝධන',
+'revision-info' => '$1 වන විට $2 විසින් සිදු කර ඇති සංශෝධන',
 'previousrevision' => '← පැරණි සංශෝධනය',
 'nextrevision' => 'නව සංශෝධනය →',
 'currentrevisionlink' => 'වත්මන් සංශෝධනය',
@@ -1022,7 +1022,7 @@ $3 විසින් සපයා ඇති හේතුව ''$2'' වේ",
 # Revision feed
 'history-feed-title' => 'සංශෝධන ඉතිහාසය',
 'history-feed-description' => 'විකියෙහි මෙම පිටුව සඳහා ඇති සංශෝධන ඉතිහාසය',
-'history-feed-item-nocomment' => '$1 විසින්  $2 හිදී',
+'history-feed-item-nocomment' => '$1 විසින් $2 හිදී',
 'history-feed-empty' => 'අයැදුනු පිටුව නොපවතියි.
 එය විකියෙන් මකා දමා හෝ නම-වෙනස් කොට ඇතිවා විය හැකිය.
 අදාල නව පිටු සඳහා  [[Special:Search|විකිය තුල ගවේෂණය]] අත්හදා බලන්න.',
@@ -1164,8 +1164,8 @@ $1",
 'lineno' => 'පේළිය $1:',
 'compareselectedversions' => 'තෝරාගත් සංශෝධන සසඳන්න',
 'showhideselectedversions' => 'තෝරාගත් සංශෝධන පෙන්වන්න/සඟවන්න',
-'editundo' => 'අහෝසි කරන්න',
-'diff-multi' => '({{PLURAL:$2|one user|$2 users}} විසින් සිදුකල {{PLURAL:$1|එක් අතරමැදි සංශෝධනයක්| අතරමැදි සංශෝධන $1 ක්}} පෙන්නුම් කර නොමැත.)',
+'editundo' => 'අහෝසිය',
+'diff-multi' => '({{PLURAL:$2|එක් පරිශීලකයෙක්|පරිශීලකයන් $2 ක්}} විසින් සිදුකල {{PLURAL:$1|එක් අතරමැදි සංශෝධනයක්|අතරමැදි සංශෝධන $1 ක්}} පෙන්නුම් කර නොමැත.)',
 'diff-multi-manyusers' => '(පරිශීලකයන් $2 කට වඩා වැඩි ගණනකගේ ආසන්න පුනරීක්‍ෂණ $1ක් පෙන්වා නොමැත)',
 
 # Search results
@@ -1179,14 +1179,14 @@ $1",
 'notitlematches' => 'පිටු ශීර්ෂ ගැලපීම් කිසිවක් නොමැත',
 'textmatches' => 'පිටු පෙළ ගැළපෙයි',
 'notextmatches' => 'පිටු පෙළ කිසිවක් නොගැළපෙයි',
-'prevn' => 'පෙර  {{PLURAL:$1|$1}}',
-'nextn' => 'මීලඟ  {{PLURAL:$1|$1}}',
-'prevn-title' => 'පූර්ව  {{PLURAL:$1|ප්‍රතිඵලය|ප්‍රතිඵලයන් $1}}',
-'nextn-title' => 'මීලඟ  {{PLURAL:$1|ප්‍රතිඵලය|ප්‍රතිඵල $1}}',
+'prevn' => 'පෙර {{PLURAL:$1|$1}}',
+'nextn' => 'මීලඟ {{PLURAL:$1|$1}}',
+'prevn-title' => 'පූර්ව {{PLURAL:$1|ප්‍රතිඵලය|ප්‍රතිඵලයන් $1}}',
+'nextn-title' => 'මීලඟ {{PLURAL:$1|ප්‍රතිඵලය|ප්‍රතිඵල $1}}',
 'shown-title' => 'එක් පිටුවක {{PLURAL:$1|ප්‍රතිඵලයක්|ප්‍රතිඵල $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|මෙම උපසර්ගය භාවිත කරමින් පිටු පිරික්සන්න]]',
@@ -1198,9 +1198,9 @@ $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|වචන 1 ක් |වචන $2 ක්}})',
+'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 යළි-යොමු කරන්න)',
@@ -1214,11 +1214,11 @@ $1",
 'search-relatedarticle' => 'සහසම්බන්ධිත',
 'mwsuggest-disable' => 'AJAX ඇඟවිලි අක්‍රීය කරන්න',
 'searcheverything-enable' => 'සියළු නාමඅවකාශයන්හි ගවේෂණය කරන්න',
-'searchrelated' => 'සහසම්බන්ධිත',
+'searchrelated' => 'ආශ්‍රිත',
 'searchall' => 'සියල්ල',
 'showingresults' => "#'''$2''' ගෙන් ආරම්භ කොට, {{PLURAL:$1|ප්‍රතිඵල '''1'''  ක් |ප්‍රතිඵල '''$1''' ක්}} දක්වා පහත පෙන්වා ඇත.",
 'showingresultsnum' => "#'''$2''' ගෙන් ආරම්භ කොට, {{PLURAL:$3|ප්‍රතිඵල '''1'''  ක් |ප්‍රතිඵල '''$3''' ක්}} පහත පෙන්වා ඇත.",
-'showingresultsheader' => "'''$4''' සඳහා {{PLURAL:$5| '''$3''' අතුරින් '''$1''' ප්‍රතිඵලය| '''$3''' අතුරින් '''$1 - $2''' ප්‍රතිඵලයන් }}",
+'showingresultsheader' => "'''$4''' සඳහා {{PLURAL:$5| '''$3''' අතුරින් '''$1''' ප්‍රතිඵලය| '''$3''' අතුරින් '''$1 - $2''' ප්‍රතිඵලයන්}}",
 'nonefound' => "'''සටහන''': පෙරනිමියෙන් ගවේෂණය වන්නේ සමහරක් නාමඅවකාශ පමණි.
 ඔබ‍ගේ විමසුමට ''all:'' උපසර්ගය යෙදීම මගින් සියළු අන්තර්ගතය ගවේෂණයට ඉඩ සැලසීම අත්හදා බලන්න (සාකච්ඡා පිටු, සැකිලි, ආදියද ඇතුළුව), නැතහොත්, උපසර්ගය ලෙස අපේක්‍ෂිත නාමඅවකාශය භාවිතා කරන්න.",
 'search-nonefound' => 'විමසුම හා ගැලපෙන ප්‍රතිඵල කිසිවක් නොමැත.',
@@ -1342,7 +1342,7 @@ HTML ටැගයන් පිරික්සන්න.',
 'email' => 'විද්‍යුත් තැපෑල',
 'prefs-help-realname' => 'සැබෑ නාමය හෙළි කිරීම වෛකල්පිකයි.
 ඔබ විසින් එය හෙළි කල හොත්, ඔබගේ කෘතීන් සඳහා ඔබහට කතෘ-බුහුමන් පිරිනැමීමට එය භාවිතා කරනු ඇත.',
-'prefs-help-email' => 'විද්‍යුත් ලිපිනය අත්‍යාවශ්‍ය නොවේ, එහෙත් ඔබගේ මුර පදය අමතක වූ විටෙක එය යලි සැකසීමට නම් විද්‍යුත් ලිපිනයක් දී තිබිය යුතුය.',
+'prefs-help-email' => 'විද්‍යුත් තැපැල් ලිපිනය අත්‍යාවශ්‍ය නොවේ, එහෙත් ඔබගේ මුර පදය අමතක වූ විටෙක එය යලි සැකසීමට නම් විද්‍යුත් ලිපිනයක් දී තිබිය යුතුය.',
 'prefs-help-email-others' => 'ඔබගේ පරිශීලක හෝ පරිශීලක සාකච්ඡා පිටුවෙහි සබැඳියක් ඔස්සේ විද්‍යුත් තැපෑල මගින් අනෙක් අයට ඔබව සම්බන්ධ කර ගැනීම පිණිස තේරිමක් සිදු කල හැක.
 අනෙකුත් පරිශීලකයන් ඔබව අමතන විට ඔබගේ විද්‍යුත් තැපැල් ලිපිනය හෙලිදරවු නොකෙරේ.',
 'prefs-help-email-required' => 'විද්‍යුත්-ලිපිනය අවශ්‍යයි.',
@@ -1526,7 +1526,7 @@ HTML ටැගයන් පිරික්සන්න.',
 'recentchanges-label-minor' => 'මෙය සුළු සංස්කරණයකි',
 'recentchanges-label-bot' => 'මෙය රොබෝවක් විසින් කරන ලද සංස්කරණයකි',
 'recentchanges-label-unpatrolled' => 'මෙම සංස්කරණය තවම විමර්ශනය කර නොමැත',
-'rcnote' => "$4 දින, $5 වන තෙක්, අවසන් {{PLURAL:$2|දිනදී|දින '''$2''' තුලදී}} සිදුවී ඇති, {{PLURAL:$1| '''1''' ක් වෙනස|අවසන් වෙනස්වීම් '''$1'''  }} පහත දැක්වේ.",
+'rcnote' => "$4 දින, $5 වන තෙක්, අවසන් {{PLURAL:$2|දිනදී|දින '''$2''' තුලදී}} සිදුවී ඇති, {{PLURAL:$1| '''1''' ක් වෙනස|අවසන් වෙනස්වීම් '''$1'''}} පහත දැක්වේ.",
 'rcnotefrom' => "'''$2''' න් පසු සිදුවී ඇති වෙනස්කම් මෙහි පහත දැක්වේ ('''$1''' ක ප්‍රමාණයක උපරිමයක් පෙන්වා ඇත).",
 'rclistfrom' => '$1 සිට බලපැවැත්වෙන මෑත වෙනස්වීම් පෙන්වන්න',
 'rcshowhideminor' => 'සුළු සංස්කරණ $1',
@@ -1557,13 +1557,13 @@ HTML ටැගයන් පිරික්සන්න.',
 'recentchangeslinked-toolbox' => 'සහසම්බන්ධිත වෙනස්වීම්',
 'recentchangeslinked-title' => '"$1" ආශ්‍රිත වෙනස්කිරීම්',
 'recentchangeslinked-noresult' => 'සලකා බැලූ කාලසීමාවෙහිදී, සබැඳි පිටු වල කිසිදු වෙනසක් සිදුවී නොමැත.',
-'recentchangeslinked-summary' => "විශේෂී ලෙස නිරූපිත පිටුවකට (හෝ විශේෂි ලෙස නිරූපිත ප්‍රවර්ගයක සාමාජීකයන්ට) සබැඳි පිටුවල  මෑතදී සිදුවූ වෙනස්වීම් දැක්වෙන ලැයිස්තුවක් මෙහි දැක්වේ.
-[[Special:Watchlist|ඔබගේ  මුර-ලැයිස්තුවෙහි]] පිටු  '''තදකුරු''' වලින් දක්වා ඇත.",
+'recentchangeslinked-summary' => "විශේෂී ලෙස නිරූපිත පිටුවකට (හෝ විශේෂි ලෙස නිරූපිත ප්‍රවර්ගයක සාමාජීකයන්ට) සබැඳි පිටුවල මෑතදී සිදුවූ වෙනස්වීම් දැක්වෙන ලැයිස්තුවක් මෙහි දැක්වේ.
+[[Special:Watchlist|ඔබගේ  මුර-ලැයිස්තුවෙහි]] පිටු '''තදකුරු''' වලින් දක්වා ඇත.",
 'recentchangeslinked-page' => 'පිටු නාමය:',
 'recentchangeslinked-to' => 'ඒ වෙනුවට දී ඇති පිටුවට සබැඳෙන පිටුවල වෙනස්වීම්  පෙන්වන්න',
 
 # Upload
-'upload' => 'ගොනුවක් උඩුගත කිරීම',
+'upload' => 'ගොනුවක් උඩුගත කරන්න',
 'uploadbtn' => 'ගොනුව උඩුගත කරන්න',
 'reuploaddesc' => 'උඩුගත කිරීම අත්හැරදමා උඩුගත කිරීම් ආකෘති පත්‍රය වෙත යන්න',
 'upload-tryagain' => 'වෙනස් කරන ලද ගොනු විස්තරය ඉදිරිපත් කරන්න',
@@ -2187,7 +2187,7 @@ When filtered by user, only files where that user uploaded the most recent versi
 'notanarticle' => 'අන්තර්ගත පිටුවක් නොවේ',
 'notvisiblerev' => 'සංශෝධනය මකාදමා ඇත',
 'watchnochange' => 'ඔබ විසින් මුරකෙරෙන කිසිදු අයිතමයක් දක්වා ඇති කාල සීමාවෙහිදී  සංස්කරණයට භාජනය වී නොමැත.',
-'watchlist-details' => 'සාකච්ඡා පිටු නොගිණුනු කල, ඔබගේ මුර-ලැයිස්තුවෙහි {{PLURAL:$1|එක් පිටුවක්|පිටු $1 ක්}} ඇත.',
+'watchlist-details' => 'සාකච්ඡා පිටු නොගිණුනු කල, ඔබගේ මුර ලැයිස්තුවෙහි {{PLURAL:$1|එක් පිටුවක්|පිටු $1 ක්}} ඇත.',
 'wlheader-enotif' => '* විද්‍යුත්-තැපැල් දැනුම්දීම සක්‍රීය කෙරිණි.',
 'wlheader-showupdated' => "* ඔබ විසින් ඒවාට අවසන් වරට පිවිසුනු පසුව වෙනස්කෙරුනු පිටු  '''තදකුරු''' වලින් පෙන්වා ඇත",
 'watchmethod-recent' => 'මුර-කෙරෙන පිටු සඳහා මෑත සංස්කරණයන් පරික්‍ෂා කරමින්',
@@ -2195,7 +2195,7 @@ When filtered by user, only files where that user uploaded the most recent versi
 'watchlistcontains' => 'ඔබගේ මුර-ලැයිස්තුවෙහි  {{PLURAL:$1|එක් පිටුවක්|පිටු $1 ක්}} අඩංගුය.',
 'iteminvalidname' => "'$1' අයිතමය පිළිබඳ ගැටළුවක් ඇත, අනීතික නමකි...",
 'wlnote' => "පහත දැක්වෙන්නේ $3, $4 මෙන්, අවසන් {{PLURAL:$2|පැය|පැය '''$2''' }} තුලදී සිදු කෙරී ඇති {{PLURAL:$1|අවසන් වෙනස්වීම්යි |අවසන් වෙනස්වීම්  '''$1''' යි}}.",
-'wlshowlast' => 'පසුගිය පැය  $1 දින  $2  $3 පෙන්වන්න',
+'wlshowlast' => 'පසුගිය පැය $1 දින $2 $3 පෙන්වන්න',
 'watchlist-options' => 'තෝරාගතහැකි මුර ලැයිස්තු සැකසුම්',
 
 # Displayed when you click the "watch" button and it is in the process of watching
@@ -2458,7 +2458,7 @@ $1',
 'sp-contributions-submit' => 'සොයන්න',
 
 # What links here
-'whatlinkshere' => 'සබැඳි පිටු',
+'whatlinkshere' => 'මෙතනට සබැඳි පිටු',
 'whatlinkshere-title' => '"$1" වෙත සබැ‍ඳෙන පිටු',
 'whatlinkshere-page' => 'පිටුව:',
 'linkshere' => "ඉදිරියෙහි දැක්වෙන පිටු, '''[[:$1]]''' වෙත සබැඳෙයි:",
@@ -2844,16 +2844,15 @@ $1 ගේ වාරණයට හේතුව මෙය වේ: "$2"',
 'tooltip-pt-preferences' => 'මගේ අභිරුචි',
 'tooltip-pt-watchlist' => 'වෙනස්වීම් සිදුවී තිබේදැයි යන්න පිලිබඳව ඔබගේ විමසුමට ලක්ව ඇති පිටු ලැයිස්තුව',
 'tooltip-pt-mycontris' => 'ඔබගේ දායකත්වයන් ලැයිස්තුව‍',
-'tooltip-pt-login' => 'ප්‍රවිසීම වඩා යෝග්‍යවේ. නමුත් එය අනිවාර්ය නැත.',
+'tooltip-pt-login' => 'පිවිසීම වඩා යෝග්‍ය වේ. නමුත්, එය අනිවාර්ය නැත',
 'tooltip-pt-anonlogin' => 'එය අවශ්‍ය‍යෙන් කල යුත්තක් ‍නොවුනද, ප්‍රවිෂ්ට වීම සඳහා ඔබ ධෛර්යමත් කරනු ලැබේ.',
 'tooltip-pt-logout' => 'නික්මීම',
 'tooltip-ca-talk' => 'අන්තර්ගත පිටුව පිළිබඳ සාකච්ඡාව',
-'tooltip-ca-edit' => 'ඔබ‍ට මෙම පිටුව සංස්කරණය කල හැක.
-සුරැකීමට පෙර කරුණාකර පෙරදසුන බොත්තම භාවිතා කරන්න.',
+'tooltip-ca-edit' => 'ඔබ‍ට මෙම පිටුව සංස්කරණය කල හැක. සුරැකීමට පෙර කරුණාකර පෙරදසුන බොත්තම භාවිතා කරන්න',
 'tooltip-ca-addsection' => 'නව ඡේදයක් අරඹන්න',
 'tooltip-ca-viewsource' => 'මෙම පිටුව ආරක්‍ෂණය කොට ඇත.
 ඔබට එහි මූලාශ්‍රය නැරඹිය හැක.',
-'tooltip-ca-history' => 'මෙම පිටුවේ පෙර අනුවාදයන්.',
+'tooltip-ca-history' => 'මෙම පිටුවේ පෙර සංශෝධනයන්',
 'tooltip-ca-protect' => 'මෙම පිටුව ආරක්‍ෂණය කරන්න',
 'tooltip-ca-unprotect' => 'මෙම පිටුවෙහි ආරක්ෂණ තත්වය වෙනස් කරන්න',
 'tooltip-ca-delete' => 'මේ පිටුව මකන්න',
@@ -2870,7 +2869,7 @@ $1 ගේ වාරණයට හේතුව මෙය වේ: "$2"',
 'tooltip-n-portal' => 'ව්‍යාපෘති පිළිබඳ, ඔබට කල හැක්කේ කුමක්ද, තොරතුරු සොයාගත හැක්කේ කොතැනද',
 'tooltip-n-currentevents' => 'කාලීන සිදුවීම් පිළිබඳ පසුබිම් තොරතුරු සොයා දැනගන්න',
 'tooltip-n-recentchanges' => 'විකියෙහි මෑත වෙනස්කිරීම් ලැයිස්තුවක්',
-'tooltip-n-randompage' => 'අහඹු පිටුවක් ලෝඩ්කරන්න',
+'tooltip-n-randompage' => 'අහඹු පිටුවක් පූරණය කරන්න',
 'tooltip-n-help' => 'සොයා දැනගත හැකි තැන',
 'tooltip-t-whatlinkshere' => 'මෙය හා සබැ‍ඳෙන සියළු විකි පිටු ලැයිස්තුව',
 'tooltip-t-recentchangeslinked' => 'මෙම පිටුව හා සබැඳි පිටුවල ‍නව වෙනස්වීම්',
@@ -3004,7 +3003,7 @@ $1',
 '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' => 'මෙයට ඉහල විසර්ජනයක් (resolution) දක්වා එළඹිය නොහැක.',
+'file-nohires' => 'මෙයට ඉහල විසර්ජනයක් දක්වා එළඹිය නොහැක.',
 'svg-long-desc' => 'SVG ගොනුව, නාමමාත්‍රිකව $1 × $2 පික්සල්, ගොනු විශාලත්වය: $3',
 'show-big-image' => 'පූර්ණ විභේදනය',
 'show-big-image-preview' => 'මෙම පෙරදසුනෙහි තරම: $1.',
@@ -3087,7 +3086,7 @@ Variants for Chinese language
 'variantname-tg' => 'tg',
 
 # Metadata
-'metadata' => 'පාරදත්ත (Metadata)',
+'metadata' => 'පාරදත්ත',
 'metadata-help' => 'සමහරවිට ඩිජිටල් කැමරාවක් හෝ ස්කෑනරයක් හෝ භාවිතයෙන්, නිමැවා හෝ සංඛ්‍යාංකකරණය (ඩිජිටල්කරණය) කොට එක් කල , අමතර තොරතුරු මෙම ගොනුවේ අඩංගුය.
 ගොනුව මුලින්ම පැවැති තත්ත්වයෙහි සිට විකරණය කොට තිබේ නම්, සමහරක් තොරතුරු විකරිත ගොනුව පූර්ණ වශයෙන් පිළිඹිමු නොකරනු ඇත.',
 'metadata-expand' => 'විස්තීරණය කරන ලද විස්තර පෙන්වන්න',
@@ -3095,14 +3094,14 @@ Variants for Chinese language
 'metadata-fields' => 'Image 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.
 * make
-* model
+* මාදිලිය
 * datetimeoriginal
 * exposuretime
 * fnumber
 * isospeedratings
 * focallength
-* artist
-* copyright
+* කලාකරු
+* ප්‍රකාශන හිමිකම
 * imagedescription
 * gpslatitude
 * gpslongitude
@@ -3684,8 +3683,8 @@ This confirmation code will expire at $4.',
 
 # Watchlist editing tools
 'watchlisttools-view' => 'අදාල වෙනස්වීම් නරඹන්න',
-'watchlisttools-edit' => 'මුර-ලැයිස්තුව නැරඹීම හා සංස්කරණය',
-'watchlisttools-raw' => 'නොනිමි මුර-ලැයිස්තුව සංස්කරණය කරන්න',
+'watchlisttools-edit' => 'මුර ලැයිස්තුව නැරඹීම හා සංස්කරණය',
+'watchlisttools-raw' => 'නොනිමි මුර ලැයිස්තුව සංස්කරණය කරන්න',
 
 # Iranian month names
 'iranian-calendar-m1' => 'ෆාර්වාදීන්',
@@ -3751,7 +3750,7 @@ This confirmation code will expire at $4.',
 
 # Core parser functions
 'unknown_extension_tag' => 'අඥාත ප්‍රසර්ජන ටැගය "$1"',
-'duplicate-defaultsort' => 'අවවාදයයි: "$2" පෙරනිමි සුබෙදුම් යතුර විසින් ‍පූර්ව පෙරනිමි සුබෙදුම් යතුර  වූ  "$1" අතික්‍රමණය කරයි.',
+'duplicate-defaultsort' => '\'\'\'අවවාදයයි:\'\'\' "$2" පෙරනිමි සුබෙදුම් යතුර විසින් ‍පූර්ව පෙරනිමි සුබෙදුම් යතුර වූ "$1" අතික්‍රමණය කරයි.',
 
 # Special:Version
 'version' => 'අනුවාදය',
diff --git a/languages/messages/MessagesSk.php b/languages/messages/MessagesSk.php
index 44c5218fd1..50e573057f 100644
--- a/languages/messages/MessagesSk.php
+++ b/languages/messages/MessagesSk.php
@@ -179,69 +179,69 @@ $bookstoreList = array(
 );
 
 $magicWords = array(
-	'redirect'                => array( '0', '#presmeruj', '#REDIRECT' ),
-	'notoc'                   => array( '0', '__BEZOBSAHU__', '__NOTOC__' ),
-	'nogallery'               => array( '0', '__BEZGALÉRIE__', '__NOGALLERY__' ),
-	'forcetoc'                => array( '0', '__VYNÚTIŤOBSAH__', '__FORCETOC__' ),
-	'toc'                     => array( '0', '__OBSAH__', '__TOC__' ),
-	'noeditsection'           => array( '0', '__NEUPRAVOVAŤSEKCIE__', '__NOEDITSECTION__' ),
-	'currentmonth'            => array( '1', 'AKTUÁLNYMESIAC', 'CURRENTMONTH', 'CURRENTMONTH2' ),
-	'currentmonthname'        => array( '1', 'NÁZOVAKTUÁLNEHOMESIACA', 'CURRENTMONTHNAME' ),
-	'currentmonthnamegen'     => array( '1', 'NÁZOVAKTUÁLNEHOMESIACAGEN', 'CURRENTMONTHNAMEGEN' ),
-	'currentmonthabbrev'      => array( '1', 'NÁZOVAKTUÁLNEHOMESIACASKRATKA', 'CURRENTMONTHABBREV' ),
-	'currentday'              => array( '1', 'AKTUÁLNYDEŇ', 'CURRENTDAY' ),
-	'currentday2'             => array( '1', 'AKTUÁLNYDEŇ2', 'CURRENTDAY2' ),
-	'currentdayname'          => array( '1', 'NÁZOVAKTUÁLNEHODŇA', 'CURRENTDAYNAME' ),
-	'currentyear'             => array( '1', 'AKTUÁLNYROK', 'CURRENTYEAR' ),
-	'currenttime'             => array( '1', 'AKTUÁLNYČAS', 'CURRENTTIME' ),
-	'currenthour'             => array( '1', 'AKTUÁLNAHODINA', 'CURRENTHOUR' ),
-	'numberofpages'           => array( '1', 'POČETSTRÁNOK', 'NUMBEROFPAGES' ),
-	'numberofarticles'        => array( '1', 'POČETČLÁNKOV', 'NUMBEROFARTICLES' ),
-	'numberoffiles'           => array( '1', 'POČETSÚBOROV', 'NUMBEROFFILES' ),
-	'numberofusers'           => array( '1', 'POČETPOUŽÍVATEĽOV', 'NUMBEROFUSERS' ),
-	'numberofedits'           => array( '1', 'POČETÚPRAV', 'NUMBEROFEDITS' ),
-	'pagename'                => array( '1', 'NÁZOVSTRÁNKY', 'PAGENAME' ),
-	'pagenamee'               => array( '1', 'NÁZOVSTRÁNKYE', 'PAGENAMEE' ),
-	'namespace'               => array( '1', 'MENNÝPRIESTOR', 'NAMESPACE' ),
-	'namespacee'              => array( '1', 'MENNÝPRIESTORE', 'NAMESPACEE' ),
-	'talkspace'               => array( '1', 'DISKUSNÝPRIESTOR', 'TALKSPACE' ),
-	'talkspacee'              => array( '1', 'DISKUSNÝPRIESTORE', 'TALKSPACEE' ),
-	'subjectspace'            => array( '1', 'PRIESTORČLÁNKOV', 'SUBJECTSPACE', 'ARTICLESPACE' ),
-	'subjectspacee'           => array( '1', 'PRIESTORČLÁNKOVE', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
-	'fullpagename'            => array( '1', 'PLNÝNÁZOVSTRÁNKY', 'FULLPAGENAME' ),
-	'fullpagenamee'           => array( '1', 'PLNÝNÁZOVSTRÁNKYE', 'FULLPAGENAMEE' ),
-	'subpagename'             => array( '1', 'NÁZOVPODSTRÁNKY', 'SUBPAGENAME' ),
-	'subpagenamee'            => array( '1', 'NÁZOVPODSTRÁNKYE', 'SUBPAGENAMEE' ),
-	'basepagename'            => array( '1', 'NÁZOVZÁKLADNEJSTRÁNKY', 'BASEPAGENAME' ),
-	'basepagenamee'           => array( '1', 'NÁZOVZÁKLADNEJSTRÁNKYE', 'BASEPAGENAMEE' ),
-	'talkpagename'            => array( '1', 'NÁZOVDISKUSNEJSTRÁNKY', 'TALKPAGENAME' ),
-	'talkpagenamee'           => array( '1', 'NÁZOVDISKUSNEJSTRÁNKYE', 'TALKPAGENAMEE' ),
-	'subjectpagename'         => array( '1', 'NÁZOVČLÁNKU', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
-	'subjectpagenamee'        => array( '1', 'NÁZOVČLÁNKUE', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
-	'msg'                     => array( '0', 'SPRÁVA:', 'MSG:' ),
-	'subst'                   => array( '0', 'NAHR:', 'SUBST:' ),
-	'img_thumbnail'           => array( '1', 'náhľad', 'náhľadobrázka', 'thumbnail', 'thumb' ),
-	'img_right'               => array( '1', 'vpravo', 'right' ),
-	'img_left'                => array( '1', 'vľavo', 'left' ),
-	'img_none'                => array( '1', 'žiadny', 'none' ),
-	'img_width'               => array( '1', '$1bod', '$1px' ),
-	'img_center'              => array( '1', 'stred', 'center', 'centre' ),
-	'img_framed'              => array( '1', 'rám', 'framed', 'enframed', 'frame' ),
-	'img_border'              => array( '1', 'okraj', 'border' ),
-	'sitename'                => array( '1', 'NÁZOVLOKALITY', 'SITENAME' ),
-	'ns'                      => array( '0', 'MP:', 'NS:' ),
-	'servername'              => array( '0', 'NÁZOVSERVERA', 'SERVERNAME' ),
-	'scriptpath'              => array( '0', 'CESTAKUSKRIPTU', 'SCRIPTPATH' ),
-	'grammar'                 => array( '0', 'GRAMATIKA:', 'GRAMMAR:' ),
-	'currentweek'             => array( '1', 'AKTUÁLNYTÝŽDEŇ', 'CURRENTWEEK' ),
-	'currentversion'          => array( '1', 'AKTUÁLNAVERZIA', 'CURRENTVERSION' ),
-	'language'                => array( '0', '#JAZYK:', '#LANGUAGE:' ),
-	'contentlanguage'         => array( '1', 'JAZYKOBSAHU', 'CONTENTLANGUAGE', 'CONTENTLANG' ),
-	'numberofadmins'          => array( '1', 'POČETSPRÁVCOV', 'NUMBEROFADMINS' ),
-	'filepath'                => array( '0', 'CESTAKSÚBORU:', 'FILEPATH:' ),
-	'hiddencat'               => array( '1', '__SKRYTÁKATEGÓRIA__', '__SKRYTÁKAT__', '__HIDDENCAT__' ),
-	'pagesincategory'         => array( '1', 'STRÁNOKVKATEGÓRII', 'STRÁNOKVKAT', 'PAGESINCATEGORY', 'PAGESINCAT' ),
-	'pagesize'                => array( '1', 'VEĽKOSŤSTRÁNKY', 'PAGESIZE' ),
+	'redirect'                  => array( '0', '#presmeruj', '#REDIRECT' ),
+	'notoc'                     => array( '0', '__BEZOBSAHU__', '__NOTOC__' ),
+	'nogallery'                 => array( '0', '__BEZGALÉRIE__', '__NOGALLERY__' ),
+	'forcetoc'                  => array( '0', '__VYNÚTIŤOBSAH__', '__FORCETOC__' ),
+	'toc'                       => array( '0', '__OBSAH__', '__TOC__' ),
+	'noeditsection'             => array( '0', '__NEUPRAVOVAŤSEKCIE__', '__NOEDITSECTION__' ),
+	'currentmonth'              => array( '1', 'AKTUÁLNYMESIAC', 'CURRENTMONTH', 'CURRENTMONTH2' ),
+	'currentmonthname'          => array( '1', 'NÁZOVAKTUÁLNEHOMESIACA', 'CURRENTMONTHNAME' ),
+	'currentmonthnamegen'       => array( '1', 'NÁZOVAKTUÁLNEHOMESIACAGEN', 'CURRENTMONTHNAMEGEN' ),
+	'currentmonthabbrev'        => array( '1', 'NÁZOVAKTUÁLNEHOMESIACASKRATKA', 'CURRENTMONTHABBREV' ),
+	'currentday'                => array( '1', 'AKTUÁLNYDEŇ', 'CURRENTDAY' ),
+	'currentday2'               => array( '1', 'AKTUÁLNYDEŇ2', 'CURRENTDAY2' ),
+	'currentdayname'            => array( '1', 'NÁZOVAKTUÁLNEHODŇA', 'CURRENTDAYNAME' ),
+	'currentyear'               => array( '1', 'AKTUÁLNYROK', 'CURRENTYEAR' ),
+	'currenttime'               => array( '1', 'AKTUÁLNYČAS', 'CURRENTTIME' ),
+	'currenthour'               => array( '1', 'AKTUÁLNAHODINA', 'CURRENTHOUR' ),
+	'numberofpages'             => array( '1', 'POČETSTRÁNOK', 'NUMBEROFPAGES' ),
+	'numberofarticles'          => array( '1', 'POČETČLÁNKOV', 'NUMBEROFARTICLES' ),
+	'numberoffiles'             => array( '1', 'POČETSÚBOROV', 'NUMBEROFFILES' ),
+	'numberofusers'             => array( '1', 'POČETPOUŽÍVATEĽOV', 'NUMBEROFUSERS' ),
+	'numberofedits'             => array( '1', 'POČETÚPRAV', 'NUMBEROFEDITS' ),
+	'pagename'                  => array( '1', 'NÁZOVSTRÁNKY', 'PAGENAME' ),
+	'pagenamee'                 => array( '1', 'NÁZOVSTRÁNKYE', 'PAGENAMEE' ),
+	'namespace'                 => array( '1', 'MENNÝPRIESTOR', 'NAMESPACE' ),
+	'namespacee'                => array( '1', 'MENNÝPRIESTORE', 'NAMESPACEE' ),
+	'talkspace'                 => array( '1', 'DISKUSNÝPRIESTOR', 'TALKSPACE' ),
+	'talkspacee'                => array( '1', 'DISKUSNÝPRIESTORE', 'TALKSPACEE' ),
+	'subjectspace'              => array( '1', 'PRIESTORČLÁNKOV', 'SUBJECTSPACE', 'ARTICLESPACE' ),
+	'subjectspacee'             => array( '1', 'PRIESTORČLÁNKOVE', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
+	'fullpagename'              => array( '1', 'PLNÝNÁZOVSTRÁNKY', 'FULLPAGENAME' ),
+	'fullpagenamee'             => array( '1', 'PLNÝNÁZOVSTRÁNKYE', 'FULLPAGENAMEE' ),
+	'subpagename'               => array( '1', 'NÁZOVPODSTRÁNKY', 'SUBPAGENAME' ),
+	'subpagenamee'              => array( '1', 'NÁZOVPODSTRÁNKYE', 'SUBPAGENAMEE' ),
+	'basepagename'              => array( '1', 'NÁZOVZÁKLADNEJSTRÁNKY', 'BASEPAGENAME' ),
+	'basepagenamee'             => array( '1', 'NÁZOVZÁKLADNEJSTRÁNKYE', 'BASEPAGENAMEE' ),
+	'talkpagename'              => array( '1', 'NÁZOVDISKUSNEJSTRÁNKY', 'TALKPAGENAME' ),
+	'talkpagenamee'             => array( '1', 'NÁZOVDISKUSNEJSTRÁNKYE', 'TALKPAGENAMEE' ),
+	'subjectpagename'           => array( '1', 'NÁZOVČLÁNKU', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
+	'subjectpagenamee'          => array( '1', 'NÁZOVČLÁNKUE', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
+	'msg'                       => array( '0', 'SPRÁVA:', 'MSG:' ),
+	'subst'                     => array( '0', 'NAHR:', 'SUBST:' ),
+	'img_thumbnail'             => array( '1', 'náhľad', 'náhľadobrázka', 'thumbnail', 'thumb' ),
+	'img_right'                 => array( '1', 'vpravo', 'right' ),
+	'img_left'                  => array( '1', 'vľavo', 'left' ),
+	'img_none'                  => array( '1', 'žiadny', 'none' ),
+	'img_width'                 => array( '1', '$1bod', '$1px' ),
+	'img_center'                => array( '1', 'stred', 'center', 'centre' ),
+	'img_framed'                => array( '1', 'rám', 'framed', 'enframed', 'frame' ),
+	'img_border'                => array( '1', 'okraj', 'border' ),
+	'sitename'                  => array( '1', 'NÁZOVLOKALITY', 'SITENAME' ),
+	'ns'                        => array( '0', 'MP:', 'NS:' ),
+	'servername'                => array( '0', 'NÁZOVSERVERA', 'SERVERNAME' ),
+	'scriptpath'                => array( '0', 'CESTAKUSKRIPTU', 'SCRIPTPATH' ),
+	'grammar'                   => array( '0', 'GRAMATIKA:', 'GRAMMAR:' ),
+	'currentweek'               => array( '1', 'AKTUÁLNYTÝŽDEŇ', 'CURRENTWEEK' ),
+	'currentversion'            => array( '1', 'AKTUÁLNAVERZIA', 'CURRENTVERSION' ),
+	'language'                  => array( '0', '#JAZYK:', '#LANGUAGE:' ),
+	'contentlanguage'           => array( '1', 'JAZYKOBSAHU', 'CONTENTLANGUAGE', 'CONTENTLANG' ),
+	'numberofadmins'            => array( '1', 'POČETSPRÁVCOV', 'NUMBEROFADMINS' ),
+	'filepath'                  => array( '0', 'CESTAKSÚBORU:', 'FILEPATH:' ),
+	'hiddencat'                 => array( '1', '__SKRYTÁKATEGÓRIA__', '__SKRYTÁKAT__', '__HIDDENCAT__' ),
+	'pagesincategory'           => array( '1', 'STRÁNOKVKATEGÓRII', 'STRÁNOKVKAT', 'PAGESINCATEGORY', 'PAGESINCAT' ),
+	'pagesize'                  => array( '1', 'VEĽKOSŤSTRÁNKY', 'PAGESIZE' ),
 );
 
 $namespaceNames = array(
diff --git a/languages/messages/MessagesSl.php b/languages/messages/MessagesSl.php
index 42c9f54ff0..7f173aa32d 100644
--- a/languages/messages/MessagesSl.php
+++ b/languages/messages/MessagesSl.php
@@ -113,44 +113,44 @@ $specialPageAliases = array(
 );
 
 $magicWords = array(
-	'redirect'                => array( '0', '#PREUSMERITEV', '#REDIRECT' ),
-	'notoc'                   => array( '0', '__BREZKAZALAVSEBINE__', '__NOTOC__' ),
-	'nogallery'               => array( '0', '__BREZGALERIJE__', '__NOGALLERY__' ),
-	'forcetoc'                => array( '0', '__VSILIKAZALOVSEBINE__', '__FORCETOC__' ),
-	'toc'                     => array( '0', '__POGLAVJE__', '__TOC__' ),
-	'noeditsection'           => array( '0', '__BREZUREJANJARAZDELKOV__', '__NOEDITSECTION__' ),
-	'img_thumbnail'           => array( '1', 'sličica', 'thumbnail', 'thumb' ),
-	'img_manualthumb'         => array( '1', 'sličica=$1', 'thumbnail=$1', 'thumb=$1' ),
-	'img_right'               => array( '1', 'desno', 'right' ),
-	'img_left'                => array( '1', 'levo', 'left' ),
-	'img_none'                => array( '1', 'brez', 'none' ),
-	'img_width'               => array( '1', '$1_pik', '$1px' ),
-	'img_center'              => array( '1', 'sredina', 'sredinsko', 'center', 'centre' ),
-	'img_framed'              => array( '1', 'okvir', 'okvirjeno', 'framed', 'enframed', 'frame' ),
-	'img_frameless'           => array( '1', 'brezokvirja', 'frameless' ),
-	'img_page'                => array( '1', 'stran=$1', 'm_stran $1', 'page=$1', 'page $1' ),
-	'img_upright'             => array( '1', 'zgorajdesno', 'zgorajdesno=$1', 'zgorajdesno $1', 'upright', 'upright=$1', 'upright $1' ),
-	'img_border'              => array( '1', 'obroba', 'border' ),
-	'img_sub'                 => array( '1', 'pod', 'podpisano', 'sub' ),
-	'img_super'               => array( '1', 'nad', 'nadpisano', 'super', 'sup' ),
-	'img_top'                 => array( '1', 'vrh', 'top' ),
-	'img_text_top'            => array( '1', 'vrh-besedila', 'text-top' ),
-	'img_bottom'              => array( '1', 'dno', 'bottom' ),
-	'img_text_bottom'         => array( '1', 'dno-besedila', 'text-bottom' ),
-	'sitename'                => array( '1', 'IMESTRANI', 'SITENAME' ),
-	'server'                  => array( '0', 'STREZNIK', 'SERVER' ),
-	'grammar'                 => array( '0', 'SKLON:', 'GRAMMAR:' ),
-	'gender'                  => array( '0', 'SPOL:', 'GENDER:' ),
-	'plural'                  => array( '0', 'MNOZINA:', 'PLURAL:' ),
-	'language'                => array( '0', '#JEZIK:', '#LANGUAGE:' ),
-	'tag'                     => array( '0', 'oznaka', 'tag' ),
-	'hiddencat'               => array( '1', '__SKRITAKATEGORIJA__', '__HIDDENCAT__' ),
-	'index'                   => array( '1', '__KAZALO__', '__INDEX__' ),
-	'noindex'                 => array( '1', '__BREZKAZALA__', '__NOINDEX__' ),
-	'staticredirect'          => array( '1', '__STATICNAPREUSMERITEV__', '__STATICREDIRECT__' ),
-	'protectionlevel'         => array( '1', 'STOPNJAZASCITE', 'PROTECTIONLEVEL' ),
-	'url_path'                => array( '0', 'POT', 'PATH' ),
-	'url_query'               => array( '0', 'POIZVEDBA', 'QUERY' ),
+	'redirect'                  => array( '0', '#PREUSMERITEV', '#REDIRECT' ),
+	'notoc'                     => array( '0', '__BREZKAZALAVSEBINE__', '__NOTOC__' ),
+	'nogallery'                 => array( '0', '__BREZGALERIJE__', '__NOGALLERY__' ),
+	'forcetoc'                  => array( '0', '__VSILIKAZALOVSEBINE__', '__FORCETOC__' ),
+	'toc'                       => array( '0', '__POGLAVJE__', '__TOC__' ),
+	'noeditsection'             => array( '0', '__BREZUREJANJARAZDELKOV__', '__NOEDITSECTION__' ),
+	'img_thumbnail'             => array( '1', 'sličica', 'thumbnail', 'thumb' ),
+	'img_manualthumb'           => array( '1', 'sličica=$1', 'thumbnail=$1', 'thumb=$1' ),
+	'img_right'                 => array( '1', 'desno', 'right' ),
+	'img_left'                  => array( '1', 'levo', 'left' ),
+	'img_none'                  => array( '1', 'brez', 'none' ),
+	'img_width'                 => array( '1', '$1_pik', '$1px' ),
+	'img_center'                => array( '1', 'sredina', 'sredinsko', 'center', 'centre' ),
+	'img_framed'                => array( '1', 'okvir', 'okvirjeno', 'framed', 'enframed', 'frame' ),
+	'img_frameless'             => array( '1', 'brezokvirja', 'frameless' ),
+	'img_page'                  => array( '1', 'stran=$1', 'm_stran $1', 'page=$1', 'page $1' ),
+	'img_upright'               => array( '1', 'zgorajdesno', 'zgorajdesno=$1', 'zgorajdesno $1', 'upright', 'upright=$1', 'upright $1' ),
+	'img_border'                => array( '1', 'obroba', 'border' ),
+	'img_sub'                   => array( '1', 'pod', 'podpisano', 'sub' ),
+	'img_super'                 => array( '1', 'nad', 'nadpisano', 'super', 'sup' ),
+	'img_top'                   => array( '1', 'vrh', 'top' ),
+	'img_text_top'              => array( '1', 'vrh-besedila', 'text-top' ),
+	'img_bottom'                => array( '1', 'dno', 'bottom' ),
+	'img_text_bottom'           => array( '1', 'dno-besedila', 'text-bottom' ),
+	'sitename'                  => array( '1', 'IMESTRANI', 'SITENAME' ),
+	'server'                    => array( '0', 'STREZNIK', 'SERVER' ),
+	'grammar'                   => array( '0', 'SKLON:', 'GRAMMAR:' ),
+	'gender'                    => array( '0', 'SPOL:', 'GENDER:' ),
+	'plural'                    => array( '0', 'MNOZINA:', 'PLURAL:' ),
+	'language'                  => array( '0', '#JEZIK:', '#LANGUAGE:' ),
+	'tag'                       => array( '0', 'oznaka', 'tag' ),
+	'hiddencat'                 => array( '1', '__SKRITAKATEGORIJA__', '__HIDDENCAT__' ),
+	'index'                     => array( '1', '__KAZALO__', '__INDEX__' ),
+	'noindex'                   => array( '1', '__BREZKAZALA__', '__NOINDEX__' ),
+	'staticredirect'            => array( '1', '__STATICNAPREUSMERITEV__', '__STATICREDIRECT__' ),
+	'protectionlevel'           => array( '1', 'STOPNJAZASCITE', 'PROTECTIONLEVEL' ),
+	'url_path'                  => array( '0', 'POT', 'PATH' ),
+	'url_query'                 => array( '0', 'POIZVEDBA', 'QUERY' ),
 );
 
 $linkTrail = '/^([a-zčćđžš]+)(.*)$/sDu';
diff --git a/languages/messages/MessagesSq.php b/languages/messages/MessagesSq.php
index 658b83341b..2b71faf9f2 100644
--- a/languages/messages/MessagesSq.php
+++ b/languages/messages/MessagesSq.php
@@ -128,77 +128,77 @@ $specialPageAliases = array(
 );
 
 $magicWords = array(
-	'redirect'                => array( '0', '#RIDREJTO', '#REDIRECT' ),
-	'notoc'                   => array( '0', '__JOTP__', '__NOTOC__' ),
-	'nogallery'               => array( '0', '__JOGALERI__', '__NOGALLERY__' ),
-	'toc'                     => array( '0', '__TP__', '__TOC__' ),
-	'noeditsection'           => array( '0', '__JOREDAKTIMSEKSIONI__', '__NOEDITSECTION__' ),
-	'currentmonth'            => array( '1', 'MUAJIMOMENTAL', 'MUAJIMOMENTAL2', 'CURRENTMONTH', 'CURRENTMONTH2' ),
-	'currentmonth1'           => array( '1', 'MUAJIMOMENTAL1', 'CURRENTMONTH1' ),
-	'currentmonthname'        => array( '1', 'EMRIIMUAJITMOMENTAL', 'CURRENTMONTHNAME' ),
-	'currentday'              => array( '1', 'DITASOT', 'CURRENTDAY' ),
-	'currentday2'             => array( '1', 'DITASOT2', 'CURRENTDAY2' ),
-	'currentdayname'          => array( '1', 'EMRIIDITËSOT', 'CURRENTDAYNAME' ),
-	'currentyear'             => array( '1', 'SIVJET', 'CURRENTYEAR' ),
-	'currenttime'             => array( '1', 'KOHATANI', 'CURRENTTIME' ),
-	'currenthour'             => array( '1', 'ORATANI', 'CURRENTHOUR' ),
-	'localmonth'              => array( '1', 'MUAJILOKAL', 'LOCALMONTH', 'LOCALMONTH2' ),
-	'localmonthname'          => array( '1', 'EMRIIMUAJITLOKAL', 'LOCALMONTHNAME' ),
-	'localday'                => array( '1', 'DITALOKALE', 'LOCALDAY' ),
-	'localday2'               => array( '1', 'DITALOKALE2', 'LOCALDAY2' ),
-	'localdayname'            => array( '1', 'EMRIIDITËSLOKALE', 'LOCALDAYNAME' ),
-	'localyear'               => array( '1', 'VITILOKAL', 'LOCALYEAR' ),
-	'localtime'               => array( '1', 'KOHALOKALE', 'LOCALTIME' ),
-	'localhour'               => array( '1', 'ORALOKALE', 'LOCALHOUR' ),
-	'numberofpages'           => array( '1', 'NUMRIFAQEVE', 'NUMBEROFPAGES' ),
-	'numberofarticles'        => array( '1', 'NUMRIIARTIKUJVE', 'NUMBEROFARTICLES' ),
-	'numberoffiles'           => array( '1', 'NUMRIISKEDAVE', 'NUMBEROFFILES' ),
-	'numberofusers'           => array( '1', 'NUMRIIPËRDORUESVE', 'NUMBEROFUSERS' ),
-	'numberofactiveusers'     => array( '1', 'NUMRIIPËRDORUESVEAKTIVË', 'NUMBEROFACTIVEUSERS' ),
-	'numberofedits'           => array( '1', 'NUMRIREDAKTIMEVE', 'NUMBEROFEDITS' ),
-	'numberofviews'           => array( '1', 'NUMRIISHIKIMEVE', 'NUMBEROFVIEWS' ),
-	'pagename'                => array( '1', 'EMRIFAQES', 'PAGENAME' ),
-	'namespace'               => array( '1', 'HAPËSIRA', 'NAMESPACE' ),
-	'fullpagename'            => array( '1', 'EMRIIPLOTËIFAQES', 'FULLPAGENAME' ),
-	'fullpagenamee'           => array( '1', 'EMRIIPLOTËIFAQESE', 'FULLPAGENAMEE' ),
-	'subpagename'             => array( '1', 'EMRIINËNFAQES', 'SUBPAGENAME' ),
-	'subpagenamee'            => array( '1', 'EMRIINËNFAQESE', 'SUBPAGENAMEE' ),
-	'basepagename'            => array( '1', 'EMRIIFAQESBAZË', 'BASEPAGENAME' ),
-	'basepagenamee'           => array( '1', 'EMRIIFAQESBAZËE', 'BASEPAGENAMEE' ),
-	'talkpagename'            => array( '1', 'EMRIIFAQESSËDISKUTIMIT', 'TALKPAGENAME' ),
-	'talkpagenamee'           => array( '1', 'EMRIIFAQESSËDISKUTIMITE', 'TALKPAGENAMEE' ),
-	'subst'                   => array( '0', 'ZËVN', 'SUBST:' ),
-	'img_thumbnail'           => array( '1', 'parapamje', 'pamje', 'thumbnail', 'thumb' ),
-	'img_manualthumb'         => array( '1', 'parapamje=$1', 'pamje=$1', 'thumbnail=$1', 'thumb=$1' ),
-	'img_right'               => array( '1', 'djathtas', 'right' ),
-	'img_left'                => array( '1', 'majtas', 'left' ),
-	'img_none'                => array( '1', 's\'ka', 'none' ),
-	'img_center'              => array( '1', 'qendër', 'qendrore', 'center', 'centre' ),
-	'img_framed'              => array( '1', 'i_kornizuar', 'pa_kornizë', 'kornizë', 'framed', 'enframed', 'frame' ),
-	'img_page'                => array( '1', 'faqja=$1', 'faqja $1', 'page=$1', 'page $1' ),
-	'img_upright'             => array( '1', 'lartdjathtas', 'lartdjathtas=$1', 'lartdjathtas $1', 'upright', 'upright=$1', 'upright $1' ),
-	'img_border'              => array( '1', 'kufi', 'border' ),
-	'img_baseline'            => array( '1', 'linjabazë', 'baseline' ),
-	'img_sub'                 => array( '1', 'nën', 'sub' ),
-	'img_text_top'            => array( '1', 'tekst-top', 'text-top' ),
-	'img_middle'              => array( '1', 'mes', 'middle' ),
-	'img_bottom'              => array( '1', 'fund', 'bottom' ),
-	'img_text_bottom'         => array( '1', 'tekst-fund', 'text-bottom' ),
-	'img_link'                => array( '1', 'lidhje=$1', 'link=$1' ),
-	'sitename'                => array( '1', 'EMRIISAJTIT', 'SITENAME' ),
-	'localurl'                => array( '0', 'URLLOKALE', 'LOCALURL:' ),
-	'server'                  => array( '0', 'SERVERI', 'SERVER' ),
-	'servername'              => array( '0', 'EMRIISERVERIT', 'SERVERNAME' ),
-	'grammar'                 => array( '0', 'GRAMATIKA:', 'GRAMMAR:' ),
-	'gender'                  => array( '0', 'GJINIA:', 'GENDER:' ),
-	'currentweek'             => array( '1', 'JAVAMOMENTALE', 'CURRENTWEEK' ),
-	'plural'                  => array( '0', 'SHUMËS:', 'PLURAL:' ),
-	'fullurl'                 => array( '0', 'URLEPLOTË', 'FULLURL:' ),
-	'language'                => array( '0', '#GJUHA:', '#LANGUAGE:' ),
-	'numberofadmins'          => array( '1', 'NUMRIIADMINISTRUESVE', 'NUMBEROFADMINS' ),
-	'special'                 => array( '0', 'speciale', 'special' ),
-	'hiddencat'               => array( '1', '__KATEGORIEFSHEHUR__', '__HIDDENCAT__' ),
-	'pagesize'                => array( '1', 'MADHËSIAEFAQES', 'PAGESIZE' ),
+	'redirect'                  => array( '0', '#RIDREJTO', '#REDIRECT' ),
+	'notoc'                     => array( '0', '__JOTP__', '__NOTOC__' ),
+	'nogallery'                 => array( '0', '__JOGALERI__', '__NOGALLERY__' ),
+	'toc'                       => array( '0', '__TP__', '__TOC__' ),
+	'noeditsection'             => array( '0', '__JOREDAKTIMSEKSIONI__', '__NOEDITSECTION__' ),
+	'currentmonth'              => array( '1', 'MUAJIMOMENTAL', 'MUAJIMOMENTAL2', 'CURRENTMONTH', 'CURRENTMONTH2' ),
+	'currentmonth1'             => array( '1', 'MUAJIMOMENTAL1', 'CURRENTMONTH1' ),
+	'currentmonthname'          => array( '1', 'EMRIIMUAJITMOMENTAL', 'CURRENTMONTHNAME' ),
+	'currentday'                => array( '1', 'DITASOT', 'CURRENTDAY' ),
+	'currentday2'               => array( '1', 'DITASOT2', 'CURRENTDAY2' ),
+	'currentdayname'            => array( '1', 'EMRIIDITËSOT', 'CURRENTDAYNAME' ),
+	'currentyear'               => array( '1', 'SIVJET', 'CURRENTYEAR' ),
+	'currenttime'               => array( '1', 'KOHATANI', 'CURRENTTIME' ),
+	'currenthour'               => array( '1', 'ORATANI', 'CURRENTHOUR' ),
+	'localmonth'                => array( '1', 'MUAJILOKAL', 'LOCALMONTH', 'LOCALMONTH2' ),
+	'localmonthname'            => array( '1', 'EMRIIMUAJITLOKAL', 'LOCALMONTHNAME' ),
+	'localday'                  => array( '1', 'DITALOKALE', 'LOCALDAY' ),
+	'localday2'                 => array( '1', 'DITALOKALE2', 'LOCALDAY2' ),
+	'localdayname'              => array( '1', 'EMRIIDITËSLOKALE', 'LOCALDAYNAME' ),
+	'localyear'                 => array( '1', 'VITILOKAL', 'LOCALYEAR' ),
+	'localtime'                 => array( '1', 'KOHALOKALE', 'LOCALTIME' ),
+	'localhour'                 => array( '1', 'ORALOKALE', 'LOCALHOUR' ),
+	'numberofpages'             => array( '1', 'NUMRIFAQEVE', 'NUMBEROFPAGES' ),
+	'numberofarticles'          => array( '1', 'NUMRIIARTIKUJVE', 'NUMBEROFARTICLES' ),
+	'numberoffiles'             => array( '1', 'NUMRIISKEDAVE', 'NUMBEROFFILES' ),
+	'numberofusers'             => array( '1', 'NUMRIIPËRDORUESVE', 'NUMBEROFUSERS' ),
+	'numberofactiveusers'       => array( '1', 'NUMRIIPËRDORUESVEAKTIVË', 'NUMBEROFACTIVEUSERS' ),
+	'numberofedits'             => array( '1', 'NUMRIREDAKTIMEVE', 'NUMBEROFEDITS' ),
+	'numberofviews'             => array( '1', 'NUMRIISHIKIMEVE', 'NUMBEROFVIEWS' ),
+	'pagename'                  => array( '1', 'EMRIFAQES', 'PAGENAME' ),
+	'namespace'                 => array( '1', 'HAPËSIRA', 'NAMESPACE' ),
+	'fullpagename'              => array( '1', 'EMRIIPLOTËIFAQES', 'FULLPAGENAME' ),
+	'fullpagenamee'             => array( '1', 'EMRIIPLOTËIFAQESE', 'FULLPAGENAMEE' ),
+	'subpagename'               => array( '1', 'EMRIINËNFAQES', 'SUBPAGENAME' ),
+	'subpagenamee'              => array( '1', 'EMRIINËNFAQESE', 'SUBPAGENAMEE' ),
+	'basepagename'              => array( '1', 'EMRIIFAQESBAZË', 'BASEPAGENAME' ),
+	'basepagenamee'             => array( '1', 'EMRIIFAQESBAZËE', 'BASEPAGENAMEE' ),
+	'talkpagename'              => array( '1', 'EMRIIFAQESSËDISKUTIMIT', 'TALKPAGENAME' ),
+	'talkpagenamee'             => array( '1', 'EMRIIFAQESSËDISKUTIMITE', 'TALKPAGENAMEE' ),
+	'subst'                     => array( '0', 'ZËVN', 'SUBST:' ),
+	'img_thumbnail'             => array( '1', 'parapamje', 'pamje', 'thumbnail', 'thumb' ),
+	'img_manualthumb'           => array( '1', 'parapamje=$1', 'pamje=$1', 'thumbnail=$1', 'thumb=$1' ),
+	'img_right'                 => array( '1', 'djathtas', 'right' ),
+	'img_left'                  => array( '1', 'majtas', 'left' ),
+	'img_none'                  => array( '1', 's\'ka', 'none' ),
+	'img_center'                => array( '1', 'qendër', 'qendrore', 'center', 'centre' ),
+	'img_framed'                => array( '1', 'i_kornizuar', 'pa_kornizë', 'kornizë', 'framed', 'enframed', 'frame' ),
+	'img_page'                  => array( '1', 'faqja=$1', 'faqja $1', 'page=$1', 'page $1' ),
+	'img_upright'               => array( '1', 'lartdjathtas', 'lartdjathtas=$1', 'lartdjathtas $1', 'upright', 'upright=$1', 'upright $1' ),
+	'img_border'                => array( '1', 'kufi', 'border' ),
+	'img_baseline'              => array( '1', 'linjabazë', 'baseline' ),
+	'img_sub'                   => array( '1', 'nën', 'sub' ),
+	'img_text_top'              => array( '1', 'tekst-top', 'text-top' ),
+	'img_middle'                => array( '1', 'mes', 'middle' ),
+	'img_bottom'                => array( '1', 'fund', 'bottom' ),
+	'img_text_bottom'           => array( '1', 'tekst-fund', 'text-bottom' ),
+	'img_link'                  => array( '1', 'lidhje=$1', 'link=$1' ),
+	'sitename'                  => array( '1', 'EMRIISAJTIT', 'SITENAME' ),
+	'localurl'                  => array( '0', 'URLLOKALE', 'LOCALURL:' ),
+	'server'                    => array( '0', 'SERVERI', 'SERVER' ),
+	'servername'                => array( '0', 'EMRIISERVERIT', 'SERVERNAME' ),
+	'grammar'                   => array( '0', 'GRAMATIKA:', 'GRAMMAR:' ),
+	'gender'                    => array( '0', 'GJINIA:', 'GENDER:' ),
+	'currentweek'               => array( '1', 'JAVAMOMENTALE', 'CURRENTWEEK' ),
+	'plural'                    => array( '0', 'SHUMËS:', 'PLURAL:' ),
+	'fullurl'                   => array( '0', 'URLEPLOTË', 'FULLURL:' ),
+	'language'                  => array( '0', '#GJUHA:', '#LANGUAGE:' ),
+	'numberofadmins'            => array( '1', 'NUMRIIADMINISTRUESVE', 'NUMBEROFADMINS' ),
+	'special'                   => array( '0', 'speciale', 'special' ),
+	'hiddencat'                 => array( '1', '__KATEGORIEFSHEHUR__', '__HIDDENCAT__' ),
+	'pagesize'                  => array( '1', 'MADHËSIAEFAQES', 'PAGESIZE' ),
 );
 
 $datePreferences = array(
diff --git a/languages/messages/MessagesSr_ec.php b/languages/messages/MessagesSr_ec.php
index f5425ed117..6a55ec021f 100644
--- a/languages/messages/MessagesSr_ec.php
+++ b/languages/messages/MessagesSr_ec.php
@@ -246,150 +246,150 @@ $dateFormats = array(
 
 /* NOT USED IN STABLE VERSION */
 $magicWords = array(
-	'redirect'                => array( '0', '#Преусмери', '#преусмери', '#ПРЕУСМЕРИ', '#Преусмјери', '#преусмјери', '#ПРЕУСМЈЕРИ', '#redirect', '#REDIRECT' ),
-	'notoc'                   => array( '0', '__БЕЗСАДРЖАЈА__', '__БЕЗ_САДРЖАЈА__', '__NOTOC__' ),
-	'nogallery'               => array( '0', '__БЕЗГАЛЕРИЈЕ__', '__БЕЗ_ГАЛЕРИЈЕ__', '__NOGALLERY__' ),
-	'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' ),
-	'currentmonthnamegen'     => array( '1', 'ТРЕНУТНИМЕСЕЦГЕН', 'ТЕКУЋИМЕСЕЦГЕН', 'ТЕКУЋИ_МЕСЕЦ_ГЕН', 'CURRENTMONTHNAMEGEN' ),
-	'currentmonthabbrev'      => array( '1', 'ТРЕНУТНИМЕСЕЦСКР', 'ТЕКУЋИМЕСЕЦСКР', 'ТЕКУЋИ_МЕСЕЦ_СКР', 'CURRENTMONTHABBREV' ),
-	'currentday'              => array( '1', 'ТРЕНУТНИДАН', 'ТЕКУЋИДАН', 'ТЕКУЋИ_ДАН', 'CURRENTDAY' ),
-	'currentday2'             => array( '1', 'ТЕКУЋИДАН2', 'ТЕКУЋИ_ДАН_2', 'CURRENTDAY2' ),
-	'currentdayname'          => array( '1', 'ТРЕНУТНИДАНИМЕ', 'ИМЕТЕКУЋЕГДАНА', 'ИМЕ_ТЕКУЋЕГ_ДАНА', 'CURRENTDAYNAME' ),
-	'currentyear'             => array( '1', 'ТРЕНУТНАГОДИНА', 'ТЕКУЋАГОДИНА', 'ТЕКУЋА_ГОДИНА', 'CURRENTYEAR' ),
-	'currenttime'             => array( '1', 'ТРЕНУТНОВРЕМЕ', 'ТЕКУЋЕВРЕМЕ', 'ТЕКУЋЕ_ВРЕМЕ', 'CURRENTTIME' ),
-	'currenthour'             => array( '1', 'ТЕКУЋИСАТ', 'ТЕКУЋИ_САТ', 'CURRENTHOUR' ),
-	'localmonth'              => array( '1', 'ЛОКАЛНИМЕСЕЦ', 'ЛОКАЛНИ_МЕСЕЦ', 'LOCALMONTH', 'LOCALMONTH2' ),
-	'localmonth1'             => array( '1', 'ЛОКАЛНИМЕСЕЦ2', 'ЛОКАЛНИ_МЕСЕЦ2', 'LOCALMONTH1' ),
-	'localmonthname'          => array( '1', 'ИМЕЛОКАЛНОГМЕСЕЦА', 'ИМЕ_ЛОКАЛНОГ_МЕСЕЦА', 'LOCALMONTHNAME' ),
-	'localmonthnamegen'       => array( '1', 'ЛОКАЛНИМЕСЕЦГЕН', 'ЛОКАЛНИ_МЕСЕЦ_ГЕН', 'LOCALMONTHNAMEGEN' ),
-	'localmonthabbrev'        => array( '1', 'ЛОКАЛНИМЕСЕЦСКР', 'ЛОКАЛНИ_МЕСЕЦ_СКР', 'LOCALMONTHABBREV' ),
-	'localday'                => array( '1', 'ЛОКАЛНИДАН', 'ЛОКАЛНИ_ДАН', 'LOCALDAY' ),
-	'localday2'               => array( '1', 'ЛОКАЛНИДАН2', 'ЛОКАЛНИ_ДАН2', 'LOCALDAY2' ),
-	'localdayname'            => array( '1', 'ИМЕЛОКАЛНОГДАНА', 'ИМЕ_ЛОКАЛНОГ_ДАНА', 'LOCALDAYNAME' ),
-	'localyear'               => array( '1', 'ЛОКАЛНАГОДИНА', 'ЛОКАЛНА_ГОДИНА', 'LOCALYEAR' ),
-	'localtime'               => array( '1', 'ЛОКАЛНОВРЕМЕ', 'ЛОКАЛНО_ВРЕМЕ', 'LOCALTIME' ),
-	'localhour'               => array( '1', 'ЛОКАЛНИСАТ', 'ЛОКАЛНИ_САТ', 'LOCALHOUR' ),
-	'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' ),
-	'talkspace'               => array( '1', 'РАЗГОВОР', 'TALKSPACE' ),
-	'talkspacee'              => array( '1', 'РАЗГОВОРИ', 'TALKSPACEE' ),
-	'subjectspace'            => array( '1', 'ИМЕНСКИПРОСТОРЧЛАНКА', 'ИМЕНСКИ_ПРОСТОР_ЧЛАНКА', 'SUBJECTSPACE', 'ARTICLESPACE' ),
-	'subjectspacee'           => array( '1', 'ИМЕНСКИПРОСТОРЧЛАНАКА', 'ИМЕНСКИ_ПРОСТОР_ЧЛАНАКА', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
-	'fullpagename'            => array( '1', 'ПУНОИМЕСТРАНИЦЕ', 'ПУНОИМЕСТРАНЕ', 'ПУНО_ИМЕ_СТРАНИЦЕ', 'ПУНО_ИМЕ_СТРАНЕ', 'FULLPAGENAME' ),
-	'fullpagenamee'           => array( '1', 'ПУНАИМЕНАСТРАНИЦА', 'ПУНАИМЕНАСТРАНА', 'ПУНА_ИМЕНА_СТРАНИЦА', 'ПУНА_ИМЕНА_СТРАНА', 'FULLPAGENAMEE' ),
-	'subpagename'             => array( '1', 'ИМЕПОДСТРАНИЦЕ', 'ИМЕПОДСТРАНЕ', 'ИМЕ_ПОДСТРАНИЦЕ', 'ИМЕ_ПОДСТРАНЕ', 'SUBPAGENAME' ),
-	'subpagenamee'            => array( '1', 'ИМЕНАПОДСТРАНИЦА', 'ИМЕНАПОДСТРАНА', 'ИМЕНА_ПОДСТРАНИЦА', 'ИМЕНА_ПОДСТРАНА', 'SUBPAGENAMEE' ),
-	'basepagename'            => array( '1', 'ИМЕОСНОВЕ', 'ИМЕ_ОСНОВЕ', 'BASEPAGENAME' ),
-	'basepagenamee'           => array( '1', 'ИМЕНАОСНОВА', 'ИМЕНА_ОСНОВА', 'BASEPAGENAMEE' ),
-	'talkpagename'            => array( '1', 'ИМЕРАЗГОВОРА', 'ИМЕ_РАЗГОВОРА', 'TALKPAGENAME' ),
-	'talkpagenamee'           => array( '1', 'ИМЕНАРАЗГОВОРА', 'ИМЕНА_РАЗГОВОРА', 'TALKPAGENAMEE' ),
-	'subjectpagename'         => array( '1', 'ИМЕЧЛАНКА', 'ИМЕ_ЧЛАНКА', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
-	'subjectpagenamee'        => array( '1', 'ИМЕНАЧЛАНАКА', 'ИМЕНА_ЧЛАНАКА', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
-	'msg'                     => array( '0', 'ПОР:', 'MSG:' ),
-	'subst'                   => array( '0', 'ЗАМЕНИ:', 'ЗАМЕНА:', 'SUBST:' ),
-	'safesubst'               => array( '0', 'БЕЗБЕДНАЗАМЕНА', 'БЕЗБЕДНА_ЗАМЕНА', 'SAFESUBST:' ),
-	'msgnw'                   => array( '0', 'НВПОР:', 'MSGNW:' ),
-	'img_thumbnail'           => array( '1', 'мини', 'умањено', 'thumbnail', 'thumb' ),
-	'img_manualthumb'         => array( '1', 'мини=$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_page'                => array( '1', 'страница=$1', 'страна=$1', 'страница_$1', 'страна_$1', 'page=$1', 'page $1' ),
-	'img_upright'             => array( '1', 'усправно', 'усправно=$1', 'усправно_$1', 'upright', 'upright=$1', 'upright $1' ),
-	'img_border'              => array( '1', 'ивица', 'border' ),
-	'img_baseline'            => array( '1', 'основа', 'baseline' ),
-	'img_sub'                 => array( '1', 'под', 'sub' ),
-	'img_super'               => array( '1', 'супер', 'super', 'sup' ),
-	'img_top'                 => array( '1', 'врх', 'top' ),
-	'img_text_top'            => array( '1', 'врхтекста', 'врх_текста', 'text-top' ),
-	'img_middle'              => array( '1', 'средина', 'middle' ),
-	'img_bottom'              => array( '1', 'дно', 'bottom' ),
-	'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:' ),
-	'sitename'                => array( '1', 'ИМЕСАЈТА', 'SITENAME' ),
-	'ns'                      => array( '0', 'ИП:', 'NS:' ),
-	'localurl'                => array( '0', 'ЛОКАЛНААДРЕСА:', 'ЛОКАЛНА_АДРЕСА:', 'LOCALURL:' ),
-	'localurle'               => array( '0', 'ЛОКАЛНЕАДРЕСЕ:', 'ЛОКАЛНЕ_АДРЕСЕ:', 'LOCALURLE:' ),
-	'articlepath'             => array( '0', 'ПУТАЊАЧЛАНКА', 'ПУТАЊА_ЧЛАНКА', 'ARTICLEPATH' ),
-	'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', '__БЕЗКН__', '__BEZKN__', '__NOTITLECONVERT__', '__NOTC__' ),
-	'nocontentconvert'        => array( '0', '__БЕЗЦЦ__', '__NOCONTENTCONVERT__', '__NOCC__' ),
-	'currentweek'             => array( '1', 'ТРЕНУТНАНЕДЕЉА', 'ТРЕНУТНА_НЕДЕЉА', 'ТЕКУЋАНЕДЕЉА', 'ТЕКУЋА_НЕДЕЉА', 'CURRENTWEEK' ),
-	'currentdow'              => array( '1', 'ТРЕНУТНИДОВ', 'ТЕКУЋИДУН', 'CURRENTDOW' ),
-	'localweek'               => array( '1', 'ЛОКАЛНАНЕДЕЉА', 'ЛОКАЛНА_НЕДЕЉА', 'LOCALWEEK' ),
-	'localdow'                => array( '1', 'ЛОКАЛНИДУН', 'LOCALDOW' ),
-	'revisionid'              => array( '1', 'ИДРЕВИЗИЈЕ', 'ИД_РЕВИЗИЈЕ', 'REVISIONID' ),
-	'revisionday'             => array( '1', 'ДАНИЗМЕНЕ', 'ДАН_ИЗМЕНЕ', 'REVISIONDAY' ),
-	'revisionday2'            => array( '1', 'ДАНИЗМЕНЕ2', 'ДАН_ИЗМЕНЕ2', 'REVISIONDAY2' ),
-	'revisionmonth'           => array( '1', 'МЕСЕЦИЗМЕНЕ', 'МЕСЕЦ_ИЗМЕНЕ', 'REVISIONMONTH' ),
-	'revisionmonth1'          => array( '1', 'МЕСЕЦИЗМЕНЕ1', 'МЕСЕЦ_ИЗМЕНЕ1', 'REVISIONMONTH1' ),
-	'revisionyear'            => array( '1', 'ГОДИНАИЗМЕНЕ', 'ГОДИНА_ИЗМЕНЕ', 'REVISIONYEAR' ),
-	'revisiontimestamp'       => array( '1', 'ВРЕМЕИЗМЕНЕ', 'ВРЕМЕ_ИЗМЕНЕ', 'REVISIONTIMESTAMP' ),
-	'revisionuser'            => array( '1', 'КОРИСНИКИЗМЕНЕ', 'КОРИСНИК_ИЗМЕНЕ', 'REVISIONUSER' ),
-	'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' ),
-	'rawsuffix'               => array( '1', 'Р', 'R' ),
-	'newsectionlink'          => array( '1', '__НОВАВЕЗАОДЕЉКА__', '__НОВА_ВЕЗА_ОДЕЉКА__', '__NEWSECTIONLINK__' ),
-	'nonewsectionlink'        => array( '1', '__БЕЗНОВЕВЕЗЕОДЕЉКА__', '__БЕЗ_НОВЕ_ВЕЗЕ_ОДЕЉКА__', '__NONEWSECTIONLINK__' ),
-	'currentversion'          => array( '1', 'ТЕКУЋЕИЗДАЊЕ', 'ТЕКУЋЕ_ИЗДАЊЕ', 'CURRENTVERSION' ),
-	'urlencode'               => array( '0', 'КОДИРАЊЕАДРЕСЕ', 'КОДИРАЊЕ_АДРЕСЕ', 'URLENCODE:' ),
-	'anchorencode'            => array( '0', 'КОДИРАЊЕВЕЗЕ', 'КОДИРАЊЕ_ВЕЗЕ', 'ANCHORENCODE' ),
-	'currenttimestamp'        => array( '1', 'ТЕКУЋИОТИСАКВРЕМЕНА', 'ТЕКУЋИ_ОТИСАК_ВРЕМЕНА', 'CURRENTTIMESTAMP' ),
-	'localtimestamp'          => array( '1', 'ОТИСАКВРЕМЕНА', 'ОТИСАК_ВРЕМЕНА', 'LOCALTIMESTAMP' ),
-	'directionmark'           => array( '1', 'СМЕРОЗНАКЕ', 'СМЕР	_ОЗНАКЕ', 'DIRECTIONMARK', 'DIRMARK' ),
-	'contentlanguage'         => array( '1', 'ЈЕЗИКСАДРЖАЈА', 'ЈЕЗИК_САДРЖАЈА', 'CONTENTLANGUAGE', 'CONTENTLANG' ),
-	'pagesinnamespace'        => array( '1', 'СТРАНИЦАУИМЕНСКОМПРОСТОРУ', 'СТРАНАУИМЕНСКОМПРОСТОРУ', 'СТРАНИЦА_У_ИМЕНСКОМ_ПРОСТОРУ', 'СТРАНА_У_ИМЕНСКОМ_ПРОСТОРУ', 'PAGESINNAMESPACE:', 'PAGESINNS:' ),
-	'numberofadmins'          => array( '1', 'БРОЈАДМИНА', 'БРОЈ_АДМИНА', 'NUMBEROFADMINS' ),
-	'padleft'                 => array( '0', 'ПОРАВНАЈЛЕВО', 'ПОРАВНАЈ_ЛЕВО', 'PADLEFT' ),
-	'padright'                => array( '0', 'ПОРАВНАЈДЕСНО', 'ПОРАВНАЈ_ДЕСНО', 'PADRIGHT' ),
-	'special'                 => array( '0', 'посебно', 'special' ),
-	'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' ),
-	'url_path'                => array( '0', 'ПУТАЊА', 'PATH' ),
-	'url_wiki'                => array( '0', 'ВИКИ', 'WIKI' ),
-	'url_query'               => array( '0', 'РЕДОСЛЕД', 'QUERY' ),
+	'redirect'                  => array( '0', '#Преусмери', '#преусмери', '#ПРЕУСМЕРИ', '#Преусмјери', '#преусмјери', '#ПРЕУСМЈЕРИ', '#redirect', '#REDIRECT' ),
+	'notoc'                     => array( '0', '__БЕЗСАДРЖАЈА__', '__БЕЗ_САДРЖАЈА__', '__NOTOC__' ),
+	'nogallery'                 => array( '0', '__БЕЗГАЛЕРИЈЕ__', '__БЕЗ_ГАЛЕРИЈЕ__', '__NOGALLERY__' ),
+	'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' ),
+	'currentmonthnamegen'       => array( '1', 'ТРЕНУТНИМЕСЕЦГЕН', 'ТЕКУЋИМЕСЕЦГЕН', 'ТЕКУЋИ_МЕСЕЦ_ГЕН', 'CURRENTMONTHNAMEGEN' ),
+	'currentmonthabbrev'        => array( '1', 'ТРЕНУТНИМЕСЕЦСКР', 'ТЕКУЋИМЕСЕЦСКР', 'ТЕКУЋИ_МЕСЕЦ_СКР', 'CURRENTMONTHABBREV' ),
+	'currentday'                => array( '1', 'ТРЕНУТНИДАН', 'ТЕКУЋИДАН', 'ТЕКУЋИ_ДАН', 'CURRENTDAY' ),
+	'currentday2'               => array( '1', 'ТЕКУЋИДАН2', 'ТЕКУЋИ_ДАН_2', 'CURRENTDAY2' ),
+	'currentdayname'            => array( '1', 'ТРЕНУТНИДАНИМЕ', 'ИМЕТЕКУЋЕГДАНА', 'ИМЕ_ТЕКУЋЕГ_ДАНА', 'CURRENTDAYNAME' ),
+	'currentyear'               => array( '1', 'ТРЕНУТНАГОДИНА', 'ТЕКУЋАГОДИНА', 'ТЕКУЋА_ГОДИНА', 'CURRENTYEAR' ),
+	'currenttime'               => array( '1', 'ТРЕНУТНОВРЕМЕ', 'ТЕКУЋЕВРЕМЕ', 'ТЕКУЋЕ_ВРЕМЕ', 'CURRENTTIME' ),
+	'currenthour'               => array( '1', 'ТЕКУЋИСАТ', 'ТЕКУЋИ_САТ', 'CURRENTHOUR' ),
+	'localmonth'                => array( '1', 'ЛОКАЛНИМЕСЕЦ', 'ЛОКАЛНИ_МЕСЕЦ', 'LOCALMONTH', 'LOCALMONTH2' ),
+	'localmonth1'               => array( '1', 'ЛОКАЛНИМЕСЕЦ2', 'ЛОКАЛНИ_МЕСЕЦ2', 'LOCALMONTH1' ),
+	'localmonthname'            => array( '1', 'ИМЕЛОКАЛНОГМЕСЕЦА', 'ИМЕ_ЛОКАЛНОГ_МЕСЕЦА', 'LOCALMONTHNAME' ),
+	'localmonthnamegen'         => array( '1', 'ЛОКАЛНИМЕСЕЦГЕН', 'ЛОКАЛНИ_МЕСЕЦ_ГЕН', 'LOCALMONTHNAMEGEN' ),
+	'localmonthabbrev'          => array( '1', 'ЛОКАЛНИМЕСЕЦСКР', 'ЛОКАЛНИ_МЕСЕЦ_СКР', 'LOCALMONTHABBREV' ),
+	'localday'                  => array( '1', 'ЛОКАЛНИДАН', 'ЛОКАЛНИ_ДАН', 'LOCALDAY' ),
+	'localday2'                 => array( '1', 'ЛОКАЛНИДАН2', 'ЛОКАЛНИ_ДАН2', 'LOCALDAY2' ),
+	'localdayname'              => array( '1', 'ИМЕЛОКАЛНОГДАНА', 'ИМЕ_ЛОКАЛНОГ_ДАНА', 'LOCALDAYNAME' ),
+	'localyear'                 => array( '1', 'ЛОКАЛНАГОДИНА', 'ЛОКАЛНА_ГОДИНА', 'LOCALYEAR' ),
+	'localtime'                 => array( '1', 'ЛОКАЛНОВРЕМЕ', 'ЛОКАЛНО_ВРЕМЕ', 'LOCALTIME' ),
+	'localhour'                 => array( '1', 'ЛОКАЛНИСАТ', 'ЛОКАЛНИ_САТ', 'LOCALHOUR' ),
+	'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' ),
+	'talkspace'                 => array( '1', 'РАЗГОВОР', 'TALKSPACE' ),
+	'talkspacee'                => array( '1', 'РАЗГОВОРИ', 'TALKSPACEE' ),
+	'subjectspace'              => array( '1', 'ИМЕНСКИПРОСТОРЧЛАНКА', 'ИМЕНСКИ_ПРОСТОР_ЧЛАНКА', 'SUBJECTSPACE', 'ARTICLESPACE' ),
+	'subjectspacee'             => array( '1', 'ИМЕНСКИПРОСТОРЧЛАНАКА', 'ИМЕНСКИ_ПРОСТОР_ЧЛАНАКА', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
+	'fullpagename'              => array( '1', 'ПУНОИМЕСТРАНИЦЕ', 'ПУНОИМЕСТРАНЕ', 'ПУНО_ИМЕ_СТРАНИЦЕ', 'ПУНО_ИМЕ_СТРАНЕ', 'FULLPAGENAME' ),
+	'fullpagenamee'             => array( '1', 'ПУНАИМЕНАСТРАНИЦА', 'ПУНАИМЕНАСТРАНА', 'ПУНА_ИМЕНА_СТРАНИЦА', 'ПУНА_ИМЕНА_СТРАНА', 'FULLPAGENAMEE' ),
+	'subpagename'               => array( '1', 'ИМЕПОДСТРАНИЦЕ', 'ИМЕПОДСТРАНЕ', 'ИМЕ_ПОДСТРАНИЦЕ', 'ИМЕ_ПОДСТРАНЕ', 'SUBPAGENAME' ),
+	'subpagenamee'              => array( '1', 'ИМЕНАПОДСТРАНИЦА', 'ИМЕНАПОДСТРАНА', 'ИМЕНА_ПОДСТРАНИЦА', 'ИМЕНА_ПОДСТРАНА', 'SUBPAGENAMEE' ),
+	'basepagename'              => array( '1', 'ИМЕОСНОВЕ', 'ИМЕ_ОСНОВЕ', 'BASEPAGENAME' ),
+	'basepagenamee'             => array( '1', 'ИМЕНАОСНОВА', 'ИМЕНА_ОСНОВА', 'BASEPAGENAMEE' ),
+	'talkpagename'              => array( '1', 'ИМЕРАЗГОВОРА', 'ИМЕ_РАЗГОВОРА', 'TALKPAGENAME' ),
+	'talkpagenamee'             => array( '1', 'ИМЕНАРАЗГОВОРА', 'ИМЕНА_РАЗГОВОРА', 'TALKPAGENAMEE' ),
+	'subjectpagename'           => array( '1', 'ИМЕЧЛАНКА', 'ИМЕ_ЧЛАНКА', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
+	'subjectpagenamee'          => array( '1', 'ИМЕНАЧЛАНАКА', 'ИМЕНА_ЧЛАНАКА', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
+	'msg'                       => array( '0', 'ПОР:', 'MSG:' ),
+	'subst'                     => array( '0', 'ЗАМЕНИ:', 'ЗАМЕНА:', 'SUBST:' ),
+	'safesubst'                 => array( '0', 'БЕЗБЕДНАЗАМЕНА', 'БЕЗБЕДНА_ЗАМЕНА', 'SAFESUBST:' ),
+	'msgnw'                     => array( '0', 'НВПОР:', 'MSGNW:' ),
+	'img_thumbnail'             => array( '1', 'мини', 'умањено', 'thumbnail', 'thumb' ),
+	'img_manualthumb'           => array( '1', 'мини=$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_page'                  => array( '1', 'страница=$1', 'страна=$1', 'страница_$1', 'страна_$1', 'page=$1', 'page $1' ),
+	'img_upright'               => array( '1', 'усправно', 'усправно=$1', 'усправно_$1', 'upright', 'upright=$1', 'upright $1' ),
+	'img_border'                => array( '1', 'ивица', 'border' ),
+	'img_baseline'              => array( '1', 'основа', 'baseline' ),
+	'img_sub'                   => array( '1', 'под', 'sub' ),
+	'img_super'                 => array( '1', 'супер', 'super', 'sup' ),
+	'img_top'                   => array( '1', 'врх', 'top' ),
+	'img_text_top'              => array( '1', 'врхтекста', 'врх_текста', 'text-top' ),
+	'img_middle'                => array( '1', 'средина', 'middle' ),
+	'img_bottom'                => array( '1', 'дно', 'bottom' ),
+	'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:' ),
+	'sitename'                  => array( '1', 'ИМЕСАЈТА', 'SITENAME' ),
+	'ns'                        => array( '0', 'ИП:', 'NS:' ),
+	'localurl'                  => array( '0', 'ЛОКАЛНААДРЕСА:', 'ЛОКАЛНА_АДРЕСА:', 'LOCALURL:' ),
+	'localurle'                 => array( '0', 'ЛОКАЛНЕАДРЕСЕ:', 'ЛОКАЛНЕ_АДРЕСЕ:', 'LOCALURLE:' ),
+	'articlepath'               => array( '0', 'ПУТАЊАЧЛАНКА', 'ПУТАЊА_ЧЛАНКА', 'ARTICLEPATH' ),
+	'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', '__БЕЗКН__', '__BEZKN__', '__NOTITLECONVERT__', '__NOTC__' ),
+	'nocontentconvert'          => array( '0', '__БЕЗЦЦ__', '__NOCONTENTCONVERT__', '__NOCC__' ),
+	'currentweek'               => array( '1', 'ТРЕНУТНАНЕДЕЉА', 'ТРЕНУТНА_НЕДЕЉА', 'ТЕКУЋАНЕДЕЉА', 'ТЕКУЋА_НЕДЕЉА', 'CURRENTWEEK' ),
+	'currentdow'                => array( '1', 'ТРЕНУТНИДОВ', 'ТЕКУЋИДУН', 'CURRENTDOW' ),
+	'localweek'                 => array( '1', 'ЛОКАЛНАНЕДЕЉА', 'ЛОКАЛНА_НЕДЕЉА', 'LOCALWEEK' ),
+	'localdow'                  => array( '1', 'ЛОКАЛНИДУН', 'LOCALDOW' ),
+	'revisionid'                => array( '1', 'ИДРЕВИЗИЈЕ', 'ИД_РЕВИЗИЈЕ', 'REVISIONID' ),
+	'revisionday'               => array( '1', 'ДАНИЗМЕНЕ', 'ДАН_ИЗМЕНЕ', 'REVISIONDAY' ),
+	'revisionday2'              => array( '1', 'ДАНИЗМЕНЕ2', 'ДАН_ИЗМЕНЕ2', 'REVISIONDAY2' ),
+	'revisionmonth'             => array( '1', 'МЕСЕЦИЗМЕНЕ', 'МЕСЕЦ_ИЗМЕНЕ', 'REVISIONMONTH' ),
+	'revisionmonth1'            => array( '1', 'МЕСЕЦИЗМЕНЕ1', 'МЕСЕЦ_ИЗМЕНЕ1', 'REVISIONMONTH1' ),
+	'revisionyear'              => array( '1', 'ГОДИНАИЗМЕНЕ', 'ГОДИНА_ИЗМЕНЕ', 'REVISIONYEAR' ),
+	'revisiontimestamp'         => array( '1', 'ВРЕМЕИЗМЕНЕ', 'ВРЕМЕ_ИЗМЕНЕ', 'REVISIONTIMESTAMP' ),
+	'revisionuser'              => array( '1', 'КОРИСНИКИЗМЕНЕ', 'КОРИСНИК_ИЗМЕНЕ', 'REVISIONUSER' ),
+	'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' ),
+	'rawsuffix'                 => array( '1', 'Р', 'R' ),
+	'newsectionlink'            => array( '1', '__НОВАВЕЗАОДЕЉКА__', '__НОВА_ВЕЗА_ОДЕЉКА__', '__NEWSECTIONLINK__' ),
+	'nonewsectionlink'          => array( '1', '__БЕЗНОВЕВЕЗЕОДЕЉКА__', '__БЕЗ_НОВЕ_ВЕЗЕ_ОДЕЉКА__', '__NONEWSECTIONLINK__' ),
+	'currentversion'            => array( '1', 'ТЕКУЋЕИЗДАЊЕ', 'ТЕКУЋЕ_ИЗДАЊЕ', 'CURRENTVERSION' ),
+	'urlencode'                 => array( '0', 'КОДИРАЊЕАДРЕСЕ', 'КОДИРАЊЕ_АДРЕСЕ', 'URLENCODE:' ),
+	'anchorencode'              => array( '0', 'КОДИРАЊЕВЕЗЕ', 'КОДИРАЊЕ_ВЕЗЕ', 'ANCHORENCODE' ),
+	'currenttimestamp'          => array( '1', 'ТЕКУЋИОТИСАКВРЕМЕНА', 'ТЕКУЋИ_ОТИСАК_ВРЕМЕНА', 'CURRENTTIMESTAMP' ),
+	'localtimestamp'            => array( '1', 'ОТИСАКВРЕМЕНА', 'ОТИСАК_ВРЕМЕНА', 'LOCALTIMESTAMP' ),
+	'directionmark'             => array( '1', 'СМЕРОЗНАКЕ', 'СМЕР	_ОЗНАКЕ', 'DIRECTIONMARK', 'DIRMARK' ),
+	'contentlanguage'           => array( '1', 'ЈЕЗИКСАДРЖАЈА', 'ЈЕЗИК_САДРЖАЈА', 'CONTENTLANGUAGE', 'CONTENTLANG' ),
+	'pagesinnamespace'          => array( '1', 'СТРАНИЦАУИМЕНСКОМПРОСТОРУ', 'СТРАНАУИМЕНСКОМПРОСТОРУ', 'СТРАНИЦА_У_ИМЕНСКОМ_ПРОСТОРУ', 'СТРАНА_У_ИМЕНСКОМ_ПРОСТОРУ', 'PAGESINNAMESPACE:', 'PAGESINNS:' ),
+	'numberofadmins'            => array( '1', 'БРОЈАДМИНА', 'БРОЈ_АДМИНА', 'NUMBEROFADMINS' ),
+	'padleft'                   => array( '0', 'ПОРАВНАЈЛЕВО', 'ПОРАВНАЈ_ЛЕВО', 'PADLEFT' ),
+	'padright'                  => array( '0', 'ПОРАВНАЈДЕСНО', 'ПОРАВНАЈ_ДЕСНО', 'PADRIGHT' ),
+	'special'                   => array( '0', 'посебно', 'special' ),
+	'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' ),
+	'url_path'                  => array( '0', 'ПУТАЊА', 'PATH' ),
+	'url_wiki'                  => array( '0', 'ВИКИ', 'WIKI' ),
+	'url_query'                 => array( '0', 'РЕДОСЛЕД', 'QUERY' ),
 );
 $separatorTransformTable = array( ',' => '.', '.' => ',' );
 
diff --git a/languages/messages/MessagesSr_el.php b/languages/messages/MessagesSr_el.php
index a3f7ac1ca3..dd45054c9c 100644
--- a/languages/messages/MessagesSr_el.php
+++ b/languages/messages/MessagesSr_el.php
@@ -158,146 +158,146 @@ $dateFormats = array(
 
 /* NOT USED IN STABLE VERSION */
 $magicWords = array(
-	'redirect'                => array( '0', '#Preusmeri', '#preusmeri', '#PREUSMERI', '#Preusmjeri', '#preusmjeri', '#PREUSMJERI', '#redirect', '#REDIRECT' ),
-	'notoc'                   => array( '0', '__BEZSADRŽAJA__', '__BEZ_SADRŽAJA__', '__NOTOC__' ),
-	'nogallery'               => array( '0', '__BEZGALERIJE__', '__BEZ_GALERIJE__', '__NOGALLERY__' ),
-	'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' ),
-	'currentmonthnamegen'     => array( '1', 'TRENUTNIMESECGEN', 'TEKUĆIMESECGEN', 'TEKUĆI_MESEC_GEN', 'CURRENTMONTHNAMEGEN' ),
-	'currentmonthabbrev'      => array( '1', 'TRENUTNIMESECSKR', 'TEKUĆIMESECSKR', 'TEKUĆI_MESEC_SKR', 'CURRENTMONTHABBREV' ),
-	'currentday'              => array( '1', 'TRENUTNIDAN', 'TEKUĆIDAN', 'TEKUĆI_DAN', 'CURRENTDAY' ),
-	'currentday2'             => array( '1', 'TEKUĆIDAN2', 'TEKUĆI_DAN_2', 'CURRENTDAY2' ),
-	'currentdayname'          => array( '1', 'TRENUTNIDANIME', 'IMETEKUĆEGDANA', 'IME_TEKUĆEG_DANA', 'CURRENTDAYNAME' ),
-	'currentyear'             => array( '1', 'TRENUTNAGODINA', 'TEKUĆAGODINA', 'TEKUĆA_GODINA', 'CURRENTYEAR' ),
-	'currenttime'             => array( '1', 'TRENUTNOVREME', 'TEKUĆEVREME', 'TEKUĆE_VREME', 'CURRENTTIME' ),
-	'currenthour'             => array( '1', 'TEKUĆISAT', 'TEKUĆI_SAT', 'CURRENTHOUR' ),
-	'localmonth'              => array( '1', 'LOKALNIMESEC', 'LOKALNI_MESEC', 'LOCALMONTH', 'LOCALMONTH2' ),
-	'localmonth1'             => array( '1', 'LOKALNIMESEC2', 'LOKALNI_MESEC2', 'LOCALMONTH1' ),
-	'localmonthname'          => array( '1', 'IMELOKALNOGMESECA', 'IME_LOKALNOG_MESECA', 'LOCALMONTHNAME' ),
-	'localmonthnamegen'       => array( '1', 'LOKALNIMESECGEN', 'LOKALNI_MESEC_GEN', 'LOCALMONTHNAMEGEN' ),
-	'localmonthabbrev'        => array( '1', 'LOKALNIMESECSKR', 'LOKALNI_MESEC_SKR', 'LOCALMONTHABBREV' ),
-	'localday'                => array( '1', 'LOKALNIDAN', 'LOKALNI_DAN', 'LOCALDAY' ),
-	'localday2'               => array( '1', 'LOKALNIDAN2', 'LOKALNI_DAN2', 'LOCALDAY2' ),
-	'localdayname'            => array( '1', 'IMELOKALNOGDANA', 'IME_LOKALNOG_DANA', 'LOCALDAYNAME' ),
-	'localyear'               => array( '1', 'LOKALNAGODINA', 'LOKALNA_GODINA', 'LOCALYEAR' ),
-	'localtime'               => array( '1', 'LOKALNOVREME', 'LOKALNO_VREME', 'LOCALTIME' ),
-	'localhour'               => array( '1', 'LOKALNISAT', 'LOKALNI_SAT', 'LOCALHOUR' ),
-	'numberofpages'           => array( '1', 'BROJSTRANICA', 'BROJ_STRANICA', 'NUMBEROFPAGES' ),
-	'numberofarticles'        => array( '1', 'BROJČLANAKA', 'BROJ_ČLANAKA', 'NUMBEROFARTICLES' ),
-	'numberoffiles'           => array( '1', 'BROJDATOTEKA', 'BROJ_DATOTEKA', 'BROJFAJLOVA', 'BROJ_FAJLOVA', 'NUMBEROFFILES' ),
-	'numberofusers'           => array( '1', 'BROJKORISNIKA', 'BROJ_KORISNIKA', 'NUMBEROFUSERS' ),
-	'numberofactiveusers'     => array( '1', 'BROJAKTIVNIHKORISNIKA', 'BROJ_AKTIVNIH_KORISNIKA', 'NUMBEROFACTIVEUSERS' ),
-	'numberofedits'           => array( '1', 'BROJIZMENA', 'BROJ_IZMENA', 'NUMBEROFEDITS' ),
-	'numberofviews'           => array( '1', 'BROJPREGLEDA', 'BROJ_PREGLEDA', 'NUMBEROFVIEWS' ),
-	'pagename'                => array( '1', 'IMESTRANICE', 'IME_STRANICE', 'STRANICA', 'PAGENAME' ),
-	'pagenamee'               => array( '1', 'IMENASTRANICA', 'IMENA_STRANICA', 'STRANICE', 'PAGENAMEE' ),
-	'namespace'               => array( '1', 'IMENSKIPROSTOR', 'IMENSKI_PROSTOR', 'NAMESPACE' ),
-	'namespacee'              => array( '1', 'IMENSKIPROSTORI', 'IMENSKI_PROSTORI', 'NAMESPACEE' ),
-	'talkspace'               => array( '1', 'RAZGOVOR', 'TALKSPACE' ),
-	'talkspacee'              => array( '1', 'RAZGOVORI', 'TALKSPACEE' ),
-	'subjectspace'            => array( '1', 'IMENSKIPROSTORČLANKA', 'IMENSKI_PROSTOR_ČLANKA', 'SUBJECTSPACE', 'ARTICLESPACE' ),
-	'subjectspacee'           => array( '1', 'IMENSKIPROSTORČLANAKA', 'IMENSKI_PROSTOR_ČLANAKA', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
-	'fullpagename'            => array( '1', 'PUNOIMESTRANICE', 'PUNOIMESTRANE', 'PUNO_IME_STRANICE', 'PUNO_IME_STRANE', 'FULLPAGENAME' ),
-	'fullpagenamee'           => array( '1', 'PUNAIMENASTRANICA', 'PUNAIMENASTRANA', 'PUNA_IMENA_STRANICA', 'PUNA_IMENA_STRANA', 'FULLPAGENAMEE' ),
-	'subpagename'             => array( '1', 'IMEPODSTRANICE', 'IMEPODSTRANE', 'IME_PODSTRANICE', 'IME_PODSTRANE', 'SUBPAGENAME' ),
-	'subpagenamee'            => array( '1', 'IMENAPODSTRANICA', 'IMENAPODSTRANA', 'IMENA_PODSTRANICA', 'IMENA_PODSTRANA', 'SUBPAGENAMEE' ),
-	'basepagename'            => array( '1', 'IMEOSNOVE', 'IME_OSNOVE', 'BASEPAGENAME' ),
-	'basepagenamee'           => array( '1', 'IMENAOSNOVA', 'IMENA_OSNOVA', 'BASEPAGENAMEE' ),
-	'talkpagename'            => array( '1', 'IMERAZGOVORA', 'IME_RAZGOVORA', 'TALKPAGENAME' ),
-	'talkpagenamee'           => array( '1', 'IMENARAZGOVORA', 'IMENA_RAZGOVORA', 'TALKPAGENAMEE' ),
-	'subjectpagename'         => array( '1', 'IMEČLANKA', 'IME_ČLANKA', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
-	'subjectpagenamee'        => array( '1', 'IMENAČLANAKA', 'IMENA_ČLANAKA', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
-	'msg'                     => array( '0', 'POR:', 'MSG:' ),
-	'subst'                   => array( '0', 'ZAMENI:', 'ZAMENA:', 'SUBST:' ),
-	'safesubst'               => array( '0', 'BEZBEDNAZAMENA', 'BEZBEDNA_ZAMENA', 'SAFESUBST:' ),
-	'msgnw'                   => array( '0', 'NVPOR:', 'MSGNW:' ),
-	'img_thumbnail'           => array( '1', 'mini', 'umanjeno', 'thumbnail', 'thumb' ),
-	'img_manualthumb'         => array( '1', 'mini=$1', 'umanjeno=$1', 'thumbnail=$1', 'thumb=$1' ),
-	'img_right'               => array( '1', 'desno', 'd', 'right' ),
-	'img_left'                => array( '1', 'levo', 'l', 'left' ),
-	'img_none'                => array( '1', 'bez', 'n', 'none' ),
-	'img_width'               => array( '1', '$1piskel', '$1p', '$1px' ),
-	'img_center'              => array( '1', 'centar', 'c', 'center', 'centre' ),
-	'img_framed'              => array( '1', 'okvir', 'ram', 'framed', 'enframed', 'frame' ),
-	'img_frameless'           => array( '1', 'bezokvira', 'bez_okvira', 'bezrama', 'bez_rama', 'frameless' ),
-	'img_page'                => array( '1', 'stranica=$1', 'strana=$1', 'stranica_$1', 'strana_$1', 'page=$1', 'page $1' ),
-	'img_upright'             => array( '1', 'uspravno', 'uspravno=$1', 'uspravno_$1', 'upright', 'upright=$1', 'upright $1' ),
-	'img_border'              => array( '1', 'ivica', 'border' ),
-	'img_baseline'            => array( '1', 'osnova', 'baseline' ),
-	'img_sub'                 => array( '1', 'pod', 'sub' ),
-	'img_top'                 => array( '1', 'vrh', 'top' ),
-	'img_text_top'            => array( '1', 'vrhteksta', 'vrh_teksta', 'text-top' ),
-	'img_middle'              => array( '1', 'sredina', 'middle' ),
-	'img_bottom'              => array( '1', 'dno', 'bottom' ),
-	'img_text_bottom'         => array( '1', 'sredinateksta', 'sredina_teksta', 'text-bottom' ),
-	'img_link'                => array( '1', 'veza=$1', 'link=$1' ),
-	'sitename'                => array( '1', 'IMESAJTA', 'SITENAME' ),
-	'ns'                      => array( '0', 'IP:', 'NS:' ),
-	'localurl'                => array( '0', 'LOKALNAADRESA:', 'LOKALNA_ADRESA:', 'LOCALURL:' ),
-	'localurle'               => array( '0', 'LOKALNEADRESE:', 'LOKALNE_ADRESE:', 'LOCALURLE:' ),
-	'articlepath'             => array( '0', 'PUTANJAČLANKA', 'PUTANJA_ČLANKA', 'ARTICLEPATH' ),
-	'servername'              => array( '0', 'IMESERVERA', 'IME_SERVERA', 'SERVERNAME' ),
-	'scriptpath'              => array( '0', 'SKRIPTA', 'SKRIPT', 'SCRIPTPATH' ),
-	'stylepath'               => array( '0', 'PUTANJASTILA', 'PUTANJA_STILA', 'STYLEPATH' ),
-	'grammar'                 => array( '0', 'GRAMATIKA:', 'GRAMMAR:' ),
-	'gender'                  => array( '0', 'ROD:', 'LICE:', 'GENDER:' ),
-	'notitleconvert'          => array( '0', '__BEZKN__', '__NOTITLECONVERT__', '__NOTC__' ),
-	'nocontentconvert'        => array( '0', '__BEZCC__', '__NOCONTENTCONVERT__', '__NOCC__' ),
-	'currentweek'             => array( '1', 'TRENUTNANEDELJA', 'TRENUTNA_NEDELJA', 'TEKUĆANEDELJA', 'TEKUĆA_NEDELJA', 'CURRENTWEEK' ),
-	'currentdow'              => array( '1', 'TRENUTNIDOV', 'TEKUĆIDUN', 'CURRENTDOW' ),
-	'localweek'               => array( '1', 'LOKALNANEDELJA', 'LOKALNA_NEDELJA', 'LOCALWEEK' ),
-	'localdow'                => array( '1', 'LOKALNIDUN', 'LOCALDOW' ),
-	'revisionid'              => array( '1', 'IDREVIZIJE', 'ID_REVIZIJE', 'IB_IZMENE', 'REVISIONID' ),
-	'revisionday'             => array( '1', 'DANIZMENE', 'DAN_IZMENE', 'REVISIONDAY' ),
-	'revisionday2'            => array( '1', 'DANIZMENE2', 'DAN_IZMENE2', 'REVISIONDAY2' ),
-	'revisionmonth'           => array( '1', 'MESECIZMENE', 'MESEC_IZMENE', 'REVISIONMONTH' ),
-	'revisionmonth1'          => array( '1', 'MESECIZMENE1', 'MESEC_IZMENE1', 'REVISIONMONTH1' ),
-	'revisionyear'            => array( '1', 'GODINAIZMENE', 'GODINA_IZMENE', 'REVISIONYEAR' ),
-	'revisiontimestamp'       => array( '1', 'VREMEIZMENE', 'VREME_IZMENE', 'REVISIONTIMESTAMP' ),
-	'revisionuser'            => array( '1', 'KORISNIKIZMENE', 'KORISNIK_IZMENE', 'REVISIONUSER' ),
-	'plural'                  => array( '0', 'MNOŽINA:', 'PLURAL:' ),
-	'fullurl'                 => array( '0', 'PUNURL:', 'CELAADRESA', 'CELA_ADRESA', 'FULLURL:' ),
-	'fullurle'                => array( '0', 'PUNURLE:', 'CELEADRESE', 'CELE_ADRESE', 'FULLURLE:' ),
-	'lcfirst'                 => array( '0', 'LCPRVI:', 'LCFIRST:' ),
-	'ucfirst'                 => array( '0', 'UCPRVI:', 'UCFIRST:' ),
-	'raw'                     => array( '0', 'ČIST:', 'RAW:' ),
-	'displaytitle'            => array( '1', 'NAZIVPRIKAZA', 'NAZIV_PRIKAZA', 'DISPLAYTITLE' ),
-	'newsectionlink'          => array( '1', '__NOVAVEZAODELJKA__', '__NOVA_VEZA_ODELJKA__', '__NEWSECTIONLINK__' ),
-	'nonewsectionlink'        => array( '1', '__BEZNOVEVEZEODELJKA__', '__BEZ_NOVE_VEZE_ODELJKA__', '__NONEWSECTIONLINK__' ),
-	'currentversion'          => array( '1', 'TEKUĆEIZDANJE', 'TEKUĆE_IZDANJE', 'CURRENTVERSION' ),
-	'urlencode'               => array( '0', 'KODIRANJEADRESE', 'KODIRANJE_ADRESE', 'URLENCODE:' ),
-	'anchorencode'            => array( '0', 'KODIRANJEVEZE', 'KODIRANJE_VEZE', 'ANCHORENCODE' ),
-	'currenttimestamp'        => array( '1', 'TEKUĆIOTISAKVREMENA', 'TEKUĆI_OTISAK_VREMENA', 'CURRENTTIMESTAMP' ),
-	'localtimestamp'          => array( '1', 'OTISAKVREMENA', 'OTISAK_VREMENA', 'LOCALTIMESTAMP' ),
-	'directionmark'           => array( '1', 'SMEROZNAKE', 'SMER	_OZNAKE', 'DIRECTIONMARK', 'DIRMARK' ),
-	'language'                => array( '0', '#JEZIK:', '#LANGUAGE:' ),
-	'contentlanguage'         => array( '1', 'JEZIKSADRŽAJA', 'JEZIK_SADRŽAJA', 'CONTENTLANGUAGE', 'CONTENTLANG' ),
-	'pagesinnamespace'        => array( '1', 'STRANICAUIMENSKOMPROSTORU', 'STRANAUIMENSKOMPROSTORU', 'STRANICA_U_IMENSKOM_PROSTORU', 'STRANA_U_IMENSKOM_PROSTORU', 'PAGESINNAMESPACE:', 'PAGESINNS:' ),
-	'numberofadmins'          => array( '1', 'BROJADMINA', 'BROJ_ADMINA', 'NUMBEROFADMINS' ),
-	'padleft'                 => array( '0', 'PORAVNAJULEVO', 'PORAVNAJ_ULEVO', 'PADLEFT' ),
-	'padright'                => array( '0', 'PORAVNAJUDESNO', 'PORAVNAJ_UDESNO', 'PADRIGHT' ),
-	'special'                 => array( '0', 'posebno', 'special' ),
-	'filepath'                => array( '0', 'PUTANJADATOTEKE', 'PUTANJA_DATOTEKE', 'FILEPATH:' ),
-	'tag'                     => array( '0', 'oznaka', 'tag' ),
-	'hiddencat'               => array( '1', '__SAKRIVENAKAT__', '__HIDDENCAT__' ),
-	'pagesincategory'         => array( '1', 'STRANICAUKATEGORIJI', 'STRANAUKATEGORIJI', 'STRANICA_U_KATEGORIJI', 'STRANA_U_KATEGORIJI', 'PAGESINCATEGORY', 'PAGESINCAT' ),
-	'pagesize'                => array( '1', 'VELIČINASTRANICE', 'VELIČINASTRANE', 'VELIČINA_STRANICE', 'VELIČINA_STRANE', 'PAGESIZE' ),
-	'index'                   => array( '1', '__INDEKS__', '__INDEX__' ),
-	'noindex'                 => array( '1', '__BEZINDEKSA__', '__BEZ_INDEKSA__', '__NOINDEX__' ),
-	'numberingroup'           => array( '1', 'BROJUGRUPI', 'BROJ_U_GRUPI', 'NUMBERINGROUP', 'NUMINGROUP' ),
-	'staticredirect'          => array( '1', '__STATIČKOPREUSMERENJE__', 'STATIČKO_PREUSMERENJE', '__STATICREDIRECT__' ),
-	'protectionlevel'         => array( '1', 'NIVOZAÅ TITE', 'NIVO_ZAÅ TITE', 'PROTECTIONLEVEL' ),
-	'formatdate'              => array( '0', 'formatdatuma', 'format_datuma', 'formatdate', 'dateformat' ),
-	'url_path'                => array( '0', 'PUTANJA', 'PATH' ),
-	'url_wiki'                => array( '0', 'VIKI', 'WIKI' ),
-	'url_query'               => array( '0', 'REDOSLED', 'QUERY' ),
-	'defaultsort_noerror'     => array( '0', 'bez_greške', 'noerror' ),
-	'defaultsort_noreplace'   => array( '0', 'bez_zamene', 'noreplace' ),
+	'redirect'                  => array( '0', '#Preusmeri', '#preusmeri', '#PREUSMERI', '#Preusmjeri', '#preusmjeri', '#PREUSMJERI', '#redirect', '#REDIRECT' ),
+	'notoc'                     => array( '0', '__BEZSADRŽAJA__', '__BEZ_SADRŽAJA__', '__NOTOC__' ),
+	'nogallery'                 => array( '0', '__BEZGALERIJE__', '__BEZ_GALERIJE__', '__NOGALLERY__' ),
+	'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' ),
+	'currentmonthnamegen'       => array( '1', 'TRENUTNIMESECGEN', 'TEKUĆIMESECGEN', 'TEKUĆI_MESEC_GEN', 'CURRENTMONTHNAMEGEN' ),
+	'currentmonthabbrev'        => array( '1', 'TRENUTNIMESECSKR', 'TEKUĆIMESECSKR', 'TEKUĆI_MESEC_SKR', 'CURRENTMONTHABBREV' ),
+	'currentday'                => array( '1', 'TRENUTNIDAN', 'TEKUĆIDAN', 'TEKUĆI_DAN', 'CURRENTDAY' ),
+	'currentday2'               => array( '1', 'TEKUĆIDAN2', 'TEKUĆI_DAN_2', 'CURRENTDAY2' ),
+	'currentdayname'            => array( '1', 'TRENUTNIDANIME', 'IMETEKUĆEGDANA', 'IME_TEKUĆEG_DANA', 'CURRENTDAYNAME' ),
+	'currentyear'               => array( '1', 'TRENUTNAGODINA', 'TEKUĆAGODINA', 'TEKUĆA_GODINA', 'CURRENTYEAR' ),
+	'currenttime'               => array( '1', 'TRENUTNOVREME', 'TEKUĆEVREME', 'TEKUĆE_VREME', 'CURRENTTIME' ),
+	'currenthour'               => array( '1', 'TEKUĆISAT', 'TEKUĆI_SAT', 'CURRENTHOUR' ),
+	'localmonth'                => array( '1', 'LOKALNIMESEC', 'LOKALNI_MESEC', 'LOCALMONTH', 'LOCALMONTH2' ),
+	'localmonth1'               => array( '1', 'LOKALNIMESEC2', 'LOKALNI_MESEC2', 'LOCALMONTH1' ),
+	'localmonthname'            => array( '1', 'IMELOKALNOGMESECA', 'IME_LOKALNOG_MESECA', 'LOCALMONTHNAME' ),
+	'localmonthnamegen'         => array( '1', 'LOKALNIMESECGEN', 'LOKALNI_MESEC_GEN', 'LOCALMONTHNAMEGEN' ),
+	'localmonthabbrev'          => array( '1', 'LOKALNIMESECSKR', 'LOKALNI_MESEC_SKR', 'LOCALMONTHABBREV' ),
+	'localday'                  => array( '1', 'LOKALNIDAN', 'LOKALNI_DAN', 'LOCALDAY' ),
+	'localday2'                 => array( '1', 'LOKALNIDAN2', 'LOKALNI_DAN2', 'LOCALDAY2' ),
+	'localdayname'              => array( '1', 'IMELOKALNOGDANA', 'IME_LOKALNOG_DANA', 'LOCALDAYNAME' ),
+	'localyear'                 => array( '1', 'LOKALNAGODINA', 'LOKALNA_GODINA', 'LOCALYEAR' ),
+	'localtime'                 => array( '1', 'LOKALNOVREME', 'LOKALNO_VREME', 'LOCALTIME' ),
+	'localhour'                 => array( '1', 'LOKALNISAT', 'LOKALNI_SAT', 'LOCALHOUR' ),
+	'numberofpages'             => array( '1', 'BROJSTRANICA', 'BROJ_STRANICA', 'NUMBEROFPAGES' ),
+	'numberofarticles'          => array( '1', 'BROJČLANAKA', 'BROJ_ČLANAKA', 'NUMBEROFARTICLES' ),
+	'numberoffiles'             => array( '1', 'BROJDATOTEKA', 'BROJ_DATOTEKA', 'BROJFAJLOVA', 'BROJ_FAJLOVA', 'NUMBEROFFILES' ),
+	'numberofusers'             => array( '1', 'BROJKORISNIKA', 'BROJ_KORISNIKA', 'NUMBEROFUSERS' ),
+	'numberofactiveusers'       => array( '1', 'BROJAKTIVNIHKORISNIKA', 'BROJ_AKTIVNIH_KORISNIKA', 'NUMBEROFACTIVEUSERS' ),
+	'numberofedits'             => array( '1', 'BROJIZMENA', 'BROJ_IZMENA', 'NUMBEROFEDITS' ),
+	'numberofviews'             => array( '1', 'BROJPREGLEDA', 'BROJ_PREGLEDA', 'NUMBEROFVIEWS' ),
+	'pagename'                  => array( '1', 'IMESTRANICE', 'IME_STRANICE', 'STRANICA', 'PAGENAME' ),
+	'pagenamee'                 => array( '1', 'IMENASTRANICA', 'IMENA_STRANICA', 'STRANICE', 'PAGENAMEE' ),
+	'namespace'                 => array( '1', 'IMENSKIPROSTOR', 'IMENSKI_PROSTOR', 'NAMESPACE' ),
+	'namespacee'                => array( '1', 'IMENSKIPROSTORI', 'IMENSKI_PROSTORI', 'NAMESPACEE' ),
+	'talkspace'                 => array( '1', 'RAZGOVOR', 'TALKSPACE' ),
+	'talkspacee'                => array( '1', 'RAZGOVORI', 'TALKSPACEE' ),
+	'subjectspace'              => array( '1', 'IMENSKIPROSTORČLANKA', 'IMENSKI_PROSTOR_ČLANKA', 'SUBJECTSPACE', 'ARTICLESPACE' ),
+	'subjectspacee'             => array( '1', 'IMENSKIPROSTORČLANAKA', 'IMENSKI_PROSTOR_ČLANAKA', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
+	'fullpagename'              => array( '1', 'PUNOIMESTRANICE', 'PUNOIMESTRANE', 'PUNO_IME_STRANICE', 'PUNO_IME_STRANE', 'FULLPAGENAME' ),
+	'fullpagenamee'             => array( '1', 'PUNAIMENASTRANICA', 'PUNAIMENASTRANA', 'PUNA_IMENA_STRANICA', 'PUNA_IMENA_STRANA', 'FULLPAGENAMEE' ),
+	'subpagename'               => array( '1', 'IMEPODSTRANICE', 'IMEPODSTRANE', 'IME_PODSTRANICE', 'IME_PODSTRANE', 'SUBPAGENAME' ),
+	'subpagenamee'              => array( '1', 'IMENAPODSTRANICA', 'IMENAPODSTRANA', 'IMENA_PODSTRANICA', 'IMENA_PODSTRANA', 'SUBPAGENAMEE' ),
+	'basepagename'              => array( '1', 'IMEOSNOVE', 'IME_OSNOVE', 'BASEPAGENAME' ),
+	'basepagenamee'             => array( '1', 'IMENAOSNOVA', 'IMENA_OSNOVA', 'BASEPAGENAMEE' ),
+	'talkpagename'              => array( '1', 'IMERAZGOVORA', 'IME_RAZGOVORA', 'TALKPAGENAME' ),
+	'talkpagenamee'             => array( '1', 'IMENARAZGOVORA', 'IMENA_RAZGOVORA', 'TALKPAGENAMEE' ),
+	'subjectpagename'           => array( '1', 'IMEČLANKA', 'IME_ČLANKA', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
+	'subjectpagenamee'          => array( '1', 'IMENAČLANAKA', 'IMENA_ČLANAKA', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
+	'msg'                       => array( '0', 'POR:', 'MSG:' ),
+	'subst'                     => array( '0', 'ZAMENI:', 'ZAMENA:', 'SUBST:' ),
+	'safesubst'                 => array( '0', 'BEZBEDNAZAMENA', 'BEZBEDNA_ZAMENA', 'SAFESUBST:' ),
+	'msgnw'                     => array( '0', 'NVPOR:', 'MSGNW:' ),
+	'img_thumbnail'             => array( '1', 'mini', 'umanjeno', 'thumbnail', 'thumb' ),
+	'img_manualthumb'           => array( '1', 'mini=$1', 'umanjeno=$1', 'thumbnail=$1', 'thumb=$1' ),
+	'img_right'                 => array( '1', 'desno', 'd', 'right' ),
+	'img_left'                  => array( '1', 'levo', 'l', 'left' ),
+	'img_none'                  => array( '1', 'bez', 'n', 'none' ),
+	'img_width'                 => array( '1', '$1piskel', '$1p', '$1px' ),
+	'img_center'                => array( '1', 'centar', 'c', 'center', 'centre' ),
+	'img_framed'                => array( '1', 'okvir', 'ram', 'framed', 'enframed', 'frame' ),
+	'img_frameless'             => array( '1', 'bezokvira', 'bez_okvira', 'bezrama', 'bez_rama', 'frameless' ),
+	'img_page'                  => array( '1', 'stranica=$1', 'strana=$1', 'stranica_$1', 'strana_$1', 'page=$1', 'page $1' ),
+	'img_upright'               => array( '1', 'uspravno', 'uspravno=$1', 'uspravno_$1', 'upright', 'upright=$1', 'upright $1' ),
+	'img_border'                => array( '1', 'ivica', 'border' ),
+	'img_baseline'              => array( '1', 'osnova', 'baseline' ),
+	'img_sub'                   => array( '1', 'pod', 'sub' ),
+	'img_top'                   => array( '1', 'vrh', 'top' ),
+	'img_text_top'              => array( '1', 'vrhteksta', 'vrh_teksta', 'text-top' ),
+	'img_middle'                => array( '1', 'sredina', 'middle' ),
+	'img_bottom'                => array( '1', 'dno', 'bottom' ),
+	'img_text_bottom'           => array( '1', 'sredinateksta', 'sredina_teksta', 'text-bottom' ),
+	'img_link'                  => array( '1', 'veza=$1', 'link=$1' ),
+	'sitename'                  => array( '1', 'IMESAJTA', 'SITENAME' ),
+	'ns'                        => array( '0', 'IP:', 'NS:' ),
+	'localurl'                  => array( '0', 'LOKALNAADRESA:', 'LOKALNA_ADRESA:', 'LOCALURL:' ),
+	'localurle'                 => array( '0', 'LOKALNEADRESE:', 'LOKALNE_ADRESE:', 'LOCALURLE:' ),
+	'articlepath'               => array( '0', 'PUTANJAČLANKA', 'PUTANJA_ČLANKA', 'ARTICLEPATH' ),
+	'servername'                => array( '0', 'IMESERVERA', 'IME_SERVERA', 'SERVERNAME' ),
+	'scriptpath'                => array( '0', 'SKRIPTA', 'SKRIPT', 'SCRIPTPATH' ),
+	'stylepath'                 => array( '0', 'PUTANJASTILA', 'PUTANJA_STILA', 'STYLEPATH' ),
+	'grammar'                   => array( '0', 'GRAMATIKA:', 'GRAMMAR:' ),
+	'gender'                    => array( '0', 'ROD:', 'LICE:', 'GENDER:' ),
+	'notitleconvert'            => array( '0', '__BEZKN__', '__NOTITLECONVERT__', '__NOTC__' ),
+	'nocontentconvert'          => array( '0', '__BEZCC__', '__NOCONTENTCONVERT__', '__NOCC__' ),
+	'currentweek'               => array( '1', 'TRENUTNANEDELJA', 'TRENUTNA_NEDELJA', 'TEKUĆANEDELJA', 'TEKUĆA_NEDELJA', 'CURRENTWEEK' ),
+	'currentdow'                => array( '1', 'TRENUTNIDOV', 'TEKUĆIDUN', 'CURRENTDOW' ),
+	'localweek'                 => array( '1', 'LOKALNANEDELJA', 'LOKALNA_NEDELJA', 'LOCALWEEK' ),
+	'localdow'                  => array( '1', 'LOKALNIDUN', 'LOCALDOW' ),
+	'revisionid'                => array( '1', 'IDREVIZIJE', 'ID_REVIZIJE', 'IB_IZMENE', 'REVISIONID' ),
+	'revisionday'               => array( '1', 'DANIZMENE', 'DAN_IZMENE', 'REVISIONDAY' ),
+	'revisionday2'              => array( '1', 'DANIZMENE2', 'DAN_IZMENE2', 'REVISIONDAY2' ),
+	'revisionmonth'             => array( '1', 'MESECIZMENE', 'MESEC_IZMENE', 'REVISIONMONTH' ),
+	'revisionmonth1'            => array( '1', 'MESECIZMENE1', 'MESEC_IZMENE1', 'REVISIONMONTH1' ),
+	'revisionyear'              => array( '1', 'GODINAIZMENE', 'GODINA_IZMENE', 'REVISIONYEAR' ),
+	'revisiontimestamp'         => array( '1', 'VREMEIZMENE', 'VREME_IZMENE', 'REVISIONTIMESTAMP' ),
+	'revisionuser'              => array( '1', 'KORISNIKIZMENE', 'KORISNIK_IZMENE', 'REVISIONUSER' ),
+	'plural'                    => array( '0', 'MNOŽINA:', 'PLURAL:' ),
+	'fullurl'                   => array( '0', 'PUNURL:', 'CELAADRESA', 'CELA_ADRESA', 'FULLURL:' ),
+	'fullurle'                  => array( '0', 'PUNURLE:', 'CELEADRESE', 'CELE_ADRESE', 'FULLURLE:' ),
+	'lcfirst'                   => array( '0', 'LCPRVI:', 'LCFIRST:' ),
+	'ucfirst'                   => array( '0', 'UCPRVI:', 'UCFIRST:' ),
+	'raw'                       => array( '0', 'ČIST:', 'RAW:' ),
+	'displaytitle'              => array( '1', 'NAZIVPRIKAZA', 'NAZIV_PRIKAZA', 'DISPLAYTITLE' ),
+	'newsectionlink'            => array( '1', '__NOVAVEZAODELJKA__', '__NOVA_VEZA_ODELJKA__', '__NEWSECTIONLINK__' ),
+	'nonewsectionlink'          => array( '1', '__BEZNOVEVEZEODELJKA__', '__BEZ_NOVE_VEZE_ODELJKA__', '__NONEWSECTIONLINK__' ),
+	'currentversion'            => array( '1', 'TEKUĆEIZDANJE', 'TEKUĆE_IZDANJE', 'CURRENTVERSION' ),
+	'urlencode'                 => array( '0', 'KODIRANJEADRESE', 'KODIRANJE_ADRESE', 'URLENCODE:' ),
+	'anchorencode'              => array( '0', 'KODIRANJEVEZE', 'KODIRANJE_VEZE', 'ANCHORENCODE' ),
+	'currenttimestamp'          => array( '1', 'TEKUĆIOTISAKVREMENA', 'TEKUĆI_OTISAK_VREMENA', 'CURRENTTIMESTAMP' ),
+	'localtimestamp'            => array( '1', 'OTISAKVREMENA', 'OTISAK_VREMENA', 'LOCALTIMESTAMP' ),
+	'directionmark'             => array( '1', 'SMEROZNAKE', 'SMER	_OZNAKE', 'DIRECTIONMARK', 'DIRMARK' ),
+	'language'                  => array( '0', '#JEZIK:', '#LANGUAGE:' ),
+	'contentlanguage'           => array( '1', 'JEZIKSADRŽAJA', 'JEZIK_SADRŽAJA', 'CONTENTLANGUAGE', 'CONTENTLANG' ),
+	'pagesinnamespace'          => array( '1', 'STRANICAUIMENSKOMPROSTORU', 'STRANAUIMENSKOMPROSTORU', 'STRANICA_U_IMENSKOM_PROSTORU', 'STRANA_U_IMENSKOM_PROSTORU', 'PAGESINNAMESPACE:', 'PAGESINNS:' ),
+	'numberofadmins'            => array( '1', 'BROJADMINA', 'BROJ_ADMINA', 'NUMBEROFADMINS' ),
+	'padleft'                   => array( '0', 'PORAVNAJULEVO', 'PORAVNAJ_ULEVO', 'PADLEFT' ),
+	'padright'                  => array( '0', 'PORAVNAJUDESNO', 'PORAVNAJ_UDESNO', 'PADRIGHT' ),
+	'special'                   => array( '0', 'posebno', 'special' ),
+	'filepath'                  => array( '0', 'PUTANJADATOTEKE', 'PUTANJA_DATOTEKE', 'FILEPATH:' ),
+	'tag'                       => array( '0', 'oznaka', 'tag' ),
+	'hiddencat'                 => array( '1', '__SAKRIVENAKAT__', '__HIDDENCAT__' ),
+	'pagesincategory'           => array( '1', 'STRANICAUKATEGORIJI', 'STRANAUKATEGORIJI', 'STRANICA_U_KATEGORIJI', 'STRANA_U_KATEGORIJI', 'PAGESINCATEGORY', 'PAGESINCAT' ),
+	'pagesize'                  => array( '1', 'VELIČINASTRANICE', 'VELIČINASTRANE', 'VELIČINA_STRANICE', 'VELIČINA_STRANE', 'PAGESIZE' ),
+	'index'                     => array( '1', '__INDEKS__', '__INDEX__' ),
+	'noindex'                   => array( '1', '__BEZINDEKSA__', '__BEZ_INDEKSA__', '__NOINDEX__' ),
+	'numberingroup'             => array( '1', 'BROJUGRUPI', 'BROJ_U_GRUPI', 'NUMBERINGROUP', 'NUMINGROUP' ),
+	'staticredirect'            => array( '1', '__STATIČKOPREUSMERENJE__', 'STATIČKO_PREUSMERENJE', '__STATICREDIRECT__' ),
+	'protectionlevel'           => array( '1', 'NIVOZAÅ TITE', 'NIVO_ZAÅ TITE', 'PROTECTIONLEVEL' ),
+	'formatdate'                => array( '0', 'formatdatuma', 'format_datuma', 'formatdate', 'dateformat' ),
+	'url_path'                  => array( '0', 'PUTANJA', 'PATH' ),
+	'url_wiki'                  => array( '0', 'VIKI', 'WIKI' ),
+	'url_query'                 => array( '0', 'REDOSLED', 'QUERY' ),
+	'defaultsort_noerror'       => array( '0', 'bez_greške', 'noerror' ),
+	'defaultsort_noreplace'     => array( '0', 'bez_zamene', 'noreplace' ),
 );
 
 $separatorTransformTable = array( ',' => '.', '.' => ',' );
diff --git a/languages/messages/MessagesSrn.php b/languages/messages/MessagesSrn.php
index 641ef8d802..991808776b 100644
--- a/languages/messages/MessagesSrn.php
+++ b/languages/messages/MessagesSrn.php
@@ -112,44 +112,44 @@ $specialPageAliases = array(
 );
 
 $magicWords = array(
-	'redirect'                => array( '0', '#STIR', '#DOORVERWIJZING', '#REDIRECT' ),
-	'notoc'                   => array( '0', '__NOINOT__', '__GEENINHOUD__', '__NOTOC__' ),
-	'nogallery'               => array( '0', '__NOPIKTURAMA__', '__GEEN_GALERIJ__', '__NOGALLERY__' ),
-	'forcetoc'                => array( '0', '__INOTDWENGI__', '__INHOUD_DWINGEN__', '__FORCEERINHOUD__', '__FORCETOC__' ),
-	'toc'                     => array( '0', '__INOT__', '__INHOUD__', '__TOC__' ),
-	'noeditsection'           => array( '0', '__NOKENKISKAKI__', '__NIETBEWERKBARESECTIE__', '__NOEDITSECTION__' ),
-	'currentmonth'            => array( '1', 'CURRENTMOTNH', 'DISIMUN', 'HUIDIGEMAAND', 'HUIDIGEMAAND2', 'CURRENTMONTH', 'CURRENTMONTH2' ),
-	'currentmonthname'        => array( '1', 'DISIMUNNEN', 'HUIDIGEMAANDNAAM', 'CURRENTMONTHNAME' ),
-	'currentmonthnamegen'     => array( '1', 'DISIMUNNENGEN', 'HUIDIGEMAANDGEN', 'CURRENTMONTHNAMEGEN' ),
-	'currentmonthabbrev'      => array( '1', 'DISIMUNSH', 'HUIDIGEMAANDAFK', 'CURRENTMONTHABBREV' ),
-	'currentday'              => array( '1', 'DISIDEY', 'HUIDIGEDAG', 'CURRENTDAY' ),
-	'currentday2'             => array( '1', 'DISIDEY2', 'HUIDIGEDAG2', 'CURRENTDAY2' ),
-	'currentdayname'          => array( '1', 'DISIDEYNEN', 'HUIDIGEDAGNAAM', 'CURRENTDAYNAME' ),
-	'currentyear'             => array( '1', 'DISIYARI', 'HUIDIGJAAR', 'CURRENTYEAR' ),
-	'currenttime'             => array( '1', 'DISITEN', 'HUIDIGETIJD', 'CURRENTTIME' ),
-	'currenthour'             => array( '1', 'DISIYURU', 'HUIDIGUUR', 'CURRENTHOUR' ),
-	'localmonth'              => array( '1', 'PRESIMUN', 'PLAATSELIJKEMAAND', 'LOKALEMAAND', 'LOKALEMAAND2', 'LOCALMONTH', 'LOCALMONTH2' ),
-	'localmonthname'          => array( '1', 'PRESIMUNNEN', 'PLAATSELIJKEMAANDNAAM', 'LOKALEMAANDNAAM', 'LOCALMONTHNAME' ),
-	'localmonthnamegen'       => array( '1', 'PRESIMUNNENGEN', 'PLAATSELIJKEMAANDNAAMGEN', 'LOKALEMAANDNAAMGEN', 'LOCALMONTHNAMEGEN' ),
-	'localmonthabbrev'        => array( '1', 'PRESIMUNSH', 'PLAATSELIJKEMAANDAFK', 'LOKALEMAANDAFK', 'LOCALMONTHABBREV' ),
-	'localday'                => array( '1', 'PRESIDEY', 'PLAATSELIJKEDAG', 'LOKALEDAG', 'LOCALDAY' ),
-	'localday2'               => array( '1', 'PRESIDEY2', 'PLAATSELIJKEDAG2', 'LOKALEDAG2', 'LOCALDAY2' ),
-	'localdayname'            => array( '1', 'PRESIDEYNEN', 'PLAATSELIJKEDAGNAAM', 'LOKALEDAGNAAM', 'LOCALDAYNAME' ),
-	'localyear'               => array( '1', 'PRESIYARI', 'PLAATSELIJKJAAR', 'LOKAALJAAR', 'LOCALYEAR' ),
-	'localtime'               => array( '1', 'PRESITEN', 'PLAATSELIJKETIJD', 'LOKALETIJD', 'LOCALTIME' ),
-	'localhour'               => array( '1', 'PRESIYURU', 'PLAATSELIJKUUR', 'LOKAALUUR', 'LOCALHOUR' ),
-	'numberofpages'           => array( '1', 'PAPIRANUMRO', 'AANTALPAGINAS', 'AANTALPAGINA\'S', 'AANTALPAGINA’S', 'NUMBEROFPAGES' ),
-	'numberofarticles'        => array( '1', 'PAPIRALEGIMNUMRO', 'AANTALARTIKELEN', 'NUMBEROFARTICLES' ),
-	'numberoffiles'           => array( '1', 'GEFRENUMRO', 'AANTALBESTANDEN', 'NUMBEROFFILES' ),
-	'numberofusers'           => array( '1', 'MASYINNUMRO', 'AANTALGEBRUIKERS', 'NUMBEROFUSERS' ),
-	'numberofedits'           => array( '1', 'KENKINUMRO', 'AANTALBEWERKINGEN', 'NUMBEROFEDITS' ),
-	'pagename'                => array( '1', 'PAPIRANEN', 'PAGINANAAM', 'PAGENAME' ),
-	'pagenamee'               => array( '1', 'PAPIRANENE', 'PAGINANAAME', 'PAGENAMEE' ),
-	'namespace'               => array( '1', 'NENPREKI', 'NAAMRUIMTE', 'NAMESPACE' ),
-	'namespacee'              => array( '1', 'NENPREKIE', 'NAAMRUIMTEE', 'NAMESPACEE' ),
-	'talkspace'               => array( '1', 'TAKIPREKI', 'OVERLEGRUIMTE', 'TALKSPACE' ),
-	'talkspacee'              => array( '1', 'TAKIPREKIE', 'OVERLEGRUIMTEE', 'TALKSPACEE' ),
-	'special'                 => array( '0', 'spesyal', 'speciaal', 'special' ),
+	'redirect'                  => array( '0', '#STIR', '#DOORVERWIJZING', '#REDIRECT' ),
+	'notoc'                     => array( '0', '__NOINOT__', '__GEENINHOUD__', '__NOTOC__' ),
+	'nogallery'                 => array( '0', '__NOPIKTURAMA__', '__GEEN_GALERIJ__', '__NOGALLERY__' ),
+	'forcetoc'                  => array( '0', '__INOTDWENGI__', '__INHOUD_DWINGEN__', '__FORCEERINHOUD__', '__FORCETOC__' ),
+	'toc'                       => array( '0', '__INOT__', '__INHOUD__', '__TOC__' ),
+	'noeditsection'             => array( '0', '__NOKENKISKAKI__', '__NIETBEWERKBARESECTIE__', '__NOEDITSECTION__' ),
+	'currentmonth'              => array( '1', 'CURRENTMOTNH', 'DISIMUN', 'HUIDIGEMAAND', 'HUIDIGEMAAND2', 'CURRENTMONTH', 'CURRENTMONTH2' ),
+	'currentmonthname'          => array( '1', 'DISIMUNNEN', 'HUIDIGEMAANDNAAM', 'CURRENTMONTHNAME' ),
+	'currentmonthnamegen'       => array( '1', 'DISIMUNNENGEN', 'HUIDIGEMAANDGEN', 'CURRENTMONTHNAMEGEN' ),
+	'currentmonthabbrev'        => array( '1', 'DISIMUNSH', 'HUIDIGEMAANDAFK', 'CURRENTMONTHABBREV' ),
+	'currentday'                => array( '1', 'DISIDEY', 'HUIDIGEDAG', 'CURRENTDAY' ),
+	'currentday2'               => array( '1', 'DISIDEY2', 'HUIDIGEDAG2', 'CURRENTDAY2' ),
+	'currentdayname'            => array( '1', 'DISIDEYNEN', 'HUIDIGEDAGNAAM', 'CURRENTDAYNAME' ),
+	'currentyear'               => array( '1', 'DISIYARI', 'HUIDIGJAAR', 'CURRENTYEAR' ),
+	'currenttime'               => array( '1', 'DISITEN', 'HUIDIGETIJD', 'CURRENTTIME' ),
+	'currenthour'               => array( '1', 'DISIYURU', 'HUIDIGUUR', 'CURRENTHOUR' ),
+	'localmonth'                => array( '1', 'PRESIMUN', 'PLAATSELIJKEMAAND', 'LOKALEMAAND', 'LOKALEMAAND2', 'LOCALMONTH', 'LOCALMONTH2' ),
+	'localmonthname'            => array( '1', 'PRESIMUNNEN', 'PLAATSELIJKEMAANDNAAM', 'LOKALEMAANDNAAM', 'LOCALMONTHNAME' ),
+	'localmonthnamegen'         => array( '1', 'PRESIMUNNENGEN', 'PLAATSELIJKEMAANDNAAMGEN', 'LOKALEMAANDNAAMGEN', 'LOCALMONTHNAMEGEN' ),
+	'localmonthabbrev'          => array( '1', 'PRESIMUNSH', 'PLAATSELIJKEMAANDAFK', 'LOKALEMAANDAFK', 'LOCALMONTHABBREV' ),
+	'localday'                  => array( '1', 'PRESIDEY', 'PLAATSELIJKEDAG', 'LOKALEDAG', 'LOCALDAY' ),
+	'localday2'                 => array( '1', 'PRESIDEY2', 'PLAATSELIJKEDAG2', 'LOKALEDAG2', 'LOCALDAY2' ),
+	'localdayname'              => array( '1', 'PRESIDEYNEN', 'PLAATSELIJKEDAGNAAM', 'LOKALEDAGNAAM', 'LOCALDAYNAME' ),
+	'localyear'                 => array( '1', 'PRESIYARI', 'PLAATSELIJKJAAR', 'LOKAALJAAR', 'LOCALYEAR' ),
+	'localtime'                 => array( '1', 'PRESITEN', 'PLAATSELIJKETIJD', 'LOKALETIJD', 'LOCALTIME' ),
+	'localhour'                 => array( '1', 'PRESIYURU', 'PLAATSELIJKUUR', 'LOKAALUUR', 'LOCALHOUR' ),
+	'numberofpages'             => array( '1', 'PAPIRANUMRO', 'AANTALPAGINAS', 'AANTALPAGINA\'S', 'AANTALPAGINA’S', 'NUMBEROFPAGES' ),
+	'numberofarticles'          => array( '1', 'PAPIRALEGIMNUMRO', 'AANTALARTIKELEN', 'NUMBEROFARTICLES' ),
+	'numberoffiles'             => array( '1', 'GEFRENUMRO', 'AANTALBESTANDEN', 'NUMBEROFFILES' ),
+	'numberofusers'             => array( '1', 'MASYINNUMRO', 'AANTALGEBRUIKERS', 'NUMBEROFUSERS' ),
+	'numberofedits'             => array( '1', 'KENKINUMRO', 'AANTALBEWERKINGEN', 'NUMBEROFEDITS' ),
+	'pagename'                  => array( '1', 'PAPIRANEN', 'PAGINANAAM', 'PAGENAME' ),
+	'pagenamee'                 => array( '1', 'PAPIRANENE', 'PAGINANAAME', 'PAGENAMEE' ),
+	'namespace'                 => array( '1', 'NENPREKI', 'NAAMRUIMTE', 'NAMESPACE' ),
+	'namespacee'                => array( '1', 'NENPREKIE', 'NAAMRUIMTEE', 'NAMESPACEE' ),
+	'talkspace'                 => array( '1', 'TAKIPREKI', 'OVERLEGRUIMTE', 'TALKSPACE' ),
+	'talkspacee'                => array( '1', 'TAKIPREKIE', 'OVERLEGRUIMTEE', 'TALKSPACEE' ),
+	'special'                   => array( '0', 'spesyal', 'speciaal', 'special' ),
 );
 
 $messages = array(
diff --git a/languages/messages/MessagesSv.php b/languages/messages/MessagesSv.php
index 304069d9eb..c1db1fe862 100644
--- a/languages/messages/MessagesSv.php
+++ b/languages/messages/MessagesSv.php
@@ -173,127 +173,127 @@ $specialPageAliases = array(
 );
 
 $magicWords = array(
-	'redirect'                => array( '0', '#OMDIRIGERING', '#REDIRECT' ),
-	'notoc'                   => array( '0', '__INGENINNEHÅLLSFÖRTECKNING__', '__NOTOC__' ),
-	'nogallery'               => array( '0', '__INGETGALLERI__', '__NOGALLERY__' ),
-	'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' ),
-	'currentmonthabbrev'      => array( '1', 'NUVARANDEMÅNADKORT', 'NUMÅNADKORT', 'CURRENTMONTHABBREV' ),
-	'currentday'              => array( '1', 'NUVARANDEDAG', 'NUDAG', 'CURRENTDAY' ),
-	'currentday2'             => array( '1', 'NUVARANDEDAG2', 'NUDAG2', 'CURRENTDAY2' ),
-	'currentdayname'          => array( '1', 'NUVARANDEDAGSNAMN', 'NUDAGSNAMN', 'CURRENTDAYNAME' ),
-	'currentyear'             => array( '1', 'NUVARANDEÅR', 'NUÅR', 'CURRENTYEAR' ),
-	'currenttime'             => array( '1', 'NUVARANDETID', 'NUTID', 'CURRENTTIME' ),
-	'currenthour'             => array( '1', 'NUVARANDETIMME', 'NUTIMME', 'CURRENTHOUR' ),
-	'localmonth'              => array( '1', 'LOKALMÅNAD', 'LOCALMONTH', 'LOCALMONTH2' ),
-	'localmonth1'             => array( '1', 'LOKALMÅNAD1', 'LOCALMONTH1' ),
-	'localmonthname'          => array( '1', 'LOKALMÅNADSNAMN', 'LOCALMONTHNAME' ),
-	'localmonthabbrev'        => array( '1', 'LOKALMÅNADKORT', 'LOCALMONTHABBREV' ),
-	'localday'                => array( '1', 'LOKALDAG', 'LOCALDAY' ),
-	'localday2'               => array( '1', 'LOKALDAG2', 'LOCALDAY2' ),
-	'localdayname'            => array( '1', 'LOKALDAGSNAMN', 'LOCALDAYNAME' ),
-	'localyear'               => array( '1', 'LOKALTÅR', 'LOCALYEAR' ),
-	'localtime'               => array( '1', 'LOKALTID', 'LOCALTIME' ),
-	'localhour'               => array( '1', 'LOKALTIMME', 'LOCALHOUR' ),
-	'numberofpages'           => array( '1', 'ANTALSIDOR', 'NUMBEROFPAGES' ),
-	'numberofarticles'        => array( '1', 'ANTALARTIKLAR', 'NUMBEROFARTICLES' ),
-	'numberoffiles'           => array( '1', 'ANTALFILER', 'NUMBEROFFILES' ),
-	'numberofusers'           => array( '1', 'ANTALANVÄNDARE', 'NUMBEROFUSERS' ),
-	'numberofactiveusers'     => array( '1', 'ANTALAKTIVAANVÄNDARE', 'NUMBEROFACTIVEUSERS' ),
-	'numberofedits'           => array( '1', 'ANTALREDIGERINGAR', 'NUMBEROFEDITS' ),
-	'numberofviews'           => array( '1', 'ANTALVISNINGAR', 'NUMBEROFVIEWS' ),
-	'pagename'                => array( '1', 'SIDNAMN', 'PAGENAME' ),
-	'pagenamee'               => array( '1', 'SIDNAMNE', 'PAGENAMEE' ),
-	'namespace'               => array( '1', 'NAMNRYMD', 'NAMESPACE' ),
-	'namespacee'              => array( '1', 'NAMNRYMDE', 'NAMESPACEE' ),
-	'talkspace'               => array( '1', 'DISKUSSIONSRYMD', 'TALKSPACE' ),
-	'talkspacee'              => array( '1', 'DISKUSSIONSRYMDE', 'TALKSPACEE' ),
-	'subjectspace'            => array( '1', 'ARTIKELRYMD', 'SUBJECTSPACE', 'ARTICLESPACE' ),
-	'subjectspacee'           => array( '1', 'ARTIKELRYMDE', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
-	'fullpagename'            => array( '1', 'HELASIDNAMNET', 'FULLPAGENAME' ),
-	'fullpagenamee'           => array( '1', 'HELASIDNAMNETE', 'FULLPAGENAMEE' ),
-	'subpagename'             => array( '1', 'UNDERSIDNAMN', 'SUBPAGENAME' ),
-	'subpagenamee'            => array( '1', 'UNDERSIDNAMNE', 'SUBPAGENAMEE' ),
-	'basepagename'            => array( '1', 'GRUNDSIDNAMN', 'BASEPAGENAME' ),
-	'basepagenamee'           => array( '1', 'GRUNDSIDNAMNE', 'BASEPAGENAMEE' ),
-	'talkpagename'            => array( '1', 'DISKUSSIONSSIDNAMN', 'TALKPAGENAME' ),
-	'talkpagenamee'           => array( '1', 'DISKUSSIONSSIDNAMNE', 'TALKPAGENAMEE' ),
-	'msg'                     => array( '0', 'MED:', 'MSG:' ),
-	'subst'                   => array( '0', 'BYT:', 'SUBST:' ),
-	'msgnw'                   => array( '0', 'MEDNW:', 'MSGNW:' ),
-	'img_thumbnail'           => array( '1', 'miniatyr', 'mini', 'thumbnail', 'thumb' ),
-	'img_manualthumb'         => array( '1', 'miniatyr=$1', 'mini=$1', 'thumbnail=$1', 'thumb=$1' ),
-	'img_right'               => array( '1', 'höger', 'right' ),
-	'img_left'                => array( '1', 'vänster', 'left' ),
-	'img_none'                => array( '1', 'ingen', 'none' ),
-	'img_center'              => array( '1', 'centrerad', 'center', 'centre' ),
-	'img_framed'              => array( '1', 'inramad', 'ram', 'framed', 'enframed', 'frame' ),
-	'img_frameless'           => array( '1', 'ramlös', 'frameless' ),
-	'img_page'                => array( '1', 'sida=$1', 'sida $1', 'page=$1', 'page $1' ),
-	'img_upright'             => array( '1', 'stående', 'stående=$1', 'stående $1', 'upright', 'upright=$1', 'upright $1' ),
-	'img_border'              => array( '1', 'kantlinje', 'border' ),
-	'img_baseline'            => array( '1', 'baslinje', 'baseline' ),
-	'img_sub'                 => array( '1', 'ned', 'sub' ),
-	'img_super'               => array( '1', 'upp', 'super', 'sup' ),
-	'img_top'                 => array( '1', 'topp', 'top' ),
-	'img_text_top'            => array( '1', 'text-topp', 'text-top' ),
-	'img_middle'              => array( '1', 'mitten', 'middle' ),
-	'img_bottom'              => array( '1', 'botten', 'bottom' ),
-	'img_text_bottom'         => array( '1', 'text-botten', 'text-bottom' ),
-	'img_link'                => array( '1', 'länk=$1', 'link=$1' ),
-	'sitename'                => array( '1', 'SAJTNAMN', 'SITENAMN', 'SITENAME' ),
-	'ns'                      => array( '0', 'NR:', 'NS:' ),
-	'localurl'                => array( '0', 'LOKALURL:', 'LOCALURL:' ),
-	'localurle'               => array( '0', 'LOKALURLE:', 'LOCALURLE:' ),
-	'servername'              => array( '0', 'SERVERNAMN', 'SERVERNAME' ),
-	'scriptpath'              => array( '0', 'SKRIPTSÖKVÄG', 'SCRIPTPATH' ),
-	'grammar'                 => array( '0', 'GRAMMATIK:', 'GRAMMAR:' ),
-	'gender'                  => array( '0', 'KÖN:', 'GENDER:' ),
-	'currentweek'             => array( '1', 'NUVARANDEVECKA', 'NUVECKA', 'CURRENTWEEK' ),
-	'currentdow'              => array( '1', 'NUVARANDEVECKODAG', 'CURRENTDOW' ),
-	'localweek'               => array( '1', 'LOKALVECKA', 'LOCALWEEK' ),
-	'localdow'                => array( '1', 'LOKALVECKODAG', 'LOCALDOW' ),
-	'revisionid'              => array( '1', 'REVISIONSID', 'REVISIONID' ),
-	'revisionday'             => array( '1', 'REVISIONSDAG', 'REVISIONDAY' ),
-	'revisionday2'            => array( '1', 'REVISIONSDAG2', 'REVISIONDAY2' ),
-	'revisionmonth'           => array( '1', 'REVISIONSMÅNAD', 'REVISIONMONTH' ),
-	'revisionyear'            => array( '1', 'REVISIONSÅR', 'REVISIONYEAR' ),
-	'revisiontimestamp'       => array( '1', 'REVISIONSTIDSSTÄMPEL', 'REVISIONTIMESTAMP' ),
-	'revisionuser'            => array( '1', 'REVISIONSANVÄNDARE', 'REVISIONUSER' ),
-	'fullurl'                 => array( '0', 'FULLTURL:', 'FULLURL:' ),
-	'fullurle'                => array( '0', 'FULLTURLE:', 'FULLURLE:' ),
-	'lcfirst'                 => array( '0', 'LBFÖRST:', 'LCFIRST:' ),
-	'ucfirst'                 => array( '0', 'UCFIRST', 'SBFÖRST:', 'UCFIRST:' ),
-	'lc'                      => array( '0', 'LB:', 'LC:' ),
-	'uc'                      => array( '0', 'SB:', 'UC:' ),
-	'raw'                     => array( '0', 'RÅ:', 'RAW:' ),
-	'displaytitle'            => array( '1', 'VISATITEL', 'DISPLAYTITLE' ),
-	'newsectionlink'          => array( '1', '__NYTTAVSNITTLÄNK__', '__NEWSECTIONLINK__' ),
-	'currentversion'          => array( '1', 'NUVARANDEVERSION', 'NUVERSION', 'CURRENTVERSION' ),
-	'currenttimestamp'        => array( '1', 'NUTIDSTÄMPEL', 'CURRENTTIMESTAMP' ),
-	'localtimestamp'          => array( '1', 'LOKALTIDSTÄMPEL', 'LOCALTIMESTAMP' ),
-	'language'                => array( '0', '#SPRÅK:', '#LANGUAGE:' ),
-	'contentlanguage'         => array( '1', 'INNEHÅLLSSPRÅK', 'CONTENTLANGUAGE', 'CONTENTLANG' ),
-	'pagesinnamespace'        => array( '1', 'SIDORINAMNRYMD:', 'SIDORINR:', 'PAGESINNAMESPACE:', 'PAGESINNS:' ),
-	'numberofadmins'          => array( '1', 'ANTALADMINS', 'ANTALADMINISTRATÖRER', 'NUMBEROFADMINS' ),
-	'formatnum'               => array( '0', 'FORMATERANUM', 'FORMATERATAL', 'FORMATNUM' ),
-	'defaultsort'             => array( '1', 'STANDARDSORTERING:', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:' ),
-	'filepath'                => array( '0', 'FILSÖKVÄG:', 'FILEPATH:' ),
-	'tag'                     => array( '0', 'tagg', 'tag' ),
-	'hiddencat'               => array( '1', '__DOLDKAT__', '__HIDDENCAT__' ),
-	'pagesincategory'         => array( '1', 'SIDORIKATEGORI', 'PAGESINCATEGORY', 'PAGESINCAT' ),
-	'pagesize'                => array( '1', 'SIDSTORLEK', 'PAGESIZE' ),
-	'index'                   => array( '1', '__INDEXERA__', '__INDEX__' ),
-	'noindex'                 => array( '1', '__INTEINDEXERA_', '__NOINDEX__' ),
-	'numberingroup'           => array( '1', 'ANTALIGRUPP', 'NUMBERINGROUP', 'NUMINGROUP' ),
-	'staticredirect'          => array( '1', '__STATISKOMDIRIGERING__', '__STATICREDIRECT__' ),
-	'protectionlevel'         => array( '1', 'SKYDDSNIVÅ', 'PROTECTIONLEVEL' ),
-	'formatdate'              => array( '0', 'formateradatum', 'datumformat', 'formatdate', 'dateformat' ),
+	'redirect'                  => array( '0', '#OMDIRIGERING', '#REDIRECT' ),
+	'notoc'                     => array( '0', '__INGENINNEHÅLLSFÖRTECKNING__', '__NOTOC__' ),
+	'nogallery'                 => array( '0', '__INGETGALLERI__', '__NOGALLERY__' ),
+	'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' ),
+	'currentmonthabbrev'        => array( '1', 'NUVARANDEMÅNADKORT', 'NUMÅNADKORT', 'CURRENTMONTHABBREV' ),
+	'currentday'                => array( '1', 'NUVARANDEDAG', 'NUDAG', 'CURRENTDAY' ),
+	'currentday2'               => array( '1', 'NUVARANDEDAG2', 'NUDAG2', 'CURRENTDAY2' ),
+	'currentdayname'            => array( '1', 'NUVARANDEDAGSNAMN', 'NUDAGSNAMN', 'CURRENTDAYNAME' ),
+	'currentyear'               => array( '1', 'NUVARANDEÅR', 'NUÅR', 'CURRENTYEAR' ),
+	'currenttime'               => array( '1', 'NUVARANDETID', 'NUTID', 'CURRENTTIME' ),
+	'currenthour'               => array( '1', 'NUVARANDETIMME', 'NUTIMME', 'CURRENTHOUR' ),
+	'localmonth'                => array( '1', 'LOKALMÅNAD', 'LOCALMONTH', 'LOCALMONTH2' ),
+	'localmonth1'               => array( '1', 'LOKALMÅNAD1', 'LOCALMONTH1' ),
+	'localmonthname'            => array( '1', 'LOKALMÅNADSNAMN', 'LOCALMONTHNAME' ),
+	'localmonthabbrev'          => array( '1', 'LOKALMÅNADKORT', 'LOCALMONTHABBREV' ),
+	'localday'                  => array( '1', 'LOKALDAG', 'LOCALDAY' ),
+	'localday2'                 => array( '1', 'LOKALDAG2', 'LOCALDAY2' ),
+	'localdayname'              => array( '1', 'LOKALDAGSNAMN', 'LOCALDAYNAME' ),
+	'localyear'                 => array( '1', 'LOKALTÅR', 'LOCALYEAR' ),
+	'localtime'                 => array( '1', 'LOKALTID', 'LOCALTIME' ),
+	'localhour'                 => array( '1', 'LOKALTIMME', 'LOCALHOUR' ),
+	'numberofpages'             => array( '1', 'ANTALSIDOR', 'NUMBEROFPAGES' ),
+	'numberofarticles'          => array( '1', 'ANTALARTIKLAR', 'NUMBEROFARTICLES' ),
+	'numberoffiles'             => array( '1', 'ANTALFILER', 'NUMBEROFFILES' ),
+	'numberofusers'             => array( '1', 'ANTALANVÄNDARE', 'NUMBEROFUSERS' ),
+	'numberofactiveusers'       => array( '1', 'ANTALAKTIVAANVÄNDARE', 'NUMBEROFACTIVEUSERS' ),
+	'numberofedits'             => array( '1', 'ANTALREDIGERINGAR', 'NUMBEROFEDITS' ),
+	'numberofviews'             => array( '1', 'ANTALVISNINGAR', 'NUMBEROFVIEWS' ),
+	'pagename'                  => array( '1', 'SIDNAMN', 'PAGENAME' ),
+	'pagenamee'                 => array( '1', 'SIDNAMNE', 'PAGENAMEE' ),
+	'namespace'                 => array( '1', 'NAMNRYMD', 'NAMESPACE' ),
+	'namespacee'                => array( '1', 'NAMNRYMDE', 'NAMESPACEE' ),
+	'talkspace'                 => array( '1', 'DISKUSSIONSRYMD', 'TALKSPACE' ),
+	'talkspacee'                => array( '1', 'DISKUSSIONSRYMDE', 'TALKSPACEE' ),
+	'subjectspace'              => array( '1', 'ARTIKELRYMD', 'SUBJECTSPACE', 'ARTICLESPACE' ),
+	'subjectspacee'             => array( '1', 'ARTIKELRYMDE', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
+	'fullpagename'              => array( '1', 'HELASIDNAMNET', 'FULLPAGENAME' ),
+	'fullpagenamee'             => array( '1', 'HELASIDNAMNETE', 'FULLPAGENAMEE' ),
+	'subpagename'               => array( '1', 'UNDERSIDNAMN', 'SUBPAGENAME' ),
+	'subpagenamee'              => array( '1', 'UNDERSIDNAMNE', 'SUBPAGENAMEE' ),
+	'basepagename'              => array( '1', 'GRUNDSIDNAMN', 'BASEPAGENAME' ),
+	'basepagenamee'             => array( '1', 'GRUNDSIDNAMNE', 'BASEPAGENAMEE' ),
+	'talkpagename'              => array( '1', 'DISKUSSIONSSIDNAMN', 'TALKPAGENAME' ),
+	'talkpagenamee'             => array( '1', 'DISKUSSIONSSIDNAMNE', 'TALKPAGENAMEE' ),
+	'msg'                       => array( '0', 'MED:', 'MSG:' ),
+	'subst'                     => array( '0', 'BYT:', 'SUBST:' ),
+	'msgnw'                     => array( '0', 'MEDNW:', 'MSGNW:' ),
+	'img_thumbnail'             => array( '1', 'miniatyr', 'mini', 'thumbnail', 'thumb' ),
+	'img_manualthumb'           => array( '1', 'miniatyr=$1', 'mini=$1', 'thumbnail=$1', 'thumb=$1' ),
+	'img_right'                 => array( '1', 'höger', 'right' ),
+	'img_left'                  => array( '1', 'vänster', 'left' ),
+	'img_none'                  => array( '1', 'ingen', 'none' ),
+	'img_center'                => array( '1', 'centrerad', 'center', 'centre' ),
+	'img_framed'                => array( '1', 'inramad', 'ram', 'framed', 'enframed', 'frame' ),
+	'img_frameless'             => array( '1', 'ramlös', 'frameless' ),
+	'img_page'                  => array( '1', 'sida=$1', 'sida $1', 'page=$1', 'page $1' ),
+	'img_upright'               => array( '1', 'stående', 'stående=$1', 'stående $1', 'upright', 'upright=$1', 'upright $1' ),
+	'img_border'                => array( '1', 'kantlinje', 'border' ),
+	'img_baseline'              => array( '1', 'baslinje', 'baseline' ),
+	'img_sub'                   => array( '1', 'ned', 'sub' ),
+	'img_super'                 => array( '1', 'upp', 'super', 'sup' ),
+	'img_top'                   => array( '1', 'topp', 'top' ),
+	'img_text_top'              => array( '1', 'text-topp', 'text-top' ),
+	'img_middle'                => array( '1', 'mitten', 'middle' ),
+	'img_bottom'                => array( '1', 'botten', 'bottom' ),
+	'img_text_bottom'           => array( '1', 'text-botten', 'text-bottom' ),
+	'img_link'                  => array( '1', 'länk=$1', 'link=$1' ),
+	'sitename'                  => array( '1', 'SAJTNAMN', 'SITENAMN', 'SITENAME' ),
+	'ns'                        => array( '0', 'NR:', 'NS:' ),
+	'localurl'                  => array( '0', 'LOKALURL:', 'LOCALURL:' ),
+	'localurle'                 => array( '0', 'LOKALURLE:', 'LOCALURLE:' ),
+	'servername'                => array( '0', 'SERVERNAMN', 'SERVERNAME' ),
+	'scriptpath'                => array( '0', 'SKRIPTSÖKVÄG', 'SCRIPTPATH' ),
+	'grammar'                   => array( '0', 'GRAMMATIK:', 'GRAMMAR:' ),
+	'gender'                    => array( '0', 'KÖN:', 'GENDER:' ),
+	'currentweek'               => array( '1', 'NUVARANDEVECKA', 'NUVECKA', 'CURRENTWEEK' ),
+	'currentdow'                => array( '1', 'NUVARANDEVECKODAG', 'CURRENTDOW' ),
+	'localweek'                 => array( '1', 'LOKALVECKA', 'LOCALWEEK' ),
+	'localdow'                  => array( '1', 'LOKALVECKODAG', 'LOCALDOW' ),
+	'revisionid'                => array( '1', 'REVISIONSID', 'REVISIONID' ),
+	'revisionday'               => array( '1', 'REVISIONSDAG', 'REVISIONDAY' ),
+	'revisionday2'              => array( '1', 'REVISIONSDAG2', 'REVISIONDAY2' ),
+	'revisionmonth'             => array( '1', 'REVISIONSMÅNAD', 'REVISIONMONTH' ),
+	'revisionyear'              => array( '1', 'REVISIONSÅR', 'REVISIONYEAR' ),
+	'revisiontimestamp'         => array( '1', 'REVISIONSTIDSSTÄMPEL', 'REVISIONTIMESTAMP' ),
+	'revisionuser'              => array( '1', 'REVISIONSANVÄNDARE', 'REVISIONUSER' ),
+	'fullurl'                   => array( '0', 'FULLTURL:', 'FULLURL:' ),
+	'fullurle'                  => array( '0', 'FULLTURLE:', 'FULLURLE:' ),
+	'lcfirst'                   => array( '0', 'LBFÖRST:', 'LCFIRST:' ),
+	'ucfirst'                   => array( '0', 'UCFIRST', 'SBFÖRST:', 'UCFIRST:' ),
+	'lc'                        => array( '0', 'LB:', 'LC:' ),
+	'uc'                        => array( '0', 'SB:', 'UC:' ),
+	'raw'                       => array( '0', 'RÅ:', 'RAW:' ),
+	'displaytitle'              => array( '1', 'VISATITEL', 'DISPLAYTITLE' ),
+	'newsectionlink'            => array( '1', '__NYTTAVSNITTLÄNK__', '__NEWSECTIONLINK__' ),
+	'currentversion'            => array( '1', 'NUVARANDEVERSION', 'NUVERSION', 'CURRENTVERSION' ),
+	'currenttimestamp'          => array( '1', 'NUTIDSTÄMPEL', 'CURRENTTIMESTAMP' ),
+	'localtimestamp'            => array( '1', 'LOKALTIDSTÄMPEL', 'LOCALTIMESTAMP' ),
+	'language'                  => array( '0', '#SPRÅK:', '#LANGUAGE:' ),
+	'contentlanguage'           => array( '1', 'INNEHÅLLSSPRÅK', 'CONTENTLANGUAGE', 'CONTENTLANG' ),
+	'pagesinnamespace'          => array( '1', 'SIDORINAMNRYMD:', 'SIDORINR:', 'PAGESINNAMESPACE:', 'PAGESINNS:' ),
+	'numberofadmins'            => array( '1', 'ANTALADMINS', 'ANTALADMINISTRATÖRER', 'NUMBEROFADMINS' ),
+	'formatnum'                 => array( '0', 'FORMATERANUM', 'FORMATERATAL', 'FORMATNUM' ),
+	'defaultsort'               => array( '1', 'STANDARDSORTERING:', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:' ),
+	'filepath'                  => array( '0', 'FILSÖKVÄG:', 'FILEPATH:' ),
+	'tag'                       => array( '0', 'tagg', 'tag' ),
+	'hiddencat'                 => array( '1', '__DOLDKAT__', '__HIDDENCAT__' ),
+	'pagesincategory'           => array( '1', 'SIDORIKATEGORI', 'PAGESINCATEGORY', 'PAGESINCAT' ),
+	'pagesize'                  => array( '1', 'SIDSTORLEK', 'PAGESIZE' ),
+	'index'                     => array( '1', '__INDEXERA__', '__INDEX__' ),
+	'noindex'                   => array( '1', '__INTEINDEXERA_', '__NOINDEX__' ),
+	'numberingroup'             => array( '1', 'ANTALIGRUPP', 'NUMBERINGROUP', 'NUMINGROUP' ),
+	'staticredirect'            => array( '1', '__STATISKOMDIRIGERING__', '__STATICREDIRECT__' ),
+	'protectionlevel'           => array( '1', 'SKYDDSNIVÅ', 'PROTECTIONLEVEL' ),
+	'formatdate'                => array( '0', 'formateradatum', 'datumformat', 'formatdate', 'dateformat' ),
 );
 
 $linkTrail = '/^([a-zåäöéÅÄÖÉ]+)(.*)$/sDu';
@@ -2099,6 +2099,7 @@ En sida anses vara en förgreningssida om den inkluderar en mall som länkas til
 # Miscellaneous special pages
 'nbytes' => '$1 {{PLURAL:$1|byte|byte}}',
 'ncategories' => '$1 {{PLURAL:$1|kategori|kategorier}}',
+'ninterwikis' => '$1 {{PLURAL:$1|interwiki|interwikis}}',
 'nlinks' => '$1 {{PLURAL:$1|länk|länkar}}',
 'nmembers' => '$1 {{PLURAL:$1|medlem|medlemmar}}',
 'nrevisions' => '$1 {{PLURAL:$1|version|versioner}}',
@@ -2127,6 +2128,7 @@ En sida anses vara en förgreningssida om den inkluderar en mall som länkas til
 'mostlinkedtemplates' => 'Mest använda mallar',
 'mostcategories' => 'Sidor med flest kategorier',
 'mostimages' => 'Filer med flest länkar till sig',
+'mostinterwikis' => 'Sidor med flest interwikis',
 'mostrevisions' => 'Sidor med flest ändringar',
 'prefixindex' => 'Alla sidor med prefix',
 'prefixindex-namespace' => 'Alla sidor med prefix ($1 namnrymder)',
@@ -2272,6 +2274,8 @@ Det kan finnas [[{{MediaWiki:Listgrouprights-helppage}}|ytterligare information]
 'mailnologin' => 'Ingen adress att skicka till',
 'mailnologintext' => 'För att kunna skicka e-post till andra användare, måste du vara [[Special:UserLogin|inloggad]] och ha angivit en korrekt e-postadress i dina [[Special:Preferences|användarinställningar]].',
 'emailuser' => 'Skicka e-post till den här användaren',
+'emailuser-title-target' => 'Skicka e-post till denna {{GENDER:$1|användare}}',
+'emailuser-title-notarget' => 'E-postanvändare',
 'emailpage' => 'Skicka e-post till användare',
 'emailpagetext' => 'Du kan använda det här formuläret för att skicka e-post till den här 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.',
@@ -2940,6 +2944,8 @@ Spara den på din dator och ladda upp den här.',
 'import-error-interwiki' => 'Sidan "$1" är inte importerad eftersom dess namn är reserverat för externa länkar (interwiki).',
 'import-error-special' => 'Sidan "$1" är inte importerad eftersom den tillhör en särskild namnrymd som inte tillåter sidor.',
 'import-error-invalid' => 'Sidan "$1" är inte importerad eftersom dess namn är ogiltigt.',
+'import-options-wrong' => 'Fel {{PLURAL:$2|alternativ|alternativ}}: <nowiki>$1</nowiki>',
+'import-rootpage-nosubpage' => 'Namnrymden "$1" till grundsidan tillåter inte undersidor.',
 
 # Import log
 'importlogpage' => 'Importlogg',
@@ -3093,11 +3099,24 @@ Detta orsakades troligen av en länk till en svartlistad webbplats.',
 
 # Info page
 'pageinfo-title' => 'Information om "$1"',
-'pageinfo-header-edits' => 'Redigeringar',
+'pageinfo-header-basic' => 'Grundläggande information',
+'pageinfo-header-edits' => 'Redigeringshistorik',
+'pageinfo-header-restrictions' => 'Sidskydd',
+'pageinfo-header-properties' => 'Sidegenskaper',
+'pageinfo-display-title' => 'Visningstitel',
+'pageinfo-default-sort' => 'Standardsorteringsnyckel',
+'pageinfo-length' => 'Sidlängd (i byte)',
+'pageinfo-article-id' => 'Sid-ID',
+'pageinfo-robot-policy' => 'Sökmotorns status',
 'pageinfo-views' => 'Antal visningar',
 'pageinfo-watchers' => 'Antal användare som bevakar sidan',
-'pageinfo-edits' => 'Antal redigeringar',
-'pageinfo-authors' => 'Antal olika författare',
+'pageinfo-redirects-name' => 'Omdirigeringar till denna sida',
+'pageinfo-subpages-name' => 'Undersidor till denna sida',
+'pageinfo-lasttime' => 'Datum för senaste redigeringen',
+'pageinfo-edits' => 'Totalt antal redigeringar',
+'pageinfo-authors' => 'Totalt antal olika författare',
+'pageinfo-magic-words' => '{{PLURAL:$1|Magiskt|Magiska}} ord ($1)',
+'pageinfo-hidden-categories' => '{{PLURAL:$1|Dold kategori|Dolda kategorier}} ($1)',
 
 # Skin names
 'skinname-standard' => 'Standard',
@@ -3152,6 +3171,7 @@ Om du kör den kan din dator skadas.",
 'file-info-size-pages' => '$1 × $2 pixlar, filstorlek: $3, MIME-typ: $4, $5 {{PLURAL:$5|sida|sidor}}',
 'file-nohires' => 'Det finns ingen version med högre upplösning.',
 'svg-long-desc' => 'SVG-fil, grundstorlek: $1 × $2 pixlar, filstorlek: $3',
+'svg-long-desc-animated' => 'animerad SVG-fil, nominellt $1 × $2 pixlar, filstorlek: $3',
 'show-big-image' => 'Högupplöst version',
 'show-big-image-preview' => 'Storlek på förhandsvisningen: $1.',
 'show-big-image-other' => '{{PLURAL:$2|Annan upplösning|Andra upplösningar}}: $1.',
diff --git a/languages/messages/MessagesSw.php b/languages/messages/MessagesSw.php
index 40500645d6..10100e5b9b 100644
--- a/languages/messages/MessagesSw.php
+++ b/languages/messages/MessagesSw.php
@@ -1498,7 +1498,7 @@ Tafadhali uhakikishe kwamba ni kweli unataka kupakia faili hili.',
 'windows-nonascii-filename' => 'Wiki hii haiwezi kutumia majina ya mafaili yenye herufi maalumu.',
 'fileexists' => 'Faili lenye jina hili lipo tayari, tafadhali tazama <strong>[[:$1]]</strong> ikiwa una mashaka kuhusu kulibadilisha.
 [[$1|thumb]]',
-'filepageexists' => 'Ukurasa wa maelezo kwa ajili ya faili hili tayari umeshaanzishwa katika <strong>[[:$1]]</strong>, lakini bado hakuna faili lenye jina hili kwa sasa.
+'filepageexists' => 'Ukurasa wa maelezo kwa ajili ya faili hili tayari umeshaanzishwa katika <strong>[[:$1]]</strong>, lakini hakuna faili lenye jina hili kwa sasa.
 Muhtasari utakaoandika hautaonekana katika ukurasa wa maelezo.
 Kufanya muhtasari wako uonekana pale, utahitajika uhariri ukurasa kwa mikono.
 [[$1|thumb]]',
@@ -1510,7 +1510,7 @@ Tafadhali chagua jina lingine.',
 [[$1|thumb]]
 Tafadhali tazama faili la <strong>[[:$1]]</strong>.
 Ikiwa faili hili linaonyesha picha ile ile kwa ukubwa wa kawaida hakuna haja ya kupakia faili lingine la picha ndogo.",
-'file-thumbnail-no' => "Jina la faili linaloanza na <strong>$1</strong>.
+'file-thumbnail-no' => "Jina la faili linaanza na <strong>$1</strong>.
 Inaonekana kuwa ni picha iliyopunguzwa ukubwa''(thumbnail)''.
 Ikiwa unaoyo picha hii kwa ukubwa wa kawaida tafadhali pakia picha hii, vinginevyo tafadhali badilisha jina la faili.",
 'fileexists-forbidden' => 'Faili lenye jina hili lipo tayari, na haliwezi kuandikizwa.
diff --git a/languages/messages/MessagesSzl.php b/languages/messages/MessagesSzl.php
index 5a676a4119..c843c683be 100644
--- a/languages/messages/MessagesSzl.php
+++ b/languages/messages/MessagesSzl.php
@@ -26,21 +26,21 @@
 $fallback = 'pl';
 
 $namespaceNames = array(
-	NS_SPECIAL        => 'Szpecyjalna',
-	NS_TALK           => 'Dyskusyjo',
-	NS_USER           => 'Używacz',
-	NS_USER_TALK      => 'Dyskusyjo_używacza',
-	NS_PROJECT_TALK   => 'Dyskusyjo_$1',
-	NS_FILE           => 'Plik',
-	NS_FILE_TALK      => 'Dyskusyjo_plika',
-	NS_MEDIAWIKI      => 'MediaWiki',
-	NS_MEDIAWIKI_TALK => 'Dyskusyjo_MediaWiki',
-	NS_TEMPLATE       => 'Muster',
-	NS_TEMPLATE_TALK  => 'Dyskusyjo_mustra',
-	NS_HELP           => 'Půmoc',
-	NS_HELP_TALK      => 'Dyskusyjo_půmocy',
-	NS_CATEGORY       => 'Kategoryjo',
-	NS_CATEGORY_TALK  => 'Dyskusyjo_kategoryji',
+	NS_SPECIAL          => 'Szpecyjalna',
+	NS_TALK             => 'Dyskusyjo',
+	NS_USER             => 'Używacz',
+	NS_USER_TALK        => 'Dyskusyjo_używacza',
+	NS_PROJECT_TALK     => 'Dyskusyjo_$1',
+	NS_FILE             => 'Plik',
+	NS_FILE_TALK        => 'Dyskusyjo_plika',
+	NS_MEDIAWIKI        => 'MediaWiki',
+	NS_MEDIAWIKI_TALK   => 'Dyskusyjo_MediaWiki',
+	NS_TEMPLATE         => 'Muster',
+	NS_TEMPLATE_TALK    => 'Dyskusyjo_mustra',
+	NS_HELP             => 'Půmoc',
+	NS_HELP_TALK        => 'Dyskusyjo_půmocy',
+	NS_CATEGORY         => 'Kategoryjo',
+	NS_CATEGORY_TALK    => 'Dyskusyjo_kategoryji',
 );
 
 $namespaceAliases = array(
diff --git a/languages/messages/MessagesTa.php b/languages/messages/MessagesTa.php
index c91d3cbadd..8b704d3d43 100644
--- a/languages/messages/MessagesTa.php
+++ b/languages/messages/MessagesTa.php
@@ -61,19 +61,19 @@ $namespaceAliases = array(
 );
 
 $magicWords = array(
-	'redirect'                => array( '0', '#வழிமாற்று', '#REDIRECT' ),
-	'img_right'               => array( '1', 'வலது', 'right' ),
-	'img_left'                => array( '1', 'இடது', 'left' ),
-	'img_none'                => array( '1', 'ஒன்றுமில்லை', 'none' ),
-	'img_center'              => array( '1', 'மையம்', 'center', 'centre' ),
-	'img_top'                 => array( '1', 'மேல்', 'top' ),
-	'img_middle'              => array( '1', 'மத்தியில்', 'middle' ),
-	'img_bottom'              => array( '1', 'கீழ்', 'bottom' ),
-	'plural'                  => array( '0', 'பன்மை', 'PLURAL:' ),
-	'special'                 => array( '0', 'சிறப்பு', 'special' ),
-	'pagesize'                => array( '1', 'பக்க_அளவு', 'PAGESIZE' ),
-	'url_path'                => array( '0', 'வழி', 'PATH' ),
-	'url_wiki'                => array( '0', 'விக்கி', 'WIKI' ),
+	'redirect'                  => array( '0', '#வழிமாற்று', '#REDIRECT' ),
+	'img_right'                 => array( '1', 'வலது', 'right' ),
+	'img_left'                  => array( '1', 'இடது', 'left' ),
+	'img_none'                  => array( '1', 'ஒன்றுமில்லை', 'none' ),
+	'img_center'                => array( '1', 'மையம்', 'center', 'centre' ),
+	'img_top'                   => array( '1', 'மேல்', 'top' ),
+	'img_middle'                => array( '1', 'மத்தியில்', 'middle' ),
+	'img_bottom'                => array( '1', 'கீழ்', 'bottom' ),
+	'plural'                    => array( '0', 'பன்மை', 'PLURAL:' ),
+	'special'                   => array( '0', 'சிறப்பு', 'special' ),
+	'pagesize'                  => array( '1', 'பக்க_அளவு', 'PAGESIZE' ),
+	'url_path'                  => array( '0', 'வழி', 'PATH' ),
+	'url_wiki'                  => array( '0', 'விக்கி', 'WIKI' ),
 );
 
 $linkTrail = "/^([\xE0\xAE\x80-\xE0\xAF\xBF]+)(.*)$/sDu";
@@ -1887,7 +1887,7 @@ $1',
 'allpagesprefix' => 'பின்வரும் முன்னொட்டு உடைய பக்கங்களை காட்டு:',
 'allpagesbadtitle' => 'கொடுக்கப்பட்ட தலைப்பு செல்லுபடியற்றது அல்லது பிழையான விக்கியிடை அல்லது மொழி முன்னொட்டைக் கொண்டுள்ளது. இது தலைப்புக்களில் பயன்படுத்த முடியாத எழுத்துக்களையும் கொண்டிருக்கலாம்.',
 'allpages-bad-ns' => '{{SITENAME}} தளத்தில் "$1" பெயர்வெளி கிடையாது.',
-'allpages-hide-redirects' => 'வழிமாற்றுகளைப் மறை',
+'allpages-hide-redirects' => 'வழிமாற்றுகளை மறை',
 
 # SpecialCachedPage
 'cachedspecial-refresh-now' => 'அண்மையான பதிப்பை காண்க',
diff --git a/languages/messages/MessagesTe.php b/languages/messages/MessagesTe.php
index e2a72a3776..148206a1ed 100644
--- a/languages/messages/MessagesTe.php
+++ b/languages/messages/MessagesTe.php
@@ -7,6 +7,7 @@
  * @ingroup Language
  * @file
  *
+ * @author Arjunaraoc
  * @author Chaduvari
  * @author Jprmvnvijay5
  * @author Kaganer
@@ -128,13 +129,13 @@ $specialPageAliases = array(
 );
 
 $magicWords = array(
-	'redirect'                => array( '0', '#దారిమార్పు', '#REDIRECT' ),
-	'notoc'                   => array( '0', '__విషయసూచికవద్దు__', '__NOTOC__' ),
-	'toc'                     => array( '0', '__విషయసూచిక__', '__TOC__' ),
-	'pagename'                => array( '1', 'పేజీపేరు', 'PAGENAME' ),
-	'img_right'               => array( '1', 'కుడి', 'right' ),
-	'img_left'                => array( '1', 'ఎడమ', 'left' ),
-	'special'                 => array( '0', 'ప్రత్యేక', 'special' ),
+	'redirect'                  => array( '0', '#దారిమార్పు', '#REDIRECT' ),
+	'notoc'                     => array( '0', '__విషయసూచికవద్దు__', '__NOTOC__' ),
+	'toc'                       => array( '0', '__విషయసూచిక__', '__TOC__' ),
+	'pagename'                  => array( '1', 'పేజీపేరు', 'PAGENAME' ),
+	'img_right'                 => array( '1', 'కుడి', 'right' ),
+	'img_left'                  => array( '1', 'ఎడమ', 'left' ),
+	'special'                   => array( '0', 'ప్రత్యేక', 'special' ),
 );
 
 $linkTrail = "/^([\xE0\xB0\x81-\xE0\xB1\xAF]+)(.*)$/sDu";
@@ -692,6 +693,7 @@ $2
 # Special:ChangeEmail
 'changeemail' => 'ఈ-మెయిలు చిరునామా మార్పు',
 'changeemail-header' => 'ఖాతా ఈ-మెయిల్ చిరునామాని మార్చండి',
+'changeemail-text' => 'మీ ఈమెయిల్ చిరునామా మార్చుటకు ఈ ఫారము నింపండి. ఈ మార్పుని ఖచ్చితపరచుటకు మీ సంకేతపదం  ప్రవేశపెట్టాలి.',
 'changeemail-no-info' => 'ఈ పేజీని నేరుగా చూడటానికి మీరు లోనికి ప్రవేశించివుండాలి.',
 'changeemail-oldemail' => 'ప్రస్తుత ఈ-మెయిలు చిరునామా:',
 'changeemail-newemail' => 'కొత్త ఈ-మెయిలు చిరునామా:',
diff --git a/languages/messages/MessagesTet.php b/languages/messages/MessagesTet.php
index 351c01beaf..4ddee10388 100644
--- a/languages/messages/MessagesTet.php
+++ b/languages/messages/MessagesTet.php
@@ -78,7 +78,7 @@ $messages = array(
 'tog-hideminor' => "Lá'os hatudu muda ki-ki'ik iha mudansa foufoun sira",
 'tog-usenewrc' => 'Iha lista "mudansa foufoun sira" no "lista hateke": Hatudu mudansa iha grupu sira - grupu ida ba pájina ida (presiza JavaScript)',
 'tog-showtoolbar' => 'Hatudu kaixa edita (presiza JavaScript)',
-'tog-watchcreations' => "Hateke pájina sira-ne'ebé ha'u kria",
+'tog-watchcreations' => "Hateke pájina no imajen sira-ne'ebé ha'u kria/tau iha arkivu laran",
 'tog-watchdefault' => "Hateke pájina sira-ne'ebé ha'u edita",
 'tog-watchmoves' => "Hateke pájina sira-ne'ebé ha'u book",
 'tog-watchdeletion' => "Hateke pájina sira-ne'ebé ha'u halakon",
@@ -764,6 +764,7 @@ Ita-nia mudansa la armazenadu seidauk!",
 'contribslink' => 'kontribuisaun',
 'block-log-flags-nocreate' => 'la bele kria konta foun',
 'block-log-flags-noemail' => 'korreiu eletróniku blokeiu',
+'block-log-flags-nousertalk' => 'la bele edita pájina diskusaun rasik',
 'ipb_already_blocked' => 'Ema ruma blokeiu "$1" tiha ona',
 
 # Move page
diff --git a/languages/messages/MessagesTh.php b/languages/messages/MessagesTh.php
index 3940971786..29c4f13b7d 100644
--- a/languages/messages/MessagesTh.php
+++ b/languages/messages/MessagesTh.php
@@ -139,12 +139,12 @@ $specialPageAliases = array(
 );
 
 $magicWords = array(
-	'redirect'                => array( '0', '#เปลี่ยนทาง', '#REDIRECT' ),
-	'notoc'                   => array( '0', '__ไม่มีสารบัญ__', '__NOTOC__' ),
-	'nogallery'               => array( '0', '__ไม่มีแกลเลอรี่__', '__NOGALLERY__' ),
-	'noeditsection'           => array( '0', '__ไม่มีแก้เฉพาะส่วน__', '__NOEDITSECTION__' ),
-	'currentmonth'            => array( '1', 'เดือนปัจจุบัน', 'CURRENTMONTH', 'CURRENTMONTH2' ),
-	'currentmonthname'        => array( '1', 'ชื่อเดือนปัจจุบัน', 'CURRENTMONTHNAME' ),
+	'redirect'                  => array( '0', '#เปลี่ยนทาง', '#REDIRECT' ),
+	'notoc'                     => array( '0', '__ไม่มีสารบัญ__', '__NOTOC__' ),
+	'nogallery'                 => array( '0', '__ไม่มีแกลเลอรี่__', '__NOGALLERY__' ),
+	'noeditsection'             => array( '0', '__ไม่มีแก้เฉพาะส่วน__', '__NOEDITSECTION__' ),
+	'currentmonth'              => array( '1', 'เดือนปัจจุบัน', 'CURRENTMONTH', 'CURRENTMONTH2' ),
+	'currentmonthname'          => array( '1', 'ชื่อเดือนปัจจุบัน', 'CURRENTMONTHNAME' ),
 );
 
 $datePreferences = array(
diff --git a/languages/messages/MessagesTl.php b/languages/messages/MessagesTl.php
index a26c3aa07f..eea0deeb9c 100644
--- a/languages/messages/MessagesTl.php
+++ b/languages/messages/MessagesTl.php
@@ -27,8 +27,8 @@ $namespaceNames = array(
 	NS_FILE_TALK        => 'Usapang_talaksan',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'Usapang_MediaWiki',
-	NS_TEMPLATE         => 'Suleras',
-	NS_TEMPLATE_TALK    => 'Usapang_suleras',
+	NS_TEMPLATE         => 'Padron',
+	NS_TEMPLATE_TALK    => 'Usapang_padron',
 	NS_HELP             => 'Tulong',
 	NS_HELP_TALK        => 'Usapang_tulong',
 	NS_CATEGORY         => 'Kategorya',
@@ -36,100 +36,114 @@ $namespaceNames = array(
 );
 
 $namespaceAliases = array(
-	'Talaksan'          => NS_FILE,
-	'Usapang talaksan'  => NS_FILE_TALK,
-	'Kaurian'         => NS_CATEGORY,
-	'Usapang_kaurian' => NS_CATEGORY_TALK,
+	'Talaksan'         => NS_FILE,
+	'Usapang talaksan' => NS_FILE_TALK,
+	'Suleras'          => NS_TEMPLATE,
+	'Usapang_suleras'  => NS_TEMPLATE_TALK,
+	'Kaurian'          => NS_CATEGORY,
+	'Usapang_kaurian'  => NS_CATEGORY_TALK,
 );
 
 $specialPageAliases = array(
-	'Allmessages'               => array( 'Lahat ng mga mensahe' ),
-	'Allpages'                  => array( 'Lahat ng mga pahina', 'LahatPahina' ),
-	'Ancientpages'              => array( 'Sinaunang mga pahina' ),
-	'Blankpage'                 => array( 'Tanggalin ang nilalaman ng pahina' ),
-	'Block'                     => array( 'Hadlangan', 'Hadlangan ang IP', 'Hadlangan ang tagagamit' ),
-	'Blockme'                   => array( 'Hadlangang ako' ),
-	'Booksources'               => array( 'Mga pinagmulang aklat' ),
-	'BrokenRedirects'           => array( 'Naputol na mga panturo papunta sa ibang pahina', 'NaputulangPanturo' ),
-	'Categories'                => array( 'Mga kaurian' ),
-	'ChangePassword'            => array( 'Baguhin ang hudyat', 'Muling itakda ang hudyat', 'Muling magtakda ng hudyat' ),
-	'Confirmemail'              => array( 'Tiyakin ang e-liham' ),
-	'Contributions'             => array( 'Mga ambag' ),
-	'CreateAccount'             => array( 'Likhain ang kuwenta', 'LikhaKuwenta' ),
-	'Deadendpages'              => array( 'Mga pahinang sukol', 'Mga pahinang walang lagusan' ),
-	'DeletedContributions'      => array( 'Naburang mga ambag' ),
-	'Disambiguations'           => array( 'Mga paglilinaw', 'Paglilinaw' ),
-	'DoubleRedirects'           => array( 'Nagkadalawang mga panturo papunta sa ibang pahina', 'DoblengPanturo' ),
-	'Emailuser'                 => array( 'Tagagamit ng e-liham' ),
+	'Activeusers'               => array( 'Masisiglang_mga_Tagagamit' ),
+	'Allmessages'               => array( 'Lahat_ng_mga_mensahe' ),
+	'Allpages'                  => array( 'Lahat_ng_mga_pahina', 'LahatPahina' ),
+	'Ancientpages'              => array( 'Sinaunang_mga_pahina' ),
+	'Badtitle'                  => array( 'Masamang_pamagat' ),
+	'Blankpage'                 => array( 'Tanggalin_ang_nilalaman_ng_pahina' ),
+	'Block'                     => array( 'Hadlangan', 'Hadlangan_ang_IP', 'Hadlangan_ang_tagagamit' ),
+	'Blockme'                   => array( 'Hadlangang_ako' ),
+	'Booksources'               => array( 'Mga_pinagmulang_aklat' ),
+	'BrokenRedirects'           => array( 'Naputol_na_mga_panturo_papunta_sa_ibang_pahina', 'NaputulangPanturo' ),
+	'Categories'                => array( 'Mga_kategorya' ),
+	'ChangeEmail'               => array( 'Baguhin_ang_e-liham' ),
+	'ChangePassword'            => array( 'Baguhin_ang_hudyat', 'Muling_itakda_ang_hudyat', 'Muling_magtakda_ng_hudyat' ),
+	'ComparePages'              => array( 'Paghambingin_ang_mga_Pahina' ),
+	'Confirmemail'              => array( 'Tiyakin_ang_e-liham' ),
+	'Contributions'             => array( 'Mga_ambag' ),
+	'CreateAccount'             => array( 'Likhain_ang_kuwenta', 'LikhaKuwenta' ),
+	'Deadendpages'              => array( 'Mga_pahinang_sukol', 'Mga_pahinang_walang_lagusan' ),
+	'DeletedContributions'      => array( 'Naburang_mga_ambag' ),
+	'Disambiguations'           => array( 'Mga_paglilinaw', 'Paglilinaw' ),
+	'DoubleRedirects'           => array( 'Nagkadalawang_mga_panturo_papunta_sa_ibang_pahina', 'DoblengPanturo' ),
+	'EditWatchlist'             => array( 'Baguhin_ang_Bantayan' ),
+	'Emailuser'                 => array( 'Tagagamit_ng_e-liham' ),
 	'Export'                    => array( 'Pagluluwas' ),
-	'Fewestrevisions'           => array( 'Pinakakaunting mga pagbabago' ),
-	'FileDuplicateSearch'       => array( 'Paghahanap ng kamukhang talaksan' ),
-	'Filepath'                  => array( 'Daanan ng talaksan' ),
+	'Fewestrevisions'           => array( 'Pinakakaunting_mga_pagbabago' ),
+	'FileDuplicateSearch'       => array( 'Paghahanap_ng_kamukhang_talaksan' ),
+	'Filepath'                  => array( 'Daanan_ng_talaksan' ),
 	'Import'                    => array( 'Pag-aangkat' ),
-	'Invalidateemail'           => array( 'Hindi tanggap na e-liham' ),
-	'BlockList'                 => array( 'Talaan ng hinahadlangan', 'Talaan ng mga hinahadlangan', 'Talaan ng hinahadlangang IP' ),
-	'LinkSearch'                => array( 'Paghahanap ng kawing' ),
-	'Listadmins'                => array( 'Talaan ng mga tagapangasiwa' ),
-	'Listbots'                  => array( 'Talaan ng mga bot' ),
-	'Listfiles'                 => array( 'Itala ang mga talaksan', 'Talaan ng mga talaksan', 'Talaan ng mga larawan' ),
-	'Listgrouprights'           => array( 'Talaan ng mga karapatan ng pangkat' ),
-	'Listredirects'             => array( 'Talaan ng mga pagturo sa ibang pahina' ),
-	'Listusers'                 => array( 'Talaan ng mga tagagamit', 'Talaan ng tagagamit' ),
-	'Lockdb'                    => array( 'Ikandado ang kalipunan ng dato' ),
-	'Log'                       => array( 'Tala', 'Mga tala' ),
-	'Lonelypages'               => array( 'Nangungulilang mga pahina', 'Ulilang mga pahina' ),
-	'Longpages'                 => array( 'Mahabang mga pahina' ),
-	'MergeHistory'              => array( 'Pagsanibin ang kasaysayan' ),
-	'MIMEsearch'                => array( 'Paghahanap ng MIME' ),
-	'Mostcategories'            => array( 'Pinakamaraming mga kaurian' ),
-	'Mostimages'                => array( 'Mga talaksang may pinakamaraming kawing', 'Pinakamaraming talaksan', 'Pinakamaraming larawan' ),
-	'Mostlinked'                => array( 'Mga pahinang may pinakamaraming kawing', 'Pinakamaraming kawing' ),
-	'Mostlinkedcategories'      => array( 'Mga kauriang may pinakamaraming kawing', 'Pinakagamiting mga kaurian' ),
-	'Mostlinkedtemplates'       => array( 'Mga suleras na may pinakamaraming kawing', 'Pinakagamiting mga suleras' ),
-	'Mostrevisions'             => array( 'Pinakamaraming mga pagbabago' ),
-	'Movepage'                  => array( 'Ilipat ang pahina' ),
-	'Mycontributions'           => array( 'Mga ambag ko' ),
-	'Mypage'                    => array( 'Pahina ko' ),
-	'Mytalk'                    => array( 'Usapan ko' ),
-	'Newimages'                 => array( 'Bagong mga talaksan', 'Bagong mga larawan' ),
-	'Newpages'                  => array( 'Bagong mga pahina' ),
-	'Popularpages'              => array( 'Sikat na mga pahina' ),
-	'Preferences'               => array( 'Mga nais' ),
-	'Prefixindex'               => array( 'Talatuntunan ng unlapi' ),
-	'Protectedpages'            => array( 'Mga pahinang nakasanggalang' ),
-	'Protectedtitles'           => array( 'Mga pamagat na nakasanggalang' ),
-	'Randompage'                => array( 'Alin man', 'Alin mang pahina' ),
-	'Randomredirect'            => array( 'Pagtuturo papunta sa alin mang pahina' ),
-	'Recentchanges'             => array( 'Mga huling binago', 'HulingBinago' ),
-	'Recentchangeslinked'       => array( 'Nakakawing ng kamakailang pagbabago', 'Kaugnay na mga pagbabago' ),
-	'Revisiondelete'            => array( 'Pagbura ng pagbabago' ),
+	'Invalidateemail'           => array( 'Hindi_tanggap_na_e-liham' ),
+	'JavaScriptTest'            => array( 'Pagsubok_sa_JavaScript' ),
+	'BlockList'                 => array( 'Talaan_ng_hinahadlangan', 'Talaan_ng_mga_hinahadlangan', 'Talaan_ng_hinahadlangang_IP' ),
+	'LinkSearch'                => array( 'Paghahanap_ng_kawing' ),
+	'Listadmins'                => array( 'Talaan_ng_mga_tagapangasiwa' ),
+	'Listbots'                  => array( 'Talaan_ng_mga_bot' ),
+	'Listfiles'                 => array( 'Itala_ang_mga_talaksan', 'Talaan_ng_mga_talaksan', 'Talaan_ng_mga_larawan' ),
+	'Listgrouprights'           => array( 'Talaan_ng_mga_karapatan_ng_pangkat' ),
+	'Listredirects'             => array( 'Talaan_ng_mga_pagturo_sa_ibang_pahina' ),
+	'Listusers'                 => array( 'Talaan_ng_mga_tagagamit', 'Talaan_ng_tagagamit' ),
+	'Lockdb'                    => array( 'Ikandado_ang_kalipunan_ng_datos' ),
+	'Log'                       => array( 'Tala', 'Mga_tala' ),
+	'Lonelypages'               => array( 'Nangungulilang_mga_pahina', 'Ulilang_mga_pahina' ),
+	'Longpages'                 => array( 'Mahabang_mga_pahina' ),
+	'MergeHistory'              => array( 'Pagsanibin_ang_kasaysayan' ),
+	'MIMEsearch'                => array( 'Paghahanap_ng_MIME' ),
+	'Mostcategories'            => array( 'Pinakamaraming_mga_kategorya' ),
+	'Mostimages'                => array( 'Mga_talaksang_may_pinakamaraming_kawing', 'Pinakamaraming_talaksan', 'Pinakamaraming_larawan' ),
+	'Mostlinked'                => array( 'Mga_pahinang_may_pinakamaraming_kawing', 'Pinakamaraming_kawing' ),
+	'Mostlinkedcategories'      => array( 'Mga_kategoryang_may_pinakamaraming_kawing', 'Pinakagamiting_mga_kategorya' ),
+	'Mostlinkedtemplates'       => array( 'Mga_suleras_na_may_pinakamaraming_kawing', 'Pinakagamiting_mga_suleras' ),
+	'Mostrevisions'             => array( 'Pinakamaraming_mga_pagbabago' ),
+	'Movepage'                  => array( 'Ilipat_ang_pahina' ),
+	'Mycontributions'           => array( 'Mga_ambag_ko' ),
+	'Mypage'                    => array( 'Pahina_ko' ),
+	'Mytalk'                    => array( 'Usapan_ko' ),
+	'Myuploads'                 => array( 'Mga_Pagkakarga_Kong_Paitaas' ),
+	'Newimages'                 => array( 'Bagong_mga_talaksan', 'Bagong_mga_larawan' ),
+	'Newpages'                  => array( 'Bagong_mga_pahina' ),
+	'PasswordReset'             => array( 'Muling_Pagtatakda_ng_Hudyat' ),
+	'PermanentLink'             => array( 'Pamalagiang_Kawing' ),
+	'Popularpages'              => array( 'Sikat_na_mga_pahina' ),
+	'Preferences'               => array( 'Mga_nais' ),
+	'Prefixindex'               => array( 'Talatuntunan_ng_unlapi' ),
+	'Protectedpages'            => array( 'Mga_pahinang_nakasanggalang' ),
+	'Protectedtitles'           => array( 'Mga_pamagat_na_nakasanggalang' ),
+	'Randompage'                => array( 'Alin_man', 'Alin_mang_pahina' ),
+	'Randomredirect'            => array( 'Pagtuturo_papunta_sa_alin_mang_pahina' ),
+	'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' ),
-	'Statistics'                => array( 'Mga estadistika', 'Estadistika' ),
-	'Tags'                      => array( 'Mga tatak' ),
-	'Uncategorizedcategories'   => array( 'Mga kauriang walang kaurian' ),
-	'Uncategorizedimages'       => array( 'Mga talaksang walang kaurian', 'Mga larawang walang kaurian' ),
-	'Uncategorizedpages'        => array( 'Mga pahinang walang kaurian' ),
-	'Uncategorizedtemplates'    => array( 'Mga suleras na walang kaurian' ),
-	'Undelete'                  => array( 'Huwag burahin' ),
-	'Unlockdb'                  => array( 'Huwag ikandado ang kalipunan ng dato' ),
-	'Unusedcategories'          => array( 'Hindi ginagamit na mga kaurian' ),
-	'Unusedimages'              => array( 'Hindi ginagamit na mga talaksan', 'Hindi ginagamit na mga larawan' ),
-	'Unusedtemplates'           => array( 'Mga suleras na hindi ginagamit' ),
-	'Unwatchedpages'            => array( 'Mga pahinang hindi binabantayanan' ),
+	'Shortpages'                => array( 'Maikling_mga_pahina' ),
+	'Specialpages'              => array( 'Natatanging_mga_pahina' ),
+	'Statistics'                => array( 'Mga_estadistika', 'Estadistika' ),
+	'Tags'                      => array( 'Mga_tatak' ),
+	'Unblock'                   => array( 'Huwag_hadlangan' ),
+	'Uncategorizedcategories'   => array( 'Mga_kauriang_walang_kaurian' ),
+	'Uncategorizedimages'       => array( 'Mga_talaksang_walang_kaurian', 'Mga_larawang_walang_kaurian' ),
+	'Uncategorizedpages'        => array( 'Mga_pahinang_walang_kaurian' ),
+	'Uncategorizedtemplates'    => array( 'Mga_suleras_na_walang_kaurian' ),
+	'Undelete'                  => array( 'Huwag_burahin' ),
+	'Unlockdb'                  => array( 'Huwag_ikandado_ang_kalipunan_ng_dato' ),
+	'Unusedcategories'          => array( 'Hindi_ginagamit_na_mga_kaurian' ),
+	'Unusedimages'              => array( 'Hindi_ginagamit_na_mga_talaksan', 'Hindi_ginagamit_na_mga_larawan' ),
+	'Unusedtemplates'           => array( 'Mga_suleras_na_hindi_ginagamit' ),
+	'Unwatchedpages'            => array( 'Mga_pahinang_hindi_binabantayanan' ),
 	'Upload'                    => array( 'Magkarga' ),
-	'Userlogin'                 => array( 'Paglagda ng tagagamit', 'Maglagda' ),
-	'Userlogout'                => array( 'Pag-alis sa pagkalagda ng tagagamit', 'AlisLagda' ),
-	'Userrights'                => array( 'Mga karapatan ng tagagamit' ),
-	'Version'                   => array( 'Bersyon' ),
-	'Wantedcategories'          => array( 'Ninanais na mga kaurian' ),
-	'Wantedfiles'               => array( 'Ninanais na mga talaksan' ),
-	'Wantedpages'               => array( 'Ninanais na mga pahina', 'Putol na mga kawing' ),
-	'Wantedtemplates'           => array( 'Ninanais na mga suleras' ),
-	'Watchlist'                 => array( 'Talaan ng binabantayan', 'Bantayan' ),
-	'Whatlinkshere'             => array( 'Ano ang nakakawing dito' ),
-	'Withoutinterwiki'          => array( 'Walang ugnayang-wiki' ),
+	'UploadStash'               => array( 'Pagkakarga_ng_mga_Nakatago' ),
+	'Userlogin'                 => array( 'Paglagda_ng_tagagamit', 'Maglagda' ),
+	'Userlogout'                => array( 'Pag-alis_sa_pagkalagda_ng_tagagamit', 'AlisLagda' ),
+	'Userrights'                => array( 'Mga_karapatan_ng_tagagamit' ),
+	'Version'                   => array( 'Bersiyon' ),
+	'Wantedcategories'          => array( 'Ninanais_na_mga_kaurian' ),
+	'Wantedfiles'               => array( 'Ninanais_na_mga_talaksan' ),
+	'Wantedpages'               => array( 'Ninanais_na_mga_pahina', 'Putol_na_mga_kawing' ),
+	'Wantedtemplates'           => array( 'Ninanais_na_mga_suleras' ),
+	'Watchlist'                 => array( 'Talaan_ng_binabantayan', 'Bantayan' ),
+	'Whatlinkshere'             => array( 'Ano_ang_nakakawing_dito' ),
+	'Withoutinterwiki'          => array( 'Walang_ugnayang-wiki' ),
 );
 
 $messages = array(
@@ -2999,7 +3013,7 @@ Maaaring dahil ito sa isang kawing sa isang nakatalang hinarang dahil di-kinaisn
 'pageinfo-authors' => 'Kabuuang bilang ng magkakabukod na mga may-akda',
 'pageinfo-recent-edits' => 'Kamakailang bilang ng mga pamamatnugot (sa loob ng huling $1)',
 'pageinfo-recent-authors' => 'Kamakailang bilang ng magkakabukod na mga may-akda',
-'pageinfo-restriction' => 'Pruteksiyon ng pahina (<code>$1</code>)',
+'pageinfo-restriction' => 'Pruteksiyon ng pahina (<code>{{lcfirst:$1}}</code>)',
 'pageinfo-magic-words' => '{{PLURAL:$1|Salita|Mga salita}}ng mahiwaga ($1)',
 'pageinfo-hidden-categories' => 'Nakatagong {{PLURAL:$1|kategorya|mga kategorya}} ($1)',
 'pageinfo-templates' => '{{PLURAL:$1|Suleras|Mga suleras}} ($1) na nasa transklusyon (kasama sa maraming mga lugar)',
diff --git a/languages/messages/MessagesTly.php b/languages/messages/MessagesTly.php
index ac88d59368..05b2808e29 100644
--- a/languages/messages/MessagesTly.php
+++ b/languages/messages/MessagesTly.php
@@ -19,17 +19,142 @@ $namespaceNames = array(
 	NS_TALK             => 'Nopegət',
 	NS_USER             => 'Okoədə',
 	NS_USER_TALK        => 'Okoədəj_nopegət',
-	NS_PROJECT_TALK     => '$1_Nopegətəti',
+	NS_PROJECT_TALK     => '$1_Nopegət',
 	NS_FILE             => 'Fajl',
-	NS_FILE_TALK        => 'Fajli_nopegət',
+	NS_FILE_TALK        => 'Fajl_nopegət',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'MediaWiki_nopegət',
 	NS_TEMPLATE         => 'Numunə',
 	NS_TEMPLATE_TALK    => 'Numunə_nopegət',
 	NS_HELP             => 'Koməg',
-	NS_HELP_TALK        => 'Koməgi_nopegət',
+	NS_HELP_TALK        => 'Koməg_nopegət',
 	NS_CATEGORY         => 'Tispir',
-	NS_CATEGORY_TALK    => 'Tispiron_nopegət',
+	NS_CATEGORY_TALK    => 'Tispir_nopegət',
+);
+
+$namespaceAliases = array(
+	'$1_Nopegətəti'    => NS_PROJECT_TALK,
+	'Fajli_nopegət'    => NS_FILE_TALK,
+	'Koməgi_nopegət'   => NS_HELP_TALK,
+	'Tispiron_nopegət' => NS_CATEGORY_TALK,
+);
+
+$specialPageAliases = array(
+	'Allpages'                  => array( 'Һәммәј_сәһифон' ),
+	'Blankpage'                 => array( 'Тәјлијә_сәһифә' ),
+	'ChangeEmail'               => array( 'Е-номә_дәгиш_кардеј' ),
+	'ChangePassword'            => array( 'Пароли_дәгиш_кардеј' ),
+	'Emailuser'                 => array( 'Бә_иштирокәкә_номә_вығандеј' ),
+	'Longpages'                 => array( 'Дырозә_сәһифон' ),
+	'Movepage'                  => array( 'Сәһифә_номи_дәгиш_кардеј' ),
+	'Mypage'                    => array( 'Чымы_сәһифә' ),
+	'Mytalk'                    => array( 'Чымы_мызокирә' ),
+	'Myuploads'                 => array( 'Чымы_бо_жә_быә_чијон' ),
+	'Newimages'                 => array( 'Нујә_фајлон' ),
+	'Newpages'                  => array( 'Нујә_сәһифон' ),
+	'PasswordReset'             => array( 'Пароли_ләғв_кардеј' ),
+	'Protectedpages'            => array( 'Мыдофијә_кардә_быә_сәһифон' ),
+	'Protectedtitles'           => array( 'Мыдофијә_кардә_быә_номон' ),
+	'Randompage'                => array( 'Рајрастә_сәһифә._Рајрастә' ),
+	'Recentchanges'             => array( 'Ән_нујә_дәгишон' ),
+	'Recentchangeslinked'       => array( 'Ангыл_кардә_быә_дәгишон' ),
+	'Revisiondelete'            => array( 'Рәдд_кардә_быә_дәгишон' ),
+	'Search'                    => array( 'Нәве' ),
+	'Shortpages'                => array( 'Кыртә_сәһифон' ),
+	'Tags'                      => array( 'Нышонон' ),
+	'Undelete'                  => array( 'Бәрпо_кардеј' ),
+	'Version'                   => array( 'Рәвојәт' ),
+);
+
+$magicWords = array(
+	'redirect'                  => array( '0', '#ТОЖӘДӘН_ИСТИҒОМӘТ_ДОЈ', '#REDIRECT' ),
+	'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' ),
+	'currentmonthnamegen'       => array( '1', 'ЕСӘТНӘ_МАНГИ_НОМ_ҸИНС', 'CURRENTMONTHNAMEGEN' ),
+	'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' ),
+	'localmonth'                => array( '1', 'БУМИНӘ_МАНГ', 'БУМИНӘ_МАНГ_2', 'LOCALMONTH', 'LOCALMONTH2' ),
+	'localmonth1'               => array( '1', 'БУМИНӘ_МАНГ_1', 'LOCALMONTH1' ),
+	'localmonthname'            => array( '1', 'БУМИНӘ_МАНГИ_НОМ', 'LOCALMONTHNAME' ),
+	'localmonthnamegen'         => array( '1', 'БУМИНӘ_МАНГИ_НОМ_ҸИНС', 'LOCALMONTHNAMEGEN' ),
+	'localday'                  => array( '1', 'БУМИНӘ_РУЖ', 'LOCALDAY' ),
+	'localday2'                 => array( '1', 'БУМИНӘ_РУЖ_2', 'LOCALDAY2' ),
+	'localdayname'              => array( '1', 'БУМИНӘ_РУЖИ_НОМ', 'LOCALDAYNAME' ),
+	'localyear'                 => array( '1', 'БУМИНӘ_СОР', 'LOCALYEAR' ),
+	'localtime'                 => array( '1', 'БУМИНӘ_ВАХТ', 'LOCALTIME' ),
+	'localhour'                 => array( '1', 'БУМИНӘ_СААТ', 'LOCALHOUR' ),
+	'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', 'СӘҺИФӘ_НОМ_2', 'PAGENAMEE' ),
+	'namespace'                 => array( '1', 'НОМОН_МӘКОН', 'NAMESPACE' ),
+	'namespacee'                => array( '1', 'НОМОН_МӘКОН_2', 'NAMESPACEE' ),
+	'namespacenumber'           => array( '1', 'НОМОН_МӘКОН_ҒӘДӘР', 'NAMESPACENUMBER' ),
+	'talkspace'                 => array( '1', 'МЫЗОКИРОН_МӘКОН', 'TALKSPACE' ),
+	'talkspacee'                => array( '1', 'МЫЗОКИРОН_МӘКОН_2', 'TALKSPACEE' ),
+	'subjectspace'              => array( '1', 'МӘҒОЛОН_МӘКОН', 'SUBJECTSPACE', 'ARTICLESPACE' ),
+	'subjectspacee'             => array( '1', 'МӘҒОЛОН_МӘКОН_2', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
+	'fullpagename'              => array( '1', 'СӘҺИФӘ_ПУРӘ_НОМ', 'FULLPAGENAME' ),
+	'fullpagenamee'             => array( '1', 'СӘҺИФӘ_ПУРӘ_НОМ_2', 'FULLPAGENAMEE' ),
+	'subpagename'               => array( '1', 'ЖИНТОНӘДӘ_СӘҺИФӘ_НОМ', 'SUBPAGENAME' ),
+	'subpagenamee'              => array( '1', 'ЖИНТОНӘДӘ_СӘҺИФӘ_НОМ_2', 'SUBPAGENAMEE' ),
+	'basepagename'              => array( '1', 'СӘҺИФӘ_НОМИ_ӘСОС', 'BASEPAGENAME' ),
+	'basepagenamee'             => array( '1', 'СӘҺИФӘ_НОМИ_ӘСОС_2', 'BASEPAGENAMEE' ),
+	'talkpagename'              => array( '1', 'МЫЗОКИРӘ_СӘҺИФӘ_НОМ', 'TALKPAGENAME' ),
+	'talkpagenamee'             => array( '1', 'МЫЗОКИРӘ_СӘҺИФӘ_НОМ_2', 'TALKPAGENAMEE' ),
+	'subjectpagename'           => array( '1', 'МӘҒОЛӘ_СӘҺИФӘ_НОМ', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
+	'subjectpagenamee'          => array( '1', 'МӘҒОЛӘ_СӘҺИФӘ_НОМ_2', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
+	'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пкс', '$1px' ),
+	'img_center'                => array( '1', 'мәрәнго', 'center', 'centre' ),
+	'img_page'                  => array( '1', 'сәһифә=$1', 'сәһифә_$1', 'page=$1', 'page $1' ),
+	'sitename'                  => array( '1', 'САЈТИ_НОМ', 'SITENAME' ),
+	'localurl'                  => array( '0', 'БУМИНӘ_УНВОН:', 'LOCALURL:' ),
+	'localurle'                 => array( '0', 'БУМИНӘ_УНВОН_2:', 'LOCALURLE:' ),
+	'currentweek'               => array( '1', 'ЕСӘТНӘ_ҺАФТӘ', 'CURRENTWEEK' ),
+	'currentdow'                => array( '1', 'ЕСӘТНӘ_ҺАФТӘ_РУЖ', 'CURRENTDOW' ),
+	'localweek'                 => array( '1', 'БУМИНӘ_ҺАФТӘ', 'LOCALWEEK' ),
+	'localdow'                  => array( '1', 'БУМИНӘ_ҺАФТӘ_РУЖ', 'LOCALDOW' ),
+	'revisionid'                => array( '1', 'РӘВОЈӘТИ_ID', 'REVISIONID' ),
+	'revisionday'               => array( '1', 'РӘВОЈӘТИ_РУЖ', 'REVISIONDAY' ),
+	'revisionday2'              => array( '1', 'РӘВОЈӘТИ_РУЖ_2', 'REVISIONDAY2' ),
+	'revisionmonth'             => array( '1', 'РӘВОЈӘТИ_МАНГ', 'REVISIONMONTH' ),
+	'revisionmonth1'            => array( '1', 'РӘВОЈӘТИ_МАНГ_2', 'REVISIONMONTH1' ),
+	'revisionyear'              => array( '1', 'РӘВОЈӘТИ_СОР', 'REVISIONYEAR' ),
+	'revisiontimestamp'         => array( '1', 'РӘВОЈӘТИ_ВАХТИ_ҒЕЈД', 'REVISIONTIMESTAMP' ),
+	'revisionuser'              => array( '1', 'ИШТИРОКӘКӘ_РӘВОЈӘТ', 'REVISIONUSER' ),
+	'fullurl'                   => array( '0', 'ПУРӘ_УНВОН:', 'FULLURL:' ),
+	'fullurle'                  => array( '0', 'ПУРӘ_УНВОН_2:', 'FULLURLE:' ),
+	'currentversion'            => array( '1', 'ЕСӘТНӘ_РӘВОЈӘТ', 'CURRENTVERSION' ),
+	'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:' ),
+	'pagesize'                  => array( '1', 'СӘҺИФӘ_ПАМЈӘ', 'PAGESIZE' ),
+	'url_wiki'                  => array( '0', 'ВИКИ', 'WIKI' ),
 );
 
 $messages = array(
diff --git a/languages/messages/MessagesTpi.php b/languages/messages/MessagesTpi.php
index 3ce9a38f11..00e4e5b2c7 100644
--- a/languages/messages/MessagesTpi.php
+++ b/languages/messages/MessagesTpi.php
@@ -15,6 +15,24 @@
  * @author לערי ריינהארט
  */
 
+$namespaceNames = array(
+	NS_SPECIAL          => 'Sipesol',
+	NS_TALK             => 'Toktok',
+	NS_USER             => 'Yusa',
+	NS_USER_TALK        => 'Toktok_bilong_yusa',
+	NS_PROJECT_TALK     => '$1_toktok',
+	NS_FILE             => 'Fail',
+	NS_FILE_TALK        => 'Toktok_bilong_fail',
+	NS_MEDIAWIKI        => 'MediaWiki',
+	NS_MEDIAWIKI_TALK   => 'Toktok_bilong_mediawiki',
+	NS_TEMPLATE         => 'Templet',
+	NS_TEMPLATE_TALK    => 'Toktok_bilong_templet',
+	NS_HELP             => 'Halivim',
+	NS_HELP_TALK        => 'Toktok_bilong_halivim',
+	NS_CATEGORY         => 'Grup',
+	NS_CATEGORY_TALK    => 'Toktok_bilong_grup',
+);
+
 $specialPageAliases = array(
 	'Confirmemail'              => array( 'Orait long imel' ),
 	'Contributions'             => array( 'Ol senis bilong yusa' ),
diff --git a/languages/messages/MessagesTr.php b/languages/messages/MessagesTr.php
index 67a7b33a75..eb0155c6d0 100644
--- a/languages/messages/MessagesTr.php
+++ b/languages/messages/MessagesTr.php
@@ -138,7 +138,7 @@ $specialPageAliases = array(
 	'PasswordReset'             => array( 'ParolaSıfırlama' ),
 	'PermanentLink'             => array( 'KalıcıBağ' ),
 	'Popularpages'              => array( 'PopülerSayfalar' ),
-	'Preferences'               => array( 'Tercihler' ),
+	'Preferences'               => array( 'Tercihler', 'Ayarlar' ),
 	'Prefixindex'               => array( 'ÖnekDizini' ),
 	'Protectedpages'            => array( 'KorunanSayfalar' ),
 	'Protectedtitles'           => array( 'KorunanBaşlıklar' ),
@@ -179,142 +179,144 @@ $specialPageAliases = array(
 );
 
 $magicWords = array(
-	'redirect'                => array( '0', '#YÖNLENDİRME', '#YÖNLENDİR', '#REDIRECT' ),
-	'notoc'                   => array( '0', '__İÇİNDEKİLERYOK__', '__NOTOC__' ),
-	'nogallery'               => array( '0', '__GALERÄ°YOK__', '__NOGALLERY__' ),
-	'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' ),
-	'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' ),
-	'currentdayname'          => array( '1', 'MEVCUTGÜNADI', 'GÜNCELGÜNADI', 'CURRENTDAYNAME' ),
-	'currentyear'             => array( '1', 'MEVCUTYIL', 'GÜNCELYIL', 'CURRENTYEAR' ),
-	'currenttime'             => array( '1', 'MEVCUTZAMAN', 'GÜNCELZAMAN', 'CURRENTTIME' ),
-	'currenthour'             => array( '1', 'MEVCUTSAAT', 'GÜNCELSAAT', 'CURRENTHOUR' ),
-	'localmonth'              => array( '1', 'YERELAY', 'YERELAY2', 'LOCALMONTH', 'LOCALMONTH2' ),
-	'localmonth1'             => array( '1', 'YERELAY1', 'LOCALMONTH1' ),
-	'localmonthname'          => array( '1', 'YERELAYADI', 'LOCALMONTHNAME' ),
-	'localmonthnamegen'       => array( '1', 'YERELAYADIÄ°YELÄ°K', 'LOCALMONTHNAMEGEN' ),
-	'localmonthabbrev'        => array( '1', 'YERELAYKISALTMASI', 'LOCALMONTHABBREV' ),
-	'localday'                => array( '1', 'YERELGÜN', 'LOCALDAY' ),
-	'localday2'               => array( '1', 'YERELGÜN2', 'LOCALDAY2' ),
-	'localdayname'            => array( '1', 'YERELGÜNADI', 'LOCALDAYNAME' ),
-	'localyear'               => array( '1', 'YERELYIL', 'LOCALYEAR' ),
-	'localtime'               => array( '1', 'YERELZAMAN', 'LOCALTIME' ),
-	'localhour'               => array( '1', 'YERELSAAT', 'LOCALHOUR' ),
-	'numberofpages'           => array( '1', 'SAYFASAYISI', 'NUMBEROFPAGES' ),
-	'numberofarticles'        => array( '1', 'MADDESAYISI', 'NUMBEROFARTICLES' ),
-	'numberoffiles'           => array( '1', 'DOSYASAYISI', 'NUMBEROFFILES' ),
-	'numberofusers'           => array( '1', 'KULLANICISAYISI', 'NUMBEROFUSERS' ),
-	'numberofactiveusers'     => array( '1', 'AKTÄ°FKULLANICISAYISI', 'ETKÄ°NKULLANICISAYISI', 'NUMBEROFACTIVEUSERS' ),
-	'numberofedits'           => array( '1', 'DEĞİŞİKLİKSAYISI', 'NUMBEROFEDITS' ),
-	'numberofviews'           => array( '1', 'GÖRÜNTÜLEMESAYISI', 'NUMBEROFVIEWS' ),
-	'pagename'                => array( '1', 'SAYFAADI', 'PAGENAME' ),
-	'pagenamee'               => array( '1', 'SAYFAADIU', 'PAGENAMEE' ),
-	'namespace'               => array( '1', 'ADALANI', 'Ä°SÄ°MALANI', 'NAMESPACE' ),
-	'namespacee'              => array( '1', 'ADALANIU', 'Ä°SÄ°MALANIU', 'NAMESPACEE' ),
-	'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' ),
-	'subjectspacee'           => array( '1', 'KONUALANIU', 'MADDEALANIU', 'KONUBOŞLUĞUU', 'MADDEBOŞLUĞUU', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
-	'fullpagename'            => array( '1', 'TAMSAYFAADI', 'FULLPAGENAME' ),
-	'fullpagenamee'           => array( '1', 'TAMSAYFAADIU', 'FULLPAGENAMEE' ),
-	'subpagename'             => array( '1', 'ALTSAYFAADI', 'SUBPAGENAME' ),
-	'subpagenamee'            => array( '1', 'ALTSAYFAADIU', 'SUBPAGENAMEE' ),
-	'basepagename'            => array( '1', 'ÜSTSAYFAADI', 'BASEPAGENAME' ),
-	'basepagenamee'           => array( '1', 'ÜSTSAYFAADIU', 'BASEPAGENAMEE' ),
-	'talkpagename'            => array( '1', 'TARTIŞMASAYFASIADI', 'TALKPAGENAME' ),
-	'talkpagenamee'           => array( '1', 'TARTIŞMASAYFASIADIU', 'TALKPAGENAMEE' ),
-	'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:' ),
-	'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' ),
-	'img_left'                => array( '1', 'sol', 'left' ),
-	'img_none'                => array( '1', 'yok', 'none' ),
-	'img_width'               => array( '1', '$1pik', '$1piksel', '$1px' ),
-	'img_center'              => array( '1', 'orta', 'center', 'centre' ),
-	'img_framed'              => array( '1', 'çerçeveli', 'çerçeve', 'framed', 'enframed', 'frame' ),
-	'img_frameless'           => array( '1', 'çerçevesiz', 'frameless' ),
-	'img_page'                => array( '1', 'sayfa=$1', 'sayfa $1', 'page=$1', 'page $1' ),
-	'img_upright'             => array( '1', 'dikey', 'dikey=$1', 'dikey $1', 'upright', 'upright=$1', 'upright $1' ),
-	'img_border'              => array( '1', 'sınır', 'border' ),
-	'img_baseline'            => array( '1', 'tabançizgisi', 'altçizgi', 'baseline' ),
-	'img_sub'                 => array( '1', 'alt', 'sub' ),
-	'img_super'               => array( '1', 'üst', 'üs', 'super', 'sup' ),
-	'img_top'                 => array( '1', 'tavan', 'tepe', 'top' ),
-	'img_text_top'            => array( '1', 'metin-tavan', 'metin-tepe', 'text-top' ),
-	'img_middle'              => array( '1', 'merkez', 'middle' ),
-	'img_bottom'              => array( '1', 'taban', 'bottom' ),
-	'img_text_bottom'         => array( '1', 'metin-taban', 'text-bottom' ),
-	'img_link'                => array( '1', 'bağlantı=$1', 'link=$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:' ),
-	'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:' ),
-	'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__' ),
-	'currentweek'             => array( '1', 'MEVCUTHAFTA', 'GÜNCELHAFTA', 'CURRENTWEEK' ),
-	'currentdow'              => array( '1', 'MEVCUTHAFTANINGÜNÜ', 'GÜNCELHAFTANINGÜNÜ', 'CURRENTDOW' ),
-	'localweek'               => array( '1', 'YERELHAFTA', 'LOCALWEEK' ),
-	'localdow'                => array( '1', 'YERELHAFTANINGÜNÜ', 'LOCALDOW' ),
-	'revisionid'              => array( '1', 'SÜRÜMNU', 'SÜRÜMNO', 'REVİZYONNU', 'REVİZYONNO', 'REVISIONID' ),
-	'revisionday'             => array( '1', 'SÜRÜMGÜNÜ', 'REVISIONDAY' ),
-	'revisionday2'            => array( '1', 'SÜRÜMGÜNÜ2', 'REVISIONDAY2' ),
-	'revisionmonth'           => array( '1', 'SÜRÜMAYI', 'REVISIONMONTH' ),
-	'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:' ),
-	'lcfirst'                 => array( '0', 'KHÄ°LK:', 'LCFIRST:' ),
-	'ucfirst'                 => array( '0', 'BHÄ°LK:', 'UCFIRST:' ),
-	'lc'                      => array( '0', 'KH:', 'LC:' ),
-	'uc'                      => array( '0', 'BH:', 'UC:' ),
-	'raw'                     => array( '0', 'HAM:', 'RAW:' ),
-	'displaytitle'            => array( '1', 'BAŞLIKGÖSTER', 'DISPLAYTITLE' ),
-	'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' ),
-	'currenttimestamp'        => array( '1', 'MEVCUTZAMANBİLGİSİ', 'GÜNCELZAMANBİLGİSİ', 'CURRENTTIMESTAMP' ),
-	'localtimestamp'          => array( '1', 'YERELZAMANBÄ°LGÄ°SÄ°', 'LOCALTIMESTAMP' ),
-	'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' ),
-	'special'                 => array( '0', 'özel', 'special' ),
-	'defaultsort'             => array( '1', 'VARSAYILANSIRALA:', 'VARSAYILANSIRALAMAANAHTARI:', 'VARSAYILANKATEGORÄ°SIRALA:', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:' ),
-	'filepath'                => array( '0', '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' ),
-	'pagesize'                => array( '1', 'SAYFABOYUTU', 'PAGESIZE' ),
-	'index'                   => array( '1', '__DÄ°ZÄ°N__', '__ENDEKS__', '__INDEX__' ),
-	'noindex'                 => array( '1', '__DÄ°ZÄ°NYOK__', '__ENDEKSYOK__', '__NOINDEX__' ),
-	'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' ),
-	'url_wiki'                => array( '0', 'VÄ°KÄ°', 'WIKI' ),
+	'redirect'                  => array( '0', '#YÖNLENDİRME', '#YÖNLENDİR', '#REDIRECT' ),
+	'notoc'                     => array( '0', '__İÇİNDEKİLERYOK__', '__NOTOC__' ),
+	'nogallery'                 => array( '0', '__GALERÄ°YOK__', '__NOGALLERY__' ),
+	'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' ),
+	'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' ),
+	'currentdayname'            => array( '1', 'MEVCUTGÜNADI', 'GÜNCELGÜNADI', 'CURRENTDAYNAME' ),
+	'currentyear'               => array( '1', 'MEVCUTYIL', 'GÜNCELYIL', 'CURRENTYEAR' ),
+	'currenttime'               => array( '1', 'MEVCUTZAMAN', 'GÜNCELZAMAN', 'CURRENTTIME' ),
+	'currenthour'               => array( '1', 'MEVCUTSAAT', 'GÜNCELSAAT', 'CURRENTHOUR' ),
+	'localmonth'                => array( '1', 'YERELAY', 'YERELAY2', 'LOCALMONTH', 'LOCALMONTH2' ),
+	'localmonth1'               => array( '1', 'YERELAY1', 'LOCALMONTH1' ),
+	'localmonthname'            => array( '1', 'YERELAYADI', 'LOCALMONTHNAME' ),
+	'localmonthnamegen'         => array( '1', 'YERELAYADIÄ°YELÄ°K', 'LOCALMONTHNAMEGEN' ),
+	'localmonthabbrev'          => array( '1', 'YERELAYKISALTMASI', 'LOCALMONTHABBREV' ),
+	'localday'                  => array( '1', 'YERELGÜN', 'LOCALDAY' ),
+	'localday2'                 => array( '1', 'YERELGÜN2', 'LOCALDAY2' ),
+	'localdayname'              => array( '1', 'YERELGÜNADI', 'LOCALDAYNAME' ),
+	'localyear'                 => array( '1', 'YERELYIL', 'LOCALYEAR' ),
+	'localtime'                 => array( '1', 'YERELZAMAN', 'LOCALTIME' ),
+	'localhour'                 => array( '1', 'YERELSAAT', 'LOCALHOUR' ),
+	'numberofpages'             => array( '1', 'SAYFASAYISI', 'NUMBEROFPAGES' ),
+	'numberofarticles'          => array( '1', 'MADDESAYISI', 'NUMBEROFARTICLES' ),
+	'numberoffiles'             => array( '1', 'DOSYASAYISI', 'NUMBEROFFILES' ),
+	'numberofusers'             => array( '1', 'KULLANICISAYISI', 'NUMBEROFUSERS' ),
+	'numberofactiveusers'       => array( '1', 'AKTÄ°FKULLANICISAYISI', 'ETKÄ°NKULLANICISAYISI', 'NUMBEROFACTIVEUSERS' ),
+	'numberofedits'             => array( '1', 'DEĞİŞİKLİKSAYISI', 'NUMBEROFEDITS' ),
+	'numberofviews'             => array( '1', 'GÖRÜNTÜLEMESAYISI', 'NUMBEROFVIEWS' ),
+	'pagename'                  => array( '1', 'SAYFAADI', 'PAGENAME' ),
+	'pagenamee'                 => array( '1', 'SAYFAADIU', 'PAGENAMEE' ),
+	'namespace'                 => array( '1', 'ADALANI', 'Ä°SÄ°MALANI', 'NAMESPACE' ),
+	'namespacee'                => array( '1', 'ADALANIU', 'Ä°SÄ°MALANIU', 'NAMESPACEE' ),
+	'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' ),
+	'subjectspacee'             => array( '1', 'KONUALANIU', 'MADDEALANIU', 'KONUBOŞLUĞUU', 'MADDEBOŞLUĞUU', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
+	'fullpagename'              => array( '1', 'TAMSAYFAADI', 'FULLPAGENAME' ),
+	'fullpagenamee'             => array( '1', 'TAMSAYFAADIU', 'FULLPAGENAMEE' ),
+	'subpagename'               => array( '1', 'ALTSAYFAADI', 'SUBPAGENAME' ),
+	'subpagenamee'              => array( '1', 'ALTSAYFAADIU', 'SUBPAGENAMEE' ),
+	'basepagename'              => array( '1', 'ÜSTSAYFAADI', 'BASEPAGENAME' ),
+	'basepagenamee'             => array( '1', 'ÜSTSAYFAADIU', 'BASEPAGENAMEE' ),
+	'talkpagename'              => array( '1', 'TARTIŞMASAYFASIADI', 'TALKPAGENAME' ),
+	'talkpagenamee'             => array( '1', 'TARTIŞMASAYFASIADIU', 'TALKPAGENAMEE' ),
+	'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:' ),
+	'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' ),
+	'img_left'                  => array( '1', 'sol', 'left' ),
+	'img_none'                  => array( '1', 'yok', 'none' ),
+	'img_width'                 => array( '1', '$1pik', '$1piksel', '$1px' ),
+	'img_center'                => array( '1', 'orta', 'center', 'centre' ),
+	'img_framed'                => array( '1', 'çerçeveli', 'çerçeve', 'framed', 'enframed', 'frame' ),
+	'img_frameless'             => array( '1', 'çerçevesiz', 'frameless' ),
+	'img_page'                  => array( '1', 'sayfa=$1', 'sayfa $1', 'page=$1', 'page $1' ),
+	'img_upright'               => array( '1', 'dikey', 'dikey=$1', 'dikey $1', 'upright', 'upright=$1', 'upright $1' ),
+	'img_border'                => array( '1', 'sınır', 'border' ),
+	'img_baseline'              => array( '1', 'tabançizgisi', 'altçizgi', 'baseline' ),
+	'img_sub'                   => array( '1', 'alt', 'sub' ),
+	'img_super'                 => array( '1', 'üst', 'üs', 'super', 'sup' ),
+	'img_top'                   => array( '1', 'tavan', 'tepe', 'top' ),
+	'img_text_top'              => array( '1', 'metin-tavan', 'metin-tepe', 'text-top' ),
+	'img_middle'                => array( '1', 'merkez', 'middle' ),
+	'img_bottom'                => array( '1', 'taban', 'bottom' ),
+	'img_text_bottom'           => array( '1', 'metin-taban', 'text-bottom' ),
+	'img_link'                  => array( '1', 'bağlantı=$1', 'link=$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:' ),
+	'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:' ),
+	'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__' ),
+	'currentweek'               => array( '1', 'MEVCUTHAFTA', 'GÜNCELHAFTA', 'CURRENTWEEK' ),
+	'currentdow'                => array( '1', 'MEVCUTHAFTANINGÜNÜ', 'GÜNCELHAFTANINGÜNÜ', 'CURRENTDOW' ),
+	'localweek'                 => array( '1', 'YERELHAFTA', 'LOCALWEEK' ),
+	'localdow'                  => array( '1', 'YERELHAFTANINGÜNÜ', 'LOCALDOW' ),
+	'revisionid'                => array( '1', 'SÜRÜMNU', 'SÜRÜMNO', 'REVİZYONNU', 'REVİZYONNO', 'REVISIONID' ),
+	'revisionday'               => array( '1', 'SÜRÜMGÜNÜ', 'REVISIONDAY' ),
+	'revisionday2'              => array( '1', 'SÜRÜMGÜNÜ2', 'REVISIONDAY2' ),
+	'revisionmonth'             => array( '1', 'SÜRÜMAYI', 'REVISIONMONTH' ),
+	'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:' ),
+	'lcfirst'                   => array( '0', 'KHÄ°LK:', 'LCFIRST:' ),
+	'ucfirst'                   => array( '0', 'BHÄ°LK:', 'UCFIRST:' ),
+	'lc'                        => array( '0', 'KH:', 'LC:' ),
+	'uc'                        => array( '0', 'BH:', 'UC:' ),
+	'raw'                       => array( '0', 'HAM:', 'RAW:' ),
+	'displaytitle'              => array( '1', 'BAŞLIKGÖSTER', 'DISPLAYTITLE' ),
+	'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' ),
+	'currenttimestamp'          => array( '1', 'MEVCUTZAMANBİLGİSİ', 'GÜNCELZAMANBİLGİSİ', 'CURRENTTIMESTAMP' ),
+	'localtimestamp'            => array( '1', 'YERELZAMANBÄ°LGÄ°SÄ°', 'LOCALTIMESTAMP' ),
+	'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' ),
+	'special'                   => array( '0', 'özel', 'special' ),
+	'defaultsort'               => array( '1', 'VARSAYILANSIRALA:', 'VARSAYILANSIRALAMAANAHTARI:', 'VARSAYILANKATEGORÄ°SIRALA:', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:' ),
+	'filepath'                  => array( '0', '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' ),
+	'pagesize'                  => array( '1', 'SAYFABOYUTU', 'PAGESIZE' ),
+	'index'                     => array( '1', '__DÄ°ZÄ°N__', '__ENDEKS__', '__INDEX__' ),
+	'noindex'                   => array( '1', '__DÄ°ZÄ°NYOK__', '__ENDEKSYOK__', '__NOINDEX__' ),
+	'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' ),
+	'url_wiki'                  => array( '0', 'VÄ°KÄ°', 'WIKI' ),
 );
 
 $separatorTransformTable = array( ',' => '.', '.' => ',' );
@@ -586,6 +588,8 @@ $1',
 'youhavenewmessages' => 'Yeni $1 var ($2).',
 'newmessageslink' => 'mesajınız',
 'newmessagesdifflink' => 'son değişiklik',
+'newmessageslinkplural' => 'mesajınız',
+'newmessagesdifflinkplural' => 'son {{PLURAL:$1|değişiklik|değişiklikler}}',
 'youhavenewmessagesmulti' => "$1'de yeni mesajınız var.",
 'editsection' => 'düzenle',
 'editold' => 'değiştir',
diff --git a/languages/messages/MessagesTru.php b/languages/messages/MessagesTru.php
index 061e4a804d..907689054f 100644
--- a/languages/messages/MessagesTru.php
+++ b/languages/messages/MessagesTru.php
@@ -162,8 +162,8 @@ $messages = array(
 'aboutsite' => '3al {{SITENAME}}',
 'aboutpage' => 'Project: 3al',
 'copyrightpage' => '{{ns:project}}:Ḥaqat duKaṭowo',
-'currentevents' => 'Gedşe du³do',
-'currentevents-url' => 'Project:Gedşe du3do',
+'currentevents' => 'Gedşe ḥaṭe',
+'currentevents-url' => 'Project:Gedşe du³do',
 'disclaimers' => 'Disclaimers',
 'disclaimerpage' => 'Project: Disclaimer gawonoyo',
 'edithelp' => 'Editing help',
diff --git a/languages/messages/MessagesTt_cyrl.php b/languages/messages/MessagesTt_cyrl.php
index bcf74ec10e..c4b7190470 100644
--- a/languages/messages/MessagesTt_cyrl.php
+++ b/languages/messages/MessagesTt_cyrl.php
@@ -172,38 +172,38 @@ $specialPageAliases = array(
 );
 
 $magicWords = array(
-	'redirect'                => array( '0', '#ЮНӘЛТҮ', '#перенаправление', '#перенапр', '#REDIRECT' ),
-	'notoc'                   => array( '0', '__БАШЛЫКЮК__', '__БЕЗ_ОГЛАВЛЕНИЯ__', '__БЕЗ_ОГЛ__', '__NOTOC__' ),
-	'forcetoc'                => array( '0', '__ETTIQ__', '__ОБЯЗ_ОГЛ__', '__ОБЯЗАТЕЛЬНОЕ_ОГЛАВЛЕНИЕ__', '__FORCETOC__' ),
-	'toc'                     => array( '0', '__ЭЧТЕЛЕК__', '__ОГЛАВЛЕНИЕ__', '__ОГЛ__', '__TOC__' ),
-	'noeditsection'           => array( '0', '__БҮЛЕКҮЗГӘРТҮЮК__', '__БЕЗ_РЕДАКТИРОВАНИЯ_РАЗДЕЛА__', '__NOEDITSECTION__' ),
-	'currentmonth'            => array( '1', 'АГЫМДАГЫ_АЙ', 'АГЫМДАГЫ_АЙ2', 'ТЕКУЩИЙ_МЕСЯЦ', 'ТЕКУЩИЙ_МЕСЯЦ_2', 'CURRENTMONTH', 'CURRENTMONTH2' ),
-	'currentmonthname'        => array( '1', 'АГЫМДАГЫ_АЙ_ИСЕМЕ', 'НАЗВАНИЕ_ТЕКУЩЕГО_МЕСЯЦА', 'CURRENTMONTHNAME' ),
-	'currentmonthnamegen'     => array( '1', 'АГЫМДАГЫ_АЙ_ИСЕМЕ_GEN', 'НАЗВАНИЕ_ТЕКУЩЕГО_МЕСЯЦА_РОД', 'CURRENTMONTHNAMEGEN' ),
-	'currentday'              => array( '1', 'АГЫМДАГЫ_КӨН', 'ТЕКУЩИЙ_ДЕНЬ', 'CURRENTDAY' ),
-	'currentday2'             => array( '1', 'АГЫМДАГЫ_КӨН2', 'ТЕКУЩИЙ_ДЕНЬ_2', 'CURRENTDAY2' ),
-	'currentdayname'          => array( '1', 'АГЫМДАГЫ_КӨН_ИСЕМЕ', 'НАЗВАНИЕ_ТЕКУЩЕГО_ДНЯ', 'CURRENTDAYNAME' ),
-	'currentyear'             => array( '1', 'АГЫМДАГЫ_ЕЛ', 'ТЕКУЩИЙ_ГОД', 'CURRENTYEAR' ),
-	'currenttime'             => array( '1', 'АГЫМДАГЫ_ВАКЫТ', 'ТЕКУЩЕЕ_ВРЕМЯ', 'CURRENTTIME' ),
-	'numberofarticles'        => array( '1', 'МӘКАЛӘ_САНЫ', 'КОЛИЧЕСТВО_СТАТЕЙ', 'NUMBEROFARTICLES' ),
-	'pagename'                => array( '1', 'БИТ_ИСЕМЕ', 'НАЗВАНИЕ_СТРАНИЦЫ', 'PAGENAME' ),
-	'namespace'               => array( '1', 'ИСЕМНӘР_МӘЙДАНЫ', 'ПРОСТРАНСТВО_ИМЁН', 'NAMESPACE' ),
-	'msg'                     => array( '0', 'ХӘБӘР', 'СООБЩЕНИЕ:', 'СООБЩ:', 'MSG:' ),
-	'subst'                   => array( '0', 'TÖPÇEK:', 'ПОДСТ:', 'ПОДСТАНОВКА:', 'SUBST:' ),
-	'img_right'               => array( '1', 'уңда', 'справа', 'right' ),
-	'img_left'                => array( '1', 'сулда', 'слева', 'left' ),
-	'img_none'                => array( '1', 'юк', 'без', 'none' ),
-	'img_width'               => array( '1', '$1пкс', '$1px' ),
-	'img_center'              => array( '1', 'үзәк', 'центр', 'center', 'centre' ),
-	'int'                     => array( '0', 'ЭЧКЕ:', 'ВНУТР:', 'INT:' ),
-	'sitename'                => array( '1', 'СӘХИФӘ_ИСЕМЕ', 'НАЗВАНИЕ_САЙТА', 'SITENAME' ),
-	'ns'                      => array( '0', 'İA:', 'ПИ:', 'NS:' ),
-	'localurl'                => array( '0', 'URINLIURL:', 'ЛОКАЛЬНЫЙ_АДРЕС:', 'LOCALURL:' ),
-	'localurle'               => array( '0', 'URINLIURLE:', 'ЛОКАЛЬНЫЙ_АДРЕС_2:', 'LOCALURLE:' ),
-	'language'                => array( '0', '#ТЕЛ:', '#ЯЗЫК:', '#LANGUAGE:' ),
-	'special'                 => array( '0', 'махсус', 'служебная', 'special' ),
-	'tag'                     => array( '0', 'тамга', 'метка', 'тег', 'тэг', 'tag' ),
-	'noindex'                 => array( '1', '__ИНДЕКССЫЗ__', '__БЕЗ_ИНДЕКСА__', '__NOINDEX__' ),
+	'redirect'                  => array( '0', '#ЮНӘЛТҮ', '#перенаправление', '#перенапр', '#REDIRECT' ),
+	'notoc'                     => array( '0', '__БАШЛЫКЮК__', '__БЕЗ_ОГЛАВЛЕНИЯ__', '__БЕЗ_ОГЛ__', '__NOTOC__' ),
+	'forcetoc'                  => array( '0', '__ETTIQ__', '__ОБЯЗ_ОГЛ__', '__ОБЯЗАТЕЛЬНОЕ_ОГЛАВЛЕНИЕ__', '__FORCETOC__' ),
+	'toc'                       => array( '0', '__ЭЧТЕЛЕК__', '__ОГЛАВЛЕНИЕ__', '__ОГЛ__', '__TOC__' ),
+	'noeditsection'             => array( '0', '__БҮЛЕКҮЗГӘРТҮЮК__', '__БЕЗ_РЕДАКТИРОВАНИЯ_РАЗДЕЛА__', '__NOEDITSECTION__' ),
+	'currentmonth'              => array( '1', 'АГЫМДАГЫ_АЙ', 'АГЫМДАГЫ_АЙ2', 'ТЕКУЩИЙ_МЕСЯЦ', 'ТЕКУЩИЙ_МЕСЯЦ_2', 'CURRENTMONTH', 'CURRENTMONTH2' ),
+	'currentmonthname'          => array( '1', 'АГЫМДАГЫ_АЙ_ИСЕМЕ', 'НАЗВАНИЕ_ТЕКУЩЕГО_МЕСЯЦА', 'CURRENTMONTHNAME' ),
+	'currentmonthnamegen'       => array( '1', 'АГЫМДАГЫ_АЙ_ИСЕМЕ_GEN', 'НАЗВАНИЕ_ТЕКУЩЕГО_МЕСЯЦА_РОД', 'CURRENTMONTHNAMEGEN' ),
+	'currentday'                => array( '1', 'АГЫМДАГЫ_КӨН', 'ТЕКУЩИЙ_ДЕНЬ', 'CURRENTDAY' ),
+	'currentday2'               => array( '1', 'АГЫМДАГЫ_КӨН2', 'ТЕКУЩИЙ_ДЕНЬ_2', 'CURRENTDAY2' ),
+	'currentdayname'            => array( '1', 'АГЫМДАГЫ_КӨН_ИСЕМЕ', 'НАЗВАНИЕ_ТЕКУЩЕГО_ДНЯ', 'CURRENTDAYNAME' ),
+	'currentyear'               => array( '1', 'АГЫМДАГЫ_ЕЛ', 'ТЕКУЩИЙ_ГОД', 'CURRENTYEAR' ),
+	'currenttime'               => array( '1', 'АГЫМДАГЫ_ВАКЫТ', 'ТЕКУЩЕЕ_ВРЕМЯ', 'CURRENTTIME' ),
+	'numberofarticles'          => array( '1', 'МӘКАЛӘ_САНЫ', 'КОЛИЧЕСТВО_СТАТЕЙ', 'NUMBEROFARTICLES' ),
+	'pagename'                  => array( '1', 'БИТ_ИСЕМЕ', 'НАЗВАНИЕ_СТРАНИЦЫ', 'PAGENAME' ),
+	'namespace'                 => array( '1', 'ИСЕМНӘР_МӘЙДАНЫ', 'ПРОСТРАНСТВО_ИМЁН', 'NAMESPACE' ),
+	'msg'                       => array( '0', 'ХӘБӘР', 'СООБЩЕНИЕ:', 'СООБЩ:', 'MSG:' ),
+	'subst'                     => array( '0', 'TÖPÇEK:', 'ПОДСТ:', 'ПОДСТАНОВКА:', 'SUBST:' ),
+	'img_right'                 => array( '1', 'уңда', 'справа', 'right' ),
+	'img_left'                  => array( '1', 'сулда', 'слева', 'left' ),
+	'img_none'                  => array( '1', 'юк', 'без', 'none' ),
+	'img_width'                 => array( '1', '$1пкс', '$1px' ),
+	'img_center'                => array( '1', 'үзәк', 'центр', 'center', 'centre' ),
+	'int'                       => array( '0', 'ЭЧКЕ:', 'ВНУТР:', 'INT:' ),
+	'sitename'                  => array( '1', 'СӘХИФӘ_ИСЕМЕ', 'НАЗВАНИЕ_САЙТА', 'SITENAME' ),
+	'ns'                        => array( '0', 'İA:', 'ПИ:', 'NS:' ),
+	'localurl'                  => array( '0', 'URINLIURL:', 'ЛОКАЛЬНЫЙ_АДРЕС:', 'LOCALURL:' ),
+	'localurle'                 => array( '0', 'URINLIURLE:', 'ЛОКАЛЬНЫЙ_АДРЕС_2:', 'LOCALURLE:' ),
+	'language'                  => array( '0', '#ТЕЛ:', '#ЯЗЫК:', '#LANGUAGE:' ),
+	'special'                   => array( '0', 'махсус', 'служебная', 'special' ),
+	'tag'                       => array( '0', 'тамга', 'метка', 'тег', 'тэг', 'tag' ),
+	'noindex'                   => array( '1', '__ИНДЕКССЫЗ__', '__БЕЗ_ИНДЕКСА__', '__NOINDEX__' ),
 );
 
 $linkTrail = '/^([a-zабвгдеёжзийклмнопрстуфхцчшщъыьэюяӘәӨөҮүҖҗҢңҺһ]+)(.*)$/sDu';
diff --git a/languages/messages/MessagesTt_latn.php b/languages/messages/MessagesTt_latn.php
index c7681f07bd..db0507f3a8 100644
--- a/languages/messages/MessagesTt_latn.php
+++ b/languages/messages/MessagesTt_latn.php
@@ -61,30 +61,30 @@ $dateFormats = array(
 );
 
 $magicWords = array(
-	'redirect'                => array( '0', '#YÜNÄLTÜ', '#REDIRECT' ),
-	'notoc'                   => array( '0', '__ETYUQ__', '__NOTOC__' ),
-	'forcetoc'                => array( '0', '__ETTIQ__', '__FORCETOC__' ),
-	'toc'                     => array( '0', '__ET__', '__TOC__' ),
-	'noeditsection'           => array( '0', '__BÜLEMTÖZÄTÜYUQ__', '__NOEDITSECTION__' ),
-	'currentmonth'            => array( '1', 'AĞIMDAĞI_AY', 'CURRENTMONTH', 'CURRENTMONTH2' ),
-	'currentmonthname'        => array( '1', 'AĞIMDAĞI_AY_İSEME', 'CURRENTMONTHNAME' ),
-	'currentmonthnamegen'     => array( '1', 'AĞIMDAĞI_AY_İSEME_GEN', 'CURRENTMONTHNAMEGEN' ),
-	'currentday'              => array( '1', 'AĞIMDAĞI_KÖN', 'CURRENTDAY' ),
-	'currentdayname'          => array( '1', 'AĞIMDAĞI_KÖN_İSEME', 'CURRENTDAYNAME' ),
-	'currentyear'             => array( '1', 'AĞIMDAĞI_YIL', 'CURRENTYEAR' ),
-	'currenttime'             => array( '1', 'AĞIMDAĞI_WAQIT', 'CURRENTTIME' ),
-	'numberofarticles'        => array( '1', 'MÄQÄLÄ_SANI', 'NUMBEROFARTICLES' ),
-	'pagename'                => array( '1', 'BÄ°TÄ°SEME', 'PAGENAME' ),
-	'namespace'               => array( '1', 'Ä°SEMARA', 'NAMESPACE' ),
-	'subst'                   => array( '0', 'TÖPÇEK:', 'SUBST:' ),
-	'img_right'               => array( '1', 'uñda', 'right' ),
-	'img_left'                => array( '1', 'sulda', 'left' ),
-	'img_none'                => array( '1', 'yuq', 'none' ),
-	'int'                     => array( '0', 'EÇKE:', 'INT:' ),
-	'sitename'                => array( '1', 'SÄXİFÄİSEME', 'SITENAME' ),
-	'ns'                      => array( '0', 'Ä°A:', 'NS:' ),
-	'localurl'                => array( '0', 'URINLIURL:', 'LOCALURL:' ),
-	'localurle'               => array( '0', 'URINLIURLE:', 'LOCALURLE:' ),
+	'redirect'                  => array( '0', '#YÜNÄLTÜ', '#REDIRECT' ),
+	'notoc'                     => array( '0', '__ETYUQ__', '__NOTOC__' ),
+	'forcetoc'                  => array( '0', '__ETTIQ__', '__FORCETOC__' ),
+	'toc'                       => array( '0', '__ET__', '__TOC__' ),
+	'noeditsection'             => array( '0', '__BÜLEMTÖZÄTÜYUQ__', '__NOEDITSECTION__' ),
+	'currentmonth'              => array( '1', 'AĞIMDAĞI_AY', 'CURRENTMONTH', 'CURRENTMONTH2' ),
+	'currentmonthname'          => array( '1', 'AĞIMDAĞI_AY_İSEME', 'CURRENTMONTHNAME' ),
+	'currentmonthnamegen'       => array( '1', 'AĞIMDAĞI_AY_İSEME_GEN', 'CURRENTMONTHNAMEGEN' ),
+	'currentday'                => array( '1', 'AĞIMDAĞI_KÖN', 'CURRENTDAY' ),
+	'currentdayname'            => array( '1', 'AĞIMDAĞI_KÖN_İSEME', 'CURRENTDAYNAME' ),
+	'currentyear'               => array( '1', 'AĞIMDAĞI_YIL', 'CURRENTYEAR' ),
+	'currenttime'               => array( '1', 'AĞIMDAĞI_WAQIT', 'CURRENTTIME' ),
+	'numberofarticles'          => array( '1', 'MÄQÄLÄ_SANI', 'NUMBEROFARTICLES' ),
+	'pagename'                  => array( '1', 'BÄ°TÄ°SEME', 'PAGENAME' ),
+	'namespace'                 => array( '1', 'Ä°SEMARA', 'NAMESPACE' ),
+	'subst'                     => array( '0', 'TÖPÇEK:', 'SUBST:' ),
+	'img_right'                 => array( '1', 'uñda', 'right' ),
+	'img_left'                  => array( '1', 'sulda', 'left' ),
+	'img_none'                  => array( '1', 'yuq', 'none' ),
+	'int'                       => array( '0', 'EÇKE:', 'INT:' ),
+	'sitename'                  => array( '1', 'SÄXİFÄİSEME', 'SITENAME' ),
+	'ns'                        => array( '0', 'Ä°A:', 'NS:' ),
+	'localurl'                  => array( '0', 'URINLIURL:', 'LOCALURL:' ),
+	'localurle'                 => array( '0', 'URINLIURLE:', 'LOCALURLE:' ),
 );
 
 $fallback8bitEncoding = "windows-1254";
diff --git a/languages/messages/MessagesUk.php b/languages/messages/MessagesUk.php
index 651f21ad94..e71b8b44c4 100644
--- a/languages/messages/MessagesUk.php
+++ b/languages/messages/MessagesUk.php
@@ -102,7 +102,7 @@ $bookstoreList = array(
 );
 
 $specialPageAliases = array(
-	'Activeusers'               => array( 'Активні_учасники' ),
+	'Activeusers'               => array( 'Активні_дописувачі' ),
 	'Allmessages'               => array( 'Системні_повідомлення' ),
 	'Allpages'                  => array( 'Усі_сторінки' ),
 	'Ancientpages'              => array( 'Давні_сторінки' ),
@@ -123,14 +123,14 @@ $specialPageAliases = array(
 	'DeletedContributions'      => array( 'Вилучений_внесок' ),
 	'Disambiguations'           => array( 'Неоднозначні_посилання' ),
 	'DoubleRedirects'           => array( 'Подвійні_перенаправлення' ),
-	'EditWatchlist'             => array( 'Правити_список_спостереження' ),
+	'EditWatchlist'             => array( 'Редагувати_список_спостереження' ),
 	'Emailuser'                 => array( 'Лист_користувачеві' ),
 	'Export'                    => array( 'Експорт' ),
-	'Fewestrevisions'           => array( 'Найменші_перевірки' ),
+	'Fewestrevisions'           => array( 'Найменшредаговані' ),
 	'FileDuplicateSearch'       => array( 'Пошук_дублікатів_файлів' ),
 	'Filepath'                  => array( 'Шлях_до_файлу' ),
 	'Import'                    => array( 'Імпорт' ),
-	'Invalidateemail'           => array( 'Нечинна_e-mail' ),
+	'Invalidateemail'           => array( 'Неперевірена_email-адреса' ),
 	'BlockList'                 => array( 'Список_блокувань', 'Блокування', 'Блокування_IP-адрес' ),
 	'LinkSearch'                => array( 'Пошук_посилань' ),
 	'Listadmins'                => array( 'Список_адміністраторів' ),
@@ -144,9 +144,9 @@ $specialPageAliases = array(
 	'Lonelypages'               => array( 'Ізольовані_сторінки' ),
 	'Longpages'                 => array( 'Найдовші_сторінки' ),
 	'MergeHistory'              => array( 'Об\'єднання_історії' ),
-	'MIMEsearch'                => array( 'Пошук_по_MIME' ),
-	'Mostcategories'            => array( 'Найкатегоризовуваніші' ),
-	'Mostimages'                => array( 'Найбільш_використовувані_файли' ),
+	'MIMEsearch'                => array( 'Пошук_за_MIME' ),
+	'Mostcategories'            => array( 'Найбільш_категоризовані' ),
+	'Mostimages'                => array( 'Найуживаніші_файли' ),
 	'Mostlinkedcategories'      => array( 'Найуживаніші_категорії' ),
 	'Mostlinkedtemplates'       => array( 'Найуживаніші_шаблони' ),
 	'Mostrevisions'             => array( 'Найбільш_редаговані' ),
@@ -167,7 +167,7 @@ $specialPageAliases = array(
 	'Randomredirect'            => array( 'Випадкове_перенаправлення' ),
 	'Recentchanges'             => array( 'Нові_редагування' ),
 	'Recentchangeslinked'       => array( 'Пов\'язані_редагування' ),
-	'Revisiondelete'            => array( 'Перевірити_видалення' ),
+	'Revisiondelete'            => array( 'Вилучити_редагування' ),
 	'Search'                    => array( 'Пошук' ),
 	'Shortpages'                => array( 'Короткі_сторінки' ),
 	'Specialpages'              => array( 'Спеціальні_сторінки' ),
@@ -181,8 +181,8 @@ $specialPageAliases = array(
 	'Undelete'                  => array( 'Відновити' ),
 	'Unlockdb'                  => array( 'Розблокувати_базу_даних' ),
 	'Unusedcategories'          => array( 'Порожні_категорії' ),
-	'Unusedimages'              => array( 'Невикористовувані_файли' ),
-	'Unusedtemplates'           => array( 'Невикористовувані_шаблони' ),
+	'Unusedimages'              => array( 'Невикористані_файли' ),
+	'Unusedtemplates'           => array( 'Невикористані_шаблони' ),
 	'Unwatchedpages'            => array( 'Неспостережувані' ),
 	'Upload'                    => array( 'Завантаження' ),
 	'UploadStash'               => array( 'Приховане_завантаження' ),
@@ -200,148 +200,153 @@ $specialPageAliases = 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__' ),
-	'noheader'                => array( '0', '__БЕЗ_ЗАГОЛОВКУ__', '__БЕЗ_ЗАГОЛОВКА__', '__NOHEADER__' ),
-	'currentmonth'            => array( '1', 'ПОТОЧНИЙ_МІСЯЦЬ', 'ПОТОЧНИЙ_МІСЯЦЬ_2', 'ТЕКУЩИЙ_МЕСЯЦ', 'ТЕКУЩИЙ_МЕСЯЦ_2', 'CURRENTMONTH', 'CURRENTMONTH2' ),
-	'currentmonth1'           => array( '1', 'ПОТОЧНИЙ_МІСЯЦЬ_1', 'ТЕКУЩИЙ_МЕСЯЦ_1', 'CURRENTMONTH1' ),
-	'currentmonthname'        => array( '1', 'НАЗВА_ПОТОЧНОГО_МІСЯЦЯ', 'НАЗВАНИЕ_ТЕКУЩЕГО_МЕСЯЦА', 'CURRENTMONTHNAME' ),
-	'currentmonthnamegen'     => array( '1', 'НАЗВА_ПОТОЧНОГО_МІСЯЦЯ_РОД', 'НАЗВАНИЕ_ТЕКУЩЕГО_МЕСЯЦА_РОД', 'CURRENTMONTHNAMEGEN' ),
-	'currentmonthabbrev'      => array( '1', 'НАЗВА_ПОТОЧНОГО_МІСЯЦЯ_АБР', 'НАЗВАНИЕ_ТЕКУЩЕГО_МЕСЯЦА_АБР', 'CURRENTMONTHABBREV' ),
-	'currentday'              => array( '1', 'ПОТОЧНИЙ_ДЕНЬ', 'ТЕКУЩИЙ_ДЕНЬ', 'CURRENTDAY' ),
-	'currentday2'             => array( '1', 'ПОТОЧНИЙ_ДЕНЬ_2', 'ТЕКУЩИЙ_ДЕНЬ_2', 'CURRENTDAY2' ),
-	'currentdayname'          => array( '1', 'НАЗВА_ПОТОЧНОГО_ДНЯ', 'НАЗВАНИЕ_ТЕКУЩЕГО_ДНЯ', 'CURRENTDAYNAME' ),
-	'currentyear'             => array( '1', 'ПОТОЧНИЙ_РІК', 'ТЕКУЩИЙ_ГОД', 'CURRENTYEAR' ),
-	'currenttime'             => array( '1', 'ПОТОЧНИЙ_ЧАС', 'ТЕКУЩЕЕ_ВРЕМЯ', 'CURRENTTIME' ),
-	'currenthour'             => array( '1', 'ПОТОЧНА_ГОДИНА', 'ТЕКУЩИЙ_ЧАС', 'CURRENTHOUR' ),
-	'localmonth'              => array( '1', 'ЛОКАЛЬНИЙ_МІСЯЦЬ', 'ЛОКАЛЬНИЙ_МІСЯЦЬ_2', 'МЕСТНЫЙ_МЕСЯЦ', 'МЕСТНЫЙ_МЕСЯЦ_2', 'LOCALMONTH', 'LOCALMONTH2' ),
-	'localmonth1'             => array( '1', 'ЛОКАЛЬНИЙ_МІСЯЦЬ_1', 'МЕСТНЫЙ_МЕСЯЦ_1', 'LOCALMONTH1' ),
-	'localmonthname'          => array( '1', 'НАЗВА_ЛОКАЛЬНОГО_МІСЯЦЯ', 'НАЗВАНИЕ_МЕСТНОГО_МЕСЯЦА', 'LOCALMONTHNAME' ),
-	'localmonthnamegen'       => array( '1', 'НАЗВА_ЛОКАЛЬНОГО_МІСЯЦЯ_РОД', 'НАЗВАНИЕ_МЕСТНОГО_МЕСЯЦА_РОД', 'LOCALMONTHNAMEGEN' ),
-	'localmonthabbrev'        => array( '1', 'НАЗВА_ЛОКАЛЬНОГО_МІСЯЦЯ_АБР', 'НАЗВАНИЕ_МЕСТНОГО_МЕСЯЦА_АБР', 'LOCALMONTHABBREV' ),
-	'localday'                => array( '1', 'ЛОКАЛЬНИЙ_ДЕНЬ', 'МЕСТНЫЙ_ДЕНЬ', 'LOCALDAY' ),
-	'localday2'               => array( '1', 'ЛОКАЛЬНИЙ_ДЕНЬ_2', 'МЕСТНЫЙ_ДЕНЬ_2', 'LOCALDAY2' ),
-	'localdayname'            => array( '1', 'НАЗВА_ЛОКАЛЬНОГО_ДНЯ', 'НАЗВАНИЕ_МЕСТНОГО_ДНЯ', 'LOCALDAYNAME' ),
-	'localyear'               => array( '1', 'ЛОКАЛЬНИЙ_РІК', 'МЕСТНЫЙ_ГОД', 'LOCALYEAR' ),
-	'localtime'               => array( '1', 'ЛОКАЛЬНИЙ_ЧАС', 'МЕСТНОЕ_ВРЕМЯ', 'LOCALTIME' ),
-	'localhour'               => array( '1', 'ЛОКАЛЬНА_ГОДИНА', 'МЕСТНЫЙ_ЧАС', 'LOCALHOUR' ),
-	'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', 'НАЗВА_СТОРІНКИ_2', 'НАЗВАНИЕ_СТРАНИЦЫ_2', 'PAGENAMEE' ),
-	'namespace'               => array( '1', 'ПРОСТІР_НАЗВ', 'ПРОСТРАНСТВО_ИМЁН', 'NAMESPACE' ),
-	'namespacee'              => array( '1', 'ПРОСТІР_НАЗВ_2', 'ПРОСТРАНСТВО_ИМЁН_2', 'NAMESPACEE' ),
-	'talkspace'               => array( '1', 'ПРОСТІР_ОБГОВОРЕННЯ', 'ПРОСТРАНСТВО_ОБСУЖДЕНИЙ', 'TALKSPACE' ),
-	'talkspacee'              => array( '1', 'ПРОСТІР_ОБГОВОРЕННЯ_2', 'ПРОСТРАНСТВО_ОБСУЖДЕНИЙ_2', 'TALKSPACEE' ),
-	'subjectspace'            => array( '1', 'ПРОСТІР_СТАТЕЙ', 'ПРОСТРАНСТВО_СТАТЕЙ', 'SUBJECTSPACE', 'ARTICLESPACE' ),
-	'subjectspacee'           => array( '1', 'ПРОСТІР_СТАТЕЙ_2', 'ПРОСТРАНСТВО_СТАТЕЙ_2', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
-	'fullpagename'            => array( '1', 'ПОВНА_НАЗВА_СТОРІНКИ', 'ПОЛНОЕ_НАЗВАНИЕ_СТРАНИЦЫ', 'FULLPAGENAME' ),
-	'fullpagenamee'           => array( '1', 'ПОВНА_НАЗВА_СТОРІНКИ_2', 'ПОЛНОЕ_НАЗВАНИЕ_СТРАНИЦЫ_2', 'FULLPAGENAMEE' ),
-	'subpagename'             => array( '1', 'НАЗВА_ПІДСТОРІНКИ', 'НАЗВАНИЕ_ПОДСТРАНИЦЫ', 'SUBPAGENAME' ),
-	'subpagenamee'            => array( '1', 'НАЗВА_ПІДСТОРІНКИ_2', 'НАЗВАНИЕ_ПОДСТРАНИЦЫ_2', 'SUBPAGENAMEE' ),
-	'basepagename'            => array( '1', 'ОСНОВА_НАЗВИ_ПІДСТОРІНКИ', 'ОСНОВА_НАЗВАНИЯ_СТРАНИЦЫ', 'BASEPAGENAME' ),
-	'basepagenamee'           => array( '1', 'ОСНОВА_НАЗВИ_ПІДСТОРІНКИ_2', 'ОСНОВА_НАЗВАНИЯ_СТРАНИЦЫ_2', 'BASEPAGENAMEE' ),
-	'talkpagename'            => array( '1', 'НАЗВА_СТОРІНКИ_ОБГОВОРЕННЯ', 'НАЗВАНИЕ_СТРАНИЦЫ_ОБСУЖДЕНИЯ', 'TALKPAGENAME' ),
-	'talkpagenamee'           => array( '1', 'НАЗВА_СТОРІНКИ_ОБГОВОРЕННЯ_2', 'НАЗВАНИЕ_СТРАНИЦЫ_ОБСУЖДЕНИЯ_2', 'TALKPAGENAMEE' ),
-	'subjectpagename'         => array( '1', 'НАЗВА_СТАТТІ', 'НАЗВАНИЕ_СТРАНИЦЫ_СТАТЬИ', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
-	'subjectpagenamee'        => array( '1', 'НАЗВА_СТАТТІ_2', 'НАЗВАНИЕ_СТРАНИЦЫ_СТАТЬИ_2', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
-	'msg'                     => array( '0', 'ПОВІД:', 'ПОВІДОМЛЕННЯ:', 'СООБЩЕНИЕ:', 'СООБЩ:', 'MSG:' ),
-	'subst'                   => array( '0', 'ПІДСТ:', 'ПІДСТАНОВКА:', 'ПОДСТАНОВКА:', 'ПОДСТ:', 'SUBST:' ),
-	'safesubst'               => array( '0', 'БЕЗПЕЧНА_ПІДСТАНОВКА:', 'ЗАЩПОДСТ:', 'SAFESUBST:' ),
-	'msgnw'                   => array( '0', 'ПОВІД_БЕЗ_ВІКІ:', 'СООБЩ_БЕЗ_ВИКИ:', 'MSGNW:' ),
-	'img_thumbnail'           => array( '1', 'міні', 'мініатюра', 'мини', 'миниатюра', 'thumbnail', 'thumb' ),
-	'img_manualthumb'         => array( '1', 'міні=$1', 'мініатюра=$1', 'мини=$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пкс', '$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', 'страница=$1', 'страница $1', 'page=$1', 'page $1' ),
-	'img_upright'             => array( '1', 'зверхуправоруч', 'зверхуправоруч=$1', 'зверхуправоруч $1', 'сверхусправа', 'сверхусправа=$1', 'сверхусправа $1', 'upright', 'upright=$1', 'upright $1' ),
-	'img_border'              => array( '1', 'межа', 'граница', 'border' ),
-	'img_baseline'            => array( '1', 'основа', 'основание', 'baseline' ),
-	'img_sub'                 => array( '1', 'під', 'под', 'sub' ),
-	'img_super'               => array( '1', 'над', 'super', 'sup' ),
-	'img_top'                 => array( '1', 'зверху', 'сверху', 'top' ),
-	'img_text_top'            => array( '1', 'текст-зверху', 'текст-сверху', 'text-top' ),
-	'img_middle'              => array( '1', 'посередині', 'посередине', 'middle' ),
-	'img_bottom'              => array( '1', 'знизу', 'снизу', 'bottom' ),
-	'img_text_bottom'         => array( '1', 'текст-знизу', 'текст-снизу', 'text-bottom' ),
-	'img_link'                => array( '1', 'посилання=$1', 'ссылка=$1', 'link=$1' ),
-	'img_alt'                 => array( '1', 'альт=$1', 'alt=$1' ),
-	'int'                     => array( '0', 'ВНУТР:', 'INT:' ),
-	'sitename'                => array( '1', 'НАЗВА_САЙТУ', 'НАЗВАНИЕ_САЙТА', 'SITENAME' ),
-	'ns'                      => array( '0', 'ПН:', 'ПИ:', 'NS:' ),
-	'nse'                     => array( '0', 'ПН_2:', 'ПИК:', 'NSE:' ),
-	'localurl'                => array( '0', 'ЛОКАЛЬНА_АДРЕСА:', 'ЛОКАЛЬНЫЙ_АДРЕС:', 'LOCALURL:' ),
-	'localurle'               => array( '0', 'ЛОКАЛЬНА_АДРЕСА_2:', 'ЛОКАЛЬНЫЙ_АДРЕС_2:', 'LOCALURLE:' ),
-	'server'                  => array( '0', 'СЕРВЕР', 'SERVER' ),
-	'servername'              => array( '0', 'НАЗВА_СЕРВЕРА', 'НАЗВАНИЕ_СЕРВЕРА', 'SERVERNAME' ),
-	'scriptpath'              => array( '0', 'ШЛЯХ_ДО_СКРИПТУ', 'ПУТЬ_К_СКРИПТУ', 'SCRIPTPATH' ),
-	'grammar'                 => array( '0', 'ВІДМІНОК:', 'ПАДЕЖ:', 'GRAMMAR:' ),
-	'gender'                  => array( '0', 'СТАТЬ:', 'ПОЛ:', 'GENDER:' ),
-	'notitleconvert'          => array( '0', '__БЕЗ_ПЕРЕТВОРЕННЯ_ЗАГОЛОВКУ__', '__БЕЗ_ПРЕОБРАЗОВАНИЯ_ЗАГОЛОВКА__', '__NOTITLECONVERT__', '__NOTC__' ),
-	'nocontentconvert'        => array( '0', '__БЕЗ_ПЕРЕТВОРЕННЯ_ТЕКСТУ__', '__БЕЗ_ПРЕОБРАЗОВАНИЯ_ТЕКСТА__', '__NOCONTENTCONVERT__', '__NOCC__' ),
-	'currentweek'             => array( '1', 'ПОТОЧНИЙ_ТИЖДЕНЬ', 'ТЕКУЩАЯ_НЕДЕЛЯ', 'CURRENTWEEK' ),
-	'currentdow'              => array( '1', 'ПОТОЧНИЙ_ДЕНЬ_ТИЖНЯ', 'ТЕКУЩИЙ_ДЕНЬ_НЕДЕЛИ', 'CURRENTDOW' ),
-	'localweek'               => array( '1', 'ЛОКАЛЬНИЙ_ТИЖДЕНЬ', 'МЕСТНАЯ_НЕДЕЛЯ', 'LOCALWEEK' ),
-	'localdow'                => array( '1', 'ЛОКАЛЬНИЙ_ДЕНЬ_ТИЖНЯ', 'МЕСТНЫЙ_ДЕНЬ_НЕДЕЛИ', 'LOCALDOW' ),
-	'revisionid'              => array( '1', 'ІД_ВЕРСІЇ', 'ИД_ВЕРСИИ', 'REVISIONID' ),
-	'revisionday'             => array( '1', 'ДЕНЬ_ВЕРСІЇ', 'ДЕНЬ_ВЕРСИИ', 'REVISIONDAY' ),
-	'revisionday2'            => array( '1', 'ДЕНЬ_ВЕРСІЇ_2', 'ДЕНЬ_ВЕРСИИ_2', 'REVISIONDAY2' ),
-	'revisionmonth'           => array( '1', 'МІСЯЦЬ_ВЕРСІЇ', 'МЕСЯЦ_ВЕРСИИ', 'REVISIONMONTH' ),
-	'revisionyear'            => array( '1', 'РІК_ВЕРСІЇ', 'ГОД_ВЕРСИИ', 'REVISIONYEAR' ),
-	'revisiontimestamp'       => array( '1', 'МІТКА_ЧАСУ_ВЕРСІЇ', 'ОТМЕТКА_ВРЕМЕНИ_ВЕРСИИ', 'REVISIONTIMESTAMP' ),
-	'revisionuser'            => array( '1', 'ВЕРСІЯ_КОРИСТУВАЧА', 'ВЕРСИЯ_УЧАСНИКА', 'REVISIONUSER' ),
-	'plural'                  => array( '0', 'МНОЖИНА:', 'МНОЖЕСТВЕННОЕ_ЧИСЛО:', 'PLURAL:' ),
-	'fullurl'                 => array( '0', 'ПОВНА_АДРЕСА:', 'ПОЛНЫЙ_АДРЕС:', 'FULLURL:' ),
-	'fullurle'                => array( '0', 'ПОВНА_АДРЕСА_2:', 'ПОЛНЫЙ_АДРЕС_2:', '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' ),
-	'rawsuffix'               => array( '1', 'Н', 'R' ),
-	'newsectionlink'          => array( '1', '__ПОСИЛАННЯ_НА_НОВИЙ_РОЗДІЛ__', '__ССЫЛКА_НА_НОВЫЙ_РАЗДЕЛ__', '__NEWSECTIONLINK__' ),
-	'nonewsectionlink'        => array( '1', '__БЕЗ_ПОСИЛАННЯ_НА_НОВИЙ_РОЗДІЛ__', '__БЕЗ_ССЫЛКИ_НА_НОВЫЙ_РАЗДЕЛ__', '__NONEWSECTIONLINK__' ),
-	'currentversion'          => array( '1', 'ПОТОЧНА_ВЕРСІЯ', 'ТЕКУЩАЯ_ВЕРСИЯ', 'CURRENTVERSION' ),
-	'urlencode'               => array( '0', 'ЗАКОДОВАНА_АДРЕСА:', 'ЗАКОДИРОВАННЫЙ_АДРЕС:', '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' ),
-	'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' ),
+	'redirect'                  => array( '0', '#ПЕРЕНАПРАВЛЕННЯ', '#ПЕРЕНАПР', '#перенапр', '#перенаправление', '#REDIRECT' ),
+	'notoc'                     => array( '0', '__БЕЗ_ЗМІСТУ__', '__БЕЗ_ОГЛАВЛЕНИЯ__', '__БЕЗ_ОГЛ__', '__NOTOC__' ),
+	'nogallery'                 => array( '0', '__БЕЗ_ГАЛЕРЕЇ__', '__БЕЗ_ГАЛЕРЕИ__', '__NOGALLERY__' ),
+	'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' ),
+	'currentmonthnamegen'       => array( '1', 'НАЗВА_ПОТОЧНОГО_МІСЯЦЯ_РОД', 'НАЗВАНИЕ_ТЕКУЩЕГО_МЕСЯЦА_РОД', 'CURRENTMONTHNAMEGEN' ),
+	'currentmonthabbrev'        => array( '1', 'НАЗВА_ПОТОЧНОГО_МІСЯЦЯ_АБР', 'НАЗВАНИЕ_ТЕКУЩЕГО_МЕСЯЦА_АБР', 'CURRENTMONTHABBREV' ),
+	'currentday'                => array( '1', 'ПОТОЧНИЙ_ДЕНЬ', 'ТЕКУЩИЙ_ДЕНЬ', 'CURRENTDAY' ),
+	'currentday2'               => array( '1', 'ПОТОЧНИЙ_ДЕНЬ_2', 'ТЕКУЩИЙ_ДЕНЬ_2', 'CURRENTDAY2' ),
+	'currentdayname'            => array( '1', 'НАЗВА_ПОТОЧНОГО_ДНЯ', 'НАЗВАНИЕ_ТЕКУЩЕГО_ДНЯ', 'CURRENTDAYNAME' ),
+	'currentyear'               => array( '1', 'ПОТОЧНИЙ_РІК', 'ТЕКУЩИЙ_ГОД', 'CURRENTYEAR' ),
+	'currenttime'               => array( '1', 'ПОТОЧНИЙ_ЧАС', 'ТЕКУЩЕЕ_ВРЕМЯ', 'CURRENTTIME' ),
+	'currenthour'               => array( '1', 'ПОТОЧНА_ГОДИНА', 'ТЕКУЩИЙ_ЧАС', 'CURRENTHOUR' ),
+	'localmonth'                => array( '1', 'ЛОКАЛЬНИЙ_МІСЯЦЬ', 'ЛОКАЛЬНИЙ_МІСЯЦЬ_2', 'МЕСТНЫЙ_МЕСЯЦ', 'МЕСТНЫЙ_МЕСЯЦ_2', 'LOCALMONTH', 'LOCALMONTH2' ),
+	'localmonth1'               => array( '1', 'ЛОКАЛЬНИЙ_МІСЯЦЬ_1', 'МЕСТНЫЙ_МЕСЯЦ_1', 'LOCALMONTH1' ),
+	'localmonthname'            => array( '1', 'НАЗВА_ЛОКАЛЬНОГО_МІСЯЦЯ', 'НАЗВАНИЕ_МЕСТНОГО_МЕСЯЦА', 'LOCALMONTHNAME' ),
+	'localmonthnamegen'         => array( '1', 'НАЗВА_ЛОКАЛЬНОГО_МІСЯЦЯ_РОД', 'НАЗВАНИЕ_МЕСТНОГО_МЕСЯЦА_РОД', 'LOCALMONTHNAMEGEN' ),
+	'localmonthabbrev'          => array( '1', 'НАЗВА_ЛОКАЛЬНОГО_МІСЯЦЯ_АБР', 'НАЗВАНИЕ_МЕСТНОГО_МЕСЯЦА_АБР', 'LOCALMONTHABBREV' ),
+	'localday'                  => array( '1', 'ЛОКАЛЬНИЙ_ДЕНЬ', 'МЕСТНЫЙ_ДЕНЬ', 'LOCALDAY' ),
+	'localday2'                 => array( '1', 'ЛОКАЛЬНИЙ_ДЕНЬ_2', 'МЕСТНЫЙ_ДЕНЬ_2', 'LOCALDAY2' ),
+	'localdayname'              => array( '1', 'НАЗВА_ЛОКАЛЬНОГО_ДНЯ', 'НАЗВАНИЕ_МЕСТНОГО_ДНЯ', 'LOCALDAYNAME' ),
+	'localyear'                 => array( '1', 'ЛОКАЛЬНИЙ_РІК', 'МЕСТНЫЙ_ГОД', 'LOCALYEAR' ),
+	'localtime'                 => array( '1', 'ЛОКАЛЬНИЙ_ЧАС', 'МЕСТНОЕ_ВРЕМЯ', 'LOCALTIME' ),
+	'localhour'                 => array( '1', 'ЛОКАЛЬНА_ГОДИНА', 'МЕСТНЫЙ_ЧАС', 'LOCALHOUR' ),
+	'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', 'НАЗВА_СТОРІНКИ_2', 'НАЗВАНИЕ_СТРАНИЦЫ_2', 'PAGENAMEE' ),
+	'namespace'                 => array( '1', 'ПРОСТІР_НАЗВ', 'ПРОСТРАНСТВО_ИМЁН', 'NAMESPACE' ),
+	'namespacee'                => array( '1', 'ПРОСТІР_НАЗВ_2', 'ПРОСТРАНСТВО_ИМЁН_2', 'NAMESPACEE' ),
+	'talkspace'                 => array( '1', 'ПРОСТІР_ОБГОВОРЕННЯ', 'ПРОСТРАНСТВО_ОБСУЖДЕНИЙ', 'TALKSPACE' ),
+	'talkspacee'                => array( '1', 'ПРОСТІР_ОБГОВОРЕННЯ_2', 'ПРОСТРАНСТВО_ОБСУЖДЕНИЙ_2', 'TALKSPACEE' ),
+	'subjectspace'              => array( '1', 'ПРОСТІР_СТАТЕЙ', 'ПРОСТРАНСТВО_СТАТЕЙ', 'SUBJECTSPACE', 'ARTICLESPACE' ),
+	'subjectspacee'             => array( '1', 'ПРОСТІР_СТАТЕЙ_2', 'ПРОСТРАНСТВО_СТАТЕЙ_2', 'SUBJECTSPACEE', 'ARTICLESPACEE' ),
+	'fullpagename'              => array( '1', 'ПОВНА_НАЗВА_СТОРІНКИ', 'ПОЛНОЕ_НАЗВАНИЕ_СТРАНИЦЫ', 'FULLPAGENAME' ),
+	'fullpagenamee'             => array( '1', 'ПОВНА_НАЗВА_СТОРІНКИ_2', 'ПОЛНОЕ_НАЗВАНИЕ_СТРАНИЦЫ_2', 'FULLPAGENAMEE' ),
+	'subpagename'               => array( '1', 'НАЗВА_ПІДСТОРІНКИ', 'НАЗВАНИЕ_ПОДСТРАНИЦЫ', 'SUBPAGENAME' ),
+	'subpagenamee'              => array( '1', 'НАЗВА_ПІДСТОРІНКИ_2', 'НАЗВАНИЕ_ПОДСТРАНИЦЫ_2', 'SUBPAGENAMEE' ),
+	'basepagename'              => array( '1', 'ОСНОВА_НАЗВИ_ПІДСТОРІНКИ', 'ОСНОВА_НАЗВАНИЯ_СТРАНИЦЫ', 'BASEPAGENAME' ),
+	'basepagenamee'             => array( '1', 'ОСНОВА_НАЗВИ_ПІДСТОРІНКИ_2', 'ОСНОВА_НАЗВАНИЯ_СТРАНИЦЫ_2', 'BASEPAGENAMEE' ),
+	'talkpagename'              => array( '1', 'НАЗВА_СТОРІНКИ_ОБГОВОРЕННЯ', 'НАЗВАНИЕ_СТРАНИЦЫ_ОБСУЖДЕНИЯ', 'TALKPAGENAME' ),
+	'talkpagenamee'             => array( '1', 'НАЗВА_СТОРІНКИ_ОБГОВОРЕННЯ_2', 'НАЗВАНИЕ_СТРАНИЦЫ_ОБСУЖДЕНИЯ_2', 'TALKPAGENAMEE' ),
+	'subjectpagename'           => array( '1', 'НАЗВА_СТАТТІ', 'НАЗВАНИЕ_СТРАНИЦЫ_СТАТЬИ', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
+	'subjectpagenamee'          => array( '1', 'НАЗВА_СТАТТІ_2', 'НАЗВАНИЕ_СТРАНИЦЫ_СТАТЬИ_2', 'SUBJECTPAGENAMEE', 'ARTICLEPAGENAMEE' ),
+	'msg'                       => array( '0', 'ПОВІД:', 'ПОВІДОМЛЕННЯ:', 'СООБЩЕНИЕ:', 'СООБЩ:', 'MSG:' ),
+	'subst'                     => array( '0', 'ПІДСТ:', 'ПІДСТАНОВКА:', 'ПОДСТАНОВКА:', 'ПОДСТ:', 'SUBST:' ),
+	'safesubst'                 => array( '0', 'БЕЗПЕЧНА_ПІДСТАНОВКА:', 'ЗАЩПОДСТ:', 'SAFESUBST:' ),
+	'msgnw'                     => array( '0', 'ПОВІД_БЕЗ_ВІКІ:', 'СООБЩ_БЕЗ_ВИКИ:', 'MSGNW:' ),
+	'img_thumbnail'             => array( '1', 'міні', 'мініатюра', 'мини', 'миниатюра', 'thumbnail', 'thumb' ),
+	'img_manualthumb'           => array( '1', 'міні=$1', 'мініатюра=$1', 'мини=$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пкс', '$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', 'страница=$1', 'страница $1', 'страница $1', 'page=$1', 'page $1' ),
+	'img_upright'               => array( '1', 'зверхуправоруч', 'зверхуправоруч=$1', 'зверхуправоруч $1', 'сверхусправа', 'сверхусправа=$1', 'сверхусправа_$1', 'сверхусправа $1', 'upright', 'upright=$1', 'upright $1' ),
+	'img_border'                => array( '1', 'межа', 'граница', 'border' ),
+	'img_baseline'              => array( '1', 'основа', 'основание', 'baseline' ),
+	'img_sub'                   => array( '1', 'під', 'под', 'sub' ),
+	'img_super'                 => array( '1', 'над', 'super', 'sup' ),
+	'img_top'                   => array( '1', 'зверху', 'сверху', 'top' ),
+	'img_text_top'              => array( '1', 'текст-зверху', 'текст-сверху', 'text-top' ),
+	'img_middle'                => array( '1', 'посередині', 'посередине', 'middle' ),
+	'img_bottom'                => array( '1', 'знизу', 'снизу', 'bottom' ),
+	'img_text_bottom'           => array( '1', 'текст-знизу', 'текст-снизу', 'text-bottom' ),
+	'img_link'                  => array( '1', 'посилання=$1', 'ссылка=$1', 'link=$1' ),
+	'img_alt'                   => array( '1', 'альт=$1', 'alt=$1' ),
+	'int'                       => array( '0', 'ВНУТР:', 'INT:' ),
+	'sitename'                  => array( '1', 'НАЗВА_САЙТУ', 'НАЗВАНИЕ_САЙТА', 'SITENAME' ),
+	'ns'                        => array( '0', 'ПН:', 'ПИ:', 'NS:' ),
+	'nse'                       => array( '0', 'ПН_2:', 'ПИК:', 'NSE:' ),
+	'localurl'                  => array( '0', 'ЛОКАЛЬНА_АДРЕСА:', 'ЛОКАЛЬНЫЙ_АДРЕС:', 'LOCALURL:' ),
+	'localurle'                 => array( '0', 'ЛОКАЛЬНА_АДРЕСА_2:', 'ЛОКАЛЬНЫЙ_АДРЕС_2:', 'LOCALURLE:' ),
+	'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__' ),
+	'currentweek'               => array( '1', 'ПОТОЧНИЙ_ТИЖДЕНЬ', 'ТЕКУЩАЯ_НЕДЕЛЯ', 'CURRENTWEEK' ),
+	'currentdow'                => array( '1', 'ПОТОЧНИЙ_ДЕНЬ_ТИЖНЯ', 'ТЕКУЩИЙ_ДЕНЬ_НЕДЕЛИ', 'CURRENTDOW' ),
+	'localweek'                 => array( '1', 'ЛОКАЛЬНИЙ_ТИЖДЕНЬ', 'МЕСТНАЯ_НЕДЕЛЯ', 'LOCALWEEK' ),
+	'localdow'                  => array( '1', 'ЛОКАЛЬНИЙ_ДЕНЬ_ТИЖНЯ', 'МЕСТНЫЙ_ДЕНЬ_НЕДЕЛИ', 'LOCALDOW' ),
+	'revisionid'                => array( '1', 'ІД_ВЕРСІЇ', 'ИД_ВЕРСИИ', 'REVISIONID' ),
+	'revisionday'               => array( '1', 'ДЕНЬ_ВЕРСІЇ', 'ДЕНЬ_ВЕРСИИ', 'REVISIONDAY' ),
+	'revisionday2'              => array( '1', 'ДЕНЬ_ВЕРСІЇ_2', 'ДЕНЬ_ВЕРСИИ_2', 'REVISIONDAY2' ),
+	'revisionmonth'             => array( '1', 'МІСЯЦЬ_ВЕРСІЇ', 'МЕСЯЦ_ВЕРСИИ', 'REVISIONMONTH' ),
+	'revisionmonth1'            => array( '1', 'МІСЯЦЬ_ВЕРСІЇ_1', 'МЕСЯЦ_ВЕРСИИ_1', 'REVISIONMONTH1' ),
+	'revisionyear'              => array( '1', 'РІК_ВЕРСІЇ', 'ГОД_ВЕРСИИ', 'REVISIONYEAR' ),
+	'revisiontimestamp'         => array( '1', 'МІТКА_ЧАСУ_ВЕРСІЇ', 'ОТМЕТКА_ВРЕМЕНИ_ВЕРСИИ', 'REVISIONTIMESTAMP' ),
+	'revisionuser'              => array( '1', 'ВЕРСІЯ_КОРИСТУВАЧА', 'ВЕРСИЯ_УЧАСНИКА', 'REVISIONUSER' ),
+	'plural'                    => array( '0', 'МНОЖИНА:', 'МНОЖЕСТВЕННОЕ_ЧИСЛО:', 'PLURAL:' ),
+	'fullurl'                   => array( '0', 'ПОВНА_АДРЕСА:', 'ПОЛНЫЙ_АДРЕС:', 'FULLURL:' ),
+	'fullurle'                  => array( '0', 'ПОВНА_АДРЕСА_2:', 'ПОЛНЫЙ_АДРЕС_2:', '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' ),
+	'rawsuffix'                 => array( '1', 'Н', 'R' ),
+	'newsectionlink'            => array( '1', '__ПОСИЛАННЯ_НА_НОВИЙ_РОЗДІЛ__', '__ССЫЛКА_НА_НОВЫЙ_РАЗДЕЛ__', '__NEWSECTIONLINK__' ),
+	'nonewsectionlink'          => array( '1', '__БЕЗ_ПОСИЛАННЯ_НА_НОВИЙ_РОЗДІЛ__', '__БЕЗ_ССЫЛКИ_НА_НОВЫЙ_РАЗДЕЛ__', '__NONEWSECTIONLINK__' ),
+	'currentversion'            => array( '1', 'ПОТОЧНА_ВЕРСІЯ', 'ТЕКУЩАЯ_ВЕРСИЯ', 'CURRENTVERSION' ),
+	'urlencode'                 => array( '0', 'ЗАКОДОВАНА_АДРЕСА:', 'ЗАКОДИРОВАННЫЙ_АДРЕС:', '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' ),
+	'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' ),
+	'url_path'                  => array( '0', 'ШЛЯХ', 'ПУТЬ', 'PATH' ),
+	'url_wiki'                  => array( '0', 'ВІКІ', 'ВИКИ', 'WIKI' ),
+	'url_query'                 => array( '0', 'ЗАПИТ', 'ЗАПРОС', 'QUERY' ),
 );
 
 $linkTrail = '/^([a-zабвгґдеєжзиіїйклмнопрстуфхцчшщьєюяёъы“»]+)(.*)$/sDu';
diff --git a/languages/messages/MessagesUr.php b/languages/messages/MessagesUr.php
index a3b9bba4ea..b726e80bda 100644
--- a/languages/messages/MessagesUr.php
+++ b/languages/messages/MessagesUr.php
@@ -1003,6 +1003,7 @@ HTML tags جانچئے.',
 'uploadlogpagetext' => 'درج ذیل میں حالیہ زبراثقال (اپ لوڈ) کی گئی املاف (فائلوں) کی فہرست دی گئی ہے۔',
 'filedesc' => 'خلاصہ',
 'fileuploadsummary' => 'خلاصہ :',
+'filesource' => 'ذرائع',
 'uploadedfiles' => 'زبراثقال ملف (فائل اپ لوڈ)',
 'ignorewarning' => 'انتباہ نظرانداز کرتے ہوۓ بہرصورت ملف (فائل) کو محفوظ کرلیا جاۓ۔',
 'ignorewarnings' => 'ہر انتباہ نظرانداز کردیا جاۓ۔',
diff --git a/languages/messages/MessagesVec.php b/languages/messages/MessagesVec.php
index b8b41a4c06..5a924c6556 100644
--- a/languages/messages/MessagesVec.php
+++ b/languages/messages/MessagesVec.php
@@ -23,7 +23,7 @@
  */
 
 $magicWords = array(
-	'redirect'                => array( '0', '#VARDA', '#RINVIA', '#RINVIO', '#RIMANDO', '#REDIRECT' ),
+	'redirect'                  => array( '0', '#VARDA', '#RINVIA', '#RINVIO', '#RIMANDO', '#REDIRECT' ),
 );
 
 $fallback = 'it';
diff --git a/languages/messages/MessagesVep.php b/languages/messages/MessagesVep.php
index 5ffdd286ed..6e7d406c0f 100644
--- a/languages/messages/MessagesVep.php
+++ b/languages/messages/MessagesVep.php
@@ -70,20 +70,20 @@ $specialPageAliases = array(
 );
 
 $magicWords = array(
-	'img_right'               => array( '1', 'oiged', 'paremal', 'right' ),
-	'img_left'                => array( '1', 'hura', 'vasakul', 'left' ),
-	'img_none'                => array( '1', 'eile', 'tühi', 'none' ),
-	'img_width'               => array( '1', '$1piks', '$1px' ),
-	'img_border'              => array( '1', 'röun', 'ääris', 'border' ),
-	'img_top'                 => array( '1', 'üläh', 'top' ),
-	'img_middle'              => array( '1', 'kesk', 'middle' ),
-	'img_bottom'              => array( '1', 'ala', 'bottom' ),
-	'sitename'                => array( '1', 'SAITANNIMI', 'KOHANIMI', 'SITENAME' ),
-	'grammar'                 => array( '0', 'GRAMMATIK:', 'GRAMMAR:' ),
-	'gender'                  => array( '0', 'SUGU:', 'GENDER:' ),
-	'plural'                  => array( '0', 'ÄILUGU:', 'PLURAL:' ),
-	'fullurl'                 => array( '0', 'TÄUZ\'URL:', 'KOGUURL:', 'FULLURL:' ),
-	'index'                   => array( '1', '__INDEKS__', 'INDEKSIGA', '__INDEX__' ),
+	'img_right'                 => array( '1', 'oiged', 'paremal', 'right' ),
+	'img_left'                  => array( '1', 'hura', 'vasakul', 'left' ),
+	'img_none'                  => array( '1', 'eile', 'tühi', 'none' ),
+	'img_width'                 => array( '1', '$1piks', '$1px' ),
+	'img_border'                => array( '1', 'röun', 'ääris', 'border' ),
+	'img_top'                   => array( '1', 'üläh', 'top' ),
+	'img_middle'                => array( '1', 'kesk', 'middle' ),
+	'img_bottom'                => array( '1', 'ala', 'bottom' ),
+	'sitename'                  => array( '1', 'SAITANNIMI', 'KOHANIMI', 'SITENAME' ),
+	'grammar'                   => array( '0', 'GRAMMATIK:', 'GRAMMAR:' ),
+	'gender'                    => array( '0', 'SUGU:', 'GENDER:' ),
+	'plural'                    => array( '0', 'ÄILUGU:', 'PLURAL:' ),
+	'fullurl'                   => array( '0', 'TÄUZ\'URL:', 'KOGUURL:', 'FULLURL:' ),
+	'index'                     => array( '1', '__INDEKS__', 'INDEKSIGA', '__INDEX__' ),
 );
 
 $messages = array(
diff --git a/languages/messages/MessagesVi.php b/languages/messages/MessagesVi.php
index fe75596902..632f2fa0c5 100644
--- a/languages/messages/MessagesVi.php
+++ b/languages/messages/MessagesVi.php
@@ -157,100 +157,102 @@ $specialPageAliases = array(
 );
 
 $magicWords = array(
-	'redirect'                => array( '0', '#đổi', '#REDIRECT' ),
-	'notoc'                   => array( '0', '__KHÔNGMỤCMỤC__', '__NOTOC__' ),
-	'nogallery'               => array( '0', '__KHÔNGALBUM__', '__NOGALLERY__' ),
-	'forcetoc'                => array( '0', '__LUÔNMỤCLỤC__', '__FORCETOC__' ),
-	'toc'                     => array( '0', '__MỤCLỤC__', '__TOC__' ),
-	'noeditsection'           => array( '0', '__KHÔNGSỬAMỤC__', '__NOEDITSECTION__' ),
-	'currentmonth'            => array( '1', 'THÁNGNÀY', 'THÁNGNÀY2', 'CURRENTMONTH', 'CURRENTMONTH2' ),
-	'currentmonth1'           => array( '1', 'THÁNGNÀY1', 'CURRENTMONTH1' ),
-	'currentmonthname'        => array( '1', 'TÊNTHÁNGNÀY', 'CURRENTMONTHNAME' ),
-	'currentmonthnamegen'     => array( '1', 'TÊNDÀITHÁNGNÀY', 'CURRENTMONTHNAMEGEN' ),
-	'currentmonthabbrev'      => array( '1', 'TÊNNGẮNTHÁNGNÀY', 'CURRENTMONTHABBREV' ),
-	'currentday'              => array( '1', 'NGÀYNÀY', 'CURRENTDAY' ),
-	'currentday2'             => array( '1', 'NGÀYNÀY2', 'CURRENTDAY2' ),
-	'currentdayname'          => array( '1', 'TÊNNGÀYNÀY', 'CURRENTDAYNAME' ),
-	'currentyear'             => array( '1', 'NĂMNÀY', 'CURRENTYEAR' ),
-	'currenttime'             => array( '1', 'GIỜNÀY', 'CURRENTTIME' ),
-	'localmonth'              => array( '1', 'THÁNGĐỊAPHƯƠNG', 'LOCALMONTH', 'LOCALMONTH2' ),
-	'localmonth1'             => array( '1', 'THÁNGĐỊAPHƯƠNG1', 'LOCALMONTH1' ),
-	'localmonthname'          => array( '1', 'TÊNTHÁNGĐỊAPHƯƠNG', 'LOCALMONTHNAME' ),
-	'localmonthabbrev'        => array( '1', 'THÁNGĐỊAPHƯƠNGTẮT', 'LOCALMONTHABBREV' ),
-	'localday'                => array( '1', 'NGÀYĐỊAPHƯƠNG', 'LOCALDAY' ),
-	'localday2'               => array( '1', 'NGÀYĐỊAPHƯƠNG2', 'LOCALDAY2' ),
-	'localdayname'            => array( '1', 'TÊNNGÀYĐỊAPHƯƠNG', 'LOCALDAYNAME' ),
-	'localyear'               => array( '1', 'NĂMĐỊAPHƯƠNG', 'LOCALYEAR' ),
-	'localtime'               => array( '1', 'GIỜĐỊAPHƯƠNG', 'LOCALTIME' ),
-	'numberofpages'           => array( '1', 'SỐTRANG', 'NUMBEROFPAGES' ),
-	'numberofarticles'        => array( '1', 'SỐBÀI', 'NUMBEROFARTICLES' ),
-	'numberoffiles'           => array( '1', 'SỐTẬPTIN', 'NUMBEROFFILES' ),
-	'numberofusers'           => array( '1', 'SỐTHÀNHVIÊN', 'NUMBEROFUSERS' ),
-	'numberofactiveusers'     => array( '1', 'SỐTHÀNHVIÊNTÍCHCỰC', 'NUMBEROFACTIVEUSERS' ),
-	'numberofedits'           => array( '1', 'SỐSỬAĐỔI', 'NUMBEROFEDITS' ),
-	'numberofviews'           => array( '1', 'SỐLẦNXEM', 'NUMBEROFVIEWS' ),
-	'pagename'                => array( '1', 'TÊNTRANG', 'PAGENAME' ),
-	'pagenamee'               => array( '1', 'TÊNTRANG2', 'PAGENAMEE' ),
-	'namespace'               => array( '1', 'KHÔNGGIANTÊN', 'NAMESPACE' ),
-	'talkspace'               => array( '1', 'KGTTHẢOLUẬN', 'TALKSPACE' ),
-	'subjectspace'            => array( '1', 'KGTNỘIDUNG', 'SUBJECTSPACE', 'ARTICLESPACE' ),
-	'fullpagename'            => array( '1', 'TÊNTRANGĐỦ', 'FULLPAGENAME' ),
-	'subpagename'             => array( '1', 'TÊNTRANGPHỤ', 'SUBPAGENAME' ),
-	'basepagename'            => array( '1', 'TÊNTRANGGỐC', 'BASEPAGENAME' ),
-	'talkpagename'            => array( '1', 'TÊNTRANGTHẢOLUẬN', 'TALKPAGENAME' ),
-	'subjectpagename'         => array( '1', 'TÊNTRANGNỘIDUNG', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
-	'msg'                     => array( '0', 'NHẮN:', 'MSG:' ),
-	'subst'                   => array( '0', 'THẾ:', 'SUBST:' ),
-	'msgnw'                   => array( '0', 'NHẮNMỚI:', 'MSGNW:' ),
-	'img_thumbnail'           => array( '1', 'nhỏ', 'thumbnail', 'thumb' ),
-	'img_manualthumb'         => array( '1', 'nhỏ=$1', 'thumbnail=$1', 'thumb=$1' ),
-	'img_right'               => array( '1', 'phải', 'right' ),
-	'img_left'                => array( '1', 'trái', 'left' ),
-	'img_none'                => array( '1', 'không', 'none' ),
-	'img_center'              => array( '1', 'giữa', 'center', 'centre' ),
-	'img_framed'              => array( '1', 'khung', 'framed', 'enframed', 'frame' ),
-	'img_page'                => array( '1', 'trang=$1', 'trang $1', 'page=$1', 'page $1' ),
-	'img_upright'             => array( '1', 'đứng', 'đứng=$1', 'đứng $1', 'upright', 'upright=$1', 'upright $1' ),
-	'img_link'                => array( '1', 'liên_kết=$1', 'link=$1' ),
-	'int'                     => array( '0', 'NỘI:', 'INT:' ),
-	'sitename'                => array( '1', 'TÊNMẠNG', 'SITENAME' ),
-	'ns'                      => array( '0', 'KGT:', 'NS:' ),
-	'localurl'                => array( '0', 'URLĐỊAPHƯƠNG:', 'LOCALURL:' ),
-	'articlepath'             => array( '0', 'LỐIBÀI', 'ARTICLEPATH' ),
-	'server'                  => array( '0', 'MÁYCHỦ', 'SERVER' ),
-	'servername'              => array( '0', 'TÊNMÁYCHỦ', 'SERVERNAME' ),
-	'scriptpath'              => array( '0', 'ĐƯỜNGDẪNSCRIPT', 'SCRIPTPATH' ),
-	'grammar'                 => array( '0', 'NGỮPHÁP:', 'GRAMMAR:' ),
-	'gender'                  => array( '0', 'GIỐNG:', 'GENDER:' ),
-	'notitleconvert'          => array( '0', '__KHÔNGCHUYỂNTÊN__', '__NOTITLECONVERT__', '__NOTC__' ),
-	'nocontentconvert'        => array( '0', '__KHÔNGCHUYỂNNỘIDUNG__', '__NOCONTENTCONVERT__', '__NOCC__' ),
-	'currentweek'             => array( '1', 'TUẦNNÀY', 'CURRENTWEEK' ),
-	'localweek'               => array( '1', 'TUẦNĐỊAPHƯƠNG', 'LOCALWEEK' ),
-	'revisionid'              => array( '1', 'SỐBẢN', 'REVISIONID' ),
-	'revisionday'             => array( '1', 'NGÀYBẢN', 'REVISIONDAY' ),
-	'revisionday2'            => array( '1', 'NGÀYBẢN2', 'REVISIONDAY2' ),
-	'revisionmonth'           => array( '1', 'THÁNGBẢN', 'REVISIONMONTH' ),
-	'revisionmonth1'          => array( '1', 'THÁNGBẢN1', 'REVISIONMONTH1' ),
-	'revisionyear'            => array( '1', 'NĂMBẢN', 'REVISIONYEAR' ),
-	'plural'                  => array( '0', 'SỐNHIỀU:', 'PLURAL:' ),
-	'fullurl'                 => array( '0', 'URLĐỦ:', 'FULLURL:' ),
-	'newsectionlink'          => array( '1', '__LIÊNKẾTMỤCMỚI__', '__NEWSECTIONLINK__' ),
-	'nonewsectionlink'        => array( '1', '__KHÔNGLIÊNKẾTMỤCMỚI__', '__NONEWSECTIONLINK__' ),
-	'currentversion'          => array( '1', 'BẢNNÀY', 'CURRENTVERSION' ),
-	'urlencode'               => array( '0', 'MÃHÓAURL:', 'URLENCODE:' ),
-	'language'                => array( '0', '#NGÔNNGỮ:', '#LANGUAGE:' ),
-	'contentlanguage'         => array( '1', 'NGÔNNGỮNỘIDUNG', 'CONTENTLANGUAGE', 'CONTENTLANG' ),
-	'pagesinnamespace'        => array( '1', 'CỠKHÔNGGIANTÊN:', 'CỠKGT:', 'PAGESINNAMESPACE:', 'PAGESINNS:' ),
-	'numberofadmins'          => array( '1', 'SỐQUẢNLÝ', 'NUMBEROFADMINS' ),
-	'formatnum'               => array( '0', 'PHÂNCHIASỐ', 'FORMATNUM' ),
-	'defaultsort'             => array( '1', 'XẾPMẶCĐỊNH:', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:' ),
-	'filepath'                => array( '0', 'ĐƯỜNGDẪNTẬPTIN', 'FILEPATH:' ),
-	'tag'                     => array( '0', 'thẻ', 'tag' ),
-	'hiddencat'               => array( '1', '__THỂLOẠIẨN__', '__HIDDENCAT__' ),
-	'pagesincategory'         => array( '1', 'CỠTHỂLOẠI', 'PAGESINCATEGORY', 'PAGESINCAT' ),
-	'pagesize'                => array( '1', 'Cá» TRANG', 'PAGESIZE' ),
-	'numberingroup'           => array( '1', 'CỠNHÓM', 'NUMBERINGROUP', 'NUMINGROUP' ),
-	'staticredirect'          => array( '1', '__ĐỔIHƯỚNGNHẤTĐỊNH__', '__STATICREDIRECT__' ),
+	'redirect'                  => array( '0', '#đổi', '#REDIRECT' ),
+	'notoc'                     => array( '0', '__KHÔNGMỤCMỤC__', '__NOTOC__' ),
+	'nogallery'                 => array( '0', '__KHÔNGALBUM__', '__NOGALLERY__' ),
+	'forcetoc'                  => array( '0', '__LUÔNMỤCLỤC__', '__FORCETOC__' ),
+	'toc'                       => array( '0', '__MỤCLỤC__', '__TOC__' ),
+	'noeditsection'             => array( '0', '__KHÔNGSỬAMỤC__', '__NOEDITSECTION__' ),
+	'currentmonth'              => array( '1', 'THÁNGNÀY', 'THÁNGNÀY2', 'CURRENTMONTH', 'CURRENTMONTH2' ),
+	'currentmonth1'             => array( '1', 'THÁNGNÀY1', 'CURRENTMONTH1' ),
+	'currentmonthname'          => array( '1', 'TÊNTHÁNGNÀY', 'CURRENTMONTHNAME' ),
+	'currentmonthnamegen'       => array( '1', 'TÊNDÀITHÁNGNÀY', 'CURRENTMONTHNAMEGEN' ),
+	'currentmonthabbrev'        => array( '1', 'TÊNNGẮNTHÁNGNÀY', 'CURRENTMONTHABBREV' ),
+	'currentday'                => array( '1', 'NGÀYNÀY', 'CURRENTDAY' ),
+	'currentday2'               => array( '1', 'NGÀYNÀY2', 'CURRENTDAY2' ),
+	'currentdayname'            => array( '1', 'TÊNNGÀYNÀY', 'CURRENTDAYNAME' ),
+	'currentyear'               => array( '1', 'NĂMNÀY', 'CURRENTYEAR' ),
+	'currenttime'               => array( '1', 'GIỜNÀY', 'CURRENTTIME' ),
+	'localmonth'                => array( '1', 'THÁNGĐỊAPHƯƠNG', 'LOCALMONTH', 'LOCALMONTH2' ),
+	'localmonth1'               => array( '1', 'THÁNGĐỊAPHƯƠNG1', 'LOCALMONTH1' ),
+	'localmonthname'            => array( '1', 'TÊNTHÁNGĐỊAPHƯƠNG', 'LOCALMONTHNAME' ),
+	'localmonthabbrev'          => array( '1', 'THÁNGĐỊAPHƯƠNGTẮT', 'LOCALMONTHABBREV' ),
+	'localday'                  => array( '1', 'NGÀYĐỊAPHƯƠNG', 'LOCALDAY' ),
+	'localday2'                 => array( '1', 'NGÀYĐỊAPHƯƠNG2', 'LOCALDAY2' ),
+	'localdayname'              => array( '1', 'TÊNNGÀYĐỊAPHƯƠNG', 'LOCALDAYNAME' ),
+	'localyear'                 => array( '1', 'NĂMĐỊAPHƯƠNG', 'LOCALYEAR' ),
+	'localtime'                 => array( '1', 'GIỜĐỊAPHƯƠNG', 'LOCALTIME' ),
+	'numberofpages'             => array( '1', 'SỐTRANG', 'NUMBEROFPAGES' ),
+	'numberofarticles'          => array( '1', 'SỐBÀI', 'NUMBEROFARTICLES' ),
+	'numberoffiles'             => array( '1', 'SỐTẬPTIN', 'NUMBEROFFILES' ),
+	'numberofusers'             => array( '1', 'SỐTHÀNHVIÊN', 'NUMBEROFUSERS' ),
+	'numberofactiveusers'       => array( '1', 'SỐTHÀNHVIÊNTÍCHCỰC', 'NUMBEROFACTIVEUSERS' ),
+	'numberofedits'             => array( '1', 'SỐSỬAĐỔI', 'NUMBEROFEDITS' ),
+	'numberofviews'             => array( '1', 'SỐLẦNXEM', 'NUMBEROFVIEWS' ),
+	'pagename'                  => array( '1', 'TÊNTRANG', 'PAGENAME' ),
+	'pagenamee'                 => array( '1', 'TÊNTRANG2', 'PAGENAMEE' ),
+	'namespace'                 => array( '1', 'KHÔNGGIANTÊN', 'NAMESPACE' ),
+	'talkspace'                 => array( '1', 'KGTTHẢOLUẬN', 'TALKSPACE' ),
+	'subjectspace'              => array( '1', 'KGTNỘIDUNG', 'SUBJECTSPACE', 'ARTICLESPACE' ),
+	'fullpagename'              => array( '1', 'TÊNTRANGĐỦ', 'FULLPAGENAME' ),
+	'subpagename'               => array( '1', 'TÊNTRANGPHỤ', 'SUBPAGENAME' ),
+	'basepagename'              => array( '1', 'TÊNTRANGGỐC', 'BASEPAGENAME' ),
+	'talkpagename'              => array( '1', 'TÊNTRANGTHẢOLUẬN', 'TALKPAGENAME' ),
+	'subjectpagename'           => array( '1', 'TÊNTRANGNỘIDUNG', 'SUBJECTPAGENAME', 'ARTICLEPAGENAME' ),
+	'msg'                       => array( '0', 'NHẮN:', 'MSG:' ),
+	'subst'                     => array( '0', 'THẾ:', 'SUBST:' ),
+	'msgnw'                     => array( '0', 'NHẮNMỚI:', 'MSGNW:' ),
+	'img_thumbnail'             => array( '1', 'nhỏ', 'thumbnail', 'thumb' ),
+	'img_manualthumb'           => array( '1', 'nhỏ=$1', 'thumbnail=$1', 'thumb=$1' ),
+	'img_right'                 => array( '1', 'phải', 'right' ),
+	'img_left'                  => array( '1', 'trái', 'left' ),
+	'img_none'                  => array( '1', 'không', 'none' ),
+	'img_center'                => array( '1', 'giữa', 'center', 'centre' ),
+	'img_framed'                => array( '1', 'khung', 'framed', 'enframed', 'frame' ),
+	'img_page'                  => array( '1', 'trang=$1', 'trang $1', 'page=$1', 'page $1' ),
+	'img_upright'               => array( '1', 'đứng', 'đứng=$1', 'đứng $1', 'upright', 'upright=$1', 'upright $1' ),
+	'img_link'                  => array( '1', 'liên_kết=$1', 'link=$1' ),
+	'int'                       => array( '0', 'NỘI:', 'INT:' ),
+	'sitename'                  => array( '1', 'TÊNMẠNG', 'SITENAME' ),
+	'ns'                        => array( '0', 'KGT:', 'NS:' ),
+	'localurl'                  => array( '0', 'URLĐỊAPHƯƠNG:', 'LOCALURL:' ),
+	'articlepath'               => array( '0', 'LỐIBÀI', 'ARTICLEPATH' ),
+	'server'                    => array( '0', 'MÁYCHỦ', 'SERVER' ),
+	'servername'                => array( '0', 'TÊNMÁYCHỦ', 'SERVERNAME' ),
+	'scriptpath'                => array( '0', 'ĐƯỜNGDẪNSCRIPT', 'SCRIPTPATH' ),
+	'grammar'                   => array( '0', 'NGỮPHÁP:', 'GRAMMAR:' ),
+	'gender'                    => array( '0', 'GIỐNG:', 'GENDER:' ),
+	'notitleconvert'            => array( '0', '__KHÔNGCHUYỂNTÊN__', '__NOTITLECONVERT__', '__NOTC__' ),
+	'nocontentconvert'          => array( '0', '__KHÔNGCHUYỂNNỘIDUNG__', '__NOCONTENTCONVERT__', '__NOCC__' ),
+	'currentweek'               => array( '1', 'TUẦNNÀY', 'CURRENTWEEK' ),
+	'localweek'                 => array( '1', 'TUẦNĐỊAPHƯƠNG', 'LOCALWEEK' ),
+	'revisionid'                => array( '1', 'SỐBẢN', 'REVISIONID' ),
+	'revisionday'               => array( '1', 'NGÀYBẢN', 'REVISIONDAY' ),
+	'revisionday2'              => array( '1', 'NGÀYBẢN2', 'REVISIONDAY2' ),
+	'revisionmonth'             => array( '1', 'THÁNGBẢN', 'REVISIONMONTH' ),
+	'revisionmonth1'            => array( '1', 'THÁNGBẢN1', 'REVISIONMONTH1' ),
+	'revisionyear'              => array( '1', 'NĂMBẢN', 'REVISIONYEAR' ),
+	'plural'                    => array( '0', 'SỐNHIỀU:', 'PLURAL:' ),
+	'fullurl'                   => array( '0', 'URLĐỦ:', 'FULLURL:' ),
+	'displaytitle'              => array( '1', 'TÊNHIỂNTHỊ', 'DISPLAYTITLE' ),
+	'newsectionlink'            => array( '1', '__LIÊNKẾTMỤCMỚI__', '__NEWSECTIONLINK__' ),
+	'nonewsectionlink'          => array( '1', '__KHÔNGLIÊNKẾTMỤCMỚI__', '__NONEWSECTIONLINK__' ),
+	'currentversion'            => array( '1', 'BẢNNÀY', 'CURRENTVERSION' ),
+	'urlencode'                 => array( '0', 'MÃHÓAURL:', 'URLENCODE:' ),
+	'language'                  => array( '0', '#NGÔNNGỮ:', '#LANGUAGE:' ),
+	'contentlanguage'           => array( '1', 'NGÔNNGỮNỘIDUNG', 'CONTENTLANGUAGE', 'CONTENTLANG' ),
+	'pagesinnamespace'          => array( '1', 'CỠKHÔNGGIANTÊN:', 'CỠKGT:', 'PAGESINNAMESPACE:', 'PAGESINNS:' ),
+	'numberofadmins'            => array( '1', 'SỐQUẢNLÝ', 'NUMBEROFADMINS' ),
+	'formatnum'                 => array( '0', 'PHÂNCHIASỐ', 'FORMATNUM' ),
+	'defaultsort'               => array( '1', 'XẾPMẶCĐỊNH:', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:' ),
+	'filepath'                  => array( '0', 'ĐƯỜNGDẪNTẬPTIN', 'FILEPATH:' ),
+	'tag'                       => array( '0', 'thẻ', 'tag' ),
+	'hiddencat'                 => array( '1', '__THỂLOẠIẨN__', '__HIDDENCAT__' ),
+	'pagesincategory'           => array( '1', 'CỠTHỂLOẠI', 'PAGESINCATEGORY', 'PAGESINCAT' ),
+	'pagesize'                  => array( '1', 'Cá» TRANG', 'PAGESIZE' ),
+	'numberingroup'             => array( '1', 'CỠNHÓM', 'NUMBERINGROUP', 'NUMINGROUP' ),
+	'staticredirect'            => array( '1', '__ĐỔIHƯỚNGNHẤTĐỊNH__', '__STATICREDIRECT__' ),
+	'url_path'                  => array( '0', 'ĐƯỜNGDẪN', 'PATH' ),
 );
 
 $datePreferences = array(
@@ -1968,6 +1970,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.',
 
 # File reversion
 'filerevert' => 'Lùi lại phiên bản của $1',
@@ -3083,6 +3086,8 @@ Lưu nó vào máy tính của bạn rồi tải nó lên đây.',
 'pageinfo-length' => 'Chiều dài của trang (byte)',
 'pageinfo-article-id' => 'Mã số 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',
 'pageinfo-views' => 'Số lần xem',
 'pageinfo-watchers' => 'Số người theo dõi trang',
 'pageinfo-redirects-name' => 'Số trang đổi hướng đến trang này',
@@ -3097,10 +3102,10 @@ Lưu nó vào máy tính của bạn rồi tải nó lên đây.',
 'pageinfo-authors' => 'Tổng số tác giả riêng',
 'pageinfo-recent-edits' => 'Số lần sửa đổi gần đây (trong $1 qua)',
 'pageinfo-recent-authors' => 'Số người dùng sửa đổi gần đây',
-'pageinfo-restriction' => 'Mức khóa trang ($1)',
-'pageinfo-magic-words' => 'Số từ thần chú ($1)',
-'pageinfo-hidden-categories' => 'Số thể loại ẩn ($1)',
-'pageinfo-templates' => 'Số bản mẫu được nhúng ($1)',
+'pageinfo-restriction' => 'Mức khóa trang (<code>{{lcfirst:$1}}</code>)',
+'pageinfo-magic-words' => 'Từ thần chú ($1)',
+'pageinfo-hidden-categories' => 'Thể loại ẩn ($1)',
+'pageinfo-templates' => 'Bản mẫu được nhúng ($1)',
 
 # Skin names
 'skinname-standard' => 'Cổ điển',
@@ -3147,12 +3152,14 @@ $1',
 Nếu thực thi nó máy tính của bạn có thể bị tiếm quyền.",
 'imagemaxsize' => "Giới hạn cỡ hình:<br />''(trên trang miêu tả tập tin)''",
 'thumbsize' => 'Cỡ hình thu nhỏ:',
+'widthheight' => '$1×$2',
 'widthheightpage' => '$1 × $2, $3 {{PLURAL:$3|trang|trang}}',
 'file-info' => 'kích thước tập tin: $1, kiểu MIME: $2',
 'file-info-size' => '$1×$2 điểm ảnh, kích thước tập tin: $3, kiểu MIME: $4',
 'file-info-size-pages' => '$1×$2 điểm ảnh, kích thước tập tin: $3, kiểu MIME: $4, $5 trang',
 'file-nohires' => 'Không có độ phân giải cao hơn.',
 'svg-long-desc' => 'tập tin SVG, $1×$2 điểm ảnh trên danh nghĩa, kích thước: $3',
+'svg-long-desc-animated' => 'tập tin hình động SVG, $1×$2 điểm ảnh trên danh nghĩa, kích thước: $3',
 'show-big-image' => 'Độ phân giải tối đa',
 'show-big-image-preview' => 'Kích thước của ảnh xem thử: $1.',
 'show-big-image-other' => '{{PLURAL:$2|Độ phân giải|Các độ phân giải}} khác: $1.',
@@ -3162,6 +3169,8 @@ Nếu thực thi nó máy tính của bạn có thể bị tiếm quyền.",
 'file-info-png-looped' => 'có lặp',
 'file-info-png-repeat' => 'chơi $1 lần',
 'file-info-png-frames' => '$1 khung ảnh',
+'file-no-thumb-animation' => "'''Lưu ý: Do hạn chế kỹ thuật, các hình nhỏ của tập tin này sẽ không phải là hình động.'''",
+'file-no-thumb-animation-gif' => "'''Lưu ý: Do hạn chế kỹ thuật, các hình nhỏ của những hình GIF có độ phân giải cao, chẳng hạn tập tin này, sẽ không phải là hình động.'''",
 
 # Special:NewFiles
 'newimages' => 'Trang trưng bày hình ảnh mới',
@@ -3176,6 +3185,7 @@ Nếu thực thi nó máy tính của bạn có thể bị tiếm quyền.",
 'sp-newimages-showfrom' => 'Trưng bày những tập tin mới, bắt đầu từ lúc $2, ngày $1',
 
 # Video information, used by Language::formatTimePeriod() to format lengths in the above messages
+'video-dims' => '$1, $2×$3',
 'seconds-abbrev' => '$1s',
 'minutes-abbrev' => '$1m',
 'hours-abbrev' => '$1h',
@@ -3752,6 +3762,7 @@ Xin hãy xác nhận bạn thực sự muốn tạo lại trang này.",
 'confirm-unwatch-top' => 'Bạn có muốn gỡ trang này khỏi danh sách theo dõi của bạn?',
 
 # Separators for various lists, etc.
+'autocomment-prefix' => '–&#32;',
 'ellipsis' => '…',
 
 # Multipage image navigation
@@ -3781,6 +3792,17 @@ Xin hãy xác nhận bạn thực sự muốn tạo lại trang này.",
 # Size units
 'size-kilobytes' => '$1 kB',
 
+# Bitrate units
+'bitrate-bits' => '$1 bps',
+'bitrate-kilobits' => '$1 kbps',
+'bitrate-megabits' => '$1 Mbps',
+'bitrate-gigabits' => '$1 Gbps',
+'bitrate-terabits' => '$1 Tbps',
+'bitrate-petabits' => '$1 Pbps',
+'bitrate-exabits' => '$1 Ebps',
+'bitrate-zetabits' => '$1 Zbps',
+'bitrate-yottabits' => '$1 Ybps',
+
 # Live preview
 'livepreview-loading' => 'Đang tải…',
 'livepreview-ready' => 'Đang tải… Xong!',
@@ -3902,6 +3924,8 @@ hoặc [//www.gnu.org/licenses/old-licenses/gpl-2.0.html đọc nó trực tuy
 'version-entrypoints' => 'Các URL lối vào',
 'version-entrypoints-header-entrypoint' => 'Lối vào',
 'version-entrypoints-header-url' => 'URL',
+'version-entrypoints-articlepath' => '[https://www.mediawiki.org/wiki/Manual:$wgArticlePath?uselang=vi Đường dẫn bài]',
+'version-entrypoints-scriptpath' => '[https://www.mediawiki.org/wiki/Manual:$wgScriptPath?uselang=vi Đường dẫn kịch bản]',
 
 # Special:FilePath
 'filepath' => 'Đường dẫn tập tin',
diff --git a/languages/messages/MessagesVro.php b/languages/messages/MessagesVro.php
index 830d17d56f..a485807626 100644
--- a/languages/messages/MessagesVro.php
+++ b/languages/messages/MessagesVro.php
@@ -38,7 +38,7 @@ $namespaceNames = array(
 );
 
 $magicWords = array(
-	'redirect'                => array( '0', '#saadaq', '#suuna', '#REDIRECT' ),
+	'redirect'                  => array( '0', '#saadaq', '#suuna', '#REDIRECT' ),
 );
 
 $messages = array(
diff --git a/languages/messages/MessagesWa.php b/languages/messages/MessagesWa.php
index ba804e76bc..adeb0322a1 100644
--- a/languages/messages/MessagesWa.php
+++ b/languages/messages/MessagesWa.php
@@ -59,11 +59,17 @@ $specialPageAliases = array(
 	'Allpages'                  => array( 'Totes_les_pådjes' ),
 	'Block'                     => array( 'Bloker', 'Blocaedje' ),
 	'Categories'                => array( 'Categoreyes' ),
+	'Listusers'                 => array( 'Djivêye_des_uzeus' ),
+	'Log'                       => array( 'Djournå', 'Djournås' ),
 	'Preferences'               => array( 'Preferinces' ),
 	'Prefixindex'               => array( 'Indecse_pa_betchete' ),
 	'Search'                    => array( 'Cweri' ),
 	'Specialpages'              => array( 'Pådjes_sipeciåles' ),
 	'Statistics'                => array( 'Sitatistikes' ),
+	'Undelete'                  => array( 'Rapexhî' ),
+	'Upload'                    => array( 'Eberweter', 'Eberwetaedje' ),
+	'Userlogin'                 => array( 'Elodjaedje' ),
+	'Userlogout'                => array( 'Dislodjaedje' ),
 	'Version'                   => array( 'Modêye' ),
 	'Watchlist'                 => array( 'PÃ¥djes_shuvowes' ),
 );
diff --git a/languages/messages/MessagesYi.php b/languages/messages/MessagesYi.php
index f28a7af36d..0f1744c3ea 100644
--- a/languages/messages/MessagesYi.php
+++ b/languages/messages/MessagesYi.php
@@ -141,43 +141,43 @@ $specialPageAliases = array(
 );
 
 $magicWords = array(
-	'redirect'                => array( '0', '#ווייטערפירן', '#הפניה', '#REDIRECT' ),
-	'notoc'                   => array( '0', '__קיין_אינהאלט_טאבעלע__', '__ללא_תוכן_עניינים__', '__ללא_תוכן__', '__NOTOC__' ),
-	'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' ),
-	'pagename'                => array( '1', 'בלאטנאמען', 'שם הדף', 'PAGENAME' ),
-	'namespace'               => array( '1', 'נאמענטייל', 'מרחב השם', 'NAMESPACE' ),
-	'fullpagename'            => array( '1', 'פולבלאטנאמען', 'שם הדף המלא', 'FULLPAGENAME' ),
-	'subpagename'             => array( '1', 'אונטערבלאטנאמען', 'שם דף המשנה', 'SUBPAGENAME' ),
-	'talkpagename'            => array( '1', 'רעדנבלאטנאמען', 'שם דף השיחה', 'TALKPAGENAME' ),
-	'subst'                   => array( '0', 'ס:', 'SUBST:' ),
-	'img_thumbnail'           => array( '1', 'קליין', 'ממוזער', 'thumbnail', 'thumb' ),
-	'img_manualthumb'         => array( '1', 'קליין=$1', 'ממוזער=$1', 'thumbnail=$1', 'thumb=$1' ),
-	'img_right'               => array( '1', 'רעכטס', 'ימין', 'right' ),
-	'img_left'                => array( '1', 'לינקס', 'שמאל', 'left' ),
-	'img_none'                => array( '1', 'אן', 'ללא', 'none' ),
-	'img_center'              => array( '1', 'צענטער', 'מרכז', 'center', 'centre' ),
-	'img_sub'                 => array( '1', 'אונטער', 'תחתי', 'sub' ),
-	'img_top'                 => array( '1', 'אויבן', 'למעלה', 'top' ),
-	'img_bottom'              => array( '1', 'אונטן', 'למטה', 'bottom' ),
-	'img_link'                => array( '1', 'לינק=$1', 'קישור=$1', 'link=$1' ),
-	'img_alt'                 => array( '1', 'טעקסט=$1', 'טקסט=$1', 'alt=$1' ),
-	'grammar'                 => array( '0', 'גראמאטיק:', 'דקדוק:', 'GRAMMAR:' ),
-	'plural'                  => array( '0', 'מערצאל:', 'רבים:', 'PLURAL:' ),
-	'fullurl'                 => array( '0', 'פֿולער_נאמען:', 'כתובת מלאה:', 'FULLURL:' ),
-	'raw'                     => array( '0', 'רוי:', 'ללא עיבוד:', 'RAW:' ),
-	'displaytitle'            => array( '1', 'ווייזן_קעפל', 'כותרת תצוגה', 'DISPLAYTITLE' ),
-	'language'                => array( '0', '#שפראך:', '#שפה:', '#LANGUAGE:' ),
-	'special'                 => array( '0', 'באזונדער', 'מיוחד', 'special' ),
-	'defaultsort'             => array( '1', 'גרונטסארטיר:', 'מיון רגיל:', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:' ),
-	'hiddencat'               => array( '1', '__באהאלטענע_קאטעגאריע__', '__באהאלטענע_קאט__', '__קטגוריה_מוסתרת__', '__HIDDENCAT__' ),
-	'pagesize'                => array( '1', 'בלאטגרייס', 'גודל דף', 'PAGESIZE' ),
-	'url_wiki'                => array( '0', 'וויקי', 'ויקי', 'WIKI' ),
+	'redirect'                  => array( '0', '#ווייטערפירן', '#הפניה', '#REDIRECT' ),
+	'notoc'                     => array( '0', '__קיין_אינהאלט_טאבעלע__', '__ללא_תוכן_עניינים__', '__ללא_תוכן__', '__NOTOC__' ),
+	'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' ),
+	'pagename'                  => array( '1', 'בלאטנאמען', 'שם הדף', 'PAGENAME' ),
+	'namespace'                 => array( '1', 'נאמענטייל', 'מרחב השם', 'NAMESPACE' ),
+	'fullpagename'              => array( '1', 'פולבלאטנאמען', 'שם הדף המלא', 'FULLPAGENAME' ),
+	'subpagename'               => array( '1', 'אונטערבלאטנאמען', 'שם דף המשנה', 'SUBPAGENAME' ),
+	'talkpagename'              => array( '1', 'רעדנבלאטנאמען', 'שם דף השיחה', 'TALKPAGENAME' ),
+	'subst'                     => array( '0', 'ס:', 'SUBST:' ),
+	'img_thumbnail'             => array( '1', 'קליין', 'ממוזער', 'thumbnail', 'thumb' ),
+	'img_manualthumb'           => array( '1', 'קליין=$1', 'ממוזער=$1', 'thumbnail=$1', 'thumb=$1' ),
+	'img_right'                 => array( '1', 'רעכטס', 'ימין', 'right' ),
+	'img_left'                  => array( '1', 'לינקס', 'שמאל', 'left' ),
+	'img_none'                  => array( '1', 'אן', 'ללא', 'none' ),
+	'img_center'                => array( '1', 'צענטער', 'מרכז', 'center', 'centre' ),
+	'img_sub'                   => array( '1', 'אונטער', 'תחתי', 'sub' ),
+	'img_top'                   => array( '1', 'אויבן', 'למעלה', 'top' ),
+	'img_bottom'                => array( '1', 'אונטן', 'למטה', 'bottom' ),
+	'img_link'                  => array( '1', 'לינק=$1', 'קישור=$1', 'link=$1' ),
+	'img_alt'                   => array( '1', 'טעקסט=$1', 'טקסט=$1', 'alt=$1' ),
+	'grammar'                   => array( '0', 'גראמאטיק:', 'דקדוק:', 'GRAMMAR:' ),
+	'plural'                    => array( '0', 'מערצאל:', 'רבים:', 'PLURAL:' ),
+	'fullurl'                   => array( '0', 'פֿולער_נאמען:', 'כתובת מלאה:', 'FULLURL:' ),
+	'raw'                       => array( '0', 'רוי:', 'ללא עיבוד:', 'RAW:' ),
+	'displaytitle'              => array( '1', 'ווייזן_קעפל', 'כותרת תצוגה', 'DISPLAYTITLE' ),
+	'language'                  => array( '0', '#שפראך:', '#שפה:', '#LANGUAGE:' ),
+	'special'                   => array( '0', 'באזונדער', 'מיוחד', 'special' ),
+	'defaultsort'               => array( '1', 'גרונטסארטיר:', 'מיון רגיל:', 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:' ),
+	'hiddencat'                 => array( '1', '__באהאלטענע_קאטעגאריע__', '__באהאלטענע_קאט__', '__קטגוריה_מוסתרת__', '__HIDDENCAT__' ),
+	'pagesize'                  => array( '1', 'בלאטגרייס', 'גודל דף', 'PAGESIZE' ),
+	'url_wiki'                  => array( '0', 'וויקי', 'ויקי', 'WIKI' ),
 );
 
 $messages = array(
@@ -378,7 +378,7 @@ $messages = array(
 'protect_change' => 'טוישן',
 'protectthispage' => 'באשיץ דעם בלאט',
 'unprotect' => 'ענדערונג באַשיצונג',
-'unprotectthispage' => 'ענדערונג באַשיצונג פון דעם בלאַט',
+'unprotectthispage' => 'ענדערן באַשיצונג פון דעם בלאַט',
 'newpage' => 'נייער בלאַט',
 'talkpage' => 'שמועסט איבער דעם בלאט',
 'talkpagelinktext' => 'שמועס',
@@ -855,7 +855,12 @@ $2
 'noarticletext-nopermission' => 'דערווײַל איז נישט פאַראַן קיין שום טעקסט אין דעם בלאַט.
 איר קענט [[Special:Search/{{PAGENAME}}| זוכן דעם בלאט טיטל]] אין אנדערע בלעטער,
 אדער <span class="plainlinks">[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} נאָכזוכן די רעלעוואנטע לאגביכער]</span>.',
-'userpage-userdoesnotexist' => 'באניצער קאנטע "<nowiki>$1</nowiki>" איז נישט אײַנגעשריבן. קוקט איבער צי איר ווילט שאפֿן/רעדאקטירן דעם בלאט.',
+'missing-revision' => 'די רעוויזיע #$1 פונעם בלאט "{{PAGENAME}}" עקזיסטירט נישט.
+
+דאס געשעט געוויינלעך פון פאלגן א פארעלטערטן היסטאריע לינק צו א בלאט וואס איז געווארן אויסגעמעקט.
+פרטים קען מען געפינען אינעם [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} אויסמעקונג לאגבוך].',
+'userpage-userdoesnotexist' => 'באניצער קאנטע "$1" איז נישט אײַנגעשריבן. 
+קוקט איבער צי איר ווילט שאפֿן/רעדאקטירן דעם בלאט.',
 'userpage-userdoesnotexist-view' => 'באניצער קאנטע "$1" איז נישט איינגעשריבן.',
 'blocked-notice-logextract' => 'דער באַניצער איז דערווייַל פֿאַרשפאַרט.
 די לעצטע בלאָקירן לאג אַקציע איז צוגעשטעלט אונטן:',
@@ -1624,15 +1629,19 @@ $1",
 אויב איר ווילט דאך אַרויפֿלאָדן אײַער טעקע, ביטע גיין צוריק און ניצן אַן אַנדער נאָמען. 
 [[File:$1|thumb|center|$1]]',
 'file-exists-duplicate' => 'די טעקע איז א דופליקאַט פון די פֿאלגנדע {{PLURAL:$1|טעקע|טעקעס}}:',
+'file-deleted-duplicate' => "א טעקע אידענטיש מיט דער טעקע ([[:$1]]) האט מען שוין אויסגעמעקט.
+איר זאלט קאנטראלירן דער טעקע'ס אויסמעקן היסטאריע איידער איר טוט ארויפלאדן פונדאסניי.",
 'uploadwarning' => 'אַרויפֿלאָדן וואָרענונג',
 'uploadwarning-text' => 'זײַט אַזוי גוט מאדיפֿיצירן די טעקע באַשרייבונג און פרובירט נאכאַמאָל.',
-'savefile' => 'טעקע אױפֿהיטן',
+'savefile' => 'אױפֿהיטן טעקע',
 'uploadedimage' => 'אַרױפֿגעלאָדן "[[$1]]"',
 'overwroteimage' => 'אַרויפֿגעלאָדן א נײַע ווערסיע פון "[[$1]]"',
 'uploaddisabled' => 'אַרויפֿלאָדן טעקעס מבוטל',
 'copyuploaddisabled' => 'ארויפלאדן דורך URL אומאקטיווירט',
-'uploadfromurl-queued' => 'אייער ארויפלאד איז אין דער רייע.',
-'uploaddisabledtext' => 'אַרויפֿלאָדן טעקעס נישט דערמעגלעכט אצינד.',
+'uploadfromurl-queued' => 'אייער ארויפֿלאד איז אין דער רייע.',
+'uploaddisabledtext' => 'אַרויפֿלאָדן טעקעס נישט דערמעגלעכט.',
+'php-uploaddisabledtext' => 'אַרויפֿלאָדן טעקעס נישט דערמעגלעכט אין PHP.
+זייט אזוי גוט בודק זיין די file_uploads שטעלונג.',
 'uploadscripted' => 'די טעקע האט א סקריפט אדער HTML קאד וואס קען ווערן פֿאלש אויסגעטייטשט דורך א בלעטערער',
 'uploadvirus' => 'די טעקע האָט אַ ווירוס! פרטים: <div dir="rtl">$1</div>',
 'upload-source' => 'מקור טעקע',
@@ -1643,6 +1652,8 @@ $1",
 'upload-description' => 'טעקע שילדערונג',
 'upload-options' => "אַרויפֿלאָדן ברירה'ס",
 'watchthisupload' => 'אויפֿפאַסן דעם בלאט',
+'filewasdeleted' => 'א טעקע מיט דעם נאמען האט מען שוין ארויפגעלאדן און דערנאך אויסגעמעקט.
+איר זאלט בודק זיין דעם $1 איידער איר הייבט אן ארויפלאדן ווידעראמאל.',
 'upload-success-subj' => 'דערפֿאלגרייכער ארויפֿלאָד',
 'upload-success-msg' => 'אײַער אַרויפֿלאָד פֿון [$2] איז געווען דערפֿאלגרייך. עס איז פֿאַראָן דאָ: [[:{{ns:file}}:$1]]',
 'upload-failure-subj' => 'אַרויפֿלאָדן פראבלעם',
@@ -1675,6 +1686,7 @@ $1",
 'backend-fail-closetemp' => 'קען נישט שליסן צייַטווייַליקע טעקע.',
 'backend-fail-read' => 'קען נישט ליינען טעקע "$1".',
 'backend-fail-create' => 'קען נישט שרייבן טעקע "$1".',
+'backend-fail-maxsize' => 'מ\'האט נישט געקענט שרייבן די טעקע "$1" ווייל זי איז גרעסער פון {{PLURAL:$2|איין בייט|$2 בייטן}}.',
 
 # Lock manager
 'lockmanager-notlocked' => 'מ\'קען נישט אויפֿשליסן "$1"; ער איז נישט פֿארשלאסן.',
@@ -1767,6 +1779,7 @@ $1",
 'shared-repo-from' => 'פֿון $1',
 'shared-repo' => 'א געמיינזאַמער זאַפאַס',
 'shared-repo-name-wikimediacommons' => 'וויקימעדיע קאמאנס',
+'upload-disallowed-here' => 'ליידער קענט איר נישט איבערשרייבן דאס בילד.',
 
 # File reversion
 'filerevert' => 'צוריקדרייען $1',
@@ -1793,6 +1806,7 @@ $1",
 ** קאפירעכט פֿאַרלעצונג
 ** דופליקאַט',
 'filedelete-edit-reasonlist' => 'רעדאַקטירן אויסמעקן סיבות',
+'filedelete-maintenance' => 'אויסמעקן און צוריקשטעלן טעקעס צײַטווײַליק אומדערמעגלעכט בשעת אויפהאלטן.',
 'filedelete-maintenance-title' => 'מען קען נישט אויסמעקן די טעקע',
 
 # MIME search
@@ -1860,13 +1874,14 @@ $1",
 'withoutinterwiki' => 'בלעטער אן שפראך פֿארבינדונגען',
 'withoutinterwiki-summary' => 'די פֿאלגנדע בלעטער פֿאַרבינדן נישט מיט אַנדערע שפראַך ווערסיעס',
 'withoutinterwiki-legend' => 'פרעפֿיקס',
-'withoutinterwiki-submit' => 'ווײַז',
+'withoutinterwiki-submit' => 'ווײַזן',
 
 'fewestrevisions' => 'בלעטער מיט די מינדערסטע רעוויזיעס',
 
 # Miscellaneous special pages
 'nbytes' => '$1 {{PLURAL:$1|בייט|בייטן}}',
 'ncategories' => '{{PLURAL:$1|קאטעגאריע|$1 קאטעגאריעס}}',
+'ninterwikis' => '$1 {{PLURAL:$1|אינטערוויקי|אינטערוויקיס}}',
 'nlinks' => '$1 {{PLURAL:$1|לינק|לינקען}}',
 'nmembers' => '$1 {{PLURAL:$1|בלאט|בלעטער}}',
 'nrevisions' => '{{PLURAL:$1|איין רעוויזיע|$1 רעוויזיעס}}',
@@ -1894,6 +1909,7 @@ $1",
 'mostlinkedtemplates' => 'מערסט פֿארבינדענע מוסטערן',
 'mostcategories' => 'אַרטיקלען מיט די מערסטע קאַטעגאָריעס',
 'mostimages' => 'מערסט פֿארבונדענע טעקעס',
+'mostinterwikis' => 'בלעטער מיט די מערסטע אינטערוויקיס',
 'mostrevisions' => 'אַרטיקלען מיט די מערסטע באַאַרבעטונגען',
 'prefixindex' => 'פּרעפֿיקס אינדעקס',
 'prefixindex-namespace' => 'אלע בלעטער מיט פרעפֿיקס ($1 נאמענטייל)',
@@ -1920,7 +1936,7 @@ $1",
 'move' => 'באַװעגן',
 'movethispage' => 'באוועג דעם בלאט',
 'unusedimagestext' => 'די פֿאלגנדע טעקעס עקזיסטירן אבער ווערן נישט גענוצט אין קיין שום בלאַט.
-גיא אַכט אז אנדערע וועבערטער קענען פֿארבינדן צו א טעקע מיט א דירעקטן URL, און קענען דעריבער באווײַזן זיך דאָ כאטש זיי זענען אין אקטיוון באניץ.',
+גיט אַכט אז אנדערע וועבערטער קענען פֿארבינדן צו א טעקע מיט א דירעקטן URL, און קענען דעריבער באווײַזן זיך דאָ כאטש זיי זענען אין אקטיוון באניץ.',
 'unusedcategoriestext' => 'די פֿאלגנדע קאטעגאריעס עקסיסטירן, אבער קיין בלאט אדער קאטעגאריע ניצט זיי נישט.',
 'notargettitle' => 'קיין ציל',
 'notargettext' => 'איר האט נישט ספעציפֿירט קיין ציל בלאַט אדער באַניצער אויף וועמען אויסצופֿירן די פעולה.',
@@ -2033,8 +2049,10 @@ $1",
 # E-mail user
 'mailnologin' => 'נישטא קיין אדרעס צו שיקן',
 'mailnologintext' => 'איר ברויכט זײַן [[Special:UserLogin|אַרײַנלאגירט]] און האָבן א גילטיגן ע־פאסט אַדרעס אין אײַער [[Special:Preferences|פרעפֿערענצן]] צו שיקן ע־פאסט צו אַנדערע באַניצער.',
-'emailuser' => 'אַרויסשיקן ע-פאסט צו דעם באַניצער',
-'emailpage' => 'אַרויסשיקן ע-פאסט צו באַניצער.',
+'emailuser' => 'שיקן ע-פאסט צו דעם באַניצער',
+'emailuser-title-target' => 'שיקן {{GENDER:$1|דעם באניצער|די באניצערין}} ע־פאסט',
+'emailuser-title-notarget' => 'שיקן א באניצער ע־פאסט',
+'emailpage' => 'שיקן ע-פאסט צו באַניצער',
 'emailpagetext' => 'איר קענט ניצן דעם פֿארעם אונטן צו שיקן אן בליצבריוו צו דעם דאזיגן באַניצער.
 דער ע-פאסט אדרעס וואס איר האט אריינגעלייגט אין [[Special:Preferences| אייערע באניצער פרעפערנעצן]] וועט זיך ווייזן כאילו דאס איז געקומען פון דארטן, בכדי צו דערמעגלעכן א תשובה.',
 'usermailererror' => 'בליצבריוו האט צוריקגעשיקט א טעות:',
@@ -2073,7 +2091,7 @@ $1",
 'nowatchlist' => 'איר האט נישט קיין שום בלעטער אין אייער אויפפַּאסונג ליסטע.',
 'watchlistanontext' => 'ביטע $1 כדי צו זען אדער ענדערן בלעטער אין אייער אַכטגעבן ליסטע.',
 'watchnologin' => 'איר זענט נישט אַרײַנלאגירט',
-'watchnologintext' => 'איר מוזט זיין אריינגעסיינט [[Special:UserLogin|אריינגלאגירט]] צו מאדיפֿיצירן אייער אויפפַּאסן ליסטע.',
+'watchnologintext' => 'איר דארפֿט זיין [[Special:UserLogin|אריינגלאגירט]] צו מאדיפֿיצירן אייער אויפפַּאסונג־ליסטע.',
 'addwatch' => 'צולייגן צו דער אויפֿפאַסונג ליסטע',
 'addedwatchtext' => "דער בלאט \"[[:\$1]]\" איז צוגעלײגט געוואָרן צו אײַער [[Special:Watchlist|אויפֿפאַסונג ליסטע]].
 
@@ -2087,12 +2105,12 @@ $1",
 'unwatchthispage' => 'ענדיגן אויפֿפאַסן',
 'notanarticle' => 'דאס איז נישט קיין אינהאלט בלאט',
 'notvisiblerev' => 'די באארבעטונג איז געווארן אויסגעמעקט',
-'watchnochange' => 'קיינע פֿון אײַערע אויפֿגעפאַסטע בלעטער זענען באַאַרבעט געווארן אין דעם צײַט פעריאד געוויזן.',
+'watchnochange' => 'קיינע פֿון אײַערע אויפֿגעפאַסטע בלעטער האבן זיך געענדערט אין דעם צײַט פעריאד געוויזן.',
 'watchlist-details' => '{{PLURAL:$1|איין בלאט|$1 בלעטער}} אין אייער אויפֿפאסן ליסטע (נישט רעכענען  רעדן בלעטער).',
 'wlheader-enotif' => '* ע-פאסט מעלדונג ערמעגליכט.',
 'wlheader-showupdated' => "* בלעטער געענדערט זײַט אײַער לעצטן וויזיט זען געוויזן '''דיק'''",
 'watchmethod-recent' => 'קאנטראלירן לעצטע ענדערונגען פֿאַר אויפֿגעפאַסטע בלעטער',
-'watchmethod-list' => 'קאנטראלירן בלעטער אין אַכטגעבן־ליסטע פֿאַר נײַע רעדאַקטירונגען',
+'watchmethod-list' => 'קאנטראלירן בלעטער אין אַכטונג־ליסטע פֿאַר לעצטע ענדערונגען',
 'watchlistcontains' => 'אייער אויפֿפאסונג ליסטע אנטהאלט {{PLURAL:$1|איין בלאט|$1 בלעטער}}.',
 'iteminvalidname' => "פּראָבלעם מיט '$1', אומגילטיקער נאָמען ...",
 'wlnote' => "אונטן {{PLURAL:$1|איז די לעצטע ענדערונג|זענען די לעצטע '''$1''' ענדערונגען}} אין {{PLURAL:$2|דער לעצטער שעה|די לעצטע '''$2''' שעה'ן}} ביז $3, $4.",
@@ -2886,6 +2904,9 @@ $1',
 'nextdiff' => 'קומענדיקע ווערסיע ←',
 
 # Media information
+'mediawarning' => "'''ווארענונג''': דער טעקע טיפ קען אנטהאלטן בייזוויליקן קאד.
+דורכפירן דעם קאד קען שעדיקן אייער סיסטעם.",
+'imagemaxsize' => "מאקסימאלע בילד גרייס :<br />''(פאר טעקע באשרייבונג בלעטער)''",
 'thumbsize' => 'קליינבילד גרייס:',
 'widthheight' => '$1 × $2',
 'widthheightpage' => '$1 × $2, {{PLURAL:$3|איין בלאט|$3 בלעטער}}',
@@ -2967,6 +2988,7 @@ $1',
 'exif-orientation' => 'אריענטאַציע',
 'exif-samplesperpixel' => 'צאל קאמאפאנענטן',
 'exif-planarconfiguration' => 'דאטן איינארדנונג',
+'exif-jpeginterchangeformatlength' => 'בייטן פון JPEG דאטן',
 'exif-datetime' => 'טעקע ענדערונג דאטע און צײַט',
 'exif-imagedescription' => 'בילד טיטל',
 'exif-make' => 'פֿאטא-אפאראט פֿאבריצירער',
diff --git a/languages/messages/MessagesZh_hans.php b/languages/messages/MessagesZh_hans.php
index 0bc9f3e0e0..b0670876c6 100644
--- a/languages/messages/MessagesZh_hans.php
+++ b/languages/messages/MessagesZh_hans.php
@@ -211,33 +211,44 @@ $specialPageAliases = 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' ),
-	'currentmonthabbrev'      => array( '1', '本月简称', 'CURRENTMONTHABBREV' ),
-	'currentday'              => array( '1', '今天', 'CURRENTDAY' ),
-	'currentday2'             => array( '1', '今天2', 'CURRENTDAY2' ),
-	'currentyear'             => array( '1', '今年', 'CURRENTYEAR' ),
-	'currenttime'             => array( '1', '此时', '当前时间', 'CURRENTTIME' ),
-	'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' ),
-	'fullpagename'            => array( '1', '全页名', 'FULLPAGENAME' ),
-	'newsectionlink'          => array( '1', '_新段落链接_', '__NEWSECTIONLINK__' ),
-	'nonewsectionlink'        => array( '1', '_无新段落链接_', '__NONEWSECTIONLINK__' ),
-	'language'                => array( '0', '#语言:', '#LANGUAGE:' ),
-	'pagesize'                => array( '1', '页面大小', 'PAGESIZE' ),
+	'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' ),
+	'currentmonthabbrev'        => array( '1', '本月简称', 'CURRENTMONTHABBREV' ),
+	'currentday'                => array( '1', '今天', 'CURRENTDAY' ),
+	'currentday2'               => array( '1', '今天2', 'CURRENTDAY2' ),
+	'currentyear'               => array( '1', '今年', 'CURRENTYEAR' ),
+	'currenttime'               => array( '1', '此时', '当前时间', 'CURRENTTIME' ),
+	'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' ),
+	'fullpagename'              => array( '1', '完整页面名', 'FULLPAGENAME' ),
+	'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像素', '$1px' ),
+	'img_center'                => array( '1', '居中', 'center', 'centre' ),
+	'img_page'                  => array( '1', '页数=$1', '$1页', 'page=$1', 'page $1' ),
+	'img_link'                  => array( '1', '链接=$1', 'link=$1' ),
+	'img_alt'                   => array( '1', '替代文本=$1', 'alt=$1' ),
+	'newsectionlink'            => array( '1', '__新段落链接__', '__NEWSECTIONLINK__' ),
+	'nonewsectionlink'          => array( '1', '__无新段落链接__', '__NONEWSECTIONLINK__' ),
+	'language'                  => array( '0', '#语言:', '#LANGUAGE:' ),
+	'tag'                       => array( '0', '标记', 'tag' ),
+	'pagesize'                  => array( '1', '页面大小', 'PAGESIZE' ),
 );
 
 $linkTrail = '/^()(.*)$/sD';
@@ -2195,14 +2206,14 @@ $1',
 'changed' => '更改',
 'created' => '创建',
 'enotif_subject' => '{{SITENAME}}页面“$PAGETITLE”已被$PAGEEDITOR$CHANGEDORCREATED',
-'enotif_lastvisited' => '请浏览$1查看你上次访问后的所有更改。',
-'enotif_lastdiff' => '请浏览$1查看该更改。',
+'enotif_lastvisited' => '请浏览 $1 查看你上次访问后的所有更改。',
+'enotif_lastdiff' => '请浏览 $1 查看该更改。',
 'enotif_anon_editor' => '匿名用户$1',
 'enotif_body' => '亲爱的$WATCHINGUSERNAME：
 
 你好！
 
-{{SITENAME}}页面$PAGETITLE已于$PAGEEDITDATE被$PAGEEDITOR$CHANGEDORCREATED，请浏览$PAGETITLE_URL查看当前版本。
+{{SITENAME}}页面$PAGETITLE已于$PAGEEDITDATE被$PAGEEDITOR $CHANGEDORCREATED，请浏览 $PAGETITLE_URL 查看当前版本。
 $NEWPAGE
 编辑摘要：$PAGESUMMARY $PAGEMINOREDIT
 
diff --git a/languages/messages/MessagesZh_hant.php b/languages/messages/MessagesZh_hant.php
index d68aac4a76..27f19e88af 100644
--- a/languages/messages/MessagesZh_hant.php
+++ b/languages/messages/MessagesZh_hant.php
@@ -33,6 +33,7 @@
  * @author PhiLiP
  * @author Philip
  * @author Shinjiman
+ * @author Shirayuki
  * @author Shizhao
  * @author Simon Shek
  * @author Skjackey tse
@@ -250,7 +251,7 @@ $messages = array(
 'tog-watchlisthideliu' => '監視列表中隱藏登入用戶',
 'tog-watchlisthideanons' => '監視列表中隱藏匿名用戶',
 'tog-watchlisthidepatrolled' => '監視清單中隱藏已巡查的編輯',
-'tog-ccmeonemails' => '當我寄電子郵件給其他用戶時，也寄一份複本到我的信箱。',
+'tog-ccmeonemails' => '當我寄電子郵件給其他用戶時，也寄一份複本到我的信箱',
 'tog-diffonly' => '比較版本差異時不顯示頁面內容',
 'tog-showhiddencats' => '顯示隱藏分類',
 'tog-noconvertlink' => '不轉換連結標題',
@@ -2194,8 +2195,8 @@ Template:消除歧義',
 'changed' => '更改',
 'created' => '建立了',
 'enotif_subject' => '{{SITENAME}}頁面“$PAGETITLE”已被$PAGEEDITOR$CHANGEDORCREATED',
-'enotif_lastvisited' => '檢視您上次訪問後的所有更改請參閱$1。',
-'enotif_lastdiff' => '檢視更改請參閱$1。',
+'enotif_lastvisited' => '請參閱 $1 檢視你上次訪問後的所有更改。',
+'enotif_lastdiff' => '請參閱 $1 檢視該更改。',
 'enotif_anon_editor' => '匿名用戶$1',
 'enotif_body' => '親愛的$WATCHINGUSERNAME：
 
@@ -2964,7 +2965,7 @@ $1被封禁的理由是“$2”',
 'pageinfo-authors' => '作者總數',
 'pageinfo-recent-edits' => '最近編輯次數 (過去 $1 內)',
 'pageinfo-recent-authors' => '最近作者數目',
-'pageinfo-restriction' => '保護頁面 （ <code>$1</code> ）',
+'pageinfo-restriction' => '保護頁面 （ <code>{{lcfirst:$1}}</code> ）',
 'pageinfo-magic-words' => '魔術{{PLURAL:$1|字|字}} ( $1 )',
 'pageinfo-hidden-categories' => '隱藏{{PLURAL:$1|分類|分類}} ( $1 )',
 'pageinfo-templates' => '被引用的{{PLURAL:$1|模版|模版}} ( $1 )',
diff --git a/languages/utils/CLDRPluralRuleEvaluator.php b/languages/utils/CLDRPluralRuleEvaluator.php
new file mode 100644
index 0000000000..6b11704376
--- /dev/null
+++ b/languages/utils/CLDRPluralRuleEvaluator.php
@@ -0,0 +1,574 @@
+<?php
+/**
+ * Parse and evaluate a plural rule.
+ *
+ * http://unicode.org/reports/tr35/#Language_Plural_Rules
+ *
+ * @author Niklas Laxstrom, Tim Starling
+ *
+ * @copyright Copyright © 2010-2012, Niklas Laxström
+ * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 2.0 or later
+ * @file
+ * @since 1.20
+ */
+
+class CLDRPluralRuleEvaluator {
+	/**
+	 * Evaluate a number against a set of plural rules. If a rule passes,
+	 * return the index of plural rule.
+	 *
+	 * @param int The number to be evaluated against the rules
+	 * @param array The associative array of plural rules in pluralform => rule format.
+	 * @return int The index of the plural form which passed the evaluation
+	 */
+	public static function evaluate( $number, array $rules ) {
+		$rules = self::compile( $rules );
+		return self::evaluateCompiled( $number, $rules );
+	}
+
+	/**
+	 * Convert a set of rules to a compiled form which is optimised for
+	 * fast evaluation. The result will be an array of strings, and may be cached.
+	 *
+	 * @param $rules The rules to compile
+	 * @return An array of compile rules.
+	 */
+	public static function compile( array $rules ) {
+		// We can't use array_map() for this because it generates a warning if
+		// there is an exception.
+		foreach ( $rules as &$rule ) {
+			$rule = CLDRPluralRuleConverter::convert( $rule );
+		}
+		return $rules;
+	}
+
+	/**
+	 * Evaluate a compiled set of rules returned by compile(). Do not allow
+	 * the user to edit the compiled form, or else PHP errors may result.
+	 */
+	public static function evaluateCompiled( $number, array $rules ) {
+		// The compiled form is RPN, with tokens strictly delimited by
+		// spaces, so this is a simple RPN evaluator.
+		foreach ( $rules as $i => $rule  ) {
+			$stack = array();
+			$zero = ord( '0' );
+			$nine = ord( '9' );
+			foreach ( StringUtils::explode( ' ', $rule ) as $token ) {
+				$ord = ord( $token );
+				if ( $token === 'n' ) {
+					$stack[] = $number;
+				} elseif ( $ord >= $zero && $ord <= $nine ) {
+					$stack[] = intval( $token );
+				} else {
+					$right = array_pop( $stack );
+					$left = array_pop( $stack );
+					$result = self::doOperation( $token, $left, $right );
+					$stack[] = $result;
+				}
+			}
+			if ( $stack[0] ) {
+				return $i;
+			}
+		}
+		// None of the provided rules match. The number belongs to caregory
+		// 'other' which comes last.
+		return count( $rules );
+	}
+
+	/**
+	 * Do a single operation
+	 *
+	 * @param $token string The token string
+	 * @param $left The left operand. If it is an object, its state may be destroyed.
+	 * @param $right The right operand
+	 * @return mixed
+	 */
+	private static function doOperation( $token, $left, $right ) {
+		if ( in_array( $token, array( 'in', 'not-in', 'within', 'not-within' ) ) ) {
+			if ( !($right instanceof CLDRPluralRuleEvaluator_Range ) ) {
+				$right = new CLDRPluralRuleEvaluator_Range( $right );
+			}
+		}
+		switch ( $token ) {
+			case 'or':
+				return $left || $right;
+			case 'and':
+				return $left && $right;
+			case 'is':
+				return $left == $right;
+			case 'is-not':
+				return $left != $right;
+			case 'in':
+				return $right->isNumberIn( $left );
+			case 'not-in':
+				return !$right->isNumberIn( $left );
+			case 'within':
+				return $right->isNumberWithin( $left );
+			case 'not-within':
+				return !$right->isNumberWithin( $left );
+			case 'mod':
+				if ( is_int( $left ) ) {
+					return (int) fmod( $left, $right );
+				}
+				return fmod( $left, $right );
+			case ',':
+				if ( $left instanceof CLDRPluralRuleEvaluator_Range ) {
+					$range = $left;
+				} else {
+					$range = new CLDRPluralRuleEvaluator_Range( $left );
+				}
+				$range->add( $right );
+				return $range;
+			case '..':
+				return new CLDRPluralRuleEvaluator_Range( $left, $right );
+			default:
+				throw new CLDRPluralRuleError( "Invalid RPN token" );
+		}
+	}
+}
+
+/**
+ * Evaluator helper class representing a range list.
+ */
+class CLDRPluralRuleEvaluator_Range {
+	var $parts = array();
+
+	function __construct( $start, $end = false ) {
+		if ( $end === false ) {
+			$this->parts[] = $start;
+		} else {
+			$this->parts[] = array( $start, $end );
+		}
+	}
+
+	/**
+	 * Determine if the given number is inside the range. If $integerConstraint
+	 * is true, the number must additionally be an integer if it is to match
+	 * any interval part.
+	 */
+	function isNumberIn( $number, $integerConstraint = true ) {
+		foreach ( $this->parts as $part ) {
+			if ( is_array( $part ) ) {
+				if ( ( !$integerConstraint || floor( $number ) === (float)$number )
+					&& $number >= $part[0] && $number <= $part[1] )
+				{
+					return true;
+				}
+			} else {
+				if ( $number == $part ) {
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * Readable alias for isNumberIn( $number, false ), and the implementation
+	 * of the "within" operator.
+	 */
+	function isNumberWithin( $number ) {
+		return $this->isNumberIn( $number, false );
+	}
+
+	/**
+	 * Add another part to this range. The supplied new part may either be a
+	 * range object itself, or a single number.
+	 */
+	function add( $other ) {
+		if ( $other instanceof self ) {
+			$this->parts = array_merge( $this->parts, $other->parts );
+		} else {
+			$this->parts[] = $other;
+		}
+	}
+
+	/**
+	 * For debugging
+	 */
+	function __toString() {
+		$s = 'Range(';
+		foreach ( $this->parts as $i => $part ) {
+			if ( $i ) {
+				$s .= ', ';
+			}
+			if ( is_array( $part ) ) {
+				$s .= $part[0] . '..' . $part[1];
+			} else {
+				$s .= $part;
+			}
+		}
+		$s .= ')';
+		return $s;
+	}
+
+}
+
+/**
+ * Helper class for converting rules to reverse polish notation (RPN).
+ */
+class CLDRPluralRuleConverter {
+	var $rule, $pos, $end;
+	var $operators = array();
+	var $operands = array();
+
+	/**
+	 * Precedence levels. Note that there's no need to worry about associativity
+	 * for the level 4 operators, since they return boolean and don't accept
+	 * boolean inputs.
+	 */
+	static $precedence = array(
+		'or' => 2,
+		'and' => 3,
+		'is' => 4,
+		'is-not' => 4,
+		'in' => 4,
+		'not-in' => 4,
+		'within' => 4,
+		'not-within' => 4,
+		'mod' => 5,
+		',' => 6,
+		'..' => 7,
+	);
+
+	/**
+	 * A character list defining whitespace, for use in strspn() etc.
+	 */
+	const WHITESPACE_CLASS = " \t\r\n";
+
+	/**
+	 * Same for digits. Note that the grammar given in UTS #35 doesn't allow
+	 * negative numbers or decimals.
+	 */
+	const NUMBER_CLASS = '0123456789';
+
+	/**
+	 * An anchored regular expression which matches a word at the current offset.
+	 */
+	const WORD_REGEX = '/[a-zA-Z]+/A';
+
+	/**
+	 * Convert a rule to RPN. This is the only public entry point.
+	 */
+	public static function convert( $rule ) {
+		$parser = new self( $rule );
+		return $parser->doConvert();
+	}
+
+	/**
+	 * Private constructor.
+	 */
+	protected function __construct( $rule ) {
+		$this->rule = $rule;
+		$this->pos = 0;
+		$this->end = strlen( $rule );
+	}
+
+	/**
+	 * Do the operation.
+	 */
+	protected function doConvert() {
+		$expectOperator = true;
+
+		// Iterate through all tokens, saving the operators and operands to a
+		// stack per Dijkstra's shunting yard algorithm.
+		while ( false !== ( $token = $this->nextToken() ) ) {
+			// In this grammar, there are only binary operators, so every valid
+			// rule string will alternate between operator and operand tokens.
+			$expectOperator = !$expectOperator;
+
+			if ( $token instanceof CLDRPluralRuleConverter_Expression ) {
+				// Operand
+				if ( $expectOperator ) {
+					$token->error( 'unexpected operand' );
+				}
+				$this->operands[] = $token;
+				continue;
+			} else {
+				// Operator
+				if  ( !$expectOperator ) {
+					$token->error( 'unexpected operator' );
+				}
+				// Resolve higher precedence levels
+				$lastOp = end( $this->operators );
+				while ( $lastOp && self::$precedence[$token->name] <= self::$precedence[$lastOp->name] ) {
+					$this->doOperation( $lastOp, $this->operands );
+					array_pop( $this->operators );
+					$lastOp = end( $this->operators );
+				}
+				$this->operators[] = $token;
+			}
+		}
+
+		// Finish off the stack
+		while ( $op = array_pop( $this->operators ) ) {
+			$this->doOperation( $op, $this->operands );
+		}
+
+		// Make sure the result is sane. The first case is possible for an empty
+		// string input, the second should be unreachable.
+		if ( !count( $this->operands ) ) {
+			$this->error( 'condition expected' );
+		} elseif ( count( $this->operands ) > 1 ) {
+			$this->error( 'missing operator or too many operands' );
+		}
+
+		$value = $this->operands[0];
+		if ( $value->type !== 'boolean' ) {
+			$this->error( 'the result must have a boolean type' );
+		}
+
+		return $this->operands[0]->rpn;
+	}
+
+	/**
+	 * Fetch the next token from the input string. Return it as a
+	 * CLDRPluralRuleConverter_Fragment object.
+	 */
+	protected function nextToken() {
+		if ( $this->pos >= $this->end ) {
+			return false;
+		}
+
+		// Whitespace
+		$length = strspn( $this->rule, self::WHITESPACE_CLASS, $this->pos );
+		$this->pos += $length;
+
+		if ( $this->pos >= $this->end ) {
+			return false;
+		}
+
+		// Number
+		$length = strspn( $this->rule, self::NUMBER_CLASS, $this->pos );
+		if ( $length !== 0 ) {
+			$token = $this->newNumber( substr( $this->rule, $this->pos, $length ), $this->pos );
+			$this->pos += $length;
+			return $token;
+		}
+
+		// Comma
+		if ( $this->rule[$this->pos] === ',' ) {
+			$token = $this->newOperator( ',', $this->pos, 1 );
+			$this->pos ++;
+			return $token;
+		}
+
+		// Dot dot
+		if ( substr( $this->rule, $this->pos, 2 ) === '..' ) {
+			$token = $this->newOperator( '..', $this->pos, 2 );
+			$this->pos += 2;
+			return $token;
+		}
+
+		// Word
+		if ( !preg_match( self::WORD_REGEX, $this->rule, $m, 0, $this->pos ) ) {
+			$this->error( 'unexpected character "' . $this->rule[$this->pos] . '"'  );
+		}
+		$word1 = strtolower( $m[0] );
+		$word2 = '';
+		$nextTokenPos = $this->pos + strlen( $word1 );
+		if ( $word1 === 'not' || $word1 === 'is' ) {
+			// Look ahead one word
+			$nextTokenPos += strspn( $this->rule, self::WHITESPACE_CLASS, $nextTokenPos );
+			if ( $nextTokenPos < $this->end
+					&& preg_match( self::WORD_REGEX, $this->rule, $m, 0, $nextTokenPos ) )
+			{
+				$word2 = strtolower( $m[0] );
+				$nextTokenPos += strlen( $word2 );
+			}
+		}
+
+		// Two-word operators like "is not" take precedence over single-word operators like "is"
+		if ( $word2 !== '' ) {
+			$bothWords = "{$word1}-{$word2}";
+			if ( isset( self::$precedence[$bothWords] ) ) {
+				$token = $this->newOperator( $bothWords, $this->pos, $nextTokenPos - $this->pos );
+				$this->pos = $nextTokenPos;
+				return $token;
+			}
+		}
+
+		// Single-word operators
+		if ( isset( self::$precedence[$word1] ) ) {
+			$token = $this->newOperator( $word1, $this->pos, strlen( $word1 ) );
+			$this->pos += strlen( $word1 );
+			return $token;
+		}
+
+		// The special numerical keyword "n"
+		if ( $word1 === 'n' ) {
+			$token = $this->newNumber( 'n', $this->pos );
+			$this->pos ++;
+			return $token;
+		}
+
+		$this->error( 'unrecognised word' );
+	}
+
+	/**
+	 * For the binary operator $op, pop its operands off the stack and push
+	 * a fragment with rpn and type members describing the result of that
+	 * operation.
+	 */
+	protected function doOperation( $op ) {
+		if ( count( $this->operands ) < 2 ) {
+			$op->error( 'missing operand' );
+		}
+		$right = array_pop( $this->operands );
+		$left = array_pop( $this->operands );
+		$result = $op->operate( $left, $right );
+		$this->operands[] = $result;
+	}
+
+	/**
+	 * Create a numerical expression object
+	 */
+	protected function newNumber( $text, $pos ) {
+		return new CLDRPluralRuleConverter_Expression( $this, 'number', $text, $pos, strlen( $text ) );
+	}
+
+	/**
+	 * Create a binary operator
+	 */
+	protected function newOperator( $type, $pos, $length ) {
+		return new CLDRPluralRuleConverter_Operator( $this, $type, $pos, $length );
+	}
+
+	/**
+	 * Throw an error
+	 */
+	protected function error( $message ) {
+		throw new CLDRPluralRuleError( $message );
+	}
+}
+
+/**
+ * Helper for CLDRPluralRuleConverter.
+ * The base class for operators and expressions, describing a region of the input string.
+ */
+class CLDRPluralRuleConverter_Fragment {
+	var $parser, $pos, $length, $end;
+
+	function __construct( $parser, $pos, $length ) {
+		$this->parser = $parser;
+		$this->pos = $pos;
+		$this->length = $length;
+		$this->end = $pos + $length;
+	}
+
+	public function error( $message ) {
+		$text = $this->getText();
+		throw new CLDRPluralRuleError( "$message at position " . ( $this->pos + 1 ) . ": \"$text\"" );
+	}
+
+	public function getText() {
+		return substr( $this->parser->rule, $this->pos, $this->length );
+	}
+}
+
+/**
+ * Helper for CLDRPluralRuleConverter.
+ * An expression object, representing a region of the input string (for error
+ * messages), the RPN notation used to evaluate it, and the result type for
+ * validation.
+ */
+class CLDRPluralRuleConverter_Expression extends CLDRPluralRuleConverter_Fragment {
+	var $type, $rpn;
+
+	function __construct( $parser, $type, $rpn, $pos, $length ) {
+		parent::__construct( $parser, $pos, $length );
+		$this->type = $type;
+		$this->rpn = $rpn;
+	}
+
+	public function isType( $type ) {
+		if ( $type === 'range' && ( $this->type === 'range' || $this->type === 'number' ) ) {
+			return true;
+		}
+		if ( $type === $this->type ) {
+			return true;
+		}
+		return false;
+	}
+}
+
+/**
+ * Helper for CLDRPluralRuleConverter.
+ * An operator object, representing a region of the input string (for error
+ * messages), and the binary operator at that location.
+ */
+class CLDRPluralRuleConverter_Operator extends CLDRPluralRuleConverter_Fragment {
+	var $name;
+
+	/**
+	 * Each op type has three characters: left operand type, right operand type and result type
+	 *
+	 *   b = boolean
+	 *   n = number
+	 *   r = range
+	 *
+	 * A number is a kind of range.
+	 */
+	static $opTypes = array(
+		'or' => 'bbb',
+		'and' => 'bbb',
+		'is' => 'nnb',
+		'is-not' => 'nnb',
+		'in' => 'nrb',
+		'not-in' => 'nrb',
+		'within' => 'nrb',
+		'not-within' => 'nrb',
+		'mod' => 'nnn',
+		',' => 'rrr',
+		'..' => 'nnr',
+	);
+
+	/**
+	 * Map converting from the abbrevation to the full form.
+	 */
+	static $typeSpecMap = array(
+		'b' => 'boolean',
+		'n' => 'number',
+		'r' => 'range',
+	);
+
+	function __construct( $parser, $name, $pos, $length ) {
+		parent::__construct( $parser, $pos, $length );
+		$this->name = $name;
+	}
+
+	public function operate( $left, $right ) {
+		$typeSpec = self::$opTypes[$this->name];
+
+		$leftType = self::$typeSpecMap[$typeSpec[0]];
+		$rightType = self::$typeSpecMap[$typeSpec[1]];
+		$resultType = self::$typeSpecMap[$typeSpec[2]];
+
+		$start = min( $this->pos, $left->pos, $right->pos );
+		$end = max( $this->end, $left->end, $right->end );
+		$length = $end - $start;
+
+		$newExpr = new CLDRPluralRuleConverter_Expression( $this->parser, $resultType,
+			"{$left->rpn} {$right->rpn} {$this->name}",
+			$start, $length );
+
+		if ( !$left->isType( $leftType ) ) {
+			$newExpr->error( "invalid type for left operand: expected $leftType, got {$left->type}" );
+		}
+
+		if ( !$right->isType( $rightType ) ) {
+			$newExpr->error( "invalid type for right operand: expected $rightType, got {$right->type}" );
+		}
+		return $newExpr;
+	}
+}
+
+/**
+ * The exception class for all the classes in this file. This will be thrown
+ * back to the caller if there is any validation error.
+ */
+class CLDRPluralRuleError extends MWException {
+	function __construct( $message ) {
+		parent::__construct( 'CLDR plural rule error: ' . $message );
+	}
+}
diff --git a/load.php b/load.php
index 4c7208006f..f363c3fa51 100644
--- a/load.php
+++ b/load.php
@@ -24,6 +24,7 @@
 
 // Bail if PHP is too low
 if ( !function_exists( 'version_compare' ) || version_compare( phpversion(), '5.3.2' ) < 0 ) {
+	// We need to use dirname( __FILE__ ) here cause __DIR__ is PHP5.3+
 	require( dirname( __FILE__ ) . '/includes/PHPVersionError.php' );
 	wfPHPVersionError( 'load.php' );
 }
@@ -31,7 +32,7 @@ if ( !function_exists( 'version_compare' ) || version_compare( phpversion(), '5.
 if ( isset( $_SERVER['MW_COMPILED'] ) ) {
 	require ( 'phase3/includes/WebStart.php' );
 } else {
-	require ( dirname( __FILE__ ) . '/includes/WebStart.php' );
+	require ( __DIR__ . '/includes/WebStart.php' );
 }
 
 wfProfileIn( 'load.php' );
diff --git a/maintenance/Maintenance.php b/maintenance/Maintenance.php
index cec1270962..69d113138a 100644
--- a/maintenance/Maintenance.php
+++ b/maintenance/Maintenance.php
@@ -20,23 +20,24 @@
  * @defgroup Maintenance Maintenance
  */
 
+// Make sure we're on PHP5.3.2 or better
+if ( !function_exists( 'version_compare' ) || version_compare( PHP_VERSION, '5.3.2' ) < 0 ) {
+	// We need to use dirname( __FILE__ ) here cause __DIR__ is PHP5.3+
+	require_once( dirname( __FILE__ ) . '/../includes/PHPVersionError.php' );
+	wfPHPVersionError( 'cli' );
+}
+
 /**
  * @defgroup MaintenanceArchive Maintenance archives
  * @ingroup Maintenance
  */
 
 // Define this so scripts can easily find doMaintenance.php
-define( 'RUN_MAINTENANCE_IF_MAIN', dirname( __FILE__ ) . '/doMaintenance.php' );
+define( 'RUN_MAINTENANCE_IF_MAIN', __DIR__ . '/doMaintenance.php' );
 define( 'DO_MAINTENANCE', RUN_MAINTENANCE_IF_MAIN ); // original name, harmless
 
 $maintClass = false;
 
-// Make sure we're on PHP5 or better
-if ( !function_exists( 'version_compare' ) || version_compare( PHP_VERSION, '5.3.2' ) < 0 ) {
-	require_once( dirname( __FILE__ ) . '/../includes/PHPVersionError.php' );
-	wfPHPVersionError( 'cli' );
-}
-
 /**
  * Abstract maintenance class for quickly writing and churning out
  * maintenance scripts with minimal effort. All that _must_ be defined
@@ -123,7 +124,7 @@ abstract class Maintenance {
 		global $IP;
 		$IP = strval( getenv( 'MW_INSTALL_PATH' ) ) !== ''
 			? getenv( 'MW_INSTALL_PATH' )
-			: realpath( dirname( __FILE__ ) . '/..' );
+			: realpath( __DIR__ . '/..' );
 
 		$this->addDefaultParams();
 		register_shutdown_function( array( $this, 'outputChanneled' ), false );
@@ -988,7 +989,7 @@ abstract class Maintenance {
 	 * @return string
 	 */
 	protected function getDir() {
-		return dirname( __FILE__ );
+		return __DIR__;
 	}
 
 	/**
@@ -1009,9 +1010,9 @@ abstract class Maintenance {
 	protected static function getCoreScripts() {
 		if ( !self::$mCoreScripts ) {
 			$paths = array(
-				dirname( __FILE__ ),
-				dirname( __FILE__ ) . '/language',
-				dirname( __FILE__ ) . '/storage',
+				__DIR__,
+				__DIR__ . '/language',
+				__DIR__ . '/storage',
 			);
 			self::$mCoreScripts = array();
 			foreach ( $paths as $p ) {
diff --git a/maintenance/archives/upgradeLogging.php b/maintenance/archives/upgradeLogging.php
index 1765bd9f10..d406ea8d98 100644
--- a/maintenance/archives/upgradeLogging.php
+++ b/maintenance/archives/upgradeLogging.php
@@ -21,7 +21,7 @@
  * @ingroup MaintenanceArchive
  */
 
-require( dirname( __FILE__ ) . '/../commandLine.inc' );
+require( __DIR__ . '/../commandLine.inc' );
 
 class UpdateLogging {
 
diff --git a/maintenance/attachLatest.php b/maintenance/attachLatest.php
index 78cae8cfb3..475cafc971 100644
--- a/maintenance/attachLatest.php
+++ b/maintenance/attachLatest.php
@@ -24,7 +24,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 /**
  * Maintenance script to correct wrong values in the `page_latest` field
diff --git a/maintenance/backupTextPass.inc b/maintenance/backupTextPass.inc
index 3ca30258a7..84aac57f12 100644
--- a/maintenance/backupTextPass.inc
+++ b/maintenance/backupTextPass.inc
@@ -24,7 +24,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/backup.inc' );
+require_once( __DIR__ . '/backup.inc' );
 
 /**
  * @ingroup Maintenance
diff --git a/maintenance/benchmarks/Benchmarker.php b/maintenance/benchmarks/Benchmarker.php
index 0056c3c7da..822f1a6a8b 100644
--- a/maintenance/benchmarks/Benchmarker.php
+++ b/maintenance/benchmarks/Benchmarker.php
@@ -27,7 +27,7 @@
  * @ingroup Benchmark
  */
 
-require_once( dirname( __FILE__ ) . '/../Maintenance.php' );
+require_once( __DIR__ . '/../Maintenance.php' );
 abstract class Benchmarker extends Maintenance {
 	private $results;
 
diff --git a/maintenance/benchmarks/bench_HTTP_HTTPS.php b/maintenance/benchmarks/bench_HTTP_HTTPS.php
index cf62aadbd0..fb836c1790 100644
--- a/maintenance/benchmarks/bench_HTTP_HTTPS.php
+++ b/maintenance/benchmarks/bench_HTTP_HTTPS.php
@@ -22,7 +22,7 @@
  * @author  Platonides
  */
 
-require_once( dirname( __FILE__ ) . '/Benchmarker.php' );
+require_once( __DIR__ . '/Benchmarker.php' );
 class bench_HTTP_HTTPS extends Benchmarker {
 
 	public function __construct() {
diff --git a/maintenance/benchmarks/bench_delete_truncate.php b/maintenance/benchmarks/bench_delete_truncate.php
index 7138552048..6e448647cd 100644
--- a/maintenance/benchmarks/bench_delete_truncate.php
+++ b/maintenance/benchmarks/bench_delete_truncate.php
@@ -4,7 +4,7 @@
  * @ingroup Benchmark
  */
 
-require_once( dirname( __FILE__ ) . '/Benchmarker.php' );
+require_once( __DIR__ . '/Benchmarker.php' );
 
 class BenchmarkDeleteTruncate extends Benchmarker {
 
diff --git a/maintenance/benchmarks/bench_if_switch.php b/maintenance/benchmarks/bench_if_switch.php
index dafce0508c..4a3abd4a71 100644
--- a/maintenance/benchmarks/bench_if_switch.php
+++ b/maintenance/benchmarks/bench_if_switch.php
@@ -22,7 +22,7 @@
  * @author  Platonides
  */
 
-require_once( dirname( __FILE__ ) . '/Benchmarker.php' );
+require_once( __DIR__ . '/Benchmarker.php' );
 class bench_if_switch extends Benchmarker {
 
 	public function __construct() {
diff --git a/maintenance/benchmarks/bench_strtr_str_replace.php b/maintenance/benchmarks/bench_strtr_str_replace.php
index 73ace2bd0b..cce7879b1c 100644
--- a/maintenance/benchmarks/bench_strtr_str_replace.php
+++ b/maintenance/benchmarks/bench_strtr_str_replace.php
@@ -4,7 +4,7 @@
  * @ingroup Benchmark
  */
 
-require_once( dirname( __FILE__ ) . '/Benchmarker.php' );
+require_once( __DIR__ . '/Benchmarker.php' );
 
 function bfNormalizeTitleStrTr( $str ) {
     return strtr( $str, '_', ' ' );
diff --git a/maintenance/benchmarks/bench_utf8_title_check.php b/maintenance/benchmarks/bench_utf8_title_check.php
index 2e4b90292d..d71f5f5ba5 100644
--- a/maintenance/benchmarks/bench_utf8_title_check.php
+++ b/maintenance/benchmarks/bench_utf8_title_check.php
@@ -1,22 +1,22 @@
 <?php
-/**
- * @file
- * @ingroup Benchmark
- */
-
-require_once( dirname( __FILE__ ) . '/Benchmarker.php' );
+/**
+ * @file
+ * @ingroup Benchmark
+ */
+
+require_once( __DIR__ . '/Benchmarker.php' );
 
 /**
  * This little benchmark executes the regexp used in Language->checkTitleEncoding() and compares its execution time
  * against that of mb_check_encoding, if available.
- */
+ */
 class bench_utf8_title_check extends Benchmarker {
 
 	private $canRun;
 
 	private $data;
 
-	public function __construct() {
+	public function __construct() {
 		parent::__construct();
 
 		$this->data = array (
@@ -43,14 +43,14 @@ class bench_utf8_title_check extends Benchmarker {
 
 		$this->canRun = function_exists ( 'mb_check_encoding' );
 
-		if ( $this->canRun ) {
+		if ( $this->canRun ) {
 			$this->mDescription = "Benchmark for using a regexp vs. mb_check_encoding to check for UTF-8 encoding.";
 			mb_internal_encoding( 'UTF-8' );
 		} else {
 			$this->mDescription = "CANNOT RUN benchmark using mb_check_encoding: function not available.";
-		}
-	}
-
+		}
+	}
+
 	public function execute() {
 		if ( !$this->canRun ) {
 			return;
@@ -69,22 +69,22 @@ class bench_utf8_title_check extends Benchmarker {
 				'function' => array( $this, 'use_regexp_once_only' ),
 				'args' => array( rawurldecode ( $val ) )
 			);
-			$benchmarks[] = array(
-				'function' => array( $this, 'use_mb_check_encoding' ),
-				'args' => array( rawurldecode ( $val ) )
+			$benchmarks[] = array(
+				'function' => array( $this, 'use_mb_check_encoding' ),
+				'args' => array( rawurldecode ( $val ) )
 			);
-		}
+		}
 		$this->bench( $benchmarks );
-		print $this->getFormattedResults();
-	}
+		print $this->getFormattedResults();
+	}
 
 	private $isutf8;
-
+
 	function use_regexp( $s ) {
 		$this->isutf8 = preg_match( '/^([\x00-\x7f]|[\xc0-\xdf][\x80-\xbf]|' .
-				'[\xe0-\xef][\x80-\xbf]{2}|[\xf0-\xf7][\x80-\xbf]{3})+$/', $s );
-	}
-
+				'[\xe0-\xef][\x80-\xbf]{2}|[\xf0-\xf7][\x80-\xbf]{3})+$/', $s );
+	}
+
 	function use_regexp_non_capturing( $s ) {
 		// Same as above with a non-capturing subgroup.
 		$this->isutf8 = preg_match( '/^(?:[\x00-\x7f]|[\xc0-\xdf][\x80-\xbf]|' .
@@ -97,11 +97,11 @@ class bench_utf8_title_check extends Benchmarker {
 				'[\xe0-\xef][\x80-\xbf]{2}|[\xf0-\xf7][\x80-\xbf]{3})+$/', $s );
 	}
 
-	function use_mb_check_encoding( $s ) {
-		$this->isutf8 = mb_check_encoding( $s, 'UTF-8' );
-	}
-
-}
-
-$maintClass = 'bench_utf8_title_check';
-require_once( RUN_MAINTENANCE_IF_MAIN );
+	function use_mb_check_encoding( $s ) {
+		$this->isutf8 = mb_check_encoding( $s, 'UTF-8' );
+	}
+
+}
+
+$maintClass = 'bench_utf8_title_check';
+require_once( RUN_MAINTENANCE_IF_MAIN );
diff --git a/maintenance/benchmarks/bench_wfIsWindows.php b/maintenance/benchmarks/bench_wfIsWindows.php
index 4caebc5edd..cd07fbd642 100644
--- a/maintenance/benchmarks/bench_wfIsWindows.php
+++ b/maintenance/benchmarks/bench_wfIsWindows.php
@@ -22,7 +22,7 @@
  * @author  Platonides
  */
 
-require_once( dirname( __FILE__ ) . '/Benchmarker.php' );
+require_once( __DIR__ . '/Benchmarker.php' );
 class bench_wfIsWindows extends Benchmarker {
 
 	public function __construct() {
diff --git a/maintenance/benchmarks/benchmarkHooks.php b/maintenance/benchmarks/benchmarkHooks.php
index 4ec2616859..508ea80aa4 100644
--- a/maintenance/benchmarks/benchmarkHooks.php
+++ b/maintenance/benchmarks/benchmarkHooks.php
@@ -19,7 +19,7 @@
  * @ingroup Benchmark
  */
 
-require_once( dirname( __FILE__ ) . '/Benchmarker.php' );
+require_once( __DIR__ . '/Benchmarker.php' );
 
 class BenchmarkHooks extends Benchmarker {
 
diff --git a/maintenance/benchmarks/benchmarkPurge.php b/maintenance/benchmarks/benchmarkPurge.php
index e9d2ec7a03..4d36d2629a 100644
--- a/maintenance/benchmarks/benchmarkPurge.php
+++ b/maintenance/benchmarks/benchmarkPurge.php
@@ -21,7 +21,7 @@
  * @ingroup Benchmark
  */
 
-require_once( dirname( __FILE__ ) . '/Benchmarker.php' );
+require_once( __DIR__ . '/Benchmarker.php' );
 
 class BenchmarkPurge extends Benchmarker {
 
diff --git a/maintenance/cdb.php b/maintenance/cdb.php
index 270f7a60f3..c06c2cd0e0 100644
--- a/maintenance/cdb.php
+++ b/maintenance/cdb.php
@@ -23,7 +23,7 @@
  */
 
 /** */
-require_once( dirname( __FILE__ ) . '/commandLine.inc' );
+require_once( __DIR__ . '/commandLine.inc' );
 
 function cdbShowHelp( $command ) {
 	$commandList = array(
diff --git a/maintenance/changePassword.php b/maintenance/changePassword.php
index e4063f9c9c..f276fc1637 100644
--- a/maintenance/changePassword.php
+++ b/maintenance/changePassword.php
@@ -24,7 +24,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 /**
  * Maintenance script to change the password of a given user.
diff --git a/maintenance/checkAutoLoader.php b/maintenance/checkAutoLoader.php
index ea6c09f2bb..8d0e442bdf 100644
--- a/maintenance/checkAutoLoader.php
+++ b/maintenance/checkAutoLoader.php
@@ -21,7 +21,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 /**
  * Maintenance script to check classes definitions in the autoloader.
diff --git a/maintenance/checkBadRedirects.php b/maintenance/checkBadRedirects.php
index f8b8955c3a..670b93de2b 100644
--- a/maintenance/checkBadRedirects.php
+++ b/maintenance/checkBadRedirects.php
@@ -21,7 +21,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 /**
  * Maintenance script to check that pages marked as being redirects really are.
diff --git a/maintenance/checkImages.php b/maintenance/checkImages.php
index d7463ece28..c05d91517d 100644
--- a/maintenance/checkImages.php
+++ b/maintenance/checkImages.php
@@ -20,7 +20,7 @@
  * @file
  * @ingroup Maintenance
  */
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 /**
  * Maintenance script to check images to see if they exist, are readable, etc.
diff --git a/maintenance/checkSyntax.php b/maintenance/checkSyntax.php
index 3019b8427a..0a22f58c32 100644
--- a/maintenance/checkSyntax.php
+++ b/maintenance/checkSyntax.php
@@ -21,7 +21,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 /**
  * Maintenance script to check syntax of all PHP files in MediaWiki.
diff --git a/maintenance/checkUsernames.php b/maintenance/checkUsernames.php
index 6a9294a307..dd5e0022cb 100644
--- a/maintenance/checkUsernames.php
+++ b/maintenance/checkUsernames.php
@@ -22,7 +22,7 @@
  */
 
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 /**
  * Maintenance script to check that database usernames are actually valid.
diff --git a/maintenance/cleanupAncientTables.php b/maintenance/cleanupAncientTables.php
index d449d6c591..dbc2e0d3d4 100644
--- a/maintenance/cleanupAncientTables.php
+++ b/maintenance/cleanupAncientTables.php
@@ -21,7 +21,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 /**
  * Maintenance script to cleans up old database tables, dropping old indexes
diff --git a/maintenance/cleanupCaps.php b/maintenance/cleanupCaps.php
index b61f6ff4ef..ec2aa957d8 100644
--- a/maintenance/cleanupCaps.php
+++ b/maintenance/cleanupCaps.php
@@ -29,7 +29,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/cleanupTable.inc' );
+require_once( __DIR__ . '/cleanupTable.inc' );
 
 /**
  * Maintenance script to clean up broken page links when somebody turns on $wgCapitalLinks.
diff --git a/maintenance/cleanupImages.php b/maintenance/cleanupImages.php
index 2beed7203d..4e7b937dbf 100644
--- a/maintenance/cleanupImages.php
+++ b/maintenance/cleanupImages.php
@@ -29,7 +29,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/cleanupTable.inc' );
+require_once( __DIR__ . '/cleanupTable.inc' );
 
 /**
  * Maintenance script to clean up broken, unparseable upload filenames.
diff --git a/maintenance/cleanupPreferences.php b/maintenance/cleanupPreferences.php
index 706f87fb92..f37af775da 100755
--- a/maintenance/cleanupPreferences.php
+++ b/maintenance/cleanupPreferences.php
@@ -23,7 +23,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 /**
  * Maintenance script that removes hidden preferences from the database.
diff --git a/maintenance/cleanupRemovedModules.php b/maintenance/cleanupRemovedModules.php
index b339bfcdcf..2085da94d1 100644
--- a/maintenance/cleanupRemovedModules.php
+++ b/maintenance/cleanupRemovedModules.php
@@ -22,7 +22,7 @@
  * @author Roan Kattouw
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 /**
  * Maintenance script to remove cache entries for removed ResourceLoader modules
diff --git a/maintenance/cleanupSpam.php b/maintenance/cleanupSpam.php
index 2051c89a4c..e20bcd87d6 100644
--- a/maintenance/cleanupSpam.php
+++ b/maintenance/cleanupSpam.php
@@ -21,7 +21,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 /**
  * Maintenance script to cleanup all spam from a given hostname.
diff --git a/maintenance/cleanupTable.inc b/maintenance/cleanupTable.inc
index 898bdf497e..85911ba7c8 100644
--- a/maintenance/cleanupTable.inc
+++ b/maintenance/cleanupTable.inc
@@ -21,7 +21,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 /**
  * Generic class to cleanup a database table. Already subclasses Maintenance.
diff --git a/maintenance/cleanupTitles.php b/maintenance/cleanupTitles.php
index a2dc3a3c60..ad2577aa9d 100644
--- a/maintenance/cleanupTitles.php
+++ b/maintenance/cleanupTitles.php
@@ -29,7 +29,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/cleanupTable.inc' );
+require_once( __DIR__ . '/cleanupTable.inc' );
 
 /**
  * Maintenance script to clean up broken, unparseable titles.
diff --git a/maintenance/cleanupUploadStash.php b/maintenance/cleanupUploadStash.php
index 32377b6972..cc329461b9 100644
--- a/maintenance/cleanupUploadStash.php
+++ b/maintenance/cleanupUploadStash.php
@@ -25,7 +25,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 /**
  * Maintenance script to remove old or broken uploads from temporary uploaded
diff --git a/maintenance/cleanupWatchlist.php b/maintenance/cleanupWatchlist.php
index 840337c1f5..fbab6a3c4f 100644
--- a/maintenance/cleanupWatchlist.php
+++ b/maintenance/cleanupWatchlist.php
@@ -29,7 +29,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/cleanupTable.inc' );
+require_once( __DIR__ . '/cleanupTable.inc' );
 
 /**
  * Maintenance script to remove broken, unparseable titles in the watchlist table.
diff --git a/maintenance/clear_interwiki_cache.php b/maintenance/clear_interwiki_cache.php
index 638a475c64..88769df2da 100644
--- a/maintenance/clear_interwiki_cache.php
+++ b/maintenance/clear_interwiki_cache.php
@@ -21,7 +21,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 /**
  * Maintenance script to clear the cache of interwiki prefixes for all local wikis.
diff --git a/maintenance/clear_stats.php b/maintenance/clear_stats.php
index 2ed5a67ce2..4581d53276 100644
--- a/maintenance/clear_stats.php
+++ b/maintenance/clear_stats.php
@@ -21,7 +21,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 /**
  * Maintenance script to remove all statistics tracking from the cache.
diff --git a/maintenance/commandLine.inc b/maintenance/commandLine.inc
index c7adbfbc9e..86a558d0e1 100644
--- a/maintenance/commandLine.inc
+++ b/maintenance/commandLine.inc
@@ -21,7 +21,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 global $optionsWithArgs;
 if ( !isset( $optionsWithArgs ) ) {
diff --git a/maintenance/compareParsers.php b/maintenance/compareParsers.php
index 9d7f5c7793..a3337173c2 100644
--- a/maintenance/compareParsers.php
+++ b/maintenance/compareParsers.php
@@ -28,7 +28,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/dumpIterator.php' );
+require_once( __DIR__ . '/dumpIterator.php' );
 
 /**
  * Maintenance script to take page text out of an XML dump file and render
diff --git a/maintenance/convertLinks.php b/maintenance/convertLinks.php
index 275d8fad19..5f7b02e423 100644
--- a/maintenance/convertLinks.php
+++ b/maintenance/convertLinks.php
@@ -21,7 +21,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 /**
  * Maintenance script to convert from the old links schema (string->ID)
diff --git a/maintenance/convertUserOptions.php b/maintenance/convertUserOptions.php
index e666b65a13..7c9ca2696f 100644
--- a/maintenance/convertUserOptions.php
+++ b/maintenance/convertUserOptions.php
@@ -21,7 +21,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 /**
  * Maintenance script to convert user options to the new `user_properties` table.
diff --git a/maintenance/copyFileBackend.php b/maintenance/copyFileBackend.php
index 2363d40ae3..aebdee175f 100644
--- a/maintenance/copyFileBackend.php
+++ b/maintenance/copyFileBackend.php
@@ -21,7 +21,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 /**
  * Copy all files in one container of one backend to another.
diff --git a/maintenance/createAndPromote.php b/maintenance/createAndPromote.php
index 3f328f9987..ad5333fcc7 100644
--- a/maintenance/createAndPromote.php
+++ b/maintenance/createAndPromote.php
@@ -22,7 +22,7 @@
  * @author Rob Church <robchur@gmail.com>
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 /**
  * Maintenance script to create an account and grant it administrator rights.
diff --git a/maintenance/deleteArchivedFiles.php b/maintenance/deleteArchivedFiles.php
index 8709ee88bc..85ffc23b78 100644
--- a/maintenance/deleteArchivedFiles.php
+++ b/maintenance/deleteArchivedFiles.php
@@ -24,8 +24,8 @@
  * @author Aaron Schulz
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
-require_once( dirname( __FILE__ ) . '/deleteArchivedFiles.inc' );
+require_once( __DIR__ . '/Maintenance.php' );
+require_once( __DIR__ . '/deleteArchivedFiles.inc' );
 
 /**
  * Maintenance script to delete archived (non-current) files from the database.
diff --git a/maintenance/deleteArchivedRevisions.php b/maintenance/deleteArchivedRevisions.php
index 353661a5c7..4b658bbb80 100644
--- a/maintenance/deleteArchivedRevisions.php
+++ b/maintenance/deleteArchivedRevisions.php
@@ -24,8 +24,8 @@
  * @author Aaron Schulz
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
-require_once( dirname( __FILE__ ) . '/deleteArchivedRevisions.inc' );
+require_once( __DIR__ . '/Maintenance.php' );
+require_once( __DIR__ . '/deleteArchivedRevisions.inc' );
 
 /**
  * Maintenance script to delete archived (deleted from public) revisions
diff --git a/maintenance/deleteBatch.php b/maintenance/deleteBatch.php
index 6860a5afa4..936a52b857 100644
--- a/maintenance/deleteBatch.php
+++ b/maintenance/deleteBatch.php
@@ -28,7 +28,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 /**
  * Maintenance script to delete a batch of pages.
diff --git a/maintenance/deleteDefaultMessages.php b/maintenance/deleteDefaultMessages.php
index 540d225e67..4ab6d1d9c2 100644
--- a/maintenance/deleteDefaultMessages.php
+++ b/maintenance/deleteDefaultMessages.php
@@ -22,7 +22,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 /**
  * Maintenance script that deletes all pages in the MediaWiki namespace
diff --git a/maintenance/deleteImageMemcached.php b/maintenance/deleteImageMemcached.php
index 2029b57106..3c8c5fdd88 100644
--- a/maintenance/deleteImageMemcached.php
+++ b/maintenance/deleteImageMemcached.php
@@ -24,7 +24,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 /**
  * Maintenance script that deletes image information from the object cache.
diff --git a/maintenance/deleteOldRevisions.php b/maintenance/deleteOldRevisions.php
index 45a6b343c1..6a3e211b00 100644
--- a/maintenance/deleteOldRevisions.php
+++ b/maintenance/deleteOldRevisions.php
@@ -22,7 +22,7 @@
  * @author Rob Church <robchur@gmail.com>
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 /**
  * Maintenance script that deletes old (non-current) revisions from the database.
diff --git a/maintenance/deleteOrphanedRevisions.php b/maintenance/deleteOrphanedRevisions.php
index 13b9c91bf9..5dc7567fc7 100644
--- a/maintenance/deleteOrphanedRevisions.php
+++ b/maintenance/deleteOrphanedRevisions.php
@@ -24,7 +24,7 @@
  * @todo More efficient cleanup of text records
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 /**
  * Maintenance script that deletes revisions which refer to a nonexisting page.
diff --git a/maintenance/deleteRevision.php b/maintenance/deleteRevision.php
index fe3b5151a8..ad6470d9d2 100644
--- a/maintenance/deleteRevision.php
+++ b/maintenance/deleteRevision.php
@@ -21,7 +21,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 /**
  * Maintenance script that deletes one or more revisions by moving them
diff --git a/maintenance/deleteSelfExternals.php b/maintenance/deleteSelfExternals.php
index 162dcb4f73..da220d6416 100644
--- a/maintenance/deleteSelfExternals.php
+++ b/maintenance/deleteSelfExternals.php
@@ -21,7 +21,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 /**
  * Maintenance script that deletes self-references to $wgServer
diff --git a/maintenance/dumpBackup.php b/maintenance/dumpBackup.php
index 463846872b..c9546c60d9 100644
--- a/maintenance/dumpBackup.php
+++ b/maintenance/dumpBackup.php
@@ -29,8 +29,8 @@ $originalDir = getcwd();
 
 $optionsWithArgs = array( 'pagelist', 'start', 'end', 'revstart', 'revend');
 
-require_once( dirname( __FILE__ ) . '/commandLine.inc' );
-require_once( dirname( __FILE__ ) . '/backup.inc' );
+require_once( __DIR__ . '/commandLine.inc' );
+require_once( __DIR__ . '/backup.inc' );
 
 $dumper = new BackupDumper( $argv );
 
diff --git a/maintenance/dumpIterator.php b/maintenance/dumpIterator.php
index 4c04d860b6..485218ca88 100644
--- a/maintenance/dumpIterator.php
+++ b/maintenance/dumpIterator.php
@@ -26,7 +26,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 /**
  * Base class for interating over a dump.
diff --git a/maintenance/dumpLinks.php b/maintenance/dumpLinks.php
index ad440e70f2..153fdd79ef 100644
--- a/maintenance/dumpLinks.php
+++ b/maintenance/dumpLinks.php
@@ -30,7 +30,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 /**
  * Maintenance script that generates a plaintext link dump.
diff --git a/maintenance/dumpSisterSites.php b/maintenance/dumpSisterSites.php
index 5dbb5e2360..e05e154ed4 100644
--- a/maintenance/dumpSisterSites.php
+++ b/maintenance/dumpSisterSites.php
@@ -25,7 +25,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 /**
  * Maintenance script that generates a page name dump for SisterSites usage.
diff --git a/maintenance/dumpTextPass.php b/maintenance/dumpTextPass.php
index 41a7a68743..72d7d97cbb 100644
--- a/maintenance/dumpTextPass.php
+++ b/maintenance/dumpTextPass.php
@@ -26,8 +26,8 @@
 
 $originalDir = getcwd();
 
-require_once( dirname( __FILE__ ) . '/commandLine.inc' );
-require_once( dirname( __FILE__ ) . '/backupTextPass.inc' );
+require_once( __DIR__ . '/commandLine.inc' );
+require_once( __DIR__ . '/backupTextPass.inc' );
 
 
 $dumper = new TextPassDumper( $argv );
diff --git a/maintenance/dumpUploads.php b/maintenance/dumpUploads.php
index b16b0c2929..0d0dfcf378 100644
--- a/maintenance/dumpUploads.php
+++ b/maintenance/dumpUploads.php
@@ -21,7 +21,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 /**
  * Maintenance script to dump a the list of files uploaded,
diff --git a/maintenance/edit.php b/maintenance/edit.php
index 13b3c49181..59df5e8863 100644
--- a/maintenance/edit.php
+++ b/maintenance/edit.php
@@ -21,7 +21,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 /**
  * Maintenance script to make a page edit.
diff --git a/maintenance/eval.php b/maintenance/eval.php
index 3bd164fdaf..5aefe1c970 100644
--- a/maintenance/eval.php
+++ b/maintenance/eval.php
@@ -34,7 +34,7 @@
 $optionsWithArgs = array( 'd' );
 
 /** */
-require_once( dirname( __FILE__ ) . "/commandLine.inc" );
+require_once( __DIR__ . "/commandLine.inc" );
 
 if ( isset( $options['d'] ) ) {
 	$d = $options['d'];
diff --git a/maintenance/fetchText.php b/maintenance/fetchText.php
index 28330814c3..a705bccad0 100644
--- a/maintenance/fetchText.php
+++ b/maintenance/fetchText.php
@@ -22,7 +22,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 /**
  * Maintenance script used to fetch page text in a subprocess.
diff --git a/maintenance/fileOpPerfTest.php b/maintenance/fileOpPerfTest.php
index 0f73e880ac..501bcfc389 100644
--- a/maintenance/fileOpPerfTest.php
+++ b/maintenance/fileOpPerfTest.php
@@ -25,7 +25,7 @@ $initialTime = microtime( true );
 $wgProfiler = array( 'class' => 'ProfilerSimpleText' );
 error_reporting( E_ALL );
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 /**
  * Maintenance script to test fileop performance.
diff --git a/maintenance/findHooks.php b/maintenance/findHooks.php
index e4fa5deee1..e273c545f4 100644
--- a/maintenance/findHooks.php
+++ b/maintenance/findHooks.php
@@ -34,7 +34,7 @@
  * @author Antoine Musso <hashar at free dot fr>
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 /**
  * Maintenance script that compares documented and actually present mismatches.
diff --git a/maintenance/fixDoubleRedirects.php b/maintenance/fixDoubleRedirects.php
index e52c6c34bf..6f017eca48 100644
--- a/maintenance/fixDoubleRedirects.php
+++ b/maintenance/fixDoubleRedirects.php
@@ -25,7 +25,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 /**
  * Maintenance script that fixes double redirects.
diff --git a/maintenance/fixExtLinksProtocolRelative.php b/maintenance/fixExtLinksProtocolRelative.php
index d247862f5f..2403ec68b4 100644
--- a/maintenance/fixExtLinksProtocolRelative.php
+++ b/maintenance/fixExtLinksProtocolRelative.php
@@ -23,7 +23,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 /**
  * Maintenance script that fixes any entriy for protocol-relative URLs
diff --git a/maintenance/fixSlaveDesync.php b/maintenance/fixSlaveDesync.php
index 126eed2524..8bf556f087 100644
--- a/maintenance/fixSlaveDesync.php
+++ b/maintenance/fixSlaveDesync.php
@@ -21,7 +21,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 /**
  * Maintenance script that fixes erroneous page_latest values
diff --git a/maintenance/fixTimestamps.php b/maintenance/fixTimestamps.php
index 3a952512de..84d08d3930 100644
--- a/maintenance/fixTimestamps.php
+++ b/maintenance/fixTimestamps.php
@@ -25,7 +25,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 /**
  * Maintenance script that fixes timestamp corruption caused by one or
diff --git a/maintenance/fixUserRegistration.php b/maintenance/fixUserRegistration.php
index 4eca3967d3..91d42a5d99 100644
--- a/maintenance/fixUserRegistration.php
+++ b/maintenance/fixUserRegistration.php
@@ -22,7 +22,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 /**
  * Maintenance script that fixes the user_registration field.
diff --git a/maintenance/formatInstallDoc.php b/maintenance/formatInstallDoc.php
index 474caabc8d..600ca9768e 100644
--- a/maintenance/formatInstallDoc.php
+++ b/maintenance/formatInstallDoc.php
@@ -21,7 +21,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) .'/Maintenance.php' );
+require_once( __DIR__ .'/Maintenance.php' );
 
 /**
  * Maintenance script that formats RELEASE-NOTE file to wiki text or HTML markup.
diff --git a/maintenance/fuzz-tester.php b/maintenance/fuzz-tester.php
index 8f3b8e5b9d..1c96a57161 100644
--- a/maintenance/fuzz-tester.php
+++ b/maintenance/fuzz-tester.php
@@ -181,7 +181,7 @@ TODO:
 // ///////////////////////// COMMAND LINE HELP ////////////////////////////////////
 
 // This is a command line script, load MediaWiki env (gives command line options);
-require_once( dirname( __FILE__ ) . '/commandLine.inc' );
+require_once( __DIR__ . '/commandLine.inc' );
 
 // if the user asked for an explanation of command line options.
 if ( isset( $options["help"] ) ) {
diff --git a/maintenance/generateSitemap.php b/maintenance/generateSitemap.php
index a81e3d9e91..f3a5d875e8 100644
--- a/maintenance/generateSitemap.php
+++ b/maintenance/generateSitemap.php
@@ -26,7 +26,7 @@
  * @see http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 /**
  * Maintenance script that generates a sitemap for the site.
diff --git a/maintenance/getLagTimes.php b/maintenance/getLagTimes.php
index c47c61e4be..72b1d48a2d 100644
--- a/maintenance/getLagTimes.php
+++ b/maintenance/getLagTimes.php
@@ -21,7 +21,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 /**
  * Maintenance script that displays replication lag times.
diff --git a/maintenance/getSlaveServer.php b/maintenance/getSlaveServer.php
index 0270052845..ec9ed20a0f 100644
--- a/maintenance/getSlaveServer.php
+++ b/maintenance/getSlaveServer.php
@@ -21,7 +21,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 /**
  * Maintenance script that reports the hostname of a slave server.
diff --git a/maintenance/getText.php b/maintenance/getText.php
index 34558b66f9..3e2f854010 100644
--- a/maintenance/getText.php
+++ b/maintenance/getText.php
@@ -23,7 +23,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 /**
  * Maintenance script that outputs page text to stdout.
diff --git a/maintenance/hiphop/make b/maintenance/hiphop/make
index 2bb9951f19..2fa70dcbc6 100755
--- a/maintenance/hiphop/make
+++ b/maintenance/hiphop/make
@@ -2,7 +2,7 @@
 <?php
 
 define( 'MW_CONFIG_CALLBACK', 'MakeHipHop::noConfigNeeded' );
-require( dirname( __FILE__ ) . '/../Maintenance.php' );
+require( __DIR__ . '/../Maintenance.php' );
 
 class MakeHipHop extends Maintenance {
 	function noConfigNeeded() {}
@@ -12,7 +12,7 @@ class MakeHipHop extends Maintenance {
 
 		$startTime = time();
 
-		$thisDir = realpath( dirname( __FILE__ ) );
+		$thisDir = realpath( __DIR__ );
 		$IP = realpath( "$thisDir/../.." );
 		if ( strval( $wgHipHopBuildDirectory ) !== '' ) {
 			$buildDir = $wgHipHopBuildDirectory;
@@ -278,7 +278,7 @@ class MakeHipHop extends Maintenance {
 			}
 		}
 
-		$extraCoreFiles = array_map( 'trim', file( dirname( __FILE__ ) . '/extra-files' ) );
+		$extraCoreFiles = array_map( 'trim', file( __DIR__ . '/extra-files' ) );
 		foreach ( $extraCoreFiles as $file ) {
 			if ( $file === '' ) {
 				continue;
diff --git a/maintenance/hiphop/run-server b/maintenance/hiphop/run-server
index 0ad4313410..1c4b51f48c 100755
--- a/maintenance/hiphop/run-server
+++ b/maintenance/hiphop/run-server
@@ -1,7 +1,7 @@
 #!/usr/bin/hphpi -f
 <?php
 
-require( dirname( __FILE__ ) . '/../Maintenance.php' );
+require( __DIR__ . '/../Maintenance.php' );
 
 class RunHipHopServer extends Maintenance {
 	function __construct() {
@@ -19,7 +19,7 @@ class RunHipHopServer extends Maintenance {
 
 	function runCompiled() {
 		global $wgHipHopBuildDirectory;
-		$thisDir = realpath( dirname( __FILE__ ) );
+		$thisDir = realpath( __DIR__ );
 		$IP = realpath( "$thisDir/../.." );
 		if ( strval( $wgHipHopBuildDirectory ) !== '' ) {
 			$buildDir = $wgHipHopBuildDirectory;
@@ -51,7 +51,7 @@ class RunHipHopServer extends Maintenance {
 	}
 
 	function runInterpreted() {
-		$thisDir = realpath( dirname( __FILE__ ) );
+		$thisDir = realpath( __DIR__ );
 		$IP = realpath( "$thisDir/../.." );
 		$sourceBase = realpath( "$IP/.." );
 
diff --git a/maintenance/importDump.php b/maintenance/importDump.php
index b6e0fe09e5..b089f70a35 100644
--- a/maintenance/importDump.php
+++ b/maintenance/importDump.php
@@ -24,7 +24,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 /**
  * Maintenance script that imports XML dump files into the current wiki.
diff --git a/maintenance/importImages.php b/maintenance/importImages.php
index 76ec565d6d..8d92383d0a 100644
--- a/maintenance/importImages.php
+++ b/maintenance/importImages.php
@@ -32,8 +32,8 @@
  */
 
 $optionsWithArgs = array( 'extensions', 'comment', 'comment-file', 'comment-ext', 'user', 'license', 'sleep', 'limit', 'from', 'source-wiki-url' );
-require_once( dirname( __FILE__ ) . '/commandLine.inc' );
-require_once( dirname( __FILE__ ) . '/importImages.inc' );
+require_once( __DIR__ . '/commandLine.inc' );
+require_once( __DIR__ . '/importImages.inc' );
 $processed = $added = $ignored = $skipped = $overwritten = $failed = 0;
 
 echo( "Import Images\n\n" );
diff --git a/maintenance/importSiteScripts.php b/maintenance/importSiteScripts.php
index b4a1bacf7f..e369cb1592 100644
--- a/maintenance/importSiteScripts.php
+++ b/maintenance/importSiteScripts.php
@@ -21,7 +21,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 /**
  * Maintenance script to import all scripts in the MediaWiki namespace from a
@@ -56,12 +56,9 @@ class ImportSiteScripts extends Maintenance {
 			}
 
 			$this->output( "Importing $page\n" );
-			$uri = new Uri( $baseUrl );
-			$uri->extendQuery( array(
+			$url = wfAppendQuery( $baseUrl, array(
 				'action' => 'raw',
 				'title' => "MediaWiki:{$page}" ) );
-			$url = $uri->toString();
-
 			$text = Http::get( $url );
 
 			$wikiPage = WikiPage::factory( $title );
@@ -82,9 +79,7 @@ class ImportSiteScripts extends Maintenance {
 		$pages = array();
 
 		do {
-			$uri = new Uri( $baseUrl );
-			$uri->extendQuery( $data );
-			$url = $uri->toString();
+			$url = wfAppendQuery( $baseUrl, $data );
 			$strResult = Http::get( $url );
 			//$result = FormatJson::decode( $strResult ); // Still broken
 			$result = unserialize( $strResult );
diff --git a/maintenance/importTextFile.php b/maintenance/importTextFile.php
index 5623fb06c2..adb5063589 100644
--- a/maintenance/importTextFile.php
+++ b/maintenance/importTextFile.php
@@ -24,7 +24,7 @@
 
 $options = array( 'help', 'nooverwrite', 'norc' );
 $optionsWithArgs = array( 'title', 'user', 'comment' );
-require_once( dirname( __FILE__ ) . '/commandLine.inc' );
+require_once( __DIR__ . '/commandLine.inc' );
 echo( "Import Text File\n\n" );
 
 if ( count( $args ) < 1 || isset( $options['help'] ) ) {
diff --git a/maintenance/initEditCount.php b/maintenance/initEditCount.php
index 0f136450fe..3135b4c74b 100644
--- a/maintenance/initEditCount.php
+++ b/maintenance/initEditCount.php
@@ -22,7 +22,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 class InitEditCount extends Maintenance {
 	public function __construct() {
diff --git a/maintenance/initStats.php b/maintenance/initStats.php
index 35918bbdb5..5d8b8866a9 100644
--- a/maintenance/initStats.php
+++ b/maintenance/initStats.php
@@ -23,7 +23,7 @@
  * @author Rob Church <robchur@gmail.com>
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 /**
  * Maintenance script to re-initialise or update the site statistics table
diff --git a/maintenance/install.php b/maintenance/install.php
index 6339773aa2..762bb94fa6 100644
--- a/maintenance/install.php
+++ b/maintenance/install.php
@@ -30,7 +30,7 @@ if ( !function_exists( 'version_compare' ) || ( version_compare( phpversion(), '
 define( 'MW_CONFIG_CALLBACK', 'Installer::overrideConfig' );
 define( 'MEDIAWIKI_INSTALL', true );
 
-require_once( dirname( dirname( __FILE__ ) )."/maintenance/Maintenance.php" );
+require_once( dirname( __DIR__ )."/maintenance/Maintenance.php" );
 
 /**
  * Maintenance script to install and configure MediaWiki
diff --git a/maintenance/jsparse.php b/maintenance/jsparse.php
index c0a4dbaa32..ceafc3909a 100644
--- a/maintenance/jsparse.php
+++ b/maintenance/jsparse.php
@@ -21,7 +21,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 /**
  * Maintenance script to do test JavaScript validity parses using jsmin+'s parser
diff --git a/maintenance/lag.php b/maintenance/lag.php
index 19c549a547..3ad0864fb9 100644
--- a/maintenance/lag.php
+++ b/maintenance/lag.php
@@ -21,7 +21,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 /**
  * Maintenance script to show database lag.
diff --git a/maintenance/language/alltrans.php b/maintenance/language/alltrans.php
index f872e6a61a..b537f9b70c 100644
--- a/maintenance/language/alltrans.php
+++ b/maintenance/language/alltrans.php
@@ -20,7 +20,7 @@
  * @ingroup MaintenanceLanguage
  */
 
-require_once( dirname( __FILE__ ) . '/../Maintenance.php' );
+require_once( __DIR__ . '/../Maintenance.php' );
 
 class AllTrans extends Maintenance {
 	public function __construct() {
diff --git a/maintenance/language/checkDupeMessages.php b/maintenance/language/checkDupeMessages.php
index ea5b1870b9..1888c4cd76 100644
--- a/maintenance/language/checkDupeMessages.php
+++ b/maintenance/language/checkDupeMessages.php
@@ -21,8 +21,8 @@
  * @ingroup MaintenanceLanguage
  */
 
-require_once( dirname( __FILE__ ) . '/../commandLine.inc' );
-$messagesDir = dirname( __FILE__ ) . '/../../languages/messages/';
+require_once( __DIR__ . '/../commandLine.inc' );
+$messagesDir = __DIR__ . '/../../languages/messages/';
 $runTest = false;
 $run = false;
 $runMode = 'text';
diff --git a/maintenance/language/checkExtensions.php b/maintenance/language/checkExtensions.php
index a58a8f5c32..ebc62b6027 100644
--- a/maintenance/language/checkExtensions.php
+++ b/maintenance/language/checkExtensions.php
@@ -21,7 +21,7 @@
  * @ingroup MaintenanceLanguage
  */
 
-require_once( dirname( __FILE__ ) . '/../commandLine.inc' );
+require_once( __DIR__ . '/../commandLine.inc' );
 require_once( 'languages.inc' );
 require_once( 'checkLanguage.inc' );
 
diff --git a/maintenance/language/checkLanguage.php b/maintenance/language/checkLanguage.php
index 69f610848c..99ba4e98d8 100644
--- a/maintenance/language/checkLanguage.php
+++ b/maintenance/language/checkLanguage.php
@@ -21,7 +21,7 @@
  * @ingroup MaintenanceLanguage
  */
 
-require_once( dirname( __FILE__ ) . '/../commandLine.inc' );
+require_once( __DIR__ . '/../commandLine.inc' );
 require_once( 'checkLanguage.inc' );
 require_once( 'languages.inc' );
 
diff --git a/maintenance/language/countMessages.php b/maintenance/language/countMessages.php
index f949ddc288..d37d22e961 100644
--- a/maintenance/language/countMessages.php
+++ b/maintenance/language/countMessages.php
@@ -20,7 +20,7 @@
  * @ingroup MaintenanceLanguage
  */
 
-require_once( dirname( __FILE__ ) . '/../Maintenance.php' );
+require_once( __DIR__ . '/../Maintenance.php' );
 
 class CountMessages extends Maintenance {
 	public function __construct() {
diff --git a/maintenance/language/date-formats.php b/maintenance/language/date-formats.php
index 04f5e8baf5..505cb57b91 100644
--- a/maintenance/language/date-formats.php
+++ b/maintenance/language/date-formats.php
@@ -20,7 +20,7 @@
  * @ingroup MaintenanceLanguage
  */
 
-require_once( dirname( __FILE__ ) . '/../Maintenance.php' );
+require_once( __DIR__ . '/../Maintenance.php' );
 
 class DateFormats extends Maintenance {
 
diff --git a/maintenance/language/digit2html.php b/maintenance/language/digit2html.php
index a80ac01435..7e729b4c7d 100644
--- a/maintenance/language/digit2html.php
+++ b/maintenance/language/digit2html.php
@@ -18,7 +18,7 @@
  * @ingroup MaintenanceLanguage
  */
 
-require_once( dirname( __FILE__ ) . '/../Maintenance.php' );
+require_once( __DIR__ . '/../Maintenance.php' );
 
 class Digit2Html extends Maintenance {
 
diff --git a/maintenance/language/dumpMessages.php b/maintenance/language/dumpMessages.php
index b7ca88d24b..9292ce3051 100644
--- a/maintenance/language/dumpMessages.php
+++ b/maintenance/language/dumpMessages.php
@@ -22,7 +22,7 @@
  * @todo Make this more useful, right now just dumps $wgContentLang
  */
 
-require_once( dirname( __FILE__ ) . '/../Maintenance.php' );
+require_once( __DIR__ . '/../Maintenance.php' );
 
 class DumpMessages extends Maintenance {
 	public function __construct() {
diff --git a/maintenance/language/generateCollationData.php b/maintenance/language/generateCollationData.php
index 4cb90ffe6a..c4a8e54320 100644
--- a/maintenance/language/generateCollationData.php
+++ b/maintenance/language/generateCollationData.php
@@ -21,7 +21,7 @@
  * @file
  */
 
-require_once( dirname( __FILE__ ) .'/../Maintenance.php' );
+require_once( __DIR__ .'/../Maintenance.php' );
 
 /**
  * Generate first letter data files for Collation.php
diff --git a/maintenance/language/generateNormalizerData.php b/maintenance/language/generateNormalizerData.php
index 3dfda92045..f3cc568221 100644
--- a/maintenance/language/generateNormalizerData.php
+++ b/maintenance/language/generateNormalizerData.php
@@ -21,9 +21,9 @@
  * @ingroup MaintenanceLanguage
  */
 
-require_once( dirname( __FILE__ ) . '/../Maintenance.php' );
+require_once( __DIR__ . '/../Maintenance.php' );
 
-require_once( dirname( __FILE__ ) . '/../../includes/normal/UtfNormalUtil.php' );
+require_once( __DIR__ . '/../../includes/normal/UtfNormalUtil.php' );
 
 /**
  * Generates normalizer data files for Arabic and Malayalam.
diff --git a/maintenance/language/langmemusage.php b/maintenance/language/langmemusage.php
index 28fe120e31..2323638e26 100644
--- a/maintenance/language/langmemusage.php
+++ b/maintenance/language/langmemusage.php
@@ -22,8 +22,8 @@
  */
 
 /** This is a command line script */
-require_once( dirname( __FILE__ ) . '/../Maintenance.php' );
-require_once( dirname( __FILE__ ) . '/languages.inc' );
+require_once( __DIR__ . '/../Maintenance.php' );
+require_once( __DIR__ . '/languages.inc' );
 
 class LangMemUsage extends Maintenance {
 
diff --git a/maintenance/language/languages.inc b/maintenance/language/languages.inc
index 15fa71249c..b76f921dd6 100644
--- a/maintenance/language/languages.inc
+++ b/maintenance/language/languages.inc
@@ -46,7 +46,7 @@ class languages {
 	 * @param $exif bool Treat the EXIF messages?
 	 */
 	function __construct( $exif = true ) {
-		require( dirname(__FILE__) . '/messageTypes.inc' );
+		require( __DIR__ . '/messageTypes.inc' );
 		$this->mIgnoredMessages = $wgIgnoredMessages;
 		if ( $exif ) {
 			$this->mOptionalMessages = array_merge( $wgOptionalMessages );
diff --git a/maintenance/language/messageTypes.inc b/maintenance/language/messageTypes.inc
index 2d0f90f1ff..ce1dbb9b5b 100644
--- a/maintenance/language/messageTypes.inc
+++ b/maintenance/language/messageTypes.inc
@@ -189,6 +189,7 @@ $wgIgnoredMessages = array(
 	'wantedtemplates-summary',
 	'activeusers-summary',
 	'search-summary',
+	'editpage-head-copy-warn',
 	'editpage-tos-summary',
 	'addsection-preload',
 	'addsection-editintro',
@@ -243,6 +244,8 @@ $wgIgnoredMessages = array(
 	'version-entrypoints-api-php',
 	'version-entrypoints-load-php',
 	'ipb-default-expiry',
+	'pageinfo-header',
+	'pageinfo-footer',
 );
 
 /** Optional messages, which may be translated only if changed in the target language. */
diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index 33c104b1fb..b644d8e6f0 100644
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -653,6 +653,7 @@ $wgMessageStructure = array(
 		'yourdiff',
 		'copyrightwarning',
 		'copyrightwarning2',
+		'editpage-head-copy-warn',
 		'editpage-tos-summary',
 		'longpage-hint',
 		'longpageerror',
@@ -2663,6 +2664,7 @@ $wgMessageStructure = array(
 		'spam_deleting',
 	),
 	'info' => array(
+		'pageinfo-header',
 		'pageinfo-title',
 		'pageinfo-header-basic',
 		'pageinfo-header-edits',
@@ -2693,6 +2695,7 @@ $wgMessageStructure = array(
 		'pageinfo-magic-words',
 		'pageinfo-hidden-categories',
 		'pageinfo-templates',
+		'pageinfo-footer',
 	),
 	'skin' => array(
 		'skinname-standard',
diff --git a/maintenance/language/rebuildLanguage.php b/maintenance/language/rebuildLanguage.php
index ed2dae7260..ad839054f7 100644
--- a/maintenance/language/rebuildLanguage.php
+++ b/maintenance/language/rebuildLanguage.php
@@ -22,7 +22,7 @@
  * @defgroup MaintenanceLanguage MaintenanceLanguage
  */
 
-require_once( dirname( __FILE__ ) . '/../commandLine.inc' );
+require_once( __DIR__ . '/../commandLine.inc' );
 require_once( 'languages.inc' );
 require_once( 'writeMessagesArray.inc' );
 
diff --git a/maintenance/language/transstat.php b/maintenance/language/transstat.php
index a2988417fa..ba503224d0 100644
--- a/maintenance/language/transstat.php
+++ b/maintenance/language/transstat.php
@@ -28,9 +28,9 @@
  */
 $optionsWithArgs = array( 'output' );
 
-require_once( dirname( __FILE__ ) . '/../commandLine.inc' );
+require_once( __DIR__ . '/../commandLine.inc' );
 require_once( 'languages.inc' );
-require_once( dirname( __FILE__ ) . '/StatOutputs.php' );
+require_once( __DIR__ . '/StatOutputs.php' );
 
 
 if ( isset( $options['help'] ) ) {
diff --git a/maintenance/language/validate.php b/maintenance/language/validate.php
index 1e97c37dae..751e744ddf 100644
--- a/maintenance/language/validate.php
+++ b/maintenance/language/validate.php
@@ -30,7 +30,7 @@ array_shift( $argv );
 define( 'MEDIAWIKI', 1 );
 define( 'NOT_REALLY_MEDIAWIKI', 1 );
 
-$IP = dirname( __FILE__ ) . '/../..';
+$IP = __DIR__ . '/../..';
 
 require_once( "$IP/includes/Defines.php" );
 require_once( "$IP/languages/Language.php" );
diff --git a/maintenance/language/writeMessagesArray.inc b/maintenance/language/writeMessagesArray.inc
index cd368476dd..b2e04c7f83 100644
--- a/maintenance/language/writeMessagesArray.inc
+++ b/maintenance/language/writeMessagesArray.inc
@@ -105,7 +105,7 @@ $messages = array(
 	 */
 	public static function writeMessagesArray( $messages, $ignoredComments = false, $prefix = false, $removeUnknown = false ) {
 		# Load messages
-		$dir = $prefix ? $prefix : dirname( __FILE__ );
+		$dir = $prefix ? $prefix : __DIR__;
 
 		require( $dir . '/messages.inc' );
 		self::$messageStructure = $wgMessageStructure;
diff --git a/maintenance/mcc.php b/maintenance/mcc.php
index 024452788f..e07e62db26 100644
--- a/maintenance/mcc.php
+++ b/maintenance/mcc.php
@@ -23,7 +23,7 @@
  */
 
 /** */
-require_once( dirname( __FILE__ ) . '/commandLine.inc' );
+require_once( __DIR__ . '/commandLine.inc' );
 
 $mcc = new MWMemcached( array( 'persistent' => true/*, 'debug' => true*/ ) );
 $mcc->set_servers( $wgMemCachedServers );
diff --git a/maintenance/mctest.php b/maintenance/mctest.php
index ed8250b122..691b832b9d 100644
--- a/maintenance/mctest.php
+++ b/maintenance/mctest.php
@@ -22,7 +22,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 /**
  * Maintenance script that  makes several 'set', 'incr' and 'get' requests
diff --git a/maintenance/mergeMessageFileList.php b/maintenance/mergeMessageFileList.php
index 8107016f46..cea64333c2 100644
--- a/maintenance/mergeMessageFileList.php
+++ b/maintenance/mergeMessageFileList.php
@@ -25,7 +25,7 @@
 # Start from scratch
 define( 'MW_NO_EXTENSION_MESSAGES', 1 );
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 $maintClass = 'MergeMessageFileList';
 $mmfl = false;
 
@@ -104,7 +104,7 @@ $s =
 
 $dirs = array(
 	$IP,
-	dirname( dirname( __FILE__ ) ),
+	dirname( __DIR__ ),
 	realpath( $IP )
 );
 
diff --git a/maintenance/migrateUserGroup.php b/maintenance/migrateUserGroup.php
index 451b598be9..497e1e0995 100644
--- a/maintenance/migrateUserGroup.php
+++ b/maintenance/migrateUserGroup.php
@@ -21,7 +21,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 /**
  * Maintenance script that re-assigns users from an old group to a new one.
diff --git a/maintenance/minify.php b/maintenance/minify.php
index b17d8fe73a..9f5a909d64 100644
--- a/maintenance/minify.php
+++ b/maintenance/minify.php
@@ -21,7 +21,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 /**
  * Maintenance script that minifies a file or set of files.
diff --git a/maintenance/moveBatch.php b/maintenance/moveBatch.php
index 78db8b97d5..7d15959c32 100644
--- a/maintenance/moveBatch.php
+++ b/maintenance/moveBatch.php
@@ -34,7 +34,7 @@
  * e.g. immobile_namespace for namespaces which can't be moved
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 /**
  * Maintenance script to move a batch of pages.
diff --git a/maintenance/mwdocgen.php b/maintenance/mwdocgen.php
index a59ba1701f..583249a5aa 100644
--- a/maintenance/mwdocgen.php
+++ b/maintenance/mwdocgen.php
@@ -49,7 +49,7 @@ if ( php_sapi_name() != 'cli' ) {
 }
 
 /** Figure out the base directory for MediaWiki location */
-$mwPath = dirname( dirname( __FILE__ ) ) . DIRECTORY_SEPARATOR;
+$mwPath = dirname( __DIR__ ) . DIRECTORY_SEPARATOR;
 
 /** doxygen binary script */
 $doxygenBin = 'doxygen';
diff --git a/maintenance/namespaceDupes.php b/maintenance/namespaceDupes.php
index e2de686cab..4197a355a5 100644
--- a/maintenance/namespaceDupes.php
+++ b/maintenance/namespaceDupes.php
@@ -24,7 +24,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 /**
  * Maintenance script that checks for articles to fix after
diff --git a/maintenance/nextJobDB.php b/maintenance/nextJobDB.php
index bee4065602..e66e981bb6 100644
--- a/maintenance/nextJobDB.php
+++ b/maintenance/nextJobDB.php
@@ -22,7 +22,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 /**
  * Maintenance script that picks a database that has pending jobs.
diff --git a/maintenance/nukeNS.php b/maintenance/nukeNS.php
index 1defe1b2f5..c471a4415a 100644
--- a/maintenance/nukeNS.php
+++ b/maintenance/nukeNS.php
@@ -33,7 +33,7 @@
  * based on nukePage by Rob Church
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 /**
  * Maintenance script that removes pages with only one revision from the
diff --git a/maintenance/nukePage.php b/maintenance/nukePage.php
index 3193d4367d..89dffe0c6f 100644
--- a/maintenance/nukePage.php
+++ b/maintenance/nukePage.php
@@ -23,7 +23,7 @@
  * @author Rob Church <robchur@gmail.com>
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 /**
  * Maintenance script that erases a page record from the database.
diff --git a/maintenance/oracle/alterSharedConstraints.php b/maintenance/oracle/alterSharedConstraints.php
index aa207821c1..e222314dd3 100644
--- a/maintenance/oracle/alterSharedConstraints.php
+++ b/maintenance/oracle/alterSharedConstraints.php
@@ -26,7 +26,7 @@
  * i.e.: GRANT REFERENCES (user_id) ON mwuser TO hubclient;
  */
 
-require_once( dirname( __FILE__ ) . '/../Maintenance.php' );
+require_once( __DIR__ . '/../Maintenance.php' );
 
 class AlterSharedConstraints extends Maintenance {
 	public function __construct() {
diff --git a/maintenance/orphans.php b/maintenance/orphans.php
index 1ab3b9962a..78f98f5a38 100644
--- a/maintenance/orphans.php
+++ b/maintenance/orphans.php
@@ -28,7 +28,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 /**
  * Maintenance script that looks for 'orphan' revisions hooked to pages which
diff --git a/maintenance/parse.php b/maintenance/parse.php
index c1a890bdf1..b0ab62443b 100644
--- a/maintenance/parse.php
+++ b/maintenance/parse.php
@@ -49,7 +49,7 @@
  * @license GNU General Public License 2.0 or later
  */
 
-require_once( dirname(__FILE__) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 /**
  * Maintenance script to parse some wikitext.
diff --git a/maintenance/patchSql.php b/maintenance/patchSql.php
index 0271e1a5ec..1f393556a6 100644
--- a/maintenance/patchSql.php
+++ b/maintenance/patchSql.php
@@ -22,7 +22,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 /**
  * Maintenance script that manually runs an SQL patch outside of the general updaters.
diff --git a/maintenance/populateCategory.php b/maintenance/populateCategory.php
index 037849bd3c..ae54d698a6 100644
--- a/maintenance/populateCategory.php
+++ b/maintenance/populateCategory.php
@@ -22,7 +22,7 @@
  * @author Simetrical
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 /**
  * Mainteance script to populate the category table.
diff --git a/maintenance/populateImageSha1.php b/maintenance/populateImageSha1.php
index 0bbb5a2808..37429a342d 100644
--- a/maintenance/populateImageSha1.php
+++ b/maintenance/populateImageSha1.php
@@ -21,7 +21,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 /**
  * Maintenance script to populate the img_sha1 field.
diff --git a/maintenance/populateLogSearch.php b/maintenance/populateLogSearch.php
index 8a2366a0d8..99d8155766 100644
--- a/maintenance/populateLogSearch.php
+++ b/maintenance/populateLogSearch.php
@@ -22,7 +22,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 /**
  * Maintenance script that makes the required database updates for populating the
diff --git a/maintenance/populateLogUsertext.php b/maintenance/populateLogUsertext.php
index 3b4b2db8a1..059b6fe25c 100644
--- a/maintenance/populateLogUsertext.php
+++ b/maintenance/populateLogUsertext.php
@@ -24,7 +24,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 /**
  * Maintenance script that makes the required database updates for
diff --git a/maintenance/populateParentId.php b/maintenance/populateParentId.php
index 6a1b5c850f..e81d4ffbd9 100644
--- a/maintenance/populateParentId.php
+++ b/maintenance/populateParentId.php
@@ -23,7 +23,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 /**
  * Maintenance script that makes the required database updates for rev_parent_id
diff --git a/maintenance/populateRevisionLength.php b/maintenance/populateRevisionLength.php
index 65dd91f974..6c835f4ed2 100644
--- a/maintenance/populateRevisionLength.php
+++ b/maintenance/populateRevisionLength.php
@@ -21,7 +21,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 /**
  * Maintenance script that populates the rev_len field for old revisions
diff --git a/maintenance/populateRevisionSha1.php b/maintenance/populateRevisionSha1.php
index bb620c527a..2e14d31e8f 100644
--- a/maintenance/populateRevisionSha1.php
+++ b/maintenance/populateRevisionSha1.php
@@ -22,7 +22,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 /**
  * Maintenance script that fills the rev_sha1 and ar_sha1 columns of revision
diff --git a/maintenance/preprocessDump.php b/maintenance/preprocessDump.php
index 5c2b0d42fa..5952fd960c 100644
--- a/maintenance/preprocessDump.php
+++ b/maintenance/preprocessDump.php
@@ -25,7 +25,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/dumpIterator.php' );
+require_once( __DIR__ . '/dumpIterator.php' );
 
 /**
  * Maintenance script that takes page text out of an XML dump file and
diff --git a/maintenance/preprocessorFuzzTest.php b/maintenance/preprocessorFuzzTest.php
index 9dee67e258..a53bc88c23 100644
--- a/maintenance/preprocessorFuzzTest.php
+++ b/maintenance/preprocessorFuzzTest.php
@@ -21,7 +21,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/commandLine.inc' );
+require_once( __DIR__ . '/commandLine.inc' );
 
 $wgHooks['BeforeParserFetchTemplateAndtitle'][] = 'PPFuzzTester::templateHook';
 
diff --git a/maintenance/protect.php b/maintenance/protect.php
index e60ee0818f..2f6aa1aedb 100644
--- a/maintenance/protect.php
+++ b/maintenance/protect.php
@@ -21,7 +21,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 /**
  * Maintenance script that protects or unprotects a page.
diff --git a/maintenance/pruneFileCache.php b/maintenance/pruneFileCache.php
index 782804958d..e058e3ec36 100644
--- a/maintenance/pruneFileCache.php
+++ b/maintenance/pruneFileCache.php
@@ -21,7 +21,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 /**
  * Maintenance script that prunes file cache for pages, objects, resources, etc.
diff --git a/maintenance/purgeDeletedFiles.php b/maintenance/purgeDeletedFiles.php
index e9d149b5ed..cd62716b2b 100644
--- a/maintenance/purgeDeletedFiles.php
+++ b/maintenance/purgeDeletedFiles.php
@@ -21,7 +21,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 /**
  * Maintenance script that scans the deletion log and purges affected files
diff --git a/maintenance/purgeList.php b/maintenance/purgeList.php
index 049d6e3e5f..4b3c382190 100644
--- a/maintenance/purgeList.php
+++ b/maintenance/purgeList.php
@@ -21,7 +21,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 /**
  * Maintenance script that sends purge requests for listed pages to squid.
diff --git a/maintenance/purgeOldText.php b/maintenance/purgeOldText.php
index e68047c00d..1f0b063b6b 100644
--- a/maintenance/purgeOldText.php
+++ b/maintenance/purgeOldText.php
@@ -22,7 +22,7 @@
  * @author Rob Church <robchur@gmail.com>
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 /**
  * Maintenance script that purges old text records from the database.
diff --git a/maintenance/purgeParserCache.php b/maintenance/purgeParserCache.php
index b56794bab1..1c417980eb 100644
--- a/maintenance/purgeParserCache.php
+++ b/maintenance/purgeParserCache.php
@@ -22,7 +22,7 @@
  * @ingroup Maintenance
  */
 
-require( dirname( __FILE__ ) . '/Maintenance.php' );
+require( __DIR__ . '/Maintenance.php' );
 
 /**
  * Maintenance script to remove old objects from the parser cache.
diff --git a/maintenance/purgeStaleMemcachedText.php b/maintenance/purgeStaleMemcachedText.php
index ec7b08135e..225400f1f1 100644
--- a/maintenance/purgeStaleMemcachedText.php
+++ b/maintenance/purgeStaleMemcachedText.php
@@ -19,7 +19,7 @@
  * @ingroup Maintenance Memcached
  */
 
-require_once( dirname( __FILE__ ) . '/commandLine.inc' );
+require_once( __DIR__ . '/commandLine.inc' );
 
 function purgeStaleMemcachedText() {
 	global $wgMemc, $wgDBname;
diff --git a/maintenance/reassignEdits.php b/maintenance/reassignEdits.php
index 2afd6e087f..a91abf93d3 100644
--- a/maintenance/reassignEdits.php
+++ b/maintenance/reassignEdits.php
@@ -23,7 +23,7 @@
  * @licence GNU General Public Licence 2.0 or later
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 /**
  * Maintenance script that reassigns edits from a user or IP address
diff --git a/maintenance/rebuildFileCache.php b/maintenance/rebuildFileCache.php
index 4dbe267f8e..3165b97ff5 100644
--- a/maintenance/rebuildFileCache.php
+++ b/maintenance/rebuildFileCache.php
@@ -21,7 +21,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 /**
  * Maintenance script that builds file cache for content pages.
diff --git a/maintenance/rebuildImages.php b/maintenance/rebuildImages.php
index 936efd7f04..f5d06e4620 100644
--- a/maintenance/rebuildImages.php
+++ b/maintenance/rebuildImages.php
@@ -30,7 +30,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 /**
  * Maintenance script to update image metadata records.
diff --git a/maintenance/rebuildLocalisationCache.php b/maintenance/rebuildLocalisationCache.php
index c48fb7421e..83849de65b 100644
--- a/maintenance/rebuildLocalisationCache.php
+++ b/maintenance/rebuildLocalisationCache.php
@@ -29,7 +29,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 /**
  * Maintenance script to rebuild the localisation cache.
diff --git a/maintenance/rebuildall.php b/maintenance/rebuildall.php
index bc9f732f6c..882ae1b3bd 100644
--- a/maintenance/rebuildall.php
+++ b/maintenance/rebuildall.php
@@ -22,7 +22,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 /**
  * Maintenance script that rebuilds link tracking tables from scratch.
diff --git a/maintenance/rebuildmessages.php b/maintenance/rebuildmessages.php
index a22d3afbac..a70e591f9e 100644
--- a/maintenance/rebuildmessages.php
+++ b/maintenance/rebuildmessages.php
@@ -21,7 +21,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 /**
  * Maintenance script that purges all languages from the message cache.
diff --git a/maintenance/rebuildrecentchanges.php b/maintenance/rebuildrecentchanges.php
index 5caa0a8fc0..0278f72cad 100644
--- a/maintenance/rebuildrecentchanges.php
+++ b/maintenance/rebuildrecentchanges.php
@@ -23,7 +23,7 @@
  * @todo Document
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 /**
  * Maintenance script that rebuilds recent changes from scratch.
diff --git a/maintenance/rebuildtextindex.php b/maintenance/rebuildtextindex.php
index a37d603451..41b245f81e 100644
--- a/maintenance/rebuildtextindex.php
+++ b/maintenance/rebuildtextindex.php
@@ -25,7 +25,7 @@
  * @todo document
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 /**
  * Maintenance script that rebuilds search index table from scratch.
diff --git a/maintenance/refreshImageCount.php b/maintenance/refreshImageCount.php
index f9bdeea735..be6bd18dac 100644
--- a/maintenance/refreshImageCount.php
+++ b/maintenance/refreshImageCount.php
@@ -21,7 +21,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 class RefreshImageCount extends Maintenance {
 	public function __construct() {
diff --git a/maintenance/refreshImageMetadata.php b/maintenance/refreshImageMetadata.php
index 6623beab23..12da7a8bc1 100644
--- a/maintenance/refreshImageMetadata.php
+++ b/maintenance/refreshImageMetadata.php
@@ -27,7 +27,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 /**
  * Maintenance script to refresh image metadata fields.
diff --git a/maintenance/refreshLinks.php b/maintenance/refreshLinks.php
index 699d88552e..3d9270b8d3 100644
--- a/maintenance/refreshLinks.php
+++ b/maintenance/refreshLinks.php
@@ -21,7 +21,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 /**
  * Maintenance script to refresh link tables.
diff --git a/maintenance/removeUnusedAccounts.php b/maintenance/removeUnusedAccounts.php
index 490602d5b4..8bc27c1837 100644
--- a/maintenance/removeUnusedAccounts.php
+++ b/maintenance/removeUnusedAccounts.php
@@ -23,7 +23,7 @@
  * @author Rob Church <robchur@gmail.com>
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 /**
  * Maintenance script that removes unused user accounts from the database.
diff --git a/maintenance/renameDbPrefix.php b/maintenance/renameDbPrefix.php
index d8e53eedd0..6f24479140 100644
--- a/maintenance/renameDbPrefix.php
+++ b/maintenance/renameDbPrefix.php
@@ -23,7 +23,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 /**
  * Maintenance script that changes the prefix of database tables.
diff --git a/maintenance/renderDump.php b/maintenance/renderDump.php
index c76a89b499..b25fb9485e 100644
--- a/maintenance/renderDump.php
+++ b/maintenance/renderDump.php
@@ -28,7 +28,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 /**
  * Maintenance script that takes page text out of an XML dump file
diff --git a/maintenance/resetUserTokens.php b/maintenance/resetUserTokens.php
index ef8f5b0ebd..d7f8c6d0bd 100644
--- a/maintenance/resetUserTokens.php
+++ b/maintenance/resetUserTokens.php
@@ -23,7 +23,7 @@
  * @author Daniel Friesen <mediawiki@danielfriesen.name>
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 /**
  * Maintenance script to reset the user_token for all users on the wiki.
diff --git a/maintenance/rollbackEdits.php b/maintenance/rollbackEdits.php
index c9f607edc3..4660bcef10 100644
--- a/maintenance/rollbackEdits.php
+++ b/maintenance/rollbackEdits.php
@@ -22,7 +22,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 /**
  * Maintenance script to rollback all edits by a given user or IP provided
diff --git a/maintenance/runBatchedQuery.php b/maintenance/runBatchedQuery.php
index 6322d31de3..e1139164c5 100644
--- a/maintenance/runBatchedQuery.php
+++ b/maintenance/runBatchedQuery.php
@@ -23,7 +23,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 /**
  * Maintenance script to run a database query in batches and wait for slaves.
diff --git a/maintenance/runJobs.php b/maintenance/runJobs.php
index af7c906cc3..e909bc06ae 100644
--- a/maintenance/runJobs.php
+++ b/maintenance/runJobs.php
@@ -25,7 +25,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 /**
  * Maintenance script that runs pending jobs.
diff --git a/maintenance/showJobs.php b/maintenance/showJobs.php
index ff7d3fc0f5..edcbdd63ee 100644
--- a/maintenance/showJobs.php
+++ b/maintenance/showJobs.php
@@ -24,7 +24,7 @@
  * @author Antoine Musso
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 class ShowJobs extends Maintenance {
 	public function __construct() {
diff --git a/maintenance/showStats.php b/maintenance/showStats.php
index b284a9acb0..f16853d7e2 100644
--- a/maintenance/showStats.php
+++ b/maintenance/showStats.php
@@ -28,7 +28,7 @@
  * @license GNU General Public License 2.0 or later
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 class ShowStats extends Maintenance {
 	public function __construct() {
diff --git a/maintenance/sql.php b/maintenance/sql.php
index c4af630786..7483dcc76f 100644
--- a/maintenance/sql.php
+++ b/maintenance/sql.php
@@ -21,7 +21,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 class MwSql extends Maintenance {
 	public function __construct() {
diff --git a/maintenance/sqlite.php b/maintenance/sqlite.php
index 864d5ab640..7a22df598f 100644
--- a/maintenance/sqlite.php
+++ b/maintenance/sqlite.php
@@ -20,7 +20,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 class SqliteMaintenance extends Maintenance {
 	public function __construct() {
diff --git a/maintenance/stats.php b/maintenance/stats.php
index 46926dd07b..cbea24b8ec 100644
--- a/maintenance/stats.php
+++ b/maintenance/stats.php
@@ -20,7 +20,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 class CacheStats extends Maintenance {
 
diff --git a/maintenance/storage/checkStorage.php b/maintenance/storage/checkStorage.php
index 29904db21f..6c669bfa07 100644
--- a/maintenance/storage/checkStorage.php
+++ b/maintenance/storage/checkStorage.php
@@ -22,7 +22,7 @@
  */
 
 if ( !defined( 'MEDIAWIKI' ) ) {
-	require_once( dirname( __FILE__ ) . '/../commandLine.inc' );
+	require_once( __DIR__ . '/../commandLine.inc' );
 
 	$cs = new CheckStorage;
 	$fix = isset( $options['fix'] );
diff --git a/maintenance/storage/compressOld.php b/maintenance/storage/compressOld.php
index 5064fe7f15..4594db716c 100644
--- a/maintenance/storage/compressOld.php
+++ b/maintenance/storage/compressOld.php
@@ -41,7 +41,7 @@
  * @ingroup Maintenance ExternalStorage
  */
 
-require_once( dirname( __FILE__ ) . '/../Maintenance.php' );
+require_once( __DIR__ . '/../Maintenance.php' );
 
 class CompressOld extends Maintenance {
 	/**
diff --git a/maintenance/storage/dumpRev.php b/maintenance/storage/dumpRev.php
index b200d8af03..6020f22e19 100644
--- a/maintenance/storage/dumpRev.php
+++ b/maintenance/storage/dumpRev.php
@@ -18,7 +18,7 @@
  * @ingroup Maintenance ExternalStorage
  */
 
-require_once( dirname( __FILE__ ) . '/../Maintenance.php' );
+require_once( __DIR__ . '/../Maintenance.php' );
 
 class DumpRev extends Maintenance {
 	public function __construct() {
diff --git a/maintenance/storage/fixBug20757.php b/maintenance/storage/fixBug20757.php
index cf30b0e6b7..52ee825cea 100644
--- a/maintenance/storage/fixBug20757.php
+++ b/maintenance/storage/fixBug20757.php
@@ -21,7 +21,7 @@
  * @ingroup Maintenance ExternalStorage
  */
 
-require_once( dirname( __FILE__ ) . '/../Maintenance.php' );
+require_once( __DIR__ . '/../Maintenance.php' );
 
 class FixBug20757 extends Maintenance {
 	var $batchSize = 10000;
diff --git a/maintenance/storage/moveToExternal.php b/maintenance/storage/moveToExternal.php
index 64f3adaa66..2dcc25c22c 100644
--- a/maintenance/storage/moveToExternal.php
+++ b/maintenance/storage/moveToExternal.php
@@ -24,8 +24,8 @@
 define( 'REPORTING_INTERVAL', 1 );
 
 if ( !defined( 'MEDIAWIKI' ) ) {
-	require_once( dirname( __FILE__ ) . '/../commandLine.inc' );
-	require_once( dirname( __FILE__ ) . '/../../includes/ExternalStoreDB.php' );
+	require_once( __DIR__ . '/../commandLine.inc' );
+	require_once( __DIR__ . '/../../includes/ExternalStoreDB.php' );
 	require_once( 'resolveStubs.php' );
 
 	$fname = 'moveToExternal';
diff --git a/maintenance/storage/orphanStats.php b/maintenance/storage/orphanStats.php
index f3b521f6c3..82ee135b0d 100644
--- a/maintenance/storage/orphanStats.php
+++ b/maintenance/storage/orphanStats.php
@@ -20,7 +20,7 @@
  *
  * @ingroup Maintenance ExternalStorage
  */
-require_once( dirname( __FILE__ ) . '/../Maintenance.php' );
+require_once( __DIR__ . '/../Maintenance.php' );
 
 class OrphanStats extends Maintenance {
 	public function __construct() {
diff --git a/maintenance/storage/recompressTracked.php b/maintenance/storage/recompressTracked.php
index 158aa34c4f..4098077f15 100644
--- a/maintenance/storage/recompressTracked.php
+++ b/maintenance/storage/recompressTracked.php
@@ -23,7 +23,7 @@
  */
 
 $optionsWithArgs = RecompressTracked::getOptionsWithArgs();
-require( dirname( __FILE__ ) . '/../commandLine.inc' );
+require( __DIR__ . '/../commandLine.inc' );
 
 if ( count( $args ) < 1 ) {
 	echo "Usage: php recompressTracked.php [options] <cluster> [... <cluster>...]
diff --git a/maintenance/storage/resolveStubs.php b/maintenance/storage/resolveStubs.php
index 08d0ee04f6..7e288e136a 100644
--- a/maintenance/storage/resolveStubs.php
+++ b/maintenance/storage/resolveStubs.php
@@ -27,7 +27,7 @@ define( 'REPORTING_INTERVAL', 100 );
 if ( !defined( 'MEDIAWIKI' ) ) {
 	$optionsWithArgs = array( 'm' );
 
-	require_once( dirname( __FILE__ ) . '/../commandLine.inc' );
+	require_once( __DIR__ . '/../commandLine.inc' );
 
 	resolveStubs();
 }
diff --git a/maintenance/storage/storageTypeStats.php b/maintenance/storage/storageTypeStats.php
index 817659fc8a..1afecc4eb8 100644
--- a/maintenance/storage/storageTypeStats.php
+++ b/maintenance/storage/storageTypeStats.php
@@ -19,7 +19,7 @@
  * @ingroup Maintenance ExternalStorage
  */
 
-require_once( dirname( __FILE__ ) . '/../Maintenance.php' );
+require_once( __DIR__ . '/../Maintenance.php' );
 
 class StorageTypeStats extends Maintenance {
 	function execute() {
diff --git a/maintenance/storage/testCompression.php b/maintenance/storage/testCompression.php
index 9ae2633539..998ebe484c 100644
--- a/maintenance/storage/testCompression.php
+++ b/maintenance/storage/testCompression.php
@@ -21,7 +21,7 @@
  */
 
 $optionsWithArgs = array( 'start', 'limit', 'type' );
-require( dirname( __FILE__ ) . '/../commandLine.inc' );
+require( __DIR__ . '/../commandLine.inc' );
 
 if ( !isset( $args[0] )  ) {
 	echo "Usage: php testCompression.php [--type=<type>] [--start=<start-date>] [--limit=<num-revs>] <page-title>\n";
diff --git a/maintenance/storage/trackBlobs.php b/maintenance/storage/trackBlobs.php
index b5f800479a..214168a831 100644
--- a/maintenance/storage/trackBlobs.php
+++ b/maintenance/storage/trackBlobs.php
@@ -22,7 +22,7 @@
  * @see wfWaitForSlaves()
  */
 
-require( dirname( __FILE__ ) . '/../commandLine.inc' );
+require( __DIR__ . '/../commandLine.inc' );
 
 
 if ( count( $args ) < 1 ) {
@@ -113,7 +113,7 @@ class TrackBlobs {
 			$dbw->query( 'DROP TABLE ' . $dbw->tableName( 'blob_tracking' ) );
 			$dbw->query( 'DROP TABLE ' . $dbw->tableName( 'blob_orphans' ) );
 		}
-		$dbw->sourceFile( dirname( __FILE__ ) . '/blob_tracking.sql' );
+		$dbw->sourceFile( __DIR__ . '/blob_tracking.sql' );
 	}
 
 	function getTextClause() {
diff --git a/maintenance/syncFileBackend.php b/maintenance/syncFileBackend.php
index 2dcf757194..18d57c30ba 100644
--- a/maintenance/syncFileBackend.php
+++ b/maintenance/syncFileBackend.php
@@ -20,7 +20,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 class SyncFileBackend extends Maintenance {
 	public function __construct() {
diff --git a/maintenance/undelete.php b/maintenance/undelete.php
index 1c3b14a567..ea8b0c4bab 100644
--- a/maintenance/undelete.php
+++ b/maintenance/undelete.php
@@ -21,7 +21,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 class Undelete extends Maintenance {
 	public function __construct() {
diff --git a/maintenance/update.php b/maintenance/update.php
index 741ec90d5a..78e88273a3 100644
--- a/maintenance/update.php
+++ b/maintenance/update.php
@@ -32,7 +32,7 @@ if ( !function_exists( 'version_compare' ) || ( version_compare( phpversion(), '
 }
 
 $wgUseMasterForMaintenance = true;
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 class UpdateMediaWiki extends Maintenance {
 
diff --git a/maintenance/updateArticleCount.php b/maintenance/updateArticleCount.php
index dbbfb80c3f..730a1f64e3 100644
--- a/maintenance/updateArticleCount.php
+++ b/maintenance/updateArticleCount.php
@@ -23,7 +23,7 @@
  * @author Rob Church <robchur@gmail.com>
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 class UpdateArticleCount extends Maintenance {
 
diff --git a/maintenance/updateCollation.php b/maintenance/updateCollation.php
index 2363665b70..ec99c99e01 100644
--- a/maintenance/updateCollation.php
+++ b/maintenance/updateCollation.php
@@ -26,7 +26,7 @@
 
 #$optionsWithArgs = array( 'begin', 'max-slave-lag' );
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 class UpdateCollation extends Maintenance {
 	const BATCH_SIZE = 50; // Number of rows to process in one batch
diff --git a/maintenance/updateDoubleWidthSearch.php b/maintenance/updateDoubleWidthSearch.php
index 61545f8df2..bcceab3999 100644
--- a/maintenance/updateDoubleWidthSearch.php
+++ b/maintenance/updateDoubleWidthSearch.php
@@ -23,7 +23,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 class UpdateDoubleWidthSearch extends Maintenance {
 
diff --git a/maintenance/updateRestrictions.php b/maintenance/updateRestrictions.php
index ffbdb2baaa..04e7f41c99 100644
--- a/maintenance/updateRestrictions.php
+++ b/maintenance/updateRestrictions.php
@@ -24,7 +24,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 class UpdateRestrictions extends Maintenance {
 	public function __construct() {
diff --git a/maintenance/updateSearchIndex.php b/maintenance/updateSearchIndex.php
index eed3571c2b..59acc9a32d 100644
--- a/maintenance/updateSearchIndex.php
+++ b/maintenance/updateSearchIndex.php
@@ -28,7 +28,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 class UpdateSearchIndex extends Maintenance {
 
diff --git a/maintenance/updateSpecialPages.php b/maintenance/updateSpecialPages.php
index a1a2e2fcac..c1e497da2e 100644
--- a/maintenance/updateSpecialPages.php
+++ b/maintenance/updateSpecialPages.php
@@ -22,7 +22,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 class UpdateSpecialPages extends Maintenance {
 	public function __construct() {
diff --git a/maintenance/upgrade1_5.php b/maintenance/upgrade1_5.php
index f0807b6df7..13faece19d 100644
--- a/maintenance/upgrade1_5.php
+++ b/maintenance/upgrade1_5.php
@@ -28,7 +28,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 define( 'MW_UPGRADE_COPY',     false );
 define( 'MW_UPGRADE_ENCODE',   true  );
diff --git a/maintenance/userOptions.inc b/maintenance/userOptions.inc
index 5e3574798b..2a0665793e 100644
--- a/maintenance/userOptions.inc
+++ b/maintenance/userOptions.inc
@@ -25,7 +25,7 @@
 $options = array( 'list', 'nowarn', 'quiet', 'usage', 'dry' );
 $optionsWithArgs = array( 'old', 'new' );
 
-require_once( dirname( __FILE__ ) . '/commandLine.inc' );
+require_once( __DIR__ . '/commandLine.inc' );
 
 /**
  * @ingroup Maintenance
diff --git a/maintenance/waitForSlave.php b/maintenance/waitForSlave.php
index 720ca288b6..468e2395d0 100644
--- a/maintenance/waitForSlave.php
+++ b/maintenance/waitForSlave.php
@@ -22,7 +22,7 @@
  * @see wfWaitForSlaves()
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 class WaitForSlave extends Maintenance {
 	public function __construct() {
diff --git a/mw-config/index.php b/mw-config/index.php
index 3f993f0279..065d187934 100644
--- a/mw-config/index.php
+++ b/mw-config/index.php
@@ -8,11 +8,11 @@
 define( 'MW_CONFIG_CALLBACK', 'Installer::overrideConfig' );
 define( 'MEDIAWIKI_INSTALL', true );
 
-chdir( dirname( dirname( __FILE__ ) ) );
+chdir( dirname( __DIR__ ) );
 if ( isset( $_SERVER['MW_COMPILED'] ) ) {
 	require ( 'core/includes/WebStart.php' );
 } else {
-	require( dirname( dirname( __FILE__ ) ) . '/includes/WebStart.php' );
+	require( dirname( __DIR__ ) . '/includes/WebStart.php' );
 }
 
 wfInstallerMain();
diff --git a/opensearch_desc.php b/opensearch_desc.php
index 630b05c16a..95f028ac73 100644
--- a/opensearch_desc.php
+++ b/opensearch_desc.php
@@ -20,7 +20,7 @@
  * @file
  */
 
-require_once( dirname(__FILE__) . '/includes/WebStart.php' );
+require_once( __DIR__ . '/includes/WebStart.php' );
 
 if( $wgRequest->getVal( 'ctype' ) == 'application/xml' ) {
 	// Makes testing tweaks about a billion times easier
diff --git a/profileinfo.php b/profileinfo.php
index ef038c1153..bbd5fc8aa8 100644
--- a/profileinfo.php
+++ b/profileinfo.php
@@ -31,7 +31,7 @@ $wgEnableProfileInfo = $wgProfileToDatabase = false;
 if ( isset( $_SERVER['MW_COMPILED'] ) ) {
 	require ( 'core/includes/WebStart.php' );
 } else {
-	require ( dirname( __FILE__ ) . '/includes/WebStart.php' );
+	require ( __DIR__ . '/includes/WebStart.php' );
 }
 
 
diff --git a/redirect.php b/redirect.php
index fde960e015..5e6cfeed68 100644
--- a/redirect.php
+++ b/redirect.php
@@ -24,7 +24,7 @@
 if ( isset( $_SERVER['MW_COMPILED'] ) ) {
 	require ( 'phase3/includes/WebStart.php' );
 } else {
-	require ( dirname( __FILE__ ) . '/includes/WebStart.php' );
+	require ( __DIR__ . '/includes/WebStart.php' );
 }
 
 global $wgArticlePath;
diff --git a/resources/Resources.php b/resources/Resources.php
index 380a09979c..82ab718b1b 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -204,6 +204,10 @@ return array(
 		'scripts' => 'resources/jquery/jquery.spinner.js',
 		'styles' => 'resources/jquery/jquery.spinner.css',
 	),
+	'jquery.jStorage' => array(
+		'scripts' => 'resources/jquery/jquery.jStorage.js',
+		'dependencies' => 'jquery.json',
+	),
 	'jquery.suggestions' => array(
 		'scripts' => 'resources/jquery/jquery.suggestions.js',
 		'styles' => 'resources/jquery/jquery.suggestions.css',
@@ -671,7 +675,6 @@ return array(
 		'scripts' => 'resources/mediawiki.language/mediawiki.language.js',
 		'languageScripts' => array(
 			'am' => 'resources/mediawiki.language/languages/am.js',
-			'ar' => 'resources/mediawiki.language/languages/ar.js',
 			'bat-smg' => 'resources/mediawiki.language/languages/bat-smg.js',
 			'be' => 'resources/mediawiki.language/languages/be.js',
 			'be-tarask' => 'resources/mediawiki.language/languages/be-tarask.js',
@@ -687,7 +690,6 @@ return array(
 			'gd' => 'resources/mediawiki.language/languages/gd.js',
 			'gv' => 'resources/mediawiki.language/languages/gv.js',
 			'he' => 'resources/mediawiki.language/languages/he.js',
-			'hi' => 'resources/mediawiki.language/languages/hi.js',
 			'hr' => 'resources/mediawiki.language/languages/hr.js',
 			'hsb' => 'resources/mediawiki.language/languages/hsb.js',
 			'hu' => 'resources/mediawiki.language/languages/hu.js',
@@ -719,7 +721,21 @@ return array(
 			'uk' => 'resources/mediawiki.language/languages/uk.js',
 			'wa' => 'resources/mediawiki.language/languages/wa.js',
 		),
-		'dependencies' => array( 'mediawiki.language.data' ),
+		'dependencies' => array(
+				'mediawiki.language.data',
+				'mediawiki.cldr'
+			),
+	),
+
+	'mediawiki.cldr' => array(
+		'scripts' => 'resources/mediawiki.language/mediawiki.cldr.js',
+		'dependencies' => array(
+			'mediawiki.libs.pluralruleparser',
+		),
+	),
+
+	'mediawiki.libs.pluralruleparser' => array(
+		'scripts' => 'resources/mediawiki.libs/CLDRPluralRuleParser.js',
 	),
 
 	'mediawiki.language.init' => array(
diff --git a/resources/jquery/jquery.jStorage.js b/resources/jquery/jquery.jStorage.js
new file mode 100644
index 0000000000..95959cf7a4
--- /dev/null
+++ b/resources/jquery/jquery.jStorage.js
@@ -0,0 +1,532 @@
+/*
+ * ----------------------------- JSTORAGE -------------------------------------
+ * Simple local storage wrapper to save data on the browser side, supporting
+ * all major browsers - IE6+, Firefox2+, Safari4+, Chrome4+ and Opera 10.5+
+ *
+ * Copyright (c) 2010 Andris Reinman, andris.reinman@gmail.com
+ * Project homepage: www.jstorage.info
+ *
+ * Taken from Github with slight modifications by Hoo man
+ * https://raw.github.com/andris9/jStorage/master/jstorage.js
+ *
+ * Licensed under MIT-style license:
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+/**
+ * $.jStorage
+ *
+ * USAGE:
+ *
+ * jStorage requires Prototype, MooTools or jQuery! If jQuery is used, then
+ * jQuery-JSON (http://code.google.com/p/jquery-json/) is also needed.
+ * (jQuery-JSON needs to be loaded BEFORE jStorage!)
+ *
+ * Methods:
+ *
+ * -set(key, value[, options])
+ * $.jStorage.set(key, value) -> saves a value
+ *
+ * -get(key[, default])
+ * value = $.jStorage.get(key [, default]) ->
+ *    retrieves value if key exists, or default if it doesn't
+ *
+ * -deleteKey(key)
+ * $.jStorage.deleteKey(key) -> removes a key from the storage
+ *
+ * -flush()
+ * $.jStorage.flush() -> clears the cache
+ *
+ * -storageObj()
+ * $.jStorage.storageObj() -> returns a read-ony copy of the actual storage
+ *
+ * -storageSize()
+ * $.jStorage.storageSize() -> returns the size of the storage in bytes
+ *
+ * -index()
+ * $.jStorage.index() -> returns the used keys as an array
+ *
+ * -storageAvailable()
+ * $.jStorage.storageAvailable() -> returns true if storage is available
+ *
+ * -reInit()
+ * $.jStorage.reInit() -> reloads the data from browser storage
+ *
+ * <value> can be any JSON-able value, including objects and arrays.
+ *
+ **/
+
+(function($){
+    if(!$ || !($.toJSON || Object.toJSON || window.JSON)){
+        throw new Error("jQuery, MooTools or Prototype needs to be loaded before jStorage!");
+    }
+
+    var
+        /* This is the object, that holds the cached values */
+        _storage = {},
+
+        /* Actual browser storage (localStorage or globalStorage['domain']) */
+        _storage_service = {jStorage:"{}"},
+
+        /* DOM element for older IE versions, holds userData behavior */
+        _storage_elm = null,
+
+        /* How much space does the storage take */
+        _storage_size = 0,
+
+        /* function to encode objects to JSON strings */
+        json_encode = $.toJSON || Object.toJSON || (window.JSON && (JSON.encode || JSON.stringify)),
+
+        /* function to decode objects from JSON strings */
+        json_decode = $.evalJSON || (window.JSON && (JSON.decode || JSON.parse)) || function(str){
+            return String(str).evalJSON();
+        },
+
+        /* which backend is currently used */
+        _backend = false,
+
+        /* Next check for TTL */
+        _ttl_timeout,
+
+        /**
+         * XML encoding and decoding as XML nodes can't be JSON'ized
+         * XML nodes are encoded and decoded if the node is the value to be saved
+         * but not if it's as a property of another object
+         * Eg. -
+         *   $.jStorage.set("key", xmlNode);        // IS OK
+         *   $.jStorage.set("key", {xml: xmlNode}); // NOT OK
+         */
+        _XMLService = {
+
+            /**
+             * Validates a XML node to be XML
+             * based on jQuery.isXML function
+             */
+            isXML: function(elm){
+                var documentElement = (elm ? elm.ownerDocument || elm : 0).documentElement;
+                return documentElement ? documentElement.nodeName !== "HTML" : false;
+            },
+
+            /**
+             * Encodes a XML node to string
+             * based on http://www.mercurytide.co.uk/news/article/issues-when-working-ajax/
+             */
+            encode: function(xmlNode) {
+                if(!this.isXML(xmlNode)){
+                    return false;
+                }
+                try{ // Mozilla, Webkit, Opera
+                    return new XMLSerializer().serializeToString(xmlNode);
+                }catch(E1) {
+                    try {  // IE
+                        return xmlNode.xml;
+                    }catch(E2){}
+                }
+                return false;
+            },
+
+            /**
+             * Decodes a XML node from string
+             * loosely based on http://outwestmedia.com/jquery-plugins/xmldom/
+             */
+            decode: function(xmlString){
+                var dom_parser = ("DOMParser" in window && (new DOMParser()).parseFromString) ||
+                        (window.ActiveXObject && function(_xmlString) {
+                    var xml_doc = new ActiveXObject('Microsoft.XMLDOM');
+                    xml_doc.async = 'false';
+                    xml_doc.loadXML(_xmlString);
+                    return xml_doc;
+                }),
+                resultXML;
+                if(!dom_parser){
+                    return false;
+                }
+                resultXML = dom_parser.call("DOMParser" in window && (new DOMParser()) || window, xmlString, 'text/xml');
+                return this.isXML(resultXML)?resultXML:false;
+            }
+        };
+
+    ////////////////////////// PRIVATE METHODS ////////////////////////
+
+    /**
+     * Initialization function. Detects if the browser supports DOM Storage
+     * or userData behavior and behaves accordingly.
+     * @returns undefined
+     */
+    function _init(){
+        /* Check if browser supports localStorage */
+        var localStorageReallyWorks = false;
+        if("localStorage" in window){
+            try {
+                window.localStorage.setItem('_tmptest', 'tmpval');
+                localStorageReallyWorks = true;
+                window.localStorage.removeItem('_tmptest');
+            } catch(BogusQuotaExceededErrorOnIos5) {
+                // Thanks be to iOS5 Private Browsing mode which throws
+                // QUOTA_EXCEEDED_ERRROR DOM Exception 22.
+            }
+        }
+        if(localStorageReallyWorks){
+            try {
+                if(window.localStorage) {
+                    _storage_service = window.localStorage;
+                    _backend = "localStorage";
+                }
+            } catch(E3) {/* Firefox fails when touching localStorage and cookies are disabled */}
+        }
+        /* Check if browser supports globalStorage */
+        else if("globalStorage" in window){
+            try {
+                if(window.globalStorage) {
+                    _storage_service = window.globalStorage[window.location.hostname];
+                    _backend = "globalStorage";
+                }
+            } catch(E4) {/* Firefox fails when touching localStorage and cookies are disabled */}
+        }
+        /* Check if browser supports userData behavior */
+        else {
+            _storage_elm = document.createElement('link');
+            if(_storage_elm.addBehavior){
+
+                /* Use a DOM element to act as userData storage */
+                _storage_elm.style.behavior = 'url(#default#userData)';
+
+                /* userData element needs to be inserted into the DOM! */
+                document.getElementsByTagName('head')[0].appendChild(_storage_elm);
+
+                _storage_elm.load("jStorage");
+                var data = "{}";
+                try{
+                    data = _storage_elm.getAttribute("jStorage");
+                }catch(E5){}
+                _storage_service.jStorage = data;
+                _backend = "userDataBehavior";
+            }else{
+                _storage_elm = null;
+                return;
+            }
+        }
+
+        _load_storage();
+
+        // remove dead keys
+        _handleTTL();
+    }
+
+    /**
+     * Loads the data from the storage based on the supported mechanism
+     * @returns undefined
+     */
+    function _load_storage(){
+        /* if jStorage string is retrieved, then decode it */
+        if(_storage_service.jStorage){
+            try{
+                _storage = json_decode(String(_storage_service.jStorage));
+            }catch(E6){_storage_service.jStorage = "{}";}
+        }else{
+            _storage_service.jStorage = "{}";
+        }
+        _storage_size = _storage_service.jStorage?String(_storage_service.jStorage).length:0;
+    }
+
+    /**
+     * This functions provides the "save" mechanism to store the jStorage object
+     * @returns undefined
+     */
+    function _save(){
+        try{
+            _storage_service.jStorage = json_encode(_storage);
+            // If userData is used as the storage engine, additional
+            if(_storage_elm) {
+                _storage_elm.setAttribute("jStorage",_storage_service.jStorage);
+                _storage_elm.save("jStorage");
+            }
+            _storage_size = _storage_service.jStorage?String(_storage_service.jStorage).length:0;
+        }catch(E7){/* probably cache is full, nothing is saved this way*/}
+    }
+
+    /**
+     * Function checks if a key is set and is string or numberic
+     */
+    function _checkKey(key){
+        if(!key || (typeof key !== "string" && typeof key !== "number")){
+            throw new TypeError('Key name must be string or numeric');
+        }
+        if(key === "__jstorage_meta"){
+            throw new TypeError('Reserved key name');
+        }
+        return true;
+    }
+
+    /**
+     * Removes expired keys
+     */
+    function _handleTTL(){
+        var curtime, i, TTL, nextExpire = Infinity, changed = false;
+
+        clearTimeout(_ttl_timeout);
+
+        if(!_storage.__jstorage_meta || typeof _storage.__jstorage_meta.TTL !== "object"){
+            // nothing to do here
+            return;
+        }
+
+        curtime = +new Date();
+        TTL = _storage.__jstorage_meta.TTL;
+        for(i in TTL){
+            if(TTL.hasOwnProperty(i)){
+                if(TTL[i] <= curtime){
+                    delete TTL[i];
+                    delete _storage[i];
+                    changed = true;
+                }else if(TTL[i] < nextExpire){
+                    nextExpire = TTL[i];
+                }
+            }
+        }
+
+        // set next check
+        if(nextExpire != Infinity){
+            _ttl_timeout = setTimeout(_handleTTL, nextExpire - curtime);
+        }
+
+        // save changes
+        if(changed){
+            _save();
+        }
+    }
+
+    ////////////////////////// PUBLIC INTERFACE /////////////////////////
+
+    $.jStorage = {
+        /* Version number */
+        version: "0.1.7.0",
+
+        /**
+         * Sets a key's value.
+         *
+         * @param {String} key - Key to set. If this value is not set or not
+         *              a string an exception is raised.
+         * @param {Mixed} value - Value to set. This can be any value that is JSON
+         *              compatible (Numbers, Strings, Objects etc.).
+         * @param {Object} [options] - possible options to use
+         * @param {Number} [options.TTL] - optional TTL value
+         * @returns the used value
+         */
+        set: function(key, value, options){
+            _checkKey(key);
+
+            options = options || {};
+
+            if(_XMLService.isXML(value)){
+                value = {_is_xml:true,xml:_XMLService.encode(value)};
+            }else if(typeof value === "function"){
+                value = null; // functions can't be saved!
+            }else if(value && typeof value === "object"){
+                // clone the object before saving to _storage tree
+                value = json_decode(json_encode(value));
+            }
+            _storage[key] = value;
+
+            if(!isNaN(options.TTL)){
+                this.setTTL(key, options.TTL);
+                // also handles saving
+            }else{
+                _save();
+            }
+            return value;
+        },
+
+        /**
+         * Looks up a key in cache
+         *
+         * @param {String} key - Key to look up.
+         * @param {mixed} def - Default value to return, if key didn't exist.
+         * @returns the key value, default value or <null>
+         */
+        get: function(key, def){
+            _checkKey(key);
+            if(key in _storage){
+                if(_storage[key] && typeof _storage[key] === "object" &&
+                        _storage[key]._is_xml &&
+                            _storage[key]._is_xml){
+                    return _XMLService.decode(_storage[key].xml);
+                }else{
+                    return _storage[key];
+                }
+            }
+            return typeof(def) === 'undefined' ? null : def;
+        },
+
+        /**
+         * Deletes a key from cache.
+         *
+         * @param {String} key - Key to delete.
+         * @returns true if key existed or false if it didn't
+         */
+        deleteKey: function(key){
+            _checkKey(key);
+            if(key in _storage){
+                delete _storage[key];
+                // remove from TTL list
+                if(_storage.__jstorage_meta &&
+                  typeof _storage.__jstorage_meta.TTL === "object" &&
+                  key in _storage.__jstorage_meta.TTL){
+                    delete _storage.__jstorage_meta.TTL[key];
+                }
+                _save();
+                return true;
+            }
+            return false;
+        },
+
+        /**
+         * Sets a TTL for a key, or remove it if ttl value is 0 or below
+         *
+         * @param {String} key - key to set the TTL for
+         * @param {Number} ttl - TTL timeout in milliseconds
+         * @returns true if key existed or false if it didn't
+         */
+        setTTL: function(key, ttl){
+            var curtime = +new Date();
+            _checkKey(key);
+            ttl = Number(ttl) || 0;
+            if(key in _storage){
+
+                if(!_storage.__jstorage_meta){
+                    _storage.__jstorage_meta = {};
+                }
+                if(!_storage.__jstorage_meta.TTL){
+                    _storage.__jstorage_meta.TTL = {};
+                }
+
+                // Set TTL value for the key
+                if(ttl>0){
+                    _storage.__jstorage_meta.TTL[key] = curtime + ttl;
+                }else{
+                    delete _storage.__jstorage_meta.TTL[key];
+                }
+
+                _save();
+
+                _handleTTL();
+                return true;
+            }
+            return false;
+        },
+
+        /**
+         * Deletes everything in cache.
+         *
+         * @return true
+         */
+        flush: function(){
+            _storage = {};
+            _save();
+            return true;
+        },
+
+        /**
+         * Returns a read-only copy of _storage
+         *
+         * @returns Object
+        */
+        storageObj: function(){
+            function F() {}
+            F.prototype = _storage;
+            return new F();
+        },
+
+        /**
+         * Returns an index of all used keys as an array
+         * ['key1', 'key2',..'keyN']
+         *
+         * @returns Array
+        */
+        index: function(){
+            var index = [], i;
+            for(i in _storage){
+                if(_storage.hasOwnProperty(i) && i !== "__jstorage_meta"){
+                    index.push(i);
+                }
+            }
+            return index;
+        },
+
+        /**
+         * How much space in bytes does the storage take?
+         *
+         * @returns Number
+         */
+        storageSize: function(){
+            return _storage_size;
+        },
+
+        /**
+         * Which backend is currently in use?
+         *
+         * @returns String
+         */
+        currentBackend: function(){
+            return _backend;
+        },
+
+        /**
+         * Test if storage is available
+         *
+         * @returns Boolean
+         */
+        storageAvailable: function(){
+            return !!_backend;
+        },
+
+        /**
+         * Reloads the data from browser storage
+         *
+         * @returns undefined
+         */
+        reInit: function(){
+            var new_storage_elm, data;
+            if(_storage_elm && _storage_elm.addBehavior){
+                new_storage_elm = document.createElement('link');
+
+                _storage_elm.parentNode.replaceChild(new_storage_elm, _storage_elm);
+                _storage_elm = new_storage_elm;
+
+                /* Use a DOM element to act as userData storage */
+                _storage_elm.style.behavior = 'url(#default#userData)';
+
+                /* userData element needs to be inserted into the DOM! */
+                document.getElementsByTagName('head')[0].appendChild(_storage_elm);
+
+                _storage_elm.load("jStorage");
+                data = "{}";
+                try{
+                    data = _storage_elm.getAttribute("jStorage");
+                }catch(E5){}
+                _storage_service.jStorage = data;
+                _backend = "userDataBehavior";
+            }
+
+            _load_storage();
+        }
+    };
+
+    // Initialize jStorage
+    _init();
+
+})(window.$ || window.jQuery);
diff --git a/resources/jquery/jquery.tablesorter.js b/resources/jquery/jquery.tablesorter.js
index 21dc3e1520..3ef71d573c 100644
--- a/resources/jquery/jquery.tablesorter.js
+++ b/resources/jquery/jquery.tablesorter.js
@@ -461,8 +461,8 @@
 				new RegExp( /^\d{1,3}[\.]\d{1,3}[\.]\d{1,3}[\.]\d{1,3}$/)
 			],
 			currency: [
-				new RegExp( /^[£$€?.]/),
-				new RegExp( /[£$€]/g)
+				new RegExp( /(^[£$€¥]|[£$€¥]$)/),
+				new RegExp( /[£$€¥]/g)
 			],
 			url: [
 				new RegExp( /^(https?|ftp|file):\/\/$/),
diff --git a/resources/mediawiki.language/languages/ar.js b/resources/mediawiki.language/languages/ar.js
deleted file mode 100644
index d21df7e597..0000000000
--- a/resources/mediawiki.language/languages/ar.js
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * Arabic (العربية) language functions
- */
-
-mediaWiki.language.convertPlural = function( count, forms ) {
-	forms = mediaWiki.language.preConvertPlural( forms, 6 );
-	if ( count == 0 ) {
-		return forms[0];
-	}
-	if ( count == 1 ) {
-		return forms[1];
-	}
-	if ( count == 2 ) {
-		return forms[2];
-	}
-	if ( count % 100 >= 3 && count % 100 <= 10 ) {
-		return forms[3];
-	}
-	if ( count % 100 >= 11 && count % 100 <= 99 ) {
-		return forms[4];
-	}
-	return forms[5];
-};
-
diff --git a/resources/mediawiki.language/languages/he.js b/resources/mediawiki.language/languages/he.js
index e737a7c0f2..d35f77ed89 100644
--- a/resources/mediawiki.language/languages/he.js
+++ b/resources/mediawiki.language/languages/he.js
@@ -2,17 +2,6 @@
  * Hebrew (עברית) language functions
  */
 
-mediaWiki.language.convertPlural = function( count, forms ) {
-	forms = mediaWiki.language.preConvertPlural( forms, 3 );
-	if ( count == 1 ) {
-		return forms[0];
-	}
-	if ( count == 2 && forms[2] ) {
-		return forms[2];
-	}
-	return forms[1];
-};
-
 mediaWiki.language.convertGrammar = function( word, form ) {
 	var grammarForms = mw.language.getData( 'he', 'grammarForms' );
 	if ( grammarForms && grammarForms[form] ) {
diff --git a/resources/mediawiki.language/languages/hi.js b/resources/mediawiki.language/languages/hi.js
deleted file mode 100644
index a22a0e17f1..0000000000
--- a/resources/mediawiki.language/languages/hi.js
+++ /dev/null
@@ -1,8 +0,0 @@
-/**
- * Hindi (हिन्दी) language functions
- */
-
-mediaWiki.language.convertPlural = function( count, forms ) {
-	forms = mediaWiki.language.preConvertPlural( forms, 2 );
-	return ( count <= 1 ) ? forms[0] : forms[1];
-};
diff --git a/resources/mediawiki.language/mediawiki.cldr.js b/resources/mediawiki.language/mediawiki.cldr.js
new file mode 100644
index 0000000000..6660eca4f2
--- /dev/null
+++ b/resources/mediawiki.language/mediawiki.cldr.js
@@ -0,0 +1,28 @@
+/**
+ *  CLDR related utility methods
+ */
+( function( mw ) {
+	"use strict";
+
+	var cldr = {
+		/**
+		 * For the number, get the plural for index
+		 * 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
+		 */
+		getPluralForm: function( number, pluralRules ) {
+			var pluralFormIndex = 0;
+			for ( pluralFormIndex = 0; pluralFormIndex < pluralRules.length; pluralFormIndex++ ) {
+				if ( mw.libs.pluralRuleParser( pluralRules[pluralFormIndex], number ) ) {
+					break;
+				}
+			}
+			return pluralFormIndex;
+		}
+	};
+
+	mw.cldr = cldr;
+} )( mediaWiki );
diff --git a/resources/mediawiki.language/mediawiki.language.js b/resources/mediawiki.language/mediawiki.language.js
index 1234637afe..935d4ff6e6 100644
--- a/resources/mediawiki.language/mediawiki.language.js
+++ b/resources/mediawiki.language/mediawiki.language.js
@@ -43,11 +43,19 @@ var language = {
 	 * @param forms array List of plural forms
 	 * @return string Correct form for quantifier in this language
 	 */
-	convertPlural: function ( count, forms ){
+	convertPlural: function( count, forms ) {
+		var pluralFormIndex = 0;
 		if ( !forms || forms.length === 0 ) {
 			return '';
 		}
-		return ( parseInt( count, 10 ) === 1 ) ? forms[0] : forms[1];
+		var pluralRules = mw.language.getData( mw.config.get( 'wgUserLanguage' ), 'pluralRules' );
+		if ( !pluralRules ) {
+			// default fallback.
+			return ( count === 1 ) ? forms[0] : forms[1];
+		}
+		pluralFormIndex = mw.cldr.getPluralForm( count, pluralRules );
+		pluralFormIndex = Math.min( pluralFormIndex, forms.length - 1 );
+		return forms[pluralFormIndex];
 	},
 
 	/**
diff --git a/resources/mediawiki.libs/CLDRPluralRuleParser.js b/resources/mediawiki.libs/CLDRPluralRuleParser.js
new file mode 100644
index 0000000000..bb1491d304
--- /dev/null
+++ b/resources/mediawiki.libs/CLDRPluralRuleParser.js
@@ -0,0 +1,306 @@
+/* This is cldrpluralparser 1.0, ported to MediaWiki ResourceLoader */
+
+/**
+* cldrpluralparser.js
+* A parser engine for CLDR plural rules.
+*
+* Copyright 2012 GPLV3+, Santhosh Thottingal
+*
+* @version 0.1.0-alpha
+* @source https://github.com/santhoshtr/CLDRPluralRuleParser
+* @author Santhosh Thottingal <santhosh.thottingal@gmail.com>
+* @author Timo Tijhof
+* @author Amir Aharoni
+*/
+
+/**
+ * Evaluates a plural rule in CLDR syntax for a number
+ * @param rule
+ * @param number
+ * @return true|false|null
+ */
+( function( mw ) {
+
+function pluralRuleParser(rule, number) {
+	/*
+	Syntax: see http://unicode.org/reports/tr35/#Language_Plural_Rules
+	-----------------------------------------------------------------
+
+	condition     = and_condition ('or' and_condition)*
+	and_condition = relation ('and' relation)*
+	relation      = is_relation | in_relation | within_relation | 'n' <EOL>
+	is_relation   = expr 'is' ('not')? value
+	in_relation   = expr ('not')? 'in' range_list
+	within_relation = expr ('not')? 'within' range_list
+	expr          = 'n' ('mod' value)?
+	range_list    = (range | value) (',' range_list)*
+	value         = digit+
+	digit         = 0|1|2|3|4|5|6|7|8|9
+	range         = value'..'value
+
+	*/
+	// Indicates current position in the rule as we parse through it.
+	// Shared among all parsing functions below.
+	var pos = 0;
+
+	var whitespace = makeRegexParser(/^\s+/);
+	var digits = makeRegexParser(/^\d+/);
+
+	var _n_ = makeStringParser('n');
+	var _is_ = makeStringParser('is');
+	var _mod_ = makeStringParser('mod');
+	var _not_ = makeStringParser('not');
+	var _in_ = makeStringParser('in');
+	var _within_ = makeStringParser('within');
+	var _range_ = makeStringParser('..');
+	var _comma_ = makeStringParser(',');
+	var _or_ = makeStringParser('or');
+	var _and_ = makeStringParser('and');
+
+	function debug() {
+		/* console.log.apply(console, arguments);*/
+	}
+
+	debug('pluralRuleParser', rule, number);
+
+	// Try parsers until one works, if none work return null
+	function choice(parserSyntax) {
+		return function () {
+			for (var i = 0; i < parserSyntax.length; i++) {
+				var result = parserSyntax[i]();
+				if (result !== null) {
+					return result;
+				}
+			}
+			return null;
+		};
+	}
+
+	// Try several parserSyntax-es in a row.
+	// All must succeed; otherwise, return null.
+	// This is the only eager one.
+	function sequence(parserSyntax) {
+		var originalPos = pos;
+		var result = [];
+		for (var i = 0; i < parserSyntax.length; i++) {
+			var res = parserSyntax[i]();
+			if (res === null) {
+				pos = originalPos;
+				return null;
+			}
+			result.push(res);
+		}
+		return result;
+	}
+
+	// Run the same parser over and over until it fails.
+	// Must succeed a minimum of n times; otherwise, return null.
+	function nOrMore(n, p) {
+		return function () {
+			var originalPos = pos;
+			var result = [];
+			var parsed = p();
+			while (parsed !== null) {
+				result.push(parsed);
+				parsed = p();
+			}
+			if (result.length < n) {
+				pos = originalPos;
+				return null;
+			}
+			return result;
+		};
+	}
+
+	// Helpers -- just make parserSyntax out of simpler JS builtin types
+
+	function makeStringParser(s) {
+		var len = s.length;
+		return function () {
+			var result = null;
+			if (rule.substr(pos, len) === s) {
+				result = s;
+				pos += len;
+			}
+			return result;
+		};
+	}
+
+	function makeRegexParser(regex) {
+		return function () {
+			var matches = rule.substr(pos).match(regex);
+			if (matches === null) {
+				return null;
+			}
+			pos += matches[0].length;
+			return matches[0];
+		};
+	}
+
+	function n() {
+		var result = _n_();
+		if (result === null) {
+			debug(" -- failed n");
+			return result;
+		}
+		result = parseInt(number, 10);
+		debug(" -- passed n ", result);
+		return result;
+	}
+
+	var expression = choice([mod, n]);
+
+	function mod() {
+		var result = sequence([n, whitespace, _mod_, whitespace, digits]);
+		if (result === null) {
+			debug(" -- failed mod");
+			return null;
+		}
+		debug(" -- passed mod");
+		return parseInt(result[0], 10) % parseInt(result[4], 10);
+	}
+
+	function not() {
+		var result = sequence([whitespace, _not_]);
+		if (result === null) {
+			debug(" -- failed not");
+			return null;
+		} else {
+			return result[1];
+		}
+	}
+
+	function is() {
+		var result = sequence([expression, whitespace, _is_, nOrMore(0, not), whitespace, digits]);
+		if (result !== null) {
+			debug(" -- passed is");
+			if (result[3][0] === 'not') {
+				return result[0] !== parseInt(result[5], 10);
+			} else {
+				return result[0] === parseInt(result[5], 10);
+			}
+		}
+		debug(" -- failed is");
+		return null;
+	}
+
+	function rangeList() {
+		// range_list    = (range | value) (',' range_list)*
+		var result = sequence([choice([range, digits]), nOrMore(0, rangeTail)]);
+		var resultList = [];
+		if (result !== null) {
+			resultList = resultList.concat(result[0], result[1][0]);
+			return resultList;
+		}
+		debug(" -- failed rangeList");
+		return null;
+	}
+
+	function rangeTail() {
+		// ',' range_list
+		var result = sequence([_comma_, rangeList]);
+		if (result !== null) {
+			return result[1];
+		}
+		debug(" -- failed rangeTail");
+		return null;
+	}
+
+	function range() {
+		var result = sequence([digits, _range_, digits]);
+		if (result !== null) {
+			debug(" -- passed range");
+			var array = [];
+			var left = parseInt(result[0], 10);
+			var right = parseInt(result[2], 10);
+			for ( i = left; i <= right; i++) {
+				array.push(i);
+			}
+			return array;
+		}
+		debug(" -- failed range");
+		return null;
+	}
+
+	function _in() {
+		// in_relation   = expr ('not')? 'in' range_list
+		var result = sequence([expression, nOrMore(0, not), whitespace, _in_, whitespace, rangeList]);
+		if (result !== null) {
+			debug(" -- passed _in");
+			var range_list = result[5];
+			for (var i = 0; i < range_list.length; i++) {
+				if (parseInt(range_list[i], 10) === result[0]) {
+					return (result[1][0] !== 'not');
+				}
+			}
+			return (result[1][0] === 'not');
+		}
+		debug(" -- failed _in ");
+		return null;
+	}
+
+	function within() {
+		var result = sequence([expression, whitespace, _within_, whitespace, rangeList]);
+		if (result !== null) {
+			debug(" -- passed within ");
+			var range_list = result[4];
+			return (parseInt( range_list[0],10 )<= result[0] && result[0] <= parseInt( range_list[1], 10));
+		}
+		debug(" -- failed within ");
+		return null;
+	}
+
+
+	var relation = choice([is, _in, within]);
+
+	function and() {
+		var result = sequence([relation, whitespace, _and_, whitespace, condition]);
+		if (result) {
+			debug(" -- passed and");
+			return result[0] && result[4];
+		}
+		debug(" -- failed and");
+		return null;
+	}
+
+	function or() {
+		var result = sequence([relation, whitespace, _or_, whitespace, condition]);
+		if (result) {
+			debug(" -- passed or");
+			return result[0] || result[4];
+		}
+		debug(" -- failed or");
+		return null;
+	}
+
+	var condition = choice([and, or, relation]);
+
+	function start() {
+		var result = condition();
+		return result;
+	}
+
+
+	var result = start();
+
+	/*
+	 * For success, the pos must have gotten to the end of the rule
+	 * 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 !== rule.length) {
+		// throw new Error("Parse error at position " + pos.toString() + " in input: " + rule + " result is " + result);
+	}
+
+	return result;
+}
+
+/* For module loaders, e.g. NodeJS, NPM */
+if (typeof module !== 'undefined' && module.exports) {
+	module.exports = pluralRuleParser;
+}
+
+/* pluralRuleParser ends here */
+mw.libs.pluralRuleParser = pluralRuleParser;
+
+} )( mediaWiki );
diff --git a/serialized/serialize.php b/serialized/serialize.php
index d8fb2b3b53..0e0ce80339 100644
--- a/serialized/serialize.php
+++ b/serialized/serialize.php
@@ -3,7 +3,7 @@
 if ( !defined( 'MEDIAWIKI' ) ) {
 	$wgNoDBParam = true;
 	$optionsWithArgs = array( 'o' );
-	require_once( dirname(__FILE__).'/../maintenance/commandLine.inc' );
+	require_once( __DIR__ .'/../maintenance/commandLine.inc' );
 
 	$stderr = fopen( 'php://stderr', 'w' );
 	if ( !isset( $args[0] ) ) {
diff --git a/skins/CologneBlue.php b/skins/CologneBlue.php
index bfcb31e4be..913c19bfa3 100644
--- a/skins/CologneBlue.php
+++ b/skins/CologneBlue.php
@@ -305,12 +305,9 @@ class CologneBlueTemplate extends LegacyTemplate {
 
 		$s .= $this->menuHead( 'qbmyoptions' );
 		if ( $this->data['loggedin'] ) {
-			$tl = Linker::link(
+			$tl = Linker::linkKnown(
 				$user->getTalkPage(),
-				wfMessage( 'mytalk' )->text(),
-				array(),
-				array(),
-				array( 'known', 'noclasses' )
+				wfMessage( 'mytalk' )->escaped()
 			);
 			if ( $user->getNewtalk() ) {
 				$tl .= ' *';
@@ -318,12 +315,12 @@ class CologneBlueTemplate extends LegacyTemplate {
 
 			$s .= Linker::linkKnown(
 					$user->getUserPage(),
-					wfMessage( 'mypage' )->text()
+					wfMessage( 'mypage' )->escaped()
 				) . $sep . $tl . $sep . Linker::specialLink( 'Watchlist' )
 					. $sep .
 				Linker::linkKnown(
 					SpecialPage::getSafeTitleFor( 'Contributions', $user->getName() ),
-					wfMessage( 'mycontris' )->text()
+					wfMessage( 'mycontris' )->escaped()
 				) . $sep . Linker::specialLink( 'Preferences' )
 				. $sep . Linker::specialLink( 'Userlogout' );
 		} else {
@@ -342,7 +339,7 @@ class CologneBlueTemplate extends LegacyTemplate {
 
 		if( $wgSiteSupportPage ) {
 			$s .= $sep . '<a href="' . htmlspecialchars( $wgSiteSupportPage ) . '" class="internal">'
-					. wfMessage( 'sitesupport' )->text() . '</a>';
+					. wfMessage( 'sitesupport' )->escaped() . '</a>';
 		}
 
 		$s .= $sep . Linker::linkKnown(
@@ -384,7 +381,7 @@ class CologneBlueTemplate extends LegacyTemplate {
 		if( $wgUseTwoButtonsSearchForm ) {
 			$s .= "<input type='submit' id=\"mw-searchButton{$this->searchboxes}\" class=\"searchButton\" name=\"fulltext\" value=\"" . wfMessage( 'search' )->escaped() . "\" />\n";
 		} else {
-			$s .= '<div><a href="' . $action . '" rel="search">' . wfMessage( 'powersearch-legend' )->text() . "</a></div>\n";
+			$s .= '<div><a href="' . $action . '" rel="search">' . wfMessage( 'powersearch-legend' )->escaped() . "</a></div>\n";
 		}
 
 		$s .= '</form>';
diff --git a/skins/Simple.php b/skins/Simple.php
index d06bdfd4af..9a3ab9468c 100644
--- a/skins/Simple.php
+++ b/skins/Simple.php
@@ -26,7 +26,7 @@ if( !defined( 'MEDIAWIKI' ) )
 	die( -1 );
 
 /** */
-require_once( dirname(__FILE__) . '/MonoBook.php' );
+require_once( __DIR__ . '/MonoBook.php' );
 
 /**
  * Inherit main code from SkinTemplate, set the CSS and template filter.
diff --git a/skins/Standard.php b/skins/Standard.php
index 502e2b41c0..54613090c4 100644
--- a/skins/Standard.php
+++ b/skins/Standard.php
@@ -67,7 +67,7 @@ class StandardTemplate extends LegacyTemplate {
 		wfProfileOut( __METHOD__ . '-1' );
 		wfProfileIn( __METHOD__ . '-2' );
 		$l = $this->getSkin()->getLanguage()->alignStart();
-		$s .= "<td class='bottom' align='$l' valign='top'>";
+		$s .= "<td class='bottom' style='text-align: $l; vertical-align: top;'>";
 
 		$s .= $this->bottomLinks();
 		$s .= "\n<br />" . $this->getSkin()->getLanguage()->pipeList( array(
@@ -133,7 +133,7 @@ class StandardTemplate extends LegacyTemplate {
 					$s.= Linker::specialLink( 'Watchlist' ) ;
 					$s .= $sep . Linker::linkKnown(
 						SpecialPage::getTitleFor( 'Contributions' ),
-						wfMessage( 'mycontris' )->text(),
+						wfMessage( 'mycontris' )->escaped(),
 						array(),
 						array( 'target' => $this->data['username'] )
 					);
diff --git a/skins/common/images/add.png b/skins/common/images/add.png
index f82f45db0b..3497423c95 100644
Binary files a/skins/common/images/add.png and b/skins/common/images/add.png differ
diff --git a/skins/common/images/ajax-loader.gif b/skins/common/images/ajax-loader.gif
index 3288d1035d..72203fdd7f 100644
Binary files a/skins/common/images/ajax-loader.gif and b/skins/common/images/ajax-loader.gif differ
diff --git a/skins/common/images/spinner.gif b/skins/common/images/spinner.gif
index 37d3a43d78..6146be4e88 100644
Binary files a/skins/common/images/spinner.gif and b/skins/common/images/spinner.gif differ
diff --git a/skins/common/preview.js b/skins/common/preview.js
index 9e76ca09ea..a332a8e4d6 100644
--- a/skins/common/preview.js
+++ b/skins/common/preview.js
@@ -12,7 +12,7 @@
 
 		// Hide active diff, used templates, old preview if shown
 		var copyElements = ['#wikiPreview', '.templatesUsed', '.hiddencats',
-							'#catlinks'];
+							'#catlinks', '#p-lang', '.mw-summary-preview'];
 		var copySelector = copyElements.join(',');
 
 		$.each( copyElements, function(k,v) { $(v).fadeOut('fast'); } );
@@ -123,6 +123,18 @@
 	};
 
 	$(document).ready( function() {
-		$('#wpPreview').click( doLivePreview );
+		// construct space for interwiki links if missing
+		// (it is usually not shown when action=edit, but shown if action=submit)
+		if ( !document.getElementById( 'p-lang' ) && document.getElementById( 'p-tb' ) ) {
+			// we need not hide this, because it's empty anyway
+			$( '#p-tb' ).after( $( '<div>' ).attr( 'id', 'p-lang' ) );
+		}
+
+		// construct space for summary preview if missing
+		if ( $( '.mw-summary-preview' ).length === 0 ) {
+			$( '.editCheckboxes' ).before( $( '<div>' ).addClass( 'mw-summary-preview' ) );
+		}
+
+		$( '#wpPreview' ).click( doLivePreview );
 	} );
 }) ( jQuery );
diff --git a/skins/common/upload.js b/skins/common/upload.js
index 8e08af31c5..df819e190d 100644
--- a/skins/common/upload.js
+++ b/skins/common/upload.js
@@ -1,4 +1,4 @@
-( function () {
+( function ( mw, $ ) {
 var	ajaxUploadDestCheck = mw.config.get( 'wgAjaxUploadDestCheck' ),
 	fileExtensions = mw.config.get( 'wgFileExtensions' );
 
@@ -241,10 +241,17 @@ window.fillDestFilename = function(id) {
 	}
 
 	// Output result
-	var destFile = document.getElementById('wpDestFile');
-	if (destFile) {
-		destFile.value = fname;
-		wgUploadWarningObj.checkNow(fname) ;
+	var destFile = document.getElementById( 'wpDestFile' );
+	if ( destFile ) {
+		// Call decodeURIComponent function to remove possible URL-encoded characters
+		// from the file name (bug 30390). Especially likely with upload-form-url.
+		// decodeURIComponent can throw an exception in input is invalid utf-8
+		try {
+			destFile.value = decodeURIComponent( fname );
+		} catch ( e ) {
+			destFile.value = fname;
+		}
+		wgUploadWarningObj.checkNow( fname );
 	}
 };
 
@@ -302,4 +309,4 @@ window.wgUploadLicenseObj = {
 
 $( document ).ready( uploadSetup );
 
-}() );
+}( mediaWiki, jQuery ) );
diff --git a/skins/monobook/main.css b/skins/monobook/main.css
index 0566e98cb7..5c7ad82c8e 100644
--- a/skins/monobook/main.css
+++ b/skins/monobook/main.css
@@ -840,7 +840,7 @@ div#searchTargetHide {
 }
 
 #powersearch p {
-	margin-top:0px;
+	margin-top: 0px;
 }
 
 div.multipageimagenavbox {
@@ -924,6 +924,7 @@ div#mw-js-message {
 	top: 1em;
 	width: 20em;
 	z-index: 10000;
+	-moz-box-shadow: 0px 2px 5px 0px rgba(0, 0, 0, 0.125);
 	-webkit-box-shadow: 0px 2px 5px 0px rgba(0, 0, 0, 0.125);
 	box-shadow: 0px 2px 5px 0px rgba(0, 0, 0, 0.125);
 }
diff --git a/skins/vector/screen.css b/skins/vector/screen.css
index 061e58acf8..bab8822b90 100644
--- a/skins/vector/screen.css
+++ b/skins/vector/screen.css
@@ -149,7 +149,7 @@ div.vectorTabs ul li {
 	background-image: url(images/tab-normal-fade.png);
 	background-position: bottom left;
 	background-repeat: repeat-x;
-	white-space:nowrap;
+	white-space: nowrap;
 }
 /* IGNORED BY IE6 */
 div.vectorTabs ul > li {
@@ -797,6 +797,7 @@ div#mw-js-message {
 	z-index: 10000;
 	border: solid 1px #a7d7f9;
 	border-radius: 0.75em;
+	-moz-box-shadow: 0px 2px 10px 0px rgba(0, 0, 0, 0.125);
 	-webkit-box-shadow: 0px 2px 10px 0px rgba(0, 0, 0, 0.125);
 	box-shadow: 0px 2px 10px 0px rgba(0, 0, 0, 0.125);
 }
@@ -848,9 +849,9 @@ div#bodyContent {
 }
 div.vectorTabs ul {
 	/* @embed */
-	background-image:url(images/tab-break.png);
-	background-position:right bottom;
-	background-repeat:no-repeat;
+	background-image: url(images/tab-break.png);
+	background-position: right bottom;
+	background-repeat: no-repeat;
 }
 
 /* Tooltips are outside of the normal body code, so this helps make the size of the text sensible */
@@ -862,39 +863,39 @@ div.vectorTabs ul {
 
 body.vector-animateLayout div#content,
 body.vector-animateLayout div#footer {
-	transition: margin-left 250ms, padding 250ms;
 	-moz-transition: margin-left 250ms, padding 250ms;
 	-webkit-transition: margin-left 250ms, padding 250ms;
 	-o-transition: margin-left 250ms, padding 250ms;
+	transition: margin-left 250ms, padding 250ms;
 }
 body.vector-animateLayout #p-logo,
 body.vector-animateLayout #left-navigation {
-	transition: left 250ms;
 	-moz-transition: left 250ms;
 	-webkit-transition: left 250ms;
 	-o-transition: left 250ms;
+	transition: left 250ms;
 }
 body.vector-animateLayout #mw-panel {
-	transition: padding-left 250ms;
 	-moz-transition: padding-left 250ms;
 	-webkit-transition: padding-left 250ms;
 	-o-transition: padding-left 250ms;
+	transition: padding-left 250ms;
 }
 body.vector-animateLayout #p-search {
-	transition: margin-right 250ms;
 	-moz-transition: margin-right 250ms;
 	-webkit-transition: margin-right 250ms;
 	-o-transition: margin-right 250ms;
+	transition: margin-right 250ms;
 }
 body.vector-animateLayout #p-personal {
-	transition: right 250ms;
 	-moz-transition: right 250ms;
 	-webkit-transition: right 250ms;
 	-o-transition: right 250ms;
+	transition: right 250ms;
 }
 body.vector-animateLayout #mw-head-base {
-	transition: margin-left 250ms;
 	-moz-transition: margin-left 250ms;
 	-webkit-transition: margin-left 250ms;
 	-o-transition: margin-left 250ms;
+	transition: margin-left 250ms;
 }
diff --git a/tests/RunSeleniumTests.php b/tests/RunSeleniumTests.php
index 9cadd759f6..28501eaa1b 100644
--- a/tests/RunSeleniumTests.php
+++ b/tests/RunSeleniumTests.php
@@ -24,12 +24,12 @@
  * http://www.gnu.org/copyleft/gpl.html
  */
 
-$IP = dirname( dirname( __FILE__ ) );
+$IP = dirname( __DIR__ );
 
 define( 'SELENIUMTEST', true );
 
-//require_once( dirname( __FILE__ ) . '/../maintenance/commandLine.inc' );
-require( dirname( __FILE__ ) . '/../maintenance/Maintenance.php' );
+//require_once( __DIR__ . '/../maintenance/commandLine.inc' );
+require( __DIR__ . '/../maintenance/Maintenance.php' );
 
 require_once( 'PHPUnit/Runner/Version.php' );
 if( version_compare( PHPUnit_Runner_Version::id(), '3.5.0', '>=' ) ) {
@@ -43,7 +43,7 @@ if( version_compare( PHPUnit_Runner_Version::id(), '3.5.0', '>=' ) ) {
 require_once( 'PHPUnit/Extensions/SeleniumTestCase.php' );
 include_once( 'PHPUnit/Util/Log/JUnit.php' );
 
-require_once( dirname( __FILE__ ) . "/selenium/SeleniumServerManager.php" );
+require_once( __DIR__ . "/selenium/SeleniumServerManager.php" );
 
 class SeleniumTester extends Maintenance {
 	protected $selenium;
diff --git a/tests/TestsAutoLoader.php b/tests/TestsAutoLoader.php
index 3125284d23..cb5ca36f13 100644
--- a/tests/TestsAutoLoader.php
+++ b/tests/TestsAutoLoader.php
@@ -1,7 +1,7 @@
 <?php
 
 global $wgAutoloadClasses;
-$testFolder = dirname( __FILE__ );
+$testFolder = __DIR__;
 
 $wgAutoloadClasses += array(
 
@@ -13,7 +13,6 @@ $wgAutoloadClasses += array(
 
 	//includes
 	'BlockTest' => "$testFolder/phpunit/includes/BlockTest.php",
-	'MockOutputPage' => "$testFolder/phpunit/includes/MockOutputPage.php",
 
 	//API
 	'ApiFormatTestBase' => "$testFolder/phpunit/includes/api/format/ApiFormatTestBase.php",
diff --git a/tests/jasmine/spec_makers/makeJqueryMsgSpec.php b/tests/jasmine/spec_makers/makeJqueryMsgSpec.php
index 9d75be4ec6..43015878af 100644
--- a/tests/jasmine/spec_makers/makeJqueryMsgSpec.php
+++ b/tests/jasmine/spec_makers/makeJqueryMsgSpec.php
@@ -14,7 +14,7 @@
  *
  */ 
 
-$maintenanceDir = dirname( dirname( dirname( dirname( dirname( __FILE__ ) ) ) ) ) . '/maintenance';
+$maintenanceDir = dirname( dirname( dirname( dirname( __DIR__ ) ) ) ) . '/maintenance';
 
 require( "$maintenanceDir/Maintenance.php" );
 
diff --git a/tests/parserTests.php b/tests/parserTests.php
index d930ac5a68..4df9a61880 100644
--- a/tests/parserTests.php
+++ b/tests/parserTests.php
@@ -27,7 +27,7 @@
 $otions = array( 'quick', 'color', 'quiet', 'help', 'show-output', 'record', 'run-disabled' );
 $optionsWithArgs = array( 'regex', 'filter', 'seed', 'setversion' );
 
-require_once( dirname( __FILE__ ) . '/../maintenance/commandLine.inc' );
+require_once( __DIR__ . '/../maintenance/commandLine.inc' );
 
 if ( isset( $options['help'] ) ) {
 	echo <<<ENDS
diff --git a/tests/phpunit/MediaWikiPHPUnitCommand.php b/tests/phpunit/MediaWikiPHPUnitCommand.php
index ea385ad9b2..fca325154a 100644
--- a/tests/phpunit/MediaWikiPHPUnitCommand.php
+++ b/tests/phpunit/MediaWikiPHPUnitCommand.php
@@ -37,7 +37,7 @@ class MediaWikiPHPUnitCommand extends PHPUnit_TextUI_Command {
 		# PHPUnit uses stream_resolve_include_path() internally
 		# See bug 32022
 		set_include_path(
-			dirname( __FILE__ )
+			__DIR__
 			.PATH_SEPARATOR
 			. get_include_path()
 		);
diff --git a/tests/phpunit/MediaWikiTestCase.php b/tests/phpunit/MediaWikiTestCase.php
index c873c5165d..49c2a70109 100644
--- a/tests/phpunit/MediaWikiTestCase.php
+++ b/tests/phpunit/MediaWikiTestCase.php
@@ -115,7 +115,7 @@ abstract class MediaWikiTestCase extends PHPUnit_Framework_TestCase {
 	}
 
 	protected function tearDown() {
-		// Cleaning up temoporary files
+		// Cleaning up temporary files
 		foreach ( $this->tmpfiles as $fname ) {
 			if ( is_file( $fname ) || ( is_link( $fname ) ) ) {
 				unlink( $fname );
@@ -124,6 +124,13 @@ abstract class MediaWikiTestCase extends PHPUnit_Framework_TestCase {
 			}
 		}
 
+		// clean up open transactions
+		if( $this->needsDB() && $this->db ) {
+			while( $this->db->trxLevel() > 0 ) {
+				$this->db->rollback();
+			}
+		}
+
 		parent::tearDown();
 	}
 
diff --git a/tests/phpunit/bootstrap.php b/tests/phpunit/bootstrap.php
index 08eb50f7eb..933767e7e9 100644
--- a/tests/phpunit/bootstrap.php
+++ b/tests/phpunit/bootstrap.php
@@ -11,7 +11,7 @@ if ( !defined( 'MW_PHPUNIT_TEST' ) ) {
 You are running these tests directly from phpunit. You may not have all globals correctly set.
 Running phpunit.php instead is recommended.
 EOF;
-	require_once ( dirname( __FILE__ ) . "/phpunit.php" );
+	require_once ( __DIR__ . "/phpunit.php" );
 }
 
 // Output a notice when running with older versions of PHPUnit
diff --git a/tests/phpunit/data/media/exif-gps.jpg b/tests/phpunit/data/media/exif-gps.jpg
index f99b484d5e..40137340e5 100644
Binary files a/tests/phpunit/data/media/exif-gps.jpg and b/tests/phpunit/data/media/exif-gps.jpg differ
diff --git a/tests/phpunit/data/xmp/gps.result.php b/tests/phpunit/data/xmp/gps.result.php
new file mode 100644
index 0000000000..2d1243d559
--- /dev/null
+++ b/tests/phpunit/data/xmp/gps.result.php
@@ -0,0 +1,12 @@
+<?php
+
+$result = array( 'xmp-exif' =>
+	array(
+		'GPSAltitude' => -3.14159265301,
+		'GPSDOP' => '5/1',
+		'GPSLatitude' => 88.51805555,
+		'GPSLongitude' => -21.12356945,
+		'GPSVersionID' => '2.2.0.0'
+        )
+);
+
diff --git a/tests/phpunit/data/xmp/gps.xmp b/tests/phpunit/data/xmp/gps.xmp
new file mode 100644
index 0000000000..e52d2c8a6b
--- /dev/null
+++ b/tests/phpunit/data/xmp/gps.xmp
@@ -0,0 +1,17 @@
+<?xpacket begin='' id='W5M0MpCehiHzreSzNTczkc9d'?>
+<x:xmpmeta xmlns:x='adobe:ns:meta/' x:xmptk='Image::ExifTool 7.30'>
+<rdf:RDF xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'>
+
+ <rdf:Description rdf:about=''
+  xmlns:exif='http://ns.adobe.com/exif/1.0/'>
+  <exif:GPSAltitude>103993/33102</exif:GPSAltitude>
+  <exif:GPSAltitudeRef>1</exif:GPSAltitudeRef>
+  <exif:GPSDOP>5/1</exif:GPSDOP>
+  <exif:GPSLatitude>88,31.083333N</exif:GPSLatitude>
+  <exif:GPSLongitude>21,7.414167W</exif:GPSLongitude>
+  <exif:GPSVersionID>2.2.0.0</exif:GPSVersionID>
+ </rdf:Description>
+
+</rdf:RDF>
+</x:xmpmeta>
+<?xpacket end='w'?>
diff --git a/tests/phpunit/includes/GlobalFunctions/GlobalTest.php b/tests/phpunit/includes/GlobalFunctions/GlobalTest.php
index 746add5b52..9097d301f5 100644
--- a/tests/phpunit/includes/GlobalFunctions/GlobalTest.php
+++ b/tests/phpunit/includes/GlobalFunctions/GlobalTest.php
@@ -108,7 +108,7 @@ class GlobalTest extends MediaWikiTestCase {
 			array( array( 'foo' => 1 ), 'foo=1' ), // number test
 			array( array( 'foo' => true ), 'foo=1' ), // true test
 			array( array( 'foo' => false ), '' ), // false test
-			array( array( 'foo' => null ), 'foo' ), // null test
+			array( array( 'foo' => null ), '' ), // null test
 			array( array( 'foo' => 'A&B=5+6@!"\'' ), 'foo=A%26B%3D5%2B6%40%21%22%27' ), // urlencoding test
 			array( array( 'foo' => 'bar', 'baz' => 'is', 'asdf' => 'qwerty' ), 'foo=bar&baz=is&asdf=qwerty' ), // multi-item test
 			array( array( 'foo' => array( 'bar' => 'baz' ) ), 'foo%5Bbar%5D=baz' ),
@@ -311,7 +311,7 @@ class GlobalTest extends MediaWikiTestCase {
 	
 	function testDebugFunctionTest() {
 	
-		global $wgDebugLogFile, $wgOut, $wgShowDebug, $wgDebugTimestamps;
+		global $wgDebugLogFile, $wgDebugTimestamps;
 		
 		$old_log_file = $wgDebugLogFile;
 		$wgDebugLogFile = tempnam( wfTempDir(), 'mw-' );
@@ -333,33 +333,7 @@ class GlobalTest extends MediaWikiTestCase {
 		wfDebug( "\00305This has böth UTF and control chars\003" );
 		$this->assertEquals( " 05This has böth UTF and control chars ", file_get_contents( $wgDebugLogFile ) );
 		unlink( $wgDebugLogFile );
-		
-		
-		
-		$old_wgOut = $wgOut;
-		$old_wgShowDebug = $wgShowDebug;
-		
-		$wgOut = new MockOutputPage;
-		
-		$wgShowDebug = true;
-		
-		$message = "\00305This has böth UTF and control chars\003";
-		
-		wfDebug( $message );
-		
-		if( $wgOut->message == "JAJA is a stupid error message. Anyway, here's your message: $message" ) {
-			$this->assertTrue( true, 'MockOutputPage called, set the proper message.' );
-		}
-		else {
-			$this->assertTrue( false, 'MockOutputPage was not called.' );
-		}
-		
-		$wgOut = $old_wgOut;
-		$wgShowDebug = $old_wgShowDebug;		
-		unlink( $wgDebugLogFile );
-		
-		
-		
+
 		wfDebugMem();
 		$this->assertGreaterThan( 5000, preg_replace( '/\D/', '', file_get_contents( $wgDebugLogFile ) ) );
 		unlink( $wgDebugLogFile );
diff --git a/tests/phpunit/includes/LocalisationCacheTest.php b/tests/phpunit/includes/LocalisationCacheTest.php
new file mode 100644
index 0000000000..356db87c68
--- /dev/null
+++ b/tests/phpunit/includes/LocalisationCacheTest.php
@@ -0,0 +1,31 @@
+<?php
+
+class LocalisationCacheTest extends MediaWikiTestCase {
+	public function testPuralRulesFallback() {
+		$cache = Language::getLocalisationCache();
+
+		$this->assertEquals(
+			$cache->getItem( 'ru', 'pluralRules' ),
+			$cache->getItem( 'os', 'pluralRules' ),
+			'os plural rules (undefined) fallback to ru (defined)'
+		);
+
+		$this->assertEquals(
+			$cache->getItem( 'ru', 'compiledPluralRules' ),
+			$cache->getItem( 'os', 'compiledPluralRules' ),
+			'os compiled plural rules (undefined) fallback to ru (defined)'
+		);
+
+		$this->assertNotEquals(
+			$cache->getItem( 'ksh', 'pluralRules' ),
+			$cache->getItem( 'de', 'pluralRules' ),
+			'ksh plural rules (defined) dont fallback to de (defined)'
+		);
+
+		$this->assertNotEquals(
+			$cache->getItem( 'ksh', 'compiledPluralRules' ),
+			$cache->getItem( 'de', 'compiledPluralRules' ),
+			'ksh compiled plural rules (defined) dont fallback to de (defined)'
+		);
+	}
+}
diff --git a/tests/phpunit/includes/MockOutputPage.php b/tests/phpunit/includes/MockOutputPage.php
deleted file mode 100644
index bdee4832bf..0000000000
--- a/tests/phpunit/includes/MockOutputPage.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-class MockOutputPage {
-
-	public $message;
-
-	function debug( $message ) {
-		$this->message = "JAJA is a stupid error message. Anyway, here's your message: $message";
-	}
-}
diff --git a/tests/phpunit/includes/TemplateCategoriesTest.php b/tests/phpunit/includes/TemplateCategoriesTest.php
index 416ec867b8..39ce6e314e 100644
--- a/tests/phpunit/includes/TemplateCategoriesTest.php
+++ b/tests/phpunit/includes/TemplateCategoriesTest.php
@@ -3,7 +3,7 @@
 /**
  * @group Database
  */
-require dirname( __FILE__ ) . "/../../../maintenance/runJobs.php";
+require __DIR__ . "/../../../maintenance/runJobs.php";
 
 class TemplateCategoriesTest extends MediaWikiLangTestCase {
 
diff --git a/tests/phpunit/includes/UriTest.php b/tests/phpunit/includes/UriTest.php
deleted file mode 100644
index 3b78f47019..0000000000
--- a/tests/phpunit/includes/UriTest.php
+++ /dev/null
@@ -1,164 +0,0 @@
-<?php
-
-class UriTest extends MediaWikiTestCase {
-
-	function setUp() {
-		AutoLoader::loadClass( 'Uri' );
-	}
-
-	function dataUris() {
-		return array(
-			array(
-				'http://example.com/',
-				array(
-					'scheme'    => 'http',
-					'delimiter' => '://',
-					'user'      => null,
-					'pass'      => null,
-					'host'      => 'example.com',
-					'port'      => null,
-					'path'      => '/',
-					'query'     => null,
-					'fragment'  => null,
-				),
-			),
-			array(
-				'//mediawiki.org/wiki/Main_Page',
-				array(
-					'scheme'    => null,
-					'delimiter' => '//',
-					'user'      => null,
-					'pass'      => null,
-					'host'      => 'mediawiki.org',
-					'port'      => null,
-					'path'      => '/wiki/Main_Page',
-					'query'     => null,
-					'fragment'  => null,
-				),
-			),
-			array(
-				'http://user:pass@example.com/',
-				array(
-					'scheme'    => 'http',
-					'delimiter' => '://',
-					'user'      => 'user',
-					'pass'      => 'pass',
-					'host'      => 'example.com',
-					'port'      => null,
-					'path'      => '/',
-					'query'     => null,
-					'fragment'  => null,
-				),
-			),
-			array(
-				'/?asdf=asdf',
-				array(
-					'scheme'    => null,
-					'delimiter' => null,
-					'user'      => null,
-					'pass'      => null,
-					'host'      => null,
-					'port'      => null,
-					'path'      => '/',
-					'query'     => 'asdf=asdf',
-					'fragment'  => null,
-				),
-			),
-			array(
-				'?asdf=asdf#asdf',
-				array(
-					'scheme'    => null,
-					'delimiter' => null,
-					'user'      => null,
-					'pass'      => null,
-					'host'      => null,
-					'port'      => null,
-					'path'      => null,
-					'query'     => 'asdf=asdf',
-					'fragment'  => 'asdf',
-				),
-			)
-		);
-	}
-
-	/**
-	 * Ensure that get* methods properly match the appropriate getComponent( key ) value
-	 * @dataProvider dataUris
-	 */
-	function testGetters( $uri ) {
-		$uri = new Uri( $uri );
-		$getterMap = array(
-			'getProtocol' => 'scheme',
-			'getUser' => 'user',
-			'getPassword' => 'pass',
-			'getHost' => 'host',
-			'getPort' => 'port',
-			'getPath' => 'path',
-			'getQueryString' => 'query',
-			'getFragment' => 'fragment',
-		);
-		foreach ( $getterMap as $fn => $c ) {
-			$this->assertSame( $uri->{$fn}(), $uri->getComponent( $c ), "\$uri->{$fn}(); matches \$uri->getComponent( '$c' );" );
-		}
-	}
-
-	/**
-	 * Ensure that Uri has the proper components for our example uris
-	 * @dataProvider dataUris
-	 */
-	function testComponents( $uri, $components ) {
-		$uri = new Uri( $uri );
-
-		$this->assertSame( $components['scheme'], $uri->getProtocol(), 'Correct scheme' );
-		$this->assertSame( $components['delimiter'], $uri->getDelimiter(), 'Correct delimiter' );
-		$this->assertSame( $components['user'], $uri->getUser(), 'Correct user' );
-		$this->assertSame( $components['pass'], $uri->getPassword(), 'Correct pass' );
-		$this->assertSame( $components['host'], $uri->getHost(), 'Correct host' );
-		$this->assertSame( $components['port'], $uri->getPort(), 'Correct port' );
-		$this->assertSame( $components['path'], $uri->getPath(), 'Correct path' );
-		$this->assertSame( $components['query'], $uri->getQueryString(), 'Correct query' );
-		$this->assertSame( $components['fragment'], $uri->getFragment(), 'Correct fragment' );
-	}
-
-	/**
-	 * Ensure that the aliases work for various components.
-	 */
-	function testAliases() {
-		$url = "//myuser@test.com";
-		$uri = new Uri( $url );
-
-		// Set the aliases.
-		$uri->setComponent( 'protocol', 'https' );
-		$uri->setComponent( 'password', 'mypass' );
-
-		// Now try getting them.
-		$this->assertSame( 'https', $uri->getComponent( 'protocol' ), 'Correct protocol (alias for scheme)' );
-		$this->assertSame( 'mypass', $uri->getComponent( 'password' ), 'Correct password (alias for pass)' );
-
-		// Finally check their actual names.
-		$this->assertSame( 'https', $uri->getProtocol(), 'Alias for scheme works' );
-		$this->assertSame( 'mypass', $uri->getPassword(), 'Alias for pass works' );
-	}
-
-	/**
-	 * Ensure that Uri's helper methods return the correct data
-	 */
-	function testHelpers() {
-		$uri = new Uri( 'http://a:b@example.com:8080/path?query=value' );
-
-		$this->assertSame( 'a:b', $uri->getUserInfo(), 'Correct getUserInfo' );
-		$this->assertSame( 'example.com:8080', $uri->getHostPort(), 'Correct getHostPort' );
-		$this->assertSame( 'a:b@example.com:8080', $uri->getAuthority(), 'Correct getAuthority' );
-		$this->assertSame( '/path?query=value', $uri->getRelativePath(), 'Correct getRelativePath' );
-		$this->assertSame( 'http://a:b@example.com:8080/path?query=value', $uri->toString(), 'Correct toString' );
-	}
-
-	/**
-	 * Ensure that Uri's extend method properly overrides keys
-	 */
-	function testExtend() {
-		$uri = new Uri( 'http://example.org/?a=b&hello=world' );
-		$uri->extendQuery( 'a=c&foo=bar' );
-		$this->assertSame( 'a=c&hello=world&foo=bar', $uri->getQueryString() );
-	}
-}
diff --git a/tests/phpunit/includes/ZipDirectoryReaderTest.php b/tests/phpunit/includes/ZipDirectoryReaderTest.php
index f7ca59e241..d90a695095 100644
--- a/tests/phpunit/includes/ZipDirectoryReaderTest.php
+++ b/tests/phpunit/includes/ZipDirectoryReaderTest.php
@@ -4,7 +4,7 @@ class ZipDirectoryReaderTest extends MediaWikiTestCase {
 	var $zipDir, $entries;
 
 	function setUp() {
-		$this->zipDir = dirname( __FILE__ ) . '/../data/zip';
+		$this->zipDir = __DIR__ . '/../data/zip';
 	}
 
 	function zipCallback( $entry ) {
diff --git a/tests/phpunit/includes/api/ApiEditPageTest.php b/tests/phpunit/includes/api/ApiEditPageTest.php
new file mode 100644
index 0000000000..5297d6daa7
--- /dev/null
+++ b/tests/phpunit/includes/api/ApiEditPageTest.php
@@ -0,0 +1,84 @@
+<?php
+
+/**
+ * Tests for MediaWiki api.php?action=edit.
+ *
+ * @author Daniel Kinzler
+ *
+ * @group API
+ * @group Database
+ */
+class ApiEditPageTest extends ApiTestCase {
+
+	function setUp() {
+		parent::setUp();
+		$this->doLogin();
+	}
+
+	function testEdit( ) {
+		$name = 'ApiEditPageTest_testEdit';
+
+		// -- test new page --------------------------------------------
+		$apiResult = $this->doApiRequestWithToken( array(
+				'action' => 'edit',
+				'title' => $name,
+				'text' => 'some text', ) );
+		$apiResult = $apiResult[0];
+
+		# Validate API result data
+		$this->assertArrayHasKey( 'edit', $apiResult );
+		$this->assertArrayHasKey( 'result', $apiResult['edit'] );
+		$this->assertEquals( 'Success', $apiResult['edit']['result'] );
+
+		$this->assertArrayHasKey( 'new', $apiResult['edit'] );
+		$this->assertArrayNotHasKey( 'nochange', $apiResult['edit'] );
+
+		$this->assertArrayHasKey( 'pageid', $apiResult['edit'] );
+
+		// -- test existing page, no change ----------------------------
+		$data = $this->doApiRequestWithToken( array(
+				'action' => 'edit',
+				'title' => $name,
+				'text' => 'some text', ) );
+
+		$this->assertEquals( 'Success', $data[0]['edit']['result'] );
+
+		$this->assertArrayNotHasKey( 'new', $data[0]['edit'] );
+		$this->assertArrayHasKey( 'nochange', $data[0]['edit'] );
+
+		// -- test existing page, with change --------------------------
+		$data = $this->doApiRequestWithToken( array(
+				'action' => 'edit',
+				'title' => $name,
+				'text' => 'different text' ) );
+
+		$this->assertEquals( 'Success', $data[0]['edit']['result'] );
+
+		$this->assertArrayNotHasKey( 'new', $data[0]['edit'] );
+		$this->assertArrayNotHasKey( 'nochange', $data[0]['edit'] );
+
+		$this->assertArrayHasKey( 'oldrevid', $data[0]['edit'] );
+		$this->assertArrayHasKey( 'newrevid', $data[0]['edit'] );
+		$this->assertNotEquals(
+			$data[0]['edit']['newrevid'],
+			$data[0]['edit']['oldrevid'],
+			"revision id should change after edit"
+		);
+	}
+
+	function testEditAppend() {
+		$this->markTestIncomplete( "not yet implemented" );
+	}
+
+	function testEditSection() {
+		$this->markTestIncomplete( "not yet implemented" );
+	}
+
+	function testUndo() {
+		$this->markTestIncomplete( "not yet implemented" );
+	}
+
+	function testEditNonText() {
+		$this->markTestIncomplete( "not yet implemented" );
+	}
+}
diff --git a/tests/phpunit/includes/api/ApiTestCase.php b/tests/phpunit/includes/api/ApiTestCase.php
index 3b044ef94b..d6c48cbd73 100644
--- a/tests/phpunit/includes/api/ApiTestCase.php
+++ b/tests/phpunit/includes/api/ApiTestCase.php
@@ -85,10 +85,16 @@ abstract class ApiTestCase extends MediaWikiLangTestCase {
 	 * This is cheating a bit -- we grab a token in the correct format and then add it to the pseudo-session and to the
 	 * request, without actually requesting a "real" edit token
 	 * @param $params Array: key-value API params
-	 * @param $session Array: session array
+	 * @param $session Array|null: session array
 	 * @param $user User|null A User object for the context
 	 */
-	protected function doApiRequestWithToken( Array $params, Array $session, User $user = null ) {
+	protected function doApiRequestWithToken( Array $params, Array $session = null, User $user = null ) {
+		global $wgRequest;
+
+		if ( $session === null ) {
+			$session = $wgRequest->getSessionArray();
+		}
+
 		if ( $session['wsToken'] ) {
 			// add edit token to fake session
 			$session['wsEditToken'] = $session['wsToken'];
diff --git a/tests/phpunit/includes/api/RandomImageGenerator.php b/tests/phpunit/includes/api/RandomImageGenerator.php
index 86c0a828fd..8b6a3849f6 100644
--- a/tests/phpunit/includes/api/RandomImageGenerator.php
+++ b/tests/phpunit/includes/api/RandomImageGenerator.php
@@ -79,7 +79,7 @@ class RandomImageGenerator {
 			foreach ( array(
 					'/usr/share/dict/words',
 					'/usr/dict/words',
-					dirname( __FILE__ ) . '/words.txt' )
+					__DIR__ . '/words.txt' )
 					as $dictionaryFile ) {
 				if ( is_file( $dictionaryFile ) and is_readable( $dictionaryFile ) ) {
 					$this->dictionaryFile = $dictionaryFile;
diff --git a/tests/phpunit/includes/api/generateRandomImages.php b/tests/phpunit/includes/api/generateRandomImages.php
index b22eccd098..ee34562325 100644
--- a/tests/phpunit/includes/api/generateRandomImages.php
+++ b/tests/phpunit/includes/api/generateRandomImages.php
@@ -6,11 +6,11 @@
  */
 
 // Evaluate the include path relative to this file
-$IP = dirname( dirname( dirname( dirname( dirname( __FILE__ ) ) ) ) );
+$IP = dirname( dirname( dirname( dirname( __DIR__ ) ) ) );
 
 // Start up MediaWiki in command-line mode
 require_once( "$IP/maintenance/Maintenance.php" );
-require(  dirname( __FILE__ ) . "/RandomImageGenerator.php" );
+require(  __DIR__ . "/RandomImageGenerator.php" );
 
 class GenerateRandomImages extends Maintenance {
 
diff --git a/tests/phpunit/includes/db/DatabaseSQLTest.php b/tests/phpunit/includes/db/DatabaseSQLTest.php
index d56e632c30..0df5a46080 100644
--- a/tests/phpunit/includes/db/DatabaseSQLTest.php
+++ b/tests/phpunit/includes/db/DatabaseSQLTest.php
@@ -16,9 +16,9 @@ class DatabaseSQLTest extends MediaWikiTestCase {
 	}
 
 	/**
-	 * @dataProvider dataSQL
+	 * @dataProvider dataSelectSQLText
 	 */
-	function testSQL( $sql, $sqlText ) {
+	function testSelectSQLText( $sql, $sqlText ) {
 		$this->assertEquals( trim( $this->db->selectSQLText(
 			isset( $sql['tables'] ) ? $sql['tables'] : array(),
 			isset( $sql['fields'] ) ? $sql['fields'] : array(),
@@ -29,7 +29,7 @@ class DatabaseSQLTest extends MediaWikiTestCase {
 		) ), $sqlText );
 	}
 
-	function dataSQL() {
+	function dataSelectSQLText() {
 		return array(
 			array(
 				array(
@@ -72,4 +72,36 @@ class DatabaseSQLTest extends MediaWikiTestCase {
 			),
 		);
 	}
+
+	/**
+	 * @dataProvider dataConditional
+	 */
+	function testConditional( $sql, $sqlText ) {
+		$this->assertEquals( trim( $this->db->conditional(
+			$sql['conds'],
+			$sql['true'],
+			$sql['false']
+		) ), $sqlText );
+	}
+
+	function dataConditional() {
+		return array(
+			array(
+				array(
+					'conds' => array( 'field' => 'text' ),
+					'true' => 1,
+					'false' => 'NULL',
+				),
+				"(CASE WHEN field = 'text' THEN 1 ELSE NULL END)"
+			),
+			array(
+				array(
+					'conds' => 'field=1',
+					'true' => 1,
+					'false' => 'NULL',
+				),
+				"(CASE WHEN field=1 THEN 1 ELSE NULL END)"
+			),
+		);
+	}
 }
\ No newline at end of file
diff --git a/tests/phpunit/includes/db/TestORMRowTest.php b/tests/phpunit/includes/db/TestORMRowTest.php
index fe5867af09..afd1cb803f 100644
--- a/tests/phpunit/includes/db/TestORMRowTest.php
+++ b/tests/phpunit/includes/db/TestORMRowTest.php
@@ -38,7 +38,7 @@
  * @licence GNU GPL v2+
  * @author Jeroen De Dauw < jeroendedauw@gmail.com >
  */
-require_once dirname( __FILE__ ) . "/ORMRowTest.php";
+require_once __DIR__ . "/ORMRowTest.php";
 
 class TestORMRowTest extends ORMRowTest {
 
diff --git a/tests/phpunit/includes/debug/MWDebugTest.php b/tests/phpunit/includes/debug/MWDebugTest.php
index 1627c47358..246b2918cf 100644
--- a/tests/phpunit/includes/debug/MWDebugTest.php
+++ b/tests/phpunit/includes/debug/MWDebugTest.php
@@ -12,6 +12,11 @@ class MWDebugTest extends MediaWikiTestCase {
 		}
 		/** Clear log before each test */
 		MWDebug::clearLog();
+		wfSuppressWarnings();
+	}
+
+	function tearDown() {
+		wfRestoreWarnings();
 	}
 
 	function testAddLog() {
diff --git a/tests/phpunit/includes/filerepo/FileBackendTest.php b/tests/phpunit/includes/filerepo/FileBackendTest.php
index 6fb7acef75..a2dc5c6ca3 100644
--- a/tests/phpunit/includes/filerepo/FileBackendTest.php
+++ b/tests/phpunit/includes/filerepo/FileBackendTest.php
@@ -3,6 +3,7 @@
 /**
  * @group FileRepo
  * @group FileBackend
+ * @group medium
  */
 class FileBackendTest extends MediaWikiTestCase {
 	private $backend, $multiBackend;
@@ -882,6 +883,20 @@ class FileBackendTest extends MediaWikiTestCase {
 				"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 ) );
@@ -1147,26 +1162,6 @@ class FileBackendTest extends MediaWikiTestCase {
 		$this->tearDownFiles();
 		$this->doTestDoOperations();
 		$this->tearDownFiles();
-
-		$this->backend = $this->singleBackend;
-		$this->tearDownFiles();
-		$this->doTestDoOperations2();
-		$this->tearDownFiles();
-
-		$this->backend = $this->multiBackend;
-		$this->tearDownFiles();
-		$this->doTestDoOperations2();
-		$this->tearDownFiles();
-
-		$this->backend = $this->singleBackend;
-		$this->tearDownFiles();
-		$this->doTestDoOperationsFailing();
-		$this->tearDownFiles();
-
-		$this->backend = $this->multiBackend;
-		$this->tearDownFiles();
-		$this->doTestDoOperationsFailing();
-		$this->tearDownFiles();
 	}
 
 	private function doTestDoOperations() {
@@ -1242,8 +1237,20 @@ class FileBackendTest extends MediaWikiTestCase {
 			"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 doTestDoOperations2() {
+	private function doTestDoOperationsPipeline() {
 		$base = $this->baseStorePath();
 
 		$fileAContents = '3tqtmoeatmn4wg4qe-mg3qt3 tq';
@@ -1329,6 +1336,18 @@ class FileBackendTest extends MediaWikiTestCase {
 			"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 = $this->baseStorePath();
 
diff --git a/tests/phpunit/includes/filerepo/StoreBatchTest.php b/tests/phpunit/includes/filerepo/StoreBatchTest.php
index 6abceeb33d..3ab56af870 100644
--- a/tests/phpunit/includes/filerepo/StoreBatchTest.php
+++ b/tests/phpunit/includes/filerepo/StoreBatchTest.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * @group FileRepo
+ * @group medium
  */
 class StoreBatchTest extends MediaWikiTestCase {
 
diff --git a/tests/phpunit/includes/libs/GenericArrayObjectTest.php b/tests/phpunit/includes/libs/GenericArrayObjectTest.php
index 5e4cda1eea..8a2fb55971 100644
--- a/tests/phpunit/includes/libs/GenericArrayObjectTest.php
+++ b/tests/phpunit/includes/libs/GenericArrayObjectTest.php
@@ -1,6 +1,5 @@
 <?php
 
-
 /**
  * Tests for the GenericArrayObject and deriving classes.
  *
@@ -171,7 +170,7 @@ abstract class GenericArrayObjectTest extends MediaWikiTestCase {
 				call_user_func( $function, $list, $element );
 				$valid = true;
 			}
-			catch ( \MWException $exception ) {
+			catch ( InvalidArgumentException $exception ) {
 				$valid = false;
 			}
 
diff --git a/tests/phpunit/includes/media/BitmapMetadataHandlerTest.php b/tests/phpunit/includes/media/BitmapMetadataHandlerTest.php
index f4f52dd875..d6e25477bd 100644
--- a/tests/phpunit/includes/media/BitmapMetadataHandlerTest.php
+++ b/tests/phpunit/includes/media/BitmapMetadataHandlerTest.php
@@ -2,7 +2,7 @@
 class BitmapMetadataHandlerTest extends MediaWikiTestCase {
 
 	public function setUp() {
-		$this->filePath = dirname( __FILE__ ) . '/../../data/media/';
+		$this->filePath = __DIR__ . '/../../data/media/';
 	}
 
 	/**
diff --git a/tests/phpunit/includes/media/ExifRotationTest.php b/tests/phpunit/includes/media/ExifRotationTest.php
index 1e2d1bb7fe..6af52dd10d 100644
--- a/tests/phpunit/includes/media/ExifRotationTest.php
+++ b/tests/phpunit/includes/media/ExifRotationTest.php
@@ -8,7 +8,7 @@ class ExifRotationTest extends MediaWikiTestCase {
 	function setUp() {
 		parent::setUp();
 		$this->handler = new BitmapHandler();
-		$filePath = dirname( __FILE__ ) . '/../../data/media';
+		$filePath = __DIR__ . '/../../data/media';
 
 		$tmpDir = $this->getNewTempDirectory();
 
diff --git a/tests/phpunit/includes/media/ExifTest.php b/tests/phpunit/includes/media/ExifTest.php
index 80aaac2332..045777d771 100644
--- a/tests/phpunit/includes/media/ExifTest.php
+++ b/tests/phpunit/includes/media/ExifTest.php
@@ -2,7 +2,7 @@
 class ExifTest extends MediaWikiTestCase {
 
 	public function setUp() {
-		$this->mediaPath = dirname( __FILE__ ) . '/../../data/media/';
+		$this->mediaPath = __DIR__ . '/../../data/media/';
 
 		if ( !wfDl( 'exif' ) ) {
 			$this->markTestSkipped( "This test needs the exif extension." );
@@ -25,7 +25,7 @@ class ExifTest extends MediaWikiTestCase {
 		$expected = array(
 			'GPSLatitude' => 88.5180555556,
 			'GPSLongitude' => -21.12357,
-			'GPSAltitude' => -200,
+			'GPSAltitude' => -3.141592653,
 			'GPSDOP' => '5/1',
 			'GPSVersionID' => '2.2.0.0',
 		);
diff --git a/tests/phpunit/includes/media/FormatMetadataTest.php b/tests/phpunit/includes/media/FormatMetadataTest.php
index 8a632f527c..6ade67027c 100644
--- a/tests/phpunit/includes/media/FormatMetadataTest.php
+++ b/tests/phpunit/includes/media/FormatMetadataTest.php
@@ -4,7 +4,7 @@ class FormatMetadataTest extends MediaWikiTestCase {
 		if ( !wfDl( 'exif' ) ) {
 			$this->markTestSkipped( "This test needs the exif extension." );
 		}
-		$filePath = dirname( __FILE__ ) .  '/../../data/media';
+		$filePath = __DIR__ .  '/../../data/media';
 		$this->backend = new FSFileBackend( array(
 			'name'           => 'localtesting',
 			'lockManager'    => 'nullLockManager',
diff --git a/tests/phpunit/includes/media/GIFMetadataExtractorTest.php b/tests/phpunit/includes/media/GIFMetadataExtractorTest.php
index 47fc368b27..650fdd5c7c 100644
--- a/tests/phpunit/includes/media/GIFMetadataExtractorTest.php
+++ b/tests/phpunit/includes/media/GIFMetadataExtractorTest.php
@@ -2,7 +2,7 @@
 class GIFMetadataExtractorTest extends MediaWikiTestCase {
 
 	public function setUp() {
-		$this->mediaPath = dirname( __FILE__ ) . '/../../data/media/';
+		$this->mediaPath = __DIR__ . '/../../data/media/';
 	}
 	/**
 	 * Put in a file, and see if the metadata coming out is as expected.
diff --git a/tests/phpunit/includes/media/GIFTest.php b/tests/phpunit/includes/media/GIFTest.php
index 3665835804..5dcbeee03f 100644
--- a/tests/phpunit/includes/media/GIFTest.php
+++ b/tests/phpunit/includes/media/GIFTest.php
@@ -2,7 +2,7 @@
 class GIFHandlerTest extends MediaWikiTestCase {
 
 	public function setUp() {
-		$this->filePath = dirname( __FILE__ ) .  '/../../data/media';
+		$this->filePath = __DIR__ .  '/../../data/media';
 		$this->backend = new FSFileBackend( array(
 			'name'           => 'localtesting',
 			'lockManager'    => 'nullLockManager',
diff --git a/tests/phpunit/includes/media/JpegMetadataExtractorTest.php b/tests/phpunit/includes/media/JpegMetadataExtractorTest.php
index f48382a431..41d811902c 100644
--- a/tests/phpunit/includes/media/JpegMetadataExtractorTest.php
+++ b/tests/phpunit/includes/media/JpegMetadataExtractorTest.php
@@ -9,7 +9,7 @@
 class JpegMetadataExtractorTest extends MediaWikiTestCase {
 
 	public function setUp() {
-		$this->filePath = dirname( __FILE__ ) . '/../../data/media/';
+		$this->filePath = __DIR__ . '/../../data/media/';
 	}
 
 	/**
diff --git a/tests/phpunit/includes/media/JpegTest.php b/tests/phpunit/includes/media/JpegTest.php
index ddabf5b8cd..ea007f9031 100644
--- a/tests/phpunit/includes/media/JpegTest.php
+++ b/tests/phpunit/includes/media/JpegTest.php
@@ -2,7 +2,7 @@
 class JpegTest extends MediaWikiTestCase {
 
 	public function setUp() {
-		$this->filePath = dirname( __FILE__ ) . '/../../data/media/';
+		$this->filePath = __DIR__ . '/../../data/media/';
 		if ( !wfDl( 'exif' ) ) {
 			$this->markTestSkipped( "This test needs the exif extension." );
 		}
diff --git a/tests/phpunit/includes/media/PNGMetadataExtractorTest.php b/tests/phpunit/includes/media/PNGMetadataExtractorTest.php
index 9f702c504d..1b1b2ec33a 100644
--- a/tests/phpunit/includes/media/PNGMetadataExtractorTest.php
+++ b/tests/phpunit/includes/media/PNGMetadataExtractorTest.php
@@ -2,7 +2,7 @@
 class PNGMetadataExtractorTest extends MediaWikiTestCase {
 
 	function setUp() {
-		$this->filePath = dirname( __FILE__ ) . '/../../data/media/';	
+		$this->filePath = __DIR__ . '/../../data/media/';
 	}
 	/**
 	 * Tests zTXt tag (compressed textual metadata) 
diff --git a/tests/phpunit/includes/media/PNGTest.php b/tests/phpunit/includes/media/PNGTest.php
index b6f911fd8a..fe73c9c71c 100644
--- a/tests/phpunit/includes/media/PNGTest.php
+++ b/tests/phpunit/includes/media/PNGTest.php
@@ -2,7 +2,7 @@
 class PNGHandlerTest extends MediaWikiTestCase {
 
 	public function setUp() {
-		$this->filePath = dirname( __FILE__ ) .  '/../../data/media';
+		$this->filePath = __DIR__ .  '/../../data/media';
 		$this->backend = new FSFileBackend( array(
 			'name'           => 'localtesting',
 			'lockManager'    => 'nullLockManager',
diff --git a/tests/phpunit/includes/media/SVGMetadataExtractorTest.php b/tests/phpunit/includes/media/SVGMetadataExtractorTest.php
index 526beae81b..2116554eec 100644
--- a/tests/phpunit/includes/media/SVGMetadataExtractorTest.php
+++ b/tests/phpunit/includes/media/SVGMetadataExtractorTest.php
@@ -39,27 +39,33 @@ class SVGMetadataExtractorTest extends MediaWikiTestCase {
 	}
 
 	function providerSvgFiles() {
-		$base = dirname( __FILE__ ) . '/../../data/media';
+		$base = __DIR__ . '/../../data/media';
 		return array(
 			array(
 				"$base/Wikimedia-logo.svg",
 				array(
 					'width' => 1024,
-					'height' => 1024
+					'height' => 1024,
+					'originalWidth' => '1024',
+					'originalHeight' => '1024',
 				)
 			),
 			array(
 				"$base/QA_icon.svg",
 				array(
 					'width' => 60,
-					'height' => 60
+					'height' => 60,
+					'originalWidth' => '60',
+					'originalHeight' => '60',
 				)
 			),
 			array(
 				"$base/Gtk-media-play-ltr.svg",
 				array(
 					'width' => 60,
-					'height' => 60
+					'height' => 60,
+					'originalWidth' => '60.0000000',
+					'originalHeight' => '60.0000000',
 				)
 			),
 			array(
@@ -67,14 +73,16 @@ class SVGMetadataExtractorTest extends MediaWikiTestCase {
 				// This file triggered bug 31719, needs entity expansion in the xmlns checks
 				array(
 					'width' => 385,
-					'height' => 385
+					'height' => 385,
+					'originalWidth' => '385',
+					'originalHeight' => '385.0004883',
 				)
 			)
 		);
 	}
 
 	function providerSvgFilesWithXMLMetadata() {
-		$base = dirname( __FILE__ ) . '/../../data/media';
+		$base = __DIR__ . '/../../data/media';
 		$metadata = 
     '<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
       <ns4:Work xmlns:ns4="http://creativecommons.org/ns#" rdf:about="">
@@ -89,7 +97,9 @@ class SVGMetadataExtractorTest extends MediaWikiTestCase {
 				array(
 					'height' => 593,
 					'metadata' => $metadata,
-					'width' => 959
+					'width' => 959,
+					'originalWidth' => '958.69',
+					'originalHeight' => '592.78998',
 				)
 			),
 		);
diff --git a/tests/phpunit/includes/media/TiffTest.php b/tests/phpunit/includes/media/TiffTest.php
index d4cf503b93..4c79f66c0e 100644
--- a/tests/phpunit/includes/media/TiffTest.php
+++ b/tests/phpunit/includes/media/TiffTest.php
@@ -5,7 +5,7 @@ class TiffTest extends MediaWikiTestCase {
 		global $wgShowEXIF;
 		$this->showExif = $wgShowEXIF;
 		$wgShowEXIF = true;
-		$this->filePath = dirname( __FILE__ ) . '/../../data/media/';
+		$this->filePath = __DIR__ . '/../../data/media/';
 		$this->handler = new TiffHandler;
 	}
 
diff --git a/tests/phpunit/includes/media/XMPTest.php b/tests/phpunit/includes/media/XMPTest.php
index c952b23c94..8198d3b08b 100644
--- a/tests/phpunit/includes/media/XMPTest.php
+++ b/tests/phpunit/includes/media/XMPTest.php
@@ -22,11 +22,11 @@ class XMPTest extends MediaWikiTestCase {
 		}
 		$reader = new XMPReader;
 		$reader->parse( $xmp );
-		$this->assertEquals( $expected, $reader->getResults(), $info );
+		$this->assertEquals( $expected, $reader->getResults(), $info, 0.0000000001 );
 	}
 
 	public function dataXMPParse() {
-		$xmpPath = dirname( __FILE__ ) . '/../../data/xmp/' ;
+		$xmpPath = __DIR__ . '/../../data/xmp/' ;
 		$data = array();
 
 		// $xmpFiles format: array of arrays with first arg file base name,
@@ -52,6 +52,7 @@ class XMPTest extends MediaWikiTestCase {
 			array( 'utf32BE', 'UTF-32BE encoding' ),
 			array( 'utf32LE', 'UTF-32LE encoding' ),
 			array( 'xmpExt', 'Extended XMP missing second part' ),
+			array( 'gps', 'Handling of exif GPS parameters in XMP' ),
 		 );
 		foreach( $xmpFiles as $file ) {
 			$xmp = file_get_contents( $xmpPath . $file[0] . '.xmp' );
@@ -72,7 +73,7 @@ class XMPTest extends MediaWikiTestCase {
 	 * world example file to double check the support for this is right.
 	 */
 	function testExtendedXMP() {
-		$xmpPath = dirname( __FILE__ ) . '/../../data/xmp/';
+		$xmpPath = __DIR__ . '/../../data/xmp/';
 		$standardXMP = file_get_contents( $xmpPath . 'xmpExt.xmp' );
 		$extendedXMP = file_get_contents( $xmpPath . 'xmpExt2.xmp' );
 
@@ -102,7 +103,7 @@ class XMPTest extends MediaWikiTestCase {
 	 * and thus should only return the StandardXMP, not the ExtendedXMP.
 	 */
 	function testExtendedXMPWithWrongGUID() {
-		$xmpPath = dirname( __FILE__ ) . '/../../data/xmp/';
+		$xmpPath = __DIR__ . '/../../data/xmp/';
 		$standardXMP = file_get_contents( $xmpPath . 'xmpExt.xmp' );
 		$extendedXMP = file_get_contents( $xmpPath . 'xmpExt2.xmp' );
 
@@ -130,7 +131,7 @@ class XMPTest extends MediaWikiTestCase {
 	 * which should cause it to ignore the ExtendedXMP packet.
 	 */
 	function testExtendedXMPMissingPacket() {
-		$xmpPath = dirname( __FILE__ ) . '/../../data/xmp/';
+		$xmpPath = __DIR__ . '/../../data/xmp/';
 		$standardXMP = file_get_contents( $xmpPath . 'xmpExt.xmp' );
 		$extendedXMP = file_get_contents( $xmpPath . 'xmpExt2.xmp' );
 
diff --git a/tests/phpunit/includes/parser/MediaWikiParserTest.php b/tests/phpunit/includes/parser/MediaWikiParserTest.php
index 816c017a95..6a6fded17a 100644
--- a/tests/phpunit/includes/parser/MediaWikiParserTest.php
+++ b/tests/phpunit/includes/parser/MediaWikiParserTest.php
@@ -1,5 +1,5 @@
 <?php
-require_once( dirname( __FILE__ ) . '/NewParserTest.php' );
+require_once( __DIR__ . '/NewParserTest.php' );
 
 /**
  * The UnitTest must be either a class that inherits from MediaWikiTestCase
diff --git a/tests/phpunit/includes/parser/PreprocessorTest.php b/tests/phpunit/includes/parser/PreprocessorTest.php
index 9d3499a03f..fee5674805 100644
--- a/tests/phpunit/includes/parser/PreprocessorTest.php
+++ b/tests/phpunit/includes/parser/PreprocessorTest.php
@@ -103,7 +103,7 @@ class PreprocessorTest extends MediaWikiTestCase {
 			array( "{{foo|bar=|}", "<root>{{foo|bar=|}</root>"),
 			array( "{{Foo|} Bar=", "<root>{{Foo|} Bar=</root>"),
 			array( "{{Foo|} Bar=}}", "<root><template><title>Foo</title><part><name>} Bar</name>=<value></value></part></template></root>"),
-			/* array( file_get_contents( dirname( __FILE__ ) . '/QuoteQuran.txt' ), file_get_contents( dirname( __FILE__ ) . '/QuoteQuranExpanded.txt' ) ), */
+			/* array( file_get_contents( __DIR__ . '/QuoteQuran.txt' ), file_get_contents( __DIR__ . '/QuoteQuranExpanded.txt' ) ), */
 		);
 	}
 
@@ -165,7 +165,7 @@ class PreprocessorTest extends MediaWikiTestCase {
 	 * @dataProvider provideFiles
 	 */
 	function testPreprocessorOutputFiles( $filename ) {
-		$folder = dirname( __FILE__ ) . "/../../../parser/preprocess";
+		$folder = __DIR__ . "/../../../parser/preprocess";
 		$wikiText = file_get_contents( "$folder/$filename.txt" );
 		$output = $this->preprocessToXml( $wikiText );
 
diff --git a/tests/phpunit/includes/upload/UploadStashTest.php b/tests/phpunit/includes/upload/UploadStashTest.php
index c9dbb1388e..dc1c2ac4fc 100644
--- a/tests/phpunit/includes/upload/UploadStashTest.php
+++ b/tests/phpunit/includes/upload/UploadStashTest.php
@@ -12,7 +12,7 @@ class UploadStashTest extends MediaWikiTestCase {
 		parent::setUp();
 
 		// Setup a file for bug 29408
-		$this->bug29408File = dirname( __FILE__ ) . '/bug29408';
+		$this->bug29408File = __DIR__ . '/bug29408';
 		file_put_contents( $this->bug29408File, "\x00" );
 
 		self::$users = array(
diff --git a/tests/phpunit/languages/LanguageHeTest.php b/tests/phpunit/languages/LanguageHeTest.php
index 9ac0f952d9..7833da7149 100644
--- a/tests/phpunit/languages/LanguageHeTest.php
+++ b/tests/phpunit/languages/LanguageHeTest.php
@@ -18,31 +18,31 @@ class LanguageHeTest extends MediaWikiTestCase {
 
 	/** @dataProvider providerPluralDual */
 	function testPluralDual( $result, $value ) {
-		$forms = array( 'one', 'many', 'two' );
+		$forms = array( 'one', 'two', 'other' );
 		$this->assertEquals( $result, $this->lang->convertPlural( $value, $forms ) );
 	}
 
 	function providerPluralDual() {
 		return array (
-			array( 'many', 0 ), // Zero -> plural
+			array( 'other', 0 ), // Zero -> plural
 			array( 'one', 1 ), // Singular
 			array( 'two', 2 ), // Dual
-			array( 'many', 3 ), // Plural
+			array( 'other', 3 ), // Plural
 		);
 	}
 
 	/** @dataProvider providerPlural */
 	function testPlural( $result, $value ) {
-		$forms = array( 'one', 'many' );
+		$forms = array( 'one', 'other' );
 		$this->assertEquals( $result, $this->lang->convertPlural( $value, $forms ) );
 	}
 
 	function providerPlural() {
 		return array (
-			array( 'many', 0 ), // Zero -> plural
+			array( 'other', 0 ), // Zero -> plural
 			array( 'one', 1 ), // Singular
-			array( 'many', 2 ), // Plural, no dual provided
-			array( 'many', 3 ), // Plural
+			array( 'other', 2 ), // Plural, no dual provided
+			array( 'other', 3 ), // Plural
 		);
 	}
 }
diff --git a/tests/phpunit/languages/LanguageSrTest.php b/tests/phpunit/languages/LanguageSrTest.php
index e7d3ea1816..d44ecf8e5b 100644
--- a/tests/phpunit/languages/LanguageSrTest.php
+++ b/tests/phpunit/languages/LanguageSrTest.php
@@ -12,7 +12,7 @@
  * @file
  */
 
-require_once dirname( dirname( __FILE__ ) ) . '/bootstrap.php';
+require_once dirname( __DIR__ ) . '/bootstrap.php';
 
 /** Tests for MediaWiki languages/LanguageSr.php */
 class LanguageSrTest extends MediaWikiTestCase {
diff --git a/tests/phpunit/languages/LanguageUzTest.php b/tests/phpunit/languages/LanguageUzTest.php
index 86f483d0fc..723872836f 100644
--- a/tests/phpunit/languages/LanguageUzTest.php
+++ b/tests/phpunit/languages/LanguageUzTest.php
@@ -12,7 +12,7 @@
  * @file
  */
 
-require_once dirname( dirname( __FILE__ ) ) . '/bootstrap.php';
+require_once dirname( __DIR__ ) . '/bootstrap.php';
 
 /** Tests for MediaWiki languages/LanguageUz.php */
 class LanguageUzTest extends MediaWikiTestCase {
diff --git a/tests/phpunit/languages/utils/CLDRPluralRuleEvaluatorTest.php b/tests/phpunit/languages/utils/CLDRPluralRuleEvaluatorTest.php
new file mode 100644
index 0000000000..033164b026
--- /dev/null
+++ b/tests/phpunit/languages/utils/CLDRPluralRuleEvaluatorTest.php
@@ -0,0 +1,95 @@
+<?php
+/**
+ * @author Niklas Laxström
+ * @file
+ */
+
+class CLDRPluralRuleEvaluatorTest extends MediaWikiTestCase {
+	/**
+	 * @dataProvider validTestCases
+	 */
+	function testValidRules( $expected, $rules, $number, $comment ) {
+		$result = CLDRPluralRuleEvaluator::evaluate( $number, (array) $rules );
+		$this->assertEquals( $expected, $result, $comment );
+	}
+
+	/**
+	 * @dataProvider invalidTestCases
+	 * @expectedException CLDRPluralRuleError
+	 */
+	function testInvalidRules( $rules, $comment ) {
+		CLDRPluralRuleEvaluator::evaluate( 1, (array) $rules );
+	}
+
+	function validTestCases() {
+		$tests = array(
+			# expected, number, rule, comment
+			array( 0, 'n is 1', 1, 'integer number and is' ),
+			array( 0, 'n is 1', "1", 'string integer number and is' ),
+			array( 0, 'n is 1', 1.0, 'float number and is' ),
+			array( 0, 'n is 1', "1.0", 'string float number and is' ),
+			array( 1, 'n is 1', 1.1, 'float number and is' ),
+			array( 1, 'n is 1', 2, 'float number and is' ),
+
+			array( 0, 'n in 1,3,5',     3, '' ),
+			array( 1, 'n not in 1,3,5', 5, '' ),
+
+			array( 1, 'n in 1,3,5',     2, '' ),
+			array( 0, 'n not in 1,3,5', 4, '' ),
+
+			array( 0, 'n in 1..3',      2, '' ),
+			array( 0, 'n in 1..3',      3, 'in is inclusive' ),
+			array( 1, 'n in 1..3',      0, '' ),
+
+			array( 1, 'n not in 1..3',      2, '' ),
+			array( 1, 'n not in 1..3',      3, 'in is inclusive' ),
+			array( 0, 'n not in 1..3',      0, '' ),
+
+			array( 1, 'n is not 1 and n is not 2 and n is not 3', 1, 'and relation' ),
+			array( 0, 'n is not 1 and n is not 2 and n is not 4', 3, 'and relation' ),
+
+			array( 0, 'n is not 1 or n is 1', 1, 'or relation' ),
+			array( 1, 'n is 1 or n is 2', 3, 'or relation' ),
+
+			array( 0, 'n              is      1', 1, 'extra whitespace' ),
+
+			array( 0, 'n mod 3 is 1', 7, 'mod' ),
+			array( 0, 'n mod 3 is not 1', 4.3, 'mod with floats' ),
+
+			array( 0, 'n within 1..3', 2, 'within with integer' ),
+			array( 0, 'n within 1..3', 2.5, 'within with float' ),
+			array( 0, 'n in 1..3', 2, 'in with integer' ),
+			array( 1, 'n in 1..3', 2.5, 'in with float' ),
+
+			array( 0, 'n in 3 or n is 4 and n is 5', 3, 'and binds more tightly than or' ),
+			array( 1, 'n is 3 or n is 4 and n is 5', 4, 'and binds more tightly than or' ),
+
+			array( 0, 'n mod 10 in 3..4,9 and n mod 100 not in 10..19,70..79,90..99', 24, 'breton rule' ),
+			array( 1, 'n mod 10 in 3..4,9 and n mod 100 not in 10..19,70..79,90..99', 25, 'breton rule' ),
+
+			array( 0, 'n within 0..2 and n is not 2', 0, 'french rule' ),
+			array( 0, 'n within 0..2 and n is not 2', 1, 'french rule' ),
+			array( 0, 'n within 0..2 and n is not 2', 1.2, 'french rule' ),
+			array( 1, 'n within 0..2 and n is not 2', 2, 'french rule' ),
+
+			array( 1, 'n in 3..10,13..19', 2, 'scottish rule - ranges with comma' ),
+			array( 0, 'n in 3..10,13..19', 4, 'scottish rule - ranges with comma' ),
+			array( 1, 'n in 3..10,13..19', 12.999, 'scottish rule - ranges with comma' ),
+			array( 0, 'n in 3..10,13..19', 13, 'scottish rule - ranges with comma' ),
+
+			array( 0, '5 mod 3 is n', 2, 'n as result of mod - no need to pass' ),
+		);
+
+		return $tests;
+	}
+
+	function invalidTestCases() {
+		$tests = array(
+			array( 'n mod mod 5 is 1', 'mod mod' ),
+			array( 'n', 'just n' ),
+			array( 'n is in 5', 'is in' ),
+		);
+		return $tests;
+	}
+
+}
diff --git a/tests/phpunit/maintenance/backupPrefetchTest.php b/tests/phpunit/maintenance/backupPrefetchTest.php
index 965d7beeaf..8ff855744b 100644
--- a/tests/phpunit/maintenance/backupPrefetchTest.php
+++ b/tests/phpunit/maintenance/backupPrefetchTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname( __FILE__ ) . "/../../../maintenance/backupPrefetch.inc";
+require_once __DIR__ . "/../../../maintenance/backupPrefetch.inc";
 
 /**
  * Tests for BaseDump
diff --git a/tests/phpunit/maintenance/backupTextPassTest.php b/tests/phpunit/maintenance/backupTextPassTest.php
index 24186fb81a..f669b26e21 100644
--- a/tests/phpunit/maintenance/backupTextPassTest.php
+++ b/tests/phpunit/maintenance/backupTextPassTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname( __FILE__ ) . "/../../../maintenance/backupTextPass.inc";
+require_once __DIR__ . "/../../../maintenance/backupTextPass.inc";
 
 /**
  * Tests for page dumps of BackupDumper
diff --git a/tests/phpunit/maintenance/fetchTextTest.php b/tests/phpunit/maintenance/fetchTextTest.php
index f0689b607a..e7ffa01c34 100644
--- a/tests/phpunit/maintenance/fetchTextTest.php
+++ b/tests/phpunit/maintenance/fetchTextTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname( __FILE__ ) . "/../../../maintenance/fetchText.php";
+require_once __DIR__ . "/../../../maintenance/fetchText.php";
 
 /**
  * Mock for the input/output of FetchText
diff --git a/tests/phpunit/maintenance/getSlaveServerTest.php b/tests/phpunit/maintenance/getSlaveServerTest.php
index 86356144f0..0b7c758c75 100644
--- a/tests/phpunit/maintenance/getSlaveServerTest.php
+++ b/tests/phpunit/maintenance/getSlaveServerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname( __FILE__ ) . "/../../../maintenance/getSlaveServer.php";
+require_once __DIR__ . "/../../../maintenance/getSlaveServer.php";
 
 /**
  * Tests for getSlaveServer
diff --git a/tests/phpunit/phpunit.php b/tests/phpunit/phpunit.php
index 61a20f1b1f..bcbf4ec121 100755
--- a/tests/phpunit/phpunit.php
+++ b/tests/phpunit/phpunit.php
@@ -9,7 +9,7 @@
 /* Configuration */
 
 // Evaluate the include path relative to this file
-$IP = dirname( dirname( dirname( __FILE__ ) ) );
+$IP = dirname( dirname( __DIR__ ) );
 
 // Set a flag which can be used to detect when other scripts have been entered through this entry point or not
 define( 'MW_PHPUNIT_TEST', true );
@@ -34,6 +34,10 @@ class PHPUnitMaintClass extends Maintenance {
 		global $wgMainCacheType, $wgMessageCacheType, $wgParserCacheType;
 		global $wgLanguageConverterCacheType, $wgUseDatabaseMessages;
 		global $wgLocaltimezone, $wgLocalisationCacheConf;
+		global $wgDevelopmentWarnings;
+
+		// wfWarn should cause tests to fail
+		$wgDevelopmentWarnings = true;
 
 		$wgMainCacheType = CACHE_NONE;
 		$wgMessageCacheType = CACHE_NONE;
diff --git a/tests/phpunit/suites/UploadFromUrlTestSuite.php b/tests/phpunit/suites/UploadFromUrlTestSuite.php
index 6779ad4781..f2638111bb 100644
--- a/tests/phpunit/suites/UploadFromUrlTestSuite.php
+++ b/tests/phpunit/suites/UploadFromUrlTestSuite.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once( dirname( dirname( __FILE__ ) ) . '/includes/upload/UploadFromUrlTest.php' );
+require_once( dirname( __DIR__ ) . '/includes/upload/UploadFromUrlTest.php' );
 
 class UploadFromUrlTestSuite extends PHPUnit_Framework_TestSuite {
 	public $savedGlobals = array();
diff --git a/tests/qunit/QUnitTestResources.php b/tests/qunit/QUnitTestResources.php
index 1cd085ffee..59ae73cd1a 100644
--- a/tests/qunit/QUnitTestResources.php
+++ b/tests/qunit/QUnitTestResources.php
@@ -30,6 +30,7 @@ return array(
 			'tests/qunit/suites/resources/mediawiki.api/mediawiki.api.parse.test.js',
 			'tests/qunit/suites/resources/mediawiki.special/mediawiki.special.recentchanges.test.js',
 			'tests/qunit/suites/resources/mediawiki/mediawiki.language.test.js',
+			'tests/qunit/suites/resources/mediawiki/mediawiki.cldr.test.js',
 		),
 		'dependencies' => array(
 			'jquery.autoEllipsis',
@@ -55,6 +56,7 @@ return array(
 			'mediawiki.util',
 			'mediawiki.special.recentchanges',
 			'mediawiki.language',
+			'mediawiki.cldr',
 		),
 		'position' => 'top',
 	)
diff --git a/tests/qunit/suites/resources/jquery/jquery.tablesorter.test.js b/tests/qunit/suites/resources/jquery/jquery.tablesorter.test.js
index 7d8c1d6044..16d8170790 100644
--- a/tests/qunit/suites/resources/jquery/jquery.tablesorter.test.js
+++ b/tests/qunit/suites/resources/jquery/jquery.tablesorter.test.js
@@ -1,4 +1,4 @@
-( function ( $ ) {
+( function ( $, mw ) {
 
 var config = {
 	wgMonthNames: ['', 'January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'],
@@ -345,11 +345,11 @@ var complexMDYDates = [
 ];
 
 var complexMDYSorted = [
-	["5.12.1990"],
-	["April 21 1991"],
-	["04 22 1991"],
-	["January, 19 2010"],
-	["December 12 '10"]
+	['5.12.1990'],
+	['April 21 1991'],
+	['04 22 1991'],
+	['January, 19 2010'],
+	['December 12 \'10']
 ];
 
 tableTest(
@@ -365,6 +365,39 @@ tableTest(
 	}
 );
 
+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();
@@ -381,6 +414,7 @@ tableTest(
 	}
 );
 
+
 /** FIXME: the diff output is not very readeable. */
 QUnit.test( 'bug 32047 - caption must be before thead', function ( assert ) {
 	var $table;
@@ -660,4 +694,4 @@ tableTest(
 	}
 );
 
-}( jQuery ) );
+}( jQuery, mediaWiki ) );
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.cldr.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.cldr.test.js
new file mode 100644
index 0000000000..09a11b0e51
--- /dev/null
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.cldr.test.js
@@ -0,0 +1,67 @@
+module( 'mediawiki.cldr' );
+
+test( '-- Initial check', function() {
+	expect( 1 );
+	ok( mw.cldr, 'mw.cldr defined' );
+} );
+
+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" ]
+	],
+	"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" ]
+	],
+	"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" ]
+		// FIXME plural rules for decimal numbers does not work
+		// [ 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, function( assert ) {
+		QUnit.expect( tests.length );
+		for ( var i = 0; i < tests.length; i++ ) {
+			assert.equal(
+				mw.language.convertPlural( tests[i][0], tests[i][1] ),
+				tests[i][2], // Expected plural form
+				tests[i][3] // Description
+			);
+		}
+	} );
+}
+
+$.each( pluralTestcases, function( langCode, tests ) {
+	if ( langCode === mw.config.get( 'wgUserLanguage' ) ) {
+		pluralTest( langCode, tests );
+	}
+} );
diff --git a/tests/selenium/installer/MediaWikiButtonsAvailabilityTestCase.php b/tests/selenium/installer/MediaWikiButtonsAvailabilityTestCase.php
index bf5b379d5e..8bca4b0db6 100644
--- a/tests/selenium/installer/MediaWikiButtonsAvailabilityTestCase.php
+++ b/tests/selenium/installer/MediaWikiButtonsAvailabilityTestCase.php
@@ -28,7 +28,7 @@
  */
 
 
-require_once (dirname(__FILE__).'/'.'MediaWikiInstallationCommonFunction.php');
+require_once (__DIR__.'/'.'MediaWikiInstallationCommonFunction.php');
 
 /**
  * Test Case ID   : 30 (http://www.mediawiki.org/wiki/New_installer/Test_plan)
@@ -99,4 +99,4 @@ class MediaWikiButtonsAvailabilityTestCase extends MediaWikiInstallationCommonFu
         $this->assertTrue( $this->isElementPresent( "submit-back" ));
         $this->assertTrue( $this->isElementPresent( "submit-continue" ));
     }
-}
\ No newline at end of file
+}
diff --git a/tests/selenium/installer/MediaWikiDifferentDatabaseAccountTestCase.php b/tests/selenium/installer/MediaWikiDifferentDatabaseAccountTestCase.php
index f1b7945970..8e2afe7305 100644
--- a/tests/selenium/installer/MediaWikiDifferentDatabaseAccountTestCase.php
+++ b/tests/selenium/installer/MediaWikiDifferentDatabaseAccountTestCase.php
@@ -28,7 +28,7 @@
  */
 
 
-require_once ( dirname( __FILE__ ) . '/MediaWikiInstallationCommonFunction.php' );
+require_once ( __DIR__ . '/MediaWikiInstallationCommonFunction.php' );
 
 /**
  * Test Case ID   : 04 (http://www.mediawiki.org/wiki/New_installer/Test_plan)
diff --git a/tests/selenium/installer/MediaWikiDifferntDatabasePrefixTestCase.php b/tests/selenium/installer/MediaWikiDifferntDatabasePrefixTestCase.php
index 2d623afcee..55ad4612b1 100644
--- a/tests/selenium/installer/MediaWikiDifferntDatabasePrefixTestCase.php
+++ b/tests/selenium/installer/MediaWikiDifferntDatabasePrefixTestCase.php
@@ -27,7 +27,7 @@
  *
  */
 
-require_once ( dirname( __FILE__ ) . '/MediaWikiInstallationCommonFunction.php' );
+require_once ( __DIR__ . '/MediaWikiInstallationCommonFunction.php' );
 
 /**
  * Test Case ID   : 02 (http://www.mediawiki.org/wiki/New_installer/Test_plan)
diff --git a/tests/selenium/installer/MediaWikiErrorsConnectToDatabasePageTestCase.php b/tests/selenium/installer/MediaWikiErrorsConnectToDatabasePageTestCase.php
index b112bc0e77..825ca424a9 100644
--- a/tests/selenium/installer/MediaWikiErrorsConnectToDatabasePageTestCase.php
+++ b/tests/selenium/installer/MediaWikiErrorsConnectToDatabasePageTestCase.php
@@ -28,7 +28,7 @@
  */
 
 
-require_once ( dirname( __FILE__ ) . '/MediaWikiInstallationCommonFunction.php' );
+require_once ( __DIR__ . '/MediaWikiInstallationCommonFunction.php' );
 
 /**
  * Test Case ID   : 09 (http://www.mediawiki.org/wiki/New_installer/Test_plan)
diff --git a/tests/selenium/installer/MediaWikiErrorsNamepageTestCase.php b/tests/selenium/installer/MediaWikiErrorsNamepageTestCase.php
index 024fe5d61c..c2b35054d2 100644
--- a/tests/selenium/installer/MediaWikiErrorsNamepageTestCase.php
+++ b/tests/selenium/installer/MediaWikiErrorsNamepageTestCase.php
@@ -33,7 +33,7 @@
  * Version        : MediaWiki 1.18alpha
 */
 
-require_once ( dirname( __FILE__ ) . '/MediaWikiInstallationCommonFunction.php' );
+require_once ( __DIR__ . '/MediaWikiInstallationCommonFunction.php' );
 
 class MediaWikiErrorsNamepageTestCase extends MediaWikiInstallationCommonFunction {
 
diff --git a/tests/selenium/installer/MediaWikiHelpFieldHintTestCase.php b/tests/selenium/installer/MediaWikiHelpFieldHintTestCase.php
index 806fcfde13..78205cf84a 100644
--- a/tests/selenium/installer/MediaWikiHelpFieldHintTestCase.php
+++ b/tests/selenium/installer/MediaWikiHelpFieldHintTestCase.php
@@ -33,7 +33,7 @@
  * Version        : MediaWiki 1.18alpha
 */
 
-require_once ( dirname( __FILE__ ) . '/MediaWikiInstallationCommonFunction.php' );
+require_once ( __DIR__ . '/MediaWikiInstallationCommonFunction.php' );
 
 class MediaWikiHelpFieldHintTestCase extends MediaWikiInstallationCommonFunction {
 
diff --git a/tests/selenium/installer/MediaWikiInstallationCommonFunction.php b/tests/selenium/installer/MediaWikiInstallationCommonFunction.php
index 99df8a2a6f..353fa2ee63 100644
--- a/tests/selenium/installer/MediaWikiInstallationCommonFunction.php
+++ b/tests/selenium/installer/MediaWikiInstallationCommonFunction.php
@@ -27,9 +27,9 @@
  */
 
 require_once 'PHPUnit/Extensions/SeleniumTestCase.php';
-require_once ( dirname( __FILE__ ) . '/MediaWikiInstallationConfig.php' );
-require_once ( dirname(__FILE__) . '/MediaWikiInstallationMessage.php' );
-require_once ( dirname(__FILE__) . '/MediaWikiInstallationVariables.php');
+require_once ( __DIR__ . '/MediaWikiInstallationConfig.php' );
+require_once ( __DIR__ . '/MediaWikiInstallationMessage.php' );
+require_once ( __DIR__ . '/MediaWikiInstallationVariables.php');
 
 
 class MediaWikiInstallationCommonFunction extends PHPUnit_Extensions_SeleniumTestCase {
diff --git a/tests/selenium/installer/MediaWikiInstallerTestSuite.php b/tests/selenium/installer/MediaWikiInstallerTestSuite.php
index 386a50ea3c..58ccc7cdcd 100644
--- a/tests/selenium/installer/MediaWikiInstallerTestSuite.php
+++ b/tests/selenium/installer/MediaWikiInstallerTestSuite.php
@@ -30,19 +30,19 @@
 require_once 'PHPUnit/Framework.php';
 require_once 'PHPUnit/Framework/TestSuite.php';
 
-require_once ( dirname( __FILE__ ) . '/MediaWikiUserInterfaceTestCase.php' );
-require_once ( dirname( __FILE__ ) . '/MediaWikiButtonsAvailabilityTestCase.php' );
-require_once ( dirname( __FILE__ ) . '/MediaWikiHelpFieldHintTestCase.php' );
-require_once ( dirname( __FILE__ ) . '/MediaWikiRightFrameworkLinksTestCase.php' );
-require_once ( dirname( __FILE__ ) . '/MediaWikiRestartInstallationTestCase.php' );
-require_once ( dirname( __FILE__ ) . '/MediaWikiErrorsConnectToDatabasePageTestCase.php' );
-require_once ( dirname( __FILE__ ) . '/MediaWikiErrorsNamepageTestCase.php' );
-require_once ( dirname( __FILE__ ) . '/MediaWikiMySQLDataBaseTestCase.php' );
-require_once ( dirname( __FILE__ ) . '/MediaWikiMySQLiteDataBaseTestCase.php' );
-require_once ( dirname( __FILE__ ) . '/MediaWikiUpgradeExistingDatabaseTestCase.php' );
-require_once ( dirname( __FILE__ ) . '/MediaWikiDifferntDatabasePrefixTestCase.php' );
-require_once ( dirname( __FILE__ ) . '/MediaWikiDifferentDatabaseAccountTestCase.php' );
-require_once ( dirname( __FILE__ ) . '/MediaWikiOnAlreadyInstalledTestCase.php' );
+require_once ( __DIR__ . '/MediaWikiUserInterfaceTestCase.php' );
+require_once ( __DIR__ . '/MediaWikiButtonsAvailabilityTestCase.php' );
+require_once ( __DIR__ . '/MediaWikiHelpFieldHintTestCase.php' );
+require_once ( __DIR__ . '/MediaWikiRightFrameworkLinksTestCase.php' );
+require_once ( __DIR__ . '/MediaWikiRestartInstallationTestCase.php' );
+require_once ( __DIR__ . '/MediaWikiErrorsConnectToDatabasePageTestCase.php' );
+require_once ( __DIR__ . '/MediaWikiErrorsNamepageTestCase.php' );
+require_once ( __DIR__ . '/MediaWikiMySQLDataBaseTestCase.php' );
+require_once ( __DIR__ . '/MediaWikiMySQLiteDataBaseTestCase.php' );
+require_once ( __DIR__ . '/MediaWikiUpgradeExistingDatabaseTestCase.php' );
+require_once ( __DIR__ . '/MediaWikiDifferntDatabasePrefixTestCase.php' );
+require_once ( __DIR__ . '/MediaWikiDifferentDatabaseAccountTestCase.php' );
+require_once ( __DIR__ . '/MediaWikiOnAlreadyInstalledTestCase.php' );
 
 
 
diff --git a/tests/selenium/installer/MediaWikiMySQLDataBaseTestCase.php b/tests/selenium/installer/MediaWikiMySQLDataBaseTestCase.php
index 399ed4e5d8..16d065c769 100644
--- a/tests/selenium/installer/MediaWikiMySQLDataBaseTestCase.php
+++ b/tests/selenium/installer/MediaWikiMySQLDataBaseTestCase.php
@@ -28,7 +28,7 @@
  */
 
 
-require_once (dirname(__FILE__).'/'.'MediaWikiInstallationCommonFunction.php');
+require_once (__DIR__.'/'.'MediaWikiInstallationCommonFunction.php');
 
 /**
  * Test Case ID   : 01 (http://www.mediawiki.org/wiki/New_installer/Test_plan)
diff --git a/tests/selenium/installer/MediaWikiMySQLiteDataBaseTestCase.php b/tests/selenium/installer/MediaWikiMySQLiteDataBaseTestCase.php
index f57c1a559b..4ca6916254 100644
--- a/tests/selenium/installer/MediaWikiMySQLiteDataBaseTestCase.php
+++ b/tests/selenium/installer/MediaWikiMySQLiteDataBaseTestCase.php
@@ -28,7 +28,7 @@
  */
 
 
-require_once (dirname(__FILE__).'/'.'MediaWikiInstallationCommonFunction.php');
+require_once (__DIR__.'/'.'MediaWikiInstallationCommonFunction.php');
 
 /**
  * Test Case ID   : 06 (http://www.mediawiki.org/wiki/New_installer/Test_plan)
diff --git a/tests/selenium/installer/MediaWikiOnAlreadyInstalledTestCase.php b/tests/selenium/installer/MediaWikiOnAlreadyInstalledTestCase.php
index 4c05266651..7a1b615cb7 100644
--- a/tests/selenium/installer/MediaWikiOnAlreadyInstalledTestCase.php
+++ b/tests/selenium/installer/MediaWikiOnAlreadyInstalledTestCase.php
@@ -28,7 +28,7 @@
  */
 
 
-require_once (dirname(__FILE__).'/'.'MediaWikiInstallationCommonFunction.php');
+require_once (__DIR__.'/'.'MediaWikiInstallationCommonFunction.php');
 
 
 /**
diff --git a/tests/selenium/installer/MediaWikiRestartInstallationTestCase.php b/tests/selenium/installer/MediaWikiRestartInstallationTestCase.php
index b9ca83057f..ea87de0838 100644
--- a/tests/selenium/installer/MediaWikiRestartInstallationTestCase.php
+++ b/tests/selenium/installer/MediaWikiRestartInstallationTestCase.php
@@ -29,7 +29,7 @@
 
 
 
-require_once (dirname(__FILE__).'/'.'MediaWikiInstallationCommonFunction.php');
+require_once (__DIR__.'/'.'MediaWikiInstallationCommonFunction.php');
 
 /**
  * Test Case ID   : 11, 12 (http://www.mediawiki.org/wiki/New_installer/Test_plan)
diff --git a/tests/selenium/installer/MediaWikiRightFrameworkLinksTestCase.php b/tests/selenium/installer/MediaWikiRightFrameworkLinksTestCase.php
index 700172c299..7b0fcf369d 100644
--- a/tests/selenium/installer/MediaWikiRightFrameworkLinksTestCase.php
+++ b/tests/selenium/installer/MediaWikiRightFrameworkLinksTestCase.php
@@ -28,7 +28,7 @@
  */
 
 
-require_once (dirname(__FILE__).'/'.'MediaWikiInstallationCommonFunction.php');
+require_once (__DIR__.'/'.'MediaWikiInstallationCommonFunction.php');
 
 /**
  * Test Case ID   : 14, 15, 16, 17 (http://www.mediawiki.org/wiki/New_installer/Test_plan)
diff --git a/tests/selenium/installer/MediaWikiUpgradeExistingDatabaseTestCase.php b/tests/selenium/installer/MediaWikiUpgradeExistingDatabaseTestCase.php
index eb82071e5c..5cdc8d42c1 100644
--- a/tests/selenium/installer/MediaWikiUpgradeExistingDatabaseTestCase.php
+++ b/tests/selenium/installer/MediaWikiUpgradeExistingDatabaseTestCase.php
@@ -28,7 +28,7 @@
  */
 
 
-require_once (dirname(__FILE__).'/'.'MediaWikiInstallationCommonFunction.php');
+require_once (__DIR__.'/'.'MediaWikiInstallationCommonFunction.php');
 
 /**
  * Test Case ID   : 05 (http://www.mediawiki.org/wiki/New_installer/Test_plan)
@@ -114,4 +114,4 @@ class MediaWikiUpgradeExistingDatabaseTestCase extends MediaWikiInstallationComm
         $this->chooseCancelOnNextConfirmation();
         parent::restartInstallation();
     }
-}
\ No newline at end of file
+}
diff --git a/tests/selenium/installer/MediaWikiUserInterfaceTestCase.php b/tests/selenium/installer/MediaWikiUserInterfaceTestCase.php
index 0994892fda..15fad95fcf 100644
--- a/tests/selenium/installer/MediaWikiUserInterfaceTestCase.php
+++ b/tests/selenium/installer/MediaWikiUserInterfaceTestCase.php
@@ -27,7 +27,7 @@
  *
  */
 
-require_once (dirname(__FILE__).'/'.'MediaWikiInstallationCommonFunction.php');
+require_once (__DIR__.'/'.'MediaWikiInstallationCommonFunction.php');
 
 /**
  * Test Case ID   : 18 - 27 (http://www.mediawiki.org/wiki/New_installer/Test_plan)
diff --git a/tests/selenium/suites/MediawikiCoreSmokeTestCase.php b/tests/selenium/suites/MediawikiCoreSmokeTestCase.php
index 5fc1a5a6de..6b8fc974b2 100644
--- a/tests/selenium/suites/MediawikiCoreSmokeTestCase.php
+++ b/tests/selenium/suites/MediawikiCoreSmokeTestCase.php
@@ -43,7 +43,7 @@ class MediawikiCoreSmokeTestCase extends SeleniumTestCase {
 		$this->login();
 		$this->open( $this->getUrl() .
 			'/index.php?title=Special:Upload' );
-		$this->type( 'wpUploadFile', dirname( __FILE__ ) .
+		$this->type( 'wpUploadFile', __DIR__ .
 			"\\..\\data\\Wikipedia-logo-v2-de.png" );
 		$this->check( 'wpIgnoreWarning' );
 		$this->click( 'wpUpload' );
diff --git a/tests/selenium/suites/MyContributionsTestCase.php b/tests/selenium/suites/MyContributionsTestCase.php
index 01d87e4b7d..b8d2d48d1d 100644
--- a/tests/selenium/suites/MyContributionsTestCase.php
+++ b/tests/selenium/suites/MyContributionsTestCase.php
@@ -27,7 +27,7 @@
  *
  */
 
-require_once dirname( dirname( __FILE__ ) ) . '/SeleniumTestConstants.php';
+require_once dirname( __DIR__ ) . '/SeleniumTestConstants.php';
 
 class MyContributionsTestCase extends SeleniumTestCase {
 
diff --git a/tests/selenium/suites/MyWatchListTestCase.php b/tests/selenium/suites/MyWatchListTestCase.php
index d1ee3e78f8..998fab9de7 100644
--- a/tests/selenium/suites/MyWatchListTestCase.php
+++ b/tests/selenium/suites/MyWatchListTestCase.php
@@ -27,7 +27,7 @@
  *
  */
 
-require_once dirname( dirname( __FILE__ ) ) . '/SeleniumTestConstants.php';
+require_once dirname( __DIR__ ) . '/SeleniumTestConstants.php';
 
 class MyWatchListTestCase extends SeleniumTestCase {
 
diff --git a/thumb.php b/thumb.php
index 5fc4446248..8307b488bf 100644
--- a/thumb.php
+++ b/thumb.php
@@ -25,7 +25,7 @@ define( 'MW_NO_OUTPUT_COMPRESSION', 1 );
 if ( isset( $_SERVER['MW_COMPILED'] ) ) {
 	require( 'core/includes/WebStart.php' );
 } else {
-	require( dirname( __FILE__ ) . '/includes/WebStart.php' );
+	require( __DIR__ . '/includes/WebStart.php' );
 }
 
 // Don't use fancy mime detection, just check the file extension for jpg/gif/png
@@ -71,9 +71,10 @@ function wfThumbHandle404() {
 	}
 	# Just get the URI path (REDIRECT_URL/REQUEST_URI is either a full URL or a path)
 	if ( substr( $uriPath, 0, 1 ) !== '/' ) {
-		$uri = new Uri( $uriPath );
-		$uriPath = $uri->getPath();
-		if ( $uriPath === null ) {
+		$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;
 		}
diff --git a/thumb_handler.php b/thumb_handler.php
index abc71dd6a9..69bdddd8ca 100644
--- a/thumb_handler.php
+++ b/thumb_handler.php
@@ -26,4 +26,4 @@ define( 'THUMB_HANDLER', true );
 
 # Execute thumb.php, having set THUMB_HANDLER so that
 # it knows to extract params from a thumbnail file URL.
-require( dirname( __FILE__ ) . '/thumb.php' );
+require( __DIR__ . '/thumb.php' );